diff --git a/.gitignore b/.gitignore
index 7028482f2..f9053c671 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,8 @@
 *devserver*
 *sublime*
 *~
+
+# PhpStorm
+.idea/
+*.iml
+/vendor/
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..dcc342063
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,16 @@
+language: php
+
+php:
+  - 5.3
+
+env:
+  - DB=mysql
+
+before_script:
+  - composer self-update --no-interaction
+  - composer install --dev --prefer-source --no-interaction
+
+# omitting "script:" will default to phpunit
+# use the $DB env variable to determine the phpunit.xml to use
+script: vendor/bin/phpunit
+
diff --git a/AGI/a2billing.php b/AGI/a2billing.php
index 4b9f30a48..9ef0407c9 100755
--- a/AGI/a2billing.php
+++ b/AGI/a2billing.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -39,7 +39,10 @@
 
 error_reporting(E_ALL ^ (E_NOTICE | E_WARNING));
 
+require_once __DIR__ . '/../vendor/autoload.php';
+
 include(dirname(__FILE__) . "/lib/Class.Table.php");
+include(dirname(__FILE__) . "/lib/Class.Connection.php");
 include(dirname(__FILE__) . "/lib/Class.A2Billing.php");
 include(dirname(__FILE__) . "/lib/Class.RateEngine.php");
 include(dirname(__FILE__) . "/lib/phpagi/phpagi.php");
@@ -49,7 +52,7 @@
 
 $charge_callback = 0;
 $G_startime = time();
-$agi_version = "A2Billing - v2.0.3";
+$agi_version = "A2Billing - v2.2.0";
 
 if ($argc > 1 && ($argv[1] == '--version' || $argv[1] == '-v')) {
     echo "$agi_version\n";
@@ -120,11 +123,7 @@
 $A2B->CC_TESTING = isset($A2B->agiconfig['debugshell']) && $A2B->agiconfig['debugshell'];
 //$A2B->CC_TESTING = true;
 
-define("DB_TYPE", isset($A2B->config["database"]['dbtype']) ? $A2B->config["database"]['dbtype'] : null);
-define("SMTP_SERVER", isset($A2B->config['global']['smtp_server']) ? $A2B->config['global']['smtp_server'] : null);
-define("SMTP_HOST", isset($A2B->config['global']['smtp_host']) ? $A2B->config['global']['smtp_host'] : null);
-define("SMTP_USERNAME", isset($A2B->config['global']['smtp_username']) ? $A2B->config['global']['smtp_username'] : null);
-define("SMTP_PASSWORD", isset($A2B->config['global']['smtp_password']) ? $A2B->config['global']['smtp_password'] : null);
+include(dirname(__FILE__) . "/lib/common.defines.php");
 
 // Print header
 $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "AGI Request:\n" . print_r($agi->request, true));
@@ -198,6 +197,7 @@
             if (($A2B->agiconfig['answer_call'] == 1) && ($stat_channel["result"] != $status_channel) && ($A2B->CC_TESTING != 1)) {
                 if ($A2B->set_inuse == 1) $A2B->callingcard_acct_start_inuse($agi, 0);
                 $A2B->write_log("[STOP - EXIT]", 0);
+                $RateEngine->hangup($agi, $A2B);
                 exit();
             }
 
@@ -227,7 +227,7 @@
                         if ($try > 3) {
                             if ($A2B->set_inuse == 1)
                                 $A2B->callingcard_acct_start_inuse($agi, 0);
-                            $agi->hangup();
+                            $RateEngine->hangup($agi, $A2B);
                             exit();
                         }
                     } while ($return);
@@ -316,7 +316,7 @@
                                 $agi->stream_file('prepaid-final', '#');
                                 if ($A2B->set_inuse == 1)
                                     $A2B->callingcard_acct_start_inuse($agi, 0);
-                                $agi->hangup();
+                                $RateEngine->hangup($agi, $A2B);
                                 exit();
                             }
                             $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[TRY : $try]");
@@ -371,7 +371,7 @@
                                 $agi->stream_file('prepaid-final', '#');
                                 if ($A2B->set_inuse == 1)
                                     $A2B->callingcard_acct_start_inuse($agi, 0);
-                                $agi->hangup();
+                                $RateEngine->hangup($agi, $A2B);
                                 exit();
                             }
                         }
@@ -415,14 +415,14 @@
                 }
             }
 
-            $A2B->dnid = $agi->request['agi_dnid'];
-            $A2B->extension = $agi->request['agi_extension'];
+            $A2B->dnid = $A2B->orig_dnid;
+            $A2B->extension = $A2B->orig_ext;
 
             if ($A2B->agiconfig['ivr_voucher'] == 1) {
                 $res_dtmf = $agi->get_data('prepaid-refill_card_with_voucher', 5000, 1);
                 $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "RES REFILL CARD VOUCHER DTMF : " . $res_dtmf["result"]);
                 $A2B->ivr_voucher = $res_dtmf["result"];
-                if ((isset($A2B->ivr_voucher)) && ($A2B->ivr_voucher == $A2B->agiconfig['ivr_voucher_prefixe'])) {
+                if ((isset($A2B->ivr_voucher)) && ($A2B->ivr_voucher == $A2B->agiconfig['ivr_voucher_prefix'])) {
                     $vou_res = $A2B->refill_card_with_voucher($agi, $i);
                 }
             }
@@ -579,16 +579,18 @@
 
                     $A2B->debug(INFO, $agi, __FILE__, __LINE__, "[ CALL OF THE SYSTEM - [DID=" . $A2B->destination . "]");
 
-                    $QUERY = "SELECT cc_did.id, cc_did_destination.id, billingtype, tariff, destination, voip_call, username, useralias, connection_charge, selling_rate, did, ".
-                            " aleg_carrier_connect_charge, aleg_carrier_cost_min, aleg_retail_connect_charge, aleg_retail_cost_min, ".
+                    $QUERY = "SELECT cc_did.id, cc_did_destination.id, billingtype, tariff, destination, voip_call, username, useralias, connection_charge, ".
+                            " selling_rate, did, aleg_carrier_connect_charge, aleg_carrier_cost_min, aleg_retail_connect_charge, aleg_retail_cost_min, ".
                             " aleg_carrier_initblock, aleg_carrier_increment, aleg_retail_initblock, aleg_retail_increment, ".
                             " aleg_timeinterval, ".
                             " aleg_carrier_connect_charge_offp, aleg_carrier_cost_min_offp, aleg_retail_connect_charge_offp, aleg_retail_cost_min_offp, ".
                             " aleg_carrier_initblock_offp, aleg_carrier_increment_offp, aleg_retail_initblock_offp, aleg_retail_increment_offp, ".
                             " cc_card.id ".
                             " FROM cc_did, cc_did_destination, cc_card ".
-                            " WHERE id_cc_did=cc_did.id AND cc_card.status=1 AND cc_card.id=id_cc_card and cc_did_destination.activated=1 AND cc_did.activated=1 AND did='" . $A2B->destination . "' ".
-                            " AND cc_did.startingdate <= CURRENT_TIMESTAMP AND (cc_did.expirationdate > CURRENT_TIMESTAMP OR cc_did.expirationdate IS NULL ".
+                            " WHERE id_cc_did=cc_did.id AND cc_card.status=1 AND cc_card.id=id_cc_card and cc_did_destination.activated=1 ".
+                            " AND cc_did.activated=1 AND did='" . $A2B->destination . "' ".
+                            " AND cc_did.startingdate <= CURRENT_TIMESTAMP ".
+                            " AND (cc_did.expirationdate > CURRENT_TIMESTAMP OR cc_did.expirationdate IS NULL ".
                             " AND cc_did_destination.validated = 1 ";
                     if ($A2B->config["database"]['dbtype'] == "mysql") {
                         $QUERY .= " OR cc_did.expirationdate = '0000-00-00 00:00:00'";
@@ -628,22 +630,22 @@
     $RateEngine->Reinit();
     $A2B->Reinit();
 
-    $mydnid = $agi->request['agi_extension'];
-    if ($A2B->CC_TESTING) $mydnid = '11111111';
+    $mydnid = $A2B->orig_ext;
 
     if (strlen($mydnid) > 0) {
         $A2B->debug(INFO, $agi, __FILE__, __LINE__, "[DID CALL - [CallerID=" . $A2B->CallerID . "]:[DID=" . $mydnid . "]");
 
-        $QUERY = "SELECT cc_did.id, cc_did_destination.id, billingtype, tariff, destination, voip_call, username, useralias, connection_charge, selling_rate, did, ".
-                    " aleg_carrier_connect_charge, aleg_carrier_cost_min, aleg_retail_connect_charge, aleg_retail_cost_min, ".
-                    " aleg_carrier_initblock, aleg_carrier_increment, aleg_retail_initblock, aleg_retail_increment, ".
-                    " aleg_timeinterval, ".
-                    " aleg_carrier_connect_charge_offp, aleg_carrier_cost_min_offp, aleg_retail_connect_charge_offp, aleg_retail_cost_min_offp, ".
-                    " aleg_carrier_initblock_offp, aleg_carrier_increment_offp, aleg_retail_initblock_offp, aleg_retail_increment_offp ".
-                    " FROM cc_did, cc_did_destination, cc_card ".
-                    " WHERE id_cc_did=cc_did.id and cc_card.status=1 and cc_card.id=id_cc_card and cc_did_destination.activated=1 and cc_did.activated=1 and did='$mydnid' ".
-                    " AND cc_did.startingdate<= CURRENT_TIMESTAMP AND (cc_did.expirationdate > CURRENT_TIMESTAMP OR cc_did.expirationdate IS NULL ".
-                    " AND cc_did_destination.validated=1";
+        $QUERY = "SELECT cc_did.id, cc_did_destination.id, billingtype, tariff, destination, voip_call, username, useralias, connection_charge, ".
+            " selling_rate, did, aleg_carrier_connect_charge, aleg_carrier_cost_min, aleg_retail_connect_charge, aleg_retail_cost_min, ".
+            " aleg_carrier_initblock, aleg_carrier_increment, aleg_retail_initblock, aleg_retail_increment, ".
+            " aleg_timeinterval, ".
+            " aleg_carrier_connect_charge_offp, aleg_carrier_cost_min_offp, aleg_retail_connect_charge_offp, aleg_retail_cost_min_offp, ".
+            " aleg_carrier_initblock_offp, aleg_carrier_increment_offp, aleg_retail_initblock_offp, aleg_retail_increment_offp ".
+            " FROM cc_did, cc_did_destination, cc_card ".
+            " WHERE id_cc_did=cc_did.id AND cc_card.status=1 AND cc_card.id=id_cc_card AND cc_did_destination.activated=1 ".
+            " AND cc_did.activated=1 AND did='$mydnid' ".
+            " AND cc_did.startingdate<= CURRENT_TIMESTAMP AND (cc_did.expirationdate > CURRENT_TIMESTAMP OR cc_did.expirationdate IS NULL ".
+            " AND cc_did_destination.validated=1";
         if ($A2B->config["database"]['dbtype'] != "postgres") {
             // MYSQL
             $QUERY .= " OR cc_did.expirationdate = '0000-00-00 00:00:00'";
@@ -699,7 +701,7 @@
     // SAY GOODBYE
     if ($A2B->agiconfig['say_goodbye'] == 1) $agi->stream_file('prepaid-final', '#');
 
-    $agi->hangup();
+    $RateEngine->hangup($agi, $A2B);
     if ($A2B->set_inuse == 1) $A2B->callingcard_acct_start_inuse($agi, 0);
     $A2B->write_log("[STOP - EXIT]", 0);
     exit();
@@ -715,7 +717,7 @@
 
     if ($A2B->agiconfig['answer_call'] == 1 && $mode == 'cid-callback') {
         $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, '[HANGUP CLI CALLBACK TRIGGER]');
-        $agi->hangup();
+        $RateEngine->hangup($agi, $A2B);
     } elseif ($mode == 'cid-prompt-callback') {
         $agi->answer();
     } else {
@@ -792,7 +794,7 @@
                                     if ($subtry >= 3) {
                                         if ($A2B->set_inuse == 1)
                                             $A2B->callingcard_acct_start_inuse($agi, 0);
-                                        $agi->hangup();
+                                        $RateEngine->hangup($agi, $A2B);
                                         exit();
                                     }
                                 } while ($res_dtmf["result"] != '1' && $res_dtmf["result"] != '2');
@@ -813,7 +815,7 @@
                         if (strlen($outbound_destination) <= 0) {
                             if ($A2B->set_inuse == 1)
                                 $A2B->callingcard_acct_start_inuse($agi, 0);
-                            $agi->hangup();
+                            $RateEngine->hangup($agi, $A2B);
                             exit();
                         }
 
@@ -841,7 +843,10 @@
                     $addparameter   = $RateEngine->ratecard_obj[0][42 + $usetrunk_failover];
 
                     $destination = $A2B->destination;
-                    if (strncmp($destination, $removeprefix, strlen($removeprefix)) == 0) $destination= substr($destination, strlen($removeprefix));
+
+                    // applying prefix rule(s)
+                    $destination = $A2B->removePrefix($removeprefix, $destination);
+                    $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[UPDATED DESTINATION: $destination]");
 
                     $pos_dialingnumber = strpos($ipaddress, '%dialingnumber%');
 
@@ -935,7 +940,7 @@
     // END
     if ($A2B->agiconfig['answer_call'] == 1) {
         $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, '[HANGUP ALL CALLBACK TRIGGER]');
-        $agi->hangup();
+        $RateEngine->hangup($agi, $A2B);
     } else {
         $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, '[ALL CALLBACK TRIGGER RINGING]');
     }
@@ -985,7 +990,10 @@
                     $addparameter   = $RateEngine->ratecard_obj[0][42 + $usetrunk_failover];
 
                     $destination = $A2B->destination;
-                    if (strncmp($destination, $removeprefix, strlen($removeprefix)) == 0) $destination= substr($destination, strlen($removeprefix));
+
+                    // applying prefix rule(s)
+                    $destination = $A2B->removePrefix($removeprefix, $destination);
+                    $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[UPDATED DESTINATION: $destination]");
 
                     $pos_dialingnumber = strpos($ipaddress, '%dialingnumber%');
 
@@ -1248,7 +1256,7 @@
 
     if ($error_settings) {
         $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[CALLBACK : Error settings accountcode and phonenumber_member]");
-        $agi->hangup();
+        $RateEngine->hangup($agi, $A2B);
         $A2B->write_log("[STOP - EXIT]", 0);
         exit();
     }
@@ -1329,7 +1337,10 @@
                         $addparameter   = $RateEngine->ratecard_obj[0][42 + $usetrunk_failover];
 
                         $destination = $A2B->destination;
-                        if (strncmp($destination, $removeprefix, strlen($removeprefix)) == 0) $destination= substr($destination, strlen($removeprefix));
+
+                        // applying prefix rule(s)
+                        $destination = $A2B->removePrefix($removeprefix, $destination);
+                        $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[UPDATED DESTINATION: $destination]");
 
                         $pos_dialingnumber = strpos($ipaddress, '%dialingnumber%');
 
@@ -1458,7 +1469,7 @@
 
     if ($error_settings) {
         $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[CALLBACK : Error settings accountcode]");
-        $agi->hangup();
+        $RateEngine->hangup($agi, $A2B);
         $A2B->write_log("[STOP - EXIT]", 0);
         exit();
     }
@@ -1585,9 +1596,9 @@
 }// END if ($charge_callback)
 
 if ($mode != 'cid-callback' && $mode != 'all-callback') {
-    $agi->hangup();
+    $RateEngine->hangup($agi, $A2B);
 } elseif ($A2B->agiconfig['answer_call'] == 1) {
-    $agi->hangup();
+    $RateEngine->hangup($agi, $A2B);
 }
 
 // SEND MAIL REMINDER WHEN CREDIT IS TOO LOW
diff --git a/AGI/a2billing_monitoring.php b/AGI/a2billing_monitoring.php
index 90a868b93..3f87a2fe8 100755
--- a/AGI/a2billing_monitoring.php
+++ b/AGI/a2billing_monitoring.php
@@ -39,6 +39,8 @@
 
 error_reporting(E_ALL ^ (E_NOTICE | E_WARNING));
 
+require_once __DIR__ . '/../vendor/autoload.php';
+
 include_once(dirname(__FILE__) . "/lib/Class.Table.php");
 include(dirname(__FILE__) . "/lib/Class.A2Billing.php");
 include(dirname(__FILE__) . "/lib/Class.RateEngine.php");
diff --git a/AUTHORS b/AUTHORS
index 8ef5c7870..77c90e102 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,11 +1,11 @@
 
-A2Billing (c) AGPL 2003-2012
+A2Billing (c) AGPL 2003-2015
 
 A2Billing is free software written by Areski Belaid <info@asterisk2billing.org>
 
 with contributions from :
 
-	Rachid Belaid <rach@asterisk2billing.org>
+	Rachid Belaid <rachid.belaid@gmail.com>
 	Panos Christeas <p_christ@hol.gr>
 	Steve Dommett <steve@st4vs.net>
 	Alberto Escudero-Pascual <aep@it46.se>
@@ -23,7 +23,7 @@ The following third party software is included with the distribution:
 
 	* phpagi 2.14 Copyright 2003, 2004, 2005 Matthew Asham and David Eder
 	* smarty 2.6.26 Copyright 2001-2005 New Digital Group, Inc
-	* jgraph 1.27 Copyright 2001, 2002, 2003, 2004 Johan Persson Aditus Consulting
+	* jgraph 3.5.0 Copyright 2001, 2002, 2003, 2004 Johan Persson Aditus Consulting
 	* adodb 4.991 Copyright (c) 2000, 2001, 2002, 2003, 2004 John Lim
 	* famfamfam.com Icons from Mark James
 	* phpconfig (C) 2003 Dave Packham and Rob Birkinshaw
diff --git a/CallBack/callback-daemon-py/INSTALL b/CallBack/callback-daemon-py/INSTALL
deleted file mode 100644
index 6de18f1a5..000000000
--- a/CallBack/callback-daemon-py/INSTALL
+++ /dev/null
@@ -1,76 +0,0 @@
---------------------------------------------------------------------------------
-                        INSTALL A2B CALLBACK DAEMON
---------------------------------------------------------------------------------
-
-
-- REQUIREMENTS
-=============================
-python
-python-mysqldb
-python-psycopg2
-python-sqlalchemy
-
-
-
-1) INSTALL DAEMON : CENTOS / REDHAT
-=====================================
-
-  Install from egg :
-  	easy_install dist/a2b_callback_daemon-versionXXX.egg
-  
-  Install Init Script :
-    cp a2b-callback-daemon.rc /etc/init.d/a2b-callback-daemon
-    chmod +x /etc/init.d/a2b-callback-daemon
- 
-  Add a service to start at boot :
-    chkconfig --add a2b-callback-daemon
-    chkconfig a2b-callback-daemon on
-  
-  Start Daemon :
-    service a2b-callback-daemon start
-
-
-
-2) INSTALL DAEMON : Debian
-=============================
-
-  Install from egg :
-  	easy_install dist/a2b_callback_daemon-versionXXX.egg
-  
-  Install Init Script :
-    cp a2b-callback-daemon.debian /etc/init.d/a2b-callback-daemon
-    chmod +x /etc/init.d/a2b-callback-daemon
- 
-    update-rc.d a2b-callback-daemon defaults 40 60
-    * to remove update-rc.d -f a2b-callback-daemon remove
- 
-  Start Daemon :
-    /etc/init.d/a2b-callback-daemon start
-  
-
-3) RUN DEBUG MODE
-=============================
-	
-	cd CallBack/callback-daemon-py/callback_daemon
-	./a2b_callback_daemon.py --nodaemon
-	
-
-
-# ADDITIONAL INFO
-=============================
-
-	a) rebuild the source :
-		
-		python setup.py build
-	
-	b) create a new egg :
-		
-		python setup.py bdist_egg
-	
-	c) Build RPMs :
-	
-		python setup.py bdist_rpm
-
-
-
-		
diff --git a/CallBack/callback-daemon-py/INSTALL.rst b/CallBack/callback-daemon-py/INSTALL.rst
new file mode 100644
index 000000000..216f46bd1
--- /dev/null
+++ b/CallBack/callback-daemon-py/INSTALL.rst
@@ -0,0 +1,83 @@
+
+===========================
+INSTALL A2B CALLBACK DAEMON
+===========================
+
+To install A2B Callback Daemon, make sure you have Python 2.7 or greater installed.
+Then follow the instructions bellow.
+
+Dependencies::
+
+    * python
+    * python-mysqldb
+    * python-psycopg2
+    * python-sqlalchemy
+
+
+1) INSTALL DAEMON : CENTOS / REDHAT
+-----------------------------------
+
+Install::
+
+    cd CallBack/callback-daemon-py
+    python setup.py install
+
+Install Init Script::
+
+    cp callback_daemon/a2b-callback-daemon.rc /etc/init.d/a2b-callback-daemon
+    chmod +x /etc/init.d/a2b-callback-daemon
+
+Add a service to start at boot::
+
+    chkconfig --add a2b-callback-daemon
+    chkconfig a2b-callback-daemon on
+
+Start Daemon::
+
+    service a2b-callback-daemon start
+
+
+2) INSTALL DAEMON : DEBIAN
+--------------------------
+
+Install::
+
+    cd CallBack/callback-daemon-py
+    python setup.py install
+
+Install Init script::
+
+    cp callback_daemon/a2b-callback-daemon.debian /etc/init.d/a2b-callback-daemon
+    chmod +x /etc/init.d/a2b-callback-daemon
+
+    update-rc.d a2b-callback-daemon defaults 40 60
+    * to remove update-rc.d -f a2b-callback-daemon remove
+
+Start daemon::
+
+    /etc/init.d/a2b-callback-daemon start
+
+
+3) RUN DEBUG MODE
+-----------------
+
+Run Daemon on debug mode::
+
+    cd CallBack/callback-daemon-py/callback_daemon
+    ./a2b_callback_daemon.py --nodaemon
+
+
+4) ADDITIONAL INFO
+------------------
+
+a) Rebuild the source::
+
+    python setup.py build
+
+b) Create a new egg::
+
+    python setup.py bdist_egg
+
+c) Kill Daemon::
+
+    kill -9 `cat /var/run/a2b-callback-daemon.pid`
diff --git a/CallBack/callback-daemon-py/callback_daemon/__init__.py b/CallBack/callback-daemon-py/callback_daemon/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/CallBack/callback-daemon-py/callback_daemon/a2b_callback_daemon.py b/CallBack/callback-daemon-py/callback_daemon/a2b_callback_daemon.py
index 439fb7b8e..510e8d74a 100755
--- a/CallBack/callback-daemon-py/callback_daemon/a2b_callback_daemon.py
+++ b/CallBack/callback-daemon-py/callback_daemon/a2b_callback_daemon.py
@@ -7,7 +7,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -32,13 +32,6 @@
 kill -9 `cat /var/run/a2b-callback-daemon.pid`
 '''
 
-__author__ = "Belaid Arezqui (areski@gmail.com)"
-__copyright__ = "Copyright (C) Belaid Arezqui"
-
-__revision__ = "$Id$"
-__version__ = "1.00"
-
-# Load Python modules
 import threading
 import signal
 import daemon
@@ -50,10 +43,6 @@
 #import asterisk.manager
 import manager
 
-INTP_VER = sys.version_info[:2]
-if INTP_VER < (2, 2):
-    raise RuntimeError("Python v.2.2 or later needed")
-
 
 # Daemon Config File
 CONFIG_FILE = '/etc/a2billing.conf'
@@ -72,7 +61,8 @@
 
 def handler(signum, frame):
     logging.debug('Signal handler called with signal %d', signum)
-    logging.debug("At " + str(frame.f_code.co_name) + " in " + str(frame.f_code.co_filename) + " line " + str(frame.f_lineno))
+    logging.debug("At " + str(frame.f_code.co_name) + " in " +
+                  str(frame.f_code.co_filename) + " line " + str(frame.f_lineno))
     shutdown_all.set()
     sys.exit()
 
@@ -149,62 +139,64 @@ def perform(self):
         if (len(request_list) > 0):
             logging.info(request_list)
 
-        prev_id_server_group = -1
-        id_server_group = None
         for current_request in request_list:
-
-            #print current_request.id,' : ',current_request.channel,' : ',current_request.context,' : ',current_request.exten,' : ',current_request.priority,' : '
             try:
                 get_Server_Manager = self.inst_cb_db.find_server_manager_roundrobin(current_request.id_server_group)
-                #print get_Server_Manager.id,' : ',get_Server_Manager.id_group, ' :  ',get_Server_Manager.server_ip, ' : ',get_Server_Manager.manager_username
+                # print "%s;%s;%s;%s" % (get_Server_Manager.id, get_Server_Manager.id_group,
+                #     get_Server_Manager.server_ip, get_Server_Manager.manager_username)
             except:
-                logging.error("ERROR to find the Server Manager for the Id group : " + str(current_request.id_server_group))
+                logging.error("ERROR to find the Server Manager for the Id group : %s" %
+                              str(current_request.id_server_group))
                 self.inst_cb_db.update_callback_request(current_request.id, 'ERROR')
                 continue
 
             # Connect to Manager
+            logging.debug("We will try to connect to the manager : host=%s, username=%s" %
+                          (get_Server_Manager.manager_host, get_Server_Manager.manager_username))
             try:
-                self.inst_callback_manager.connect(get_Server_Manager.manager_host, get_Server_Manager.manager_username, get_Server_Manager.manager_secret)
+                self.inst_callback_manager.connect(
+                    get_Server_Manager.manager_host,
+                    get_Server_Manager.manager_username,
+                    get_Server_Manager.manager_secret)
             except:
                 # cannot connect to the manager
-                self.inst_cb_db.update_callback_request(
-                            current_request.id,
-                            'ERROR')
+                logging.error("ERROR cannot connect to the manager")
+                self.inst_cb_db.update_callback_request(current_request.id, 'ERROR')
                 continue
 
             current_channel = current_request.channel
 
             # UPDATE Callback Request to "Perform Status"
-            self.inst_cb_db.update_callback_request(
-                        current_request.id,
-                        'PROCESSING')
+            self.inst_cb_db.update_callback_request(current_request.id, 'PROCESSING')
 
             """
-            id ; uniqueid ; entry_time ; status; server_ip ; num_attempt ; last_attempt_time ; manager_result ; agi_result ; callback_time ; channel ; exten
-            context ; priority ; application ; data ; timeout ; callerid ; variable ; account ; async ; actionid ; id_server ;  id_server_group
+            id ; uniqueid ; entry_time ; status; server_ip ; num_attempt ; last_attempt_time ;
+            manager_result ; agi_result ; callback_time ; channel ; exten
+            context ; priority ; application ; data ; timeout ; callerid ; variable ; account ;
+            async ; actionid ; id_server ;  id_server_group
             """
             self.num_placed = self.num_placed + 1
 
             # Initiate call
-            logging.info("try_originate : " + current_request.channel + " : " + current_request.exten + " : " + current_request.context)
+            logging.info("try_originate : " + current_request.channel + " : " +
+                         current_request.exten + " : " + current_request.context)
             try:
                 res_orig = self.inst_callback_manager.try_originate(
-                                                current_channel,
-                                                current_request.exten,
-                                                current_request.context,
-                                                current_request.priority,
-                                                current_request.timeout,
-                                                current_request.callerid,
-                                                False,
-                                                current_request.account,
-                                                current_request.application,
-                                                current_request.data,
-                                                current_request.variable)
+                    current_channel,
+                    current_request.exten,
+                    current_request.context,
+                    current_request.priority,
+                    current_request.timeout,
+                    current_request.callerid,
+                    False,
+                    current_request.account,
+                    current_request.application,
+                    current_request.data,
+                    current_request.variable)
             except:
                 # cannot connect to the manager
-                self.inst_cb_db.update_callback_request(
-                            current_request.id,
-                            'ERROR')
+                logging.error("Error connecting to the manager 2: %s" % reason)
+                self.inst_cb_db.update_callback_request(current_request.id, 'ERROR')
                 continue
 
             str_manager_res = str(res_orig)
@@ -213,19 +205,20 @@ def perform(self):
             if (str_manager_res.find('Success') == -1):
                 # Callback Failed
                 self.inst_cb_db.update_callback_request_server(
-                            current_request.id,
-                            'ERROR',
-                            get_Server_Manager.id,
-                            str_manager_res)
+                    current_request.id,
+                    'ERROR',
+                    get_Server_Manager.id,
+                    str_manager_res)
             else:
                 # Callback Successful
                 self.inst_cb_db.update_callback_request_server(
-                            current_request.id,
-                            'SENT',
-                            get_Server_Manager.id,
-                            str_manager_res)
+                    current_request.id,
+                    'SENT',
+                    get_Server_Manager.id,
+                    str_manager_res)
 
-            logging.info("[" + time.strftime("%Y/%m/%d %H:%M:%S", time.localtime()) + "] Placed " + str(self.num_placed) + " calls")
+            logging.info("[" + time.strftime("%Y/%m/%d %H:%M:%S", time.localtime()) + "] Placed " +
+                         str(self.num_placed) + " calls")
 
             """
             self.inst_cb_db.update_callback_request(
@@ -243,11 +236,11 @@ class callback_manager(object):
 
     def connect(self, host, login, password):
         if (self._manager_host != host or
-            self._manager_login != login or
-            self._manager_passw != password or
-            self._manager == None):
+           self._manager_login != login or
+           self._manager_passw != password or
+           self._manager is None):
             # we have different manager parameter so let s connect
-            if self._manager != None:
+            if self._manager is not None:
                 self.disconnect()
             self._manager_host = host
             self._manager_login = login
@@ -276,20 +269,22 @@ def try_connect(self):
 
         return True
 
-    def try_originate(self, channel = None, exten = None, context = None, priority = None, timeout = None, caller_id = None, async = True, account = None, application = None, data = None, variables = None, actionid = None):
+    def try_originate(self, channel=None, exten=None, context=None, priority=None, timeout=None,
+                      caller_id=None, async=True, account=None, application=None, data=None,
+                      variables=None, actionid=None):
         response = self._manager.originate(
-                    channel,
-                    exten,
-                    context,
-                    priority,
-                    timeout,
-                    caller_id,
-                    async,
-                    account,
-                    application,
-                    data,
-                    variables,
-                    actionid)
+            channel,
+            exten,
+            context,
+            priority,
+            timeout,
+            caller_id,
+            async,
+            account,
+            application,
+            data,
+            variables,
+            actionid)
         return response
 
     def disconnect(self):
@@ -297,38 +292,10 @@ def disconnect(self):
         self._manager = None
 
 
-# ------------------------------ FUNCTION MAIN  ------------------------------
-
 def main():
     CallBackDaemon().main()
 
 
-# ------------------------------ COMMON FUNCTION ------------------------------
-
-def IsInt(str):
-    """ Is the given string an integer?    """
-    ok = 1
-    try:
-        int(str)
-    except ValueError:
-        ok = 0
-    except TypeError:
-        ok = 0
-    return ok
-
-
-def readToEnd(manager, message, END_SIGNAL='--END COMMAND--'):
-    """Read until the end of the current command"""
-    result = []
-    while manager._running.isSet():
-        current = message.data
-        if current.strip() == END_SIGNAL:
-            return result
-        else:
-            result.append(current.rstrip('\n'))
-        message = manager._response_queue.get()
-
-
 # ------------------------------ MAIN ------------------------------
 if __name__ == '__main__':
     CallBackDaemon().main()
diff --git a/CallBack/callback-daemon-py/callback_daemon/database.py b/CallBack/callback-daemon-py/callback_daemon/database.py
index 7cde2d872..806090d2b 100755
--- a/CallBack/callback-daemon-py/callback_daemon/database.py
+++ b/CallBack/callback-daemon-py/callback_daemon/database.py
@@ -32,29 +32,13 @@
     module to connect to Postgresql & Mysql Database and manipulate database information .
 
 '''
-
-__author__ = "Belaid Arezqui (areski@gmail.com)"
-__copyright__ = "Copyright (C) Belaid Arezqui"
-
-__revision__ = "$Id$"
-__version__ = "1.00"
-
-
-
-# ------------------------------ IMPORT ------------------------------
-import sys
-INTP_VER = sys.version_info[:2]
-if INTP_VER < (2, 2):
-    raise RuntimeError("Python v.2.2 or later needed")
-
 import ConfigParser
 
 from sqlalchemy import *
 from sqlalchemy import orm
 from sqlalchemy.orm import sessionmaker
-import datetime, time
+import datetime
 
-# ------------------------------ CLASS ------------------------------
 
 class SQLError(Exception):
     ''' Error exception class '''
@@ -65,9 +49,13 @@ def __init__(self, value):
     def __str__(self):
         return repr(self.value)
 
-class ConnectionError(Exception): pass
 
-class SQlRow_Empty(Exception): pass
+class ConnectionError(Exception):
+    pass
+
+
+class SQlRow_Empty(Exception):
+    pass
 
 
 # Class for the ORM
@@ -121,18 +109,16 @@ def read_basic_config(self):
         self.dbpasswd = cp.get(self.section, 'password')
         self.dbtype = cp.get(self.section, 'dbtype')
 
-
-    def status_on (self, status):
-        if (status.lower()=='on') :
+    def status_on(self, status):
+        if (status.lower() == 'on'):
             return 'ACTIVE'
         else:
             return 'INACTIVE'
 
-
-    def db_connect (self):
-
-        if (len(self.dbpasswd) > 0) :
-            connection_string = self.dbtype + "://" + self.dbuser + ":" + self.dbpasswd + "@" + self.dbhost + "/" + self.dbname
+    def db_connect(self):
+        if (len(self.dbpasswd) > 0):
+            connection_string = self.dbtype + "://" + self.dbuser + ":" + \
+                self.dbpasswd + "@" + self.dbhost + "/" + self.dbname
         else:
             connection_string = self.dbtype + "://" + self.dbuser + "@" + self.dbhost + "/" + self.dbname
 
@@ -163,52 +149,51 @@ def db_connect (self):
             #print "connection error to " + connection_string
             raise ConnectionError(error_message)
 
-
-    def db_close (self):
+    def db_close(self):
         try:
             self.session.flush()
         except Exception, error_message:
             raise SQLError(error_message)
 
-
     def count_callback_spool(self):
-        return self.CallBack_Spool_q.filter((self.cc_callback_spool.c.status=='PENDING')).count()
-
+        return self.CallBack_Spool_q.filter((self.cc_callback_spool.c.status == 'PENDING')).count()
 
     def find_server_manager(self, c_id_group):
 
         get_Server_Manager = self.Server_Manager_q.filter(
-                                 (self.cc_server_manager.c.id_group==c_id_group)
-                                 ).all()
+            (self.cc_server_manager.c.id_group == c_id_group)
+        ).all()
         return get_Server_Manager
 
-
     def find_server_manager_roundrobin(self, c_id_group):
-
-        nball_Server_Manager = self.Server_Manager_q.filter(
-                                 (self.cc_server_manager.c.id_group==c_id_group)
-                                 ).count()
-        if (nball_Server_Manager == 0):
-            raise SQlRow_Empty("No Server_Manager has been found for this idgroup : "+ str(c_id_group))
-
-        nb_sel_Server_Manager = (self.count_server_manager % nball_Server_Manager) + 1
-        selected_Server_Manager = self.Server_Manager_q.get(nb_sel_Server_Manager)
+        cnt_servermanager = self.Server_Manager_q.filter(
+            (self.cc_server_manager.c.id_group == c_id_group)
+        ).count()
+        if not cnt_servermanager:
+            raise SQlRow_Empty("No Server_Manager has been found for this idgroup : " + str(c_id_group))
+
+        list_servermanager = self.Server_Manager_q.filter(
+            (self.cc_server_manager.c.id_group == c_id_group)
+        ).all()
+        select_servermanager = (self.count_server_manager % cnt_servermanager) + 1
+        #selected_Server_Manager = self.Server_Manager_q.get(select_servermanager)
+        selected_Server_Manager = list_servermanager[select_servermanager - 1]
+        # print (selected_Server_Manager)
+        # print (dir(selected_Server_Manager))
+        # print (selected_Server_Manager.server_ip)
         self.count_server_manager = self.count_server_manager + 1
 
         return selected_Server_Manager
 
-
-    def find_callback_request(self, c_status = 'PENDING', c_hours = 24):
-
+    def find_callback_request(self, c_status='PENDING', c_hours=24):
         get_CallBack_Spool = self.CallBack_Spool_q.filter(
-                                 (self.cc_callback_spool.c.status==c_status) &
-                                 (self.cc_callback_spool.c.entry_time > datetime.datetime.now() - datetime.timedelta(hours=c_hours)) &
-                                 ((self.cc_callback_spool.c.callback_time==None) | (self.cc_callback_spool.c.callback_time < datetime.datetime.now()))
-                                 ).all()
+            (self.cc_callback_spool.c.status == c_status) &
+            (self.cc_callback_spool.c.entry_time > datetime.datetime.now() - datetime.timedelta(hours=c_hours)) &
+            ((self.cc_callback_spool.c.callback_time == None) | (self.cc_callback_spool.c. callback_time < datetime.datetime.now()))
+        ).all()
         return get_CallBack_Spool
 
-
-    def update_callback_request (self, c_id, c_status):
+    def update_callback_request(self, c_id, c_status):
         try:
             get_CallBack_Spool = self.CallBack_Spool_q.filter((self.cc_callback_spool.c.id == c_id)).one()
             get_CallBack_Spool.status = c_status
@@ -217,8 +202,7 @@ def update_callback_request (self, c_id, c_status):
             #print "--- nothing to update ---"
             pass
 
-
-    def update_callback_request_server (self, c_id, c_status, c_id_server, c_manager_result):
+    def update_callback_request_server(self, c_id, c_status, c_id_server, c_manager_result):
         try:
             get_CallBack_Spool = self.CallBack_Spool_q.filter((self.cc_callback_spool.c.id == c_id)).one()
             get_CallBack_Spool.status = c_status
@@ -236,7 +220,6 @@ def update_callback_request_server (self, c_id, c_status, c_id_server, c_manager
 
 if __name__ == "__main__":
 
-    """
     print "\n\n"
     inst_cb_db = callback_database()
     print inst_cb_db.count_callback_spool()
@@ -244,25 +227,20 @@ def update_callback_request_server (self, c_id, c_status, c_id_server, c_manager
     print
     get_CallBack_Spool = inst_cb_db.find_callback_request('SENT', 121212)
     for p in get_CallBack_Spool[0:5]:
-        print p.id,' ===========>>> >>> ',p.uniqueid, '>> ',p.status, '>> ',p.num_attempt, ' ::>> ',p.id_server, ' ::>> ',p.manager_result
-
-
+        print "%d ==> %s, %s, %d, %d, %s" % (p.id, p.uniqueid, p.status, p.num_attempt, p.id_server, p.manager_result)
 
-    inst_cb_db.update_callback_request (5, 'SENT')
-    inst_cb_db.update_callback_request (5, 'SENT')
+    inst_cb_db.update_callback_request(5, 'SENT')
+    inst_cb_db.update_callback_request_server(5, 'SENT', 77, 'this is a test')
 
-    inst_cb_db.update_callback_request_server (5, 'SENT', 77, 'rhaaaaaaaa')
-
-    print
+    print ""
     get_Server_Manager = inst_cb_db.find_server_manager(1)
     for p in get_Server_Manager[0:5]:
-        print p.id,' ===========>>> >>> ',p.id_group, '>> ',p.server_ip, '>> ',p.manager_username
-
+        print "%d ==> %d, %d, %s" % (p.id, p.id_group, p.server_ip, p.manager_username)
 
     try:
-        get_Server_Manager = inst_cb_db.find_server_manager_roundrobin(11)
-        print get_Server_Manager.id,' ===========>>> >>> ',get_Server_Manager.id_group, '>> ',get_Server_Manager.server_ip, '>> ',get_Server_Manager.manager_username
+        server_manager = inst_cb_db.find_server_manager_roundrobin(11)
+        print ("%d ==> %d, %d, %s" %
+            (server_manager.id, server_manager.id_group, server_manager.server_ip, server_manager.manager_username))
     except:
         print "--- no manager ---"
         pass
-    """
diff --git a/CallBack/callback-daemon-py/callback_daemon/manager.py b/CallBack/callback-daemon-py/callback_daemon/manager.py
index 21f2c86bc..491136980 100644
--- a/CallBack/callback-daemon-py/callback_daemon/manager.py
+++ b/CallBack/callback-daemon-py/callback_daemon/manager.py
@@ -52,7 +52,8 @@ def handle_event(event, manager):
 and submit patches.
 """
 
-import sys,os
+import sys
+import os
 import socket
 import threading
 import Queue
@@ -94,7 +95,7 @@ def parse(self, response):
 
             # locate the ':' in our message, if there is one
             if line.find(':') > -1:
-                item = [x.strip() for x in line.split(':',1)]
+                item = [x.strip() for x in line.split(':', 1)]
 
                 # if this is a header
                 if len(item) == 2:
@@ -239,12 +240,12 @@ def send_action(self, cdict={}, **kwargs):
         # generate the command
         for key, value in cdict.items():
             if isinstance(value, list):
-               for item in value:
-                  item = tuple([key, item])
-                  clist.append('%s: %s' % item)
+                for item in value:
+                    item = tuple([key, item])
+                    clist.append('%s: %s' % item)
             else:
-               item = tuple([key, value])
-               clist.append('%s: %s' % item)
+                item = tuple([key, value])
+                clist.append('%s: %s' % item)
         clist.append(EOL)
         command = EOL.join(clist)
 
@@ -254,7 +255,7 @@ def send_action(self, cdict={}, **kwargs):
         except socket.error, (errno, reason):
             raise ManagerSocketException(errno, reason)
 
-        self._reswaiting.insert(0,1)
+        self._reswaiting.insert(0, 1)
         response = self._response_queue.get()
         self._reswaiting.pop(0)
 
@@ -297,12 +298,14 @@ def _receive_data(self):
 
                         # if we are no longer connected we probably did not
                         # recieve a full message, don't try to handle it
-                        if not self._connected.isSet(): break
+                        if not self._connected.isSet():
+                            break
 
                         # make sure our line is a string
                         assert type(line) in StringTypes
 
-                        lines.append(line) # add the line to our message
+                        # add the line to our message
+                        lines.append(line)
 
                         # if the line is our EOL marker we have a complete message
                         if line == EOL:
@@ -310,8 +313,10 @@ def _receive_data(self):
 
                         # check to see if this is the greeting line
                         if line.find('/') >= 0 and line.find(':') < 0:
-                            self.title = line.split('/')[0].strip() # store the title of the manager we are connecting to
-                            self.version = line.split('/')[1].strip() # store the version of the manager we are connecting to
+                            # store the title of the manager we are connecting to
+                            self.title = line.split('/')[0].strip()
+                            # store the version of the manager we are connecting to
+                            self.version = line.split('/')[1].strip()
                             break
 
                         #sleep(.001)  # waste some time before reading another line
@@ -391,7 +396,6 @@ def message_loop(self):
             # wait for our data receiving thread to exit
             t.join()
 
-
     def event_dispatch(self):
         """This thread is responsible fore dispatching events"""
 
@@ -412,8 +416,8 @@ def event_dispatch(self):
 
             # now execute the functions
             for callback in callbacks:
-               if callback(ev, self):
-                  break
+                if callback(ev, self):
+                    break
 
     def connect(self, host, port=5038):
         """Connect to the manager interface"""
@@ -429,7 +433,7 @@ def connect(self, host, port=5038):
         # create our socket and connect
         try:
             self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            self._sock.connect((host,port))
+            self._sock.connect((host, port))
         except socket.error, (errno, reason):
             raise ManagerSocketException(errno, reason)
 
@@ -467,30 +471,29 @@ def close(self):
 
         self._running.clear()
 
-
     def login(self, username, secret):
         """Login to the manager, throws ManagerAuthException when login fails"""
 
-        cdict = {'Action':'Login'}
+        cdict = {'Action': 'Login'}
         cdict['Username'] = username
         cdict['Secret'] = secret
         response = self.send_action(cdict)
 
         if response.get_header('Response') == 'Error':
-           raise ManagerAuthException(response.get_header('Message'))
+            raise ManagerAuthException(response.get_header('Message'))
 
         return response
 
     def ping(self):
         """Send a ping action to the manager"""
-        cdict = {'Action':'Ping'}
+        cdict = {'Action': 'Ping'}
         response = self.send_action(cdict)
         return response
 
     def logoff(self):
         """Logoff from the manager"""
 
-        cdict = {'Action':'Logoff'}
+        cdict = {'Action': 'Logoff'}
         response = self.send_action(cdict)
 
         # Clear connection
@@ -502,16 +505,16 @@ def logoff(self):
     def hangup(self, channel):
         """Hanup the specfied channel"""
 
-        cdict = {'Action':'Hangup'}
+        cdict = {'Action': 'Hangup'}
         cdict['Channel'] = channel
         response = self.send_action(cdict)
 
         return response
 
-    def status(self, channel = ''):
+    def status(self, channel=''):
         """Get a status message from asterisk"""
 
-        cdict = {'Action':'Status'}
+        cdict = {'Action': 'Status'}
         cdict['Channel'] = channel
         response = self.send_action(cdict)
 
@@ -520,12 +523,14 @@ def status(self, channel = ''):
     def redirect(self, channel, exten, priority='1', extra_channel='', context=''):
         """Redirect a channel"""
 
-        cdict = {'Action':'Redirect'}
+        cdict = {'Action': 'Redirect'}
         cdict['Channel'] = channel
         cdict['Exten'] = exten
         cdict['Priority'] = priority
-        if context:   cdict['Context']  = context
-        if extra_channel: cdict['ExtraChannel'] = extra_channel
+        if context:
+            cdict['Context'] = context
+        if extra_channel:
+            cdict['ExtraChannel'] = extra_channel
         response = self.send_action(cdict)
 
         return response
@@ -533,23 +538,33 @@ def redirect(self, channel, exten, priority='1', extra_channel='', context=''):
     def originate(self, channel, exten, context='', priority='', timeout='', caller_id='', async=False, account='', application='', data='', variables={}, ActionID=''):
         """Originate a call"""
 
-        cdict = {'Action':'Originate'}
+        cdict = {'Action': 'Originate'}
         cdict['Channel'] = channel
         cdict['Exten'] = exten
-        if context:   cdict['Context']  = context
-        if priority:  cdict['Priority'] = priority
-        if timeout:   cdict['Timeout']  = timeout
-        if caller_id: cdict['CallerID'] = caller_id
-        if async:     cdict['Async']    = 'yes'
-        if account:   cdict['Account']  = account
-        if application: cdict['Application']  = application
-        if data:        cdict['Data'] = data
-        if ActionID:        cdict['ActionID'] = ActionID
+        if context:
+            cdict['Context'] = context
+        if priority:
+            cdict['Priority'] = priority
+        if timeout:
+            cdict['Timeout'] = timeout
+        if caller_id:
+            cdict['CallerID'] = caller_id
+        if async:
+            cdict['Async'] = 'yes'
+        if account:
+            cdict['Account'] = account
+        if application:
+            cdict['Application'] = application
+        if data:
+            cdict['Data'] = data
+        if ActionID:
+            cdict['ActionID'] = ActionID
         # join dict of vairables together in a string in the form of 'key=val|key=val'
         # with the latest CVS HEAD this is no longer necessary
         # if variables: cdict['Variable'] = '|'.join(['='.join((str(key), str(value))) for key, value in variables.items()])
         #if variables: cdict['Variable'] = ['='.join((str(key), str(value))) for key, value in variables.items()]
-        if variables: cdict['Variable'] = variables
+        if variables:
+            cdict['Variable'] = variables
 
         response = self.send_action(cdict)
 
@@ -558,7 +573,7 @@ def originate(self, channel, exten, context='', priority='', timeout='', caller_
     def mailbox_status(self, mailbox):
         """Get the status of the specfied mailbox"""
 
-        cdict = {'Action':'MailboxStatus'}
+        cdict = {'Action': 'MailboxStatus'}
         cdict['Mailbox'] = mailbox
         response = self.send_action(cdict)
 
@@ -567,7 +582,7 @@ def mailbox_status(self, mailbox):
     def command(self, command):
         """Execute a command"""
 
-        cdict = {'Action':'Command'}
+        cdict = {'Action': 'Command'}
         cdict['Command'] = command
         response = self.send_action(cdict)
 
@@ -576,7 +591,7 @@ def command(self, command):
     def extension_state(self, exten, context):
         """Get the state of an extension"""
 
-        cdict = {'Action':'ExtensionState'}
+        cdict = {'Action': 'ExtensionState'}
         cdict['Exten'] = exten
         cdict['Context'] = context
         response = self.send_action(cdict)
@@ -586,7 +601,7 @@ def extension_state(self, exten, context):
     def absolute_timeout(self, channel, timeout):
         """Set an absolute timeout on a channel"""
 
-        cdict = {'Action':'AbsoluteTimeout'}
+        cdict = {'Action': 'AbsoluteTimeout'}
         cdict['Channel'] = channel
         cdict['Timeout'] = timeout
         response = self.send_action(cdict)
@@ -594,13 +609,20 @@ def absolute_timeout(self, channel, timeout):
         return response
 
     def mailbox_count(self, mailbox):
-        cdict = {'Action':'MailboxCount'}
+        cdict = {'Action': 'MailboxCount'}
         cdict['Mailbox'] = mailbox
         response = self.send_action(cdict)
 
         return response
 
-class ManagerException(Exception): pass
-class ManagerSocketException(ManagerException): pass
-class ManagerAuthException(ManagerException): pass
 
+class ManagerException(Exception):
+    pass
+
+
+class ManagerSocketException(ManagerException):
+    pass
+
+
+class ManagerAuthException(ManagerException):
+    pass
diff --git a/CallBack/callback-daemon-py/setup.py b/CallBack/callback-daemon-py/setup.py
index c97bd53d8..8e1e50aaf 100644
--- a/CallBack/callback-daemon-py/setup.py
+++ b/CallBack/callback-daemon-py/setup.py
@@ -1,25 +1,59 @@
+# This file is part of A2Billing (http://www.a2billing.net/)
+#
+# A2Billing, Commercial Open Source Telecom Billing platform,
+# powered by Star2billing S.L. <http://www.star2billing.com/>
+#
+# @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
+# @author      Belaid Arezqui <areski@gmail.com>
+# @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
+# @package     A2Billing
+#
+# Software License Agreement (GNU Affero General Public License)
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Daemon to proceed Call-Back request from the a2billing plaftorm
+#
+
 from setuptools import setup, find_packages
 
 setup(
-    name = "callback_daemon",
-    version = "1.0",
-    packages = ['callback_daemon'],
-
-    package_data = {
+    name="callback_daemon",
+    version="1.1",
+    packages=['callback_daemon'],
+    package_data={
         '': ['*.txt', '*.conf', '*.debian', '*.rc']
     },
-
-    entry_points = {
+    entry_points={
         'console_scripts': [
-            'a2b_callback_daemon = callback_daemon.a2b_callback_daemon:main'
+            'a2b_callback_daemon=callback_daemon.a2b_callback_daemon:main'
         ]
     },
-
-    # metadata
-    author = "Belaid Arezqui",
-    author_email = "areski@gmail.com",
-    description = "This Package provide a callback daemon for a2billing",
-    license = "GPL",
-    keywords = "callback a2billing daemon",
-    url = "http://www.asterisk2billing.org/"
+    author="Belaid Arezqui",
+    author_email="areski@gmail.com",
+    description="This Package provide a callback daemon for a2billing",
+    license="AGPLv3+",
+    keywords="callback a2billing daemon",
+    url="http://www.asterisk2billing.org/",
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Intended Audience :: Developers, Users',
+        'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Software Development'
+    ],
 )
diff --git a/Checker/checker.init.d.sh b/Checker/checker.init.d.sh
new file mode 100644
index 000000000..3d9b3816b
--- /dev/null
+++ b/Checker/checker.init.d.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+#
+# Startup script for A2Billing checker
+#
+# author: Roman Davydov <openvoip.co@gmail.com>
+#
+# chkconfig: 345 150 20
+# description: A2Billing checker.
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+DAEMON=/path/to/checker.php
+PIDFILE=/var/run/checker.php
+PROG=checker
+RETVAL=0
+
+start() {
+	echo -n $"Starting $PROG: "
+	daemon --pidfile $PIDFILE php $DAEMON -p $PIDFILE
+	RETVAL=$?
+	echo
+	return $RETVAL
+}
+
+stop() {
+	echo -n $"Stopping $PROG: "
+	killproc -p $PIDFILE
+	RETVAL=$?
+	echo
+	return $RETVAL
+}
+
+
+# See how we were called.
+case "$1" in
+	start|debug)
+		start
+		;;
+	stop)
+		stop
+		;;
+	restart)
+		stop
+		start
+		;;
+	*)
+		echo $"Usage: $PROG {start|stop|restart}"
+		exit 1
+esac
+
+exit $RETVAL
diff --git a/Checker/checker.php b/Checker/checker.php
new file mode 100644
index 000000000..c78971aab
--- /dev/null
+++ b/Checker/checker.php
@@ -0,0 +1,555 @@
+<?php
+
+/**
+ * A2Billing checker.
+ * 
+ * Checks the following:
+ * 1. "inuse" field data for trunks with real value from Asterisk realtime channels
+ * 2. if "minutes_per_day" is reached by trunk - hangups channel
+ * 3. if account type is "prepaid" and credit is <= 0 - hangups channel (works only for directly registered devices on A2B)
+ * 
+ * How to use:
+ * 1. To run in foreground - execute "php checker.php -nf"
+ * 2. To see help - execute "php checker.php -h"
+ * 3. To run as daemon - use script "checker.init.d.sh" from the same folder,
+ *    copy it to /etc/init.d/checker, give 755 rights and change the daemon path in the header, 
+ *    then run as "/etc/init.d/checker start"
+ * 4. IMPORTANT: each trunk is determined by providertech/providerip - keep it unique!
+ * 
+ * @author Roman Davydov <openvoip.co@gmail.com>
+ * @license http://openvoip.co Free (just keep reference to my name and my site)
+ * 
+ */
+
+require_once('phpagi-asmanager.php');
+declare(ticks = 1);
+
+function _asm_event_handler($ecode, $data, $server, $port) {
+    if (is_object($checker = Checker::getInstance()))
+        $checker->asmHandleEvent($ecode, $data, $server, $port);
+}
+
+class Checker {
+
+    private static
+        $instance = null,
+        $daemon = false,
+        $pidfile = '',
+        $master_pid = 0,
+        $logfile = 'checker.log',
+        $action_prefix = 'checker_';
+    
+    private
+        $childs = array(),
+        $worker = null,
+        $stop = false,
+        $params = array(),
+        $mysqli = null,
+        $asm = null;
+   
+    public static function getInstance($argv = null) {
+        if (!self::$instance) {
+            self::$instance = new self($argv);
+            
+            // check args
+            if (!is_array($argv) || count($argv) == 0)
+                $argv = array(__FILE__);
+            $script = basename($argv[0]);
+        
+            // show help
+            if (in_array('-h', $argv)) {
+
+                echo "Usage: $script [OPTIONS]
+------------------------------------------------
+OPTIONS:
+-p   Enable PID file (only one running process)
+-nf  No fork
+-h   Show this help
+
+";
+                exit(0);
+            }
+            
+            if (in_array('-nf', $argv)) {
+
+                ini_set('error_reporting', E_ALL);
+                
+                self::$master_pid = getmypid();
+                self::log('No fork mode', LOG_INFO);
+                
+            } else {
+            
+                $pid = pcntl_fork();
+                if ($pid == -1) {
+                    self::log('Could not fork!', LOG_ERR);
+                    exit(1);
+                } else if ($pid) {
+                    // we are the parent
+                    exit(0);
+                } else {
+                    // we are daemon
+                    ini_set('error_log', '/var/log/' . self::$logfile);
+                    ini_set('error_reporting', E_ERROR);
+
+                    self::$daemon = true;
+                    self::$master_pid = getmypid();
+                    
+                    // check pid
+                    if (in_array('-p', $argv)) {
+                        self::log("Checking PID");
+                        self::$pidfile = "/var/run/$script";
+                        if (is_file(self::$pidfile)) {
+                            $pid = file_get_contents(self::$pidfile);
+                            $prog = trim(shell_exec("ps --pid $pid -o comm="));
+                            if (strlen($prog) > 0) {
+                                self::log("Old instance is still running!", LOG_ERR);
+                                self::$pidfile = null;
+                                exit(10);
+                            }
+                        }
+                        
+                        // update pid file
+                        $pid = self::$master_pid;
+                        file_put_contents(self::$pidfile, $pid);
+                    }
+                }
+            }
+        }
+        
+        return self::$instance;
+    }
+    
+    private function __construct() {
+    
+        // load settings
+        $config = '/etc/a2billing.conf';
+        if (file_exists($config))
+            $this->params = parse_ini_file($config, true);
+        
+    }
+    
+    public function __destruct() {
+        
+        if (!$this->worker) { // master ending
+
+            if (count($this->childs) > 0) {
+            
+                self::log("Destroying master...");
+                foreach ($this->childs as $pid => $id) {
+                    if (posix_kill($pid, SIGTERM)) {
+                        $res = pcntl_waitpid($pid, $status, WNOHANG | WUNTRACED);
+                        if ($res == -1) {
+                            self::log("Something happened with worker, pid = $pid", LOG_ERR);
+                        } else if (!pcntl_wifstopped($status)) {
+                            self::log("Child is agile, killing with 9", LOG_INFO);
+                            posix_kill($pid, 9);
+                        }
+                    } else {
+                        self::log("Cannot kill worker, pid = $pid", LOG_ERR);
+                    }
+                }
+                
+            } // else - it is just daemon parent
+
+            if (self::$daemon) {
+                # removes PID if exists
+                if (is_file(self::$pidfile)) {
+                    self::log("Removing PID file");
+                    unlink(self::$pidfile);
+                }
+            }
+            
+        } else {
+        
+            $pid = self::$master_pid;
+            self::log("$pid Destroying worker '$this->worker' ...");
+            
+            // signalling to parent
+            $res = posix_kill($pid, SIGCHLD);
+            
+        }
+        
+    }
+    
+    // signal handler function
+    public function sig_handler($signo) {
+        switch ($signo) {
+            case SIGTERM:
+            case SIGHUP:
+                self::log("Term signal recieved, ending...");
+                $this->stop = true;
+                break;
+            case SIGUSR1:
+                break;
+            case SIGCHLD:
+                self::log("Child term signal recieved, ending...");
+                $this->stop = true;
+                break;
+            default:
+                // handle all other signals
+        }
+    }    
+    
+    private function createWorker($id = '') {
+        // run another child for schedule managing
+        $pid = pcntl_fork();
+        if ($pid == -1) {
+            self::log("Cannot create worker!", LOG_ERR);
+            return false;
+        } else if ($pid) {
+            // we are the parent
+            $this->childs[$pid] = $id;
+        } else {
+            // we are worker
+            $this->worker = $id;
+            $func = array($this, 'initWorker'.$id);
+            if (is_callable($func)) {
+                $result = call_user_func($func);
+                if ($result) {
+                    $func = array($this, 'runWorker'.$id);
+                    if (is_callable($func)) {
+                        // run worker task
+                        self::log("Running worker '$id'");
+                        exit(call_user_func($func));
+                    }
+                    self::log("Cannot run worker '$id' !", LOG_ERR);
+                    exit(50);
+                }
+            }
+            self::log("Cannot initiate worker '$id' !", LOG_ERR);
+            exit(50);
+        }
+        return true;
+    }
+    
+    private function initDb() {
+        // connecting to DB
+        if (strcasecmp($this->getParam('database.dbtype', ''), 'mysql') != 0) {
+            self::log('Supports only mysql database', LOG_ERR);
+            return false;
+        }
+        $host = $this->getParam('database.hostname', '127.0.0.1');
+        $user = $this->getParam('database.user', 'root');
+        $pass = $this->getParam('database.password', '');
+        $db = $this->getParam('database.dbname', 'a2billing');
+        $mysqli = new mysqli($host, $user, $pass, $db);
+        if ($mysqli->connect_error) {
+            self::log('Mysql connection error (' . $mysqli->connect_errno . ') ' . $mysqli->connect_error, LOG_ERR);
+            return false;
+        }
+        $this->mysqli = $mysqli;
+        $this->mysqli->set_charset("utf8");
+        return true;
+    }
+
+    private function initAsm() {
+        // connecting to Asterisk
+        $this->asm = new AGI_AsteriskManager();
+        $this->asm->pagi = &$this;
+        if ($this->asm->connect(
+            $this->getConfig('manager_host', '127.0.0.1'),
+            $this->getConfig('manager_username', 'manager'),
+            $this->getConfig('manager_secret', '')))  {
+
+            $this->asm->Events('on');
+            $this->asm->add_event_handler('*', '_asm_event_handler');
+        } else {
+            self::log('Asterisk connection error!', LOG_ERR);
+            return false;
+        }
+        return true;
+    }
+    
+    function conlog($str, $vbl = 1) {
+        if (!self::$daemon)
+            $this->log($str);
+    }
+
+    private function initWorkerEventHandler() {
+        return $this->initDb() && $this->initAsm();
+    }
+    
+    protected $channels = array();
+    private function runWorkerEventHandler() {
+
+        // life cycle
+        while (!$this->stop) {
+            if (!$this->pingResources())
+                break;
+
+            // send initial request
+            $this->sendStatusRequest();
+            
+            // handle responses
+            $this->asm->wait_response(true);
+        }
+        
+    }
+    
+    private function asmEventEventHandler($ecode, $data, $server, $port) {
+        
+        if ($ecode == 'status') {
+            
+            $this->channels[] = $data;
+            
+        } else if ($ecode == 'statuscomplete') {
+            
+            // do check
+            $this->doCheck();
+            
+            // sleep to prevent event flooding
+            sleep(1);
+            
+            // send next request
+            $this->sendStatusRequest();
+            
+        }
+        
+    }
+    
+    private function sendStatusRequest() {
+        $data = $this->asm->send_request('Status', array('ActionID' => $this->generateId(time())));
+    }
+
+    private function doCheck() {
+        if (count($this->channels) == 0)
+            return;
+            
+        //print_r($this->channels);
+
+        // list of channels to hangup
+        $hangup = array();
+
+        // prepare channels
+        $channels = array();
+        foreach ($this->channels as $channel) {            
+            // check bridged channel
+            if (isset($channel['BridgedChannel']) && preg_match("/^(.+\/.+)\-.*$/", $channel['BridgedChannel'], $matches)) {
+                $channel_id = strtolower($matches[1]);
+                if (!isset($channels[$channel_id])) {
+                    $channels[$channel_id] = array(
+                        'seconds' => 0,
+                        'channels' => array()
+                    );
+                }
+                $billsec = $this->asm->GetVar($channel['BridgedChannel'], "CDR(billsec)");
+                $channels[$channel_id]['seconds'] += is_array($billsec) && isset($billsec['Value']) ? intval($billsec['Value']) : 0;
+                $channels[$channel_id]['channels'][$channel['BridgedChannel']] = isset($channel['Accountcode']) ? $channel['Accountcode'] : '';
+            }
+        }
+        
+        //print_r($channels);
+        
+        // check trunks (minutes_per_day, inuse)
+        $sql = "select * from cc_trunk";
+        $trunks = $this->query($sql);
+        foreach ($trunks as $t) {
+            $id = $t['id_trunk'];
+            $minutes_per_day = intval($t['minutes_per_day']);
+            $inuse = intval($t['inuse']);
+            $channel_id = strtolower($t['providertech'] . '/' . $t['providerip']);
+
+            // check if trunk minutes limit exceeded
+            if ($minutes_per_day > 0 && isset($channels[$channel_id])) {
+                // getting realtime seconds
+                $realtime_seconds = $channels[$channel_id]['seconds'];
+                $sql = "select * from cc_trunk_counter where (id_trunk = '$id') and (calldate = getCurDateByTrunkTZ($id)) and (((seconds + $realtime_seconds) / 60) >= $minutes_per_day) limit 1";
+                $data = $this->query($sql);
+                if (count($data) > 0)
+                    $hangup = array_merge($hangup, array_keys($channels[$channel_id]['channels']));
+            }
+
+            // check inuse except for "Local" trunks
+            $inuse_real = isset($channels[$channel_id]) ? count($channels[$channel_id]['channels']) : 0;
+            if (strcasecmp(trim($t['providertech']), 'local') != 0 && $inuse_real != $inuse) {
+                self::log("Fixing 'inuse' for trunk with ID = $id", LOG_INFO);
+                $sql = "update cc_trunk set inuse = $inuse_real where id_trunk = $id";
+                $this->query($sql);
+            }
+        }
+
+        // check account balances limit (works only for devices registered on A2B)
+        $sql = "select * from cc_card where typepaid = 0 and credit <= 0";
+        $data = $this->query($sql);
+        foreach ($data as $card) {
+            foreach ($channels as $channel_id => $info) {
+                foreach ($info['channels'] as $channel => $accountcode) {
+                    if (strcasecmp($accountcode, $card['username']) == 0)
+                        $hangup[] = $channel;
+                }
+            }
+        }
+
+        // hangup channels
+        $hangup = array_unique($hangup);
+        foreach ($hangup as $channel) {
+            // sending Hangup for the channel
+            self::log("Hanging up channel '$channel'", LOG_INFO);
+            $this->asm->Hangup($channel);
+        }
+
+        // reset channels list
+        $this->channels = array();
+    }
+    
+    public function run() {
+        $result = 0;
+        self::log('Starting...', LOG_INFO);
+
+        // set signal handlers for ALL !
+        pcntl_signal(SIGTERM, array($this, "sig_handler"));
+        pcntl_signal(SIGHUP,  array($this, "sig_handler"));
+        pcntl_signal(SIGUSR1, array($this, "sig_handler"));
+        pcntl_signal(SIGCHLD, array($this, "sig_handler"));
+        
+        // create workers
+        if ($this->createWorker('EventHandler')) {
+
+            // waiting for stop
+            while (!$this->stop)
+                sleep(1);
+                
+        } else {
+            $result = 15;
+        }
+        
+        self::log('Exiting...', LOG_INFO);
+        return $result;
+    }
+    
+    private static function getEventData($event, $key, $default = '') {
+        if (!is_array($event))
+            return $default;
+            
+        $event = array_change_key_case($event);
+        $key = strtolower($key);
+        return isset($event[$key]) ? $event[$key] : $default;
+    }
+    
+    private static function isId($actid) {
+        $result = null;
+        $prefix = self::$action_prefix;
+        if (preg_match("/^$prefix(.+)$/i", $actid, $matches)) {
+            $result = $matches[1];
+        }
+        return $result;
+    }
+    
+    private static function generateId($actid) {
+        return self::$action_prefix . $actid;
+    }
+    
+    private function pingResources() {
+        
+        static $stamp_mysqli = 0;
+        static $stamp_asm = 0;
+        
+        // step # 1 - ping mysql
+        $stamp = time();
+        $ping_interval = 3;
+        if ($this->mysqli !== null && ($stamp - $stamp_mysqli) > $ping_interval) {
+            $stamp_mysqli = $stamp;
+            if (!$this->mysqli->ping()) {
+                self::log("Mysql connection has been lost in '" . $this->worker . "', trying to reconnect...", LOG_ERR);
+                // reconnect
+                $connected = false;
+                while (!$this->stop) {
+                    $connected = $this->initDb();
+                    if ($connected)
+                        break;
+                    sleep(1);
+                }
+                if (!$connected) {
+                    self::log("Cannot establish Mysql connection in '" . $this->worker . "' !", LOG_ERR);
+                    return false;
+                } else {
+                    self::log("Mysql connection reestablished in '" . $this->worker . "' !", LOG_INFO);
+                }
+            }
+        }
+        
+        // step # 2 - ping Asterisk
+        $stamp = time();
+        $ping_interval = 7;
+        if ($this->asm !== null && ($stamp - $stamp_asm) > $ping_interval) {
+            $stamp_asm = $stamp;
+            $result = $this->asm->Ping();
+            if (is_array($result) && isset($result['Ping']) && $result['Ping'] == 'Pong') {
+                // connection OK
+            } else {
+                self::log("AMI connection has been lost in '" . $this->worker . "', trying to reconnect...", LOG_ERR);
+                // reconnect
+                $connected = false;
+                while (!$this->stop) {
+                    $connected = $this->initAsm();
+                    if ($connected)
+                        break;
+                    sleep(1);
+                }
+                if (!$connected) {
+                    self::log("Cannot establish AMI connection in '" . $this->worker . "' !", LOG_ERR);
+                    return false;
+                } else {
+                    self::log("AMI connection reestablished in '" . $this->worker . "' !", LOG_INFO);
+                }
+            }
+        }
+    
+        return true;
+    }
+    
+    public function asmHandleEvent($ecode, $data, $server, $port) {
+        if (!$this->worker) 
+            return;
+        
+        $func = array($this, 'asmEvent'.$this->worker);
+        if (is_callable($func))
+            call_user_func_array($func, array($ecode, $data, $server, $port));
+    }
+    
+    private function getParam($key, $default = null) {
+        $keys = explode('.', $key);
+        if (!is_array($keys))
+            $keys = array($key);
+        
+        // get param
+        $value = $this->params;
+        foreach ($keys as $key) {
+            $value = isset($value[$key]) ? $value[$key] : $default;
+        }
+        
+        return $value;
+    }
+    
+    private function getConfig($key, $default = null, $group = 'global') {
+        if (!$this->mysqli)
+            return $default;
+        
+        $sql = "select * from cc_config where config_group_title = '$group' and config_key = '$key' limit 1";
+        $data = $this->query($sql);
+        
+        return count($data) > 0 ? $data[0]['config_value'] : $default;
+    }
+
+    public static function log($msg, $level = LOG_INFO) {
+        if (self::$daemon)
+            syslog($level, $msg);
+        else
+            error_log(date('r') . ' - ' . $msg);
+    }
+    
+    public function query($sql) {
+        $data = array();
+        if (is_object($result = $this->mysqli->query($sql))) {
+            while ($row = $result->fetch_assoc())
+                $data[] = $row;
+            $result->free();
+        }
+        return $data;
+    }
+    
+}
+
+// run Process
+$checker = Checker::getInstance($argv);
+exit($checker->run());
diff --git a/Checker/cid_randomizer.php b/Checker/cid_randomizer.php
new file mode 100755
index 000000000..ed41f5558
--- /dev/null
+++ b/Checker/cid_randomizer.php
@@ -0,0 +1,106 @@
+#!/usr/bin/php -q
+<?php
+
+/**
+ * CallerID randomizer checker.
+ * It gets CID randomly from file but never repeats CID until ALL CIDs were used.
+ * 
+ * How to use: exten => s,n,AGI(cid_randomizer.php,PATH/TO/FILE/WITH/CIDS[,DISABLE_CACHE]); one CID per line
+ * For example: exten => s,n,AGI(cid_randomizer.php,/tmp/list.txt,1) OR exten => s,n,AGI(cid_randomizer.php,/tmp/list.txt);
+ * 
+ * @author Roman Davydov <openvoip.co@gmail.com>
+ * @license http://openvoip.co Free (just keep reference to my name and my site)
+ * 
+ */
+
+error_reporting(E_ALL ^ E_NOTICE);
+require_once('phpagi.php');
+
+$agi = new AGI();
+$filename = ($argc > 1 ? $argv[1] : '');
+$disable_cache = intval($argc > 2 ? $argv[2] : 0);
+
+if (!file_exists($filename)) {
+    $agi->verbose("CID filename not found");
+    exit;
+}
+
+if ($cid = getNextNumber($filename, $disable_cache)) {
+    if (preg_match("/[xzn]/i", $cid)) {
+        for ($i = 0; $i < strlen($cid); $i++) {
+            switch (strtolower($cid[$i])) {
+                case 'x':
+                    $cid[$i] = rand(0, 9);
+                    break;
+                case 'z':
+                    $cid[$i] = rand(1, 9);
+                    break;
+                case 'n':
+                    $cid[$i] = rand(2, 9);
+                    break;
+            }
+        }
+    }
+    $agi->verbose("New CID: " . $cid);
+    $agi->set_variable('CALLERID(num)', $cid);
+} else {
+    $agi->verbose("New CID is not obtained!");
+}
+
+// go back to the dialplan
+exit;
+
+
+// functions
+
+function getNextNumber($filename, $disable_cache) {
+    // check the cache
+    $cache = array();
+    $modified = filemtime($filename);
+    $cache_filename = '/tmp/' . basename($filename) . '_' . ($modified === false ? '' : date('U', $modified));
+    if (!$disable_cache && file_exists($cache_filename) && is_readable($cache_filename)) {
+        $cache = unserialize(file_get_contents($cache_filename));
+        if (!is_array($cache)) {
+            $cache = array();
+        }
+    }
+    
+    // getting data
+    $data = file_get_contents($filename);
+    $number = null;
+    if (is_string($data) && strlen($data) > 0) {
+        $cids = preg_split("/(\n)|(\r\n)|(\n\r)/m", $data);
+        if (is_array($cids) && count($cids) > 0) {
+            $cids = array_map('trim', $cids);
+            $cids = array_filter($cids);
+            $cids = array_merge(array_unique($cids), array()); // to reassign indexes
+            $cidsn = count($cids);
+            $protection = 0;
+            while ($protection < ($cidsn * 100)) { // protect from infinite loops
+                $tmp_number = $cids[rand(0, $cidsn - 1)];
+                if ($disable_cache) {
+                    $number = $tmp_number;
+                    break;
+                } else {
+                    if (!in_array($tmp_number, $cache)) { // try to search in cache for unique value
+                        $cache[] = $tmp_number;
+                        $number = $tmp_number;
+                        break;
+                    } else if (!count(array_diff($cids, $cache))) { // no more variants, reset cache
+                        $cache = array($tmp_number);
+                        $number = $tmp_number;
+                        break;
+                    }
+                }
+                $protection++;
+            }
+        }
+    }
+    
+    // update cache
+    if (!$disable_cache && $number != null) {
+        file_put_contents($cache_filename, serialize($cache));
+    }
+
+    return $number;
+}
diff --git a/Checker/phpagi-asmanager.php b/Checker/phpagi-asmanager.php
new file mode 100644
index 000000000..111b02a44
--- /dev/null
+++ b/Checker/phpagi-asmanager.php
@@ -0,0 +1,834 @@
+<?php
+ /**
+  * phpagi-asmanager.php : PHP Asterisk Manager functions
+  * Website: http://phpagi.sourceforge.net
+  *
+  * $Id: phpagi-asmanager.php,v 1.10 2005/05/25 18:43:48 pinhole Exp $
+  *
+  * Copyright (c) 2004 - 2010 Matthew Asham <matthew@ochrelabs.com>, David Eder <david@eder.us> and others
+  * All Rights Reserved.
+  *
+  * This software is released under the terms of the GNU Lesser General Public License v2.1
+  *  A copy of which is available from http://www.gnu.org/copyleft/lesser.html
+  * 
+  * We would be happy to list your phpagi based application on the phpagi
+  * website.  Drop me an Email if you'd like us to list your program.
+  *
+  * @package phpAGI
+  * @version 2.0
+  */
+
+
+ /**
+  * Written for PHP 4.3.4, should work with older PHP 4.x versions.  
+  * Please submit bug reports, patches, etc to http://sourceforge.net/projects/phpagi/
+  * Gracias. :)
+  *
+  */
+
+  if(!class_exists('AGI'))
+  {
+    require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'phpagi.php');
+  }
+
+ /**
+  * Asterisk Manager class
+  *
+  * @link http://www.voip-info.org/wiki-Asterisk+config+manager.conf
+  * @link http://www.voip-info.org/wiki-Asterisk+manager+API
+  * @example examples/sip_show_peer.php Get information about a sip peer
+  * @package phpAGI
+  */
+  class AGI_AsteriskManager
+  {
+   /**
+    * Config variables
+    *
+    * @var array
+    * @access public
+    */
+    public $config;
+
+   /**
+    * Socket
+    *
+    * @access public
+    */
+    public $socket = NULL;
+
+   /**
+    * Server we are connected to
+    *
+    * @access public
+    * @var string
+    */
+    public $server;
+
+   /**
+    * Port on the server we are connected to
+    *
+    * @access public
+    * @var integer
+    */
+    public $port;
+
+   /**
+    * Parent AGI
+    *
+    * @access private
+    * @var AGI
+    */
+    public $pagi;
+
+   /**
+    * Event Handlers
+    *
+    * @access private
+    * @var array
+    */
+    private $event_handlers;
+
+    /**
+     * Whether we're successfully logged in
+     *
+     * @access private
+     * @var boolean
+     */
+    private $_logged_in = FALSE;
+    
+   /**
+    * Constructor
+    *
+    * @param string $config is the name of the config file to parse or a parent agi from which to read the config
+    * @param array $optconfig is an array of configuration vars and vals, stuffed into $this->config['asmanager']
+    */
+    function AGI_AsteriskManager($config=NULL, $optconfig=array())
+    {
+      // load config
+      if(!is_null($config) && file_exists($config))
+        $this->config = parse_ini_file($config, true);
+      elseif(file_exists(DEFAULT_PHPAGI_CONFIG))
+        $this->config = parse_ini_file(DEFAULT_PHPAGI_CONFIG, true);
+
+      // If optconfig is specified, stuff vals and vars into 'asmanager' config array.
+      foreach($optconfig as $var=>$val)
+        $this->config['asmanager'][$var] = $val;
+
+      // add default values to config for uninitialized values
+      if(!isset($this->config['asmanager']['server'])) $this->config['asmanager']['server'] = 'localhost';
+      if(!isset($this->config['asmanager']['port'])) $this->config['asmanager']['port'] = 5038;
+      if(!isset($this->config['asmanager']['username'])) $this->config['asmanager']['username'] = 'phpagi';
+      if(!isset($this->config['asmanager']['secret'])) $this->config['asmanager']['secret'] = 'phpagi';
+    }
+
+   /**
+    * Send a request
+    *
+    * @param string $action
+    * @param array $parameters
+    * @return array of parameters
+    */
+    function send_request($action, $parameters=array())
+    {
+      $req = "Action: $action\r\n";
+      foreach($parameters as $var=>$val)
+        $req .= "$var: $val\r\n";
+      $req .= "\r\n";
+      $result = fwrite($this->socket, $req);
+      if ($result === false)
+        return null;
+      return $this->wait_response();
+    }
+
+   /**
+    * Wait for a response
+    *
+    * If a request was just sent, this will return the response.
+    * Otherwise, it will loop forever, handling events.
+    *
+    * @param boolean $allow_timeout if the socket times out, return an empty array
+    * @return array of parameters, empty on timeout
+    */
+    function wait_response($allow_timeout=false)
+    {
+      $timeout = false;
+      do
+      {
+        $type = NULL;
+        $parameters = array();
+
+        $buffer = fgets($this->socket, 4096);
+        if ($buffer === false)
+            return null;
+        
+        $buffer = trim($buffer);
+        while($buffer != '')
+        {
+          $a = strpos($buffer, ':');
+          if($a)
+          {
+            if(!count($parameters)) // first line in a response?
+            {
+              $type = strtolower(substr($buffer, 0, $a));
+              if(substr($buffer, $a + 2) == 'Follows')
+              {
+                // A follows response means there is a miltiline field that follows.
+                $parameters['data'] = '';
+                $buff = fgets($this->socket, 4096);
+                while(substr($buff, 0, 6) != '--END ')
+                {
+                  $parameters['data'] .= $buff;
+                  $buff = fgets($this->socket, 4096);
+                }
+              }
+            }
+
+            // store parameter in $parameters
+            $parameters[substr($buffer, 0, $a)] = substr($buffer, $a + 2);
+          }
+          
+          $buffer = fgets($this->socket, 4096);
+          if ($buffer === false)
+            return null;
+          $buffer = trim($buffer);
+        }
+
+        // process response
+        switch($type)
+        {
+          case '': // timeout occured
+            $timeout = $allow_timeout;
+            break;
+          case 'event':
+            $this->process_event($parameters);
+            break;
+          case 'response':
+            break;
+          default:
+            $this->log('Unhandled response packet from Manager: ' . print_r($parameters, true));
+            break;
+        }
+      } while($type != 'response' && !$timeout);
+      return $parameters;
+    }
+
+   /**
+    * Connect to Asterisk
+    *
+    * @example examples/sip_show_peer.php Get information about a sip peer
+    *
+    * @param string $server
+    * @param string $username
+    * @param string $secret
+    * @return boolean true on success
+    */
+    function connect($server=NULL, $username=NULL, $secret=NULL)
+    {
+      // use config if not specified
+      if(is_null($server)) $server = $this->config['asmanager']['server'];
+      if(is_null($username)) $username = $this->config['asmanager']['username'];
+      if(is_null($secret)) $secret = $this->config['asmanager']['secret'];
+
+      // get port from server if specified
+      if(strpos($server, ':') !== false)
+      {
+        $c = explode(':', $server);
+        $this->server = $c[0];
+        $this->port = $c[1];
+      }
+      else
+      {
+        $this->server = $server;
+        $this->port = $this->config['asmanager']['port'];
+      }
+
+      // connect the socket
+      $errno = $errstr = NULL;
+      $this->socket = @fsockopen($this->server, $this->port, $errno, $errstr);
+      if($this->socket == false)
+      {
+        $this->log("Unable to connect to manager {$this->server}:{$this->port} ($errno): $errstr");
+        return false;
+      }
+
+      // read the header
+      $str = fgets($this->socket);
+      if($str == false)
+      {
+        // a problem.
+        $this->log("Asterisk Manager header not received.");
+        return false;
+      }
+      else
+      {
+        // note: don't $this->log($str) until someone looks to see why it mangles the logging
+      }
+
+      // login
+      $res = $this->send_request('login', array('Username'=>$username, 'Secret'=>$secret));
+      if($res['Response'] != 'Success')
+      {
+        $this->_logged_in = FALSE;
+        $this->log("Failed to login.");
+        $this->disconnect();
+        return false;
+      }
+      $this->_logged_in = TRUE;
+      return true;
+    }
+
+   /**
+    * Disconnect
+    *
+    * @example examples/sip_show_peer.php Get information about a sip peer
+    */
+    function disconnect()
+    {
+      if($this->_logged_in==TRUE)
+        $this->logoff();
+      fclose($this->socket);
+    }
+
+   // *********************************************************************************************************
+   // **                       COMMANDS                                                                      **
+   // *********************************************************************************************************
+
+   /**
+    * Set Absolute Timeout
+    *
+    * Hangup a channel after a certain time.
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+AbsoluteTimeout
+    * @param string $channel Channel name to hangup
+    * @param integer $timeout Maximum duration of the call (sec)
+    */
+    function AbsoluteTimeout($channel, $timeout)
+    {
+      return $this->send_request('AbsoluteTimeout', array('Channel'=>$channel, 'Timeout'=>$timeout));
+    }
+
+   /**
+    * Change monitoring filename of a channel
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+ChangeMonitor
+    * @param string $channel the channel to record.
+    * @param string $file the new name of the file created in the monitor spool directory.
+    */
+    function ChangeMonitor($channel, $file)
+    {
+      return $this->send_request('ChangeMontior', array('Channel'=>$channel, 'File'=>$file));
+    }
+
+   /**
+    * Execute Command
+    *
+    * @example examples/sip_show_peer.php Get information about a sip peer
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+Command
+    * @link http://www.voip-info.org/wiki-Asterisk+CLI
+    * @param string $command
+    * @param string $actionid message matching variable
+    */
+    function Command($command, $actionid=NULL)
+    {
+      $parameters = array('Command'=>$command);
+      if($actionid) $parameters['ActionID'] = $actionid;
+      return $this->send_request('Command', $parameters);
+    }
+
+   /**
+    * Enable/Disable sending of events to this manager
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+Events
+    * @param string $eventmask is either 'on', 'off', or 'system,call,log'
+    */
+    function Events($eventmask)
+    {
+      return $this->send_request('Events', array('EventMask'=>$eventmask));
+    }
+
+   /**
+    * Check Extension Status
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+ExtensionState
+    * @param string $exten Extension to check state on
+    * @param string $context Context for extension
+    * @param string $actionid message matching variable
+    */
+    function ExtensionState($exten, $context, $actionid=NULL)
+    {
+      $parameters = array('Exten'=>$exten, 'Context'=>$context);
+      if($actionid) $parameters['ActionID'] = $actionid;
+      return $this->send_request('ExtensionState', $parameters);
+    }
+
+   /**
+    * Gets a Channel Variable
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+GetVar
+    * @link http://www.voip-info.org/wiki-Asterisk+variables
+    * @param string $channel Channel to read variable from
+    * @param string $variable
+    * @param string $actionid message matching variable
+    */
+    function GetVar($channel, $variable, $actionid=NULL)
+    {
+      $parameters = array('Channel'=>$channel, 'Variable'=>$variable);
+      if($actionid) $parameters['ActionID'] = $actionid;
+      return $this->send_request('GetVar', $parameters);
+    }
+
+   /**
+    * Hangup Channel
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+Hangup
+    * @param string $channel The channel name to be hungup
+    */
+    function Hangup($channel)
+    {
+      return $this->send_request('Hangup', array('Channel'=>$channel));
+    }
+
+   /**
+    * List IAX Peers
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+IAXpeers
+    */
+    function IAXPeers()
+    {
+      return $this->send_request('IAXPeers');
+    }
+
+   /**
+    * List available manager commands
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+ListCommands
+    * @param string $actionid message matching variable
+    */
+    function ListCommands($actionid=NULL)
+    {
+      if($actionid)
+        return $this->send_request('ListCommands', array('ActionID'=>$actionid));
+      else
+        return $this->send_request('ListCommands');
+    }
+
+   /**
+    * Logoff Manager
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+Logoff
+    */
+    function Logoff()
+    {
+      return $this->send_request('Logoff');
+    }
+
+   /**
+    * Check Mailbox Message Count
+    *
+    * Returns number of new and old messages.
+    *   Message: Mailbox Message Count
+    *   Mailbox: <mailboxid>
+    *   NewMessages: <count>
+    *   OldMessages: <count>
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+MailboxCount
+    * @param string $mailbox Full mailbox ID <mailbox>@<vm-context>
+    * @param string $actionid message matching variable
+    */
+    function MailboxCount($mailbox, $actionid=NULL)
+    {
+      $parameters = array('Mailbox'=>$mailbox);
+      if($actionid) $parameters['ActionID'] = $actionid;
+      return $this->send_request('MailboxCount', $parameters);
+    }
+
+   /**
+    * Check Mailbox
+    *
+    * Returns number of messages.
+    *   Message: Mailbox Status
+    *   Mailbox: <mailboxid>
+    *   Waiting: <count>
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+MailboxStatus
+    * @param string $mailbox Full mailbox ID <mailbox>@<vm-context>
+    * @param string $actionid message matching variable
+    */
+    function MailboxStatus($mailbox, $actionid=NULL)
+    {	
+      $parameters = array('Mailbox'=>$mailbox);
+      if($actionid) $parameters['ActionID'] = $actionid;
+      return $this->send_request('MailboxStatus', $parameters);
+    }
+
+   /**
+    * Monitor a channel
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+Monitor
+    * @param string $channel
+    * @param string $file
+    * @param string $format
+    * @param boolean $mix
+    */
+    function Monitor($channel, $file=NULL, $format=NULL, $mix=NULL)
+    {
+      $parameters = array('Channel'=>$channel);
+      if($file) $parameters['File'] = $file;
+      if($format) $parameters['Format'] = $format;
+      if(!is_null($file)) $parameters['Mix'] = ($mix) ? 'true' : 'false';
+      return $this->send_request('Monitor', $parameters);
+    }
+
+   /**
+    * Originate Call
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+Originate
+    * @param string $channel Channel name to call
+    * @param string $exten Extension to use (requires 'Context' and 'Priority')
+    * @param string $context Context to use (requires 'Exten' and 'Priority')
+    * @param string $priority Priority to use (requires 'Exten' and 'Context')
+    * @param string $application Application to use
+    * @param string $data Data to use (requires 'Application')
+    * @param integer $timeout How long to wait for call to be answered (in ms)
+    * @param string $callerid Caller ID to be set on the outgoing channel
+    * @param string $variable Channel variable to set (VAR1=value1|VAR2=value2)
+    * @param string $account Account code
+    * @param boolean $async true fast origination
+    * @param string $actionid message matching variable
+    */
+    function Originate($channel,
+                       $exten=NULL, $context=NULL, $priority=NULL,
+                       $application=NULL, $data=NULL,
+                       $timeout=NULL, $callerid=NULL, $variable=NULL, $account=NULL, $async=NULL, $actionid=NULL)
+    {
+      $parameters = array('Channel'=>$channel);
+
+      if($exten) $parameters['Exten'] = $exten;
+      if($context) $parameters['Context'] = $context;
+      if($priority) $parameters['Priority'] = $priority;
+
+      if($application) $parameters['Application'] = $application;
+      if($data) $parameters['Data'] = $data;
+
+      if($timeout) $parameters['Timeout'] = $timeout;
+      if($callerid) $parameters['CallerID'] = $callerid;
+      if($variable) $parameters['Variable'] = $variable;
+      if($account) $parameters['Account'] = $account;
+      if(!is_null($async)) $parameters['Async'] = ($async) ? 'true' : 'false';
+      if($actionid) $parameters['ActionID'] = $actionid;
+
+      return $this->send_request('Originate', $parameters);
+    }	
+
+   /**
+    * List parked calls
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+ParkedCalls
+    * @param string $actionid message matching variable
+    */
+    function ParkedCalls($actionid=NULL)
+    {
+      if($actionid)
+        return $this->send_request('ParkedCalls', array('ActionID'=>$actionid));
+      else
+        return $this->send_request('ParkedCalls');
+    }
+
+   /**
+    * Ping
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+Ping
+    */
+    function Ping()
+    {
+      return $this->send_request('Ping');
+    }
+
+   /**
+    * Queue Add
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+QueueAdd
+    * @param string $queue
+    * @param string $interface
+    * @param integer $penalty
+    */
+    function QueueAdd($queue, $interface, $penalty=0)
+    {
+      $parameters = array('Queue'=>$queue, 'Interface'=>$interface);
+      if($penalty) $parameters['Penalty'] = $penalty;
+      return $this->send_request('QueueAdd', $parameters);
+    }
+
+   /**
+    * Queue Remove
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+QueueRemove
+    * @param string $queue
+    * @param string $interface
+    */
+    function QueueRemove($queue, $interface)
+    {
+      return $this->send_request('QueueRemove', array('Queue'=>$queue, 'Interface'=>$interface));
+    }
+
+   /**
+    * Queues
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+Queues
+    */
+    function Queues()
+    {
+      return $this->send_request('Queues');
+    }
+
+   /**
+    * Queue Status
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+QueueStatus
+    * @param string $actionid message matching variable
+    */
+    function QueueStatus($actionid=NULL)
+    {
+      if($actionid)
+        return $this->send_request('QueueStatus', array('ActionID'=>$actionid));
+      else
+        return $this->send_request('QueueStatus');
+    }
+
+   /**
+    * Redirect
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+Redirect
+    * @param string $channel
+    * @param string $extrachannel
+    * @param string $exten
+    * @param string $context
+    * @param string $priority
+    */
+    function Redirect($channel, $extrachannel, $exten, $context, $priority)
+    {
+      return $this->send_request('Redirect', array('Channel'=>$channel, 'ExtraChannel'=>$extrachannel, 'Exten'=>$exten,
+                                                   'Context'=>$context, 'Priority'=>$priority));
+    }
+
+   /**
+    * Set the CDR UserField
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+SetCDRUserField
+    * @param string $userfield
+    * @param string $channel
+    * @param string $append
+    */
+    function SetCDRUserField($userfield, $channel, $append=NULL)
+    {
+      $parameters = array('UserField'=>$userfield, 'Channel'=>$channel);
+      if($append) $parameters['Append'] = $append;
+      return $this->send_request('SetCDRUserField', $parameters);
+    }
+
+   /**
+    * Set Channel Variable
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+SetVar
+    * @param string $channel Channel to set variable for
+    * @param string $variable name
+    * @param string $value
+    */
+    function SetVar($channel, $variable, $value)
+    {
+      return $this->send_request('SetVar', array('Channel'=>$channel, 'Variable'=>$variable, 'Value'=>$value));
+    }
+
+   /**
+    * Channel Status
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+Status
+    * @param string $channel
+    * @param string $actionid message matching variable
+    */
+    function Status($channel, $actionid=NULL)
+    {
+      $parameters = array('Channel'=>$channel);
+      if($actionid) $parameters['ActionID'] = $actionid;
+      return $this->send_request('Status', $parameters);
+    }
+
+   /**
+    * Stop monitoring a channel
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+StopMonitor
+    * @param string $channel
+    */
+    function StopMonitor($channel)
+    {
+      return $this->send_request('StopMonitor', array('Channel'=>$channel));
+    }
+
+   /**
+    * Dial over Zap channel while offhook
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+ZapDialOffhook
+    * @param string $zapchannel
+    * @param string $number
+    */
+    function ZapDialOffhook($zapchannel, $number)
+    {
+      return $this->send_request('ZapDialOffhook', array('ZapChannel'=>$zapchannel, 'Number'=>$number));
+    }
+
+   /**
+    * Toggle Zap channel Do Not Disturb status OFF
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+ZapDNDoff
+    * @param string $zapchannel
+    */
+    function ZapDNDoff($zapchannel)
+    {
+      return $this->send_request('ZapDNDoff', array('ZapChannel'=>$zapchannel));
+    }
+
+   /**
+    * Toggle Zap channel Do Not Disturb status ON
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+ZapDNDon
+    * @param string $zapchannel
+    */
+    function ZapDNDon($zapchannel)
+    {
+      return $this->send_request('ZapDNDon', array('ZapChannel'=>$zapchannel));
+    }
+
+   /**
+    * Hangup Zap Channel
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+ZapHangup
+    * @param string $zapchannel
+    */
+    function ZapHangup($zapchannel)
+    {
+      return $this->send_request('ZapHangup', array('ZapChannel'=>$zapchannel));
+    }
+
+   /**
+    * Transfer Zap Channel
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+ZapTransfer
+    * @param string $zapchannel
+    */
+    function ZapTransfer($zapchannel)
+    {
+      return $this->send_request('ZapTransfer', array('ZapChannel'=>$zapchannel));
+    }
+
+   /**
+    * Zap Show Channels
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+Manager+API+Action+ZapShowChannels
+    * @param string $actionid message matching variable
+    */
+    function ZapShowChannels($actionid=NULL)
+    {
+      if($actionid)
+        return $this->send_request('ZapShowChannels', array('ActionID'=>$actionid));
+      else
+        return $this->send_request('ZapShowChannels');
+    }
+
+   // *********************************************************************************************************
+   // **                       MISC                                                                          **
+   // *********************************************************************************************************
+
+   /*
+    * Log a message
+    *
+    * @param string $message
+    * @param integer $level from 1 to 4
+    */
+    function log($message, $level=1)
+    {
+      if($this->pagi != false)
+        $this->pagi->conlog($message, $level);
+      else
+        error_log(date('r') . ' - ' . $message);
+    }
+
+   /**
+    * Add event handler
+    *
+    * Known Events include ( http://www.voip-info.org/wiki-asterisk+manager+events )
+    *   Link - Fired when two voice channels are linked together and voice data exchange commences.
+    *   Unlink - Fired when a link between two voice channels is discontinued, for example, just before call completion.
+    *   Newexten -
+    *   Hangup -
+    *   Newchannel -
+    *   Newstate -
+    *   Reload - Fired when the "RELOAD" console command is executed.
+    *   Shutdown -
+    *   ExtensionStatus -
+    *   Rename -
+    *   Newcallerid -
+    *   Alarm -
+    *   AlarmClear -
+    *   Agentcallbacklogoff -
+    *   Agentcallbacklogin -
+    *   Agentlogoff -
+    *   MeetmeJoin -
+    *   MessageWaiting -
+    *   join -
+    *   leave -
+    *   AgentCalled -
+    *   ParkedCall - Fired after ParkedCalls
+    *   Cdr -
+    *   ParkedCallsComplete -
+    *   QueueParams -
+    *   QueueMember -
+    *   QueueStatusEnd -
+    *   Status -
+    *   StatusComplete -
+    *   ZapShowChannels - Fired after ZapShowChannels
+    *   ZapShowChannelsComplete -
+    *
+    * @param string $event type or * for default handler
+    * @param string $callback function
+    * @return boolean sucess
+    */
+    function add_event_handler($event, $callback)
+    {
+      $event = strtolower($event);
+      if(isset($this->event_handlers[$event]))
+      {
+        $this->log("$event handler is already defined, not over-writing.");
+        return false;
+      }
+      $this->event_handlers[$event] = $callback;
+      return true;
+    }
+
+   /**
+    * Process event
+    *
+    * @access private
+    * @param array $parameters
+    * @return mixed result of event handler or false if no handler was found
+    */
+    function process_event($parameters)
+    {
+      $ret = false;
+      $e = strtolower($parameters['Event']);
+      $this->log("Got event.. $e");		
+
+      $handler = '';
+      if(isset($this->event_handlers[$e])) $handler = $this->event_handlers[$e];
+      elseif(isset($this->event_handlers['*'])) $handler = $this->event_handlers['*'];
+
+      if(function_exists($handler))
+      {
+        $this->log("Execute handler $handler");
+        $ret = $handler($e, $parameters, $this->server, $this->port);
+      }
+      else
+        $this->log("No event handler for event '$e'");
+      return $ret;
+    }
+  }
+?>
diff --git a/Checker/phpagi.php b/Checker/phpagi.php
new file mode 100644
index 000000000..d84b8c731
--- /dev/null
+++ b/Checker/phpagi.php
@@ -0,0 +1,1826 @@
+<?php
+
+/**
+* phpagi.php : PHP AGI Functions for Asterisk
+* Website: http://phpagi.sourceforge.net/
+*
+* $Id: phpagi.php,v 2.20 2010/09/30 02:21:00 masham Exp $
+*
+* Copyright (c) 2003 - 2010 Matthew Asham <matthew@ochrelabs.com>, David Eder <david@eder.us> and others
+* All Rights Reserved.
+*
+* This software is released under the terms of the GNU Lesser General Public License v2.1
+* A copy of which is available from http://www.gnu.org/copyleft/lesser.html
+*
+* We would be happy to list your phpagi based application on the phpagi
+* website.  Drop me an Email if you'd like us to list your program.
+* 
+*
+* Written for PHP 4.3.4, should work with older PHP 4.x versions.
+*
+* Please submit bug reports, patches, etc to http://sourceforge.net/projects/phpagi/
+* Gracias. :)
+*
+*
+* @package phpAGI
+* @version 2.20
+*/
+
+if (!class_exists('AGI_AsteriskManager'))
+{
+    require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'phpagi-asmanager.php');
+}
+
+define('AST_CONFIG_DIR', '/etc/asterisk/');
+define('AST_SPOOL_DIR', '/var/spool/asterisk/');
+define('AST_TMP_DIR', AST_SPOOL_DIR . '/tmp/');
+define('DEFAULT_PHPAGI_CONFIG', AST_CONFIG_DIR . '/phpagi.conf');
+
+define('AST_DIGIT_ANY', '0123456789#*');
+
+define('AGIRES_OK', 200);
+
+define('AST_STATE_DOWN', 0);
+define('AST_STATE_RESERVED', 1);
+define('AST_STATE_OFFHOOK', 2);
+define('AST_STATE_DIALING', 3);
+define('AST_STATE_RING', 4);
+define('AST_STATE_RINGING', 5);
+define('AST_STATE_UP', 6);
+define('AST_STATE_BUSY', 7);
+define('AST_STATE_DIALING_OFFHOOK', 8);
+define('AST_STATE_PRERING', 9);
+
+define('AUDIO_FILENO', 3); // STDERR_FILENO + 1
+
+/**
+* AGI class
+*
+* @package phpAGI
+* @link http://www.voip-info.org/wiki-Asterisk+agi
+* @example examples/dtmf.php Get DTMF tones from the user and say the digits
+* @example examples/input.php Get text input from the user and say it back
+* @example examples/ping.php Ping an IP address
+*/
+class AGI
+{
+    /**
+    * Request variables read in on initialization.
+    *
+    * Often contains any/all of the following:
+    *   agi_request - name of agi script
+    *   agi_channel - current channel
+    *   agi_language - current language
+    *   agi_type - channel type (SIP, ZAP, IAX, ...)
+    *   agi_uniqueid - unique id based on unix time
+    *   agi_callerid - callerID string
+    *   agi_dnid - dialed number id
+    *   agi_rdnis - referring DNIS number
+    *   agi_context - current context
+    *   agi_extension - extension dialed
+    *   agi_priority - current priority
+    *   agi_enhanced - value is 1.0 if started as an EAGI script
+    *   agi_accountcode - set by SetAccount in the dialplan
+    *   agi_network - value is yes if this is a fastagi
+    *   agi_network_script - name of the script to execute
+    *
+    * NOTE: program arguments are still in $_SERVER['argv'].
+    *
+    * @var array
+    * @access public
+    */
+    var $request;
+
+    /**
+    * Config variables
+    *
+    * @var array
+    * @access public
+    */
+    var $config;
+
+    /**
+    * Asterisk Manager
+    *
+    * @var AGI_AsteriskManager
+    * @access public
+    */
+    var $asmanager;
+
+    /**
+    * Input Stream
+    *
+    * @access private
+    */
+    var $in = NULL;
+
+    /**
+    * Output Stream
+    *
+    * @access private
+    */
+    var $out = NULL;
+
+    /**
+    * Audio Stream
+    *
+    * @access public
+    */
+    var $audio = NULL;
+
+
+    /**
+    * Application option delimiter
+    * 
+    * @access public
+    */
+    public $option_delim = ",";
+    
+    /**
+    * Constructor
+    *
+    * @param string $config is the name of the config file to parse
+    * @param array $optconfig is an array of configuration vars and vals, stuffed into $this->config['phpagi']
+    */
+    function __construct($config=NULL, $optconfig=array())
+    {
+        // load config
+        if(!is_null($config) && file_exists($config))
+          $this->config = parse_ini_file($config, true);
+        elseif(file_exists(DEFAULT_PHPAGI_CONFIG))
+          $this->config = parse_ini_file(DEFAULT_PHPAGI_CONFIG, true);
+
+        // If optconfig is specified, stuff vals and vars into 'phpagi' config array.
+        foreach($optconfig as $var=>$val)
+          $this->config['phpagi'][$var] = $val;
+
+        // add default values to config for uninitialized values
+        if(!isset($this->config['phpagi']['error_handler'])) $this->config['phpagi']['error_handler'] = true;
+        if(!isset($this->config['phpagi']['debug'])) $this->config['phpagi']['debug'] = false;
+        if(!isset($this->config['phpagi']['admin'])) $this->config['phpagi']['admin'] = NULL;
+        if(!isset($this->config['phpagi']['tempdir'])) $this->config['phpagi']['tempdir'] = AST_TMP_DIR;
+
+        // festival TTS config
+        if(!isset($this->config['festival']['text2wave'])) $this->config['festival']['text2wave'] = $this->which('text2wave');
+
+        // swift TTS config
+        if(!isset($this->config['cepstral']['swift'])) $this->config['cepstral']['swift'] = $this->which('swift');
+
+        ob_implicit_flush(true);
+
+        // open stdin & stdout
+        $this->in = defined('STDIN') ? STDIN : fopen('php://stdin', 'r');
+        $this->out = defined('STDOUT') ? STDOUT : fopen('php://stdout', 'w');
+
+        // initialize error handler
+        if($this->config['phpagi']['error_handler'] == true)
+        {
+          set_error_handler('phpagi_error_handler');
+          global $phpagi_error_handler_email;
+          $phpagi_error_handler_email = $this->config['phpagi']['admin'];
+          error_reporting(E_ALL);
+        }
+
+        // make sure temp folder exists
+        $this->make_folder($this->config['phpagi']['tempdir']);
+
+        // read the request
+        $str = fgets($this->in);
+        while($str != "\n")
+        {
+          $this->request[substr($str, 0, strpos($str, ':'))] = trim(substr($str, strpos($str, ':') + 1));
+          $str = fgets($this->in);
+        }
+
+        // open audio if eagi detected
+        if($this->request['agi_enhanced'] == '1.0')
+        {
+          if(file_exists('/proc/' . getmypid() . '/fd/3'))
+            $this->audio = fopen('/proc/' . getmypid() . '/fd/3', 'r');
+          elseif(file_exists('/dev/fd/3'))
+          {
+            // may need to mount fdescfs
+            $this->audio = fopen('/dev/fd/3', 'r');
+          }
+          else
+            $this->conlog('Unable to open audio stream');
+
+          if($this->audio) stream_set_blocking($this->audio, 0);
+        }
+
+        $this->conlog('AGI Request:');
+        $this->conlog(print_r($this->request, true));
+        $this->conlog('PHPAGI internal configuration:');
+        $this->conlog(print_r($this->config, true));
+    }
+
+    // *********************************************************************************************************
+    // **                             COMMANDS                                                                                            **
+    // *********************************************************************************************************
+
+    /**
+    * Answer channel if not already in answer state.
+    *
+    * @link http://www.voip-info.org/wiki-answer
+    * @example examples/dtmf.php Get DTMF tones from the user and say the digits
+    * @example examples/input.php Get text input from the user and say it back
+    * @example examples/ping.php Ping an IP address
+    *
+    * @return array, see evaluate for return information.  ['result'] is 0 on success, -1 on failure.
+    */
+    function answer()
+    {
+        return $this->evaluate('ANSWER');
+    }
+
+    /**
+    * Get the status of the specified channel. If no channel name is specified, return the status of the current channel.
+    *
+    * @link http://www.voip-info.org/wiki-channel+status
+    * @param string $channel
+    * @return array, see evaluate for return information. ['data'] contains description.
+    */
+    function channel_status($channel='')
+    {
+        $ret = $this->evaluate("CHANNEL STATUS $channel");
+        switch($ret['result'])
+        {
+          case -1: $ret['data'] = trim("There is no channel that matches $channel"); break;
+          case AST_STATE_DOWN: $ret['data'] = 'Channel is down and available'; break;
+          case AST_STATE_RESERVED: $ret['data'] = 'Channel is down, but reserved'; break;
+          case AST_STATE_OFFHOOK: $ret['data'] = 'Channel is off hook'; break;
+          case AST_STATE_DIALING: $ret['data'] = 'Digits (or equivalent) have been dialed'; break;
+          case AST_STATE_RING: $ret['data'] = 'Line is ringing'; break;
+          case AST_STATE_RINGING: $ret['data'] = 'Remote end is ringing'; break;
+          case AST_STATE_UP: $ret['data'] = 'Line is up'; break;
+          case AST_STATE_BUSY: $ret['data'] = 'Line is busy'; break;
+          case AST_STATE_DIALING_OFFHOOK: $ret['data'] = 'Digits (or equivalent) have been dialed while offhook'; break;
+          case AST_STATE_PRERING: $ret['data'] = 'Channel has detected an incoming call and is waiting for ring'; break;
+          default: $ret['data'] = "Unknown ({$ret['result']})"; break;
+        }
+        return $ret;
+    }
+
+    /**
+    * Deletes an entry in the Asterisk database for a given family and key.
+    *
+    * @link http://www.voip-info.org/wiki-database+del
+    * @param string $family
+    * @param string $key
+    * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 otherwise.
+    */
+    function database_del($family, $key)
+    {
+        return $this->evaluate("DATABASE DEL \"$family\" \"$key\"");
+    }
+
+    /**
+    * Deletes a family or specific keytree within a family in the Asterisk database.
+    *
+    * @link http://www.voip-info.org/wiki-database+deltree
+    * @param string $family
+    * @param string $keytree
+    * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 otherwise.
+    */
+    function database_deltree($family, $keytree='')
+    {
+        $cmd = "DATABASE DELTREE \"$family\"";
+        if($keytree != '') $cmd .= " \"$keytree\"";
+        return $this->evaluate($cmd);
+    }
+
+    /**
+    * Retrieves an entry in the Asterisk database for a given family and key.
+    *
+    * @link http://www.voip-info.org/wiki-database+get
+    * @param string $family
+    * @param string $key
+    * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 failure. ['data'] holds the value
+    */
+    function database_get($family, $key)
+    {
+        return $this->evaluate("DATABASE GET \"$family\" \"$key\"");
+    }
+
+    /**
+    * Adds or updates an entry in the Asterisk database for a given family, key, and value.
+    *
+    * @param string $family
+    * @param string $key
+    * @param string $value
+    * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 otherwise
+    */
+    function database_put($family, $key, $value)
+    {
+        $value = str_replace("\n", '\n', addslashes($value));
+        return $this->evaluate("DATABASE PUT \"$family\" \"$key\" \"$value\"");
+    }
+
+
+    /**
+    * Sets a global variable, using Asterisk 1.6 syntax.
+    *
+    * @link http://www.voip-info.org/wiki/view/Asterisk+cmd+Set
+    *
+    * @param string $pVariable
+    * @param string|int|float $pValue
+    * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 otherwise
+    */
+    function set_global_var($pVariable, $pValue)
+    {
+        if (is_numeric($pValue))
+            return $this->evaluate("Set({$pVariable}={$pValue},g);");
+        else
+            return $this->evaluate("Set({$pVariable}=\"{$pValue}\",g);");
+    }
+
+
+    /**
+    * Sets a variable, using Asterisk 1.6 syntax.
+    *
+    * @link http://www.voip-info.org/wiki/view/Asterisk+cmd+Set
+    *
+    * @param string $pVariable
+    * @param string|int|float $pValue
+    * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 otherwise
+    */
+    function set_var($pVariable, $pValue)
+    {
+        if (is_numeric($pValue))
+            return $this->evaluate("Set({$pVariable}={$pValue});");
+        else
+            return $this->evaluate("Set({$pVariable}=\"{$pValue}\");");
+    }
+
+
+    /**
+    * Executes the specified Asterisk application with given options.
+    *
+    * @link http://www.voip-info.org/wiki-exec
+    * @link http://www.voip-info.org/wiki-Asterisk+-+documentation+of+application+commands
+    * @param string $application
+    * @param mixed $options
+    * @return array, see evaluate for return information. ['result'] is whatever the application returns, or -2 on failure to find application
+    */
+    function exec($application, $options)
+    {
+        if(is_array($options)) $options = join('|', $options);
+        return $this->evaluate("EXEC $application $options");
+    }
+
+    /**
+    * Plays the given file and receives DTMF data.
+    *
+    * This is similar to STREAM FILE, but this command can accept and return many DTMF digits,
+    * while STREAM FILE returns immediately after the first DTMF digit is detected.
+    *
+    * Asterisk looks for the file to play in /var/lib/asterisk/sounds by default.
+    *
+    * If the user doesn't press any keys when the message plays, there is $timeout milliseconds
+    * of silence then the command ends. 
+    *
+    * The user has the opportunity to press a key at any time during the message or the
+    * post-message silence. If the user presses a key while the message is playing, the
+    * message stops playing. When the first key is pressed a timer starts counting for
+    * $timeout milliseconds. Every time the user presses another key the timer is restarted.
+    * The command ends when the counter goes to zero or the maximum number of digits is entered,
+    * whichever happens first. 
+    *
+    * If you don't specify a time out then a default timeout of 2000 is used following a pressed
+    * digit. If no digits are pressed then 6 seconds of silence follow the message. 
+    *
+    * If you don't specify $max_digits then the user can enter as many digits as they want. 
+    *
+    * Pressing the # key has the same effect as the timer running out: the command ends and
+    * any previously keyed digits are returned. A side effect of this is that there is no
+    * way to read a # key using this command.
+    *
+    * @example examples/ping.php Ping an IP address
+    *
+    * @link http://www.voip-info.org/wiki-get+data
+    * @param string $filename file to play. Do not include file extension.
+    * @param integer $timeout milliseconds
+    * @param integer $max_digits
+    * @return array, see evaluate for return information. ['result'] holds the digits and ['data'] holds the timeout if present.
+    *
+    * This differs from other commands with return DTMF as numbers representing ASCII characters.
+    */
+    function get_data($filename, $timeout=NULL, $max_digits=NULL)
+    {
+        return $this->evaluate(rtrim("GET DATA $filename $timeout $max_digits"));
+    }
+
+    /**
+    * Fetch the value of a variable.
+    *
+    * Does not work with global variables. Does not work with some variables that are generated by modules.
+    *
+    * @link http://www.voip-info.org/wiki-get+variable
+    * @link http://www.voip-info.org/wiki-Asterisk+variables
+    * @param string $variable name
+    * @param boolean $getvalue return the value only
+    * @return array, see evaluate for return information. ['result'] is 0 if variable hasn't been set, 1 if it has. ['data'] holds the value. returns value if $getvalue is TRUE
+    */
+    function get_variable($variable,$getvalue=FALSE)
+    {
+        $res=$this->evaluate("GET VARIABLE $variable");
+
+        if($getvalue==FALSE)
+          return($res);
+
+        return($res['data']);
+    }
+
+
+    /**
+    * Fetch the value of a full variable.
+    *
+    *
+    * @link http://www.voip-info.org/wiki/view/get+full+variable
+    * @link http://www.voip-info.org/wiki-Asterisk+variables
+    * @param string $variable name
+    * @param string $channel channel
+    * @param boolean $getvalue return the value only 
+    * @return array, see evaluate for return information. ['result'] is 0 if variable hasn't been set, 1 if it has. ['data'] holds the value.  returns value if $getvalue is TRUE
+    */
+    function get_fullvariable($variable,$channel=FALSE,$getvalue=FALSE)
+    {
+      if($channel==FALSE){
+        $req = $variable;
+      } else {
+        $req = $variable.' '.$channel;
+      }
+      
+      $res=$this->evaluate('GET VARIABLE FULL '.$req);
+      
+      if($getvalue==FALSE)
+        return($res);
+      
+      return($res['data']);
+      
+    }
+
+    /**
+    * Hangup the specified channel. If no channel name is given, hang up the current channel.
+    *
+    * With power comes responsibility. Hanging up channels other than your own isn't something
+    * that is done routinely. If you are not sure why you are doing so, then don't.
+    *
+    * @link http://www.voip-info.org/wiki-hangup
+    * @example examples/dtmf.php Get DTMF tones from the user and say the digits
+    * @example examples/input.php Get text input from the user and say it back
+    * @example examples/ping.php Ping an IP address
+    *
+    * @param string $channel
+    * @return array, see evaluate for return information. ['result'] is 1 on success, -1 on failure.
+    */
+    function hangup($channel='')
+    {
+        return $this->evaluate("HANGUP $channel");
+    }
+
+    /**
+    * Does nothing.
+    *
+    * @link http://www.voip-info.org/wiki-noop
+    * @return array, see evaluate for return information.
+    */
+    function noop($string="")
+    {
+        return $this->evaluate("NOOP \"$string\"");
+    }
+
+    /**
+    * Receive a character of text from a connected channel. Waits up to $timeout milliseconds for
+    * a character to arrive, or infinitely if $timeout is zero.
+    *
+    * @link http://www.voip-info.org/wiki-receive+char
+    * @param integer $timeout milliseconds
+    * @return array, see evaluate for return information. ['result'] is 0 on timeout or not supported, -1 on failure. Otherwise 
+    * it is the decimal value of the DTMF tone. Use chr() to convert to ASCII.
+    */
+    function receive_char($timeout=-1)
+    {
+        return $this->evaluate("RECEIVE CHAR $timeout");
+    }
+
+    /**
+    * Record sound to a file until an acceptable DTMF digit is received or a specified amount of
+    * time has passed. Optionally the file BEEP is played before recording begins.
+    *
+    * @link http://www.voip-info.org/wiki-record+file
+    * @param string $file to record, without extension, often created in /var/lib/asterisk/sounds
+    * @param string $format of the file. GSM and WAV are commonly used formats. MP3 is read-only and thus cannot be used.
+    * @param string $escape_digits
+    * @param integer $timeout is the maximum record time in milliseconds, or -1 for no timeout.
+    * @param integer $offset to seek to without exceeding the end of the file.
+    * @param boolean $beep
+    * @param integer $silence number of seconds of silence allowed before the function returns despite the 
+    * lack of dtmf digits or reaching timeout.
+    * @return array, see evaluate for return information. ['result'] is -1 on error, 0 on hangup, otherwise a decimal value of the 
+    * DTMF tone. Use chr() to convert to ASCII.
+    */
+    function record_file($file, $format, $escape_digits='', $timeout=-1, $offset=NULL, $beep=false, $silence=NULL)
+    {
+        $cmd = trim("RECORD FILE $file $format \"$escape_digits\" $timeout $offset");
+        if($beep) $cmd .= ' BEEP';
+        if(!is_null($silence)) $cmd .= " s=$silence";
+        return $this->evaluate($cmd);
+    }
+
+    /**
+    * Say the given digit string, returning early if any of the given DTMF escape digits are received on the channel.
+    *
+    * @link http://www.voip-info.org/wiki-say+digits
+    * @param integer $digits
+    * @param string $escape_digits
+    * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no 
+    * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
+    */
+    function say_digits($digits, $escape_digits='')
+    {
+        return $this->evaluate("SAY DIGITS $digits \"$escape_digits\"");
+    }
+
+    /**
+    * Say the given number, returning early if any of the given DTMF escape digits are received on the channel.
+    *
+    * @link http://www.voip-info.org/wiki-say+number
+    * @param integer $number
+    * @param string $escape_digits
+    * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no 
+    * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
+    */
+    function say_number($number, $escape_digits='')
+    {
+        return $this->evaluate("SAY NUMBER $number \"$escape_digits\"");
+    }
+
+    /**
+    * Say the given character string, returning early if any of the given DTMF escape digits are received on the channel.
+    *
+    * @link http://www.voip-info.org/wiki-say+phonetic
+    * @param string $text
+    * @param string $escape_digits
+    * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no 
+    * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
+    */
+    function say_phonetic($text, $escape_digits='')
+    {
+        return $this->evaluate("SAY PHONETIC $text \"$escape_digits\"");
+    }
+
+    /**
+    * Say a given time, returning early if any of the given DTMF escape digits are received on the channel.
+    *
+    * @link http://www.voip-info.org/wiki-say+time
+    * @param integer $time number of seconds elapsed since 00:00:00 on January 1, 1970, Coordinated Universal Time (UTC).
+    * @param string $escape_digits
+    * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no 
+    * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
+    */
+    function say_time($time=NULL, $escape_digits='')
+    {
+        if(is_null($time)) $time = time();
+        return $this->evaluate("SAY TIME $time \"$escape_digits\"");
+    }
+
+    /**
+    * Send the specified image on a channel.
+    *
+    * Most channels do not support the transmission of images.
+    *
+    * @link http://www.voip-info.org/wiki-send+image
+    * @param string $image without extension, often in /var/lib/asterisk/images
+    * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if the image is sent or 
+    * channel does not support image transmission.
+    */
+    function send_image($image)
+    {
+        return $this->evaluate("SEND IMAGE $image");
+    }
+
+    /**
+    * Send the given text to the connected channel.
+    *
+    * Most channels do not support transmission of text.
+    *
+    * @link http://www.voip-info.org/wiki-send+text
+    * @param $text
+    * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if the text is sent or 
+    * channel does not support text transmission.
+    */
+    function send_text($text)
+    {
+        return $this->evaluate("SEND TEXT \"$text\"");
+    }
+
+    /**
+    * Cause the channel to automatically hangup at $time seconds in the future.
+    * If $time is 0 then the autohangup feature is disabled on this channel.
+    *
+    * If the channel is hungup prior to $time seconds, this setting has no effect.
+    *
+    * @link http://www.voip-info.org/wiki-set+autohangup
+    * @param integer $time until automatic hangup
+    * @return array, see evaluate for return information.
+    */
+    function set_autohangup($time=0)
+    {
+        return $this->evaluate("SET AUTOHANGUP $time");
+    }
+
+    /**
+    * Changes the caller ID of the current channel.
+    *
+    * @link http://www.voip-info.org/wiki-set+callerid
+    * @param string $cid example: "John Smith"<1234567>
+    * This command will let you take liberties with the <caller ID specification> but the format shown in the example above works 
+    * well: the name enclosed in double quotes followed immediately by the number inside angle brackets. If there is no name then
+    * you can omit it. If the name contains no spaces you can omit the double quotes around it. The number must follow the name
+    * immediately; don't put a space between them. The angle brackets around the number are necessary; if you omit them the
+    * number will be considered to be part of the name.
+    * @return array, see evaluate for return information.
+    */
+    function set_callerid($cid)
+    {
+        return $this->evaluate("SET CALLERID $cid");
+    }
+
+    /**
+    * Sets the context for continuation upon exiting the application.
+    *
+    * Setting the context does NOT automatically reset the extension and the priority; if you want to start at the top of the new 
+    * context you should set extension and priority yourself. 
+    *
+    * If you specify a non-existent context you receive no error indication (['result'] is still 0) but you do get a 
+    * warning message on the Asterisk console.
+    *
+    * @link http://www.voip-info.org/wiki-set+context
+    * @param string $context 
+    * @return array, see evaluate for return information.
+    */
+    function set_context($context)
+    {
+        return $this->evaluate("SET CONTEXT $context");
+    }
+
+    /**
+    * Set the extension to be used for continuation upon exiting the application.
+    *
+    * Setting the extension does NOT automatically reset the priority. If you want to start with the first priority of the 
+    * extension you should set the priority yourself. 
+    *
+    * If you specify a non-existent extension you receive no error indication (['result'] is still 0) but you do 
+    * get a warning message on the Asterisk console.
+    *
+    * @link http://www.voip-info.org/wiki-set+extension
+    * @param string $extension
+    * @return array, see evaluate for return information.
+    */
+    function set_extension($extension)
+    {
+        return $this->evaluate("SET EXTENSION $extension");
+    }
+
+    /**
+    * Enable/Disable Music on hold generator.
+    *
+    * @link http://www.voip-info.org/wiki-set+music
+    * @param boolean $enabled
+    * @param string $class
+    * @return array, see evaluate for return information.
+    */
+    function set_music($enabled=true, $class='')
+    {
+        $enabled = ($enabled) ? 'ON' : 'OFF';
+        return $this->evaluate("SET MUSIC $enabled $class");
+    }
+
+    /**
+    * Set the priority to be used for continuation upon exiting the application.
+    *
+    * If you specify a non-existent priority you receive no error indication (['result'] is still 0)
+    * and no warning is issued on the Asterisk console.
+    *
+    * @link http://www.voip-info.org/wiki-set+priority
+    * @param integer $priority
+    * @return array, see evaluate for return information.
+    */
+    function set_priority($priority)
+    {
+        return $this->evaluate("SET PRIORITY $priority");
+    }
+
+    /**
+    * Sets a variable to the specified value. The variables so created can later be used by later using ${<variablename>}
+    * in the dialplan.
+    *
+    * These variables live in the channel Asterisk creates when you pickup a phone and as such they are both local and temporary. 
+    * Variables created in one channel can not be accessed by another channel. When you hang up the phone, the channel is deleted 
+    * and any variables in that channel are deleted as well.
+    *
+    * @link http://www.voip-info.org/wiki-set+variable
+    * @param string $variable is case sensitive
+    * @param string $value
+    * @return array, see evaluate for return information.
+    */
+    function set_variable($variable, $value)
+    {
+        $value = str_replace("\n", '\n', addslashes($value));
+        return $this->evaluate("SET VARIABLE $variable \"$value\"");
+    }
+
+    /**
+    * Play the given audio file, allowing playback to be interrupted by a DTMF digit. This command is similar to the GET DATA 
+    * command but this command returns after the first DTMF digit has been pressed while GET DATA can accumulated any number of 
+    * digits before returning.
+    *
+    * @example examples/ping.php Ping an IP address
+    *
+    * @link http://www.voip-info.org/wiki-stream+file
+    * @param string $filename without extension, often in /var/lib/asterisk/sounds
+    * @param string $escape_digits
+    * @param integer $offset
+    * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no 
+    * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
+    */
+    function stream_file($filename, $escape_digits='', $offset=0)
+    {
+        return $this->evaluate("STREAM FILE $filename \"$escape_digits\" $offset");
+    }
+
+    /**
+    * Enable or disable TDD transmission/reception on the current channel.
+    *
+    * @link http://www.voip-info.org/wiki-tdd+mode
+    * @param string $setting can be on, off or mate
+    * @return array, see evaluate for return information. ['result'] is 1 on sucess, 0 if the channel is not TDD capable.
+    */
+    function tdd_mode($setting)
+    {
+        return $this->evaluate("TDD MODE $setting");
+    }
+
+    /**
+    * Sends $message to the Asterisk console via the 'verbose' message system.
+    *
+    * If the Asterisk verbosity level is $level or greater, send $message to the console.
+    *
+    * The Asterisk verbosity system works as follows. The Asterisk user gets to set the desired verbosity at startup time or later 
+    * using the console 'set verbose' command. Messages are displayed on the console if their verbose level is less than or equal 
+    * to desired verbosity set by the user. More important messages should have a low verbose level; less important messages 
+    * should have a high verbose level.
+    *
+    * @link http://www.voip-info.org/wiki-verbose
+    * @param string $message
+    * @param integer $level from 1 to 4
+    * @return array, see evaluate for return information.
+    */
+    function verbose($message, $level=1)
+    {
+        foreach(explode("\n", str_replace("\r\n", "\n", print_r($message, true))) as $msg)
+        {
+          @syslog(LOG_WARNING, $msg);
+          $ret = $this->evaluate("VERBOSE \"$msg\" $level");
+        }
+        return $ret;
+    }
+
+    /**
+    * Waits up to $timeout milliseconds for channel to receive a DTMF digit.
+    *
+    * @link http://www.voip-info.org/wiki-wait+for+digit
+    * @param integer $timeout in millisecons. Use -1 for the timeout value if you want the call to wait indefinitely.
+    * @return array, see evaluate for return information. ['result'] is 0 if wait completes with no 
+    * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
+    */
+    function wait_for_digit($timeout=-1)
+    {
+        return $this->evaluate("WAIT FOR DIGIT $timeout");
+    }
+
+
+    // *********************************************************************************************************
+    // **                             APPLICATIONS                                                                                        **
+    // *********************************************************************************************************
+
+    /**
+    * Set absolute maximum time of call.
+    *
+    * Note that the timeout is set from the current time forward, not counting the number of seconds the call has already been up. 
+    * Each time you call AbsoluteTimeout(), all previous absolute timeouts are cancelled. 
+    * Will return the call to the T extension so that you can playback an explanatory note to the calling party (the called party 
+    * will not hear that)
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+-+documentation+of+application+commands
+    * @link http://www.dynx.net/ASTERISK/AGI/ccard/agi-ccard.agi
+    * @param $seconds allowed, 0 disables timeout
+    * @return array, see evaluate for return information.
+    */
+    function exec_absolutetimeout($seconds=0)
+    {
+        return $this->exec('AbsoluteTimeout', $seconds);
+    }
+
+    /**
+    * Executes an AGI compliant application.
+    *
+    * @param string $command
+    * @return array, see evaluate for return information. ['result'] is -1 on hangup or if application requested hangup, or 0 on non-hangup exit.
+    * @param string $args
+    */
+    function exec_agi($command, $args)
+    {
+        return $this->exec("AGI $command", $args);
+    }
+
+    /**
+    * Set Language.
+    *
+    * @param string $language code
+    * @return array, see evaluate for return information.
+    */
+    function exec_setlanguage($language='en')
+    {
+        return $this->exec('Set', 'CHANNEL(language)='. $language);
+    }
+
+    /**
+    * Do ENUM Lookup.
+    *
+    * Note: to retrieve the result, use
+    *   get_variable('ENUM');
+    *
+    * @param $exten
+    * @return array, see evaluate for return information.
+    */
+    function exec_enumlookup($exten)
+    {
+        return $this->exec('EnumLookup', $exten);
+    }
+
+    /**
+    * Dial.
+    *
+    * Dial takes input from ${VXML_URL} to send XML Url to Cisco 7960
+    * Dial takes input from ${ALERT_INFO} to set ring cadence for Cisco phones
+    * Dial returns ${CAUSECODE}: If the dial failed, this is the errormessage.
+    * Dial returns ${DIALSTATUS}: Text code returning status of last dial attempt.
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+cmd+Dial
+    * @param string $type
+    * @param string $identifier
+    * @param integer $timeout
+    * @param string $options
+    * @param string $url
+    * @return array, see evaluate for return information.
+    */
+    function exec_dial($type, $identifier, $timeout=NULL, $options=NULL, $url=NULL)
+    {
+        return $this->exec('Dial', trim("$type/$identifier".$this->option_delim.$timeout.$this->option_delim.$options.$this->option_delim.$url, $this->option_delim));
+    }
+
+    /**
+    * Goto.
+    *
+    * This function takes three arguments: context,extension, and priority, but the leading arguments
+    * are optional, not the trailing arguments.  Thuse goto($z) sets the priority to $z.
+    *
+    * @param string $a
+    * @param string $b;
+    * @param string $c;
+    * @return array, see evaluate for return information.
+    */
+    function exec_goto($a, $b=NULL, $c=NULL)
+    {
+        return $this->exec('Goto', trim($a.$this->option_delim.$b.$this->option_delim.$c, $this->option_delim));
+    }
+
+
+    // *********************************************************************************************************
+    // **                             FAST PASSING                                                                                        **
+    // *********************************************************************************************************
+
+    /**
+    * Say the given digit string, returning early if any of the given DTMF escape digits are received on the channel.
+    * Return early if $buffer is adequate for request.
+    *
+    * @link http://www.voip-info.org/wiki-say+digits
+    * @param string $buffer
+    * @param integer $digits
+    * @param string $escape_digits
+    * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
+    * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
+    */
+    function fastpass_say_digits(&$buffer, $digits, $escape_digits='')
+    {
+     $proceed = false;
+     if($escape_digits != '' && $buffer != '')
+     {
+         if(!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer)-1}))
+           $proceed = true;
+     }
+     if($buffer == '' || $proceed)
+     {
+         $res = $this->say_digits($digits, $escape_digits);
+         if($res['code'] == AGIRES_OK && $res['result'] > 0)
+           $buffer .= chr($res['result']);
+         return $res;
+     }
+     return array('code'=>AGIRES_OK, 'result'=>ord($buffer{strlen($buffer)-1}));
+    }
+
+    /**
+    * Say the given number, returning early if any of the given DTMF escape digits are received on the channel.
+    * Return early if $buffer is adequate for request.
+    *
+    * @link http://www.voip-info.org/wiki-say+number
+    * @param string $buffer
+    * @param integer $number
+    * @param string $escape_digits
+    * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
+    * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
+    */
+    function fastpass_say_number(&$buffer, $number, $escape_digits='')
+    {
+     $proceed = false;
+     if($escape_digits != '' && $buffer != '')
+     {
+         if(!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer)-1}))
+           $proceed = true;
+     }
+     if($buffer == '' || $proceed)
+     {
+         $res = $this->say_number($number, $escape_digits);
+         if($res['code'] == AGIRES_OK && $res['result'] > 0)
+           $buffer .= chr($res['result']);
+         return $res;
+     }
+     return array('code'=>AGIRES_OK, 'result'=>ord($buffer{strlen($buffer)-1}));
+    }
+
+    /**
+    * Say the given character string, returning early if any of the given DTMF escape digits are received on the channel.
+    * Return early if $buffer is adequate for request.
+    *
+    * @link http://www.voip-info.org/wiki-say+phonetic
+    * @param string $buffer
+    * @param string $text
+    * @param string $escape_digits
+    * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
+    * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
+    */
+    function fastpass_say_phonetic(&$buffer, $text, $escape_digits='')
+    {
+     $proceed = false;
+     if($escape_digits != '' && $buffer != '')
+     {
+         if(!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer)-1}))
+           $proceed = true;
+     }
+     if($buffer == '' || $proceed)
+     {
+         $res = $this->say_phonetic($text, $escape_digits);
+         if($res['code'] == AGIRES_OK && $res['result'] > 0)
+           $buffer .= chr($res['result']);
+         return $res;
+     }
+     return array('code'=>AGIRES_OK, 'result'=>ord($buffer{strlen($buffer)-1}));
+    }
+
+    /**
+    * Say a given time, returning early if any of the given DTMF escape digits are received on the channel.
+    * Return early if $buffer is adequate for request.
+    *
+    * @link http://www.voip-info.org/wiki-say+time
+    * @param string $buffer
+    * @param integer $time number of seconds elapsed since 00:00:00 on January 1, 1970, Coordinated Universal Time (UTC).
+    * @param string $escape_digits
+    * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
+    * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
+    */
+    function fastpass_say_time(&$buffer, $time=NULL, $escape_digits='')
+    {
+     $proceed = false;
+     if($escape_digits != '' && $buffer != '')
+     {
+         if(!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer)-1}))
+           $proceed = true;
+     }
+     if($buffer == '' || $proceed)
+     {
+         $res = $this->say_time($time, $escape_digits);
+         if($res['code'] == AGIRES_OK && $res['result'] > 0)
+           $buffer .= chr($res['result']);
+         return $res;
+     }
+     return array('code'=>AGIRES_OK, 'result'=>ord($buffer{strlen($buffer)-1}));
+    }
+
+    /**
+    * Play the given audio file, allowing playback to be interrupted by a DTMF digit. This command is similar to the GET DATA
+    * command but this command returns after the first DTMF digit has been pressed while GET DATA can accumulated any number of
+    * digits before returning.
+    * Return early if $buffer is adequate for request.
+    *
+    * @link http://www.voip-info.org/wiki-stream+file
+    * @param string $buffer
+    * @param string $filename without extension, often in /var/lib/asterisk/sounds
+    * @param string $escape_digits
+    * @param integer $offset
+    * @return array, see evaluate for return information. ['result'] is -1 on hangup or error, 0 if playback completes with no
+    * digit received, otherwise a decimal value of the DTMF tone.  Use chr() to convert to ASCII.
+    */
+    function fastpass_stream_file(&$buffer, $filename, $escape_digits='', $offset=0)
+    {
+     $proceed = false;
+     if($escape_digits != '' && $buffer != '')
+     {
+         if(!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer)-1}))
+           $proceed = true;
+     }
+     if($buffer == '' || $proceed)
+     {
+         $res = $this->stream_file($filename, $escape_digits, $offset);
+         if($res['code'] == AGIRES_OK && $res['result'] > 0)
+           $buffer .= chr($res['result']);
+         return $res;
+     }
+     return array('code'=>AGIRES_OK, 'result'=>ord($buffer{strlen($buffer)-1}), 'endpos'=>0);
+    }
+
+    /**
+    * Use festival to read text.
+    * Return early if $buffer is adequate for request.
+    *
+    * @link http://www.cstr.ed.ac.uk/projects/festival/
+    * @param string $buffer
+    * @param string $text
+    * @param string $escape_digits
+    * @param integer $frequency
+    * @return array, see evaluate for return information.
+    */
+    function fastpass_text2wav(&$buffer, $text, $escape_digits='', $frequency=8000)
+    {
+     $proceed = false;
+     if($escape_digits != '' && $buffer != '')
+     {
+         if(!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer)-1}))
+           $proceed = true;
+     }
+     if($buffer == '' || $proceed)
+     {
+         $res = $this->text2wav($text, $escape_digits, $frequency);
+         if($res['code'] == AGIRES_OK && $res['result'] > 0)
+           $buffer .= chr($res['result']);
+         return $res;
+     }
+     return array('code'=>AGIRES_OK, 'result'=>ord($buffer{strlen($buffer)-1}), 'endpos'=>0);
+    }
+
+    /**
+    * Use Cepstral Swift to read text.
+    * Return early if $buffer is adequate for request.
+    *
+    * @link http://www.cepstral.com/
+    * @param string $buffer
+    * @param string $text
+    * @param string $escape_digits
+    * @param integer $frequency
+    * @return array, see evaluate for return information.
+    */
+    function fastpass_swift(&$buffer, $text, $escape_digits='', $frequency=8000, $voice=NULL)
+    {
+     $proceed = false;
+     if($escape_digits != '' && $buffer != '')
+     {
+         if(!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer)-1}))
+           $proceed = true;
+     }
+     if($buffer == '' || $proceed)
+     {
+         $res = $this->swift($text, $escape_digits, $frequency, $voice);
+         if($res['code'] == AGIRES_OK && $res['result'] > 0)
+           $buffer .= chr($res['result']);
+         return $res;
+     }
+     return array('code'=>AGIRES_OK, 'result'=>ord($buffer{strlen($buffer)-1}), 'endpos'=>0);
+    }
+
+    /**
+    * Say Puncutation in a string.
+    * Return early if $buffer is adequate for request.
+    *
+    * @param string $buffer
+    * @param string $text
+    * @param string $escape_digits
+    * @param integer $frequency
+    * @return array, see evaluate for return information.
+    */
+    function fastpass_say_punctuation(&$buffer, $text, $escape_digits='', $frequency=8000)
+    {
+     $proceed = false;
+     if($escape_digits != '' && $buffer != '')
+     {
+         if(!strpos(chr(255) . $escape_digits, $buffer{strlen($buffer)-1}))
+           $proceed = true;
+     }
+     if($buffer == '' || $proceed)
+     {
+         $res = $this->say_punctuation($text, $escape_digits, $frequency);
+         if($res['code'] == AGIRES_OK && $res['result'] > 0)
+           $buffer .= chr($res['result']);
+         return $res;
+     }
+     return array('code'=>AGIRES_OK, 'result'=>ord($buffer{strlen($buffer)-1}));
+    }
+
+    /**
+    * Plays the given file and receives DTMF data.
+    * Return early if $buffer is adequate for request.
+    *
+    * This is similar to STREAM FILE, but this command can accept and return many DTMF digits,
+    * while STREAM FILE returns immediately after the first DTMF digit is detected.
+    *
+    * Asterisk looks for the file to play in /var/lib/asterisk/sounds by default.
+    *
+    * If the user doesn't press any keys when the message plays, there is $timeout milliseconds
+    * of silence then the command ends.
+    *
+    * The user has the opportunity to press a key at any time during the message or the
+    * post-message silence. If the user presses a key while the message is playing, the
+    * message stops playing. When the first key is pressed a timer starts counting for
+    * $timeout milliseconds. Every time the user presses another key the timer is restarted.
+    * The command ends when the counter goes to zero or the maximum number of digits is entered,
+    * whichever happens first.
+    *
+    * If you don't specify a time out then a default timeout of 2000 is used following a pressed
+    * digit. If no digits are pressed then 6 seconds of silence follow the message.
+    *
+    * If you don't specify $max_digits then the user can enter as many digits as they want.
+    *
+    * Pressing the # key has the same effect as the timer running out: the command ends and
+    * any previously keyed digits are returned. A side effect of this is that there is no
+    * way to read a # key using this command.
+    *
+    * @link http://www.voip-info.org/wiki-get+data
+    * @param string $buffer
+    * @param string $filename file to play. Do not include file extension.
+    * @param integer $timeout milliseconds
+    * @param integer $max_digits
+    * @return array, see evaluate for return information. ['result'] holds the digits and ['data'] holds the timeout if present.
+    *
+    * This differs from other commands with return DTMF as numbers representing ASCII characters.
+    */
+    function fastpass_get_data(&$buffer, $filename, $timeout=NULL, $max_digits=NULL)
+    {
+     if(is_null($max_digits) || strlen($buffer) < $max_digits)
+     {
+         if($buffer == '')
+         {
+           $res = $this->get_data($filename, $timeout, $max_digits);
+           if($res['code'] == AGIRES_OK)
+             $buffer .= $res['result'];
+           return $res;
+         }
+         else
+         {
+           while(is_null($max_digits) || strlen($buffer) < $max_digits)
+           {
+             $res = $this->wait_for_digit();
+             if($res['code'] != AGIRES_OK) return $res;
+             if($res['result'] == ord('#')) break;
+             $buffer .= chr($res['result']);
+           }
+         }
+     }
+     return array('code'=>AGIRES_OK, 'result'=>$buffer);
+    }
+
+    // *********************************************************************************************************
+    // **                             DERIVED                                                                                             **
+    // *********************************************************************************************************
+
+    /**
+    * Menu.
+    *
+    * This function presents the user with a menu and reads the response
+    *
+    * @param array $choices has the following structure:
+    *   array('1'=>'*Press 1 for this', // festival reads if prompt starts with *
+    *           '2'=>'some-gsm-without-extension',
+    *           '*'=>'*Press star for help');
+    * @return mixed key pressed on sucess, -1 on failure
+    */
+    function menu($choices, $timeout=2000)
+    {
+        $keys = join('', array_keys($choices));
+        $choice = NULL;
+        while(is_null($choice))
+        {
+          foreach($choices as $prompt)
+          {
+            if($prompt{0} == '*')
+                $ret = $this->text2wav(substr($prompt, 1), $keys);
+            else
+                $ret = $this->stream_file($prompt, $keys);
+
+            if($ret['code'] != AGIRES_OK || $ret['result'] == -1)
+            {
+                $choice = -1;
+                break;
+            }
+
+            if($ret['result'] != 0)
+            {
+                $choice = chr($ret['result']);
+                break;
+            }
+          }
+
+          if(is_null($choice))
+          {
+            $ret = $this->get_data('beep', $timeout, 1);
+            if($ret['code'] != AGIRES_OK || $ret['result'] == -1)
+                $choice = -1;
+            elseif($ret['result'] != '' && strpos(' '.$keys, $ret['result']))
+                $choice = $ret['result'];
+          }
+        }
+        return $choice;
+    }
+
+    /**
+    * setContext - Set context, extension and priority.
+    *
+    * @param string $context
+    * @param string $extension
+    * @param string $priority
+    */
+    function setContext($context, $extension='s', $priority=1)
+    {
+        $this->set_context($context);
+        $this->set_extension($extension);
+        $this->set_priority($priority);
+    }
+
+    /**
+    * Parse caller id.
+    *
+    * @example examples/dtmf.php Get DTMF tones from the user and say the digits
+    * @example examples/input.php Get text input from the user and say it back
+    *
+    * "name" <proto:user@server:port>
+    *
+    * @param string $callerid
+    * @return array('Name'=>$name, 'Number'=>$number)
+    */
+    function parse_callerid($callerid=NULL)
+    {
+        if(is_null($callerid))
+          $callerid = $this->request['agi_callerid'];
+
+        $ret = array('name'=>'', 'protocol'=>'', 'username'=>'', 'host'=>'', 'port'=>'');
+        $callerid = trim($callerid);
+
+        if($callerid{0} == '"' || $callerid{0} == "'")
+        {
+          $d = $callerid{0};
+          $callerid = explode($d, substr($callerid, 1));
+          $ret['name'] = array_shift($callerid);
+          $callerid = join($d, $callerid);
+        }
+
+        $callerid = explode('@', trim($callerid, '<> '));
+        $username  = explode(':', array_shift($callerid));
+        if(count($username) == 1)
+          $ret['username'] = $username[0];
+        else
+        {
+          $ret['protocol'] = array_shift($username);
+          $ret['username'] = join(':', $username);
+        }
+
+        $callerid = join('@', $callerid);
+        $host = explode(':', $callerid);
+        if(count($host) == 1)
+          $ret['host'] =  $host[0];
+        else
+        {
+          $ret['host'] = array_shift($host);
+          $ret['port'] = join(':', $host);
+        }
+
+        return $ret;
+    }
+
+    /**
+    * Use festival to read text.
+    *
+    * @example examples/dtmf.php Get DTMF tones from the user and say the digits
+    * @example examples/input.php Get text input from the user and say it back
+    * @example examples/ping.php Ping an IP address
+    *
+    * @link http://www.cstr.ed.ac.uk/projects/festival/
+    * @param string $text
+    * @param string $escape_digits
+    * @param integer $frequency
+    * @return array, see evaluate for return information.
+    */
+    function text2wav($text, $escape_digits='', $frequency=8000)
+    {
+        $text = trim($text);
+        if($text == '') return true;
+
+        $hash = md5($text);
+        $fname = $this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR;
+        $fname .= 'text2wav_' . $hash;
+
+        // create wave file
+        if(!file_exists("$fname.wav"))
+        {
+          // write text file
+          if(!file_exists("$fname.txt"))
+          {
+            $fp = fopen("$fname.txt", 'w');
+            fputs($fp, $text);
+            fclose($fp);
+          }
+
+          shell_exec("{$this->config['festival']['text2wave']} -F $frequency -o $fname.wav $fname.txt");
+        }
+        else
+        {
+          touch("$fname.txt");
+          touch("$fname.wav");
+        }
+
+        // stream it
+        $ret = $this->stream_file($fname, $escape_digits);
+
+        // clean up old files
+        $delete = time() - 2592000; // 1 month
+        foreach(glob($this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR . 'text2wav_*') as $file)
+          if(filemtime($file) < $delete)
+            unlink($file);
+
+        return $ret;
+    }
+
+    /**
+    * Use Cepstral Swift to read text.
+    *
+    * @link http://www.cepstral.com/
+    * @param string $text
+    * @param string $escape_digits
+    * @param integer $frequency
+    * @return array, see evaluate for return information.
+    */
+    function swift($text, $escape_digits='', $frequency=8000, $voice=NULL)
+    {
+        if(!is_null($voice))
+          $voice = "-n $voice";
+        elseif(isset($this->config['cepstral']['voice']))
+          $voice = "-n {$this->config['cepstral']['voice']}";
+
+        $text = trim($text);
+        if($text == '') return true;
+
+        $hash = md5($text);
+        $fname = $this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR;
+        $fname .= 'swift_' . $hash;
+
+        // create wave file
+        if(!file_exists("$fname.wav"))
+        {
+          // write text file
+          if(!file_exists("$fname.txt"))
+          {
+            $fp = fopen("$fname.txt", 'w');
+            fputs($fp, $text);
+            fclose($fp);
+          }
+
+          shell_exec("{$this->config['cepstral']['swift']} -p audio/channels=1,audio/sampling-rate=$frequency $voice -o $fname.wav -f $fname.txt");
+        }
+
+        // stream it
+        $ret = $this->stream_file($fname, $escape_digits);
+
+        // clean up old files
+        $delete = time() - 2592000; // 1 month
+        foreach(glob($this->config['phpagi']['tempdir'] . DIRECTORY_SEPARATOR . 'swift_*') as $file)
+          if(filemtime($file) < $delete)
+            unlink($file);
+
+        return $ret;
+    }
+
+    /**
+    * Text Input.
+    *
+    * Based on ideas found at http://www.voip-info.org/wiki-Asterisk+cmd+DTMFToText
+    *
+    * Example:
+    *                  UC   H     LC   i        ,     SP   h     o        w    SP   a    r        e     SP   y        o        u     ?
+    *   $string = '*8'.'44*'.'*5'.'444*'.'00*'.'0*'.'44*'.'666*'.'9*'.'0*'.'2*'.'777*'.'33*'.'0*'.'999*'.'666*'.'88*'.'0000*';
+    *
+    * @link http://www.voip-info.org/wiki-Asterisk+cmd+DTMFToText
+    * @example examples/input.php Get text input from the user and say it back
+    *
+    * @return string
+    */
+    function text_input($mode='NUMERIC')
+    {
+        $alpha = array( 'k0'=>' ', 'k00'=>',', 'k000'=>'.', 'k0000'=>'?', 'k00000'=>'0',
+                            'k1'=>'!', 'k11'=>':', 'k111'=>';', 'k1111'=>'#', 'k11111'=>'1',
+                            'k2'=>'A', 'k22'=>'B', 'k222'=>'C', 'k2222'=>'2',
+                            'k3'=>'D', 'k33'=>'E', 'k333'=>'F', 'k3333'=>'3',
+                            'k4'=>'G', 'k44'=>'H', 'k444'=>'I', 'k4444'=>'4',
+                            'k5'=>'J', 'k55'=>'K', 'k555'=>'L', 'k5555'=>'5',
+                            'k6'=>'M', 'k66'=>'N', 'k666'=>'O', 'k6666'=>'6',
+                            'k7'=>'P', 'k77'=>'Q', 'k777'=>'R', 'k7777'=>'S', 'k77777'=>'7',
+                            'k8'=>'T', 'k88'=>'U', 'k888'=>'V', 'k8888'=>'8',
+                            'k9'=>'W', 'k99'=>'X', 'k999'=>'Y', 'k9999'=>'Z', 'k99999'=>'9');
+        $symbol = array('k0'=>'=',
+                            'k1'=>'<', 'k11'=>'(', 'k111'=>'[', 'k1111'=>'{', 'k11111'=>'1',
+                            'k2'=>'@', 'k22'=>'$', 'k222'=>'&', 'k2222'=>'%', 'k22222'=>'2',
+                            'k3'=>'>', 'k33'=>')', 'k333'=>']', 'k3333'=>'}', 'k33333'=>'3',
+                            'k4'=>'+', 'k44'=>'-', 'k444'=>'*', 'k4444'=>'/', 'k44444'=>'4',
+                            'k5'=>"'", 'k55'=>'`', 'k555'=>'5',
+                            'k6'=>'"', 'k66'=>'6',
+                            'k7'=>'^', 'k77'=>'7',
+                            'k8'=>"\\",'k88'=>'|', 'k888'=>'8',
+                            'k9'=>'_', 'k99'=>'~', 'k999'=>'9');
+        $text = '';
+        do
+        {
+          $command = false;
+          $result = $this->get_data('beep');
+          foreach(explode('*', $result['result']) as $code)
+          {
+            if($command)
+            {
+                switch($code{0})
+                {
+                  case '2': $text = substr($text, 0, strlen($text) - 1); break; // backspace
+                  case '5': $mode = 'LOWERCASE'; break;
+                  case '6': $mode = 'NUMERIC'; break;
+                  case '7': $mode = 'SYMBOL'; break;
+                  case '8': $mode = 'UPPERCASE'; break;
+                  case '9': $text = explode(' ', $text); unset($text[count($text)-1]); $text = join(' ', $text); break; // backspace a word
+                }
+                $code = substr($code, 1);
+                $command = false;
+            }
+            if($code == '')
+                $command = true;
+            elseif($mode == 'NUMERIC')
+                $text .= $code;
+            elseif($mode == 'UPPERCASE' && isset($alpha['k'.$code]))
+                $text .= $alpha['k'.$code];
+            elseif($mode == 'LOWERCASE' && isset($alpha['k'.$code]))
+                $text .= strtolower($alpha['k'.$code]);
+            elseif($mode == 'SYMBOL' && isset($symbol['k'.$code]))
+                $text .= $symbol['k'.$code];
+          }
+          $this->say_punctuation($text);
+        } while(substr($result['result'], -2) == '**');
+        return $text;
+    }
+
+    /**
+    * Say Puncutation in a string.
+    *
+    * @param string $text
+    * @param string $escape_digits
+    * @param integer $frequency
+    * @return array, see evaluate for return information.
+    */
+    function say_punctuation($text, $escape_digits='', $frequency=8000)
+    {
+        $ret="";
+        for($i = 0; $i < strlen($text); $i++)
+        {
+          switch($text{$i})
+          {
+            case ' ': $ret .= 'SPACE ';
+            case ',': $ret .= 'COMMA '; break;
+            case '.': $ret .= 'PERIOD '; break;
+            case '?': $ret .= 'QUESTION MARK '; break;
+            case '!': $ret .= 'EXPLANATION POINT '; break;
+            case ':': $ret .= 'COLON '; break;
+            case ';': $ret .= 'SEMICOLON '; break;
+            case '#': $ret .= 'POUND '; break;
+            case '=': $ret .= 'EQUALS '; break;
+            case '<': $ret .= 'LESS THAN '; break;
+            case '(': $ret .= 'LEFT PARENTHESIS '; break;
+            case '[': $ret .= 'LEFT BRACKET '; break;
+            case '{': $ret .= 'LEFT BRACE '; break;
+            case '@': $ret .= 'AT '; break;
+            case '$': $ret .= 'DOLLAR SIGN '; break;
+            case '&': $ret .= 'AMPERSAND '; break;
+            case '%': $ret .= 'PERCENT '; break;
+            case '>': $ret .= 'GREATER THAN '; break;
+            case ')': $ret .= 'RIGHT PARENTHESIS '; break;
+            case ']': $ret .= 'RIGHT BRACKET '; break;
+            case '}': $ret .= 'RIGHT BRACE '; break;
+            case '+': $ret .= 'PLUS '; break;
+            case '-': $ret .= 'MINUS '; break;
+            case '*': $ret .= 'ASTERISK '; break;
+            case '/': $ret .= 'SLASH '; break;
+            case "'": $ret .= 'SINGLE QUOTE '; break;
+            case '`': $ret .= 'BACK TICK '; break;
+            case '"': $ret .= 'QUOTE '; break;
+            case '^': $ret .= 'CAROT '; break;
+            case "\\": $ret .= 'BACK SLASH '; break;
+            case '|': $ret .= 'BAR '; break;
+            case '_': $ret .= 'UNDERSCORE '; break;
+            case '~': $ret .= 'TILDE '; break;
+            default: $ret .= $text{$i} . ' '; break;
+          }
+        }
+        return $this->text2wav($ret, $escape_digits, $frequency);
+    }
+
+    /**
+    * Create a new AGI_AsteriskManager.
+    */
+    function &new_AsteriskManager()
+    {
+        $this->asm = new AGI_AsteriskManager(NULL, $this->config);
+        $this->asm->pagi =& $this;
+        $this->config =& $this->asm->config;
+        return $this->asm;
+    }
+
+
+    // *********************************************************************************************************
+    // **                             PRIVATE                                                                                             **
+    // *********************************************************************************************************
+
+
+    /**
+    * Evaluate an AGI command.
+    *
+    * @access private
+    * @param string $command
+    * @return array ('code'=>$code, 'result'=>$result, 'data'=>$data)
+    */
+    function evaluate($command)
+    {
+        $broken = array('code'=>500, 'result'=>-1, 'data'=>'');
+
+        // write command
+        if(!@fwrite($this->out, trim($command) . "\n")) return $broken;
+        fflush($this->out);
+
+        // Read result.  Occasionally, a command return a string followed by an extra new line.
+        // When this happens, our script will ignore the new line, but it will still be in the
+        // buffer.  So, if we get a blank line, it is probably the result of a previous
+        // command.  We read until we get a valid result or asterisk hangs up.  One offending
+        // command is SEND TEXT.
+        $count = 0;
+        do
+        {
+          $str = trim(fgets($this->in, 4096));
+        } while($str == '' && $count++ < 5);
+
+        if($count >= 5)
+        {
+    //          $this->conlog("evaluate error on read for $command");
+          return $broken;
+        }
+
+        // parse result
+        $ret['code'] = substr($str, 0, 3);
+        $str = trim(substr($str, 3));
+
+        if($str{0} == '-') // we have a multiline response!
+        {
+          $count = 0;
+          $str = substr($str, 1) . "\n";
+          $line = fgets($this->in, 4096);
+          while(substr($line, 0, 3) != $ret['code'] && $count < 5)
+          {
+            $str .= $line;
+            $line = fgets($this->in, 4096);
+            $count = (trim($line) == '') ? $count + 1 : 0;
+          }
+          if($count >= 5)
+          {
+    //            $this->conlog("evaluate error on multiline read for $command");
+            return $broken;
+          }
+        }
+
+        $ret['result'] = NULL;
+        $ret['data'] = '';
+        if($ret['code'] != AGIRES_OK) // some sort of error
+        {
+          $ret['data'] = $str;
+          $this->conlog(print_r($ret, true));
+        }
+        else // normal AGIRES_OK response
+        {
+          $parse = explode(' ', trim($str));
+          $in_token = false;
+          foreach($parse as $token)
+          {
+            if($in_token) // we previously hit a token starting with ')' but not ending in ')'
+            {
+                $ret['data'] .= ' ' . trim($token, '() ');
+                if($token{strlen($token)-1} == ')') $in_token = false;
+            }
+            elseif($token{0} == '(')
+            {
+                if($token{strlen($token)-1} != ')') $in_token = true;
+                $ret['data'] .= ' ' . trim($token, '() ');
+            }
+            elseif(strpos($token, '='))
+            {
+                $token = explode('=', $token);
+                $ret[$token[0]] = $token[1];
+            }
+            elseif($token != '')
+                $ret['data'] .= ' ' . $token;
+          }
+          $ret['data'] = trim($ret['data']);
+        }
+
+        // log some errors
+        if($ret['result'] < 0)
+          $this->conlog("$command returned {$ret['result']}");
+
+        return $ret;
+    }
+
+    /**
+    * Log to console if debug mode.
+    *
+    * @example examples/ping.php Ping an IP address
+    *
+    * @param string $str
+    * @param integer $vbl verbose level
+    */
+    function conlog($str, $vbl=1)
+    {
+        static $busy = false;
+
+        if($this->config['phpagi']['debug'] != false)
+        {
+          if(!$busy) // no conlogs inside conlog!!!
+          {
+            $busy = true;
+            $this->verbose($str, $vbl);
+            $busy = false;
+          }
+        }
+    }
+
+    /**
+    * Find an execuable in the path.
+    *
+    * @access private
+    * @param string $cmd command to find
+    * @param string $checkpath path to check
+    * @return string the path to the command
+    */
+    function which($cmd, $checkpath=NULL)
+    {
+        global $_ENV;
+        $chpath = is_null($checkpath) ? $_ENV['PATH'] : $checkpath;
+
+        foreach(explode(':', $chpath) as $path)
+          if(is_executable("$path/$cmd"))
+            return "$path/$cmd";
+
+        if(is_null($checkpath))
+          return $this->which($cmd, '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:'.
+                                            '/usr/X11R6/bin:/usr/local/apache/bin:/usr/local/mysql/bin');
+        return false;
+    }
+
+    /**
+    * Make a folder recursively.
+    *
+    * @access private
+    * @param string $folder
+    * @param integer $perms
+    * @return boolean 
+    */
+    function make_folder($folder, $perms=0755)
+    {
+        $f = explode(DIRECTORY_SEPARATOR, $folder);
+        $base = '';
+        for($i = 0; $i < count($f); $i++)
+        {
+          $base .= $f[$i];
+          if($f[$i] != '' && !file_exists($base)) {
+            if(mkdir($base, $perms)==FALSE){
+              return(FALSE);
+            }
+          }
+          $base .= DIRECTORY_SEPARATOR;
+        }
+        return(TRUE);
+    }	
+
+}
+
+
+/**
+ * error handler for phpagi.
+ *
+ * @param integer $level PHP error level
+ * @param string $message error message
+ * @param string $file path to file
+ * @param integer $line line number of error
+ * @param array $context variables in the current scope
+ */
+  function phpagi_error_handler($level, $message, $file, $line, $context)
+  {
+    if(ini_get('error_reporting') == 0) return; // this happens with an @
+
+    @syslog(LOG_WARNING, $file . '[' . $line . ']: ' . $message);
+
+    global $phpagi_error_handler_email;
+    if(function_exists('mail') && !is_null($phpagi_error_handler_email)) // generate email debugging information
+    {
+        // decode error level
+        switch($level)
+        {
+          case E_WARNING:
+          case E_USER_WARNING:
+            $level = "Warning";
+            break;
+          case E_NOTICE:
+          case E_USER_NOTICE:
+            $level = "Notice";
+            break;
+          case E_USER_ERROR:
+            $level = "Error";
+            break;
+        }
+
+        // build message
+        $basefile = basename($file);
+        $subject = "$basefile/$line/$level: $message";
+        $message = "$level: $message in $file on line $line\n\n";
+
+        if(function_exists('mysql_errno') && strpos(' '.strtolower($message), 'mysql'))
+          $message .= 'MySQL error ' . mysql_errno() . ": " . mysql_error() . "\n\n";
+
+        // figure out who we are
+        if(function_exists('socket_create'))
+        {
+          $addr = NULL;
+          $port = 80;
+          $socket = @socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
+          @socket_connect($socket, '64.0.0.0', $port);
+          @socket_getsockname($socket, $addr, $port);
+          @socket_close($socket);
+          $message .= "\n\nIP Address: $addr\n";
+        }
+
+        // include variables
+        $message .= "\n\nContext:\n" . print_r($context, true);
+        $message .= "\n\nGLOBALS:\n" . print_r($GLOBALS, true);
+        $message .= "\n\nBacktrace:\n" . print_r(debug_backtrace(), true);
+
+        // include code fragment
+        if(file_exists($file))
+        {
+          $message .= "\n\n$file:\n";
+          $code = @file($file);
+          for($i = max(0, $line - 10); $i < min($line + 10, count($code)); $i++)
+            $message .= ($i + 1)."\t$code[$i]";
+        }
+
+        // make sure message is fully readable (convert unprintable chars to hex representation)
+        $ret = '';
+        for($i = 0; $i < strlen($message); $i++)
+        {
+          $c = ord($message{$i});
+          if($c == 10 || $c == 13 || $c == 9)
+            $ret .= $message{$i};
+          elseif($c < 16)
+            $ret .= '\x0' . dechex($c);
+          elseif($c < 32 || $c > 127)
+            $ret .= '\x' . dechex($c);
+          else
+            $ret .= $message{$i};
+        }
+        $message = $ret;
+
+        // send the mail if less than 5 errors
+        static $mailcount = 0;
+        if($mailcount < 5)
+          @mail($phpagi_error_handler_email, $subject, $message);
+        $mailcount++;
+    }
+  }
+
+  $phpagi_error_handler_email = NULL;
+
diff --git a/Cronjobs/a2billing_alarm.php b/Cronjobs/a2billing_alarm.php
index 04689e828..22d1ca8d6 100755
--- a/Cronjobs/a2billing_alarm.php
+++ b/Cronjobs/a2billing_alarm.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/Cronjobs/a2billing_archive_data_cront.php b/Cronjobs/a2billing_archive_data_cront.php
old mode 100644
new mode 100755
index ff9ac67bb..12a3c3d8a
--- a/Cronjobs/a2billing_archive_data_cront.php
+++ b/Cronjobs/a2billing_archive_data_cront.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -66,10 +66,10 @@
 
 $pH= new ProcessHandler();
 if ($pH->isActive()) {
-        die(); // Already running!
-        } else {
-                $pH->activate();
-                }
+    die(); // Already running!
+} else {
+    $pH->activate();
+}
 
 $A2B = new A2Billing();
 $A2B->load_conf($agi, NULL, 0, $idconfig);
diff --git a/Cronjobs/a2billing_autorefill.php b/Cronjobs/a2billing_autorefill.php
index c8625a709..64273170a 100755
--- a/Cronjobs/a2billing_autorefill.php
+++ b/Cronjobs/a2billing_autorefill.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -67,10 +67,10 @@
 // CHECK IF THE CRONT PROCESS IS ALREADY RUNNING
 $pH= new ProcessHandler();
 if ($pH->isActive()) {
-        die(); // Already running!
-        } else {
-                $pH->activate();
-                }
+    die(); // Already running!
+} else {
+    $pH->activate();
+}
 
 $verbose_level = 0;
 $groupcard = 5000;
diff --git a/Cronjobs/a2billing_batch_autodialer.php b/Cronjobs/a2billing_batch_autodialer.php
index af4d5f368..fa356a484 100755
--- a/Cronjobs/a2billing_batch_autodialer.php
+++ b/Cronjobs/a2billing_batch_autodialer.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -71,10 +71,10 @@
 // CHECK IF THE CRONT PROCESS IS ALREADY RUNNING
 $pH= new ProcessHandler();
 if ($pH->isActive()) {
-        die(); // Already running!
-        } else {
-                $pH->activate();
-                }
+    die(); // Already running!
+} else {
+    $pH->activate();
+}
 
 $verbose_level = 1;
 
@@ -259,8 +259,10 @@
                     $addparameter = $RateEngine->ratecard_obj[0][42 + $usetrunk_failover];
 
                     $destination = $phone["number"];
-                    if (strncmp($destination, $removeprefix, strlen($removeprefix)) == 0)
-                        $destination = substr($destination, strlen($removeprefix));
+                        
+                    // applying prefix rule(s)
+                    $destination = $A2B->removePrefix($removeprefix, $destination);
+                    $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[UPDATED DESTINATION: $destination]");
 
                     $pos_dialingnumber = strpos($ipaddress, '%dialingnumber%');
                     $ipaddress = str_replace("%cardnumber%", $A2B->cardnumber, $ipaddress);
diff --git a/Cronjobs/a2billing_batch_billing.php b/Cronjobs/a2billing_batch_billing.php
index cb89d86bd..04c45f91f 100755
--- a/Cronjobs/a2billing_batch_billing.php
+++ b/Cronjobs/a2billing_batch_billing.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -66,10 +66,10 @@
 // CHECK IF THE CRONT PROCESS IS ALREADY RUNNING
 $pH= new ProcessHandler();
 if ($pH->isActive()) {
-        die(); // Already running!
-        } else {
-                $pH->activate();
-                }
+    die(); // Already running!
+} else {
+    $pH->activate();
+}
 
 //Flag to show the debuging information
 $verbose_level = 0;
@@ -179,7 +179,7 @@
                 $clause_call_billing .= "stoptime >= '" . $result[0][1] . "' AND ";
                 $clause_charge .= "creationdate >= '" . $result[0][1] . "' AND  ";
                 $desc_billing = "Calls cost between the " . $result[0][1] . " and " . $date_now;
-                $desc_billing_postpaid = "Amount for period between the " .date("Y-m-d", strtotime($result[0][1]) + $oneday). " and " . $date_now;
+                $desc_billing_postpaid = "Amount for period between the " .date("Y-m-d", strtotime($result[0][1])). " and " . $date_now;
                 $start_date = $result[0][1];
                 $lastbilling_invoice = $result[0][2];
             } else {
diff --git a/Cronjobs/a2billing_batch_cache.php b/Cronjobs/a2billing_batch_cache.php
index 8a08351d4..1ff34f428 100755
--- a/Cronjobs/a2billing_batch_cache.php
+++ b/Cronjobs/a2billing_batch_cache.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -73,10 +73,10 @@
 // CHECK IF THE CRONT PROCESS IS ALREADY RUNNING
 $pH= new ProcessHandler();
 if ($pH->isActive()) {
-        die(); // Already running!
-        } else {
-                $pH->activate();
-                }
+    die(); // Already running!
+} else {
+    $pH->activate();
+}
 
 $verbose_level = 1;
 $nb_record = 100;
diff --git a/Cronjobs/a2billing_batch_process.php b/Cronjobs/a2billing_batch_process.php
index 692ea26d7..fe4518ce8 100755
--- a/Cronjobs/a2billing_batch_process.php
+++ b/Cronjobs/a2billing_batch_process.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -68,10 +68,10 @@
 // CHECK IF THE CRONT PROCESS IS ALREADY RUNNING
 $pH= new ProcessHandler();
 if ($pH->isActive()) {
-        die(); // Already running!
-        } else {
-                $pH->activate();
-                }
+    die(); // Already running!
+} else {
+    $pH->activate();
+}
 
 $verbose_level = 0;
 $groupcard = 1000;
@@ -98,7 +98,7 @@
 
 // CHECK THE SERVICES
 $QUERY = "SELECT DISTINCT id, name, amount, period, rule, daynumber, stopmode, maxnumbercycle, status, numberofrun, datecreate, " .
-        "UNIX_TIMESTAMP(datelastrun), emailreport, totalcredit, totalcardperform, dialplan, operate_mode, use_group " .
+        "UNIX_TIMESTAMP(datelastrun), emailreport, totalcredit, totalcardperform, dialplan, operate_mode, use_group, condition5x " .
         "FROM cc_service " .
         "WHERE status=1 $service_lastrun ORDER BY id DESC";
 if ($verbose_level >= 1)
@@ -139,6 +139,7 @@
     $dialplan		= $myservice[15];
     $operate_mode	= $myservice[16];
     $use_group		= $myservice[17];
+    $condition5x        = $myservice[18];
     $amount			= $myservice[2];
     $filter			= '';
     if ($verbose_level >= 1)
@@ -161,11 +162,17 @@
     if ($stopmode == 2) {
         $filter .= " -- NBSERVICE <= MAXNUMBERCYCLE  STOPMODE Max number of cycle reach
                 AND nbservice <= " . $myservice[7] ."\n";
-    }
-    if ($stopmode == 1) {
+    } else if ($stopmode == 1) {
         $filter .= " -- CREDIT <= 0 STOPMODE Account balance below zero
                         AND credit>0 \n";
+    } else if ($stopmode == 50) {
+        $filter .= " -- CREDIT > PARAM STOPMODE Account balance greater than parameter
+                        AND credit<$condition5x \n";
+    } else if ($stopmode == 51) {
+        $filter .= " -- CREDIT < PARAM STOPMODE Account balance less than parameter
+                        AND credit>$condition5x \n";
     }
+        
     // dialplan
     if ($dialplan > 0) {
         $filter .= " -- dialplan check
diff --git a/Cronjobs/a2billing_bill_diduse.php b/Cronjobs/a2billing_bill_diduse.php
index 2da6a91ae..1e447f663 100755
--- a/Cronjobs/a2billing_bill_diduse.php
+++ b/Cronjobs/a2billing_bill_diduse.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -66,10 +66,10 @@
 // CHECK IF THE CRONT PROCESS IS ALREADY RUNNING
 $pH= new ProcessHandler();
 if ($pH->isActive()) {
-        die(); // Already running!
-        } else {
-                $pH->activate();
-                }
+    die(); // Already running!
+} else {
+    $pH->activate();
+}
 
 $verbose_level = 0;
 
diff --git a/Cronjobs/a2billing_notify_account.php b/Cronjobs/a2billing_notify_account.php
index 08f7697ee..d3dc32b77 100755
--- a/Cronjobs/a2billing_notify_account.php
+++ b/Cronjobs/a2billing_notify_account.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -69,10 +69,10 @@
 // CHECK IF THE CRONT PROCESS IS ALREADY RUNNING
 $pH= new ProcessHandler();
 if ($pH->isActive()) {
-        die(); // Already running!
-        } else {
-                $pH->activate();
-                }
+    die(); // Already running!
+} else {
+    $pH->activate();
+}
 
 $verbose_level = 0;
 $groupcard = 5000;
diff --git a/Cronjobs/a2billing_subscription_fee.php b/Cronjobs/a2billing_subscription_fee.php
index 17e80009a..a5d524a67 100755
--- a/Cronjobs/a2billing_subscription_fee.php
+++ b/Cronjobs/a2billing_subscription_fee.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -68,10 +68,10 @@
 // CHECK IF THE CRONT PROCESS IS ALREADY RUNNING
 $pH= new ProcessHandler();
 if ($pH->isActive()) {
-        die(); // Already running!
-        } else {
-                $pH->activate();
-                }
+    die(); // Already running!
+} else {
+    $pH->activate();
+}
 
 $verbose_level = 1;
 
diff --git a/Cronjobs/currencies_update_yahoo.php b/Cronjobs/currencies_update_yahoo.php
index 0be2c581a..fc07d6fd5 100755
--- a/Cronjobs/currencies_update_yahoo.php
+++ b/Cronjobs/currencies_update_yahoo.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/DataBase/mysql-5.x/INFO b/DataBase/mysql-5.x/INFO
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.2.0-to-v1.2.2.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.2.0-to-v1.2.2.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.2.2-to-v1.2.3.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.2.2-to-v1.2.3.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.2.3-to-v1.3.0.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.2.3-to-v1.3.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.3.0-to-v1.3.1.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.3.0-to-v1.3.1.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.3.3-to-v1.3.4.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.3.3-to-v1.3.4.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.3.4-to-v1.4.0.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.3.4-to-v1.4.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.0-to-v1.4.1.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.0-to-v1.4.1.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.1-to-v1.4.2.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.1-to-v1.4.2.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.2-to-v1.4.3.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.2-to-v1.4.3.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.3-to-v1.4.4.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.3-to-v1.4.4.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.4-to-v1.4.4.1.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.4-to-v1.4.4.1.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.4.1-to-v1.4.5.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.4.1-to-v1.4.5.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.5-to-v1.5.0.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.4.5-to-v1.5.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.5.0-to-v1.5.1.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.5.0-to-v1.5.1.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.5.1-to-v1.6.0.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.5.1-to-v1.6.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.6.0-to-v1.6.1.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.6.0-to-v1.6.1.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.6.1-to-v1.6.2.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.6.1-to-v1.6.2.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.6.2-to-v1.7.0.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.6.2-to-v1.7.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.7.0-to-v1.7.1.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.7.0-to-v1.7.1.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.7.1-to-v1.7.2.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.7.1-to-v1.7.2.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.7.2-to-v1.8.0.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.7.2-to-v1.8.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.0-to-v1.8.1.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.0-to-v1.8.1.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.1-to-v1.8.2.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.1-to-v1.8.2.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.2-to-v1.8.3.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.2-to-v1.8.3.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.3-to-v1.8.4.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.3-to-v1.8.4.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.4-to-v1.8.5.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.4-to-v1.8.5.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.5-to-v1.8.6.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.5-to-v1.8.6.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.6-to-v1.9.0.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.8.6-to-v1.9.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.0-to-v1.9.1.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.0-to-v1.9.1.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.1-to-v1.9.2.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.1-to-v1.9.2.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.2-to-v1.9.3.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.2-to-v1.9.3.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.3-to-v1.9.4.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.3-to-v1.9.4.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.4-to-v1.9.5.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.4-to-v1.9.5.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.5-to-v2.0.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.5-to-v2.0.sql
index 0640d4eb7..ba6ce1612 100644
--- a/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.5-to-v2.0.sql
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v1.9.5-to-v2.0.sql
@@ -27,8 +27,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Contributed by Milan Benicek, SIPhone s.r.o., milan.benicek@siphone.cz
- *
 **/
 
 
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0-to-v2.0.3.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0-to-v2.0.3.sql
index bb7f21c4b..1b11dcb0d 100644
--- a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0-to-v2.0.3.sql
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0-to-v2.0.3.sql
@@ -27,8 +27,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Contributed by Milan Benicek, SIPhone s.r.o., milan.benicek@siphone.cz
- *
 **/
 
 
diff --git a/admin/Public/A2B_entity_campaign_config.php b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.10-to-v2.0.11.sql
old mode 100755
new mode 100644
similarity index 52%
rename from admin/Public/A2B_entity_campaign_config.php
rename to DataBase/mysql-5.x/UPDATE-a2billing-v2.0.10-to-v2.0.11.sql
index c1c28843f..d116c4240
--- a/admin/Public/A2B_entity_campaign_config.php
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.10-to-v2.0.11.sql
@@ -1,4 +1,3 @@
-<?php
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
@@ -28,45 +27,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
 **/
 
-include '../lib/admin.defines.php';
-include '../lib/admin.module.access.php';
-include '../lib/Form/Class.FormHandler.inc.php';
-include './form_data/FG_var_campaign_config.inc';
-include '../lib/admin.smarty.php';
-
-if (! has_rights (ACX_PREDICTIVE_DIALER)) {
-    Header ("HTTP/1.0 401 Unauthorized");
-    Header ("Location: PP_error.php?c=accessdenied");
-    die();
-}
-
-getpost_ifset(array('popup_select', 'popup_formname', 'popup_fieldname'));
-
-$HD_Form -> setDBHandler (DbConnect());
-$HD_Form -> init();
-
-if ($id!="" || !is_null($id)) {
-    $HD_Form -> FG_EDITION_CLAUSE = str_replace("%id", "$id", $HD_Form -> FG_EDITION_CLAUSE);
-}
-
-if (!isset($form_action))  $form_action="list"; //ask-add
-if (!isset($action)) $action = $form_action;
-
-$list = $HD_Form -> perform_action($form_action);
-
-// #### HEADER SECTION
-$smarty->display('main.tpl');
-
-// #### HELP SECTION
-echo $CC_help_campaign_config;
-
-// #### TOP SECTION PAGE
-$HD_Form -> create_toppage ($form_action);
-
-$HD_Form -> create_form ($form_action, $list, $id=null) ;
-
-// #### FOOTER SECTION
-if (!$popup_select) $smarty->display('footer.tpl');
+-- Update Version
+UPDATE cc_version SET version = '2.0.11';
diff --git a/admin/Public/A2B_entity_phonebook.php b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.11-to-v2.0.12.sql
old mode 100755
new mode 100644
similarity index 54%
rename from admin/Public/A2B_entity_phonebook.php
rename to DataBase/mysql-5.x/UPDATE-a2billing-v2.0.11-to-v2.0.12.sql
index e12621783..6ac57769b
--- a/admin/Public/A2B_entity_phonebook.php
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.11-to-v2.0.12.sql
@@ -1,4 +1,3 @@
-<?php
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
@@ -28,47 +27,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
 **/
 
-include '../lib/admin.defines.php';
-include '../lib/admin.module.access.php';
-include '../lib/Form/Class.FormHandler.inc.php';
-include './form_data/FG_var_phonebook.inc';
-include '../lib/admin.smarty.php';
-
-if (!has_rights(ACX_PREDICTIVE_DIALER)) {
-    Header("HTTP/1.0 401 Unauthorized");
-    Header("Location: PP_error.php?c=accessdenied");
-    die();
-}
-
-$HD_Form->setDBHandler(DbConnect());
-
-$HD_Form->init();
-
-if ($id != "" || !is_null($id)) {
-    $HD_Form->FG_EDITION_CLAUSE = str_replace("%id", "$id", $HD_Form->FG_EDITION_CLAUSE);
-}
-
-if (!isset ($form_action))
-    $form_action = "list"; //ask-add
-if (!isset ($action))
-    $action = $form_action;
-
-$list = $HD_Form->perform_action($form_action);
-
-// #### HEADER SECTION
-$smarty->display('main.tpl');
-
-// #### HELP SECTION
-echo $CC_help_phonebook;
-
-// #### TOP SECTION PAGE
-$HD_Form->create_toppage($form_action);
-
-$HD_Form->create_form($form_action, $list, $id = null);
+-- Update Version
+UPDATE cc_version SET version = '2.0.12';
 
-// #### FOOTER SECTION
-if (!$popup_select)
-    $smarty->display('footer.tpl');
+CREATE OR REPLACE VIEW cc_sip_buddies_empty AS
+     SELECT id, id_cc_card, name, accountcode, regexten, amaflags, callgroup, callerid, canreinvite, context, DEFAULTip, dtmfmode, fromuser, fromdomain, host, insecure, language, mailbox, '' as md5secret, nat, deny, permit, mask, pickupgroup, port, qualify, restrictcid, rtptimeout, rtpholdtimeout, '' as secret, type, username, disallow, allow, musiconhold, regseconds, ipaddr, cancallforward, fullcontact, setvar, regserver, lastms, defaultuser, auth, subscribemwi, vmexten, cid_number, callingpres, usereqphone, incominglimit, subscribecontext, musicclass, mohsuggest, allowtransfer, autoframing, maxcallbitrate, outboundproxy, rtpkeepalive, useragent, callbackextension
+     FROM cc_sip_buddies;
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.12-to-v2.0.13.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.12-to-v2.0.13.sql
new file mode 100644
index 000000000..bde135817
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.12-to-v2.0.13.sql
@@ -0,0 +1,33 @@
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * This file is part of A2Billing (http://www.a2billing.net/)
+ *
+ * A2Billing, Commercial Open Source Telecom Billing platform,
+ * powered by Star2billing S.L. <http://www.star2billing.com/>
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @author      Belaid Arezqui <areski@gmail.com>
+ * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
+ * @package     A2Billing
+ *
+ * Software License Agreement (GNU Affero General Public License)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.0.13';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.13-to-v2.0.14.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.13-to-v2.0.14.sql
new file mode 100644
index 000000000..ba37043cb
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.13-to-v2.0.14.sql
@@ -0,0 +1,33 @@
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * This file is part of A2Billing (http://www.a2billing.net/)
+ *
+ * A2Billing, Commercial Open Source Telecom Billing platform,
+ * powered by Star2billing S.L. <http://www.star2billing.com/>
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @author      Belaid Arezqui <areski@gmail.com>
+ * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
+ * @package     A2Billing
+ *
+ * Software License Agreement (GNU Affero General Public License)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.0.14';
diff --git a/customer/A2B_entity_campaign.php b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.14-to-v2.0.15.sql
similarity index 55%
rename from customer/A2B_entity_campaign.php
rename to DataBase/mysql-5.x/UPDATE-a2billing-v2.0.14-to-v2.0.15.sql
index 65bd0c538..bf9152eb6 100644
--- a/customer/A2B_entity_campaign.php
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.14-to-v2.0.15.sql
@@ -1,4 +1,3 @@
-<?php
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
@@ -28,45 +27,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- *
 **/
 
-include './lib/customer.defines.php';
-include './lib/customer.module.access.php';
-include './lib/Form/Class.FormHandler.inc.php';
-include './form_data/FG_var_campaign.inc';
-include 'lib/customer.smarty.php';
-
-if (!has_rights(ACX_AUTODIALER)) {
-    Header("HTTP/1.0 401 Unauthorized");
-    Header("Location: PP_error.php?c=accessdenied");
-    die();
-}
-
-$HD_Form->setDBHandler(DbConnect());
-$HD_Form->init();
-
-if ($id != "" || !is_null($id)) {
-    $HD_Form->FG_EDITION_CLAUSE = str_replace("%id", "$id", $HD_Form->FG_EDITION_CLAUSE);
-}
-
-if (!isset ($form_action))
-    $form_action = "list"; //ask-add
-if (!isset ($action))
-    $action = $form_action;
-
-$list = $HD_Form->perform_action($form_action);
-
-// #### HEADER SECTION
-$smarty->display('main.tpl');
-
-// #### HELP SECTION
-echo $CC_help_campaign;
-
-// #### TOP SECTION PAGE
-$HD_Form->create_toppage($form_action);
 
-$HD_Form->create_form($form_action, $list, $id = null);
+ALTER TABLE cc_call ADD a2b_custom1 VARCHAR( 20 );
+ALTER TABLE cc_call ADD a2b_custom2 VARCHAR( 20 );
 
-// #### FOOTER SECTION
-$smarty->display('footer.tpl');
+-- Update Version
+UPDATE cc_version SET version = '2.0.15';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.15-to-v2.0.16.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.15-to-v2.0.16.sql
new file mode 100644
index 000000000..b1d2a1a51
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.15-to-v2.0.16.sql
@@ -0,0 +1,33 @@
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * This file is part of A2Billing (http://www.a2billing.net/)
+ *
+ * A2Billing, Commercial Open Source Telecom Billing platform,
+ * powered by Star2billing S.L. <http://www.star2billing.com/>
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @author      Belaid Arezqui <areski@gmail.com>
+ * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
+ * @package     A2Billing
+ *
+ * Software License Agreement (GNU Affero General Public License)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.0.16';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.16-to-v2.0.17.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.16-to-v2.0.17.sql
new file mode 100644
index 000000000..eb463e566
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.16-to-v2.0.17.sql
@@ -0,0 +1,53 @@
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+* This file is part of A2Billing (http://www.a2billing.net/)
+*
+* A2Billing, Commercial Open Source Telecom Billing platform,
+* powered by Star2billing S.L. <http://www.star2billing.com/>
+*
+* @copyright Copyright (C) 2004-2012 - Star2billing S.L.
+* @author Belaid Arezqui <areski@gmail.com>
+* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html
+* @package A2Billing
+*
+* Software License Agreement (GNU Affero General Public License)
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+**/
+
+-- Add default account code setting
+DELETE FROM cc_config
+    WHERE config_key IN ('default_accountcode', 'default_accountcode_all');
+
+INSERT INTO cc_config SET
+    config_title       = 'Default Accountcode',
+    config_key         = 'default_accountcode',
+    config_value       = '',
+    config_description = 'The accountcode to apply to all calls using this AGI config. See default_accountcode_all for more control',
+    config_valuetype   = 0,
+    config_listvalues  = NULL,
+    config_group_title = 'agi-conf1';
+
+INSERT INTO cc_config SET
+    config_title       = 'Default Accountcode Behaviour',
+    config_key         = 'default_accountcode_all',
+    config_value       = '0',
+    config_description = 'Use the default accountcode for all calls, even if they have an accountcode already?',
+    config_valuetype   = '1',
+    config_listvalues  = 'yes,no',
+    config_group_title = 'agi-conf1';
+
+-- Update Version
+UPDATE cc_version SET version = '2.0.17';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.17-to-v2.1.0.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.17-to-v2.1.0.sql
new file mode 100644
index 000000000..fb32dec56
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.17-to-v2.1.0.sql
@@ -0,0 +1,31 @@
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+* This file is part of A2Billing (http://www.a2billing.net/)
+*
+* A2Billing, Commercial Open Source Telecom Billing platform,
+* powered by Star2billing S.L. <http://www.star2billing.com/>
+*
+* @copyright Copyright (C) 2004-2012 - Star2billing S.L.
+* @author Belaid Arezqui <areski@gmail.com>
+* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html
+* @package A2Billing
+*
+* Software License Agreement (GNU Affero General Public License)
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.1.0';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.3-to-v2.0.4.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.3-to-v2.0.4.sql
new file mode 100755
index 000000000..fe5442da8
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.3-to-v2.0.4.sql
@@ -0,0 +1,33 @@
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * This file is part of A2Billing (http://www.a2billing.net/)
+ *
+ * A2Billing, Commercial Open Source Telecom Billing platform,
+ * powered by Star2billing S.L. <http://www.star2billing.com/>
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @author      Belaid Arezqui <areski@gmail.com>
+ * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
+ * @package     A2Billing
+ *
+ * Software License Agreement (GNU Affero General Public License)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.0.4';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.4-to-v2.0.5.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.4-to-v2.0.5.sql
new file mode 100755
index 000000000..fd2263c2f
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.4-to-v2.0.5.sql
@@ -0,0 +1,33 @@
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * This file is part of A2Billing (http://www.a2billing.net/)
+ *
+ * A2Billing, Commercial Open Source Telecom Billing platform,
+ * powered by Star2billing S.L. <http://www.star2billing.com/>
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @author      Belaid Arezqui <areski@gmail.com>
+ * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
+ * @package     A2Billing
+ *
+ * Software License Agreement (GNU Affero General Public License)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.0.5';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.5-to-v2.0.6.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.5-to-v2.0.6.sql
new file mode 100755
index 000000000..81afdefae
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.5-to-v2.0.6.sql
@@ -0,0 +1,33 @@
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * This file is part of A2Billing (http://www.a2billing.net/)
+ *
+ * A2Billing, Commercial Open Source Telecom Billing platform,
+ * powered by Star2billing S.L. <http://www.star2billing.com/>
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @author      Belaid Arezqui <areski@gmail.com>
+ * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
+ * @package     A2Billing
+ *
+ * Software License Agreement (GNU Affero General Public License)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.0.6';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.6-to-v2.0.7.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.6-to-v2.0.7.sql
new file mode 100755
index 000000000..bb63d0fe4
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.6-to-v2.0.7.sql
@@ -0,0 +1,33 @@
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * This file is part of A2Billing (http://www.a2billing.net/)
+ *
+ * A2Billing, Commercial Open Source Telecom Billing platform,
+ * powered by Star2billing S.L. <http://www.star2billing.com/>
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @author      Belaid Arezqui <areski@gmail.com>
+ * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
+ * @package     A2Billing
+ *
+ * Software License Agreement (GNU Affero General Public License)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.0.7';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.7-to-v2.0.8.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.7-to-v2.0.8.sql
new file mode 100644
index 000000000..b165fbcba
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.7-to-v2.0.8.sql
@@ -0,0 +1,33 @@
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * This file is part of A2Billing (http://www.a2billing.net/)
+ *
+ * A2Billing, Commercial Open Source Telecom Billing platform,
+ * powered by Star2billing S.L. <http://www.star2billing.com/>
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @author      Belaid Arezqui <areski@gmail.com>
+ * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
+ * @package     A2Billing
+ *
+ * Software License Agreement (GNU Affero General Public License)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.0.8';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.8-to-v2.0.9.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.8-to-v2.0.9.sql
new file mode 100644
index 000000000..d66aa1a45
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.8-to-v2.0.9.sql
@@ -0,0 +1,33 @@
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * This file is part of A2Billing (http://www.a2billing.net/)
+ *
+ * A2Billing, Commercial Open Source Telecom Billing platform,
+ * powered by Star2billing S.L. <http://www.star2billing.com/>
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @author      Belaid Arezqui <areski@gmail.com>
+ * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
+ * @package     A2Billing
+ *
+ * Software License Agreement (GNU Affero General Public License)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.0.9';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.9-to-v2.0.10.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.9-to-v2.0.10.sql
new file mode 100644
index 000000000..8bb09c18f
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.0.9-to-v2.0.10.sql
@@ -0,0 +1,33 @@
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * This file is part of A2Billing (http://www.a2billing.net/)
+ *
+ * A2Billing, Commercial Open Source Telecom Billing platform,
+ * powered by Star2billing S.L. <http://www.star2billing.com/>
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @author      Belaid Arezqui <areski@gmail.com>
+ * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
+ * @package     A2Billing
+ *
+ * Software License Agreement (GNU Affero General Public License)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.0.10';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.0-to-v2.1.1.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.0-to-v2.1.1.sql
new file mode 100644
index 000000000..4ba637038
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.0-to-v2.1.1.sql
@@ -0,0 +1,31 @@
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+* This file is part of A2Billing (http://www.a2billing.net/)
+*
+* A2Billing, Commercial Open Source Telecom Billing platform,
+* powered by Star2billing S.L. <http://www.star2billing.com/>
+*
+* @copyright Copyright (C) 2004-2012 - Star2billing S.L.
+* @author Belaid Arezqui <areski@gmail.com>
+* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html
+* @package A2Billing
+*
+* Software License Agreement (GNU Affero General Public License)
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.1.1';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.1-to-v2.1.2.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.1-to-v2.1.2.sql
new file mode 100644
index 000000000..643a28a15
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.1-to-v2.1.2.sql
@@ -0,0 +1,31 @@
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+* This file is part of A2Billing (http://www.a2billing.net/)
+*
+* A2Billing, Commercial Open Source Telecom Billing platform,
+* powered by Star2billing S.L. <http://www.star2billing.com/>
+*
+* @copyright Copyright (C) 2004-2012 - Star2billing S.L.
+* @author Belaid Arezqui <areski@gmail.com>
+* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html
+* @package A2Billing
+*
+* Software License Agreement (GNU Affero General Public License)
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.1.2';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.2-to-v2.1.3.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.2-to-v2.1.3.sql
new file mode 100644
index 000000000..d9965f50e
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.2-to-v2.1.3.sql
@@ -0,0 +1,31 @@
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+* This file is part of A2Billing (http://www.a2billing.net/)
+*
+* A2Billing, Commercial Open Source Telecom Billing platform,
+* powered by Star2billing S.L. <http://www.star2billing.com/>
+*
+* @copyright Copyright (C) 2004-2012 - Star2billing S.L.
+* @author Belaid Arezqui <areski@gmail.com>
+* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html
+* @package A2Billing
+*
+* Software License Agreement (GNU Affero General Public License)
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.1.3';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.3-to-v2.1.4.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.3-to-v2.1.4.sql
new file mode 100644
index 000000000..ecac540d8
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.3-to-v2.1.4.sql
@@ -0,0 +1,31 @@
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+* This file is part of A2Billing (http://www.a2billing.net/)
+*
+* A2Billing, Commercial Open Source Telecom Billing platform,
+* powered by Star2billing S.L. <http://www.star2billing.com/>
+*
+* @copyright Copyright (C) 2004-2012 - Star2billing S.L.
+* @author Belaid Arezqui <areski@gmail.com>
+* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html
+* @package A2Billing
+*
+* Software License Agreement (GNU Affero General Public License)
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.1.4';
diff --git a/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.4-to-v2.2.0.sql b/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.4-to-v2.2.0.sql
new file mode 100644
index 000000000..5c3314edc
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-a2billing-v2.1.4-to-v2.2.0.sql
@@ -0,0 +1,31 @@
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+* This file is part of A2Billing (http://www.a2billing.net/)
+*
+* A2Billing, Commercial Open Source Telecom Billing platform,
+* powered by Star2billing S.L. <http://www.star2billing.com/>
+*
+* @copyright Copyright (C) 2004-2012 - Star2billing S.L.
+* @author Belaid Arezqui <areski@gmail.com>
+* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html
+* @package A2Billing
+*
+* Software License Agreement (GNU Affero General Public License)
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+**/
+
+-- Update Version
+UPDATE cc_version SET version = '2.2.0';
diff --git a/DataBase/mysql-5.x/UPDATE-to-develop.sql b/DataBase/mysql-5.x/UPDATE-to-develop.sql
new file mode 100755
index 000000000..c7b0c20a1
--- /dev/null
+++ b/DataBase/mysql-5.x/UPDATE-to-develop.sql
@@ -0,0 +1,130 @@
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * 2016 copyright Roman Davydov <openvoip.co@gmail.com>
+**/
+
+-- ICustomer bundle specific SQL changes
+
+alter table `cc_version`
+    add primary key(`version`);
+
+-- Openvoip.co customization SQL changes
+
+alter table `cc_trunk`
+    add column `minutes_per_day` int(11)   NULL DEFAULT '0' after `if_max_use`,
+    add column `attempt_statuses` varchar(255)  COLLATE utf8_bin NULL DEFAULT 'CHANUNAVAIL,CONGESTION' after `minutes_per_day`,
+    add column `attempt_condition` int(11) unsigned   NULL DEFAULT '0' after `attempt_statuses`,
+    add column `attempt_count` int(11) unsigned   NULL DEFAULT '0' after `attempt_condition`,
+    add column `priority` int(11)   NULL DEFAULT '0' after `attempt_count`,
+    add column `attempt_delay` int(11) DEFAULT '0' after `priority`,
+    add column `calls_per_day` int(11) DEFAULT '0' after `attempt_delay`,
+    add column `trunk_GMT` int(11) DEFAULT '0' after `calls_per_day`,
+    add column `tollfree` int(11)   NOT NULL DEFAULT '0' after `trunk_GMT`,
+    change `removeprefix` `removeprefix` varchar (2048)  NULL;
+
+CREATE TABLE `cc_trunk_counter` (
+    `id_trunk` int(10) unsigned NOT NULL,
+    `calldate` date NOT NULL,
+    `seconds` int(11) DEFAULT '0',
+    `last_call_time` int(11) NOT NULL DEFAULT '0',
+    `success_calls` int(11) DEFAULT '0',
+    `minutes` int(11) DEFAULT '0',
+    PRIMARY KEY (`id_trunk`,`calldate`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+alter table `cc_provider`
+    add column `id_cc_card` int(11)   NOT NULL DEFAULT '0' after `description`;
+
+alter table `cc_ratecard`
+    add column `is_disabled` int(1) unsigned   NOT NULL DEFAULT '0' after `destination`;
+
+alter table `cc_tariffplan`
+    add column `trunk_algo` int(10) unsigned   NULL DEFAULT '0' after `calleridprefix`,
+    add column `algo_break_hc` varchar (1024)  NULL  after `trunk_algo`;
+
+create table `cc_tariffplan_trunk`(
+    `idtariffplan` int(11) NOT NULL,
+    `idtrunk` int(11) NOT NULL,
+    PRIMARY KEY (`idtariffplan`,`idtrunk`)
+)Engine=MyISAM DEFAULT CHARSET='utf8';
+
+
+DELIMITER $$
+DROP FUNCTION IF EXISTS `a2billing`.`getCurDateByTrunkTZ`$$
+CREATE FUNCTION `a2billing`.`getCurDateByTrunkTZ`(id_trunk INT)
+RETURNS DATE DETERMINISTIC
+BEGIN
+    declare server_GMT varchar(10);
+    declare trunk_GMT varchar(10);
+
+    -- getting server GMT
+    select config_value into server_GMT from cc_config where config_key = 'server_GMT' and config_group_title = 'global' and (config_value REGEXP "^(GMT)?(\\-|\\+)[[:digit:]]{1,2}\\:[[:digit:]]{1,2}$") limit 1;
+    IF (ISNULL(server_GMT)) THEN
+        set server_GMT = '+00:00';
+    ELSE
+        IF SUBSTRING(server_GMT, 1, 3) LIKE 'gmt' THEN
+            set server_GMT = SUBSTRING(server_GMT, 4);
+        END IF;
+    END IF;
+
+    -- getting trunk GMT
+    select tz.gmttime into trunk_GMT from cc_timezone tz where tz.id = (select t.trunk_GMT from cc_trunk t where t.id_trunk = id_trunk limit 1) limit 1;
+    IF (ISNULL(trunk_GMT)) THEN
+        set trunk_GMT = '+00:00';
+    ELSE
+        IF SUBSTRING(trunk_GMT, 1, 3) LIKE 'gmt' THEN
+            set trunk_GMT = SUBSTRING(trunk_GMT, 4);
+        END IF;
+    END IF;
+
+    -- adjusting current date
+    return DATE(CONVERT_TZ(NOW(), server_GMT, trunk_GMT));
+
+END$$
+DELIMITER ;
+
+-- Reccuring service improvement, added new condition
+alter table cc_service add `condition5x` float NOT NULL DEFAULT '0';
+
+-- Create cc_auth_failures_log for Auth fails report
+CREATE TABLE `cc_auth_failures_log` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `cid` varchar(100) DEFAULT NULL,
+  `reason` varchar(100) NOT NULL,
+  `dump` text NOT NULL,
+  `id_card` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `cid` (`cid`),
+  KEY `created_at` (`created_at`),
+  KEY `reason` (`reason`),
+  FULLTEXT KEY `dump` (`dump`)
+) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+
+-- Insert new config parameter allowed_groups
+insert into cc_config
+(config_title, config_key, config_description, config_valuetype, config_group_title)
+values
+('Allowed card groups', 'allowed_groups', 'The list of allowed card groups to be authenticated. Just list groups IDs with commas, like "1,2,3,4". Allows all if empty', '0', 'agi-conf1');
+
+-- Insert new config parameter lock_useralias
+insert into cc_config
+(config_title, config_key, config_description, config_valuetype, config_value, config_listvalues, config_group_title)
+values
+('Lock useralias', 'lock_useralias', 'Disable WEBUI LOGIN field editing', '1', '0', 'yes,no', 'webui');
+
+-- Insert new config parameter customer_balance_precision
+insert into cc_config
+(config_title, config_key, config_value, config_description, config_valuetype, config_group_title)
+values
+('Customer balance precision', 'customer_balance_precision', '2', 'Only for displaying / saying', 0, 'global');
+
+-- Insert new config parameter force_rerouting
+insert into cc_config
+(config_title, config_key, config_description, config_valuetype, config_value, config_listvalues, config_group_title)
+values
+  ('Force rerouting', 'force_rerouting', 'If enabled the billing will stop rerouting only on ANSWER', '1', '0', 'yes,no', 'agi-conf1');
+
+-- END Openvoip.co customization SQL changes
diff --git a/DataBase/mysql-5.x/a2billing-createdb-user.sql b/DataBase/mysql-5.x/a2billing-createdb-user.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/a2billing-prefix-table-josko-v1.4.0.sql b/DataBase/mysql-5.x/a2billing-prefix-table-josko-v1.4.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/a2billing-prefix-table-v1.4.0.sql b/DataBase/mysql-5.x/a2billing-prefix-table-v1.4.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/mysql-5.x/a2billing-schema-v1.4.0.sql b/DataBase/mysql-5.x/a2billing-schema-v1.4.0.sql
old mode 100644
new mode 100755
index cd15aee33..c30f379f3
--- a/DataBase/mysql-5.x/a2billing-schema-v1.4.0.sql
+++ b/DataBase/mysql-5.x/a2billing-schema-v1.4.0.sql
@@ -1478,6 +1478,7 @@ INSERT INTO `cc_country` (`id`, `countrycode`, `countryprefix`, `countryname`) V
 INSERT INTO `cc_country` (`id`, `countrycode`, `countryprefix`, `countryname`) VALUES(253, 'SRB', '381', 'Serbia, Republic of');
 INSERT INTO `cc_country` (`id`, `countrycode`, `countryprefix`, `countryname`) VALUES(254, 'CPT', '0', 'Clipperton Island');
 INSERT INTO `cc_country` (`id`, `countrycode`, `countryprefix`, `countryname`) VALUES(255, 'TAA', '0', 'Tristan da Cunha');
+INSERT INTO `cc_country` (`id`, `countrycode`, `countryprefix`, `countryname`) VALUES(256, 'UNK', '381', 'Kosovo');
 
 -- --------------------------------------------------------
 
diff --git a/DataBase/mysql-5.x/install-db.sh b/DataBase/mysql-5.x/install-db.sh
index e2c3df7e7..786cbe677 100755
--- a/DataBase/mysql-5.x/install-db.sh
+++ b/DataBase/mysql-5.x/install-db.sh
@@ -1,8 +1,36 @@
 #!/bin/bash
+SCRIPT_DIR=$(dirname $0)
+sqllist=(
+    a2billing-schema-v1.4.0.sql UPDATE-a2billing-v1.4.0-to-v1.4.1.sql
+    UPDATE-a2billing-v1.4.1-to-v1.4.2.sql UPDATE-a2billing-v1.4.2-to-v1.4.3.sql
+    UPDATE-a2billing-v1.4.3-to-v1.4.4.sql UPDATE-a2billing-v1.4.4-to-v1.4.4.1.sql
+    UPDATE-a2billing-v1.4.4.1-to-v1.4.5.sql UPDATE-a2billing-v1.4.5-to-v1.5.0.sql
+    UPDATE-a2billing-v1.5.0-to-v1.5.1.sql UPDATE-a2billing-v1.5.1-to-v1.6.0.sql
+    UPDATE-a2billing-v1.6.0-to-v1.6.1.sql UPDATE-a2billing-v1.6.1-to-v1.6.2.sql
+    UPDATE-a2billing-v1.6.2-to-v1.7.0.sql UPDATE-a2billing-v1.7.0-to-v1.7.1.sql
+    UPDATE-a2billing-v1.7.1-to-v1.7.2.sql UPDATE-a2billing-v1.7.2-to-v1.8.0.sql
+    UPDATE-a2billing-v1.8.0-to-v1.8.1.sql UPDATE-a2billing-v1.8.1-to-v1.8.2.sql
+    UPDATE-a2billing-v1.8.2-to-v1.8.3.sql UPDATE-a2billing-v1.8.3-to-v1.8.4.sql
+    UPDATE-a2billing-v1.8.4-to-v1.8.5.sql UPDATE-a2billing-v1.8.5-to-v1.8.6.sql
+    UPDATE-a2billing-v1.8.6-to-v1.9.0.sql UPDATE-a2billing-v1.9.0-to-v1.9.1.sql
+    UPDATE-a2billing-v1.9.1-to-v1.9.2.sql UPDATE-a2billing-v1.9.2-to-v1.9.3.sql
+    UPDATE-a2billing-v1.9.3-to-v1.9.4.sql UPDATE-a2billing-v1.9.4-to-v1.9.5.sql
+    UPDATE-a2billing-v1.9.5-to-v2.0.sql UPDATE-a2billing-v2.0-to-v2.0.3.sql
+    UPDATE-a2billing-v2.0.3-to-v2.0.4.sql UPDATE-a2billing-v2.0.4-to-v2.0.5.sql
+    UPDATE-a2billing-v2.0.5-to-v2.0.6.sql UPDATE-a2billing-v2.0.6-to-v2.0.7.sql
+    UPDATE-a2billing-v2.0.7-to-v2.0.8.sql UPDATE-a2billing-v2.0.9-to-v2.0.10.sql
+    UPDATE-a2billing-v2.0.10-to-v2.0.11.sql UPDATE-a2billing-v2.0.11-to-v2.0.12.sql
+    UPDATE-a2billing-v2.0.12-to-v2.0.13.sql UPDATE-a2billing-v2.0.13-to-v2.0.14.sql
+    UPDATE-a2billing-v2.0.14-to-v2.0.15.sql UPDATE-a2billing-v2.0.15-to-v2.0.16.sql
+    UPDATE-a2billing-v2.0.16-to-v2.0.17.sql UPDATE-a2billing-v2.0.17-to-v2.1.0.sql
+    UPDATE-a2billing-v2.1.0-to-v2.1.1.sql UPDATE-a2billing-v2.1.1-to-v2.1.2.sql
+    UPDATE-a2billing-v2.1.2-to-v2.1.3.sql UPDATE-a2billing-v2.1.3-to-v2.1.4.sql
+    UPDATE-a2billing-v2.1.4-to-v2.2.0.sql
+)
 
 echo ""
-echo "Install A2Billing DataBase"
-echo "-----------------------------"
+echo "Install A2Billing Database"
+echo "--------------------------"
 echo ""
 
 echo "Enter Database Name : "
@@ -19,7 +47,12 @@ read password
 
 echo mysql --user=$username --password=$password --host=$hostname $dbname
 
-cat a2billing-schema-v1.4.0.sql UPDATE-a2billing-v1.4.0-to-v1.4.1.sql UPDATE-a2billing-v1.4.1-to-v1.4.2.sql UPDATE-a2billing-v1.4.2-to-v1.4.3.sql UPDATE-a2billing-v1.4.3-to-v1.4.4.sql UPDATE-a2billing-v1.4.4-to-v1.4.4.1.sql UPDATE-a2billing-v1.4.4.1-to-v1.4.5.sql UPDATE-a2billing-v1.4.5-to-v1.5.0.sql UPDATE-a2billing-v1.5.0-to-v1.5.1.sql UPDATE-a2billing-v1.5.1-to-v1.6.0.sql UPDATE-a2billing-v1.6.0-to-v1.6.1.sql UPDATE-a2billing-v1.6.1-to-v1.6.2.sql UPDATE-a2billing-v1.6.2-to-v1.7.0.sql UPDATE-a2billing-v1.7.0-to-v1.7.1.sql UPDATE-a2billing-v1.7.1-to-v1.7.2.sql UPDATE-a2billing-v1.7.2-to-v1.8.0.sql UPDATE-a2billing-v1.8.0-to-v1.8.1.sql UPDATE-a2billing-v1.8.1-to-v1.8.2.sql UPDATE-a2billing-v1.8.2-to-v1.8.3.sql UPDATE-a2billing-v1.8.3-to-v1.8.4.sql UPDATE-a2billing-v1.8.4-to-v1.8.5.sql UPDATE-a2billing-v1.8.5-to-v1.8.6.sql UPDATE-a2billing-v1.8.6-to-v1.9.0.sql UPDATE-a2billing-v1.9.0-to-v1.9.1.sql UPDATE-a2billing-v1.9.1-to-v1.9.2.sql UPDATE-a2billing-v1.9.2-to-v1.9.3.sql UPDATE-a2billing-v1.9.3-to-v1.9.4.sql UPDATE-a2billing-v1.9.4-to-v1.9.5.sql UPDATE-a2billing-v1.9.5-to-v2.0.sql UPDATE-a2billing-v2.0-to-v2.0.3.sql| mysql --user=$username --password=$password --host=$hostname $dbname
+for script in "${sqllist[@]}"
+do
+	cat $SCRIPT_DIR/$script|mysql --user=$username --password=$password --host=$hostname $dbname
+done
+
+[ ! -z "$1" ] && cat $SCRIPT_DIR/UPDATE-to-develop.sql | mysql --user=$username --password=$password --host=$hostname $dbname
 
 # All done, exit ok
 exit 0
diff --git a/DataBase/mysql-5.x/my-maintenance.sh b/DataBase/mysql-5.x/my-maintenance.sh
new file mode 100755
index 000000000..b5e165886
--- /dev/null
+++ b/DataBase/mysql-5.x/my-maintenance.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+echo ""
+echo "Maintenance A2Billing DataBase"
+echo "------------------------------"
+echo ""
+
+echo "Enter Database Name : "
+read dbname
+
+echo "Enter Hostname : "
+read hostname
+
+echo "Enter UserName : "
+read username
+
+echo "Enter Password : "
+read password
+
+NOW=$(date +"%m-%d-%Y")
+
+echo "Dump a2billing.$NOW.dmp in process..."
+mysqldump --user=$username --password=$password --host=$hostname --create-options --routines --triggers $dbname > a2billing.$NOW.dmp
+
+echo "Tar.gz a2billing.$NOW.dmp in process..."
+tar -pczf a2billing.$NOW.tar.gz a2billing.$NOW.dmp
+rm a2billing.$NOW.dmp
+
+echo "Database backup available at a2billing.$NOW.tar.gz"
+
+echo "mysqlcheck --user=$username --password=$password --host=$hostname --check --databases $dbname"
+mysqlcheck --user=$username --password=$password --host=$hostname --check --databases $dbname
+
+
+echo "mysqlcheck --user=$username --password=$password --host=$hostname --optimize --databases $dbname"
+mysqlcheck --user=$username --password=$password --host=$hostname --optimize --databases $dbname
+
+
+echo "mysqlcheck --user=$username --password=$password --host=$hostname --analyze --databases $dbname"
+mysqlcheck --user=$username --password=$password --host=$hostname --analyze --databases $dbname
diff --git a/DataBase/psql/INSTALL b/DataBase/psql/INSTALL
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.2.0-to-v1.2.3.sql b/DataBase/psql/UPDATE-a2billing-v1.2.0-to-v1.2.3.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.2.3-to-v1.3.0.sql b/DataBase/psql/UPDATE-a2billing-v1.2.3-to-v1.3.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.3.0-to-v1.3.1.sql b/DataBase/psql/UPDATE-a2billing-v1.3.0-to-v1.3.1.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.3.3-to-v1.3.4.sql b/DataBase/psql/UPDATE-a2billing-v1.3.3-to-v1.3.4.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.3.4-to-v1.4.0.sql b/DataBase/psql/UPDATE-a2billing-v1.3.4-to-v1.4.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.4.0-to-v1.4.1.sql b/DataBase/psql/UPDATE-a2billing-v1.4.0-to-v1.4.1.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.4.1-to-v1.4.2.sql b/DataBase/psql/UPDATE-a2billing-v1.4.1-to-v1.4.2.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.4.2-to-v1.4.3.sql b/DataBase/psql/UPDATE-a2billing-v1.4.2-to-v1.4.3.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.4.3-to-v1.4.4.sql b/DataBase/psql/UPDATE-a2billing-v1.4.3-to-v1.4.4.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.4.4-to-v1.4.4.1.sql b/DataBase/psql/UPDATE-a2billing-v1.4.4-to-v1.4.4.1.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.4.4.1-to-v1.4.5.sql b/DataBase/psql/UPDATE-a2billing-v1.4.4.1-to-v1.4.5.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.4.5-to-v1.5.0.sql b/DataBase/psql/UPDATE-a2billing-v1.4.5-to-v1.5.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.5.0-to-v1.5.1.sql b/DataBase/psql/UPDATE-a2billing-v1.5.0-to-v1.5.1.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.5.1-to-v1.6.0.sql b/DataBase/psql/UPDATE-a2billing-v1.5.1-to-v1.6.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.6.0-to-v1.6.1.sql b/DataBase/psql/UPDATE-a2billing-v1.6.0-to-v1.6.1.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.6.1-to-v1.6.2.sql b/DataBase/psql/UPDATE-a2billing-v1.6.1-to-v1.6.2.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/UPDATE-a2billing-v1.6.2-to-v1.7.0.sql b/DataBase/psql/UPDATE-a2billing-v1.6.2-to-v1.7.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/a2billing-createdb-user-v1.0.0.sql b/DataBase/psql/a2billing-createdb-user-v1.0.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/a2billing-createlang-v1.0.0.sql b/DataBase/psql/a2billing-createlang-v1.0.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/a2billing-prefix-table-josko-v1.4.0.sql b/DataBase/psql/a2billing-prefix-table-josko-v1.4.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/a2billing-prefix-table-v1.4.0.sql b/DataBase/psql/a2billing-prefix-table-v1.4.0.sql
old mode 100644
new mode 100755
diff --git a/DataBase/psql/a2billing-schema-v1.4.0.sql b/DataBase/psql/a2billing-schema-v1.4.0.sql
old mode 100644
new mode 100755
index 6e640ccd3..30a6b24c6
--- a/DataBase/psql/a2billing-schema-v1.4.0.sql
+++ b/DataBase/psql/a2billing-schema-v1.4.0.sql
@@ -766,7 +766,7 @@ CREATE TABLE cc_sip_buddies (
 );
 
 
--- Empty password view for OpenSips
+-- Empty password view for OpenSips / Kamailio
 CREATE OR REPLACE VIEW cc_sip_buddies_empty AS
   SELECT id, id_cc_card, name, accountcode, regexten, amaflags, callgroup, callerid, canreinvite, context,
   DEFAULTip, dtmfmode, fromuser, fromdomain, host, insecure, language, mailbox, md5secret, nat, permit,
diff --git a/INSTALL.rst b/INSTALL.rst
index b18eb46f3..b7f211813 100644
--- a/INSTALL.rst
+++ b/INSTALL.rst
@@ -7,15 +7,18 @@ A2BILLING INSTALLATION GUIDE
 0. Sypnosis
 -----------
 
-    A2Billing is a voip billing software licensed under the AGPL 3.
-    Copyright (C) 2004-2012 - Star2billing S.L. http://www.star2billing.com/
+A2Billing is a voip billing software licensed under the AGPL 3.
+Copyright (C) 2004-2015 - Star2billing S.L. http://www.star2billing.com/
 
-    This document focuses on the installation of A2Billing system for the Asterisk open source PBX. The document covers the installation and basic configuration of
-    A2Billing. A2billing is an open source implementation of a telecommunication billing and added value services platform.
+This document focuses on the installation of A2Billing system for the Asterisk
+open source PBX. The document covers the installation and basic configuration
+of A2Billing. A2billing is an open source implementation of a telecommunication
+billing and added value services platform.
 
-    A2billing is a LAMP (Linux Apache Mysql(Postgresql) PHP) application that interfaces with Asterisk using both the AMI and AGI interfaces.
+A2billing is a LAMP (Linux/Apache/Mysql/PHP) application that interfaces with
+Asterisk using both the AMI and AGI interfaces.
 
-    This documentation has been tested using Debian etch, Debian etch and half, Ubuntu 8.04 and Ubuntu 8.10 and A2Billing.
+This documentation has been tested using Ubuntu 12.04.
 
 
 1. A2Billing installation guide
@@ -24,60 +27,83 @@ A2BILLING INSTALLATION GUIDE
 1.1 Important note about distributions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    This documentation assumes that you are using a .deb based distro that has used the folder /usr/share/asterisk during packaging. Other distributions use the alternate
-    folder /var/lib/asterisk. If you compile from source the path by default is /var/lib/asterisk.
+This documentation assumes that you are using a .deb based distro that has used the folder /usr/share/asterisk during packaging. Other distributions use the alternate
+folder /var/lib/asterisk. If you compile from source the path by default is /var/lib/asterisk.
 
-    The basic assumptions of this documentation is that used pre-packaged software and:
-        * your apache2 default root folder is /var/www
-        * your asterisk sounds are under /usr/share/asterisk
-        * your asterisk AGI folder is expected under /usr/share/asterisk
-        * your apache2 runs as www-data (uid)
-        * you asterisk runs as asterisk (uid)
-        * those using subversion to check out the code, can use symbolic links instead of copying the files to the right directories
+The basic assumptions of this documentation is that used pre-packaged software and:
+    * your apache2 default root folder is /var/www
+    * your asterisk sounds are under /usr/share/asterisk
+    * your asterisk AGI folder is expected under /usr/share/asterisk
+    * your apache2 runs as www-data (uid)
+    * you asterisk runs as asterisk (uid)
+    * those using subversion to check out the code, can use symbolic links instead of copying the files to the right directories
 
 1.2 Default passwords and access info
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    This are the default passwords that you should know about
-        * mysql root password (in default system normally is <ENTER>)
-        * A2Billing default database is mya2billing, user is a2billinguser and password is a2billing
-        * asterisk manager default information is: [myasterisk] and secret=mycode
-        * A2Billing admin default password is: user: root password: changepassword
+This are the default passwords that you should know about:
+
+* mysql root password (in default system normally is <ENTER>)
+* A2Billing default database is mya2billing, user is a2billinguser and password is a2billing
+* asterisk manager default information is: [myasterisk] and secret=mycode
+* A2Billing admin default password is: user: root password: changepassword
 
 
 1.3 Pre-required software packages
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    A2billing requires the packages of a LAMP (PHP5) installation. To install the necessary packages, run the following commands:
-        - apt-get install libapache2-mod-php5 php5 php5-common
-        - apt-get install php5-cli php5-mysql mysql-server apache2 php5-gd
-        - apt-get install openssh-server subversion
 
-    A2Billing also requires MCrypt module for PHP5
-        - apt-get install php5-mcrypt
+A2billing requires the packages of a LAMP (PHP5) installation. To install
+the necessary packages, run the following commands::
+
+    apt-get install libapache2-mod-php5 php5 php5-common
+    apt-get install php5-cli php5-mysql mysql-server apache2 php5-gd
+    apt-get install openssh-server subversion
+
+A2Billing also requires MCrypt module for PHP5::
+
+    apt-get install php5-mcrypt
+
+Asterisk is of course also needed::
+
+    apt-get install asterisk
+
+1.3.1 Extra software to support text-to-speech IVR monitoring
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Since version 1.7 we include an AGI mode that allows the monitoring of
+the a2billing system via an IVR.
 
-    Asterisk is of course also needed.
-        - apt-get install asterisk
+The monitoring feature requires text-to-speech TTS support, the
+default TTS engine is Cepstral (http://www.cepstral.com/) although
+A2Billing can support Festival too.
 
-	1.3.1 Extra software to support text-to-speech IVR monitoring
+Install Cepstral (default path: /opt/swift) and make a symbolic link::
 
-        Version 1.7.1 includes a new AGI mode that allows the monitoring of the a2billing system via an IVR.
+    ln -s /opt/swift/bin/swift /usr/bin/swift
 
-        The new monitoring feature requires text-to-speech TTS support, the default TTS engine is Cepstral
-        http://www.cepstral.com/ although a2billing can support Festival too.
+Make sure that the dynamic libraries are linked, create a file called
+cepstral.conf under /etc/ld.so.conf.d/ including the path : /opt/swift/lib
 
-        Install Cepstral (default path: /opt/swift) and make a symbolic link:
-        - ln -s /opt/swift/bin/swift /usr/bin/swift
 
-        Make sure that the dynamic libraries are linked, create a file called cepstral.conf under /etc/ld.so.conf.d/ including the path : /opt/swift/lib
+1.3 PHP Composer
+~~~~~~~~~~~~~~~~
 
-        Do not forget to register your voice!
+A PHP dependency manager called Composer (https://getcomposer.org/) is used to
+install PHP packages needed for A2Billing.
 
 
+You can follow those steps to install PHP composer::
+
+    cd /usr/local/a2billing
+    curl -sS https://getcomposer.org/installer | php
+    php composer.phar update
+    php composer.phar install
+
 
 2. Installation
-~~~~~~~~~~~~~~~
+---------------
 
-    In a nutshell installing A2Billing requires a minimum of seven steps (1-7)
+In a nutshell installing A2Billing requires a minimum of seven steps (1-7)
 
     1. Download and unpack source code
     2. Setup the database
@@ -91,311 +117,384 @@ A2BILLING INSTALLATION GUIDE
     10. Enable monitoring (only for IVR monitoring)
     11. Enable card locking (only for card PIN locking)
 
-    2.1. Step 1: Download and unpack source code
 
-        Create a a2billing folder under /usr/local/src
+2.1. Step 1: Download and unpack source code
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Create a a2billing folder under /usr/local/src::
+
+    mkdir /usr/local/src/a2billing
+
+Unpack the code
+
+Download the code from the GIT repository run: ::
+
+    git clone https://github.com/Star2Billing/a2billing.git /usr/local/src/a2billing/ && rm -rf /usr/local/src/a2billing/.git
+
+At the end of this step you should have a a2billing tree structure that should look like::
+
+    /usr/local/src/a2billing/
+
+Files::
+
+    AGI
+    CHANGELOG
+    COPYING
+    CallBack
+    Cronjobs : Recurrent services run via crontab
+    DataBase : Database Schema / DB Installation
+    FEATURES_LIST
+    a2billing.conf : Main Configuration file
+    addons : Sounds and other addons
+    admin : Admin UI
+    agent : Agent UI
+    customer : Customer UI
+    webservice
+
+
+2.2. Step 2: Prepare the Database
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+We will now create a MySQL database (mya2billing) for the billing software. The file a2billing-createdb-user.sql includes a script that creates the database with the correct access control users and permissions. ::
+
+    cd /usr/local/src/a2billing
+    mysql -u root -p < DataBase/mysql-5.x/a2billing-createdb-user.sql
+
+The script with create a database, username and password with the following default values
+    - Database name is: mya2billing
+    - Database user is: a2billinguser
+    - User password is: a2billing
+
+After creating the database structure, we will create a set of tables and insert some initial basic configuration data::
+
+    cd DataBase/mysql-5.x/
+    ./install-db.sh
+
+**Checkpoint 1 :** Check that the database (my2billing) and that (97) tables have been created. ::
+
+    mysql -u root -p mya2billing
+    mysql>show tables
+    mysql>exit
+
+
+2.3. Step 3: Edit the a2billing.conf configuration file
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The A2Billing configuration file (a2billing.conf) contains the basic
+information to connect to the a2billing database. Copy or make a symbolic
+link from /usr/local/src/a2billing/a2billing.conf to /etc/a2billing.conf
+
+a2billing.conf -> /usr/local/src/a2billing/a2billing.conf
+
+Option 1::
+
+    cp /usr/local/src/a2billing/a2billing.conf /etc/
+
+Option 2::
+
+    ln -s /usr/local/src/a2billing/a2billing.conf /etc/a2billing.conf
+
+Open the file with your favorite text editor (vi is used in this example).
+If you are new to Linux, we recommend you to use the text editor Gedit::
+
+    vi /etc/a2billing.conf
+
+The only parameters that you need to change here is the database connection
+information, an example follows::
+
+    [database]
+    hostname = localhost
+    port = 3306
+    user = a2billinguser
+    password = a2billing
+    dbname = mya2billing
+    dbtype = mysql
+
+
+2.4. Step 4: Fix permissions, files and folders
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In this step, we will tweak the file permissions of Asterisk to fit the A2Billing software. We will also create a number of additional files and folders that A2Billing
+needs, which does not come with the default installation.
+
+2.4.1. SIP and IAX
+^^^^^^^^^^^^^^^^^^
+
+First we will set a few file permissions (chmod, chown) and create (touch) the SIP and IAX configuration files for Asterisk.::
+
+    chmod 777 /etc/asterisk
+    touch /etc/asterisk/additional_a2billing_iax.conf
+    touch /etc/asterisk/additional_a2billing_sip.conf
+    echo \#include additional_a2billing_sip.conf >> /etc/asterisk/sip.conf
+    echo \#include additional_a2billing_iax.conf >> /etc/asterisk/iax.conf
+    chown -Rf www-data /etc/asterisk/additional_a2billing_iax.conf
+    chown -Rf www-data /etc/asterisk/additional_a2billing_sip.conf
+
+2.4.2. Sound files
+^^^^^^^^^^^^^^^^^^
+
+Run the sounds installation script available in the addons folder (IMPORTANT: the script assumes that asterisk sounds are under /usr/share/asterisk/sounds/)::
+
+    /usr/local/src/a2billing/addons/install_a2b_sounds_deb.sh
+    chown -R asterisk:asterisk /usr/share/asterisk/sounds/
+
+
+2.4.3. Configure Asterisk Manager
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Configure the Asterisk Manager by editing the manager.conf file::
+
+    vi /etc/asterisk/manager.conf
+
+Notice that we are using the default values (myasterisk, mycode) in this section. The configuration should look like this::
+
+    [general]
+    enabled = yes
+    port = 5038
+    bindaddr = 0.0.0.0
+
+    [myasterisk]
+    secret=mycode
+    read=system,call,log,verbose,command,agent,user
+    write=system,call,log,verbose,command,agent,user
+
+
+2.5. Step 6: Install The AGI components
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Copy or create a symbolic link of the entire content of the AGI directory into asterisk agi-bin directory::
 
-            - mkdir /usr/local/src/a2billing
+    mkdir /usr/share/asterisk/agi-bin
+    chown asterisk:asterisk /usr/share/asterisk/agi-bin
 
-        Unpack the code
+Option 1::
 
-        Download the code from the SVN repository run:
-            - svn co --username guest --password guest http://svn.a2billing.net/svn/asterisk2billing/tags/1-current /usr/local/src/a2billing/
+    cd /usr/local/src/a2billing/AGI
+    cp a2billing.php /usr/share/asterisk/agi-bin/
+    cp a2billing-monitoring.php /usr/share/asterisk/agi-bin/
+    cp -Rf ../common/lib /usr/share/asterisk/agi-bin/
 
-        At the end of this step you should have a a2billing tree structure that should look like:
-            - /usr/local/src/a2billing/
+Option 2::
 
-        Files :
-            - AGI
-            - CHANGELOG
-            - COPYING
-            - CallBack
-            - Cronjobs : Recurrent services run via crontab
-            - DataBase : Database Schema / DB Installation
-            - FEATURES_LIST
-            - a2billing.conf : Main Configuration file
-            - addons : Sounds and other addons
-            - admin : Admin UI
-            - agent : Agent UI
-            - customer : Customer UI
-            - webservice
+    ln -s /usr/local/src/a2billing/AGI/a2billing.php /usr/share/asterisk/agi-bin/a2billing.php
+    ln -s /usr/local/src/a2billing/AGI/lib /usr/share/asterisk/agi-bin/lib
 
+Make sure the scripts are executable::
 
-    2.2. Step 2: Prepare the Database
+    chmod +x /usr/share/asterisk/agi-bin/a2billing.php
 
-        We will now create a MySQL database (mya2billing) for the billing software. The file a2billing-createdb-user.sql includes a script that creates the database with the correct access control users and permissions.
+(if you are going to run the monitoring AGI script)::
 
-        - cd /usr/local/src/a2billing
+    chmod +x /usr/share/asterisk/agi-bin/a2billing_monitoring.php
 
-        - mysql -u root -p < DataBase/mysql-5.x/a2billing-createdb-user.sql
 
-        The script with create a database, username and password with the following default values
-            - Database name is: mya2billing
-            - Database user is: a2billinguser
-            - User password is: a2billing
+2.6. Step 5: Install web-based Graphical interfaces
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-        After creating the database structure, we will create a set of tables and insert some initial basic configuration data
-            - cd DataBase/mysql-5.x/
-            - ./install-db.sh
+In this step, we will install the three graphical interfaces of A2Billing:
+the Administration (admin), Agent (agent) and Customer (customer) interface.
+As in previous steps you can copy the folders of make symbolic links.
 
-        **Checkpoint 1 :** Check that the database (my2billing) and that (97) tables have been created.
-            - mysql -u root -p mya2billing
-            - mysql>show tables
-            - mysql>exit
+Place the directories "admin" and "customer" into your webserver document root.
 
+Create a2billing folder in your web root folder::
 
-    2.3. Step 3: Edit the a2billing.conf configuration file
+    mkdir /var/www/a2billing
+    chown www-data:www-data /var/www/a2billing
 
-        The A2Billing configuration file (a2billing.conf) contains the basic information to connect to the a2billing database. Copy or make a symbolic link from
-        /usr/local/src/a2billing/a2billing.conf to /etc/a2billing.conf
+Create folder directory for monitoring Scripts::
 
-        a2billing.conf -> /usr/local/src/a2billing/a2billing.conf
+    mkdir -p /var/lib/a2billing/script
 
-        Option 1
-        - cp /usr/local/src/a2billing/a2billing.conf /etc/
+Create folder directory for Cronts PID::
 
-        Option 2
-        - ln -s /usr/local/src/a2billing/a2billing.conf /etc/a2billing.conf
+    mkdir -p /var/run/a2billing
 
-        Open the file with your favorite text editor (vi is used in this example). If you are new to Linux, we recommend you to use the text editor Gedit.
-        - vi /etc/a2billing.conf
+Option 1::
 
-        The only parameters that you need to change here is the database connection information, an example follows:
-            [database]
-            hostname = localhost
-            port = 3306
-            user = a2billinguser
-            password = a2billing
-            dbname = mya2billing
-            dbtype = mysql
+    cp -rf /usr/local/src/a2billing/admin /var/www/a2billing
+    cp -rf /usr/local/src/a2billing/agent /var/www/a2billing
+    cp -rf /usr/local/src/a2billing/customer /var/www/a2billing
+    cp -rf /usr/local/src/a2billing/common /var/www/a2billing
 
+Option 2::
 
-    2.4. Step 4: Fix permissions, files and folders
+    ln -s /usr/local/src/a2billing/admin /var/www/a2billing/admin
+    ln -s /usr/local/src/a2billing/agent /var/www/a2billing/agent
+    ln -s /usr/local/src/a2billing/customer /var/www/a2billing/customer
+    ln -s /usr/local/src/a2billing/common /var/www/a2billing/common
 
-        In this step, we will tweak the file permissions of Asterisk to fit the A2Billing software. We will also create a number of additional files and folders that A2Billing
-        needs, which does not come with the default installation.
+Fix the permissions of the templates_c folder in each of the UI::
 
-        2.4.1. SIP and IAX
+    chmod 755 /usr/local/src/a2billing/admin/templates_c
+    chmod 755 /usr/local/src/a2billing/customer/templates_c
+    chmod 755 /usr/local/src/a2billing/agent/templates_c
+    chown -Rf www-data:www-data /usr/local/src/a2billing/admin/templates_c
+    chown -Rf www-data:www-data /usr/local/src/a2billing/customer/templates_c
+    chown -Rf www-data:www-data /usr/local/src/a2billing/agent/templates_c
 
-            First we will set a few file permissions (chmod, chown) and create (touch) the SIP and IAX configuration files for Asterisk.
-                chmod 777 /etc/asterisk
-                touch /etc/asterisk/additional_a2billing_iax.conf
-                touch /etc/asterisk/additional_a2billing_sip.conf
-                echo \#include additional_a2billing_sip.conf >> /etc/asterisk/sip.conf
-                echo \#include additional_a2billing_iax.conf >> /etc/asterisk/iax.conf
-                chown -Rf www-data /etc/asterisk/additional_a2billing_iax.conf
-                chown -Rf www-data /etc/asterisk/additional_a2billing_sip.conf
 
-        2.4.2. Sound files
+Checkpoint 2: Direct a browser to the administrative web interface (http://<ip-addr>/a2billing/admin) and login as administrator. Default passwords are:
+    - user: root
+    - pass: changepassword
 
-            Run the sounds installation script available in the addons folder (IMPORTANT: the script assumes that asterisk sounds are under /usr/share/asterisk/sounds/)
-                - /usr/local/src/a2billing/addons/install_a2b_sounds_deb.sh
-                - chown -R asterisk:asterisk /usr/share/asterisk/sounds/
 
-        2.4.3. Configure Asterisk Manager
+2.7. Step 7: Create a dialplan for A2Billing
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            Configure the Asterisk Manager by editing the manager.conf file.
-            - vi /etc/asterisk/manager.conf
+The extensions.conf is the Asterisk dialplan. Calls that interact with the billing software need to be handled inside of one or many A2Billing related contexts.
 
-            Notice that we are using the default values (myasterisk, mycode) in this section. The configuration should look like this
-            [general]
-            enabled = yes
-            port = 5038
-            bindaddr = 0.0.0.0
+The calls that reach the context are processed using the a2billing.php AGI script. The a2billing.php script can be invoked in many different modes (standard, did,voucher, callback, etc). In the example, we create two different contexts, the first context [a2billing] handles all the calls from our VoIP clients. When a call arrives, any extension number _X. (2 digits or more) reaches the script a2billing.php
 
-            [myasterisk]
-            secret=mycode
-            read=system,call,log,verbose,command,agent,user
-            write=system,call,log,verbose,command,agent,user
+The second context [did], will be used to route inward calls back to the users. Calls to the clients (DID) are handled inside of the [did] context. The script a2billing.php in did mode is responsible of routing the call back to one of our users.
 
+Edit extension.conf::
 
-    2.5. Step 6: Install The AGI components
+    vi /etc/asterisk/extensions.conf
 
-        Copy or create a symbolic link of the entire content of the AGI directory into asterisk agi-bin directory.
-            - mkdir /usr/share/asterisk/agi-bin
-            - chown asterisk:asterisk /usr/share/asterisk/agi-bin
+and the following contexts::
 
-        Option 1
-            - cd /usr/local/src/a2billing/AGI
-            - cp a2billing.php /usr/share/asterisk/agi-bin/
-            - cp a2billing-monitoring.php /usr/share/asterisk/agi-bin/
-            - cp -Rf lib /usr/share/asterisk/agi-bin/
+    [a2billing]
+    include => a2billing_callingcard
+    include => a2billing_monitoring
+    include => a2billing_voucher
 
-        Option 2
-            - ln -s /usr/local/src/a2billing/AGI/a2billing.php /usr/share/asterisk/agi-bin/a2billing.php
-            - ln -s /usr/local/src/a2billing/AGI/lib /usr/share/asterisk/agi-bin/lib
+    [a2billing_callingcard]
+    ; CallingCard application
+    exten => _X.,1,NoOp(A2Billing Start)
+    exten => _X.,n,DeadAgi(a2billing.php|1)
+    exten => _X.,n,Hangup
 
-        Make sure the scripts are executable
-            - chmod +x /usr/share/asterisk/agi-bin/a2billing.php
-        (if you are going to run the monitoring AGI script)
-            - chmod +x /usr/share/asterisk/agi-bin/a2billing_monitoring.php
+    [a2billing_voucher]
+    exten => _X.,1,Answer(1)
+    exten => _X.,n,DeadAgi(a2billing.php|1|voucher)
+    ;exten => _X.,n,AGI(a2billing.php|1|voucher44) ; will add 44 in front of the callerID for the CID authentication
+    exten => _X.,n,Hangup
 
+    [a2billing_did]
+    exten => _X.,1,DeadAgi(a2billing.php|1|did)
+    exten => _X.,2,Hangup
 
-    2.6. Step 5: Install web-based Graphical interfaces
+Note that newer versions of Asterisk use a comma (,) instead of a pipe (|) to separate the AGI arguments.
 
-        In this step, we will install the three graphical interfaces of A2Billing: the Administration (admin), Agent (agent) and Customer (customer) interface. As in previous
-        steps you can copy the folders of make symbolic links.
 
-        Place the directories "admin" and "customer" into your webserver document root.
+2.8. Step 8: Configure recurring services
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-        Create a2billing folder in your web root folder
-            - mkdir /var/www/a2billing
-            - chown www-data:www-data /var/www/a2billing
+Recurring services are handled via the /etc/crontab
 
-        Create folder directory for monitoring Scripts
-            - mkdir -p /var/lib/a2billing/script
+You can add the following cron jobs to your /etc/crontab or create a file with
+the jobs in /var/spool/cron/a2billing
 
-        Create folder directory for Cronts PID
-            - mkdir -p /var/run/a2billing
+- update the currency table::
 
-        Option 1
-            - cp -rf /usr/local/src/a2billing/admin /var/www/a2billing
-            - cp -rf /usr/local/src/a2billing/agent /var/www/a2billing
-            - cp -rf /usr/local/src/a2billing/customer /var/www/a2billing
-            - cp -rf /usr/local/src/a2billing/common /var/www/a2billing
+    0 6 * * * php /usr/local/src/a2billing/Cronjobs/currencies_update_yahoo.php
 
-        Option 2
-            - ln -s /usr/local/src/a2billing/admin /var/www/a2billing/admin
-            - ln -s /usr/local/src/a2billing/agent /var/www/a2billing/agent
-            - ln -s /usr/local/src/a2billing/customer /var/www/a2billing/customer
-            - ln -s /usr/local/src/a2billing/common /var/www/a2billing/common
+- manage the monthly services subscription::
 
-        Fix the permissions of the templates_c folder in each of the UI
-            - chmod 755 /usr/local/src/a2billing/admin/templates_c
-            - chmod 755 /usr/local/src/a2billing/customer/templates_c
-            - chmod 755 /usr/local/src/a2billing/agent/templates_c
-            - chown -Rf www-data:www-data /usr/local/src/a2billing/admin/templates_c
-            - chown -Rf www-data:www-data /usr/local/src/a2billing/customer/templates_c
-            - chown -Rf www-data:www-data /usr/local/src/a2billing/agent/templates_c
+    0 6 1 * * php /usr/local/src/a2billing/Cronjobs/a2billing_subscription_fee.php
 
+- To check account of each Users and send an email if the balance is less than the user have choice::
 
-        Checkpoint 2: Direct a browser to the administrative web interface (http://<ip-addr>/a2billing/admin) and login as administrator. Default passwords are:
-            user: root
-            pass: changepassword
+    0 * * * * php /usr/local/src/a2billing/Cronjobs/a2billing_notify_account.php
 
 
-    2.7. Step 7: Create a dialplan for A2Billing
+- This script will browse all the DID that are reserve and check if the customer
+  need to pay for it bill them or warn them per email to know if they want to pay
+  in order to keep their DIDs::
 
-        The extensions.conf is the Asterisk dialplan. Calls that interact with the billing software need to be handled inside of one or many A2Billing related contexts.
+    0 2 * * * php /usr/local/src/a2billing/Cronjobs/a2billing_bill_diduse.php
 
-        The calls that reach the context are processed using the a2billing.php AGI script. The a2billing.php script can be invoked in many different modes (standard, did,voucher, callback, etc). In the example, we create two different contexts, the first context [a2billing] handles all the calls from our VoIP clients. When a call arrives, any extension number _X. (2 digits or more) reaches the script a2billing.php
+- This script will take care of the recurring service. ::
 
-        The second context [did], will be used to route inward calls back to the users. Calls to the clients (DID) are handled inside of the [did] context. The script a2billing.php in did mode is responsible of routing the call back to one of our users.
+    0 12 * * * php /usr/local/src/a2billing/Cronjobs/a2billing_batch_process.php
 
-        Edit extension.conf
-            - vi /etc/asterisk/extensions.conf
+- Generate Invoices at 6am everyday::
 
-        and the following contexts
+    0 6 * * * php /usr/local/src/a2billing/Cronjobs/a2billing_batch_billing.php
 
-        | [a2billing]
-        | include => a2billing_callingcard
-        | include => a2billing_monitoring
-        | include => a2billing_voucher
+- to proceed the autodialer::
 
-        | [a2billing_callingcard]
-        | ; CallingCard application
-        | exten => _X.,1,NoOp(A2Billing Start)
-        | exten => _X.,n,DeadAgi(a2billing.php|1)
-        | exten => _X.,n,Hangup
+    * / 5 * * * * php /usr/local/src/a2billing/Cronjobs/a2billing_batch_autodialer.php
 
-        | [a2billing_voucher]
-        | exten => _X.,1,Answer(1)
-        | exten => _X.,n,DeadAgi(a2billing.php|1|voucher)
-        | ;exten => _X.,n,AGI(a2billing.php|1|voucher|44) ; will add 44 in front of the callerID for the CID authentication
-        | exten => _X.,n,Hangup
+- manage alarms::
 
-        | [a2billing_did]
-        | exten => _X.,1,DeadAgi(a2billing.php|1|did)
-        | exten => _X.,2,Hangup
+    0 * * * * php /usr/local/src/a2billing/Cronjobs/a2billing_alarm.php
 
 
-    2.8. Step 8: Configure recurring services
+2.9. Step 9: Call back daemon (only for Call backs)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-        Recurring services are handled via the /etc/crontab
+The call back daemon is responsible of reading from the database the pool of
+calls stored for call back and trigger those calls periodically.
 
-        You can add the following cron jobs to your /etc/crontab or create a file with the jobs in /var/spool/cron/a2billing
+The daemon is written in Python. Install the python-setuptools and use
+easy_install to install the callback_daemon::
 
-            -  update the currency table
-                0 6 * * * php /usr/local/src/a2billing/Cronjobs/currencies_update_yahoo.php
+    apt-get install python-setuptools python-mysqldb python-psycopg2 python-sqlalchemy
+    cd /usr/local/src/a2billing/CallBack
+    easy_install callback-daemon-py/dist/callback_daemon-1.0.prod_r1527-py2.5.egg
 
-            -  manage the monthly services subscription
-                0 6 1 * * php /usr/local/src/a2billing/Cronjobs/a2billing_subscription_fee.php
+Install the init.d startup script::
 
-            -  To check account of each Users and send an email if the balance is less than the user have choice.
-                0 * * * * php /usr/local/src/a2billing/Cronjobs/a2billing_notify_account.php
+    cd /usr/local/src/a2billing/CallBack/callback-daemon-py/callback_daemon/
 
-            -  this script will browse all the DID that are reserve and check if the customer need to pay for it bill them or warn them per email to know if they want to pay in order to keep their DIDs
-                0 2 * * * php /usr/local/src/a2billing/Cronjobs/a2billing_bill_diduse.php
+For Debian::
 
-            -  This script will take care of the recurring service.
-                0 12 * * * php /usr/local/src/a2billing/Cronjobs/a2billing_batch_process.php
+    cp a2b-callback-daemon.debian  /etc/init.d/a2b-callback-daemon
 
-            - Generate Invoices at 6am everyday
-                0 6 * * * php /usr/local/src/a2billing/Cronjobs/a2billing_batch_billing.php
+For RedHat::
 
-            -  to proceed the autodialer
-                * / 5 * * * * php /usr/local/src/a2billing/Cronjobs/a2billing_batch_autodialer.php
+    cp a2b-callback-daemon.rc /etc/init.d/a2b-callback-daemon
+    chmod +x /etc/init.d/a2b-callback-daemon
 
-            -  manage alarms
-                0 * * * * php /usr/local/src/a2billing/Cronjobs/a2billing_alarm.php
+Make sure the daemon starts,
 
+For Debian::
 
-    2.9. Step 9: Call back daemon (only for Call backs)
+    update-rc.d a2b-callback-daemon defaults 40 60
 
-        The call back daemon is responsible of reading from the database the pool of calls stored for call back and trigger those calls periodically.
+If you need to remove the daemon in the future run::
 
-        The daemon is written in Python. Install the python-setuptools and use easy_install to install the callback_daemon
-            - apt-get install python-setuptools python-mysqldb python-psycopg2 python-sqlalchemy
-            - cd /usr/local/src/a2billing/CallBack
-            - easy_install callback-daemon-py/dist/callback_daemon-1.0.prod_r1527-py2.5.egg
+      update-rc.d -f a2b-callback-daemon remove
 
-        Install the init.d startup script
-            - cd /usr/local/src/a2billing/CallBack/callback-daemon-py/callback_daemon/
+For RedHat::
 
-        For Debian :
-            - cp a2b-callback-daemon.debian  /etc/init.d/a2b-callback-daemon
+    chkconfig --add a2b-callback-daemon
+    service a2b-callback-daemon start
+    chkconfig a2b-callback-daemon on
 
-        For RedHat :
-            - cp a2b-callback-daemon.rc /etc/init.d/a2b-callback-daemon
-            - chmod +x /etc/init.d/a2b-callback-daemon
 
-        Make sure the daemon starts
-            For Debian :
-                - update-rc.d a2b-callback-daemon defaults 40 60
+2.10. Step 10: Enable IVR monitoring
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-                If you need to remove the daemon in the future run
-                - update-rc.d -f a2b-callback-daemon remove
-            For RedHat :
-                - chkconfig --add a2b-callback-daemon
-                - service a2b-callback-daemon start
-                - chkconfig a2b-callback-daemon on
+General system monitoring via IVR is available from version 1.7, the new AGI
+a2billing_monitoring.php provides access to an IVR where monitoring tasks can be
+configured via the new Monitoring Menu under Maintenance.
 
+SQL queries can be performed and shell scripts can be invoked.
+Place your scripts under /var/lib/a2billing/script/
 
-    2.10. Step 10: Enable Monitoring
 
-        General system monitoring via IVR is available from version 1.7, the new AGI
-        a2billing_monitoring.php provides access to an IVR where monitoring tasks can be
-        configured via the new Monitoring Menu under Maintenance.
+2.11. Step 11: Security features via IVR (Monitor account and locking calling card)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-        SQL queries can be performed and shell scripts can be invoked.
-        Place your scripts under /var/lib/a2billing/script/
+Two new IVR menus are now available via the main a2billing.php AGI. The menus
+needs to be enabled setting the variables in the agi-conf menu (GUI system settings)
 
-    2.11. Step 11: Security features via IVR (Monitor account and locking calling card)
+Locking Options IVR menu::
 
-        Two new IVR menus are now available via the main a2billing.php AGI. The menus
-        needs to be enabled setting the variables in the agi-conf menu (GUI system settings)
+    ivr_enable_locking_option = true (default: false)
 
-        Locking Options IVR menu
-        ivr_enable_locking_option = true (default: false)
 
+Monitoring your Calling Card IVR menu::
 
-        Monitoring your Calling Card IVR menu
-        ivr_enable_account_information = true (default: false)
+    ivr_enable_account_information = true (default: false)
 
 
 3. Support
 ----------
 
-    Star2Billing S.L. offers consultancy including installation, training and customisation
+Star2Billing S.L. offers consultancy including installation, training and customisation
 
-    Please email us at sales@star2billing.com for more information
+Please email us at sales@star2billing.com for more information.
diff --git a/README.rst b/README.rst
index 8bc3bdb7e..c90dfe1d6 100644
--- a/README.rst
+++ b/README.rst
@@ -13,6 +13,9 @@ services, consultancy and support is available.
 see http://www.star2billing.com/ for more details
 
 
+.. image:: https://github.com/Star2Billing/a2billing/raw/master/a2billing_dashboard.png
+
+
 Info
 ----
 
@@ -20,7 +23,7 @@ Info
     http://forum.asterisk2billing.org/
 
 * Wiki version of installation
-    - http://www.asterisk2billing.org/documentation/
+    http://www.asterisk2billing.org/documentation/
 
 * Latest development version
     https://github.com/Star2Billing/a2billing
@@ -29,10 +32,17 @@ Info
     https://github.com/Star2Billing/a2billing/issues
 
 
+License
+-------
+
+Copyright (c) 2004-2015 Star2Billing S.L. <info@star2billing.com>
+
+A2Billing is licensed under AGPL: http://www.gnu.org/licenses/agpl.html
+
+
 Support
 -------
 
 Star2Billing S.L. offers consultancy including installation, training and customisation
 
 Please email us at sales@star2billing.com for more information
-
diff --git a/REQUIREMENTS.rst b/REQUIREMENTS.rst
index 7d4d9a38c..9c73ea01c 100644
--- a/REQUIREMENTS.rst
+++ b/REQUIREMENTS.rst
@@ -2,29 +2,30 @@
 REQUIREMENTS
 ------------
 
-    - Apache 2
+- Apache2
 
-    - Asterisk 1.2 >=
+- Asterisk >= version 1.2
 
-    - MySQL 5.x or PostgreSQL 8.x
+- MySQL 5.x
 
-    - PHP 5 >= 5.2.0
+- PHP >= version 5.3.0
 
-    - PHP MODULES :
-        * PHP-PGSQL or PHP-MYSQLi
-        * PHP-MCRYPT
-        * PHP_POSIX
-        * PHP-GD
-        * PHP-PCNTL
-        * PHP-GETTEXT
-        * PHP-SQLITE (only if you use the module to pool CDR)
-        * PHP PEAR SOAP
+- PHP MODULES :
+    * PHP-PGSQL or PHP-MYSQLi
+    * PHP-MCRYPT
+    * PHP-XML
+    * PHP_POSIX
+    * PHP-GD
+    * PHP-PCNTL
+    * PHP-GETTEXT
+    * PHP-SQLITE (only if you use the module to pool CDR)
+    * PHP PEAR SOAP
 
-    - CallBack Module, Python requirements :
-        * python >= 2.4
-        * python-mysqldb
-        * python-psycopg2
-        * python-sqlalchemy
+- CallBack Module, Python requirements :
+    * python >= version 2.6
+    * python-mysqldb
+    * python-psycopg2
+    * python-sqlalchemy
 
-    - Monitoring IVR Module
-        * Cepstral Text to speech (http://www.cepstral.com)
+- Monitoring IVR Module
+    * Cepstral Text to speech (http://www.cepstral.com)
diff --git a/a2billing.conf b/a2billing.conf
index 7f77b21ab..02fe25ca1 100755
--- a/a2billing.conf
+++ b/a2billing.conf
@@ -37,18 +37,18 @@ keys=consoleHandler,FileHandler,RotatingFileHandler
 keys=callbackFormatter
 
 [logger_root]
-level=INFO
+level=DEBUG
 handlers=consoleHandler,RotatingFileHandler
 
 [logger_callbackLogger]
-level=INFO
+level=DEBUG
 handlers=consoleHandler,RotatingFileHandler
 qualname=callbackLogger
 propagate=0
 
 [handler_consoleHandler]
 class=StreamHandler
-level=INFO
+level=DEBUG
 formatter=callbackFormatter
 args=(sys.stdout,)
 
diff --git a/a2billing_dashboard.png b/a2billing_dashboard.png
new file mode 100755
index 000000000..457d59376
Binary files /dev/null and b/a2billing_dashboard.png differ
diff --git a/addons/Doc/Database/a2b_database_description.txt b/addons/Doc/Database/a2b_database_description.txt
index 6a5aceea3..349a0a859 100644
--- a/addons/Doc/Database/a2b_database_description.txt
+++ b/addons/Doc/Database/a2b_database_description.txt
@@ -1,38 +1,38 @@
 
 
- >> A2Billing Database Description 
+ >> A2Billing Database Description
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~``
 
 
 
-1) cc_agent                     This table contains detail information of agent who have access to the agent interface. 
+1) cc_agent                     This table contains detail information of agent who have access to the agent interface.
                                 Info like personal detail,account detail, bank detail,active status etc.
 
 2) cc_agent_commission          This table contains the information about commission of agent like commission percentage, type, amount etc.
 
-3) cc_agent_signup              This table contains the information about agent sign-up key which can be used to relate customer and 
+3) cc_agent_signup              This table contains the information about agent sign-up key which can be used to relate customer and
                                 also their group id,tariff group id available.
 
 4) cc_agent_tariffgroup         This table contains the information about tariff group (call-plan) in which agent is belong to.
 
-5) cc_alarm                     This table contains the information about alarms which can monitor the calls rates,trunks,durations, status etc. 
+5) cc_alarm                     This table contains the information about alarms which can monitor the calls rates,trunks,durations, status etc.
                                 and able to create these alarms on daily, weekly, and monthly basis.
 
 6) cc_alarm_report              This table contains reporting information of created alarm.
 
-7) cc_autorefill_report	        This table keeps information about the auto refill cront performed, used for reporting. 
+7) cc_autorefill_report	        This table keeps information about the auto refill cront performed, used for reporting.
 
-8) cc_backup			        This table contains backup detail to backup an existing database context. Path define where backup files are stored. 
+8) cc_backup			        This table contains backup detail to backup an existing database context. Path define where backup files are stored.
 
 9) cc_billing_customer		    This table contains detail of created bill against customer with invoice id,start date.
                                 It allows you to see all billing generated by the batch for the customers, or also to run a billing manually for a specific customer.
 
-10) cc_call			            This table contains records of the made calls. This is a CDR (Call Detail Record) which contains 
+10) cc_call			            This table contains records of the made calls. This is a CDR (Call Detail Record) which contains
                                 trunk id,customer id,rate card,cost,start-stop time,session id,call destination,tariff detail etc.
 
 11) cc_callback_spool		    This table contains functionality to handle the callback service. Different parameters like server ip,server group, channel,call-back time,number of attempt,agi result,caller id etc we need to set.
 
-12) cc_callerid			        This table contains caller id number and its status of customer through which the customer calling in is authenticated on the basis of the callerID rather than with the account number. 
+12) cc_callerid			        This table contains caller id number and its status of customer through which the customer calling in is authenticated on the basis of the callerID rather than with the account number.
 
 13) cc_callplan_lcr		        This table contains list of Call Plans & Call plan will regroup a collection of ratecards and define a routing rules on them (LCR/LCD).
 
@@ -48,7 +48,7 @@
 
 19) cc_campaign_phonestatus 	This table contains list of all the phone numbers attached to a campaign which includes phone number,status, callback id.
 
-20) cc_card                     This table contains detail information of customers/accounts. 
+20) cc_card                     This table contains detail information of customers/accounts.
                                 Table stores the info personal detail, account detail, company detail,call plan, credit remaining etc.
 
 21) cc_cardgroup_service 	    This table define the link between Service and Customer Group
@@ -67,10 +67,10 @@
 
 28) cc_charge			        This table contains charges for setup,services etc. Charges will appear to the customer with & each charge that you create for a customer will decrement from his account.
 
-29) cc_config			        This table contains different A2Billing settings which includes config key, value,group etc. 
+29) cc_config			        This table contains different A2Billing settings which includes config key, value,group etc.
 
-30) cc_configuration		    This table contains epayment method configuration. 
-                                It used to enable or disable the payment method, define the currency settings etc. 
+30) cc_configuration		    This table contains epayment method configuration.
+                                It used to enable or disable the payment method, define the currency settings etc.
 
 31) cc_config_group		        This table contains list of all configuration groups.
 
@@ -132,7 +132,7 @@
 
 60) cc_payments			        Keep trace of the customer's payment
 
-61) cc_payments_agent		    Keep trace of the agent's payment  
+61) cc_payments_agent		    Keep trace of the agent's payment
 
 62) cc_payments_status		    This table contains list of different payment status (failed,paid,in-progress,completed).
 
@@ -155,12 +155,12 @@
 71) cc_receipt_item		        This table contains list of receipt history against a customers with date,price,description.
 
 72) cc_remittance_request	    This is used from the Agent UI to require for a payment of their commission
- 
+
 73) cc_restricted_phonenumber	This table contains list of restricted phonenumber through which customer can't make call.
 
-74) cc_server_group		        This table contains list of server groups which define the set of servers that are going to be used by the callback system. A callback is bound to a server group which will be used to dispatch the callback requests. 
+74) cc_server_group		        This table contains list of server groups which define the set of servers that are going to be used by the callback system. A callback is bound to a server group which will be used to dispatch the callback requests.
 
-75) cc_server_manager		    This table contains list of servers are used by the callback system through the asterisk manager in order to initiate the callback and outbound calls for your customers.AGI and callback modes need to be installed on those machines. 
+75) cc_server_manager		    This table contains list of servers are used by the callback system through the asterisk manager in order to initiate the callback and outbound calls for your customers.AGI and callback modes need to be installed on those machines.
 
 76) cc_service			        This table contains list of services which can be a scheduled action on the account.For example if we want to remove 10 cents everyday on each single customer account
 
@@ -168,7 +168,7 @@
 
 78) cc_sip_buddies		        This table contains configuration info of each SIP client which is identified by a number of parameters.
 
-79) cc_sip_buddies_empty	    This table is used when Asterisk is used with OpenSIPs.
+79) cc_sip_buddies_empty	    This table is used when Asterisk is used with OpenSIPs/Kamailio.
 
 80) cc_speeddial		        This table contains list of speed dials numbers for the customer.
 
@@ -198,7 +198,7 @@
 
 93) cc_timezone			        This table contains detail for all the Timezone which includes zone,gmt-time,gmt-offset.
 
-94) cc_trunk			        This table contains list of trunks which are used to terminate the call.Trunk and ratecard is selected by the rating engine on the basis of the dialed digits. The trunk is used to dial out from asterisk box which can be a zaptel interface or a voip provider. 
+94) cc_trunk			        This table contains list of trunks which are used to terminate the call.Trunk and ratecard is selected by the rating engine on the basis of the dialed digits. The trunk is used to dial out from asterisk box which can be a zaptel interface or a voip provider.
 
 95) cc_ui_authen		        This table contains list of all the Administrators who have access to the Administrator interface.
 
diff --git a/addons/Doc/Resources/a2billing-customer-list.png b/addons/Doc/Resources/a2billing-customer-list.png
new file mode 100644
index 000000000..249732f2f
Binary files /dev/null and b/addons/Doc/Resources/a2billing-customer-list.png differ
diff --git a/addons/apache2/a2billing_admin.conf b/addons/apache2/a2billing_admin.conf
new file mode 100644
index 000000000..83e866da0
--- /dev/null
+++ b/addons/apache2/a2billing_admin.conf
@@ -0,0 +1,21 @@
+Alias /a2b_admin /usr/share/a2billing/latest/admin/
+
+<Directory /usr/share/a2billing/latest/admin/>
+
+    DirectoryIndex index.php
+
+    Options +FollowSymLinks
+    AllowOverride None
+
+    #order deny,allow
+    #deny from all
+    #allow from 127.0.0.0/255.0.0.0 ::1/128
+    allow from all
+
+    <IfModule mod_php5.c>
+        php_flag magic_quotes_gpc Off
+        php_flag track_vars On
+        php_flag register_globals Off
+    </IfModule>
+
+</Directory>
diff --git a/addons/apache2/a2billing_agent.conf b/addons/apache2/a2billing_agent.conf
new file mode 100644
index 000000000..762be5f4a
--- /dev/null
+++ b/addons/apache2/a2billing_agent.conf
@@ -0,0 +1,21 @@
+Alias /a2b_agent /usr/share/a2billing/latest/agent/
+
+<Directory /usr/share/a2billing/latest/agent/>
+
+    DirectoryIndex index.php
+
+    Options +FollowSymLinks
+    AllowOverride None
+
+    #order deny,allow
+    #deny from all
+    #allow from 127.0.0.0/255.0.0.0 ::1/128
+    allow from all
+
+    <IfModule mod_php5.c>
+        php_flag magic_quotes_gpc Off
+        php_flag track_vars On
+        php_flag register_globals Off
+    </IfModule>
+
+</Directory>
diff --git a/addons/apache2/a2billing_customer.conf b/addons/apache2/a2billing_customer.conf
new file mode 100644
index 000000000..e43e097f4
--- /dev/null
+++ b/addons/apache2/a2billing_customer.conf
@@ -0,0 +1,21 @@
+Alias /customer /usr/share/a2billing/latest/customer/
+
+<Directory /usr/share/a2billing/latest/customer/>
+
+    DirectoryIndex index.php
+
+    Options +FollowSymLinks
+    AllowOverride None
+
+    #order deny,allow
+    #deny from all
+    #allow from 127.0.0.0/255.0.0.0 ::1/128
+    allow from all
+
+    <IfModule mod_php5.c>
+        php_flag magic_quotes_gpc Off
+        php_flag track_vars On
+        php_flag register_globals Off
+    </IfModule>
+
+</Directory>
diff --git a/addons/apache2/a2billing_index.conf b/addons/apache2/a2billing_index.conf
new file mode 100644
index 000000000..9255da734
--- /dev/null
+++ b/addons/apache2/a2billing_index.conf
@@ -0,0 +1,21 @@
+Alias /a2b /usr/share/a2billing/index/
+
+<Directory /usr/share/a2billing/index/>
+
+    DirectoryIndex index.php index.html
+
+    Options +FollowSymLinks
+    AllowOverride None
+
+    #order deny,allow
+    #deny from all
+    #allow from 127.0.0.0/255.0.0.0 ::1/128
+    allow from all
+
+    <IfModule mod_php5.c>
+        php_flag magic_quotes_gpc Off
+        php_flag track_vars On
+        php_flag register_globals Off
+    </IfModule>
+
+</Directory>
diff --git a/addons/apache2/a2billing_webservice.conf b/addons/apache2/a2billing_webservice.conf
new file mode 100644
index 000000000..98aee8af6
--- /dev/null
+++ b/addons/apache2/a2billing_webservice.conf
@@ -0,0 +1,16 @@
+Alias /a2b_webservice /usr/share/a2billing/latest/webservice/
+
+<Directory /usr/share/a2billing/latest/webservice/>
+
+    AllowOverride all
+    Options Indexes FollowSymLinks
+    order allow,deny
+    allow from all
+
+    <IfModule mod_php5.c>
+        php_flag magic_quotes_gpc Off
+        php_flag track_vars On
+        php_flag register_globals Off
+    </IfModule>
+
+</Directory>
diff --git a/addons/asterisk-conf/extensions_a2billing.conf b/addons/asterisk-conf/extensions_a2billing.conf
index b61bf9de8..3b8e2ad6e 100755
--- a/addons/asterisk-conf/extensions_a2billing.conf
+++ b/addons/asterisk-conf/extensions_a2billing.conf
@@ -29,17 +29,17 @@ exten => _X.,1,DeadAgi(a2billing.php|1|cid-prompt-callback|34) ;last parameter i
 exten => _X.,n,Hangup
 
 ; Inbound callback scenario
-; it will just callback the person after this callback context rang 
+; it will just callback the person after this callback context rang
 [a2billing-all-callback]
 exten => _X.,1,DeadAgi(a2billing.php|1|all-callback|34) ;last parameter is the callback area code
-exten => _X.,n,Hangup	
+exten => _X.,n,Hangup
 
 ; !!! note : the 34 number is used for international callback, let s say that my server is in UK but that my DID is in Spain
-; The system will need to know that it have to add up 34 to callback this person 
+; The system will need to know that it have to add up 34 to callback this person
 
 
 [a2billing-predictivedialer]
-exten => _X.,1,DeadAgi(a2billing.php|1|predictivedialer)	
+exten => _X.,1,DeadAgi(a2billing.php|1|predictivedialer)
 exten => _X.,n,Hangup
 
 
@@ -62,7 +62,7 @@ exten => h,1,Hangup
 exten => _X.,1,Answer()
 exten => _X.,n,NoOp(Start Conference)
 ;exten => _X.,n(record),Set(MEETME_RECORDINGFILE=/var/spool/asterisk/meetme/conference_recording-${EPOCH}-${USER});
-;exten => _X.,n,MeetMe(${EXTEN}|rdTMc) ;Make new Room and record call. 
+;exten => _X.,n,MeetMe(${EXTEN}|rdTMc) ;Make new Room and record call.
 exten => _X.,n,MeetMe(${EXTEN}|dTMc) ;Make new Room
 exten => _X.,n,Hangup()
 
@@ -71,7 +71,7 @@ exten => _X.,n,Hangup()
 exten => _X.,1,Answer(1)
 exten => _X.,n,DeadAgi(a2billing.php|1|voucher)
 ;exten => _X.,n,AGI(a2billing.php|1|voucher|44) ; will add 44 in front of the callerID for the CID authentication
-exten => _X.,n,Hangup	
+exten => _X.,n,Hangup
 
 
 [a2billing_dispatch]
@@ -91,7 +91,7 @@ exten => _X.,1,Dial(SIP/${EXTEN}@IP_SECOND_SERVER)
 ; Use canreinvite to not pass the media through the first box
 
 
-; As fourth parameter we pass the reference ID of the Agent 
+; As fourth parameter we pass the reference ID of the Agent
 [a2billing_autocreate_example]
 exten => _X.,1,DeadAgi(a2billing.php|1|standard|0|%REF_AGENT%)
 exten => _X.,n,Hangup
@@ -113,4 +113,15 @@ exten => _X.,h,Hangup
 exten => _X.,1,NoOp(A2Billing Echo Test Start)
 exten => _X.,1,Playback(demo-echotest) ; Let them know what's going on
 exten => _X.,2,Echo ; Do the echo test
-exten => _X.,3,Playback(demo-echodone) ; Let them know it's over
\ No newline at end of file
+exten => _X.,3,Playback(demo-echodone) ; Let them know it's over
+
+
+; A2Billing Set Custom Vars into CDRs cc_call Table
+[a2billing-custom-var-cdr]
+exten => _X.,1,NoOp(A2Billing Set Custom Var into CDRs table cc_call)
+exten => _X.,n,Set(A2B_CUSTOM1=${SIP_HEADER(X-a2b-custom1)})
+exten => _X.,n,Set(A2B_CUSTOM2=${SIP_HEADER(X-a2b-custom2)})
+exten => _X.,n,Set(CDR(A2B_CUSTOM1)=${A2B_CUSTOM1})
+exten => _X.,n,Set(CDR(A2B_CUSTOM2)=${A2B_CUSTOM2})
+exten => _X.,n,DeadAgi(a2billing.php|1)
+exten => _X.,h,Hangup
diff --git a/addons/contrib/archives/enhancements/A2B_entity_package_group.php b/addons/contrib/archives/enhancements/A2B_entity_package_group.php
index 60e4901bc..5ea8fba12 100755
--- a/addons/contrib/archives/enhancements/A2B_entity_package_group.php
+++ b/addons/contrib/archives/enhancements/A2B_entity_package_group.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/openvoip.co/cdr_format.php b/addons/contrib/openvoip.co/cdr_format.php
new file mode 100755
index 000000000..c951c7b08
--- /dev/null
+++ b/addons/contrib/openvoip.co/cdr_format.php
@@ -0,0 +1,134 @@
+<?php
+/*
+INPUT:
+"4528339244","000","375232569865","a2billing","000","SIP/4528339244-00000013","SIP/375232569865@carrier_15_1-0000000c;1","Dial","Local/375232569865@a2billing_test,60,HRrL(5400000:61000:30000)","2016-08-04 19:52:29","2016-08-04 19:52:30","2016-08-04 19:54:22",113,112,"BUSY","BILLING","A2B03-1470340349.43","375232569865"
+"4528339244","000","375232569865","a2billing","000","SIP/4528339244-00000014","SIP/375232569865@carrier_15_2-0000000d;1","Dial","Local/375232569865@a2billing_test,60,HRrL(5400000:61000:30000)","2016-08-04 20:24:13",,"2016-08-04 20:24:13",45,38,"ANSWERED","BILLING","A2B03-1470340349.43","375232569865"
+"4528339244","000","79187700476","a2billing","000","SIP/4528339244-00000015","SIP/79187700476@carrier_16_1-0000000e;1","Dial","Local/79187700476@a2billing_test,60,HRrL(5400000:61000:30000)","2016-08-09 20:03:38","2016-08-09 20:03:39","2016-08-09 20:03:57",19,18,"ANSWERED","BILLING","A2B03-1470773018.49","79187700476"
+
+0. accountcode: What account number to use: Asterisk billing account, (string, 20 characters)
+1. src: Caller*ID number (string, 80 characters)
+2. dst: Destination extension (string, 80 characters)
+3. dcontext: Destination context (string, 80 characters)
+4. clid: Caller*ID with text (80 characters)
+5. channel: Channel used (80 characters)
+6. dstchannel: Destination channel if appropriate (80 characters)
+7. lastapp: Last application if appropriate (80 characters)
+8. lastdata: Last application data (arguments) (80 characters)
+9. start: Start of call (date/time)
+10. answer: Answer of call (date/time)
+11. end: End of call (date/time)
+12. duration: Total time in system, in seconds (integer)
+13. billsec: Total time call is up, in seconds (integer)
+14. disposition: What happened to the call: ANSWERED, NO ANSWER, BUSY, FAILED
+15. amaflags: What flags to use: see amaflags::DOCUMENTATION, BILL, IGNORE etc, specified on a per channel basis like accountcode.
+16. uniqueid: Unique Channel Identifier (32 characters)
+
+OUTPUT:
+FromT1 ToT1   Date       CallTime Duration   Dialed number           CarrierID+ITUT Number   Caller ID
+048-20 036-03 12-31-2015 23:57:05 00:07:53 A 01173472630592          01573472630592          3108294615
+
+MAPPING:
+FromT1
+091-00 - a2b01
+092-00 - ab202
+ToT1: extract carrier_gateway from dstchannelm for example carrier_5_1 = 005-01
+CallTime: call start time
+A - means ANSWERED, R - should mean that attempt made, but failed and next trunk attempted, " " (empty space) - other status
+Dialed number - 23 symbols! for 011 - remove 011, for all - add carrier id (3 symbols for example 015)
+CarrierID+ITUT Number - 23 symbols!
+*/
+
+$cdr_file = $argc >= 2 ? $argv[1] : "";
+if (empty($cdr_file) && isset($_REQUEST['file']))
+    $cdr_file = $_REQUEST['file'];
+
+if (!file_exists($cdr_file))
+    exit(1);
+
+$cdr_position_file = __DIR__ . '/.cdr_position';
+$cdr_position = intval(file_exists($cdr_position_file) ? file_get_contents($cdr_position_file) : 0);
+
+$file = new SplFileObject($cdr_file);
+if (!$file->isReadable())
+    exit(1);
+
+try {
+    $csv2 = null;
+    $file->seek($cdr_position);
+    while (!$file->eof()) {
+        if (empty($csv2)) {
+            $csv1 = get_csv();
+        } else {
+            $csv1 = $csv2;
+        }
+        $csv2 = get_csv();
+        if ($csv1 === false)
+            break;
+
+        process_cdr($csv1, $csv2);
+    };
+
+    // save position for next run
+    $cdr_position = $file->key() - 1;
+    file_put_contents($cdr_position_file, ($cdr_position < 0 ? 0 : $cdr_position));
+} catch (\Exception $e) {
+    echo $e->getMessage();
+    exit(1);
+}
+
+function get_csv() {
+    global $file;
+    $result = false;
+    while (!$file->eof()) {
+        $line = $file->fgets();
+        $csv = str_getcsv($line);
+        if (!is_array($csv) || count($csv) < 17)
+            continue;
+        if ($csv[7] != 'Dial') // need only Dial app cdrs
+            continue;
+        $result = $csv;
+        break;
+    }
+    return $result;
+}
+
+function process_cdr($csv, $next_csv) {
+    if (!$csv)
+        return;
+
+    // detect from
+    $from = '';
+    if ($csv[0] == '4528339244') {
+        $from = '091-00';
+    } elseif ($csv[0] == '0744553513') {
+        $from = '092-00';
+    }
+
+    // detect to, cdr format
+    $carrier = '';
+    $to = '';
+    if (preg_match('/[A-Z0-9]+\/carrier\_(\d+)\_(\d+)/', $csv[6], $matches) || preg_match('/[A-Z0-9]+\/\d+\@carrier\_(\d+)\_(\d+)/', $csv[6], $matches)) {
+        $carrier = $matches[1];
+        $to = sprintf('%03d-%02d', $carrier, $matches[2]);
+    }
+
+    // detect date
+    $datetime = DateTime::createFromFormat('Y-m-d H:i:s', $csv[9]);
+
+    // detect duration
+    $duration = gmdate("H:i:s", $csv[13]);
+
+    // detect answer flag
+    $flag = '';
+    if ($csv[14] == 'ANSWERED') {
+        $flag = 'A'; // answer
+    } elseif ($next_csv && $csv[16] == $next_csv[16]) {
+        $flag = 'R'; // retry, next one is the result
+    }
+
+    // detect dialed number
+    $number = sprintf('%03d', $carrier) . preg_replace('/^011/', '', $csv[2]);
+
+    // output data
+    printf("%-6s %-6s %-10s %-8s %-8s %1s %-23s %-23s %-23s %s\r\n", $from, $to, $datetime->format('m-d-Y'), $datetime->format('H:i:s'), $duration, $flag, $csv[2], $number, $csv[1], $csv[16]);
+}
diff --git a/addons/contrib/openvoip.co/cdr_format_mysql.php b/addons/contrib/openvoip.co/cdr_format_mysql.php
new file mode 100755
index 000000000..de49104ae
--- /dev/null
+++ b/addons/contrib/openvoip.co/cdr_format_mysql.php
@@ -0,0 +1,448 @@
+<?php
+/*
+INPUT:
+CREATE TABLE `cdr` (
+  `calldate` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `clid` varchar(80) NOT NULL DEFAULT '',
+  `src` varchar(80) NOT NULL DEFAULT '',
+  `dst` varchar(80) NOT NULL DEFAULT '',
+  `dcontext` varchar(80) NOT NULL DEFAULT '',
+  `channel` varchar(80) NOT NULL DEFAULT '',
+  `dstchannel` varchar(80) NOT NULL DEFAULT '',
+  `lastapp` varchar(80) NOT NULL DEFAULT '',
+  `lastdata` varchar(80) NOT NULL DEFAULT '',
+  `duration` int(11) NOT NULL DEFAULT '0',
+  `billsec` int(11) NOT NULL DEFAULT '0',
+  `disposition` varchar(45) NOT NULL DEFAULT '',
+  `amaflags` int(11) NOT NULL DEFAULT '0',
+  `accountcode` varchar(20) NOT NULL DEFAULT '',
+  `userfield` varchar(255) NOT NULL DEFAULT '',
+  `uniqueid` varchar(32) NOT NULL DEFAULT '',
+  `linkedid` varchar(32) NOT NULL DEFAULT '',
+  `sequence` varchar(32) NOT NULL DEFAULT '',
+  `peeraccount` varchar(32) NOT NULL DEFAULT '',
+  KEY `calldate` (`calldate`),
+  KEY `dst` (`dst`),
+  KEY `src` (`src`),
+  KEY `accountcode` (`accountcode`),
+  KEY `duration` (`duration`),
+  KEY `billsec` (`billsec`)
+)
+
+OUTPUT:
+FromT1 ToT1   Date       CallTime Duration   Dialed number           CarrierID+ITUT Number   Caller ID
+048-20 036-03 12-31-2015 23:57:05 00:07:53 A 01173472630592          01573472630592          3108294615
+
+MAPPING:
+FromT1
+091-00 - a2b01
+092-00 - ab202
+ToT1: extract carrier_gateway from dstchannelm for example carrier_5_1 = 005-01
+CallTime: call start time
+A - means ANSWERED, R - should mean that attempt made, but failed and next trunk attempted, " " (empty space) - other status
+Dialed number - 23 symbols! for 011 - remove 011, for all - add carrier id (3 symbols for example 015)
+CarrierID+ITUT Number - 23 symbols!
+*/
+
+require_once __DIR__ . "../../../../common/lib/phpagi/phpagi.php";
+require_once __DIR__ . "../../../../common/lib/phpagi/phpagi-asmanager.php";
+
+class CdrParser {
+    const A2B_CONFIG = '/etc/a2billing.conf';
+    const DEL = "\n-----------------------------------------------------";
+    const MAX_CALL_DURATION = 3600; // seconds
+
+    protected $columns = array( // cdr table legit columns
+        'calldate',
+        'clid',
+        'src',
+        'dst',
+        'channel',
+        'dstchannel',
+        'duration',
+        'billsec',
+        'disposition',
+        'accountcode',
+        'uniqueid',
+        'lastapp'
+    );
+    protected $args = array(); // app console args
+    protected $params_ini = array(); // INI params from A2B_CONFIG
+    protected $params_a2b = array(); // A2B params from database
+    protected $cdr_db = null;
+    protected $cdr_table = null;
+    protected $cdr_id_column = null;
+    protected $cdr_processed_column = null;
+    protected $cdr_batch = null;
+    protected $active_channels = null;
+    protected $asterisk_hosts = null;
+
+    public function __construct() {
+        $this->args = self::parse_args();
+        $this->params_ini = self::parse_ini_config();
+        $this->init_db();
+        $this->params_a2b = $this->parse_a2b_config();
+
+        $this->cdr_db = $this->get_arg('cdr_db', 'asteriskcdrdb');
+        $this->cdr_table = $this->get_arg('cdr_table', 'cdr');
+        $this->cdr_batch = intval($this->get_arg('cdr_batch', 10000));
+        $this->active_channels = $this->get_active_channels();
+        $this->cdr_id_column = $this->get_arg('cdr_id_column', 'id');
+        $this->cdr_processed_column = $this->get_arg('cdr_processed_column', 'processed');
+
+        // add dynamic columns
+        $this->columns[] = $this->cdr_id_column;
+        $this->columns[] = $this->cdr_processed_column;
+    }
+
+    public function run() {
+        if ($this->has_arg('h') || $this->has_arg('help')) { // help
+            self::print_ln(
+                'Usage: php cdr_format_mysql.php [options]',
+                'Options are:',
+                '-h or --help           - show this help',
+                '--test                 - test only, no real actions, just output to console',
+                '--cdr_db               - CDR database name, default "asteriskcdrdb"',
+                '--cdr_table            - CDR table name, default "cdr"',
+                '--cdr_batch            - CDR parsing batch limit, default 10000',
+                '--cdr_id_column        - CDR db table ID column, must be "bigint UNSIGNED NOT NULL Auto_increment"',
+                '--cdr_processed_column - CDR db table column that is used to mark processed cdrs, must "int(1) UNSIGNED DEFAULT 0 NULL"',
+                '--asterisk_hosts       - comma separated list of all asterisk hosts in cluster, like "host1,192.168.0.2"'
+            );
+            return;
+        }
+
+        if ($this->is_test()) {
+            self::print_ln('>>> TEST RUN <<<');
+            self::print_ln(self::DEL);
+            self::print_ln('Passed arguments:');
+            self::print_ln($this->args);
+            self::print_ln(self::DEL);
+            self::print_ln('INI params:');
+            self::print_ln($this->params_ini);
+        }
+
+        // process cdrs
+        $cdrs = $this->get_cdrs();
+        $cdr_ids = array();
+        for ($i = 0; $i < count($cdrs); ++$i) {
+            $cdr = $cdrs[$i];
+            $cdr_ids[] = $cdr[$this->cdr_id_column];
+
+            // we need to parse only following
+            if (!in_array($cdr['lastapp'], array('Dial', 'ResetCDR')))
+                continue;
+
+            if ($this->is_test())
+                self::print_ln(self::DEL, 'Processing cdr #' . $i . ':', $cdr);
+
+            // detect from
+            $from = '';
+            if ($cdr['accountcode'] == '4528339244') {
+                $from = '091-00';
+            } elseif ($cdr['accountcode'] == '0744553513') {
+                $from = '092-00';
+            }
+
+            // detect to, cdr format
+            $carrier = '';
+            $to = '';
+            if (preg_match('/[A-Z0-9]+\/carrier\_(\d+)\_(\d+)/', $cdr['dstchannel'], $matches) || preg_match('/[A-Z0-9]+\/\d+\@carrier\_(\d+)\_(\d+)/', $cdr['dstchannel'], $matches)) {
+                $carrier = $matches[1];
+                $to = sprintf('%03d-%02d', $carrier, $matches[2]);
+            }
+
+            // detect date
+            $datetime = \DateTime::createFromFormat('Y-m-d H:i:s', $cdr['calldate']);
+
+            // detect duration
+            $duration = gmdate("H:i:s", $cdr['billsec']);
+
+            // detect answer flag
+            $flag = '';
+            if ($cdr['disposition'] == 'ANSWERED') { // answer
+                $flag = 'A';
+            } elseif ($this->is_retry($cdrs, $i)) { // retry
+                $flag = 'R';
+            }
+
+            // detect dialed number
+            $number = sprintf('%03d', $carrier) . preg_replace('/^011/', '', $cdr['dst']);
+
+            // output data
+            if ($this->is_test())
+                self::print_ln(self::DEL, 'OUTPUT cdr #' . $i . ':');
+
+            printf("%-6s %-6s %-10s %-8s %-8s %1s %-23s %-23s %-23s %s\r\n", $from, $to, $datetime->format('m-d-Y'), $datetime->format('H:i:s'), $duration, $flag, $cdr['dst'], $number, $cdr['src'], $cdr['uniqueid']);
+        }
+
+        // set marker
+        $this->mark_cdrs_processed($cdr_ids);
+    }
+
+    protected function is_retry($cdrs, $i) {
+        $result = false;
+        $current_cdr = $cdrs[$i];
+
+        // all cdrs is cdrs + active calls
+        static $all_cdrs = null;
+        if (!$all_cdrs)
+            $all_cdrs = array_merge($cdrs, $this->active_channels);
+
+        // prepare time limit
+        $until_time = \DateTime::createFromFormat('Y-m-d H:i:s', $current_cdr['calldate']);
+        $until_time->add(new DateInterval('PT' . self::MAX_CALL_DURATION . 'S'));
+
+        // check if we have a retry in the following CDRs and active calls
+        // we go forward on self::MAX_CALL_DURATION seconds only!
+        $j = $i + 1;
+        for ($j; $j < count($all_cdrs); $j++) {
+            $cdr = $all_cdrs[$j];
+            if ($current_cdr['channel'] === $cdr['channel'] && $current_cdr['dst'] === $cdr['dst']) {
+                $result = true;
+                break;
+            }
+            $cdr_time = \DateTime::createFromFormat('Y-m-d H:i:s', $cdr['calldate']);
+            if ($cdr_time > $until_time)
+                break;
+        }
+
+        if ($this->is_test())
+            self::print_ln(
+                self::DEL,
+                'RETRY RESULT: ' . ($result ? 'TRUE' : 'FALSE'),
+                'Checked cdr(s): ' . ($j - $i)
+            );
+
+        return $result;
+    }
+
+    protected function get_cdrs() {
+        $columns = implode(', ', $this->columns);
+        $sql = "select $columns from {$this->cdr_db}.{$this->cdr_table}
+        where {$this->cdr_processed_column} = 0 order by calldate asc limit {$this->cdr_batch}";
+
+        if ($this->is_test())
+            self::print_ln(self::DEL, 'CDRs SQL:', $sql);
+
+        $cdrs = $this->query($sql);
+
+        if ($this->is_test())
+            self::print_ln(self::DEL, 'CDRs count: ' . count($cdrs));
+
+        return $cdrs;
+    }
+
+    protected function mark_cdrs_processed($cdr_ids) {
+        if (!is_array($cdr_ids) || !count($cdr_ids))
+            return;
+
+        $cdrs_chunks = array_chunk($cdr_ids, 500);
+        foreach ($cdrs_chunks as $cdr_ids) {
+            $cdr_ids_sql = join(', ', $cdr_ids);
+            $sql = "update {$this->cdr_db}.{$this->cdr_table}
+            set {$this->cdr_processed_column} = 1
+            where {$this->cdr_id_column} in ($cdr_ids_sql)";
+
+            if ($this->is_test()) {
+                self::print_ln(self::DEL, 'CDRs mark SQL: ' . $sql);
+            } else {
+                $this->query($sql);
+            }
+        }
+    }
+
+    protected function get_a2b_param($key, $default_value = null) {
+        return self::_get_param($this->params_a2b, $key, $default_value);
+    }
+
+    protected function get_ini_param($key, $default_value = null) {
+        return self::_get_param($this->params_ini, $key, $default_value);
+    }
+
+    protected static function _get_param($data, $key, $default_value = null) {
+        $keys = explode('.', $key);
+        if (!is_array($keys))
+            $keys = array($key);
+
+        // get param
+        $value = $data;
+        foreach ($keys as $key) {
+            $value = isset($value[$key]) ? $value[$key] : $default_value;
+        }
+
+        return $value;
+    }
+
+    protected function escape($value) {
+        return $this->mysqli ? $this->mysqli->real_escape_string($value) : $value;
+    }
+
+    protected function init_db() {
+        // connecting to DB
+        if (strcasecmp($this->get_ini_param('database.dbtype', ''), 'mysql') != 0)
+            throw new \RuntimeException('Supports only mysql database');
+
+        $host = $this->get_ini_param('database.hostname', '127.0.0.1');
+        $user = $this->get_ini_param('database.user', 'root');
+        $pass = $this->get_ini_param('database.password', '');
+        $db = $this->get_ini_param('database.dbname', 'a2billing');
+        $mysqli = new mysqli($host, $user, $pass, $db);
+
+        if ($mysqli->connect_error)
+            throw new \RuntimeException('Mysql connection error (' . $mysqli->connect_errno . ') ' . $mysqli->connect_error);
+
+        $this->mysqli = $mysqli;
+        $this->mysqli->set_charset("utf8");
+    }
+
+    public function query($sql) {
+        $data = array();
+        if (is_object($result = $this->mysqli->query($sql))) {
+            while ($row = $result->fetch_assoc())
+                $data[] = $row;
+            $result->free();
+        }
+        return $data;
+    }
+
+    protected function is_test() {
+        return $this->has_arg('test');
+    }
+
+    protected function has_arg($name) {
+        return array_key_exists($name, $this->args);
+    }
+
+    protected function get_arg($name, $default_value = null) {
+        return $this->has_arg($name) ? $this->args[$name] : $default_value;
+    }
+
+    protected static function parse_args() {
+        $shortargs = 'h';
+        $longargs = array(
+            'help',
+            'test',
+            'cdr_db:',
+            'cdr_table:',
+            'cdr_processed_column:',
+            'cdr_id_column:',
+            'cdr_batch:',
+            'asterisk_hosts:'
+        );
+        return getopt($shortargs, $longargs);
+    }
+
+    protected function parse_a2b_config() {
+        $result = [];
+        $sql = "select * from cc_config";
+        $data = $this->query($sql);
+        foreach ($data as $row) {
+            $group = $row['config_group_title'];
+            if (!isset($result[$group]))
+                $result[$group] = array();
+            $result[$group][$row['config_key']] = $row['config_value'];
+        }
+        return $result;
+    }
+
+    protected static function parse_ini_config() {
+        return file_exists(self::A2B_CONFIG) ? parse_ini_file(self::A2B_CONFIG, true) : array();
+    }
+
+    protected static function _print_ln($value, $block_name = null) {
+        if (!empty($block_name) && !is_numeric($block_name))
+            echo '[' . $block_name . ']' . PHP_EOL;
+        foreach ($value as $name => $arg) {
+            if (is_array($arg)) {
+                self::_print_ln($arg, $name);
+            } else {
+                echo (!is_numeric($name) ? $name . ': ' : '') . $arg . PHP_EOL;
+            }
+        }
+    }
+
+    protected static function print_ln() {
+        self::_print_ln(func_get_args());
+    }
+
+    protected function get_active_channels() {
+        $result = array();
+        $asm = new AGI_AsteriskManager();
+        $hosts = $this->get_arg('asterisk_hosts', $this->get_a2b_param('global.manager_host', '127.0.0.1'));
+        $hosts = explode(',', $hosts);
+        $username = $this->get_a2b_param('global.manager_username', '');
+        $secret = $this->get_a2b_param('global.manager_secret', '');
+
+        if (!is_array($hosts) || !count($hosts)) {
+            if ($this->is_test())
+                self::print_ln('No asterisk hosts found!');
+
+            return $result;
+        }
+
+        // search calls on all hosts
+        foreach ($hosts as $host) {
+            if (!$asm->connect($host, $username, $secret)) {
+                if ($this->is_test())
+                    self::print_ln('Cannot connect to asterisk host "' . $host . '"!');
+                continue;
+            }
+
+            $response = $asm->send_request('COMMAND', array(
+                'command' => 'core show channels concise',
+                'actionid' => md5(rand())
+            ));
+
+            if (empty($response['data'])) {
+                if ($this->is_test())
+                    self::print_ln('Got no response from asterisk: ' . $host);
+
+                continue;
+            }
+
+            if ($this->is_test())
+                self::print_ln('Got asterisk response:', $response['data']);
+
+            $lines = preg_split('/\r\n|\n/', $response['data']);
+            if (!is_array($lines)) {
+                if ($this->is_test())
+                    self::print_ln('Cannot parse lines: ', $lines);
+
+                continue;
+            }
+
+            foreach ($lines as $line) {
+                if (strpos($line, '!')) {
+                    $parts = explode('!', $line);
+                    if (!is_array($parts) || count($parts) < 3)
+                        continue;
+
+                    // we need channel and number
+                    $result[] = array(
+                        'calldate' => date('Y-m-d H:i:s'),
+                        'channel' => $parts[0],
+                        'dst' => $parts[2]
+                    );
+                }
+            }
+
+            $asm->disconnect();
+        }
+
+        if ($this->is_test())
+            self::print_ln(self::DEL, 'ACTIVE CHANNELS COUNT: ' . count($result));
+
+        return $result;
+    }
+}
+
+// run app
+try {
+    $parser = new CdrParser();
+    $parser->run();
+    exit(0);
+} catch (\Exception $err) {
+    error_log($err->getMessage());
+    exit(1);
+}
diff --git a/addons/contrib/openvoip.co/cdr_upload.sh b/addons/contrib/openvoip.co/cdr_upload.sh
new file mode 100755
index 000000000..6e5910d81
--- /dev/null
+++ b/addons/contrib/openvoip.co/cdr_upload.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+SCRIPT_NAME=$(basename "$0")
+SCRIPT_DIR=$(cd $(dirname $0) ; pwd -P);
+
+lock() {
+    exec 200>/var/lock/$SCRIPT_NAME
+    flock -n 200
+}
+
+if ! lock; then
+    exit 1;
+fi
+
+# run parser and redirect output to NMS server
+php $SCRIPT_DIR/cdr_format_mysql.php $@ | ssh cdranalyst@nms "cat >> /home/cdranalyst/cdrs/A$(date +%m%d%Y).txt"
diff --git a/addons/contrib/openvoip.co/test.csv b/addons/contrib/openvoip.co/test.csv
new file mode 100644
index 000000000..43afff656
--- /dev/null
+++ b/addons/contrib/openvoip.co/test.csv
@@ -0,0 +1,7 @@
+"4528339244","17186173500","01113474604646","a2billing","17186173500","SIP/4528339244-00000018","SIP/carrier_34_2-0000001a","Dial","1","2016-09-07 20:01:50",,"2016-09-07 20:01:55",5,0,"CHANUNAVAIL","BILLING","A2B03-1473278510.32","13474604646"
+"4528339244","17186173500","01113474604646","a2billing","17186173500","SIP/4528339244-00000018","SIP/carrier_35_1-0000001a","Dial","1","2016-09-07 20:01:56",,"2016-09-07 20:06:56",500,300,"ANSWERED","BILLING","A2B03-1473278510.32","13474604646"
+"4528339244","17186173500","5082159142","a2billing","17186173500","SIP/4528339244-00000036","OOH323/carrier_14_1-8","Hangup","42","2016-10-04 01:09:17",,"2016-10-04 01:09:21",4,0,"FAILED","BILLING","A2B03-1475543357.62","5082159142"
+"4528339244","17186173500","150821591423","a2billing","17186173500","SIP/4528339244-00000037","OOH323/carrier_14_1-9","Dial","OOH323/25830#150821591423@carrier_14_1,30,L(5400000:61000:30000)","2016-10-04 01:09:46","2016-10-04 01:10:00","2016-10-04 01:10:07",21,7,"ANSWERED","BILLING","A2B03-1475543386.64","150821591423"
+"4528339244","17186173500","15082159142","a2billing","17186173500","SIP/4528339244-00000039","SIP/carrier_30_1-0000003a","Dial","SIP/78816#15082159142@carrier_30_1,30,L(5400000:61000:30000)","2016-10-04 01:19:08","2016-10-04 01:19:17","2016-10-04 01:19:25",17,8,"ANSWERED","BILLING","A2B03-1475543948.67","15082159142"
+"4528339244","17186173500","13474604646","a2billing","17186173500","SIP/4528339244-0000003b","SIP/carrier_30_1-0000003e","Dial","SIP/78816#13474604646@carrier_30_1,30,L(5400000:61000:30000)","2016-10-04 01:21:48",,"2016-10-04 01:21:59",11,0,"NO ANSWER","BILLING","A2B03-1475544108.69","13474604646"
+"4528339244","17186173500","15082159142","a2billing","17186173500","SIP/4528339244-0000003f","SIP/carrier_30_1-00000040","Dial","SIP/78816#15082159142@carrier_30_1,30,L(5400000:61000:30000)","2016-10-04 01:28:12","2016-10-04 01:28:28","2016-10-04 01:28:38",26,10,"ANSWERED","BILLING","A2B03-1475544492.73","15082159142"
diff --git a/addons/contrib/villagetelco/gui/admin/Public/A2B_card_info__vt.php b/addons/contrib/villagetelco/gui/admin/Public/A2B_card_info__vt.php
index fd3a127ba..bcdf4fee4 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/A2B_card_info__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/A2B_card_info__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_card__vt.php b/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_card__vt.php
index 0d64007ab..f364114c0 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_card__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_card__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -150,17 +150,15 @@
 if ($popup_select) {
 ?>
 <SCRIPT LANGUAGE="javascript">
-<!-- Begin
+
 function sendValue(selvalue, othervalue)
 {
-        window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
-        if (othervalue && window.opener.document.<?php echo $popup_formname ?>.accountcode) {
-                window.opener.document.<?php echo $popup_formname ?>.accountcode.value = othervalue;
-        }
-        window.close();
+    window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
+    if (othervalue && window.opener.document.<?php echo $popup_formname ?>.accountcode) {
+            window.opener.document.<?php echo $popup_formname ?>.accountcode.value = othervalue;
+    }
+    window.close();
 }
-
-// End -->
 </SCRIPT>
 <?php
 }
diff --git a/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_def_ratecard__vt.php b/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_def_ratecard__vt.php
index 562b0b024..3e641acdf 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_def_ratecard__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_def_ratecard__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_did__vt.php b/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_did__vt.php
index 521c80b74..b8c03fd9f 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_did__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_did__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_monitor__vt.php b/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_monitor__vt.php
index b15a039a4..65b576fb3 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_monitor__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_monitor__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_password__vt.php b/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_password__vt.php
index fb2b8ebae..67097de14 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_password__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_password__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_voucher__vt.php b/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_voucher__vt.php
index ffb43e26a..5be4bb00f 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_voucher__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/A2B_entity_voucher__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/admin/Public/A2B_notification__vt.php b/addons/contrib/villagetelco/gui/admin/Public/A2B_notification__vt.php
index 6076286e1..e78b79ab5 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/A2B_notification__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/A2B_notification__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/admin/Public/PP_error__vt.php b/addons/contrib/villagetelco/gui/admin/Public/PP_error__vt.php
index 4537eba0b..943a2f67f 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/PP_error__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/PP_error__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/admin/Public/PP_intro__vt.php b/addons/contrib/villagetelco/gui/admin/Public/PP_intro__vt.php
index a8c9e80ab..675053386 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/PP_intro__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/PP_intro__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/admin/Public/call-last-month__vt.php b/addons/contrib/villagetelco/gui/admin/Public/call-last-month__vt.php
index a4b644f74..80fc95449 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/call-last-month__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/call-last-month__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/admin/Public/call-log-customers__vt.php b/addons/contrib/villagetelco/gui/admin/Public/call-log-customers__vt.php
index 6a605bb79..4320a5883 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/call-log-customers__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/call-log-customers__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/admin/Public/dashboard__vt.php b/addons/contrib/villagetelco/gui/admin/Public/dashboard__vt.php
index daab64160..bf384f9f0 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/dashboard__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/dashboard__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_card__vt.inc b/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_card__vt.inc
index e01a3f4c6..c299c5623 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_card__vt.inc
+++ b/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_card__vt.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -38,7 +38,7 @@ getpost_ifset(array('id', 'username', 'useralias', 'uipass', 'credit', 'language
 'lastname', 'firstname', 'email', 'address','city', 'state', 'country', 'zipcode', 'phone', 'fax', 'inuse',
 'cid', 'runservice', 'firstusedate','expirationdate', 'enableexpire', 'expiredays', 'sip_buddy',
 'iax_buddy','popup_select', 'vat', 'autorefill', 'initialbalance', 'mac_addr', 'cardnumberlenght_list',
-'status', 'block', 'lock_pin', 'template_invoice', 'template_outstanding', 'description', 'voicemail_activated', 
+'status', 'block', 'lock_pin', 'template_invoice', 'template_outstanding', 'description', 'voicemail_activated',
 'voicemail_permitted','email_notification','credit_notification','notify_email', 'id_seria',
 'company_name' , 'company_website' , 'vat_rn' , 'traffic' , 'traffic_target','discount','restriction' ));
 
@@ -64,15 +64,15 @@ if (DELETE_FK_CARD) {
 }
 
 if (!($popup_select>=1)) {
-	if (VT_MODE) { 
+	if (VT_MODE) {
     $HD_Form ->FG_LIST_ADDING_BUTTON1 = false;
-} else { 
+} else {
     $HD_Form ->FG_LIST_ADDING_BUTTON1 = true;
 }
 	$HD_Form ->FG_LIST_ADDING_BUTTON_LINK1 = "A2B_entity_card_multi__vt.php?stitle=Card&section=".$_SESSION["menu_section"];
 	$HD_Form ->FG_LIST_ADDING_BUTTON_ALT1 = $HD_Form ->FG_LIST_ADDING_BUTTON_MSG1 = gettext("Generate Customers");
 	$HD_Form ->FG_LIST_ADDING_BUTTON_IMG1 = Images_Path ."/user_multi_add.png" ;
-    if (VT_MODE) {  
+    if (VT_MODE) {
 	$HD_Form ->FG_LIST_ADDING_BUTTON2 = false;
 } else {
     $HD_Form ->FG_LIST_ADDING_BUTTON2 = true;
@@ -123,7 +123,7 @@ foreach ($show_list_temp as $i => $value) {
 	if (!($pos===false)) {
 		$temp_ar=preg_split('/:/',$a);
 		$b=$temp_ar[1];
-		$a=strtolower(trim($temp_ar[0]));	
+		$a=strtolower(trim($temp_ar[0]));
 		if (strlen($a)>1) {
 		$show_list_sizes[$a]=$b;
 		}
@@ -136,7 +136,7 @@ $show_fields=array();
 $show_fields['id']=array(gettext("ID"), "id", "3%", "center", "sort","", "", "", "", "", "", "");
 
 $show_fields['username']=array(gettext("Account Number"), "username", "14%", "center", "sort", "", "30", "", "", "", "", "linktocustomer");
-if (!($popup_select>=1)) 
+if (!($popup_select>=1))
  $show_fields['useralias']=array("<acronym title=\"WEB UI LOGIN\">".gettext("LOGIN")."</acronym>", "useralias", "12%", "center", "sort","", "", "", "", "", "", "");
 
 $show_fields['lastname']=array(gettext("LASTNAME"), "lastname", "7%", "center", "sort", "20","", "", "", "", "", "");
@@ -166,7 +166,7 @@ if (!($popup_select>=1)) {
 	foreach ($show_list_temp as $i => $value) {
                 $show_list[$value]=$value;
 	}
-	
+
 	$FG_COL_QUERY='DISTINCT ';
 }
 $FG_COL_QUERY_FIELD='';
@@ -218,7 +218,7 @@ if (!($popup_select>=1)) $HD_Form -> FG_EXPORT_CSV = true;
 
 
 if (!($popup_select>=1))  {
-    if (VT_MODE) { 
+    if (VT_MODE) {
     $HD_Form -> FG_EXPORT_XML = false;
     } else {
     $HD_Form -> FG_EXPORT_XML = true;
@@ -270,7 +270,7 @@ if (($popup_select>=1)) {
 //This disables the select botton in the CDR
     if (VT_MODE){
     $HD_Form -> FG_OTHER_BUTTON1 = true;
-    } else { 
+    } else {
     $HD_Form -> FG_OTHER_BUTTON1 = true;
     }
     $HD_Form -> FG_OTHER_BUTTON1_ALT = '<font color="red">&lt;select&gt;</font>';
@@ -284,7 +284,7 @@ if (($popup_select>=1)) {
 
 } else {
 	$HD_Form -> FG_INFO = true;
-     if (VT_MODE){    
+     if (VT_MODE){
 	$HD_Form -> FG_OTHER_BUTTON1 = false;
 	$HD_Form -> FG_OTHER_BUTTON2 = false;
 	$HD_Form -> FG_OTHER_BUTTON3 = false;
@@ -334,7 +334,7 @@ $HD_Form -> FG_ADDITION = true;
 
 if (has_rights (ACX_MODIFY_CUSTOMERS) && !($popup_select>=1)) {
 
-    if (VT_MODE) { 
+    if (VT_MODE) {
     $HD_Form -> FG_EDITION = true;
 } else {
     $HD_Form -> FG_EDITION = false;
@@ -347,11 +347,11 @@ if (has_rights (ACX_MODIFY_CUSTOMERS) && !($popup_select>=1)) {
 }
 
 
-	
+
 	$maxi	= '';
 	$maxi2	= '';
 	$maxi3	= '';
-	
+
 	if (isset($form_action) && $form_action=="ask-add") {
 		if (!is_numeric($cardnumberlenght_list)) 	$cardnumberlenght_list = LEN_CARDNUMBER;
 		$array_card_generated  = gen_card_with_alias("cc_card", 0, $cardnumberlenght_list);
@@ -361,7 +361,7 @@ if (has_rights (ACX_MODIFY_CUSTOMERS) && !($popup_select>=1)) {
 		$maxi3 = "value='".$pass."'";
 		$default_initbalance = "value='0'";
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("ACCOUNT NUMBER"),
 				   "username",
 				   "",
@@ -370,8 +370,8 @@ if (has_rights (ACX_MODIFY_CUSTOMERS) && !($popup_select>=1)) {
 				   "4",
 				   gettext("Insert the account number"),
 				   "" , "", "",	"", "" , "", "", '', null, null, gettext("Customer Information"));
-				   
-	
+
+
 	$HD_Form -> AddEditElement (gettext("VOIP LOGIN"),
 				   "useralias",
 				   "",
@@ -380,8 +380,8 @@ if (has_rights (ACX_MODIFY_CUSTOMERS) && !($popup_select>=1)) {
 				   "4",
 				   gettext("Insert the webui login"),
 				   "" , "", "",	"", "" , "", "", "");
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("VOIP PASSWORD"),
 				   "uipass",
 				   '',
@@ -390,16 +390,16 @@ if (has_rights (ACX_MODIFY_CUSTOMERS) && !($popup_select>=1)) {
 				   "",
 				   gettext("Insert the password"),
 				   "" , "", "",	"", "", "",	"", gettext("Password for customer to register with the VoIP gateway") );
-	
+
 	if ($form_action =="ask-add" || $form_action=="add") {
 		$balance_access = "value = '0'";
 		$payment_status = "";
-		
+
 	} else {
 		$balance_access = 'readonly';
 		$payment_status= 'disabled="true" style="color: gray;" ';
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("BALANCE"),
 				   "credit",
 				   "",
@@ -408,7 +408,7 @@ if (has_rights (ACX_MODIFY_CUSTOMERS) && !($popup_select>=1)) {
 				   "12",
 				   gettext("Insert the number of credit"),
 				   "" , "", "", "", "", "", "", gettext("currency : ").strtoupper(BASE_CURRENCY) );
-				   
+
 if (!VT_MODE) {
 	$HD_Form -> AddEditElement (gettext("CUSTOMER GROUP"),
 				   "id_group",
@@ -429,7 +429,7 @@ if (!VT_MODE) {
 	               		   "cc_card_seria",
 	               		   "name, id",
 	               		   "", "", "%1", "", "", "", '<OPTION  value="-1" selected>'.gettext("NOT DEFINED").'</OPTION>' );
-}	
+}
         $HD_Form -> AddEditElement (gettext("LAST NAME"),
 				   "lastname",
 				   '$value',
@@ -438,7 +438,7 @@ if (!VT_MODE) {
 				   "11",
 				   gettext("Insert the lastname of the customers"),
 				   "" , "", "",	"", "", "" , "NO", "", null, null, gettext("Personal Information"));
-	
+
 	$HD_Form -> AddEditElement (gettext("FIRST NAME"),
 				   "firstname",
 				   '$value',
@@ -447,8 +447,8 @@ if (!VT_MODE) {
 				   "11",
 				   gettext("Insert the firstname of the customers"),
 				   "" , "", "",	"", "", "" , "NO", "");
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("EMAIL"),
 				   "email",
 				   '$value',
@@ -457,8 +457,8 @@ if (!VT_MODE) {
 				   "1",
 				   gettext("Insert the email"),
 				   "" , "", "",	"", "", "" , "NO", "");
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("ADDRESS"),
 				   "address",
 				   '$value',
@@ -467,8 +467,8 @@ if (!VT_MODE) {
 				   "0",
 				   gettext("Insert the address of the customers"),
 				   "" , "", "",	"", "", "" , "NO", "");
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("CITY"),
 				   "city",
 				   '$value',
@@ -477,8 +477,8 @@ if (!VT_MODE) {
 				   "0",
 				   gettext("Insert the city"),
 				   "" , "", "",	"", "", "" , "NO", "");
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("STATE/PROVINCE"),
 				   "state",
 				   '$value',
@@ -487,11 +487,11 @@ if (!VT_MODE) {
 				   "11",
 				   gettext("Insert the state"),
 				   "" , "", "",	"", "", "" , "NO", "");
-	
+
 	if ($form_action == 'ask-add') {
 		$country_default_val = 'USA';
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("COUNTRY"),
 				   "country",
 				   "$country_default_val",
@@ -501,7 +501,7 @@ if (!VT_MODE) {
 				   "cc_country",
 				   "countryname, countrycode",
 				   "", "", "%1", "", "", "", '' );
-	
+
 	$HD_Form -> AddEditElement (gettext("ZIP/POSTAL CODE"),
 				   "zipcode",
 				   '$value',
@@ -510,8 +510,8 @@ if (!VT_MODE) {
 				   "0",
 				   gettext("Insert the zipcode"),
 				   "" , "", "",	"", "", "" , "NO", "");
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("PHONE NUMBER"),
 				   "phone",
 				   '$value',
@@ -520,8 +520,8 @@ if (!VT_MODE) {
 				   "7",
 				   gettext("Insert the phone number of the customers"),
 				   "" , "", "",	"", "", "" , "NO", "");
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("FAX NUMBER"),
 				   "fax",
 				   '$value',
@@ -530,7 +530,7 @@ if (!VT_MODE) {
 				   "",
 				   gettext("Insert the fax number of the customers"),
 				   "" , "", "",	"", "", "" , "NO", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("COMPANY NAME"),
 				   "company_name",
 				   '$value',
@@ -539,8 +539,8 @@ if (!VT_MODE) {
 				   "",
 				   gettext("Insert Company name of this customer"),
 				   "" , "", "",	"", "", "" , "NO", "");
-				   
-				   
+
+
 	$HD_Form -> AddEditElement (gettext("COMPANY WEBSITE"),
 				   "company_website",
 				   '$value',
@@ -549,11 +549,11 @@ if (!VT_MODE) {
 				   "",
 				   gettext("Insert the company website of this customer"),
 				   "" , "", "",	"", "", "" , "NO", "");
-	
+
 	if ($form_action != "edit") {
-		
+
 		$update_field_typepaid = 'typepaid ,';
-	
+
 		$HD_Form -> AddEditElement (gettext("PAYMENT TYPE"),
 					   "typepaid",
 					   "",
@@ -563,7 +563,7 @@ if (!VT_MODE) {
 					   "",
 					   "list" , "", "",	"", $typepaid_list, "%1", "", '', null, null, gettext("Customer Status") );
 	}
-if (!VT_MODE) {	
+if (!VT_MODE) {
 	$HD_Form -> AddEditElement (gettext("CALL PLAN"),
 				   "tariff",
 				   "",
@@ -573,7 +573,7 @@ if (!VT_MODE) {
 				   "cc_tariffgroup",
 				   "tariffgroupname, id",
 				   "", "", "%1", "", gettext("Changing the call plan will result in the free minutes or free calls package being reset.") );
-	
+
 	$HD_Form -> AddEditElement (gettext("DIDGROUP"),
 				   "id_didgroup",
 				   "",
@@ -583,7 +583,7 @@ if (!VT_MODE) {
 				   "cc_didgroup",
 				   "didgroupname, id",
 				   "", "", "%1", "", "", "", '<OPTION  value="-1" selected>'.gettext("NOT DEFINED").'</OPTION>' );
-	
+
     $timezone_list = get_timezones();
 	$one_select = false;
 	foreach ($timezone_list as $key => $cur_value) {
@@ -595,16 +595,16 @@ if (!VT_MODE) {
 			}
 		}
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("TIMEZONE"),
 				   "id_timezone",
 				   "$timezone_default_val",
 				   "SELECT",
 				   "","","",
 				   "list" , "", "",	"", $timezone_list, "%1", "", "" );
-	
+
 }
-	
+
 	$HD_Form -> AddEditElement (gettext("LANGUAGE"),
 				   "language",
 				   "",
@@ -613,7 +613,7 @@ if (!VT_MODE) {
 				   "",
 				   "",
 				   "list" , "", "",	"", $language_list, "%1", "", "" );
-	
+
 
 	$HD_Form -> AddEditElement (gettext("CURRENCY"),
 				   "currency",
@@ -621,9 +621,9 @@ if (!VT_MODE) {
 				   "SELECT",
 				   "",
 				   "", "", "list" , "", "",	"", $currency_list, "%1", "", gettext("Currency used at the customer end.") );
-	
-	
-	
+
+
+
 	$HD_Form -> AddEditElement (gettext("STATUS"),
 				   "status",
 				   "",
@@ -664,8 +664,8 @@ if (!VT_MODE) {
 				   "",
 				   "",
 				   "list" , "", "",	"", $simultaccess_list, "%1", "", "" );
-	
-if (!VT_MODE) {	
+
+if (!VT_MODE) {
 	$HD_Form -> AddEditElement (gettext("RUN SERVICE"),
 				   "runservice",
 				   '0',
@@ -674,7 +674,7 @@ if (!VT_MODE) {
 				   "",
 				   gettext("Choose if you want to enable the service recurring on this account"),
 				   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Apply recurring service to this account."));
-	
+
 	$HD_Form -> AddEditElement (gettext("CREDIT LIMIT"),
 				   "creditlimit",
 				   "",
@@ -683,9 +683,9 @@ if (!VT_MODE) {
 				   "4",
 				   gettext("Insert the credit limit"),
 				   "" , "", "",	"", "", "", "NO-NULL", gettext("Credit limit is only used for the postpaid account."));
-	
-	
-	
+
+
+
 	$HD_Form -> AddEditElement (gettext("CREDIT LIMIT NOTIFICATION"),
 				   "credit_notification",
 				   '',
@@ -693,11 +693,11 @@ if (!VT_MODE) {
 				   "",
 				   "",
 				   "",
-				   "list" , "", "", "", $limits_notify_list , "%1", "", 
-				   gettext("currency : ").strtoupper(BASE_CURRENCY).'<BR>'.gettext("Low credit limit to alert the customer"), 
+				   "list" , "", "", "", $limits_notify_list , "%1", "",
+				   gettext("currency : ").strtoupper(BASE_CURRENCY).'<BR>'.gettext("Low credit limit to alert the customer"),
 				   "", '<OPTION  value="-1" selected>'.gettext("NOT DEFINED").'</OPTION>');
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("PERMITTED NOTIFICATIONS BY MAIL"),
 				   "notify_email",
 				   '0',
@@ -706,8 +706,8 @@ if (!VT_MODE) {
 				   "",
 				   gettext("Choose if you want to enable the notification by email for this account"),
 				   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Enable the notification by mail for this account."));
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("EMAIL NOTIFICATION"),
 				   "email_notification",
 				   '$value',
@@ -716,8 +716,8 @@ if (!VT_MODE) {
 				   "1",
 				   gettext("Insert the email to notify this customer"),
 				   "" , "", "",	"", "", "" , "NO", "");
-	
-	if (ACT_VOICEMAIL) { 
+
+	if (ACT_VOICEMAIL) {
 		$HD_Form -> AddEditElement (gettext("PERMITTED VOICEMAIL"),
 					   "voicemail_permitted",
 					   '1',
@@ -726,7 +726,7 @@ if (!VT_MODE) {
 					   "",
 					   gettext("Choose if you want to enable the voicemail functionality for this account"),
 					   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Enable the voicemail functionality for this account."));
-		
+
 		$HD_Form -> AddEditElement (gettext("ACTIVE VOICEMAIL SERVICE"),
 					   "voicemail_activated",
 					   '0',
@@ -736,7 +736,7 @@ if (!VT_MODE) {
 					   gettext("Customer can choose to enable the voicemail for this account"),
 					   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Customer can enable the voicemail for this account."));
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("CAMPAIGN"),
 				   "id_campaign",
 				   "",
@@ -746,9 +746,9 @@ if (!VT_MODE) {
 				   "cc_campaign",
 				   "name, id",
 				   "", "", "%1", "", "", "", '<OPTION  value="-1" selected>'.gettext("NOT DEFINED").'</OPTION>' );
-//END OF VT_MODE IF CLAUSE	
-}	
-	
+//END OF VT_MODE IF CLAUSE
+}
+
 	$HD_Form -> AddEditElement (gettext("FIRST USE DATE"),
 				   "firstusedate",
 				   "",
@@ -757,8 +757,8 @@ if (!VT_MODE) {
 				   "",
 				   "the first use date",
 				   "" , "" , "", "", "", "", "NO-NULL", "", "", "res_display_dateformat");
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("ENABLE EXPIRY"),
 				   "enableexpire",
 				   "",
@@ -767,18 +767,18 @@ if (!VT_MODE) {
 				   "",
 				   "",
 				   "list" , "", "",	"", $expire_list, "%1", "", gettext("Select method of expiry for the account.") );
-	
-	
+
+
 	$comp_zero = $comp_date_plus='';
 	if (isset($form_action) && $form_action=="ask-add"){
 		$begin_date = date("Y");
-		$begin_date_plus = date("Y")+10;
+		$begin_date_plus = date("Y") + 10;
 		$end_date = date("-m-d H:i:s");
 		$comp_date = "value='".$begin_date.$end_date."'";
 		$comp_date_plus = "value='".$begin_date_plus.$end_date."'";
 		$comp_zero = "value='0'";
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("EXPIRY DATE"),
 				   "expirationdate",
 				   '$value',
@@ -787,9 +787,9 @@ if (!VT_MODE) {
 				   "10",
 				   gettext("Insert the expiration date"),
 				   "" , "", "",	"", "", "", "NO-NULL", gettext("please use the format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"), "", "res_display_dateformat");
-	
-	
-	
+
+
+
 	$HD_Form -> AddEditElement (gettext("EXPIRY DAYS"),
 				   "expiredays",
 				   "",
@@ -798,8 +798,8 @@ if (!VT_MODE) {
 				   "4",
 				   gettext("Insert the number of days after which the account will expire"),
 				   "" , "", "",	"", "", "", "", gettext("The number of days after which the account will expire."));
-if (!VT_MODE) {	
-	
+if (!VT_MODE) {
+
 	$HD_Form -> AddEditElement (gettext("CREATE SIP CONFIG"),
 				   "sip_buddy",
 				   '1',
@@ -808,8 +808,8 @@ if (!VT_MODE) {
 				   "",
 				   gettext("Choose if you want to enable the sip account"),
 				   "" , "", "" , "Yes :1, - No:0", "", "" , "", gettext("Create the SIP config automatically"));
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("CREATE IAX CONFIG"),
 				   "iax_buddy",
 				   '1',
@@ -828,8 +828,8 @@ if (!VT_MODE) {
 				   "",
 				   gettext("Insert the MAC address customers' device"),
 				   "" , "", "",	"", "", "" , "NO", gettext("FORMAT: 00-08-74-4C-7F-1D"));
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("IN USE"),
 				   "inuse",
 				   '$value',
@@ -838,7 +838,7 @@ if (!VT_MODE) {
 				   "",
 				   "",
 				   "" , "", "",	"", "", "", "NO", gettext("Updated to show the number of concurrent calls in use by this customer. If there are no currently no calls, and the system shows that there are, manually reset this field back to zero.") );
-if (!VT_DEMO) {	
+if (!VT_DEMO) {
 	$HD_Form -> AddEditElement (gettext("AUTOREFILL"),
 				   "autorefill",
 				   '0',
@@ -848,7 +848,7 @@ if (!VT_DEMO) {
 				   gettext("Choose if you want to enable the autorefill on this account"),
 				   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Define if you want to authorize the autorefill to apply on this accout"),
 				   '', '', gettext("AUTOREFILL"));
-	
+
 	$HD_Form -> AddEditElement (gettext("INITIAL BALANCE"),
 				   "initialbalance",
 				   "",
@@ -857,9 +857,9 @@ if (!VT_DEMO) {
 				   "12",
 				   gettext("Insert the amount of the initial balance"),
 				   "" , "", "",	"", "", "",	"", gettext("The initial balance is used by autorefill to reset the current balance to this amount"));
-	
-	
-	
+
+
+
 	$HD_Form -> AddEditElement (gettext("INVOICE DAY"),
 				   "invoiceday",
 				   '$value',
@@ -867,15 +867,15 @@ if (!VT_DEMO) {
 				   "",
 				   "",
 				   "",
-				   "list" , "", "",	"", $invoiceday_list, "%1", "", gettext("Define the day of the month when the system will generate the customer invoice."), 
+				   "list" , "", "",	"", $invoiceday_list, "%1", "", gettext("Define the day of the month when the system will generate the customer invoice."),
 				   '', '', gettext("Invoice Status"));
-}	
-	
+}
+
 	if ($form_action =="ask-add" || $form_action=="add") {
 		$vat_init = "value = '0'";
-		
+
 	}
-if (!VT_DEMO) {	
+if (!VT_DEMO) {
 	$HD_Form -> AddEditElement (gettext("VAT"),
 				   "vat",
 				   "",
@@ -884,8 +884,8 @@ if (!VT_DEMO) {
 				   "12",
 				   gettext("Insert the VAT"),
 				   "" , "", "",	"", "", "", "" , gettext("VAT to add on the invoice of this customer. it should be a decimal value '21' this will be for 21% of VAT!"));
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("VAT REGISTRATION NUMBER "),
 				   "vat_rn",
 				   '$value',
@@ -893,9 +893,9 @@ if (!VT_DEMO) {
 				   "size=40 maxlength=40",
 				   "",
 				   gettext("Insert the VAT registration number of this customer"),
-				   "" , "", "",	"", "", "" , "NO", "");			   
-	
-	
+				   "" , "", "",	"", "", "" , "NO", "");
+
+
 	$HD_Form -> AddEditElement (gettext("DISCOUNT"),
 	               "discount",
 	               "",
@@ -903,9 +903,9 @@ if (!VT_DEMO) {
 	               "",
 	               "",
 	               "",
-	               "list" , "", "",     "", $discount_list, "%1", "", ""); 
-					
-	
+	               "list" , "", "",     "", $discount_list, "%1", "", "");
+
+
 	$HD_Form -> AddEditElement (gettext("TRAFFIC PER MONTH"),
 				   "traffic",
 				   '$value',
@@ -914,8 +914,8 @@ if (!VT_DEMO) {
 				   "4",
 				   gettext("Insert the traffic per month for this customer"),
 				   "" , "", "",	"", "", "" , "NO", "",
-				   '', '', gettext("TARGET TRAFFIC")); 
-	
+				   '', '', gettext("TARGET TRAFFIC"));
+
 	$HD_Form -> AddEditElement (gettext("TARGET TRAFFIC"),
 					"traffic_target",
 					'',
@@ -924,8 +924,8 @@ if (!VT_DEMO) {
 					"",
 					gettext("Insert the target traffic description"),
 					"" , "", "", "", "" , "", "", "");
-	
-					
+
+
 	$HD_Form -> AddEditElement (gettext("RESTRICTION"),
 				   "restriction",
 				   "0",
@@ -934,8 +934,8 @@ if (!VT_DEMO) {
 				   "",
 				   "",
 				   "list" , "", "",	"", $restriction_list, "%1", "", "",
-				   '', '', gettext("RESTRICTED NUMBERS")); 
-					
+				   '', '', gettext("RESTRICTED NUMBERS"));
+
 	$HD_Form -> AddEditElement (gettext("RESTRICTED NUMBERS"),
 				   "restrictednumber",
 				   '$value',
@@ -947,8 +947,8 @@ if (!VT_DEMO) {
 				   "",
 				   "",
 				   "", "", "", "", "", "cc_restricted_phonenumber:number:number, id_card:id_card = %id::id_card:::::::0");
-	
-				   
+
+
 	$HD_Form -> AddEditElement (gettext("CALLERID"),
 				   "callerid",
 				   '$value',
@@ -961,12 +961,12 @@ if (!VT_DEMO) {
 				   "",
 				   "", "", "", "", "", "cc_callerid:cid:cid, cid, id_cc_card:id_cc_card = %id::id_cc_card:::::::0",
 				   '', gettext("CALLERID / CUSTOMER HISTORY"));
-					
-				   
-	
-	
-}	
-	
+
+
+
+
+}
+
 	$HD_Form -> AddEditElement (gettext("CUSTOMER HISTORY"),
 				   "description",
 				   '$value',
@@ -978,7 +978,7 @@ if (!VT_DEMO) {
 				   "",
 				   "",
 				   "", "", "", "", "", "cc_card_history:description:description,id_cc_card,datecreated:id_cc_card = %id::id_cc_card::2:::::0");
-	
+
 				   // cc_card_history:description:description,id_cc_card:id_cc_card = %id::id_cc_card
 				   // Above function will provid Has Many functionality
 				   // Each parameter is seperated by (:) notation
@@ -988,12 +988,12 @@ if (!VT_DEMO) {
 				   // 3. Third will get all the columns (but first should be joining column)
 				   // 4. Fourth param generates the where cluase
 				   // 5. Last, Sixth param is the FK column
-	
+
 	$add_fields_voicemail = '';
 	if (ACT_VOICEMAIL)
 		$add_fields_voicemail = 'voicemail_permitted, voicemail_activated, ';
-	
-/* THIS FORM IS EVIL! 	
+
+/* THIS FORM IS EVIL!
 
 
 	$HD_Form -> FieldEditElement ('username, useralias, uipass, credit, id_group, id_seria, lastname, firstname, email, '.
@@ -1008,59 +1008,59 @@ if (!VT_DEMO) {
              ' address, city, state, country, zipcode, phone, fax, company_name, company_website, '.
                     $update_field_typepaid.' language, currency, status, block, lock_pin, simultaccess, ' .
              ' firstusedate, enableexpire, expirationdate, expiredays, mac_addr, inuse' );
-	
-	
-	if(!isset($myusername)) 
+
+
+	if(!isset($myusername))
 		$myusername='';
-	
+
 	if ($form_action == "ask-edit") {
 		$table_card = new Table("cc_card","status");
 		$result_card = $table_card ->Get_list(DbConnect(),"id=$id");
 		$HD_Form -> FG_EDITION_HIDDEN_PARAM = "oldstatus";
 		$HD_Form -> FG_EDITION_HIDDEN_PARAM_VALUE = "".$result_card[0][0];
 	}
-	
-	
+
+
 	$HD_Form -> FG_INTRO_TEXT_EDITION= gettext("You can modify, through the following form, the different properties of your")." ".$HD_Form->FG_INSTANCE_NAME;
 	$HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this")." ".$HD_Form->FG_INSTANCE_NAME.", ".gettext("click on the delete button.");
 	$HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new")." ".$HD_Form->FG_INSTANCE_NAME.".<br>".gettext("Fill the following fields and confirm by clicking on the button add.");
-	
-	
+
+
 	$HD_Form -> FG_INTRO_TEXT_ADITION = '';
 	$HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_INSTANCE_NAME." ".gettext("has been inserted.")."<br>";
-	
-	
+
+
 	$HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 		$HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Once you have completed the form above, click on Confirm Data");
-	
+
 	$HD_Form -> FG_ADDITIONAL_FUNCTION_BEFORE_EDITION = 'change_card_lock';
-	
+
 	$HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_ADD = 'processing_card_add';
 	$HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_EDITION = 'create_status_log';
-	
+
 	if (isset($form_action) && $form_action=='delete' && USE_REALTIME) {
 		$card_table = new Table('cc_card','sip_buddy,iax_buddy');
 		$card_clause = "id = ".$id;
 		$card_result = $card_table -> Get_list(DbConnect(), $card_clause, 0);
 		$sip_buddy = $card_result[0]['sip_buddy'];
 		$iax_buddy = $card_result[0]['iax_buddy'];
-		if(($sip_buddy == 1) && ($iax_buddy == 1)) 
+		if(($sip_buddy == 1) && ($iax_buddy == 1))
 			$key = "sip_iax_changed";
-		elseif (($sip_buddy == 1) ) 
+		elseif (($sip_buddy == 1) )
 			$key = "sip_changed";
-		elseif ($iax_buddy == 1) 
+		elseif ($iax_buddy == 1)
 			$key = "iax_changed";
-		
+
 		if ($_SESSION["user_type"]=="ADMIN") {
 				$who= Notification::$ADMIN;$who_id=$_SESSION['admin_id'];
 		} elseif ($_SESSION["user_type"]=="AGENT") {
 			$who= Notification::$AGENT;$who_id=$_SESSION['agent_id'];
-		} else { 
+		} else {
 			$who=Notification::$UNKNOWN;$who_id=-1;
 		}
 		NotificationsDAO::AddNotification($key,Notification::$HIGH,$who,$who_id);
 	}
-	
+
 	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?section=".$_SESSION["menu_section"]."&id=";
 	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?section=".$_SESSION["menu_section"]."&id=";
 	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?section=".$_SESSION["menu_section"]."&id=";
diff --git a/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_def_ratecard__vt.inc b/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_def_ratecard__vt.inc
index 706564c05..d79829164 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_def_ratecard__vt.inc
+++ b/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_def_ratecard__vt.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -37,7 +37,7 @@ getpost_ifset(array('id', 'idtariffplan', 'dialprefix', 'destination', 'buyrate'
 'buyrateincrement', 'rateinitial', 'initblock', 'billingblock', 'connectcharge', 'disconnectcharge','disconnectcharge_after',
 'stepchargea', 'chargea', 'timechargea', 'billingblocka', 'stepchargeb', 'chargeb', 'timechargeb',
 'billingblockb', 'stepchargec', 'chargec', 'timechargec', 'billingblockc', 'startdate', 'stopdate',
-'starttime', 'endtime', 'id_trunk', 'musiconhold','tariffplan', 'tariffgroup','posted','id_outbound_cidgroup','rounding_calltime', 
+'starttime', 'endtime', 'id_trunk', 'musiconhold','tariffplan', 'tariffgroup','posted','id_outbound_cidgroup','rounding_calltime',
 'rounding_threshold', 'additional_block_charge', 'additional_block_charge_time', 'additional_grace','minimal_cost','announce_time_correction',
 'cancelsearch_callplanlcr', 'deleteselected'));
 
@@ -50,7 +50,7 @@ if ( (empty($form_action) || $form_action=="list") && $deleteselected != 'true')
 	$HD_Form = new FormHandler("cc_ratecard", "Rates");
 }
 
-$HD_Form -> FG_TABLE_ID = 'cc_ratecard.id'; 
+$HD_Form -> FG_TABLE_ID = 'cc_ratecard.id';
 
 if ($cancelsearch_callplanlcr) {
 	$_SESSION['def_ratecard_tariffgroup'] = '';
@@ -60,38 +60,38 @@ $rateinitial_field = "rateinitial";
 $use_lcr_callplan = false;
 
 if (isset($posted) && !$popup_select) {
-	
+
 	if (is_string ($tariffgroup) && strlen(trim($tariffgroup))>0) {
-		
+
 		$HD_Form = new FormHandler("cc_callplan_lcr", "Rates");
 		$HD_Form -> FG_TABLE_ID = 'id';
 		$use_lcr_callplan = true;
 		$HD_Form -> SQL_GROUP = " GROUP BY dialprefix ";
-		
+
 		$tariffgroup = explode('-:-',$tariffgroup);
 		$HD_Form->FG_TOP_FILTER_NAME = gettext("EXPORTED LCR CALL PLAN").' : <b>'.str_replace ("-:-","",$tariffgroup[1]).'</b>';
 		$HD_Form->FG_TOP_FILTER_VALUE2 = $tariffgroup[0];
-		
+
 		$HD_Form -> FG_TABLE_CLAUSE = "tariffgroup_id= '$HD_Form->FG_TOP_FILTER_VALUE2'";
-		
+
 		$rateinitial_field = "MIN(rateinitial) as rateinitial";
-		
+
 		$_SESSION['def_ratecard_tariffgroup'] = $HD_Form -> FG_TABLE_CLAUSE;
-		
+
 	} else {
-		$_SESSION['def_ratecard_tariffgroup'] = '';	
+		$_SESSION['def_ratecard_tariffgroup'] = '';
 	}
 } else {
 	if (!empty($_SESSION['def_ratecard_tariffgroup']) && (empty($form_action) || $form_action=="list")) {
-		
+
 		$HD_Form = new FormHandler("cc_callplan_lcr", "Rates");
 		$HD_Form -> FG_TABLE_ID = 'id';
 		$use_lcr_callplan = true;
 		$HD_Form -> SQL_GROUP = " GROUP BY dialprefix ";
-		
+
 		$HD_Form -> FG_TABLE_CLAUSE = $_SESSION['def_ratecard_tariffgroup'];
 		$rateinitial_field = "MIN(rateinitial) as rateinitial";
-		
+
 	}
 }
 
@@ -102,11 +102,11 @@ $HD_Form -> FG_TABLE_DEFAULT_SENS = "ASC";
 $HD_Form->FG_FILTER_SEARCH_SESSION_NAME = 'entity_ratecard_selection';
 
 if (!$popup_select) {
-    if (VT_MODE) 
-    { 
-    $HD_Form ->FG_LIST_ADDING_BUTTON1 = false; 
+    if (VT_MODE)
+    {
+    $HD_Form ->FG_LIST_ADDING_BUTTON1 = false;
     } else {
-    $HD_Form ->FG_LIST_ADDING_BUTTON1 = true; 
+    $HD_Form ->FG_LIST_ADDING_BUTTON1 = true;
     }
     $HD_Form ->FG_LIST_ADDING_BUTTON_LINK1 = "A2B_entity_def_ratecard.php?form_action=ask-add&atmenu=ratecard&section=".$_SESSION["menu_section"];
     $HD_Form ->FG_LIST_ADDING_BUTTON_ALT1 = $HD_Form ->FG_LIST_ADDING_BUTTON_MSG1 = gettext("Add Rate");
@@ -117,7 +117,7 @@ if (!$popup_select) {
 $musiconhold_list = Constants::getMusicOnHold_List();
 $yesno = Constants::getYesNoList();
 
-// 
+//
 if ($popup_select) $HD_Form -> AddViewElement(gettext("ID"), "id", "5%", "center", "sort");
 $HD_Form -> AddViewElement(gettext("DESTINATION"), "destination", "17%", "center", "", "15");
 $HD_Form -> AddViewElement("<acronym title=\"DIALING PREFIX\">".gettext("PREFIX")."</acronym>", "dialprefix", "10%", "center", "sort", "");
@@ -150,7 +150,7 @@ if ($popup_select) {
 	$HD_Form -> FG_OTHER_BUTTON1 = true;
 	$HD_Form -> FG_OTHER_BUTTON1_ALT = '<font color="red">&lt;select&gt;</font>';
 	$HD_Form -> FG_OTHER_BUTTON1_IMG = '';
-	
+
 	if ($popup_select == 1)
 		$HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|param|');";
 	elseif ($popup_select == 2)
@@ -163,7 +163,7 @@ if ($popup_select) {
 	$HD_Form -> FG_EXPORT_XML = true;
 	}
 	$HD_Form -> FG_EXPORT_SESSION_VAR = "pr_export_entity_rates";
-	if (VT_MODE) {	
+	if (VT_MODE) {
 	$HD_Form -> FG_EDITION = false;
 	$HD_Form -> FG_DELETION = false;
 	$HD_Form -> FG_ADDITION = false;
@@ -171,13 +171,13 @@ if ($popup_select) {
 	$HD_Form -> FG_EDITION = true;
 	$HD_Form -> FG_DELETION = true;
 	$HD_Form -> FG_ADDITION = true;
-	}	
+	}
 }
 
 if (VT_MODE) {
 $HD_Form -> CV_NO_FIELDS  = '';
-} else { 
-$HD_Form -> CV_NO_FIELDS  = gettext("NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("HAVE BEEN CREATED."); 
+} else {
+$HD_Form -> CV_NO_FIELDS  = gettext("NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("HAVE BEEN CREATED.");
 }
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
@@ -204,48 +204,48 @@ $HD_Form -> AddSearchElement_Select('SELECT RATECARD', "cc_tariffplan", "id, tar
 }
 
 $HD_Form -> AddEditElement(gettext("RATECARD"),
-   "idtariffplan",	
-   '$value',	
-   "SELECT",	
-   "", "", "",	
-   "sql",		
-   "cc_tariffplan",	
-   "tariffname, id",		
+   "idtariffplan",
+   '$value',
+   "SELECT",
+   "", "", "",
+   "sql",
+   "cc_tariffplan",
+   "tariffname, id",
    "", "", "%1", "", "");
 
 
 $HD_Form -> AddEditElement(gettext("DIALPREFIX"),
    "dialprefix",
-   '$value',	
-   "INPUT",	
-   "size=50 maxlength=80",	
+   '$value',
+   "INPUT",
+   "size=50 maxlength=80",
    "13",
    gettext("Insert the dialing prefix, such as for UK '44' or for US '1' "),
-   "" , "", "",	"", "" , "", "", 
+   "" , "", "",	"", "" , "", "",
    gettext("A) Add destination prefixes, ie '441' for UK Landlines.<br>B) Use 'defaultprefix' to setup a rate for all destinations where a specific rate is not provided.<br>C) if you ADD a rate, NOT an EDIT, you can define a range of prefixes. '32484-32487' adds all prefixes between 32484 and 32487. '32484,32386,32488' would add only the individual prefixes listed.<br>D) Asterisk extensions style + POSIX regex syntaxes are supported. '_447[7-9]XXXXXXXX' matches 12-digit UK mobiles. '_X{0,3}(112|999|911)' matches any 0-3 digits followed an emergency number. '_' can be used to add length, and raise the priority."));
 
 
 $HD_Form -> AddEditElement(gettext("Destination Prefix"),
    "destination",
-   '$value',	
-   "POPUPVALUE",	
-   "size=50 maxlength=80", 
+   '$value',
+   "POPUPVALUE",
+   "size=50 maxlength=80",
    "13",
    "",
-   "" , "", "",	"", "" , "A2B_entity_prefix.php?popup_select=2&", ", 'prefix','width=550,height=340,top=20,left=100,scrollbars=1'", 
+   "" , "", "",	"", "" , "A2B_entity_prefix.php?popup_select=2&", ", 'prefix','width=550,height=340,top=20,left=100,scrollbars=1'",
    gettext("Select the prefix destination corresponding to your prefix rate.").'<br>'.gettext("This is the label that appears against the Call Detail Record."));
 
 /*
 $HD_Form -> AddEditElement(gettext("Destination Prefix"),
    "destination",
-   '$value',	
-   "SELECT",	
-   "", "", "",	
-   "sql",		
-   "cc_prefix",	
-   "destination, prefix",		
+   '$value',
+   "SELECT",
+   "", "", "",
+   "sql",
+   "cc_prefix",
+   "destination, prefix",
    "prefix >= 0 ORDER BY prefix ASC", "", "%2 (%1)", "", gettext("Select the prefix destination corresponding to your prefix rate."));
-*/ 
+*/
 
 $HD_Form -> AddEditElement("BUYING RATE",
    "buyrate",
@@ -254,7 +254,7 @@ $HD_Form -> AddEditElement("BUYING RATE",
    "size=30 maxlength=20",
    "12",
    gettext("Insert the buy rate"),
-   "" , "", "",	"", "" , "", "", gettext("Set the carrier cost, the price you pay for minutes."), null, null, 
+   "" , "", "",	"", "" , "", "", gettext("Set the carrier cost, the price you pay for minutes."), null, null,
    gettext("Set the carrier cost for this destination."));
 
 
@@ -289,11 +289,11 @@ $HD_Form -> AddEditElement(gettext("SELLING RATE"),
 
 
 $HD_Form -> AddEditElement(gettext("SELLRATE MIN DURATION"),
-   "initblock",		
-   '$value',	
-   "INPUT",	
-   "size=30 maxlength=20",	
-   "4",	
+   "initblock",
+   '$value',
+   "INPUT",
+   "size=30 maxlength=20",
+   "4",
    gettext("Insert the init block"),
    "" , "", "",	"", "", "", "NO", gettext("Set the minimum duration to charge the customer (ie 60 seconds)"));
 
@@ -349,7 +349,7 @@ $HD_Form -> AddEditElement(gettext("MINIMUM CALL COST"),
 
 
 if (ADVANCED_MODE) {
-	
+
 	$HD_Form -> AddEditElement(gettext("STEPCHARGE A"),
 	   "stepchargea",
 	   '$value',
@@ -358,8 +358,8 @@ if (ADVANCED_MODE) {
 	   "12",
 	   gettext("Insert the stepcharge A"),
 	   "" , "", "",	"", "", "", "NO", gettext("When entering in the cycle 'A', define the amount to charge for the entrance."), '', '', gettext("Below we have the section to create progressive rates. Progressive rate aims to bill the customer at various rates according the duration of the call. For instance you can define that you can to bill the customer 0.33dollars for the first 2 minutes and then you want to bill him 0.45dollars for the rest of the call." ));
-	
-	
+
+
 	$HD_Form -> AddEditElement(gettext("CHARGE A"),
 	   "chargea",
 	   '$value',
@@ -368,8 +368,8 @@ if (ADVANCED_MODE) {
 	   "12",
 	   gettext("Insert the charge A"),
 	   "" , "", "",	"", "", "", "NO", gettext("When entering in the cycle 'A', define the rate to apply." ));
-	
-	
+
+
 	$HD_Form -> AddEditElement(gettext("TIMECHARGE A"),
 	   "timechargea",
 	   '$value',
@@ -378,8 +378,8 @@ if (ADVANCED_MODE) {
 	   "4",
 	   gettext("Insert the time charge A"),
 	   "" , "", "",	"", "", "", "NO", gettext("Define the duration of the cycle 'A'." ));
-	
-	
+
+
 	$HD_Form -> AddEditElement(gettext("BILLING BLOCK A"),
 	   "billingblocka",
 	   '$value',
@@ -388,8 +388,8 @@ if (ADVANCED_MODE) {
 	   "4",
 	   gettext("Insert the billing block A"),
 	   "" , "", "",	"", "", "" , "NO", gettext("Define the duration of each billing block to apply the rate 'CHARGE A'."));
-	
-	
+
+
 	$HD_Form -> AddEditElement(gettext("STEPCHARGE B"),
 	   "stepchargeb",
 	   '$value',
@@ -398,8 +398,8 @@ if (ADVANCED_MODE) {
 	   "12",
 	   gettext("Insert the stepcharge B"),
 	   "" , "", "",	"", "", "" , "NO", gettext("When entering in the cycle 'B', define the amount to charge for the entrance."));
-	
-	
+
+
 	$HD_Form -> AddEditElement(gettext("CHARGE B"),
 	   "chargeb",
 	   '$value',
@@ -408,8 +408,8 @@ if (ADVANCED_MODE) {
 	   "12",
 	   gettext("Insert the charge B"),
 	   "" , "", "",	"", "", "", "NO", gettext("When entering in the cycle 'B', define the rate to apply." ));
-	
-	
+
+
 	$HD_Form -> AddEditElement(gettext("TIMECHARGE B"),
 	   "timechargeb",
 	   '$value',
@@ -418,8 +418,8 @@ if (ADVANCED_MODE) {
 	   "4",
 	   gettext("Insert the time charge B"),
 	   "" , "", "",	"", "", "", "NO", gettext("Define the duration of the cycle 'B'." ));
-	
-	
+
+
 	$HD_Form -> AddEditElement(gettext("BILLING BLOCK B"),
 	   "billingblockb",
 	   '$value',
@@ -428,8 +428,8 @@ if (ADVANCED_MODE) {
 	   "4",
 	   gettext("Insert the billing block B"),
 	   "" , "", "",	"", "", "", "NO", gettext("Define the duration of each billing block to apply the rate 'CHARGE B'." ));
-	
-	
+
+
 	$HD_Form -> AddEditElement(gettext("STEPCHARGE C"),
 	   "stepchargec",
 	   '$value',
@@ -438,8 +438,8 @@ if (ADVANCED_MODE) {
 	   "12",
 	   "Insert the stepcharge C",
 	   "" , "", "",	"", "", "", "NO", gettext("When entering in the cycle 'C', define the amount to charge for the entrance." ));
-	
-	
+
+
 	$HD_Form -> AddEditElement(gettext("CHARGE C"),
 	   "chargec",
 	   '$value',
@@ -448,8 +448,8 @@ if (ADVANCED_MODE) {
 	   "12",
 	   gettext("Insert the charge C"),
 	   "" , "", "",	"", "", "", "NO", gettext("When entering in the cycle 'C', define the rate to apply."));
-	
-	
+
+
 	$HD_Form -> AddEditElement(gettext("TIMECHARGE C"),
 	   "timechargec",
 	   '$value',
@@ -458,8 +458,8 @@ if (ADVANCED_MODE) {
 	   "4",
 	   gettext("Insert the time charge C"),
 	   "" , "", "",	"", "", "", "NO", gettext("Define the duration of the cycle 'C'."));
-	
-	
+
+
 	$HD_Form -> AddEditElement(gettext("BILLING BLOCK C"),
 	   "billingblockc",
 	   '$value',
@@ -468,8 +468,8 @@ if (ADVANCED_MODE) {
 	   "4",
 	   gettext("Insert the billing block C"),
 	   "" , "", "",	"", "", "", "NO", gettext("Define the duration of each billing block to apply the rate 'CHARGE C'."));
-	
-	
+
+
 	$HD_Form -> AddEditElement(gettext("ANNOUNCE TIME CORRECTION"),
            "announce_time_correction",
            '$value',
@@ -484,7 +484,7 @@ if (ADVANCED_MODE) {
 
 if ($form_action=="ask-add") {
 	$begin_date = date("Y");
-	$begin_date_plus = date("Y")+10;
+	$begin_date_plus = date("Y") + 10;
 	$end_date = date("-m-d H:i:s");
 	$comp_date = "value='".$begin_date.$end_date."'";
 	$comp_date_plus = "value='".$begin_date_plus.$end_date."'";
diff --git a/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_did__vt.inc b/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_did__vt.inc
index f890d753f..d9c2d62cc 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_did__vt.inc
+++ b/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_did__vt.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -98,11 +98,10 @@ $HD_Form -> FG_DELETION = true;
 $HD_Form -> FG_SPLITABLE_FIELD = 'did';
 
 
-
 // TODO integrate in Framework
 if ($form_action=="ask-add" || $form_action=="purchase") {
 	$begin_date = date("Y");
-	$begin_date_plus = date("Y")+25;
+	$begin_date_plus = date("Y") + 10;
 	$end_date = date("-m-d H:i:s");
 	$comp_date = "value='".$begin_date.$end_date."'";
 	$comp_date_plus = "value='".$begin_date_plus.$end_date."'";
diff --git a/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_voucher__vt.inc b/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_voucher__vt.inc
index 1c5e2617f..9c716f9c0 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_voucher__vt.inc
+++ b/addons/contrib/villagetelco/gui/admin/Public/form_data/FG_var_voucher__vt.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -65,7 +65,7 @@ foreach($currencies_list as $key => $cur_value) {
 
 if (VT_MODE) {
 $HD_Form ->FG_LIST_ADDING_BUTTON1 = false;
-} else { 
+} else {
 $HD_Form ->FG_LIST_ADDING_BUTTON1 = true;
 }
 $HD_Form ->FG_LIST_ADDING_BUTTON_LINK1 = "A2B_entity_voucher_multi.php?section=".$_SESSION["menu_section"];
@@ -146,31 +146,31 @@ if ($form_action=="ask-add") {
 }
 
 $HD_Form -> AddEditElement (gettext("VOUCHER"),
-   "voucher",			
-   "$value",	
+   "voucher",
+   "$value",
    "INPUT",
-	"size=20 $maxi readonly maxlength=40",	 
-   "4",	
+	"size=20 $maxi readonly maxlength=40",
+   "4",
    gettext("Insert the voucher"),
    "" , "", "",	"", "" , "", "", "");
 
 
 $HD_Form -> AddEditElement (gettext("AMOUNT"),
    "credit",
-   '$value',	
-   "INPUT",	
-   "size=30 maxlength=30",	
+   '$value',
+   "INPUT",
+   "size=30 maxlength=30",
    "12",
    gettext("Insert the number of credit"),
    "" , "", "",	"", "", "",	"", "" );
 
 
 $HD_Form -> AddEditElement (gettext("TAG"),
-   "tag",			
-   '$value',	
+   "tag",
+   '$value',
    "INPUT",
-   "size=30 maxlength=30",	
-   "11",	
+   "size=30 maxlength=30",
+   "11",
    gettext("Insert the tag"),
    "" , "", "",	"", "", "", "NO-NULL", "" );
 
@@ -178,8 +178,8 @@ $HD_Form -> AddEditElement (gettext("TAG"),
 $HD_Form -> AddEditElement (gettext("ACTIVATED"),
 	"activated",
 	't',
-	"RADIOBUTTON",	
-	"",	
+	"RADIOBUTTON",
+	"",
 	"",
 	gettext("Choose if you want to activate this card"),
 	"" , "", "" ,"Yes :t, - No:f", "", "" , "" , "");
@@ -196,7 +196,7 @@ $HD_Form -> AddEditElement (gettext("CURRENCY"),
 
 if ($form_action=="ask-add") {
 	$begin_date = date("Y");
-	$begin_date_plus = date("Y")+10;
+	$begin_date_plus = date("Y") + 10;
 	$end_date = date("-m-d H:i:s");
 	$comp_date = "value='".$begin_date.$end_date."'";
 	$comp_date_plus = "value='".$begin_date_plus.$end_date."'";
@@ -207,7 +207,7 @@ $HD_Form -> AddEditElement (gettext("EXPIRY DATE"),
 	"expirationdate",
 	'$value',
 	"INPUT",
-	"size=40 maxlength=40  $comp_date_plus",	
+	"size=40 maxlength=40  $comp_date_plus",
 	"10",
 	gettext("Insert the expiration date"),
 	"" , "", "",	"", "", "", "", gettext("Format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"), null, "res_display_dateformat" );
diff --git a/addons/contrib/villagetelco/gui/admin/Public/index__vt.php b/addons/contrib/villagetelco/gui/admin/Public/index__vt.php
index 39919cae4..f55ec30eb 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/index__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/index__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/admin/Public/logout__vt.php b/addons/contrib/villagetelco/gui/admin/Public/logout__vt.php
index af609648c..1143b0bbc 100644
--- a/addons/contrib/villagetelco/gui/admin/Public/logout__vt.php
+++ b/addons/contrib/villagetelco/gui/admin/Public/logout__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/common/lib/Form/Class.FormHandler.inc__vt.php b/addons/contrib/villagetelco/gui/common/lib/Form/Class.FormHandler.inc__vt.php
index c251c0dd2..3a5e8ac8d 100644
--- a/addons/contrib/villagetelco/gui/common/lib/Form/Class.FormHandler.inc__vt.php
+++ b/addons/contrib/villagetelco/gui/common/lib/Form/Class.FormHandler.inc__vt.php
@@ -18,7 +18,7 @@
 include (dirname(__FILE__) . "/Class.FormBO.php");
 
 class FormHandler
-{	
+{
 	private static $Instance;
 	var $_action = '';
 	var $_vars = null;
@@ -26,22 +26,22 @@ class FormHandler
 	var $DBHandle;
 	var $VALID_SQL_REG_EXP = true;
 	var $RESULT_QUERY = false;
-	
+
 	var $pqp;
-	
-	
+
+
 	/* CONFIG THE VIEWER : CV */
 	var $CV_TOPVIEWER = '';
 	var $CV_NO_FIELDS = "THERE IS NO RECORD !";
 	var $CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = true;
-	var $CV_TITLE_TEXT = ''; 
+	var $CV_TITLE_TEXT = '';
 	var $CV_TEXT_TITLE_ABOVE_TABLE = "DIRECTORY";
 	var $CV_DISPLAY_FILTER_ABOVE_TABLE = true;
 	var $CV_FILTER_ABOVE_TABLE_PARAM = "?id=";
 	var $CV_FOLLOWPARAMETERS = '';
 	var $CV_DO_ARCHIVE_ALL = false;
-		
-	
+
+
 	var $CV_DISPLAY_RECORD_LIMIT = true;
 	var $CV_DISPLAY_BROWSE_PAGE = true;
 
@@ -54,20 +54,20 @@ class FormHandler
     * @public	-	@type integer
     */
 	var $FG_DEBUG = 0;
-	 
+
 	/**
     * Sets the table name.
     * @public	-	@type string
-    */	 
+    */
 	var $FG_TABLE_NAME="";
-	
+
 	/**
     * Sets the table name used for count.
     * @public	-	@type string
-    */	 
+    */
 	var $FG_TABLE_NAME_COUNT="";
-	
-	 	 
+
+
 	/**
     * Sets the instance_name, used to descripbe the name of the element your are managing
     * @public	-	@type string
@@ -77,15 +77,15 @@ class FormHandler
 	/**
     * Sets the main clause - Clause to execute on the table
     * @public	-	@type string
-    */	
+    */
 	var $FG_TABLE_CLAUSE = "";
 
 	/**
     * Sets the table list you will need to feed the SELECT from element
     * @public	-	@type array - ( String to display, value to save)
-    */	
+    */
 	var $tablelist = array();
-	
+
 	/**
     * ARRAY with the list of element to display in the ViewData page
     * @public	-	@type array
@@ -104,8 +104,8 @@ class FormHandler
     */
 	var $FG_NB_TABLE_COL=0;
 	var $FG_TOTAL_TABLE_COL=0;
-	
-	 
+
+
 	/**
     * Keep the ID of the table
     * @public	-	@type string
@@ -120,7 +120,7 @@ class FormHandler
 	var $FG_LIST_ADDING_BUTTON_IMG = '';
 	var $FG_LIST_ADDING_BUTTON_MSG = '';
 	var $FG_LIST_ADDING_BUTTON_ALT = '';
-	
+
 	/**
     * Sets if we want a colum "ACTION" to EDIT or to DELETE
     * @public	-	@type boolean
@@ -134,7 +134,7 @@ class FormHandler
 	var $FG_OTHER_BUTTON3=false;
 	var $FG_OTHER_BUTTON4=false;
 	var $FG_OTHER_BUTTON5=false;
-	
+
 
 	/**
     * Keep the link for the action (EDIT & DELETE)
@@ -143,17 +143,17 @@ class FormHandler
 	var $FG_EDITION_LINK	= '';
 	var $FG_DELETION_LINK	= '';
 	var $FG_DELETION_FORBIDDEN_ID	= array();
-	var $FG_INFO_LINK='';	
-	var $FG_OTHER_BUTTON1_LINK	= '';	
+	var $FG_INFO_LINK='';
+	var $FG_OTHER_BUTTON1_LINK	= '';
 	var $FG_OTHER_BUTTON2_LINK	= '';
 	var $FG_OTHER_BUTTON3_LINK	= '';
 	var $FG_OTHER_BUTTON4_LINK	= '';
 	var $FG_OTHER_BUTTON5_LINK	= '';
-	
+
 	var $FG_EDITION_IMG	= 'edit.png';
 	var $FG_DELETION_IMG= 'delete.png';
-	var $FG_INFO_IMG='info.png';	
-	
+	var $FG_INFO_IMG='info.png';
+
 	var $FG_OTHER_BUTTON1_IMG = '';
 	var $FG_OTHER_BUTTON2_IMG = '';
 	var $FG_OTHER_BUTTON3_IMG = '';
@@ -164,19 +164,19 @@ class FormHandler
 	var $FG_OTHER_BUTTON2_FORBIDDEN_KEY	= array();
 	var $FG_OTHER_BUTTON3_FORBIDDEN_KEY	= array();
 	var $FG_OTHER_BUTTON4_FORBIDDEN_KEY	= array();
-	var $FG_OTHER_BUTTON5_FORBIDDEN_KEY	= array();		
+	var $FG_OTHER_BUTTON5_FORBIDDEN_KEY	= array();
 
 	var $FG_EDIT_PAGE_CONFIRM_BUTTON	= '';
 	var $FG_DELETE_PAGE_CONFIRM_BUTTON	= '';
 	var $FG_ADD_PAGE_CONFIRM_BUTTON		= '';
-	
+
 	/**
     * Sets the number of record to show by page
     * @public	-	@type integer
     */
 	var $FG_LIMITE_DISPLAY=10;
 	var $SQL_GROUP = null;
-	
+
 	/**
     * Sets the variable to control the View Module
     * @public	-	@type integer
@@ -188,17 +188,17 @@ class FormHandler
 
 	var $FG_NB_RECORD_MAX  = 0;
 	var $FG_NB_RECORD  = 0;
-	
+
 	/**
 	* Sets the variables to control the Apply filter
 	* @public  - @type string
 	*/
 	var $FG_FILTER_FORM_ACTION = 'list';
-	
+
 	var $FG_FILTER_APPLY = false;
 	var $FG_FILTERTYPE = 'INPUT'; // INPUT :: SELECT :: POPUPVALUE
 	var $FG_FILTERFIELD = '';
-	var $FG_FILTERFIELDNAME = '';	
+	var $FG_FILTERFIELDNAME = '';
 	var $FG_FILTERPOPUP = array('CC_entity_card.php?popup_select=1&', ", 'CardNumberSelection','width=550,height=350,top=20,left=100'");
 
 	// SECOND FILTER
@@ -208,21 +208,21 @@ class FormHandler
 	var $FG_FILTERFIELDNAME2 = '';
 	var $FG_FILTERPOPUP2 = array();
 
-	
+
 	/**
 	* Sets the variables to control the search filter
 	* @public  - @type boolean , array , string
 	*/
 	var $FG_FILTER_SEARCH_FORM = false;
-	
+
 	var $FG_FILTER_SEARCH_1_TIME = false;
 	var $FG_FILTER_SEARCH_1_TIME_TEXT = '';
 	var $FG_FILTER_SEARCH_1_TIME_FIELD = 'creationdate';
-		
+
 	var $FG_FILTER_SEARCH_1_TIME_BIS = false;
 	var $FG_FILTER_SEARCH_1_TIME_TEXT_BIS = '';
 	var $FG_FILTER_SEARCH_1_TIME_FIELD_BIS = '';
-	
+
 	var $FG_FILTER_SEARCH_3_TIME = false;
 	var $FG_FILTER_SEARCH_3_TIME_TEXT = '';
 	var $FG_FILTER_SEARCH_3_TIME_FIELD = 'creationdate';
@@ -231,11 +231,11 @@ class FormHandler
 	var $FG_FILTER_SEARCH_FORM_2C = array();
 	var $FG_FILTER_SEARCH_FORM_SELECT = array();
 	var $FG_FILTER_SEARCH_FORM_SELECT_TEXT = '';
-	var $FG_FILTER_SEARCH_TOP_TEXT = "";	
+	var $FG_FILTER_SEARCH_TOP_TEXT = "";
 	var $FG_FILTER_SEARCH_SESSION_NAME = '';
 	var $FG_FILTER_SEARCH_DELETE_ALL = true;
-	
-	
+
+
 	/**
 	* Sets the variable to define if we want a splitable field into the form
 	* @public  - @type void , string (fieldname)
@@ -243,14 +243,14 @@ class FormHandler
 	* according to the values/ranges defined.
 	*/
 	var $FG_SPLITABLE_FIELD = '';
-	
+
 	/**
 	* Sets the variables to control the top search filter
 	* @public  - @type void , string
 	*/
 	var $FG_TOP_FILTER_VALUE = 0;
 	var $FG_TOP_FILTER_NAME = '';
-	
+
 	/**
 	* Sets the variables to control the CSV export
 	* @public  - @type boolean
@@ -258,7 +258,7 @@ class FormHandler
 	var $FG_EXPORT_CSV = false;
     var $FG_EXPORT_XML = false;
 	var $FG_EXPORT_SESSION_VAR = '';
-	
+
 	/**
     * Sets the fieldname of the SQL query for Export e.g:name, mail"
     * @public	-	@type string
@@ -266,17 +266,17 @@ class FormHandler
     var $FG_EXPORT_FIELD_LIST = "";
 
 	/**
-     * Sets the TEXT to display above the records displayed 
+     * Sets the TEXT to display above the records displayed
      * @public   -  @string
      */
 	var $FG_INTRO_TEXT="You can browse through our #FG_INSTANCE_NAME# and modify their different properties<br>";
 
 
 	/**
-     * Sets the ALT TEXT after mouse over the bouton 
+     * Sets the ALT TEXT after mouse over the bouton
      * @public   -  @string
-     */	
-	 
+     */
+
 	var $FG_DELETE_ALT = "Delete this record";
 	var $FG_EDIT_ALT = "Edit this record";
 	var $FG_INFO_ALT = "Info on this record";
@@ -285,19 +285,19 @@ class FormHandler
 	var $FG_OTHER_BUTTON3_ALT = '';
 	var $FG_OTHER_BUTTON4_ALT = '';
 	var $FG_OTHER_BUTTON5_ALT = '';
-	
+
 	var $FG_OTHER_BUTTON1_HTML_CLASS = '';
 	var $FG_OTHER_BUTTON2_HTML_CLASS = '';
 	var $FG_OTHER_BUTTON3_HTML_CLASS = '';
 	var $FG_OTHER_BUTTON4_HTML_CLASS = '';
 	var $FG_OTHER_BUTTON5_HTML_CLASS = '';
-	
+
 	var $FG_OTHER_BUTTON1_HTML_ID = '';
 	var $FG_OTHER_BUTTON2_HTML_ID = '';
 	var $FG_OTHER_BUTTON3_HTML_ID = '';
-	var $FG_OTHER_BUTTON4_HTML_ID = '';	
+	var $FG_OTHER_BUTTON4_HTML_ID = '';
 	var $FG_OTHER_BUTTON5_HTML_ID = '';
-	
+
 	var $FG_OTHER_BUTTON1_CONDITION = '';
 	var $FG_OTHER_BUTTON2_CONDITION = '';
 	var $FG_OTHER_BUTTON3_CONDITION = '';
@@ -306,34 +306,34 @@ class FormHandler
 
 	var $FG_EDITION_CONDITION = '';
 	var $FG_DELETION_CONDITION = '';
-	
+
 	//	-------------------- DATA FOR THE EDITION --------------------
-	
+
 	/**
     * ARRAY with the list of element to EDIT/REMOVE/ADD in the edit page
-    * @public	-	@type array 
-    */		
+    * @public	-	@type array
+    */
 	var $FG_TABLE_EDITION = array ();
 	var $FG_TABLE_ADITION = array ();
-	
+
 	/**
     * ARRAY with the comment below each fields
-    * @public	-	@type array 
-    */	
+    * @public	-	@type array
+    */
 	var $FG_TABLE_COMMENT = array ();
-	
+
 	/**
     * ARRAY with the regular expression to check the form
-    * @public	-	@type array 
-    */	
+    * @public	-	@type array
+    */
 	var $FG_regular = array();
 
 	/**
     * Array that will contain the field where the regularexpression check have found errors
-    * @public	-	@type array 
-    */	
+    * @public	-	@type array
+    */
 	var $FG_fit_expression = array();
-	
+
 	/**
     * Set the fields  for the EDIT/ADD query
     * @public	-	@type string
@@ -341,7 +341,7 @@ class FormHandler
 	var $FG_QUERY_EDITION='';
 	var $FG_QUERY_ADITION='';
 
-	
+
 	/**
     * Set the width  of the column to the EDIT FORM
     * @public	-	@type string
@@ -377,12 +377,12 @@ class FormHandler
 	var $FG_QUERY_ADITION_HIDDEN_FIELDS = '';
 	var $FG_QUERY_ADITION_HIDDEN_VALUE  = '';
 	var $FG_QUERY_SQL_HIDDEN = '';
-	
+
 	var $FG_EDITION_HIDDEN_PARAM = '';
 	var $FG_EDITION_HIDDEN_PARAM_VALUE  = '';
 	var $FG_ADITION_HIDDEN_PARAM = '';
 	var $FG_ADITION_HIDDEN_PARAM_VALUE  = '';
-	
+
 	/**
     * Set the EXTRA HIDDED VALUES for the edition/addition
     * @public	-	@type array
@@ -406,10 +406,10 @@ class FormHandler
     */
 	var $FG_GO_LINK_AFTER_ACTION;
 	var $FG_GO_LINK_AFTER_ACTION_ADD;
-	var $FG_GO_LINK_AFTER_ACTION_DELETE;	
+	var $FG_GO_LINK_AFTER_ACTION_DELETE;
 	var $FG_GO_LINK_AFTER_ACTION_EDIT;
-	
-	
+
+
 	/** ####################################################
      * if yes that allow your form to edit the form after added succesfully a instance
 	 * in the case if you don't have the same option in the edition and the adding option
@@ -417,7 +417,7 @@ class FormHandler
     */
 
 	var $FG_ADITION_GO_EDITION = "no";
-	
+
 	var $FG_ADITION_GO_EDITION_MESSAGE = "The document has been created correctly. Now, you can define the different tariff that you want to associate.";
 
 
@@ -426,7 +426,7 @@ class FormHandler
 	var $FG_INTRO_TEXT_EDITION="You can modify, through the following form, the different properties of your #FG_INSTANCE_NAME#<br>";
 
 	var $FG_INTRO_TEXT_ASK_DELETION = "If you really want remove this #FG_INSTANCE_NAME#, click on the delete button.";
-	
+
 	var $FG_INTRO_TEXT_DELETION = "A #FG_INSTANCE_NAME# has been deleted!";
 
 	var $FG_INTRO_TEXT_ADD = "you can add easily a new #FG_INSTANCE_NAME#.<br>Fill the following fields and confirm by clicking on the button add.";
@@ -434,7 +434,7 @@ class FormHandler
 	var $FG_INTRO_TEXT_ADITION = "Add a \"#FG_INSTANCE_NAME#\" now.";
 
 	var $FG_TEXT_ADITION_CONFIRMATION = "Your new #FG_INSTANCE_NAME# has been inserted. <br>";
-	
+
 	var $FG_TEXT_ADITION_ERROR = '<font color="Red"> Your new #FG_INSTANCE_NAME# has not been inserted. </font><br> ';
 
 	var $FG_TEXT_ERROR_DUPLICATION = "You cannot choose more than one !";
@@ -454,9 +454,9 @@ class FormHandler
 	var $FG_ADDITIONAL_FUNCTION_AFTER_DELETE = '';
 	var $FG_ADDITIONAL_FUNCTION_BEFORE_EDITION = '';
 	var $FG_ADDITIONAL_FUNCTION_AFTER_EDITION = '';
-	
+
 	var $FG_TABLE_ALTERNATE_ROW_COLOR = array();
-	
+
 	var $FG_TABLE_DEFAULT_ORDER = "id";
 	var $FG_TABLE_DEFAULT_SENS = "ASC";
 
@@ -466,7 +466,7 @@ class FormHandler
 
 	// if it is set to true and Allowed flag is true all dependent records will be deleted.
 	var $FG_FK_DELETE = false;
-	
+
     // Foreign Key Tables
     var $FG_FK_TABLENAMES = array();
 
@@ -488,16 +488,16 @@ class FormHandler
 
     // Delete Message for FK
     var $FG_FK_DELETE_MESSAGE = "Are you sure to delete all records connected to this instance.";
-	
-    //To enable Disable Selection List 
-    var $FG_DISPLAY_SELECT  = false;	
+
+    //To enable Disable Selection List
+    var $FG_DISPLAY_SELECT  = false;
 
     //Selection List Field Name to get from Database
     var $FG_SELECT_FIELDNAME  = "";
 
 	// Configuration Key value Field Name
     var $FG_CONF_VALUE_FIELDNAME  = "";
-    
+
 	// For Pre Selected Delete
     // Pre Selected Records Count
     var $FG_PRE_COUNT = 0;
@@ -510,10 +510,10 @@ class FormHandler
 	var $lang = array('strfirst' => '&lt;&lt; First', 'strprev' => '&lt; Prev', 'strnext' => 'Next &gt;', 'strlast' => 'Last &gt;&gt;' );
 
 	var $logger = null;
-	
+
 	var $FG_ENABLE_LOG = ENABLE_LOG;
-	
-	
+
+
 	// ----------------------------------------------
 	// CLASS CONSTRUCTOR : FormHandler
 	//	@public
@@ -530,17 +530,17 @@ function FormHandler ($tablename=null, $instance_name=null, $action=null, $table
 		$this -> FG_TABLE_NAME = $tablename;
 		$this -> FG_INSTANCE_NAME = $instance_name;
 		$this -> FG_TABLE_NAME_COUNT = $tablename_count;
-		
+
 	  	if ($this->FG_DEBUG) echo "".$this -> Host."";
-		
+
 		$this -> set_regular_expression();
-		
+
 		$this->_action = $action ? $action : $_SERVER['PHP_SELF'];
-		
+
 		$this->_vars = array_merge((array)$_GET, (array)$_POST);
-		
+
 		$this -> def_list();
-		
+
         //initializing variables with gettext
 		$this -> CV_NO_FIELDS = gettext("No data found!");
         $this -> CV_TEXT_TITLE_ABOVE_TABLE = gettext("DIRECTORY");
@@ -553,7 +553,7 @@ function FormHandler ($tablename=null, $instance_name=null, $action=null, $table
         $this -> FG_INTRO_TEXT_EDITION = gettext("You can modify, through the following form, the different properties of your")." #FG_INSTANCE_NAME#".'<br>';
         $this -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this")." #FG_INSTANCE_NAME#, ".gettext("Click on the delete button.");
         $this -> FG_INTRO_TEXT_DELETION = gettext("One")." #FG_INSTANCE_NAME# ".gettext("has been deleted!");
-		
+
         $this -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new")." #FG_INSTANCE_NAME#.<br>".gettext("Fill the following fields and confirm by clicking on the button add.");
         $this -> FG_INTRO_TEXT_ADITION = gettext("Add a")." \"#FG_INSTANCE_NAME#\" ".gettext("now.");
         $this -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." #FG_INSTANCE_NAME# ".gettext("has been inserted.".'<br>');
@@ -561,18 +561,18 @@ function FormHandler ($tablename=null, $instance_name=null, $action=null, $table
         $this -> FG_TEXT_ERROR_DUPLICATION = gettext("You cannot choose more than one !");
 
         $this -> FG_FK_DELETE_MESSAGE = gettext("Are you sure to delete all records connected to this instance.");
-		
+
 		$this -> FG_EDIT_PAGE_CONFIRM_BUTTON	= gettext("CONFIRM DATA");
 		$this -> FG_DELETE_PAGE_CONFIRM_BUTTON	= gettext('DELETE');
 		$this -> FG_ADD_PAGE_CONFIRM_BUTTON		= gettext('CONFIRM DATA');
-		
+
 		if($this -> FG_ENABLE_LOG == 1) {
 			$this -> logger = new Logger();
 		}
-		
+
 	}
 
-	
+
 	static function GetInstance() {
 		if (empty (self :: $Instance)) {
 			$Instance = null;
@@ -585,25 +585,25 @@ function setDBHandler  ($DBHandle=null)
 		Console::log('FormHandler -> setDBHandler');
 		Console::logMemory($this, 'FormHandler -> setDBHandler : Line '.__LINE__);
 		Console::logSpeed('FormHandler -> setDBHandler : Line '.__LINE__);
-		
+
 		$this->DBHandle = $DBHandle;
 	}
 
 	/**
      * Perform the execution of some actions to prepare the form generation
-     * @public     	 
-     */	
+     * @public
+     */
 	function init ()
 	{
 		$processed = $this->getProcessed();
-		
+
 		Console::log('FormHandler -> init');
 		Console::logMemory($this, 'FormHandler -> init : Line '.__LINE__);
 		Console::logSpeed('FormHandler -> init : Line '.__LINE__);
-		
-		global $_SERVER;	
-		
-		
+
+		global $_SERVER;
+
+
 		if ($processed['section']!="") {
 			$section = $processed['section'];
 			$_SESSION["menu_section"] = $section;
@@ -615,10 +615,10 @@ function init ()
 		if (!empty($processed['order']) && !empty($processed['sens']))$ext_link.="&order=".$processed['order']."&sens=".$processed['sens'];
 		$this -> FG_EDITION_LINK	= $_SERVER['PHP_SELF']."?form_action=ask-edit".$ext_link."&id=";
 		$this -> FG_DELETION_LINK	= $_SERVER['PHP_SELF']."?form_action=ask-delete".$ext_link."&id=";
-		
+
 		$this -> FG_DELETE_ALT = gettext("Delete this ").$this -> FG_INSTANCE_NAME;
 		$this -> FG_EDIT_ALT = gettext("Edit this ").$this -> FG_INSTANCE_NAME;
-		
+
 		$this -> FG_INTRO_TEXT 	= str_replace('#FG_INSTANCE_NAME#', $this -> FG_INSTANCE_NAME, $this -> FG_INTRO_TEXT);
 		$this -> FG_INTRO_TEXT_EDITION 	= str_replace('#FG_INSTANCE_NAME#', $this -> FG_INSTANCE_NAME, $this -> FG_INTRO_TEXT_EDITION);
 		$this -> FG_INTRO_TEXT_ASK_DELETION = str_replace('#FG_INSTANCE_NAME#', $this -> FG_INSTANCE_NAME, $this -> FG_INTRO_TEXT_ASK_DELETION);
@@ -628,36 +628,36 @@ function init ()
 		$this -> FG_TEXT_ADITION_CONFIRMATION = str_replace('#FG_INSTANCE_NAME#', $this -> FG_INSTANCE_NAME, $this -> FG_TEXT_ADITION_CONFIRMATION);
 		$this -> FG_TEXT_ADITION_ERROR = str_replace('#FG_INSTANCE_NAME#', $this -> FG_INSTANCE_NAME, $this -> FG_TEXT_ADITION_ERROR);
 		$this -> FG_FILTER_SEARCH_TOP_TEXT = gettext("Define criteria to make a precise search");
-		
+
 		$this -> FG_TABLE_ALTERNATE_ROW_COLOR[] = "#F2F2EE";
 		$this -> FG_TABLE_ALTERNATE_ROW_COLOR[] = "#FCFBFB";
-		
+
 		$this -> FG_TOTAL_TABLE_COL = $this -> FG_NB_TABLE_COL;
 		if ($this -> FG_DELETION || $this -> FG_INFO || $this -> FG_EDITION || $this -> FG_OTHER_BUTTON1 || $this -> FG_OTHER_BUTTON2 || $this -> FG_OTHER_BUTTON3 || $this -> FG_OTHER_BUTTON4 || $this -> FG_OTHER_BUTTON5) {
 			$this -> FG_TOTAL_TABLE_COL++;
 		}
 	}
-	
+
 	/**
      * Define the list
      * @public
-     */	
+     */
 	function def_list ()
 	{
 		Console::log('FormHandler -> def_list');
 		Console::logMemory($this, 'FormHandler -> def_list : Line '.__LINE__);
 		Console::logSpeed('FormHandler -> def_list : Line '.__LINE__);
-			
+
 		$this -> tablelist['status_list']["1"] = array( gettext("INSERTED"), "1");
 		$this -> tablelist['status_list']["2"] = array( gettext("ENABLE"), "2");
 		$this -> tablelist['status_list']["3"] = array( gettext("DISABLE"), "3");
 		$this -> tablelist['status_list']["4"] = array( gettext("FREE"), "4");
-		
+
 	}
 
 
 	function &getProcessed()
-	{	
+	{
 		foreach ($this->_vars as $key => $value) {
 			if (!$this->_processed[$key] or empty($this->_processed[$key])) {
 				$this->_processed[$key] = $this -> sanitize($value);
@@ -671,9 +671,9 @@ function &getProcessed()
 		}
 		return $this->_processed;
 	}
-	
-	
-	function cleanInput($input)
+
+
+	function sanitize_tag($input)
 	{
 		$search = array(
 		    '@<script[^>]*?>.*?</script>@si',   // Strip out javascript
@@ -681,42 +681,42 @@ function cleanInput($input)
 		    '@<style[^>]*?>.*?</style>@siU',    // Strip style tags properly
 		    '@<![\s\S]*?--[ \t\n\r]*>@'         // Strip multi-line comments
 		);
-			 
+
 	    $output = preg_replace($search, '', $input);
 	    return $output;
 	}
-		
-	
-	function sanitize($input)  
-	{  
-		
+
+
+	function sanitize($input)
+	{
+
 		if (is_array($input)) {
 	        foreach($input as $var=>$val) {
 	            $output[$var] = $this -> sanitize($val);
 	        }
 	    } else {
-	    	
-	    	// remove whitespaces (not a must though)  
+
+	    	// remove whitespaces (not a must though)
 			$input = trim($input);
-			
+
 			$input = str_replace('--', '', $input);
 			$data = str_replace(';', '', $data);
-			
+
 			if (!(stripos($input, ' or 1')===FALSE)) { return false;}
 			if (!(stripos($input, ' or true')===FALSE)) { return false;}
-	    	
+
 	        if (get_magic_quotes_gpc()) {
 	            $input = stripslashes($input);
 	        }
-	        $input  = $this -> cleanInput($input);
-	        
+	        $input  = $this -> sanitize_tag($input);
+
 	        $output = addslashes( $input );
 	    }
-	    
+
 	    return $output;
 	}
 
-	
+
 
 	// ----------------------------------------------
     // RECIPIENT METHODS
@@ -758,7 +758,7 @@ function AddViewElement($displayname, $fieldname, $colpercentage, $textalign='ce
         *fieldname is the Field Name which will be included in the export file
 
     */
-	
+
     function FieldExportElement($fieldname)
     {
         if(strlen($fieldname)>0)
@@ -903,11 +903,11 @@ function AddEditElement($displayname, $fieldname, $defaultvalue, $fieldtype, $fi
 		 return;
 		}
 		if($field_enabled==true)
-		{		
+		{
 			$cur = count($this->FG_TABLE_EDITION);
 			$this->FG_TABLE_EDITION[$cur] = array ( $displayname, $fieldname, $defaultvalue, $fieldtype, $fieldproperty, $regexpr_nb, $error_message,
 							$type_selectfield, $lie_tablename, $lie_tablefield, $lie_clause, $listname, $displayformat_selectfield, $check_emptyvalue,
-							$custom_query, $displayinput_defaultselect, $comment_above);		
+							$custom_query, $displayinput_defaultselect, $comment_above);
 			$this->FG_TABLE_COMMENT[$cur] = $comment;
 			$this->FG_TABLE_ADITION[$cur] = $this->FG_TABLE_EDITION[$cur];
 			$this->FG_NB_TABLE_ADITION = $this->FG_NB_TABLE_EDITION = count($this->FG_TABLE_EDITION);
@@ -916,15 +916,15 @@ function AddEditElement($displayname, $fieldname, $defaultvalue, $fieldtype, $fi
 
 	/**
      * Sets Search form fieldnames for the view module
-     * @public     
-	 * @ $displayname , $fieldname, $fieldvar	 
+     * @public
+	 * @ $displayname , $fieldname, $fieldvar
      */
 	function AddSearchElement_C1($displayname, $fieldname, $fieldvar)
 	{
 		$cur = count($this->FG_FILTER_SEARCH_FORM_1C);
 		$this->FG_FILTER_SEARCH_FORM_1C[$cur] = array($displayname, $fieldname, $fieldvar);
 	}
-	
+
 	function AddSearchElement_C2($displayname, $fieldname1 , $fielvar1 , $fieldname2 , $fielvar2, $sqlfield)
 	{
 		$cur = count($this->FG_FILTER_SEARCH_FORM_2C);
@@ -938,25 +938,25 @@ function AddSearchElement_C2($displayname, $fieldname1 , $fielvar1 , $fieldname2
      */
 	function AddSearchElement_Select($displayname, $table = null, $fields = null, $clause = null,
 			$order = null ,$sens = null , $select_name, $sql_type = 1, $array_content = null,$search_table=null){
-			
+
 		$cur = count($this->FG_FILTER_SEARCH_FORM_SELECT);
-		
+
 		if ($sql_type) {
 			$sql = array($table, $fields, $clause, $order ,$sens);
 			$this->FG_FILTER_SEARCH_FORM_SELECT[$cur] = array($displayname, $sql, $select_name,null,$search_table);
 		} else {
 			$this->FG_FILTER_SEARCH_FORM_SELECT[$cur] = array($displayname, 0, $select_name, $array_content,null);
-		}		
+		}
 	}
-	
-	
+
+
 	/**
      * Sets Query fieldnames for the Edit/ADD module
-     * @public     
-	 * @ $col_query	 
+     * @public
+	 * @ $col_query
      */
 	function FieldEditElement ($fieldname)
-	{     
+	{
 		if($this->FG_DISPLAY_SELECT == true)
 		{
 			if(strlen($this->FG_SELECT_FIELDNAME)>0)
@@ -967,50 +967,50 @@ function FieldEditElement ($fieldname)
 		$this->FG_QUERY_EDITION = $fieldname;
 		$this->FG_QUERY_ADITION = $fieldname;
 	}
-	
-	
+
+
 	function set_regular_expression()
 	{
-		// 0.  A STRING WITH EXACTLY 3 CHARACTERS.			
-		$this -> FG_regular[]  = array(	"^.{3}", 
+		// 0.  A STRING WITH EXACTLY 3 CHARACTERS.
+		$this -> FG_regular[]  = array(	"^.{3}",
 						gettext("(at least 3 characters)"));
-						
+
 		// 1.  EMAIL ADRESSE
-		$this -> FG_regular[]  = array(	"^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*$", 
+		$this -> FG_regular[]  = array(	"^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*$",
 						gettext("(must match email structure. Example : name@domain.com)"));
-						
+
 		// 2 . IF AT LEAST FIVE SUCCESSIVE CHARACTERS APPEAR AT THE END OF THE STRING.
-		$this -> FG_regular[]  = array(	".{5}$", 
+		$this -> FG_regular[]  = array(	".{5}$",
 						gettext("(at least 5 successive characters appear at the end of this string)"));
 
 		// 3. IF AT LEAST 4 CHARACTERS
-		$this -> FG_regular[]  = array(	".{4}", 
+		$this -> FG_regular[]  = array(	".{4}",
 						gettext("(at least 4 characters)"));
 
 		// 4
-		$this -> FG_regular[]  = array(	"^[0-9]+$"	, 
+		$this -> FG_regular[]  = array(	"^[0-9]+$"	,
 						gettext("(number format)"));
-			
+
 		// 5
-		$this -> FG_regular[]  = array(	"^([0-9]{4})-([0-9]{2})-([0-9]{2})$"	, 
+		$this -> FG_regular[]  = array(	"^([0-9]{4})-([0-9]{2})-([0-9]{2})$"	,
 						"(YYYY-MM-DD)");
-			
+
 		// 6
-		$this -> FG_regular[]  = array(	"^[0-9]{8,}$"	, 
+		$this -> FG_regular[]  = array(	"^[0-9]{8,}$"	,
 						gettext("(only number with more that 8 digits)"));
-			
+
 		// 7
-		$this -> FG_regular[]  = array(	"^[0-9][ .0-9\/\-]{6,}[0-9]$"	, 
+		$this -> FG_regular[]  = array(	"^[0-9][ .0-9\/\-]{6,}[0-9]$"	,
 						gettext("(at least 8 digits using . or - or the space key)"));
-						
+
 		// 8
-		$this -> FG_regular[]  = array(	".{5}", 
+		$this -> FG_regular[]  = array(	".{5}",
 						gettext("network adress format"));
 
 		// 9
 		$this -> FG_regular[]  = array(	"^.{1}",
 						gettext("at least 1 character"));
-	
+
 		// 10
 		$this -> FG_regular[]  = array(    "^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$"   ,
 		                        "(YYYY-MM-DD HH:MM:SS)");
@@ -1022,27 +1022,27 @@ function set_regular_expression()
 		// 12
 		$this -> FG_regular[]  = array(    "^(-){0,1}[0-9]+(\.){0,1}[0-9]*$"       ,
 					gettext("(NUMBER FORMAT WITH/WITHOUT DECIMAL, use '.' for decimal)"));
-		
+
 		// 13  - RATECARD
 		$this -> FG_regular[]  = array(    "^(defaultprefix|[-,0-9]+|_[-[.[.][.].]0-9XZN(){}|.,_]+)$",
 					"(NUMBER FORMAT OR 'defaultprefix' OR ASTERISK/POSIX REGEX FORMAT)");
-		
+
 		// 14  - DNID PREFIX FOR RATECARD
 		$this -> FG_regular[]  = array(    "^(all|[0-9]+)$",
 		                        "(NUMBER FORMAT OR 'all')");
-		
+
 		// 15 - RATECARD TIME
 		$this -> FG_regular[]  = array(    "^([0-9]{2}):([0-9]{2})$"   ,
 		                        "(HH:MM)");
-						
+
 		// 16  TEXT > 15 caract
-		$this -> FG_regular[]  = array(	".{15}", 
+		$this -> FG_regular[]  = array(	".{15}",
 						gettext("You must write something."));
-		
+
 		// 17  TEXT > 15 caract
-		$this -> FG_regular[]  = array(	".{8}", 
+		$this -> FG_regular[]  = array(	".{8}",
 						gettext("8 characters alphanumeric"));
-		
+
 		// 18 - CALLERID - PhoneNumber
 		$this -> FG_regular[]  = array(    "^(\+|[0-9]{1})[0-9]+$"   ,
 		                        "Phone Number format");
@@ -1051,26 +1051,26 @@ function set_regular_expression()
 						gettext("(at least 6 Alphanumeric characters)"));
 		//20 TIME
 		$this -> FG_regular[]  = array(    "^([0-9]{2}):([0-9]{2}):([0-9]{2})$"   ,
-		                        "(HH:MM:SS)");				
+		                        "(HH:MM:SS)");
 						// check_select
 		// TO check if a select have a value different -1
 		// 21 -> Check percent more of 0 and under 100
 		$this -> FG_regular[]  = array( "^100$|^(([0-9]){0,2})((\.)([0-9]*))?$"  ,
 					gettext("(PERCENT FORMAT WITH/WITHOUT DECIMAL, use '.' for decimal and don't use '%' character. e.g.: 12.4 )"));
-		
+
 	}
-	
-	
+
+
 	// ----------------------------------------------
     // FUNCTION FOR THE FORM
     // ----------------------------------------------
-	
+
 	function do_field_duration($sql,$fld, $fldsql)
-	{	
+	{
   		$processed = $this->getProcessed();
-  		
+
   		$fldtype = $fld.'type';
-  		
+
   		if (isset($processed[$fld]) && ($processed[$fld]!='')){
             if (strpos($sql,'WHERE') > 0){
                 $sql = "$sql AND ";
@@ -1078,11 +1078,11 @@ function do_field_duration($sql,$fld, $fldsql)
                 $sql = "$sql WHERE ";
             }
 			$sql = "$sql $fldsql";
-			if (isset ($processed[$fldtype])){                
+			if (isset ($processed[$fldtype])){
                 switch ($processed[$fldtype]) {
 					case 1:	$sql = "$sql ='".$processed[$fld]."'";  break;
 					case 2: $sql = "$sql <= '".$processed[$fld]."'";  break;
-					case 3: $sql = "$sql < '".$processed[$fld]."'";  break;							
+					case 3: $sql = "$sql < '".$processed[$fld]."'";  break;
 					case 4: $sql = "$sql > '".$processed[$fld]."'";  break;
 					case 5: $sql = "$sql >= '".$processed[$fld]."'";  break;
 				}
@@ -1093,13 +1093,13 @@ function do_field_duration($sql,$fld, $fldsql)
 
 	function do_field($sql,$fld, $simple=0,$processed=null,$search_table=null)
 	{
-		
-		
+
+
   		$fldtype = $fld.'type';
-        if(empty($processed)) { 
+        if(empty($processed)) {
         	$processed = $this->getProcessed();
         }
-  		
+
         if (isset($processed[$fld]) && ($processed[$fld]!='')){
 			if (strpos($sql,'WHERE') > 0){
                 $sql = "$sql AND ";
@@ -1111,24 +1111,24 @@ function do_field($sql,$fld, $simple=0,$processed=null,$search_table=null)
             }else{
             	$sql = "$sql $search_table.$fld";
             }
-	        if (DB_TYPE == "postgres"){		
+	        if (DB_TYPE == "postgres"){
 		 		$LIKE = "ILIKE";
 		 		$CONVERT ="";
 			}else{
 				$LIKE = "LIKE";
 				$CONVERT =" COLLATE utf8_unicode_ci";
 			}
-			
+
 			if ($simple==0){
-				if (isset ($processed[$fldtype])){      
+				if (isset ($processed[$fldtype])){
 					switch ($processed[$fldtype]) {
 						case 1:	$sql = "$sql='".$processed[$fld]."'";  break;
 						case 2: $sql = "$sql $LIKE '".$processed[$fld]."%'".$CONVERT;  break;
 						case 3: $sql = "$sql $LIKE '%".$processed[$fld]."%'".$CONVERT;  break;
 						case 4: $sql = "$sql $LIKE '%".$processed[$fld]."'".$CONVERT;
 					}
-				}else{ 
-					$sql = "$sql $LIKE '%".$processed[$fld]."%'".$CONVERT; 
+				}else{
+					$sql = "$sql $LIKE '%".$processed[$fld]."%'".$CONVERT;
 				}
 			}else{
 				$sql = "$sql ='".$processed[$fld]."'";
@@ -1136,10 +1136,10 @@ function do_field($sql,$fld, $simple=0,$processed=null,$search_table=null)
 		}
 		return $sql;
 	}
-	
+
 	/**
      * Function to execture the appropriate action
-     * @public     	 
+     * @public
      */
 	function perform_action (&$form_action){
 		//security check
@@ -1178,7 +1178,7 @@ function perform_action (&$form_action){
 			   $this -> perform_delete($form_action);
 			   break;
 		}
-				
+
 		$processed = $this->getProcessed();  //$processed['firstname']
 
 		if ($form_action == "ask-delete" && in_array($processed['id'],$this->FG_DELETION_FORBIDDEN_ID) ){
@@ -1189,7 +1189,7 @@ function perform_action (&$form_action){
 			}
 			die();
 		}
-		
+
 		if ( $form_action == "list" || $form_action == "edit" || $form_action == "ask-delete" ||
 			 $form_action == "ask-edit" || $form_action == "add-content" || $form_action == "del-content" || $form_action == "ask-del-confirm") {
 			include_once (FSROOT."lib/Class.Table.php");
@@ -1202,7 +1202,7 @@ function perform_action (&$form_action){
 			if (isset($_SESSION[$session_limit]) && is_numeric($_SESSION[$session_limit])){
 				$this -> FG_LIMITE_DISPLAY = $_SESSION[$session_limit];
 			}
-			
+
 			if (isset($processed['mydisplaylimit']) && (is_numeric($processed['mydisplaylimit']) || ($processed['mydisplaylimit']=='ALL'))){
 				if ($processed['mydisplaylimit']=='ALL'){
 					$this -> FG_LIMITE_DISPLAY = 5000;
@@ -1216,29 +1216,29 @@ function perform_action (&$form_action){
 				$this->FG_ORDER = $this -> FG_TABLE_DEFAULT_ORDER;
 				$this->FG_SENS  = $this -> FG_TABLE_DEFAULT_SENS;
 			}
-			
+
 			if ( $form_action == "list" ) {
 				$sql_calc_found_rows = '';
 				if (DB_TYPE != "postgres") {
 					$sql_calc_found_rows = 'SQL_CALC_FOUND_ROWS';
 				}
 				$instance_table = new Table($this -> FG_TABLE_NAME, "$sql_calc_found_rows ".$this -> FG_COL_QUERY, null, null, null, true, $this -> FG_TABLE_NAME_COUNT);
-				
+
 				$this->prepare_list_subselection($form_action);
-	
+
 				// Code here to call the Delete Selected items Fucntion
 				if (isset($processed['deleteselected'])) {
 					$this -> Delete_Selected();
 				}
-				
-				if ($this->FG_DEBUG >= 2) { 
+
+				if ($this->FG_DEBUG >= 2) {
 					echo "FG_CLAUSE:$this->FG_CLAUSE";
 					echo "FG_ORDER = ".$this->FG_ORDER."<br>";
 					echo "FG_SENS = ".$this->FG_SENS."<br>";
 					echo "FG_LIMITE_DISPLAY = ".$this -> FG_LIMITE_DISPLAY."<br>";
 					echo "CV_CURRENT_PAGE = ".$this -> CV_CURRENT_PAGE."<br>";
 				}
-				
+
 				$list = $instance_table -> Get_list ($this -> DBHandle, $this -> FG_TABLE_CLAUSE, $this->FG_ORDER, $this->FG_SENS, null, null,
 													 $this -> FG_LIMITE_DISPLAY, $this -> CV_CURRENT_PAGE * $this -> FG_LIMITE_DISPLAY, $this -> SQL_GROUP);
 				if ($this->FG_DEBUG == 3) echo "<br>Clause : ".$this -> FG_TABLE_CLAUSE;
@@ -1248,9 +1248,9 @@ function perform_action (&$form_action){
 					$res_count = $instance_table -> SQLExec($this->DBHandle, "SELECT FOUND_ROWS() as count", 1);
 					$this -> FG_NB_RECORD = $res_count[0][0];
 				}
-				
+
 				if ($this->FG_DEBUG >= 1) var_dump ($list);
-				
+
 				if ($this -> FG_NB_RECORD <=$this -> FG_LIMITE_DISPLAY){
 					$this -> FG_NB_RECORD_MAX = 1;
 				}else{
@@ -1259,12 +1259,12 @@ function perform_action (&$form_action){
 
 				if ($this->FG_DEBUG == 3) echo "<br>Nb_record : ".$this -> FG_NB_RECORD ;
 				if ($this->FG_DEBUG == 3) echo "<br>Nb_record_max : ".$this -> FG_NB_RECORD_MAX ;
-					
+
 			} else {
-			
+
 				$instance_table = new Table($this->FG_TABLE_NAME, $this->FG_QUERY_EDITION);
 				$list = $instance_table -> Get_list ($this->DBHandle, $this->FG_EDITION_CLAUSE, null, null, null, null, 1, 0);
-				
+
 				//PATCH TO CLEAN THE IMPORT OF PASSWORD FROM THE DATABASE
 				if ( substr_count($this->FG_QUERY_EDITION,"pwd_encoded")>0 ) {
 					$tab_field = explode(',',  $this->FG_QUERY_EDITION ) ;
@@ -1274,19 +1274,19 @@ function perform_action (&$form_action){
 						}
 					}
 				}
-				
+
 				if (isset($list[0]["pwd_encoded"])) {
-					$list[0]["pwd_encoded"] = "";				
+					$list[0]["pwd_encoded"] = "";
 				}
 			}
-			
-			if ($this->FG_DEBUG >= 2) print_r ($list);			
+
+			if ($this->FG_DEBUG >= 2) print_r ($list);
 		}
 
 		return $list;
-	
+
 	}
-	
+
 	/**
      * Function to prepare the clause from the session filter
      * @public
@@ -1295,9 +1295,9 @@ function prepare_list_subselection($form_action)
 	{
 
 		$processed = $this->getProcessed();
-		
+
 		if ( $form_action == "list" && $this->FG_FILTER_SEARCH_FORM) {
-			
+
 			if (isset($processed['cancelsearch']) && ($processed['cancelsearch'] == true)){
 				$_SESSION[$this->FG_FILTER_SEARCH_SESSION_NAME] = '';
 			}
@@ -1314,7 +1314,7 @@ function prepare_list_subselection($form_action)
 					}
 				}
 			}
-			
+
 			if (($processed['posted_search'] != 1 && isset($_SESSION[$this->FG_FILTER_SEARCH_SESSION_NAME]) && strlen($_SESSION[$this->FG_FILTER_SEARCH_SESSION_NAME])>10 )){
 				$arr_session_var = preg_split("/\|/", $_SESSION[$this->FG_FILTER_SEARCH_SESSION_NAME]);
 				foreach ($arr_session_var as $arr_val){
@@ -1328,14 +1328,14 @@ function prepare_list_subselection($form_action)
 
 			// Search Form On
 			if (($processed['posted_search'] == 1 )) {
-				
+
 				$this->_processed[fromstatsday_sday] = normalize_day_of_month($processed[fromstatsday_sday], $processed[fromstatsmonth_sday],1);
 				$this->_processed[tostatsday_sday] = normalize_day_of_month($processed[tostatsday_sday], $processed[tostatsmonth_sday],1);
 				$this->_processed[fromstatsday_sday_bis] = normalize_day_of_month($processed[fromstatsday_sday_bis], $processed[fromstatsmonth_sday_bis],1);
 				$this->_processed[tostatsday_sday_bis] = normalize_day_of_month($processed[tostatsday_sday_bis], $processed[tostatsmonth_sday_bis],1);
-				
+
 				$SQLcmd = '';
-				
+
 				$search_parameters = "Period=$processed[Period]|frommonth=$processed[frommonth]|fromstatsmonth=$processed[fromstatsmonth]|tomonth=$processed[tomonth]";
 				$search_parameters .= "|tostatsmonth=$processed[tostatsmonth]|fromday=$processed[fromday]|fromstatsday_sday=$processed[fromstatsday_sday]";
 				$search_parameters .= "|fromstatsmonth_sday=$processed[fromstatsmonth_sday]|today=$processed[today]|tostatsday_sday=$processed[tostatsday_sday]";
@@ -1344,52 +1344,52 @@ function prepare_list_subselection($form_action)
 				$search_parameters .= "|tostatsmonth_bis=$processed[tostatsmonth_bis]|fromday_bis=$processed[fromday_bis]|fromstatsday_sday_bis=$processed[fromstatsday_sday_bis]";
 				$search_parameters .= "|fromstatsmonth_sday_bis=$processed[fromstatsmonth_sday_bis]|today_bis=$processed[today_bis]|tostatsday_sday_bis=$processed[tostatsday_sday_bis]";
 				$search_parameters .= "|tostatsmonth_sday_bis=$processed[tostatsmonth_sday_bis]";
-				
-				foreach ($this->FG_FILTER_SEARCH_FORM_1C as $r){							
+
+				foreach ($this->FG_FILTER_SEARCH_FORM_1C as $r){
 					$search_parameters .= "|$r[1]=".$processed[$r[1]]."|$r[2]=".$processed[$r[2]];
 					$SQLcmd = $this->do_field($SQLcmd, $r[1],0,$processed);
 				}
-				
+
 				foreach ($this->FG_FILTER_SEARCH_FORM_2C as $r){
 					$search_parameters .= "|$r[1]=".$processed[$r[1]]."|$r[2]=".$processed[$r[2]];
 					$search_parameters .= "|$r[3]=".$processed[$r[3]]."|$r[4]=".$processed[$r[4]];
 					$SQLcmd = $this->do_field_duration($SQLcmd,$r[1],$r[5]);
 					$SQLcmd = $this->do_field_duration($SQLcmd,$r[3],$r[5]);
 				}
-				
+
 				foreach ($this->FG_FILTER_SEARCH_FORM_SELECT as $r){
 					$search_parameters .= "|$r[2]=".$processed[$r[2]];
 					$SQLcmd = $this->do_field($SQLcmd, $r[2], 1,null,$r[4]);
 				}
-				
+
 				$_SESSION[$this->FG_FILTER_SEARCH_SESSION_NAME] = $search_parameters;
 
 				$date_clause = '';
-				
+
 				if ($processed[fromday] && isset($processed[fromstatsday_sday]) && isset($processed[fromstatsmonth_sday]))
 					$date_clause.=" AND ".$this->FG_FILTER_SEARCH_1_TIME_FIELD." >= TIMESTAMP('$processed[fromstatsmonth_sday]-$processed[fromstatsday_sday]')";
 				if ($processed[today] && isset($processed[tostatsday_sday]) && isset($processed[tostatsmonth_sday]))
 					$date_clause.=" AND ".$this->FG_FILTER_SEARCH_1_TIME_FIELD." <= TIMESTAMP('$processed[tostatsmonth_sday]-".sprintf("%02d",intval($processed[tostatsday_sday])/*+1*/)." 23:59:59')";
-				
-				
+
+
 				if ($processed[Period]=="month_older_rad"){
 					$from_month = $processed[month_earlier];
 					$date_clause .= " AND DATE_SUB(NOW(),INTERVAL $from_month MONTH) > ".$this->FG_FILTER_SEARCH_3_TIME_FIELD."";
 				}
-				
+
 				//BIS FIELD
 				if ($processed[fromday_bis] && isset($processed[fromstatsday_sday_bis]) && isset($processed[fromstatsmonth_sday_bis]))
 					$date_clause.=" AND ".$this->FG_FILTER_SEARCH_1_TIME_FIELD_BIS." >= TIMESTAMP('$processed[fromstatsmonth_sday_bis]-$processed[fromstatsday_sday_bis]')";
 				if ($processed[today_bis] && isset($processed[tostatsday_sday_bis]) && isset($processed[tostatsmonth_sday_bis]))
 					$date_clause.=" AND ".$this->FG_FILTER_SEARCH_1_TIME_FIELD_BIS." <= TIMESTAMP('$processed[tostatsmonth_sday_bis]-".sprintf("%02d",intval($processed[tostatsday_sday_bis])/*+1*/)." 23:59:59')";
-				
-				
+
+
 				if ($processed[Period_bis]=="month_older_rad") {
 					$from_month = $processed[month_earlier_bis];
 					$date_clause .= " AND DATE_SUB(NOW(),INTERVAL $from_month MONTH) > ".$this->FG_FILTER_SEARCH_3_TIME_FIELD_BIS."";
 				}
-				
-				
+
+
 				if (strpos($SQLcmd, 'WHERE') > 0) {
 					if (strlen($this->FG_TABLE_CLAUSE)>0) $this->FG_TABLE_CLAUSE .=" AND ";
 					$this -> FG_TABLE_CLAUSE .= substr($SQLcmd,6).$date_clause;
@@ -1400,7 +1400,7 @@ function prepare_list_subselection($form_action)
 			}
 		}
 	}
-	
+
     /****************************************
     Function to delete all pre selected records,
     This Function Gets the selected records and delete them from DB
@@ -1417,45 +1417,45 @@ function Delete_Selected()
 
 	/**
      * Function to perform the add action after inserting all data in required fields
-     * @public     	 
+     * @public
      */
 	function perform_add (&$form_action)
 	{
 		include_once (FSROOT."lib/Class.Table.php");
-		
+
 		$processed = $this->getProcessed();  //$processed['firstname']
-		$this->VALID_SQL_REG_EXP = true;		
-		
+		$this->VALID_SQL_REG_EXP = true;
+
 		for($i=0; $i < $this->FG_NB_TABLE_ADITION; $i++) {
-			
+
 			$pos = strpos($this->FG_TABLE_ADITION[$i][14], ":"); // SQL CUSTOM QUERY
 			$pos_mul = strpos($this->FG_TABLE_ADITION[$i][4], "multiple");
-			
+
 			if (!$pos) {
-				
+
 				$fields_name = $this->FG_TABLE_ADITION[$i][1];
 				$regexp = $this->FG_TABLE_ADITION[$i][5];
-				
+
 				// FIND THE MULTIPLE SELECT
 				if ($pos_mul && is_array($processed[$fields_name])) {
-					$total_mult_select=0;					
+					$total_mult_select=0;
 					foreach ($processed[$fields_name] as $value) {
 							$total_mult_select += $value;
 					}
-					
-					if ($this->FG_DEBUG == 1) echo "<br>$fields_name : ".$total_mult_select;					
-					
+
+					if ($this->FG_DEBUG == 1) echo "<br>$fields_name : ".$total_mult_select;
+
 					if ($i>0) $param_add_fields .= ", ";
 					$param_add_fields .= $fields_name;
 					if ($i>0) $param_add_value .= ", ";
 					$param_add_value .= "'".addslashes(trim($total_mult_select))."'";
-				
+
 				} else {
 					// NO MULTIPLE SELECT
-					
-					// CHECK ACCORDING TO THE REGULAR EXPRESSION DEFINED	
-					if (is_numeric($regexp) && !(strtoupper(substr($this->FG_TABLE_ADITION[$i][13],0,2))=="NO" && $processed[$fields_name]=="")) {					
-						$this-> FG_fit_expression[$i] = preg_match("/".$this->FG_regular[$regexp][0]."/", $processed[$fields_name]);								
+
+					// CHECK ACCORDING TO THE REGULAR EXPRESSION DEFINED
+					if (is_numeric($regexp) && !(strtoupper(substr($this->FG_TABLE_ADITION[$i][13],0,2))=="NO" && $processed[$fields_name]=="")) {
+						$this-> FG_fit_expression[$i] = preg_match("/".$this->FG_regular[$regexp][0]."/", $processed[$fields_name]);
 						if ($this->FG_DEBUG == 1)  echo "<br>->  $fields_name => ".$this->FG_regular[$regexp][0]." , ".$processed[$fields_name];
 						if (!$this-> FG_fit_expression[$i]){
 							$this->VALID_SQL_REG_EXP = false;
@@ -1492,31 +1492,31 @@ function perform_add (&$form_action)
 								$arr_value_to_import[] = $arr_value_explode[0];
 							}
 						}
-						
+
 						if (!is_null($processed[$fields_name]) && ($processed[$fields_name]!="") && ($this->FG_TABLE_ADITION[$i][4]!="disabled") ){
-							if ($i>0) $param_add_fields .= ", ";							
+							if ($i>0) $param_add_fields .= ", ";
 							$param_add_fields .= str_replace('myfrom_', '', $fields_name);
 							if ($i>0) $param_add_value .= ", ";
-							$param_add_value .= "'%TAGPREFIX%'";							
+							$param_add_value .= "'%TAGPREFIX%'";
 						}
 					} else {
 						if ($this->FG_DEBUG == 1) echo "<br>$fields_name : ".$processed[$fields_name];
 						if (!is_null($processed[$fields_name]) && ($processed[$fields_name]!="") && ($this->FG_TABLE_ADITION[$i][4]!="disabled") ){
 							if (strtoupper ($this->FG_TABLE_ADITION[$i][3]) != strtoupper("CAPTCHAIMAGE"))
 							{
-								if ($i>0) $param_add_fields .= ", ";							
+								if ($i>0) $param_add_fields .= ", ";
 									$param_add_fields .= str_replace('myfrom_', '', $fields_name);
 								if ($i>0) $param_add_value .= ", ";
 									$param_add_value .= "'".addslashes(trim($processed[$fields_name]))."'";
 							}
 						}
 					}
-				}		
+				}
 			}
 		}
-		
+
 		if (!is_null($this->FG_QUERY_ADITION_HIDDEN_FIELDS) && $this->FG_QUERY_ADITION_HIDDEN_FIELDS!=""){
-			if ($i>0) $param_add_fields .= ", ";		
+			if ($i>0) $param_add_fields .= ", ";
 			$param_add_fields .= $this->FG_QUERY_ADITION_HIDDEN_FIELDS;
 			if ($i>0) $param_add_value .= ", ";
 			$split_hidden_fields_value = preg_split("/,/",trim($this->FG_QUERY_ADITION_HIDDEN_VALUE));
@@ -1525,24 +1525,24 @@ function perform_add (&$form_action)
 				if($cur_hidden<count($split_hidden_fields_value)-1)$param_add_value.=",";
 			}
 		}
-			
+
 		if ($this->FG_DEBUG == 1)  echo "<br><hr> $param_add_fields";
-		if ($this->FG_DEBUG == 1)  echo "<br><hr> $param_add_value";	
-		
+		if ($this->FG_DEBUG == 1)  echo "<br><hr> $param_add_value";
+
 		$res_funct = true;
-		
+
 		// CALL DEFINED FUNCTION BEFORE THE ADDITION
-		
+
 		if (strlen($this->FG_ADDITIONAL_FUNCTION_BEFORE_ADD)>0 && ($this->VALID_SQL_REG_EXP))
-				$res_funct = call_user_func(array('FormBO', $this->FG_ADDITIONAL_FUNCTION_BEFORE_ADD)); 
-			
+				$res_funct = call_user_func(array('FormBO', $this->FG_ADDITIONAL_FUNCTION_BEFORE_ADD));
+
 		if ($res_funct) {
-			
+
 			$instance_table = new Table($this->FG_TABLE_NAME, $param_add_fields);
 			// CHECK IF WE HAD FOUND A SPLITABLE FIELD THEN WE MIGHT HAVE %TAGPREFIX%
 			if (strpos($param_add_value, '%TAGPREFIX%')) {
 				foreach ($arr_value_to_import as $current_value) {
-					$param_add_value_replaced = str_replace("%TAGPREFIX%", $current_value, $param_add_value);				
+					$param_add_value_replaced = str_replace("%TAGPREFIX%", $current_value, $param_add_value);
 					if ($this->VALID_SQL_REG_EXP) $this -> RESULT_QUERY = $instance_table -> Add_table ($this->DBHandle, $param_add_value_replaced, null, null, $this->FG_TABLE_ID);
 				}
 			} else {
@@ -1559,7 +1559,7 @@ function perform_add (&$form_action)
 				$this->FG_ADITION_GO_EDITION = "yes-done";
 			}
 			$id = $this -> RESULT_QUERY;
-			if ( !empty($id) && ($this->VALID_SQL_REG_EXP) && (isset($this->FG_GO_LINK_AFTER_ACTION_ADD))){				
+			if ( !empty($id) && ($this->VALID_SQL_REG_EXP) && (isset($this->FG_GO_LINK_AFTER_ACTION_ADD))){
 				if ($this->FG_DEBUG == 1)  echo "<br> GOTO ; ".$this->FG_GO_LINK_AFTER_ACTION_ADD.$id;
 				//echo "<br> GOTO ; ".$this->FG_GO_LINK_AFTER_ACTION_ADD.$id;
 				Header ("Location: ".$this->FG_GO_LINK_AFTER_ACTION_ADD.$id);
@@ -1567,8 +1567,8 @@ function perform_add (&$form_action)
 		}
 	}
 
-	
-	
+
+
 	/**
      * Function to edit the fields
      * @public
@@ -1576,35 +1576,35 @@ function perform_add (&$form_action)
 	function perform_edit (&$form_action)
 	{
 		include_once (FSROOT."lib/Class.Table.php");
-		
+
 		$processed = $this->getProcessed();  //$processed['firstname']
-		
+
 		$this->VALID_SQL_REG_EXP = true;
-		
+
 		$instance_table = new Table($this->FG_TABLE_NAME, $this->FG_QUERY_EDITION);
-		
+
 		if ($processed['id']!="" || !is_null($processed['id'])){
 			$this->FG_EDITION_CLAUSE = str_replace("%id", $processed['id'], $this->FG_EDITION_CLAUSE);
 		}
-		
+
 		for($i=0;$i<$this->FG_NB_TABLE_EDITION;$i++) {
-			
-			$pos = strpos($this->FG_TABLE_EDITION[$i][14], ":"); // SQL CUSTOM QUERY		
+
+			$pos = strpos($this->FG_TABLE_EDITION[$i][14], ":"); // SQL CUSTOM QUERY
 			$pos_mul = strpos($this->FG_TABLE_EDITION[$i][4], "multiple");
 			if (!$pos){
-				$fields_name = $this->FG_TABLE_EDITION[$i][1];								
+				$fields_name = $this->FG_TABLE_EDITION[$i][1];
 				$regexp = $this->FG_TABLE_EDITION[$i][5];
-				
+
 				if ($pos_mul && is_array($processed[$fields_name])){
 					$total_mult_select=0;
 					foreach ($processed[$fields_name] as $value){
 						$total_mult_select += $value;
 					}
 					if ($this->FG_DEBUG == 1) echo "<br>$fields_name : ".$total_mult_select;
-					if ($i>0) $param_update .= ", ";				
+					if ($i>0) $param_update .= ", ";
 					$param_update .= "$fields_name = '".addslashes(trim($total_mult_select))."'";
 				} else {
-					
+
 					if (is_numeric($regexp) && !(strtoupper(substr($this->FG_TABLE_ADITION[$i][13],0,2))=="NO" && $processed[$fields_name]=="") ) {
 						$this-> FG_fit_expression[$i] = preg_match("/".$this->FG_regular[$regexp][0]."/", $processed[$fields_name]);
 						if ($this->FG_DEBUG == 1)  echo "<br>->  ".$this->FG_regular[$regexp][0]." , ".$processed[$fields_name];
@@ -1613,7 +1613,7 @@ function perform_edit (&$form_action)
 							$form_action="ask-edit";
 						}
 					}
-					
+
 					if ($this->FG_DEBUG == 1) echo "<br>$fields_name : ".$processed[$fields_name];
 					if ($i>0 && $this->FG_TABLE_EDITION[$i][3]!= "SPAN") $param_update .= ", ";
 					if (empty($processed[$fields_name]) && strtoupper(substr($this->FG_TABLE_ADITION[$i][13],3,4))=="NULL"){
@@ -1624,73 +1624,73 @@ function perform_edit (&$form_action)
 						}
 					}
 				}
-				
+
 			} else {
 				if (strtoupper ($this->FG_TABLE_EDITION[$i][3])==strtoupper ("CHECKBOX")) {
 					$table_split = preg_split("/:/",$this->FG_TABLE_EDITION[$i][1]);
-					$checkbox_data = $table_split[0];	//doc_tariff			
+					$checkbox_data = $table_split[0];	//doc_tariff
 					$instance_sub_table = new Table($table_split[0], $table_split[1].", ".$table_split[5]);
-					$SPLIT_FG_DELETE_CLAUSE = $table_split[5]."='".trim($processed['id'])."'";	
+					$SPLIT_FG_DELETE_CLAUSE = $table_split[5]."='".trim($processed['id'])."'";
 					$instance_sub_table -> Delete_table ($this -> DBHandle, $SPLIT_FG_DELETE_CLAUSE, $func_table = null);
-					
+
 					if (!is_array($processed[$checkbox_data])) {
 						$snum=0;
 						$this -> VALID_SQL_REG_EXP = false;
 						$this-> FG_fit_expression[$i] = false;
-					} else {									
+					} else {
 						$snum = count($processed[$checkbox_data]);
 					}
-					
+
 					$checkbox_data_tab = $processed[$checkbox_data];
 					for($j=0;$j<$snum;$j++){
 						$this -> RESULT_QUERY = $instance_sub_table -> Add_table ($this-> DBHandle, "'".addslashes(trim($checkbox_data_tab[$j]))."', '".addslashes(trim($processed['id']))."'", null, null);
 						if (!$this -> RESULT_QUERY) {
 							$findme   = 'duplicate';
-							$pos_find = strpos($instance_sub_table -> errstr, $findme);	
-							
+							$pos_find = strpos($instance_sub_table -> errstr, $findme);
+
 							// Note our use of ===.  Simply == would not work as expected
 							// because the position of 'a' was the 0th (first) character.
 							if ($pos_find === false) {
-								echo $instance_sub_table -> errstr;	
+								echo $instance_sub_table -> errstr;
 							} else {
 								//echo $FG_TEXT_ERROR_DUPLICATION;
 								$alarm_db_error_duplication = true;
-							}								
-						}						
+							}
+						}
 					}
 				}
-			}			
+			}
 		}
-		
+
 		if (!is_null($this->FG_QUERY_EDITION_HIDDEN_FIELDS) && $this->FG_QUERY_EDITION_HIDDEN_FIELDS!=""){
-			
+
 			$table_split_field = preg_split("/,/",$this->FG_QUERY_EDITION_HIDDEN_FIELDS);
 			$table_split_value = preg_split("/,/",$this->FG_QUERY_EDITION_HIDDEN_VALUE);
-			
+
 			for($k=0;$k<count($table_split_field);$k++){
 				$param_update .= ", ";
 				$param_update .= "$table_split_field[$k] = '".addslashes(trim($table_split_value[$k]))."'";
-			}				
+			}
 		}
-		
+
 		if (strlen($this->FG_ADDITIONAL_FUNCTION_BEFORE_EDITION)>0 && ($this->VALID_SQL_REG_EXP))
-				$res_funct = call_user_func(array('FormBO', $this->FG_ADDITIONAL_FUNCTION_BEFORE_EDITION)); 
+				$res_funct = call_user_func(array('FormBO', $this->FG_ADDITIONAL_FUNCTION_BEFORE_EDITION));
 
 		if ($this->FG_DEBUG == 1)
 			echo "<br><hr> PARAM_UPDATE: $param_update<br>".$this->FG_EDITION_CLAUSE;
-		
+
 		if ($this->VALID_SQL_REG_EXP)
 			$this -> RESULT_QUERY = $instance_table -> Update_table ($this->DBHandle, $param_update, $this->FG_EDITION_CLAUSE, $func_table = null);
-		
+
 		if($this -> FG_ENABLE_LOG == 1)
 			$this -> logger -> insertLog_Update($_SESSION["admin_id"], 3, "A ".strtoupper($this->FG_INSTANCE_NAME)." UPDATED" , "A RECORD IS UPDATED, EDITION CALUSE USED IS ".$this->FG_EDITION_CLAUSE, $this->FG_TABLE_NAME, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI'], $param_update);
-		
+
 		if ($this->FG_DEBUG == 1) echo $this -> RESULT_QUERY;
 			// CALL DEFINED FUNCTION AFTER THE ACTION ADDITION
 			if (strlen($this->FG_ADDITIONAL_FUNCTION_AFTER_EDITION)>0 && ($this->VALID_SQL_REG_EXP))
-				$res_funct = call_user_func(array('FormBO', $this->FG_ADDITIONAL_FUNCTION_AFTER_EDITION)); 
-		
-		if (($this->VALID_SQL_REG_EXP) && (isset($this->FG_GO_LINK_AFTER_ACTION_EDIT))) {				
+				$res_funct = call_user_func(array('FormBO', $this->FG_ADDITIONAL_FUNCTION_AFTER_EDITION));
+
+		if (($this->VALID_SQL_REG_EXP) && (isset($this->FG_GO_LINK_AFTER_ACTION_EDIT))) {
 			if ($this->FG_DEBUG == 1)  echo "<br> GOTO ; ".$this->FG_GO_LINK_AFTER_ACTION_EDIT.$processed['id'];
 			$ext_link ='';
 			if(is_numeric($processed['current_page']))$ext_link.="&current_page=".$processed['current_page'];
@@ -1698,8 +1698,8 @@ function perform_edit (&$form_action)
 			Header ("Location: ".$this->FG_GO_LINK_AFTER_ACTION_EDIT.$processed['id'].$ext_link);
 		}
 	}
-	
-	
+
+
 	/**
      * Function to delete a record
      * @public
@@ -1707,12 +1707,12 @@ function perform_edit (&$form_action)
 	function perform_delete (&$form_action)
 	{
 		include_once (FSROOT."lib/Class.Table.php");
-		
+
 		if (strlen($this -> FG_ADDITIONAL_FUNCTION_AFTER_DELETE) > 0)
 		$res_funct = call_user_func(array('FormBO', $this->FG_ADDITIONAL_FUNCTION_AFTER_DELETE));
 		$processed = $this->getProcessed();  //$processed['firstname']
 		$this->VALID_SQL_REG_EXP = true;
-		
+
         $instance_table = null;
         $tableCount = count($this -> FG_FK_TABLENAMES);
         $clauseCount = count($this -> FG_FK_EDITION_CLAUSE);
@@ -1725,17 +1725,17 @@ function perform_delete (&$form_action)
 		    $instance_table = new Table($this->FG_TABLE_NAME, $this->FG_QUERY_EDITION);
         }
 		$instance_table->FK_DELETE = ($this->FG_FK_WARNONLY ? false : true);
-		
+
 		if ($processed['id']!="" || !is_null($processed['id'])){
 			$this->FG_EDITION_CLAUSE = str_replace("%id", $processed['id'], $this->FG_EDITION_CLAUSE);
 		}
-		
+
 		$this -> RESULT_QUERY = $instance_table -> Delete_table ($this->DBHandle, $this->FG_EDITION_CLAUSE, $func_table = null);
 		if($this -> FG_ENABLE_LOG == 1) {
 			$this -> logger -> insertLog($_SESSION["admin_id"], 3, "A ".strtoupper($this->FG_INSTANCE_NAME)." DELETED" , "A RECORD IS DELETED, EDITION CLAUSE USED IS ".$this->FG_EDITION_CLAUSE, $this->FG_TABLE_NAME, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI'], $param_update);
-		}	
+		}
 		if (!$this -> RESULT_QUERY)  echo gettext("error deletion");
-		
+
 		$this->FG_INTRO_TEXT_DELETION = str_replace("%id", $processed['id'], $this->FG_INTRO_TEXT_DELETION);
 		$this->FG_INTRO_TEXT_DELETION = str_replace("%table", $this->FG_TABLE_NAME, $this->FG_INTRO_TEXT_DELETION);
 		if (isset($this->FG_GO_LINK_AFTER_ACTION_DELETE)) {
@@ -1751,7 +1751,7 @@ function perform_delete (&$form_action)
 				}
 			}
 		}
-		
+
 	}
 
     /*
@@ -1784,18 +1784,18 @@ function perform_add_content($sub_action,$id)
 	{
 		$processed = $this->getProcessed();
 		$table_split = preg_split("/:/",$this->FG_TABLE_EDITION[$sub_action][14]);
-		$instance_sub_table = new Table($table_split[0], $table_split[1].", ".$table_split[5]);		
-		
+		$instance_sub_table = new Table($table_split[0], $table_split[1].", ".$table_split[5]);
+
 		if (is_array($processed[$table_split[1]])) {
 			foreach($processed[$table_split[1]] as $value) {
 				if (empty($table_split[12]) || preg_match("/".$this->FG_regular[$table_split[12]][0]."/", $value)){
 					// RESPECT REGULAR EXPRESSION
 					$result_query = $instance_sub_table -> Add_table ($this->DBHandle, "'".addslashes(trim($value))."', '".addslashes(trim($id))."'", null, null);
-			
+
 					if (!$result_query) {
 						$findme   = 'duplicate';
 						$pos_find = strpos($instance_sub_table -> errstr, $findme);
-			
+
 						if ($pos_find === false) {
 							echo $instance_sub_table -> errstr;
 						} else {
@@ -1809,12 +1809,12 @@ function perform_add_content($sub_action,$id)
 			if (empty($table_split[12]) || preg_match("/".$this->FG_regular[$table_split[12]][0]."/", $value)) {
 				// RESPECT REGULAR EXPRESSION
 				$result_query = $instance_sub_table -> Add_table ($this->DBHandle, "'".addslashes(trim($value))."', '".addslashes(trim($id))."'", null, null);
-		
+
 				if (!$result_query) {
-		
+
 					$findme   = 'duplicate';
 					$pos_find = strpos($instance_sub_table -> errstr, $findme);
-					
+
 					if ($pos_find === false) {
 						echo $instance_sub_table -> errstr;
 					} else {
@@ -1829,7 +1829,7 @@ function perform_add_content($sub_action,$id)
 
 	/**
 	* Function to del_content
-	* @public     	 
+	* @public
 	*/
 	function perform_del_content($sub_action,$id)
 	{
@@ -1840,15 +1840,15 @@ function perform_del_content($sub_action,$id)
 		} else {
 			$value = trim($processed[$table_split[1]]);
 		}
-		$instance_sub_table = new Table($table_split[0], $table_split[1].", ".$table_split[5]);	
+		$instance_sub_table = new Table($table_split[0], $table_split[1].", ".$table_split[5]);
 		$SPLIT_FG_DELETE_CLAUSE = $table_split[1]."='".$value."' AND ".$table_split[5]."='".trim($id)."'";
 		$instance_sub_table -> Delete_table ($this->DBHandle, $SPLIT_FG_DELETE_CLAUSE, $func_table = null);
-	}	
-	
-	
+	}
+
+
 	/**
      * Function to create the top page section
-     * @public     	 
+     * @public
      */
 	function create_toppage ($form_action)
 	{
@@ -1856,43 +1856,43 @@ function create_toppage ($form_action)
 		if ($form_action=="ask-edit" || $form_action=="edit" || $form_action == "add-content" ||
 			$form_action == "del-content"){ ?>
 			<table class="toppage_maintable">
-				<tr><td height="20"  align="center"> 
-						<font class="toppage_maintable_text">						  
-						  <?php  
-						  	if ($this->FG_ADITION_GO_EDITION == "yes-done") echo '<font class="toppage_maintable_editmsg">'.$this->FG_ADITION_GO_EDITION_MESSAGE.'</font><br><br>'; 								
-							if ($alarm_db_error_duplication){ 
+				<tr><td height="20"  align="center">
+						<font class="toppage_maintable_text">
+						  <?php
+						  	if ($this->FG_ADITION_GO_EDITION == "yes-done") echo '<font class="toppage_maintable_editmsg">'.$this->FG_ADITION_GO_EDITION_MESSAGE.'</font><br><br>';
+							if ($alarm_db_error_duplication){
 								echo '<font class="toppage_maintable_editmsg">'.gettext("ERROR_DUPLICATION").' ::'.$this->FG_TEXT_ERROR_DUPLICATION.'</font>';
-							}else{	
+							}else{
 								echo $this->FG_INTRO_TEXT_EDITION;
 							}
 						  ?>
 						  <br>
 						</font>
 				</td></tr>
-			</table>	
-	  <?php 
+			</table>
+	  <?php
 	  	} elseif ($form_action=="ask-add") {
 	  		if (strlen($this->FG_INTRO_TEXT_ADITION)>1){
      		?>
 				<table class="toppage_askedit">
 				  <tr>
-				  <td height="40"> 
+				  <td height="40">
 					<td height="48" align="center" valign="middle" class="textnegrita"><p>
 						 <font class="fontstyle_002">
 					 <?php echo $this->FG_INTRO_TEXT_ADITION?> </font></p></td>
 				  </tr>
 			  	</table>
-			<?php 
+			<?php
 		  	} else {
 				echo '<br>';
 			}
 	  	}
-	}	
-	
-	
+	}
+
+
 	/**
      * CREATE_ACTIONFINISH : Function to display result
-     * @public     	 
+     * @public
      */
 	function create_actionfinish ($form_action)
 	{
@@ -1900,25 +1900,25 @@ function create_actionfinish ($form_action)
 		?>
 		<TABLE  cellSpacing=2  class="toppage_actionfinish">
 			<TR>
-        	<TD class="form_head"> 
+        	<TD class="form_head">
 				  <?php if ($form_action == "delete") { ?>
-				  <?php echo $this->FG_INSTANCE_NAME?> Deletion 
+				  <?php echo $this->FG_INSTANCE_NAME?> Deletion
 				  <?php }elseif ($form_action == "add"){ ?>
 				  INSERT NEW <?php echo $this->FG_INSTANCE_NAME?>
 				  <?php  } ?>
-            </TD>                    
+            </TD>
             </TR><TR>
             <TD width="516" valign="top" class="tdstyle_001"> <br>
-				<div align="center"><strong> 
-				<?php 
-					if ($form_action == "delete") { 
+				<div align="center"><strong>
+				<?php
+					if ($form_action == "delete") {
 				 		echo $this->FG_INTRO_TEXT_DELETION;
-					} elseif ($form_action == "add") { 
+					} elseif ($form_action == "add") {
 					 	if(!empty($this -> RESULT_QUERY)) {
 					 		echo $this->FG_TEXT_ADITION_CONFIRMATION;
 					 	} else {
 					 		echo $this->FG_TEXT_ADITION_ERROR;
-					 	} 
+					 	}
 					}
 				?>
            		</strong></div>
@@ -1926,8 +1926,8 @@ function create_actionfinish ($form_action)
 			</TD>
             </TR>
 		</TABLE>
-		<br><br><br><br><br> 
-		<?php 	
+		<br><br><br><br><br>
+		<?php
 	}
 
 	/**
@@ -1954,11 +1954,11 @@ function create_custom($form_action)
 			</TR>
 		</TBODY>
               </TABLE>
-			<br><br><br><br><br>	      
+			<br><br><br><br><br>
 		<?php
 	}
-	
-	
+
+
 	/**
      *  CREATE_CUSTOM : Function to display a custom message using form_action
      *  @public		TODO : maybe is better to allow use a string as parameter
@@ -1974,17 +1974,17 @@ function create_select_form()
 		$instance_table_tariffgroup = new Table("cc_tariffgroup", "id, tariffgroupname, lcrtype");
 		$FG_TABLE_CLAUSE = "";
 		$list_tariffgroup = $instance_table_tariffgroup  -> Get_list ($this->DBHandle, $FG_TABLE_CLAUSE, "tariffgroupname", "ASC", null, null, null, null);
-		
+
 	 ?>
 	<center>
 	<?php  if (!empty($this->FG_TOP_FILTER_NAME)) echo "<font size=\"1\">$this->FG_TOP_FILTER_NAME</font><br>"; ?>
-<?php if (!VT_MODE) { ?>	
+<?php if (!VT_MODE) { ?>
 	<!-- ** ** ** ** ** Part for the select form  ** ** ** ** ** -->
 	<FORM METHOD=POST ACTION="<?php echo $_SERVER['PHP_SELF']?>?s=1&t=0&order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
 	<INPUT TYPE="hidden" NAME="posted" value=1>
 	<INPUT TYPE="hidden" NAME="current_page" value=0>
 		<table class="form_selectform" cellspacing="1">
-			
+
 			<tr>
 				<td align="left" valign="top" class="form_selectform_td1">
 					&nbsp;&nbsp;<?php echo gettext("Export Call Plan with LCR");?>
@@ -2001,7 +2001,7 @@ function create_select_form()
 							<?php 	 }
 							?>
 						</select>
-						 
+
 					</td>
 					<td class="form_selectform_table1_td1">
 						<input type="image"  name="image16" align="top" border="0" src="<?php echo Images_Path_Main;?>/button-search.gif" />
@@ -2014,7 +2014,7 @@ function create_select_form()
 				</tr></table>
 				</td>
 			</tr>
-			
+
 		</table>
 	</FORM>
 <?php } ?>
@@ -2023,8 +2023,8 @@ function create_select_form()
 	<?php
 	}
 
-	
-	
+
+
 
 	/**
      *  create_select_form_client() : Function to display a select list on form
@@ -2044,12 +2044,12 @@ function create_select_form_client($table_cluase = "")
 	  <?php  if (is_string ($this->FG_TOP_FILTER_NAME)) echo "<font size=\"3\">".gettext("THE CURRENT RATECARD")." : <b>$this->FG_TOP_FILTER_NAME</b></font>"; ?>
 		<br><br>&nbsp;
 	  <!-- ** ** ** ** ** Part for the select form  ** ** ** ** ** -->
-	
+
 		<table class="form_selectform" >
 			<FORM METHOD=POST ACTION="<?php echo $_SERVER['PHP_SELF']?>?s=1&t=0&order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
 				<INPUT TYPE="hidden" NAME="posted" value=1>
 				<INPUT TYPE="hidden" NAME="current_page" value=0>
-			
+
 			<tr>
 				<td align="left" valign="top" class="form_selectform_td1">
 					&nbsp;&nbsp;<?php echo gettext("R A T E C A R D");?>
@@ -2075,11 +2075,11 @@ function create_select_form_client($table_cluase = "")
 				</tr></table></td>
 			</tr>
 			</FORM>
-		</table>	
+		</table>
 </center>
 	<?php
 	}
-	
+
 	/**
 	* Function to create the search form
 	* @public
@@ -2088,7 +2088,7 @@ function create_search_form()
 	{
 		Console::logSpeed('Time taken to get to line '.__LINE__);
 		$processed = $this->getProcessed();
-		
+
 		$cur = 0;
 		foreach ($this->FG_FILTER_SEARCH_FORM_SELECT as $select) {
 			// 	If is a sql_type
@@ -2104,7 +2104,7 @@ function create_search_form()
 		}
 		include ("Class.SearchHandler.inc__vt.php");
 	}
-	
+
 	/**
      * Function to create the form
      * @public
@@ -2114,49 +2114,49 @@ function create_form ($form_action, $list, $id=null)
 		Console::logSpeed('Time taken to get to line '.__LINE__);
 		include_once (FSROOT."lib/Class.Table.php");
 		$processed = $this->getProcessed();
-		
+
 		$id = $processed['id'];
 		$atmenu = $processed['atmenu'];
 		$stitle = $processed['stitle'];
 		$ratesort = $processed['ratesort'];
 		$sub_action = $processed['sub_action'];
-		
+
 		switch ($form_action) {
 			case "add-content":
 				$this->perform_add_content($sub_action,$id);
 				include('Class.FormHandler.EditForm.inc.php');
 				break;
-					
+
 			case "del-content":
 				$this->perform_del_content($sub_action,$id);
 				include('Class.FormHandler.EditForm.inc.php');
 				break;
-					
+
 			case "ask-edit":
 			case "edit":
 				include('Class.FormHandler.EditForm.inc.php');
 				break;
-				
-			case "ask-add":					
+
+			case "ask-add":
 				include('Class.FormHandler.AddForm.inc.php');
 				break;
-				
+
 			case "ask-delete":
             case "ask-del-confirm":
 				if (strlen($this -> FG_ADDITIONAL_FUNCTION_BEFORE_DELETE) > 0)
 			   	$res_funct = call_user_func(array('FormBO', $this->FG_ADDITIONAL_FUNCTION_BEFORE_DELETE));
 				include('Class.FormHandler.DelForm.inc.php');
 				break;
-				
+
 			case "list":
 				include('Class.ViewHandler.inc.php');
 				break;
-				
+
 			case "delete":
 			case "add":
 				$this -> create_actionfinish($form_action);
 				break;
-				
+
 			default:
 				$this -> create_custom($form_action);
 			}
@@ -2189,25 +2189,25 @@ function printPages($page, $pages, $url, $max_width = 20)
 				$temp = str_replace('%s', $page - 1-1, $url);
 				echo "<a class=\"pagenav\" href=\"{$temp}\">{$this->lang['strprev']}</a>\n";
 			}
-			
-			if ($page <= $window) { 
-				$min_page = 1; 
-				$max_page = min(2 * $window, $pages); 
+
+			if ($page <= $window) {
+				$min_page = 1;
+				$max_page = min(2 * $window, $pages);
 			}
-			elseif ($page > $window && $pages >= $page + $window) { 
-				$min_page = ($page - $window) + 1; 
-				$max_page = $page + $window; 
+			elseif ($page > $window && $pages >= $page + $window) {
+				$min_page = ($page - $window) + 1;
+				$max_page = $page + $window;
 			}
-			else { 
-				$min_page = ($page - (2 * $window - ($pages - $page))) + 1; 
-				$max_page = $pages; 
+			else {
+				$min_page = ($page - (2 * $window - ($pages - $page))) + 1;
+				$max_page = $pages;
 			}
-			
+
 			// Make sure min_page is always at least 1
 			// and max_page is never greater than $pages
 			$min_page = max($min_page, 1);
 			$max_page = min($max_page, $pages);
-			
+
 			for ($i = $min_page; $i <= $max_page; $i++) {
 				$temp = str_replace('%s', $i-1, $url);
 				if ($i != $page) echo "<a class=\"pagenav\" href=\"{$temp}\">$i</a>\n";
diff --git a/addons/contrib/villagetelco/gui/common/lib/Misc__vt.php b/addons/contrib/villagetelco/gui/common/lib/Misc__vt.php
index 9f84ce44a..81a0fe4d3 100644
--- a/addons/contrib/villagetelco/gui/common/lib/Misc__vt.php
+++ b/addons/contrib/villagetelco/gui/common/lib/Misc__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -218,9 +218,9 @@ function write_log($logfile, $output)
 }
 
 /*
- * function cleanInput
+ * function sanitize_tag
  */
-function cleanInput($input)
+function sanitize_tag($input)
 {
     $search = array (
             '@<script[^>]*?>.*?</script>@si', // Strip out javascript
@@ -261,7 +261,7 @@ function sanitize_data($input)
         if (get_magic_quotes_gpc()) {
             $input = stripslashes($input);
         }
-        $input = cleanInput($input);
+        $input = sanitize_tag($input);
 
         $output = addslashes($input);
     }
diff --git a/addons/contrib/villagetelco/gui/common/lib/admin.defines__vt.php b/addons/contrib/villagetelco/gui/common/lib/admin.defines__vt.php
index 5e671f54b..628bc2124 100644
--- a/addons/contrib/villagetelco/gui/common/lib/admin.defines__vt.php
+++ b/addons/contrib/villagetelco/gui/common/lib/admin.defines__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -42,7 +42,6 @@
 
 include_once (FSROOT."lib/interface/constants.php");
 include_once (dirname(__FILE__)."/Class.A2Billing.php");
-require_once 'adodb/adodb.inc.php'; // AdoDB
 include_once (dirname(__FILE__)."/Class.Table.php");
 include_once (dirname(__FILE__)."/Class.Connection.php");
 include_once (dirname(__FILE__)."/Class.Realtime.php");
diff --git a/addons/contrib/villagetelco/gui/common/lib/admin.module.access__vt.php b/addons/contrib/villagetelco/gui/common/lib/admin.module.access__vt.php
index 7f018a744..be774afc1 100644
--- a/addons/contrib/villagetelco/gui/common/lib/admin.module.access__vt.php
+++ b/addons/contrib/villagetelco/gui/common/lib/admin.module.access__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/gui/common/lib/admin.smarty__vt.php b/addons/contrib/villagetelco/gui/common/lib/admin.smarty__vt.php
index 827ecb828..7d03dbc0e 100644
--- a/addons/contrib/villagetelco/gui/common/lib/admin.smarty__vt.php
+++ b/addons/contrib/villagetelco/gui/common/lib/admin.smarty__vt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -31,6 +31,8 @@
  *
 **/
 
+use Factory\SmartyFactory;
+
 error_reporting(E_ALL ^ (E_NOTICE | E_WARNING));
 
 define( 'FULL_PATH', dirname(__FILE__) . '/' );
@@ -38,8 +40,7 @@
 define( 'TEMPLATE_DIR',  '../Public/templates/' );
 define( 'TEMPLATE_C_DIR', '../templates_c/' );
 
-require_once SMARTY_DIR . 'Smarty.class.php';
-$smarty = new Smarty;
+$smarty = SmartyFactory::getInstance();
 
 $skin_name = $_SESSION["stylefile"];
 
diff --git a/addons/contrib/villagetelco/provisioning/a2billing_provisioning.php b/addons/contrib/villagetelco/provisioning/a2billing_provisioning.php
index 99090f81e..038d6d76e 100644
--- a/addons/contrib/villagetelco/provisioning/a2billing_provisioning.php
+++ b/addons/contrib/villagetelco/provisioning/a2billing_provisioning.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/villagetelco/provisioning/originate_echo.php b/addons/contrib/villagetelco/provisioning/originate_echo.php
index e0f2ef19c..8ad06e5b8 100644
--- a/addons/contrib/villagetelco/provisioning/originate_echo.php
+++ b/addons/contrib/villagetelco/provisioning/originate_echo.php
@@ -9,7 +9,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/addons/contrib/wordpress/a2billing.zip b/addons/contrib/wordpress/a2billing.zip
new file mode 100644
index 000000000..2cf80cb23
Binary files /dev/null and b/addons/contrib/wordpress/a2billing.zip differ
diff --git a/addons/debian/install_debian.sh b/addons/debian/install_debian.sh
new file mode 100644
index 000000000..21eeea8cc
--- /dev/null
+++ b/addons/debian/install_debian.sh
@@ -0,0 +1,74 @@
+#
+# Minimalist Install on Debian 7.4
+#
+#
+# This scripts only install the A2Billing Web UI and Asterisk
+# It doesn't include realtime, callback, security
+#
+# WARNING: Don't use this script for production deployment, this is intended for development purpose
+#
+
+apt-get update
+apt-get -y upgrade
+
+apt-get -y install asterisk
+apt-get -y install mysql-client mysql-server apache2 libapache2-mod-php5 php5-mysql vim-tiny
+apt-get -y install php-pear php-db php5-gd php5-curl php-soap
+
+mkdir -p /usr/share/a2billing/latest/
+cd /usr/share/a2billing/
+wget -O master.tar.gz --no-check-certificate https://codeload.github.com/Star2Billing/a2billing/tar.gz/master
+tar zxf master.tar.gz
+mv a2billing-master/* /usr/share/a2billing/latest/
+rm -rf a2billing-master master.tar.gz
+
+chmod u+xwr /usr/share/a2billing/latest/admin/templates_c
+chmod a+w /usr/share/a2billing/latest/admin/templates_c
+chmod u+xwr /usr/share/a2billing/latest/agent/templates_c
+chmod a+w /usr/share/a2billing/latest/agent/templates_c
+chmod u+xwr /usr/share/a2billing/latest/customer/templates_c
+chmod a+w /usr/share/a2billing/latest/customer/templates_c
+
+rm -rf /usr/share/a2billing/latest/admin/templates_c/*
+rm -rf /usr/share/a2billing/latest/agent/templates_c/*
+rm -rf /usr/share/a2billing/latest/customer/templates_c/*
+
+# copy conf files
+cp /usr/share/a2billing/latest//a2billing.conf /etc/a2billing.conf
+
+cd /etc/apache2/sites-enabled/
+wget https://raw.github.com/Star2Billing/a2billing/develop/addons/apache2/a2billing_admin.conf
+wget https://raw.github.com/Star2Billing/a2billing/develop/addons/apache2/a2billing_customer.conf
+
+ln -s /usr/share/a2billing/latest/AGI/a2billing.php /usr/share/asterisk/agi-bin/a2billing.php
+chown asterisk:asterisk /usr/share/asterisk/agi-bin/a2billing.php
+chmod +x /usr/share/asterisk/agi-bin/a2billing.php
+
+# Install Audio files
+cd /usr/share/a2billing/latest/addons/sounds
+./install_a2b_sounds.sh
+#set ownership on sounds
+chown -R asterisk:asterisk /usr/share/asterisk/
+
+cd /etc/asterisk
+wget -O extensions_a2billing.conf https://raw.github.com/Star2Billing/a2billing/develop/addons/asterisk-conf/extensions_a2billing_1_8.conf
+
+#include "extensions_a2billing.conf"
+echo "Adding A2Billing extensions to /etc/asterisk/extensions.conf"
+echo '
+; include a2billing extension
+#include extensions_a2billing.conf
+' >> /etc/asterisk/extensions.conf
+
+#Install A2billing DB
+/etc/init.d/mysql start
+mysql -uroot -ppassword -e "CREATE DATABASE a2billing_db;"
+cd /usr/share/a2billing/latest/DataBase/mysql-5.x
+bash install-db.sh
+
+sed -i "s/a2billing_dbuser/root/g" /etc/a2billing.conf
+sed -i "s/a2billing_dbpassword/password/g" /etc/a2billing.conf
+sed -i "s/a2billing_dbname/a2billing_db/g" /etc/a2billing.conf
+
+/etc/init.d/mysql restart
+/etc/init.d/apache2 restart
diff --git a/admin/Public/A2B_admin_info.php b/admin/Public/A2B_admin_info.php
old mode 100644
new mode 100755
index f6d728c38..982bf7e00
--- a/admin/Public/A2B_admin_info.php
+++ b/admin/Public/A2B_admin_info.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_agent_home.php b/admin/Public/A2B_agent_home.php
old mode 100644
new mode 100755
index a1219979e..1ed1852b8
--- a/admin/Public/A2B_agent_home.php
+++ b/admin/Public/A2B_agent_home.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -62,7 +62,7 @@
                 $count = $result[0][0];
                 $fields="id_agent,type,message,order_display,logo";
                 if(empty($logo))$logo=0;
-                $values="$id,$type,'".addslashes($_POST['message'])."',$count,$logo";
+                $values="$id,$type,$message,$count,$logo";
                 $return=$instance_table->Add_table($DBHandle, $values, $fields);
                 if($return)$result_param ="success";
                 else $result_param ="faild";
@@ -93,7 +93,7 @@
                 $clause = "id = $id_msg";
                 $instance_table = new Table("cc_message_agent","*");
                 if(empty($logo))$logo=0;
-                $values="type = $type, message ='".addslashes($_POST['message'])."',logo = $logo";
+                $values="type = $type, message = '$message',logo = $logo";
                 $return=$instance_table -> Update_table($DBHandle, $values, $clause);
                 if($return)$result_param ="success";
                 else $result_param ="faild";
@@ -174,7 +174,7 @@
 ?>
 
 <form action="<?php echo $PHP_SELF.'?id='.$id ?>" method="post" >
-     <input id="action" type="hidden" name="action" value="<?php echo $action;?>"/>
+    <input id="action" type="hidden" name="action" value="<?php echo $action;?>"/>
     <input id="id_msg" type="hidden" name="id_msg" value="<?php echo $id_msg;?>"/>
     <table class="epayment_conf_table">
         <tr>
@@ -223,7 +223,6 @@
 <?php
 foreach ($messages as $message) {
     ?>
-
     <div id="msg" class="<?php echo $message_types[$message['type']][2];?>" style="margin-top:0px;position:relative;<?php if($message['logo']==0)echo 'background-image:none;padding-left:10px;'; ?>" >
         <?php if ($message['order_display']>0) { ?>
             <img id="<?php echo $message['id']; ?>" onmouseover="this.style.cursor='pointer'" class="up" src="<?php echo Images_Path ?>/arrow_up.png"  border="0" style="position:absolute;right:60px;top:0;display:none"/>
@@ -249,7 +248,6 @@
 });
 
 $(document).ready(function () {
-
     $('.msg_info , .msg_success , .msg_warning , .msg_error').mouseover(function () {
         $(this).children(".up,.down,.delete,.edit").show();
          });
diff --git a/admin/Public/A2B_agent_info.php b/admin/Public/A2B_agent_info.php
old mode 100644
new mode 100755
index 473bf99a6..57bf3b414
--- a/admin/Public/A2B_agent_info.php
+++ b/admin/Public/A2B_agent_info.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_asteriskinfo.php b/admin/Public/A2B_asteriskinfo.php
old mode 100644
new mode 100755
index e878ed210..21427789c
--- a/admin/Public/A2B_asteriskinfo.php
+++ b/admin/Public/A2B_asteriskinfo.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -158,8 +158,8 @@
 foreach ($modes as $mode => $value) {
     $i++;
     if ($i > 1) echo " | ";
-    //echo "<li><a id=\"".($extdisplay==$mode)."\" href=\"".$_SERVER['PHP_SELF']."?&section=".$section."type=".urlencode("tool")."&display=".urlencode($dispnum)."&extdisplay=".urlencode($mode)."\">"._($value)."</a></li>";
-    echo "<a id=\"".($extdisplay==$mode)."\" href=\"".$_SERVER['PHP_SELF']."?section=".$section."&type=".urlencode("tool")."&display=".urlencode($dispnum)."&extdisplay=".urlencode($mode)."\">"._($value)."</a>";
+    //echo "<li><a id=\"".($extdisplay==$mode)."\" href=\"".filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?&section=".$section."type=".urlencode("tool")."&display=".urlencode($dispnum)."&extdisplay=".urlencode($mode)."\">"._($value)."</a></li>";
+    echo "<a id=\"".($extdisplay==$mode)."\" href=\"".filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?section=".$section."&type=".urlencode("tool")."&display=".urlencode($dispnum)."&extdisplay=".urlencode($mode)."\">"._($value)."</a>";
 }
 ?>
 </ul></div>
@@ -167,7 +167,7 @@
 <div class="content">
 <h2><span class="headerHostInfo"><?php echo "Asterisk : ".$modes[$extdisplay]; ?></span></h2>
 
-<form name="asteriskinfo" action="<?php  $_SERVER['PHP_SELF'] ?>" method="post">
+<form name="asteriskinfo" action="<?php  filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) ?>" method="post">
 <input type="hidden" name="display" value="asteriskinfo"/>
 <input type="hidden" name="action" value="asteriskinfo"/>
 <table>
diff --git a/admin/Public/A2B_call_archiving.php b/admin/Public/A2B_call_archiving.php
old mode 100644
new mode 100755
index d27019f2a..847851586
--- a/admin/Public/A2B_call_archiving.php
+++ b/admin/Public/A2B_call_archiving.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -183,8 +183,16 @@
 <!-- ** ** ** ** ** Part for the research ** ** ** ** ** -->
 <center>
 <FORM METHOD=POST name="myForm" ACTION="<?php echo $PHP_SELF?>?s=1&t=0&order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
-<INPUT TYPE="hidden" NAME="posted" value=1>
-<INPUT TYPE="hidden" NAME="current_page" value=0>
+    <INPUT TYPE="hidden" NAME="posted" value="1'>
+    <INPUT TYPE="hidden" NAME="current_page" value="0">
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
     <TABLE class="bar-status" width="85%" border="0" cellspacing="1" cellpadding="2" align="center">
         <?php  if ($_SESSION["pr_groupID"]==2 && is_numeric($_SESSION["pr_IDCust"])) { ?>
         <?php  } else { ?>
diff --git a/admin/Public/A2B_card_info.php b/admin/Public/A2B_card_info.php
index 2401fe4c6..31fe64483 100644
--- a/admin/Public/A2B_card_info.php
+++ b/admin/Public/A2B_card_info.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -841,7 +841,7 @@
 }
 
 $call_table = new Table('cc_call,cc_prefix','*');
-$call_clause = "card_id = ".$id." AND cc_call.destination = cc_prefix.prefix";
+$call_clause = "card_id = ".$id." AND CAST(cc_call.destination AS CHAR) = cc_prefix.prefix";
 $call_result = $call_table -> Get_list($DBHandle, $call_clause, 'starttime', 'DESC', NULL, NULL, 10, 0);
 if (sizeof($call_result)>0 && $call_result[0]!=null) {
 ?>
diff --git a/admin/Public/A2B_currencies.php b/admin/Public/A2B_currencies.php
old mode 100644
new mode 100755
index 57f99bac9..e07ac43bf
--- a/admin/Public/A2B_currencies.php
+++ b/admin/Public/A2B_currencies.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -50,10 +50,11 @@
 
 /********************************* BATCH UPDATE CURRENCY TABLE ***********************************/
 $A2B -> DBHandle = $HD_Form -> DBHandle;
-if ($updatecurrency == 1) {
 
+if ($updatecurrency == 1) {
+    // Check demo mode
     check_demo_mode();
-
+    // Update Currencies
     $instance_table = new Table();
     $A2B -> set_instance_table ($instance_table);
     $return = currencies_update_yahoo($A2B -> DBHandle, $A2B -> instance_table);
@@ -78,8 +79,16 @@
 ?>
 <div align="center">
 <table align="center" border="0" width="65%"  cellspacing="1" cellpadding="2">
-    <form name="updateForm" action="<?php echo $_SERVER['PHP_SELF']?>" method="post">
+    <FORM name="updateForm" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>" method="post">
     <INPUT type="hidden" name="updatecurrency" value="1">
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
     <tr>
       <td align="center"  class="bgcolor_001">
         &nbsp;<?php echo gettext("THE CURRENCY LIST IS BASED FROM YAHOO FINANCE"); ?>&nbsp;:
diff --git a/admin/Public/A2B_data_archiving.php b/admin/Public/A2B_data_archiving.php
old mode 100644
new mode 100755
index 53f904701..a845bcf5d
--- a/admin/Public/A2B_data_archiving.php
+++ b/admin/Public/A2B_data_archiving.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -227,23 +227,32 @@
 ?>
 <center>
 <FORM name="frm_archive" id="frm_archive" method="post" action="A2B_call_archiving.php">
-<table class="bar-status" width="50%" border="0" cellspacing="1" cellpadding="2" align="center">
-            <tbody>
-            <tr>
-                <td width="30%" align="left" valign="top" class="bgcolor_004">
-                    <font class="fontstyle_003">&nbsp;&nbsp;<?php echo gettext("ARCHIVING OPTIONS");?></font>
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
+    <table class="bar-status" width="50%" border="0" cellspacing="1" cellpadding="2" align="center">
+        <tbody>
+        <tr>
+            <td width="30%" align="left" valign="top" class="bgcolor_004">
+                <font class="fontstyle_003">&nbsp;&nbsp;<?php echo gettext("ARCHIVING OPTIONS");?></font>
+            </td>
+            <td width="70%" align="CENTER" class="bgcolor_005">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center"><tr>
+              <td class="fontstyle_searchoptions">
+            <select name="archiveselect" class="form_input_select" onchange="form.submit();">
+            <option value="" ><?php echo gettext("Customer Archiving");?></option>
+            <option value="" ><?php echo gettext("Calls Archiving");?></option>
+            </select>
                 </td>
-                <td width="70%" align="CENTER" class="bgcolor_005">
-                <table width="100%" border="0" cellspacing="0" cellpadding="0" align="center"><tr>
-                  <td class="fontstyle_searchoptions">
-                <select name="archiveselect" class="form_input_select" onchange="form.submit();">
-                <option value="" ><?php echo gettext("Customer Archiving");?></option>
-                <option value="" ><?php echo gettext("Calls Archiving");?></option>
-                </select>
-                    </td>
-                </tr></table></td>
-            </tr>
-        </tbody></table>
+            </tr></table></td>
+        </tr>
+        </tbody>
+    </table>
 </FORM>
 </center>
 
diff --git a/admin/Public/A2B_detail_package.php b/admin/Public/A2B_detail_package.php
old mode 100644
new mode 100755
index b16b501fe..29290e185
--- a/admin/Public/A2B_detail_package.php
+++ b/admin/Public/A2B_detail_package.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -190,7 +190,7 @@
 
 <!-- ** ** ** ** ** Part for the research ** ** ** ** ** -->
     <center>
-    <FORM METHOD=POST name="myForm" ACTION="<?php echo $PHP_SELF?>?s=1&t=0&order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
+    <FORM METHOD="POST" name="myForm" ACTION="<?php echo $PHP_SELF?>?s=1&t=0&order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
     <INPUT TYPE="hidden" NAME="posted" value=1>
     <INPUT TYPE="hidden" NAME="current_page" value=0>
         <table class="bar-status" width="85%" border="0" cellspacing="1" cellpadding="2" align="center">
diff --git a/admin/Public/A2B_entity_agent.php b/admin/Public/A2B_entity_agent.php
old mode 100644
new mode 100755
index 73a38d3ef..bae9b51a0
--- a/admin/Public/A2B_entity_agent.php
+++ b/admin/Public/A2B_entity_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -68,14 +68,11 @@
 if ($popup_select) {
 ?>
 <SCRIPT LANGUAGE="javascript">
-<!-- Begin
-function sendValue(selvalue)
-{
+function sendValue(selvalue) {
     window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
     window.opener.$("#selectagent").change();
     window.close();
 }
-// End -->
 </script>
 <?php
 
diff --git a/admin/Public/A2B_entity_agentsituation.php b/admin/Public/A2B_entity_agentsituation.php
old mode 100644
new mode 100755
index 62b79a883..10c5423c7
--- a/admin/Public/A2B_entity_agentsituation.php
+++ b/admin/Public/A2B_entity_agentsituation.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_alarm.php b/admin/Public/A2B_entity_alarm.php
old mode 100644
new mode 100755
index 87d5a4dfa..2a2ccd068
--- a/admin/Public/A2B_entity_alarm.php
+++ b/admin/Public/A2B_entity_alarm.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_autorefill.php b/admin/Public/A2B_entity_autorefill.php
old mode 100644
new mode 100755
index 22412edaf..4228de749
--- a/admin/Public/A2B_entity_autorefill.php
+++ b/admin/Public/A2B_entity_autorefill.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_backup.php b/admin/Public/A2B_entity_backup.php
old mode 100644
new mode 100755
index bd5bf6d25..aad0b1e4c
--- a/admin/Public/A2B_entity_backup.php
+++ b/admin/Public/A2B_entity_backup.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_billing_customer.php b/admin/Public/A2B_entity_billing_customer.php
index 3d111664d..5a00db5ae 100755
--- a/admin/Public/A2B_entity_billing_customer.php
+++ b/admin/Public/A2B_entity_billing_customer.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_call.php b/admin/Public/A2B_entity_call.php
old mode 100644
new mode 100755
index 1bceca74b..9bd4e18b9
--- a/admin/Public/A2B_entity_call.php
+++ b/admin/Public/A2B_entity_call.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_callback.php b/admin/Public/A2B_entity_callback.php
old mode 100644
new mode 100755
index 68c82ddca..40cd953ec
--- a/admin/Public/A2B_entity_callback.php
+++ b/admin/Public/A2B_entity_callback.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_callerid.php b/admin/Public/A2B_entity_callerid.php
old mode 100644
new mode 100755
index 6a558fb2b..80925ec92
--- a/admin/Public/A2B_entity_callerid.php
+++ b/admin/Public/A2B_entity_callerid.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_campaign.php b/admin/Public/A2B_entity_campaign.php
old mode 100644
new mode 100755
index c7ebe28f0..a5957bb48
--- a/admin/Public/A2B_entity_campaign.php
+++ b/admin/Public/A2B_entity_campaign.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -33,8 +33,6 @@
 
 include '../lib/admin.defines.php';
 include '../lib/admin.module.access.php';
-include '../lib/Form/Class.FormHandler.inc.php';
-include './form_data/FG_var_campaign.inc';
 include '../lib/admin.smarty.php';
 
 if (! has_rights (ACX_PREDICTIVE_DIALER)) {
@@ -43,28 +41,15 @@
     die();
 }
 
-$HD_Form -> setDBHandler (DbConnect());
-$HD_Form -> init();
 
-if ($id!="" || !is_null($id)) {
-    $HD_Form -> FG_EDITION_CLAUSE = str_replace("%id", "$id", $HD_Form -> FG_EDITION_CLAUSE);
-}
-
-if (!isset($form_action))  $form_action="list"; //ask-add
-if (!isset($action)) $action = $form_action;
-
-$list = $HD_Form -> perform_action($form_action);
 
 // #### HEADER SECTION
 $smarty->display('main.tpl');
 
-// #### HELP SECTION
-echo $CC_help_campaign;
-
-// #### TOP SECTION PAGE
-$HD_Form -> create_toppage ($form_action);
 
-$HD_Form -> create_form ($form_action, $list, $id=null) ;
+echo "<br/><br/>";
+echo "<center>Campaigns and Voice Broadcasting is obsolete in A2Billing, and has been replaced by Newfies-Dialer.<br/>";
+echo '<br/>More information at <a target="_blank" href="http://www.newfies-dialer.org/">http://www.newfies-dialer.org/</a><br/><br/><br/>';
 
 // #### FOOTER SECTION
 $smarty->display('footer.tpl');
diff --git a/admin/Public/A2B_entity_card.php b/admin/Public/A2B_entity_card.php
index 2bb7f6bcc..8d2769e0d 100644
--- a/admin/Public/A2B_entity_card.php
+++ b/admin/Public/A2B_entity_card.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -47,26 +47,29 @@
 $HD_Form -> init();
 
 /********************************* BATCH UPDATE ***********************************/
-getpost_ifset(array('popup_select', 'popup_formname', 'popup_fieldname', 'upd_inuse', 'upd_status', 'upd_language', 'upd_tariff', 'upd_credit',
-     'upd_credittype', 'upd_simultaccess', 'upd_currency', 'upd_typepaid', 'upd_creditlimit', 'upd_enableexpire', 'upd_expirationdate',
-    'upd_expiredays', 'upd_runservice', 'upd_runservice', 'batchupdate', 'check', 'type', 'mode', 'addcredit', 'cardnumber','description',
-    'upd_id_group','upd_discount','upd_refill_type','upd_description','upd_id_seria', 'upd_vat', 'upd_country'));
+getpost_ifset(array('popup_select', 'popup_formname', 'popup_fieldname', 'upd_inuse', 'upd_status', 'upd_language',
+              'upd_tariff', 'upd_credit', 'upd_credittype', 'upd_simultaccess', 'upd_currency', 'upd_typepaid',
+              'upd_creditlimit', 'upd_enableexpire', 'upd_expirationdate', 'upd_expiredays', 'upd_runservice',
+              'upd_runservice', 'batchupdate', 'check', 'type', 'mode', 'addcredit', 'cardnumber','description',
+              'upd_id_group','upd_discount','upd_refill_type','upd_description','upd_id_seria', 'upd_vat',
+              'upd_country'));
 
 // CHECK IF REQUEST OF BATCH UPDATE
 if ($batchupdate == 1 && is_array($check)) {
     $SQL_REFILL="";
     $HD_Form->prepare_list_subselection('list');
 
-    if (isset($check['upd_credit'])||(strlen(trim($upd_credit))>0)) {//set to refil
+    if (isset($check['upd_credit']) || (strlen(trim($upd_credit)) > 0)) {
+        //set to refill
         $SQL_REFILL_CREDIT="";
         $SQL_REFILL_WHERE="";
         if ($type["upd_credit"] == 1) {//equal
             $SQL_REFILL_CREDIT="($upd_credit -credit) ";
             $SQL_REFILL_WHERE=" AND $upd_credit<>credit ";//never write 0 refill
         } elseif ($type["upd_credit"] == 2) {//+-
-             $SQL_REFILL_CREDIT="($upd_credit) ";
+            $SQL_REFILL_CREDIT="($upd_credit) ";
         } else {
-             $SQL_REFILL_CREDIT="(-$upd_credit) ";
+            $SQL_REFILL_CREDIT="(-$upd_credit) ";
         }
         $SQL_REFILL="INSERT INTO cc_logrefill (credit,card_id,description,refill_type)
         SELECT $SQL_REFILL_CREDIT,a.id,'$upd_description','$upd_refill_type' from  ".$HD_Form->FG_TABLE_NAME."  as a ";
@@ -150,17 +153,13 @@
 if ($popup_select) {
 ?>
 <SCRIPT LANGUAGE="javascript">
-<!-- Begin
-function sendValue(selvalue, othervalue)
-{
-        window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
-        if (othervalue && window.opener.document.<?php echo $popup_formname ?>.accountcode) {
-                window.opener.document.<?php echo $popup_formname ?>.accountcode.value = othervalue;
-        }
-        window.close();
+function sendValue(selvalue, othervalue) {
+    window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
+    if (othervalue && window.opener.document.<?php echo $popup_formname ?>.accountcode) {
+        window.opener.document.<?php echo $popup_formname ?>.accountcode.value = othervalue;
+    }
+    window.close();
 }
-
-// End -->
 </SCRIPT>
 <?php
 }
@@ -176,6 +175,7 @@ function sendValue(selvalue, othervalue)
     <div class="tohide" style="display:none;">
 
 <?php
+
 // #### CREATE SEARCH FORM
 if ($form_action == "list") {
     $HD_Form -> create_search_form();
@@ -218,256 +218,264 @@ function sendValue(selvalue, othervalue)
 
 <center>
 <b>&nbsp;<?php echo $HD_Form -> FG_NB_RECORD ?> <?php echo gettext("cards selected!"); ?>&nbsp;<?php echo gettext("Use the options below to batch update the selected cards.");?></b>
-       <table align="center" border="0" width="65%"  cellspacing="1" cellpadding="2">
-        <tbody>
-        <form name="updateForm" action="<?php echo $_SERVER['PHP_SELF']?>" method="post">
-        <INPUT type="hidden" name="batchupdate" value="1">
-        <tr>
-          <td align="left" class="bgcolor_001" >
-                  <input name="check[upd_inuse]" type="checkbox" <?php if ($check["upd_inuse"]=="on") echo "checked"?>>
-          </td>
-          <td align="left"  class="bgcolor_001">
-                1)&nbsp;<?php echo gettext("In use"); ?>&nbsp;:
-                <input class="form_input_text"  name="upd_inuse" size="10" maxlength="6" value="<?php if (isset($upd_inuse)) echo $upd_inuse; else echo '0';?>">
-                <br/>
-          </td>
-        </tr>
-        <tr>
-          <td align="left"  class="bgcolor_001">
-              <input name="check[upd_status]" type="checkbox" <?php if ($check["upd_status"]=="on") echo "checked"?> >
-          </td>
-          <td align="left" class="bgcolor_001">
-                  2)&nbsp;<?php echo gettext("Status");?>&nbsp;:
-                <select NAME="upd_status" size="1" class="form_input_select">
-                <?php foreach ($cardstatus_list as $key => $cur_value) { ?>
-                    <option value='<?php echo $cur_value[1] ?>' <?php if ($upd_status==$cur_value[1]) echo 'selected="selected"'?>><?php echo $cur_value[0] ?></option>
+   <table align="center" border="0" width="65%"  cellspacing="1" cellpadding="2">
+    <tbody>
+    <FORM name="updateForm" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>" method="post">
+    <INPUT type="hidden" name="batchupdate" value="1">
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
+    <tr>
+      <td align="left" class="bgcolor_001" >
+              <input name="check[upd_inuse]" type="checkbox" <?php if ($check["upd_inuse"]=="on") echo "checked"?>>
+      </td>
+      <td align="left"  class="bgcolor_001">
+            1)&nbsp;<?php echo gettext("In use"); ?>&nbsp;:
+            <input class="form_input_text"  name="upd_inuse" size="10" maxlength="6" value="<?php if (isset($upd_inuse)) echo $upd_inuse; else echo '0';?>">
+            <br/>
+      </td>
+    </tr>
+    <tr>
+      <td align="left"  class="bgcolor_001">
+          <input name="check[upd_status]" type="checkbox" <?php if ($check["upd_status"]=="on") echo "checked"?> >
+      </td>
+      <td align="left" class="bgcolor_001">
+              2)&nbsp;<?php echo gettext("Status");?>&nbsp;:
+            <select NAME="upd_status" size="1" class="form_input_select">
+            <?php foreach ($cardstatus_list as $key => $cur_value) { ?>
+                <option value='<?php echo $cur_value[1] ?>' <?php if ($upd_status==$cur_value[1]) echo 'selected="selected"'?>><?php echo $cur_value[0] ?></option>
+            <?php } ?>
+            </select><br/>
+      </td>
+    </tr>
+
+    <tr>
+      <td align="left" class="bgcolor_001">
+              <input name="check[upd_language]" type="checkbox" <?php if ($check["upd_language"]=="on") echo "checked"?>>
+      </td>
+      <td align="left"  class="bgcolor_001">
+            3)&nbsp;<?php echo gettext("Language");?>&nbsp;:
+            <select NAME="upd_language" size="1" class="form_input_select">
+            <?php foreach ($language_list as $key => $cur_value) { ?>
+                <option value='<?php echo $cur_value[1] ?>' <?php if ($upd_language==$cur_value[1]) echo 'selected="selected"'?>><?php echo $cur_value[0] ?></option>
+            <?php } ?>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td align="left"  class="bgcolor_001">
+          <input name="check[upd_tariff]" type="checkbox" <?php if ($check["upd_tariff"]=="on") echo "checked"?> >
+      </td>
+      <td align="left" class="bgcolor_001">
+              4)&nbsp;<?php echo gettext("Tariff");?>&nbsp;:
+            <select NAME="upd_tariff" size="1" class="form_input_select">
+                <?php foreach ($list_tariff as $recordset) { ?>
+                    <option class=input value='<?php echo $recordset[0]?>'  <?php if ($upd_tariff==$recordset[0]) echo 'selected="selected"'?>><?php echo $recordset[1]?></option>
                 <?php } ?>
-                </select><br/>
-          </td>
-        </tr>
-
-        <tr>
-          <td align="left" class="bgcolor_001">
-                  <input name="check[upd_language]" type="checkbox" <?php if ($check["upd_language"]=="on") echo "checked"?>>
-          </td>
-          <td align="left"  class="bgcolor_001">
-                3)&nbsp;<?php echo gettext("Language");?>&nbsp;:
-                <select NAME="upd_language" size="1" class="form_input_select">
-                <?php foreach ($language_list as $key => $cur_value) { ?>
-                    <option value='<?php echo $cur_value[1] ?>' <?php if ($upd_language==$cur_value[1]) echo 'selected="selected"'?>><?php echo $cur_value[0] ?></option>
+            </select><br/>
+      </td>
+    </tr>
+    <tr>
+      <td align="left" class="bgcolor_001">
+              <input name="check[upd_credit]" type="checkbox" <?php if ($check["upd_credit"]=="on") echo "checked"?>>
+            <input name="mode[upd_credit]" type="hidden" value="2">
+      </td>
+      <td align="left"  class="bgcolor_001">
+              5)&nbsp;<?php echo gettext("Credit");?>&nbsp;:
+                <input class="form_input_text" name="upd_credit" size="10" maxlength="10"  value="<?php if (isset($upd_credit)) echo $upd_credit; else echo '0';?>">
+            <font class="version">
+            <input type="radio" NAME="type[upd_credit]" value="1" <?php if ((!isset($type["upd_credit"]))|| ($type["upd_credit"]==1) ) {?>checked<?php }?>><?php echo gettext("Equals");?>
+            <input type="radio" NAME="type[upd_credit]" value="2" <?php if ($type["upd_credit"]==2) {?>checked<?php }?>> <?php echo gettext("Add");?>
+            <input type="radio" NAME="type[upd_credit]" value="3" <?php if ($type["upd_credit"]==3) {?>checked<?php }?>> <?php echo gettext("Subtract");?>
+            </font><br>&nbsp;&nbsp;&nbsp;Refill:
+                <select NAME="upd_refill_type" size="1" class="form_input_select">
+                <?php foreach ($list_refill_type as $recordset) { ?>
+                    <option class=input value='<?php echo $recordset[1]?>'  <?php if ($upd_refill_type==$recordset[1]) echo 'selected="selected"'?>><?php echo $recordset[0]?></option>
                 <?php } ?>
+            </select> Description <input class="form_input_text" name="upd_description"  size="20" maxlength="20"  value="<?php if (isset($upd_description)) echo $upd_description;?>"><br/>
+
+      </td>
+    </tr>
+    <tr>
+      <td align="left" class="bgcolor_001">
+              <input name="check[upd_simultaccess]" type="checkbox" <?php if ($check["upd_simultaccess"]=="on") echo "checked"?>>
+      </td>
+      <td align="left" class="bgcolor_001">
+            6)&nbsp;<?php echo gettext("Access");?>&nbsp;:
+            <select NAME="upd_simultaccess" size="1" class="form_input_select">
+                <option value='0'  <?php if ($upd_simultaccess==0) echo 'selected="selected"'?>><?php echo gettext("INDIVIDUAL ACCESS");?></option>
+                <option value='1'  <?php if ($upd_simultaccess==1) echo 'selected="selected"'?>><?php echo gettext("SIMULTANEOUS ACCESS");?></option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td align="left" class="bgcolor_001">
+              <input name="check[upd_currency]" type="checkbox" <?php if ($check["upd_currency"]=="on") echo "checked"?>>
+      </td>
+      <td align="left"  class="bgcolor_001">
+            7)&nbsp;<?php echo gettext("Currency");?>&nbsp;:
+            <select NAME="upd_currency" size="1" class="form_input_select">
+            <?php
+                foreach ($currencies_list as $key => $cur_value) {
+            ?>
+                <option value='<?php echo $key ?>'  <?php if ($upd_currency==$key) echo 'selected="selected"'?>><?php echo $cur_value[1].' ('.$cur_value[2].')' ?></option>
+            <?php } ?>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td align="left" class="bgcolor_001">
+              <input name="check[upd_creditlimit]" type="checkbox" <?php if ($check["upd_creditlimit"]=="on") echo "checked"?>>
+            <input name="mode[upd_creditlimit]" type="hidden" value="2">
+      </td>
+      <td align="left"  class="bgcolor_001">
+            8)&nbsp;<?php echo gettext("Credit limit");?>&nbsp;:
+                 <input class="form_input_text" name="upd_creditlimit" size="10" maxlength="10"  value="<?php if (isset($upd_creditlimit)) echo $upd_creditlimit; else echo '0';?>" >
+            <font class="version">
+            <input type="radio" NAME="type[upd_creditlimit]" value="1" <?php if ((!isset($type[upd_creditlimit]))|| ($type[upd_creditlimit]==1) ) {?>checked<?php }?>> <?php echo gettext("Equals");?>
+            <input type="radio" NAME="type[upd_creditlimit]" value="2" <?php if ($type[upd_creditlimit]==2) {?>checked<?php }?>><?php echo gettext("Add");?>
+            <input type="radio" NAME="type[upd_creditlimit]" value="3" <?php if ($type[upd_creditlimit]==3) {?>checked<?php }?>> <?php echo gettext("Subtract");?>
+            </font>
+      </td>
+    </tr>
+    <tr>
+      <td align="left" class="bgcolor_001">
+              <input name="check[upd_enableexpire]" type="checkbox" <?php if ($check["upd_enableexpire"]=="on") echo "checked"?>>
+      </td>
+      <td align="left"  class="bgcolor_001">
+            9)&nbsp;<?php echo gettext("Enable expire");?>&nbsp;:
+            <select name="upd_enableexpire" class="form_input_select" >
+                <option value="0"  <?php if ($upd_enableexpire==0) echo 'selected="selected"'?>> <?php echo gettext("NO EXPIRY");?></option>
+                <option value="1"  <?php if ($upd_enableexpire==1) echo 'selected="selected"'?>> <?php echo gettext("EXPIRE DATE");?></option>
+                <option value="2"  <?php if ($upd_enableexpire==2) echo 'selected="selected"'?>> <?php echo gettext("EXPIRE DAYS SINCE FIRST USE");?></option>
+                <option value="3"  <?php if ($upd_enableexpire==3) echo 'selected="selected"'?>> <?php echo gettext("EXPIRE DAYS SINCE CREATION");?></option>
             </select>
-          </td>
-        </tr>
-        <tr>
-          <td align="left"  class="bgcolor_001">
-              <input name="check[upd_tariff]" type="checkbox" <?php if ($check["upd_tariff"]=="on") echo "checked"?> >
-          </td>
-          <td align="left" class="bgcolor_001">
-                  4)&nbsp;<?php echo gettext("Tariff");?>&nbsp;:
-                <select NAME="upd_tariff" size="1" class="form_input_select">
-                    <?php foreach ($list_tariff as $recordset) { ?>
-                        <option class=input value='<?php echo $recordset[0]?>'  <?php if ($upd_tariff==$recordset[0]) echo 'selected="selected"'?>><?php echo $recordset[1]?></option>
+      </td>
+    </tr>
+    <tr>
+      <td align="left" class="bgcolor_001">
+              <input name="check[upd_expirationdate]" type="checkbox" <?php if ($check["upd_expirationdate"]=="on") echo "checked"?>>
+      </td>
+      <td align="left"  class="bgcolor_001">
+            <?php
+                $begin_date = date("Y");
+                $begin_date_plus = date("Y") + 10;
+                $end_date = date("-m-d H:i:s");
+                $comp_date = "value='".$begin_date.$end_date."'";
+                $comp_date_plus = "value='".$begin_date_plus.$end_date."'";
+            ?>
+            10)&nbsp;<?php echo gettext("Expiry date");?>&nbsp;:
+             <input class="form_input_text"  name="upd_expirationdate" size="20" maxlength="30" <?php echo $comp_date_plus; ?>> <font class="version"><?php echo gettext("(Format YYYY-MM-DD HH:MM:SS)");?></font>
+      </td>
+    </tr>
+    <tr>
+      <td align="left" class="bgcolor_001">
+              <input name="check[upd_expiredays]" type="checkbox" <?php if ($check["upd_expiredays"]=="on") echo "checked"?>>
+      </td>
+      <td align="left"  class="bgcolor_001">
+            11)&nbsp;<?php echo gettext("Expiration days");?>&nbsp;:
+            <input class="form_input_text"  name="upd_expiredays" size="10" maxlength="6" value="<?php if (isset($upd_expiredays)) echo $upd_expiredays; else echo '0';?>">
+            <br/>
+    </td>
+    </tr>
+    <tr>
+      <td align="left" class="bgcolor_001">
+          <input name="check[upd_runservice]" type="checkbox" <?php if ($check["upd_runservice"]=="on") echo "checked"?>>
+      </td>
+      <td align="left"  class="bgcolor_001">
+             12)&nbsp;<?php echo gettext("Run service");?>&nbsp;:
+            <font class="version">
+            <input type="radio" NAME="type[upd_runservice]" value="1" <?php if ((!isset($type[upd_runservice]))|| ($type[upd_runservice]=='1') ) {?>checked<?php }?>>
+            <?php echo gettext("Yes");?> <input type="radio" NAME="type[upd_runservice]" value="0" <?php if ($type[upd_runservice]=='0') {?>checked<?php }?>><?php echo gettext("No");?>
+            </font>
+      </td>
+    </tr>
+
+    <tr>
+     <td align="left"  class="bgcolor_001">
+            <input name="check[upd_id_group]" type="checkbox" <?php if ($check["upd_id_group"]=="on") echo "checked"?> >
+      </td>
+      <td align="left" class="bgcolor_001">
+            13)&nbsp;<?php echo gettext("Group this batch belongs to");?>&nbsp;:
+            <select NAME="upd_id_group" size="1" class="form_input_select">
+                    <?php
+                     foreach ($list_group as $recordset) {
+                    ?>
+                            <option class=input value='<?php echo $recordset[0]?>'  <?php if ($upd_id_group==$recordset[0]) echo 'selected="selected"'?>><?php echo $recordset[1]?></option>
                     <?php } ?>
-                </select><br/>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" class="bgcolor_001">
-                  <input name="check[upd_credit]" type="checkbox" <?php if ($check["upd_credit"]=="on") echo "checked"?>>
-                <input name="mode[upd_credit]" type="hidden" value="2">
-          </td>
-          <td align="left"  class="bgcolor_001">
-                  5)&nbsp;<?php echo gettext("Credit");?>&nbsp;:
-                    <input class="form_input_text" name="upd_credit" size="10" maxlength="10"  value="<?php if (isset($upd_credit)) echo $upd_credit; else echo '0';?>">
-                <font class="version">
-                <input type="radio" NAME="type[upd_credit]" value="1" <?php if ((!isset($type["upd_credit"]))|| ($type["upd_credit"]==1) ) {?>checked<?php }?>><?php echo gettext("Equals");?>
-                <input type="radio" NAME="type[upd_credit]" value="2" <?php if ($type["upd_credit"]==2) {?>checked<?php }?>> <?php echo gettext("Add");?>
-                <input type="radio" NAME="type[upd_credit]" value="3" <?php if ($type["upd_credit"]==3) {?>checked<?php }?>> <?php echo gettext("Subtract");?>
-                </font><br>&nbsp;&nbsp;&nbsp;Refill:
-                    <select NAME="upd_refill_type" size="1" class="form_input_select">
-                    <?php foreach ($list_refill_type as $recordset) { ?>
-                        <option class=input value='<?php echo $recordset[1]?>'  <?php if ($upd_refill_type==$recordset[1]) echo 'selected="selected"'?>><?php echo $recordset[0]?></option>
+            </select><br/>
+      </td>
+    </tr>
+
+    <tr>
+     <td align="left"  class="bgcolor_001">
+          <input name="check[upd_discount]" type="checkbox" <?php if ($check["upd_discount"]=="on") echo "checked"?> >
+      </td>
+      <td align="left" class="bgcolor_001">
+          14)&nbsp;<?php echo gettext("Set discount to");?>&nbsp;:
+          <select NAME="upd_discount" size="1" class="form_input_select">
+              <option class=input value="0" ><?php echo gettext("NO DISCOUNT");?></option>
+              <?php for ($i=1;$i<99;$i++) { ?>
+                    <option class=input value='<?php echo $i;?>'  <?php if ($upd_discount==$i) echo 'selected="selected"';echo '>'. $i; ?>%</option>
+              <?php } ?>
+          </select><br/>
+      </td>
+    </tr>
+    <tr>
+        <td align="left"  class="bgcolor_001">
+                <input name="check[upd_id_seria]" type="checkbox" <?php if ($check["upd_id_seria"]=="on") echo "checked"?> >
+        </td>
+        <td align="left" class="bgcolor_001">
+            15)&nbsp;<?php echo gettext("Move to Seria");?>&nbsp;:
+            <select NAME="upd_id_seria" size="1" class="form_input_select">
+                    <?php
+                     foreach ($list_seria as $recordset) {
+                    ?>
+                            <option class=input value='<?php echo $recordset[0]?>'  <?php if ($upd_id_seria==$recordset[0]) echo 'selected="selected"'?>><?php echo $recordset[1]?></option>
                     <?php } ?>
-                </select> Description <input class="form_input_text" name="upd_description"  size="20" maxlength="20"  value="<?php if (isset($upd_description)) echo $upd_description;?>"><br/>
-
-          </td>
-        </tr>
-        <tr>
-          <td align="left" class="bgcolor_001">
-                  <input name="check[upd_simultaccess]" type="checkbox" <?php if ($check["upd_simultaccess"]=="on") echo "checked"?>>
-          </td>
-          <td align="left" class="bgcolor_001">
-                6)&nbsp;<?php echo gettext("Access");?>&nbsp;:
-                <select NAME="upd_simultaccess" size="1" class="form_input_select">
-                    <option value='0'  <?php if ($upd_simultaccess==0) echo 'selected="selected"'?>><?php echo gettext("INDIVIDUAL ACCESS");?></option>
-                    <option value='1'  <?php if ($upd_simultaccess==1) echo 'selected="selected"'?>><?php echo gettext("SIMULTANEOUS ACCESS");?></option>
-            </select>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" class="bgcolor_001">
-                  <input name="check[upd_currency]" type="checkbox" <?php if ($check["upd_currency"]=="on") echo "checked"?>>
-          </td>
-          <td align="left"  class="bgcolor_001">
-                7)&nbsp;<?php echo gettext("Currency");?>&nbsp;:
-                <select NAME="upd_currency" size="1" class="form_input_select">
-                <?php
-                    foreach ($currencies_list as $key => $cur_value) {
-                ?>
-                    <option value='<?php echo $key ?>'  <?php if ($upd_currency==$key) echo 'selected="selected"'?>><?php echo $cur_value[1].' ('.$cur_value[2].')' ?></option>
-                <?php } ?>
-            </select>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" class="bgcolor_001">
-                  <input name="check[upd_creditlimit]" type="checkbox" <?php if ($check["upd_creditlimit"]=="on") echo "checked"?>>
-                <input name="mode[upd_creditlimit]" type="hidden" value="2">
-          </td>
-          <td align="left"  class="bgcolor_001">
-                8)&nbsp;<?php echo gettext("Credit limit");?>&nbsp;:
-                     <input class="form_input_text" name="upd_creditlimit" size="10" maxlength="10"  value="<?php if (isset($upd_creditlimit)) echo $upd_creditlimit; else echo '0';?>" >
-                <font class="version">
-                <input type="radio" NAME="type[upd_creditlimit]" value="1" <?php if ((!isset($type[upd_creditlimit]))|| ($type[upd_creditlimit]==1) ) {?>checked<?php }?>> <?php echo gettext("Equals");?>
-                <input type="radio" NAME="type[upd_creditlimit]" value="2" <?php if ($type[upd_creditlimit]==2) {?>checked<?php }?>><?php echo gettext("Add");?>
-                <input type="radio" NAME="type[upd_creditlimit]" value="3" <?php if ($type[upd_creditlimit]==3) {?>checked<?php }?>> <?php echo gettext("Subtract");?>
-                </font>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" class="bgcolor_001">
-                  <input name="check[upd_enableexpire]" type="checkbox" <?php if ($check["upd_enableexpire"]=="on") echo "checked"?>>
-          </td>
-          <td align="left"  class="bgcolor_001">
-                9)&nbsp;<?php echo gettext("Enable expire");?>&nbsp;:
-                <select name="upd_enableexpire" class="form_input_select" >
-                    <option value="0"  <?php if ($upd_enableexpire==0) echo 'selected="selected"'?>> <?php echo gettext("NO EXPIRY");?></option>
-                    <option value="1"  <?php if ($upd_enableexpire==1) echo 'selected="selected"'?>> <?php echo gettext("EXPIRE DATE");?></option>
-                    <option value="2"  <?php if ($upd_enableexpire==2) echo 'selected="selected"'?>> <?php echo gettext("EXPIRE DAYS SINCE FIRST USE");?></option>
-                    <option value="3"  <?php if ($upd_enableexpire==3) echo 'selected="selected"'?>> <?php echo gettext("EXPIRE DAYS SINCE CREATION");?></option>
-                </select>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" class="bgcolor_001">
-                  <input name="check[upd_expirationdate]" type="checkbox" <?php if ($check["upd_expirationdate"]=="on") echo "checked"?>>
-          </td>
-          <td align="left"  class="bgcolor_001">
-                <?php
-                    $begin_date = date("Y");
-                    $begin_date_plus = date("Y")+10;
-                    $end_date = date("-m-d H:i:s");
-                    $comp_date = "value='".$begin_date.$end_date."'";
-                    $comp_date_plus = "value='".$begin_date_plus.$end_date."'";
-                ?>
-                10)&nbsp;<?php echo gettext("Expiry date");?>&nbsp;:
-                 <input class="form_input_text"  name="upd_expirationdate" size="20" maxlength="30" <?php echo $comp_date_plus; ?>> <font class="version"><?php echo gettext("(Format YYYY-MM-DD HH:MM:SS)");?></font>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" class="bgcolor_001">
-                  <input name="check[upd_expiredays]" type="checkbox" <?php if ($check["upd_expiredays"]=="on") echo "checked"?>>
-          </td>
-          <td align="left"  class="bgcolor_001">
-                11)&nbsp;<?php echo gettext("Expiration days");?>&nbsp;:
-                <input class="form_input_text"  name="upd_expiredays" size="10" maxlength="6" value="<?php if (isset($upd_expiredays)) echo $upd_expiredays; else echo '0';?>">
-                <br/>
+            </select><br/>
         </td>
-        </tr>
-        <tr>
-          <td align="left" class="bgcolor_001">
-              <input name="check[upd_runservice]" type="checkbox" <?php if ($check["upd_runservice"]=="on") echo "checked"?>>
-          </td>
-          <td align="left"  class="bgcolor_001">
-                 12)&nbsp;<?php echo gettext("Run service");?>&nbsp;:
-                <font class="version">
-                <input type="radio" NAME="type[upd_runservice]" value="1" <?php if ((!isset($type[upd_runservice]))|| ($type[upd_runservice]=='1') ) {?>checked<?php }?>>
-                <?php echo gettext("Yes");?> <input type="radio" NAME="type[upd_runservice]" value="0" <?php if ($type[upd_runservice]=='0') {?>checked<?php }?>><?php echo gettext("No");?>
-                </font>
-          </td>
-        </tr>
-
-        <tr>
-         <td align="left"  class="bgcolor_001">
-                <input name="check[upd_id_group]" type="checkbox" <?php if ($check["upd_id_group"]=="on") echo "checked"?> >
-          </td>
-          <td align="left" class="bgcolor_001">
-                13)&nbsp;<?php echo gettext("Group this batch belongs to");?>&nbsp;:
-                <select NAME="upd_id_group" size="1" class="form_input_select">
-                        <?php
-                         foreach ($list_group as $recordset) {
-                        ?>
-                                <option class=input value='<?php echo $recordset[0]?>'  <?php if ($upd_id_group==$recordset[0]) echo 'selected="selected"'?>><?php echo $recordset[1]?></option>
-                        <?php } ?>
-                </select><br/>
-          </td>
-        </tr>
-
-        <tr>
-         <td align="left"  class="bgcolor_001">
-                <input name="check[upd_discount]" type="checkbox" <?php if ($check["upd_discount"]=="on") echo "checked"?> >
-          </td>
-          <td align="left" class="bgcolor_001">
-                14)&nbsp;<?php echo gettext("Set discount to");?>&nbsp;:
-                <select NAME="upd_discount" size="1" class="form_input_select">
-                    <option class=input value="0" ><?php echo gettext("NO DISCOUNT");?></option>
-                    <?php for ($i=1;$i<99;$i++) { ?>
-                          <option class=input value='<?php echo $i;?>'  <?php if ($upd_discount==$i) echo 'selected="selected"';echo '>'. $i; ?>%</option>
+    </tr>
+    <tr>
+        <td align="left" class="bgcolor_001" >
+                <input name="check[upd_vat]" type="checkbox" <?php if ($check["upd_vat"]=="on") echo "checked"?>>
+        </td>
+        <td align="left"  class="bgcolor_001">
+              16)&nbsp;<?php echo gettext("VAT"); ?>&nbsp;:
+              <input class="form_input_text"  name="upd_vat" size="10" maxlength="6" value="<?php if (isset($upd_vat)) echo $upd_vat;?>">
+              <br/>
+        </td>
+    </tr>
+
+    <tr>
+     <td align="left"  class="bgcolor_001">
+            <input name="check[upd_country]" type="checkbox" <?php if ($check["upd_country"]=="on") echo "checked"?> >
+      </td>
+      <td align="left" class="bgcolor_001">
+            17)&nbsp;<?php echo gettext("Country");?>&nbsp;:
+            <select NAME="upd_country" size="1" class="form_input_select">
+                    <?php
+                     foreach ($list_country as $recordset) {
+                    ?>
+                            <option class=input value='<?php echo $recordset[0]?>'  <?php if ($upd_country==$recordset[0]) echo 'selected="selected"'?>><?php echo $recordset[1]?></option>
                     <?php } ?>
-                </select><br/>
-          </td>
-        </tr>
-        <tr>
-             <td align="left"  class="bgcolor_001">
-                    <input name="check[upd_id_seria]" type="checkbox" <?php if ($check["upd_id_seria"]=="on") echo "checked"?> >
-              </td>
-              <td align="left" class="bgcolor_001">
-                    15)&nbsp;<?php echo gettext("Move to Seria");?>&nbsp;:
-                    <select NAME="upd_id_seria" size="1" class="form_input_select">
-                            <?php
-                             foreach ($list_seria as $recordset) {
-                            ?>
-                                    <option class=input value='<?php echo $recordset[0]?>'  <?php if ($upd_id_seria==$recordset[0]) echo 'selected="selected"'?>><?php echo $recordset[1]?></option>
-                            <?php } ?>
-                    </select><br/>
-              </td>
-        </tr>
-        <tr>
-          <td align="left" class="bgcolor_001" >
-                  <input name="check[upd_vat]" type="checkbox" <?php if ($check["upd_vat"]=="on") echo "checked"?>>
-          </td>
-          <td align="left"  class="bgcolor_001">
-                16)&nbsp;<?php echo gettext("VAT"); ?>&nbsp;:
-                <input class="form_input_text"  name="upd_vat" size="10" maxlength="6" value="<?php if (isset($upd_vat)) echo $upd_vat;?>">
-                <br/>
-          </td>
-        </tr>
-
-        <tr>
-         <td align="left"  class="bgcolor_001">
-                <input name="check[upd_country]" type="checkbox" <?php if ($check["upd_country"]=="on") echo "checked"?> >
-          </td>
-          <td align="left" class="bgcolor_001">
-                17)&nbsp;<?php echo gettext("Country");?>&nbsp;:
-                <select NAME="upd_country" size="1" class="form_input_select">
-                        <?php
-                         foreach ($list_country as $recordset) {
-                        ?>
-                                <option class=input value='<?php echo $recordset[0]?>'  <?php if ($upd_country==$recordset[0]) echo 'selected="selected"'?>><?php echo $recordset[1]?></option>
-                        <?php } ?>
-                </select><br/>
-          </td>
-        </tr>
-
-        <tr>
-            <td align="right" class="bgcolor_001"></td>
-             <td align="right"  class="bgcolor_001">
-                <input class="form_input_button"  value=" <?php echo gettext("BATCH UPDATE CARD");?>  " type="submit">
-            </td>
-        </tr>
-        </form>
-        </table>
+            </select><br/>
+      </td>
+    </tr>
+
+    <tr>
+        <td align="right" class="bgcolor_001"></td>
+        <td align="right"  class="bgcolor_001">
+            <input class="form_input_button"  value=" <?php echo gettext("BATCH UPDATE CARD");?>  " type="submit">
+        </td>
+    </tr>
+    </form>
+    </table>
 </center>
     </div>
 </div>
@@ -476,10 +484,18 @@ function sendValue(selvalue, othervalue)
 } // END if ($form_action == "list")
 ?>
 
-<?php  if ( !USE_REALTIME && isset($_SESSION["is_sip_iax_change"]) && $_SESSION["is_sip_iax_change"]) { ?>
+<?php  if (!USE_REALTIME && isset($_SESSION["is_sip_iax_change"]) && $_SESSION["is_sip_iax_change"]) { ?>
       <table width="<?php echo $HD_Form -> FG_HTML_TABLE_WIDTH?>" border="0" align="center" cellpadding="0" cellspacing="0" >
         <TR><TD style="border-bottom: medium dotted #ED2525" align="center"> <?php echo gettext("Changes detected on SIP/IAX Friends");?></TD></TR>
         <TR><FORM NAME="sipfriend">
+            <?php
+                if ($HD_Form->FG_CSRF_STATUS == true) {
+            ?>
+                <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+                <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+            <?php
+                }
+            ?>
             <td height="31" class="bgcolor_013" style="padding-left: 5px; padding-right: 3px;" align="center">
             <font color=white><b>
             <?php  if ( isset($_SESSION["is_sip_changed"]) && $_SESSION["is_sip_changed"] ) { ?>
diff --git a/admin/Public/A2B_entity_card_group.php b/admin/Public/A2B_entity_card_group.php
index 0ebaaa46e..4bf8f63d0 100755
--- a/admin/Public/A2B_entity_card_group.php
+++ b/admin/Public/A2B_entity_card_group.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_card_multi.php b/admin/Public/A2B_entity_card_multi.php
index 6bbc82cff..62c5b4e6f 100644
--- a/admin/Public/A2B_entity_card_multi.php
+++ b/admin/Public/A2B_entity_card_multi.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -45,7 +45,7 @@
 
 getpost_ifset(array('nb_to_create', 'creditlimit', 'cardnum', 'addcredit', 'choose_tariff', 'gen_id', 'cardnum', 'choose_simultaccess',
     'choose_currency', 'choose_typepaid', 'creditlimit', 'enableexpire', 'expirationdate', 'expiredays', 'runservice', 'sip', 'iax',
-    'cardnumberlenght_list', 'tag', 'id_group', 'discount', 'id_seria', 'id_didgroup', 'vat', 'id_country'));
+    'cardnumberlenght_list', 'tag', 'id_group', 'discount', 'id_seria', 'id_didgroup', 'vat', 'id_country', 'useralias_next'));
 
 $HD_Form->FG_FILTER_SEARCH_FORM = false;
 $HD_Form->FG_EDITION = false;
@@ -108,6 +108,13 @@
             $msg_error .= "<br/>";
         $msg_error .= gettext("- Choose the number of customers that you want generate!");
     }
+    if (!empty($useralias_next) && !is_numeric($useralias_next)) {
+        $nb_error++;
+        $number_error = true;
+        if (!empty ($msg_error))
+            $msg_error .= "<br/>";
+        $msg_error .= gettext("- User alias should be a number!");
+    }
 }
 $nbcard = $nb_to_create;
 if ($nbcard > 0 && $action == "generate" && $nb_error == 0) {
@@ -144,7 +151,7 @@
     $instance_refill_table = new Table("cc_logrefill", $field_insert_refill);
 
     for ($k = 0; $k < $nbcard; $k++) {
-        $arr_card_alias = gen_card_with_alias("cc_card", 0, $cardnumberlenght_list);
+        $arr_card_alias = gen_card_with_alias("cc_card", 0, $cardnumberlenght_list, null, $useralias_next);
         $accountnumber = $arr_card_alias[0];
         $useralias = $arr_card_alias[1];
         if (!is_numeric($addcredit))
@@ -233,7 +240,15 @@
     </div>
 <?php } ?>
 <table align="center"  class="bgcolor_001" border="0" width="65%">
-<form name="theForm" action="<?php echo $_SERVER['PHP_SELF'] ?>" method="POST">
+<form name="theForm" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) ?>" method="POST">
+<?php
+    if ($HD_Form->FG_CSRF_STATUS == true) {
+?>
+    <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+    <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+<?php
+    }
+?>
 <tr>
     <td align="left" width="100%">
     <strong>1)</strong> <?php echo gettext("Length of card number :");?>
@@ -315,7 +330,7 @@
     <br/>
     <?php
         $begin_date = date("Y");
-        $begin_date_plus = date("Y")+10;
+        $begin_date_plus = date("Y") + 10;
         $end_date = date("-m-d H:i:s");
         $comp_date = "value='".$begin_date.$end_date."'";
         $comp_date_plus = "value='".$begin_date_plus.$end_date."'";
@@ -409,6 +424,10 @@
         <img style="vertical-align:middle;" src="<?php echo Images_Path;?>/exclamation.png" />
     <?php } ?>
 
+    <br/>
+    <strong>21)</strong>
+    <?php echo gettext("Start user alias with");?> : <input class="form_input_text"  name="useralias_next" size="20" maxlength="100" <?php if(!empty($useralias_next)) echo "value='$useralias_next'"; ?> >
+
     </td>
 </tr>
 <tr>
diff --git a/admin/Public/A2B_entity_card_seria.php b/admin/Public/A2B_entity_card_seria.php
old mode 100644
new mode 100755
index 48702e570..78898284b
--- a/admin/Public/A2B_entity_card_seria.php
+++ b/admin/Public/A2B_entity_card_seria.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_charge.php b/admin/Public/A2B_entity_charge.php
old mode 100644
new mode 100755
index b7b3ae96f..5244f3867
--- a/admin/Public/A2B_entity_charge.php
+++ b/admin/Public/A2B_entity_charge.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_commission_agent.php b/admin/Public/A2B_entity_commission_agent.php
index 9a62c5651..cbdc05873 100755
--- a/admin/Public/A2B_entity_commission_agent.php
+++ b/admin/Public/A2B_entity_commission_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_config.php b/admin/Public/A2B_entity_config.php
old mode 100644
new mode 100755
index 1f879407e..fc6d2479d
--- a/admin/Public/A2B_entity_config.php
+++ b/admin/Public/A2B_entity_config.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -44,7 +44,7 @@
     die();
 }
 
-$HD_Form -> setDBHandler (DbConnect());
+$HD_Form -> setDBHandler(DbConnect());
 $HD_Form -> init();
 
 if ($id!="" || !is_null($id)) {
@@ -72,17 +72,15 @@
 ?>
 <br>
 <script language="javascript">
-function go(URL)
-{
-    if ( Check() ) {
+function go(URL) {
+    if (Check()) {
         document.searchform.action = URL;
         alert(document.searchform.action);
         document.searchform.submit();
     }
 }
 
-function Check()
-{
+function Check() {
     if (document.searchform.filterradio[1].value == "payment") {
         if (document.searchform.paymenttext.value < 0) {
             alert("Payment amount cannot be less than Zero.");
@@ -91,13 +89,21 @@ function Check()
             return false;
         }
     }
-
     return true;
 }
 </script>
+
 <form name="searchform" id="searchform" method="post" action="A2B_entity_config.php">
     <input type="hidden" name="searchenabled" value="yes">
     <input type="hidden" name="posted" value="1">
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
 
     <table class="bar-status" width="85%" border="0" cellspacing="1" cellpadding="2" align="center">
 
diff --git a/admin/Public/A2B_entity_config_generate_confirm.php b/admin/Public/A2B_entity_config_generate_confirm.php
old mode 100644
new mode 100755
index 76ca4ccf0..98440bdfd
--- a/admin/Public/A2B_entity_config_generate_confirm.php
+++ b/admin/Public/A2B_entity_config_generate_confirm.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_config_group.php b/admin/Public/A2B_entity_config_group.php
old mode 100644
new mode 100755
index bbedee707..9b4a3fe05
--- a/admin/Public/A2B_entity_config_group.php
+++ b/admin/Public/A2B_entity_config_group.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_def_ratecard.php b/admin/Public/A2B_entity_def_ratecard.php
old mode 100644
new mode 100755
index ad6834425..e9a2d51d8
--- a/admin/Public/A2B_entity_def_ratecard.php
+++ b/admin/Public/A2B_entity_def_ratecard.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -48,7 +48,7 @@
 /********************************* BATCH UPDATE ***********************************/
 getpost_ifset(array ( 'batchupdate', 'upd_id_trunk', 'upd_idtariffplan', 'upd_id_outbound_cidgroup', 'upd_tag', 'upd_inuse', 'upd_activated', 'upd_language',
     'upd_tariff', 'upd_credit', 'upd_credittype', 'upd_simultaccess', 'upd_currency', 'upd_typepaid', 'upd_creditlimit', 'upd_enableexpire', 'upd_expirationdate',
-    'upd_expiredays', 'upd_runservice', 'filterprefix', 'filterfield'
+    'upd_expiredays', 'upd_runservice', 'filterprefix', 'filterfield', 'upd_is_disabled'
 ));
 
 $update_fields = array (
@@ -236,13 +236,10 @@
 if ($popup_select && empty($package) && !is_numeric($package) ) {
 ?>
 <SCRIPT LANGUAGE="javascript">
-<!-- Begin
-function sendValue(selvalue)
-{
+function sendValue(selvalue) {
     window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
     window.close();
 }
-// End -->
 </script>
 <?php
 
@@ -252,13 +249,11 @@ function sendValue(selvalue)
 $HD_Form-> CV_FOLLOWPARAMETERS .= "&package=".$package;
 ?>
 <SCRIPT LANGUAGE="javascript">
-<!-- Begin
 function sendValue(selvalue)
 {
      // redirect browser to the grabbed value (hopefully a URL)
     window.opener.location.href= <?php echo '"A2B_package_manage_rates.php?id='.$package.'&addrate="'; ?>+selvalue;
 }
-// End -->
 </script>
 <?php
 }
@@ -297,11 +292,11 @@ function sendValue(selvalue)
 <div class="toggle_hide2show">
 <center><a href="#" target="_self" class="toggle_menu"><img class="toggle_hide2show" src="<?php echo KICON_PATH; ?>/toggle_hide2show.png" onmouseover="this.style.cursor='hand';" HEIGHT="16"> <font class="fontstyle_002"><?php echo gettext("BATCH UPDATE");?> </font></a></center>
     <div class="tohide" style="display:none;">
-
 <center>
+
 <b>&nbsp;<?php echo $HD_Form -> FG_NB_RECORD ?> <?php echo gettext("rates selected!"); ?>&nbsp;<?php echo gettext("Use the options below to batch update the selected rates.");?></b>
-       <table align="center" border="0" width="65%"  cellspacing="1" cellpadding="2">
-        <form name="updateForm" action="<?php echo $_SERVER['PHP_SELF']?>" method="post">
+<table align="center" border="0" width="65%"  cellspacing="1" cellpadding="2">
+    <FORM name="updateForm" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>" method="post">
         <INPUT type="hidden" name="batchupdate" value="1">
         <INPUT type="hidden" name="atmenu" value="<?php echo $atmenu?>">
         <INPUT type="hidden" name="popup_select" value="<?php echo $popup_select?>">
@@ -310,7 +305,27 @@ function sendValue(selvalue)
         <INPUT type="hidden" name="form_action" value="<?php echo $form_action?>">
         <INPUT type="hidden" name="filterprefix" value="<?php echo $filterprefix?>">
         <INPUT type="hidden" name="filterfield" value="<?php echo $filterfield?>">
+        <?php
+            if ($HD_Form->FG_CSRF_STATUS == true) {
+        ?>
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+        <?php
+            }
+        ?>
         <tr>
+          <td align="left" class="bgcolor_001">
+		  		<input name="check[upd_is_disabled]" type="checkbox" <?php if ($check["upd_is_disabled"]=="on") echo "checked"?>>
+		  </td>
+		  <td align="left"  class="bgcolor_001">
+				<font class="fontstyle_009">*) <?php echo gettext("DISABLED");?> :</font> 
+				<select NAME="upd_is_disabled" size="1" class="form_enter" >
+					<option class=input value='0' <?php if ($upd_is_disabled=='0') echo 'selected="selected"'?>><?php echo gettext("no");?></option>
+                    <option class=input value='1' <?php if ($upd_is_disabled=='1') echo 'selected="selected"'?>><?php echo gettext("yes");?></option>
+				</select>
+			</td>
+		</tr>
+		<tr>
           <td align="left" class="bgcolor_001">
                   <input name="check[upd_id_trunk]" type="checkbox" <?php if ($check["upd_id_trunk"]=="on") echo "checked"?>>
           </td>
@@ -370,20 +385,19 @@ function sendValue(selvalue)
            foreach ($update_fields as $value) {
            ?>
           <td align="left" class="bgcolor_001">
-                                <input name="check[<?php echo $value;?>]" type="checkbox" <?php if ($check[$value]=="on") echo "checked"?>>
-                                <input name="mode[<?php echo $value;?>]" type="hidden" value="2">
-                  </td>
-                  <td align="left"  class="bgcolor_001">
-
-                                <font class="fontstyle_009"><?php echo ($index + 4).") ".gettext($update_fields_info[$index]);?> :</font>
-                                        <input class="form_input_text" name="<?php echo $value;?>" size="10" maxlength="10"  value="<?php if (isset(${$value})) echo ${$value}; else echo '0';?>" >
-                                <font class="version">
-                                <input type="radio" NAME="type[<?php echo $value;?>]" value="1" <?php if ((!isset($type[$value]))|| ($type[$value]==1) ) {?>checked<?php }?>> <?php echo gettext("Equal");?>
-                                <input type="radio" NAME="type[<?php echo $value;?>]" value="2" <?php if ($type[$value]==2) {?>checked<?php }?>> <?php echo gettext("Add");?>
-                                <input type="radio" NAME="type[<?php echo $value;?>]" value="3" <?php if ($type[$value]==3) {?>checked<?php }?>> <?php echo gettext("Subtract");?>
-                                </font>
-                        </td>
-               </tr>
+                <input name="check[<?php echo $value;?>]" type="checkbox" <?php if ($check[$value]=="on") echo "checked"?>>
+                <input name="mode[<?php echo $value;?>]" type="hidden" value="2">
+              </td>
+              <td align="left"  class="bgcolor_001">
+                  <font class="fontstyle_009"><?php echo ($index + 4).") ".gettext($update_fields_info[$index]);?> :</font>
+                            <input class="form_input_text" name="<?php echo $value;?>" size="10" maxlength="10"  value="<?php if (isset(${$value})) echo ${$value}; else echo '0';?>" >
+                  <font class="version">
+                    <input type="radio" NAME="type[<?php echo $value;?>]" value="1" <?php if ((!isset($type[$value]))|| ($type[$value]==1) ) {?>checked<?php }?>> <?php echo gettext("Equal");?>
+                    <input type="radio" NAME="type[<?php echo $value;?>]" value="2" <?php if ($type[$value]==2) {?>checked<?php }?>> <?php echo gettext("Add");?>
+                    <input type="radio" NAME="type[<?php echo $value;?>]" value="3" <?php if ($type[$value]==3) {?>checked<?php }?>> <?php echo gettext("Subtract");?>
+                  </font>
+                </td>
+            </tr>
             <?php $index=$index+1;
             }?>
         <tr>
@@ -399,27 +413,26 @@ function sendValue(selvalue)
         </tr>
 
         <tr>
-           <?php
-           $index=0;
-           foreach ($charges_abc as $value) {
-           ?>
+            <?php
+            $index=0;
+            foreach ($charges_abc as $value) {
+            ?>
           <td align="left" class="bgcolor_001">
-                                <input name="check[<?php echo $value;?>]" type="checkbox" <?php if ($check[$value]=="on") echo "checked"?>>
-                                <input name="mode[<?php echo $value;?>]" type="hidden" value="2">
-                  </td>
-                  <td align="left"  class="bgcolor_001">
-
-                                <font class="fontstyle_009"><?php echo ($index+16).") ".gettext($charges_abc_info[$index]);?> :</font>
-                                        <input class="form_input_text" name="<?php echo $value;?>" size="10" maxlength="10"  value="<?php if (isset(${$value})) echo ${$value}; else echo '0';?>" >
-                                <font class="version">
-                                <input type="radio" NAME="type[<?php echo $value;?>]" value="1" <?php if ((!isset($type[$value]))|| ($type[$value]==1) ) {?>checked<?php }?>> <?php echo gettext("Equal");?>
-                                <input type="radio" NAME="type[<?php echo $value;?>]" value="2" <?php if ($type[$value]==2) {?>checked<?php }?>> <?php echo gettext("Add");?>
-                                <input type="radio" NAME="type[<?php echo $value;?>]" value="3" <?php if ($type[$value]==3) {?>checked<?php }?>> <?php echo gettext("Subtract");?>
-                                </font>
-                        </td>
-               </tr>
-               <?php $index=$index+1;
-               }?>
+              <input name="check[<?php echo $value;?>]" type="checkbox" <?php if ($check[$value]=="on") echo "checked"?>>
+              <input name="mode[<?php echo $value;?>]" type="hidden" value="2">
+          </td>
+              <td align="left"  class="bgcolor_001">
+                <font class="fontstyle_009"><?php echo ($index+16).") ".gettext($charges_abc_info[$index]);?> :</font>
+                    <input class="form_input_text" name="<?php echo $value;?>" size="10" maxlength="10"  value="<?php if (isset(${$value})) echo ${$value}; else echo '0';?>" >
+                <font class="version">
+                <input type="radio" NAME="type[<?php echo $value;?>]" value="1" <?php if ((!isset($type[$value]))|| ($type[$value]==1) ) {?>checked<?php }?>> <?php echo gettext("Equal");?>
+                <input type="radio" NAME="type[<?php echo $value;?>]" value="2" <?php if ($type[$value]==2) {?>checked<?php }?>> <?php echo gettext("Add");?>
+                <input type="radio" NAME="type[<?php echo $value;?>]" value="3" <?php if ($type[$value]==3) {?>checked<?php }?>> <?php echo gettext("Subtract");?>
+                </font>
+              </td>
+              </tr>
+              <?php $index=$index+1;
+            }?>
         <tr>
             <td align="right" class="bgcolor_001">
             </td>
@@ -427,8 +440,8 @@ function sendValue(selvalue)
                 <input class="form_input_button"  value=" <?php echo gettext("BATCH UPDATE RATECARD");?> " type="submit">
             </td>
         </tr>
-        </form>
-        </table>
+    </form>
+</table>
 </center>
 <!-- ** ** ** ** ** Part for the Update ** ** ** ** ** -->
     </div>
@@ -467,13 +480,16 @@ function sendValue(selvalue)
 
 <!-- ** ** ** ** ** Part for the Update ** ** ** ** ** -->
 <div class="toggle_hide2show">
-<center><a href="#" target="_self" class="toggle_menu"><img class="toggle_hide2show" src="<?php echo KICON_PATH; ?>/toggle_hide2show.png" onmouseover="this.style.cursor='hand';" HEIGHT="16"> <font class="fontstyle_002"><?php echo gettext("BATCH ASSIGNED");?> </font></a></center>
+<center>
+    <a href="#" target="_self" class="toggle_menu">
+    <img class="toggle_hide2show" src="<?php echo KICON_PATH; ?>/toggle_hide2show.png" onmouseover="this.style.cursor='hand';" HEIGHT="16">
+    <font class="fontstyle_002"><?php echo gettext("BATCH ASSIGNED");?> </font></a></center>
     <div class="tohide" style="display:none;">
 <center>
 
 <b>&nbsp;<?php echo $HD_Form -> FG_NB_RECORD ?> <?php echo gettext("rates selected!"); ?>&nbsp;<?php echo gettext("Use the options below to batch update the selected rates.");?></b>
-       <table align="center" border="0" width="65%"  cellspacing="1" cellpadding="2">
-        <form name="assignForm" action="javascript:;" method="post">
+<table align="center" border="0" width="65%"  cellspacing="1" cellpadding="2">
+    <FORM name="assignForm" action="javascript:;" method="post">
         <INPUT type="hidden" name="batchupdate" value="1">
         <INPUT type="hidden" name="atmenu" value="<?php echo $atmenu?>">
         <INPUT type="hidden" name="popup_select" value="<?php echo $popup_select?>">
@@ -484,6 +500,15 @@ function sendValue(selvalue)
         <INPUT type="hidden" name="filterfield" value="<?php echo $filterfield?>">
         <INPUT type="hidden" name="addbatchrate" value="1">
 
+        <?php
+            if ($HD_Form->FG_CSRF_STATUS == true) {
+        ?>
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+        <?php
+            }
+        ?>
+
         <tr>
           <td align="left" class="bgcolor_001">
                   <input name="check" type="checkbox">
@@ -557,13 +582,12 @@ function sendValue(selvalue)
                 <input onclick="javascript:sendOpener();" class="form_input_button"  value=" <?php echo gettext("BATCH ASSIGNED");?> " type="submit">
             </td>
         </tr>
-        </form>
-        </table>
+    </form>
+</table>
 </center>
 
 <script language="javascript">
-function sendOpener()
-{
+function sendOpener() {
     if (document.assignForm.check[0].checked==true) {
         var id_trunk = document.assignForm.assign_id_trunk.options[document.assignForm.assign_id_trunk.selectedIndex].value;
     }
diff --git a/admin/Public/A2B_entity_did.php b/admin/Public/A2B_entity_did.php
old mode 100644
new mode 100755
index 6f2f30782..12aa1bd17
--- a/admin/Public/A2B_entity_did.php
+++ b/admin/Public/A2B_entity_did.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_did_billing.php b/admin/Public/A2B_entity_did_billing.php
old mode 100644
new mode 100755
index 45be401e3..1f3df2d8a
--- a/admin/Public/A2B_entity_did_billing.php
+++ b/admin/Public/A2B_entity_did_billing.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_did_destination.php b/admin/Public/A2B_entity_did_destination.php
old mode 100644
new mode 100755
index d45efe1eb..40854f681
--- a/admin/Public/A2B_entity_did_destination.php
+++ b/admin/Public/A2B_entity_did_destination.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_did_import.php b/admin/Public/A2B_entity_did_import.php
old mode 100644
new mode 100755
index 69309a92a..d77abac36
--- a/admin/Public/A2B_entity_did_import.php
+++ b/admin/Public/A2B_entity_did_import.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -65,57 +65,41 @@
 ?>
 
 <script language="JavaScript">
-<!--
-function sendtofield(form)
-{
+function sendtofield(form) {
     if (form.listemail.value.length < 5) {
         alert ('<?php echo addslashes(gettext("Insert emails on the Field!")); ?>');
         form.listemail.focus ();
-
         return (false);
     }
-
     document.forms["prefs"].elements["task"].value = "field";
     document.forms[0].submit();
 }
 
-function sendtoupload(form)
-{
+function sendtoupload(form) {
     if (form.the_file.value.length < 2) {
         alert ('<?php echo addslashes(gettext("Please, you must first select a file !")); ?>');
         form.the_file.focus ();
-
         return (false);
     }
-
     return true;
 }
 
-//-->
-</script>
-
-<script language="JavaScript" type="text/javascript">
-<!--
-function deselectHeaders()
-{
+function deselectHeaders() {
     document.prefs.unselected_search_sources[0].selected = false;
     document.prefs.selected_search_sources[0].selected = false;
 }
 
-function resetHidden()
-{
+function resetHidden() {
     var tmp = '';
     for (i = 1; i < document.prefs.selected_search_sources.length; i++) {
         tmp += document.prefs.selected_search_sources[i].value;
         if (i < document.prefs.selected_search_sources.length - 1)
             tmp += "\t";
     }
-
     document.prefs.search_sources.value = tmp;
 }
 
-function addSource()
-{
+function addSource() {
     for (i = 1; i < document.prefs.unselected_search_sources.length; i++) {
         if (document.prefs.unselected_search_sources[i].selected) {
             document.prefs.selected_search_sources[document.prefs.selected_search_sources.length] = new Option(document.prefs.unselected_search_sources[i].text, document.prefs.unselected_search_sources[i].value);
@@ -123,12 +107,10 @@ function addSource()
             i--;
         }
     }
-
     resetHidden();
 }
 
-function removeSource()
-{
+function removeSource() {
     for (i = 1; i < document.prefs.selected_search_sources.length; i++) {
         if (document.prefs.selected_search_sources[i].selected) {
             document.prefs.unselected_search_sources[document.prefs.unselected_search_sources.length] = new Option(document.prefs.selected_search_sources[i].text, document.prefs.selected_search_sources[i].value)
@@ -136,12 +118,10 @@ function removeSource()
             i--;
         }
     }
-
     resetHidden();
 }
 
-function moveSourceUp()
-{
+function moveSourceUp() {
     var sel = document.prefs.selected_search_sources.selectedIndex;
     //var sel = document.prefs["selected_search_sources[]"].selectedIndex;
 
@@ -174,12 +154,10 @@ function moveSourceUp()
 
         document.prefs.selected_search_sources.selectedIndex = sel - 1;
     }
-
     resetHidden();
 }
 
-function moveSourceDown()
-{
+function moveSourceDown() {
     var sel = document.prefs.selected_search_sources.selectedIndex;
 
     if (sel == -1 || document.prefs.selected_search_sources.length <= 2) return;
@@ -223,44 +201,44 @@ function moveSourceDown()
     resetHidden();
 }
 
-// -->
 </script>
 
 <center>
-        <b><?php echo gettext("New DID have to be imported from a CSV file.");?>.</b></br></br>
-        <table width="95%" border="0" cellspacing="2" align="center" class="records">
-
-              <form name="prefs" enctype="multipart/form-data" action="A2B_entity_did_import_analyse.php" method="post">
-
-                <tr>
-                  <td colspan="2" align=center>
-                  <?php echo gettext("Choose a DIDGroup to use");?> :
-                  <select NAME="didgroup" size="1"  class="form_input_select"  style="width=250">
-                                <option value=''><?php echo gettext("Choose a DIDGroup");?></option>
-
-                                <?php
-                                 foreach ($list_tariffname as $recordset) {
-                                ?>
-                                    <option class=input value='<?php  echo $recordset[0]?>-:-<?php  echo $recordset[1]?>' <?php if ($recordset[0]==$didgroup) echo "selected";?>><?php echo $recordset[1]?></option>
-                                <?php 	 }
-                                ?>
-                        </select>
-                        <br>
-                        <br>
-                        <?php echo gettext("Choose a Country to use");?> :
-                        <select NAME="countryID" size="1" class="form_input_select" style="width=250">
-                                <option value=''><?php echo gettext("Choose a Country");?></option>
-
-                                <?php
-                                 foreach ($list_countryname as $recordset) {
-                                ?>
-                                    <option class=input value='<?php  echo $recordset[0]?>-:-<?php  echo $recordset[1]?>' <?php if ($recordset[0]== $countryID) echo "selected";?>><?php echo $recordset[1]?></option>
-                                <?php 	 }
-                                ?>
-                        </select>
-                        <br><br>
-
-                <?php echo gettext("These fields are mandatory");?><br>
+<b><?php echo gettext("New DID have to be imported from a CSV file.");?>.</b></br></br>
+<table width="95%" border="0" cellspacing="2" align="center" class="records">
+
+    <form name="prefs" enctype="multipart/form-data" action="A2B_entity_did_import_analyse.php" method="post">
+    <tr>
+        <td colspan="2" align=center>
+        <?php echo gettext("Choose a DIDGroup to use");?> :
+        <select NAME="didgroup" size="1"  class="form_input_select"  style="width=250">
+            <option value=''><?php echo gettext("Choose a DIDGroup");?></option>
+
+            <?php
+            foreach ($list_tariffname as $recordset) {
+            ?>
+                <option class=input value='<?php  echo $recordset[0]?>-:-<?php  echo $recordset[1]?>' <?php if ($recordset[0]==$didgroup) echo "selected";?>><?php echo $recordset[1]?></option>
+            <?php
+            }
+            ?>
+        </select>
+        <br>
+        <br>
+        <?php echo gettext("Choose a Country to use");?> :
+        <select NAME="countryID" size="1" class="form_input_select" style="width=250">
+            <option value=''><?php echo gettext("Choose a Country");?></option>
+
+            <?php
+            foreach ($list_countryname as $recordset) {
+            ?>
+                <option class=input value='<?php  echo $recordset[0]?>-:-<?php  echo $recordset[1]?>' <?php if ($recordset[0]== $countryID) echo "selected";?>><?php echo $recordset[1]?></option>
+            <?php
+                }
+            ?>
+        </select>
+        <br><br>
+
+    <?php echo gettext("These fields are mandatory");?><br>
 
 <select  name="bydefault" multiple="multiple" size="2" class="form_input_select" width="40">
     <option value="bb1"><?php echo gettext("DID");?></option>
@@ -280,8 +258,6 @@ function moveSourceDown()
                 <option value="startingdate"><?php echo gettext("startingdate");?></option>
                 <option value="expirationdate"><?php echo gettext("expirationdate");?></option>
                 <option value="billingtype"><?php echo gettext("billingtype");?></option>
-
-    down_black
             </select>
         </td>
 
@@ -302,46 +278,47 @@ function moveSourceDown()
             <a href="" onclick="moveSourceDown(); return false;"><img src="<?php echo Images_Path;?>/down_black.png" alt="move down" title="move down" border="0"></a>
         </td>
     </tr>
-</tbody></table>
-
-                </td></tr>
-
-                <tr>
-                  <td colspan="2">
-                    <div align="center"><span class="textcomment">
-
-                      <?php echo gettext("Use the example below  to format the CSV file. Fields are separated by [,] or [;]");?><br/>
-                      <?php echo gettext("(dot) . is used for decimal format.");?>
-                      <br/>
-                      <a href="importsamples.php?sample=did_Complex" target="superframe"><?php echo gettext("Complex Sample");?></a> -
-                      <a href="importsamples.php?sample=did_Simple" target="superframe"> <?php echo gettext("Simple Sample");?></a>
-                      </span></div>
-
-                        <center>
-                            <iframe name="superframe" src="importsamples.php?sample=did_Simple" BGCOLOR=white	width=600 height=80 marginWidth=10 marginHeight=10  frameBorder=1  scrolling=yes>
-
-                            </iframe>
-                        </center>
-
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2">
-                    <p align="center"><span class="textcomment">
-                      <?php echo gettext("The maximum file size is ");?>
-                      <?php echo $my_max_file_size / 1024?>
-                      KB </span><br>
-                      <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $my_max_file_size?>">
-                      <input type="hidden" name="task" value="upload">
-                      <input name="the_file" type="file" size="50" onFocus=this.select() class="saisie1">
-                      <input type="submit"  value="Import DID" onFocus=this.select() class="form_input_button" name="submit1" onClick="return sendtoupload(this.form);">
-
-                       </p>
-                  </td>
-                </tr>
-
-              </form>
-            </table>
+</tbody>
+</table>
+
+    </td></tr>
+
+    <tr>
+      <td colspan="2">
+        <div align="center"><span class="textcomment">
+
+            <?php echo gettext("Use the example below  to format the CSV file. Fields are separated by [,] or [;]");?><br/>
+            <?php echo gettext("(dot) . is used for decimal format.");?>
+            <br/>
+            <a href="importsamples.php?sample=did_Complex" target="superframe"><?php echo gettext("Complex Sample");?></a> -
+            <a href="importsamples.php?sample=did_Simple" target="superframe"> <?php echo gettext("Simple Sample");?></a>
+            </span></div>
+
+            <center>
+            <iframe name="superframe" src="importsamples.php?sample=did_Simple" BGCOLOR=white	width=600 height=80 marginWidth=10 marginHeight=10  frameBorder=1  scrolling=yes>
+
+            </iframe>
+            </center>
+
+      </td>
+    </tr>
+    <tr>
+        <td colspan="2">
+        <p align="center"><span class="textcomment">
+            <?php echo gettext("The maximum file size is ");?>
+            <?php echo $my_max_file_size / 1024?>
+            KB </span><br>
+            <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $my_max_file_size?>">
+            <input type="hidden" name="task" value="upload">
+            <input name="the_file" type="file" size="50" onFocus=this.select() class="saisie1">
+            <input type="submit"  value="Import DID" onFocus=this.select() class="form_input_button" name="submit1" onClick="return sendtoupload(this.form);">
+
+            </p>
+      </td>
+    </tr>
+
+  </form>
+</table>
 </center>
 
 <?php
diff --git a/admin/Public/A2B_entity_did_import_analyse.php b/admin/Public/A2B_entity_did_import_analyse.php
index 841adb01f..4bde4aeea 100644
--- a/admin/Public/A2B_entity_did_import_analyse.php
+++ b/admin/Public/A2B_entity_did_import_analyse.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -190,7 +190,7 @@
             }
 
             $begin_date = date("Y");
-            $begin_date_plus = date("Y") + 25;
+            $begin_date_plus = date("Y") + 10;
             $end_date = date("-m-d H:i:s");
             $comp_date = "'".$begin_date.$end_date."'";
             $comp_date_plus = "'".$begin_date_plus.$end_date."'";
diff --git a/admin/Public/A2B_entity_did_use.php b/admin/Public/A2B_entity_did_use.php
old mode 100644
new mode 100755
index f4cd5f386..4de37d529
--- a/admin/Public/A2B_entity_did_use.php
+++ b/admin/Public/A2B_entity_did_use.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -65,10 +65,19 @@
     case "release_did":
     echo $CC_help_release_did;
     ?>
-    <FORM action=<?php echo $_SERVER['PHP_SELF']?> id=form1 method=post name=form1>
+    <FORM action=<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?> id=form1 method=post name=form1>
         <INPUT type="hidden" name="did" value="<?php echo $did?>">
         <INPUT type="hidden" name="atmenu" value="<?php echo $atmenu?>">
-        <INPUT type="hidden" name="actionbtn" value="ask_release"><br><br>
+        <INPUT type="hidden" name="actionbtn" value="ask_release">
+        <?php
+            if ($HD_Form->FG_CSRF_STATUS == true) {
+        ?>
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+        <?php
+            }
+        ?>
+        <br><br>
         <br><br>
         <TABLE cellspacing="0" class="delform_table5">
             <tr>
@@ -105,12 +114,22 @@
 if (!isset($actionbtn) || $actionbtn=="ask_release") {
 
 echo $CC_help_list_did_use;
+
 if (!isset($inuse) || $inuse=="")$inuse=1;
 /*<!-- ** ** ** ** ** Part for the research ** ** ** ** ** -->*/?>
     <center>
     <FORM METHOD=POST name="myForm" ACTION="<?php echo $PHP_SELF?>?order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
-    <INPUT TYPE="hidden" NAME="posted" value=1>
-    <INPUT TYPE="hidden" NAME="current_page" value=0>
+        <INPUT TYPE="hidden" NAME="posted" value="1">
+        <INPUT TYPE="hidden" NAME="current_page" value="0">
+        <?php
+            if ($HD_Form->FG_CSRF_STATUS == true) {
+        ?>
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+        <?php
+            }
+        ?>
+
         <table class="bar-status" width="85%" border="0" cellspacing="1" cellpadding="2" align="center">
         <tbody>
         <tr>
diff --git a/admin/Public/A2B_entity_didgroup.php b/admin/Public/A2B_entity_didgroup.php
old mode 100644
new mode 100755
index cbc927153..d60ae57b9
--- a/admin/Public/A2B_entity_didgroup.php
+++ b/admin/Public/A2B_entity_didgroup.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_didx.php b/admin/Public/A2B_entity_didx.php
old mode 100644
new mode 100755
index 09ed3b337..f92f672f1
--- a/admin/Public/A2B_entity_didx.php
+++ b/admin/Public/A2B_entity_didx.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -46,15 +46,12 @@
 
 getpost_ifset(array('country', 'area', 'nxx', 'number', 'ID', 'rating'));
 
-function unavailable()
-{
+function unavailable() {
     return "Sorry, the DID selection service is currently unavailable because of uplink error, please come back and try again later or contact us about available DIDs (include country and area codes to your request).";
 }
 
-function getcountry($arr, $selected=0, $id=0)
-{
-    if($arr === false)
-
+function getcountry($arr, $selected=0, $id=0) {
+    if ($arr === false)
         return unavailable();
     $res = "<select class=\"form_input_select\" name=\"country\" onchange=\"this.form.elements['area'].value=0; this.form.elements['nxx'].value=0; this.form.elements['number'].value=0; this.form.submit();\">\n";
     $res .= "<option value=\"0\">Select a Country</option>\n";
@@ -74,10 +71,8 @@ function getcountry($arr, $selected=0, $id=0)
     return $res;
 }
 
-function getarea($arr, $selected=0)
-{
+function getarea($arr, $selected=0) {
     if($arr === false)
-
         return unavailable();
     $res = "<select class=\"form_input_select\" name=\"area\" onchange=\"this.form.elements['nxx'].value=0; this.form.elements['number'].value=0; this.form.submit();\">\n";
     $res .= "<option value=\"0\">Select an area code</option>\n";
@@ -98,10 +93,8 @@ function getarea($arr, $selected=0)
     return $res;
 }
 
-function getnxx($arr, $selected=0)
-{
+function getnxx($arr, $selected=0) {
     if($arr === false)
-
         return unavailable();
     $res = "<select class=\"form_input_select\" name=\"nxx\" onchange=\"this.form.elements['number'].value=0; this.form.submit();\">\n";
     $res .= "<option value=\"0\">Select rate center</option>\n";
@@ -121,10 +114,8 @@ function getnxx($arr, $selected=0)
     return $res;
 }
 
-function getnumber($arr, $country, $selected=0)
-{
+function getnumber($arr, $country, $selected=0) {
     if($arr === false)
-
         return unavailable();
     $res = "<select class=\"form_input_select\" name=\"number\" onchange=\"this.form.submit();\">\n";
     $res .= "<option value=\"0\">Select a number</option>\n";
@@ -150,16 +141,17 @@ function getnumber($arr, $country, $selected=0)
 $didx = new didx();
 
 if ($form_action == "purchase" || $form_action == "add") {
-    if($form_action == "purchase")
+    if($form_action == "purchase") {
         $form_action = "ask-add";
+    }
     $HD_Form -> init();
     $list = $HD_Form -> perform_action($form_action);
     $smarty->display('main.tpl');
 
-        $res = $didx->BuyDIDByNumber($did,"$did@".DIDX_RING_TO);
-        if($res < 0)
-                echo "Error $res while setting up the DID $did.";
-    else {
+    $res = $didx->BuyDIDByNumber($did,"$did@".DIDX_RING_TO);
+    if ($res < 0) {
+            echo "Error $res while setting up the DID $did.";
+    } else {
         echo "The DID $did successfully purchased on DIDX";
         // #### TOP SECTION PAGE
         $HD_Form -> create_toppage ($form_action);
@@ -167,9 +159,7 @@ function getnumber($arr, $country, $selected=0)
         $HD_Form -> create_form ($form_action, $list, $id=null) ;
     }
 } else {
-
     $smarty->display('main.tpl');
-
     echo $CC_help_list_did;
 
     if (!empty($country))
@@ -205,7 +195,7 @@ function getnumber($arr, $country, $selected=0)
 <div align="center">
 <table>
 <tr><td>
-<FORM action="<?php echo $_SERVER['PHP_SELF']; ?> " method="get">
+<FORM action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL); ?> " method="get">
 <?php
 $res = "<select class=\"form_input_select\" name=\"rating\" onchange=\"this.form.submit();\">\n";
 for ($i=0; $i<=9;$i++) {
diff --git a/admin/Public/A2B_entity_friend.php b/admin/Public/A2B_entity_friend.php
old mode 100644
new mode 100755
index 6e8525357..d679403a3
--- a/admin/Public/A2B_entity_friend.php
+++ b/admin/Public/A2B_entity_friend.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -47,21 +47,23 @@
 $HD_Form -> init();
 
 /********************************* BATCH UPDATE ***********************************/
-getpost_ifset(array('upd_callerid', 'upd_context', 'batchupdate', 'check', 'type', 'mode'));
+getpost_ifset(array('upd_callerid', 'upd_context', 'batchupdate', 'check', 'type', 'mode', 'atmenu'));
+
 
 // CHECK IF REQUEST OF BATCH UPDATE
 if ($batchupdate == 1 && is_array($check)) {
-    $SQL_REFILL="";
-    $HD_Form->prepare_list_subselection('list');
+    $SQL_REFILL = "";
+    $HD_Form -> prepare_list_subselection('list');
 
     // Array ( [upd_simultaccess] => on [upd_currency] => on )
-    $loop_pass=0;
+    $loop_pass = 0;
     $SQL_UPDATE = '';
-    foreach ($check as $ind_field => $ind_val) {
+    foreach($check as $ind_field => $ind_val) {
         //echo "<br>::> $ind_field -";
         $myfield = substr($ind_field,4);
-        if ($loop_pass!=0) $SQL_UPDATE.=',';
-
+        if ($loop_pass != 0) {
+            $SQL_UPDATE.=',';
+        }
         // Standard update mode
         if (!isset($mode["$ind_field"]) || $mode["$ind_field"]==1) {
             if (!isset($type["$ind_field"])) {
@@ -96,14 +98,12 @@
     if (!$HD_Form -> DBHandle -> Execute("begin")) {
         $update_msg = $update_msg_error;
     } else {
-
         if (!$HD_Form -> DBHandle -> Execute($SQL_UPDATE)) {
             $update_msg = $update_msg_error;
         }
         if (! $res = $HD_Form -> DBHandle -> Execute("commit")) {
             $update_msg = '<center><font color="green"><b>'.gettext('The batch update has been successfully perform!').'</b></font></center>';
         }
-
     };
 }
 
@@ -134,8 +134,11 @@
     $instance_table_friend = new Table('cc_card');
     $instance_table_friend -> Update_table ($HD_Form -> DBHandle, $friend_param_update, "id='$id_cc_card'", $func_table = null);
 
-    if ( $form_action == "add_sip" )	$TABLE_BUDDY = 'cc_sip_buddies';
-    else 	$TABLE_BUDDY = 'cc_iax_buddies';
+    if ($form_action == "add_sip") {
+        $TABLE_BUDDY = 'cc_sip_buddies';
+    } else {
+        $TABLE_BUDDY = 'cc_iax_buddies';
+    }
 
     $instance_table_friend = new Table($TABLE_BUDDY,'*');
     $list_friend = $instance_table_friend -> Get_list ($HD_Form -> DBHandle, "id_cc_card='$id_cc_card'", null, null, null, null);
@@ -161,10 +164,10 @@
     $HD_Form->_vars = array_merge((array) $_GET, (array) $_POST);
 }
 
-$HD_Form -> FG_EDITION_LINK	= $_SERVER['PHP_SELF']."?form_action=ask-edit&atmenu=$atmenu&id=";
-$HD_Form -> FG_DELETION_LINK = $_SERVER['PHP_SELF']."?form_action=ask-delete&atmenu=$atmenu&id=";
+$HD_Form -> FG_EDITION_LINK = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?form_action=ask-edit&atmenu=$atmenu&id=";
+$HD_Form -> FG_DELETION_LINK = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?form_action=ask-delete&atmenu=$atmenu&id=";
 
-if ($id!="" || !is_null($id)) {
+if ($id != "" || !is_null($id)) {
     $HD_Form -> FG_EDITION_CLAUSE = str_replace("%id", "$id", $HD_Form -> FG_EDITION_CLAUSE);
 }
 
@@ -176,9 +179,9 @@
     if ($form_action == "add" || $form_action == "edit" || $form_action == "delete") {
         if ($atmenu=='sip') {
             $key = "sip_changed";
-          } else {
-              $key = "iax_changed";
-          }
+        } else {
+            $key = "iax_changed";
+        }
         if ($_SESSION["user_type"]=="ADMIN") {$who= Notification::$ADMIN;$id=$_SESSION['admin_id'];} elseif ($_SESSION["user_type"]=="AGENT") {$who= Notification::$AGENT;$id=$_SESSION['agent_id'];} else {$who=Notification::$UNKNOWN;$id=-1;}
         NotificationsDAO::AddNotification($key,Notification::$HIGH,$who,$id);
     }
@@ -197,12 +200,24 @@
     if (!USE_REALTIME) {
     ?>
           <table width="<?php echo $HD_Form -> FG_HTML_TABLE_WIDTH?>" border="0" align="center" cellpadding="0" cellspacing="0" >
-            <TR><TD  align="center"> <?php echo gettext("Link to Generate on SIP/IAX Friends")?> &nbsp;:&nbsp;
-            </TD></TR>
-            <TR><TD  align="center">
-            <b><?php echo gettext("Realtime not active, you have to use the conf file for your system"); ?></b>
-            </TD></TR>
-            <TR><FORM NAME="sipfriend">
+            <TR>
+                <TD  align="center"> <?php echo gettext("Link to Generate on SIP/IAX Friends")?> &nbsp;:&nbsp;</TD>
+            </TR>
+            <TR>
+                <TD  align="center">
+                <b><?php echo gettext("Realtime not active, you have to use the conf file for your system"); ?></b>
+                </TD>
+            </TR>
+            <TR>
+            <FORM NAME="sipfriend">
+                <?php
+                    if ($HD_Form->FG_CSRF_STATUS == true) {
+                ?>
+                    <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+                    <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+                <?php
+                    }
+                ?>
                 <td height="31" style="padding-left: 5px; padding-right: 3px;" align="center" >
                 <b>
                 SIP : <input class="form_input_button"  TYPE="button" VALUE=" <?php echo gettext("GENERATE ADDITIONAL_A2BILLING_SIP.CONF"); ?> "
@@ -229,22 +244,29 @@
 <div align="center">
 <table width="40%" border="0" align="center" cellpadding="0" cellspacing="1">
     <tr>
-      <td  class="bgcolor_021">
-      <table width="100%" border="0" cellspacing="1" cellpadding="0">
-          <form name="form1" method="post" action="">
-          <tr>
-            <td bgcolor="#FFFFFF" class="fontstyle_006" width="100%">&nbsp;<?php echo gettext("CONFIGURATION TYPE")?> </td>
-            <td bgcolor="#FFFFFF" class="fontstyle_006" align="center">
-               <select name="atmenu" id="col_configtype" onChange="window.document.form1.elements['PMChange'].value='Change';window.document.form1.submit();">
-                 <option value="iax" <?php if($atmenu == "iax")echo "selected"?>><?php echo gettext("IAX")?></option>
-                 <option value="sip" <?php if($atmenu == "sip")echo "selected"?>><?php echo gettext("SIP")?></option>
-               </select>
-              <input name="PMChange" type="hidden" id="PMChange">
-
-            </td>
-          </tr>
-          </form>
-      </table></td>
+        <td  class="bgcolor_021">
+        <table width="100%" border="0" cellspacing="1" cellpadding="0">
+            <FORM name="form1" method="post" action="">
+            <?php
+              if ($HD_Form->FG_CSRF_STATUS == true) {
+            ?>
+                <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+                <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+            <?php
+                }
+            ?>
+            <tr>
+                <td bgcolor="#FFFFFF" class="fontstyle_006" width="100%">&nbsp;<?php echo gettext("CONFIGURATION TYPE")?> </td>
+                <td bgcolor="#FFFFFF" class="fontstyle_006" align="center">
+                   <select name="atmenu" id="col_configtype" onChange="window.document.form1.elements['PMChange'].value='Change';window.document.form1.submit();">
+                     <option value="iax" <?php if($atmenu == "iax")echo "selected"?>><?php echo gettext("IAX")?></option>
+                     <option value="sip" <?php if($atmenu == "sip")echo "selected"?>><?php echo gettext("SIP")?></option>
+                   </select>
+                  <input name="PMChange" type="hidden" id="PMChange">
+                </td>
+            </tr>
+            </FORM>
+        </table></td>
     </tr>
 </table>
 </div>
@@ -257,42 +279,49 @@
 
 <center>
 <b>&nbsp;<?php echo $HD_Form -> FG_NB_RECORD ?> <?php echo gettext("cards selected!"); ?>&nbsp;<?php echo gettext("Use the options below to batch update the selected cards.");?></b>
-       <table align="center" border="0" width="65%"  cellspacing="1" cellpadding="2">
-        <tbody>
-        <form name="updateForm" action="<?php echo $_SERVER['PHP_SELF']?>" method="post">
+    <table align="center" border="0" width="65%"  cellspacing="1" cellpadding="2">
+    <tbody>
+    <form name="updateForm" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>" method="post">
+        <?php
+            if ($HD_Form->FG_CSRF_STATUS == true) {
+        ?>
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+        <?php
+            }
+        ?>
         <INPUT type="hidden" name="batchupdate" value="1">
         <tr>
-          <td align="left" class="bgcolor_001" >
-                  <input name="check[upd_callerid]" type="checkbox" <?php if ($check["upd_callerid"]=="on") echo "checked"?>>
-          </td>
-          <td align="left"  class="bgcolor_001">
+            <td align="left" class="bgcolor_001" >
+                <input name="check[upd_callerid]" type="checkbox" <?php if ($check["upd_callerid"]=="on") echo "checked"?>>
+            </td>
+            <td align="left"  class="bgcolor_001">
                 1)&nbsp;<?php echo gettext("CallerID"); ?>&nbsp;:
                 <input class="form_input_text"  name="upd_callerid" size="30" maxlength="40" value="<?php if (isset($upd_callerid)) echo $upd_callerid;?>">
                 <br/>
-          </td>
+            </td>
         </tr>
 
         <tr>
-          <td align="left" class="bgcolor_001" >
-                  <input name="check[upd_context]" type="checkbox" <?php if ($check["upd_context"]=="on") echo "checked"?>>
-          </td>
-          <td align="left"  class="bgcolor_001">
+            <td align="left" class="bgcolor_001" >
+                <input name="check[upd_context]" type="checkbox" <?php if ($check["upd_context"]=="on") echo "checked"?>>
+            </td>
+            <td align="left"  class="bgcolor_001">
                 2)&nbsp;<?php echo gettext("Context"); ?>&nbsp;:
                 <input class="form_input_text"  name="upd_context" size="30" maxlength="40" value="<?php if (isset($upd_context)) echo $upd_context;?>">
                 <br/>
-          </td>
+            </td>
         </tr>
-
         <tr>
             <td align="right" class="bgcolor_001"></td>
-             <td align="right"  class="bgcolor_001">
+            <td align="right"  class="bgcolor_001">
                 <input class="form_input_button"  value=" <?php echo gettext("BATCH UPDATE VOIP SETTINGS");?>  " type="submit">
             </td>
         </tr>
-        </form>
-        </table>
-</center>
-    </div>
+    </form>
+    </table>
+  </center>
+  </div>
 </div>
 <!-- ** ** ** ** ** Part for the Update ** ** ** ** ** -->
 
diff --git a/admin/Public/A2B_entity_invoice.php b/admin/Public/A2B_entity_invoice.php
old mode 100644
new mode 100755
index 288c3608a..e1916f579
--- a/admin/Public/A2B_entity_invoice.php
+++ b/admin/Public/A2B_entity_invoice.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -108,10 +108,10 @@
 <script type="text/javascript">
 $(document).ready(function () {
     $('.lock').click(function () {
-            $.get("A2B_entity_invoice.php", { id: ""+ this.id, action: "lock" },
-                  function(data){
-                    location.reload(true);
-                  });
+        $.get("A2B_entity_invoice.php", { id: ""+ this.id, action: "lock" },
+            function(data){
+                location.reload(true);
             });
+        });
 });
 </script>
diff --git a/admin/Public/A2B_entity_invoice_conf.php b/admin/Public/A2B_entity_invoice_conf.php
old mode 100644
new mode 100755
index 5ef5ff6a0..b1c0d0194
--- a/admin/Public/A2B_entity_invoice_conf.php
+++ b/admin/Public/A2B_entity_invoice_conf.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_log_viewer.php b/admin/Public/A2B_entity_log_viewer.php
old mode 100644
new mode 100755
index 10c712c2f..46ec3ba59
--- a/admin/Public/A2B_entity_log_viewer.php
+++ b/admin/Public/A2B_entity_log_viewer.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -70,163 +70,171 @@
 <FORM METHOD=POST name="myForm" ACTION="<?php echo $PHP_SELF?>?s=1&t=0&order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
     <INPUT TYPE="hidden" NAME="posted" value=1>
     <INPUT TYPE="hidden" NAME="current_page" value=0>
-        <table class="bar-status" width="85%" border="0" cellspacing="1" cellpadding="2" align="center">
-            <tbody>
-            <?php  if ($_SESSION["pr_groupID"]==2 && is_numeric($_SESSION["pr_IDCust"])) { ?>
-            <?php  } else { ?>
-            <tr>
-                <td align="left" valign="top" class="bgcolor_004">
-                    <font class="fontstyle_003">&nbsp;&nbsp;<?php echo gettext("CUSTOMERS");?></font>
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
+    <table class="bar-status" width="85%" border="0" cellspacing="1" cellpadding="2" align="center">
+        <tbody>
+        <?php  if ($_SESSION["pr_groupID"]==2 && is_numeric($_SESSION["pr_IDCust"])) { ?>
+        <?php  } else { ?>
+        <tr>
+            <td align="left" valign="top" class="bgcolor_004">
+                <font class="fontstyle_003">&nbsp;&nbsp;<?php echo gettext("CUSTOMERS");?></font>
+            </td>
+            <td class="bgcolor_005" align="left">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0"><tr>
+                <td class="fontstyle_searchoptions">
+                    <?php echo gettext("ADMIN USER");?>: <INPUT TYPE="text" NAME="enteradmin" value="<?php echo $enteradmin?>" class="form_input_text">
+                    <a href="#" onclick="window.open('A2B_entity_user.php?popup_select=1&popup_formname=myForm&popup_fieldname=enteradmin' , 'AdminSelection','scrollbars=1,width=550,height=330,top=20,left=100,scrollbars=1');"><img src="<?php echo Images_Path;?>/icon_arrow_orange.gif"></a>
                 </td>
-                <td class="bgcolor_005" align="left">
-                <table width="100%" border="0" cellspacing="0" cellpadding="0"><tr>
-                    <td class="fontstyle_searchoptions">
-                        <?php echo gettext("ADMIN USER");?>: <INPUT TYPE="text" NAME="enteradmin" value="<?php echo $enteradmin?>" class="form_input_text">
-                        <a href="#" onclick="window.open('A2B_entity_user.php?popup_select=1&popup_formname=myForm&popup_fieldname=enteradmin' , 'AdminSelection','scrollbars=1,width=550,height=330,top=20,left=100,scrollbars=1');"><img src="<?php echo Images_Path;?>/icon_arrow_orange.gif"></a>
-                    </td>
-                </tr></table></td>
-            </tr>
-            <?php  }?>
-            <tr>
-                <td class="bgcolor_002" align="left">
-
-                    <input type="radio" name="Period" value="Month" <?php  if (($Period=="Month") || !isset($Period)) { ?>checked="checked" <?php  } ?>>
-                    <font class="fontstyle_003"><?php echo gettext("SELECT MONTH");?></font>
-                </td>
-                  <td class="bgcolor_003" align="left">
-                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                    <tr><td class="fontstyle_searchoptions">
-                      <input type="checkbox" name="frommonth" value="true" <?php  if ($frommonth) { ?>checked<?php }?>>
-                    <?php echo gettext("From");?> : <select name="fromstatsmonth" class="form_input_select">
+            </tr></table></td>
+        </tr>
+        <?php  }?>
+        <tr>
+            <td class="bgcolor_002" align="left">
+
+                <input type="radio" name="Period" value="Month" <?php  if (($Period=="Month") || !isset($Period)) { ?>checked="checked" <?php  } ?>>
+                <font class="fontstyle_003"><?php echo gettext("SELECT MONTH");?></font>
+            </td>
+              <td class="bgcolor_003" align="left">
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                <tr><td class="fontstyle_searchoptions">
+                  <input type="checkbox" name="frommonth" value="true" <?php  if ($frommonth) { ?>checked<?php }?>>
+                <?php echo gettext("From");?> : <select name="fromstatsmonth" class="form_input_select">
+                <?php
+                    $monthname = array( gettext("January"), gettext("February"),gettext("March"), gettext("April"), gettext("May"), gettext("June"), gettext("July"), gettext("August"), gettext("September"), gettext("October"), gettext("November"), gettext("December"));
+                    $year_actual = date("Y");
+                    for ($i=$year_actual;$i >= $year_actual-1;$i--) {
+                       if ($year_actual==$i) {
+                        $monthnumber = date("n")-1; // Month number without lead 0.
+                       } else {
+                        $monthnumber=11;
+                       }
+                       for ($j=$monthnumber;$j>=0;$j--) {
+                        $month_formated = sprintf("%02d",$j+1);
+                           if ($fromstatsmonth=="$i-$month_formated")	$selected="selected";
+                        else $selected="";
+                        echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
+                       }
+                    }
+                ?>
+                </select>
+                </td><td  class="fontstyle_searchoptions">&nbsp;&nbsp;
+                <input type="checkbox" name="tomonth" value="true" <?php  if ($tomonth) { ?>checked<?php }?>>
+                <?php echo gettext("To");?> : <select name="tostatsmonth" class="form_input_select">
+                <?php 	$year_actual = date("Y");
+                    for ($i=$year_actual;$i >= $year_actual-1;$i--) {
+                       if ($year_actual==$i) {
+                        $monthnumber = date("n")-1; // Month number without lead 0.
+                       } else {
+                        $monthnumber=11;
+                       }
+                       for ($j=$monthnumber;$j>=0;$j--) {
+                        $month_formated = sprintf("%02d",$j+1);
+                           if ($tostatsmonth=="$i-$month_formated") $selected="selected";
+                        else $selected="";
+                        echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
+                       }
+                    }
+                ?>
+                </select>
+                </td></tr></table>
+              </td>
+        </tr>
+
+        <tr>
+            <td align="left" class="bgcolor_004">
+                <input type="radio" name="Period" value="Day" <?php  if ($Period=="Day") { ?>checked="checked" <?php  } ?>>
+                <font class="fontstyle_003"><?php echo gettext("SELECT DAY");?></font>
+            </td>
+              <td align="left" class="bgcolor_005">
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                <tr><td class="fontstyle_searchoptions">
+                  <input type="checkbox" name="fromday" value="true" <?php  if ($fromday) { ?>checked<?php }?>> <?php echo gettext("From");?> :
+                <select name="fromstatsday_sday" class="form_input_select">
                     <?php
-                        $monthname = array( gettext("January"), gettext("February"),gettext("March"), gettext("April"), gettext("May"), gettext("June"), gettext("July"), gettext("August"), gettext("September"), gettext("October"), gettext("November"), gettext("December"));
-                        $year_actual = date("Y");
-                        for ($i=$year_actual;$i >= $year_actual-1;$i--) {
-                           if ($year_actual==$i) {
+                    for ($i=1;$i<=31;$i++) {
+                        if ($fromstatsday_sday==sprintf("%02d",$i)) $selected="selected";
+                        else	$selected="";
+                        echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
+                    }
+                    ?>
+                </select>
+                 <select name="fromstatsmonth_sday" class="form_input_select">
+                <?php 	$year_actual = date("Y");
+                    for ($i=$year_actual;$i >= $year_actual-1;$i--) {
+                        if ($year_actual==$i) {
                             $monthnumber = date("n")-1; // Month number without lead 0.
-                           } else {
+                        } else {
                             $monthnumber=11;
-                           }
-                           for ($j=$monthnumber;$j>=0;$j--) {
+                        }
+                        for ($j=$monthnumber;$j>=0;$j--) {
                             $month_formated = sprintf("%02d",$j+1);
-                               if ($fromstatsmonth=="$i-$month_formated")	$selected="selected";
+                            if ($fromstatsmonth_sday=="$i-$month_formated") $selected="selected";
                             else $selected="";
                             echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
-                           }
                         }
-                    ?>
-                    </select>
-                    </td><td  class="fontstyle_searchoptions">&nbsp;&nbsp;
-                    <input type="checkbox" name="tomonth" value="true" <?php  if ($tomonth) { ?>checked<?php }?>>
-                    <?php echo gettext("To");?> : <select name="tostatsmonth" class="form_input_select">
-                    <?php 	$year_actual = date("Y");
-                        for ($i=$year_actual;$i >= $year_actual-1;$i--) {
-                           if ($year_actual==$i) {
+                    }
+                ?>
+                </select>
+                </td><td class="fontstyle_searchoptions">&nbsp;&nbsp;
+                <input type="checkbox" name="today" value="true" <?php  if ($today) { ?>checked<?php }?>>
+                <?php echo gettext("To");?>  :
+                <select name="tostatsday_sday" class="form_input_select">
+                <?php
+                    for ($i=1;$i<=31;$i++) {
+                        if ($tostatsday_sday==sprintf("%02d",$i)) {$selected="selected";} else {$selected="";}
+                        echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
+                    }
+                ?>
+                </select>
+                 <select name="tostatsmonth_sday" class="form_input_select">
+                <?php 	$year_actual = date("Y");
+                    for ($i=$year_actual;$i >= $year_actual-1;$i--) {
+                        if ($year_actual==$i) {
                             $monthnumber = date("n")-1; // Month number without lead 0.
-                           } else {
+                        } else {
                             $monthnumber=11;
-                           }
-                           for ($j=$monthnumber;$j>=0;$j--) {
-                            $month_formated = sprintf("%02d",$j+1);
-                               if ($tostatsmonth=="$i-$month_formated") $selected="selected";
-                            else $selected="";
-                            echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
-                           }
                         }
-                    ?>
-                    </select>
-                    </td></tr></table>
-                  </td>
-            </tr>
-
-            <tr>
-                <td align="left" class="bgcolor_004">
-                    <input type="radio" name="Period" value="Day" <?php  if ($Period=="Day") { ?>checked="checked" <?php  } ?>>
-                    <font class="fontstyle_003"><?php echo gettext("SELECT DAY");?></font>
-                </td>
-                  <td align="left" class="bgcolor_005">
-                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                    <tr><td class="fontstyle_searchoptions">
-                      <input type="checkbox" name="fromday" value="true" <?php  if ($fromday) { ?>checked<?php }?>> <?php echo gettext("From");?> :
-                    <select name="fromstatsday_sday" class="form_input_select">
-                        <?php
-                        for ($i=1;$i<=31;$i++) {
-                            if ($fromstatsday_sday==sprintf("%02d",$i)) $selected="selected";
+                        for ($j=$monthnumber;$j>=0;$j--) {
+                            $month_formated = sprintf("%02d",$j+1);
+                               if ($tostatsmonth_sday=="$i-$month_formated") $selected="selected";
                             else	$selected="";
-                            echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
-                        }
-                        ?>
-                    </select>
-                     <select name="fromstatsmonth_sday" class="form_input_select">
-                    <?php 	$year_actual = date("Y");
-                        for ($i=$year_actual;$i >= $year_actual-1;$i--) {
-                            if ($year_actual==$i) {
-                                $monthnumber = date("n")-1; // Month number without lead 0.
-                            } else {
-                                $monthnumber=11;
-                            }
-                            for ($j=$monthnumber;$j>=0;$j--) {
-                                $month_formated = sprintf("%02d",$j+1);
-                                if ($fromstatsmonth_sday=="$i-$month_formated") $selected="selected";
-                                else $selected="";
-                                echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
-                            }
-                        }
-                    ?>
-                    </select>
-                    </td><td class="fontstyle_searchoptions">&nbsp;&nbsp;
-                    <input type="checkbox" name="today" value="true" <?php  if ($today) { ?>checked<?php }?>>
-                    <?php echo gettext("To");?>  :
-                    <select name="tostatsday_sday" class="form_input_select">
-                    <?php
-                        for ($i=1;$i<=31;$i++) {
-                            if ($tostatsday_sday==sprintf("%02d",$i)) {$selected="selected";} else {$selected="";}
-                            echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
-                        }
-                    ?>
-                    </select>
-                     <select name="tostatsmonth_sday" class="form_input_select">
-                    <?php 	$year_actual = date("Y");
-                        for ($i=$year_actual;$i >= $year_actual-1;$i--) {
-                            if ($year_actual==$i) {
-                                $monthnumber = date("n")-1; // Month number without lead 0.
-                            } else {
-                                $monthnumber=11;
-                            }
-                            for ($j=$monthnumber;$j>=0;$j--) {
-                                $month_formated = sprintf("%02d",$j+1);
-                                   if ($tostatsmonth_sday=="$i-$month_formated") $selected="selected";
-                                else	$selected="";
-                                echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
-                            }
+                            echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
                         }
-                    ?>
-                    </select>
-                    </td></tr></table>
-                  </td>
-            </tr>
-            <tr>
-                <td class="bgcolor_002" align="left">
-                    <font class="fontstyle_003">&nbsp;&nbsp;<?php echo gettext("LOG LEVEL");?></font>
-                </td>
-                <td class="bgcolor_003" align="left">
-                <select name="loglevel" style="width:90px;">
-                <option value="0" <?php if ($loglevel == 0) echo "selected"?>>ALL</option>
-                <option value="1" <?php if ($loglevel == 1) echo "selected"?>>Level-1</option>
-                <option value="2" <?php if ($loglevel == 2) echo "selected"?>>Level-2</option>
-                <option value="3" <?php if ($loglevel == 3) echo "selected"?>>Level-3</option>
+                    }
+                ?>
                 </select>
-                </td>
-            </tr>
-            <tr>
-                <td class="bgcolor_004" align="left" > </td>
-
-                <td class="bgcolor_005" align="center" >
-                    <input type="image"  name="image16" align="top" border="0" src="<?php echo Images_Path;?>/button-search.gif" />
-
-                  </td>
-            </tr>
-        </tbody></table>
+                </td></tr></table>
+              </td>
+        </tr>
+        <tr>
+            <td class="bgcolor_002" align="left">
+                <font class="fontstyle_003">&nbsp;&nbsp;<?php echo gettext("LOG LEVEL");?></font>
+            </td>
+            <td class="bgcolor_003" align="left">
+            <select name="loglevel" style="width:90px;">
+            <option value="0" <?php if ($loglevel == 0) echo "selected"?>>ALL</option>
+            <option value="1" <?php if ($loglevel == 1) echo "selected"?>>Level-1</option>
+            <option value="2" <?php if ($loglevel == 2) echo "selected"?>>Level-2</option>
+            <option value="3" <?php if ($loglevel == 3) echo "selected"?>>Level-3</option>
+            </select>
+            </td>
+        </tr>
+        <tr>
+            <td class="bgcolor_004" align="left" > </td>
+
+            <td class="bgcolor_005" align="center" >
+                <input type="image"  name="image16" align="top" border="0" src="<?php echo Images_Path;?>/button-search.gif" />
+
+              </td>
+        </tr>
+    </tbody></table>
 </FORM>
 
 <?php
diff --git a/admin/Public/A2B_entity_logrefill.php b/admin/Public/A2B_entity_logrefill.php
old mode 100644
new mode 100755
index 138593224..5dad0e171
--- a/admin/Public/A2B_entity_logrefill.php
+++ b/admin/Public/A2B_entity_logrefill.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_logrefill_agent.php b/admin/Public/A2B_entity_logrefill_agent.php
index cfdebd63c..739da089d 100755
--- a/admin/Public/A2B_entity_logrefill_agent.php
+++ b/admin/Public/A2B_entity_logrefill_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_mailtemplate.php b/admin/Public/A2B_entity_mailtemplate.php
old mode 100644
new mode 100755
index 95b698469..4423f6e0a
--- a/admin/Public/A2B_entity_mailtemplate.php
+++ b/admin/Public/A2B_entity_mailtemplate.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -43,7 +43,7 @@
     die();
 }
 
-getpost_ifset(array('languages','id','action'));
+getpost_ifset(array('languages', 'id', 'action'));
 
 if ($action=="load") {
     $DBHandle=DbConnect();
@@ -59,9 +59,7 @@
 if ($popup_select) {
 ?>
 <SCRIPT LANGUAGE="javascript">
-<!-- Begin
-function sendValue(selvalue)
-{
+function sendValue(selvalue) {
     $.getJSON("A2B_entity_mailtemplate.php", { id: ""+ selvalue, action: "load" },
     function(data){
         window.opener.document.getElementById('msg_mail').value = data.messagetext;
@@ -71,7 +69,6 @@ function(data){
         window.close();
     });
 }
-// End -->
 </script>
 <?php
 }
@@ -98,23 +95,23 @@ function(data){
 ?>
 <table align="center" class="bgcolor_001" border="0" width="30%">
     <tr>
-        <form name="theForm" action="<?php echo $_SERVER['PHP_SELF'] ?>">
+        <form name="theForm" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) ?>">
           <?php if ($popup_select) { ?>
                   <input type="hidden" name="popup_select" value="<?php echo $popup_select; ?>" />
           <?php } ?>
           <td align="left" width="75%">
-                    <?php
-                        $handle = DbConnect();
-                        $instance_table = new Table();
-                        $QUERY =  "SELECT code, name FROM cc_iso639 order by code";
-                        $result = $instance_table -> SQLExec ($handle, $QUERY);
-                        if (is_array($result)) {
-                            $num_cur = count($result);
-                            for ($i=0;$i<$num_cur;$i++) {
-                                $languages_list[$result[$i][0]] = array (0 => $result[$i][0], 1 => $result[$i][1]);
-                            }
+                <?php
+                    $handle = DbConnect();
+                    $instance_table = new Table();
+                    $QUERY =  "SELECT code, name FROM cc_iso639 order by code";
+                    $result = $instance_table -> SQLExec ($handle, $QUERY);
+                    if (is_array($result)) {
+                        $num_cur = count($result);
+                        for ($i=0;$i<$num_cur;$i++) {
+                            $languages_list[$result[$i][0]] = array (0 => $result[$i][0], 1 => $result[$i][1]);
                         }
-                    ?>
+                    }
+                ?>
                 <select NAME="languages" size="1" class="form_input_select" onChange="form.submit()">
                     <?php
                     foreach ($languages_list as $key => $lang_value) {
diff --git a/admin/Public/A2B_entity_moneysituation.php b/admin/Public/A2B_entity_moneysituation.php
old mode 100644
new mode 100755
index ace0ec962..148ccfdcb
--- a/admin/Public/A2B_entity_moneysituation.php
+++ b/admin/Public/A2B_entity_moneysituation.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_moneysituation_details.php b/admin/Public/A2B_entity_moneysituation_details.php
old mode 100644
new mode 100755
index fbe56b3b3..ff0e59d82
--- a/admin/Public/A2B_entity_moneysituation_details.php
+++ b/admin/Public/A2B_entity_moneysituation_details.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_monitor.php b/admin/Public/A2B_entity_monitor.php
old mode 100644
new mode 100755
index 837e5b6ea..cb7a9173e
--- a/admin/Public/A2B_entity_monitor.php
+++ b/admin/Public/A2B_entity_monitor.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_outbound_cid.php b/admin/Public/A2B_entity_outbound_cid.php
old mode 100644
new mode 100755
index a58900c33..902c50fb5
--- a/admin/Public/A2B_entity_outbound_cid.php
+++ b/admin/Public/A2B_entity_outbound_cid.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_outbound_cidgroup.php b/admin/Public/A2B_entity_outbound_cidgroup.php
old mode 100644
new mode 100755
index 6db0af276..264f63106
--- a/admin/Public/A2B_entity_outbound_cidgroup.php
+++ b/admin/Public/A2B_entity_outbound_cidgroup.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_package.php b/admin/Public/A2B_entity_package.php
old mode 100644
new mode 100755
index 9c0dbfbaa..46a437596
--- a/admin/Public/A2B_entity_package.php
+++ b/admin/Public/A2B_entity_package.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_password.php b/admin/Public/A2B_entity_password.php
index 8fc9be2ba..5eab2e67a 100755
--- a/admin/Public/A2B_entity_password.php
+++ b/admin/Public/A2B_entity_password.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -48,9 +48,8 @@
 ));
 
 $DBHandle = DbConnect();
-echo $form_action;
-if ($form_action == "ask-modif") {
 
+if ($form_action == "ask-modif") {
     check_demo_mode();
 
     $table_old_pwd = new Table("cc_ui_authen", " login");
@@ -77,28 +76,23 @@ function CheckPassword()
     if (document.frmPass.NewPassword.value =='') {
         alert('<?php echo gettext("No value in New Password entered")?>');
         document.frmPass.NewPassword.focus();
-
         return false;
     }
     if (document.frmPass.CNewPassword.value =='') {
         alert('<?php echo gettext("No Value in Confirm New Password entered")?>');
         document.frmPass.CNewPassword.focus();
-
         return false;
     }
     if (document.frmPass.NewPassword.value.length < 5) {
         alert('<?php echo gettext("Password length should be greater than or equal to 5")?>');
         document.frmPass.NewPassword.focus();
-
         return false;
     }
     if (document.frmPass.CNewPassword.value != document.frmPass.NewPassword.value) {
         alert('<?php echo gettext("Value mismatch, New Password should be equal to Confirm New Password")?>');
         document.frmPass.NewPassword.focus();
-
         return false;
     }
-
     return true;
 }
 </script>
diff --git a/admin/Public/A2B_entity_payment.php b/admin/Public/A2B_entity_payment.php
old mode 100644
new mode 100755
index 33d3d2ca2..126bca08f
--- a/admin/Public/A2B_entity_payment.php
+++ b/admin/Public/A2B_entity_payment.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_payment_agent.php b/admin/Public/A2B_entity_payment_agent.php
index 52eb0b356..48c4899e4 100755
--- a/admin/Public/A2B_entity_payment_agent.php
+++ b/admin/Public/A2B_entity_payment_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_payment_configuration.php b/admin/Public/A2B_entity_payment_configuration.php
old mode 100644
new mode 100755
index 7a338b98d..b21ce4f11
--- a/admin/Public/A2B_entity_payment_configuration.php
+++ b/admin/Public/A2B_entity_payment_configuration.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_payment_invoice.php b/admin/Public/A2B_entity_payment_invoice.php
index b5cb99254..edd17e24b 100755
--- a/admin/Public/A2B_entity_payment_invoice.php
+++ b/admin/Public/A2B_entity_payment_invoice.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -64,7 +64,7 @@ function sendValue(selvalue)
 {
      // redirect browser to the grabbed value (hopefully a URL)
     window.opener.location.href= <?php echo '"A2B_invoice_manage_payment.php?id='.$invoice.'&addpayment="'; ?>+selvalue;
-    self.location.href = "<?php echo $_SERVER['PHP_SELF']."?popup_select=1&invoice=$invoice&card=$card"?>";
+    self.location.href = "<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?popup_select=1&invoice=$invoice&card=$card"?>";
 }
 // End -->
 </script>
diff --git a/admin/Public/A2B_entity_payment_settings.php b/admin/Public/A2B_entity_payment_settings.php
old mode 100644
new mode 100755
index df8105c5f..94ffc663b
--- a/admin/Public/A2B_entity_payment_settings.php
+++ b/admin/Public/A2B_entity_payment_settings.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_paymentlog.php b/admin/Public/A2B_entity_paymentlog.php
old mode 100644
new mode 100755
index 47edccac2..cb7d9e513
--- a/admin/Public/A2B_entity_paymentlog.php
+++ b/admin/Public/A2B_entity_paymentlog.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_paymentlog_agent.php b/admin/Public/A2B_entity_paymentlog_agent.php
index 5213a8956..a47b617e2 100755
--- a/admin/Public/A2B_entity_paymentlog_agent.php
+++ b/admin/Public/A2B_entity_paymentlog_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -72,149 +72,156 @@
 
 ?>
 <FORM METHOD=POST name="myForm" ACTION="<?php echo $PHP_SELF?>?s=1&t=0&order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
-    <INPUT TYPE="hidden" NAME="posted" value=1>
-    <INPUT TYPE="hidden" NAME="current_page" value=0>
-        <table class="bar-status" width="85%" border="0" cellspacing="1" cellpadding="2" align="center">
-            <tbody>
-            <tr>
-                <td class="bgcolor_002" align="left">
-
-                    <input type="radio" name="Period" value="Month" <?php  if (($Period=="Month") || !isset($Period)) { ?>checked="checked" <?php  } ?>>
-                    <font class="fontstyle_003"><?php echo gettext("SELECT MONTH");?></font>
-                </td>
-                  <td class="bgcolor_003" align="left">
-                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                    <tr><td class="fontstyle_searchoptions">
-                      <input type="checkbox" name="frommonth" value="true" <?php  if ($frommonth) { ?>checked<?php }?>>
-                    <?php echo gettext("From");?> : <select name="fromstatsmonth" class="form_input_select">
+    <INPUT TYPE="hidden" NAME="posted" value="1">
+    <INPUT TYPE="hidden" NAME="current_page" value="0">
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
+    <table class="bar-status" width="85%" border="0" cellspacing="1" cellpadding="2" align="center">
+        <tbody>
+        <tr>
+            <td class="bgcolor_002" align="left">
+                <input type="radio" name="Period" value="Month" <?php  if (($Period=="Month") || !isset($Period)) { ?>checked="checked" <?php  } ?>>
+                <font class="fontstyle_003"><?php echo gettext("SELECT MONTH");?></font>
+            </td>
+              <td class="bgcolor_003" align="left">
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                <tr><td class="fontstyle_searchoptions">
+                  <input type="checkbox" name="frommonth" value="true" <?php  if ($frommonth) { ?>checked<?php }?>>
+                <?php echo gettext("From");?> : <select name="fromstatsmonth" class="form_input_select">
+                <?php
+                    $monthname = array( gettext("January"), gettext("February"),gettext("March"), gettext("April"), gettext("May"), gettext("June"), gettext("July"), gettext("August"), gettext("September"), gettext("October"), gettext("November"), gettext("December"));
+                    $year_actual = date("Y");
+                    for ($i=$year_actual;$i >= $year_actual-1;$i--) {
+                       if ($year_actual==$i) {
+                        $monthnumber = date("n")-1; // Month number without lead 0.
+                       } else {
+                        $monthnumber=11;
+                       }
+                       for ($j=$monthnumber;$j>=0;$j--) {
+                        $month_formated = sprintf("%02d",$j+1);
+                           if ($fromstatsmonth=="$i-$month_formated")	$selected="selected";
+                        else $selected="";
+                        echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
+                       }
+                    }
+                ?>
+                </select>
+                </td><td  class="fontstyle_searchoptions">&nbsp;&nbsp;
+                <input type="checkbox" name="tomonth" value="true" <?php  if ($tomonth) { ?>checked<?php }?>>
+                <?php echo gettext("To");?> : <select name="tostatsmonth" class="form_input_select">
+                <?php 	$year_actual = date("Y");
+                    for ($i=$year_actual;$i >= $year_actual-1;$i--) {
+                       if ($year_actual==$i) {
+                        $monthnumber = date("n")-1; // Month number without lead 0.
+                       } else {
+                        $monthnumber=11;
+                       }
+                       for ($j=$monthnumber;$j>=0;$j--) {
+                        $month_formated = sprintf("%02d",$j+1);
+                           if ($tostatsmonth=="$i-$month_formated") $selected="selected";
+                        else $selected="";
+                        echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
+                       }
+                    }
+                ?>
+                </select>
+                </td></tr></table>
+              </td>
+        </tr>
+
+        <tr>
+            <td align="left" class="bgcolor_004">
+                <input type="radio" name="Period" value="Day" <?php  if ($Period=="Day") { ?>checked="checked" <?php  } ?>>
+                <font class="fontstyle_003"><?php echo gettext("SELECT DAY");?></font>
+            </td>
+              <td align="left" class="bgcolor_005">
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                <tr><td class="fontstyle_searchoptions">
+                  <input type="checkbox" name="fromday" value="true" <?php  if ($fromday) { ?>checked<?php }?>> <?php echo gettext("From");?> :
+                <select name="fromstatsday_sday" class="form_input_select">
                     <?php
-                        $monthname = array( gettext("January"), gettext("February"),gettext("March"), gettext("April"), gettext("May"), gettext("June"), gettext("July"), gettext("August"), gettext("September"), gettext("October"), gettext("November"), gettext("December"));
-                        $year_actual = date("Y");
-                        for ($i=$year_actual;$i >= $year_actual-1;$i--) {
-                           if ($year_actual==$i) {
+                    for ($i=1;$i<=31;$i++) {
+                        if ($fromstatsday_sday==sprintf("%02d",$i)) $selected="selected";
+                        else	$selected="";
+                        echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
+                    }
+                    ?>
+                </select>
+                 <select name="fromstatsmonth_sday" class="form_input_select">
+                <?php 	$year_actual = date("Y");
+                    for ($i=$year_actual;$i >= $year_actual-1;$i--) {
+                        if ($year_actual==$i) {
                             $monthnumber = date("n")-1; // Month number without lead 0.
-                           } else {
+                        } else {
                             $monthnumber=11;
-                           }
-                           for ($j=$monthnumber;$j>=0;$j--) {
+                        }
+                        for ($j=$monthnumber;$j>=0;$j--) {
                             $month_formated = sprintf("%02d",$j+1);
-                               if ($fromstatsmonth=="$i-$month_formated")	$selected="selected";
+                            if ($fromstatsmonth_sday=="$i-$month_formated") $selected="selected";
                             else $selected="";
                             echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
-                           }
                         }
-                    ?>
-                    </select>
-                    </td><td  class="fontstyle_searchoptions">&nbsp;&nbsp;
-                    <input type="checkbox" name="tomonth" value="true" <?php  if ($tomonth) { ?>checked<?php }?>>
-                    <?php echo gettext("To");?> : <select name="tostatsmonth" class="form_input_select">
-                    <?php 	$year_actual = date("Y");
-                        for ($i=$year_actual;$i >= $year_actual-1;$i--) {
-                           if ($year_actual==$i) {
+                    }
+                ?>
+                </select>
+                </td><td class="fontstyle_searchoptions">&nbsp;&nbsp;
+                <input type="checkbox" name="today" value="true" <?php  if ($today) { ?>checked<?php }?>>
+                <?php echo gettext("To");?>  :
+                <select name="tostatsday_sday" class="form_input_select">
+                <?php
+                    for ($i=1;$i<=31;$i++) {
+                        if ($tostatsday_sday==sprintf("%02d",$i)) {$selected="selected";} else {$selected="";}
+                        echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
+                    }
+                ?>
+                </select>
+                 <select name="tostatsmonth_sday" class="form_input_select">
+                <?php 	$year_actual = date("Y");
+                    for ($i=$year_actual;$i >= $year_actual-1;$i--) {
+                        if ($year_actual==$i) {
                             $monthnumber = date("n")-1; // Month number without lead 0.
-                           } else {
+                        } else {
                             $monthnumber=11;
-                           }
-                           for ($j=$monthnumber;$j>=0;$j--) {
-                            $month_formated = sprintf("%02d",$j+1);
-                               if ($tostatsmonth=="$i-$month_formated") $selected="selected";
-                            else $selected="";
-                            echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
-                           }
                         }
-                    ?>
-                    </select>
-                    </td></tr></table>
-                  </td>
-            </tr>
-
-            <tr>
-                <td align="left" class="bgcolor_004">
-                    <input type="radio" name="Period" value="Day" <?php  if ($Period=="Day") { ?>checked="checked" <?php  } ?>>
-                    <font class="fontstyle_003"><?php echo gettext("SELECT DAY");?></font>
-                </td>
-                  <td align="left" class="bgcolor_005">
-                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                    <tr><td class="fontstyle_searchoptions">
-                      <input type="checkbox" name="fromday" value="true" <?php  if ($fromday) { ?>checked<?php }?>> <?php echo gettext("From");?> :
-                    <select name="fromstatsday_sday" class="form_input_select">
-                        <?php
-                        for ($i=1;$i<=31;$i++) {
-                            if ($fromstatsday_sday==sprintf("%02d",$i)) $selected="selected";
+                        for ($j=$monthnumber;$j>=0;$j--) {
+                            $month_formated = sprintf("%02d",$j+1);
+                               if ($tostatsmonth_sday=="$i-$month_formated") $selected="selected";
                             else	$selected="";
-                            echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
-                        }
-                        ?>
-                    </select>
-                     <select name="fromstatsmonth_sday" class="form_input_select">
-                    <?php 	$year_actual = date("Y");
-                        for ($i=$year_actual;$i >= $year_actual-1;$i--) {
-                            if ($year_actual==$i) {
-                                $monthnumber = date("n")-1; // Month number without lead 0.
-                            } else {
-                                $monthnumber=11;
-                            }
-                            for ($j=$monthnumber;$j>=0;$j--) {
-                                $month_formated = sprintf("%02d",$j+1);
-                                if ($fromstatsmonth_sday=="$i-$month_formated") $selected="selected";
-                                else $selected="";
-                                echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
-                            }
-                        }
-                    ?>
-                    </select>
-                    </td><td class="fontstyle_searchoptions">&nbsp;&nbsp;
-                    <input type="checkbox" name="today" value="true" <?php  if ($today) { ?>checked<?php }?>>
-                    <?php echo gettext("To");?>  :
-                    <select name="tostatsday_sday" class="form_input_select">
-                    <?php
-                        for ($i=1;$i<=31;$i++) {
-                            if ($tostatsday_sday==sprintf("%02d",$i)) {$selected="selected";} else {$selected="";}
-                            echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
-                        }
-                    ?>
-                    </select>
-                     <select name="tostatsmonth_sday" class="form_input_select">
-                    <?php 	$year_actual = date("Y");
-                        for ($i=$year_actual;$i >= $year_actual-1;$i--) {
-                            if ($year_actual==$i) {
-                                $monthnumber = date("n")-1; // Month number without lead 0.
-                            } else {
-                                $monthnumber=11;
-                            }
-                            for ($j=$monthnumber;$j>=0;$j--) {
-                                $month_formated = sprintf("%02d",$j+1);
-                                   if ($tostatsmonth_sday=="$i-$month_formated") $selected="selected";
-                                else	$selected="";
-                                echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
-                            }
+                            echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
                         }
-                    ?>
-                    </select>
-                    </td></tr></table>
-                  </td>
-            </tr>
-            <tr>
-                <td class="bgcolor_002" align="left">
-                    <font class="fontstyle_003">&nbsp;&nbsp;<?php echo gettext("STATUS");?></font>
-                </td>
-                <td class="bgcolor_003" align="left">
-                <select name="status" style="width:100px;">
-                <option value="0" <?php if ($status == 0) echo "selected"?>>New</option>
-                <option value="1" <?php if ($status == 1) echo "selected"?>>Proceed</option>
-                <option value="2" <?php if ($status == 2) echo "selected"?>>In Progress</option>
+                    }
+                ?>
                 </select>
-                </td>
-            </tr>
-            <tr>
-                <td class="bgcolor_004" align="left" > </td>
-
-                <td class="bgcolor_005" align="center" >
-                    <input type="image"  name="image16" align="top" border="0" src="<?php echo Images_Path;?>/button-search.gif" />
-
-                  </td>
-            </tr>
-        </tbody></table>
+                </td></tr></table>
+              </td>
+        </tr>
+        <tr>
+            <td class="bgcolor_002" align="left">
+                <font class="fontstyle_003">&nbsp;&nbsp;<?php echo gettext("STATUS");?></font>
+            </td>
+            <td class="bgcolor_003" align="left">
+            <select name="status" style="width:100px;">
+            <option value="0" <?php if ($status == 0) echo "selected"?>>New</option>
+            <option value="1" <?php if ($status == 1) echo "selected"?>>Proceed</option>
+            <option value="2" <?php if ($status == 2) echo "selected"?>>In Progress</option>
+            </select>
+            </td>
+        </tr>
+        <tr>
+            <td class="bgcolor_004" align="left" > </td>
+
+            <td class="bgcolor_005" align="center" >
+                <input type="image"  name="image16" align="top" border="0" src="<?php echo Images_Path;?>/button-search.gif" />
+
+              </td>
+        </tr>
+    </tbody></table>
 </FORM>
 <?php
 }
diff --git a/admin/Public/A2B_entity_phonenumber.php b/admin/Public/A2B_entity_phonenumber.php
deleted file mode 100644
index 49f34b25d..000000000
--- a/admin/Public/A2B_entity_phonenumber.php
+++ /dev/null
@@ -1,352 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * This file is part of A2Billing (http://www.a2billing.net/)
- *
- * A2Billing, Commercial Open Source Telecom Billing platform,
- * powered by Star2billing S.L. <http://www.star2billing.com/>
- *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
- * @author      Belaid Arezqui <areski@gmail.com>
- * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
- * @package     A2Billing
- *
- * Software License Agreement (GNU Affero General Public License)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
-**/
-
-include '../lib/admin.defines.php';
-include '../lib/admin.module.access.php';
-include '../lib/Form/Class.FormHandler.inc.php';
-include './form_data/FG_var_phonenumber.inc';
-include '../lib/admin.smarty.php';
-
-if (!has_rights(ACX_PREDICTIVE_DIALER)) {
-    Header("HTTP/1.0 401 Unauthorized");
-    Header("Location: PP_error.php?c=accessdenied");
-    die();
-}
-
-getpost_ifset(array (
-    'action',
-    'campaign',
-    'check', 'type', 'mode', 'batchupdate',
-    'upd_id_phonebook', 'upd_number', 'upd_name', 'upd_amount', 'upd_status'
-));
-
-if (!empty ($action) && !empty ($campaign) && is_numeric($campaign) && ($action == "run" || $action == "hold" || $action == "stop")) {
-    $DBHandle = DbConnect();
-    $status = 0;
-    if ($action == "stop")
-        $status = 2;
-    elseif ($action == "hold")
-        $status = 1;
-
-    $table = new Table();
-    $table->SQLExec($DBHandle, "UPDATE cc_campaign_phonestatus SET status = $status WHERE id_phonenumber =$id AND id_campaign = $campaign ");
-
-    Header("Location: A2B_entity_phonenumber.php?form_action=ask-edit&id=$id");
-}
-
-$HD_Form->setDBHandler(DbConnect());
-
-$HD_Form->init();
-
-/********************************* BATCH UPDATE ***********************************/
-
-// CHECK IF REQUEST OF BATCH UPDATE
-if ($batchupdate == 1 && is_array($check)) {
-    $SQL_REFILL="";
-    $HD_Form->prepare_list_subselection('list');
-
-    // Array ( [upd_simultaccess] => on [upd_currency] => on )
-    $loop_pass=0;
-    $SQL_UPDATE = '';
-    foreach ($check as $ind_field => $ind_val) {
-        //echo "<br>::> $ind_field -";
-        $myfield = substr($ind_field,4);
-        if ($loop_pass!=0) $SQL_UPDATE.=',';
-
-        // Standard update mode
-        if (!isset($mode["$ind_field"]) || $mode["$ind_field"]==1) {
-            if (!isset($type["$ind_field"])) {
-                $SQL_UPDATE .= " $myfield='".$$ind_field."'";
-            } else {
-                $SQL_UPDATE .= " $myfield='".$type["$ind_field"]."'";
-            }
-        // Mode 2 - Equal - Add - Subtract
-        } elseif ($mode["$ind_field"]==2) {
-            if (!isset($type["$ind_field"])) {
-                $SQL_UPDATE .= " $myfield='".$$ind_field."'";
-            } else {
-                if ($type["$ind_field"] == 1) {
-                    $SQL_UPDATE .= " $myfield='".$$ind_field."'";
-                } elseif ($type["$ind_field"] == 2) {
-                    $SQL_UPDATE .= " $myfield = $myfield +'".$$ind_field."'";
-                } else {
-                    $SQL_UPDATE .= " $myfield = $myfield -'".$$ind_field."'";
-                }
-            }
-        }
-        $loop_pass++;
-    }
-
-    $SQL_UPDATE = "UPDATE $HD_Form->FG_TABLE_NAME SET $SQL_UPDATE";
-    if (strlen($HD_Form->FG_TABLE_CLAUSE)>1) {
-        $SQL_UPDATE .= ' WHERE ';
-        $SQL_UPDATE .= $HD_Form->FG_TABLE_CLAUSE;
-    }
-    $update_msg_error = '<center><font color="red"><b>'.gettext('Could not perform the batch update!').'</b></font></center>';
-
-    if (!$HD_Form -> DBHandle -> Execute("begin")) {
-        $update_msg = $update_msg_error;
-    } else {
-        if (!$HD_Form -> DBHandle -> Execute($SQL_UPDATE)) {
-            $update_msg = $update_msg_error;
-        }
-        if (! $res = $HD_Form -> DBHandle -> Execute("commit")) {
-            $update_msg = '<center><font color="green"><b>'.gettext('The batch update has been successfully perform!').'</b></font></center>';
-        }
-
-    };
-}
-
-if ($id != "" || !is_null($id)) {
-    $HD_Form->FG_EDITION_CLAUSE = str_replace("%id", "$id", $HD_Form->FG_EDITION_CLAUSE);
-}
-
-if (!isset ($form_action))
-    $form_action = "list"; //ask-add
-if (!isset ($action))
-    $action = $form_action;
-
-$list = $HD_Form->perform_action($form_action);
-
-// #### HEADER SECTION
-$smarty->display('main.tpl');
-
-// #### HELP SECTION
-echo $CC_help_phonelist;
-
-?>
-<script language="JavaScript" src="javascript/card.js"></script>
-<div class="toggle_hide2show">
-<center><a href="#" target="_self" class="toggle_menu"><img class="toggle_hide2show" src="<?php echo KICON_PATH; ?>/toggle_hide2show.png" onmouseover="this.style.cursor='hand';" HEIGHT="16"> <font class="fontstyle_002"><?php echo gettext("SEARCH PHONENUMBER");?> </font></a><?php if (!empty($_SESSION['entity_phonenumber_selection'])) { ?>&nbsp;(<font style="color:#EE6564;" > <?php echo gettext("search activated"); ?> </font> ) <?php } ?> </center>
-    <div class="tohide" style="display:none;">
-<?php
-// #### CREATE SEARCH FORM
-if ($form_action == "list") {
-    $HD_Form -> create_search_form();
-}
-?>
-    </div>
-</div>
-
-<?php
-/********************************* BATCH UPDATE ***********************************/
-if ( $form_action == "list" && (!($popup_select>=1)) ) {
-
-    $instance_table_tariff = new Table("cc_phonebook", "id, name");
-    $FG_TABLE_CLAUSE = "";
-    $list_phonebook = $instance_table_tariff -> Get_list ($HD_Form -> DBHandle, $FG_TABLE_CLAUSE, "name", "ASC", null, null, null, null);
-    $nb_phonebook = count($list_phonebook);
-    $cnts = new Constants();
-    $actived_list = $cnts->getActivationList();
-
-?>
-<!-- ** ** ** ** ** Part for the Update ** ** ** ** ** -->
-<div class="toggle_hide2show">
-<center><a href="#" target="_self" class="toggle_menu"><img class="toggle_hide2show" src="<?php echo KICON_PATH; ?>/toggle_hide2show.png" onmouseover="this.style.cursor='hand';" HEIGHT="16"> <font class="fontstyle_002"><?php echo gettext("BATCH UPDATE");?> </font></a></center>
-    <div class="tohide" style="display:none;">
-
-<center>
-<b>&nbsp;<?php echo $HD_Form -> FG_NB_RECORD ?> <?php echo gettext("phonenumbers selected!"); ?>&nbsp;<?php echo gettext("Use the options below to batch update the selected phonenumbers.");?></b>
-       <table align="center" border="0" width="65%"  cellspacing="1" cellpadding="2">
-        <tbody>
-        <form name="updateForm" action="<?php echo $_SERVER['PHP_SELF']?>" method="post">
-        <INPUT type="hidden" name="batchupdate" value="1">
-        <tr>
-          <td align="left"  class="bgcolor_001">
-              <input name="check[upd_id_phonebook]" type="checkbox" <?php if ($check["upd_id_phonebook"]=="on") echo "checked"?> >
-          </td>
-          <td align="left" class="bgcolor_001">
-                  1)&nbsp;<?php echo gettext("Phonebook");?>&nbsp;:
-                <select NAME="upd_id_phonebook" size="1" class="form_input_select">
-                <?php foreach ($list_phonebook as $key => $cur_value) { ?>
-                    <option value='<?php echo $cur_value[0] ?>' <?php if ($upd_status==$cur_value[0]) echo 'selected="selected"'?>><?php echo $cur_value[1] ?></option>
-                <?php } ?>
-                </select><br/>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" class="bgcolor_001" >
-                  <input name="check[upd_number]" type="checkbox" <?php if ($check["upd_number"]=="on") echo "checked"?>>
-          </td>
-          <td align="left"  class="bgcolor_001">
-                2)&nbsp;<?php echo gettext("Phonenumber"); ?>&nbsp;:
-                <input class="form_input_text"  name="upd_number" size="15" maxlength="15">
-                <br/>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" class="bgcolor_001" >
-                  <input name="check[upd_name]" type="checkbox" <?php if ($check["upd_name"]=="on") echo "checked"?>>
-          </td>
-          <td align="left"  class="bgcolor_001">
-                3)&nbsp;<?php echo gettext("Name"); ?>&nbsp;:
-                <input class="form_input_text"  name="upd_name" size="15" maxlength="15">
-                <br/>
-          </td>
-        </tr>
-        <tr>
-          <td align="left" class="bgcolor_001">
-                  <input name="check[upd_amount]" type="checkbox" <?php if ($check["upd_amount"]=="on") echo "checked"?>>
-                <input name="mode[upd_amount]" type="hidden" value="2">
-          </td>
-          <td align="left"  class="bgcolor_001">
-                4)&nbsp;<?php echo gettext("Amount");?>&nbsp;:
-                     <input class="form_input_text" name="upd_amount" size="10" maxlength="10"  value="<?php if (isset($upd_amount)) echo $upd_amount; else echo '0';?>" >
-                <font class="version">
-                <input type="radio" NAME="type[upd_amount]" value="1" <?php if ((!isset($type[upd_amount]))|| ($type[upd_amount]==1) ) {?>checked<?php }?>> <?php echo gettext("Equals");?>
-                <input type="radio" NAME="type[upd_amount]" value="2" <?php if ($type[upd_amount]==2) {?>checked<?php }?>><?php echo gettext("Add");?>
-                <input type="radio" NAME="type[upd_amount]" value="3" <?php if ($type[upd_amount]==3) {?>checked<?php }?>> <?php echo gettext("Subtract");?>
-                </font>
-          </td>
-        </tr>
-        <tr>
-          <td align="left"  class="bgcolor_001">
-              <input name="check[upd_status]" type="checkbox" <?php if ($check["upd_status"]=="on") echo "checked"?> >
-          </td>
-          <td align="left" class="bgcolor_001">
-              5)&nbsp;<?php echo gettext("Status");?>&nbsp;:
-                <select NAME="upd_status" size="1" class="form_input_select">
-                <?php foreach ($actived_list as $key => $cur_value) { ?>
-                    <option value='<?php echo $cur_value[1] ?>' <?php if ($upd_status==$cur_value[1]) echo 'selected="selected"'?>><?php echo $cur_value[0] ?></option>
-                <?php } ?>
-                </select><br/>
-          </td>
-        </tr>
-
-        <tr>
-            <td align="right" class="bgcolor_001"></td>
-             <td align="right"  class="bgcolor_001">
-                <input class="form_input_button"  value=" <?php echo gettext("BATCH UPDATE CARD");?>  " type="submit">
-            </td>
-        </tr>
-        </form>
-        </table>
-</center>
-    </div>
-</div>
-<!-- ** ** ** ** ** Part for the Update ** ** ** ** ** -->
-<?php
-
-}elseif (!($popup_select>=1)) echo $CC_help_create_customer;
-
-if (isset($update_msg) && strlen($update_msg)>0) echo $update_msg;
-
-// #### TOP SECTION PAGE
-$HD_Form->create_toppage($form_action);
-
-$HD_Form->create_form($form_action, $list);
-
-if ($form_action = "ask_edit") {
-    $DBHandle = DbConnect();
-    $instance_table = new Table();
-
-    $QUERY_PHONENUMBERS = 'SELECT cc_campaign.id, cc_campaign.name,cc_campaign.status, cc_campaign.startingdate <= CURRENT_TIMESTAMP AS started ,cc_campaign.expirationdate <= CURRENT_TIMESTAMP AS expired  FROM cc_phonenumber , cc_phonebook , cc_campaign_phonebook, cc_campaign WHERE ';
-    //JOIN CLAUSE
-    $QUERY_PHONENUMBERS .= 'cc_phonenumber.id_phonebook = cc_phonebook.id AND cc_campaign_phonebook.id_phonebook = cc_phonebook.id AND cc_campaign_phonebook.id_campaign = cc_campaign.id ';
-    //CAMPAIGN CLAUSE
-    if ($id != null) // Exclude if null otherwise kills the list query
-        $QUERY_PHONENUMBERS .= 'AND cc_phonenumber.id= ' . $id; // I've no idea under what conditions this should be included. Please review!
-    $result = $instance_table->SQLExec($DBHandle, $QUERY_PHONENUMBERS);
-    if ($result) {
-        ?>
-         <br/>
-         <br/>
-        <table width="100%" class="editform_table1" >
-        <tr>
-            <th>
-                <?php echo gettext("CAMPAIGN") ?>
-            </th>
-            <th>
-                <?php echo gettext("INFO") ?>
-            </th>
-            <th>
-                <?php echo gettext("STATUS") ?>
-            </th>
-            <th>
-                <?php echo gettext("ACTION") ?>
-            </th>
-        </tr>
-
-        <?php
-        foreach ($result as $phone) {
-            $query = "SELECT id_callback, status FROM cc_campaign_phonestatus WHERE id_campaign = $phone[0] AND id_phonenumber = $id";
-            $res = $instance_table -> SQLExec ($DBHandle, $query);
-         ?>
-        <tr>
-            <td class="form_head" align="center" width="20%" >
-             <?php echo $phone['name'] ?>
-            </td>
-            <td  class="tableBodyRight"  background="../Public/templates/default/images/background_cells.gif" width="40%" >
-             <?php
-                 if ($phone['expired']) echo gettext("EXPIRED");
-                else if ($phone['started']) {
-                    if($res) echo gettext("STARTED AND IN PROCESS");
-                    else echo gettext("STARTED BUT NOT IN PROCESS : check the batch");
-                }else echo gettext("NOT STARTED");
-
-             ?>
-            </td>
-            <td  class="tableBodyRight"  background="../Public/templates/default/images/background_cells.gif" width="10%" >
-                 <?php
-                 if ($res) {
-                     if($res[0]['status']==0) echo gettext("RUN");
-                     elseif ($res[0]['status']==1) echo gettext("HOLD");
-                     else echo gettext("STOP");
-                 }else echo gettext("NO STATUS");
-                 ?>
-            </td>
-            <td  class="tableBodyRight"  background="../Public/templates/default/images/background_cells.gif" align="center" width="30%" >
-                 &nbsp;
-                 <?php
-                 if ($res) {
-                 ?>
-                     <a href="<?php echo "A2B_entity_phonenumber.php?action=run&id=$id&campaign=$phone[0]&section=16"?>"> <img src="<?php echo Images_Path."/control_play.png" ?>" border="0" title="<?php echo "RUN"?>" alt="<?php echo "RUN"?>"></a>
-                     <a href="<?php echo "A2B_entity_phonenumber.php?action=hold&id=$id&campaign=$phone[0]&section=16"?>"> <img src="<?php echo Images_Path."/control_pause.png" ?>" border="0" title="<?php echo "PAUSE"?>" alt="<?php echo "PAUSE"?>"></a>
-                     <a href="<?php echo "A2B_entity_phonenumber.php?action=stop&id=$id&campaign=$phone[0]&section=16"?>"> <img src="<?php echo Images_Path."/control_stop.png" ?>" border="0" title="<?php echo "STOP"?>" alt="<?php echo "STOP"?>"></a>
-
-                <?php } ?>
-            </td>
-        </tr>
-
-        <?php
-        }
-
-        ?>
-        </table>
-        <?php
-
-    }
-}
-
-// #### FOOTER SECTION
-$smarty->display('footer.tpl');
diff --git a/admin/Public/A2B_entity_prefix.php b/admin/Public/A2B_entity_prefix.php
old mode 100644
new mode 100755
index 508e3355f..013a1207c
--- a/admin/Public/A2B_entity_prefix.php
+++ b/admin/Public/A2B_entity_prefix.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_provider.php b/admin/Public/A2B_entity_provider.php
index d0d7370c8..90c0bd6c6 100644
--- a/admin/Public/A2B_entity_provider.php
+++ b/admin/Public/A2B_entity_provider.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -50,10 +50,12 @@
     $HD_Form->FG_EDITION_CLAUSE = str_replace("%id", "$id", $HD_Form->FG_EDITION_CLAUSE);
 }
 
-if (!isset ($form_action))
+if (!isset ($form_action)) {
     $form_action = "list"; //ask-add
-if (!isset ($action))
+}
+if (!isset ($action)) {
     $action = $form_action;
+}
 
 $list = $HD_Form->perform_action($form_action);
 
@@ -61,22 +63,20 @@
 $smarty->display('main.tpl');
 if ($popup_select) {
 ?>
-    <SCRIPT LANGUAGE="javascript">
-    <!-- Begin
-    public function sendValue(selvalue)
-    {
-        window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
-        window.close();
-    }
-    // End -->
-    </script>
+<SCRIPT LANGUAGE="javascript">
+function sendValue(selvalue) {
+    window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
+    window.close();
+}
+</script>
 <?php
 
 }
 
 // #### HELP SECTION
-if (!$popup_select)
+if (!$popup_select) {
     echo $CC_help_provider;
+}
 
 echo $CALL_LABS;
 
@@ -88,5 +88,6 @@ public function sendValue(selvalue)
 $HD_Form->create_form($form_action, $list, $id = null);
 
 // #### FOOTER SECTION
-if (!$popup_select)
+if (!$popup_select) {
     $smarty->display('footer.tpl');
+}
diff --git a/admin/Public/A2B_entity_receipt.php b/admin/Public/A2B_entity_receipt.php
old mode 100644
new mode 100755
index ba685e325..e7d09194a
--- a/admin/Public/A2B_entity_receipt.php
+++ b/admin/Public/A2B_entity_receipt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -68,10 +68,12 @@
     $HD_Form->FG_EDITION_CLAUSE = str_replace("%id", "$id", $HD_Form->FG_EDITION_CLAUSE);
 }
 
-if (!isset ($form_action))
+if (!isset ($form_action)) {
     $form_action = "list"; //ask-add
-if (!isset ($action))
+}
+if (!isset ($action)) {
     $action = $form_action;
+}
 
 $list = $HD_Form->perform_action($form_action);
 
@@ -93,10 +95,10 @@
 <script type="text/javascript">
 $(document).ready(function () {
     $('.lock').click(function () {
-            $.get("A2B_entity_receipt.php", { id: ""+ this.id, action: "lock" },
-                  function(data){
-                    location.reload(true);
-                  });
+        $.get("A2B_entity_receipt.php", { id: ""+ this.id, action: "lock" },
+            function(data){
+                location.reload(true);
             });
+        });
 });
 </script>
diff --git a/admin/Public/A2B_entity_remittance_request.php b/admin/Public/A2B_entity_remittance_request.php
old mode 100644
new mode 100755
index ec6973ec9..340e4b868
--- a/admin/Public/A2B_entity_remittance_request.php
+++ b/admin/Public/A2B_entity_remittance_request.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_restore.php b/admin/Public/A2B_entity_restore.php
old mode 100644
new mode 100755
index 490e33b9e..462b9a5a9
--- a/admin/Public/A2B_entity_restore.php
+++ b/admin/Public/A2B_entity_restore.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -146,7 +146,15 @@ function CheckForm()
 //-->
 </script>
 <table width="85%" border="0" align="center" cellpadding="0" cellspacing="0">
-<form  name="Dupload" enctype="multipart/form-data" action="A2B_entity_restore.php" method="POST">
+<form name="Dupload" enctype="multipart/form-data" action="A2B_entity_restore.php" method="POST">
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
     <TR valign="middle">
         <TD align="center">
             <?php echo gettext("Upload a database backup")?>&nbsp;<input type="file" name="databasebackup" value="">
diff --git a/admin/Public/A2B_entity_server.php b/admin/Public/A2B_entity_server.php
old mode 100644
new mode 100755
index 78c536412..33bb78b6f
--- a/admin/Public/A2B_entity_server.php
+++ b/admin/Public/A2B_entity_server.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_server_group.php b/admin/Public/A2B_entity_server_group.php
old mode 100644
new mode 100755
index 6cf2c374c..e96a5f997
--- a/admin/Public/A2B_entity_server_group.php
+++ b/admin/Public/A2B_entity_server_group.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_service.php b/admin/Public/A2B_entity_service.php
old mode 100644
new mode 100755
index 1a2b812d9..c3ee8c84e
--- a/admin/Public/A2B_entity_service.php
+++ b/admin/Public/A2B_entity_service.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_signup_agent.php b/admin/Public/A2B_entity_signup_agent.php
index 973c478c7..7cf325e52 100755
--- a/admin/Public/A2B_entity_signup_agent.php
+++ b/admin/Public/A2B_entity_signup_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -45,9 +45,9 @@
 
 ?>
 <style type="text/css">
-     #sexyBG { display: none; position: absolute; background: #000; opacity: 0.5; -moz-opacity: 0.5; -khtml-opacity: 0.5; filter: alpha(opacity=40); width: 100%; height: 100%; top: 0; left: 0; z-index: 99; }
-    #sexyBOX { padding-top:15px;display: none; position: absolute; background: #FCFCFC; color: #333; font-size: 14px; text-align: center; border: 1px solid #111; top: 200px; z-index: 100; }
-    .sexyX { margin-top:15px; font-size: 12px; color: #636D61; padding: 4px 0; border-top: 1px solid #636D61; background: #BDE5F8; }
+    #elegantBG { display: none; position: absolute; background: #000; opacity: 0.5; -moz-opacity: 0.5; -khtml-opacity: 0.5; filter: alpha(opacity=40); width: 100%; height: 100%; top: 0; left: 0; z-index: 99; }
+    #elegantBOX { padding-top:15px;display: none; position: absolute; background: #FCFCFC; color: #333; font-size: 14px; text-align: center; border: 1px solid #111; top: 200px; z-index: 100; }
+    .elegantX { margin-top:15px; font-size: 12px; color: #636D61; padding: 4px 0; border-top: 1px solid #636D61; background: #BDE5F8; }
 </style>
 <script type="text/javascript">
 var msg = '<?php echo gettext('click outside box to close'); ?>';
@@ -57,8 +57,8 @@ function agent(v) { return(Math.max(navigator.userAgent.toLowerCase().indexOf(v)
 function isset(v) { return((typeof(v)=='undefined' || v.length==0)?false:true); }
 function XYwin(v) { var z=Array($('#page-wrap').innerHeight()-2,$('#page-wrap').width()); return(isset(v)?z[v]:z); }
 
-function sexyTOG() { document.onclick=function(){ style('sexyBG').display='none'; style('sexyBOX').display='none'; document.onclick=function(){}; }; }
-function sexyBOX(v,b) { setTimeout("sexyTOG()",100); style('sexyBG').height=XYwin(0)+'px'; style('sexyBG').display='block'; getId('sexyBOX').innerHTML=v+'<div class="sexyX">('+msg+')'+"<\/div>"; style('sexyBOX').left=Math.round((XYwin(1)-b)/2)+'px'; style('sexyBOX').width=b+'px'; style('sexyBOX').display='block'; }
+function elegantTOG() { document.onclick=function(){ style('elegantBG').display='none'; style('elegantBOX').display='none'; document.onclick=function(){}; }; }
+function elegantBOX(v,b) { setTimeout("elegantTOG()",100); style('elegantBG').height=XYwin(0)+'px'; style('elegantBG').display='block'; getId('elegantBOX').innerHTML=v+'<div class="elegantX">('+msg+')'+"<\/div>"; style('elegantBOX').left=Math.round((XYwin(1)-b)/2)+'px'; style('elegantBOX').width=b+'px'; style('elegantBOX').display='block'; }
 </script>
 <?php
 $HD_Form -> setDBHandler (DbConnect());
@@ -72,8 +72,8 @@ function sexyBOX(v,b) { setTimeout("sexyTOG()",100); style('sexyBG').height=XYwi
 
 // #### HEADER SECTION
 $smarty->display('main.tpl'); ?>
-<div id="sexyBG"></div>
-<div id="sexyBOX" onmousedown="document.onclick=function(){};" onmouseup="setTimeout('sexyTOG()',1);"></div>
+<div id="elegantBG"></div>
+<div id="elegantBOX" onmousedown="document.onclick=function(){};" onmouseup="setTimeout('elegantTOG()',1);"></div>
 <?php
 
 // #### HELP SECTION
diff --git a/admin/Public/A2B_entity_speeddial.php b/admin/Public/A2B_entity_speeddial.php
old mode 100644
new mode 100755
index d3216af4a..faa55707e
--- a/admin/Public/A2B_entity_speeddial.php
+++ b/admin/Public/A2B_entity_speeddial.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_statuslog.php b/admin/Public/A2B_entity_statuslog.php
old mode 100644
new mode 100755
index a9305d8cb..d9f95c4a0
--- a/admin/Public/A2B_entity_statuslog.php
+++ b/admin/Public/A2B_entity_statuslog.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -70,171 +70,178 @@
 ?>
 
 <FORM METHOD=POST name="myForm" ACTION="<?php echo $PHP_SELF?>?s=1&t=0&order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
-    <INPUT TYPE="hidden" NAME="posted" value=1>
-    <INPUT TYPE="hidden" NAME="current_page" value=0>
-        <table class="bar-status" width="85%" border="0" cellspacing="1" cellpadding="2" align="center">
-            <tbody>
-            <?php  if ($_SESSION["pr_groupID"]==2 && is_numeric($_SESSION["pr_IDCust"])) { ?>
-            <?php  } else { ?>
-            <tr>
-                <td align="left" valign="top" class="bgcolor_004">
-                    <font class="fontstyle_003">&nbsp;&nbsp;<?php echo gettext("CUSTOMERS");?></font>
+    <INPUT TYPE="hidden" NAME="posted" value="1">
+    <INPUT TYPE="hidden" NAME="current_page" value="0">
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
+
+    <table class="bar-status" width="85%" border="0" cellspacing="1" cellpadding="2" align="center">
+        <tbody>
+        <?php  if ($_SESSION["pr_groupID"]==2 && is_numeric($_SESSION["pr_IDCust"])) { ?>
+        <?php  } else { ?>
+        <tr>
+            <td align="left" valign="top" class="bgcolor_004">
+                <font class="fontstyle_003">&nbsp;&nbsp;<?php echo gettext("CUSTOMERS");?></font>
+            </td>
+            <td class="bgcolor_005" align="left">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0"><tr>
+                <td class="fontstyle_searchoptions" >
+                <INPUT TYPE="text" NAME="id_cc_card" value="<?php echo $id_cc_card?>" class="form_input_text">
+                <a href="#" onclick="window.open('A2B_entity_card.php?popup_select=1&popup_formname=myForm&popup_fieldname=id_cc_card' , 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1');"><img src="<?php echo Images_Path;?>/icon_arrow_orange.gif"></a>
                 </td>
-                <td class="bgcolor_005" align="left">
-                <table width="100%" border="0" cellspacing="0" cellpadding="0"><tr>
-                    <td class="fontstyle_searchoptions" >
-                    <INPUT TYPE="text" NAME="id_cc_card" value="<?php echo $id_cc_card?>" class="form_input_text">
-                    <a href="#" onclick="window.open('A2B_entity_card.php?popup_select=1&popup_formname=myForm&popup_fieldname=id_cc_card' , 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1');"><img src="<?php echo Images_Path;?>/icon_arrow_orange.gif"></a>
-                    </td>
-                </tr></table></td>
-            </tr>
-            <?php  } ?>
-            <tr>
-                <td class="bgcolor_004" align="left">
-
-                    <input type="radio" name="Period" value="Month" <?php  if (($Period=="Month") || !isset($Period)) { ?>checked="checked" <?php  } ?>>
-                    <font class="fontstyle_003"><?php echo gettext("SELECT MONTH");?></font>
-                </td>
-                  <td class="bgcolor_003" align="left">
-                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                    <tr><td class="fontstyle_searchoptions">
-                      <input type="checkbox" name="frommonth" value="true" <?php  if ($frommonth) { ?>checked<?php }?>>
-                    <?php echo gettext("From");?> : <select name="fromstatsmonth" class="form_input_select">
+            </tr></table></td>
+        </tr>
+        <?php  } ?>
+        <tr>
+            <td class="bgcolor_004" align="left">
+
+                <input type="radio" name="Period" value="Month" <?php  if (($Period=="Month") || !isset($Period)) { ?>checked="checked" <?php  } ?>>
+                <font class="fontstyle_003"><?php echo gettext("SELECT MONTH");?></font>
+            </td>
+              <td class="bgcolor_003" align="left">
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                <tr><td class="fontstyle_searchoptions">
+                  <input type="checkbox" name="frommonth" value="true" <?php  if ($frommonth) { ?>checked<?php }?>>
+                <?php echo gettext("From");?> : <select name="fromstatsmonth" class="form_input_select">
+                <?php
+                    $monthname = array( gettext("January"), gettext("February"),gettext("March"), gettext("April"), gettext("May"), gettext("June"), gettext("July"), gettext("August"), gettext("September"), gettext("October"), gettext("November"), gettext("December"));
+                    $year_actual = date("Y");
+                    for ($i=$year_actual;$i >= $year_actual-1;$i--) {
+                       if ($year_actual==$i) {
+                        $monthnumber = date("n")-1; // Month number without lead 0.
+                       } else {
+                        $monthnumber=11;
+                       }
+                       for ($j=$monthnumber;$j>=0;$j--) {
+                        $month_formated = sprintf("%02d",$j+1);
+                           if ($fromstatsmonth=="$i-$month_formated")	$selected="selected";
+                        else $selected="";
+                        echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
+                       }
+                    }
+                ?>
+                </select>
+                </td><td  class="fontstyle_searchoptions">&nbsp;&nbsp;
+                <input type="checkbox" name="tomonth" value="true" <?php  if ($tomonth) { ?>checked<?php }?>>
+                <?php echo gettext("To");?> : <select name="tostatsmonth" class="form_input_select">
+                <?php 	$year_actual = date("Y");
+                    for ($i=$year_actual;$i >= $year_actual-1;$i--) {
+                       if ($year_actual==$i) {
+                        $monthnumber = date("n")-1; // Month number without lead 0.
+                       } else {
+                        $monthnumber=11;
+                       }
+                       for ($j=$monthnumber;$j>=0;$j--) {
+                        $month_formated = sprintf("%02d",$j+1);
+                           if ($tostatsmonth=="$i-$month_formated") $selected="selected";
+                        else $selected="";
+                        echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
+                       }
+                    }
+                ?>
+                </select>
+                </td></tr></table>
+              </td>
+        </tr>
+
+        <tr>
+            <td align="left" class="bgcolor_004">
+                <input type="radio" name="Period" value="Day" <?php  if ($Period=="Day") { ?>checked="checked" <?php  } ?>>
+                <font class="fontstyle_003"><?php echo gettext("SELECT DAY");?></font>
+            </td>
+              <td align="left" class="bgcolor_005">
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                <tr><td class="fontstyle_searchoptions">
+                  <input type="checkbox" name="fromday" value="true" <?php  if ($fromday) { ?>checked<?php }?>> <?php echo gettext("From");?> :
+                <select name="fromstatsday_sday" class="form_input_select">
                     <?php
-                        $monthname = array( gettext("January"), gettext("February"),gettext("March"), gettext("April"), gettext("May"), gettext("June"), gettext("July"), gettext("August"), gettext("September"), gettext("October"), gettext("November"), gettext("December"));
-                        $year_actual = date("Y");
-                        for ($i=$year_actual;$i >= $year_actual-1;$i--) {
-                           if ($year_actual==$i) {
+                    for ($i=1;$i<=31;$i++) {
+                        if ($fromstatsday_sday==sprintf("%02d",$i)) $selected="selected";
+                        else	$selected="";
+                        echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
+                    }
+                    ?>
+                </select>
+                 <select name="fromstatsmonth_sday" class="form_input_select">
+                <?php 	$year_actual = date("Y");
+                    for ($i=$year_actual;$i >= $year_actual-1;$i--) {
+                        if ($year_actual==$i) {
                             $monthnumber = date("n")-1; // Month number without lead 0.
-                           } else {
+                        } else {
                             $monthnumber=11;
-                           }
-                           for ($j=$monthnumber;$j>=0;$j--) {
+                        }
+                        for ($j=$monthnumber;$j>=0;$j--) {
                             $month_formated = sprintf("%02d",$j+1);
-                               if ($fromstatsmonth=="$i-$month_formated")	$selected="selected";
+                            if ($fromstatsmonth_sday=="$i-$month_formated") $selected="selected";
                             else $selected="";
                             echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
-                           }
                         }
-                    ?>
-                    </select>
-                    </td><td  class="fontstyle_searchoptions">&nbsp;&nbsp;
-                    <input type="checkbox" name="tomonth" value="true" <?php  if ($tomonth) { ?>checked<?php }?>>
-                    <?php echo gettext("To");?> : <select name="tostatsmonth" class="form_input_select">
-                    <?php 	$year_actual = date("Y");
-                        for ($i=$year_actual;$i >= $year_actual-1;$i--) {
-                           if ($year_actual==$i) {
+                    }
+                ?>
+                </select>
+                </td><td class="fontstyle_searchoptions">&nbsp;&nbsp;
+                <input type="checkbox" name="today" value="true" <?php  if ($today) { ?>checked<?php }?>>
+                <?php echo gettext("To");?>  :
+                <select name="tostatsday_sday" class="form_input_select">
+                <?php
+                    for ($i=1;$i<=31;$i++) {
+                        if ($tostatsday_sday==sprintf("%02d",$i)) {$selected="selected";} else {$selected="";}
+                        echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
+                    }
+                ?>
+                </select>
+                 <select name="tostatsmonth_sday" class="form_input_select">
+                <?php 	$year_actual = date("Y");
+                    for ($i=$year_actual;$i >= $year_actual-1;$i--) {
+                        if ($year_actual==$i) {
                             $monthnumber = date("n")-1; // Month number without lead 0.
-                           } else {
+                        } else {
                             $monthnumber=11;
-                           }
-                           for ($j=$monthnumber;$j>=0;$j--) {
-                            $month_formated = sprintf("%02d",$j+1);
-                               if ($tostatsmonth=="$i-$month_formated") $selected="selected";
-                            else $selected="";
-                            echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
-                           }
                         }
-                    ?>
-                    </select>
-                    </td></tr></table>
-                  </td>
-            </tr>
-
-            <tr>
-                <td align="left" class="bgcolor_004">
-                    <input type="radio" name="Period" value="Day" <?php  if ($Period=="Day") { ?>checked="checked" <?php  } ?>>
-                    <font class="fontstyle_003"><?php echo gettext("SELECT DAY");?></font>
-                </td>
-                  <td align="left" class="bgcolor_005">
-                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                    <tr><td class="fontstyle_searchoptions">
-                      <input type="checkbox" name="fromday" value="true" <?php  if ($fromday) { ?>checked<?php }?>> <?php echo gettext("From");?> :
-                    <select name="fromstatsday_sday" class="form_input_select">
-                        <?php
-                        for ($i=1;$i<=31;$i++) {
-                            if ($fromstatsday_sday==sprintf("%02d",$i)) $selected="selected";
+                        for ($j=$monthnumber;$j>=0;$j--) {
+                            $month_formated = sprintf("%02d",$j+1);
+                               if ($tostatsmonth_sday=="$i-$month_formated") $selected="selected";
                             else	$selected="";
-                            echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
-                        }
-                        ?>
-                    </select>
-                     <select name="fromstatsmonth_sday" class="form_input_select">
-                    <?php 	$year_actual = date("Y");
-                        for ($i=$year_actual;$i >= $year_actual-1;$i--) {
-                            if ($year_actual==$i) {
-                                $monthnumber = date("n")-1; // Month number without lead 0.
-                            } else {
-                                $monthnumber=11;
-                            }
-                            for ($j=$monthnumber;$j>=0;$j--) {
-                                $month_formated = sprintf("%02d",$j+1);
-                                if ($fromstatsmonth_sday=="$i-$month_formated") $selected="selected";
-                                else $selected="";
-                                echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
-                            }
-                        }
-                    ?>
-                    </select>
-                    </td><td class="fontstyle_searchoptions">&nbsp;&nbsp;
-                    <input type="checkbox" name="today" value="true" <?php  if ($today) { ?>checked<?php }?>>
-                    <?php echo gettext("To");?>  :
-                    <select name="tostatsday_sday" class="form_input_select">
-                    <?php
-                        for ($i=1;$i<=31;$i++) {
-                            if ($tostatsday_sday==sprintf("%02d",$i)) {$selected="selected";} else {$selected="";}
-                            echo '<option value="'.sprintf("%02d",$i)."\"$selected>".sprintf("%02d",$i).'</option>';
-                        }
-                    ?>
-                    </select>
-                     <select name="tostatsmonth_sday" class="form_input_select">
-                    <?php 	$year_actual = date("Y");
-                        for ($i=$year_actual;$i >= $year_actual-1;$i--) {
-                            if ($year_actual==$i) {
-                                $monthnumber = date("n")-1; // Month number without lead 0.
-                            } else {
-                                $monthnumber=11;
-                            }
-                            for ($j=$monthnumber;$j>=0;$j--) {
-                                $month_formated = sprintf("%02d",$j+1);
-                                   if ($tostatsmonth_sday=="$i-$month_formated") $selected="selected";
-                                else	$selected="";
-                                echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
-                            }
-                        }
-                    ?>
-                    </select>
-                    </td></tr></table>
-                  </td>
-            </tr>
-            <tr>
-                <td class="bgcolor_004" align="left">
-                </td>
-                  <td class="bgcolor_003" align="left">
-                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                    <tr><td class="fontstyle_searchoptions">
-
-                    <select name="status" class="form_input_select">
-                    <?php
-                            echo "<OPTION value=\"-1\">" . gettext("SELECT STATUS") . "</option>";
-                        foreach ($cardstatus_list as $status) {
-                            echo "<OPTION value=\"$status[1]\"> $status[0] </option>";
+                            echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
                         }
-                    ?>
-                    </select>
-                    </td></tr></table>
-                  </td>
-            </tr>
-
-            <tr>
-                <td class="bgcolor_004" align="left" > </td>
-
-                <td class="bgcolor_003" align="center" >
-                    <input type="image"  name="image16" align="top" border="0" src="<?php echo Images_Path;?>/button-search.gif" />
-
-                  </td>
-            </tr>
-        </tbody></table>
+                    }
+                ?>
+                </select>
+                </td></tr></table>
+              </td>
+        </tr>
+        <tr>
+            <td class="bgcolor_004" align="left">
+            </td>
+              <td class="bgcolor_003" align="left">
+                <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                <tr><td class="fontstyle_searchoptions">
+
+                <select name="status" class="form_input_select">
+                <?php
+                        echo "<OPTION value=\"-1\">" . gettext("SELECT STATUS") . "</option>";
+                    foreach ($cardstatus_list as $status) {
+                        echo "<OPTION value=\"$status[1]\"> $status[0] </option>";
+                    }
+                ?>
+                </select>
+                </td></tr></table>
+              </td>
+        </tr>
+        <tr>
+            <td class="bgcolor_004" align="left" > </td>
+            <td class="bgcolor_003" align="center" >
+                <input type="image"  name="image16" align="top" border="0" src="<?php echo Images_Path;?>/button-search.gif" />
+
+              </td>
+        </tr>
+    </tbody></table>
 </FORM>
 
 <?php
diff --git a/admin/Public/A2B_entity_subscriber.php b/admin/Public/A2B_entity_subscriber.php
old mode 100644
new mode 100755
index 426de6e1b..afc6946f3
--- a/admin/Public/A2B_entity_subscriber.php
+++ b/admin/Public/A2B_entity_subscriber.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_subscriber_signup.php b/admin/Public/A2B_entity_subscriber_signup.php
index d263fedd2..a04d91f5e 100755
--- a/admin/Public/A2B_entity_subscriber_signup.php
+++ b/admin/Public/A2B_entity_subscriber_signup.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_subscription.php b/admin/Public/A2B_entity_subscription.php
old mode 100644
new mode 100755
index b20c1e456..e25ecdc47
--- a/admin/Public/A2B_entity_subscription.php
+++ b/admin/Public/A2B_entity_subscription.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_tariffgroup.php b/admin/Public/A2B_entity_tariffgroup.php
index e9efc82e4..02f62ccb4 100644
--- a/admin/Public/A2B_entity_tariffgroup.php
+++ b/admin/Public/A2B_entity_tariffgroup.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -50,31 +50,33 @@
     $HD_Form->FG_EDITION_CLAUSE = str_replace("%id", "$id", $HD_Form->FG_EDITION_CLAUSE);
 }
 
-if (!isset ($form_action))
+if (!isset ($form_action)) {
     $form_action = "list"; //ask-add
-if (!isset ($action))
+}
+if (!isset ($action)) {
     $action = $form_action;
+}
 
 $list = $HD_Form->perform_action($form_action);
 
 // #### HEADER SECTION
 $smarty->display('main.tpl');
 ?>
-    <SCRIPT LANGUAGE="javascript">
-    <!-- Begin
-    public function sendValue(selvalue)
-    {
-            window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
-        window.close();
-    }
-    // End -->
-    </script>
+<SCRIPT LANGUAGE="javascript">
+<!--
+function sendValue(selvalue) {
+    window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
+    window.close();
+}
+// -->
+</script>
 <?php
 
 // #### HELP SECTION
 if ($form_action == 'list') {
-    if (!$popup_select)
+    if (!$popup_select) {
         echo $CC_help_list_tariffgroup;
+    }
 } else {
     echo $CC_help_list_tariffgroup;
 }
@@ -85,5 +87,6 @@ public function sendValue(selvalue)
 $HD_Form->create_form($form_action, $list, $id = null);
 
 // #### FOOTER SECTION
-if (!$popup_select)
+if (!$popup_select) {
     $smarty->display('footer.tpl');
+}
diff --git a/admin/Public/A2B_entity_tariffplan.php b/admin/Public/A2B_entity_tariffplan.php
old mode 100644
new mode 100755
index 1fcb6de6b..4010a1f6e
--- a/admin/Public/A2B_entity_tariffplan.php
+++ b/admin/Public/A2B_entity_tariffplan.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_transactions.php b/admin/Public/A2B_entity_transactions.php
old mode 100644
new mode 100755
index c839bec45..62876466b
--- a/admin/Public/A2B_entity_transactions.php
+++ b/admin/Public/A2B_entity_transactions.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_transactions_agent.php b/admin/Public/A2B_entity_transactions_agent.php
index b2b4f87c0..b03a4f2b3 100755
--- a/admin/Public/A2B_entity_transactions_agent.php
+++ b/admin/Public/A2B_entity_transactions_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_translate.php b/admin/Public/A2B_entity_translate.php
old mode 100644
new mode 100755
index 2d2449ace..e0eafa9c8
--- a/admin/Public/A2B_entity_translate.php
+++ b/admin/Public/A2B_entity_translate.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -90,65 +90,74 @@
 }
 
 ?>
-<FORM name="theForm" action="<?php echo $_SERVER['PHP_SELF'] ?>" METHOD="POST">
-<input name="mailtype" value="<?php echo $mailtype; ?>" type="hidden">
+<FORM name="theForm" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) ?>" METHOD="POST">
+<INPUT name="mailtype" value="<?php echo $mailtype; ?>" type="hidden">
+
+<?php
+    if ($HD_Form->FG_CSRF_STATUS == true) {
+?>
+    <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+    <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+<?php
+    }
+?>
 
 <table cellspacing="2" class="addform_table1">
-     <TBODY>
-        <TR>
-            <TD width="%25" valign="middle" class="form_head"> <?php echo gettext('Language');?> </TD>
-            <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" class="text">
-                <select NAME="languages" size="1" class="form_input_select" onChange="form.submit()">
+    <TBODY>
+    <TR>
+        <TD width="%25" valign="middle" class="form_head"> <?php echo gettext('Language');?> </TD>
+        <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" class="text">
+            <select NAME="languages" size="1" class="form_input_select" onChange="form.submit()">
+            <?php
+                foreach ($languages_list as $key => $lang_value) {
+            ?>
+            <option value='<?php echo $lang_value[0];?>'
                 <?php
-                    foreach ($languages_list as $key => $lang_value) {
-                ?>
-                <option value='<?php echo $lang_value[0];?>'
-                    <?php
-                    if ($mail[0][4] != '') {
-                        if ($lang_value[0]==$mail[0][4]) {print "selected";}
-                    } else {
-                        if ($lang_value[0]==$languages) {print "selected";}
-                    }?>><?php echo $lang_value[1]; ?></option>
-                <?php }?>
-                </select>
-                <span class="liens">
-            </span>
-            </TD>
-        </TR>
-
-        <TR>
-            <TD width="%25" valign="middle" class="form_head"> <?php echo gettext('Subject');?> </TD>
-            <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" class="text">
-            <INPUT class="form_input_text" name="subject"  size=30 maxlength=30 value="<?php echo $mail[0][2]?>">
-            <span class="liens">
-            </span>
-            </TD>
-        </TR>
-
-        <TR>
-            <TD width="%25" valign="middle" class="form_head"> <?php echo gettext('Mail Text');?> </TD>
-            <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" class="text">
-            <TEXTAREA class="form_input_textarea" name="mailtext" cols=60 rows=12><?php echo $mail[0][3]?></TEXTAREA>
+                if ($mail[0][4] != '') {
+                    if ($lang_value[0]==$mail[0][4]) {print "selected";}
+                } else {
+                    if ($lang_value[0]==$languages) {print "selected";}
+                }?>><?php echo $lang_value[1]; ?></option>
+            <?php }?>
+            </select>
             <span class="liens">
-            </span>
-            </TD>
-        </TR>
-</table>
-      <TABLE cellspacing="0" class="editform_table8">
-        <tr>
-         <td colspan="2" class="editform_dotted_line">&nbsp; </td>
-        </tr>
-
-        <tr>
-            <td width="50%" class="text_azul"><span class="tableBodyRight"><?php echo gettext('Once you have completed the form above, click on the Translate button.');?></span></td>
-            <td width="50%" align="right" class="text">
-        <input class="form_input_button" TYPE="submit" name="translate_data" VALUE="translate">
-            </td>
-        </tr>
-
-      </TABLE>
-      <INPUT type="hidden" name="id" value="<?php echo $id?>">
-    </form>
+        </span>
+        </TD>
+    </TR>
+
+    <TR>
+        <TD width="%25" valign="middle" class="form_head"> <?php echo gettext('Subject');?> </TD>
+        <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" class="text">
+        <INPUT class="form_input_text" name="subject"  size=30 maxlength=30 value="<?php echo $mail[0][2]?>">
+        <span class="liens">
+        </span>
+        </TD>
+    </TR>
+
+    <TR>
+        <TD width="%25" valign="middle" class="form_head"> <?php echo gettext('Mail Text');?> </TD>
+        <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" class="text">
+        <TEXTAREA class="form_input_textarea" name="mailtext" cols=60 rows=12><?php echo $mail[0][3]?></TEXTAREA>
+        <span class="liens">
+        </span>
+        </TD>
+    </TR>
+    </table>
+    <TABLE cellspacing="0" class="editform_table8">
+    <tr>
+     <td colspan="2" class="editform_dotted_line">&nbsp; </td>
+    </tr>
+
+    <tr>
+        <td width="50%" class="text_azul"><span class="tableBodyRight"><?php echo gettext('Once you have completed the form above, click on the Translate button.');?></span></td>
+        <td width="50%" align="right" class="text">
+    <input class="form_input_button" TYPE="submit" name="translate_data" VALUE="translate">
+        </td>
+    </tr>
+
+    </TABLE>
+    <INPUT type="hidden" name="id" value="<?php echo $id?>">
+</form>
 
 <?php
 
diff --git a/admin/Public/A2B_entity_trunk.php b/admin/Public/A2B_entity_trunk.php
index 6a61d8826..016aa7f18 100644
--- a/admin/Public/A2B_entity_trunk.php
+++ b/admin/Public/A2B_entity_trunk.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -46,9 +46,20 @@
 getpost_ifset(array (
     'popup_select',
     'popup_formname',
-    'popup_fieldname'
+    'popup_fieldname',
+    'counters_clear'
 ));
 
+if ($counters_clear && !empty($id)) {
+    eraseTrunkCounters($id);
+    $_SESSION['trunk_counters_erased'] = true;
+    Header("Location: A2B_entity_trunk.php?form_action=ask-edit&id=" . $id);
+    die;
+} else if (isset($_SESSION['trunk_counters_erased'])) {
+    unset($_SESSION['trunk_counters_erased']);
+    echo '<script>alert("' . gettext("Trunk counters has been erased...") . '")</script>';
+}
+
 $HD_Form->setDBHandler(DbConnect());
 
 $HD_Form->init();
@@ -71,9 +82,9 @@
 ?>
     <SCRIPT LANGUAGE="javascript">
     <!-- Begin
-    public function sendValue(selvalue)
+    function sendValue(selvalue)
     {
-            window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
+        window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
         window.close();
     }
     // End -->
@@ -100,6 +111,17 @@ public function sendValue(selvalue)
 // #### TOP SECTION PAGE
 $HD_Form->create_toppage($form_action);
 
+// display clear trunk counters controls
+if ($form_action=='ask-edit' && !empty($id)) {
+    ?>
+    <div align="right" style="padding-right: 35px;">
+        <a href="?form_action=ask-edit&id=<?php echo $id; ?>&counters_clear=1" onclick="return confirm('<?php echo gettext("Trunk counters will be erased, are you sure?"); ?>')">
+            <?php echo gettext("Clear trunk counters"); ?>
+        </a>
+    </div>
+    <?php
+}
+
 $HD_Form->create_form($form_action, $list, $id = null);
 
 // #### FOOTER SECTION
diff --git a/admin/Public/A2B_entity_user.php b/admin/Public/A2B_entity_user.php
old mode 100644
new mode 100755
index 315a6d694..df20329ee
--- a/admin/Public/A2B_entity_user.php
+++ b/admin/Public/A2B_entity_user.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_entity_voucher.php b/admin/Public/A2B_entity_voucher.php
old mode 100644
new mode 100755
index 9b9f60d32..c9a186f9d
--- a/admin/Public/A2B_entity_voucher.php
+++ b/admin/Public/A2B_entity_voucher.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -156,7 +156,6 @@
 
 /********************************* BATCH UPDATE ***********************************/
 if ($form_action == "list" && (!($popup_select>=1))	) {
-
     $instance_table_tariff = new Table("cc_tariffgroup", "id, tariffgroupname");
     $FG_TABLE_CLAUSE = "";
     $list_tariff = $instance_table_tariff -> Get_list ($HD_Form -> DBHandle, $FG_TABLE_CLAUSE, "tariffgroupname", "ASC", null, null, null, null);
@@ -170,9 +169,17 @@
 
 <center>
 <b>&nbsp;<?php echo $HD_Form -> FG_NB_RECORD ?> <?php echo gettext("vouchers selected!"); ?>&nbsp;<?php echo gettext("Use the options below to batch update the selected vouchers.");?></b>
-       <table align="center" border="0" width="65%"  cellspacing="1" cellpadding="2">
+    <table align="center" border="0" width="65%"  cellspacing="1" cellpadding="2">
         <tbody>
-        <form name="updateForm" action="<?php echo $_SERVER['PHP_SELF']?>" method="post">
+        <form name="updateForm" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>" method="post">
+        <?php
+            if ($HD_Form->FG_CSRF_STATUS == true) {
+        ?>
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+        <?php
+            }
+        ?>
         <INPUT type="hidden" name="batchupdate" value="1">
         <tr>
           <td align="left" class="bgcolor_001" >
@@ -251,9 +258,9 @@
             </td>
         </tr>
         </form>
-        </table>
+    </table>
 </center>
-    </div>
+</div>
 </div>
 <!-- ** ** ** ** ** Part for the Update ** ** ** ** ** -->
 <?php
diff --git a/admin/Public/A2B_entity_voucher_multi.php b/admin/Public/A2B_entity_voucher_multi.php
index 832c3d2c7..749abe314 100644
--- a/admin/Public/A2B_entity_voucher_multi.php
+++ b/admin/Public/A2B_entity_voucher_multi.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -97,60 +97,66 @@
 echo $CC_help_generate_voucher;
 
 ?>
-      <div align="center">
-       <table align="center" class="bgcolor_001" border="0" width="65%">
-        <tbody><tr>
-        <form name="theForm" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-          <td align="left" width="75%">
-
-                  <strong>1)</strong>
-                <select name="choose_list" size="1" class="form_input_select">
-                        <option value=""><?php echo gettext("Choose the number of vouchers to create");?></option>
-                        <option class="input" value="5"><?php echo gettext("5 Voucher");?></option>
-                        <option class="input" value="10"><?php echo gettext("10 Vouchers");?></option>
-                        <option class="input" value="50"><?php echo gettext("50 Vouchers");?></option>
-                        <option class="input" value="100"><?php echo gettext("100 Vouchers");?></option>
-                        <option class="input" value="200"><?php echo gettext("200 Vouchers");?></option>
-                        <option class="input" value="500"><?php echo gettext("500 Vouchers");?></option>
-                    </select>
-                    <br/>
-
-                  <strong>2)</strong>
-                <?php echo gettext("Amount of credit");?> : 	<input class="form_input_text" name="addcredit" size="10" maxlength="10" >
-                <br/>
-
-                <strong>3)</strong>
-                <select NAME="choose_currency" size="1" class="form_input_select">
-                    <?php
-                    foreach ($currencies_list as $key => $cur_value) {
-                ?>
-                    <option value='<?php echo $key ?>'><?php echo $cur_value[1].' ('.$cur_value[2].')' ?></option>
-                <?php } ?>
-                   </select>
-                <br/>
-
-                <?php
-                    $begin_date = date("Y");
-                    $begin_date_plus = date("Y")+10;
-                    $end_date = date("-m-d H:i:s");
-                    $comp_date = "value='".$begin_date.$end_date."'";
-                    $comp_date_plus = "value='".$begin_date_plus.$end_date."'";
-                ?>
-                <strong>4)</strong>
-                <?php echo gettext("Expiration date");?> : <input class="form_input_text"  name="expirationdate" size="40" maxlength="40" <?php echo $comp_date_plus; ?>> <?php echo gettext("(respect the format YYYY-MM-DD HH:MM:SS)");?>
-                <br/>
-                <strong>5)</strong>
-                <?php echo gettext("Tag");?> : <input class="form_input_text"  name="tag_list" size="40" maxlength="40" >
-
+<div align="center">
+<table align="center" class="bgcolor_001" border="0" width="65%">
+<tbody><tr>
+<form name="theForm" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) ?>">
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
+    <td align="left" width="75%">
+        <strong>1)</strong>
+        <select name="choose_list" size="1" class="form_input_select">
+            <option value=""><?php echo gettext("Choose the number of vouchers to create");?></option>
+            <option class="input" value="5"><?php echo gettext("5 Voucher");?></option>
+            <option class="input" value="10"><?php echo gettext("10 Vouchers");?></option>
+            <option class="input" value="50"><?php echo gettext("50 Vouchers");?></option>
+            <option class="input" value="100"><?php echo gettext("100 Vouchers");?></option>
+            <option class="input" value="200"><?php echo gettext("200 Vouchers");?></option>
+            <option class="input" value="500"><?php echo gettext("500 Vouchers");?></option>
+        </select>
+        <br/>
+
+        <strong>2)</strong>
+        <?php echo gettext("Amount of credit");?> : 	<input class="form_input_text" name="addcredit" size="10" maxlength="10" >
+        <br/>
+
+        <strong>3)</strong>
+        <select NAME="choose_currency" size="1" class="form_input_select">
+        <?php
+        foreach ($currencies_list as $key => $cur_value) {
+        ?>
+        <option value='<?php echo $key ?>'><?php echo $cur_value[1].' ('.$cur_value[2].')' ?></option>
+        <?php } ?>
+        </select>
+        <br/>
+
+        <?php
+            $begin_date = date("Y");
+            $begin_date_plus = date("Y") + 10;
+            $end_date = date("-m-d H:i:s");
+            $comp_date = "value='".$begin_date.$end_date."'";
+            $comp_date_plus = "value='".$begin_date_plus.$end_date."'";
+        ?>
+        <strong>4)</strong>
+        <?php echo gettext("Expiration date");?> : <input class="form_input_text"  name="expirationdate" size="40" maxlength="40" <?php echo $comp_date_plus; ?>> <?php echo gettext("(respect the format YYYY-MM-DD HH:MM:SS)");?>
+        <br/>
+        <strong>5)</strong>
+        <?php echo gettext("Tag");?> : <input class="form_input_text"  name="tag_list" size="40" maxlength="40">
         </td>
         <td align="left" valign="bottom">
-                <input class="form_input_button" value=" GENERATE VOUCHER " type="submit">
+            <input class="form_input_button" value=" GENERATE VOUCHER " type="submit">
         </td>
-         </form>
-        </tr>
-      </tbody></table>
-      <br>
-    </div>
+</form>
+</tr>
+</tbody></table>
+<br>
+</div>
 
 <?php
 
@@ -159,10 +165,12 @@
 $HD_Form -> create_form ($form_action, $list, $id=null) ;
 
 $_SESSION[$HD_Form->FG_EXPORT_SESSION_VAR]= "SELECT ".$HD_Form -> FG_EXPORT_FIELD_LIST." FROM $HD_Form->FG_TABLE_NAME";
-if (strlen($HD_Form->FG_TABLE_CLAUSE)>1)
+if (strlen($HD_Form->FG_TABLE_CLAUSE)>1) {
     $_SESSION[$HD_Form->FG_EXPORT_SESSION_VAR] .= " WHERE $HD_Form->FG_TABLE_CLAUSE ";
-if (!is_null ($HD_Form->FG_ORDER) && ($HD_Form->FG_ORDER!='') && !is_null ($HD_Form->FG_SENS) && ($HD_Form->FG_SENS!=''))
+}
+if (!is_null ($HD_Form->FG_ORDER) && ($HD_Form->FG_ORDER!='') && !is_null ($HD_Form->FG_SENS) && ($HD_Form->FG_SENS!='')) {
     $_SESSION[$HD_Form->FG_EXPORT_SESSION_VAR].= " ORDER BY $HD_Form->FG_ORDER $HD_Form->FG_SENS";
+}
 
 // #### FOOTER SECTION
 $smarty->display('footer.tpl');
diff --git a/admin/Public/A2B_invoice_edit.php b/admin/Public/A2B_invoice_edit.php
index 51ad712b0..2352a5156 100755
--- a/admin/Public/A2B_invoice_edit.php
+++ b/admin/Public/A2B_invoice_edit.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_invoice_manage_payment.php b/admin/Public/A2B_invoice_manage_payment.php
index 9a0fcac9e..c1b2d119c 100755
--- a/admin/Public/A2B_invoice_manage_payment.php
+++ b/admin/Public/A2B_invoice_manage_payment.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -90,26 +90,23 @@
 ?>
 
 <SCRIPT LANGUAGE="javascript">
-<!-- Begin
+<!--
 var win= null;
-function addpayment(selvalue)
-{
+function addpayment(selvalue) {
     //test si win est encore ouvert et close ou refresh
     win=MM_openBrWindow('A2B_entity_payment_invoice.php?popup_select=1&invoice=<?php echo $id ?>&card=<?php echo $invoice->getCard() ?>','','scrollbars=yes,resizable=yes,width=700,height=500');
 }
-function delpayment()
-{
+function delpayment() {
     //test si val is not null & numeric
     if ($('#payment').val()!=null) {
         self.location.href= "A2B_invoice_manage_payment.php?id=<?php echo $id; ?>&delpayment="+$('#payment').val();
     }
 }
 
-function changeStatus()
-{
+function changeStatus() {
     self.location.href= "A2B_invoice_manage_payment.php?id=<?php echo $id; ?>&status=<?php echo ($invoice->getPaidStatus()+1)%2; ?>";
 }
-// End -->
+// -->
 
 </script>
 <table class="invoice_table" >
diff --git a/admin/Public/A2B_invoice_view.php b/admin/Public/A2B_invoice_view.php
index 71ec5f547..11650455d 100755
--- a/admin/Public/A2B_invoice_view.php
+++ b/admin/Public/A2B_invoice_view.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -132,7 +132,7 @@ function amount_convert($amount)
 &nbsp;&nbsp;
 <?php if (strtoupper(BASE_CURRENCY)!=strtoupper($card['currency'])) { ?>
 
-    <select id="currency" class="form_input_select" name="curr" onChange="openURL('<?php echo $_SERVER['PHP_SELF']."?id=$id"?>')">
+    <select id="currency" class="form_input_select" name="curr" onChange="openURL('<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?id=$id"?>')">
         <option value="<?php echo BASE_CURRENCY;?>" <?php if(BASE_CURRENCY==$curr) echo "selected";?>  ><?php echo gettext('SYSTEM CURRENCY')." : ".strtoupper(BASE_CURRENCY); ?> </option>
         <option value="<?php echo $card['currency'];?>" <?php if($card['currency']==$curr) echo "selected";?>   ><?php echo gettext('CUSTOMER CURRENCY')." : ".strtoupper($card['currency']); ?></option>
     </select>
diff --git a/admin/Public/A2B_log_activity_info.php b/admin/Public/A2B_log_activity_info.php
old mode 100644
new mode 100755
index d0a665a63..405395ff7
--- a/admin/Public/A2B_log_activity_info.php
+++ b/admin/Public/A2B_log_activity_info.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_logfile.php b/admin/Public/A2B_logfile.php
old mode 100644
new mode 100755
index 5b70f1663..bd09fa40b
--- a/admin/Public/A2B_logfile.php
+++ b/admin/Public/A2B_logfile.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_mass_mail.php b/admin/Public/A2B_mass_mail.php
old mode 100644
new mode 100755
index bedf79da9..5fcb71f04
--- a/admin/Public/A2B_mass_mail.php
+++ b/admin/Public/A2B_mass_mail.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -186,17 +186,14 @@
 ?>
 
 <SCRIPT LANGUAGE="javascript">
-<!-- Begin
 var win= null;
-function loadtmpl()
-{
-    //test si win est encore ouvert et close ou refresh
+function loadtmpl() {
+    //test if windows is still open and close on refresh
     win=MM_openBrWindow('A2B_entity_mailtemplate.php?popup_select=1','','scrollbars=yes,resizable=yes,width=700,height=500');
 }
-// End -->
-
 </script>
 <script language="JavaScript" src="javascript/card.js"></script>
+
 <div class="toggle_hide2show">
 <?php
     if ($_REQUEST['id']==null) {
@@ -220,26 +217,34 @@ function loadtmpl()
 }
 
 ?>
-<FORM action="<?php echo $_SERVER['PHP_SELF']?>" method="post" name="mass_mail">
-    <table class="editform_table1" cellspacing="2">
-<?php
-    if (isset($submit)) {
-?>
-        <TR>
-         <td align="center" colspan="2"><?php echo gettext("The e-mail has been sent to "); echo $total_customer; echo gettext(" customer(s)!")?></td>
-        </TR>
-    <?php if ($err_sent > 0) { ?>
-        <tr>
-         <td align="center" colspan="2"><br/><?php echo gettext("There is some error sending e-mail :");?>
-
-         <div class="scroll">
-<pre>
-<?php echo $error_msg; ?>
-</pre>
-</div>
+<FORM action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>" method="post" name="mass_mail">
+<table class="editform_table1" cellspacing="2">
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
+    <?php
+        if (isset($submit)) {
+    ?>
+    <TR>
+      <td align="center" colspan="2"><?php echo gettext("The e-mail has been sent to "); echo $total_customer; echo gettext(" customer(s)!")?></td>
+    </TR>
+<?php if ($err_sent > 0) { ?>
+    <tr>
+      <td align="center" colspan="2"><br/><?php echo gettext("There is some error sending e-mail :");?>
+
+      <div class="scroll">
+        <pre>
+          <?php echo $error_msg; ?>
+        </pre>
+      </div>
 
-         </td>
-       </tr>
+      </td>
+    </tr>
     <?php
         }
 
@@ -262,79 +267,78 @@ function loadtmpl()
 <?php
     if (is_array($list_customer)) {
 ?>
-       <TR>
-            <TD width="%25" valign="middle" class="form_head"><?php echo gettext("TO");?></TD>
-            <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" >
-            <?php
-                $link_to_customer = CUSTOMER_UI_URL;
-                if ($nb_customer==1) {
-                echo "<input type=\"hidden\" name=\"id\" value=".$_REQUEST['id'].">";
-            }
-                if (is_array($list_customer)) {
-                    for ($key=0; $key < $nb_customer && $key <= 100; $key++) {
-                        echo "<a href=A2B_entity_card.php?form_action=ask-edit&id=".$list_customer[$key]['id']." target=\"_blank\">".$list_customer[$key][1]."</a>";
-                        if ($key + 1 != $nb_customer) echo ", ";
-                            echo "<input type=\"hidden\" name=\"hd_email[]\" value=".$list_customer[$key][1].">";
-                        if ($key == 100) {
-                            echo "<br><a href=\"A2B_entity_card.php?atmenu=card&stitle=Customers_Card&section=1\" target=\"_blank\">".gettext("Click on list customer to see them all")."</a>";
-                        }
+    <TR>
+        <TD width="%25" valign="middle" class="form_head"><?php echo gettext("TO");?></TD>
+        <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" >
+        <?php
+            $link_to_customer = CUSTOMER_UI_URL;
+            if ($nb_customer==1) {
+            echo "<input type=\"hidden\" name=\"id\" value=".$_REQUEST['id'].">";
+        }
+            if (is_array($list_customer)) {
+                for ($key=0; $key < $nb_customer && $key <= 100; $key++) {
+                    echo "<a href=A2B_entity_card.php?form_action=ask-edit&id=".$list_customer[$key]['id']." target=\"_blank\">".$list_customer[$key][1]."</a>";
+                    if ($key + 1 != $nb_customer) echo ", ";
+                        echo "<input type=\"hidden\" name=\"hd_email[]\" value=".$list_customer[$key][1].">";
+                    if ($key == 100) {
+                        echo "<br><a href=\"A2B_entity_card.php?atmenu=card&stitle=Customers_Card&section=1\" target=\"_blank\">".gettext("Click on list customer to see them all")."</a>";
                     }
-                }?><span class="liens"></span>&nbsp;<br>
-             </TD>
-       </TR>
+                }
+            }?><span class="liens"></span>&nbsp;<br>
+         </TD>
+    </TR>
 <?php
     }
 ?>
-        <TR>
-            <TD width="%25" valign="middle" class="form_head">&nbsp;</TD>
-            <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" >
-                <input class="form_input_button" onClick="loadtmpl()"   style="vertical-align:top" TYPE="button" VALUE="<?php echo gettext(">LOAD TEMPLATE<");?>" />
-             </TD>
-        </TR>
-        <TR>
-            <TD width="%25" valign="middle" class="form_head"><?php echo gettext("EMAIL FROM");?></TD>
-            <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" >
-                <INPUT class="form_input_text" id="from" name="from"  size="30" maxlength="80" value="<?php echo EMAIL_ADMIN; ?>"><span class="liens"></span>&nbsp;
-             </TD>
-        </TR>
-        <TR>
-            <TD width="%25" valign="middle" class="form_head"><?php echo gettext("FROM NAME");?></TD>
-            <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" >
-                <INPUT class="form_input_text" id="fromname" name="fromname"  size="30" maxlength="80" value=""><span class="liens"></span>&nbsp;
-             </TD>
-        </TR>
-        <TR>
-            <TD width="%25" valign="middle" class="form_head"><?php echo gettext("SUBJECT");?></TD>
-            <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" >
-                <INPUT class="form_input_text" name="subject" id="subject"  size="50" maxlength="120" value=""><span class="liens"></span>&nbsp;
-             </TD>
-        </TR>
-        <TR>
-            <TD width="%25" valign="middle" class="form_head"><?php echo gettext("MESSAGE");?></TD>
-            <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" >
-
-                <textarea id="msg_mail" class="form_input_textarea" name="message"  cols="80" rows="15""></textarea>
-                    <span class="liens"></span>&nbsp; </TD>
-         </TR>
-
-        <tr>
-            <td>&nbsp;</td>
-                        <td align="right" >
-            <input class="form_input_button" name="submit"  TYPE="submit" VALUE="<?php echo gettext("EMAIL");?>"></td>
-        </tr>
-        <tr>
-         <td colspan="2"> <?php echo $tags_help; ?></td>
-        </tr>
-            <?php } else { ?>
-        <tr>
-             <td colspan="2" align="center"><?php echo gettext("No Record Found!");?></td>
-        </tr>
-        <?php }
-        }
-        ?>
-        </table>
-        <input type="hidden" name="total_customer" value="<?php echo $nb_customer?>">
-    </FORM>
+    <TR>
+        <TD width="%25" valign="middle" class="form_head">&nbsp;</TD>
+        <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif" >
+            <input class="form_input_button" onClick="loadtmpl()"   style="vertical-align:top" TYPE="button" VALUE=" <?php echo gettext("LOAD TEMPLATE");?> " />
+         </TD>
+    </TR>
+    <TR>
+        <TD width="%25" valign="middle" class="form_head"><?php echo gettext("EMAIL FROM");?></TD>
+        <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif">
+            <INPUT class="form_input_text" id="from" name="from"  size="30" maxlength="80" value="<?php echo EMAIL_ADMIN; ?>"><span class="liens"></span>&nbsp;
+         </TD>
+    </TR>
+    <TR>
+        <TD width="%25" valign="middle" class="form_head"><?php echo gettext("FROM NAME");?></TD>
+        <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif">
+            <INPUT class="form_input_text" id="fromname" name="fromname"  size="30" maxlength="80" value=""><span class="liens"></span>&nbsp;
+         </TD>
+    </TR>
+    <TR>
+        <TD width="%25" valign="middle" class="form_head"><?php echo gettext("SUBJECT");?></TD>
+        <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif">
+            <INPUT class="form_input_text" name="subject" id="subject"  size="50" maxlength="120" value=""><span class="liens"></span>&nbsp;
+         </TD>
+    </TR>
+    <TR>
+        <TD width="%25" valign="middle" class="form_head"><?php echo gettext("MESSAGE");?></TD>
+        <TD width="%75" valign="top" class="tableBodyRight" background="../Public/templates/default/images/background_cells.gif">
+        <TEXTAREA id="msg_mail" class="form_input_textarea" name="message"  cols="80" rows="15""></textarea>
+            <span class="liens"></span>&nbsp; </TD>
+     </TR>
+
+    <tr>
+        <td>&nbsp;</td>
+                    <td align="right" >
+        <input class="form_input_button" name="submit"  TYPE="submit" VALUE="<?php echo gettext("EMAIL");?>"></td>
+    </tr>
+    <tr>
+     <td colspan="2"> <?php echo $tags_help; ?></td>
+    </tr>
+        <?php } else { ?>
+    <tr>
+         <td colspan="2" align="center"><?php echo gettext("No Record Found!");?></td>
+    </tr>
+    <?php }
+    }
+    ?>
+    </table>
+    <input type="hidden" name="total_customer" value="<?php echo $nb_customer?>">
+</FORM>
 
 <?php
 
diff --git a/admin/Public/A2B_notification.php b/admin/Public/A2B_notification.php
old mode 100644
new mode 100755
index 510ebc6a3..04d47fcd5
--- a/admin/Public/A2B_notification.php
+++ b/admin/Public/A2B_notification.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_notifications.php b/admin/Public/A2B_notifications.php
old mode 100644
new mode 100755
index 966ca3152..d3c24095f
--- a/admin/Public/A2B_notifications.php
+++ b/admin/Public/A2B_notifications.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_package_manage_rates.php b/admin/Public/A2B_package_manage_rates.php
old mode 100644
new mode 100755
index fe284ea97..7759c17b2
--- a/admin/Public/A2B_package_manage_rates.php
+++ b/admin/Public/A2B_package_manage_rates.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_payment_info.php b/admin/Public/A2B_payment_info.php
old mode 100644
new mode 100755
index 5f0cc7eaa..b146536bf
--- a/admin/Public/A2B_payment_info.php
+++ b/admin/Public/A2B_payment_info.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_payment_info_agent.php b/admin/Public/A2B_payment_info_agent.php
old mode 100644
new mode 100755
index a70ed44e2..95cb6fcc6
--- a/admin/Public/A2B_payment_info_agent.php
+++ b/admin/Public/A2B_payment_info_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_phonelist_import.php b/admin/Public/A2B_phonelist_import.php
deleted file mode 100755
index 8e4a558f8..000000000
--- a/admin/Public/A2B_phonelist_import.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * This file is part of A2Billing (http://www.a2billing.net/)
- *
- * A2Billing, Commercial Open Source Telecom Billing platform,
- * powered by Star2billing S.L. <http://www.star2billing.com/>
- *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
- * @author      Belaid Arezqui <areski@gmail.com>
- * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
- * @package     A2Billing
- *
- * Software License Agreement (GNU Affero General Public License)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
-**/
-
-include '../lib/admin.defines.php';
-include '../lib/admin.module.access.php';
-include '../lib/admin.smarty.php';
-
-set_time_limit(0);
-
-if (! has_rights (ACX_PREDICTIVE_DIALER)) {
-    Header ("HTTP/1.0 401 Unauthorized");
-    Header ("Location: PP_error.php?c=accessdenied");
-    die();
-}
-
-$FG_DEBUG = 0;
-
-$DBHandle  = DbConnect();
-$my_max_file_size = (int) MY_MAX_FILE_SIZE_IMPORT;
-
-$instance_table_phonebook = new Table("cc_phonebook", "id, name");
-$FG_TABLE_CLAUSE = "";
-$list_phonebook = $instance_table_phonebook  -> Get_list ($DBHandle, $FG_TABLE_CLAUSE, "name", "ASC", null, null, null, null);
-$nb_phonebook = count($list_phonebook);
-
-$smarty->display('main.tpl');
-
-?>
-<script type="text/javascript">
-<!--
-
-function sendtoupload(form)
-{
-    if (form.phonebook.value.length < 1) {
-        alert ('<?php echo gettext("Please, you must first select a phonebook !")?>');
-        form.tariffplan.focus ();
-
-        return (false);
-    }
-    if (form.the_file.value.length < 2) {
-        alert ('<?php echo gettext("Please, you must first select a file !")?>');
-        form.the_file.focus ();
-
-        return (false);
-    }
-
-    document.forms["prefs"].elements["task"].value = "upload";
-    document.prefs.submit();
-}
-
-//-->
-</script>
-
-<script language="JavaScript" type="text/javascript">
-<!--
-function deselectHeaders()
-{
-    document.prefs.unselected_search_sources[0].selected = false;
-    document.prefs.selected_search_sources[0].selected = false;
-}
-
-function resetHidden()
-{
-    var tmp = '';
-    for (i = 1; i < document.prefs.selected_search_sources.length; i++) {
-        tmp += document.prefs.selected_search_sources[i].value;
-        if (i < document.prefs.selected_search_sources.length - 1)
-            tmp += "\t";
-    }
-
-    document.prefs.search_sources.value = tmp;
-}
-
-function addSource()
-{
-    for (i = 1; i < document.prefs.unselected_search_sources.length; i++) {
-        if (document.prefs.unselected_search_sources[i].selected) {
-            document.prefs.selected_search_sources[document.prefs.selected_search_sources.length] = new Option(document.prefs.unselected_search_sources[i].text, document.prefs.unselected_search_sources[i].value);
-            document.prefs.unselected_search_sources[i] = null;
-            i--;
-        }
-    }
-
-    resetHidden();
-}
-
-function removeSource()
-{
-    for (i = 1; i < document.prefs.selected_search_sources.length; i++) {
-        if (document.prefs.selected_search_sources[i].selected) {
-            document.prefs.unselected_search_sources[document.prefs.unselected_search_sources.length] = new Option(document.prefs.selected_search_sources[i].text, document.prefs.selected_search_sources[i].value)
-            document.prefs.selected_search_sources[i] = null;
-            i--;
-        }
-    }
-
-    resetHidden();
-}
-
-function moveSourceUp()
-{
-    var sel = document.prefs.selected_search_sources.selectedIndex;
-    //var sel = document.prefs["selected_search_sources[]"].selectedIndex;
-
-    if (sel == -1 || document.prefs.selected_search_sources.length <= 2) return;
-
-    // deselect everything but the first selected item
-    document.prefs.selected_search_sources.selectedIndex = sel;
-
-    if (sel == 1) {
-        tmp = document.prefs.selected_search_sources[sel];
-        document.prefs.selected_search_sources[sel] = null;
-        document.prefs.selected_search_sources[document.prefs.selected_search_sources.length] = tmp;
-        document.prefs.selected_search_sources.selectedIndex = document.prefs.selected_search_sources.length - 1;
-    } else {
-        tmp = new Array();
-
-        for (i = 1; i < document.prefs.selected_search_sources.length; i++) {
-            tmp[i - 1] = new Option(document.prefs.selected_search_sources[i].text, document.prefs.selected_search_sources[i].value)
-        }
-
-        for (i = 0; i < tmp.length; i++) {
-            if (i + 1 == sel - 1) {
-                document.prefs.selected_search_sources[i + 1] = tmp[i + 1];
-            } elseif (i + 1 == sel) {
-                document.prefs.selected_search_sources[i + 1] = tmp[i - 1];
-            } else {
-                document.prefs.selected_search_sources[i + 1] = tmp[i];
-            }
-        }
-
-        document.prefs.selected_search_sources.selectedIndex = sel - 1;
-    }
-
-    resetHidden();
-}
-
-function moveSourceDown()
-{
-    var sel = document.prefs.selected_search_sources.selectedIndex;
-
-    if (sel == -1 || document.prefs.selected_search_sources.length <= 2) return;
-
-    // deselect everything but the first selected item
-    document.prefs.selected_search_sources.selectedIndex = sel;
-
-    if (sel == document.prefs.selected_search_sources.length - 1) {
-        tmp = new Array();
-
-        for (i = 1; i < document.prefs.selected_search_sources.length; i++) {
-            tmp[i - 1] = new Option(document.prefs.selected_search_sources[i].text, document.prefs.selected_search_sources[i].value)
-        }
-
-        document.prefs.selected_search_sources[1] = tmp[tmp.length - 1];
-        for (i = 0; i < tmp.length - 1; i++) {
-            document.prefs.selected_search_sources[i + 2] = tmp[i];
-        }
-
-        document.prefs.selected_search_sources.selectedIndex = 1;
-    } else {
-        tmp = new Array();
-
-        for (i = 1; i < document.prefs.selected_search_sources.length; i++) {
-            tmp[i - 1] = new Option(document.prefs.selected_search_sources[i].text, document.prefs.selected_search_sources[i].value)
-        }
-
-        for (i = 0; i < tmp.length; i++) {
-            if (i + 1 == sel) {
-                document.prefs.selected_search_sources[i + 1] = tmp[i + 1];
-            } elseif (i + 1 == sel + 1) {
-                document.prefs.selected_search_sources[i + 1] = tmp[i - 1];
-            } else {
-                document.prefs.selected_search_sources[i + 1] = tmp[i];
-            }
-        }
-
-        document.prefs.selected_search_sources.selectedIndex = sel + 1;
-    }
-
-    resetHidden();
-}
-
-// -->
-</script>
-
-<?php
-    echo $CC_help_import_phonebook;
-?>
-<center>
-        <b><?php echo gettext("New phonebooks have to be imported from a CSV file.");?></b></br></br>
-        <table width="95%" border="0" cellspacing="2" align="center" class="records">
-
-              <form name="prefs" enctype="multipart/form-data" action="A2B_phonelist_import_analyse.php" method="post">
-
-                <tr>
-                  <td colspan="2" align=center>
-                  <?php echo gettext("Choose the phonebook to import");?> :
-                  <select NAME="phonebook" size="1"  style="width=250" class="form_input_select">
-                                <option value=''><?php echo gettext("Choose a phonebook");?></option>
-
-                                <?php
-                                 foreach ($list_phonebook as $recordset) {
-                                ?>
-                                    <option class=input value='<?php  echo $recordset[0]?>-:-<?php  echo $recordset[1]?>' <?php if ($recordset[0]==$phonebook) echo "selected";?>><?php echo $recordset[1]?></option>
-                                <?php 	 }
-                                ?>
-                        </select>
-                        <br><br>
-
-                <?php echo gettext("These fields are mandatory");?><br>
-
-<select  name="bydefault" multiple="multiple" size="4" width="40" class="form_input_select">
-    <option value="bb1"><?php echo gettext("number");?></option>
-</select>
-<br/><br/>
-
-<?php echo gettext("Choose the additional fields to import from the CSV file");?>.<br>
-
-<input name="search_sources" value="nochange" type="hidden">
-<table>
-    <tbody><tr>
-        <td>
-            <select name="unselected_search_sources" multiple="multiple" size="9" width="50" onchange="deselectHeaders()" class="form_input_select">
-                <option value=""><?php echo gettext("Unselected Fields...");?></option>
-                <option value="name"><?php echo gettext("name");?></option>
-                <option value="info"><?php echo gettext("info");?></option>
-
-            </select>
-        </td>
-
-        <td>
-            <a href="" onclick="addSource(); return false;"><img src="<?php echo Images_Path;?>/forward.png" alt="add source" title="add source" border="0"></a>
-            <br>
-            <a href="" onclick="removeSource(); return false;"><img src="<?php echo Images_Path;?>/back.png" alt="remove source" title="remove source" border="0"></a>
-        </td>
-        <td>
-            <select name="selected_search_sources" multiple="multiple" size="9" width="50" onchange="deselectHeaders();" class="form_input_select">
-                <option value=""><?php echo gettext("Selected Fields...");?></option>
-            </select>
-        </td>
-
-        <td>
-            <a href="" onclick="moveSourceUp(); return false;"><img src="<?php echo Images_Path;?>/up_black.png" alt="move up" title="move up" border="0"></a>
-            <br>
-            <a href="" onclick="moveSourceDown(); return false;"><img src="<?php echo Images_Path;?>/down_black.png" alt="move down" title="move down" border="0"></a>
-        </td>
-    </tr>
-</tbody></table>
-
-                </td></tr>
-
-                <tr>
-                <td colspan="2" align="center">&nbsp;
-
-                </td>
-                </tr>
-                <tr>
-                  <td colspan="2">
-                    <div align="center"><span class="textcomment">
-
-                      <?php echo gettext("Use the example below  to format the CSV file. Fields are separated by  ; or :");?><br/>
-                      <?php echo gettext("(dot) . is used for decimal format.");?>
-
-                      <br/>
-                      <a href="importsamples.php?sample=Phonebook_Complex" target="superframe"><?php echo gettext("Complex Sample");?></a> -
-                      <a href="importsamples.php?sample=Phonebook_Simple" target="superframe"> <?php echo gettext("Simple Sample");?></a>
-                      </span></div>
-
-                        <center>
-                            <iframe name="superframe" src="importsamples.php?sample=Phonebook_Simple" BGCOLOR=white	width=500 height=80 marginWidth=10 marginHeight=10  frameBorder=1  scrolling=yes>
-
-                            </iframe>
-                            </font>
-                        </center>
-
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2">
-                    <p align="center"><span class="textcomment">
-                      <?php echo gettext("The maximum file size is ");?>
-                      <?php echo $my_max_file_size / 1024?>
-                      KB </span><br>
-                      <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $my_max_file_size?>">
-                      <input type="hidden" name="task" value="upload">
-                      <input name="the_file" type="file" size="50" onFocus=this.select() class="saisie1">
-                      <input type="button" value="Import Phonebook" onFocus=this.select() class="form_input_button" name="submit1" onClick="sendtoupload(this.form);">
-                       </p>
-                  </td>
-                </tr>
-
-              </form>
-            </table>
-</center>
-
-<?php
-    $smarty->display('footer.tpl');
diff --git a/admin/Public/A2B_phonelist_import_analyse.php b/admin/Public/A2B_phonelist_import_analyse.php
deleted file mode 100755
index 35b14e15a..000000000
--- a/admin/Public/A2B_phonelist_import_analyse.php
+++ /dev/null
@@ -1,342 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * This file is part of A2Billing (http://www.a2billing.net/)
- *
- * A2Billing, Commercial Open Source Telecom Billing platform,
- * powered by Star2billing S.L. <http://www.star2billing.com/>
- *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
- * @author      Belaid Arezqui <areski@gmail.com>
- * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
- * @package     A2Billing
- *
- * Software License Agreement (GNU Affero General Public License)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
-**/
-
-include '../lib/admin.defines.php';
-include '../lib/admin.module.access.php';
-include '../lib/admin.smarty.php';
-
-set_time_limit(0);
-
-if (! has_rights (ACX_PREDICTIVE_DIALER)) {
-    Header ("HTTP/1.0 401 Unauthorized");
-    Header ("Location: PP_error.php?c=accessdenied");
-    die();
-}
-
-check_demo_mode();
-
-getpost_ifset(array('phonebook', 'search_sources', 'task','status_import','uploadedfile_name','uploadedfile_name'));
-
-$phonebookval= preg_split('/-:-/', $phonebook);
-if (!is_numeric($phonebookval[0])) {
-    echo gettext("No Phonebook defined !");
-    exit();
-}
-
-if ($search_sources!='nochange') {
-    $fieldtoimport= preg_split("/\t/", $search_sources);
-    $fieldtoimport_sql = str_replace("\t", ", ", $search_sources);
-    $fieldtoimport_sql = trim ($fieldtoimport_sql);
-    if (strlen($fieldtoimport_sql)>0) $fieldtoimport_sql = ', '.$fieldtoimport_sql;
-}
-
-$fixfield[0]="Id Phonebook (KEY)";
-$field[0]="Number";
-
-$FG_DEBUG = 0;
-
-// THIS VARIABLE DEFINE THE COLOR OF THE HEAD TABLE
-$FG_TABLE_ALTERNATE_ROW_COLOR[] = "#FFFFFF";
-$FG_TABLE_ALTERNATE_ROW_COLOR[] = "#F2F8FF";
-$Temps1 = time();
-if ($FG_DEBUG == 1) echo "::::>> ".$the_file;
-//INUTILE
-$my_max_file_size = (int) MY_MAX_FILE_SIZE_IMPORT;
-
-if ($FG_DEBUG == 1) echo "<br> Task :: $task";
-
-if ($task=='upload') {
-
-    $the_file_name = $_FILES['the_file']['name'];
-    $the_file_type = $_FILES['the_file']['type'];
-    $the_file = $_FILES['the_file']['tmp_name'];
-
-    if (count($_FILES) > 0) {
-        $errortext = validate_upload($the_file, $the_file_type);
-        if ($errortext != "" || $errortext  != false) {
-            echo $errortext;
-            exit;
-        }
-        $new_filename = "/tmp/".MDP(6).".csv";
-        if (file_exists($new_filename)) {
-            echo $_FILES["file"]["name"] . " already exists. ";
-        } else {
-            if (!move_uploaded_file($_FILES["the_file"]["tmp_name"],	$new_filename)) {
-                echo gettext("File Save Failed, FILE=".$new_filename);
-            }
-        }
-        $the_file = $new_filename;
-    } else {
-        $the_file_type = $uploadedfile_type;
-        $the_file = $uploadedfile_name;
-    }
-
-    if ($FG_DEBUG == 1) echo "<br> FILE  ::> ".$the_file_name;
-    if ($FG_DEBUG == 1) echo "<br> THE_FILE:$the_file <br>THE_FILE_TYPE:$the_file_type";
-
-    $fp = fopen($the_file,  "r");
-    if (!$fp) {  /* THE FILE DOESN'T EXIST */
-        echo  gettext('Error: Failed to open the file.');
-        exit();
-    }
-
-    $nb_imported=0;
-    $nb_to_import=0;
-    $DBHandle  = DbConnect();
-
-    while (!feof($fp)) {
-
-        //if ($nb_imported==1000) break;
-        $ligneoriginal = fgets($fp,4096);  /* On se dplace d'une ligne */
-        $ligneoriginal = trim ($ligneoriginal);
-
-        // strip out ' and " and, with the exception of dialprefix field,
-        // substitute , for . to allow European style floats, eg: 0,1 == 0.1
-        $ligne = str_replace(array('"',"'"), '', $ligneoriginal);
-        $val=preg_split('/[;:]/', $ligne);
-        for ($i = 1; $i < count($val); $i++)
-             $val[$i]=str_replace(',', '.', $val[$i]);
-        if ($status_import!="ok") break;
-
-        if (substr($ligne,0,1)!='#' && $val[0]!='' && strlen($val[0])>0) {
-
-            $FG_ADITION_SECOND_ADD_TABLE  = 'cc_phonenumber';
-            $FG_ADITION_SECOND_ADD_FIELDS = 'id_phonebook, number'; //$fieldtoimport_sql
-
-
-            $FG_ADITION_SECOND_ADD_VALUE  = "'".$phonebookval[0]."', '".$val[0]."'";
-
-            for ($k=0;$k<count($fieldtoimport);$k++) {
-
-                if (!empty($val[$k+1]) || $val[$k+1]=='0') {
-
-                    $FG_ADITION_SECOND_ADD_FIELDS .= ', '.$fieldtoimport[$k];
-
-                    if (is_numeric($val[$k+1])) {
-                        $FG_ADITION_SECOND_ADD_VALUE .= ", ".$val[$k+1]."";
-                    } else {
-                        $FG_ADITION_SECOND_ADD_VALUE .= ", '".trim($val[$k+1])."'";
-                    }
-
-                }
-            }
-
-            $TT_QUERY .= "INSERT INTO ".$FG_ADITION_SECOND_ADD_TABLE." (".$FG_ADITION_SECOND_ADD_FIELDS.") values (".$FG_ADITION_SECOND_ADD_VALUE.") ";
-            $nb_to_import++;
-        }
-
-        if ($TT_QUERY!='' && strlen($TT_QUERY)>0 && ($nb_to_import==1) ) {
-
-            $nb_to_import=0;
-            $result_query =  $DBHandle -> Execute($TT_QUERY);
-
-            if ($result_query) {
-                $nb_imported = $nb_imported + 1;
-            } else {$buffer_error.= $ligneoriginal.'<br/>';}
-            $TT_QUERY='';
-        }
-
-    } // END WHILE EOF
-
-    echo "QUERY : ".$TT_QUERY;
-    if ($TT_QUERY!='' && strlen($TT_QUERY)>0 && ($nb_to_import>0) ) {
-        $result_query = @ $DBHandle -> Execute($TT_QUERY);
-        if ($result_query) $nb_imported = $nb_imported + $nb_to_import;
-    }
-}
-
-$Temps2 = time();
-$Temps = $Temps2 - $Temps1;
-
-
-$smarty->display('main.tpl');
-
-?>
-
-<style type="text/css">
-<!--
-div.myscroll {
-    align: left;
-    height: 100px;
-    width: 600px;
-    overflow: auto;
-    border: 1px solid #ddd;
-    background-color: #FFFFFF;
-    padding: 5px;
-}
--->
-</style>
-
-<script type="text/javascript">
-<!--
-function sendtoupload(form)
-{
-    document.forms["myform"].elements["task"].value = "upload";
-    document.forms[0].submit();
-}
-//-->
-</script>
-
-
-
-<?php
-if ($status_import=="ok") {
-    echo $CC_help_import_phonebook_confirm;
-} else {
-    echo $CC_help_import_phonebook_analyse;
-}
-?>
-
-<?php  if ($status_import!="ok") {?>
-
-<center>
-<?php echo gettext("The first line of your import is previewed below, please check to ensure that every is correct")?>.
-</center>
-
-<table align=center border="0" cellpadding="2" cellspacing="2" width="300">
-    <tbody>
-        <tr class="form_head">
-          <td class="tableBody" style="padding: 2px;" align="center" width="50%">
-            <strong> <span class="white_link"><?php echo gettext("FIELD")?> </span> </strong>
-          </td>
-          <td class="tableBody" style="padding: 2px;" align="center" width="50%">
-            <strong> <span class="white_link"><?php echo gettext("VALUE")?> </span> </strong>
-          </td>
-        </tr>
-        <tr bgcolor="<?php echo $FG_TABLE_ALTERNATE_ROW_COLOR[1]?>"  onMouseOver="bgColor='#C4FFD7'" onMouseOut="bgColor='<?php echo $FG_TABLE_ALTERNATE_ROW_COLOR[1]?>'">
-         <td class="tableBody" align="left" valign="top"><font color="red"><b><?php echo strtoupper($fixfield[0])?></b></font></td>
-         <td class="tableBody" align="center" valign="top"><font color="red"><b><?php echo $tariffplanval[1]?> (<?php echo $tariffplanval[0]?>)</b></font></td>
-        </tr>
-
-        <?php  for ($i=0;$i<count($field);$i++) { ?>
-        <tr bgcolor="<?php echo $FG_TABLE_ALTERNATE_ROW_COLOR[($i+1)%2]?>"  onMouseOver="bgColor='#C4FFD7'" onMouseOut="bgColor='<?php echo $FG_TABLE_ALTERNATE_ROW_COLOR[($i+1)%2]?>'">
-         <td class="tableBody" align="left" valign="top"><b><?php echo strtoupper($field[$i])?></b></td>
-         <td class="tableBody" align="center" valign="top"><?php echo $val[$i]?></td>
-        </tr>
-        <?php  } ?>
-
-        <?php  for ($i=0;$i<count($fieldtoimport);$i++) { ?>
-        <tr bgcolor="<?php echo $FG_TABLE_ALTERNATE_ROW_COLOR[($i)%2]?>"  onMouseOver="bgColor='#C4FFD7'" onMouseOut="bgColor='<?php echo $FG_TABLE_ALTERNATE_ROW_COLOR[($i)%2]?>'">
-         <td class="tableBody" align="left" valign="top"><b><?php echo strtoupper($fieldtoimport[$i])?></b></td>
-         <td class="tableBody" align="center" valign="top"><?php echo $val[$i+1]?></td>
-        </tr>
-        <?php  } ?>
-
-    </tbody>
-</table>
-
-
-<br></br>
-<table width="95%" border="0" cellspacing="2" align="center" class="records">
-
-      <form name="myform" enctype="multipart/form-data" action="A2B_phonelist_import_analyse.php" method="post" >
-        <INPUT type="hidden" name="phonebook" value="<?php echo $phonebook?>">
-        <INPUT type="hidden" name="search_sources" value="<?php echo $search_sources?>">
-        <INPUT TYPE="hidden" VALUE="<?php echo $tag?>" NAME="tag">
-
-        <tr>
-          <td colspan="2">
-            <div align="center"><span class="textcomment">
-               <?php echo gettext("Please check if the datas above are correct.")?> <br><b><?php echo gettext("If Yes")?></b>, <?php echo gettext("you can continue the import. Otherwise you must fix your csv file!")?>
-              </span></div>
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <p align="center">
-              <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $my_max_file_size?>">
-              <input type="hidden" name="task" value="upload">
-              <input type="hidden" name="status_import" value="ok">
-              <input type="hidden" name="uploadedfile_name" value="<?php echo $new_filename?>">
-              <input type="hidden" name="uploadedfile_type" value="<?php echo $the_file_type?>">
-              <input type="submit"  value="Continue to Import the RateCard" onFocus=this.select() class="form_input_button" name="submit1" onClick="sendtoupload(this.form);">
-              <br>
-              &nbsp; </p>
-          </td>
-        </tr>
-
-        <tr>
-          <td  class="bgcolor_014" colspan="2"><b>
-            <?php echo $translate[P34_9]?>
-            </b></td>
-        </tr>
-
-      </form>
-    </table>
-
-    <?php } else { ?>
-
-    </br>
-    <table width="75%" border="0" cellspacing="2" align="center" class="records">
-
-        <TR>
-            <TD style="border-bottom: medium dotted #ED2525" align="center">&nbsp;</TD>
-        </TR>
-        <tr>
-          <td colspan="2" class="bgcolor_015" style="padding-left: 5px; padding-right: 3px;" align=center>
-            <div align="center"><span class="textcomment">
-              <br>
-              <?php
-              $log = new Logger();
-              $log -> insertLog($_SESSION["admin_id"], 2, "PHONE NUMBER IMPORTED", $nb_imported." Phone Number Imported Successfully", '', $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI'],'');
-              $log = null;
-              ?>
-              <?php echo gettext("Success")?>, <?php echo $nb_imported?> &nbsp; <?php echo gettext("new phone number have been imported")?>.<br>
-              </span></div>
-              <br><br>
-
-              <?php  if (!empty($buffer_error)) { ?>
-              <center>
-                 <b><i><?php echo gettext("Line that has not been inserted")?>!</i></b>
-                 <div class="myscroll">
-                      <span style="color: red;">
-                      <?php echo $buffer_error?>
-                      </span>
-                 </div>
-                </center>
-                <br>
-             <?php  } ?>
-
-          </td>
-        </tr>
-    </table>
-
-    <?php }?>
-    <br>
-
-<?php
-if ($uploadedfile_name != "") {
-    unlink($uploadedfile_name);
-}
-
-$smarty->display('footer.tpl');
diff --git a/admin/Public/A2B_phpinfo.php b/admin/Public/A2B_phpinfo.php
old mode 100644
new mode 100755
index f87e6e512..32e11f137
--- a/admin/Public/A2B_phpinfo.php
+++ b/admin/Public/A2B_phpinfo.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_phpsysinfo.php b/admin/Public/A2B_phpsysinfo.php
old mode 100644
new mode 100755
index 4bc58e03d..0b32854f8
--- a/admin/Public/A2B_phpsysinfo.php
+++ b/admin/Public/A2B_phpsysinfo.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_receipt_edit.php b/admin/Public/A2B_receipt_edit.php
index 08d30fac8..f67f77721 100755
--- a/admin/Public/A2B_receipt_edit.php
+++ b/admin/Public/A2B_receipt_edit.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_receipt_view.php b/admin/Public/A2B_receipt_view.php
index bfa33a0ae..1a15f6a60 100755
--- a/admin/Public/A2B_receipt_view.php
+++ b/admin/Public/A2B_receipt_view.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -127,7 +127,7 @@ function amount_convert($amount)
 &nbsp;&nbsp;
 <?php if (strtoupper(BASE_CURRENCY)!=strtoupper($card['currency'])) { ?>
 
-    <select id="currency" class="form_input_select" name="curr" onChange="openURL('<?php echo $_SERVER['PHP_SELF']."?id=$id"?>')">
+    <select id="currency" class="form_input_select" name="curr" onChange="openURL('<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?id=$id"?>')">
         <option value="<?php echo BASE_CURRENCY;?>" <?php if(BASE_CURRENCY==$curr) echo "selected";?>  ><?php echo gettext('SYSTEM CURRENCY')." : ".strtoupper(BASE_CURRENCY); ?> </option>
         <option value="<?php echo $card['currency'];?>" <?php if($card['currency']==$curr) echo "selected";?>   ><?php echo gettext('CUSTOMER CURRENCY')." : ".strtoupper($card['currency']); ?></option>
     </select>
diff --git a/admin/Public/A2B_refill_info.php b/admin/Public/A2B_refill_info.php
old mode 100644
new mode 100755
index 72de12bd8..953b36cfd
--- a/admin/Public/A2B_refill_info.php
+++ b/admin/Public/A2B_refill_info.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_refill_info_agent.php b/admin/Public/A2B_refill_info_agent.php
old mode 100644
new mode 100755
index 32e7b8937..fb8ac894a
--- a/admin/Public/A2B_refill_info_agent.php
+++ b/admin/Public/A2B_refill_info_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_remittance_info.php b/admin/Public/A2B_remittance_info.php
old mode 100644
new mode 100755
index 01fffaee6..d396ff6ec
--- a/admin/Public/A2B_remittance_info.php
+++ b/admin/Public/A2B_remittance_info.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_signup_agent.php b/admin/Public/A2B_signup_agent.php
old mode 100644
new mode 100755
index e9dc36741..67734ddc9
--- a/admin/Public/A2B_signup_agent.php
+++ b/admin/Public/A2B_signup_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_ticket_agent.php b/admin/Public/A2B_ticket_agent.php
index b57a709a4..ee35bffbc 100755
--- a/admin/Public/A2B_ticket_agent.php
+++ b/admin/Public/A2B_ticket_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/A2B_trunk_report.php b/admin/Public/A2B_trunk_report.php
old mode 100644
new mode 100755
index 61d3ae04c..78ac18ef7
--- a/admin/Public/A2B_trunk_report.php
+++ b/admin/Public/A2B_trunk_report.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/CC_card_import.php b/admin/Public/CC_card_import.php
old mode 100644
new mode 100755
index f15e6b978..0b4efe9fb
--- a/admin/Public/CC_card_import.php
+++ b/admin/Public/CC_card_import.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/CC_card_import_analyse.php b/admin/Public/CC_card_import_analyse.php
index 37562d4d1..cc1e8cd81 100644
--- a/admin/Public/CC_card_import_analyse.php
+++ b/admin/Public/CC_card_import_analyse.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -165,7 +165,7 @@
             }
 
             $begin_date = date("Y");
-            $begin_date_plus = date("Y") + 25;
+            $begin_date_plus = date("Y") + 10;
             $end_date = date("-m-d H:i:s");
             $comp_date = "'".$begin_date.$end_date."'";
             $comp_date_plus = "'".$begin_date_plus.$end_date."'";
diff --git a/admin/Public/CC_entity_alarm_details.php b/admin/Public/CC_entity_alarm_details.php
old mode 100644
new mode 100755
index 94c576bf5..e813a4154
--- a/admin/Public/CC_entity_alarm_details.php
+++ b/admin/Public/CC_entity_alarm_details.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/CC_entity_service_details.php b/admin/Public/CC_entity_service_details.php
old mode 100644
new mode 100755
index 82b86ba7c..ca1e5e847
--- a/admin/Public/CC_entity_service_details.php
+++ b/admin/Public/CC_entity_service_details.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/CC_entity_sim_ratecard.php b/admin/Public/CC_entity_sim_ratecard.php
old mode 100644
new mode 100755
index 2b6fbb4a3..c988ac5c4
--- a/admin/Public/CC_entity_sim_ratecard.php
+++ b/admin/Public/CC_entity_sim_ratecard.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/CC_generate_friend_file.php b/admin/Public/CC_generate_friend_file.php
old mode 100644
new mode 100755
index c326c4ca7..6e853cbd1
--- a/admin/Public/CC_generate_friend_file.php
+++ b/admin/Public/CC_generate_friend_file.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/CC_musiconhold.php b/admin/Public/CC_musiconhold.php
old mode 100644
new mode 100755
index 4378d741f..057f0af76
--- a/admin/Public/CC_musiconhold.php
+++ b/admin/Public/CC_musiconhold.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/CC_ratecard_import.php b/admin/Public/CC_ratecard_import.php
index 8c4a565fb..5d7f43687 100644
--- a/admin/Public/CC_ratecard_import.php
+++ b/admin/Public/CC_ratecard_import.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,   
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L. 
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -51,7 +51,7 @@
 // GET CALLPLAN LIST
 $instance_table_tariffname = new Table("cc_tariffplan", "id, tariffname");
 $FG_TABLE_CLAUSE = "";
-$list_tariffname = $instance_table_tariffname->Get_list($DBHandle, $FG_TABLE_CLAUSE, "tariffname", "ASC", null, null, null, null);
+$list_tariffname = $instance_table_tariffname->Get_list($DBHandle, $FG_TABLE_CLAUSE, "id", "DESC", null, null, null, null);
 $nb_tariffname = count($list_tariffname);
 
 // GET TRUNK LIST
diff --git a/admin/Public/CC_ratecard_import_analyse.php b/admin/Public/CC_ratecard_import_analyse.php
old mode 100644
new mode 100755
index 8e8bec6ed..66c7c09d3
--- a/admin/Public/CC_ratecard_import_analyse.php
+++ b/admin/Public/CC_ratecard_import_analyse.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/CC_ratecard_merging.php b/admin/Public/CC_ratecard_merging.php
old mode 100644
new mode 100755
index 4e29090f9..acbd5510e
--- a/admin/Public/CC_ratecard_merging.php
+++ b/admin/Public/CC_ratecard_merging.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -219,7 +219,16 @@ function removeSource()
 <br/>
 <div align="center">
         <table width="95%" border="0" cellspacing="2" align="center" class="editform_table1">
-              <form name="prefs" action="<?php echo $_SERVER['PHP_SELF']?>" method="post">
+              <form name="prefs" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>" method="post">
+                <?php
+                    if ($HD_Form->FG_CSRF_STATUS == true) {
+                ?>
+                    <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+                    <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+                <?php
+                    }
+                ?>
+
                 <?php if ($posted) {?>
                 <tr>
                     <td align="center" colspan="2">
diff --git a/admin/Public/CC_support.php b/admin/Public/CC_support.php
old mode 100644
new mode 100755
index 80bd7f66d..242fd52d3
--- a/admin/Public/CC_support.php
+++ b/admin/Public/CC_support.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/CC_support_component.php b/admin/Public/CC_support_component.php
old mode 100644
new mode 100755
index 0007ea919..d70954a3d
--- a/admin/Public/CC_support_component.php
+++ b/admin/Public/CC_support_component.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/CC_ticket.php b/admin/Public/CC_ticket.php
old mode 100644
new mode 100755
index ad860087f..4c64125c2
--- a/admin/Public/CC_ticket.php
+++ b/admin/Public/CC_ticket.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/CC_ticket_view.php b/admin/Public/CC_ticket_view.php
old mode 100644
new mode 100755
index 793ba52dc..8ddf5c555
--- a/admin/Public/CC_ticket_view.php
+++ b/admin/Public/CC_ticket_view.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/CC_upload.php b/admin/Public/CC_upload.php
old mode 100644
new mode 100755
index a03104a75..3df9c19f4
--- a/admin/Public/CC_upload.php
+++ b/admin/Public/CC_upload.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -199,7 +199,7 @@ function arr_rid_blank($my_arr)
 </table>
 
 <table width="560" cellspacing="5" cellpadding="2" border="0" style="padding-top:5px;padding-left=5px;padding-bottom:5px;padding-right:5px">
-  <form method='post' enctype='multipart/form-data' action='<?php echo $_SERVER['PHP_SELF'];?>?method=upload'>
+  <form method='post' enctype='multipart/form-data' action='<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL);?>?method=upload'>
   <input type="hidden" value="<?php echo $acc?>" name="acc"/>
  <?php for ($i = 0; $i < $files_to_upload; $i++) { ?>
          <tr>
@@ -276,13 +276,13 @@ function arr_rid_blank($my_arr)
     ?>
 
         <tr>
-            <td width="30%"><A href='<?php echo $_SERVER['PHP_SELF'];?>?method=download&amp;file=<?php echo $entry;?>&<?php echo $pass_param?>'><?php echo $entry;?></a></td>
+            <td width="30%"><A href='<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL);?>?method=download&amp;file=<?php echo $entry;?>&<?php echo $pass_param?>'><?php echo $entry;?></a></td>
             <td align="center" width="5%"><?php  echo strtoupper(substr($entry,-3));?></td>
             <td align="center" width="5%"><?php echo $filesize;?></td>
             <td align="center" width="5%">
-                <A href="javascript:if(confirm('<?php echo gettext("Are you sure to delete ");?> <?php echo $entry;?>?')) location.href='<?php echo $_SERVER['PHP_SELF'];?>?method=delete&amp;file=<?php echo $entry;?>&<?php echo $pass_param?>';"><img src='<?php echo $dir_img?>/cross.gif' alt='Delete <?php echo $entry;?>' border=0></a>
-                <A href='<?php echo $_SERVER['PHP_SELF'];?>?method=download&amp;file=<?php echo $entry;?>&<?php echo $pass_param?>'><img src='<?php echo $dir_img?>/dl.gif' alt='Download <?php echo $entry;?>' border=0></a>
-                <A href="javascript: var inserttext = ''; if(inserttext = prompt('Rename <?php echo $entry;?>. Fill in the new name for the file.','<?php echo $entry;?>')) location.href='<?php echo $_SERVER['PHP_SELF'];?>?method=rename&<?php echo $pass_param?>&amp;file=<?php echo $entry;?>&amp;to='+inserttext; "><img src='<?php echo $dir_img?>/edit.gif' alt='Rename <?php echo $entry;?>' border=0></a>
+                <A href="javascript:if(confirm('<?php echo gettext("Are you sure to delete ");?> <?php echo $entry;?>?')) location.href='<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL);?>?method=delete&amp;file=<?php echo $entry;?>&<?php echo $pass_param?>';"><img src='<?php echo $dir_img?>/cross.gif' alt='Delete <?php echo $entry;?>' border=0></a>
+                <A href='<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL);?>?method=download&amp;file=<?php echo $entry;?>&<?php echo $pass_param?>'><img src='<?php echo $dir_img?>/dl.gif' alt='Download <?php echo $entry;?>' border=0></a>
+                <A href="javascript: var inserttext = ''; if(inserttext = prompt('Rename <?php echo $entry;?>. Fill in the new name for the file.','<?php echo $entry;?>')) location.href='<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL);?>?method=rename&<?php echo $pass_param?>&amp;file=<?php echo $entry;?>&amp;to='+inserttext; "><img src='<?php echo $dir_img?>/edit.gif' alt='Rename <?php echo $entry;?>' border=0></a>
             </td>
         </tr>
     <?php
diff --git a/admin/Public/PP_error.php b/admin/Public/PP_error.php
old mode 100644
new mode 100755
index 2f6be0c48..56a9acfa8
--- a/admin/Public/PP_error.php
+++ b/admin/Public/PP_error.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/PP_intro.php b/admin/Public/PP_intro.php
old mode 100644
new mode 100755
index 92c3b7eee..2c872ee0e
--- a/admin/Public/PP_intro.php
+++ b/admin/Public/PP_intro.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/call-auth-failures-report.php b/admin/Public/call-auth-failures-report.php
new file mode 100755
index 000000000..5d2ce52c4
--- /dev/null
+++ b/admin/Public/call-auth-failures-report.php
@@ -0,0 +1,434 @@
+<?php
+/* * *****************************************************************************
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Roman Davydov (http://www.openvoip.co)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * ***************************************************************************** */
+
+include '../lib/admin.defines.php';
+include '../lib/admin.module.access.php';
+include '../lib/admin.smarty.php';
+
+if (!has_rights(ACX_CALL_REPORT)) {
+    Header("HTTP/1.0 401 Unauthorized");
+    Header("Location: PP_error.php?c=accessdenied");
+    die();
+}
+
+getpost_ifset(array('posted', 'Period', 'frommonth', 'fromstatsmonth', 'tomonth', 'tostatsmonth', 'fromday', 'fromstatsday_sday', 'fromstatsmonth_sday', 'today', 'tostatsday_sday', 'tostatsmonth_sday', 'fromtime', 'totime', 'fromstatsday_hour', 'tostatsday_hour', 'fromstatsday_min', 'tostatsday_min', 'cidtype', 'order', 'sens', 'cid'));
+
+if (!isset($current_page) || ($current_page == "")) {
+    $current_page = 0;
+}
+
+// this variable specifie the debug type (0 => nothing, 1 => sql result, 2 => boucle checking, 3 other value checking)
+$FG_DEBUG = 0;
+
+// The variable FG_TABLE_NAME define the table name to use
+$FG_TABLE_NAME = "cc_auth_failures_log t1 LEFT JOIN cc_card t2 ON t1.id_card = t2.id";
+
+// THIS VARIABLE DEFINE THE COLOR OF THE HEAD TABLE
+$FG_TABLE_ALTERNATE_ROW_COLOR[] = "#FFFFFF";
+$FG_TABLE_ALTERNATE_ROW_COLOR[] = "#F2F8FF";
+
+$yesno = array();
+$yesno["1"] = array("Yes", "1");
+$yesno["0"] = array("No", "0");
+
+$DBHandle = DbConnect();
+
+$FG_TABLE_COL = array();
+$FG_TABLE_COL[] = array(gettext("DATE"), "created_at", "15%", "center", "SORT", "100");
+$FG_TABLE_COL[] = array(gettext("CALLER ID"), "cid", "10%", "center", "SORT", "100");
+$FG_TABLE_COL[] = array(gettext("REASON"), "reason", "15%", "center", "SORT", "100");
+$FG_TABLE_COL[] = array(gettext("LOG"), "dump", "50%", "left", "SORT", "", "", "", "", "", "", "display_pre");
+$FG_TABLE_COL[] = array(gettext("CUSTOMER"), "username", "10%", "center", "SORT", "30", "", "", "", "", "", "linktocustomer");
+
+$FG_TABLE_DEFAULT_ORDER = "created_at";
+$FG_TABLE_DEFAULT_SENS = "DESC";
+
+// This Variable store the argument for the SQL query
+$FG_COL_QUERY = 't1.created_at as created_at, t1.cid as cid, t1.reason as reason, t1.dump as dump, t2.username as username';
+
+$FG_LIMITE_DISPLAY = 1000;
+$FG_NB_TABLE_COL = count($FG_TABLE_COL);
+$FG_EDITION = false;
+$FG_TOTAL_TABLE_COL = $FG_NB_TABLE_COL;
+
+$FG_HTML_TABLE_TITLE = gettext(" - AUTH FAIL REPORT - ");
+$FG_HTML_TABLE_WIDTH = '80%';
+
+if ($FG_DEBUG == 3)
+    echo "<br>Table : $FG_TABLE_NAME  	- 	Col_query : $FG_COL_QUERY";
+$instance_table = new Table($FG_TABLE_NAME, $FG_COL_QUERY);
+$instance_table_graph = new Table($FG_TABLE_NAME);
+
+if (is_null($order) || is_null($sens)) {
+    $order = $FG_TABLE_DEFAULT_ORDER;
+    $sens = $FG_TABLE_DEFAULT_SENS;
+}
+
+if ($posted == 1) {
+    $SQLcmd = '';
+    $SQLcmd = do_field($SQLcmd, 'cid', 'cid');
+}
+
+$date_clause = '';
+normalize_day_of_month($fromstatsday_sday, $fromstatsmonth_sday, 1);
+normalize_day_of_month($tostatsday_sday, $tostatsmonth_sday, 1);
+if ($fromday && isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) {
+    if ($fromtime) {
+        $date_clause.=" AND t1.created_at >= '$fromstatsmonth_sday-$fromstatsday_sday $fromstatsday_hour:$fromstatsday_min'";
+    } else {
+        $date_clause.=" AND t1.created_at >= '$fromstatsmonth_sday-$fromstatsday_sday'";
+    }
+}
+if ($today && isset($tostatsday_sday) && isset($tostatsmonth_sday)) {
+    if ($totime) {
+        $date_clause.=" AND t1.created_at <= '$tostatsmonth_sday-" . sprintf("%02d", intval($tostatsday_sday)/* +1 */) . " $tostatsday_hour:$tostatsday_min:59'";
+    } else {
+        $date_clause.=" AND t1.created_at <= '$tostatsmonth_sday-" . sprintf("%02d", intval($tostatsday_sday)/* +1 */) . " 23:59:59'";
+    }
+}
+
+if (strpos($SQLcmd, 'WHERE') > 0) {
+    $FG_TABLE_CLAUSE = substr($SQLcmd, 6) . $date_clause;
+} elseif (strpos($date_clause, 'AND') > 0) {
+    $FG_TABLE_CLAUSE = substr($date_clause, 5);
+}
+
+if (!isset($FG_TABLE_CLAUSE) || strlen($FG_TABLE_CLAUSE) == 0) {
+    $cc_yearmonth = sprintf("%04d-%02d-%02d", date("Y"), date("n"), date("d"));
+    $FG_TABLE_CLAUSE = " t1.created_at >= '$cc_yearmonth'";
+}
+
+$list = $instance_table->Get_list($DBHandle, $FG_TABLE_CLAUSE, $order, $sens, null, null, $FG_LIMITE_DISPLAY, $current_page * $FG_LIMITE_DISPLAY);
+
+$smarty->display('main.tpl');
+
+?>
+
+<!-- ** ** ** ** ** Part for the research ** ** ** ** ** -->
+<div align="center">
+    <FORM METHOD=POST name="myForm" ACTION="<?php echo $PHP_SELF ?>?s=1&t=0&order=<?php echo $order ?>&sens=<?php echo $sens ?>&current_page=<?php echo $current_page ?>">
+        <INPUT TYPE="hidden" NAME="posted" value=1>
+        <INPUT TYPE="hidden" NAME="current_page" value=0>
+        <TABLE class="bar-status" width="85%" border="0" cellspacing="1" cellpadding="2" align="center">
+            <tr>
+                <td align="left" class="bgcolor_004">
+                    <font class="fontstyle_003">&nbsp;&nbsp;<?php echo gettext("DATE"); ?></font>
+                </td>
+                <td align="left" class="bgcolor_005">
+                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                        <tr><td class="fontstyle_searchoptions">
+                                <input type="checkbox" name="fromday" value="true" <?php if ($fromday) { ?>checked<?php } ?>> <?php echo gettext("From"); ?> :
+                                <select name="fromstatsday_sday" class="form_input_select">
+                                    <?php
+                                    for ($i = 1; $i <= 31; $i++) {
+                                        if ($fromstatsday_sday == sprintf("%02d", $i))
+                                            $selected = "selected";
+                                        else
+                                            $selected = "";
+                                        echo '<option value="' . sprintf("%02d", $i) . "\"$selected>" . sprintf("%02d", $i) . '</option>';
+                                    }
+                                    ?>
+                                </select>
+                                <select name="fromstatsmonth_sday" class="form_input_select">
+                                    <?php
+                                    $monthname = array(gettext("January"), gettext("February"), gettext("March"), gettext("April"), gettext("May"), gettext("June"), gettext("July"), gettext("August"), gettext("September"), gettext("October"), gettext("November"), gettext("December"));
+                                    $year_actual = date("Y");
+                                    for ($i = $year_actual; $i >= $year_actual - 1; $i--) {
+                                        if ($year_actual == $i) {
+                                            $monthnumber = date("n") - 1; // Month number without lead 0.
+                                        } else {
+                                            $monthnumber = 11;
+                                        }
+                                        for ($j = $monthnumber; $j >= 0; $j--) {
+                                            $month_formated = sprintf("%02d", $j + 1);
+                                            if ($fromstatsmonth_sday == "$i-$month_formated")
+                                                $selected = "selected";
+                                            else
+                                                $selected = "";
+                                            echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
+                                        }
+                                    }
+                                    ?>
+                                </select>
+                                <br/>
+                                <input type="checkbox" name="fromtime" value="true" <?php if ($fromtime) { ?>checked<?php } ?>>
+                                <?php echo gettext("Time :") ?>
+                                <select name="fromstatsday_hour" class="form_input_select">
+                                    <?php
+                                    for ($i = 0; $i <= 23; $i++) {
+                                        if ($fromstatsday_hour == sprintf("%02d", $i)) {
+                                            $selected = "selected";
+                                        } else {
+                                            $selected = "";
+                                        }
+                                        echo '<option value="' . sprintf("%02d", $i) . "\"$selected>" . sprintf("%02d", $i) . '</option>';
+                                    }
+                                    ?>
+                                </select>
+                                :
+                                <select name="fromstatsday_min" class="form_input_select">
+                                    <?php
+                                    for ($i = 0; $i < 60; $i = $i + 5) {
+                                        if ($fromstatsday_min == sprintf("%02d", $i)) {
+                                            $selected = "selected";
+                                        } else {
+                                            $selected = "";
+                                        }
+                                        echo '<option value="' . sprintf("%02d", $i) . "\"$selected>" . sprintf("%02d", $i) . '</option>';
+                                    }
+                                    ?>
+                                </select>
+                            </td><td class="fontstyle_searchoptions">
+                                <input type="checkbox" name="today" value="true" <?php if ($today) { ?>checked<?php } ?>>
+                                <?php echo gettext("To"); ?>  :
+                                <select name="tostatsday_sday" class="form_input_select">
+                                    <?php
+                                    for ($i = 1; $i <= 31; $i++) {
+                                        if ($tostatsday_sday == sprintf("%02d", $i)) {
+                                            $selected = "selected";
+                                        } else {
+                                            $selected = "";
+                                        }
+                                        echo '<option value="' . sprintf("%02d", $i) . "\"$selected>" . sprintf("%02d", $i) . '</option>';
+                                    }
+                                    ?>
+                                </select>
+                                <select name="tostatsmonth_sday" class="form_input_select">
+                                    <?php
+                                    $year_actual = date("Y");
+                                    for ($i = $year_actual; $i >= $year_actual - 1; $i--) {
+                                        if ($year_actual == $i) {
+                                            $monthnumber = date("n") - 1; // Month number without lead 0.
+                                        } else {
+                                            $monthnumber = 11;
+                                        }
+                                        for ($j = $monthnumber; $j >= 0; $j--) {
+                                            $month_formated = sprintf("%02d", $j + 1);
+                                            if ($tostatsmonth_sday == "$i-$month_formated")
+                                                $selected = "selected";
+                                            else
+                                                $selected = "";
+                                            echo "<OPTION value=\"$i-$month_formated\" $selected> $monthname[$j]-$i </option>";
+                                        }
+                                    }
+                                    ?>
+                                </select>
+                                <br/>
+                                <input type="checkbox" name="totime" value="true" <?php if ($totime) { ?>checked<?php } ?>>
+                                <?php echo gettext("Time :") ?>
+                                <select name="tostatsday_hour" class="form_input_select">
+                                    <?php
+                                    for ($i = 0; $i <= 23; $i++) {
+                                        if ($tostatsday_hour == sprintf("%02d", $i)) {
+                                            $selected = "selected";
+                                        } else {
+                                            $selected = "";
+                                        }
+                                        echo '<option value="' . sprintf("%02d", $i) . "\"$selected>" . sprintf("%02d", $i) . '</option>';
+                                    }
+                                    ?>
+                                </select>
+                                :
+                                <select name="tostatsday_min" class="form_input_select">
+                                    <?php
+                                    for ($i = 0; $i < 60; $i = $i + 5) {
+                                        if ($tostatsday_min == sprintf("%02d", $i)) {
+                                            $selected = "selected";
+                                        } else {
+                                            $selected = "";
+                                        }
+                                        echo '<option value="' . sprintf("%02d", $i) . "\"$selected>" . sprintf("%02d", $i) . '</option>';
+                                    }
+                                    ?>
+                                </select>
+                            </td></tr></table>
+                </td>
+            </tr>
+            <tr>
+                <td class="bgcolor_002" align="left">
+                    <font class="fontstyle_003">&nbsp;&nbsp;<?php echo gettext("CALLER ID"); ?></font>
+                </td>
+                <td class="bgcolor_003" align="left">
+                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                        <tr><td>&nbsp;&nbsp;<INPUT TYPE="text" NAME="cid" value="<?php echo $cid ?>" class="form_input_text"></td>
+                            <td class="fontstyle_searchoptions" align="center" ><input type="radio" NAME="cidtype" value="1" <?php if ((!isset($cidtype)) || ($cidtype == 1)) { ?>checked<?php } ?>><?php echo gettext("Exact"); ?></td>
+                            <td class="fontstyle_searchoptions" align="center" ><input type="radio" NAME="cidtype" value="2" <?php if ($cidtype == 2) { ?>checked<?php } ?>><?php echo gettext("Begins with"); ?></td>
+                            <td class="fontstyle_searchoptions" align="center" ><input type="radio" NAME="cidtype" value="3" <?php if ($cidtype == 3) { ?>checked<?php } ?>><?php echo gettext("Contains"); ?></td>
+                            <td class="fontstyle_searchoptions" align="center" ><input type="radio" NAME="cidtype" value="4" <?php if ($cidtype == 4) { ?>checked<?php } ?>><?php echo gettext("Ends with"); ?></td>
+                        </tr>
+                    </table></td>
+            </tr>
+            <tr>
+                <td class="bgcolor_004" align="left" > </td>
+                <td class="bgcolor_005" align="center" >
+                    <input type="image"  name="image16" align="top" border="0" src="<?php echo Images_Path; ?>/button-search.gif"/>
+                </td>
+            </tr>
+        </table>
+    </FORM>
+
+    <!-- ** ** ** ** ** Part to display data ** ** ** ** ** -->
+
+    <br/>
+    <center>
+        <?php echo gettext("Number of failed auth attempts") . ': ' . (is_array($list) ? count($list) : 0 ); ?>
+    </center>
+    <br/>
+
+    <table width="<?php echo $FG_HTML_TABLE_WIDTH ?>" border="0" align="center" cellpadding="0" cellspacing="0">
+        <TR bgcolor="#ffffff">
+            <TD  class="bgcolor_021" height=16 style="PADDING-LEFT: 5px; PADDING-RIGHT: 3px">
+                <TABLE border=0 cellPadding=0 cellSpacing=0 width="100%">
+                    <TBODY>
+                        <TR>
+                            <TD><SPAN  class="fontstyle_003"><?php echo $FG_HTML_TABLE_TITLE ?></SPAN></TD>
+                        </TR>
+                    </TBODY>
+                </TABLE>
+            </TD>
+        </TR>
+        <TR>
+            <TD>
+                <TABLE border=0 cellPadding=0 cellSpacing=0 width="100%">
+                    <TR  class="bgcolor_008">
+                        <TD width="<?php echo $FG_ACTION_SIZE_COLUMN ?>" align=center class="tableBodyRight" style="PADDING-BOTTOM: 2px; PADDING-LEFT: 2px; PADDING-RIGHT: 2px; PADDING-TOP: 2px"></TD>
+
+                        <?php
+                        if (is_array($list) && count($list) > 0) {
+
+                            for ($i = 0; $i < $FG_NB_TABLE_COL; $i++) {
+                                ?>
+
+                                <TD width="<?php echo $FG_TABLE_COL[$i][2] ?>" align=middle class="tableBody" style="PADDING-BOTTOM: 2px; PADDING-LEFT: 2px; PADDING-RIGHT: 2px; PADDING-TOP: 2px">
+                            <center><strong>
+                                    <?php if (strtoupper($FG_TABLE_COL[$i][4]) == "SORT") { ?>
+                                        <a href="<?php
+                                        echo $PHP_SELF . "?$customer&s=1&t=0&stitle=$stitle&atmenu=$atmenu&current_page=$current_page&order=" . $FG_TABLE_COL[$i][1] . "&sens=";
+                                        if ($sens == "ASC") {
+                                            echo"DESC";
+                                        } else {
+                                            echo"ASC";
+                                        }
+                                        echo "&posted=$posted&Period=$Period&frommonth=$frommonth&fromstatsmonth=$fromstatsmonth&tomonth=$tomonth&tostatsmonth=$tostatsmonth&fromday=$fromday&fromstatsday_sday=$fromstatsday_sday&fromstatsmonth_sday=$fromstatsmonth_sday&today=$today&tostatsday_sday=$tostatsday_sday&tostatsmonth_sday=$tostatsmonth_sday&cidtype=$cidtype&cid=$cid";
+                                        ?>">
+                                            <span class="liens"><?php } ?>
+                                            <?php echo $FG_TABLE_COL[$i][0] ?>
+                                            <?php if ($order == $FG_TABLE_COL[$i][1] && $sens == "ASC") { ?>
+                                                &nbsp;<img src="<?php echo Images_Path; ?>/icon_up_12x12.GIF" width="12" height="12" border="0">
+                                            <?php } elseif ($order == $FG_TABLE_COL[$i][1] && $sens == "DESC") { ?>
+                                                &nbsp;<img src="<?php echo Images_Path; ?>/icon_down_12x12.GIF" width="12" height="12" border="0">
+                                            <?php } ?>
+                                    <?php if (strtoupper($FG_TABLE_COL[$i][4]) == "SORT") { ?>
+                                            </span></a>
+                    <?php } ?>
+                                </strong></center></TD>
+            <?php } ?>
+            </TR>
+            <?php
+            $ligne_number = 0;
+            //print_r($list);
+            foreach ($list as $recordset) {
+                $ligne_number++;
+                ?>
+
+                <TR bgcolor="<?php echo $FG_TABLE_ALTERNATE_ROW_COLOR[$ligne_number % 2] ?>"  onMouseOver="bgColor = '#C4FFD7'" onMouseOut="bgColor = '<?php echo $FG_TABLE_ALTERNATE_ROW_COLOR[$ligne_number % 2] ?>'">
+                    <TD vAlign=top align="<?php echo $FG_TABLE_COL[$i][3] ?>" class=tableBody><?php echo $ligne_number + $current_page * $FG_LIMITE_DISPLAY . ".&nbsp;"; ?></TD>
+
+                    <?php for ($i = 0; $i < $FG_NB_TABLE_COL; $i++) { ?>
+
+                        <?php
+                        if ($FG_TABLE_COL[$i][6] == "lie") {
+
+                            $instance_sub_table = new Table($FG_TABLE_COL[$i][7], $FG_TABLE_COL[$i][8]);
+                            $sub_clause = str_replace("%id", $recordset[$i], $FG_TABLE_COL[$i][9]);
+                            $select_list = $instance_sub_table->Get_list($DBHandle, $sub_clause, null, null, null, null, null, null);
+
+                            $field_list_sun = preg_split('/,/', $FG_TABLE_COL[$i][8]);
+                            $record_display = $FG_TABLE_COL[$i][10];
+
+                            for ($l = 1; $l <= count($field_list_sun); $l++) {
+                                $record_display = str_replace("%$l", $select_list[0][$l - 1], $record_display);
+                            }
+                        } elseif ($FG_TABLE_COL[$i][6] == "list") {
+                            $select_list = $FG_TABLE_COL[$i][7];
+                            $record_display = $select_list[$recordset[$i]][0];
+                        } else {
+                            $record_display = $recordset[$i];
+                        }
+
+                        if (is_numeric($FG_TABLE_COL[$i][5]) && (strlen($record_display) > $FG_TABLE_COL[$i][5])) {
+                            $record_display = substr($record_display, 0, $FG_TABLE_COL[$i][5] - 3) . "";
+                        }
+                        ?>
+                        <TD vAlign=top align="<?php echo $FG_TABLE_COL[$i][3] ?>" class=tableBody><?php
+                            if (isset($FG_TABLE_COL[$i][11]) && strlen($FG_TABLE_COL[$i][11]) > 1) {
+                                call_user_func($FG_TABLE_COL[$i][11], $record_display);
+                            } else {
+                                echo stripslashes($record_display);
+                            }
+                            ?></TD>
+        <?php } ?>
+
+                </TR>
+                <?php
+            }//foreach ($list as $recordset)
+            if ($ligne_number < $FG_LIMITE_DISPLAY)
+                $ligne_number_end = $ligne_number + 2;
+            while ($ligne_number < $ligne_number_end) {
+                $ligne_number++;
+                ?>
+                <TR bgcolor="<?php echo $FG_TABLE_ALTERNATE_ROW_COLOR[$ligne_number % 2] ?>">
+                    <?php for ($i = 0; $i < $FG_NB_TABLE_COL; $i++) {
+                        ?>
+                        <TD vAlign=top class=tableBody>&nbsp;</TD>
+        <?php } ?>
+                    <TD align="center" vAlign=top class=tableBodyRight>&nbsp;</TD>
+                </TR>
+
+                <?php
+            } //END_WHILE
+        } else {
+            echo gettext("No data found !!!");
+        }//end_if
+        ?>
+    </TABLE></td>
+</tr>
+<TR bgcolor="#ffffff">
+    <TD  class="bgcolor_005" height=16 style="PADDING-LEFT: 5px; PADDING-RIGHT: 3px">
+        <TABLE border=0 cellPadding=0 cellSpacing=0 width="100%">
+            <TBODY>
+                <TR>
+                    <TD align="right"><SPAN  class="fontstyle_003" >
+                        </SPAN>
+                    </TD>
+            </TBODY>
+        </TABLE></TD>
+</TR>
+</table>
+
+</div>
+
+<?php
+$smarty->display('footer.tpl');
diff --git a/admin/Public/call-comp.php b/admin/Public/call-comp.php
old mode 100644
new mode 100755
index 22c1bdbc2..201fc24b2
--- a/admin/Public/call-comp.php
+++ b/admin/Public/call-comp.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -174,7 +174,7 @@
     $FG_TABLE_CLAUSE = substr($date_clause,5);
 }
 
-if ($_POST['posted']==1) {
+if ($posted==1) {
     $list = $instance_table -> Get_list ($DBHandle, $FG_TABLE_CLAUSE, $order, $sens, null, null, $FG_LIMITE_DISPLAY, $current_page*$FG_LIMITE_DISPLAY);
 
     $instance_table_graph = new Table($FG_TABLE_NAME, $FG_COL_QUERY_GRAPH);
diff --git a/admin/Public/call-count-reporting.php b/admin/Public/call-count-reporting.php
old mode 100644
new mode 100755
index 365a42363..1ed4f54a2
--- a/admin/Public/call-count-reporting.php
+++ b/admin/Public/call-count-reporting.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/call-daily-load.php b/admin/Public/call-daily-load.php
old mode 100644
new mode 100755
index b3185b6c3..9a1afde8e
--- a/admin/Public/call-daily-load.php
+++ b/admin/Public/call-daily-load.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -166,7 +166,7 @@
     $FG_TABLE_CLAUSE = substr($date_clause,5);
 }
 
-if ($_POST['posted']==1) {
+if ($posted==1) {
     $list = $instance_table -> Get_list ($DBHandle, $FG_TABLE_CLAUSE, $order, $sens, null, null, $FG_LIMITE_DISPLAY, $current_page*$FG_LIMITE_DISPLAY);
 
     $instance_table_graph = new Table($FG_TABLE_NAME, $FG_COL_QUERY_GRAPH);
diff --git a/admin/Public/call-dnid.php b/admin/Public/call-dnid.php
old mode 100644
new mode 100755
index b57adb4f7..363ab197e
--- a/admin/Public/call-dnid.php
+++ b/admin/Public/call-dnid.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/call-last-month.php b/admin/Public/call-last-month.php
old mode 100644
new mode 100755
index 176d0abb7..7064a7602
--- a/admin/Public/call-last-month.php
+++ b/admin/Public/call-last-month.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/call-log-customers.php b/admin/Public/call-log-customers.php
old mode 100644
new mode 100755
index 9f1588f33..39dfb1c78
--- a/admin/Public/call-log-customers.php
+++ b/admin/Public/call-log-customers.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -53,8 +53,8 @@
         $dl_full = MONITOR_PATH . "/" . $value_de;
         $dl_name = $value_de;
 
-        if (! file_exists ( $dl_full )) {
-            echo gettext ( "ERROR: Cannot download file " . $dl_full . ", it does not exist.<br>" );
+        if (!file_exists ($dl_full)) {
+            echo gettext ("ERROR: Cannot download file " . $dl_full . ", it does not exist.<br>");
             exit ();
         }
 
diff --git a/admin/Public/call-pnl-report.php b/admin/Public/call-pnl-report.php
old mode 100644
new mode 100755
index 21562d95a..98e83269b
--- a/admin/Public/call-pnl-report.php
+++ b/admin/Public/call-pnl-report.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -42,24 +42,9 @@
     die();
 }
 
-getpost_ifset(array (
-    'posted',
-    'Period',
-    'frommonth',
-    'fromstatsmonth',
-    'tomonth',
-    'tostatsmonth',
-    'fromday',
-    'fromstatsday_sday',
-    'fromstatsmonth_sday',
-    'today',
-    'tostatsday_sday',
-    'tostatsmonth_sday',
-    'current_page',
-    'lst_time',
-    'group_id',
-    'report_type'
-));
+getpost_ifset(array ( 'posted', 'Period', 'frommonth', 'fromstatsmonth', 'tomonth', 'tostatsmonth', 'fromday',
+    'fromstatsday_sday', 'fromstatsmonth_sday', 'today', 'tostatsday_sday', 'tostatsmonth_sday', 'current_page',
+    'lst_time', 'group_id', 'report_type'));
 
 //     Initialization of variables	///////////////////////////////
 
@@ -68,13 +53,19 @@
 $from_to = '';
 $bool = false;
 
+$HD_Form = new FormHandler("pnl_report","PNL Report");
+
+$HD_Form -> setDBHandler (DbConnect());
+$HD_Form -> init();
+
 //     Generating WHERE CLAUSE		///////////////////////////////
 
 normalize_day_of_month($fromstatsday_sday, $fromstatsmonth_sday, 1);
 normalize_day_of_month($tostatsday_sday, $tostatsmonth_sday, 1);
 if ($Period == "Time" && $lst_time != "") {
-    if (strlen($condition) > 0)
+    if (strlen($condition) > 0) {
         $condition .= " AND ";
+    }
     if (DB_TYPE == "postgres") {
         switch ($lst_time) {
             case 1 :
@@ -92,7 +83,6 @@
             case 5 :
                 $condition .= "CURRENT_TIMESTAMP - interval '1 month' <= cdr.starttime";
                 break;
-
         }
     } else {
         switch ($lst_time) {
@@ -164,6 +154,14 @@
 <FORM METHOD=POST name="myForm" ACTION="<?php echo $PHP_SELF?>?s=1&t=0&order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
     <INPUT TYPE="hidden" NAME="posted" value=1>
     <INPUT TYPE="hidden" NAME="current_page" value=0>
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
         <table class="bar-status" width="85%" border="0" cellspacing="1" cellpadding="2" align="center">
             <tr>
                 <td align="left" class="bgcolor_004">
@@ -272,24 +270,19 @@
 
 <?php
 
-$HD_Form = new FormHandler("pnl_report","PNL Report");
-
-$HD_Form -> setDBHandler (DbConnect());
-$HD_Form -> init();
-
-$condition1=str_replace('cdr.starttime','date',$condition);
-$condition2=str_replace('cdr.starttime','firstusedate',$condition);
-$payphones=$A2B->config["webui"]["report_pnl_pay_phones"];
-$tallfree=$A2B->config["webui"]["report_pnl_tall_free"];
-$payphones=str_replace(' ','',$payphones);
-$tallfree=str_replace(' ','',$tallfree);
-$payphones=str_replace('),(',' ,1 as dnid_type union select ',$payphones);
-$payphones=str_replace(')',' ,1  ',$payphones);
-$tallfree=str_replace('),(',' ,2  union select ',$tallfree);
-$tallfree=str_replace(')',' ,2 ',$tallfree);
-$tallfree=str_replace('(',' select ',$tallfree);
-$payphones=str_replace('(',' select ',$payphones);
-$dnids="select 'dnid' as dnid, 0.1 as sell_cost,0.1 as cost,0 as dnid_type";
+$condition1 = str_replace('cdr.starttime','date',$condition);
+$condition2 = str_replace('cdr.starttime','firstusedate',$condition);
+$payphones = $A2B->config["webui"]["report_pnl_pay_phones"];
+$tallfree = $A2B->config["webui"]["report_pnl_tall_free"];
+$payphones = str_replace(' ','',$payphones);
+$tallfree = str_replace(' ','',$tallfree);
+$payphones = str_replace('),(',' ,1 as dnid_type union select ',$payphones);
+$payphones = str_replace(')',' ,1  ',$payphones);
+$tallfree = str_replace('),(',' ,2  union select ',$tallfree);
+$tallfree = str_replace(')',' ,2 ',$tallfree);
+$tallfree = str_replace('(',' select ',$tallfree);
+$payphones = str_replace('(',' select ',$payphones);
+$dnids = "select 'dnid' as dnid, 0.1 as sell_cost,0.1 as cost,0 as dnid_type";
 
 if (strlen($tallfree)>0)$dnids.=" union ".$tallfree;
 if (strlen($payphones)>0)$dnids.=" union ".$payphones;
@@ -363,47 +356,46 @@
 if (!isset($group_id)) {
  if ($report_type==1) {
      $HD_Form -> DBHandle -> Execute("create temporary table pnl_report_sub1 as
-                       select cc.id_group,sum(cr.credit) as credits from cc_logrefill cr
-                         left join cc_card  cc on cc.id=cr.card_id
-                             where refill_type=1 and $condition1
-                             group by id_group");
+        select cc.id_group,sum(cr.credit) as credits from cc_logrefill cr
+            left join cc_card  cc on cc.id=cr.card_id
+        where refill_type=1 and $condition1
+            group by id_group");
      $HD_Form -> DBHandle -> Execute("create index pnl_report_sub1_get on pnl_report_sub1(id_group)");
      $HD_Form -> DBHandle -> Execute("create temporary table pnl_report_sub2 as
-                        select cc.id_group,-sum(cr.credit) as charges from cc_logrefill cr
-                             left join cc_card  cc on cc.id=cr.card_id
-                              where refill_type=2 and $condition1
-                         group by  id_group ");
+        select cc.id_group,-sum(cr.credit) as charges from cc_logrefill cr
+            left join cc_card  cc on cc.id=cr.card_id
+        where refill_type=2 and $condition1
+            group by  id_group ");
      $HD_Form -> DBHandle -> Execute("create index pnl_report_sub2_get on pnl_report_sub2(id_group)");
      $HD_Form -> DBHandle -> Execute("create temporary table pnl_report_sub3 as
-                         select id_group,count(*) as first_use from cc_card
-                           where $condition2 group by id_group");
+        select id_group,count(*) as first_use from cc_card
+        where $condition2 group by id_group");
  $HD_Form -> DBHandle -> Execute("create index pnl_report_sub3_get on pnl_report_sub3(id_group)");
 
  $QUERY.=" left join cc_card_group as cg on cg.id=id_group left join pnl_report_sub1 as t2 on t1.id_group=t2.id_group
        left join pnl_report_sub2  as t3 on t1.id_group=t3.id_group
        left join  pnl_report_sub3 as t4 on t1.id_group=t4.id_group
-     )as result
-    )as final
+     ) as result
+    ) as final
 ";
   } elseif ($report_type==2) {
      $HD_Form -> DBHandle -> Execute("create temporary table pnl_report_sub1 as
-        select cc.tariff as id_tariffgroup,
-                 sum(case when refill_type=1 then cr.credit else 0 end ) as credits,
-             - sum(case when refill_type=2 then  cr.credit else 0 end ) as charges
+        select cc.tariff as id_tariffgroup, sum(case when refill_type=1 then cr.credit else 0 end ) as credits,
+            - sum(case when refill_type=2 then  cr.credit else 0 end ) as charges
                 from cc_logrefill cr left join cc_card as  cc on cc.id=cr.card_id
             where $condition1
             group by cc.tariff");
      $HD_Form -> DBHandle -> Execute("create temporary table pnl_report_sub2 as
-                        select tariff as id_tariffgroup,count(*) as first_use
-                        from cc_card where $condition2
-                     group by tariff");
+        select tariff as id_tariffgroup,count(*) as first_use
+        from cc_card where $condition2
+        group by tariff");
      $HD_Form -> DBHandle -> Execute("create index pnl_report_sub1_get on pnl_report_sub1(id_tariffgroup)");
      $HD_Form -> DBHandle -> Execute("create index pnl_report_sub2_get on pnl_report_sub2(id_tariffgroup)");
      $QUERY.=" left join cc_tariffgroup as cg on cg.id=id_tariffgroup
-           left join pnl_report_sub1 as t2 on t1.id_tariffgroup=t2.id_tariffgroup
-           left join  pnl_report_sub2 as t4 on t1.id_tariffgroup=t4.id_tariffgroup
-     )as result
-    )as final
+                left join pnl_report_sub1 as t2 on t1.id_tariffgroup=t2.id_tariffgroup
+                left join pnl_report_sub2 as t4 on t1.id_tariffgroup=t4.id_tariffgroup
+            ) as result
+        )as final
 ";
   }
 } else {
@@ -424,8 +416,7 @@
 $FG_TABLE_ALTERNATE_ROW_COLOR[] = "#FFFFFF";
 $FG_TABLE_ALTERNATE_ROW_COLOR[] = "#F2F8FF";
 
-function linktonext_1($value)
-{
+function linktonext_1($value) {
     $handle = DbConnect();
         $inst_table = new Table("cc_card_group", "id");
         $FG_TABLE_CLAUSE = "name = '$value'";
@@ -437,8 +428,8 @@ function linktonext_1($value)
         echo $value;
     }
 }
-function linktonext_2($value)
-{
+
+function linktonext_2($value) {
         $handle = DbConnect();
         $inst_table = new Table("cc_tariffgroup", "id");
         $FG_TABLE_CLAUSE = "tariffgroupname = '$value'";
@@ -497,7 +488,7 @@ function linktonext_2($value)
 $HD_Form -> FG_FILTER_SEARCH_SESSION_NAME = 'pnl_selection';
 $HD_Form -> FG_FK_DELETE_CONFIRM = true;
 $HD_Form -> FG_FK_DELETE_ALLOWED = true;
-$HD_Form -> FieldViewElement ($FG_COL_QUERY);
+$HD_Form -> FieldViewElement($FG_COL_QUERY);
 
 $HD_Form -> CV_NO_FIELDS  = gettext("NO INFO!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
@@ -543,10 +534,10 @@ function linktonext_2($value)
     <td class='tableBody'><?php gettext('Margin');?></td>
     <td class='tableBody'><?php gettext('Total Profit');?></td></tr>
     <?php
-    $roa=array();
-    $row =$res -> fetchRow();
+    $roa = array();
+    $row = $res -> fetchRow();
     echo "<TR>";
-    for ($k=0;$k<18;$k++) {
+    for ($k=0; $k<18; $k++) {
         echo "<TD class='tableBody'>";
          if ($k<3) {
             echo $row[$k];
diff --git a/admin/Public/calonlydays.html b/admin/Public/calonlydays.html
old mode 100644
new mode 100755
index 8cd3d1ae9..69e87625f
--- a/admin/Public/calonlydays.html
+++ b/admin/Public/calonlydays.html
@@ -31,19 +31,11 @@
 // function passing selected date to calling window
 function set_datetime(day, b_close) {
 	if (!obj_caller) return;
-
-//	alert('day '+day+' time '+document.cal.time.value);
-	
-
 	var dt_datetime = obj_caller.prs_time((document.cal ? document.cal.time.value : ''),day);
-
-//	alert('result '+dt_datetime);
-
 	if (dt_datetime == -1) return;
 	window.close();
 	obj_caller.target.value = dt_datetime;
 }
-
 </script>
 </head>
 <body bgcolor="#FFFFFF" marginheight="5" marginwidth="5" topmargin="5" leftmargin="5" rightmargin="5">
@@ -62,7 +54,7 @@
 	document.write('<td bgcolor="#87cefa" align="center"><font color="#ffffff">')
 	document.write('<a href="javascript:set_datetime('+n+',true);">');
 	document.write(ARR_WEEKDAYS[(NUM_WEEKSTART+n)%7]+'</font></td>');
-}	
+}
 document.write('</tr>');
 
 if (obj_caller && obj_caller.time_comp)
@@ -71,5 +63,4 @@
 </table></tr></td>
 </table>
 </body>
-</html>
-
+</html>
\ No newline at end of file
diff --git a/admin/Public/card-history.php b/admin/Public/card-history.php
old mode 100644
new mode 100755
index d356372b8..7bbbb668b
--- a/admin/Public/card-history.php
+++ b/admin/Public/card-history.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -246,7 +246,7 @@
                    <td class="tableBody" style="padding: 2px;" align="center" width="<?php echo $FG_TABLE_COL[$i][2]?>" >
                         <strong>
                         <?php  if (strtoupper($FG_TABLE_COL[$i][4])=="SORT") {?>
-                        <a href="<?php  echo $_SERVER['PHP_SELF']."?stitle=$stitle&atmenu=$atmenu&current_page=$current_page&order=".$FG_TABLE_COL[$i][1]."&sens="; if ($FG_SENS=="ASC") {echo"DESC";} else {echo"ASC";}
+                        <a href="<?php  echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?stitle=$stitle&atmenu=$atmenu&current_page=$current_page&order=".$FG_TABLE_COL[$i][1]."&sens="; if ($FG_SENS=="ASC") {echo"DESC";} else {echo"ASC";}
                         echo "&posted=$posted&Period=$Period&frommonth=$frommonth&fromstatsmonth=$fromstatsmonth&tomonth=$tomonth&tostatsmonth=$tostatsmonth&fromday=$fromday&fromstatsday_sday=$fromstatsday_sday&fromstatsmonth_sday=$fromstatsmonth_sday&today=$today&tostatsday_sday=$tostatsday_sday&tostatsmonth_sday=$tostatsmonth_sday";?>">
                         <font color="#FFFFFF"><?php  } ?>
                         <?php echo $FG_TABLE_COL[$i][0]?>
diff --git a/admin/Public/cls_phpconfig.php b/admin/Public/cls_phpconfig.php
old mode 100644
new mode 100755
index 20269aca9..51e930cf2
--- a/admin/Public/cls_phpconfig.php
+++ b/admin/Public/cls_phpconfig.php
@@ -97,7 +97,7 @@ function OC_setConfDirectories($newvalue)
         // build directory name => link menu list
         foreach ($newvalue as $item)
         {
-            $this->_OC_conf_dirs[$item] = $_SERVER['PHP_SELF'] . '?dir=' . $item;
+            $this->_OC_conf_dirs[$item] = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) . '?dir=' . $item;
         }
     }
 
@@ -120,7 +120,7 @@ function OC_readConfFile($confFile)
 		{
 			exit();
 		}
-            
+
         $this->OC_setConfFile($this->_OC_conf_dir . '/' . basename($confFile));
 
         $this->_OC_the_file = array();
@@ -435,7 +435,7 @@ function OC_checkAccess($user)
             echo 'Access file: ' .$this->_OC_access_file . 'not found!<br>';
             return(false);
         }
-		
+
         $file = fopen($this->_OC_access_file, "r");
 
         while (!feof($file))
@@ -443,7 +443,7 @@ function OC_checkAccess($user)
             $accessFile[] = fgets($file);
         }
 
-        fclose($file);		
+        fclose($file);
 
         foreach ($accessFile as $line)
         {
diff --git a/admin/Public/cls_phpconfig_html.php b/admin/Public/cls_phpconfig_html.php
old mode 100644
new mode 100755
index d5c3e46d0..53e2ec789
--- a/admin/Public/cls_phpconfig_html.php
+++ b/admin/Public/cls_phpconfig_html.php
@@ -577,7 +577,7 @@ public function OC_HTML_showTimestat($start)
 //////////////////////////////////////////////////////////
     public function OC_HTML_doConfigurationForm($file,$section,$theItems,$md5)
     {
-    $action = $_SERVER['PHP_SELF']."?file=$file";
+    $action = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?file=$file";
         ?>
 
             <form  name="section_form" method="post" action="<?php echo $action ?>">
diff --git a/admin/Public/dashboard.php b/admin/Public/dashboard.php
old mode 100644
new mode 100755
index 826f4495f..8e1aaa12d
--- a/admin/Public/dashboard.php
+++ b/admin/Public/dashboard.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/export_csv.php b/admin/Public/export_csv.php
old mode 100644
new mode 100755
index 447247d57..ac627db2c
--- a/admin/Public/export_csv.php
+++ b/admin/Public/export_csv.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/form_data/FG_var_agent.inc b/admin/Public/form_data/FG_var_agent.inc
old mode 100644
new mode 100755
index 7dd4f6d28..8f50e47f8
--- a/admin/Public/form_data/FG_var_agent.inc
+++ b/admin/Public/form_data/FG_var_agent.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,14 +27,14 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
 
-getpost_ifset(array('id', 'login', 'passwd', 'active', 'location', 'id_tariffgroup', 'options', 'credit', 
-'currency', 'locale', 'commission', 'vat', 'banner', 'language', 'perms', 'lastname', 'firstname', 'address', 'city', 'state', 
+getpost_ifset(array('id', 'login', 'passwd', 'active', 'location', 'id_tariffgroup', 'options', 'credit',
+'currency', 'locale', 'commission', 'vat', 'banner', 'language', 'perms', 'lastname', 'firstname', 'address', 'city', 'state',
 'country', 'zipcode', 'phone', 'email', 'fax'));
 
 
@@ -100,7 +100,7 @@ if ($popup_select) {
 	$HD_Form -> AddViewElement(gettext("LASTNAME"), "lastname", "14%", "center", "sort");
 	$HD_Form -> AddViewElement("<acronym title=\"".gettext("CURRENCY")."\">".gettext("CUR")."</acronym>", "currency", "5%", "center", "sort", "", "list", $currency_list_key);
 	$HD_Form -> AddViewElement(gettext("ACTIVE"), "active", "3%", "center", "sort", "", "list", $yesno);
-	
+
 	$HD_Form -> FieldViewElement ('id, login, passwd, lastname, currency, active');
 } else {
 	$HD_Form -> AddViewElement(gettext("ID"), "id", "3%", "center", "sort");
@@ -113,7 +113,7 @@ if ($popup_select) {
 	$HD_Form -> AddViewElement(gettext("COMMISSION"), "com_balance", "7%", "center", "sort");
 	$HD_Form -> AddViewElement("<acronym title=\"".gettext("CURRENCY")."\">".gettext("CUR")."</acronym>", "currency", "5%", "center", "sort", "", "list", $currency_list_key);
 	$HD_Form -> AddViewElement(gettext("ACTIVE"), "active", "5%", "center", "sort", "", "list", $yesno);
-	
+
 	$HD_Form -> FieldViewElement ('id, datecreation, login, passwd, firstname, lastname, credit, com_balance, currency, active');
 }
 
@@ -136,19 +136,19 @@ if ($popup_select) {
 		$HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|param|');";
 	elseif ($popup_select == 2)
 		$HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|col0|');";
-	
+
 } else {
 	$HD_Form -> FG_INFO = true;
 	$HD_Form -> FG_INFO_LINK = "A2B_agent_info.php?id=";
 }
 
 if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
-	
+
 	$HD_Form -> FG_EDITION = true;
 	$HD_Form -> FG_ADDITION = true;
 	$HD_Form -> FG_DELETION = true;
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("LOGIN"),
 			"login",
 			'$value',
@@ -157,7 +157,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"3",
 			gettext("Insert the login"),
 			"" , "", "", "", "" , "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("PASSWORD"),
 			"passwd",
 			'$value',
@@ -166,7 +166,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"3",
 			gettext("Insert the password"),
 			"" , "", "", "", "", "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("PERMISSION"),
 			"perms",
 			'$value',
@@ -175,7 +175,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"", "",
 			"list", "", "description, id", "", $right_list, "%1" , "",
 			gettext("To select several rights in the above ListBox, hold the CTRL key down while clicking the items") );
-			
+
 	$HD_Form -> AddEditElement (gettext("ACTIVE"),
 		   "active",
 		   '1',
@@ -184,14 +184,14 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 		   "",
 		   gettext("Choose if you want to active the agent"),
 		   "" , "", "" , "Yes :1, - No:0",  "", "" , "", gettext("Enable agent"));
-	
+
 	if ($form_action =="ask-add" || $form_action=="add") {
 		$balance_access = "value = '0'";
 		$default_label_value = "0";
 	} else {
 		$balance_access = 'readonly';
 	}
-		   
+
 	$HD_Form -> AddEditElement (gettext("BALANCE"),
 		   "credit",
 		   "",
@@ -209,14 +209,14 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 		   "",
 		   gettext("amount of commission"),
 		   "" , "", "", "", "", "", "", gettext("currency : ").strtoupper(BASE_CURRENCY) );
-	
+
 	$HD_Form -> AddEditElement (gettext("CURRENCY"),
 		   "currency",
 		   "",
 		   "SELECT",
 		   "",
 		   "", "", "list" , "", "",	"", $currency_list, "%1", "", gettext("Currency used at the customer end.") );
-	
+
 	$HD_Form -> AddEditElement (gettext("COMMISSION PERCENTAGE"),
 		   "commission",
 		   "",
@@ -234,7 +234,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 		   "12",
 		   gettext("treshold remittance"),
 		   "" , "", "", "", "", "", "", gettext("currency : ").strtoupper(BASE_CURRENCY) );
-	
+
 	$HD_Form -> AddEditElement (gettext("VAT"),
 		   "vat",
 		   "",
@@ -243,7 +243,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 		   "12",
 		   gettext("Insert the VAT"),
 		   "" , "", "",	"", "", "", "NO-NULL", gettext("VAT"));
-	
+
 	$HD_Form -> AddEditElement (gettext("LANGUAGE"),
 		   "language",
 		   "",
@@ -252,7 +252,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 		   "",
 		   "",
 		   "list" , "", "",	"", $language_list, "%1", "", "" );
-	
+
 	$HD_Form -> AddEditElement (gettext("COMPANY"),
 			"company",
 			'$value',
@@ -261,7 +261,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"",
 			gettext("Insert the company"),
 			"" , "", "", "", "", "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("LAST NAME"),
 			"lastname",
 			'$value',
@@ -270,7 +270,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"",
 			gettext("Insert the lastname"),
 			"" , "", "", "", "", "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("FIRST NAME"),
 			"firstname",
 			'$value',
@@ -279,7 +279,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"",
 			gettext("Insert the firstname"),
 			"" , "", "", "", "", "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("ADDRESS"),
 			"address",
 			'$value',
@@ -288,7 +288,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"",
 			gettext("Insert the address"),
 			"" , "", "", "", "", "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("CITY"),
 			"city",
 			'$value',
@@ -297,7 +297,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"",
 			gettext("Insert the city"),
 			"" , "", "", "", "", "", "", "");
-			
+
 	$HD_Form -> AddEditElement (gettext("STATE"),
 			"state",
 			'$value',
@@ -306,7 +306,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"",
 			gettext("Insert the state"),
 			"" , "", "", "", "", "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("COUNTRY"),
 			"country",
 			'$value',
@@ -315,7 +315,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"",
 			gettext("Insert the country"),
 			"" , "", "", "", "", "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("ZIPCODE"),
 			"zipcode",
 			'$value',
@@ -324,7 +324,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"",
 			gettext("Insert the zip code"),
 			"" , "", "", "", "", "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("EMAIL"),
 			"email",
 			'$value',
@@ -333,7 +333,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"1",
 			gettext("Insert the email"),
 			"" , "", "", "", "" , "", "NO", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("PHONE"),
 			"phone",
 			'$value',
@@ -342,7 +342,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"",
 			gettext("Insert the telephone number"),
 			"" , "", "", "", "" , "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("FAX"),
 			"fax",
 			'$value',
@@ -351,7 +351,7 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 			"",
 			gettext("Insert the fax number"),
 			"" , "", "", "", "" , "", "", "");
-			
+
 	$HD_Form -> AddEditElement (gettext("BANK INFO"),
 					"bank_info",
 					'',
@@ -359,53 +359,53 @@ if (has_rights (ACX_MODIFY_AGENTS) && !($popup_select)) {
 					"cols=50 rows=4",
 					"",
 					gettext("Insert the bank info of this agent"),
-					"" , "", "", "", "" , "", "", "");		
-		
-		
+					"" , "", "", "", "" , "", "", "");
+
+
 	$DBHandle_max  = DbConnect();
 	$numrow = 0;
 	$resmax = $DBHandle_max -> Execute("SELECT * FROM cc_tariffgroup");
 	if ( $resmax )
 		$numrow = $resmax -> RecordCount();
 
-	if ($numrow > 0) { 
+	if ($numrow > 0) {
 		$HD_Form -> AddEditElement (gettext("CALL PLAN USABLE"),
-			"tariffgroup",	
-			'$value',	
-			"SELECT",		
+			"tariffgroup",
+			'$value',
+			"SELECT",
 			'size="10" multiple="multiple"',
-			"",		
-			"",	
-			"sql",		
-			"cc_agent_tariffgroup",	
-			"label, id",		
+			"",
+			"",
+			"sql",
+			"cc_agent_tariffgroup",
+			"label, id",
 			"", "", "%1 : (%2)", "", "", "cc_agent_tariffgroup:id_tariffgroup:cc_tariffgroup LEFT JOIN cc_agent_tariffgroup ON cc_tariffgroup.id=cc_agent_tariffgroup.id_tariffgroup:DISTINCT cc_tariffgroup.tariffgroupname, cc_tariffgroup.id: cc_agent_tariffgroup.id_agent = %id:id_agent:%2 - (%1)::::%1:id='%1'");
 	}
-	
-		
+
+
     $FG_QUERY_EDITION = 'login, passwd, perms, active, credit,com_balance, currency, commission,threshold_remittance, vat, language, company, lastname, firstname, address, city, state, country, zipcode, email, phone,  fax,bank_info';
     $HD_Form -> FieldEditElement ($FG_QUERY_EDITION);
-	
+
 	$HD_Form -> FG_EDITION_CLAUSE = " id='%id'";
-	
+
 	$HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_ADD = 'creation_agent_refill';
-	
+
 	$HD_Form -> FG_INTRO_TEXT_EDITION= gettext("Modify the properties of the")." ".$HD_Form->FG_INSTANCE_NAME;
 	$HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this")." ".$HD_Form->FG_INSTANCE_NAME.", ".gettext("click on the delete button.");
 	$HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new")." ".$HD_Form->FG_INSTANCE_NAME.".<br>".gettext("Fill the following fields and confirm by clicking on the button add.");
-	
-	
+
+
 	$HD_Form -> FG_INTRO_TEXT_ADITION = '';
 	$HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_INSTANCE_NAME." ".gettext("has been inserted.")."<br>";
-	
-	
+
+
 	$HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 	$HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
-	
-	
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-	
-	
-}	
+
+
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+
+
+}
diff --git a/admin/Public/form_data/FG_var_agentsituation.inc b/admin/Public/form_data/FG_var_agentsituation.inc
old mode 100644
new mode 100755
index 05d56bd82..f47142d80
--- a/admin/Public/form_data/FG_var_agentsituation.inc
+++ b/admin/Public/form_data/FG_var_agentsituation.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -60,7 +60,7 @@ $HD_Form -> AddSearchElement_C1(gettext("FIRSTNAME"),'firstname','firstnametype'
 
 
 $HD_Form -> FG_ACTION_SIZE_COLUMN = '15%';
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO").strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO").strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -87,7 +87,7 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
diff --git a/admin/Public/form_data/FG_var_alarm.inc b/admin/Public/form_data/FG_var_alarm.inc
old mode 100644
new mode 100755
index 76b231bc8..0faac057e
--- a/admin/Public/form_data/FG_var_alarm.inc
+++ b/admin/Public/form_data/FG_var_alarm.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -148,9 +148,9 @@ $HD_Form -> AddEditElement (gettext("MIN VALUE"),
 	"" , "", "", "", "", "", "", gettext("Input the minimum value (between 0 and 1 for ASR ; >= 0 for ALOC in sec ; not used by CIC) or leave it empty"));
 $HD_Form -> AddEditElement(gettext("TRUNK"),
    "id_trunk",
-   '$value',	
-   "POPUPVALUE",	
-   "",	
+   '$value',
+   "POPUPVALUE",
+   "",
    "",
    "",
    "" , "", "",	"", "" , "A2B_entity_trunk.php?popup_select=1&", ", 'id_trunk','width=550,height=340,top=20,left=100,scrollbars=1'", gettext("Set if you want to apply the alarm on a specific trunk or leave empty for all trunk."));
@@ -192,8 +192,8 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_autorefill.inc b/admin/Public/form_data/FG_var_autorefill.inc
old mode 100644
new mode 100755
diff --git a/admin/Public/form_data/FG_var_backup.inc b/admin/Public/form_data/FG_var_backup.inc
old mode 100644
new mode 100755
index c890ffaba..2a805dd14
--- a/admin/Public/form_data/FG_var_backup.inc
+++ b/admin/Public/form_data/FG_var_backup.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -53,7 +53,7 @@ if ($form_action == 'add'){
         // Make the backup stuff here and redirect to success page
         //mysqldump -all --databases mya2billing -ua2billinguser -pa2billing > /tmp/test.sql
         //pg_dump -c -d -U a2billinguser -h localhost -f /tmp/test.sql mya2billing
-		
+
         if (DB_TYPE != 'postgres'){
 			$run_backup=MYSQLDUMP." -all --databases ".DBNAME." -u'".USER."' -p'".PASS."' > '{$backup_file}'";
         }else{
@@ -122,7 +122,7 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Once you have completed the form above, click on the CONTINUE button.");
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_billing_customer.inc b/admin/Public/form_data/FG_var_billing_customer.inc
index b0c2d9900..ed9ee5d71 100644
--- a/admin/Public/form_data/FG_var_billing_customer.inc
+++ b/admin/Public/form_data/FG_var_billing_customer.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,15 +27,12 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
-
-
 getpost_ifset(array('id', 'id_card', 'date'));
 
-
 if (!isset($form_action) || $form_action=="list") {
 	$HD_Form = new FormHandler("cc_billing_customer LEFT JOIN cc_card ON cc_card.id=id_card  ","Billing");
 } else {
@@ -57,8 +54,7 @@ $HD_Form -> AddViewElement(gettext("ACCOUNT"), "username", "15%", "center", "sor
 $HD_Form -> AddViewElement(gettext("BILLING DATE"), "cc_billing_customer.date", "20%", "center", "sort", "30", "", "", "", "", "", "display_dateformat");
 $HD_Form -> FieldViewElement ('cc_billing_customer.id, username, cc_billing_customer.date');
 
-
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -66,34 +62,30 @@ $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
 $HD_Form -> FG_ADDITION = true;
 $HD_Form -> FG_DELETION = true;
 
-
 $HD_Form -> AddEditElement (gettext("ID CUSTOMER"),
-			   "id_card",		
-			   "$value", "POPUPVALUE", "size=30 maxlength=50",	
-			   "4",	gettext("Insert the Customer ID"),
-			    "" , "", "", "", "", 				
-				"A2B_entity_card.php?popup_select=1&", ", 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
-				gettext("Select the Customer ID"));
-
-if ($form_action=="ask-add"){	
+	"id_card",
+	"$value", "POPUPVALUE", "size=30 maxlength=50",
+	"4",	gettext("Insert the Customer ID"),
+	"" , "", "", "", "",
+	"A2B_entity_card.php?popup_select=1&", ", 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
+	gettext("Select the Customer ID"));
+
+if ($form_action=="ask-add"){
 	$comp_date = date("Y-m-d");
 	$comp_date="value='$comp_date'";
 }
 
 $HD_Form -> AddEditElement (gettext("BILLING DATE"),
-			   "date",		
-			   '$value',	
-			   "INPUT",	
-			   "size=40 maxlength=40  $comp_date",	
-			   "5",	
-			   gettext("Insert the current date (YYYY-MM-DD)"),
-			   "" , "", "",	"", "", "", "", "" );
-
+	"date",
+	'$value',
+	"INPUT",
+	"size=40 maxlength=40 $comp_date",
+	"8",
+	gettext("Insert the current date (YYYY-MM-DD)"),
+	"" , "", "",	"", "", "", "", "" );
 
 $HD_Form -> FieldEditElement ('id_card, date');
 
-
-
 $HD_Form -> FG_FILTER_APPLY = true;
 $HD_Form -> FG_FILTERFIELD = 'cardnumber';
 $HD_Form -> FG_FILTERFIELDNAME = 'Account number';
@@ -104,19 +96,13 @@ if (isset($filterprefix)  &&  (strlen($filterprefix)>0)){
 	$HD_Form -> FG_TABLE_CLAUSE.="username like '$filterprefix%'";
 }
 
-
-
 $HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this ".$HD_Form->FG_INSTANCE_NAME.", click on the delete button.");
 $HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new ".$HD_Form->FG_INSTANCE_NAME.".<br>Fill the following fields and confirm by clicking on the button add.");
 
-
 $HD_Form -> FG_INTRO_TEXT_ADITION = '';
 $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new ".$HD_Form->FG_INSTANCE_NAME." has been inserted. <br>");
 
 $HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_ADD = 'proccessing_billing_customer';
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-
-
-
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
diff --git a/admin/Public/form_data/FG_var_call.inc b/admin/Public/form_data/FG_var_call.inc
old mode 100644
new mode 100755
diff --git a/admin/Public/form_data/FG_var_callback.inc b/admin/Public/form_data/FG_var_callback.inc
index 3b0037717..f530ed97d 100755
--- a/admin/Public/form_data/FG_var_callback.inc
+++ b/admin/Public/form_data/FG_var_callback.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -75,7 +75,7 @@ $HD_Form -> AddViewElement(gettext("SERVER"), "id_server", "5%", "center", "sort
 $HD_Form -> FieldViewElement ('id, uniqueid, entry_time, status, server_ip, num_attempt, manager_result, callback_time, last_attempt_time, channel, context, id_server');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO CALLBACK CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO CALLBACK CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -97,34 +97,34 @@ $HD_Form -> AddEditElement (gettext("SERVER GROUP"),
 	"", "", "%1","", "");
 
 
-$HD_Form -> AddEditElement (gettext("UNIQUEID"),	
-	"uniqueid",		
-	'$value',	
-	"INPUT",	
-	"size=20 maxlength=30",	
-	"3",	
-	gettext("Insert the uniqueid"), 
+$HD_Form -> AddEditElement (gettext("UNIQUEID"),
+	"uniqueid",
+	'$value',
+	"INPUT",
+	"size=20 maxlength=30",
+	"3",
+	gettext("Insert the uniqueid"),
 	"" , "", "",	"", "" , "", "", gettext("This is an identifier to cross check the callback's request.").gettext("(useful if you have requests coming from an other platform through the API))") );
 
 
 if ($form_action=="ask-add") {
 	$begin_date = date("Y");
-	$begin_date_plus = date("Y")+25;	
+	$begin_date_plus = date("Y") + 10;
 	$end_date = date("-m-d H:i:s");
 	$comp_date = "value='".$begin_date.$end_date."'";
 	$comp_date_plus = "value='".$begin_date_plus.$end_date."'";
-	
-	$def_ipserver = " value='localhost' "; 
+
+	$def_ipserver = " value='localhost' ";
 	$def_nbattempt = " value='0' ";
 }
 
-$HD_Form -> AddEditElement (gettext("STATUS"),	
-	"status",			
-	'$value',	
-	"SELECT",	
-	"",	
-	"",	
-	"", 
+$HD_Form -> AddEditElement (gettext("STATUS"),
+	"status",
+	'$value',
+	"SELECT",
+	"",
+	"",
+	"",
 	"list" , "", "",	"", $status_list, "%1", "", "" );
 
 
@@ -138,13 +138,13 @@ $HD_Form -> AddEditElement (gettext("IP SERVER"),
 	"" , "", "",	"", "", "" , "", "");
 
 
-$HD_Form -> AddEditElement (gettext("NUMBER ATTEMPTS"),	
-	"num_attempt",		
-	'$value',	
-	"INPUT",	
-	"size=5 maxlength=10 $def_nbattempt",	
+$HD_Form -> AddEditElement (gettext("NUMBER ATTEMPTS"),
+	"num_attempt",
+	'$value',
+	"INPUT",
+	"size=5 maxlength=10 $def_nbattempt",
 	"4",
-	gettext("Insert the number of attempts"), 
+	gettext("Insert the number of attempts"),
 	"" , "", "",	"", "", "", "", "");
 
 
@@ -176,7 +176,7 @@ $HD_Form -> AddEditElement (gettext("CALLBACK DATE"),
 	"10",
 	"Insert the callback time",
 	"" , "", "",	"", "", "", "NO-NULL", gettext("please use the format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"), "", "res_display_dateformat");
-	
+
 
 $HD_Form -> AddEditElement (gettext("CHANNEL"),
 	"channel",
@@ -186,7 +186,7 @@ $HD_Form -> AddEditElement (gettext("CHANNEL"),
 	"11",
 	gettext("Insert the channel"),
 	"" , "", "",	"", "", "", "", gettext("Channel on which to originate the call (SIP/123@1.1.1.4)"), null, null, gettext("Define all the information requested by asterisk to generate the callback"));
-	
+
 
 $HD_Form -> AddEditElement (gettext("EXTENSION"),
 	"exten",
@@ -325,8 +325,8 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Setup those values to create the new")." ".$HD_Form->FG_INSTANCE_NAME;
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?id=";
 
 
diff --git a/admin/Public/form_data/FG_var_callerid.inc b/admin/Public/form_data/FG_var_callerid.inc
old mode 100644
new mode 100755
index 72ec72e7c..de6cf629e
--- a/admin/Public/form_data/FG_var_callerid.inc
+++ b/admin/Public/form_data/FG_var_callerid.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -91,13 +91,13 @@ $HD_Form -> AddEditElement (gettext("ACTIVATED"),
 			   "" , "", "", "Yes :t, - No:f", "", "", "", "" );
 
 $HD_Form -> AddEditElement (gettext("ID CARD"),
-			   "id_cc_card",		
-			   "$value",	
-			   "POPUPVALUE",	
-			   "size=30 maxlength=50",	
-			   "4",	
+			   "id_cc_card",
+			   "$value",
+			   "POPUPVALUE",
+			   "size=30 maxlength=50",
+			   "4",
 			   gettext("Insert the Id CardNumber"),
-			    "" , "", "", "", "", 				
+			    "" , "", "", "", "",
 				"A2B_entity_card.php?popup_select=1&"
 				, ", 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 				gettext("Define the card number ID to use."));
@@ -138,9 +138,9 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_campaign.inc b/admin/Public/form_data/FG_var_campaign.inc
index 5a30a4801..935c4b122 100644
--- a/admin/Public/form_data/FG_var_campaign.inc
+++ b/admin/Public/form_data/FG_var_campaign.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -77,7 +77,7 @@ $HD_Form -> AddViewElement(gettext("STATUS"), "status", "5%", "center", "sort",
 $HD_Form -> FieldViewElement ('cc_campaign.name, cc_campaign.startingdate, cc_campaign.expirationdate, username,cc_campaign.status');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("No campaigns have been created."); 
+$HD_Form -> CV_NO_FIELDS  = gettext("No campaigns have been created.");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -107,20 +107,20 @@ $HD_Form -> AddEditElement ("STATUS",
 
 
 if ($form_action=="ask-add") {
-	
+
 	$HD_Form -> AddEditElement (gettext("CUSTOMER ID"),
-				   "id_card",		
-				   "$value",	
-				   "POPUPVALUE",	
-				   "size=30 maxlength=50 ",	
-				   "4",	
+				   "id_card",
+				   "$value",
+				   "POPUPVALUE",
+				   "size=30 maxlength=50 ",
+				   "4",
 				   gettext("Insert the customer ID"),
-				    "" , "", "", "", "", 				
+				    "" , "", "", "", "",
 					"A2B_entity_card.php?popup_select=1&"
 					, ", 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 					gettext("Select the owner of this campaing, but you may not modify it in the future"));
 } else {
-	
+
 	$HD_Form -> AddEditElement (gettext("CUSTOMER ID"),
 		"id_card",
 		'$value',
@@ -149,7 +149,7 @@ if ($form_action!="ask-add") {
 // TODO integrate in new framework
 if ($form_action=="ask-add") {
 	$begin_date = date("Y");
-	$begin_date_plus = date("Y")+25;
+	$begin_date_plus = date("Y") + 10;
 	$end_date = date("-m-d H:i:s");
 	$time = "value= '10:00:00'";
 	$time_plus = "value= '18:00:00'";
@@ -195,7 +195,7 @@ $HD_Form -> AddEditElement (gettext("FREQUENCY"),
 	"size=20 maxlength=10",
 	"4",
 	gettext("Insert the frequency of callback in min "),
-	"" , "", "", "", "" , "", "", gettext("Please insert the frequency in minutes"));	
+	"" , "", "", "", "" , "", "", gettext("Please insert the frequency in minutes"));
 
 $HD_Form -> AddEditElement (gettext("DAILY START TIME"),
 	"daily_start_time",
@@ -214,7 +214,7 @@ $HD_Form -> AddEditElement (gettext("DAILY STOP TIME"),
 	"20",
 	gettext("Insert the daily stop time"),
 	"" , "", "", "", "", "", "res_display_dateformat", gettext("Please respect the format HH:MM:SS. For instance, '00:00:00'"));
-	
+
 
 $HD_Form -> AddEditElement (gettext("MONDAY"),
    "monday",
@@ -224,7 +224,7 @@ $HD_Form -> AddEditElement (gettext("MONDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the monday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-   
+
 $HD_Form -> AddEditElement (gettext("TUESDAY"),
    "tuesday",
    '1',
@@ -233,7 +233,7 @@ $HD_Form -> AddEditElement (gettext("TUESDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the monday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-   
+
 $HD_Form -> AddEditElement (gettext("WEDNESDAY"),
    "wednesday",
    '1',
@@ -242,7 +242,7 @@ $HD_Form -> AddEditElement (gettext("WEDNESDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the monday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-   
+
 $HD_Form -> AddEditElement (gettext("THURSDAY"),
    "thursday",
    '1',
@@ -251,7 +251,7 @@ $HD_Form -> AddEditElement (gettext("THURSDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the thursday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-   
+
 $HD_Form -> AddEditElement (gettext("FRIDAY"),
    "friday",
    '1',
@@ -260,7 +260,7 @@ $HD_Form -> AddEditElement (gettext("FRIDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the friday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-   
+
 $HD_Form -> AddEditElement (gettext("SATURDAY"),
    "saturday",
    '0',
@@ -269,7 +269,7 @@ $HD_Form -> AddEditElement (gettext("SATURDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the saturday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-   
+
 $HD_Form -> AddEditElement (gettext("SUNDAY"),
    "sunday",
    '0',
@@ -278,7 +278,7 @@ $HD_Form -> AddEditElement (gettext("SUNDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the sunday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-	
+
 $HD_Form -> AddEditElement (gettext("DESCRIPTION"),
 	"description",
 	'',
@@ -292,26 +292,26 @@ $HD_Form -> AddEditElement (gettext("DESCRIPTION"),
 $HD_Form -> FieldEditElement ("name, status, id_card $edit_col, id_cid_group, startingdate, expirationdate, frequency, daily_start_time, daily_stop_time, monday, tuesday, wednesday, thursday, friday, saturday, sunday, description" );
 $HD_Form -> FG_EDITION_CLAUSE = " id='%id'";
 
-if ($form_action!="ask-delete") {	
+if ($form_action!="ask-delete") {
 	$DBHandle_max  = DbConnect();
 	$numrow = 0;
 	$resmax = $DBHandle_max -> Execute("SELECT * FROM cc_phonebook");
 	if ( $resmax )
 		$numrow = $resmax -> RecordCount( );
-	
+
 	if ($numrow>0) {
 		$HD_Form -> AddEditElement (gettext("PHONE BOOK"),
-			"phonebook",	
-			'$value',	
-			"SELECT",		
+			"phonebook",
+			'$value',
+			"SELECT",
 			'size="10" multiple="multiple"',
-			"",		
-			"",	
-			"sql",		
-			"campaigns_phonebooks",	
-			"name, id",		
-			"", "", "%1 : (%2)", "", "", "cc_campaign_phonebook:id_phonebook:cc_phonebook LEFT JOIN cc_campaign_phonebook ON cc_phonebook.id=cc_campaign_phonebook.id_phonebook:DISTINCT cc_phonebook.name, cc_phonebook.id: cc_campaign_phonebook.id_campaign = %id:id_campaign:%2 - (%1)::::%1:id='%1'");		
-		
+			"",
+			"",
+			"sql",
+			"campaigns_phonebooks",
+			"name, id",
+			"", "", "%1 : (%2)", "", "", "cc_campaign_phonebook:id_phonebook:cc_phonebook LEFT JOIN cc_campaign_phonebook ON cc_phonebook.id=cc_campaign_phonebook.id_phonebook:DISTINCT cc_phonebook.name, cc_phonebook.id: cc_campaign_phonebook.id_campaign = %id:id_campaign:%2 - (%1)::::%1:id='%1'");
+
 	}
 }
 
diff --git a/admin/Public/form_data/FG_var_card.inc b/admin/Public/form_data/FG_var_card.inc
old mode 100644
new mode 100755
index d9ef4c9ff..b53340cc9
--- a/admin/Public/form_data/FG_var_card.inc
+++ b/admin/Public/form_data/FG_var_card.inc
@@ -32,15 +32,14 @@
 **/
 
 
-
 getpost_ifset(array('id', 'username', 'useralias', 'uipass', 'credit', 'language', 'tariff',
-'id_didgroup','id_campaign', 'callback', 'simultaccess', 'currency','typepaid', 'creditlimit',
-'lastname', 'firstname', 'email', 'address','city', 'state', 'country', 'zipcode', 'phone', 'fax', 'inuse',
-'max_concurrent', 'cid', 'runservice', 'firstusedate','expirationdate', 'enableexpire', 'expiredays', 'sip_buddy',
-'iax_buddy','popup_select', 'vat', 'autorefill', 'initialbalance', 'mac_addr', 'cardnumberlenght_list',
-'status', 'block', 'lock_pin', 'template_invoice', 'template_outstanding', 'description', 'voicemail_activated',
-'voicemail_permitted','email_notification','credit_notification','notify_email', 'id_seria',
-'company_name' , 'company_website' , 'vat_rn' , 'traffic' , 'traffic_target','discount','restriction' ));
+    'id_didgroup','id_campaign', 'callback', 'simultaccess', 'currency','typepaid', 'creditlimit',
+    'lastname', 'firstname', 'email', 'address','city', 'state', 'country', 'zipcode', 'phone', 'fax', 'inuse',
+    'max_concurrent', 'cid', 'runservice', 'firstusedate','expirationdate', 'enableexpire', 'expiredays', 'sip_buddy',
+    'iax_buddy','popup_select', 'vat', 'autorefill', 'initialbalance', 'mac_addr', 'cardnumberlenght_list',
+    'status', 'block', 'lock_pin', 'template_invoice', 'template_outstanding', 'description', 'voicemail_activated',
+    'voicemail_permitted','email_notification','credit_notification','notify_email', 'id_seria',
+    'company_name' , 'company_website' , 'vat_rn' , 'traffic' , 'traffic_target','discount','restriction' ));
 
 $HD_Form = new FormHandler("cc_card", gettext("Card"));
 
@@ -56,23 +55,23 @@ $HD_Form -> FG_FK_EDITION_CLAUSE = array("id_cc_card", "id_cc_card", "id_cc_card
 $HD_Form -> FG_FK_WARNONLY = (DELETE_FK_CARD == true) ? false: true;
 
 if (DELETE_FK_CARD) {
-	// WE WILL DELETE THE FK
-	$HD_Form -> FG_FK_DELETE_MESSAGE = gettext("You are going as well to remove all the SIP/IAX accounts & CallerIDs attached to this card! Please confirm that you really want to remove this card ? ");
+    // WE WILL DELETE THE FK
+    $HD_Form -> FG_FK_DELETE_MESSAGE = gettext("You are going as well to remove all the SIP/IAX accounts & CallerIDs attached to this card! Please confirm that you really want to remove this card ? ");
 } else {
-	// WE JUST NOTIFY
-	$HD_Form -> FG_FK_DELETE_MESSAGE = gettext("You are going to remove a card that have SIP/IAX accounts and/or CallerIDs attached to it ! Please confirm that you really want to remove this card ? ");
+    // WE JUST NOTIFY
+    $HD_Form -> FG_FK_DELETE_MESSAGE = gettext("You are going to remove a card that have SIP/IAX accounts and/or CallerIDs attached to it ! Please confirm that you really want to remove this card ? ");
 }
 
 if (!($popup_select>=1)) {
-	$HD_Form ->FG_LIST_ADDING_BUTTON1 = true;
-	$HD_Form ->FG_LIST_ADDING_BUTTON_LINK1 = "A2B_entity_card_multi.php?stitle=Card&section=".$_SESSION["menu_section"];
-	$HD_Form ->FG_LIST_ADDING_BUTTON_ALT1 = $HD_Form ->FG_LIST_ADDING_BUTTON_MSG1 = gettext("Generate Customers");
-	$HD_Form ->FG_LIST_ADDING_BUTTON_IMG1 = Images_Path ."/user_multi_add.png" ;
-
-	$HD_Form ->FG_LIST_ADDING_BUTTON2 = true;
-	$HD_Form ->FG_LIST_ADDING_BUTTON_LINK2 = "A2B_entity_card.php?form_action=ask-add&atmenu=card&stitle=Card&section=".$_SESSION["menu_section"];
-	$HD_Form ->FG_LIST_ADDING_BUTTON_ALT2 = $HD_Form ->FG_LIST_ADDING_BUTTON_MSG2 = gettext("Add Customer");
-	$HD_Form ->FG_LIST_ADDING_BUTTON_IMG2 = Images_Path ."/user_add.png" ;
+    $HD_Form ->FG_LIST_ADDING_BUTTON1 = true;
+    $HD_Form ->FG_LIST_ADDING_BUTTON_LINK1 = "A2B_entity_card_multi.php?stitle=Card&section=".$_SESSION["menu_section"];
+    $HD_Form ->FG_LIST_ADDING_BUTTON_ALT1 = $HD_Form ->FG_LIST_ADDING_BUTTON_MSG1 = gettext("Generate Customers");
+    $HD_Form ->FG_LIST_ADDING_BUTTON_IMG1 = Images_Path ."/user_multi_add.png" ;
+
+    $HD_Form ->FG_LIST_ADDING_BUTTON2 = true;
+    $HD_Form ->FG_LIST_ADDING_BUTTON_LINK2 = "A2B_entity_card.php?form_action=ask-add&atmenu=card&stitle=Card&section=".$_SESSION["menu_section"];
+    $HD_Form ->FG_LIST_ADDING_BUTTON_ALT2 = $HD_Form ->FG_LIST_ADDING_BUTTON_MSG2 = gettext("Add Customer");
+    $HD_Form ->FG_LIST_ADDING_BUTTON_IMG2 = Images_Path ."/user_add.png" ;
 }
 
 $cnts= new Constants();
@@ -90,9 +89,9 @@ $indcur=0;
 
 $currencies_list = get_currencies();
 foreach($currencies_list as $key => $cur_value) {
-	$currency_list[$key]  = array( $cur_value[1].' ('.$cur_value[2].')', $key);
-	$currency_list_r[$key]  = array( $key, $cur_value[1]);
-	$currency_list_key[$key][0] = $key;
+    $currency_list[$key]  = array( $cur_value[1].' ('.$cur_value[2].')', $key);
+    $currency_list_r[$key]  = array( $key, $cur_value[1]);
+    $currency_list_key[$key][0] = $key;
 }
 
 $restriction_list = $cnts->getRestrictionList();
@@ -113,19 +112,19 @@ $show_list_temp = array();
 
 $show_list_temp = preg_split('/,/', $A2B->config["webui"]['card_show_field_list']);
 foreach ($show_list_temp as $i => $value) {
-	$a = strtolower(trim($value));
-	$pos = strpos($a, ':');
-	if (!($pos === false)) {
-		$temp_ar = preg_split('/:/', $a);
-		$b = $temp_ar[1];
-		$a = strtolower(trim($temp_ar[0]));
-		if (strlen($a)>1) {
-		$show_list_sizes[$a] = $b;
-		}
-	}
-	if (strlen($a)>1) {
-		$show_list[$a] = $a;
-	}
+    $a = strtolower(trim($value));
+    $pos = strpos($a, ':');
+    if (!($pos === false)) {
+        $temp_ar = preg_split('/:/', $a);
+        $b = $temp_ar[1];
+        $a = strtolower(trim($temp_ar[0]));
+        if (strlen($a)>1) {
+        $show_list_sizes[$a] = $b;
+        }
+    }
+    if (strlen($a)>1) {
+        $show_list[$a] = $a;
+    }
 }
 $show_fields = array();
 $show_fields['id'] = array(gettext("ID"), "id", "3%", "center", "sort","", "", "", "", "", "", "");
@@ -139,61 +138,61 @@ $show_fields['id_group'] = array(gettext("GROUP"), "id_group", "6%", "center", "
 $show_fields['credit'] = array("<acronym title=\"".gettext("BALANCE")."\">".gettext("BA")."</acronym>", "credit", "5%", "center", "sort", "", "", "", "", "", "", "display_2bill");
 
 if (!($popup_select>=1)) {
-	$serial_pad_length = $A2B->config["webui"]['card_serial_length'];
-	$show_fields['id_seria'] = array(gettext("SERIE"), "id_seria", "*", "center", "sort", "15", "lie", "cc_card_seria", "name","id='%id'", "%1","");
-	$show_fields['serial'] = array("<acronym title=\"".gettext("SERIAL NUMBER")."\">SERIAL#</acronym>", "serial", "*","center", "sort","","eval",'str_pad("%C",'.$serial_pad_length.' , "0", STR_PAD_LEFT)');
-	$show_fields['tariff'] = array("<acronym title=\"".gettext("CALL PLAN")."\">".gettext('PLAN')."</acronym>",
-	       "tariff", "8%", "center", "sort", "20", "lie", "cc_tariffgroup", "tariffgroupname", "id='%id'", "%1");
-	$show_fields['status'] = array(gettext("STATUS"), "status", "4%", "center", "sort", "", "list", $cardstatus_list_acronym);
-	$show_fields['language']=array(gettext("LG"), "language", "3%", "center", "sort");
-	$show_fields['inuse'] = array(gettext("USE"), "inuse", "3%", "center", "sort");
-	$show_fields['currency'] = array("<acronym title=\"".gettext("CURRENCY")."\">".gettext("CUR")."</acronym>", "currency", "4%", "center", "sort", "", "list", $currency_list_key);
-	$show_fields['sip_buddy'] = array(gettext("SIP"), "sip_buddy", "2%", "center", "sort", "", "list", $yesno);
-	$show_fields['iax_buddy'] = array(gettext("IAX"), "iax_buddy", "2%", "center", "sort", "", "list", $yesno);
-	$show_fields['nbused'] = array("<acronym title=\"AMOUNT OF CALL DONE\">".gettext("ACD")."</acronym>", "nbused", "3%", "center", "sort");
-	$show_fields['firstname'] = array(gettext("FIRSTNAME"), "firstname", "7%", "center", "sort", "15");
-	$show_fields['email'] = array(gettext("EMAIL"), "email","","center", "sort", "40");
-	$show_fields['discount'] = array("<acronym title=\"DISCOUNT\">".gettext("DISC")."</acronym>", "discount","","center", "sort", "15","30", "", "", "", "", "display_percentage");
-	$show_fields['callerid'] = array("<acronym title=\"CALLER IDENTIFICATION NUMBER\">".gettext("CID")."</acronym>", "callerid","","center", "sort", "15");
-	$FG_COL_QUERY = 'DISTINCT ';
+    $serial_pad_length = $A2B->config["webui"]['card_serial_length'];
+    $show_fields['id_seria'] = array(gettext("SERIE"), "id_seria", "*", "center", "sort", "15", "lie", "cc_card_seria", "name","id='%id'", "%1","");
+    $show_fields['serial'] = array("<acronym title=\"".gettext("SERIAL NUMBER")."\">SERIAL#</acronym>", "serial", "*","center", "sort","","eval",'str_pad("%C",'.$serial_pad_length.' , "0", STR_PAD_LEFT)');
+    $show_fields['tariff'] = array("<acronym title=\"".gettext("CALL PLAN")."\">".gettext('PLAN')."</acronym>",
+           "tariff", "8%", "center", "sort", "20", "lie", "cc_tariffgroup", "tariffgroupname", "id='%id'", "%1");
+    $show_fields['status'] = array(gettext("STATUS"), "status", "4%", "center", "sort", "", "list", $cardstatus_list_acronym);
+    $show_fields['language']=array(gettext("LG"), "language", "3%", "center", "sort");
+    $show_fields['inuse'] = array(gettext("USE"), "inuse", "3%", "center", "sort");
+    $show_fields['currency'] = array("<acronym title=\"".gettext("CURRENCY")."\">".gettext("CUR")."</acronym>", "currency", "4%", "center", "sort", "", "list", $currency_list_key);
+    $show_fields['sip_buddy'] = array(gettext("SIP"), "sip_buddy", "2%", "center", "sort", "", "list", $yesno);
+    $show_fields['iax_buddy'] = array(gettext("IAX"), "iax_buddy", "2%", "center", "sort", "", "list", $yesno);
+    $show_fields['nbused'] = array("<acronym title=\"AMOUNT OF CALL DONE\">".gettext("ACD")."</acronym>", "nbused", "3%", "center", "sort");
+    $show_fields['firstname'] = array(gettext("FIRSTNAME"), "firstname", "7%", "center", "sort", "15");
+    $show_fields['email'] = array(gettext("EMAIL"), "email","","center", "sort", "40");
+    $show_fields['discount'] = array("<acronym title=\"DISCOUNT\">".gettext("DISC")."</acronym>", "discount","","center", "sort", "15","30", "", "", "", "", "display_percentage");
+    $show_fields['callerid'] = array("<acronym title=\"CALLER IDENTIFICATION NUMBER\">".gettext("CID")."</acronym>", "callerid","","center", "sort", "15");
+    $FG_COL_QUERY = 'DISTINCT ';
 }else{
-	$show_list_temp = array('id', 'username', 'lastname', 'id_group',  'credit');
-	foreach ($show_list_temp as $i => $value) {
+    $show_list_temp = array('id', 'username', 'lastname', 'id_group',  'credit');
+    foreach ($show_list_temp as $i => $value) {
                 $show_list[$value] = $value;
-	}
+    }
 
-	$FG_COL_QUERY = 'DISTINCT ';
+    $FG_COL_QUERY = 'DISTINCT ';
 }
 $FG_COL_QUERY_FIELD = '';
 $index = 0;
 foreach ($show_list as $i => $value) {
-	if (array_key_exists($i,$show_fields)) {
-		$param = $show_fields[$i];
-		$param = $param + array("","","","","","");#expand array to max length
-		$size = "*";
-		$param7 = $param[7];
-		if ($param[6]=="eval"){
-			$param7 = str_replace('%C', '%'.$index, $param7);//because of dynamic nature need set current field for eval
-		};
-		if (array_key_exists($i,$show_list_sizes)) {
-			if ((strlen(trim($show_list_sizes[$i])==0))&&(strlen(trim($param[2])>0))){
-				$size = $param[2];
-			}else{
-				$size = $show_list_sizes[$i];
-			}
-		}
-		$HD_Form -> AddViewElement($param[0],$param[1],$size,$param[3],$param[4],$param[5],$param[6],$param7,$param[8],
-						$param[9],$param[10],$param[11],$param[12]);
-		if ($value=='callerid') {
-			$FG_COL_QUERY_FIELD = $FG_COL_QUERY_FIELD .', (select GROUP_CONCAT(cid SEPARATOR \'<br>\') from cc_callerid where id_cc_card=cc_card.id) as callerid';
-		} else {
-			$FG_COL_QUERY_FIELD = $FG_COL_QUERY_FIELD .', '.$value;
-		}
-		$index = $index + 1;
-	}
+    if (array_key_exists($i,$show_fields)) {
+        $param = $show_fields[$i];
+        $param = $param + array("","","","","","");#expand array to max length
+        $size = "*";
+        $param7 = $param[7];
+        if ($param[6]=="eval"){
+            $param7 = str_replace('%C', '%'.$index, $param7);//because of dynamic nature need set current field for eval
+        };
+        if (array_key_exists($i,$show_list_sizes)) {
+            if ((strlen(trim($show_list_sizes[$i])==0))&&(strlen(trim($param[2])>0))){
+                $size = $param[2];
+            }else{
+                $size = $show_list_sizes[$i];
+            }
+        }
+        $HD_Form -> AddViewElement($param[0],$param[1],$size,$param[3],$param[4],$param[5],$param[6],$param7,$param[8],
+                        $param[9],$param[10],$param[11],$param[12]);
+        if ($value=='callerid') {
+            $FG_COL_QUERY_FIELD = $FG_COL_QUERY_FIELD .', (select GROUP_CONCAT(cid SEPARATOR \'<br>\') from cc_callerid where id_cc_card=cc_card.id) as callerid';
+        } else {
+            $FG_COL_QUERY_FIELD = $FG_COL_QUERY_FIELD .', '.$value;
+        }
+        $index = $index + 1;
+    }
 }
 if (strlen($FG_COL_QUERY_FIELD)>2) {
-	$FG_COL_QUERY_FIELD = substr( $FG_COL_QUERY_FIELD,2);
+    $FG_COL_QUERY_FIELD = substr( $FG_COL_QUERY_FIELD,2);
 }
 $FG_COL_QUERY_COUNT = count(preg_split('/,/',$FG_COL_QUERY_FIELD));
 $FG_COL_QUERY_FIELD = $FG_COL_QUERY_FIELD.', id as id_,username as username_,useralias as alias_ ';
@@ -214,13 +213,13 @@ if (!($popup_select>=1)) $HD_Form -> FG_EXPORT_XML = true;
 $HD_Form -> FG_EXPORT_SESSION_VAR = "pr_export_entity_card";
 
 
-if (($popup_select>=1))	$HD_Form ->FG_LIMITE_DISPLAY = 7;
+if (($popup_select>=1)) $HD_Form ->FG_LIMITE_DISPLAY = 7;
 
 
 $HD_Form -> CV_FOLLOWPARAMETERS= "&popup_select=".$popup_select."&popup_formname=".$popup_formname."&popup_fieldname=".$popup_fieldname;
 
 // Search form
-if (!($popup_select>=1))	 $HD_Form -> FG_FILTER_SEARCH_FORM = true;
+if (!($popup_select>=1))     $HD_Form -> FG_FILTER_SEARCH_FORM = true;
 
 $HD_Form -> FG_FILTER_SEARCH_TOP_TEXT = gettext('Define specific criteria to search for cards created.');
 $HD_Form -> FG_FILTER_SEARCH_1_TIME = true;
@@ -234,8 +233,11 @@ $HD_Form -> FG_FILTER_SEARCH_1_TIME_FIELD_BIS = 'firstusedate';
 $HD_Form -> AddSearchElement_C1(gettext("ACCOUNT NUMBER"), 'username','usernametype');
 $HD_Form -> AddSearchElement_C1(gettext("EMAIL"), 'email','emailtype');
 $HD_Form -> AddSearchElement_C1(gettext("LASTNAME"),'lastname','lastnametype');
+$HD_Form -> AddSearchElement_C1(gettext("FIRSTNAME"),'firstname','firstnametype');
 $HD_Form -> AddSearchElement_C1(gettext("LOGIN"),'useralias','useraliastype');
+$HD_Form -> AddSearchElement_C2(gettext("LOGIN NUMERIC"),'useralias1','useralias1type','useralias2','useralias2type','useralias');
 $HD_Form -> AddSearchElement_C1(gettext("MACADDRESS"),'mac_addr','macaddresstype');
+$HD_Form -> AddSearchElement_C1(gettext("COMPANY NAME"),'company_name','companynametype');
 $HD_Form -> AddSearchElement_C2(gettext("CUSTOMER ID"),'id1','id1type','id2','id2type','id');
 $HD_Form -> AddSearchElement_C2(gettext("SERIAL"),'serial1','serial1type','serial2','serial2type','serial');
 $HD_Form -> AddSearchElement_C2(gettext("CREDIT"),'credit1','credit1type','credit2','credit2type','credit');
@@ -253,43 +255,43 @@ $HD_Form -> AddSearchElement_Select(gettext("SELECT LANGUAGE"), null, null, null
 $HD_Form -> AddSearchElement_Select(gettext("SELECT PAYMENT TYPE"), null, null, null, null, null, "typepaid", 0, $typepaid_list_r);
 
 if (($popup_select>=1)) {
-	$HD_Form -> FG_OTHER_BUTTON1 = true;
-	$HD_Form -> FG_OTHER_BUTTON1_ALT = '<font color="red">&lt;select&gt;</font>';
-	$HD_Form -> FG_OTHER_BUTTON1_IMG = '';
+    $HD_Form -> FG_OTHER_BUTTON1 = true;
+    $HD_Form -> FG_OTHER_BUTTON1_ALT = '<font color="red">&lt;select&gt;</font>';
+    $HD_Form -> FG_OTHER_BUTTON1_IMG = '';
 
-	if ($popup_select==1) {
-		$HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|param|', '|col1|');";
-	} elseif ($popup_select==2) {
-		$HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|col1|');";
-	}
+    if ($popup_select==1) {
+        $HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|param|', '|col1|');";
+    } elseif ($popup_select==2) {
+        $HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|col1|');";
+    }
 
 } else {
-	$HD_Form -> FG_INFO = true;
-	$HD_Form -> FG_OTHER_BUTTON1 = true;
-	$HD_Form -> FG_OTHER_BUTTON2 = true;
-	$HD_Form -> FG_OTHER_BUTTON3 = true;
-	$HD_Form -> FG_OTHER_BUTTON4 = true;
-	$HD_Form -> FG_OTHER_BUTTON5 = true;
-	$FN_COLUMN_ID="col".($FG_COL_QUERY_COUNT);//get numbers of rows for needed fields
-	$FN_COLUMN_USERNAME="col".($FG_COL_QUERY_COUNT+1);
-	$FN_COLUMN_ALIAS="col".($FG_COL_QUERY_COUNT+2);
-	$HD_Form -> FG_OTHER_BUTTON1_LINK="A2B_entity_friend.php?atmenu=sip&form_action=add_sip&id_cc_card=|$FN_COLUMN_ID|&cardnumber=|$FN_COLUMN_USERNAME|&useralias=|$FN_COLUMN_ALIAS|";
-	$HD_Form -> FG_OTHER_BUTTON2_LINK="A2B_entity_friend.php?atmenu=iax&form_action=add_iax&id_cc_card=|$FN_COLUMN_ID|&cardnumber=|$FN_COLUMN_USERNAME|&useralias=|$FN_COLUMN_ALIAS|";
-	$HD_Form -> FG_OTHER_BUTTON3_LINK="A2B_entity_payment.php?form_action=ask-add&card_id=|$FN_COLUMN_ID|";
-	$HD_Form -> FG_OTHER_BUTTON4_LINK="A2B_entity_subscriber.php?form_action=ask-add&id=|$FN_COLUMN_ID|";
-	$HD_Form -> FG_OTHER_BUTTON5_LINK="A2B_mass_mail.php?form_action=ask-add&id=|$FN_COLUMN_ID|";
-	$HD_Form -> FG_INFO_LINK = "A2B_card_info.php?id=";
-	//FOR INFO , DEL, EDIT  the image is already in Image_Path
-	$HD_Form -> FG_OTHER_BUTTON1_IMG = Images_Path . "/icon-sip.gif";
-	$HD_Form -> FG_OTHER_BUTTON2_IMG = Images_Path . "/icon-iax.gif";
-	$HD_Form -> FG_OTHER_BUTTON3_IMG = Images_Path . "/money.png";
-	$HD_Form -> FG_OTHER_BUTTON4_IMG = Images_Path . "/book_add.png";
-	$HD_Form -> FG_OTHER_BUTTON5_IMG = Images_Path . "/email.png";
-	$HD_Form -> FG_OTHER_BUTTON1_ALT=gettext("Auto Create SIP Config");
-	$HD_Form -> FG_OTHER_BUTTON2_ALT=gettext("Auto Create IAX Config");
-	$HD_Form -> FG_OTHER_BUTTON3_ALT = gettext('Add Payment to this Card');
-	$HD_Form -> FG_OTHER_BUTTON4_ALT = gettext('Add New Subscription to this Card');
-	$HD_Form -> FG_OTHER_BUTTON5_ALT = gettext('Email to this Customer');
+    $HD_Form -> FG_INFO = true;
+    $HD_Form -> FG_OTHER_BUTTON1 = true;
+    $HD_Form -> FG_OTHER_BUTTON2 = true;
+    $HD_Form -> FG_OTHER_BUTTON3 = true;
+    $HD_Form -> FG_OTHER_BUTTON4 = true;
+    $HD_Form -> FG_OTHER_BUTTON5 = true;
+    $FN_COLUMN_ID="col".($FG_COL_QUERY_COUNT);//get numbers of rows for needed fields
+    $FN_COLUMN_USERNAME="col".($FG_COL_QUERY_COUNT+1);
+    $FN_COLUMN_ALIAS="col".($FG_COL_QUERY_COUNT+2);
+    $HD_Form -> FG_OTHER_BUTTON1_LINK="A2B_entity_friend.php?atmenu=sip&form_action=add_sip&id_cc_card=|$FN_COLUMN_ID|&cardnumber=|$FN_COLUMN_USERNAME|&useralias=|$FN_COLUMN_ALIAS|";
+    $HD_Form -> FG_OTHER_BUTTON2_LINK="A2B_entity_friend.php?atmenu=iax&form_action=add_iax&id_cc_card=|$FN_COLUMN_ID|&cardnumber=|$FN_COLUMN_USERNAME|&useralias=|$FN_COLUMN_ALIAS|";
+    $HD_Form -> FG_OTHER_BUTTON3_LINK="A2B_entity_payment.php?form_action=ask-add&card_id=|$FN_COLUMN_ID|";
+    $HD_Form -> FG_OTHER_BUTTON4_LINK="A2B_entity_subscriber.php?form_action=ask-add&id=|$FN_COLUMN_ID|";
+    $HD_Form -> FG_OTHER_BUTTON5_LINK="A2B_mass_mail.php?form_action=ask-add&id=|$FN_COLUMN_ID|";
+    $HD_Form -> FG_INFO_LINK = "A2B_card_info.php?id=";
+    //FOR INFO , DEL, EDIT  the image is already in Image_Path
+    $HD_Form -> FG_OTHER_BUTTON1_IMG = Images_Path . "/icon-sip.gif";
+    $HD_Form -> FG_OTHER_BUTTON2_IMG = Images_Path . "/icon-iax.gif";
+    $HD_Form -> FG_OTHER_BUTTON3_IMG = Images_Path . "/money.png";
+    $HD_Form -> FG_OTHER_BUTTON4_IMG = Images_Path . "/book_add.png";
+    $HD_Form -> FG_OTHER_BUTTON5_IMG = Images_Path . "/email.png";
+    $HD_Form -> FG_OTHER_BUTTON1_ALT=gettext("Auto Create SIP Config");
+    $HD_Form -> FG_OTHER_BUTTON2_ALT=gettext("Auto Create IAX Config");
+    $HD_Form -> FG_OTHER_BUTTON3_ALT = gettext('Add Payment to this Card');
+    $HD_Form -> FG_OTHER_BUTTON4_ALT = gettext('Add New Subscription to this Card');
+    $HD_Form -> FG_OTHER_BUTTON5_ALT = gettext('Email to this Customer');
 }
 
 $HD_Form -> FG_FILTER_APPLY = true;
@@ -299,735 +301,738 @@ $HD_Form -> FG_FILTER_FORM_ACTION = 'list';
 
 
 if (isset($filterprefix)  &&  (strlen($filterprefix)>0)){
-	if (strlen($HD_Form -> FG_TABLE_CLAUSE)>0) $HD_Form -> FG_TABLE_CLAUSE.=" AND ";
-	$HD_Form -> FG_TABLE_CLAUSE.="username like '$filterprefix%'";
+    if (strlen($HD_Form -> FG_TABLE_CLAUSE)>0) $HD_Form -> FG_TABLE_CLAUSE.=" AND ";
+    $HD_Form -> FG_TABLE_CLAUSE.="username like '$filterprefix%'";
 }
 
 $HD_Form -> FG_ADDITION = true;
 
 if (has_rights (ACX_MODIFY_CUSTOMERS) && !($popup_select>=1)) {
-	$HD_Form -> FG_EDITION = true;
-	$HD_Form -> FG_DELETION = true;
-
-	$maxi	= '';
-	$maxi2	= '';
-	$maxi3	= '';
-
-	if (isset($form_action) && $form_action=="ask-add") {
-		if (!is_numeric($cardnumberlenght_list)) 	$cardnumberlenght_list = LEN_CARDNUMBER;
-		$array_card_generated  = gen_card_with_alias("cc_card", 0, $cardnumberlenght_list);
-		$maxi = "value='".$array_card_generated[0]."'";
-		$maxi2 = "value='".$array_card_generated[1]."'";
-		$pass = MDP_NUMERIC(5).MDP_STRING(15);
-		$maxi3 = "value='".$pass."'";
-		$default_initbalance = "value='0'";
-	}
-
-	$HD_Form -> AddEditElement (gettext("ACCOUNT NUMBER"),
-				   "username",
-				   "",
-				   "INPUT",
-				    "size=30 $maxi readonly  maxlength=40",
-				   "4",
-				   gettext("Insert the account number"),
-				   "" , "", "",	"", "" , "", "", '', null, null, gettext("Customer Information"));
-
-
-	$HD_Form -> AddEditElement (gettext("WEBUI LOGIN"),
-				   "useralias",
-				   "",
-				   "INPUT",
-				    "size=20 $maxi2 maxlength=40",
-				   "4",
-				   gettext("Insert the webui login"),
-				   "" , "", "",	"", "" , "", "", "");
-
-
-	$HD_Form -> AddEditElement (gettext("WEBUI PASSWORD"),
-				   "uipass",
-				   '',
-				   "INPUT",
-				   "size=20 $maxi3 maxlength=20",
-				   "",
-				   gettext("Insert the password"),
-				   "" , "", "",	"", "", "",	"", gettext("Password for customer to access to the web interface and view the balance.") );
-
-	if ($form_action =="ask-add" || $form_action=="add") {
-		$balance_access = "value = '0'";
-		$payment_status = "";
-
-	} else {
-		$balance_access = 'readonly';
-		$payment_status= 'disabled="true" style="color: gray;" ';
-	}
-
-	$HD_Form -> AddEditElement (gettext("BALANCE"),
-				   "credit",
-				   "",
-				   "INPUT",
-				   "size=30 maxlength=30 ".$balance_access,
-				   "12",
-				   gettext("Insert the number of credit"),
-				   "" , "", "", "", "", "", "", gettext("currency : ").strtoupper(BASE_CURRENCY) );
-
-
-	$HD_Form -> AddEditElement (gettext("CUSTOMER GROUP"),
-				   "id_group",
-				   "",
-				   "SELECT",
-				   "", "", "",
-				   "sql",
-				   "cc_card_group",
-				   "name, id",
-				   "", "", "%1", "", "", "", "", "");
-
-	$HD_Form -> AddEditElement (gettext("SERIAL"),
-	               "id_seria",
-	               "",
-	               "SELECT",
-	               "", "", "",
-	               "sql",
-	               "cc_card_seria",
-	               "name, id",
-	               "", "", "%1", "", "", "", '<OPTION  value="-1" selected>'.gettext("NOT DEFINED").'</OPTION>' );
-
-
-	$HD_Form -> AddEditElement (gettext("LAST NAME"),
-				   "lastname",
-				   '$value',
-				   "INPUT",
-				   "size=30 maxlength=50",
-				   "11",
-				   gettext("Insert the lastname of the customers"),
-				   "" , "", "",	"", "", "" , "NO", "", null, null, gettext("Personal Information"));
-
-	$HD_Form -> AddEditElement (gettext("FIRST NAME"),
-				   "firstname",
-				   '$value',
-				   "INPUT",
-				   "size=30 maxlength=50",
-				   "11",
-				   gettext("Insert the firstname of the customers"),
-				   "" , "", "",	"", "", "" , "NO", "");
-
-
-	$HD_Form -> AddEditElement (gettext("EMAIL"),
-				   "email",
-				   '$value',
-				   "INPUT",
-				   "size=30 maxlength=70",
-				   "1",
-				   gettext("Insert the email"),
-				   "" , "", "",	"", "", "" , "NO", "");
-
-
-	$HD_Form -> AddEditElement (gettext("ADDRESS"),
-				   "address",
-				   '$value',
-				   "INPUT",
-				   "size=30 maxlength=100",
-				   "0",
-				   gettext("Insert the address of the customers"),
-				   "" , "", "",	"", "", "" , "NO", "");
-
-
-	$HD_Form -> AddEditElement (gettext("CITY"),
-				   "city",
-				   '$value',
-				   "INPUT",
-				   "size=30 maxlength=40",
-				   "0",
-				   gettext("Insert the city"),
-				   "" , "", "",	"", "", "" , "NO", "");
-
-
-	$HD_Form -> AddEditElement (gettext("STATE/PROVINCE"),
-				   "state",
-				   '$value',
-				   "INPUT",
-				   "size=30 maxlength=40",
-				   "11",
-				   gettext("Insert the state"),
-				   "" , "", "",	"", "", "" , "NO", "");
-
-	if ($form_action == 'ask-add') {
-		$country_default_val = 'USA';
-	}
-
-	$HD_Form -> AddEditElement (gettext("COUNTRY"),
-				   "country",
-				   "$country_default_val",
-				   "SELECT",
-				   "", "", "",
-				   "sql",
-				   "cc_country",
-				   "countryname, countrycode",
-				   "", "", "%1", "", "", "", '' );
-
-	$HD_Form -> AddEditElement (gettext("ZIP/POSTAL CODE"),
-				   "zipcode",
-				   '$value',
-				   "INPUT",
-				   "size=30 maxlength=20",
-				   "0",
-				   gettext("Insert the zipcode"),
-				   "" , "", "",	"", "", "" , "NO", "");
-
-
-	$HD_Form -> AddEditElement (gettext("PHONE NUMBER"),
-				   "phone",
-				   '$value',
-				   "INPUT",
-				   "size=30 maxlength=20",
-				   "7",
-				   gettext("Insert the phone number of the customers"),
-				   "" , "", "",	"", "", "" , "NO", "");
-
-
-	$HD_Form -> AddEditElement (gettext("FAX NUMBER"),
-				   "fax",
-				   '$value',
-				   "INPUT",
-				   "size=30 maxlength=20",
-				   "",
-				   gettext("Insert the fax number of the customers"),
-				   "" , "", "",	"", "", "" , "NO", "");
-
-	$HD_Form -> AddEditElement (gettext("COMPANY NAME"),
-				   "company_name",
-				   '$value',
-				   "INPUT",
-				   "size=40 maxlength=50",
-				   "",
-				   gettext("Insert Company name of this customer"),
-				   "" , "", "",	"", "", "" , "NO", "");
-
-
-	$HD_Form -> AddEditElement (gettext("COMPANY WEBSITE"),
-				   "company_website",
-				   '$value',
-				   "INPUT",
-				   "size=40 maxlength=60",
-				   "",
-				   gettext("Insert the company website of this customer"),
-				   "" , "", "",	"", "", "" , "NO", "");
-
-	if ($form_action != "edit") {
-
-		$update_field_typepaid = 'typepaid ,';
-
-		$HD_Form -> AddEditElement (gettext("PAYMENT TYPE"),
-					   "typepaid",
-					   "",
-					   "SELECT",
-					   "$payment_status",
-					   "",
-					   "",
-					   "list" , "", "",	"", $typepaid_list, "%1", "", '', null, null, gettext("Customer Status") );
-	}
-
-	$HD_Form -> AddEditElement (gettext("CALL PLAN"),
-				   "tariff",
-				   "",
-				   "SELECT",
-				   "", "", "",
-				   "sql",
-				   "cc_tariffgroup",
-				   "tariffgroupname, id",
-				   "", "", "%1", "", gettext("Changing the call plan will result in the free minutes or free calls package being reset.") );
-
-
-	$HD_Form -> AddEditElement (gettext("DIDGROUP"),
-				   "id_didgroup",
-				   "",
-				   "SELECT",
-				   "", "", "",
-				   "sql",
-				   "cc_didgroup",
-				   "didgroupname, id",
-				   "", "", "%1", "", "", "", '<OPTION  value="-1" selected>'.gettext("NOT DEFINED").'</OPTION>' );
-
-	$timezone_list = get_timezones();
-	$one_select = false;
-	foreach ($timezone_list as $key => $cur_value) {
-		$timezone_list[$key] = array($cur_value[2], $key);
-		if ($form_action == 'ask-add') {
-			if (in_array(SERVER_GMT,$cur_value) && !$one_select) {
-				$timezone_default_val = $key;
-				$one_select = true;
-			}
-		}
-	}
-
-	$HD_Form -> AddEditElement (gettext("TIMEZONE"),
-				   "id_timezone",
-				   "$timezone_default_val",
-				   "SELECT",
-				   "","","",
-				   "list" , "", "",	"", $timezone_list, "%1", "", "" );
-
-
-	$HD_Form -> AddEditElement (gettext("LANGUAGE"),
-				   "language",
-				   "",
-				   "SELECT",
-				   "",
-				   "",
-				   "",
-				   "list" , "", "",	"", $language_list, "%1", "", "" );
-
-
-	$HD_Form -> AddEditElement (gettext("CURRENCY"),
-				   "currency",
-				   "",
-				   "SELECT",
-				   "",
-				   "", "", "list" , "", "",	"", $currency_list, "%1", "", gettext("Currency used at the customer end.") );
-
-
-
-	$HD_Form -> AddEditElement (gettext("STATUS"),
-				   "status",
-				   "",
-				   "SELECT",
-				   "",
-				   "",
-				   "",
-				   "list" , "", "",	"", $cardstatus_list, "%1", "", "" );
-
-	$HD_Form -> AddEditElement (gettext("LOCK"),
-				   "block",
-				   '0',
-				   "RADIOBUTTON",
-				   "",
-				   "",
-				   gettext("Choose if you want to enable the lock on this account"),
-				   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Enable lock for this account."));
-
-	if ($form_action =="ask-add" || $form_action=="add") {
-		$lockpin_default = "value = '0'";
-	}
-
-	$HD_Form -> AddEditElement (gettext("LOCK PIN"),
-				   "lock_pin",
-				   '$value',
-				   "INPUT",
-				   "size=20 maxlength=10 $lockpin_default",
-				   "4",
-				   "",
-				   "" , "", "",	"", "", "", "NO", gettext("Code required to make the call if the lock is active."));
-
-
-	$HD_Form -> AddEditElement (gettext("SIMULTANEOUS ACCESS"),
-				   "simultaccess",
-				   "1",
-				   "SELECT",
-				   "",
-				   "",
-				   "",
-				   "list" , "", "",	"", $simultaccess_list, "%1", "", "" );
-
-
-	$HD_Form -> AddEditElement (gettext("RUN SERVICE"),
-				   "runservice",
-				   '0',
-				   "RADIOBUTTON",
-				   "",
-				   "",
-				   gettext("Choose if you want to enable the service recurring on this account"),
-				   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Apply recurring service to this account."));
-
-
-	$HD_Form -> AddEditElement (gettext("CREDIT LIMIT"),
-				   "creditlimit",
-				   "",
-				   "INPUT",
-				   "size=20 maxlength=20",
-				   "4",
-				   gettext("Insert the credit limit"),
-				   "" , "", "",	"", "", "", "NO-NULL", gettext("Credit limit is only used for the postpaid account."));
-
-
-
-	$HD_Form -> AddEditElement (gettext("CREDIT LIMIT NOTIFICATION"),
-				   "credit_notification",
-				   '',
-				   "SELECT",
-				   "",
-				   "",
-				   "",
-				   "list" , "", "", "", $limits_notify_list , "%1", "",
-				   gettext("currency : ").strtoupper(BASE_CURRENCY).'<BR>'.gettext("Low credit limit to alert the customer"),
-				   "", '<OPTION  value="-1" selected>'.gettext("NOT DEFINED").'</OPTION>');
-
-
-	$HD_Form -> AddEditElement (gettext("PERMITTED NOTIFICATIONS BY MAIL"),
-				   "notify_email",
-				   '0',
-				   "RADIOBUTTON",
-				   "",
-				   "",
-				   gettext("Choose if you want to enable the notification by email for this account"),
-				   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Enable the notification by mail for this account."));
-
-
-	$HD_Form -> AddEditElement (gettext("EMAIL NOTIFICATION"),
-				   "email_notification",
-				   '$value',
-				   "INPUT",
-				   "size=30 maxlength=70",
-				   "1",
-				   gettext("Insert the email to notify this customer"),
-				   "" , "", "",	"", "", "" , "NO", "");
-
-	if (ACT_VOICEMAIL) {
-		$HD_Form -> AddEditElement (gettext("PERMITTED VOICEMAIL"),
-					   "voicemail_permitted",
-					   '1',
-					   "RADIOBUTTON",
-					   "",
-					   "",
-					   gettext("Choose if you want to enable the voicemail functionality for this account"),
-					   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Enable the voicemail functionality for this account."));
-
-		$HD_Form -> AddEditElement (gettext("ACTIVE VOICEMAIL SERVICE"),
-					   "voicemail_activated",
-					   '0',
-					   "RADIOBUTTON",
-					   "",
-					   "",
-					   gettext("Customer can choose to enable the voicemail for this account"),
-					   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Customer can enable the voicemail for this account."));
-	}
-
-	$HD_Form -> AddEditElement (gettext("CAMPAIGN"),
-				   "id_campaign",
-				   "",
-				   "SELECT",
-				   "", "", "",
-				   "sql",
-				   "cc_campaign",
-				   "name, id",
-				   "", "", "%1", "", "", "", '<OPTION  value="-1" selected>'.gettext("NOT DEFINED").'</OPTION>' );
-
-
-	$HD_Form -> AddEditElement (gettext("FIRST USE DATE"),
-				   "firstusedate",
-				   "",
-				   "INPUT",
-				   "size=40 maxlength=40 readonly",
-				   "",
-				   "the first use date",
-				   "" , "" , "", "", "", "", "NO-NULL", "", "", "res_display_dateformat");
-
-
-	$HD_Form -> AddEditElement (gettext("ENABLE EXPIRY"),
-				   "enableexpire",
-				   "",
-				   "SELECT",
-				   "",
-				   "",
-				   "",
-				   "list" , "", "",	"", $expire_list, "%1", "", gettext("Select method of expiry for the account.") );
-
-
-	$comp_zero = $comp_date_plus='';
-	if (isset($form_action) && $form_action=="ask-add"){
-		$begin_date = date("Y");
-		$begin_date_plus = date("Y")+10;
-		$end_date = date("-m-d H:i:s");
-		$comp_date = "value='".$begin_date.$end_date."'";
-		$comp_date_plus = "value='".$begin_date_plus.$end_date."'";
-		$comp_zero = "value='0'";
-	}
-
-	$HD_Form -> AddEditElement (gettext("EXPIRY DATE"),
-				   "expirationdate",
-				   '$value',
-				   "INPUT",
-				   "size=40 maxlength=40  $comp_date_plus",
-				   "10",
-				   gettext("Insert the expiration date"),
-				   "" , "", "",	"", "", "", "NO-NULL", gettext("please use the format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"), "", "res_display_dateformat");
-
-
-
-	$HD_Form -> AddEditElement (gettext("EXPIRY DAYS"),
-				   "expiredays",
-				   "",
-				   "INPUT",
-				    "size=10 maxlength=6 $comp_zero",
-				   "4",
-				   gettext("Insert the number of days after which the account will expire"),
-				   "" , "", "",	"", "", "", "", gettext("The number of days after which the account will expire."));
-
-
-	$HD_Form -> AddEditElement (gettext("CREATE SIP CONFIG"),
-				   "sip_buddy",
-				   '1',
-				   "RADIOBUTTON",
-				   "",
-				   "",
-				   gettext("Choose if you want to enable the sip account"),
-				   "" , "", "" , "Yes :1, - No:0", "", "" , "", gettext("Create the SIP config automatically"));
-
-
-	$HD_Form -> AddEditElement (gettext("CREATE IAX CONFIG"),
-				   "iax_buddy",
-				   '1',
-				   "RADIOBUTTON",
-				   "",
-				   "",
-				   gettext("Choose if you want to enable the iax account"),
-				   "" , "", "" , "Yes :1, - No:0",  "", "" , "", gettext("Create the IAX config automatically"));
-
-	$HD_Form -> AddEditElement (gettext("MAC ADDRESS"),
-				   "mac_addr",
-				   '$value',
-				   "INPUT",
-				   "size=20 maxlength=17",
-				   "",
-				   gettext("Insert the MAC address customers' device"),
-				   "" , "", "",	"", "", "" , "NO", gettext("FORMAT: 00-08-74-4C-7F-1D"));
-
-
-	$HD_Form -> AddEditElement (gettext("IN USE"),
-				   "inuse",
-				   '$value',
-				   "INPUT",
-				   "size=5 maxlength=5",
-				   "",
-				   "",
-				   "" , "", "",	"", "", "", "NO", gettext("Updated to show the number of concurrent calls in use by this customer. If there are no currently no calls, and the system shows that there are, manually reset this field back to zero.") );
-
-
-	$HD_Form -> AddEditElement (gettext("MAX CONCURRENT CALLS"),
-				   "max_concurrent",
-				   '$value',
-				   "INPUT",
-				   "size=5 maxlength=5",
-				   "",
-				   "",
-				   "" , "", "",	"", "", "", "NO", gettext("Max concurrent calls (Feature not implemented)") );
-
-
-	$HD_Form -> AddEditElement (gettext("AUTOREFILL"),
-				   "autorefill",
-				   '0',
-				   "RADIOBUTTON",
-				   "",
-				   "",
-				   gettext("Choose if you want to enable the autorefill on this account"),
-				   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Define if you want to authorize the autorefill to apply on this accout"),
-				   '', '', gettext("AUTOREFILL"));
-
-	$HD_Form -> AddEditElement (gettext("INITIAL BALANCE"),
-				   "initialbalance",
-				   "",
-				   "INPUT",
-				   "size=30 $default_initbalance maxlength=30",
-				   "12",
-				   gettext("Insert the amount of the initial balance"),
-				   "" , "", "",	"", "", "",	"", gettext("The initial balance is used by autorefill to reset the current balance to this amount"));
-
-
-
-	$HD_Form -> AddEditElement (gettext("INVOICE DAY"),
-				   "invoiceday",
-				   '$value',
-				   "SELECT",
-				   "",
-				   "",
-				   "",
-				   "list" , "", "",	"", $invoiceday_list, "%1", "", gettext("Define the day of the month when the system will generate the customer invoice."),
-				   '', '', gettext("Invoice Status"));
-
-
-	if ($form_action =="ask-add" || $form_action=="add") {
-		$vat_init = "value = '0'";
-
-	}
-
-	$HD_Form -> AddEditElement (gettext("VAT"),
-				   "vat",
-				   "",
-				   "INPUT",
-				   "size=10 maxlength=6 $vat_init",
-				   "12",
-				   gettext("Insert the VAT"),
-				   "" , "", "",	"", "", "", "" , gettext("VAT to add on the invoice of this customer. it should be a decimal value '21' this will be for 21% of VAT!"));
-
-
-	$HD_Form -> AddEditElement (gettext("VAT REGISTRATION NUMBER "),
-				   "vat_rn",
-				   '$value',
-				   "INPUT",
-				   "size=40 maxlength=40",
-				   "",
-				   gettext("Insert the VAT registration number of this customer"),
-				   "" , "", "",	"", "", "" , "NO", "");
-
-
-	$HD_Form -> AddEditElement (gettext("DISCOUNT"),
-	               "discount",
-	               "",
-	               "SELECT",
-	               "",
-	               "",
-	               "",
-	               "list" , "", "",     "", $discount_list, "%1", "", "");
-
-
-	$HD_Form -> AddEditElement (gettext("TRAFFIC PER MONTH"),
-				   "traffic",
-				   '$value',
-				   "INPUT",
-				   "size=30 maxlength=20",
-				   "4",
-				   gettext("Insert the traffic per month for this customer"),
-				   "" , "", "",	"", "", "" , "NO", "",
-				   '', '', gettext("TARGET TRAFFIC"));
-
-	$HD_Form -> AddEditElement (gettext("TARGET TRAFFIC"),
-					"traffic_target",
-					'',
-					"TEXTAREA",
-					"cols=50 rows=4",
-					"",
-					gettext("Insert the target traffic description"),
-					"" , "", "", "", "" , "", "", "");
-
-
-	$HD_Form -> AddEditElement (gettext("RESTRICTION"),
-				   "restriction",
-				   "0",
-				   "SELECT",
-				   "",
-				   "",
-				   "",
-				   "list" , "", "",	"", $restriction_list, "%1", "", "",
-				   '', '', gettext("RESTRICTED NUMBERS"));
-
-	$HD_Form -> AddEditElement (gettext("RESTRICTED NUMBERS"),
-				   "restrictednumber",
-				   '$value',
-				   "HAS_MANY",
-				   "",
-				   "",
-				   gettext("Insert numbers that restrict the customer"),
-				   "",
-				   "",
-				   "",
-				   "", "", "", "", "", "cc_restricted_phonenumber:number:number, id_card:id_card = %id::id_card:::::::0");
-
-
-
-	$HD_Form -> AddEditElement (gettext("CALLERID"),
-				   "callerid",
-				   '$value',
-				   "HAS_MANY",
-				   "",
-				   "",
-				   "",
-				   "",
-				   "",
-				   "",
-				   "", "", "", "", "", "cc_callerid:cid:cid, cid, id_cc_card:id_cc_card = %id::id_cc_card:::::::0",
-				   '', gettext("CALLERID / CUSTOMER HISTORY"));
-
-
-
-
-
-	$HD_Form -> AddEditElement (gettext("CUSTOMER HISTORY"),
-				   "description",
-				   '$value',
-				   "HAS_MANY",
-				   "multiline",
-				   "",
-				   "",
-				   "",
-				   "",
-				   "",
-				   "", "", "", "", "", "cc_card_history:description:description,id_cc_card,datecreated:id_cc_card = %id::id_cc_card::2:::::0");
-
-				   // cc_card_history:description:description,id_cc_card:id_cc_card = %id::id_cc_card
-				   // Above function will provid Has Many functionality
-				   // Each parameter is seperated by (:) notation
-				   // 0. HAS_MANY will allow to get one to many functionality
-				   // 1. First param is the table name
-				   // 2. Second param is the join condition coloumn
-				   // 3. Third will get all the columns (but first should be joining column)
-				   // 4. Fourth param generates the where cluase
-				   // 5. Last, Sixth param is the FK column
-
-	$add_fields_voicemail = '';
-	if (ACT_VOICEMAIL)
-		$add_fields_voicemail = 'voicemail_permitted, voicemail_activated, ';
-
-	$HD_Form -> FieldEditElement ('username, useralias, uipass, credit, id_group, id_seria, lastname, firstname, email, '.
-			' address, city, state, country, zipcode, phone, fax,company_name, company_website, '.
-			$update_field_typepaid.' tariff, id_didgroup, id_timezone, language, currency, status, block, lock_pin, simultaccess,  runservice, creditlimit, ' .
-			' credit_notification, notify_email, email_notification, ' .$add_fields_voicemail.
-			' id_campaign, ' .
-			' firstusedate, enableexpire, expirationdate, expiredays, sip_buddy, iax_buddy, mac_addr, inuse, max_concurrent, ' .
-			' autorefill, initialbalance, invoiceday, vat, vat_rn, discount, traffic, traffic_target, restriction' );
-
-
-	if(!isset($myusername))
-		$myusername='';
-
-	if ($form_action == "ask-edit") {
-		$table_card = new Table("cc_card","status");
-		$result_card = $table_card ->Get_list(DbConnect(),"id=$id");
-		$HD_Form -> FG_EDITION_HIDDEN_PARAM = "oldstatus";
-		$HD_Form -> FG_EDITION_HIDDEN_PARAM_VALUE = "".$result_card[0][0];
-	}
-
-
-	$HD_Form -> FG_INTRO_TEXT_EDITION= gettext("You can modify, through the following form, the different properties of your")." ".$HD_Form->FG_INSTANCE_NAME;
-	$HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this")." ".$HD_Form->FG_INSTANCE_NAME.", ".gettext("click on the delete button.");
-	$HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new")." ".$HD_Form->FG_INSTANCE_NAME.".<br>".gettext("Fill the following fields and confirm by clicking on the button add.");
-
-
-	$HD_Form -> FG_INTRO_TEXT_ADITION = '';
-	$HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_INSTANCE_NAME." ".gettext("has been inserted.")."<br>";
-
-
-	$HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
-	$HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Once you have completed the form above, click on Confirm Data");
-
-	$HD_Form -> FG_ADDITIONAL_FUNCTION_BEFORE_EDITION = 'change_card_lock';
-
-	$HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_ADD = 'processing_card_add';
-	$HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_EDITION = 'create_status_log';
-
-	if (isset($form_action) && $form_action=='delete' && USE_REALTIME) {
-		$card_table = new Table('cc_card','sip_buddy,iax_buddy');
-		$card_clause = "id = ".$id;
-		$card_result = $card_table -> Get_list(DbConnect(), $card_clause, 0);
-		$sip_buddy = $card_result[0]['sip_buddy'];
-		$iax_buddy = $card_result[0]['iax_buddy'];
-		if(($sip_buddy == 1) && ($iax_buddy == 1))
-			$key = "sip_iax_changed";
-		elseif (($sip_buddy == 1) )
-			$key = "sip_changed";
-		elseif ($iax_buddy == 1)
-			$key = "iax_changed";
-
-		if ($_SESSION["user_type"]=="ADMIN") {
-				$who= Notification::$ADMIN;$who_id=$_SESSION['admin_id'];
-		} elseif ($_SESSION["user_type"]=="AGENT") {
-			$who= Notification::$AGENT;$who_id=$_SESSION['agent_id'];
-		} else {
-			$who=Notification::$UNKNOWN;$who_id=-1;
-		}
-		NotificationsDAO::AddNotification($key,Notification::$HIGH,$who,$who_id);
-	}
-
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?section=".$_SESSION["menu_section"]."&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?section=".$_SESSION["menu_section"]."&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?section=".$_SESSION["menu_section"]."&id=";
+    $HD_Form -> FG_EDITION = true;
+    $HD_Form -> FG_DELETION = true;
+
+    $maxi   = '';
+    $maxi2  = '';
+    $maxi3  = '';
+    $useralias_locked = '';
+
+    if (isset($form_action) && $form_action=="ask-add") {
+        if (!is_numeric($cardnumberlenght_list))    $cardnumberlenght_list = LEN_CARDNUMBER;
+        $array_card_generated  = gen_card_with_alias("cc_card", 0, $cardnumberlenght_list);
+        $maxi = "value='".$array_card_generated[0]."'";
+        $maxi2 = "value='".$array_card_generated[1]."'";
+        $pass = MDP_NUMERIC(5).MDP_STRING(15);
+        $maxi3 = "value='".$pass."'";
+        $default_initbalance = "value='0'";
+    }
+
+    if (!empty($A2B->config["webui"]['lock_useralias'])) {
+        $useralias_locked = 'readonly="readonly"';
+    }
+
+    $HD_Form -> AddEditElement (gettext("ACCOUNT NUMBER"),
+                   "username",
+                   "",
+                   "INPUT",
+                    "size=30 $maxi readonly  maxlength=40",
+                   "4",
+                   gettext("Insert the account number"),
+                   "" , "", "", "", "" , "", "", '', null, null, gettext("Customer Information"));
+
+
+    $HD_Form -> AddEditElement (gettext("WEBUI LOGIN"),
+                   "useralias",
+                   "",
+                   "INPUT",
+                    "size=20 $maxi2 maxlength=40 $useralias_locked",
+                   "4",
+                   gettext("Insert the webui login"),
+                   "" , "", "", "", "" , "", "", "");
+
+
+    $HD_Form -> AddEditElement (gettext("WEBUI PASSWORD"),
+                   "uipass",
+                   '',
+                   "INPUT",
+                   "size=20 $maxi3 maxlength=20",
+                   "",
+                   gettext("Insert the password"),
+                   "" , "", "", "", "", "", "", gettext("Password for customer to access to the web interface and view the balance.") );
+
+    if ($form_action =="ask-add" || $form_action=="add") {
+        $balance_access = "value = '0'";
+        $payment_status = "";
+
+    } else {
+        $balance_access = 'readonly';
+        $payment_status= 'disabled="true" style="color: gray;" ';
+    }
+
+    $HD_Form -> AddEditElement (gettext("BALANCE"),
+                   "credit",
+                   "",
+                   "INPUT",
+                   "size=30 maxlength=30 ".$balance_access,
+                   "12",
+                   gettext("Insert the number of credit"),
+                   "" , "", "", "", "", "", "", gettext("currency : ").strtoupper(BASE_CURRENCY) );
+
+
+    $HD_Form -> AddEditElement (gettext("CUSTOMER GROUP"),
+                   "id_group",
+                   "",
+                   "SELECT",
+                   "", "", "",
+                   "sql",
+                   "cc_card_group",
+                   "name, id",
+                   "", "", "%1", "", "", "", "", "");
+
+    $HD_Form -> AddEditElement (gettext("SERIAL"),
+                   "id_seria",
+                   "",
+                   "SELECT",
+                   "", "", "",
+                   "sql",
+                   "cc_card_seria",
+                   "name, id",
+                   "", "", "%1", "", "", "", '<OPTION  value="-1" selected>'.gettext("NOT DEFINED").'</OPTION>' );
+
+
+    $HD_Form -> AddEditElement (gettext("LAST NAME"),
+                   "lastname",
+                   '$value',
+                   "INPUT",
+                   "size=30 maxlength=50",
+                   "11",
+                   gettext("Insert the lastname of the customers"),
+                   "" , "", "", "", "", "" , "NO", "", null, null, gettext("Personal Information"));
+
+    $HD_Form -> AddEditElement (gettext("FIRST NAME"),
+                   "firstname",
+                   '$value',
+                   "INPUT",
+                   "size=30 maxlength=50",
+                   "11",
+                   gettext("Insert the firstname of the customers"),
+                   "" , "", "", "", "", "" , "NO", "");
+
+
+    $HD_Form -> AddEditElement (gettext("EMAIL"),
+                   "email",
+                   '$value',
+                   "INPUT",
+                   "size=30 maxlength=70",
+                   "1",
+                   gettext("Insert the email"),
+                   "" , "", "", "", "", "" , "NO", "");
+
+
+    $HD_Form -> AddEditElement (gettext("ADDRESS"),
+                   "address",
+                   '$value',
+                   "INPUT",
+                   "size=30 maxlength=100",
+                   "0",
+                   gettext("Insert the address of the customers"),
+                   "" , "", "", "", "", "" , "NO", "");
+
+
+    $HD_Form -> AddEditElement (gettext("CITY"),
+                   "city",
+                   '$value',
+                   "INPUT",
+                   "size=30 maxlength=40",
+                   "0",
+                   gettext("Insert the city"),
+                   "" , "", "", "", "", "" , "NO", "");
+
+
+    $HD_Form -> AddEditElement (gettext("STATE/PROVINCE"),
+                   "state",
+                   '$value',
+                   "INPUT",
+                   "size=30 maxlength=40",
+                   "11",
+                   gettext("Insert the state"),
+                   "" , "", "", "", "", "" , "NO", "");
+
+    if ($form_action == 'ask-add') {
+        $country_default_val = 'USA';
+    }
+
+    $HD_Form -> AddEditElement (gettext("COUNTRY"),
+                   "country",
+                   "$country_default_val",
+                   "SELECT",
+                   "", "", "",
+                   "sql",
+                   "cc_country",
+                   "countryname, countrycode",
+                   "", "", "%1", "", "", "", '' );
+
+    $HD_Form -> AddEditElement (gettext("ZIP/POSTAL CODE"),
+                   "zipcode",
+                   '$value',
+                   "INPUT",
+                   "size=30 maxlength=20",
+                   "0",
+                   gettext("Insert the zipcode"),
+                   "" , "", "", "", "", "" , "NO", "");
+
+
+    $HD_Form -> AddEditElement (gettext("PHONE NUMBER"),
+                   "phone",
+                   '$value',
+                   "INPUT",
+                   "size=30 maxlength=20",
+                   "7",
+                   gettext("Insert the phone number of the customers"),
+                   "" , "", "", "", "", "" , "NO", "");
+
+
+    $HD_Form -> AddEditElement (gettext("FAX NUMBER"),
+                   "fax",
+                   '$value',
+                   "INPUT",
+                   "size=30 maxlength=20",
+                   "",
+                   gettext("Insert the fax number of the customers"),
+                   "" , "", "", "", "", "" , "NO", "");
+
+    $HD_Form -> AddEditElement (gettext("COMPANY NAME"),
+                   "company_name",
+                   '$value',
+                   "INPUT",
+                   "size=40 maxlength=50",
+                   "",
+                   gettext("Insert Company name of this customer"),
+                   "" , "", "", "", "", "" , "NO", "");
+
+
+    $HD_Form -> AddEditElement (gettext("COMPANY WEBSITE"),
+                   "company_website",
+                   '$value',
+                   "INPUT",
+                   "size=40 maxlength=60",
+                   "",
+                   gettext("Insert the company website of this customer"),
+                   "" , "", "", "", "", "" , "NO", "");
+
+    if ($form_action != "edit") {
+
+        $update_field_typepaid = 'typepaid ,';
+
+        $HD_Form -> AddEditElement (gettext("PAYMENT TYPE"),
+                       "typepaid",
+                       "",
+                       "SELECT",
+                       "$payment_status",
+                       "",
+                       "",
+                       "list" , "", "", "", $typepaid_list, "%1", "", '', null, null, gettext("Customer Status") );
+    }
+
+    $HD_Form -> AddEditElement (gettext("CALL PLAN"),
+                   "tariff",
+                   "",
+                   "SELECT",
+                   "", "", "",
+                   "sql",
+                   "cc_tariffgroup",
+                   "tariffgroupname, id",
+                   "", "", "%1", "", gettext("Changing the call plan will result in the free minutes or free calls package being reset.") );
+
+
+    $HD_Form -> AddEditElement (gettext("DIDGROUP"),
+                   "id_didgroup",
+                   "",
+                   "SELECT",
+                   "", "", "",
+                   "sql",
+                   "cc_didgroup",
+                   "didgroupname, id",
+                   "", "", "%1", "", "", "", '<OPTION  value="-1" selected>'.gettext("NOT DEFINED").'</OPTION>' );
+
+    $timezone_list = get_timezones();
+    $one_select = false;
+    foreach ($timezone_list as $key => $cur_value) {
+        $timezone_list[$key] = array($cur_value[2], $key);
+        if ($form_action == 'ask-add') {
+            if (in_array(SERVER_GMT,$cur_value) && !$one_select) {
+                $timezone_default_val = $key;
+                $one_select = true;
+            }
+        }
+    }
+
+    $HD_Form -> AddEditElement (gettext("TIMEZONE"),
+                   "id_timezone",
+                   "$timezone_default_val",
+                   "SELECT",
+                   "","","",
+                   "list" , "", "", "", $timezone_list, "%1", "", "" );
+
+
+    $HD_Form -> AddEditElement (gettext("LANGUAGE"),
+                   "language",
+                   "",
+                   "SELECT",
+                   "",
+                   "",
+                   "",
+                   "list" , "", "", "", $language_list, "%1", "", "" );
+
+
+    $HD_Form -> AddEditElement (gettext("CURRENCY"),
+                   "currency",
+                   "",
+                   "SELECT",
+                   "",
+                   "", "", "list" , "", "", "", $currency_list, "%1", "", gettext("Currency used at the customer end.") );
+
+
+
+    $HD_Form -> AddEditElement (gettext("STATUS"),
+                   "status",
+                   "",
+                   "SELECT",
+                   "",
+                   "",
+                   "",
+                   "list" , "", "", "", $cardstatus_list, "%1", "", "" );
+
+    $HD_Form -> AddEditElement (gettext("LOCK"),
+                   "block",
+                   '0',
+                   "RADIOBUTTON",
+                   "",
+                   "",
+                   gettext("Choose if you want to enable the lock on this account"),
+                   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Enable lock for this account."));
+
+    if ($form_action =="ask-add" || $form_action=="add") {
+        $lockpin_default = "value = '0'";
+    }
+
+    $HD_Form -> AddEditElement (gettext("LOCK PIN"),
+                   "lock_pin",
+                   '$value',
+                   "INPUT",
+                   "size=20 maxlength=10 $lockpin_default",
+                   "4",
+                   "",
+                   "" , "", "", "", "", "", "NO", gettext("Code required to make the call if the lock is active."));
+
+
+    $HD_Form -> AddEditElement (gettext("SIMULTANEOUS ACCESS"),
+                   "simultaccess",
+                   "1",
+                   "SELECT",
+                   "",
+                   "",
+                   "",
+                   "list" , "", "", "", $simultaccess_list, "%1", "", "" );
+
+
+    $HD_Form -> AddEditElement (gettext("RUN SERVICE"),
+                   "runservice",
+                   '0',
+                   "RADIOBUTTON",
+                   "",
+                   "",
+                   gettext("Choose if you want to enable the service recurring on this account"),
+                   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Apply recurring service to this account."));
+
+
+    $HD_Form -> AddEditElement (gettext("CREDIT LIMIT"),
+                   "creditlimit",
+                   "",
+                   "INPUT",
+                   "size=20 maxlength=20",
+                   "4",
+                   gettext("Insert the credit limit"),
+                   "" , "", "", "", "", "", "NO-NULL", gettext("Credit limit is only used for the postpaid account."));
+
+
+
+    $HD_Form -> AddEditElement (gettext("CREDIT LIMIT NOTIFICATION"),
+                   "credit_notification",
+                   '',
+                   "SELECT",
+                   "",
+                   "",
+                   "",
+                   "list" , "", "", "", $limits_notify_list , "%1", "",
+                   gettext("currency : ").strtoupper(BASE_CURRENCY).'<BR>'.gettext("Low credit limit to alert the customer"),
+                   "", '<OPTION  value="-1" selected>'.gettext("NOT DEFINED").'</OPTION>');
+
+
+    $HD_Form -> AddEditElement (gettext("PERMITTED NOTIFICATIONS BY MAIL"),
+                   "notify_email",
+                   '0',
+                   "RADIOBUTTON",
+                   "",
+                   "",
+                   gettext("Choose if you want to enable the notification by email for this account"),
+                   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Enable the notification by mail for this account."));
+
+
+    $HD_Form -> AddEditElement (gettext("EMAIL NOTIFICATION"),
+                   "email_notification",
+                   '$value',
+                   "INPUT",
+                   "size=30 maxlength=70",
+                   "1",
+                   gettext("Insert the email to notify this customer"),
+                   "" , "", "", "", "", "" , "NO", "");
+
+    if (ACT_VOICEMAIL) {
+        $HD_Form -> AddEditElement (gettext("PERMITTED VOICEMAIL"),
+                       "voicemail_permitted",
+                       '1',
+                       "RADIOBUTTON",
+                       "",
+                       "",
+                       gettext("Choose if you want to enable the voicemail functionality for this account"),
+                       "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Enable the voicemail functionality for this account."));
+
+        $HD_Form -> AddEditElement (gettext("ACTIVE VOICEMAIL SERVICE"),
+                       "voicemail_activated",
+                       '0',
+                       "RADIOBUTTON",
+                       "",
+                       "",
+                       gettext("Customer can choose to enable the voicemail for this account"),
+                       "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Customer can enable the voicemail for this account."));
+    }
+
+    $HD_Form -> AddEditElement (gettext("CAMPAIGN"),
+                   "id_campaign",
+                   "",
+                   "SELECT",
+                   "", "", "",
+                   "sql",
+                   "cc_campaign",
+                   "name, id",
+                   "", "", "%1", "", "", "", '<OPTION  value="-1" selected>'.gettext("NOT DEFINED").'</OPTION>' );
+
+
+    $HD_Form -> AddEditElement (gettext("FIRST USE DATE"),
+                   "firstusedate",
+                   "",
+                   "INPUT",
+                   "size=40 maxlength=40 readonly",
+                   "",
+                   "the first use date",
+                   "" , "" , "", "", "", "", "NO-NULL", "", "", "res_display_dateformat");
+
+
+    $HD_Form -> AddEditElement (gettext("ENABLE EXPIRY"),
+                   "enableexpire",
+                   "",
+                   "SELECT",
+                   "",
+                   "",
+                   "",
+                   "list" , "", "", "", $expire_list, "%1", "", gettext("Select method of expiry for the account.") );
+
+
+    $comp_zero = $comp_date_plus='';
+    if (isset($form_action) && $form_action=="ask-add"){
+        $begin_date = date("Y");
+        $begin_date_plus = date("Y")+10;
+        $end_date = date("-m-d H:i:s");
+        $comp_date = "value='".$begin_date.$end_date."'";
+        $comp_date_plus = "value='".$begin_date_plus.$end_date."'";
+        $comp_zero = "value='0'";
+    }
+
+    $HD_Form -> AddEditElement (gettext("EXPIRY DATE"),
+                   "expirationdate",
+                   '$value',
+                   "INPUT",
+                   "size=40 maxlength=40  $comp_date_plus",
+                   "10",
+                   gettext("Insert the expiration date"),
+                   "" , "", "", "", "", "", "NO-NULL", gettext("please use the format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"), "", "res_display_dateformat");
+
+
+
+    $HD_Form -> AddEditElement (gettext("EXPIRY DAYS"),
+                   "expiredays",
+                   "",
+                   "INPUT",
+                    "size=10 maxlength=6 $comp_zero",
+                   "4",
+                   gettext("Insert the number of days after which the account will expire"),
+                   "" , "", "", "", "", "", "", gettext("The number of days after which the account will expire."));
+
+
+    $HD_Form -> AddEditElement (gettext("CREATE SIP CONFIG"),
+                   "sip_buddy",
+                   '1',
+                   "RADIOBUTTON",
+                   "",
+                   "",
+                   gettext("Choose if you want to enable the sip account"),
+                   "" , "", "" , "Yes :1, - No:0", "", "" , "", gettext("Create the SIP config automatically"));
+
+
+    $HD_Form -> AddEditElement (gettext("CREATE IAX CONFIG"),
+                   "iax_buddy",
+                   '1',
+                   "RADIOBUTTON",
+                   "",
+                   "",
+                   gettext("Choose if you want to enable the iax account"),
+                   "" , "", "" , "Yes :1, - No:0",  "", "" , "", gettext("Create the IAX config automatically"));
+
+    $HD_Form -> AddEditElement (gettext("MAC ADDRESS"),
+                   "mac_addr",
+                   '$value',
+                   "INPUT",
+                   "size=20 maxlength=17",
+                   "",
+                   gettext("Insert the MAC address customers' device"),
+                   "" , "", "", "", "", "" , "NO", gettext("FORMAT: 00-08-74-4C-7F-1D"));
+
+
+    $HD_Form -> AddEditElement (gettext("IN USE"),
+                   "inuse",
+                   '$value',
+                   "INPUT",
+                   "size=5 maxlength=5",
+                   "",
+                   "",
+                   "" , "", "", "", "", "", "NO", gettext("Updated to show the number of concurrent calls in use by this customer. If there are no currently no calls, and the system shows that there are, manually reset this field back to zero.") );
+
+
+    $HD_Form -> AddEditElement (gettext("MAX CONCURRENT CALLS"),
+                   "max_concurrent",
+                   '$value',
+                   "INPUT",
+                   "size=5 maxlength=5",
+                   "",
+                   "",
+                   "" , "", "", "", "", "", "NO", gettext("Max concurrent calls (Feature not implemented)") );
+
+
+    $HD_Form -> AddEditElement (gettext("AUTOREFILL"),
+                   "autorefill",
+                   '0',
+                   "RADIOBUTTON",
+                   "",
+                   "",
+                   gettext("Choose if you want to enable the autorefill on this account"),
+                   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Define if you want to authorize the autorefill to apply on this accout"),
+                   '', '', gettext("AUTOREFILL"));
+
+    $HD_Form -> AddEditElement (gettext("INITIAL BALANCE"),
+                   "initialbalance",
+                   "",
+                   "INPUT",
+                   "size=30 $default_initbalance maxlength=30",
+                   "12",
+                   gettext("Insert the amount of the initial balance"),
+                   "" , "", "", "", "", "", "", gettext("The initial balance is used by autorefill to reset the current balance to this amount"));
+
+
+
+    $HD_Form -> AddEditElement (gettext("INVOICE DAY"),
+                   "invoiceday",
+                   '$value',
+                   "SELECT",
+                   "",
+                   "",
+                   "",
+                   "list" , "", "", "", $invoiceday_list, "%1", "", gettext("Define the day of the month when the system will generate the customer invoice."),
+                   '', '', gettext("Invoice Status"));
+
+
+    if ($form_action =="ask-add" || $form_action=="add") {
+        $vat_init = "value = '0'";
+
+    }
+
+    $HD_Form -> AddEditElement (gettext("VAT"),
+                   "vat",
+                   "",
+                   "INPUT",
+                   "size=10 maxlength=6 $vat_init",
+                   "12",
+                   gettext("Insert the VAT"),
+                   "" , "", "", "", "", "", "" , gettext("VAT to add on the invoice of this customer. it should be a decimal value '21' this will be for 21% of VAT!"));
+
+
+    $HD_Form -> AddEditElement (gettext("VAT REGISTRATION NUMBER "),
+                   "vat_rn",
+                   '$value',
+                   "INPUT",
+                   "size=40 maxlength=40",
+                   "",
+                   gettext("Insert the VAT registration number of this customer"),
+                   "" , "", "", "", "", "" , "NO", "");
+
+
+    $HD_Form -> AddEditElement (gettext("DISCOUNT"),
+                   "discount",
+                   "",
+                   "SELECT",
+                   "",
+                   "",
+                   "",
+                   "list" , "", "",     "", $discount_list, "%1", "", "");
+
+
+    $HD_Form -> AddEditElement (gettext("TRAFFIC PER MONTH"),
+                   "traffic",
+                   '$value',
+                   "INPUT",
+                   "size=30 maxlength=20",
+                   "4",
+                   gettext("Insert the traffic per month for this customer"),
+                   "" , "", "", "", "", "" , "NO", "",
+                   '', '', gettext("TARGET TRAFFIC"));
+
+    $HD_Form -> AddEditElement (gettext("TARGET TRAFFIC"),
+                    "traffic_target",
+                    '',
+                    "TEXTAREA",
+                    "cols=50 rows=4",
+                    "",
+                    gettext("Insert the target traffic description"),
+                    "" , "", "", "", "" , "", "", "");
+
+
+    $HD_Form -> AddEditElement (gettext("RESTRICTION"),
+                   "restriction",
+                   "0",
+                   "SELECT",
+                   "",
+                   "",
+                   "",
+                   "list" , "", "", "", $restriction_list, "%1", "", "",
+                   '', '', gettext("RESTRICTED NUMBERS"));
+
+    $HD_Form -> AddEditElement (gettext("RESTRICTED NUMBERS"),
+                   "restrictednumber",
+                   '$value',
+                   "HAS_MANY",
+                   "",
+                   "",
+                   gettext("Insert numbers that restrict the customer"),
+                   "",
+                   "",
+                   "",
+                   "", "", "", "", "", "cc_restricted_phonenumber:number:number, id_card:id_card = %id::id_card:::::::0");
+
+
+
+    $HD_Form -> AddEditElement (gettext("CALLERID"),
+                   "callerid",
+                   '$value',
+                   "HAS_MANY",
+                   "",
+                   "",
+                   "",
+                   "",
+                   "",
+                   "",
+                   "", "", "", "", "", "cc_callerid:cid:cid, cid, id_cc_card:id_cc_card = %id::id_cc_card:::::::0",
+                   '', gettext("CALLERID / CUSTOMER HISTORY"));
+
+
+
+
+
+    $HD_Form -> AddEditElement (gettext("CUSTOMER HISTORY"),
+                   "description",
+                   '$value',
+                   "HAS_MANY",
+                   "multiline",
+                   "",
+                   "",
+                   "",
+                   "",
+                   "",
+                   "", "", "", "", "", "cc_card_history:description:description,id_cc_card,datecreated:id_cc_card = %id::id_cc_card::2:::::0");
+
+                   // cc_card_history:description:description,id_cc_card:id_cc_card = %id::id_cc_card
+                   // Above function will provid Has Many functionality
+                   // Each parameter is seperated by (:) notation
+                   // 0. HAS_MANY will allow to get one to many functionality
+                   // 1. First param is the table name
+                   // 2. Second param is the join condition coloumn
+                   // 3. Third will get all the columns (but first should be joining column)
+                   // 4. Fourth param generates the where cluase
+                   // 5. Last, Sixth param is the FK column
+
+    $add_fields_voicemail = '';
+    if (ACT_VOICEMAIL)
+        $add_fields_voicemail = 'voicemail_permitted, voicemail_activated, ';
+
+    $HD_Form -> FieldEditElement ('username, useralias, uipass, credit, id_group, id_seria, lastname, firstname, email, '.
+            ' address, city, state, country, zipcode, phone, fax,company_name, company_website, '.
+            $update_field_typepaid.' tariff, id_didgroup, id_timezone, language, currency, status, block, lock_pin, simultaccess,  runservice, creditlimit, ' .
+            ' credit_notification, notify_email, email_notification, ' .$add_fields_voicemail.
+            ' id_campaign, ' .
+            ' firstusedate, enableexpire, expirationdate, expiredays, sip_buddy, iax_buddy, mac_addr, inuse, max_concurrent, ' .
+            ' autorefill, initialbalance, invoiceday, vat, vat_rn, discount, traffic, traffic_target, restriction' );
+
+
+    if(!isset($myusername))
+        $myusername='';
+
+    if ($form_action == "ask-edit") {
+        $table_card = new Table("cc_card","status");
+        $result_card = $table_card ->Get_list(DbConnect(),"id=$id");
+        $HD_Form -> FG_EDITION_HIDDEN_PARAM = "oldstatus";
+        $HD_Form -> FG_EDITION_HIDDEN_PARAM_VALUE = "".$result_card[0][0];
+    }
+
+
+    $HD_Form -> FG_INTRO_TEXT_EDITION= gettext("You can modify, through the following form, the different properties of your")." ".$HD_Form->FG_INSTANCE_NAME;
+    $HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this")." ".$HD_Form->FG_INSTANCE_NAME.", ".gettext("click on the delete button.");
+    $HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new")." ".$HD_Form->FG_INSTANCE_NAME.".<br>".gettext("Fill the following fields and confirm by clicking on the button add.");
+
+
+    $HD_Form -> FG_INTRO_TEXT_ADITION = '';
+    $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_INSTANCE_NAME." ".gettext("has been inserted.")."<br>";
+
+
+    $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
+    $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Once you have completed the form above, click on Confirm Data");
+
+    $HD_Form -> FG_ADDITIONAL_FUNCTION_BEFORE_EDITION = 'change_card_lock';
+
+    $HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_ADD = 'processing_card_add';
+    $HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_EDITION = 'create_status_log';
+
+    if (isset($form_action) && $form_action=='delete' && USE_REALTIME) {
+        $card_table = new Table('cc_card','sip_buddy,iax_buddy');
+        $card_clause = "id = ".$id;
+        $card_result = $card_table -> Get_list(DbConnect(), $card_clause, 0);
+        $sip_buddy = $card_result[0]['sip_buddy'];
+        $iax_buddy = $card_result[0]['iax_buddy'];
+        if(($sip_buddy == 1) && ($iax_buddy == 1))
+            $key = "sip_iax_changed";
+        elseif (($sip_buddy == 1) )
+            $key = "sip_changed";
+        elseif ($iax_buddy == 1)
+            $key = "iax_changed";
+
+        if ($_SESSION["user_type"]=="ADMIN") {
+                $who= Notification::$ADMIN;$who_id=$_SESSION['admin_id'];
+        } elseif ($_SESSION["user_type"]=="AGENT") {
+            $who= Notification::$AGENT;$who_id=$_SESSION['agent_id'];
+        } else {
+            $who=Notification::$UNKNOWN;$who_id=-1;
+        }
+        NotificationsDAO::AddNotification($key,Notification::$HIGH,$who,$who_id);
+    }
+
+    $HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?section=".$_SESSION["menu_section"]."&id=";
+    $HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?section=".$_SESSION["menu_section"]."&id=";
+    $HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?section=".$_SESSION["menu_section"]."&id=";
 }
-
-
diff --git a/admin/Public/form_data/FG_var_card_group.inc b/admin/Public/form_data/FG_var_card_group.inc
index 567d8ad81..321b81679 100755
--- a/admin/Public/form_data/FG_var_card_group.inc
+++ b/admin/Public/form_data/FG_var_card_group.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -61,13 +61,13 @@ $HD_Form ->FG_LIST_ADDING_BUTTON_ALT1 = $HD_Form ->FG_LIST_ADDING_BUTTON_MSG1 =
 $HD_Form ->FG_LIST_ADDING_BUTTON_IMG1 = Images_Path ."/group_add.png" ;
 
 
-
+$HD_Form -> AddViewElement(gettext("ID"), "id", "10%", "center", "sort");
 $HD_Form -> AddViewElement(gettext("NAME"), "name", "25%", "center", "sort");
-$HD_Form -> AddViewElement(gettext("DESCRIPTION"), "description", "65%", "center", "SORT", "150");
-$HD_Form -> FieldViewElement ( 'name, description');
+$HD_Form -> AddViewElement(gettext("DESCRIPTION"), "description", "55%", "center", "SORT", "150");
+$HD_Form -> FieldViewElement ( 'id, name, description');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("NO CUSTOMER GROUP CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("NO CUSTOMER GROUP CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -101,12 +101,12 @@ $right_list["19"] = array( gettext("SEE RECORDING"), "262144");
 $len_right_list = count($right_list);
 
 
-$HD_Form -> AddEditElement ( gettext("NAME"),	
-		"name",	'$value',	
+$HD_Form -> AddEditElement ( gettext("NAME"),
+		"name",	'$value',
 		"INPUT",
 		"size=30 maxlength=40",
 		"0",
-		gettext("Insert the provider name"), 
+		gettext("Insert the provider name"),
 		"" , "", "",	"", "", "", "", "" );
 
 
@@ -118,7 +118,7 @@ $HD_Form -> AddEditElement (gettext("DESCRIPTION"),
 		"",
 		gettext("Insert the description"),
 		"" , "", "", "", "" , "", "", "");
-		
+
 $HD_Form -> AddEditElement (gettext("AGENT"),
 	   "id_agent",
 	   "",
@@ -137,7 +137,7 @@ $HD_Form -> AddEditElement (gettext("PERMISSION USER INTERFACE"),
 		"", "",
 		"list", "", "description, id", "", $right_list, "%1" , "",
 		gettext("To select several rights in the above ListBox, hold the CTRL key down while clicking the items") );
-	
+
 
 $HD_Form -> FieldEditElement ('name, description, id_agent, users_perms');
 
@@ -158,7 +158,7 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
diff --git a/admin/Public/form_data/FG_var_card_seria.inc b/admin/Public/form_data/FG_var_card_seria.inc
old mode 100644
new mode 100755
index 500f35147..80f36af8d
--- a/admin/Public/form_data/FG_var_card_seria.inc
+++ b/admin/Public/form_data/FG_var_card_seria.inc
@@ -106,6 +106,6 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
diff --git a/admin/Public/form_data/FG_var_charge.inc b/admin/Public/form_data/FG_var_charge.inc
old mode 100644
new mode 100755
index 43298a8af..ffd1eeb6a
--- a/admin/Public/form_data/FG_var_charge.inc
+++ b/admin/Public/form_data/FG_var_charge.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -188,7 +188,7 @@ $HD_Form_c -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form_c -> FG_BUTTON_ADITION_BO
 
 
 
-$HD_Form_c -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form_c -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form_c -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form_c -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form_c -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form_c -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
diff --git a/admin/Public/form_data/FG_var_commission.inc b/admin/Public/form_data/FG_var_commission.inc
old mode 100644
new mode 100755
index a4035aa5f..efccf36f7
--- a/admin/Public/form_data/FG_var_commission.inc
+++ b/admin/Public/form_data/FG_var_commission.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -58,7 +58,7 @@ $HD_Form -> AddViewElement(gettext("LINK TO PAYMENT"), "id_payment", "10%", "cen
 $HD_Form -> FieldViewElement ('cc_agent_commission.id, id_card, id_agent, date, amount, commission_type , description, id_payment');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE ARE NO COMMISSION AGENTS CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE ARE NO COMMISSION AGENTS CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -72,30 +72,30 @@ if ($form_action=="ask-add" && !empty($id_card)) {
 }
 
 $HD_Form -> AddEditElement (gettext("CUSTOMER ID"),
-			   "id_card",		
-			   "$value",	
-			   "POPUPVALUE",	
-			   "size=30 maxlength=50 ".$id_val,	
-			   "4",	
+			   "id_card",
+			   "$value",
+			   "POPUPVALUE",
+			   "size=30 maxlength=50 ".$id_val,
+			   "4",
 			   gettext("Insert the Customer ID "),
-			    "" , "", "", "", "", 				
+			    "" , "", "", "", "",
 				"A2B_entity_card.php?popup_select=1&"
 				, ", 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 				gettext("Select the Customer ID"));
 
 $HD_Form -> AddEditElement (gettext("AGENT ID"),
-			   "id_agent",		
-			   "$value",	
-			   "POPUPVALUE",	
-			   "size=30 maxlength=50 ".$id_val,	
-			   "4",	
+			   "id_agent",
+			   "$value",
+			   "POPUPVALUE",
+			   "size=30 maxlength=50 ".$id_val,
+			   "4",
 			   gettext("Insert the AGENT ID "),
-			    "" , "", "", "", "", 				
+			    "" , "", "", "", "",
 				"A2B_entity_agent.php?popup_select=1&"
 				, ", 'AgentSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 				gettext("Select the Agent ID"));
-			   
-if ($form_action=="ask-add") {	
+
+if ($form_action=="ask-add") {
 	$begin_date = date("Y");
 	$end_date = date("-m-d H:i:s");
 	$comp_date=$begin_date.$end_date;
@@ -103,20 +103,20 @@ if ($form_action=="ask-add") {
 }
 
 $HD_Form -> AddEditElement (gettext("PAYMENT DATE"),
-			   "date",		
-			   '$value',	
-			   "INPUT",	
-			   "size=40 READONLY maxlength=40  $comp_date",	
-			   "10",	
+			   "date",
+			   '$value',
+			   "INPUT",
+			   "size=40 READONLY maxlength=40  $comp_date",
+			   "10",
 			   gettext("Insert the current date"),
 			   "" , "", "",	"", "", "", "", "" );
 
 $HD_Form -> AddEditElement (gettext("COMMISSION AMOUNT"),
-			   "amount",		
-			   '$value',	
-			   "INPUT",	
-			   "size=60 maxlength=10",	
-			   "12",	
+			   "amount",
+			   '$value',
+			   "INPUT",
+			   "size=60 maxlength=10",
+			   "12",
 			   gettext("Insert the commission amount"),
 			   "" , "", "",	"", "" , "", "", gettext("Enter the amount in the currency base : ").BASE_CURRENCY );
 
@@ -131,13 +131,13 @@ $HD_Form -> AddEditElement (gettext("DESCRIPTION"),
 				"" , "", "", "", "" , "", "", "");
 
 $HD_Form -> AddEditElement (gettext("PAYMENT ID"),
-			   "id_payment",		
-			   "$value",	
-			   "POPUPVALUE",	
-			   "size=30 maxlength=50 ".$id_val,	
-			   "4",	
+			   "id_payment",
+			   "$value",
+			   "POPUPVALUE",
+			   "size=30 maxlength=50 ".$id_val,
+			   "4",
 			   gettext("Insert the Payment ID "),
-			    "" , "", "", "", "", 				
+			    "" , "", "", "", "",
 				"A2B_entity_payment.php?popup_select=1&"
 				, ", 'PaymentSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 				gettext("Select the Payment ID"));
@@ -167,8 +167,8 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue.");
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_config.inc b/admin/Public/form_data/FG_var_config.inc
index e62b27b05..a96dbb86c 100755
--- a/admin/Public/form_data/FG_var_config.inc
+++ b/admin/Public/form_data/FG_var_config.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,16 +27,15 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
-
 getpost_ifset(array('id', 'config_title', 'config_key', 'config_value', 'config_description', 'config_group_title', 'groupselect', 'filterKey', 'rbKey', 'filterDescription', 'rbDesc', 'filterValue', 'rbValue', 'posted','agi_conf'));
 
-// This will generate agi-confx 
-// agi-confx is duplication of Global configuration and list of configurations of : agi-conf1 
+// This will generate agi-confx
+// agi-confx is duplication of Global configuration and list of configurations of : agi-conf1
 if ($agi_conf) {
 	check_demo_mode();
 	$groupselect = add_agi_confx();
@@ -84,7 +83,6 @@ $HD_Form -> FG_TABLE_DEFAULT_ORDER = "config_group_title";
 $HD_Form -> FG_TABLE_DEFAULT_SENS = "ASC";
 
 if ($groupselect != "-1" && $groupselect != "") {
-	$HD_Form = new FormHandler("cc_config", gettext("Configuration"));
 	$HD_Form -> FG_TABLE_ID = "id";
 	$HD_Form -> FG_TABLE_CLAUSE = " config_group_title = '$groupselect'";
 	$_SESSION['ss_groupselect'] = $HD_Form -> FG_TABLE_CLAUSE;
@@ -145,7 +143,7 @@ if($form_action == "list") {
 	$_SESSION['ss_groupselect'] = '';
 	$_SESSION['groupselect'] = '';
 } else {
-	$HD_Form -> FG_TABLE_CLAUSE = $_SESSION['ss_groupselect']; 
+	$HD_Form -> FG_TABLE_CLAUSE = $_SESSION['ss_groupselect'];
 }
 
 $HD_Form -> FG_EDITION_CLAUSE = "id = %id";
@@ -180,7 +178,7 @@ $HD_Form -> AddEditElement (gettext("GROUP"),
 	"",
 	gettext("This is the group of the configuration. Not editable!"),
 	"" , "", "", "", "", "", "", gettext("Group Name of the configuration variable"));
-	
+
 
 $HD_Form -> AddEditElement (gettext("TITLE"),
 	"config_title",
@@ -199,7 +197,7 @@ $HD_Form -> AddEditElement (gettext("KEY"),
 	"",
 	gettext("Insert the TITLE"),
 	"" , "", "", "", "" , "", "" ,gettext("Key name of the configuration variable"));
-	
+
 if ($setbool) {
 	$HD_Form -> AddEditElement (gettext("VALUE"),
 	   "config_value",
@@ -207,7 +205,7 @@ if ($setbool) {
 	   "SELECT",
 	   "","","",
 	   "list" , "", "",	"", $value_list, "%1", "", "" );
-	
+
 } else {
 	$HD_Form -> AddEditElement (gettext("VALUE"),
 		"config_value",
@@ -250,8 +248,4 @@ $HD_Form -> FG_INTRO_TEXT_EDITION= '';
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-
-
-
-
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
diff --git a/admin/Public/form_data/FG_var_config_group.inc b/admin/Public/form_data/FG_var_config_group.inc
index 583a4252f..8f2f1e526 100755
--- a/admin/Public/form_data/FG_var_config_group.inc
+++ b/admin/Public/form_data/FG_var_config_group.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -44,7 +44,7 @@ if ( !empty($groupdelete) && substr($groupdelete,0,8) == "agi-conf" && $groupdel
 	$result = $instance_table -> SQLExec ($handle, $QUERY);
 	$QUERY =  "DELETE FROM cc_config WHERE config_group_title='$groupdelete'";
 	$result = $instance_table -> SQLExec ($handle, $QUERY);
-	
+
 	$msg = $groupdelete.' : '."Group deleted !";
 	$error_msg = '<font face="Arial, Helvetica, sans-serif" size="2" color="green"><b>'.$msg.'</b></font><br>';
 }
@@ -98,9 +98,9 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_currencies.inc b/admin/Public/form_data/FG_var_currencies.inc
old mode 100644
new mode 100755
index 717be8143..c9fc69fa7
--- a/admin/Public/form_data/FG_var_currencies.inc
+++ b/admin/Public/form_data/FG_var_currencies.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -70,7 +70,7 @@ $HD_Form -> AddEditElement (gettext("Name"),
 	"3",
 	gettext("Insert the currency name"),
 	"" , "", "", "", "" , "" , "" , "");
-	
+
 $HD_Form -> AddEditElement (gettext("LABEL"),
 	"currency",
 	"$value",
@@ -79,7 +79,7 @@ $HD_Form -> AddEditElement (gettext("LABEL"),
 	"0",
 	gettext("Insert the currency label"),
 	"" , "", "", "", "" , "" , "" , "");
-	
+
 
 $HD_Form -> AddEditElement (gettext("VALUE"),
 	"value",
@@ -126,9 +126,9 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 $HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_ADD = 'processing_refill_add';
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_def_ratecard.inc b/admin/Public/form_data/FG_var_def_ratecard.inc
old mode 100644
new mode 100755
index ccc620149..c87ff00b0
--- a/admin/Public/form_data/FG_var_def_ratecard.inc
+++ b/admin/Public/form_data/FG_var_def_ratecard.inc
@@ -38,7 +38,7 @@ getpost_ifset(array('id', 'idtariffplan', 'dialprefix', 'destination', 'buyrate'
 'billingblockb', 'stepchargec', 'chargec', 'timechargec', 'billingblockc', 'startdate', 'stopdate',
 'starttime', 'endtime', 'id_trunk', 'musiconhold','tariffplan', 'tariffgroup','posted','id_outbound_cidgroup','rounding_calltime',
 'rounding_threshold', 'additional_block_charge', 'additional_block_charge_time', 'additional_grace','minimal_cost','announce_time_correction',
-'cancelsearch_callplanlcr', 'deleteselected'));
+'cancelsearch_callplanlcr', 'deleteselected', 'is_disabled'));
 
 // put all the destination name to lowercase
 $destination = strtolower ($destination);
@@ -62,7 +62,9 @@ if (isset($posted) && !$popup_select) {
 
 	if (is_string ($tariffgroup) && strlen(trim($tariffgroup))>0) {
 
-		$HD_Form = new FormHandler("cc_callplan_lcr", "Rates");
+		// $HD_Form = new FormHandler("cc_callplan_lcr", "Rates");
+        $HD_Form -> FG_TABLE_NAME = "cc_callplan_lcr";
+        $HD_Form -> FG_INSTANCE_NAME = "Rates";
 		$HD_Form -> FG_TABLE_ID = 'id';
 		$use_lcr_callplan = true;
 		$HD_Form -> SQL_GROUP = " GROUP BY dialprefix ";
@@ -115,6 +117,7 @@ $yesno = Constants::getYesNoList();
 if ($popup_select) $HD_Form -> AddViewElement(gettext("ID"), "id", "5%", "center", "sort");
 $HD_Form -> AddViewElement(gettext("DESTINATION"), "destination", "17%", "center", "", "15");
 $HD_Form -> AddViewElement("<acronym title=\"DIALING PREFIX\">".gettext("PREFIX")."</acronym>", "dialprefix", "10%", "center", "sort", "");
+$HD_Form -> AddViewElement(gettext("Disabled"), "is_disabled", "", "center", "", "", "list", $yesno);
 $HD_Form -> AddViewElement("<acronym title=\"BUYING RATE\">".gettext("BR")."</acronym>", "buyrate", "4%", "center", "sort");
 $HD_Form -> AddViewElement("<acronym title=\"SELLING RATE\">".gettext("SR")."</acronym>", "rateinitial", "4%", "center", "sort");
 if (!$popup_select) $HD_Form -> AddViewElement(gettext("START-DATE"), "startdate", "13%", "center", "sort", "19", "", "", "", "", "", "display_dateformat");
@@ -127,14 +130,14 @@ if (!$popup_select) $HD_Form -> AddViewElement(gettext("RATE CARD"), "idtariffpl
 
 if (!$popup_select) {
 	if ($use_lcr_callplan)
-		$HD_Form -> FieldViewElement ('destination, dialprefix, buyrate, '.$rateinitial_field.', startdate, stopdate, initblock, connectcharge, id_trunk , idtariffplan ');
+		$HD_Form -> FieldViewElement ('destination, dialprefix, is_disabled, buyrate, '.$rateinitial_field.', startdate, stopdate, initblock, connectcharge, id_trunk , idtariffplan ');
 	else
-		$HD_Form -> FieldViewElement ('cc_prefix.destination, cc_ratecard.dialprefix, cc_ratecard.buyrate, cc_ratecard.rateinitial, cc_ratecard.startdate, cc_ratecard.stopdate, cc_ratecard.initblock, cc_ratecard.connectcharge, cc_ratecard.id_trunk , cc_ratecard.idtariffplan ');
+		$HD_Form -> FieldViewElement ('cc_prefix.destination, cc_ratecard.dialprefix, cc_ratecard.is_disabled, cc_ratecard.buyrate, cc_ratecard.rateinitial, cc_ratecard.startdate, cc_ratecard.stopdate, cc_ratecard.initblock, cc_ratecard.connectcharge, cc_ratecard.id_trunk , cc_ratecard.idtariffplan ');
 } else {
 	if ($use_lcr_callplan)
-		$HD_Form -> FieldViewElement ('id, destination, dialprefix, buyrate, '.$rateinitial_field);
+		$HD_Form -> FieldViewElement ('id, destination, dialprefix, is_disabled, buyrate, '.$rateinitial_field);
 	else
-		$HD_Form -> FieldViewElement ('id, cc_prefix.destination, cc_ratecard.dialprefix, cc_ratecard.buyrate, '.$rateinitial_field);
+		$HD_Form -> FieldViewElement ('id, cc_prefix.destination, cc_ratecard.dialprefix, cc_ratecard.is_disabled, cc_ratecard.buyrate, '.$rateinitial_field);
 }
 
 if ($popup_select) {
@@ -214,6 +217,17 @@ $HD_Form -> AddEditElement(gettext("Destination Prefix"),
    "" , "", "",	"", "" , "A2B_entity_prefix.php?popup_select=2&", ", 'prefix','width=650,height=400,top=20,left=100,scrollbars=1'",
    gettext("Select the prefix destination corresponding to your prefix rate.").'<br>'.gettext("This is the label that appears against the Call Detail Record."));
 
+$value_list = array();
+$value_list["1"] = array(gettext("yes"), 1);
+$value_list["2"] = array(gettext("no"), 0);
+
+$HD_Form -> AddEditElement (gettext("Disabled"),
+   "is_disabled",
+   "",
+   "SELECT",
+   "","","",
+   "list" , "", "",	"", $value_list, "%1", "", "" );
+
 /*
 $HD_Form -> AddEditElement(gettext("Destination Prefix"),
    "destination",
@@ -612,10 +626,10 @@ if (ADVANCED_MODE) {
 
 if (ADVANCED_MODE) {
 	// This Variable store the argument for the SQL query
-	$HD_Form -> FieldEditElement ('cc_ratecard.idtariffplan, dialprefix, cc_ratecard.destination, buyrate, buyrateinitblock, buyrateincrement, rateinitial, initblock, billingblock, connectcharge, disconnectcharge,disconnectcharge_after, minimal_cost, stepchargea, chargea, timechargea, billingblocka, stepchargeb, chargeb, timechargeb, billingblockb, stepchargec, chargec, timechargec, billingblockc,announce_time_correction, startdate, stopdate, starttime, endtime, rounding_calltime, rounding_threshold, additional_block_charge, additional_block_charge_time,additional_grace, id_trunk, id_outbound_cidgroup, tag, musiconhold');
+	$HD_Form -> FieldEditElement ('cc_ratecard.idtariffplan, dialprefix, cc_ratecard.destination, cc_ratecard.is_disabled, buyrate, buyrateinitblock, buyrateincrement, rateinitial, initblock, billingblock, connectcharge, disconnectcharge,disconnectcharge_after, minimal_cost, stepchargea, chargea, timechargea, billingblocka, stepchargeb, chargeb, timechargeb, billingblockb, stepchargec, chargec, timechargec, billingblockc,announce_time_correction, startdate, stopdate, starttime, endtime, rounding_calltime, rounding_threshold, additional_block_charge, additional_block_charge_time,additional_grace, id_trunk, id_outbound_cidgroup, tag, musiconhold');
 } else {
 	// This Variable store the argument for the SQL query
-	$HD_Form -> FieldEditElement ('cc_ratecard.idtariffplan, dialprefix, cc_ratecard.destination, buyrate, buyrateinitblock, buyrateincrement, rateinitial, initblock, billingblock, connectcharge, disconnectcharge,disconnectcharge_after, minimal_cost, startdate, stopdate, starttime, endtime, rounding_calltime, rounding_threshold, additional_block_charge, additional_block_charge_time,additional_grace, id_trunk, id_outbound_cidgroup, tag');
+	$HD_Form -> FieldEditElement ('cc_ratecard.idtariffplan, dialprefix, cc_ratecard.destination, cc_ratecard.is_disabled, buyrate, buyrateinitblock, buyrateincrement, rateinitial, initblock, billingblock, connectcharge, disconnectcharge,disconnectcharge_after, minimal_cost, startdate, stopdate, starttime, endtime, rounding_calltime, rounding_threshold, additional_block_charge, additional_block_charge_time,additional_grace, id_trunk, id_outbound_cidgroup, tag');
 }
 
 
@@ -644,8 +658,8 @@ if (isset($filterprefix)  &&  (strlen($filterprefix)>0)) {
 	$HD_Form -> FG_TABLE_CLAUSE.="dialprefix like '$filterprefix%'";
 }
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_did.inc b/admin/Public/form_data/FG_var_did.inc
index a1ebbdd47..21ed92e93 100644
--- a/admin/Public/form_data/FG_var_did.inc
+++ b/admin/Public/form_data/FG_var_did.inc
@@ -87,7 +87,7 @@ $HD_Form -> FG_SPLITABLE_FIELD = 'did';
 // TODO integrate in Framework
 if ($form_action=="ask-add" || $form_action=="purchase") {
 	$begin_date = date("Y");
-	$begin_date_plus = date("Y")+25;
+	$begin_date_plus = date("Y") + 10;
 	$end_date = date("-m-d H:i:s");
 	$comp_date = "value='".$begin_date.$end_date."'";
 	$comp_date_plus = "value='".$begin_date_plus.$end_date."'";
@@ -413,7 +413,7 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
diff --git a/admin/Public/form_data/FG_var_did_billing.inc b/admin/Public/form_data/FG_var_did_billing.inc
old mode 100644
new mode 100755
index 8e28222f0..814832318
--- a/admin/Public/form_data/FG_var_did_billing.inc
+++ b/admin/Public/form_data/FG_var_did_billing.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -62,7 +62,7 @@ $HD_Form -> FieldViewElement ("DATE(starttime) as date, cc_did.did, count(*) as
 
 $HD_Form -> SQL_GROUP = " GROUP BY cc_card.username, cc_did.did, date ";
 
-$HD_Form -> CV_NO_FIELDS  = gettext("NO DID BILLING HAS BEEN CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("NO DID BILLING HAS BEEN CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -112,7 +112,7 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
diff --git a/admin/Public/form_data/FG_var_did_destination.inc b/admin/Public/form_data/FG_var_did_destination.inc
index 4a01c02b6..31a98c532 100644
--- a/admin/Public/form_data/FG_var_did_destination.inc
+++ b/admin/Public/form_data/FG_var_did_destination.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -84,7 +84,7 @@ $HD_Form -> AddViewElement(gettext("VALIDATED"), "validated", "10%", "center", "
 $HD_Form -> FieldViewElement ('destination, cc_did_destination.creationdate, cc_did.did, id_cc_card, cc_did_destination.activated, voip_call, priority, cc_did_destination.secondusedreal, validated');
 
 $HD_Form -> FG_ACTION_SIZE_COLUMN = '15%';
- 
+
 
 $HD_Form -> CV_NO_FIELDS  = gettext("NO DID DESTINATIONS HAVE BEEN CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
@@ -100,7 +100,7 @@ $HD_Form -> FG_ADDITION = true;
 // TODO integrate in Framework
 if ($form_action=="ask-add"){
 	$begin_date = date("Y");
-	$begin_date_plus = date("Y")+25;
+	$begin_date_plus = date("Y") + 10;
 	$end_date = date("-m-d H:i:s");
 	$comp_date = "value='".$begin_date.$end_date."'";
 	$comp_date_plus = "value='".$begin_date_plus.$end_date."'";
@@ -118,7 +118,7 @@ $HD_Form -> AddEditElement (gettext("DESTINATION"),
 	"" , "", "", "", "" , "", "", gettext("Enter the phone number you wish to call, or the VoIP client to reach. (ie: 347894999 or SIP/jeremy@182.212.1.45). If the call is VoIP, the VoIP_Call must be set to yes."));
 
 if ($form_action!='ask-edit' && $form_action!='edit') {
-	
+
 	$HD_Form -> AddEditElement (gettext("CUSTOMER ID"),
 		"id_cc_card",
 		'',
@@ -211,9 +211,9 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 $HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_ADD = 'did_destination_add';
 $HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_DELETE = 'did_destination_del';
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_didgroup.inc b/admin/Public/form_data/FG_var_didgroup.inc
old mode 100644
new mode 100755
index 7f5692ae7..6969916c7
--- a/admin/Public/form_data/FG_var_didgroup.inc
+++ b/admin/Public/form_data/FG_var_didgroup.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -100,8 +100,8 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_diduse.inc b/admin/Public/form_data/FG_var_diduse.inc
old mode 100644
new mode 100755
diff --git a/admin/Public/form_data/FG_var_friend.inc b/admin/Public/form_data/FG_var_friend.inc
old mode 100644
new mode 100755
index 55d0d3899..65a3de4b0
--- a/admin/Public/form_data/FG_var_friend.inc
+++ b/admin/Public/form_data/FG_var_friend.inc
@@ -952,7 +952,7 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=$atmenu&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=$atmenu&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=$atmenu&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=$atmenu&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=$atmenu&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=$atmenu&stitle=Document&wh=AC&id=";
 
diff --git a/admin/Public/form_data/FG_var_invoice.inc b/admin/Public/form_data/FG_var_invoice.inc
old mode 100644
new mode 100755
index ad64ec20a..5fa9308b7
--- a/admin/Public/form_data/FG_var_invoice.inc
+++ b/admin/Public/form_data/FG_var_invoice.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,15 +27,15 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
 
 getpost_ifset(array('id', 'id_card', 'date','title','description'));
-   
- 
+
+
 if (!isset($form_action) || $form_action=="list") {
 	$list_query = "cc_invoice LEFT JOIN cc_card ON cc_card.id=id_card ";
 	$list_query .= "LEFT JOIN (SELECT st1.id_invoice, TRUNCATE(SUM(st1.price*(1+(st1.vat/100))),2) as total_price " .
@@ -54,7 +54,7 @@ $HD_Form -> FG_FK_DELETE_CONFIRM = true;
 $HD_Form -> FG_FK_WARNONLY = true;
 $HD_Form -> FG_FK_TABLENAMES = array("cc_invoice_item");
 $HD_Form -> FG_FK_EDITION_CLAUSE = array(" id_invoice ");
- 
+
 $HD_Form -> FG_INFO = true;
 $HD_Form -> FG_INFO_LINK = "A2B_invoice_view.php?id=";
 $HD_Form -> FG_INFO_ALT = "VIEW";
@@ -107,7 +107,7 @@ $HD_Form -> AddViewElement(gettext("AMOUNT INCL VAT"), "total_price", "10%", "ce
 $HD_Form -> FieldViewElement ("cc_invoice.id, cc_invoice.reference, username, cc_invoice.date,title, cc_invoice.paid_status, cc_invoice.status as cc_invoice_status,$filter_amount_with_vat");
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -137,14 +137,14 @@ $HD_Form -> FG_DELETION = true;
 $HD_Form -> FG_ADDITION = true;
 
 $HD_Form -> AddEditElement (gettext("ID CUSTOMER"),
-			   "id_card",		
-			   "$value", "POPUPVALUE", "size=30 maxlength=50",	
+			   "id_card",
+			   "$value", "POPUPVALUE", "size=30 maxlength=50",
 			   "4",	gettext("Insert the Customer ID"),
-			    "" , "", "", "", "", 				
+			    "" , "", "", "", "",
 				"A2B_entity_card.php?popup_select=1&", ", 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 				gettext("Select the Customer ID"));
 
-if ($form_action=="ask-add"){	
+if ($form_action=="ask-add"){
 	$begin_date = date("Y");
 	$end_date = date("-m-d H:i:s");
 	$comp_date=$begin_date.$end_date;
@@ -152,24 +152,24 @@ if ($form_action=="ask-add"){
 }
 
 $HD_Form -> AddEditElement (gettext("INVOICE DATE"),
-			   "date",		
-			   '$value',	
-			   "INPUT",	
-			   "size=40 READONLY maxlength=40  $comp_date",	
-			   "10",	
+			   "date",
+			   '$value',
+			   "INPUT",
+			   "size=40 READONLY maxlength=40  $comp_date",
+			   "10",
 			   gettext("Insert the current date"),
 			   "" , "", "",	"", "", "", "", "" );
 
 
-$HD_Form -> AddEditElement ( gettext("TITLE"),	
-		"title",	'$value',	
+$HD_Form -> AddEditElement ( gettext("TITLE"),
+		"title",	'$value',
 		"INPUT",
 		"size=30 maxlength=50",
 		"0",
-		gettext("Insert the title of invoice, if you need one"), 
+		gettext("Insert the title of invoice, if you need one"),
 		"" , "", "",	"", "", "", "", "" );
-			   
-			   
+
+
 $HD_Form -> AddEditElement (gettext("DESCRIPTION"),
 				"description",
 				'',
@@ -178,7 +178,7 @@ $HD_Form -> AddEditElement (gettext("DESCRIPTION"),
 				"",
 				gettext("Insert the description"),
 				"" , "", "", "", "" , "", "", "");
-			   
+
 
 $HD_Form -> FieldEditElement ('id_card, date,title, description');
 
@@ -211,8 +211,8 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 $HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_ADD = 'create_invoice_reference';
 
 $HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = "A2B_invoice_edit.php?id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_logrefill.inc b/admin/Public/form_data/FG_var_logrefill.inc
old mode 100644
new mode 100755
index f72d87762..8ce7f498b
--- a/admin/Public/form_data/FG_var_logrefill.inc
+++ b/admin/Public/form_data/FG_var_logrefill.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -76,7 +76,7 @@ $HD_Form -> AddSearchElement_C1(gettext("LASTNAME"),'lastname','lastnametype');
 $HD_Form -> AddSearchElement_C1(gettext("FIRSTNAME"),'firstname','firstnametype');
 $HD_Form -> FG_FILTER_SEARCH_DELETE_ALL =false;
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -94,47 +94,47 @@ if (isset($filterprefix)  &&  (strlen($filterprefix)>0)) {
 
 $HD_Form -> FG_ADDITION = true;
 if (has_rights (ACX_MODIFY_REFILLS)) {
-	
+
 	$HD_Form -> FG_EDITION = true;
 	$HD_Form -> FG_DELETION = true;
-	
+
 	if ($form_action=="ask-add" && !empty($card_id)) {
 		$id_val = "value='$card_id'";
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("ID CUSTOMER"),
-				   "card_id",		
-				   "$value", "POPUPVALUE", "size=30 maxlength=50 ".$id_val,		
+				   "card_id",
+				   "$value", "POPUPVALUE", "size=30 maxlength=50 ".$id_val,
 				   "4",	gettext("Insert the Customer ID"),
-				    "" , "", "", "", "", 				
+				    "" , "", "", "", "",
 					"A2B_entity_card.php?popup_select=1&", ", 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 					gettext("Select the Customer ID"));
-	
-	if ($form_action=="ask-add") {	
+
+	if ($form_action=="ask-add") {
 		$begin_date = date("Y");
 		$end_date = date("-m-d H:i:s");
 		$comp_date=$begin_date.$end_date;
 		$comp_date="value='$comp_date'";
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("REFILL DATE"),
-				   "date",		
-				   '$value',	
-				   "INPUT",	
-				   "size=40 maxlength=40 $comp_date",	
-				   "10",	
+				   "date",
+				   '$value',
+				   "INPUT",
+				   "size=40 maxlength=40 $comp_date",
+				   "10",
 				   gettext("Insert the current date"),
 				   "" , "", "",	"", "", "", "", "" );
-	
+
 	$HD_Form -> AddEditElement (gettext("REFILL AMOUNT"),
-				   "credit",		
-				   '$value',	
-				   "INPUT",	
-				   "size=60 maxlength=10",	
-				   "12",	
+				   "credit",
+				   '$value',
+				   "INPUT",
+				   "size=60 maxlength=10",
+				   "12",
 				   gettext("Insert the credit amount"),
 				   "" , "", "",	"", "" , "", "", gettext("Enter the amount in the currency base : ").BASE_CURRENCY );
-	
+
 	$HD_Form -> AddEditElement (gettext("DESCRIPTION"),
 					"description",
 					'',
@@ -143,7 +143,7 @@ if (has_rights (ACX_MODIFY_REFILLS)) {
 					"",
 					gettext("Insert the description"),
 					"" , "", "", "", "" , "", "", "");
-				   
+
 	$HD_Form -> AddEditElement (gettext("REFILL TYPE"),
 	               "refill_type",
 	               '$value',
@@ -152,8 +152,8 @@ if (has_rights (ACX_MODIFY_REFILLS)) {
 	               "",
 	               "",
 	               "list" , "", "",     "", $list_refill_type, "%1", "", gettext("Define type for payment and refill,if created.") );
-	
-	if ($form_action!="ask-edit" && $form_action!="edit") {	
+
+	if ($form_action!="ask-edit" && $form_action!="edit") {
 		$HD_Form -> AddEditElement (gettext("CREATE ASSOCIATE INVOICE"),
 					   "added_invoice",
 					   '1',
@@ -163,29 +163,29 @@ if (has_rights (ACX_MODIFY_REFILLS)) {
 					   gettext("Choose if you want to create an invoice with this refill account"),
 					   "" , "", "" , "Yes :1, - No:0", "", "" , "", "");
 	}
-	
-	
+
+
 	$HD_Form -> FieldEditElement ('card_id, date, credit, description, refill_type, added_invoice');
-	
-	
-	
+
+
+
 	$HD_Form -> FG_INTRO_TEXT_EDITION= gettext("You can modify, through the following form, the different properties of your ".$HD_Form->FG_INSTANCE_NAME);
 	$HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this ".$HD_Form->FG_INSTANCE_NAME.", click on the delete button.");
 	$HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new ".$HD_Form->FG_INSTANCE_NAME.".<br>Fill the following fields and confirm by clicking on the button add.");
-	
-	
+
+
 	$HD_Form -> FG_INTRO_TEXT_ADITION = '';
 	$HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new ".$HD_Form->FG_INSTANCE_NAME." has been inserted. <br>");
-	
-	
+
+
 	$HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 	$HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue.");
-	
+
 	$HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_ADD = 'processing_refill_add';
-	
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 }
 
diff --git a/admin/Public/form_data/FG_var_logrefill_agent.inc b/admin/Public/form_data/FG_var_logrefill_agent.inc
old mode 100644
new mode 100755
index e563bf60d..956525bf8
--- a/admin/Public/form_data/FG_var_logrefill_agent.inc
+++ b/admin/Public/form_data/FG_var_logrefill_agent.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -56,7 +56,7 @@ $HD_Form ->FG_LIST_ADDING_BUTTON_IMG1 = Images_Path ."/time_add.png" ;
 
 $list_refill_type=Constants::getRefillType_List();
 $HD_Form -> AddViewElement(gettext("ID"), "cc_logrefill_agent.id", "10%", "center", "sort");
-if (has_rights (ACX_ADMINISTRATOR)) { 
+if (has_rights (ACX_ADMINISTRATOR)) {
 	$HD_Form -> AddViewElement(gettext("AGENT"), "agent_id", "20%", "center", "sort", "", "30", "", "", "", "", "linktoagent");
 }else{
 	$HD_Form -> AddViewElement(gettext("AGENT"), "agent_id", "20%", "center", "sort", "", "30", "", "", "", "", "nameofagent");
@@ -68,7 +68,7 @@ $HD_Form -> AddViewElement(gettext("REFILL AMOUNT"), "credit", "15%", "center",
 $HD_Form -> FieldViewElement ('cc_logrefill_agent.id, agent_id, date, cc_logrefill_agent.refill_type as refill_type, cc_logrefill_agent.credit');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO AGENT REFILL CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO AGENT REFILL CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -91,41 +91,41 @@ $HD_Form -> AddSearchElement_C1(gettext("FIRSTNAME"),'firstname','firstnametype'
 
 if (has_rights (ACX_MODIFY_REFILLS)) {
 	$HD_Form -> FG_EDITION = true;
-	$HD_Form -> FG_DELETION = true;	
-	
+	$HD_Form -> FG_DELETION = true;
+
 	$HD_Form -> AddEditElement (gettext("ID AGENT"),
-				   "agent_id",		
-				   "$value", "POPUPVALUE", "size=30 maxlength=50",	
+				   "agent_id",
+				   "$value", "POPUPVALUE", "size=30 maxlength=50",
 				   "4",	gettext("Insert the Customer ID"),
-				    "" , "", "", "", "", 				
+				    "" , "", "", "", "",
 					"A2B_entity_agent.php?popup_select=1&", ", 'AgentSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 					gettext("Select the Agent ID"));
-	
+
 	if ($form_action=="ask-add") {
 		$begin_date = date("Y");
 		$end_date = date("-m-d H:i:s");
 		$comp_date=$begin_date.$end_date;
 		$comp_date="value='$comp_date'";
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("REFILL DATE"),
-				   "date",		
-				   '$value',	
-				   "INPUT",	
-				   "size=40 maxlength=40  $comp_date",	
-				   "10",	
+				   "date",
+				   '$value',
+				   "INPUT",
+				   "size=40 maxlength=40  $comp_date",
+				   "10",
 				   gettext("Insert the current date"),
 				   "" , "", "",	"", "", "", "", "" );
-	
+
 	$HD_Form -> AddEditElement (gettext("REFILL AMOUNT"),
-				   "credit",		
-				   '$value',	
-				   "INPUT",	
-				   "size=60 maxlength=10",	
-				   "12",	
+				   "credit",
+				   '$value',
+				   "INPUT",
+				   "size=60 maxlength=10",
+				   "12",
 				   gettext("Insert the credit amount"),
 				   "" , "", "",	"", "" , "", "", gettext("Enter the amount in the currency base : ").BASE_CURRENCY );
-	
+
 	$HD_Form -> AddEditElement (gettext("DESCRIPTION"),
 					"description",
 					'',
@@ -134,7 +134,7 @@ if (has_rights (ACX_MODIFY_REFILLS)) {
 					"",
 					gettext("Insert the description"),
 					"" , "", "", "", "" , "", "", "");
-				   
+
 	$HD_Form -> AddEditElement (gettext("REFILL TYPE"),
 	               "refill_type",
 	               '$value',
@@ -143,26 +143,26 @@ if (has_rights (ACX_MODIFY_REFILLS)) {
 	               "",
 	               "",
 	               "list" , "", "",     "", $list_refill_type, "%1", "", gettext("Define type for payment and refill,if created.") );
-	
+
 	$HD_Form -> FieldEditElement ('agent_id, date, credit, description, refill_type');
-	
+
 	$HD_Form -> FG_INTRO_TEXT_EDITION= gettext("You can modify, through the following form, the different properties of your ".$HD_Form->FG_INSTANCE_NAME);
 	$HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this ".$HD_Form->FG_INSTANCE_NAME.", click on the delete button.");
 	$HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new ".$HD_Form->FG_INSTANCE_NAME.".<br>Fill the following fields and confirm by clicking on the button add.");
-	
-	
+
+
 	$HD_Form -> FG_INTRO_TEXT_ADITION = '';
 	$HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new ".$HD_Form->FG_INSTANCE_NAME." has been inserted. <br>");
-	
-	
+
+
 	$HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 	$HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue.");
-	
+
 	$HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_ADD = 'add_agent_refill';
-	
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-	
+
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+
 }
 
diff --git a/admin/Public/form_data/FG_var_mailtemplate.inc b/admin/Public/form_data/FG_var_mailtemplate.inc
old mode 100644
new mode 100755
index 060387a55..573a4e5b1
--- a/admin/Public/form_data/FG_var_mailtemplate.inc
+++ b/admin/Public/form_data/FG_var_mailtemplate.inc
@@ -31,7 +31,7 @@
  *
 **/
 
-getpost_ifset(array('id', 'IDCust', 'mailtype', 'fromemail', 'fromname', 'subject', 'messagetext','languages','id_language'));
+getpost_ifset(array('id', 'IDCust', 'mailtype', 'fromemail', 'fromname', 'subject', 'messagetext', 'languages','id_language'));
 
 
 // Get Latest id from the table
@@ -45,62 +45,56 @@ $HD_Form -> FG_TABLE_DEFAULT_ORDER = "id";
 
 
 if ($languages != '') {
-	if ($languages != '') {
-		$_SESSION["Langfilter"]=$languages;
-	}
-	if (isset($_SESSION["Langfilter"])) {
-		$HD_Form -> FG_TABLE_CLAUSE = "id_language='".$_SESSION["Langfilter"]."'";
-	}
+    if ($languages != '') {
+        $_SESSION["Langfilter"]=$languages;
+    }
+    if (isset($_SESSION["Langfilter"])) {
+        $HD_Form -> FG_TABLE_CLAUSE = "id_language='".$_SESSION["Langfilter"]."'";
+    }
 } else {
-	if (isset($_SESSION["Langfilter"])) {
-		$languages = $_SESSION["Langfilter"];
-	}
+    if (isset($_SESSION["Langfilter"])) {
+        $languages = $_SESSION["Langfilter"];
+    }
 }
 $id_language = $languages;
-$HD_Form -> FG_EDITION_LINK	= $_SERVER['PHP_SELF']."?form_action=ask-edit&id_language=$languages&id=";
-$HD_Form -> FG_DELETION_LINK = $_SERVER['PHP_SELF']."?form_action=ask-delete&id_language=$languages&id=";
+$HD_Form -> FG_EDITION_LINK = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?form_action=ask-edit&id_language=$languages&id=";
+$HD_Form -> FG_DELETION_LINK = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?form_action=ask-delete&id_language=$languages&id=";
 
 
 $typemail_list = array();
-$typemail_list["reminder"]  		= array( gettext("Reminder"), Mail::$TYPE_REMINDER);
-$typemail_list["signup"]    		= array( gettext("Signup"),  Mail::$TYPE_SIGNUP);
-$typemail_list["forgetpassword"]  	= array( gettext("Forget password"), Mail::$TYPE_FORGETPASSWORD);
-$typemail_list["signupconfirmed"]  	= array( gettext("Signup confirmed"), Mail::$TYPE_SIGNUPCONFIRM);
-$typemail_list["payment"]  			= array( gettext("Payment Confirmation"), Mail::$TYPE_PAYMENT);
-$typemail_list["invoice_to_pay"]  	= array( gettext("Invoice"), Mail::$TYPE_INVOICE_TO_PAY);
-$typemail_list["epaymentverify"]  	= array( gettext("EPayment Warning"), Mail::$TYPE_EPAYMENTVERIFY);
-$typemail_list["did_paid"]			= array( gettext("Did Payment confirmation"), Mail::$TYPE_DID_PAID);
-$typemail_list["did_unpaid"]		= array( gettext("Did not payment warning"), Mail::$TYPE_DID_UNPAID);
-$typemail_list["did_released"]		= array( gettext("Did released warning"), Mail::$TYPE_DID_RELEASED);
-$typemail_list["template1"] 		= array( gettext("template1"), "template1");
-$typemail_list["template2"] 		= array( gettext("template2"), "template2");
-$typemail_list["template3"] 		= array( gettext("template3"), "template3");
-$typemail_list["template4"] 		= array( gettext("template4"), "template4");
-$typemail_list["template5"] 		= array( gettext("template5"), "template5");
-$typemail_list["template6"] 		= array( gettext("template6"), "template6");
-$typemail_list["template7"] 		= array( gettext("template7"), "template7");
-$typemail_list["template8"] 		= array( gettext("template8"), "template8");
-$typemail_list["template9"] 		= array( gettext("template9"), "template9");
-$typemail_list["new_ticket"]		= array( gettext("New Ticket"), Mail::$TYPE_TICKET_NEW);
-$typemail_list["modify_ticket"]		= array( gettext("Modify Ticket"), Mail::$TYPE_TICKET_MODIFY);
-$typemail_list["invoice_to_pay"]	= array( gettext("Invoice to Pay"), Mail::$TYPE_INVOICE_TO_PAY);
-$typemail_list["subscription_paid"]	= array( gettext("Subscription Paid"), Mail::$TYPE_SUBSCRIPTION_PAID);
-$typemail_list["subscription_unpaid"]	= array( gettext("Subscription Unpaid"), Mail::$TYPE_SUBSCRIPTION_UNPAID);
-$typemail_list["subscription_disable_card"]	= array( gettext("Subscription Disable Card"), Mail::$TYPE_SUBSCRIPTION_DISABLE_CARD);
-
-if (($popup_select>=1)) {
-	$HD_Form -> AddViewElement(gettext("ID MAIL"), "id", "10%", "center", "sort");
-}
+$typemail_list["reminder"]          = array( gettext("Reminder"), Mail::$TYPE_REMINDER);
+$typemail_list["signup"]            = array( gettext("Signup"),  Mail::$TYPE_SIGNUP);
+$typemail_list["forgetpassword"]    = array( gettext("Forget password"), Mail::$TYPE_FORGETPASSWORD);
+$typemail_list["signupconfirmed"]   = array( gettext("Signup confirmed"), Mail::$TYPE_SIGNUPCONFIRM);
+$typemail_list["payment"]           = array( gettext("Payment Confirmation"), Mail::$TYPE_PAYMENT);
+$typemail_list["invoice_to_pay"]    = array( gettext("Invoice"), Mail::$TYPE_INVOICE_TO_PAY);
+$typemail_list["epaymentverify"]    = array( gettext("EPayment Warning"), Mail::$TYPE_EPAYMENTVERIFY);
+$typemail_list["did_paid"]          = array( gettext("Did Payment confirmation"), Mail::$TYPE_DID_PAID);
+$typemail_list["did_unpaid"]        = array( gettext("Did not payment warning"), Mail::$TYPE_DID_UNPAID);
+$typemail_list["did_released"]      = array( gettext("Did released warning"), Mail::$TYPE_DID_RELEASED);
+$typemail_list["template1"]         = array( gettext("template1"), "template1");
+$typemail_list["template2"]         = array( gettext("template2"), "template2");
+$typemail_list["template3"]         = array( gettext("template3"), "template3");
+$typemail_list["template4"]         = array( gettext("template4"), "template4");
+$typemail_list["template5"]         = array( gettext("template5"), "template5");
+$typemail_list["template6"]         = array( gettext("template6"), "template6");
+$typemail_list["template7"]         = array( gettext("template7"), "template7");
+$typemail_list["template8"]         = array( gettext("template8"), "template8");
+$typemail_list["template9"]         = array( gettext("template9"), "template9");
+$typemail_list["new_ticket"]        = array( gettext("New Ticket"), Mail::$TYPE_TICKET_NEW);
+$typemail_list["modify_ticket"]     = array( gettext("Modify Ticket"), Mail::$TYPE_TICKET_MODIFY);
+$typemail_list["invoice_to_pay"]    = array( gettext("Invoice to Pay"), Mail::$TYPE_INVOICE_TO_PAY);
+$typemail_list["subscription_paid"] = array( gettext("Subscription Paid"), Mail::$TYPE_SUBSCRIPTION_PAID);
+$typemail_list["subscription_unpaid"]   = array( gettext("Subscription Unpaid"), Mail::$TYPE_SUBSCRIPTION_UNPAID);
+$typemail_list["subscription_disable_card"] = array( gettext("Subscription Disable Card"), Mail::$TYPE_SUBSCRIPTION_DISABLE_CARD);
+
+$HD_Form -> AddViewElement(gettext("ID MAIL"), "id", "10%", "center", "sort");
 $HD_Form -> AddViewElement(gettext("MAILTYPE"), "mailtype", "14%", "center", "sort");
 $HD_Form -> AddViewElement(gettext("FROMEMAIL"), "fromemail", "25%", "center", "sort");
 $HD_Form -> AddViewElement(gettext("SUBJECT"), "subject", "30%", "center", "sort");
 
 
-if (($popup_select>=1)) {
-	$HD_Form -> FieldViewElement ('id, mailtype, fromemail, subject');
-} else {
-	$HD_Form -> FieldViewElement ('mailtype, fromemail, subject');
-}
+$HD_Form -> FieldViewElement ('id, mailtype, fromemail, subject');
 
 
 $HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!");
@@ -108,89 +102,99 @@ $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
 
-if (($popup_select>=1)) {
-	$HD_Form -> FG_OTHER_BUTTON1 = true;
-	$HD_Form -> FG_OTHER_BUTTON1_ALT = '<font color="red">&lt;'.gettext("SELECT TEXT").'&gt;</font>';
-	$HD_Form -> FG_OTHER_BUTTON1_IMG = '';
+if ($popup_select >= 1) {
+    $HD_Form -> FG_OTHER_BUTTON1 = true;
+    $HD_Form -> FG_OTHER_BUTTON1_ALT = '<font color="red">&lt;'.gettext("SELECT TEXT").'&gt;</font>';
+    $HD_Form -> FG_OTHER_BUTTON1_IMG = '';
 
-	if ($popup_select==1) {
-		$HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|col0|');";
-	}
+    if ($popup_select == 1) {
+        $HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|col0|');";
+    }
 } else {
-	$HD_Form -> FG_LIST_ADDING_BUTTON1 = true;
-	$HD_Form -> FG_LIST_ADDING_BUTTON_LINK1 = "A2B_entity_mailtemplate.php?form_action=ask-add&id_language=$languages&section=".$_SESSION["menu_section"];
-	$HD_Form -> FG_LIST_ADDING_BUTTON_ALT1 = $HD_Form ->FG_LIST_ADDING_BUTTON_MSG1 = gettext("Add MAIL TEMPLATE");
-	$HD_Form -> FG_LIST_ADDING_BUTTON_IMG1 = Images_Path ."/email_add.png" ;
-
-	$HD_Form -> FG_ADDITION = true;
-	$HD_Form -> FG_EDITION = true;
-	$HD_Form -> FG_DELETION = true;
-
-	// Translation
-	$HD_Form -> FG_OTHER_BUTTON2 = true;
-	$HD_Form -> FG_OTHER_BUTTON2_LINK= "A2B_entity_translate.php?form_action=ask-add&id=|param|&mailtype=|col0|&languages=$languages";
-	$HD_Form -> FG_OTHER_BUTTON2_ALT = gettext('Translate');
+    $HD_Form -> FG_LIST_ADDING_BUTTON1 = true;
+    $HD_Form -> FG_LIST_ADDING_BUTTON_LINK1 = "A2B_entity_mailtemplate.php?form_action=ask-add&id_language=$languages&section=".$_SESSION["menu_section"];
+    $HD_Form -> FG_LIST_ADDING_BUTTON_ALT1 = $HD_Form ->FG_LIST_ADDING_BUTTON_MSG1 = gettext("Add MAIL TEMPLATE");
+    $HD_Form -> FG_LIST_ADDING_BUTTON_IMG1 = Images_Path ."/email_add.png" ;
+
+    $HD_Form -> FG_ADDITION = true;
+    $HD_Form -> FG_EDITION = true;
+    $HD_Form -> FG_DELETION = true;
+
+    // Translation
+    $HD_Form -> FG_OTHER_BUTTON2 = true;
+    $HD_Form -> FG_OTHER_BUTTON2_LINK= "A2B_entity_translate.php?form_action=ask-add&id=|param|&mailtype=|col0|&languages=$languages";
+    $HD_Form -> FG_OTHER_BUTTON2_ALT = gettext('Translate');
 }
 
 
 $HD_Form -> AddEditElement (gettext("MAIL TYPE"),
-	"mailtype",
-	'$value',
-	"SELECT",
-	"",
-	"",
-	"",
-	"list" , "", "", "", $typemail_list, "%1", "", "");
+    "mailtype",
+    '$value',
+    "SELECT",
+    "",
+    "",
+    "",
+    "list" , "", "", "", $typemail_list, "%1", "", "");
+
+$HD_Form -> AddEditElement (gettext("LANGUAGE"),
+    "id_language",
+    '',
+    "INPUT",
+    "size=30 maxlength=60",
+    "",
+    gettext("Insert the mail id language"),
+    "" , "", "", "", "" , "", "", "");
+
 
 $HD_Form -> AddEditElement (gettext("FROM EMAIL"),
-	"fromemail",
-	'',
-	"INPUT",
-	"size=30 maxlength=60",
-	"1",
-	gettext("Insert the user fromemail"),
-	"" , "", "", "", "" , "", "", "");
+    "fromemail",
+    '',
+    "INPUT",
+    "size=30 maxlength=60",
+    "1",
+    gettext("Insert the user fromemail"),
+    "" , "", "", "", "" , "", "", "");
 
 $HD_Form -> AddEditElement (gettext("FROM NAME"),
-	"fromname",
-	'',
-	"INPUT",
-	"size=30 maxlength=60",
-	"",
-	gettext("Insert the user fromname"),
-	"" , "", "", "", "" , "", "", "");
+    "fromname",
+    '',
+    "INPUT",
+    "size=30 maxlength=60",
+    "",
+    gettext("Insert the user fromname"),
+    "" , "", "", "", "" , "", "", "");
 
 $HD_Form -> AddEditElement (gettext("SUBJECT"),
-	"subject",
-	'',
-	"INPUT",
-	"size=30 maxlength=80",
-	"",
-	gettext("Insert the user subject"),
-	"" , "", "", "", "" , "", "", "");
+    "subject",
+    '',
+    "INPUT",
+    "size=30 maxlength=80",
+    "",
+    gettext("Insert the user subject"),
+    "" , "", "", "", "" , "", "", "");
 
 $HD_Form -> AddEditElement (gettext("MESSAGE TEXT"),
-	"messagetext",
-	'',
-	"TEXTAREA",
-	"cols=70 rows=10",
-	"",
-	gettext("Insert the user subject"),
-	"" , "", "", "", "" , "", "", "");
+    "messagetext",
+    '',
+    "TEXTAREA",
+    "cols=70 rows=10",
+    "",
+    gettext("Insert the user subject"),
+    "" , "", "", "", "" , "", "", "");
 
-$HD_Form -> FieldEditElement ('mailtype, fromemail, fromname, subject, messagetext');
+$HD_Form -> FieldEditElement ('mailtype, id_language, fromemail, fromname, subject, messagetext');
 
-$HD_Form ->FG_QUERY_ADITION_HIDDEN_FIELDS = "id, id_language";
-$HD_Form ->FG_QUERY_ADITION_HIDDEN_VALUE  = "$latest_id, $id_language";
+$HD_Form -> FG_QUERY_ADITION_HIDDEN_FIELDS = "id, id_language";
+$HD_Form -> FG_QUERY_ADITION_HIDDEN_VALUE  = "$latest_id, $id_language";
 
-$HD_Form ->FG_QUERY_EDITION_HIDDEN_FIELDS = "id_language";
-$HD_Form ->FG_QUERY_EDITION_HIDDEN_VALUE  = "$id_language";
+$HD_Form -> FG_QUERY_EDITION_HIDDEN_FIELDS = "id_language";
+$HD_Form -> FG_QUERY_EDITION_HIDDEN_VALUE  = "$id_language";
 
 $HD_Form -> FG_EDITION_CLAUSE = "id ='%id' ";
 
-if($id_language != '' || !is_null($id_language)) {
-	$HD_Form -> FG_EDITION_CLAUSE .= "AND id_language = '$id_language'";
-}
+// if ($id_language != '' || !is_null($id_language)) {
+//     $HD_Form -> FG_EDITION_CLAUSE .= "AND id_language = '$id_language'";
+// }
 
 $HD_Form -> FG_INTRO_TEXT_EDITION= gettext("Modify the contents of the email template below.");
 $HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this").$HD_Form->FG_INSTANCE_NAME." ".gettext("click on the delete button.");
@@ -203,51 +207,50 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("The followings tags will be replaced in the message by the value in the database.").'<br/>';
 
 $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT .= '<u>'.gettext('Tags used for EPayment Warning email').': </u><br/> ' .
-		'<b>$time$</b> : time of payment <br/>' .
-		'<b>$paymentgateway$</b>: '.gettext('display payment gateway').'<br/>' .
-		'<b>$itemAmount$</b>: '.gettext('amount of payment').'<br/>';
+        '<b>$time$</b> : time of payment <br/>' .
+        '<b>$paymentgateway$</b>: '.gettext('display payment gateway').'<br/>' .
+        '<b>$itemAmount$</b>: '.gettext('amount of payment').'<br/>';
 $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT .= '<u>'.gettext('Tags used for Payment email').': </u><br/> ' .
-		'<b>$itemName$</b>: '.gettext('name of item paid').'<br/> ' .
-		'<b>$itemID$</b> : '.gettext('id of customer').'<br/> ' .
-		'<b>$paymentMethod$</b> : '.gettext('methode of payment').'<br/> ' .
-		'<b>$paymentStatus$</b> : '.gettext('status of payment').'<br/>' .
-		'<b>$itemAmount$</b>: '.gettext('amount of payment').'<br/>';
+        '<b>$itemName$</b>: '.gettext('name of item paid').'<br/> ' .
+        '<b>$itemID$</b> : '.gettext('id of customer').'<br/> ' .
+        '<b>$paymentMethod$</b> : '.gettext('methode of payment').'<br/> ' .
+        '<b>$paymentStatus$</b> : '.gettext('status of payment').'<br/>' .
+        '<b>$itemAmount$</b>: '.gettext('amount of payment').'<br/>';
 $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT .= '<u>'.gettext('Tags used for Signup').': </u><br/> ' .
-		'<b>$loginkey$</b>: '.gettext('key created to validate the signup').'<br/> ';
+        '<b>$loginkey$</b>: '.gettext('key created to validate the signup').'<br/> ';
 $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT .= '<u>'.gettext('Tag used for Did Payment confirmation email').': </u><br/> ' .
-		'<b>$balance_remaining$</b>: '.gettext('balance after payment').'<br/> ';
+        '<b>$balance_remaining$</b>: '.gettext('balance after payment').'<br/> ';
 $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT .= '<u>'.gettext('Tag used for Did not payment warning email').': </u><br/> ' .
-		'<b>$days_remaining$</b>: '.gettext('number of day before release of the did').'<br/> '.
-		'<b>$invoice_ref$</b>: '.gettext('invoice reference to pay for the did').'<br/> ';
+        '<b>$days_remaining$</b>: '.gettext('number of day before release of the did').'<br/> '.
+        '<b>$invoice_ref$</b>: '.gettext('invoice reference to pay for the did').'<br/> ';
 $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT .= '<u>'.gettext('Tag used for DID').': </u><br/> ' .
-		'<b>$did$</b>: '.gettext('did number').'<br/> '.
-		'<b>$did_cost$</b>: '.gettext('cost of the did').'<br/> ';
+        '<b>$did$</b>: '.gettext('did number').'<br/> '.
+        '<b>$did_cost$</b>: '.gettext('cost of the did').'<br/> ';
 $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT .= '<u>'.gettext('Tag used for Support Ticket').': </u><br/> ' .
-		'<b>$ticket_id$</b>: '.gettext('Ticket Id').'<br/> '.
-		'<b>$ticket_owner$</b>: '.gettext('Ticket Owner').'<br/> '.
-		'<b>$ticket_priority$</b>: '.gettext('Ticket Priority').'<br/> '.
-		'<b>$ticket_status$</b>: '.gettext('Ticket Status').'<br/> '.
-		'<b>$ticket_title$</b>: '.gettext('Ticket Title').'<br/> '.
-		'<b>$ticket_description$</b>: '.gettext('Ticket Description').'<br/> '.
-		'<b>$comment_creator$</b>: '.gettext('Comment Creator').'<br/> '.
-		'<b>$comment_description$</b>: '.gettext('Comment Description').'<br/> ';
+        '<b>$ticket_id$</b>: '.gettext('Ticket Id').'<br/> '.
+        '<b>$ticket_owner$</b>: '.gettext('Ticket Owner').'<br/> '.
+        '<b>$ticket_priority$</b>: '.gettext('Ticket Priority').'<br/> '.
+        '<b>$ticket_status$</b>: '.gettext('Ticket Status').'<br/> '.
+        '<b>$ticket_title$</b>: '.gettext('Ticket Title').'<br/> '.
+        '<b>$ticket_description$</b>: '.gettext('Ticket Description').'<br/> '.
+        '<b>$comment_creator$</b>: '.gettext('Comment Creator').'<br/> '.
+        '<b>$comment_description$</b>: '.gettext('Comment Description').'<br/> ';
 $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT .= '<u>'.gettext('Tags used in all emails').': </u><br/> ' .
-		'<b>$email$</b>: '.gettext('email of the customer').'<br/>' .
-		'<b>$firstname$</b>: '.gettext('firstname of the customer').'<br/>' .
-		'<b>$lastname$</b>: '.gettext('lastname of the customer').'<br/>' .
-		'<b>$credit$</b>: '.gettext('credit of the customer in the system currency').'<br/>' .
-		'<b>$creditcurrency$</b>: '.gettext('credit of the customer in the own currency').'<br/>' .
-		'<b>$currency$</b>: '.gettext('currency of the customer').'<br/>' .
-		'<b>$cardnumber$</b>: '.gettext('card number of the customer').'<br/>' .
-		'<b>$password$</b>: '.gettext('password of the customer').'<br/>' .
-		'<b>$login$</b>: '.gettext('login of the customer').'<br/>' .
-		'<b>$credit_notification$</b>: '.gettext('credit notification of the customer').'<br/>' .
-		'<b>$base_currency$</b>: '.gettext('base currency of system').'<br/>';
+        '<b>$email$</b>: '.gettext('email of the customer').'<br/>' .
+        '<b>$firstname$</b>: '.gettext('firstname of the customer').'<br/>' .
+        '<b>$lastname$</b>: '.gettext('lastname of the customer').'<br/>' .
+        '<b>$credit$</b>: '.gettext('credit of the customer in the system currency').'<br/>' .
+        '<b>$creditcurrency$</b>: '.gettext('credit of the customer in the own currency').'<br/>' .
+        '<b>$currency$</b>: '.gettext('currency of the customer').'<br/>' .
+        '<b>$cardnumber$</b>: '.gettext('card number of the customer').'<br/>' .
+        '<b>$password$</b>: '.gettext('password of the customer').'<br/>' .
+        '<b>$login$</b>: '.gettext('login of the customer').'<br/>' .
+        '<b>$credit_notification$</b>: '.gettext('credit notification of the customer').'<br/>' .
+        '<b>$base_currency$</b>: '.gettext('base currency of system').'<br/>';
 
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT ;
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&languages=en&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&languages=en&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&languages=en&id=";
-
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&languages=en&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&languages=en&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&languages=en&id=";
diff --git a/admin/Public/form_data/FG_var_moneysituation.inc b/admin/Public/form_data/FG_var_moneysituation.inc
old mode 100644
new mode 100755
index 522c26526..2d05aaecc
--- a/admin/Public/form_data/FG_var_moneysituation.inc
+++ b/admin/Public/form_data/FG_var_moneysituation.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -52,7 +52,7 @@ $HD_Form -> AddViewElement(gettext("TO PAY"), "to pay", "7%", "center", "sort",
 $HD_Form -> FieldViewElement ('id, username, useralias, firstname, lastname, credit, id, id, id');
 
 $HD_Form -> FG_ACTION_SIZE_COLUMN = '15%';
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO").strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO").strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -99,7 +99,7 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
diff --git a/admin/Public/form_data/FG_var_moneysituation_details.inc b/admin/Public/form_data/FG_var_moneysituation_details.inc
old mode 100644
new mode 100755
diff --git a/admin/Public/form_data/FG_var_monitor.inc b/admin/Public/form_data/FG_var_monitor.inc
old mode 100644
new mode 100755
index 6d22a6c1b..d663f50f2
--- a/admin/Public/form_data/FG_var_monitor.inc
+++ b/admin/Public/form_data/FG_var_monitor.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -172,8 +172,8 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_outbound_cid.php b/admin/Public/form_data/FG_var_outbound_cid.php
index 50dcd57ef..38ddf0300 100644
--- a/admin/Public/form_data/FG_var_outbound_cid.php
+++ b/admin/Public/form_data/FG_var_outbound_cid.php
@@ -34,7 +34,7 @@
 // TODO integrate in Framework
 if ($form_action=="ask-add") {
     $begin_date = date("Y");
-    $begin_date_plus = date("Y")+25;
+    $begin_date_plus = date("Y") + 10;
     $end_date = date("-m-d H:i:s");
     $comp_date = "value='".$begin_date.$end_date."'";
     $comp_date_plus = "value='".$begin_date_plus.$end_date."'";
@@ -81,6 +81,6 @@
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
diff --git a/admin/Public/form_data/FG_var_outbound_cidgroup.php b/admin/Public/form_data/FG_var_outbound_cidgroup.php
old mode 100644
new mode 100755
index b546e8043..21b754226
--- a/admin/Public/form_data/FG_var_outbound_cidgroup.php
+++ b/admin/Public/form_data/FG_var_outbound_cidgroup.php
@@ -63,6 +63,6 @@
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
diff --git a/admin/Public/form_data/FG_var_package.inc b/admin/Public/form_data/FG_var_package.inc
old mode 100644
new mode 100755
index 5b087c339..d1d3017a8
--- a/admin/Public/form_data/FG_var_package.inc
+++ b/admin/Public/form_data/FG_var_package.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -70,7 +70,7 @@ $HD_Form -> AddViewElement(gettext("FREE"), "freetimetocall", "17%", "center", "
 $HD_Form -> FieldViewElement ('label, creationdate, packagetype, billingtype, startday, '.$filter_unit);
 
 $HD_Form -> FG_ACTION_SIZE_COLUMN='15%';
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!");  
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -83,29 +83,29 @@ $HD_Form -> FG_OTHER_BUTTON1_ALT = gettext("Add rates");
 $HD_Form -> FG_OTHER_BUTTON1_IMG = "";
 $HD_Form -> FG_OTHER_BUTTON1_LINK = "A2B_package_manage_rates.php?id=|param|";
 $HD_Form -> AddEditElement (gettext("LABEL"),
-	"label",	
-	'$value',	
-	"INPUT",	
-	"size=30 maxlength=30",	
-	"0",	
+	"label",
+	'$value',
+	"INPUT",
+	"size=30 maxlength=30",
+	"0",
 	gettext("Insert the package label"),
 	"" , "", "",	"", "", "", "",	"");
 
 $HD_Form -> AddEditElement (gettext("PACKAGE TYPE"),
-	"packagetype",		
-	'$value',	
-	"SELECT",	
-	"",	
-	"",	
+	"packagetype",
+	'$value',
+	"SELECT",
+	"",
+	"",
 	"",
 	"list" , "", "", "", $packagetype_list, "%1", "", "");
 
 $HD_Form -> AddEditElement (gettext("BILLING TYPE"),
 	"billingtype",
-	'$value',	
-	"SELECT",	
-	"",	
-	"",	
+	'$value',
+	"SELECT",
+	"",
+	"",
 	"",
 	"list" , "", "", "", $billingtype_list, "%1", "", "");
 
@@ -115,25 +115,25 @@ if (isset($form_action) && $form_action=="ask-add") {
 
 $HD_Form -> AddEditElement (gettext("STARTING DAY"),
    "startday",
-   '$value',	
-   "INPUT",	
-   "size=10 $default_init maxlength=5",	
-   "4",	
-   gettext("Insert the start day"),			   
+   '$value',
+   "INPUT",
+   "size=10 $default_init maxlength=5",
+   "4",
+   gettext("Insert the start day"),
    "" , "", "",	"", "", "", "", gettext("The value will be related to billing type ; if monthly accepted value are 1-31 ; if Weekly accepted value 1-7 (Monday to Sunday) "));
 
 
 $HD_Form -> AddEditElement (gettext("FREE UNITS"),
-   "freetimetocall",	
-   '$value',	
-   "INPUT",	
-   "size=10 maxlength=10",	
-   "4",	
+   "freetimetocall",
+   '$value',
+   "INPUT",
+   "size=10 maxlength=10",
+   "4",
    gettext("Insert the amount of free time to call (seconds)"),
    "" , "", "",	"", "", "", "", gettext("Insert the amount of free units, in seconds,for the FREE SECONDS mode. For NUMBER OF FREE CALLS insert the number of free calls"));
-   
 
-	
+
+
 
 $HD_Form -> FieldEditElement ('label, packagetype, billingtype, startday, freetimetocall');
 
@@ -148,9 +148,9 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Setup those values to create the new")." ".$HD_Form->FG_INSTANCE_NAME;
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_payment.inc b/admin/Public/form_data/FG_var_payment.inc
old mode 100644
new mode 100755
index ef7bde87a..f8b89d877
--- a/admin/Public/form_data/FG_var_payment.inc
+++ b/admin/Public/form_data/FG_var_payment.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -65,7 +65,7 @@ $HD_Form -> AddViewElement(gettext("REFILL"), "id_logrefill", "17%", "center", "
 $HD_Form -> FieldViewElement ('cc_logpayment.id, card_id, date, payment ,payment_type,id_logrefill');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -106,53 +106,53 @@ if (isset($filterprefix)  &&  (strlen($filterprefix)>0)) {
 
 
 if (has_rights (ACX_MODIFY_PAYMENTS)) {
-	
+
 	$HD_Form -> FG_ADDITION = true;
 	$HD_Form -> FG_EDITION = true;
 	$HD_Form -> FG_DELETION = true;
-	
+
 	if ($form_action=="ask-add" && !empty($card_id)) {
 		$id_val = "value='$card_id'";
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("CUSTOMER ID"),
-				   "card_id",		
-				   "$value",	
-				   "POPUPVALUE",	
-				   "size=30 maxlength=50 ".$id_val,	
-				   "4",	
+				   "card_id",
+				   "$value",
+				   "POPUPVALUE",
+				   "size=30 maxlength=50 ".$id_val,
+				   "4",
 				   gettext("Insert the Customer ID "),
-				    "" , "", "", "", "", 				
+				    "" , "", "", "", "",
 					"A2B_entity_card.php?popup_select=1&"
 					, ", 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 					gettext("Select the Customer ID"));
-				   
-	if ($form_action=="ask-add"){	
+
+	if ($form_action=="ask-add"){
 		$begin_date = date("Y");
 		$end_date = date("-m-d H:i:s");
 		$comp_date=$begin_date.$end_date;
 		$comp_date="value='$comp_date'";
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("PAYMENT DATE"),
-				   "date",		
-				   '$value',	
-				   "INPUT",	
-				   "size=40 maxlength=40  $comp_date",	
-				   "10",	
+				   "date",
+				   '$value',
+				   "INPUT",
+				   "size=40 maxlength=40  $comp_date",
+				   "10",
 				   gettext("Insert the current date"),
 				   "" , "", "",	"", "", "", "", "" );
-	
+
 	$HD_Form -> AddEditElement (gettext("PAYMENT AMOUNT"),
-				   "payment",		
-				   '$value',	
-				   "INPUT",	
-				   "size=60 maxlength=10",	
-				   "12",	
+				   "payment",
+				   '$value',
+				   "INPUT",
+				   "size=60 maxlength=10",
+				   "12",
 				   gettext("Insert the payment amount"),
 				   "" , "", "",	"", "" , "", "", gettext("Enter the amount in the currency base : ").BASE_CURRENCY );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("DESCRIPTION"),
 		"description",
 		'',
@@ -161,8 +161,8 @@ if (has_rights (ACX_MODIFY_PAYMENTS)) {
 		"",
 		gettext("Insert the description"),
 		"" , "", "", "", "" , "", "", "");
-	
-	if ($form_action!="ask-edit" && $form_action!="edit") {	
+
+	if ($form_action!="ask-edit" && $form_action!="edit") {
 		$HD_Form -> AddEditElement (gettext("CREATE ASSOCIATE REFILL"),
 					   "added_refill",
 					   '0',
@@ -172,8 +172,8 @@ if (has_rights (ACX_MODIFY_PAYMENTS)) {
 					   gettext("Choose if you want to create a refill with this payment account"),
 					   "" , "", "" , "Yes :1, - No:0", "", "" , "", gettext("Refill card account"));
 	}
-	
-	if ($form_action!="ask-edit" && $form_action!="edit") {	
+
+	if ($form_action!="ask-edit" && $form_action!="edit") {
 		$HD_Form -> AddEditElement (gettext("CREATE AGENT COMMISSION "),
 					   "added_commission",
 					   '0',
@@ -183,7 +183,7 @@ if (has_rights (ACX_MODIFY_PAYMENTS)) {
 					   gettext("Choose if you want to create a commission to an agent, if this customer is managed by one"),
 					   "" , "", "" , "Yes :1, - No:0", "", "" , "", gettext("Commission for agent"));
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("PAYMENT TYPE"),
 	                   "payment_type",
 	                   '$value',
@@ -192,32 +192,32 @@ if (has_rights (ACX_MODIFY_PAYMENTS)) {
 	                   "",
 	                   "",
 	                   "list" , "", "",     "", $list_refill_type, "%1", "", gettext("Define type for payment and refill,if created.") );
-	
-	
-	
-	if ($form_action!="ask-edit" && $form_action!="edit") {	
+
+
+
+	if ($form_action!="ask-edit" && $form_action!="edit") {
 		$HD_Form -> FieldEditElement ('card_id, date, payment, description,payment_type');
 	} else {
 		$HD_Form -> FieldEditElement ('card_id, date, payment, description, added_refill,added_commission, payment_type');
 	}
-	
-	
+
+
 	$HD_Form -> FG_INTRO_TEXT_EDITION= gettext("You can modify, through the following form, the different properties of your ".$HD_Form->FG_INSTANCE_NAME);
 	$HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this ".$HD_Form->FG_INSTANCE_NAME.", click on the delete button.");
 	$HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new ".$HD_Form->FG_INSTANCE_NAME.".<br>Fill the following fields and confirm by clicking on the button add.");
-	
-	
+
+
 	$HD_Form -> FG_INTRO_TEXT_ADITION = '';
 	$HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new ".$HD_Form->FG_INSTANCE_NAME." has been inserted. <br>");
-	
-	
+
+
 	$HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 	$HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue.");
-	
+
 	$HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_ADD = 'create_refill_after_payment';
-	
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 }
diff --git a/admin/Public/form_data/FG_var_payment_agent.inc b/admin/Public/form_data/FG_var_payment_agent.inc
old mode 100644
new mode 100755
index d04f13b61..32b9d2ecd
--- a/admin/Public/form_data/FG_var_payment_agent.inc
+++ b/admin/Public/form_data/FG_var_payment_agent.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -54,7 +54,7 @@ $HD_Form ->FG_LIST_ADDING_BUTTON_IMG1 = Images_Path ."/money_add.png" ;
 
 $list_refill_type=Constants::getRefillType_List();
 $HD_Form -> AddViewElement(gettext("ID"), "cc_logpayment.id", "10%", "center", "sort");
-if (has_rights (ACX_ADMINISTRATOR)) { 
+if (has_rights (ACX_ADMINISTRATOR)) {
 	$HD_Form -> AddViewElement(gettext("AGENT"), "agent_id", "20%", "center", "sort", "", "30", "", "", "", "", "linktoagent");
 } else {
 	$HD_Form -> AddViewElement(gettext("AGENT"), "agent_id", "20%", "center", "sort", "", "30", "", "", "", "", "nameofagent");
@@ -67,7 +67,7 @@ $HD_Form -> AddViewElement(gettext("REFILL"), "id_logrefill", "17%", "center", "
 $HD_Form -> FieldViewElement ('cc_logpayment_agent.id, agent_id, date, payment ,payment_type,id_logrefill');
 
 
-$HD_Form -> CV_NO_FIELDS = gettext("THERE IS NO AGENT PAYMENT CREATED!"); 
+$HD_Form -> CV_NO_FIELDS = gettext("THERE IS NO AGENT PAYMENT CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -90,49 +90,49 @@ $HD_Form -> AddSearchElement_C1(gettext("FIRSTNAME"),'firstname','firstnametype'
 if (has_rights (ACX_MODIFY_PAYMENTS)) {
 	$HD_Form -> FG_EDITION = true;
 	$HD_Form -> FG_DELETION = true;
-	
-	if ($form_action=="ask-add" && !empty($agent_id)) {	
+
+	if ($form_action=="ask-add" && !empty($agent_id)) {
 		$id_val = "value='$agent_id'";
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("AGENT ID"),
-				   "agent_id",		
-				   "$value",	
-				   "POPUPVALUE",	
-				   "size=30 maxlength=50 ".$id_val,	
-				   "4",	
+				   "agent_id",
+				   "$value",
+				   "POPUPVALUE",
+				   "size=30 maxlength=50 ".$id_val,
+				   "4",
 				   gettext("Insert the Agent ID "),
-				    "" , "", "", "", "", 				
+				    "" , "", "", "", "",
 					"A2B_entity_agent.php?popup_select=1&"
 					, ", 'AgentSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 					gettext("Select the Agent ID"));
-				   
+
 	if ($form_action=="ask-add") {
 		$begin_date = date("Y");
 		$end_date = date("-m-d H:i:s");
 		$comp_date=$begin_date.$end_date;
 		$comp_date="value='$comp_date'";
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("PAYMENT DATE"),
-				   "date",		
-				   '$value',	
-				   "INPUT",	
-				   "size=40 maxlength=40  $comp_date",	
-				   "10",	
+				   "date",
+				   '$value',
+				   "INPUT",
+				   "size=40 maxlength=40  $comp_date",
+				   "10",
 				   gettext("Insert the current date"),
 				   "" , "", "",	"", "", "", "", "" );
-	
+
 	$HD_Form -> AddEditElement (gettext("PAYMENT AMOUNT"),
-				   "payment",		
-				   '$value',	
-				   "INPUT",	
-				   "size=60 maxlength=10",	
-				   "12",	
+				   "payment",
+				   '$value',
+				   "INPUT",
+				   "size=60 maxlength=10",
+				   "12",
 				   gettext("Insert the payment amount"),
 				   "" , "", "",	"", "" , "", "", gettext("Enter the amount in the currency base : ").BASE_CURRENCY );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("DESCRIPTION"),
 		"description",
 		'',
@@ -141,8 +141,8 @@ if (has_rights (ACX_MODIFY_PAYMENTS)) {
 		"",
 		gettext("Insert the description"),
 		"" , "", "", "", "" , "", "", "");
-	
-	if ($form_action!="ask-edit" && $form_action!="edit") {	
+
+	if ($form_action!="ask-edit" && $form_action!="edit") {
 		$HD_Form -> AddEditElement (gettext("CREATE ASSOCIATE REFILL"),
 					   "added_refill",
 					   '0',
@@ -152,7 +152,7 @@ if (has_rights (ACX_MODIFY_PAYMENTS)) {
 					   gettext("Choose if you want to create a refill with this payment account"),
 					   "" , "", "" , "Yes :1, - No:0", "", "" , "", gettext("Refill card account"));
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("REFILL TYPE"),
                        "payment_type",
                        '$value',
@@ -161,31 +161,31 @@ if (has_rights (ACX_MODIFY_PAYMENTS)) {
                        "",
                        "",
                        "list" , "", "",     "", $list_refill_type, "%1", "", gettext("Define type for payment and refill,if created.") );
-	
-	
-	if ($form_action!="ask-edit" && $form_action!="edit") {	
+
+
+	if ($form_action!="ask-edit" && $form_action!="edit") {
 		$HD_Form -> FieldEditElement ('agent_id, date, payment, description,payment_type');
 	} else {
 		$HD_Form -> FieldEditElement ('agent_id, date, payment, description, added_refill, payment_type');
 	}
-	
-	
+
+
 	$HD_Form -> FG_INTRO_TEXT_EDITION= gettext("You can modify, through the following form, the different properties of your ".$HD_Form->FG_INSTANCE_NAME);
 	$HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this ".$HD_Form->FG_INSTANCE_NAME.", click on the delete button.");
 	$HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new ".$HD_Form->FG_INSTANCE_NAME.".<br>Fill the following fields and confirm by clicking on the button add.");
-	
-	
+
+
 	$HD_Form -> FG_INTRO_TEXT_ADITION = '';
 	$HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new ".$HD_Form->FG_INSTANCE_NAME." has been inserted. <br>");
-	
-	
+
+
 	$HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 	$HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue.");
-	
+
 	$HD_Form -> FG_ADDITIONAL_FUNCTION_AFTER_ADD = 'create_agent_refill';
-	
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 }
diff --git a/admin/Public/form_data/FG_var_payment_configuration.inc b/admin/Public/form_data/FG_var_payment_configuration.inc
old mode 100644
new mode 100755
diff --git a/admin/Public/form_data/FG_var_payment_invoice.inc b/admin/Public/form_data/FG_var_payment_invoice.inc
old mode 100644
new mode 100755
diff --git a/admin/Public/form_data/FG_var_paymentlog.inc b/admin/Public/form_data/FG_var_paymentlog.inc
old mode 100644
new mode 100755
index 068d83888..4bec325d8
--- a/admin/Public/form_data/FG_var_paymentlog.inc
+++ b/admin/Public/form_data/FG_var_paymentlog.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -44,7 +44,7 @@ $HD_Form -> FG_TABLE_DEFAULT_SENS = "DESC";
 
 $date_clause = "";
 
-if (DB_TYPE == "postgres") {		
+if (DB_TYPE == "postgres") {
 	 	$UNIX_TIMESTAMP = "";
 }else{
 		$UNIX_TIMESTAMP = "UNIX_TIMESTAMP";
@@ -57,10 +57,10 @@ if ($Period=="Month"){
 	if ($tomonth && isset($tostatsmonth))
 	{
 		if (strlen($date_clause)>0) $date_clause.=" AND ";
-		$date_clause.=" $UNIX_TIMESTAMP(creationdate) <= $UNIX_TIMESTAMP('".$tostatsmonth."-$lastdayofmonth 23:59:59')"; 
+		$date_clause.=" $UNIX_TIMESTAMP(creationdate) <= $UNIX_TIMESTAMP('".$tostatsmonth."-$lastdayofmonth 23:59:59')";
 	}
 }else{
-	if ($fromday && isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) 
+	if ($fromday && isset($fromstatsday_sday) && isset($fromstatsmonth_sday))
 	{
 		if (strlen($date_clause)>0) $date_clause.=" AND ";
 		$date_clause.=" $UNIX_TIMESTAMP(creationdate) >= $UNIX_TIMESTAMP('$fromstatsmonth_sday-$fromstatsday_sday')";
@@ -76,7 +76,7 @@ if (strlen($HD_Form -> FG_TABLE_CLAUSE)>0 && strlen($enteradmin)>0) $HD_Form ->
 if($enteradmin != "")
 {
 	$HD_Form -> FG_TABLE_CLAUSE.=" iduser = '$enteradmin'";
-}	
+}
 if (strlen($enteradmin)>0 && strlen($loglevel)>0 && $loglevel > 0) $HD_Form -> FG_TABLE_CLAUSE.=" AND ";
 if($status >= 0 && $status != '')
 {
@@ -116,74 +116,74 @@ $HD_Form -> FG_DELETION = true;
 $HD_Form -> FG_ADDITION = true;
 
 $HD_Form -> AddEditElement (gettext("ID"),
-			   "id",		
-			   "$value",	
-			   "INPUT",	
-			   "size=10 READONLY maxlength=10",	
-			   "4",	
+			   "id",
+			   "$value",
+			   "INPUT",
+			   "size=10 READONLY maxlength=10",
+			   "4",
 			   gettext("Insert the Id "),
-			    "" , "", "", "", "", "", "", 
+			    "" , "", "", "", "", "", "",
 				gettext("Select the ID"));
 
 
 $HD_Form -> AddEditElement (gettext("DATE"),
-			   "creationdate",		
-			   '$value',	
-			   "INPUT",	
-			   "size=40 READONLY maxlength=40 ",	
-			   "10",	
+			   "creationdate",
+			   '$value',
+			   "INPUT",
+			   "size=40 READONLY maxlength=40 ",
+			   "10",
 			   gettext("Insert the creation date"),
 			   "" , "", "",	"", "", "", "", "" );
 
 
 $HD_Form -> AddEditElement (gettext("PAYMENT METHOD"),
-			   "paymentmethod",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=30",	
-			   "12",	
+			   "paymentmethod",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=30",
+			   "12",
 			   gettext("Insert the payment method"),
 			   "" , "", "",	"", "" , "", "", gettext("Enter the payment method ") );
 
 
-$HD_Form -> AddEditElement (gettext("STATUS"),	
-				"status",			
-				'$value',	
-				"SELECT",	
-				"",	
-				"",	
-				"", 
+$HD_Form -> AddEditElement (gettext("STATUS"),
+				"status",
+				'$value',
+				"SELECT",
+				"",
+				"",
+				"",
 				"list" , "", "",	"", $status_list, "%1", "", "" );
 
 $HD_Form -> AddEditElement (gettext("OWNER"),
-			   "cc_owner",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=30",	
-			   "12",	
+			   "cc_owner",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=30",
+			   "12",
 			   gettext("Insert the owner"),
 			   "" , "", "",	"", "" , "", "", gettext("Enter the owner") );
 
 
 $HD_Form -> AddEditElement (gettext("AMOUNT"),
-			   "amount",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=30",	
-			   "12",	
+			   "amount",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=30",
+			   "12",
 			   gettext("Insert the amount"),
 			   "" , "", "",	"", "" , "", "", gettext("Enter the amount ") );
 
 
 
 $HD_Form -> AddEditElement (gettext("ID CARD"),
-			   "card_id",		
-			   "$value",	
-			   "POPUPVALUE",	
-			   "size=30 maxlength=50",	
-			   "4",	
+			   "card_id",
+			   "$value",
+			   "POPUPVALUE",
+			   "size=30 maxlength=50",
+			   "4",
 			   gettext("Insert the Id CardNumber"),
-			    "" , "", "", "", "", 				
+			    "" , "", "", "", "",
 				"A2B_entity_card.php?popup_select=1&"
 				, ", 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 				gettext("Select the Card Number ID"));
@@ -208,6 +208,6 @@ $HD_Form -> FG_INTRO_TEXT_EDITION= '';
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_paymentlog_agent.inc b/admin/Public/form_data/FG_var_paymentlog_agent.inc
old mode 100644
new mode 100755
index f76efe2bc..c0647d4af
--- a/admin/Public/form_data/FG_var_paymentlog_agent.inc
+++ b/admin/Public/form_data/FG_var_paymentlog_agent.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -44,7 +44,7 @@ $HD_Form -> FG_TABLE_DEFAULT_SENS = "DESC";
 
 $date_clause = "";
 
-if (DB_TYPE == "postgres") {		
+if (DB_TYPE == "postgres") {
 	 	$UNIX_TIMESTAMP = "";
 }else{
 		$UNIX_TIMESTAMP = "UNIX_TIMESTAMP";
@@ -57,10 +57,10 @@ if ($Period=="Month"){
 	if ($tomonth && isset($tostatsmonth))
 	{
 		if (strlen($date_clause)>0) $date_clause.=" AND ";
-		$date_clause.=" $UNIX_TIMESTAMP(creationdate) <= $UNIX_TIMESTAMP('".$tostatsmonth."-$lastdayofmonth 23:59:59')"; 
+		$date_clause.=" $UNIX_TIMESTAMP(creationdate) <= $UNIX_TIMESTAMP('".$tostatsmonth."-$lastdayofmonth 23:59:59')";
 	}
 }else{
-	if ($fromday && isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) 
+	if ($fromday && isset($fromstatsday_sday) && isset($fromstatsmonth_sday))
 	{
 		if (strlen($date_clause)>0) $date_clause.=" AND ";
 		$date_clause.=" $UNIX_TIMESTAMP(creationdate) >= $UNIX_TIMESTAMP('$fromstatsmonth_sday-$fromstatsday_sday')";
@@ -76,7 +76,7 @@ if (strlen($HD_Form -> FG_TABLE_CLAUSE)>0 && strlen($enteradmin)>0) $HD_Form ->
 if($enteradmin != "")
 {
 	$HD_Form -> FG_TABLE_CLAUSE.=" iduser = '$enteradmin'";
-}	
+}
 if (strlen($enteradmin)>0 && strlen($loglevel)>0 && $loglevel > 0) $HD_Form -> FG_TABLE_CLAUSE.=" AND ";
 if($status >= 0 && $status != '')
 {
@@ -116,74 +116,74 @@ $HD_Form -> FG_DELETION = true;
 $HD_Form -> FG_ADDITION = true;
 
 $HD_Form -> AddEditElement (gettext("ID"),
-			   "id",		
-			   "$value",	
-			   "INPUT",	
-			   "size=10 READONLY maxlength=10",	
-			   "4",	
+			   "id",
+			   "$value",
+			   "INPUT",
+			   "size=10 READONLY maxlength=10",
+			   "4",
 			   gettext("Insert the Id "),
-			    "" , "", "", "", "", "", "", 
+			    "" , "", "", "", "", "", "",
 				gettext("Select the ID"));
 
 
 $HD_Form -> AddEditElement (gettext("DATE"),
-			   "creationdate",		
-			   '$value',	
-			   "INPUT",	
-			   "size=40 READONLY maxlength=40 ",	
-			   "10",	
+			   "creationdate",
+			   '$value',
+			   "INPUT",
+			   "size=40 READONLY maxlength=40 ",
+			   "10",
 			   gettext("Insert the creation date"),
 			   "" , "", "",	"", "", "", "", "" );
 
 
 $HD_Form -> AddEditElement (gettext("PAYMENT METHOD"),
-			   "paymentmethod",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=30",	
-			   "12",	
+			   "paymentmethod",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=30",
+			   "12",
 			   gettext("Insert the payment method"),
 			   "" , "", "",	"", "" , "", "", gettext("Enter the payment method ") );
 
 
-$HD_Form -> AddEditElement (gettext("STATUS"),	
-				"status",			
-				'$value',	
-				"SELECT",	
-				"",	
-				"",	
-				"", 
+$HD_Form -> AddEditElement (gettext("STATUS"),
+				"status",
+				'$value',
+				"SELECT",
+				"",
+				"",
+				"",
 				"list" , "", "",	"", $status_list, "%1", "", "" );
 
 $HD_Form -> AddEditElement (gettext("OWNER"),
-			   "cc_owner",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=30",	
-			   "12",	
+			   "cc_owner",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=30",
+			   "12",
 			   gettext("Insert the owner"),
 			   "" , "", "",	"", "" , "", "", gettext("Enter the owner") );
 
 
 $HD_Form -> AddEditElement (gettext("AMOUNT"),
-			   "amount",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=30",	
-			   "12",	
+			   "amount",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=30",
+			   "12",
 			   gettext("Insert the amount"),
 			   "" , "", "",	"", "" , "", "", gettext("Enter the amount ") );
 
 
 
 $HD_Form -> AddEditElement (gettext("ID AGENT"),
-			   "agent_id",		
-			   "$value",	
-			   "POPUPVALUE",	
-			   "size=30 maxlength=50",	
-			   "4",	
+			   "agent_id",
+			   "$value",
+			   "POPUPVALUE",
+			   "size=30 maxlength=50",
+			   "4",
 			   gettext("Insert the Id CardNumber"),
-			    "" , "", "", "", "", 				
+			    "" , "", "", "", "",
 				"A2B_entity_agent.php?popup_select=1&"
 				, ", 'AgentIdSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 				gettext("Select the Agent ID"));
@@ -208,6 +208,6 @@ $HD_Form -> FG_INTRO_TEXT_EDITION= '';
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_phonenumber.inc b/admin/Public/form_data/FG_var_phonenumber.inc
old mode 100644
new mode 100755
diff --git a/admin/Public/form_data/FG_var_prefix.inc b/admin/Public/form_data/FG_var_prefix.inc
old mode 100644
new mode 100755
index e9f583c28..f651fd7f0
--- a/admin/Public/form_data/FG_var_prefix.inc
+++ b/admin/Public/form_data/FG_var_prefix.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -92,7 +92,7 @@ $HD_Form -> AddEditElement (gettext("PREFIX"),
 	"$dialprefix",
 	gettext("Insert the Prefixe"),
 	"" , "", "", "", "" , "", "" ,"");
-	
+
 $HD_Form -> AddEditElement (gettext("DESTINATION"),
 	"destination",
 	'$value',
@@ -134,9 +134,9 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_provider.inc b/admin/Public/form_data/FG_var_provider.inc
old mode 100644
new mode 100755
index 810225573..c44cefe45
--- a/admin/Public/form_data/FG_var_provider.inc
+++ b/admin/Public/form_data/FG_var_provider.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,13 +27,13 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
 
-getpost_ifset(array('id', 'provider_name', 'creationdate', 'description', 'popup_select'));
+getpost_ifset(array('id', 'provider_name', 'creationdate', 'description', 'popup_select', 'id_cc_card'));
 
 $HD_Form = new FormHandler("cc_provider","Provider");
 
@@ -50,11 +50,12 @@ if ($popup_select)
 	$HD_Form -> AddViewElement(gettext("ID"), "id", "15%", "center", "sort");
 $HD_Form -> AddViewElement(gettext("PROVIDER NAME"), "provider_name", "25%", "center", "sort");
 $HD_Form -> AddViewElement(gettext("CREATIONDATE"), "creationdate", "20%", "center", "sort", "19", "", "", "", "", "", "display_dateformat");
-$HD_Form -> AddViewElement(gettext("DESCRIPTION"), "description", "30%", "center", "sort", "30");
-$HD_Form -> FieldViewElement (($popup_select ? 'id,' : '') . 'provider_name, creationdate, description');
+$HD_Form -> AddViewElement(gettext("DESCRIPTION"), "description", "20%", "center", "sort", "30");
+$HD_Form -> AddViewElement(gettext("CARDHOLDER"), "id_cc_card", "17%", "center", "sort", "25", "lie", "cc_card", "lastname, firstname", "id='%id'", "%1 %2");
+$HD_Form -> FieldViewElement (($popup_select ? 'id,' : '') . 'provider_name, creationdate, description, id_cc_card');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("NO PROVIDERS CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("NO PROVIDERS CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -80,25 +81,37 @@ if ($popup_select) {
 	$HD_Form -> FG_ADDITION = true;
 }
 
-$HD_Form -> AddEditElement ( gettext("PROVIDER NAME"),	
-		"provider_name",	'$value',	
+$HD_Form -> AddEditElement ( gettext("PROVIDER NAME"),
+		"provider_name",	'$value',
 		"INPUT",
 		"size=40 maxlength=40",
 		"0",
-		gettext("Insert the provider name"), 
+		gettext("Insert the provider name"),
 		"" , "", "",	"", "", "", "", "" );
 
 
 $HD_Form -> AddEditElement ( gettext("DESCRIPTION"),
 		"description",
-		'$value',	
+		'$value',
 		"TEXTAREA",
 		"cols=50 rows=5",
 		"",
-		gettext("Insert the description"), 
+		gettext("Insert the description"),
 		"" , "", "",	"", "", "", "", "");
 
-$HD_Form -> FieldEditElement ('provider_name, description');
+$HD_Form -> AddEditElement (gettext("ID CARD"),
+        "id_cc_card",
+        '',
+        "POPUPVALUE",
+        "size=30 maxlength=50 $def_value_idcard",
+        "4",
+        gettext("Insert the Id CardNumber"),
+        "", "", "", "", "",
+        "A2B_entity_card.php?popup_select=1&"
+        , ", 'CardNumberSelection','width=590,height=350,top=20,left=100,scrollbars=1'",
+        gettext("Insert the card ID."));
+
+$HD_Form -> FieldEditElement ('provider_name, description, id_cc_card');
 
 
 
@@ -112,9 +125,9 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_receipt.inc b/admin/Public/form_data/FG_var_receipt.inc
old mode 100644
new mode 100755
index d67a2645a..f83fd734c
--- a/admin/Public/form_data/FG_var_receipt.inc
+++ b/admin/Public/form_data/FG_var_receipt.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,15 +27,15 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
 
 getpost_ifset(array('id', 'id_card', 'date','title','description'));
-   
- 
+
+
 if (!isset($form_action) || $form_action=="list") {
 	$list_query = "cc_receipt LEFT JOIN cc_card ON cc_card.id=id_card";
 	$list_query .= " LEFT JOIN ( SELECT st1.id_receipt, SUM(st1.price) as total_price FROM cc_receipt_item AS st1 GROUP BY st1.id_receipt) as items ON items.id_receipt = cc_receipt.id ";
@@ -53,7 +53,7 @@ $HD_Form -> FG_FK_DELETE_CONFIRM = true;
 $HD_Form -> FG_FK_WARNONLY = true;
 $HD_Form -> FG_FK_TABLENAMES = array("cc_receipt_item");
 $HD_Form -> FG_FK_EDITION_CLAUSE = array(" id_receipt ");
- 
+
 $HD_Form -> FG_INFO = true;
 $HD_Form -> FG_INFO_LINK = "A2B_receipt_view.php?id=";
 $HD_Form -> FG_INFO_ALT = "VIEW";
@@ -92,7 +92,7 @@ $HD_Form -> AddViewElement(gettext("AMOUNT INCL VAT"), "total_price", "10%", "ce
 $HD_Form -> FieldViewElement ("cc_receipt.id, username, cc_receipt.date,title,cc_receipt.status,$filter_amount_with_vat");
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -103,14 +103,14 @@ $HD_Form -> FG_DELETION = true;
 
 
 $HD_Form -> AddEditElement (gettext("ID CUSTOMER"),
-			   "id_card",		
-			   "$value", "POPUPVALUE", "size=30 maxlength=50",	
+			   "id_card",
+			   "$value", "POPUPVALUE", "size=30 maxlength=50",
 			   "4",	gettext("Insert the Customer ID"),
-			    "" , "", "", "", "", 				
+			    "" , "", "", "", "",
 				"A2B_entity_card.php?popup_select=1&", ", 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 				gettext("Select the Customer ID"));
 
-if ($form_action=="ask-add"){	
+if ($form_action=="ask-add"){
 	$begin_date = date("Y");
 	$end_date = date("-m-d H:i:s");
 	$comp_date=$begin_date.$end_date;
@@ -118,24 +118,24 @@ if ($form_action=="ask-add"){
 }
 
 $HD_Form -> AddEditElement (gettext("INVOICE DATE"),
-			   "date",		
-			   '$value',	
-			   "INPUT",	
-			   "size=40 READONLY maxlength=40  $comp_date",	
-			   "10",	
+			   "date",
+			   '$value',
+			   "INPUT",
+			   "size=40 READONLY maxlength=40  $comp_date",
+			   "10",
 			   gettext("Insert the current date"),
 			   "" , "", "",	"", "", "", "", "" );
 
 
-$HD_Form -> AddEditElement ( gettext("TITLE"),	
-				"title",	'$value',	
+$HD_Form -> AddEditElement ( gettext("TITLE"),
+				"title",	'$value',
 				"INPUT",
 				"size=30 maxlength=50",
 				"0",
-				gettext("Insert the title of invoice, if you need one"), 
+				gettext("Insert the title of invoice, if you need one"),
 				"" , "", "",	"", "", "", "", "" );
-			   
-			   
+
+
 $HD_Form -> AddEditElement (gettext("DESCRIPTION"),
 				"description",
 				'',
@@ -144,7 +144,7 @@ $HD_Form -> AddEditElement (gettext("DESCRIPTION"),
 				"",
 				gettext("Insert the description"),
 				"" , "", "", "", "" , "", "", "");
-			   
+
 
 $HD_Form -> FieldEditElement ('id_card, date,title, description');
 
@@ -176,8 +176,8 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 $HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = "A2B_receipt_edit.php?id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_remittance_request.inc b/admin/Public/form_data/FG_var_remittance_request.inc
old mode 100644
new mode 100755
diff --git a/admin/Public/form_data/FG_var_restore.inc b/admin/Public/form_data/FG_var_restore.inc
old mode 100644
new mode 100755
index 3893b3295..e2e8924e2
--- a/admin/Public/form_data/FG_var_restore.inc
+++ b/admin/Public/form_data/FG_var_restore.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -52,7 +52,7 @@ $HD_Form -> AddViewElement(gettext("CREATIONDATE"), "creationdate", "20%", "cent
 $HD_Form -> FieldViewElement ('id, name, path, creationdate');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -72,7 +72,7 @@ $HD_Form -> AddEditElement (gettext("Name "),
 	"",
 	gettext("Insert the name of backup"),
 	"" , "", "", "", "", "", "", gettext("Name of the backup"));
-	
+
 $HD_Form -> AddEditElement ("PATH",
 	"path",
 	'',
@@ -81,7 +81,7 @@ $HD_Form -> AddEditElement ("PATH",
 	"",
 	"the backup file",
 	"" , "", "", "", "", "", "", gettext("The backup file name"));
-	
+
 
 
 $HD_Form -> FieldEditElement ('name, path, creationdate');
@@ -101,11 +101,11 @@ $HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this
 $HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new")." ".$HD_Form->FG_INSTANCE_NAME.".<br>".gettext("Fill the following fields and confirm by clicking on the button add.");
 
 
-$HD_Form -> FG_OTHER_BUTTON1_LINK = $_SERVER['PHP_SELF']."?form_action=restore&atmenu=$HD_Form->FG_INSTANCE_NAME&id=";
+$HD_Form -> FG_OTHER_BUTTON1_LINK = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?form_action=restore&atmenu=$HD_Form->FG_INSTANCE_NAME&id=";
 $HD_Form -> FG_OTHER_BUTTON1_IMG = Images_Path . "/icon-restore.gif";
 $HD_Form -> FG_OTHER_BUTTON1_ALT = gettext("Restore");
 
-$HD_Form -> FG_OTHER_BUTTON2_LINK = $_SERVER['PHP_SELF']."?form_action=download&atmenu=$HD_Form->FG_INSTANCE_NAME&id=";
+$HD_Form -> FG_OTHER_BUTTON2_LINK = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?form_action=download&atmenu=$HD_Form->FG_INSTANCE_NAME&id=";
 $HD_Form -> FG_OTHER_BUTTON2_IMG = Images_Path . "/dl.gif";
 $HD_Form -> FG_OTHER_BUTTON2_ALT = gettext("Download");
 
@@ -117,10 +117,10 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Once you have completed the form above, click on the CONTINUE button.");
 
 
-$FG_GO_LINK_AFTER_UPLOAD = $_SERVER['PHP_SELF']."?form_action=list&atmenu=$HD_Form->FG_INSTANCE_NAME&id=";
+$FG_GO_LINK_AFTER_UPLOAD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?form_action=list&atmenu=$HD_Form->FG_INSTANCE_NAME&id=";
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 unset($FG_GO_LINK_AFTER_UPLOAD);
 unset($HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE);
diff --git a/admin/Public/form_data/FG_var_server.inc b/admin/Public/form_data/FG_var_server.inc
index a387edccf..e6ef31ede 100755
--- a/admin/Public/form_data/FG_var_server.inc
+++ b/admin/Public/form_data/FG_var_server.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -56,7 +56,7 @@ $HD_Form -> AddViewElement(gettext("LASTTIME USED"), "lasttime_used", "15%", "ce
 $HD_Form -> FieldViewElement ('id_group, id_group, server_ip, manager_host, manager_username, lasttime_used');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -76,39 +76,39 @@ $HD_Form -> AddEditElement (gettext("SERVER GROUP"),
 				"name, id",
 				"", "", "%1","", "");
 
-$HD_Form -> AddEditElement (gettext("SERVER HOSTNAME"),	
-			   "server_ip",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=40",	
+$HD_Form -> AddEditElement (gettext("SERVER HOSTNAME"),
+			   "server_ip",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=40",
 			   "3",
 			   gettext("Insert the server hostname"),
 			   "" , "", "",	"", "" , "", "", "");
 
-$HD_Form -> AddEditElement (gettext("MANAGER HOST"),	
-			   "manager_host",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=40",	
+$HD_Form -> AddEditElement (gettext("MANAGER HOST"),
+			   "manager_host",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=40",
 			   "9",
 			   gettext("Insert the manager host"),
 			   "" , "", "",	"", "" , "", "", "");
 
 $HD_Form -> AddEditElement (gettext("MANAGER USERNAME"),
-			   "manager_username",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=40",	
-			   "9",	
+			   "manager_username",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=40",
+			   "9",
 			   gettext("Insert the manager username"),
 			   "" , "", "",	"", "" , "", "", "");
 
 $HD_Form -> AddEditElement (gettext("MANAGER SECRET"),
-			   "manager_secret",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=40",	
-			   "",	
+			   "manager_secret",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=40",
+			   "",
 			   gettext("Insert the manager secret"),
 			   "" , "", "",	"", "" , "", "", "");
 
@@ -140,9 +140,9 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Setup those values to create the new")." ".$HD_Form->FG_INSTANCE_NAME;
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_server_group.inc b/admin/Public/form_data/FG_var_server_group.inc
index 3c2345aa9..9cf6e3d00 100755
--- a/admin/Public/form_data/FG_var_server_group.inc
+++ b/admin/Public/form_data/FG_var_server_group.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -54,7 +54,7 @@ $HD_Form -> AddViewElement("DESCRIPTION", "description", "40%", "center", "sort"
 $HD_Form -> FieldViewElement ('id, name, description');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -66,21 +66,21 @@ $HD_Form -> FG_DELETION = true;
 $HD_Form -> FG_ADDITION = true;
 
 
-$HD_Form -> AddEditElement ("NAME",	
-			   "name",		
-			   '$value',	
-			   "INPUT",	
-			   "size=20 maxlength=30",	
-			   "3",	
-			   gettext("Insert the name"), 
+$HD_Form -> AddEditElement ("NAME",
+			   "name",
+			   '$value',
+			   "INPUT",
+			   "size=20 maxlength=30",
+			   "3",
+			   gettext("Insert the name"),
 			   "" , "", "",	"", "" , "", "", "");
-			   
+
 $HD_Form -> AddEditElement (gettext("DESCRIPTION"),
-			   "description",		
-			   '',	
-			   "TEXTAREA",	
-			   "cols=50 rows=4",	
-			   "",	
+			   "description",
+			   '',
+			   "TEXTAREA",
+			   "cols=50 rows=4",
+			   "",
 			   gettext("Insert the description"),
 			   "" , "", "",	"", "" , "", "", "");
 
@@ -116,9 +116,9 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Setup those values to create the new")." ".$HD_Form->FG_INSTANCE_NAME;
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_service.inc b/admin/Public/form_data/FG_var_service.inc
old mode 100644
new mode 100755
index 05f029cf6..14c680c60
--- a/admin/Public/form_data/FG_var_service.inc
+++ b/admin/Public/form_data/FG_var_service.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,13 +27,13 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
 
-getpost_ifset(array('id', 'name', 'amount', 'period', 'rule', 'daynumber', 'stopmode', 'maxnumbercycle', 'status', 'emailreport'));
+getpost_ifset(array('id', 'name', 'amount', 'period', 'rule', 'daynumber', 'stopmode', 'maxnumbercycle', 'status', 'emailreport', 'condition5x'));
 
 
 $HD_Form = new FormHandler("cc_service","Service");
@@ -73,13 +73,15 @@ $stopmode_list = array();
 $stopmode_list["0"]  = array( gettext("Never"), "0");
 $stopmode_list["1"]  = array( gettext("Account balance below zero"), "1");
 $stopmode_list["2"]  = array( gettext("Max number of cycle reach"), "2");
+$stopmode_list["50"]  = array( gettext("Account balance is greater than"), "50");
+$stopmode_list["51"]  = array( gettext("Account balance is less than"), "51");
 
 $operatemode_list = array();
 $operatemode_list["0"] = array(gettext("Allow be charged into negative balance"),"0");
 $operatemode_list["1"] = array(gettext("Do partial charge but never go into negative balance"),"1");
 
 $usegroup_list = array();
-$usegroup_list["0"] = array(gettext("List of groups below"),"0"); 
+$usegroup_list["0"] = array(gettext("List of groups below"),"0");
 $usegroup_list["1"] = array(gettext("Any group"),"1");
 
 $HD_Form -> AddViewElement(gettext("NAME"), "name", "15%", "center", "sort");
@@ -96,7 +98,7 @@ $HD_Form -> AddViewElement(gettext("TOTALCREDIT"), "totalcredit", "10%", "center
 $HD_Form -> FieldViewElement ('name, amount, period, status, numberofrun, datelastrun, totalcardperform, totalcredit');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!");  
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -140,7 +142,7 @@ $HD_Form -> AddEditElement (gettext("RULE"),
 	"",
 	"",
 	"list" , "", "", "", $rule_list, "%1", "", gettext("where X - day number (X) in days <br>	and Y = number set in period field"));
-	
+
 $HD_Form -> AddEditElement ("DAY NUMBER (X)",
 	"daynumber",
 	"$value",
@@ -167,7 +169,7 @@ $HD_Form -> AddEditElement ("STOP MODE",
 	"",
 	"",
 	"list" , "", "", "", $stopmode_list, "%1" , "", "");
-	
+
 $HD_Form -> AddEditElement ("MAX NUMBER OF CYCLES BY CARD",
 	"maxnumbercycle",
 	"$value",
@@ -176,7 +178,16 @@ $HD_Form -> AddEditElement ("MAX NUMBER OF CYCLES BY CARD",
 	"4",
 	gettext("Insert the max number of cycle"),
 	"" , "", "", "", "", "" , "NO-NULL", gettext("Set the maximum number of times that the service should be applied."));
-	
+
+$HD_Form -> AddEditElement ("ACCOUNT BALANCE PARAMETER",
+	"condition5x",
+	'$value',
+	"INPUT",
+	"size=20 maxlength=20",
+	"12",
+	gettext("Insert the condition for stop mode"),
+	"" , "", "", "", "", "" , "NO-NULL", gettext("Set the stop mode condition for checking by account balance."));
+
 $HD_Form -> AddEditElement ("STATUS",
 	"status",
 	'$value',
@@ -190,10 +201,10 @@ $HD_Form -> AddEditElement (gettext("EMAIL TO SEND REPORT"),
 	"emailreport",
 	'$value',
 	"INPUT",
-	"size=30 maxlength=30",
+	"size=30 maxlength=70",
 	"1",
 	gettext("Insert the email to send the report"),
-	"" , "", "", "", "", "" , "NO-NULL", "");
+	"" , "", "", "", "", "" , "NO", "");
 
 $HD_Form -> AddEditElement (gettext("CALL PLAN"),
        "dialplan",
@@ -204,7 +215,7 @@ $HD_Form -> AddEditElement (gettext("CALL PLAN"),
        "cc_tariffgroup union select '--ANY--',0",
        "tariffgroupname, id",
        "", "", "%1", "", "");
- 
+
 $HD_Form -> AddEditElement (gettext("OPERATE MODE"),
         "operate_mode",
         '$value',
@@ -213,7 +224,7 @@ $HD_Form -> AddEditElement (gettext("OPERATE MODE"),
         "",
         "",
         "list" , "", "", "", $operatemode_list, "%1", "", gettext("If you want to charge only part of sum in case if current balance less then amount, select second option. Will be charged only part of amount, cause balance to be 0.0"));
- 
+
 $HD_Form -> AddEditElement (gettext("SKIP GROUP"),
         "use_group",
         '$value',
@@ -229,21 +240,21 @@ $resmax = $DBHandle_max -> Execute("SELECT * FROM cc_card_group");
 if ( $resmax )
 	$numrow = $resmax -> RecordCount( );
 
-if ($numrow > 0) { 
+if ($numrow > 0) {
 	$HD_Form -> AddEditElement (gettext("CARD GROUP"),
-		"service",	
-		'$value',	
-		"SELECT",		
+		"service",
+		'$value',
+		"SELECT",
 		'size="10" multiple="multiple"',
-		"",		
-		"",	
-		"sql",		
-		"cards_services",	
-		"name, id",		
+		"",
+		"",
+		"sql",
+		"cards_services",
+		"name, id",
 		"", "", "%1 : (%2)", "", "", "cc_cardgroup_service:id_card_group:cc_card_group LEFT JOIN cc_cardgroup_service ON cc_card_group.id=cc_cardgroup_service.id_card_group:DISTINCT cc_card_group.name, cc_card_group.id: cc_cardgroup_service.id_service = %id:id_service:%2 - (%1)::::%1:id='%1'");
 }
 
-$HD_Form->FieldEditElement('name, amount, rule, daynumber, period, stopmode, maxnumbercycle, status, emailreport, dialplan, operate_mode, use_group');
+$HD_Form->FieldEditElement('name, amount, rule, daynumber, period, stopmode, maxnumbercycle, condition5x, status, emailreport, dialplan, operate_mode, use_group');
 
 if (DB_TYPE == "mysql") {
 	$HD_Form->FG_QUERY_ADITION_HIDDEN_FIELDS = "datecreate ";
@@ -260,7 +271,7 @@ $HD_Form->FG_TEXT_ADITION_CONFIRMATION = gettext("Your new") . " " . $HD_Form->F
 $HD_Form->FG_BUTTON_EDITION_SRC = $HD_Form->FG_BUTTON_ADITION_SRC = Images_Path . "/cormfirmboton.gif";
 $HD_Form->FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form->FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form->FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF'] . "?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form->FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF'] . "?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form->FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF'] . "?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form->FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) . "?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form->FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) . "?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form->FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) . "?atmenu=document&stitle=Document&wh=AC&id=";
 
diff --git a/admin/Public/form_data/FG_var_service_details.inc b/admin/Public/form_data/FG_var_service_details.inc
old mode 100644
new mode 100755
index 21a08479a..d35c8fe51
--- a/admin/Public/form_data/FG_var_service_details.inc
+++ b/admin/Public/form_data/FG_var_service_details.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -57,7 +57,7 @@ $HD_Form -> AddViewElement(gettext("TOTALCARDPERFORM"), "totalcardperform", "20%
 $HD_Form -> FieldViewElement ('name, numberofrun, datelastrun, totalcredit, totalcardperform',0);
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -81,6 +81,6 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
diff --git a/admin/Public/form_data/FG_var_signup_agent.inc b/admin/Public/form_data/FG_var_signup_agent.inc
index 86fd2002a..015660cb9 100644
--- a/admin/Public/form_data/FG_var_signup_agent.inc
+++ b/admin/Public/form_data/FG_var_signup_agent.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -59,13 +59,13 @@ $HD_Form -> FieldViewElement ('code, id_agent, id_tariffgroup ,id_group');
 
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
 $HD_Form -> FG_OTHER_BUTTON1 = true;
 $HD_Form -> FG_OTHER_BUTTON1_ALT = 'URL';
 $HD_Form -> FG_OTHER_BUTTON1_IMG = Images_Path ."/link.png";
-$HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sexyBOX('".$A2B->config['signup']['urlcustomerinterface']."signup.php?key=|col0|',400);";
+$HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:elegantBOX('".$A2B->config['signup']['urlcustomerinterface']."signup.php?key=|col0|',400);";
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF'];
\ No newline at end of file
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL);
\ No newline at end of file
diff --git a/admin/Public/form_data/FG_var_speeddial.inc b/admin/Public/form_data/FG_var_speeddial.inc
old mode 100644
new mode 100755
index 433d2508a..40c96b320
--- a/admin/Public/form_data/FG_var_speeddial.inc
+++ b/admin/Public/form_data/FG_var_speeddial.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -66,7 +66,7 @@ $HD_Form -> AddViewElement(gettext("DATE"), "cc_speeddial.creationdate", "20%",
 $HD_Form -> FieldViewElement ('cc_speeddial.speeddial, cc_speeddial.phone, cc_speeddial.name, cc_speeddial.id_cc_card, cc_speeddial.creationdate');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("NO SPEED DIALS HAVE BEEN CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("NO SPEED DIALS HAVE BEEN CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -77,43 +77,43 @@ $HD_Form -> FG_DELETION = true;
 $HD_Form -> FG_ADDITION = true;
 
 $HD_Form -> AddEditElement (gettext("SPEED DIAL"),
-			   "speeddial",			
-			   "",	
-			   "SELECT",	
-			   "",	
-			   "",	
-			   "", 
+			   "speeddial",
+			   "",
+			   "SELECT",
+			   "",
+			   "",
+			   "",
 			   "list" , "", "",	"", $speeddial_list, "%1", "", "" );
 
 
 $HD_Form -> AddEditElement (gettext("NAME"),
-			   "name",		
-			   '$value',	
-			   "INPUT",	
-			   "size=40 maxlength=50",	
-			   "0",	
+			   "name",
+			   '$value',
+			   "INPUT",
+			   "size=40 maxlength=50",
+			   "0",
 			   gettext("Insert the name"),
 			   "" , "", "",	"", "", "",	"", gettext("Enter the name or label that will identify this speed dial") );
 
 
 $HD_Form -> AddEditElement (gettext("PHONE"),
-			   "phone",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=50",	
-			   "4",	
+			   "phone",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=50",
+			   "4",
 			   gettext("Insert the phone"),
 			   "" , "", "",	"", "", "",	"", gettext("Enter the phone number for the speed dial.") );
 
 
 $HD_Form -> AddEditElement (gettext("ID CARD"),
-			   "id_cc_card",		
-			   "$value",	
-			   "POPUPVALUE",	
-			   "size=30 maxlength=50",	
-			   "4",	
+			   "id_cc_card",
+			   "$value",
+			   "POPUPVALUE",
+			   "size=30 maxlength=50",
+			   "4",
 			   gettext("Insert the Id CardNumber"),
-			    "" , "", "", "", "", 				
+			    "" , "", "", "", "",
 				"A2B_entity_card.php?popup_select=1&"
 				, ", 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 				gettext("Define the card number ID to use."));
@@ -144,7 +144,7 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Once you have completed the form above, click Confirm Data.");
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_statuslog.inc b/admin/Public/form_data/FG_var_statuslog.inc
old mode 100644
new mode 100755
diff --git a/admin/Public/form_data/FG_var_subscriber.inc b/admin/Public/form_data/FG_var_subscriber.inc
old mode 100644
new mode 100755
index 40b35df7f..b600bac83
--- a/admin/Public/form_data/FG_var_subscriber.inc
+++ b/admin/Public/form_data/FG_var_subscriber.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -58,7 +58,7 @@ $HD_Form -> FG_ACTION_SIZE_COLUMN = '15%';
 // added a parameter to append  FG_TABLE_ID  ( by default ) or disable 0.
 $HD_Form -> FieldViewElement ('id_cc_card, id_subscription_fee, startdate, stopdate, product_name');
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." MADE!");  
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." MADE!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -90,7 +90,7 @@ $HD_Form -> AddEditElement (gettext("ACCOUNT ID"),
 				"A2B_entity_card.php?popup_select=1&"
 				, ", 'CardNumberSelection','width=550,height=350,top=20,left=100,scrollbars=1'" ,
 				gettext("Set the Customer ID."));
-		
+
 $HD_Form -> AddEditElement (gettext("ID SUBSCRIPTION SERVICE"),
 				"id_subscription_fee",
 				"",
@@ -109,7 +109,7 @@ $HD_Form -> AddEditElement (gettext("START DATE"),
 				"10",
 				gettext("Insert the start date"),
 				"" , "", "",	"", "", "", "NO-NULL", gettext("please use the format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"), "", "res_display_dateformat");
-	
+
 $HD_Form -> AddEditElement (gettext("STOP DATE"),
 				"stopdate",
 				'$value',
@@ -118,13 +118,13 @@ $HD_Form -> AddEditElement (gettext("STOP DATE"),
 				"10",
 				gettext("Insert the stop date"),
 				"" , "", "",	"", "", "", "NO-NULL", gettext("please use the format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"), "", "res_display_dateformat");
-		
+
 $HD_Form -> AddEditElement (gettext("PRODUCT LABEL"),
-				"product_name",		
-				'',	
-				"TEXTAREA",	
-				"cols=50 rows=4",	
-				"",	
+				"product_name",
+				'',
+				"TEXTAREA",
+				"cols=50 rows=4",
+				"",
 				gettext("Enter the name of the product wich is subscribed"),
 				"" , "", "",	"", "" , "", "", "");
 
@@ -143,8 +143,8 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Once you have completed the form above, click on Confirm Data");
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_subscription.inc b/admin/Public/form_data/FG_var_subscription.inc
old mode 100644
new mode 100755
index 80c5df113..a43a1db44
--- a/admin/Public/form_data/FG_var_subscription.inc
+++ b/admin/Public/form_data/FG_var_subscription.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -74,7 +74,7 @@ $HD_Form -> AddViewElement(gettext("TOTAL CREDIT"), "totalcredit", "10%", "cente
 $HD_Form -> FieldViewElement ('label, fee, status,startdate,stopdate, numberofrun, datelastrun, totalcardperform, totalcredit');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("There are no subscriptions created!");  
+$HD_Form -> CV_NO_FIELDS  = gettext("There are no subscriptions created!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -178,8 +178,8 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_subscription_signup.inc b/admin/Public/form_data/FG_var_subscription_signup.inc
index c04ff3e8f..9815ad76b 100755
--- a/admin/Public/form_data/FG_var_subscription_signup.inc
+++ b/admin/Public/form_data/FG_var_subscription_signup.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -73,14 +73,14 @@ $HD_Form -> FG_ADDITION = true;
 $HD_Form -> FG_EDITION = true;
 $HD_Form -> FG_DELETION = true;
 
-$HD_Form -> AddEditElement ( gettext("LABEL"),	
-		"label",	'$value',	
+$HD_Form -> AddEditElement ( gettext("LABEL"),
+		"label",	'$value',
 		"INPUT",
 		"size=30 maxlength=40",
 		"0",
-		gettext("Insert the provider name"), 
+		gettext("Insert the provider name"),
 		"" , "", "",	"", "", "", "", "" );
-		
+
 $HD_Form -> AddEditElement (gettext("ACTIVATED"),
 	"enable",
 	'1',
@@ -90,7 +90,7 @@ $HD_Form -> AddEditElement (gettext("ACTIVATED"),
 	gettext("Choose if you want to activate this subscriber in the signup"),
 	"" , "", "", "Yes :1, - No:0", "", "", "" , "" );
 
-$CURRENCY = strtoupper(BASE_CURRENCY);	
+$CURRENCY = strtoupper(BASE_CURRENCY);
 $HD_Form -> AddEditElement (gettext("SUBSCRIPTION OPTIONS"),
 	   "id_subscription",
 	   "",
@@ -142,7 +142,7 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
diff --git a/admin/Public/form_data/FG_var_support.inc b/admin/Public/form_data/FG_var_support.inc
index ce8d2af36..82961b387 100755
--- a/admin/Public/form_data/FG_var_support.inc
+++ b/admin/Public/form_data/FG_var_support.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -124,9 +124,9 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_support_component.inc b/admin/Public/form_data/FG_var_support_component.inc
index 0bafed20c..30c2bc8b9 100755
--- a/admin/Public/form_data/FG_var_support_component.inc
+++ b/admin/Public/form_data/FG_var_support_component.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -135,8 +135,8 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_tariffgroup.inc b/admin/Public/form_data/FG_var_tariffgroup.inc
old mode 100644
new mode 100755
index ce5af452f..1af321f47
--- a/admin/Public/form_data/FG_var_tariffgroup.inc
+++ b/admin/Public/form_data/FG_var_tariffgroup.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -81,7 +81,7 @@ if (!$popup_select) {
 }
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!");  
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -108,21 +108,21 @@ if ($popup_select) {
 
 
 $HD_Form -> AddEditElement (gettext("NAME"),
-	"tariffgroupname",		
-	'$value',	
-	"INPUT",	
-	"size=30 maxlength=20",	
-	"9",	
+	"tariffgroupname",
+	'$value',
+	"INPUT",
+	"size=30 maxlength=20",
+	"9",
 	gettext("Insert the Call Plan name "),
 	"" , "", "", "", "", "", "", "" );
 
 
 $HD_Form -> AddEditElement (gettext("LC TYPE"),
-	"lcrtype",				
-	'$value',	
-	"SELECT",	
-	"",	
-	"",	
+	"lcrtype",
+	'$value',
+	"SELECT",
+	"",
+	"",
 	"",
 	"list" , "", "", "", $lcrtype_list, "%1", "", "");
 
@@ -139,35 +139,35 @@ $HD_Form -> AddEditElement(gettext("PACKAGE"),
 
 
 $HD_Form -> AddEditElement (gettext("REMOVE INTER PREFIX"),
-	"removeinterprefix",		
+	"removeinterprefix",
 	'0',
 	"RADIOBUTTON",
-	"",	
-	"",	
+	"",
+	"",
 	gettext("Define if the international prefix will be removed to check the rate."),
 	"" , "", "" , "Yes :1, - No:0", "", "", "", gettext("Remove the international access prefix (00 or 011) before matching the dialled digits with the rate card. E.G. If the dialled digits were 0044 for a call to the UK, only 44 would be delivered."));
 
 
-	
+
 $DBHandle_max  = DbConnect();
 $numrow = 0;
 $resmax = $DBHandle_max -> Execute("SELECT * FROM cc_tariffplan");
 if ( $resmax )
 	$numrow = $resmax -> RecordCount( );
 
-if ($numrow>0){ 
+if ($numrow>0){
 	$HD_Form -> AddEditElement (gettext("RATECARD"),
-		"tariffplan",	
-		'$value',	
-		"SELECT",		
+		"tariffplan",
+		'$value',
+		"SELECT",
 		'size="10" multiple="multiple"',
-		"",		
-		"",	
-		"sql",		
-		"cc_tariffgroup_plan",	
-		"label, id",		
-		"", "", "%1 : (%2)", "", "", "cc_tariffgroup_plan:idtariffplan:cc_tariffplan LEFT JOIN cc_tariffgroup_plan ON cc_tariffplan.id=cc_tariffgroup_plan.idtariffplan:DISTINCT cc_tariffplan.tariffname, cc_tariffplan.id: cc_tariffgroup_plan.idtariffgroup = %id:idtariffgroup:%2 - (%1)::::%1:id='%1'");		
-	
+		"",
+		"",
+		"sql",
+		"cc_tariffgroup_plan",
+		"label, id",
+		"", "", "%1 : (%2)", "", "", "cc_tariffgroup_plan:idtariffplan:cc_tariffplan LEFT JOIN cc_tariffgroup_plan ON cc_tariffplan.id=cc_tariffgroup_plan.idtariffplan:DISTINCT cc_tariffplan.tariffname, cc_tariffplan.id: cc_tariffgroup_plan.idtariffgroup = %id:idtariffgroup:%2 - (%1)::::%1:id='%1'");
+
 }
 
 
@@ -186,9 +186,9 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_tariffplan.inc b/admin/Public/form_data/FG_var_tariffplan.inc
index 3315fd809..b5b940260 100644
--- a/admin/Public/form_data/FG_var_tariffplan.inc
+++ b/admin/Public/form_data/FG_var_tariffplan.inc
@@ -56,6 +56,7 @@ $HD_Form -> FG_FK_TABLENAMES = array("cc_ratecard");
 $HD_Form -> FG_FK_EDITION_CLAUSE = array(" idtariffplan ");
 $HD_Form -> FG_FK_DELETE_MESSAGE = gettext("You are going as well to remove all the rates attached to this ratecard! Please comfirm that you really want to remove this ratecard and those rates ? ");
 
+$trunk_algo_list = Constants::getTrunkAlgo_List();
 
 $HD_Form -> AddViewElement(gettext("ID"), "id", "4%", "center", "sort");
 $HD_Form -> AddViewElement(gettext("TARIFFNAME"), "tariffname", "18%", "center", "sort");
@@ -95,6 +96,7 @@ if ($form_action=="ask-add"){
 	$end_date = date("-m-d H:i:s");
 	$comp_date = "value='".$begin_date.$end_date."'";
 	$comp_date_plus = "value='".$begin_date_plus.$end_date."'";
+	$def_value_trunkalgo = "value='0'";
 }
 
 $HD_Form -> AddEditElement (gettext("START DATE"),
@@ -160,6 +162,45 @@ $HD_Form -> AddEditElement (gettext("CALLERID PREFIX"),
 
 
 $HD_Form -> FieldEditElement ('tariffname, startingdate, expirationdate, id_trunk, description, dnidprefix, calleridprefix');
+$HD_Form -> AddEditElement (gettext("TRUNK SELECT ALGO"),
+	"trunk_algo",
+	'$value',
+	"SELECT",
+	"$def_value_trunkalgo",
+	"",
+	"",
+	"list" , "", "", "", $trunk_algo_list, "%1", "", gettext("Trunk selection algorithm. Use default for the standard functionality."));
+
+$HD_Form -> AddEditElement (gettext("ALGO BREAK CODE(S)"),
+	"algo_break_hc",
+	"$value",
+	"INPUT",
+	"size=100 maxlength=1024",
+	"",
+	"",
+	"", "", "", "", "", "", "", gettext("Use this setting to recognize a hangup cause and break algo if code matches. This field should contain a comma separated list of HANGUPCAUSE codes or be empty to do nothing"));
+
+$DBHandle_max  = DbConnect();
+$numrow = 0;
+$resmax = $DBHandle_max -> Execute("SELECT * FROM cc_trunk");
+if ( $resmax )
+    $numrow = $resmax -> RecordCount( );
+
+if ($numrow>0){ 
+    $HD_Form -> AddEditElement (gettext("TRUNKS"),
+        "trunk",	
+        '$value',	
+        "SELECT",		
+        'size="10" multiple="multiple"',
+        "",		
+        "",	
+        "sql",		
+        "cc_tariffplan_trunk",	
+        "label, id",
+        "", "", "%1 : (%2)", "", "", "cc_tariffplan_trunk:idtrunk:cc_trunk LEFT JOIN cc_tariffplan_trunk ON cc_trunk.id_trunk=cc_tariffplan_trunk.idtrunk:DISTINCT cc_trunk.trunkcode, cc_trunk.id_trunk: cc_tariffplan_trunk.idtariffplan = %id:idtariffplan:%2 - (%1)::::%1:id='%1'");
+}
+	
+$HD_Form -> FieldEditElement ('tariffname, startingdate, expirationdate, id_trunk, description, dnidprefix, calleridprefix, trunk_algo, algo_break_hc');
 
 
 $HD_Form -> FG_INTRO_TEXT_EDITION= gettext("Modify the properties of the rate card.");
@@ -172,8 +213,8 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ". $HD_Form->FG
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT =  gettext("Setup those values to create the new")." ".$HD_Form->FG_INSTANCE_NAME;
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_ticket.inc b/admin/Public/form_data/FG_var_ticket.inc
index 90d0bb3b8..8fec5b1c2 100755
--- a/admin/Public/form_data/FG_var_ticket.inc
+++ b/admin/Public/form_data/FG_var_ticket.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -144,7 +144,7 @@ $HD_Form -> AddEditElement (gettext("TITLE"),
 	"9",
 	gettext("Insert the Title of ticket "),
 	"" , "", "", "", "", "", "", "" );
-	
+
 $HD_Form -> AddEditElement (gettext("COMPONENT"),
    "id_component",
    "",
@@ -200,8 +200,8 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_ticket_agent.inc b/admin/Public/form_data/FG_var_ticket_agent.inc
index f9dd9e0ea..29e58209b 100755
--- a/admin/Public/form_data/FG_var_ticket_agent.inc
+++ b/admin/Public/form_data/FG_var_ticket_agent.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -121,7 +121,7 @@ $HD_Form -> AddEditElement (gettext("TITLE"),
 	"9",
 	gettext("Insert the Title of ticket "),
 	"" , "", "", "", "", "", "", "" );
-	
+
 $HD_Form -> AddEditElement (gettext("COMPONENT"),
    "id_component",
    "",
@@ -177,8 +177,8 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_transactions.inc b/admin/Public/form_data/FG_var_transactions.inc
old mode 100644
new mode 100755
index d4aa712ec..23fd4fe32
--- a/admin/Public/form_data/FG_var_transactions.inc
+++ b/admin/Public/form_data/FG_var_transactions.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -84,7 +84,7 @@ if (isset($filterprefix)  &&  (strlen($filterprefix)>0)){
 $HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this")." ".$HD_Form->FG_INSTANCE_NAME.", ".gettext("click on the delete button.");
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_transactions_agent.inc b/admin/Public/form_data/FG_var_transactions_agent.inc
old mode 100644
new mode 100755
index 91c050a67..f6b302625
--- a/admin/Public/form_data/FG_var_transactions_agent.inc
+++ b/admin/Public/form_data/FG_var_transactions_agent.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -80,7 +80,7 @@ if (isset($filterprefix)  &&  (strlen($filterprefix)>0)){
 $HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this")." ".$HD_Form->FG_INSTANCE_NAME.", ".gettext("click on the delete button.");
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/admin/Public/form_data/FG_var_trunk.inc b/admin/Public/form_data/FG_var_trunk.inc
index 42c59b5b6..769f11094 100644
--- a/admin/Public/form_data/FG_var_trunk.inc
+++ b/admin/Public/form_data/FG_var_trunk.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,13 +27,11 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
-
-
-getpost_ifset(array('id', 'trunkcode', 'trunkprefix', 'removeprefix', 'providertech', 'providerip', 'addparameter','failover_trunk', 'id_provider', 'popup_select', 'inuse', 'maxuse', 'status', 'if_max_use'));
+getpost_ifset(array('id', 'trunkcode', 'trunkprefix', 'removeprefix', 'providertech', 'providerip', 'addparameter','failover_trunk', 'id_provider', 'popup_select', 'inuse', 'maxuse', 'status', 'if_max_use', 'minutes_per_day', 'attempt_condition', 'attempt_statuses', 'attempt_count, attempt_statuses, priority, attempt_delay, calls_per_day', 'trunk_GMT'));
 
 $DBHandle  = DbConnect();
 $instance_table = new Table();
@@ -77,6 +75,13 @@ $maxuse_behaviour_list = array();
 $maxuse_behaviour_list["0"] = array( gettext("Use failover trunk"), "0");
 $maxuse_behaviour_list["1"] = array( gettext("Use next trunk"), "1");
 
+$attempt_cond_list = array();
+$attempt_cond_list["0"] = array( gettext("Dialstatus in the list"), "0");
+$attempt_cond_list["1"] = array( gettext("Dialstatus not in the list"), "1");
+
+$timezone_list = constants::getTimezones_List();
+$timezone_list['0'] = array(gettext("Not set"), '0');
+
 // Dependent Tables
 $HD_Form -> FG_FK_DELETE_ALLOWED = true;
 $HD_Form -> FG_FK_DELETE_CONFIRM = true;
@@ -91,20 +96,29 @@ if ($popup_select) {
 	$HD_Form -> AddViewElement(gettext("ID"), "id_trunk", "7%", "center", "sort");
 	$HD_Form -> AddViewElement(gettext("LABEL"), "trunkcode", "15%", "center", "sort");
 	$HD_Form -> AddViewElement(gettext("PROVIDER"), "id_provider" ,"10%", "center", "sort", "15", "lie", "cc_provider", "provider_name", "id='%id'", "%1");
+	$HD_Form -> AddViewElement(gettext("TOLL FREE"), "tollfree", "5%", "center", "sort", "", "list", Constants::getYesNoList());
 
-	$HD_Form -> FieldViewElement ('id_trunk, trunkcode, id_provider');
+	$HD_Form -> FieldViewElement ('id_trunk, trunkcode, id_provider, tollfree');
 } else {
 	$HD_Form -> AddViewElement(gettext("LABEL"), "trunkcode", "14%", "center", "sort");
 	$HD_Form -> AddViewElement(gettext("ADD_PREFIX"), "trunkprefix", "6%", "center", "sort");
-	$HD_Form -> AddViewElement(gettext("REMOVE_PREFIX"), "removeprefix", "6%", "center", "sort");
+	$HD_Form -> AddViewElement(gettext("REMOVE_PREFIX"), "removeprefix", "2%", "center", "sort");
 	$HD_Form -> AddViewElement(gettext("TECH"), "providertech", "6%", "center", "sort");
 	$HD_Form -> AddViewElement(gettext("IP/HOST"), "providerip" , "14%", "center", "sort");
 	$HD_Form -> AddViewElement(gettext("PROVIDER"), "id_provider" ,"9%", "center", "sort", "15", "lie", "cc_provider", "provider_name", "id='%id'", "%1");
 	$HD_Form -> AddViewElement(gettext("MINUTES USED"), "secondusedreal", "%9", "center", "SORT", "30", "", "", "", "", "", "display_minute");
 	$HD_Form -> AddViewElement(gettext("STATUS"), "status", "7%", "center", "sort", "", "list", $actived_list);
 	$HD_Form -> AddViewElement(gettext("MAXUSE"), "maxuse" , "5%", "center", "sort");
-
-	$HD_Form -> FieldViewElement ('trunkcode, trunkprefix, removeprefix, providertech, providerip, id_provider, secondusedreal, status, maxuse');
+	$HD_Form -> AddViewElement(gettext("Minutes/day"), "minutes_per_day" , "5%", "center", "sort");
+	$HD_Form -> AddViewElement(gettext("Minutes/day used"), "id_trunk" , "5%", "center", "", "", "", "", "", "", "", "display_minute_used");
+	$HD_Form -> AddViewElement(gettext("Whole Minutes/day used"), "id_trunk" , "5%", "center", "", "", "", "", "", "", "", "display_wholeminute_used");
+	$HD_Form -> AddViewElement(gettext("Priority"), "priority" , "5%", "center", "sort");
+	$HD_Form -> AddViewElement(gettext("Calls/day"), "calls_per_day" , "5%", "center", "sort");
+	$HD_Form -> AddViewElement(gettext("Calls/day used"), "id_trunk" , "5%", "center", "", "", "", "", "", "", "", "display_calls_used");
+    $HD_Form -> AddViewElement(gettext("TIMEZONE"), "trunk_GMT", "1%", "center", "SORT", "30", "", "", "", "", "", "display_timezone");
+	$HD_Form -> AddViewElement(gettext("TOLL FREE"), "tollfree", "1%", "center", "sort", "", "list", Constants::getYesNoList());
+
+	$HD_Form -> FieldViewElement ('trunkcode, trunkprefix, removeprefix, providertech, providerip, id_provider, secondusedreal, status, maxuse, minutes_per_day, id_trunk, id_trunk, priority, calls_per_day, id_trunk, trunk_GMT, tollfree');
 }
 
 $HD_Form -> FG_FILTER_SEARCH_FORM = true;
@@ -140,11 +154,25 @@ if ($popup_select) {
 	$HD_Form -> FG_ADDITION = true;
 }
 
+$counters = getTrunkCounters($id);
 $def_value_inuse = '';
 $def_value_maxuse = '';
-if (isset($form_action) && $form_action=="ask-add"){
-	$def_value_inuse = "value='0'";
-	$def_value_maxuse = "value='-1'";
+$def_value_minutes = '';
+$def_value_attempts = '';
+$def_value_statuses = '';
+$def_value_priority = '';
+$def_value_attempt_delay = '';
+$def_value_calls = '';
+if (isset($form_action) && $form_action=="ask-add") {
+    $counters = null;
+    $def_value_inuse = "value='0'";
+    $def_value_maxuse = "value='-1'";
+    $def_value_minutes = "value='0'";
+    $def_value_attempts = "value='0'";
+    $def_value_statuses = "value=''";
+    $def_value_priority = "value='0'";
+    $def_value_attempt_delay = "value='0'";
+    $def_value_calls = "value='0'";
 }
 
 $HD_Form -> AddEditElement (gettext("VOIP-PROVIDER"),
@@ -156,7 +184,7 @@ $HD_Form -> AddEditElement (gettext("VOIP-PROVIDER"),
 	"cc_provider",
 	"provider_name, id",
 	"", "", "%1","", "", '', '<OPTION  value="-1" selected>NOT DEFINED</OPTION>');
-	
+
 $HD_Form -> AddEditElement (gettext("LABEL"),
 	"trunkcode",
 	"$value",
@@ -174,16 +202,16 @@ $HD_Form -> AddEditElement (gettext("ADD PREFIX"),
 	"",
 	gettext("Insert the trunkprefix"),
 	"" , "", "", "", "" , "" , "", gettext("Add a prefix to the dialled digits."));
-	
+
 $HD_Form -> AddEditElement (gettext("REMOVE PREFIX"),
 	"removeprefix",
 	"$value",
 	"INPUT",
-	"size=30 maxlength=20",
+	"size=120",
 	"",
 	gettext("Insert the removeprefix"),
-	"" , "", "", "", "" , "" , "", gettext("Remove prefix from the dialed digits."));
-	
+	"" , "", "", "", "" , "" , "", gettext("Remove prefix from the dialed digits.") . " " . gettext("Supported format: SEARCH_PLAIN[{,}/SEARCH_REGEX/[{-}REPLACEMENT][{-}STOP_FLAG]{,}/SEARCH_REGEX/{,}SEARCH_PLAIN{-}REPLACEMENT{,}etc...] Separators are: {,} - between rules , {-} - between SEARCH and REPLACEMENT rules and STOP sign (if 3rd parameter greater than 0 - than rule process will be stoped if current rule was applied; if / found in the rule - it is being recognized as REGEX; default for REPLACEMENT is empty string; default for STOP_FLAG is zero)."));
+
 $HD_Form -> AddEditElement (gettext("PROVIDER TECH"),
 	"providertech",
 	"$value",
@@ -192,7 +220,7 @@ $HD_Form -> AddEditElement (gettext("PROVIDER TECH"),
 	"0",
 	gettext("Insert the providertech"),
 	"" , "", "", "", "" , "" , "", gettext("Technology used on the trunk (SIP,IAX2,ZAP,H323)"));
-	
+
 $HD_Form -> AddEditElement (gettext("PROVIDER IP"),
 	"providerip",
 	"$value",
@@ -210,7 +238,7 @@ $HD_Form -> AddEditElement (gettext("ADDITIONAL PARAMETER"),
 	"",
 	gettext("Insert Additional parameters"),
 	"" , "", "", "", "" , "" , "", gettext("Define any additional parameters that will be used when running the Dial Command in Asterisk. Use the following tags as variables  %dialingnumber%, %cardnumber%. ie 'D(ww%cardnumber%wwwwwwwwww%dialingnumber%)'"));
-	
+
 $HD_Form -> AddEditElement (gettext("FAILOVER TRUNK"),
 	"failover_trunk",
 	'$value',
@@ -239,7 +267,7 @@ $HD_Form -> AddEditElement (gettext("MAXIMUM CONNECTIONS"),
 	gettext("Number of maximum simultaneous connections"),
 	"" , "", "", "", "", "", "", gettext("The maximum number of channels available to this trunk. Set to -1 to have an unlimited number of channels") );
 
-$HD_Form -> AddEditElement ("IFMAXUSED",
+$HD_Form -> AddEditElement (gettext("IFMAXUSED"),
 	"if_max_use",
 	'$value',
 	"SELECT",
@@ -247,8 +275,8 @@ $HD_Form -> AddEditElement ("IFMAXUSED",
 	"",
 	"",
 	"list" , "", "", "", $maxuse_behaviour_list, "%1" , "", gettext("Specifies which trunk to use when the maximum number of connections is reached"));
-	
-$HD_Form -> AddEditElement ("STATUS",
+
+$HD_Form -> AddEditElement (gettext("STATUS"),
 	"status",
 	'$value',
 	"SELECT",
@@ -257,9 +285,88 @@ $HD_Form -> AddEditElement ("STATUS",
 	"",
 	"list" , "", "", "", $actived_list, "%1" , "", gettext("Define if this trunk is active or not"));
 
+$HD_Form -> AddEditElement (gettext("Minutes/day"),
+	"minutes_per_day",
+	"",
+	"INPUT",
+	"size=9 $def_value_minutes maxlength=30",
+	"12",
+	"",
+	"" , "", "", "", "", "", "", gettext("Number of maximum minutes to the gateway per day, to disable - set to 0 (zero)") . (is_array($counters) ? ". <b>" . sprintf(gettext("Minutes today: %s"), sprintf("%02d", intval($counters['seconds'] / 60)) . ":" . sprintf("%02d", intval($counters['seconds'] % 60))) . sprintf(", Whole minutes today: %ld", $counters['minutes']) . '</b>' : ''));
+
+$HD_Form -> AddEditElement (gettext("Attempts"),
+	"attempt_count",
+	"",
+	"INPUT",
+	"size=9 $def_value_attempts maxlength=30",
+	"12",
+	"",
+	"" , "", "", "", "", "", "", gettext("Additional attempts according attempt condition, to disable - set to 0 (zero)"));
+
+$HD_Form -> AddEditElement (gettext("Attempt condition"),
+	"attempt_condition",
+	'$value',
+	"SELECT",
+	"",
+	"",
+	"",
+	"list" , "", "", "", $attempt_cond_list, "%1" , "", gettext("Condition for checking the dialstatus in list"));
+
+$HD_Form -> AddEditElement (gettext("Attempt dial status(es) list"),
+	"attempt_statuses",
+	"$value",
+	"INPUT",
+	"size=100 $def_value_statuses maxlength=255",
+	"",
+	"",
+	"" , "", "", "", "", "", "", gettext("The list of dialstatuses (comma (,) as separator). Use any of: ANSWER,BUSY,NOANSWER,CONGESTION,CHANUNAVAIL,DONTCALL,TORTURE,INVALIDARGS,CANCEL. If empty - does nothing..."));
 
-$HD_Form -> FieldEditElement ('id_provider, trunkcode, trunkprefix, removeprefix, providertech, providerip, addparameter, failover_trunk, inuse, maxuse, if_max_use, status');
+$HD_Form -> AddEditElement (gettext("Priority"),
+	"priority",
+	"",
+	"INPUT",
+	"size=9 $def_value_priority maxlength=30",
+	"12",
+	"",
+	"" , "", "", "", "", "", "", gettext("Trunk select priority for tariffplan algorithm"));
+
+$HD_Form -> AddEditElement (gettext("Attempt delay"),
+	"attempt_delay",
+	"",
+	"INPUT",
+	"size=9 $def_value_attempt_delay maxlength=30",
+	"12",
+	"",
+	"" , "", "", "", "", "", "", gettext("Delay between calls to the trunk in seconds, to disable - set to 0 (zero)"));
+
+$HD_Form -> AddEditElement (gettext("Calls/day"),
+	"calls_per_day",
+	"",
+	"INPUT",
+	"size=9 $def_value_calls maxlength=30",
+	"12",
+	"",
+	"" , "", "", "", "", "", "", gettext("Number of maximum success calls to the gateway per day, to disable - set to 0 (zero)") . (is_array($counters) ? ". <b>" . sprintf(gettext("Calls today: %s"), $counters['success_calls']) . '</b>' : ''));
+
+$HD_Form -> AddEditElement (gettext("Timezone"),
+	"trunk_GMT",
+	'$value',
+	"SELECT",
+	"",
+	"",
+	"",
+	"list" , "", "", "", $timezone_list, "%1" , "", gettext("Trunk timezone"));
+
+$HD_Form -> AddEditElement (gettext("TOLL FREE"),
+	"tollfree",
+	'0',
+	"RADIOBUTTON",
+	"",
+	"",
+	gettext("Choose if this provider is toll free"),
+	"" , "", "", "Yes:1, - No:0", "", "" , "", gettext("Define if you want to apply toll free logic"));
 
+$HD_Form -> FieldEditElement ('id_provider, trunkcode, trunkprefix, removeprefix, providertech, providerip, addparameter, failover_trunk, inuse, maxuse, if_max_use, status, minutes_per_day, attempt_count, attempt_condition, attempt_statuses, priority, attempt_delay, calls_per_day, trunk_GMT, tollfree');
 
 $HD_Form -> FG_INTRO_TEXT_EDITION= gettext("Modify the properties of the trunk below.");
 $HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this")." ".$HD_Form->FG_INSTANCE_NAME.", ".gettext("click on the delete button.");
@@ -271,8 +378,8 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = 'Fill correctly the fields to add a new '.$HD_Form->FG_INSTANCE_NAME;
 
-//$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+//$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/admin/Public/form_data/FG_var_user.inc b/admin/Public/form_data/FG_var_user.inc
old mode 100644
new mode 100755
index a14d6f940..99855627b
--- a/admin/Public/form_data/FG_var_user.inc
+++ b/admin/Public/form_data/FG_var_user.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -66,7 +66,7 @@ $HD_Form ->FG_LIST_ADDING_BUTTON_IMG1 = $ADDING_BUTTON_IMG1;
 
 if (is_numeric($groupID)) {
 	$FG_TABLE_CLAUSE = "groupid='$groupID'";
-} 
+}
 //else select all
 
 $HD_Form -> FG_TABLE_CLAUSE = $FG_TABLE_CLAUSE;
@@ -114,7 +114,7 @@ $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
 
 
 if (!$popup_select) {
-	$HD_Form -> FG_ADDITION = true;	
+	$HD_Form -> FG_ADDITION = true;
 	$HD_Form -> FG_INFO = true;
 	$HD_Form -> FG_INFO_LINK = "A2B_admin_info.php?groupID=$groupID&id=";
 }
@@ -122,7 +122,7 @@ if (!$popup_select) {
 if (has_rights (ACX_MODIFY_ADMINS) && !($popup_select)) {
 	$HD_Form -> FG_DELETION = true;
 	$HD_Form -> FG_EDITION = true;
-	
+
 	if ($form_action!="ask-add" && $form_action!="add") {
 		$HD_Form -> AddEditElement (gettext("USERID"),
 			"userid",
@@ -133,7 +133,7 @@ if (has_rights (ACX_MODIFY_ADMINS) && !($popup_select)) {
 			gettext("Insert the userid"),
 			"" , "", "", "", "", "", "", "" );
 	}
-	
+
 	$HD_Form -> AddEditElement (gettext("LOGIN"),
 		"login",
 		'$value',
@@ -142,16 +142,16 @@ if (has_rights (ACX_MODIFY_ADMINS) && !($popup_select)) {
 		"3",
 		gettext("Insert the username"),
 		"" , "", "", "", "" , "", "", "");
-		
+
 	$HD_Form -> AddEditElement (gettext("PASSWORD"),
 		"pwd_encoded",
 		'$value',
 		"INPUT",
-		"type=password size=30 maxlength=15",
+		"type=password size=30 maxlength=30",
 		"3",
 		gettext("Insert the Reseller password"),
 		"" , "", "", "", "", "", "", "");
-	
+
 	if ($groupID!="0") {
 		$HD_Form -> AddEditElement (gettext("PERMISSION"),
 			"perms",
@@ -162,8 +162,8 @@ if (has_rights (ACX_MODIFY_ADMINS) && !($popup_select)) {
 			"list", "", "description, id", "", $right_list, "%1" , "",
 			gettext("To select several rights in the above ListBox, hold the CTRL key down while clicking the items") );
 	}
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("NAME"),
 		"name",
 		'$value',
@@ -172,7 +172,7 @@ if (has_rights (ACX_MODIFY_ADMINS) && !($popup_select)) {
 		"",
 		gettext("Insert the name"),
 		"" , "", "", "", "", "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("ADDRESS"),
 		"direction",
 		'$value',
@@ -189,7 +189,7 @@ if (has_rights (ACX_MODIFY_ADMINS) && !($popup_select)) {
 		"",
 		gettext("Insert the country"),
 		"" , "", "", "", "" , "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("ZIPCODE"),
 		"zipcode",
 		'$value',
@@ -198,7 +198,7 @@ if (has_rights (ACX_MODIFY_ADMINS) && !($popup_select)) {
 		"",
 		gettext("Insert the zip code"),
 		"" , "", "", "", "", "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("STATE"),
 		"state",
 		'$value',
@@ -215,7 +215,7 @@ if (has_rights (ACX_MODIFY_ADMINS) && !($popup_select)) {
 		"",
 		gettext("Insert the country"),
 		"" , "", "", "", "" , "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("PHONE"),
 		"phone",
 		'$value',
@@ -224,7 +224,7 @@ if (has_rights (ACX_MODIFY_ADMINS) && !($popup_select)) {
 		"",
 		gettext("Insert the telephone number"),
 		"" , "", "", "", "" , "", "", "");
-	
+
 	$HD_Form -> AddEditElement (gettext("FAX"),
 		"fax",
 		'$value',
@@ -241,8 +241,8 @@ if (has_rights (ACX_MODIFY_ADMINS) && !($popup_select)) {
 		"",
 		gettext("Insert the email"),
 		"" , "", "", "", "" , "", "", "");
-		
-	
+
+
 	if (($groupID=="2") || ($groupID=="3")) {
 		if ($groupID=="2") {
 			$HD_Form -> AddEditElement ("UserID",
@@ -266,36 +266,36 @@ if (has_rights (ACX_MODIFY_ADMINS) && !($popup_select)) {
 				"groupID='1'", "", "%2 (%1)", "", "" );
 		}
 	}
-	
+
 	if ($form_action!="ask-add" && $form_action!="add") {
 	        $FG_QUERY_EDITION='userid, ';
 	}
-	
+
 	$FG_QUERY_EDITION .= 'login, ';
-	
+
 	$FG_QUERY_EDITION .='pwd_encoded,  ';
-	
+
 	if ($groupID!="0") {
 		$FG_QUERY_EDITION .= 'perms, ';
 	}
-	
+
 	$FG_QUERY_EDITION .= 'name, direction,city, zipcode, state,country, phone, fax,email';
-	
+
 	$HD_Form -> FieldEditElement ($FG_QUERY_EDITION);
-	
+
 	$HD_Form -> FG_EDITION_CLAUSE = " userid='%id'";
-	
+
 	if (is_numeric($groupID)) {
 		$HD_Form -> FG_QUERY_ADITION_HIDDEN_FIELDS .= "groupID";
 		$HD_Form -> FG_QUERY_ADITION_HIDDEN_VALUE  .= "$groupID";
-	
+
 		$HD_Form -> FG_QUERY_EDITION_HIDDEN_FIELDS  = "groupID";
 		$HD_Form -> FG_QUERY_EDITION_HIDDEN_VALUE   = "$groupID";
-	
+
 		if ($groupID=="0") {
 			$HD_Form -> FG_QUERY_ADITION_HIDDEN_FIELDS .= ", perms";
 			$HD_Form -> FG_QUERY_ADITION_HIDDEN_VALUE  .= ", 5242879";
-	
+
 			$HD_Form -> FG_QUERY_EDITION_HIDDEN_FIELDS .= ", perms";
 			$HD_Form -> FG_QUERY_EDITION_HIDDEN_VALUE  .= ", 5242879";
 		}
@@ -303,33 +303,33 @@ if (has_rights (ACX_MODIFY_ADMINS) && !($popup_select)) {
 		$HD_Form -> FG_QUERY_ADITION_HIDDEN_FIELDS .= "groupID";
 		$HD_Form -> FG_QUERY_ADITION_HIDDEN_VALUE  .= "1";
 	}
-	
+
 	if (($popup_select>=1)){
 		$HD_Form -> FG_OTHER_BUTTON1 = true;
 		$HD_Form -> FG_OTHER_BUTTON1_ALT = '<font color="red">&lt;select&gt;</font>';
 		$HD_Form -> FG_OTHER_BUTTON1_IMG = '';
-		
+
 		if ($popup_select==1) {
 			$HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|param|');";
 		}
 	}
-	
+
 	$HD_Form -> FG_INTRO_TEXT_EDITION= gettext("Modify the properties of the")." ".$HD_Form->FG_INSTANCE_NAME;
 	$HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this")." ".$HD_Form->FG_INSTANCE_NAME.", ".gettext("click on the delete button.");
 	$HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new")." ".$HD_Form->FG_INSTANCE_NAME.".<br>".gettext("Fill the following fields and confirm by clicking on the button add.");
-	
-	
+
+
 	$HD_Form -> FG_INTRO_TEXT_ADITION = '';
 	$HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_INSTANCE_NAME." ".gettext("has been inserted.")."<br>";
-	
-	
+
+
 	$HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 	$HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
-	
-	
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION = $_SERVER['PHP_SELF']."?atmenu=user&groupID=$groupID&stitle=Administrator+management&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=user&groupID=$groupID&stitle=Administrator+management&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=user&groupID=$groupID&stitle=Administrator+management&id=";
-	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=user&groupID=$groupID&stitle=Administrator+management&id=";
+
+
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=user&groupID=$groupID&stitle=Administrator+management&id=";
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=user&groupID=$groupID&stitle=Administrator+management&id=";
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=user&groupID=$groupID&stitle=Administrator+management&id=";
+	$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=user&groupID=$groupID&stitle=Administrator+management&id=";
 }
 
diff --git a/admin/Public/form_data/FG_var_voucher.inc b/admin/Public/form_data/FG_var_voucher.inc
index 1a22b08fb..8e98e8bab 100644
--- a/admin/Public/form_data/FG_var_voucher.inc
+++ b/admin/Public/form_data/FG_var_voucher.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -126,31 +126,31 @@ if ($form_action=="ask-add") {
 }
 
 $HD_Form -> AddEditElement (gettext("VOUCHER"),
-   "voucher",			
-   "$value",	
+   "voucher",
+   "$value",
    "INPUT",
-	"size=20 $maxi readonly maxlength=40",	 
-   "4",	
+	"size=20 $maxi readonly maxlength=40",
+   "4",
    gettext("Insert the voucher"),
    "" , "", "",	"", "" , "", "", "");
 
 
 $HD_Form -> AddEditElement (gettext("AMOUNT"),
    "credit",
-   '$value',	
-   "INPUT",	
-   "size=30 maxlength=30",	
+   '$value',
+   "INPUT",
+   "size=30 maxlength=30",
    "12",
    gettext("Insert the number of credit"),
    "" , "", "",	"", "", "",	"", "" );
 
 
 $HD_Form -> AddEditElement (gettext("TAG"),
-   "tag",			
-   '$value',	
+   "tag",
+   '$value',
    "INPUT",
-   "size=30 maxlength=30",	
-   "11",	
+   "size=30 maxlength=30",
+   "11",
    gettext("Insert the tag"),
    "" , "", "",	"", "", "", "NO-NULL", "" );
 
@@ -158,8 +158,8 @@ $HD_Form -> AddEditElement (gettext("TAG"),
 $HD_Form -> AddEditElement (gettext("ACTIVATED"),
 	"activated",
 	't',
-	"RADIOBUTTON",	
-	"",	
+	"RADIOBUTTON",
+	"",
 	"",
 	gettext("Choose if you want to activate this card"),
 	"" , "", "" ,"Yes :t, - No:f", "", "" , "" , "");
@@ -176,7 +176,7 @@ $HD_Form -> AddEditElement (gettext("CURRENCY"),
 
 if ($form_action=="ask-add") {
 	$begin_date = date("Y");
-	$begin_date_plus = date("Y")+10;
+	$begin_date_plus = date("Y") + 10;
 	$end_date = date("-m-d H:i:s");
 	$comp_date = "value='".$begin_date.$end_date."'";
 	$comp_date_plus = "value='".$begin_date_plus.$end_date."'";
@@ -187,7 +187,7 @@ $HD_Form -> AddEditElement (gettext("EXPIRY DATE"),
 	"expirationdate",
 	'$value',
 	"INPUT",
-	"size=40 maxlength=40  $comp_date_plus",	
+	"size=40 maxlength=40  $comp_date_plus",
 	"10",
 	gettext("Insert the expiration date"),
 	"" , "", "",	"", "", "", "", gettext("Format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"), null, "res_display_dateformat" );
@@ -216,7 +216,7 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$Form->FG_INS
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue.");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
diff --git a/admin/Public/graph_hourdetail.php b/admin/Public/graph_hourdetail.php
old mode 100644
new mode 100755
index cbeea0de6..2c20594e0
--- a/admin/Public/graph_hourdetail.php
+++ b/admin/Public/graph_hourdetail.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/graph_pie.php b/admin/Public/graph_pie.php
old mode 100644
new mode 100755
index f5f9811d7..e21ee7426
--- a/admin/Public/graph_pie.php
+++ b/admin/Public/graph_pie.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -88,11 +88,7 @@
 
 $SQLcmd = '';
 
-if (isset ($dst) && ($dst > 0)) {
-    if (strlen($SQLcmd) > 0)
-        $SQLcmd .= " AND ";
-    $SQLcmd .= " calledstation='$dst' ";
-}
+$SQLcmd = do_field ( $SQLcmd, 'dst', 'calledstation' );
 
 if (isset ($customer) && ($customer > 0)) {
     if (strlen($SQLcmd) > 0)
@@ -207,14 +203,16 @@
         $at_least_one_data = true;
 
 }
-if (!$at_least_one_data)
+
+if (!$at_least_one_data) {
     $data[0] = 1;
+}
 
 /**************************************/
 
 $data = array_reverse($data);
 
-$graph = new PieGraph(475, 200, "auto");
+$graph = new PieGraph(800, 300, "auto");
 $graph->SetShadow();
 
 $graph->title->Set($title_graph);
@@ -222,7 +220,8 @@
 
 $p1 = new PiePlot3D($data);
 $p1->ExplodeSlice(2);
-$p1->SetCenter(0.35);
+// $p1->SetCenter(0.35);
+$p1->SetCenter(0.4, 0.4);
 //print_r($gDateLocale->GetShortMonth());
 //Array ( [0] => Jan [1] => Feb [2] => Mar [3] => Apr [4] => May [5] => Jun [6] => Jul [7] => Aug [8] => Sep [9] => Oct [10] => Nov [11] => Dec )
 //$p1->SetLegends($gDateLocale->GetShortMonth());
diff --git a/admin/Public/graph_stat.php b/admin/Public/graph_stat.php
old mode 100644
new mode 100755
index 52cc30399..8f9e113dc
--- a/admin/Public/graph_stat.php
+++ b/admin/Public/graph_stat.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/graph_statbar.php b/admin/Public/graph_statbar.php
old mode 100644
new mode 100755
index 8026b1207..c7cf4c249
--- a/admin/Public/graph_statbar.php
+++ b/admin/Public/graph_statbar.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/importsamples.php b/admin/Public/importsamples.php
old mode 100644
new mode 100755
index c6d298115..a545aaf55
--- a/admin/Public/importsamples.php
+++ b/admin/Public/importsamples.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/index.php b/admin/Public/index.php
old mode 100644
new mode 100755
index 3ff1aff27..97281f9e8
--- a/admin/Public/index.php
+++ b/admin/Public/index.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/logout.php b/admin/Public/logout.php
old mode 100644
new mode 100755
index 806ed073b..39f0bab5b
--- a/admin/Public/logout.php
+++ b/admin/Public/logout.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/modules/calls_counts.php b/admin/Public/modules/calls_counts.php
old mode 100644
new mode 100755
index fbf8d3785..d4e4af95d
--- a/admin/Public/modules/calls_counts.php
+++ b/admin/Public/modules/calls_counts.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/modules/calls_lastmonth.php b/admin/Public/modules/calls_lastmonth.php
old mode 100644
new mode 100755
index 5a5103c92..de65fec6d
--- a/admin/Public/modules/calls_lastmonth.php
+++ b/admin/Public/modules/calls_lastmonth.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/modules/customers_lastmonth.php b/admin/Public/modules/customers_lastmonth.php
old mode 100644
new mode 100755
index f3279c8e5..7d6bd25ea
--- a/admin/Public/modules/customers_lastmonth.php
+++ b/admin/Public/modules/customers_lastmonth.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/modules/customers_numbers.php b/admin/Public/modules/customers_numbers.php
old mode 100644
new mode 100755
index 7258a87c0..ab838f5d7
--- a/admin/Public/modules/customers_numbers.php
+++ b/admin/Public/modules/customers_numbers.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/modules/news.php b/admin/Public/modules/news.php
old mode 100644
new mode 100755
index c7c8a46ab..68183ef4c
--- a/admin/Public/modules/news.php
+++ b/admin/Public/modules/news.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/modules/payments_lastmonth.php b/admin/Public/modules/payments_lastmonth.php
old mode 100644
new mode 100755
index 660f3d1eb..bec3e7c7e
--- a/admin/Public/modules/payments_lastmonth.php
+++ b/admin/Public/modules/payments_lastmonth.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/modules/refills_lastmonth.php b/admin/Public/modules/refills_lastmonth.php
old mode 100644
new mode 100755
index 59ee98454..89578f716
--- a/admin/Public/modules/refills_lastmonth.php
+++ b/admin/Public/modules/refills_lastmonth.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/modules/system_info.php b/admin/Public/modules/system_info.php
index 611799b4c..bbea5b43e 100755
--- a/admin/Public/modules/system_info.php
+++ b/admin/Public/modules/system_info.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/phpconfig.php b/admin/Public/phpconfig.php
old mode 100644
new mode 100755
index 0e7c66180..f8fae39b8
--- a/admin/Public/phpconfig.php
+++ b/admin/Public/phpconfig.php
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -46,7 +46,7 @@
  *          Rob Birkinshaw <robert.birkinshaw@utah.edu>
  */
 
-// add for a2billing 
+// add for a2billing
 include_once ("../lib/admin.defines.php");
 include_once ("../lib/admin.module.access.php");
 include_once ("../lib/regular_express.inc");
@@ -59,6 +59,9 @@
 	die();
 }
 
+getpost_ifset(array('tryUpdate', 'themd5', 'updateSection', 'section_text'));
+
+
 check_demo_mode_intro();
 
 require_once ("phpconfig_init.php");
@@ -126,7 +129,7 @@
 
 		// side menu population of file sections
 		foreach ($conf->_OC_the_sections as $record) {
-			$menuList[$record[0]] = $_SERVER['PHP_SELF'] . "?file=" . $_GET['file'] . "&section_conf=$record[0]";
+			$menuList[$record[0]] = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) . "?file=" . $_GET['file'] . "&section_conf=$record[0]";
 		}
 
 		if ($_GET['section_conf']) // sidemenu link was clicked (edit section)
@@ -159,14 +162,14 @@
 			}
 
 		}
-		elseif ($_POST['tryUpdate']) // update button pushed from edit section page
+		elseif ($tryUpdate) // update button pushed from edit section page
 		{
 			// create HTML header and left menu
 			$page->OC_HTML_doHtmlHeader_a2billing($smarty);
 			$page->OC_HTML_doSideMenu($menuList);
 
 			// attempt to write the changes
-			$result = $conf->OC_writeConfSection($_POST['themd5'], $_POST['updateSection'], $_POST['section_text']);
+			$result = $conf->OC_writeConfSection($themd5, $updateSection, $section_text);
 
 			if (!$result) {
 				echo "Write failed!<br>";
@@ -233,7 +236,7 @@
 
 	if ($files) {
 		foreach ($files as $file) {
-			$menuList[$file] = $_SERVER['PHP_SELF'] . "?file=$file&section_conf=$file";
+			$menuList[$file] = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) . "?file=$file&section_conf=$file";
 			// HTML output
 			$page->OC_HTML_setMenuList($menuList);
 		}
diff --git a/admin/Public/phpconfig_init.php b/admin/Public/phpconfig_init.php
old mode 100644
new mode 100755
index dc65152fb..a24e4e82b
--- a/admin/Public/phpconfig_init.php
+++ b/admin/Public/phpconfig_init.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/admin/Public/templates/default/css/index.php b/admin/Public/templates/default/css/index.php
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/css/main.css b/admin/Public/templates/default/css/main.css
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/css/menu.css b/admin/Public/templates/default/css/menu.css
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/css/popup.css b/admin/Public/templates/default/css/popup.css
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/css/style-ie.css b/admin/Public/templates/default/css/style-ie.css
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/footer.tpl b/admin/Public/templates/default/footer.tpl
old mode 100644
new mode 100755
index 97177ab50..37f1d92f1
--- a/admin/Public/templates/default/footer.tpl
+++ b/admin/Public/templates/default/footer.tpl
@@ -1,14 +1,14 @@
 
 			</div>
-			
+
 			<div id="footer"><div style=" border: solid 1px #C3C3C3;"><div style=" border: solid 1px #F4F4F4; text-align:center;">{$COPYRIGHT}</div></div></div>
-		
+
 		</div>
-		
+
 		<div style="clear: both;"></div>
-	
+
 	</div>
-	
+
 	<br><br>
 	{include file="profiler.tpl"}
 
diff --git a/admin/Public/templates/default/header.tpl b/admin/Public/templates/default/header.tpl
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/OSicon/Arch.png b/admin/Public/templates/default/images/OSicon/Arch.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/OSicon/Ubuntu.png b/admin/Public/templates/default/images/OSicon/Ubuntu.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/OSicon/xp.png b/admin/Public/templates/default/images/OSicon/xp.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/a2b-logo-450.png b/admin/Public/templates/default/images/a2b-logo-450.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/animated_favicon1.gif b/admin/Public/templates/default/images/animated_favicon1.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/back.png b/admin/Public/templates/default/images/back.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/back_button_over.gif b/admin/Public/templates/default/images/back_button_over.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/background_cells.gif b/admin/Public/templates/default/images/background_cells.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/background_cells_red.gif b/admin/Public/templates/default/images/background_cells_red.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/bg-menu-down.png b/admin/Public/templates/default/images/bg-menu-down.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/bg-menu-middle.png b/admin/Public/templates/default/images/bg-menu-middle.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/bg-menu-up.png b/admin/Public/templates/default/images/bg-menu-up.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/blueshade.png b/admin/Public/templates/default/images/blueshade.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/btn_Delete_94x20.gif b/admin/Public/templates/default/images/btn_Delete_94x20.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/button_buynow.gif b/admin/Public/templates/default/images/button_buynow.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/button_cancel.gif b/admin/Public/templates/default/images/button_cancel.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/button_confirm_order.gif b/admin/Public/templates/default/images/button_confirm_order.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/button_continue.gif b/admin/Public/templates/default/images/button_continue.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/button_update.gif b/admin/Public/templates/default/images/button_update.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/cal.gif b/admin/Public/templates/default/images/cal.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/call-labs.com.png b/admin/Public/templates/default/images/call-labs.com.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/call-labs.png b/admin/Public/templates/default/images/call-labs.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/chart_bar.png b/admin/Public/templates/default/images/chart_bar.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/chart_curve.png b/admin/Public/templates/default/images/chart_curve.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/chart_line.png b/admin/Public/templates/default/images/chart_line.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/chart_pie.png b/admin/Public/templates/default/images/chart_pie.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/cog.png b/admin/Public/templates/default/images/cog.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/cog_add.png b/admin/Public/templates/default/images/cog_add.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/cog_delete.png b/admin/Public/templates/default/images/cog_delete.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/cog_edit.png b/admin/Public/templates/default/images/cog_edit.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/cog_error.png b/admin/Public/templates/default/images/cog_error.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/cog_go.png b/admin/Public/templates/default/images/cog_go.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/connected.gif b/admin/Public/templates/default/images/connected.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/cross.gif b/admin/Public/templates/default/images/cross.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/del.png b/admin/Public/templates/default/images/del.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/details.gif b/admin/Public/templates/default/images/details.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/dl.gif b/admin/Public/templates/default/images/dl.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/down.png b/admin/Public/templates/default/images/down.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/down_black.png b/admin/Public/templates/default/images/down_black.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/edit.gif b/admin/Public/templates/default/images/edit.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/email03.gif b/admin/Public/templates/default/images/email03.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/excel.gif b/admin/Public/templates/default/images/excel.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/exclamation.png b/admin/Public/templates/default/images/exclamation.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/favicon.ico b/admin/Public/templates/default/images/favicon.ico
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/ae.gif b/admin/Public/templates/default/images/flags/ae.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/br.gif b/admin/Public/templates/default/images/flags/br.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/cn.gif b/admin/Public/templates/default/images/flags/cn.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/cz.gif b/admin/Public/templates/default/images/flags/cz.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/de.gif b/admin/Public/templates/default/images/flags/de.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/dk.gif b/admin/Public/templates/default/images/flags/dk.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/es.gif b/admin/Public/templates/default/images/flags/es.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/fi.gif b/admin/Public/templates/default/images/flags/fi.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/fr.gif b/admin/Public/templates/default/images/flags/fr.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/gb.gif b/admin/Public/templates/default/images/flags/gb.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/gr.gif b/admin/Public/templates/default/images/flags/gr.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/it.gif b/admin/Public/templates/default/images/flags/it.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/jp.gif b/admin/Public/templates/default/images/flags/jp.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/nl.gif b/admin/Public/templates/default/images/flags/nl.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/pk.gif b/admin/Public/templates/default/images/flags/pk.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/pl.gif b/admin/Public/templates/default/images/flags/pl.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/pt.gif b/admin/Public/templates/default/images/flags/pt.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/ro.gif b/admin/Public/templates/default/images/flags/ro.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/ru.gif b/admin/Public/templates/default/images/flags/ru.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/tr.gif b/admin/Public/templates/default/images/flags/tr.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/flags/us.gif b/admin/Public/templates/default/images/flags/us.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/forward.png b/admin/Public/templates/default/images/forward.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/gbottom.png b/admin/Public/templates/default/images/gbottom.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/group.png b/admin/Public/templates/default/images/group.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/group_add.png b/admin/Public/templates/default/images/group_add.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/gtop.png b/admin/Public/templates/default/images/gtop.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/icon-card.png b/admin/Public/templates/default/images/icon-card.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/icon-info.gif b/admin/Public/templates/default/images/icon-info.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/icon-release.gif b/admin/Public/templates/default/images/icon-release.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/icon-restore.gif b/admin/Public/templates/default/images/icon-restore.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/icon-viewdetails.gif b/admin/Public/templates/default/images/icon-viewdetails.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/icon_refresh.gif b/admin/Public/templates/default/images/icon_refresh.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/icons_xml.gif b/admin/Public/templates/default/images/icons_xml.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/index.php b/admin/Public/templates/default/images/index.php
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/key-menu_back.gif b/admin/Public/templates/default/images/key-menu_back.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/key-menu_bl.gif b/admin/Public/templates/default/images/key-menu_bl.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/key-menu_br.gif b/admin/Public/templates/default/images/key-menu_br.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/key-menu_tl.gif b/admin/Public/templates/default/images/key-menu_tl.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/key-menu_tr.gif b/admin/Public/templates/default/images/key-menu_tr.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/key-point_back.gif b/admin/Public/templates/default/images/key-point_back.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/key-point_bl.gif b/admin/Public/templates/default/images/key-point_bl.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/key-point_br.gif b/admin/Public/templates/default/images/key-point_br.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/key-point_tl.gif b/admin/Public/templates/default/images/key-point_tl.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/key-point_tr.gif b/admin/Public/templates/default/images/key-point_tr.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/3d.gif b/admin/Public/templates/default/images/kicons/3d.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/accessibility-directory.gif b/admin/Public/templates/default/images/kicons/accessibility-directory.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/acroread.gif b/admin/Public/templates/default/images/kicons/acroread.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/apply.gif b/admin/Public/templates/default/images/kicons/apply.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/authorize.gif b/admin/Public/templates/default/images/kicons/authorize.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/back.gif b/admin/Public/templates/default/images/kicons/back.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/backup.gif b/admin/Public/templates/default/images/kicons/backup.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/blockdevice.gif b/admin/Public/templates/default/images/kicons/blockdevice.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/bug.gif b/admin/Public/templates/default/images/kicons/bug.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/button_cancel.gif b/admin/Public/templates/default/images/kicons/button_cancel.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/button_ok.gif b/admin/Public/templates/default/images/kicons/button_ok.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/cache.gif b/admin/Public/templates/default/images/kicons/cache.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/calc.gif b/admin/Public/templates/default/images/kicons/calc.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/clanbomber.gif b/admin/Public/templates/default/images/kicons/clanbomber.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/clear_left.gif b/admin/Public/templates/default/images/kicons/clear_left.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/clock.gif b/admin/Public/templates/default/images/kicons/clock.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/config-date.gif b/admin/Public/templates/default/images/kicons/config-date.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/config-language.gif b/admin/Public/templates/default/images/kicons/config-language.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/connect_to_network.gif b/admin/Public/templates/default/images/kicons/connect_to_network.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/date.gif b/admin/Public/templates/default/images/kicons/date.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/desktop.gif b/admin/Public/templates/default/images/kicons/desktop.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/exec.gif b/admin/Public/templates/default/images/kicons/exec.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/favorites.gif b/admin/Public/templates/default/images/kicons/favorites.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/favorites_16.gif b/admin/Public/templates/default/images/kicons/favorites_16.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/favorites_24.gif b/admin/Public/templates/default/images/kicons/favorites_24.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/file-manager.gif b/admin/Public/templates/default/images/kicons/file-manager.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/folder_open.gif b/admin/Public/templates/default/images/kicons/folder_open.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/folder_red_open.gif b/admin/Public/templates/default/images/kicons/folder_red_open.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/gkrellm2.gif b/admin/Public/templates/default/images/kicons/gkrellm2.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/gnome-calculator.gif b/admin/Public/templates/default/images/kicons/gnome-calculator.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/gnome-finance.gif b/admin/Public/templates/default/images/kicons/gnome-finance.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/gnome-globe.gif b/admin/Public/templates/default/images/kicons/gnome-globe.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/gnome-other.gif b/admin/Public/templates/default/images/kicons/gnome-other.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/gnome-settings.gif b/admin/Public/templates/default/images/kicons/gnome-settings.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/gnome-shutdown.gif b/admin/Public/templates/default/images/kicons/gnome-shutdown.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/help.gif b/admin/Public/templates/default/images/kicons/help.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/help_index.gif b/admin/Public/templates/default/images/kicons/help_index.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/hwbrowser.gif b/admin/Public/templates/default/images/kicons/hwbrowser.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/icon-db-user.gif b/admin/Public/templates/default/images/kicons/icon-db-user.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/icon-media.gif b/admin/Public/templates/default/images/kicons/icon-media.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/icon-speaker.gif b/admin/Public/templates/default/images/kicons/icon-speaker.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/identity.gif b/admin/Public/templates/default/images/kicons/identity.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/im-nov.gif b/admin/Public/templates/default/images/kicons/im-nov.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/index.php b/admin/Public/templates/default/images/kicons/index.php
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/kate.gif b/admin/Public/templates/default/images/kicons/kate.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/kchart.gif b/admin/Public/templates/default/images/kicons/kchart.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/kchart_chrt.gif b/admin/Public/templates/default/images/kicons/kchart_chrt.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/kcmdf.gif b/admin/Public/templates/default/images/kicons/kcmdf.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/kdmconfig.gif b/admin/Public/templates/default/images/kicons/kdmconfig.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/kfind.gif b/admin/Public/templates/default/images/kicons/kfind.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/kfm_home.gif b/admin/Public/templates/default/images/kicons/kfm_home.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/khelpcenter.gif b/admin/Public/templates/default/images/kicons/khelpcenter.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/knewstuff.gif b/admin/Public/templates/default/images/kicons/knewstuff.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/ksplash.gif b/admin/Public/templates/default/images/kicons/ksplash.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/kspread.gif b/admin/Public/templates/default/images/kicons/kspread.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/kspread_ksp.gif b/admin/Public/templates/default/images/kicons/kspread_ksp.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/ksysguard.gif b/admin/Public/templates/default/images/kicons/ksysguard.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/kthememgr.gif b/admin/Public/templates/default/images/kicons/kthememgr.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/ktip.gif b/admin/Public/templates/default/images/kicons/ktip.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/kwrite.gif b/admin/Public/templates/default/images/kicons/kwrite.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/locale.gif b/admin/Public/templates/default/images/kicons/locale.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/locationbar_erase.gif b/admin/Public/templates/default/images/kicons/locationbar_erase.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/lock_bg.png b/admin/Public/templates/default/images/kicons/lock_bg.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/messagebox_critical.gif b/admin/Public/templates/default/images/kicons/messagebox_critical.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/messagebox_info.gif b/admin/Public/templates/default/images/kicons/messagebox_info.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/moneybookers.gif b/admin/Public/templates/default/images/kicons/moneybookers.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/network.gif b/admin/Public/templates/default/images/kicons/network.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/network_local.gif b/admin/Public/templates/default/images/kicons/network_local.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/next.gif b/admin/Public/templates/default/images/kicons/next.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/package.gif b/admin/Public/templates/default/images/kicons/package.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/package_network.gif b/admin/Public/templates/default/images/kicons/package_network.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/package_settings.gif b/admin/Public/templates/default/images/kicons/package_settings.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/package_utilities.gif b/admin/Public/templates/default/images/kicons/package_utilities.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/password.gif b/admin/Public/templates/default/images/kicons/password.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/password.png b/admin/Public/templates/default/images/kicons/password.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/paypal.gif b/admin/Public/templates/default/images/kicons/paypal.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/paypal_logo.gif b/admin/Public/templates/default/images/kicons/paypal_logo.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/penguin.gif b/admin/Public/templates/default/images/kicons/penguin.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/personal.gif b/admin/Public/templates/default/images/kicons/personal.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/pinguim-root3.gif b/admin/Public/templates/default/images/kicons/pinguim-root3.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/pinguim-user.gif b/admin/Public/templates/default/images/kicons/pinguim-user.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/pinguim-user2.gif b/admin/Public/templates/default/images/kicons/pinguim-user2.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/pipe.gif b/admin/Public/templates/default/images/kicons/pipe.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/plugnpay.png b/admin/Public/templates/default/images/kicons/plugnpay.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/socket.gif b/admin/Public/templates/default/images/kicons/socket.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/spreadsheet.gif b/admin/Public/templates/default/images/kicons/spreadsheet.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/stock-panel-multimedia.gif b/admin/Public/templates/default/images/kicons/stock-panel-multimedia.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/stock_alarm.gif b/admin/Public/templates/default/images/kicons/stock_alarm.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/stock_cell-phone.gif b/admin/Public/templates/default/images/kicons/stock_cell-phone.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/stock_dialog-info.gif b/admin/Public/templates/default/images/kicons/stock_dialog-info.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/stock_init.gif b/admin/Public/templates/default/images/kicons/stock_init.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/stock_landline-phone.gif b/admin/Public/templates/default/images/kicons/stock_landline-phone.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/stock_new-spreadsheet.gif b/admin/Public/templates/default/images/kicons/stock_new-spreadsheet.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/stock_unknown.gif b/admin/Public/templates/default/images/kicons/stock_unknown.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/system-config-date.gif b/admin/Public/templates/default/images/kicons/system-config-date.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/system-config-rootpassword.gif b/admin/Public/templates/default/images/kicons/system-config-rootpassword.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/system-config-rootpassword.png b/admin/Public/templates/default/images/kicons/system-config-rootpassword.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/toggle_hide2show.png b/admin/Public/templates/default/images/kicons/toggle_hide2show.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/toggle_hide2show_on.png b/admin/Public/templates/default/images/kicons/toggle_hide2show_on.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/vcard.gif b/admin/Public/templates/default/images/kicons/vcard.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/viewmag.gif b/admin/Public/templates/default/images/kicons/viewmag.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/wi0124-48.gif b/admin/Public/templates/default/images/kicons/wi0124-48.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/worldpay.gif b/admin/Public/templates/default/images/kicons/worldpay.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/xclock.gif b/admin/Public/templates/default/images/kicons/xclock.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/xmag.gif b/admin/Public/templates/default/images/kicons/xmag.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/yast_HD.gif b/admin/Public/templates/default/images/kicons/yast_HD.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/yast_PhoneTTOffhook.gif b/admin/Public/templates/default/images/kicons/yast_PhoneTTOffhook.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/yast_multihead.gif b/admin/Public/templates/default/images/kicons/yast_multihead.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/yast_partitioner.gif b/admin/Public/templates/default/images/kicons/yast_partitioner.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/yast_remote.gif b/admin/Public/templates/default/images/kicons/yast_remote.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/yast_sysadmin.gif b/admin/Public/templates/default/images/kicons/yast_sysadmin.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/kicons/zip_mount.gif b/admin/Public/templates/default/images/kicons/zip_mount.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/login-border-center.png b/admin/Public/templates/default/images/login-border-center.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/login-border-down.png b/admin/Public/templates/default/images/login-border-down.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/login-border-up.png b/admin/Public/templates/default/images/login-border-up.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/logout.png b/admin/Public/templates/default/images/logout.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/map.png b/admin/Public/templates/default/images/map.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/menu_back.gif b/admin/Public/templates/default/images/menu_back.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/menu_br.gif b/admin/Public/templates/default/images/menu_br.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/menu_tr.gif b/admin/Public/templates/default/images/menu_tr.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/msg_error.png b/admin/Public/templates/default/images/msg_error.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/msg_info.png b/admin/Public/templates/default/images/msg_info.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/msg_success.png b/admin/Public/templates/default/images/msg_success.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/msg_warning.png b/admin/Public/templates/default/images/msg_warning.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/next.gif b/admin/Public/templates/default/images/next.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/next_icon.gif b/admin/Public/templates/default/images/next_icon.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/next_icon2.gif b/admin/Public/templates/default/images/next_icon2.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/next_year.gif b/admin/Public/templates/default/images/next_year.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/orangeshade.png b/admin/Public/templates/default/images/orangeshade.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/orangeshadet.gif b/admin/Public/templates/default/images/orangeshadet.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/orangeshadet.png b/admin/Public/templates/default/images/orangeshadet.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/page_white.png b/admin/Public/templates/default/images/page_white.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/page_white_add.png b/admin/Public/templates/default/images/page_white_add.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/page_white_edit.png b/admin/Public/templates/default/images/page_white_edit.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/pdf.gif b/admin/Public/templates/default/images/pdf.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/pixel.gif b/admin/Public/templates/default/images/pixel.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/prev.gif b/admin/Public/templates/default/images/prev.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/prev_year.gif b/admin/Public/templates/default/images/prev_year.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/spacer.jpg b/admin/Public/templates/default/images/spacer.jpg
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/stock-mic.png b/admin/Public/templates/default/images/stock-mic.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/telephone.png b/admin/Public/templates/default/images/telephone.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/telephone_add.png b/admin/Public/templates/default/images/telephone_add.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/telephone_delete.png b/admin/Public/templates/default/images/telephone_delete.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/telephone_edit.png b/admin/Public/templates/default/images/telephone_edit.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/terminated.gif b/admin/Public/templates/default/images/terminated.gif
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/top_menu_bg.png b/admin/Public/templates/default/images/top_menu_bg.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/topshade.png b/admin/Public/templates/default/images/topshade.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/tux.png b/admin/Public/templates/default/images/tux.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/up.png b/admin/Public/templates/default/images/up.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/up_black.png b/admin/Public/templates/default/images/up_black.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/user.png b/admin/Public/templates/default/images/user.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/user_comment.png b/admin/Public/templates/default/images/user_comment.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/user_delete.png b/admin/Public/templates/default/images/user_delete.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/user_edit.png b/admin/Public/templates/default/images/user_edit.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/user_female.png b/admin/Public/templates/default/images/user_female.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/user_go.png b/admin/Public/templates/default/images/user_go.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/user_gray.png b/admin/Public/templates/default/images/user_gray.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/user_green.png b/admin/Public/templates/default/images/user_green.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/user_multi_add.png b/admin/Public/templates/default/images/user_multi_add.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/user_orange.png b/admin/Public/templates/default/images/user_orange.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/user_red.png b/admin/Public/templates/default/images/user_red.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/images/user_suit.png b/admin/Public/templates/default/images/user_suit.png
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/default/index.tpl b/admin/Public/templates/default/index.tpl
index f2c80ad65..957ea9a25 100755
--- a/admin/Public/templates/default/index.tpl
+++ b/admin/Public/templates/default/index.tpl
@@ -39,7 +39,7 @@
 	<form name="form" method="POST" action="PP_intro.php" onsubmit="return test()">
 	<input type="hidden" name="done" value="submit_log">
 
-	
+
 	<div id="login-wrapper" class="login-border-up">
 	<div class="login-border-down">
 	<div class="login-border-center">
@@ -76,7 +76,7 @@
                 </select>
             </td>
 			<td><input type="submit" name="submit" value="{php} echo gettext("LOGIN");{/php}" class="form_input_button"></td>
-			</tr>           
+			</tr>
 
 			</table>
 		</td>
@@ -85,7 +85,7 @@
   	</center>
   	</div>
   	</div>
-  	
+
   	<div style="color:#BC2222;font-family:Arial,Helvetica,sans-serif;font-size:11px;font-weight:bold;padding-left:10px;" >
   	{if ($error == 1)}
 			{php} echo gettext("AUTHENTICATION REFUSED, please check your user/password!");{/php}
@@ -95,12 +95,12 @@
 			{php} echo gettext("BLOCKED ACCOUNT, Please contact the administrator!");{/php}
     {/if}
     </div>
+
     <div id="footer_index"><div style=" border: solid 1px #F4F4F4; text-align:center;">{$COPYRIGHT}</div></div>
-    
+
   	</div>
-  	
-  	
 	</form>
+
 {literal}
 <script LANGUAGE="JavaScript">
 	document.form.pr_login.focus();
@@ -109,5 +109,3 @@
         });
 </script>
 {/literal}
-
-
diff --git a/admin/Public/templates/default/main.tpl b/admin/Public/templates/default/main.tpl
index 207ac44d6..3a5e5e06c 100755
--- a/admin/Public/templates/default/main.tpl
+++ b/admin/Public/templates/default/main.tpl
@@ -6,27 +6,27 @@
 		<ul id="menu_horizontal">
 			<li class="topmenu-left-button" style="border:none;">
 				<div style="width:100%;height:100%;text-align:center;" >
-					<a href="PP_intro.php"> 
+					<a href="PP_intro.php">
 							<strong> {php} echo gettext("HOME");{/php}</strong>&nbsp;
-						<img style="vertical-align:bottom;" src="templates/{$SKIN_NAME}/images/house.png"> 
+						<img style="vertical-align:bottom;" src="templates/{$SKIN_NAME}/images/house.png">
 					</a>
 				</div>
 			</li>
 			{if ($ACXDASHBOARD > 0) }
 			<li class="topmenu-left-button" >
 				<div style="width:100%;height:100%;text-align:center;" >
-					<a href="dashboard.php" > 
+					<a href="dashboard.php" >
 						<strong> {php} echo gettext("DASHBOARD");{/php}</strong>&nbsp;
-						<img style="vertical-align:bottom;" src="templates/{$SKIN_NAME}/images/chart_bar.png"> 
+						<img style="vertical-align:bottom;" src="templates/{$SKIN_NAME}/images/chart_bar.png">
 					</a>
 				</div>
 			</li>
 			{/if}
 			<li class="topmenu-left-button">
 				<div style="width:100%;height:100%;text-align:center;" >
-					 <a href="A2B_notification.php" > 
+					 <a href="A2B_notification.php" >
 						<strong > {php} echo gettext("NOTIFICATION");{/php}</strong>&nbsp;
-					<img style="vertical-align:bottom;" src="templates/{$SKIN_NAME}/images/email.png"> 
+					<img style="vertical-align:bottom;" src="templates/{$SKIN_NAME}/images/email.png">
 					{if ($NEW_NOTIFICATION > 0) }
 						<strong style="font-size:8px; color:red;"> NEW</strong>
 					{else}
@@ -44,7 +44,7 @@
 		</ul>
 
 	</div>
-	
+
 {/if}
 
 {if ($popupwindow == 0)}
@@ -54,7 +54,7 @@
 <div id="leftmenu-middle">
 
 <ul id="nav">
-  
+
   	{if ($ACXCUSTOMER > 0) }
   	<div class="toggle_menu"><li>
 	<a href="javascript:;" class="toggle_menu" target="_self"> <div> <div id="menutitlebutton"> <img id="img1"
@@ -182,6 +182,7 @@
 					<li><a href="call-comp.php?section=5">{php} echo gettext("Compare Calls");{/php}</a></li>
 					<li><a href="call-daily-load.php?section=5">{php} echo gettext("Daily Traffic");{/php}</a></li>
 					<li><a href="call-last-month.php?section=5">{php} echo gettext("Monthly Traffic");{/php}</a></li>
+                                        <li><a href="call-auth-failures-report.php?section=5">{php} echo gettext("Auth fails");{/php}</a></li>
 			</ul></li>
 		</ul>
 	</div>
@@ -265,7 +266,7 @@
 		</ul>
 	</div>
 	{/if}
-	
+
 
 	{if ($ACXOUTBOUNDCID > 0)}
 	<div class="toggle_menu"><li>
@@ -291,7 +292,7 @@
 	{/if}
 
 
-	
+
 	{if ($ACXBILLING > 0)}
 	<div class="toggle_menu"><li>
 	<a href="javascript:;" class="toggle_menu" target="_self"> <div> <div id="menutitlebutton"> <img id="img10"
@@ -355,7 +356,7 @@
 	</div>
 	{/if}
 
-	
+
 	{if ($ACXPACKAGEOFFER > 0)}
 	<div class="toggle_menu"><li>
 	<a href="javascript:;" class="toggle_menu" target="_self"> <div> <div id="menutitlebutton"> <img id="img12"
@@ -378,7 +379,7 @@
 		</ul>
 	</div>
 	{/if}
-	
+
 
 	{if ($ACXCRONTSERVICE  > 0)}
 	<div class="toggle_menu"><li>
@@ -405,7 +406,7 @@
 		</ul>
 	</div>
 	{/if}
-	
+
 
 	{if ($ACXCALLBACK  > 0)}
 	<div class="toggle_menu"><li>
@@ -447,17 +448,13 @@
 	{/if}
 		<ul>
 			<li><ul>
-				<li><a href="A2B_entity_campaign.php?section=15">{php} echo gettext("Add");{/php}</a></li>
-				<li><a href="A2B_entity_campaign_config.php?section=15">{php} echo gettext("Config");{/php}</a></li>
-				<li><a href="A2B_entity_phonebook.php?section=15">{php} echo gettext("Phone Book");{/php}</a></li>
-				<li><a href="A2B_entity_phonenumber.php?section=15">»» {php} echo gettext("Add Number");{/php}</a></li>
-				<li><a href="A2B_phonelist_import.php?section=15">»» {php} echo gettext("Import");{/php}</a></li>
+				<li><a href="A2B_entity_campaign.php?section=15">{php} echo gettext("Autodialer");{/php}</a></li>
 			</ul></li>
 		</ul>
 	</div>
 	{/if}
 
-	
+
 	{if ($ACXMAINTENANCE  > 0)}
 	<div class="toggle_menu"><li>
 	<a href="javascript:;" class="toggle_menu" target="_self"> <div> <div id="menutitlebutton"> <img id="img16"
@@ -489,10 +486,11 @@
 			</ul></li>
 		</ul>
 	</div>
-	
+
 	{/if}
-	
+
 	{if ($ACXMAIL  > 0)}
+	<!-- Disabled Mail feature -->
 	<div class="toggle_menu"><li>
 	<a href="javascript:;" class="toggle_menu" target="_self"> <div> <div id="menutitlebutton"> <img id="img17"
 	{if ($section == "17")}
@@ -515,7 +513,7 @@
 	</div>
 	{/if}
 
-	
+
 	{if ($ACXSETTING  > 0)}
 	<div class="toggle_menu"><li>
 	<a href="javascript:;" class="toggle_menu" target="_self"> <div> <div id="menutitlebutton"> <img id="img18"
@@ -542,11 +540,11 @@
 			</ul></li>
 		</ul>
 	</div>
-	
+
 	{/if}
-	
+
 </ul>
-	
+
 <br/>
 <ul id="nav"><li>
 	<ul><li><a href="A2B_entity_password.php?atmenu=password&form_action=ask-edit"><strong>{php} echo gettext("Change Password");{/php}</strong> <img style="vertical-align:bottom;" src="templates/{$SKIN_NAME}/images/key.png"> </a></li></ul>
@@ -567,6 +565,7 @@
 		<a href="PP_intro.php?ui_language=french" target="_parent"><img src="templates/{$SKIN_NAME}/images/flags/fr.gif" border="0" title="French" alt="French"></a>
 		<a href="PP_intro.php?ui_language=spanish" target="_parent"><img src="templates/{$SKIN_NAME}/images/flags/es.gif" border="0" title="Spanish" alt="Spanish"></a>
 		<a href="PP_intro.php?ui_language=greek" target="_parent"><img src="templates/{$SKIN_NAME}/images/flags/gr.gif" border="0" title="Greek" alt="Greek"></a>
+		<a href="PP_intro.php?ui_language=italian" target="_parent"><img src="templates/{$SKIN_NAME}/images/flags/it.gif" border="0" title="Italian" alt="Italian"></a>
 	</td>
 </tr>
 </table>
@@ -578,7 +577,7 @@
 		<p>Thank you for using A2Billing. However, we have detected that you have edited the Author’s names, Copyright or licensing information in the A2Billing Management Interface.</p>
 		<p>The <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" target="_blank">AGPL 3</a> license under which you are allowed to use A2Billing requires that the original copyright and license must be displayed and kept intact. Without this information being displayed, you do not have a right to use the software.</p>
 		<p>However, if it is important to you that the Author’s names, Copyright and License information is not displayed, possibly for publicity purposes; then we can offer you additional permissions to use and convey A2Billing, with these items removed, for a fee that will be used to help sponsor the continued development of A2Billing.</p>
-		<p>For more information, please go to <a target="_blank" href="http://www.star2billing.com/licensing">http://www.star2billing.com/licensing</a>.</p>
+		<p>For more information, please go to <a target="_blank" href="http://www.asterisk2billing.org/pricing/rebranding/">http://www.asterisk2billing.org/pricing/rebranding/</a>.</p>
 		<p>Yours,<br/>
 		The A2Billing Team<br/>
 		Star2Billing S.L</p>
@@ -600,6 +599,6 @@
     loadLicenceModal();
 </script>
 {/if}
- 
+
 {$MAIN_MSG}
 
diff --git a/admin/Public/templates/default/profiler.tpl b/admin/Public/templates/default/profiler.tpl
old mode 100644
new mode 100755
index 215bf1767..83e9ccd89
--- a/admin/Public/templates/default/profiler.tpl
+++ b/admin/Public/templates/default/profiler.tpl
@@ -1,4 +1,4 @@
-{php} 
+{php}
         global $profiler;
         global $G_instance_Query_trace;
 
diff --git a/admin/Public/templates/outstanding/outstanding_example.tpl b/admin/Public/templates/outstanding/outstanding_example.tpl
old mode 100644
new mode 100755
diff --git a/admin/Public/templates/sales/sales_example.tpl b/admin/Public/templates/sales/sales_example.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/COPYING b/admin/phpsysinfo/COPYING
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/ChangeLog b/admin/phpsysinfo/ChangeLog
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/README b/admin/phpsysinfo/README
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/config.php b/admin/phpsysinfo/config.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/distros.ini b/admin/phpsysinfo/distros.ini
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/Arch.gif b/admin/phpsysinfo/images/Arch.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/CentOS.png b/admin/phpsysinfo/images/CentOS.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/Cobalt.png b/admin/phpsysinfo/images/Cobalt.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/Darwin.png b/admin/phpsysinfo/images/Darwin.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/Debian.png b/admin/phpsysinfo/images/Debian.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/Fedora.png b/admin/phpsysinfo/images/Fedora.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/FreeBSD.png b/admin/phpsysinfo/images/FreeBSD.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/Gentoo.png b/admin/phpsysinfo/images/Gentoo.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/Mandrake.png b/admin/phpsysinfo/images/Mandrake.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/NetBSD.png b/admin/phpsysinfo/images/NetBSD.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/OpenBSD.png b/admin/phpsysinfo/images/OpenBSD.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/PLD.gif b/admin/phpsysinfo/images/PLD.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/Redhat.png b/admin/phpsysinfo/images/Redhat.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/Rubix.png b/admin/phpsysinfo/images/Rubix.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/Slackware.png b/admin/phpsysinfo/images/Slackware.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/SunOS.png b/admin/phpsysinfo/images/SunOS.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/Suse.png b/admin/phpsysinfo/images/Suse.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/Trustix.gif b/admin/phpsysinfo/images/Trustix.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/Ubuntu.gif b/admin/phpsysinfo/images/Ubuntu.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/free-eos.png b/admin/phpsysinfo/images/free-eos.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/index.html b/admin/phpsysinfo/images/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/lfs.png b/admin/phpsysinfo/images/lfs.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/unknown.png b/admin/phpsysinfo/images/unknown.png
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/images/xp.gif b/admin/phpsysinfo/images/xp.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/XPath.class.php b/admin/phpsysinfo/includes/XPath.class.php
old mode 100644
new mode 100755
index 28b104751..742563838
--- a/admin/phpsysinfo/includes/XPath.class.php
+++ b/admin/phpsysinfo/includes/XPath.class.php
@@ -3,21 +3,21 @@
  * Php.XPath
  *
  * +======================================================================================================+
- * | A php class for searching an XML document using XPath, and making modifications using a DOM 
- * | style API. Does not require the DOM XML PHP library. 
+ * | A php class for searching an XML document using XPath, and making modifications using a DOM
+ * | style API. Does not require the DOM XML PHP library.
  * |
  * +======================================================================================================+
  * | What Is XPath:
  * | --------------
  * | - "What SQL is for a relational database, XPath is for an XML document." -- Sam Blum
- * | - "The primary purpose of XPath is to address parts of an XML document. In support of this 
+ * | - "The primary purpose of XPath is to address parts of an XML document. In support of this
  * |    primary purpose, it also provides basic facilities for manipulting it." -- W3C
- * | 
+ * |
  * | XPath in action and a very nice intro is under:
  * |    http://www.zvon.org/xxl/XPathTutorial/General/examples.html
  * | Specs Can be found under:
- * |    http://www.w3.org/TR/xpath     W3C XPath Recommendation 
- * |    http://www.w3.org/TR/xpath20   W3C XPath Recommendation 
+ * |    http://www.w3.org/TR/xpath     W3C XPath Recommendation
+ * |    http://www.w3.org/TR/xpath20   W3C XPath Recommendation
  * |
  * | NOTE: Most of the XPath-spec has been realized, but not all. Usually this should not be
  * |       problem as the missing part is either rarely used or it's simpler to do with PHP itself.
@@ -30,26 +30,26 @@
  * |   Started around 2001-07, saved phpxml from near death and renamed to Php.XPath
  * |   Restructured XPath code to stay in line with XPath spec.
  * | Sam Blum <bs_php@infeer.com>
- * |   Started around 2001-09 1st major restruct (V2.0) and testbench initiator.   
+ * |   Started around 2001-09 1st major restruct (V2.0) and testbench initiator.
  * |   2nd (V3.0) major rewrite in 2002-02
  * | Daniel Allen <bigredlinux@yahoo.com>
- * |   Started around 2001-10 working to make Php.XPath adhere to specs 
+ * |   Started around 2001-10 working to make Php.XPath adhere to specs
  * | Main Former Author: Michael P. Mehl <mpm@phpxml.org>
- * |   Inital creator of V 1.0. Stoped activities around 2001-03        
+ * |   Inital creator of V 1.0. Stoped activities around 2001-03
  * +------------------------------------------------------------------------------------------------------+
  * | Code Structure:
  * | --------------_
- * | The class is split into 3 main objects. To keep usability easy all 3 
+ * | The class is split into 3 main objects. To keep usability easy all 3
  * | objects are in this file (but may be split in 3 file in future).
- * |   +-------------+ 
- * |   |  XPathBase  | XPathBase holds general and debugging functions. 
+ * |   +-------------+
+ * |   |  XPathBase  | XPathBase holds general and debugging functions.
  * |   +------+------+
- * |          v      
- * |   +-------------+ XPathEngine is the implementation of the W3C XPath spec. It contains the 
- * |   | XPathEngine | XML-import (parser), -export  and can handle xPathQueries. It's a fully 
+ * |          v
+ * |   +-------------+ XPathEngine is the implementation of the W3C XPath spec. It contains the
+ * |   | XPathEngine | XML-import (parser), -export  and can handle xPathQueries. It's a fully
  * |   +------+------+ functional class but has no functions to modify the XML-document (see following).
- * |          v      
- * |   +-------------+ 
+ * |          v
+ * |   +-------------+
  * |   |    XPath    | XPath extends the functionality with actions to modify the XML-document.
  * |   +-------------+ We tryed to implement a DOM - like interface.
  * +------------------------------------------------------------------------------------------------------+
@@ -60,30 +60,30 @@
  * | Glossary:
  * | ---------
  * | To understand how to use the functions and to pass the right parameters, read following:
- * |     
+ * |
  * | Document: (full node tree, XML-tree)
- * |     After a XML-source has been imported and parsed, it's stored as a tree of nodes sometimes 
+ * |     After a XML-source has been imported and parsed, it's stored as a tree of nodes sometimes
  * |     refered to as 'document'.
- * |     
+ * |
  * | AbsoluteXPath: (xPath, xPathSet)
  * |     A absolute XPath is a string. It 'points' to *one* node in the XML-document. We use the
- * |     term 'absolute' to emphasise that it is not an xPath-query (see xPathQuery). A valid xPath 
- * |     has the form like '/AAA[1]/BBB[2]/CCC[1]'. Usually functions that require a node (see Node) 
+ * |     term 'absolute' to emphasise that it is not an xPath-query (see xPathQuery). A valid xPath
+ * |     has the form like '/AAA[1]/BBB[2]/CCC[1]'. Usually functions that require a node (see Node)
  * |     will also accept an abs. XPath.
- * |     
+ * |
  * | Node: (node, nodeSet, node-tree)
- * |     Some funtions require or return a node (or a whole node-tree). Nodes are only used with the 
- * |     XPath-interface and have an internal structure. Every node in a XML document has a unique 
- * |     corresponding abs. xPath. That's why public functions that accept a node, will usually also 
+ * |     Some funtions require or return a node (or a whole node-tree). Nodes are only used with the
+ * |     XPath-interface and have an internal structure. Every node in a XML document has a unique
+ * |     corresponding abs. xPath. That's why public functions that accept a node, will usually also
  * |     accept a abs. xPath (a string) 'pointing' to an existing node (see absolutXPath).
- * |     
+ * |
  * | XPathQuery: (xquery, query)
- * |     A xPath-query is a string that is matched against the XML-document. The result of the match 
- * |     is a xPathSet (vector of xPath's). It's always possible to pass a single absoluteXPath 
+ * |     A xPath-query is a string that is matched against the XML-document. The result of the match
+ * |     is a xPathSet (vector of xPath's). It's always possible to pass a single absoluteXPath
  * |     instead of a xPath-query. A valid xPathQuery could look like this:
  * |     '//XXX/*[contains(., "foo")]/..' (See the link in 'What Is XPath' to learn more).
- * |     
- * |     
+ * |
+ * |
  * +------------------------------------------------------------------------------------------------------+
  * | Internals:
  * | ----------
@@ -91,27 +91,27 @@
  * |   -------------
  * | A central role of the package is how the XML-data is stored. The whole data is in a node-tree.
  * | A node can be seen as the equvalent to a tag in the XML soure with some extra info.
- * | For instance the following XML 
+ * | For instance the following XML
  * |                        <AAA foo="x">***<BBB/><CCC/>**<BBB/>*</AAA>
  * | Would produce folowing node-tree:
- * |                              'super-root'      <-- $nodeRoot (Very handy)  
- * |                                    |                                           
+ * |                              'super-root'      <-- $nodeRoot (Very handy)
+ * |                                    |
  * |             'depth' 0            AAA[1]        <-- top node. The 'textParts' of this node would be
  * |                                /   |   \                     'textParts' => array('***','','**','*')
  * |             'depth' 1     BBB[1] CCC[1] BBB[2]               (NOTE: Is always size of child nodes+1)
  * | - The Node
  * |   --------
  * | The node itself is an structure desiged mainly to be used in connection with the interface of PHP.XPath.
- * | That means it's possible for functions to return a sub-node-tree that can be used as input of an other 
+ * | That means it's possible for functions to return a sub-node-tree that can be used as input of an other
  * | PHP.XPath function.
- * | 
+ * |
  * | The main structure of a node is:
  * |   $node = array(
  * |     'name'        => '',      # The tag name. E.g. In <FOO bar="aaa"/> it would be 'FOO'
  * |     'attributes'  => array(), # The attributes of the tag E.g. In <FOO bar="aaa"/> it would be array('bar'=>'aaa')
  * |     'textParts'   => array(), # Array of text parts surrounding the children E.g. <FOO>aa<A>bb<B/>cc</A>dd</FOO> -> array('aa','bb','cc','dd')
  * |     'childNodes'  => array(), # Array of refences (pointers) to child nodes.
- * |     
+ * |
  * | For optimisation reasions some additional data is stored in the node too:
  * |     'parentNode'  => NULL     # Reference (pointer) to the parent node (or NULL if it's 'super root')
  * |     'depth'       => 0,       # The tag depth (or tree level) starting with the root tag at 0.
@@ -119,40 +119,40 @@
  * |     'contextPos'  => 1,       # Is the one-based position this node has by counting the siblings tags (tags with same name)
  * |     'xpath'       => ''       # Is the abs. XPath to this node.
  * |     'generated_id'=> ''       # The id returned for this node by generate-id() (attribute and text nodes not supported)
- * | 
+ * |
  * | - The NodeIndex
  * |   -------------
  * | Every node in the tree has an absolute XPath. E.g '/AAA[1]/BBB[2]' the $nodeIndex is a hash array
  * | to all the nodes in the node-tree. The key used is the absolute XPath (a string).
- * |    
+ * |
  * +------------------------------------------------------------------------------------------------------+
  * | License:
  * | --------
- * | The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); 
- * | you may not use this file except in compliance with the License. You may obtain a copy of the 
- * | License at http://www.mozilla.org/MPL/ 
- * | 
+ * | The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * | you may not use this file except in compliance with the License. You may obtain a copy of the
+ * | License at http://www.mozilla.org/MPL/
+ * |
  * | Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * | OF ANY KIND, either express or implied. See the License for the specific language governing 
- * | rights and limitations under the License. 
+ * | OF ANY KIND, either express or implied. See the License for the specific language governing
+ * | rights and limitations under the License.
  * |
- * | The Original Code is <phpXML/>. 
- * | 
- * | The Initial Developer of the Original Code is Michael P. Mehl. Portions created by Michael 
+ * | The Original Code is <phpXML/>.
+ * |
+ * | The Initial Developer of the Original Code is Michael P. Mehl. Portions created by Michael
  * | P. Mehl are Copyright (C) 2001 Michael P. Mehl. All Rights Reserved.
  * |
  * | Contributor(s): N.Swinson / S.Blum / D.Allen
- * | 
- * | Alternatively, the contents of this file may be used under the terms of either of the GNU 
- * | General Public License Version 2 or later (the "GPL"), or the GNU Lesser General Public 
- * | License Version 2.1 or later (the "LGPL"), in which case the provisions of the GPL or the 
- * | LGPL License are applicable instead of those above.  If you wish to allow use of your version 
- * | of this file only under the terms of the GPL or the LGPL License and not to allow others to 
- * | use your version of this file under the MPL, indicate your decision by deleting the 
- * | provisions above and replace them with the notice and other provisions required by the 
- * | GPL or the LGPL License.  If you do not delete the provisions above, a recipient may use 
- * | your version of this file under either the MPL, the GPL or the LGPL License. 
- * | 
+ * |
+ * | Alternatively, the contents of this file may be used under the terms of either of the GNU
+ * | General Public License Version 2 or later (the "GPL"), or the GNU Lesser General Public
+ * | License Version 2.1 or later (the "LGPL"), in which case the provisions of the GPL or the
+ * | LGPL License are applicable instead of those above.  If you wish to allow use of your version
+ * | of this file only under the terms of the GPL or the LGPL License and not to allow others to
+ * | use your version of this file under the MPL, indicate your decision by deleting the
+ * | provisions above and replace them with the notice and other provisions required by the
+ * | GPL or the LGPL License.  If you do not delete the provisions above, a recipient may use
+ * | your version of this file under either the MPL, the GPL or the LGPL License.
+ * |
  * +======================================================================================================+
  *
  * @author  S.Blum / N.Swinson / D.Allen / (P.Mehl)
@@ -168,12 +168,12 @@
 
 /************************************************************************************************
 * ===============================================================================================
-*                               X P a t h B a s e  -  Class                                      
+*                               X P a t h B a s e  -  Class
 * ===============================================================================================
 ************************************************************************************************/
 class XPathBase {
   var $_lastError;
-  
+
   // As debugging of the xml parse is spread across several functions, we need to make this a member.
   var $bDebugXmlParse = FALSE;
 
@@ -198,37 +198,37 @@ class XPathBase {
    */
   function XPathBase() {
     # $this->bDebugXmlParse = TRUE;
-    $this->properties['verboseLevel'] = 1;  // 0=silent, 1 and above produce verbose output (an echo to screen). 
-    
+    $this->properties['verboseLevel'] = 1;  // 0=silent, 1 and above produce verbose output (an echo to screen).
+
     if (!isSet($_ENV)) {  // Note: $_ENV introduced in 4.1.0. In earlier versions, use $HTTP_ENV_VARS.
       $_ENV = $GLOBALS['HTTP_ENV_VARS'];
     }
-    
-    // Windows 95/98 do not support file locking. Detecting OS (Operation System) and setting the 
-    // properties['OS_supports_flock'] to FALSE if win 95/98 is detected. 
+
+    // Windows 95/98 do not support file locking. Detecting OS (Operation System) and setting the
+    // properties['OS_supports_flock'] to FALSE if win 95/98 is detected.
     // This will surpress the file locking error reported from win 98 users when exportToFile() is called.
     // May have to add more OS's to the list in future (Macs?).
     // ### Note that it's only the FAT and NFS file systems that are really a problem.  NTFS and
     // the latest php libs do support flock()
     $_ENV['OS'] = isSet($_ENV['OS']) ? $_ENV['OS'] : 'Unknown OS';
-    switch ($_ENV['OS']) { 
+    switch ($_ENV['OS']) {
       case 'Windows_95':
       case 'Windows_98':
       case 'Unknown OS':
-        // should catch Mac OS X compatible environment 
-        if (!empty($_SERVER['SERVER_SOFTWARE']) 
-            && preg_match('/Darwin/',$_SERVER['SERVER_SOFTWARE'])) { 
-           // fall-through 
-        } else { 
-           $this->properties['OS_supports_flock'] = FALSE; 
-           break; 
+        // should catch Mac OS X compatible environment
+        if (!empty($_SERVER['SERVER_SOFTWARE'])
+            && preg_match('/Darwin/',$_SERVER['SERVER_SOFTWARE'])) {
+           // fall-through
+        } else {
+           $this->properties['OS_supports_flock'] = FALSE;
+           break;
         }
       default:
         $this->properties['OS_supports_flock'] = TRUE;
     }
   }
-  
-  
+
+
   /**
    * Resets the object so it's able to take a new xml sting/file
    *
@@ -238,16 +238,16 @@ function XPathBase() {
   function reset() {
     $this->_lastError   = '';
   }
-  
+
   //-----------------------------------------------------------------------------------------
-  // XPathBase                    ------  Helpers  ------                                    
+  // XPathBase                    ------  Helpers  ------
   //-----------------------------------------------------------------------------------------
-  
+
   /**
    * This method checks the right amount and match of brackets
    *
    * @param     $term (string) String in which is checked.
-   * @return          (bool)   TRUE: OK / FALSE: KO  
+   * @return          (bool)   TRUE: OK / FALSE: KO
    */
   function _bracketsCheck($term) {
     $leng = strlen($term);
@@ -256,12 +256,12 @@ function _bracketsCheck($term) {
     $stack = array();
     for ($i=0; $i<$leng; $i++) {
       switch ($term[$i]) {
-        case '(' : 
-        case '[' : 
-          $stack[$brackets] = $term[$i]; 
-          $brackets++; 
+        case '(' :
+        case '[' :
+          $stack[$brackets] = $term[$i];
+          $brackets++;
           break;
-        case ')': 
+        case ')':
           $brackets--;
           if ($brackets<0) {
             $bracketMisscount = TRUE;
@@ -272,7 +272,7 @@ function _bracketsCheck($term) {
             break 2;
           }
           break;
-        case ']' : 
+        case ']' :
           $brackets--;
           if ($brackets<0) {
             $bracketMisscount = TRUE;
@@ -292,7 +292,7 @@ function _bracketsCheck($term) {
     }
     return TRUE;
   }
-  
+
   /**
    * Looks for a string within another string -- BUT the search-string must be located *outside* of any brackets.
    *
@@ -303,11 +303,11 @@ function _bracketsCheck($term) {
    *
    * @param     $term       (string) String in which the search shall take place.
    * @param     $expression (string) String that should be searched.
-   * @return                (int)    This method returns -1 if no string was found, 
+   * @return                (int)    This method returns -1 if no string was found,
    *                                 otherwise the offset at which the string was found.
    */
   function _searchString($term, $expression) {
-    $bracketCounter = 0; // Record where we are in the brackets. 
+    $bracketCounter = 0; // Record where we are in the brackets.
     $leng = strlen($term);
     $exprLeng = strlen($expression);
     for ($i=0; $i<$leng; $i++) {
@@ -327,12 +327,12 @@ function _searchString($term, $expression) {
     // Nothing was found.
     return (-1);
   }
-  
+
   /**
    * Split a string by a searator-string -- BUT the separator-string must be located *outside* of any brackets.
-   * 
-   * Returns an array of strings, each of which is a substring of string formed 
-   * by splitting it on boundaries formed by the string separator. 
+   *
+   * Returns an array of strings, each of which is a substring of string formed
+   * by splitting it on boundaries formed by the string separator.
    *
    * @param     $separator  (string) String that should be searched.
    * @param     $term       (string) String in which the search shall take place.
@@ -342,7 +342,7 @@ function _bracketExplode($separator, $term) {
     // Note that it doesn't make sense for $separator to itself contain (,),[ or ],
     // but as this is a private function we should be ok.
     $resultArr   = array();
-    $bracketCounter = 0;  // Record where we are in the brackets. 
+    $bracketCounter = 0;  // Record where we are in the brackets.
     do { // BEGIN try block
       // Check if any separator is in the term
       $sepLeng =  strlen($separator);
@@ -350,10 +350,10 @@ function _bracketExplode($separator, $term) {
         $resultArr[] = $term;
         break; // try-block
       }
-      
+
       // Make a substitute separator out of 'unused chars'.
       $substituteSep = str_repeat(chr(2), $sepLeng);
-      
+
       // Now determine the first bracket '(' or '['.
       $tmp1 = strpos($term, '(');
       $tmp2 = strpos($term, '[');
@@ -364,12 +364,12 @@ function _bracketExplode($separator, $term) {
       } else {
         $startAt = min($tmp1, $tmp2);
       }
-      
+
       // Get prefix string part before the first bracket.
       $preStr = substr($term, 0, $startAt);
       // Substitute separator in prefix string.
       $preStr = str_replace($separator, $substituteSep, $preStr);
-      
+
       // Now get the rest-string (postfix string)
       $postStr = substr($term, $startAt);
       // Go all the way through the rest-string.
@@ -382,7 +382,7 @@ function _bracketExplode($separator, $term) {
         if ($char=='(' || $char=='[') {
           $bracketCounter++;
           continue;
-        } 
+        }
         elseif ($char==')' || $char==']') {
           $bracketCounter--;
         }
@@ -390,7 +390,7 @@ function _bracketExplode($separator, $term) {
         if ($bracketCounter == 0) {
           // Check whether we can find the expression starting at this index.
           if ((substr($postStr, $i, $sepLeng) == $separator)) {
-            // Substitute the found separator 
+            // Substitute the found separator
             for ($j=0; $j<$sepLeng; $j++) {
               $postStr[$i+$j] = $substituteSep[$j];
             }
@@ -406,7 +406,7 @@ function _bracketExplode($separator, $term) {
 
   /**
    * Split a string at it's groups, ie bracketed expressions
-   * 
+   *
    * Returns an array of strings, when concatenated together would produce the original
    * string.  ie a(b)cde(f)(g) would map to:
    * array ('a', '(b)', cde', '(f)', '(g)')
@@ -421,7 +421,7 @@ function _getEndGroups($string, $open='[', $close=']') {
     // but as this is a private function we should be ok.
     $resultArr   = array();
     do { // BEGIN try block
-      // Check if we have both an open and a close tag      
+      // Check if we have both an open and a close tag
       if (empty($open) and empty($close)) { // no separator found so end now
         $resultArr[] = $string;
         break; // try-block
@@ -432,7 +432,7 @@ function _getEndGroups($string, $open='[', $close=']') {
         break; // try-block
       }
 
-      
+
       while (!empty($string)) {
         // Now determine the first bracket '(' or '['.
         $openPos = strpos($string, $open);
@@ -490,7 +490,7 @@ function _getEndGroups($string, $open='[', $close=']') {
     // Return the results that we found. May be a array with 1 entry.
     return $resultArr;
   }
-  
+
   /**
    * Retrieves a substring before a delimiter.
    *
@@ -508,7 +508,7 @@ function _prestr(&$string, $delimiter, $offset=0) {
     $pos = strpos($string, $delimiter, $offset);
     if ($pos===FALSE) return $string; else return substr($string, 0, $pos);
   }
-  
+
   /**
    * Retrieves a substring after a delimiter.
    *
@@ -525,16 +525,16 @@ function _afterstr($string, $delimiter, $offset=0) {
     // Return the substring.
     return substr($string, strpos($string, $delimiter, $offset) + strlen($delimiter));
   }
-  
+
   //-----------------------------------------------------------------------------------------
-  // XPathBase                ------  Debug Stuff  ------                                    
+  // XPathBase                ------  Debug Stuff  ------
   //-----------------------------------------------------------------------------------------
-  
+
   /**
    * Alter the verbose (error) level reporting.
    *
-   * Pass an int. >0 to turn on, 0 to turn off.  The higher the number, the 
-   * higher the level of verbosity. By default, the class has a verbose level 
+   * Pass an int. >0 to turn on, 0 to turn off.  The higher the number, the
+   * higher the level of verbosity. By default, the class has a verbose level
    * of 1.
    *
    * @param $levelOfVerbosity (int) default is 1 = on
@@ -550,7 +550,7 @@ function setVerbose($levelOfVerbosity = 1) {
     }
     if ($level >= 0) $this->properties['verboseLevel'] = $levelOfVerbosity;
   }
-   
+
   /**
    * Returns the last occured error message.
    *
@@ -561,18 +561,18 @@ function setVerbose($levelOfVerbosity = 1) {
   function getLastError() {
     return $this->_lastError;
   }
-  
+
   /**
-   * Creates a textual error message and sets it. 
-   * 
+   * Creates a textual error message and sets it.
+   *
    * example: 'XPath error in THIS_FILE_NAME:LINE. Message: YOUR_MESSAGE';
-   * 
-   * I don't think the message should include any markup because not everyone wants to debug 
+   *
+   * I don't think the message should include any markup because not everyone wants to debug
    * into the browser window.
-   * 
+   *
    * You should call _displayError() rather than _setLastError() if you would like the message,
    * dependant on their verbose settings, echoed to the screen.
-   * 
+   *
    * @param $message (string) a textual error message default is ''
    * @param $line    (int)    the line number where the error occured, use __LINE__
    * @see getLastError()
@@ -580,12 +580,12 @@ function getLastError() {
   function _setLastError($message='', $line='-', $file='-') {
     $this->_lastError = 'XPath error in ' . basename($file) . ':' . $line . '. Message: ' . $message;
   }
-  
+
   /**
    * Displays an error message.
    *
-   * This method displays an error messages depending on the users verbose settings 
-   * and sets the last error message.  
+   * This method displays an error messages depending on the users verbose settings
+   * and sets the last error message.
    *
    * If also possibly stops the execution of the script.
    * ### Terminate should not be allowed --fab.  Should it??  N.S.
@@ -616,7 +616,7 @@ function _displayMessage($message, $lineNumber='-', $file='-') {
     $err = '<b>XPath message from '.basename($file).':'.$lineNumber.'</b> '.$message."<br \>\n";
     if ($this->properties['verboseLevel'] > 0) echo $err;
   }
-  
+
   /**
    * Called to begin the debug run of a function.
    *
@@ -651,7 +651,7 @@ function _beginDebugFunction($functionName, $bDebugFlag) {
 
     return TRUE;
   }
-  
+
   /**
    * Called to end the debug run of a function.
    *
@@ -660,7 +660,7 @@ function _beginDebugFunction($functionName, $bDebugFlag) {
    *
    * @author    Nigel Swinson <nigelswinson@users.sourceforge.net>
    * @param     $functionName (string) the name of the function we are beginning to debug
-   * @param     $return_value (mixed) the return value from the function call that 
+   * @param     $return_value (mixed) the return value from the function call that
    *                                  we are debugging
    * @param     $bDebugFlag   (bool) TRUE if we are to draw a call stack, FALSE otherwise
    */
@@ -672,23 +672,23 @@ function _closeDebugFunction($functionName, $returnValue = "", $bDebugFlag) {
       if (isSet($returnValue)) {
       if (is_array($returnValue))
         echo "Return Value: ".print_r($returnValue)."\n";
-      else if (is_numeric($returnValue)) 
+      else if (is_numeric($returnValue))
         echo "Return Value: ".(string)$returnValue."\n";
-      else if (is_bool($returnValue)) 
+      else if (is_bool($returnValue))
         echo "Return Value: ".($returnValue ? "TRUE" : "FALSE")."\n";
-      else 
+      else
         echo "Return Value: \"".htmlspecialchars($returnValue)."\"\n";
     }
       echo '<br style="clear:both">';
       echo " \n</pre></div>";
     }
-  
+
     if ($this->bClassProfiling)
       $this->_ProfEnd($FunctionName);
 
     return TRUE;
   }
-  
+
   /**
     * Profile begin call
     */
@@ -802,25 +802,25 @@ function _ProfileToHtml() {
   function _printContext($context) {
     echo "{$context['nodePath']}({$context['pos']}/{$context['size']})";
   }
-  
+
   /**
    * This is a debug helper function. It dumps the node-tree as HTML
    *
    * *QUICK AND DIRTY*. Needs some polishing.
    *
-   * @param $node   (array)   A node 
+   * @param $node   (array)   A node
    * @param $indent (string) (optional, default=''). For internal recursive calls.
    */
   function _treeDump($node, $indent = '') {
     $out = '';
-    
+
     // Get rid of recursion
     $parentName = empty($node['parentNode']) ? "SUPER ROOT" :  $node['parentNode']['name'];
     unset($node['parentNode']);
     $node['parentNode'] = $parentName ;
-    
+
     $out .= "NODE[{$node['name']}]\n";
-    
+
     foreach($node as $key => $val) {
       if ($key === 'childNodes') continue;
       if (is_Array($val)) {
@@ -829,14 +829,14 @@ function _treeDump($node, $indent = '') {
         $out .= $indent . "  [{$key}] => '{$val}' \n";
       }
     }
-    
+
     if (!empty($node['childNodes'])) {
       $out .= $indent . "  ['childNodes'] (Size = ".sizeOf($node['childNodes']).")\n";
       foreach($node['childNodes'] as $key => $childNode) {
         $out .= $indent . "     [$key] => " . $this->_treeDump($childNode, $indent . '       ') . "\n";
       }
     }
-    
+
     if (empty($indent)) {
       return "<pre>" . htmlspecialchars($out) . "</pre>";
     }
@@ -847,30 +847,30 @@ function _treeDump($node, $indent = '') {
 
 /************************************************************************************************
 * ===============================================================================================
-*                             X P a t h E n g i n e  -  Class                                    
+*                             X P a t h E n g i n e  -  Class
 * ===============================================================================================
 ************************************************************************************************/
 
 class XPathEngine extends XPathBase {
-  
+
   // List of supported XPath axes.
   // What a stupid idea from W3C to take axes name containing a '-' (dash)
   // NOTE: We replace the '-' with '_' to avoid the conflict with the minus operator.
   //       We will then do the same on the users Xpath querys
   //   -sibling => _sibling
   //   -or-     =>     _or_
-  //  
+  //
   // This array contains a list of all valid axes that can be evaluated in an
   // XPath query.
-  var $axes = array ( 'ancestor', 'ancestor_or_self', 'attribute', 'child', 'descendant', 
-                        'descendant_or_self', 'following', 'following_sibling',  
-                        'namespace', 'parent', 'preceding', 'preceding_sibling', 'self' 
+  var $axes = array ( 'ancestor', 'ancestor_or_self', 'attribute', 'child', 'descendant',
+                        'descendant_or_self', 'following', 'following_sibling',
+                        'namespace', 'parent', 'preceding', 'preceding_sibling', 'self'
      );
-  
+
   // List of supported XPath functions.
   // What a stupid idea from W3C to take function name containing a '-' (dash)
   // NOTE: We replace the '-' with '_' to avoid the conflict with the minus operator.
-  //       We will then do the same on the users Xpath querys 
+  //       We will then do the same on the users Xpath querys
   //   starts-with      => starts_with
   //   substring-before => substring_before
   //   substring-after  => substring_after
@@ -883,7 +883,7 @@ class XPathEngine extends XPathBase {
     'substring_after', 'substring', 'string_length', 'normalize_space', 'translate',
     'boolean', 'not', 'true', 'false', 'lang', 'number', 'sum', 'floor',
     'ceiling', 'round', 'x_lower', 'x_upper', 'generate_id' );
-    
+
   // List of supported XPath operators.
   //
   // This array contains a list of all valid operators that can be evaluated
@@ -894,7 +894,7 @@ class XPathEngine extends XPathBase {
 
   // List of literals from the xPath string.
   var $axPathLiterals = array();
-  
+
   // The index and tree that is created during the analysis of an XML source.
   var $nodeIndex = array();
   var $nodeRoot  = array();
@@ -912,15 +912,15 @@ class XPathEngine extends XPathBase {
                    );
   var $_indexIsDirty = FALSE;
 
-  
+
   // These variable used during the parse XML source
   var $nodeStack       = array(); // The elements that we have still to close.
-  var $parseStackIndex = 0;       // The current element of the nodeStack[] that we are adding to while 
+  var $parseStackIndex = 0;       // The current element of the nodeStack[] that we are adding to while
                                   // parsing an XML source.  Corresponds to the depth of the xml node.
                                   // in our input data.
   var $parseOptions    = array(); // Used to set the PHP's XML parser options (see xml_parser_set_option)
   var $parsedTextLocation   = ''; // A reference to where we have to put char data collected during XML parsing
-  var $parsInCData     = 0 ;      // Is >0 when we are inside a CDATA section.  
+  var $parsInCData     = 0 ;      // Is >0 when we are inside a CDATA section.
   var $parseSkipWhiteCache = 0;   // A cache of the skip whitespace parse option to speed up the parse.
 
   // This is the array of error strings, to keep consistency.
@@ -929,19 +929,19 @@ class XPathEngine extends XPathBase {
     'NoNodeMatch'           => "The supplied xPath-query '%s' does not match *any* node in the xml document.",
     'RootNodeAlreadyExists' => "An xml document may have only one root node."
     );
-    
+
   /**
    * Constructor
    *
-   * Optionally you may call this constructor with the XML-filename to parse and the 
+   * Optionally you may call this constructor with the XML-filename to parse and the
    * XML option vector. Each of the entries in the option vector will be passed to
    * xml_parser_set_option().
    *
-   * A option vector sample: 
-   *   $xmlOpt = array(XML_OPTION_CASE_FOLDING => FALSE, 
+   * A option vector sample:
+   *   $xmlOpt = array(XML_OPTION_CASE_FOLDING => FALSE,
    *                   XML_OPTION_SKIP_WHITE => TRUE);
    *
-   * @param  $userXmlOptions (array) (optional) Vector of (<optionID>=><value>, 
+   * @param  $userXmlOptions (array) (optional) Vector of (<optionID>=><value>,
    *                                 <optionID>=><value>, ...).  See PHP's
    *                                 xml_parser_set_option() docu for a list of possible
    *                                 options.
@@ -953,14 +953,14 @@ function XPathEngine($userXmlOptions=array()) {
     $this->parseOptions[XML_OPTION_CASE_FOLDING] = FALSE;
     // And not skipping whitespace
     $this->parseOptions[XML_OPTION_SKIP_WHITE] = FALSE;
-    
+
     // Now merge in the overrides.
     // Don't use PHP's array_merge!
     if (is_array($userXmlOptions)) {
       foreach($userXmlOptions as $key => $val) $this->parseOptions[$key] = $val;
     }
   }
-  
+
   /**
    * Resets the object so it's able to take a new xml sting/file
    *
@@ -969,7 +969,7 @@ function XPathEngine($userXmlOptions=array()) {
    */
   function reset() {
     parent::reset();
-    $this->properties['xmlFile']  = ''; 
+    $this->properties['xmlFile']  = '';
     $this->parseStackIndex = 0;
     $this->parsedTextLocation = '';
     $this->parsInCData   = 0;
@@ -979,15 +979,15 @@ function reset() {
     $this->aLiterals     = array();
     $this->_indexIsDirty = FALSE;
   }
-  
-  
+
+
   //-----------------------------------------------------------------------------------------
-  // XPathEngine              ------  Get / Set Stuff  ------                                
+  // XPathEngine              ------  Get / Set Stuff  ------
   //-----------------------------------------------------------------------------------------
-  
+
   /**
    * Returns the property/ies you want.
-   * 
+   *
    * if $param is not given, all properties will be returned in a hash.
    *
    * @param  $param (string) the property you want the value of, or NULL for all the properties
@@ -997,16 +997,16 @@ function getProperties($param=NULL) {
     $this->properties['hasContent']      = !empty($this->nodeRoot);
     $this->properties['caseFolding']     = $this->parseOptions[XML_OPTION_CASE_FOLDING];
     $this->properties['skipWhiteSpaces'] = $this->parseOptions[XML_OPTION_SKIP_WHITE];
-    
+
     if (empty($param)) return $this->properties;
-    
+
     if (isSet($this->properties[$param])) {
       return $this->properties[$param];
     } else {
       return NULL;
     }
   }
-  
+
   /**
    * Set an xml_parser_set_option()
    *
@@ -1031,45 +1031,45 @@ function setXmlOptions($userXmlOptions=array()) {
       $this->setXmlOption($key, $val);
     }
   }
-  
+
   /**
    * Alternative way to control whether case-folding is enabled for this XML parser.
    *
    * Short cut to setXmlOptions(XML_OPTION_CASE_FOLDING, TRUE/FALSE)
    *
-   * When it comes to XML, case-folding simply means uppercasing all tag- 
+   * When it comes to XML, case-folding simply means uppercasing all tag-
    * and attribute-names (NOT the content) if set to TRUE.  Note if you
-   * have this option set, then your XPath queries will also be case folded 
+   * have this option set, then your XPath queries will also be case folded
    * for you.
    *
-   * @param $onOff (bool) (default TRUE) 
+   * @param $onOff (bool) (default TRUE)
    * @see XML parser functions in PHP doc
    */
   function setCaseFolding($onOff=TRUE) {
     $this->parseOptions[XML_OPTION_CASE_FOLDING] = $onOff;
   }
-  
+
   /**
    * Alternative way to control whether skip-white-spaces is enabled for this XML parser.
    *
    * Short cut to setXmlOptions(XML_OPTION_SKIP_WHITE, TRUE/FALSE)
    *
    * When it comes to XML, skip-white-spaces will trim the tag content.
-   * An XML file with no whitespace will be faster to process, but will make 
+   * An XML file with no whitespace will be faster to process, but will make
    * your data less human readable when you come to write it out.
    *
-   * Running with this option on will slow the class down, so if you want to 
+   * Running with this option on will slow the class down, so if you want to
    * speed up your XML, then run it through once skipping white-spaces, then
    * write out the new version of your XML without whitespace, then use the
    * new XML file with skip whitespaces turned off.
    *
-   * @param $onOff (bool) (default TRUE) 
+   * @param $onOff (bool) (default TRUE)
    * @see XML parser functions in PHP doc
    */
   function setSkipWhiteSpaces($onOff=TRUE) {
     $this->parseOptions[XML_OPTION_SKIP_WHITE] = $onOff;
   }
-   
+
   /**
    * Get the node defined by the $absoluteXPath.
    *
@@ -1085,19 +1085,19 @@ function &getNode($absoluteXPath='') {
 
   /**
    * Get a the content of a node text part or node attribute.
-   * 
-   * If the absolute Xpath references an attribute (Xpath ends with @ or attribute::), 
+   *
+   * If the absolute Xpath references an attribute (Xpath ends with @ or attribute::),
    * then the text value of that node-attribute is returned.
-   * Otherwise the Xpath is referencing a text part of the node. This can be either a 
-   * direct reference to a text part (Xpath ends with text()[<nr>]) or indirect reference 
+   * Otherwise the Xpath is referencing a text part of the node. This can be either a
+   * direct reference to a text part (Xpath ends with text()[<nr>]) or indirect reference
    * (a simple abs. Xpath to a node).
    * 1) Direct Reference (xpath ends with text()[<part-number>]):
    *   If the 'part-number' is omitted, the first text-part is assumed; starting by 1.
    *   Negative numbers are allowed, where -1 is the last text-part a.s.o.
    * 2) Indirect Reference (a simple abs. Xpath to a node):
    *   Default is to return the *whole text*; that is the concated text-parts of the matching
-   *   node. (NOTE that only in this case you'll only get a copy and changes to the returned  
-   *   value wounld have no effect). Optionally you may pass a parameter 
+   *   node. (NOTE that only in this case you'll only get a copy and changes to the returned
+   *   value wounld have no effect). Optionally you may pass a parameter
    *   $textPartNr to define the text-part you want;  starting by 1.
    *   Negative numbers are allowed, where -1 is the last text-part a.s.o.
    *
@@ -1107,16 +1107,16 @@ function &getNode($absoluteXPath='') {
    * SIDENOTE:The function name is a suggestion from W3C in the XPath specification level 3.
    *
    * @param   $absoluteXPath  (string)  xpath to the node (See above).
-   * @param   $textPartNr     (int)     If referring to a node, specifies which text part 
+   * @param   $textPartNr     (int)     If referring to a node, specifies which text part
    *                                    to query.
-   * @return                  (&string) A *reference* to the text if the node that the other 
+   * @return                  (&string) A *reference* to the text if the node that the other
    *                                    parameters describe or FALSE if the node is not found.
    */
   function &wholeText($absoluteXPath, $textPartNr=NULL) {
     $status = FALSE;
     $text   = NULL;
     if ($this->_indexIsDirty) $this->reindexNodeTree();
-    
+
     do { // try-block
       if (preg_match(";(.*)/(attribute::|@)([^/]*)$;U", $absoluteXPath, $matches)) {
         $absoluteXPath = $matches[1];
@@ -1129,11 +1129,11 @@ function &wholeText($absoluteXPath, $textPartNr=NULL) {
         $status = TRUE;
         break; // try-block
       }
-            
+
       // Xpath contains a 'text()'-function, thus goes right to a text node. If so interpret the Xpath.
       if (preg_match(":(.*)/text\(\)(\[(.*)\])?$:U", $absoluteXPath, $matches)) {
         $absoluteXPath = $matches[1];
- 
+
         if (!isSet($this->nodeIndex[$absoluteXPath])) {
             $this->_displayError("The $absoluteXPath value isn't a node in this document.", __LINE__, __FILE__, FALSE);
             break; // try-block
@@ -1155,10 +1155,10 @@ function &wholeText($absoluteXPath, $textPartNr=NULL) {
         $status = TRUE;
         break; // try-block
       }
-      
+
       // At this point we have been given an xpath with neither a 'text()' nor 'attribute::' axis at the end
       // So we assume a get to text is wanted and use the optioanl fallback parameters $textPartNr
-     
+
       if (!isSet($this->nodeIndex[$absoluteXPath])) {
           $this->_displayError("The $absoluteXPath value isn't a node in this document.", __LINE__, __FILE__, FALSE);
           break; // try-block
@@ -1174,7 +1174,7 @@ function &wholeText($absoluteXPath, $textPartNr=NULL) {
         $status = TRUE;
         break; // try-block
       }
-      
+
       // Support negative indexes like -1 === last a.s.o.
       if ($textPartNr < 0) $textPartNr = $textPartSize + $textPartNr +1;
       if (($textPartNr <= 0) OR ($textPartNr > $textPartSize)) {
@@ -1184,7 +1184,7 @@ function &wholeText($absoluteXPath, $textPartNr=NULL) {
       $text =& $this->nodeIndex[$absoluteXPath]['textParts'][$textPartNr -1];
       $status = TRUE;
     } while (FALSE); // END try-block
-    
+
     if (!$status) return FALSE;
     return $text;
   }
@@ -1194,8 +1194,8 @@ function &wholeText($absoluteXPath, $textPartNr=NULL) {
    *
    * http://www.w3.org/TR/xpath#dt-string-value
    *
-   * "For every type of node, there is a way of determining a string-value for a node of that type. 
-   * For some types of node, the string-value is part of the node; for other types of node, the 
+   * "For every type of node, there is a way of determining a string-value for a node of that type.
+   * For some types of node, the string-value is part of the node; for other types of node, the
    * string-value is computed from the string-value of descendant nodes."
    *
    * @param $node   (node)   The node we have to convert
@@ -1206,11 +1206,11 @@ function _stringValue($node) {
     // Decode the entitites and then add the resulting literal string into our array.
     return $this->_addLiteral($this->decodeEntities($this->wholeText($node)));
   }
-  
+
   //-----------------------------------------------------------------------------------------
-  // XPathEngine           ------ Export the XML Document ------                             
+  // XPathEngine           ------ Export the XML Document ------
   //-----------------------------------------------------------------------------------------
-   
+
   /**
    * Returns the containing XML as marked up HTML with specified nodes hi-lighted
    *
@@ -1220,14 +1220,14 @@ function _stringValue($node) {
    * @return                  (mixed)  The Xml document marked up as HTML so that it can
    *                                   be viewed in a browser, including any XML headers.
    *                                   FALSE on error.
-   * @see _export()    
+   * @see _export()
    */
   function exportAsHtml($absoluteXPath='', $hilightXpathList=array()) {
     $htmlString = $this->_export($absoluteXPath, $xmlHeader=NULL, $hilightXpathList);
     if (!$htmlString) return FALSE;
-    return "<pre>\n" . $htmlString . "\n</pre>"; 
+    return "<pre>\n" . $htmlString . "\n</pre>";
   }
-  
+
   /**
    * Given a context this function returns the containing XML
    *
@@ -1235,41 +1235,41 @@ function exportAsHtml($absoluteXPath='', $hilightXpathList=array()) {
    *                                 If empty the whole document will be exported.
    * @param $xmlHeader      (array)  The string that you would like to appear before
    *                                 the XML content.  ie before the <root></root>.  If you
-   *                                 do not specify this argument, the xmlHeader that was 
+   *                                 do not specify this argument, the xmlHeader that was
    *                                 found in the parsed xml file will be used instead.
    * @return                (mixed)  The Xml fragment/document, suitable for writing
    *                                 out to an .xml file or as part of a larger xml file, or
    *                                 FALSE on error.
-   * @see _export()    
+   * @see _export()
    */
   function exportAsXml($absoluteXPath='', $xmlHeader=NULL) {
     $this->hilightXpathList = NULL;
-    return $this->_export($absoluteXPath, $xmlHeader); 
+    return $this->_export($absoluteXPath, $xmlHeader);
   }
-    
+
   /**
    * Generates a XML string with the content of the current document and writes it to a file.
    *
-   * Per default includes a <?xml ...> tag at the start of the data too. 
+   * Per default includes a <?xml ...> tag at the start of the data too.
    *
-   * @param     $fileName       (string) 
+   * @param     $fileName       (string)
    * @param     $absoluteXPath  (string) The path to the parent node you want(see text above)
    * @param     $xmlHeader      (array)  The string that you would like to appear before
    *                                     the XML content.  ie before the <root></root>.  If you
-   *                                     do not specify this argument, the xmlHeader that was 
+   *                                     do not specify this argument, the xmlHeader that was
    *                                     found in the parsed xml file will be used instead.
-   * @return                    (string) The returned string contains well-formed XML data 
+   * @return                    (string) The returned string contains well-formed XML data
    *                                     or FALSE on error.
    * @see       exportAsXml(), exportAsHtml()
    */
-  function exportToFile($fileName, $absoluteXPath='', $xmlHeader=NULL) {   
+  function exportToFile($fileName, $absoluteXPath='', $xmlHeader=NULL) {
     $status = FALSE;
     do { // try-block
       if (!($hFile = fopen($fileName, "wb"))) {   // Did we open the file ok?
         $errStr = "Failed to open the $fileName xml file.";
         break; // try-block
       }
-      
+
       if ($this->properties['OS_supports_flock']) {
         if (!flock($hFile, LOCK_EX + LOCK_NB)) {  // Lock the file
           $errStr = "Couldn't get an exclusive lock on the $fileName file.";
@@ -1280,18 +1280,18 @@ function exportToFile($fileName, $absoluteXPath='', $xmlHeader=NULL) {
         $errStr = "Export failed";
         break; // try-block
       }
-      
+
       $iBytesWritten = fwrite($hFile, $xmlOut);
       if ($iBytesWritten != strlen($xmlOut)) {
         $errStr = "Write error when writing back the $fileName file.";
         break; // try-block
       }
-      
+
       // Flush and unlock the file
       @fflush($hFile);
       $status = TRUE;
     } while(FALSE);
-    
+
     @flock($hFile, LOCK_UN);
     @fclose($hFile);
     // Sanity check the produced file.
@@ -1300,7 +1300,7 @@ function exportToFile($fileName, $absoluteXPath='', $xmlHeader=NULL) {
       $errStr = "Write error when writing back the $fileName file.";
       $status = FALSE;
     }
-    
+
     if (!$status)  $this->_displayError($errStr, __LINE__, __FILE__, FALSE);
     return $status;
   }
@@ -1309,8 +1309,8 @@ function exportToFile($fileName, $absoluteXPath='', $xmlHeader=NULL) {
    * Generates a XML string with the content of the current document.
    *
    * This is the start for extracting the XML-data from the node-tree. We do some preperations
-   * and then call _InternalExport() to fetch the main XML-data. You optionally may pass 
-   * xpath to any node that will then be used as top node, to extract XML-parts of the 
+   * and then call _InternalExport() to fetch the main XML-data. You optionally may pass
+   * xpath to any node that will then be used as top node, to extract XML-parts of the
    * document. Default is '', meaning to extract the whole document.
    *
    * You also may pass a 'xmlHeader' (usually something like <?xml version="1.0"? > that will
@@ -1318,18 +1318,18 @@ function exportToFile($fileName, $absoluteXPath='', $xmlHeader=NULL) {
    * wasn't one in the original source, and you still don't specify one, then it will
    * use a default of <?xml version="1.0"? >
    * Finaly, when exporting to HTML, you may pass a vector xPaths you want to hi-light.
-   * The hi-lighted tags and attributes will receive a nice color. 
-   * 
+   * The hi-lighted tags and attributes will receive a nice color.
+   *
    * NOTE I : The output can have 2 formats:
    *       a) If "skip white spaces" is/was set. (Not Recommended - slower)
    *          The output is formatted by adding indenting and carriage returns.
    *       b) If "skip white spaces" is/was *NOT* set.
-   *          'as is'. No formatting is done. The output should the same as the 
-   *          the original parsed XML source. 
+   *          'as is'. No formatting is done. The output should the same as the
+   *          the original parsed XML source.
    *
    * @param  $absoluteXPath (string) (optional, default is root) The node we choose as top-node
    * @param  $xmlHeader     (string) (optional) content before <root/> (see text above)
-   * @param  $hilightXpath  (array)  (optional) a vector of xPaths to nodes we wat to 
+   * @param  $hilightXpath  (array)  (optional) a vector of xPaths to nodes we wat to
    *                                 hi-light (see text above)
    * @return                (mixed)  The xml string, or FALSE on error.
    */
@@ -1345,14 +1345,14 @@ function _export($absoluteXPath='', $xmlHeader=NULL, $hilightXpathList='') {
       $this->_displayError("The given xpath '{$absoluteXpath}' isn't a node in this document.", __LINE__, __FILE__, FALSE);
       return FALSE;
     }
-    
+
     $this->hilightXpathList = $hilightXpathList;
     $this->indentStep = '  ';
     $hilightIsActive = is_array($hilightXpathList);
     if ($hilightIsActive) {
       $this->indentStep = '&nbsp;&nbsp;&nbsp;&nbsp;';
-    }    
-    
+    }
+
     // Cache this now
     $this->parseSkipWhiteCache = isSet($this->parseOptions[XML_OPTION_SKIP_WHITE]) ? $this->parseOptions[XML_OPTION_SKIP_WHITE] : FALSE;
 
@@ -1377,7 +1377,7 @@ function _export($absoluteXPath='', $xmlHeader=NULL, $hilightXpathList='') {
       $startNode = $this->nodeIndex[$absoluteXPath];
     }
 
-    if (!empty($xmlHeader)) { 
+    if (!empty($xmlHeader)) {
       $xmlOut = $this->parseSkipWhiteCache ? $xmlHeader."\n" : $xmlHeader;
     } else {
       $xmlOut = '';
@@ -1389,7 +1389,7 @@ function _export($absoluteXPath='', $xmlHeader=NULL, $hilightXpathList='') {
     if (($xmlOut .= $this->_InternalExport($startNode)) === FALSE) {
       return FALSE;
     }
-    
+
     ///////////////////////////////////////
 
     // Convert our markers to hi-lights.
@@ -1398,8 +1398,8 @@ function _export($absoluteXPath='', $xmlHeader=NULL, $hilightXpathList='') {
       $to = array('&lt;', '&gt;', '<font color="#FF0000"><b>', '</b></font>');
       $xmlOut = str_replace($from, $to, $xmlOut);
     }
-    return $xmlOut; 
-  }  
+    return $xmlOut;
+  }
 
   /**
    * Export the xml document starting at the named node.
@@ -1422,12 +1422,12 @@ function _InternalExport($node) {
 
     // The output starts as empty.
     $xmlOut = '';
-    // This loop will output the text before the current child of a parent then the 
+    // This loop will output the text before the current child of a parent then the
     // current child.  Where the child is a short tag we output the child, then move
-    // onto the next child.  Where the child is not a short tag, we output the open tag, 
-    // then queue up on currentParentStack[] the child.  
+    // onto the next child.  Where the child is not a short tag, we output the open tag,
+    // then queue up on currentParentStack[] the child.
     //
-    // When we run out of children, we then output the last text part, and close the 
+    // When we run out of children, we then output the last text part, and close the
     // 'parent' tag before popping the stack and carrying on.
     //
     // To illustrate, the numbers in this xml file indicate what is output on each
@@ -1449,16 +1449,16 @@ function _InternalExport($node) {
     $currentIndent = '';
     $hilightIsActive = is_array($this->hilightXpathList);
 
-    // To keep track of where we are in the document we use a node stack.  The node 
+    // To keep track of where we are in the document we use a node stack.  The node
     // stack has the following parallel entries:
-    //   'Parent'     => (array) A copy of the parent node that who's children we are 
+    //   'Parent'     => (array) A copy of the parent node that who's children we are
     //                           exporting
     //   'ChildIndex' => (array) The child index of the corresponding parent that we
     //                           are currently exporting.
     //   'Highlighted'=> (bool)  If we are highlighting this node.  Only relevant if
     //                           the hilight is active.
 
-    // Setup our node stack.  The loop is designed to output children of a parent, 
+    // Setup our node stack.  The loop is designed to output children of a parent,
     // not the parent itself, so we must put the parent on as the starting point.
     $nodeStack['Parent'] = array($node['parentNode']);
     // And add the childpos of our node in it's parent to our "child index stack".
@@ -1606,7 +1606,7 @@ function _InternalExport($node) {
       }
       $beforeTagContent .= '<';
 //      if ($shortGrandChild) $afterTagContent .= $CR;
-      
+
       ///////////////////////////////////////////
       // Output the tag
 
@@ -1615,7 +1615,7 @@ function _InternalExport($node) {
                   .$afterTagContent;
 
       ///////////////////////////////////////////
-      // Carry on.            
+      // Carry on.
 
       // If it is a short tag, then we've already done this child, we just move to the next
       if ($shortGrandChild) {
@@ -1642,11 +1642,11 @@ function _InternalExport($node) {
 
     return $result;
   }
-     
+
   //-----------------------------------------------------------------------------------------
-  // XPathEngine           ------ Import the XML Source ------                               
+  // XPathEngine           ------ Import the XML Source ------
   //-----------------------------------------------------------------------------------------
-  
+
   /**
    * Reads a file or URL and parses the XML data.
    *
@@ -1654,7 +1654,7 @@ function _InternalExport($node) {
    *
    * @param     $fileName (string) Path and name (or URL) of the file to be read and parsed.
    * @return              (bool)   TRUE on success, FALSE on failure (check getLastError())
-   * @see       importFromString(), getLastError(), 
+   * @see       importFromString(), getLastError(),
    */
   function importFromFile($fileName) {
     $status = FALSE;
@@ -1679,8 +1679,8 @@ function importFromFile($fileName) {
           $errStr = "The url '{$fileName}' could not be found or read.";
         }
         break; // try-block
-      } 
-      
+      }
+
       // Reaching this point we're dealing with a real file (not an url). Check if the file exists and is readable.
       if (!is_readable($fileName)) { // Read the content from the file
         $errStr = "File '{$fileName}' could not be found or read.";
@@ -1697,17 +1697,17 @@ function importFromFile($fileName) {
       }
       $xmlString = fread($fp, filesize($fileName));
       @fclose($fp);
-      
+
       $status = TRUE;
     } while (FALSE);
-    
+
     if (!$status) {
       $this->_displayError('In importFromFile(): '. $errStr, __LINE__, __FILE__, FALSE);
       return FALSE;
     }
     return $this->importFromString($xmlString);
   }
-  
+
   /**
    * Reads a string and parses the XML data.
    *
@@ -1718,7 +1718,7 @@ function importFromFile($fileName) {
    *
    * @param  $xmlString           (string) Name of the string to be read and parsed.
    * @param  $absoluteParentPath  (string) Node to append data too (see above)
-   * @return                      (bool)   TRUE on success, FALSE on failure 
+   * @return                      (bool)   TRUE on success, FALSE on failure
    *                                       (check getLastError())
    */
   function importFromString($xmlString, $absoluteParentPath = '') {
@@ -1753,7 +1753,7 @@ function importFromString($xmlString, $absoluteParentPath = '') {
       } else {
         $xmlString = $this->_translateAmpersand($xmlString);
       }
-      
+
       // Restart our node index with a root entry.
       $nodeStack = array();
       $this->parseStackIndex = 0;
@@ -1764,7 +1764,7 @@ function importFromString($xmlString, $absoluteParentPath = '') {
         if (!isSet($this->nodeIndex[$absoluteParentPath])) {
           $errStr = "You tried to append XML data to a parent '$absoluteParentPath' that does not exist.";
           break; // try-block
-        } 
+        }
         // Add it as the starting point in our array.
         $this->nodeStack[0] =& $this->nodeIndex[$absoluteParentPath];
       } else {
@@ -1779,7 +1779,7 @@ function importFromString($xmlString, $absoluteParentPath = '') {
       $this->parsInCData = 0;
       // We cache this now.
       $this->parseSkipWhiteCache = isSet($this->parseOptions[XML_OPTION_SKIP_WHITE]) ? $this->parseOptions[XML_OPTION_SKIP_WHITE] : FALSE;
-      
+
       // Create an XML parser.
       $parser = xml_parser_create();
       // Set default XML parser options.
@@ -1788,14 +1788,14 @@ function importFromString($xmlString, $absoluteParentPath = '') {
           xml_parser_set_option($parser, $key, $val);
         }
       }
-      
+
       // Set the object and the element handlers for the XML parser.
       xml_set_object($parser, $this);
       xml_set_element_handler($parser, '_handleStartElement', '_handleEndElement');
       xml_set_character_data_handler($parser, '_handleCharacterData');
       xml_set_default_handler($parser, '_handleDefaultData');
       xml_set_processing_instruction_handler($parser, '_handlePI');
-     
+
       // Parse the XML source and on error generate an error message.
       if (!xml_parse($parser, $xmlString, TRUE)) {
         $source = empty($this->properties['xmlFile']) ? 'string' : 'file ' . basename($this->properties['xmlFile']) . "'";
@@ -1804,7 +1804,7 @@ function importFromString($xmlString, $absoluteParentPath = '') {
                '. Reason:'. xml_error_string(xml_get_error_code($parser));
         break; // try-block
       }
-      
+
       // Free the parser.
       @xml_parser_free($parser);
       // And we don't need this any more.
@@ -1818,7 +1818,7 @@ function importFromString($xmlString, $absoluteParentPath = '') {
 
       $status = TRUE;
     } while (FALSE);
-    
+
     if (!$status) {
       $this->_displayError('In importFromString(): '. $errStr, __LINE__, __FILE__, FALSE);
       $bResult = FALSE;
@@ -1832,12 +1832,12 @@ function importFromString($xmlString, $absoluteParentPath = '') {
 
     return $bResult;
   }
-  
-  
+
+
   //-----------------------------------------------------------------------------------------
-  // XPathEngine               ------  XML Handlers  ------                                  
+  // XPathEngine               ------  XML Handlers  ------
   //-----------------------------------------------------------------------------------------
-  
+
   /**
    * Handles opening XML tags while parsing.
    *
@@ -1860,7 +1860,7 @@ function _handleStartElement($parser, $nodeName, $attributes) {
     if ($this->parseSkipWhiteCache) {
       $iCount = count($this->nodeStack[$this->parseStackIndex]['textParts']);
       $this->nodeStack[$this->parseStackIndex]['textParts'][$iCount-1] = rtrim($this->parsedTextLocation);
-    } 
+    }
 
     if ($this->bDebugXmlParse) {
       echo "<blockquote>" . htmlspecialchars("Start node: <".$nodeName . ">")."<br>";
@@ -1880,14 +1880,14 @@ function _handleStartElement($parser, $nodeName, $attributes) {
     if (!$this->_internalAppendChild($this->parseStackIndex, $nodeName)) {
       $this->_displayError('Internal error during parse of XML file at line'. xml_get_current_line_number($parser) .'. Empty name.', __LINE__, __FILE__);
       return;
-    }    
+    }
 
     // We will have gone one deeper then in the stack.
     $this->parseStackIndex++;
 
     // Point our parseTxtBuffer reference at the new node.
     $this->parsedTextLocation =& $this->nodeStack[$this->parseStackIndex]['textParts'][0];
-    
+
     // Set the attributes.
     if (!empty($attributes)) {
       if ($this->bDebugXmlParse) {
@@ -1898,7 +1898,7 @@ function _handleStartElement($parser, $nodeName, $attributes) {
       $this->nodeStack[$this->parseStackIndex]['attributes'] = $attributes;
     }
   }
-  
+
   /**
    * Handles closing XML tags while parsing.
    *
@@ -1909,9 +1909,9 @@ function _handleStartElement($parser, $nodeName, $attributes) {
    * @see       _handleStartElement(), _handleCharacterData()
    */
   function _handleEndElement($parser, $name) {
-    if (($this->parsedTextLocation=='') 
+    if (($this->parsedTextLocation=='')
         && empty($this->nodeStack[$this->parseStackIndex]['textParts'])) {
-      // We reach this point when parsing a tag of format <foo/>. The 'textParts'-array 
+      // We reach this point when parsing a tag of format <foo/>. The 'textParts'-array
       // should stay empty and not have an empty string in it.
     } else {
       // Trim accumulated text if necessary.
@@ -1939,15 +1939,15 @@ function _handleEndElement($parser, $name) {
     $this->parsedTextLocation =& $this->nodeStack[$this->parseStackIndex]['textParts'][];
 
     // Note we leave the entry in the stack, as it will get blanked over by the next element
-    // at this level.  The safe thing to do would be to remove it too, but in the interests 
+    // at this level.  The safe thing to do would be to remove it too, but in the interests
     // of performance, we will not bother, as were it to be a problem, then it would be an
     // internal bug anyway.
     if ($this->parseStackIndex < 0) {
       $this->_displayError('Internal error during parse of XML file at line'. xml_get_current_line_number($parser) .'. Empty name.', __LINE__, __FILE__);
       return;
-    }    
+    }
   }
-  
+
   /**
    * Handles character data while parsing.
    *
@@ -1959,12 +1959,12 @@ function _handleEndElement($parser, $name) {
    * @see       _handleStartElement(), _handleEndElement()
    */
   function _handleCharacterData($parser, $text) {
-  
+
     if ($this->parsInCData >0) $text = $this->_translateAmpersand($text, $reverse=TRUE);
-    
+
     if ($this->bDebugXmlParse) echo "Handling character data: '".htmlspecialchars($text)."'<br>";
     if ($this->parseSkipWhiteCache AND !empty($text) AND !$this->parsInCData) {
-      // Special case CR. CR always comes in a separate data. Trans. it to '' or ' '. 
+      // Special case CR. CR always comes in a separate data. Trans. it to '' or ' '.
       // If txtBuffer is already ending with a space use '' otherwise ' '.
       $bufferHasEndingSpace = (empty($this->parsedTextLocation) OR substr($this->parsedTextLocation, -1) === ' ') ? TRUE : FALSE;
       if ($text=="\n") {
@@ -1980,9 +1980,9 @@ function _handleCharacterData($parser, $text) {
     }
     $this->parsedTextLocation .= $text;
   }
-  
+
   /**
-   * Default handler for the XML parser.  
+   * Default handler for the XML parser.
    *
    * While parsing a XML document for string not caught by one of the other
    * handler functions, we end up here.
@@ -2000,22 +2000,22 @@ function _handleDefaultData($parser, $text) {
         if ($this->parsInCData < 0) $this->parsInCData = 0;
       }
       $this->parsedTextLocation .= $this->_translateAmpersand($text, $reverse=TRUE);
-      if ($this->bDebugXmlParse) echo "Default handler data: ".htmlspecialchars($text)."<br>";    
+      if ($this->bDebugXmlParse) echo "Default handler data: ".htmlspecialchars($text)."<br>";
       break; // try-block
     } while (FALSE); // END try-block
   }
-  
+
   /**
    * Handles processing instruction (PI)
    *
-   * A processing instruction has the following format: 
+   * A processing instruction has the following format:
    * <?  target data  ? > e.g.  <? dtd version="1.0" ? >
    *
-   * Currently I have no bether idea as to left it 'as is' and treat the PI data as normal 
-   * text (and adding the surrounding PI-tags <? ? >). 
+   * Currently I have no bether idea as to left it 'as is' and treat the PI data as normal
+   * text (and adding the surrounding PI-tags <? ? >).
    *
    * @param     $parser (int)    Handler for accessing the current XML parser.
-   * @param     $target (string) Name of the PI target. E.g. XML, PHP, DTD, ... 
+   * @param     $target (string) Name of the PI target. E.g. XML, PHP, DTD, ...
    * @param     $data   (string) Associative array containing a list of
    * @see       PHP's manual "xml_set_processing_instruction_handler"
    */
@@ -2025,9 +2025,9 @@ function _handlePI($parser, $target, $data) {
     $this->parsedTextLocation .= "<?{$target} {$data}?>";
     return TRUE;
   }
-  
+
   //-----------------------------------------------------------------------------------------
-  // XPathEngine          ------  Node Tree Stuff  ------                                    
+  // XPathEngine          ------  Node Tree Stuff  ------
   //-----------------------------------------------------------------------------------------
 
   /**
@@ -2048,7 +2048,7 @@ function _createSuperRoot() {
    * being handled by this class. The new node is created according to the
    * parameters passed to this method.  This method is a much watered down
    * version of appendChild(), used in parsing an xml file only.
-   * 
+   *
    * It is assumed that adding starts with root and progresses through the
    * document in parse order.  New nodes must have a corresponding parent. And
    * once we have read the </> tag for the element we will never need to add
@@ -2058,10 +2058,10 @@ function _createSuperRoot() {
    * we have yet to close.
    *
    * @param   $stackParentIndex (int)    The index into the nodeStack[] of the parent
-   *                                     node to which the new node should be added as 
+   *                                     node to which the new node should be added as
    *                                     a child. *READONLY*
    * @param   $nodeName         (string) Name of the new node. *READONLY*
-   * @return                    (bool)   TRUE if we successfully added a new child to 
+   * @return                    (bool)   TRUE if we successfully added a new child to
    *                                     the node stack at index $stackParentIndex + 1,
    *                                     FALSE on error.
    */
@@ -2069,7 +2069,7 @@ function _internalAppendChild($stackParentIndex, $nodeName) {
     // This call is likely to be executed thousands of times, so every 0.01ms counts.
     // If you want to debug this function, you'll have to comment the stuff back in
     //$bDebugThisFunction = FALSE;
-    
+
     /*
     $ThisFunctionName = '_internalAppendChild';
     $bDebugThisFunction = in_array($ThisFunctionName, $this->aDebugFunctions);
@@ -2082,7 +2082,7 @@ function _internalAppendChild($stackParentIndex, $nodeName) {
 
     if (!isSet($this->nodeStack[$stackParentIndex])) {
       $errStr = "Invalid parent. You tried to append the tag '{$nodeName}' to an non-existing parent in our node stack '{$stackParentIndex}'.";
-      $this->_displayError('In _internalAppendChild(): '. $errStr, __LINE__, __FILE__, FALSE); 
+      $this->_displayError('In _internalAppendChild(): '. $errStr, __LINE__, __FILE__, FALSE);
 
       /*
       $this->_closeDebugFunction($ThisFunctionName, FALSE, $bDebugThisFunction);
@@ -2091,43 +2091,43 @@ function _internalAppendChild($stackParentIndex, $nodeName) {
       return FALSE;
     }
 
-    // Retrieve the parent node from the node stack.  This is the last node at that 
+    // Retrieve the parent node from the node stack.  This is the last node at that
     // depth that we have yet to close.  This is where we should add the text/node.
     $parentNode =& $this->nodeStack[$stackParentIndex];
-          
+
     // Brand new node please
     $newChildNode = $this->emptyNode;
-    
+
     // Save the vital information about the node.
     $newChildNode['name'] = $nodeName;
     $parentNode['childNodes'][] =& $newChildNode;
-    
+
     // Add to our node stack
     $this->nodeStack[$stackParentIndex + 1] =& $newChildNode;
 
     /*
     if ($bDebugThisFunction) {
       echo "The new node received index: '".($stackParentIndex + 1)."'\n";
-      foreach($this->nodeStack as $key => $val) echo "$key => ".$val['name']."\n"; 
+      foreach($this->nodeStack as $key => $val) echo "$key => ".$val['name']."\n";
     }
     $this->_closeDebugFunction($ThisFunctionName, TRUE, $bDebugThisFunction);
     */
 
     return TRUE;
   }
-  
+
   /**
-   * Update nodeIndex and every node of the node-tree. 
+   * Update nodeIndex and every node of the node-tree.
    *
-   * Call after you have finished any tree modifications other wise a match with 
-   * an xPathQuery will produce wrong results.  The $this->nodeIndex[] is recreated 
+   * Call after you have finished any tree modifications other wise a match with
+   * an xPathQuery will produce wrong results.  The $this->nodeIndex[] is recreated
    * and every nodes optimization data is updated.  The optimization data is all the
-   * data that is duplicate information, would just take longer to find. Child nodes 
+   * data that is duplicate information, would just take longer to find. Child nodes
    * with value NULL are removed from the tree.
    *
    * By default the modification functions in this component will automatically re-index
-   * the nodes in the tree.  Sometimes this is not the behaver you want. To surpress the 
-   * reindex, set the functions $autoReindex to FALSE and call reindexNodeTree() at the 
+   * the nodes in the tree.  Sometimes this is not the behaver you want. To surpress the
+   * reindex, set the functions $autoReindex to FALSE and call reindexNodeTree() at the
    * end of your changes.  This sometimes leads to better code (and less CPU overhead).
    *
    * Sample:
@@ -2140,13 +2140,13 @@ function _internalAppendChild($stackParentIndex, $nodeName) {
    *    removeChild('/AAA[1]/B[2]'); // Now remove B[2] (That originaly was B[3])
    * 2) Bottom-Up (with auto reindexing) -  Safe, Slow and the changing node index (caused by auto-reindex) can be ignored.
    *    for ($i=sizeOf($xPathSet)-1; $i>=0; $i--) {
-   *      if ($i==1) continue; 
+   *      if ($i==1) continue;
    *      removeChild($xPathSet[$i]);
    *    }
    * 3) // Top-down (with *NO* auto reindexing) - Fast, Safe as long as you call reindexNodeTree()
    *    foreach($xPathSet as $xPath) {
    *      // Specify no reindexing
-   *      if ($xPath == $xPathSet[1]) continue; 
+   *      if ($xPath == $xPathSet[1]) continue;
    *      removeChild($xPath, $autoReindex=FALSE);
    *      // The object is now in a slightly inconsistent state.
    *    }
@@ -2165,7 +2165,7 @@ function reindexNodeTree() {
     if (empty($this->nodeRoot)) return TRUE;
     return $this->_recursiveReindexNodeTree('');
   }
-  
+
 
   /**
    * Create the ids that are accessable through the generate-id() function
@@ -2199,14 +2199,14 @@ function _generate_ids() {
    */
   function _recursiveReindexNodeTree($absoluteParentPath) {
     $parentNode =& $this->nodeIndex[$absoluteParentPath];
-    
+
     // Check for any 'dead' child nodes first and concate the text parts if found.
     for ($iChildIndex=sizeOf($parentNode['childNodes'])-1; $iChildIndex>=0; $iChildIndex--) {
       // Check if the child node still exits (it may have been removed).
       if (!empty($parentNode['childNodes'][$iChildIndex])) continue;
       // Child node was removed. We got to merge the text parts then.
       $parentNode['textParts'][$iChildIndex] .= $parentNode['textParts'][$iChildIndex+1];
-      array_splice($parentNode['textParts'], $iChildIndex+1, 1); 
+      array_splice($parentNode['textParts'], $iChildIndex+1, 1);
       array_splice($parentNode['childNodes'], $iChildIndex, 1);
     }
 
@@ -2225,7 +2225,7 @@ function _recursiveReindexNodeTree($absoluteParentPath) {
         if (!isSet($parentNode['textParts'][$iChildIndex])) $parentNode['textParts'][$iChildIndex] = '';
         // Count the nodes with same name (to determine their context position)
         $childName = $childNode['name'];
-        if (empty($contextHash[$childName])) { 
+        if (empty($contextHash[$childName])) {
           $contextPos = $contextHash[$childName] = 1;
         } else {
           $contextPos = ++$contextHash[$childName];
@@ -2253,7 +2253,7 @@ function _recursiveReindexNodeTree($absoluteParentPath) {
             $newAttributeNode['xpath'] = "$newPath/attribute::$attribute";
             $newAttributeNode['parentNode'] =& $childNode;
             $newAttributeNode['depth'] =& $parentNode['depth'] + 2;
-            // Insert the node as a master node, not a reference, otherwise there will be 
+            // Insert the node as a master node, not a reference, otherwise there will be
             // variable "bleeding".
             $this->nodeIndex["$newPath/attribute::$attribute"] = $newAttributeNode;
           }
@@ -2277,16 +2277,16 @@ function _recursiveReindexNodeTree($absoluteParentPath) {
 
     return TRUE;
   }
-  
-  /** 
+
+  /**
    * Clone a node and it's child nodes.
    *
    * NOTE: If the node has children you *MUST* use the reference operator!
    *       E.g. $clonedNode =& cloneNode($node);
-   *       Otherwise the children will not point back to the parent, they will point 
+   *       Otherwise the children will not point back to the parent, they will point
    *       back to your temporary variable instead.
    *
-   * @param   $node (mixed)  Either a node (hash array) or an abs. Xpath to a node in 
+   * @param   $node (mixed)  Either a node (hash array) or an abs. Xpath to a node in
    *                         the current doc
    * @return        (&array) A node and it's child nodes.
    */
@@ -2300,14 +2300,14 @@ function &cloneNode($node, $recursive=FALSE) {
     foreach ($textParts as $key => $val) {
       $node['textParts'][] = $val;
     }
-    
+
     $childSize = sizeOf($node['childNodes']);
     for ($i=0; $i<$childSize; $i++) {
-      $childNode =& $this->cloneNode($node['childNodes'][$i], TRUE);  // copy child 
+      $childNode =& $this->cloneNode($node['childNodes'][$i], TRUE);  // copy child
       $node['childNodes'][$i] =& $childNode; // reference the copy
       $childNode['parentNode'] =& $node;      // child references the parent.
     }
-    
+
     if (!$recursive) {
       //$node['childNodes'][0]['parentNode'] = null;
       //print "<pre>";
@@ -2315,13 +2315,13 @@ function &cloneNode($node, $recursive=FALSE) {
     }
     return $node;
   }
-  
-  
-/** Nice to have but __sleep() has a bug. 
+
+
+/** Nice to have but __sleep() has a bug.
     (2002-2 PHP V4.1. See bug #15350)
-  
+
   /**
-   * PHP cals this function when you call PHP's serialize. 
+   * PHP cals this function when you call PHP's serialize.
    *
    * It prevents cyclic referencing, which is why print_r() of an XPath object doesn't work.
    *
@@ -2334,59 +2334,59 @@ function __sleep() {
     }
     unset($this->nodeIndex);
   }
-  
+
   /**
-   * PHP cals this function when you call PHP's unserialize. 
+   * PHP cals this function when you call PHP's unserialize.
    *
    * It reindexes the node-tree
    *
   function __wakeup() {
     $this->reindexNodeTree();
   }
-  
+
 */
-  
+
   //-----------------------------------------------------------------------------------------
-  // XPath            ------  XPath Query / Evaluation Handlers  ------                      
+  // XPath            ------  XPath Query / Evaluation Handlers  ------
   //-----------------------------------------------------------------------------------------
-  
+
   /**
    * Matches (evaluates) an XPath query
    *
-   * This method tries to evaluate an XPath query by parsing it. A XML source must 
+   * This method tries to evaluate an XPath query by parsing it. A XML source must
    * have been imported before this method is able to work.
    *
    * @param     $xPathQuery  (string) XPath query to be evaluated.
-   * @param     $baseXPath   (string) (default is super-root) XPath query to a single document node, 
+   * @param     $baseXPath   (string) (default is super-root) XPath query to a single document node,
    *                                  from which the XPath query should  start evaluating.
    * @return                 (mixed)  The result of the XPath expression.  Either:
-   *                                    node-set (an ordered collection of absolute references to nodes without duplicates) 
-   *                                    boolean (true or false) 
-   *                                    number (a floating-point number) 
-   *                                    string (a sequence of UCS characters) 
+   *                                    node-set (an ordered collection of absolute references to nodes without duplicates)
+   *                                    boolean (true or false)
+   *                                    number (a floating-point number)
+   *                                    string (a sequence of UCS characters)
    */
   function match($xPathQuery, $baseXPath='') {
     if ($this->_indexIsDirty) $this->reindexNodeTree();
-    
+
     // Replace a double slashes, because they'll cause problems otherwise.
     static $slashes2descendant = array(
-        '//@' => '/descendant_or_self::*/attribute::', 
-        '//'  => '/descendant_or_self::node()/', 
+        '//@' => '/descendant_or_self::*/attribute::',
+        '//'  => '/descendant_or_self::node()/',
         '/@'  => '/attribute::');
     // Stupid idea from W3C to take axes name containing a '-' (dash) !!!
     // We replace the '-' with '_' to avoid the conflict with the minus operator.
-    static $dash2underscoreHash = array( 
-        '-sibling'    => '_sibling', 
+    static $dash2underscoreHash = array(
+        '-sibling'    => '_sibling',
         '-or-'        => '_or_',
-        'starts-with' => 'starts_with', 
+        'starts-with' => 'starts_with',
         'substring-before' => 'substring_before',
-        'substring-after'  => 'substring_after', 
+        'substring-after'  => 'substring_after',
         'string-length'    => 'string_length',
         'normalize-space'  => 'normalize_space',
         'x-lower'          => 'x_lower',
         'x-upper'          => 'x_upper',
         'generate-id'      => 'generate_id');
-    
+
     if (empty($xPathQuery)) return array();
 
     // Special case for when document is empty.
@@ -2403,11 +2403,11 @@ function match($xPathQuery, $baseXPath='') {
 
     // We should possibly do a proper syntactical parse, but instead we will cheat and just
     // remove any literals that could make things very difficult for us, and replace them with
-    // special tags.  Then we can treat the xPathQuery much more easily as JUST "syntax".  Provided 
-    // there are no literals in the string, then we can guarentee that most of the operators and 
+    // special tags.  Then we can treat the xPathQuery much more easily as JUST "syntax".  Provided
+    // there are no literals in the string, then we can guarentee that most of the operators and
     // syntactical elements are indeed elements and not just part of a literal string.
     $processedxPathQuery = $this->_removeLiterals($xPathQuery);
-    
+
     // Replace a double slashes, and '-' (dash) in axes names.
     $processedxPathQuery = strtr($processedxPathQuery, $slashes2descendant);
     $processedxPathQuery = strtr($processedxPathQuery, $dash2underscoreHash);
@@ -2443,16 +2443,16 @@ function evaluate($xPathQuery, $baseXPath='') {
    * later from the literals associative array.
    *
    * Example:
-   *  XPathExpr = /AAA[@CCC = "hello"]/BBB[DDD = 'world'] 
+   *  XPathExpr = /AAA[@CCC = "hello"]/BBB[DDD = 'world']
    *  =>  literals: array("hello", "world")
-   *      return value: /AAA[@CCC = $1]/BBB[DDD = $2] 
+   *      return value: /AAA[@CCC = $1]/BBB[DDD = $2]
    *
-   * Note: This does not interfere with the VariableReference syntactical element, as these 
+   * Note: This does not interfere with the VariableReference syntactical element, as these
    * elements must not start with a number.
    *
    * @param  $xPathQuery  (string) XPath expression to be processed
    * @return              (string) The XPath expression without the literals.
-   *                              
+   *
    */
   function _removeLiterals($xPathQuery) {
     // What comes first?  A " or a '?
@@ -2460,7 +2460,7 @@ function _removeLiterals($xPathQuery) {
       // No " or ' means no more literals.
       return $xPathQuery;
     }
-    
+
     $result = $aMatches[1];
     $remainder = $aMatches[2];
     // What kind of literal?
@@ -2508,7 +2508,7 @@ function _asLiteral($string) {
     // It's not a reference then.
     return FALSE;
   }
-  
+
   /**
    * Adds a literal to our array of literals
    *
@@ -2571,15 +2571,15 @@ function _GetOperator($xPathQuery) {
       if ($operator == '=') {
         // Also look for other operators containing the equal sign.
         switch ($xPathQuery[$position-1]) {
-          case '<' : 
+          case '<' :
             $position--;
             $operator = '<=';
             break;
-          case '>' : 
+          case '>' :
             $position--;
             $operator = '>=';
             break;
-          case '!' : 
+          case '!' :
             $position--;
             $operator = '!=';
             break;
@@ -2591,13 +2591,13 @@ function _GetOperator($xPathQuery) {
 
       if ($operator == '*') {
         // http://www.w3.org/TR/xpath#exprlex:
-        // "If there is a preceding token and the preceding token is not one of @, ::, (, [, 
-        // or an Operator, then a * must be recognized as a MultiplyOperator and an NCName must 
+        // "If there is a preceding token and the preceding token is not one of @, ::, (, [,
+        // or an Operator, then a * must be recognized as a MultiplyOperator and an NCName must
         // be recognized as an OperatorName."
 
         // Get some substrings.
         $character = substr($xPathQuery, $position - 1, 1);
-      
+
         // Check whether it's a multiply operator or a name test.
         if (strchr('/@:([', $character) != FALSE) {
           // Don't use the operator.
@@ -2643,7 +2643,7 @@ function _GetOperator($xPathQuery) {
     // Get the left and the right part of the expression.
     $leftOperand  = trim(substr($xPathQuery, 0, $position));
     $rightOperand = trim(substr($xPathQuery, $position + strlen($operator)));
-  
+
     // Remove whitespaces.
     $leftOperand  = trim($leftOperand);
     $rightOperand = trim($rightOperand);
@@ -2676,21 +2676,21 @@ function _GetOperator($xPathQuery) {
    *
    * http://www.w3.org/TR/xpath#section-Basics
    *
-   *  [15]    PrimaryExpr    ::= VariableReference  
-   *                             | '(' Expr ')'  
-   *                             | Literal  
-   *                             | Number  
-   *                             | FunctionCall 
+   *  [15]    PrimaryExpr    ::= VariableReference
+   *                             | '(' Expr ')'
+   *                             | Literal
+   *                             | Number
+   *                             | FunctionCall
    *
    * @param  $xPathQuery  (string)   XPath query to be evaluated.
    * @param  $context     (array)    The context from which to evaluate
    * @param  $results     (mixed)    If the expression could be parsed and evaluated as one of these
    *                                 syntactical elements, then this will be either:
-   *                                    - node-set (an ordered collection of nodes without duplicates) 
-   *                                    - boolean (true or false) 
-   *                                    - number (a floating-point number) 
-   *                                    - string (a sequence of UCS characters) 
-   * @return              (string)    An empty string if the query was successfully parsed and 
+   *                                    - node-set (an ordered collection of nodes without duplicates)
+   *                                    - boolean (true or false)
+   *                                    - number (a floating-point number)
+   *                                    - string (a sequence of UCS characters)
+   * @return              (string)    An empty string if the query was successfully parsed and
    *                                  evaluated, else a string containing the reason for failing.
    * @see    evaluate()
    */
@@ -2708,7 +2708,7 @@ function _evaluatePrimaryExpr($xPathQuery, $context, &$result) {
     // Certain expressions will never be PrimaryExpr, so to speed up processing, cache the
     // results we do find from this function.
     static $aResultsCache = array();
-    
+
     // Do while false loop
     $error = "";
     // If the result is independant of context, then we can cache the result and speed this function
@@ -2721,11 +2721,11 @@ function _evaluatePrimaryExpr($xPathQuery, $context, &$result) {
         break;
       }
 
-      // VariableReference 
+      // VariableReference
       // ### Not supported.
 
       // Is it a number?
-      // | Number  
+      // | Number
       if (is_numeric($xPathQuery)) {
         $result = doubleval($xPathQuery);
         $bCacheableResult = TRUE;
@@ -2733,7 +2733,7 @@ function _evaluatePrimaryExpr($xPathQuery, $context, &$result) {
       }
 
       // If it starts with $, and the remainder is a number, then it's a string.
-      // | Literal  
+      // | Literal
       $literal = $this->_asLiteral($xPathQuery);
       if ($literal !== FALSE) {
         $result = $xPathQuery;
@@ -2742,7 +2742,7 @@ function _evaluatePrimaryExpr($xPathQuery, $context, &$result) {
       }
 
       // Is it a function?
-      // | FunctionCall 
+      // | FunctionCall
       {
         // Check whether it's all wrapped in a function.  will be like count(.*) where .* is anything
         // text() will try to be matched here, so just explicitly ignore it
@@ -2757,13 +2757,13 @@ function _evaluatePrimaryExpr($xPathQuery, $context, &$result) {
               if ($bDebugThisFunction) echo "XPathExpr: $xPathQuery is a $function() function call:\n";
               $result = $this->_evaluateFunction($function, $data, $context);
               break;
-            } 
+            }
           }
         }
       }
 
       // Is it a bracketed expression?
-      // | '(' Expr ')'  
+      // | '(' Expr ')'
       // If it is surrounded by () then trim the brackets
       $bBrackets = FALSE;
       if (preg_match(":^\((.*)\):", $xPathQuery, $aMatches)) {
@@ -2782,7 +2782,7 @@ function _evaluatePrimaryExpr($xPathQuery, $context, &$result) {
       $error = "Expression is not a PrimaryExpr";
       $bCacheableResult = TRUE;
     } while (FALSE);
-    //////////////////////////////////////////////    
+    //////////////////////////////////////////////
 
     // If possible, cache the result.
     if ($bCacheableResult) {
@@ -2799,44 +2799,44 @@ function _evaluatePrimaryExpr($xPathQuery, $context, &$result) {
   /**
    * Evaluates an XPath Expr
    *
-   * $this->evaluate() is the entry point and does some inits, while this 
+   * $this->evaluate() is the entry point and does some inits, while this
    * function is called recursive internaly for every sub-xPath expresion we find.
    * It handles the following syntax, and calls evaluatePathExpr if it finds that none
    * of this grammer applies.
    *
    * http://www.w3.org/TR/xpath#section-Basics
    *
-   * [14]    Expr               ::= OrExpr 
-   * [21]    OrExpr             ::= AndExpr  
-   *                                | OrExpr 'or' AndExpr  
-   * [22]    AndExpr            ::= EqualityExpr  
-   *                                | AndExpr 'and' EqualityExpr  
-   * [23]    EqualityExpr       ::= RelationalExpr  
-   *                                | EqualityExpr '=' RelationalExpr  
-   *                                | EqualityExpr '!=' RelationalExpr  
-   * [24]    RelationalExpr     ::= AdditiveExpr  
-   *                                | RelationalExpr '<' AdditiveExpr  
-   *                                | RelationalExpr '>' AdditiveExpr  
-   *                                | RelationalExpr '<=' AdditiveExpr  
-   *                                | RelationalExpr '>=' AdditiveExpr  
-   * [25]    AdditiveExpr       ::= MultiplicativeExpr  
-   *                                | AdditiveExpr '+' MultiplicativeExpr  
-   *                                | AdditiveExpr '-' MultiplicativeExpr  
-   * [26]    MultiplicativeExpr ::= UnaryExpr  
-   *                                | MultiplicativeExpr MultiplyOperator UnaryExpr  
-   *                                | MultiplicativeExpr 'div' UnaryExpr  
-   *                                | MultiplicativeExpr 'mod' UnaryExpr  
-   * [27]    UnaryExpr          ::= UnionExpr  
-   *                                | '-' UnaryExpr 
-   * [18]    UnionExpr          ::= PathExpr  
-   *                                | UnionExpr '|' PathExpr 
-   *
-   * NOTE: The effect of the above grammar is that the order of precedence is 
-   * (lowest precedence first): 
-   * 1) or 
-   * 2) and 
-   * 3) =, != 
-   * 4) <=, <, >=, > 
+   * [14]    Expr               ::= OrExpr
+   * [21]    OrExpr             ::= AndExpr
+   *                                | OrExpr 'or' AndExpr
+   * [22]    AndExpr            ::= EqualityExpr
+   *                                | AndExpr 'and' EqualityExpr
+   * [23]    EqualityExpr       ::= RelationalExpr
+   *                                | EqualityExpr '=' RelationalExpr
+   *                                | EqualityExpr '!=' RelationalExpr
+   * [24]    RelationalExpr     ::= AdditiveExpr
+   *                                | RelationalExpr '<' AdditiveExpr
+   *                                | RelationalExpr '>' AdditiveExpr
+   *                                | RelationalExpr '<=' AdditiveExpr
+   *                                | RelationalExpr '>=' AdditiveExpr
+   * [25]    AdditiveExpr       ::= MultiplicativeExpr
+   *                                | AdditiveExpr '+' MultiplicativeExpr
+   *                                | AdditiveExpr '-' MultiplicativeExpr
+   * [26]    MultiplicativeExpr ::= UnaryExpr
+   *                                | MultiplicativeExpr MultiplyOperator UnaryExpr
+   *                                | MultiplicativeExpr 'div' UnaryExpr
+   *                                | MultiplicativeExpr 'mod' UnaryExpr
+   * [27]    UnaryExpr          ::= UnionExpr
+   *                                | '-' UnaryExpr
+   * [18]    UnionExpr          ::= PathExpr
+   *                                | UnionExpr '|' PathExpr
+   *
+   * NOTE: The effect of the above grammar is that the order of precedence is
+   * (lowest precedence first):
+   * 1) or
+   * 2) and
+   * 3) =, !=
+   * 4) <=, <, >=, >
    * 5) +, -
    * 6) *, div, mod
    * 7) - (negate)
@@ -2849,10 +2849,10 @@ function _evaluatePrimaryExpr($xPathQuery, $context, &$result) {
    *                                  'size' => The context size
    *                                  'pos' => The context position
    * @return              (mixed)    The result of the XPath expression.  Either:
-   *                                 node-set (an ordered collection of nodes without duplicates) 
-   *                                 boolean (true or false) 
-   *                                 number (a floating-point number) 
-   *                                 string (a sequence of UCS characters) 
+   *                                 node-set (an ordered collection of nodes without duplicates)
+   *                                 boolean (true or false)
+   *                                 number (a floating-point number)
+   *                                 string (a sequence of UCS characters)
    * @see    evaluate()
    */
   function _evaluateExpr($xPathQuery, $context) {
@@ -2863,7 +2863,7 @@ function _evaluateExpr($xPathQuery, $context) {
       echo "Path: $xPathQuery\n";
       echo "Context:";
       $this->_printContext($context);
-      echo "\n";    
+      echo "\n";
     }
 
     // Numpty check
@@ -2872,7 +2872,7 @@ function _evaluateExpr($xPathQuery, $context) {
       return FALSE;
     }
 
-    // At the top level we deal with booleans.  Only if the Expr is just an AdditiveExpr will 
+    // At the top level we deal with booleans.  Only if the Expr is just an AdditiveExpr will
     // the result not be a boolean.
     //
     //
@@ -2909,7 +2909,7 @@ function _evaluateExpr($xPathQuery, $context) {
         // No operator.  Means we have a PathExpr then.  Go to the next level.
         $result = $this->_evaluatePathExpr($xPathQuery, $context);
         break;
-      } 
+      }
 
       if ($bDebugThisFunction) { echo "\nFound and operator:"; print_r($aOperatorInfo); }//LEFT:[$leftOperand]  oper:[$operator]  RIGHT:[$rightOperand]";
 
@@ -2920,12 +2920,12 @@ function _evaluateExpr($xPathQuery, $context) {
 
       // Check the kind of operator.
       switch ($operator) {
-        case ' or ': 
+        case ' or ':
         case ' and ':
           $operatorType = 'Boolean';
           break;
-        case '+': 
-        case '-': 
+        case '+':
+        case '-':
         case '*':
         case ' div ':
         case ' mod ':
@@ -2935,10 +2935,10 @@ function _evaluateExpr($xPathQuery, $context) {
           $operatorType = 'NodeSet';
           break;
         case '<=':
-        case '<': 
+        case '<':
         case '>=':
         case '>':
-        case '=': 
+        case '=':
         case '!=':
           $operatorType = 'Multi';
           break;
@@ -2955,7 +2955,7 @@ function _evaluateExpr($xPathQuery, $context) {
       if ($bDebugThisFunction) echo "\nEvaluating LEFT:[{$aOperatorInfo['left operand']}]\n";
       $left = $this->_evaluateExpr($aOperatorInfo['left operand'], $context);
       if ($bDebugThisFunction) {echo "{$aOperatorInfo['left operand']} evals as:\n"; print_r($left); }
-      
+
       // If it is a boolean operator, it's possible we don't need to evaluate the right part.
 
       // Only evaluate the right part if we need to.
@@ -2970,7 +2970,7 @@ function _evaluateExpr($xPathQuery, $context) {
           $result = TRUE;
           break;
         }
-      } 
+      }
 
       // Evaluate the right part
       if ($bDebugThisFunction) echo "\nEvaluating RIGHT:[{$aOperatorInfo['right operand']}]\n";
@@ -2985,22 +2985,22 @@ function _evaluateExpr($xPathQuery, $context) {
         $result = $this->_evaluateOperator($left, $operator, $right, $operatorType, $context);
       } else {
         // http://www.w3.org/TR/xpath#booleans
-        // If both objects to be compared are node-sets, then the comparison will be true if and 
-        // only if there is a node in the first node-set and a node in the second node-set such 
-        // that the result of performing the comparison on the string-values of the two nodes is 
-        // true. 
-        // 
-        // If one object to be compared is a node-set and the other is a number, then the 
-        // comparison will be true if and only if there is a node in the node-set such that the 
-        // result of performing the comparison on the number to be compared and on the result of 
-        // converting the string-value of that node to a number using the number function is true. 
+        // If both objects to be compared are node-sets, then the comparison will be true if and
+        // only if there is a node in the first node-set and a node in the second node-set such
+        // that the result of performing the comparison on the string-values of the two nodes is
+        // true.
+        //
+        // If one object to be compared is a node-set and the other is a number, then the
+        // comparison will be true if and only if there is a node in the node-set such that the
+        // result of performing the comparison on the number to be compared and on the result of
+        // converting the string-value of that node to a number using the number function is true.
+        //
+        // If one object to be compared is a node-set and the other is a string, then the comparison
+        // will be true if and only if there is a node in the node-set such that the result of performing
+        // the comparison on the string-value of the node and the other string is true.
         //
-        // If one object to be compared is a node-set and the other is a string, then the comparison 
-        // will be true if and only if there is a node in the node-set such that the result of performing 
-        // the comparison on the string-value of the node and the other string is true. 
-        // 
-        // If one object to be compared is a node-set and the other is a boolean, then the comparison 
-        // will be true if and only if the result of performing the comparison on the boolean and on 
+        // If one object to be compared is a node-set and the other is a boolean, then the comparison
+        // will be true if and only if the result of performing the comparison on the boolean and on
         // the result of converting the node-set to a boolean using the boolean function is true.
         if (is_array($left) || is_array($right)) {
           if ($bDebugThisFunction) echo "As one of the operands is an array, we will need to loop\n";
@@ -3046,24 +3046,24 @@ function _evaluateExpr($xPathQuery, $context) {
               if ($result === TRUE) break;
             }
           }
-        } 
-        // When neither object to be compared is a node-set and the operator is = or !=, then the 
-        // objects are compared by converting them to a common type as follows and then comparing 
-        // them. 
+        }
+        // When neither object to be compared is a node-set and the operator is = or !=, then the
+        // objects are compared by converting them to a common type as follows and then comparing
+        // them.
+        //
+        // If at least one object to be compared is a boolean, then each object to be compared
+        // is converted to a boolean as if by applying the boolean function.
         //
-        // If at least one object to be compared is a boolean, then each object to be compared 
-        // is converted to a boolean as if by applying the boolean function. 
+        // Otherwise, if at least one object to be compared is a number, then each object to be
+        // compared is converted to a number as if by applying the number function.
         //
-        // Otherwise, if at least one object to be compared is a number, then each object to be 
-        // compared is converted to a number as if by applying the number function. 
+        // Otherwise, both objects to be compared are converted to strings as if by applying
+        // the string function.
         //
-        // Otherwise, both objects to be compared are converted to strings as if by applying 
-        // the string function. 
-        //  
-        // The = comparison will be true if and only if the objects are equal; the != comparison 
-        // will be true if and only if the objects are not equal. Numbers are compared for equality 
-        // according to IEEE 754 [IEEE 754]. Two booleans are equal if either both are true or 
-        // both are false. Two strings are equal if and only if they consist of the same sequence 
+        // The = comparison will be true if and only if the objects are equal; the != comparison
+        // will be true if and only if the objects are not equal. Numbers are compared for equality
+        // according to IEEE 754 [IEEE 754]. Two booleans are equal if either both are true or
+        // both are false. Two strings are equal if and only if they consist of the same sequence
         // of UCS characters.
         else {
           if (is_bool($left) || is_bool($right)) {
@@ -3090,21 +3090,21 @@ function _evaluateExpr($xPathQuery, $context) {
   /**
    * Evaluate the result of an operator whose operands have been evaluated
    *
-   * If the operator type is not "NodeSet", then neither the left or right operators 
+   * If the operator type is not "NodeSet", then neither the left or right operators
    * will be node sets, as the processing when one or other is an array is complex,
    * and should be handled by the caller.
    *
    * @param  $left          (mixed)   The left operand
    * @param  $right         (mixed)   The right operand
    * @param  $operator      (string)  The operator to use to combine the operands
-   * @param  $operatorType  (string)  The type of the operator.  Either 'Boolean', 
+   * @param  $operatorType  (string)  The type of the operator.  Either 'Boolean',
    *                                  'Integer', 'String', or 'NodeSet'
    * @param  $context     (array)    The context from which to evaluate
    * @return              (mixed)    The result of the XPath expression.  Either:
-   *                                 node-set (an ordered collection of nodes without duplicates) 
-   *                                 boolean (true or false) 
-   *                                 number (a floating-point number) 
-   *                                 string (a sequence of UCS characters) 
+   *                                 node-set (an ordered collection of nodes without duplicates)
+   *                                 boolean (true or false)
+   *                                 number (a floating-point number)
+   *                                 string (a sequence of UCS characters)
    */
   function _evaluateOperator($left, $operator, $right, $operatorType, $context) {
     $ThisFunctionName = '_evaluateOperator';
@@ -3127,7 +3127,7 @@ function _evaluateOperator($left, $operator, $right, $operatorType, $context) {
             $right = $this->_handleFunction_boolean($right, $context);
             switch ($operator) {
               case '=': // Compare the two results.
-                $result = (bool)($left == $right); 
+                $result = (bool)($left == $right);
                 break;
               case ' or ': // Return the two results connected by an 'or'.
                 $result = (bool)( $left or $right );
@@ -3156,10 +3156,10 @@ function _evaluateOperator($left, $operator, $right, $operatorType, $context) {
             if ($bDebugThisFunction) echo "\nLeft is $left, Right is $right\n";
             switch ($operator) {
               case '=': // Compare the two results.
-                $result = (bool)($left == $right); 
+                $result = (bool)($left == $right);
                 break;
               case '!=': // Compare the two results.
-                $result = (bool)($left != $right); 
+                $result = (bool)($left != $right);
                 break;
               case '+': // Return the result by adding one result to the other.
                 $result = $left + $right;
@@ -3210,10 +3210,10 @@ function _evaluateOperator($left, $operator, $right, $operatorType, $context) {
             if ($bDebugThisFunction) echo "\nLeft is $left, Right is $right\n";
             switch ($operator) {
               case '=': // Compare the two results.
-                $result = (bool)($left == $right); 
+                $result = (bool)($left == $right);
                 break;
               case '!=': // Compare the two results.
-                $result = (bool)($left != $right); 
+                $result = (bool)($left != $right);
                 break;
               default:
                 $this->_displayError("Internal error.  Default case of switch statement reached.", __LINE__, __FILE__);
@@ -3231,7 +3231,7 @@ function _evaluateOperator($left, $operator, $right, $operatorType, $context) {
     // Return the result.
     return $result;
   }
-  
+
   /**
    * Evaluates an XPath PathExpr
    *
@@ -3242,54 +3242,54 @@ function _evaluateOperator($left, $operator, $right, $operatorType, $context) {
    * http://www.w3.org/TR/xpath#path-abbrev
    * http://www.w3.org/TR/xpath#NT-Step
    *
-   * [19]   PathExpr              ::= LocationPath  
-   *                                  | FilterExpr  
-   *                                  | FilterExpr '/' RelativeLocationPath  
+   * [19]   PathExpr              ::= LocationPath
+   *                                  | FilterExpr
+   *                                  | FilterExpr '/' RelativeLocationPath
    *                                  | FilterExpr '//' RelativeLocationPath
-   * [20]   FilterExpr            ::= PrimaryExpr  
-   *                                  | FilterExpr Predicate 
-   * [1]    LocationPath          ::= RelativeLocationPath  
-   *                                  | AbsoluteLocationPath  
-   * [2]    AbsoluteLocationPath  ::= '/' RelativeLocationPath?  
+   * [20]   FilterExpr            ::= PrimaryExpr
+   *                                  | FilterExpr Predicate
+   * [1]    LocationPath          ::= RelativeLocationPath
+   *                                  | AbsoluteLocationPath
+   * [2]    AbsoluteLocationPath  ::= '/' RelativeLocationPath?
    *                                  | AbbreviatedAbsoluteLocationPath
-   * [3]    RelativeLocationPath  ::= Step  
-   *                                  | RelativeLocationPath '/' Step  
+   * [3]    RelativeLocationPath  ::= Step
+   *                                  | RelativeLocationPath '/' Step
    *                                  | AbbreviatedRelativeLocationPath
-   * [4]    Step                  ::= AxisSpecifier NodeTest Predicate*  
-   *                                  | AbbreviatedStep  
-   * [5]    AxisSpecifier         ::= AxisName '::'  
-   *                                  | AbbreviatedAxisSpecifier  
+   * [4]    Step                  ::= AxisSpecifier NodeTest Predicate*
+   *                                  | AbbreviatedStep
+   * [5]    AxisSpecifier         ::= AxisName '::'
+   *                                  | AbbreviatedAxisSpecifier
    * [10]   AbbreviatedAbsoluteLocationPath
    *                              ::= '//' RelativeLocationPath
    * [11]   AbbreviatedRelativeLocationPath
    *                              ::= RelativeLocationPath '//' Step
-   * [12]   AbbreviatedStep       ::= '.'  
-   *                                  | '..'  
-   * [13]   AbbreviatedAxisSpecifier    
-   *                              ::= '@'? 
+   * [12]   AbbreviatedStep       ::= '.'
+   *                                  | '..'
+   * [13]   AbbreviatedAxisSpecifier
+   *                              ::= '@'?
    *
    * If you expand all the abbreviated versions, then the grammer simplifies to:
    *
-   * [19]   PathExpr              ::= RelativeLocationPath  
-   *                                  | '/' RelativeLocationPath?  
-   *                                  | FilterExpr  
-   *                                  | FilterExpr '/' RelativeLocationPath  
-   * [20]   FilterExpr            ::= PrimaryExpr  
-   *                                  | FilterExpr Predicate 
-   * [3]    RelativeLocationPath  ::= Step  
-   *                                  | RelativeLocationPath '/' Step  
-   * [4]    Step                  ::= AxisName '::' NodeTest Predicate*  
+   * [19]   PathExpr              ::= RelativeLocationPath
+   *                                  | '/' RelativeLocationPath?
+   *                                  | FilterExpr
+   *                                  | FilterExpr '/' RelativeLocationPath
+   * [20]   FilterExpr            ::= PrimaryExpr
+   *                                  | FilterExpr Predicate
+   * [3]    RelativeLocationPath  ::= Step
+   *                                  | RelativeLocationPath '/' Step
+   * [4]    Step                  ::= AxisName '::' NodeTest Predicate*
    *
    * Conceptually you can say that we should split by '/' and try to treat the parts
-   * as steps, and if that fails then try to treat it as a PrimaryExpr.  
-   * 
+   * as steps, and if that fails then try to treat it as a PrimaryExpr.
+   *
    * @param  $PathExpr   (string) PathExpr syntactical element
    * @param  $context    (array)  The context from which to evaluate
    * @return             (mixed)  The result of the XPath expression.  Either:
-   *                               node-set (an ordered collection of nodes without duplicates) 
-   *                               boolean (true or false) 
-   *                               number (a floating-point number) 
-   *                               string (a sequence of UCS characters) 
+   *                               node-set (an ordered collection of nodes without duplicates)
+   *                               boolean (true or false)
+   *                               number (a floating-point number)
+   *                               string (a sequence of UCS characters)
    * @see    evaluate()
    */
   function _evaluatePathExpr($PathExpr, $context) {
@@ -3302,7 +3302,7 @@ function _evaluatePathExpr($PathExpr, $context) {
       $this->_printContext($context);
       echo "\n";
     }
-    
+
     // Numpty check
     if (empty($PathExpr)) {
       $this->_displayError("The \$PathExpr argument must have a value.", __LINE__, __FILE__);
@@ -3316,7 +3316,7 @@ function _evaluatePathExpr($PathExpr, $context) {
     if (isset($aResultsCache[$PathExpr])) {
       $steps = $aResultsCache[$PathExpr];
     } else {
-      // Note that we have used $this->slashes2descendant to simplify this logic, so the 
+      // Note that we have used $this->slashes2descendant to simplify this logic, so the
       // "Abbreviated" paths basically never exist as '//' never exists.
 
       // mini syntax check
@@ -3398,7 +3398,7 @@ function _sortByDocOrder($xPathSet) {
         for ($iIndex = $iLastIndex; $iIndex < $nodeCount + $iLastIndex; $iIndex++) {
           $iThisIndex = $iIndex % $nodeCount;
           if (!strcmp($aPaths[$iThisIndex],$path)) {
-            // we have found the doc-position index of the path 
+            // we have found the doc-position index of the path
             $aDocPos[] = $iThisIndex;
             $iLastIndex = $iThisIndex;
             $foundNode = TRUE;
@@ -3408,7 +3408,7 @@ function _sortByDocOrder($xPathSet) {
         if ($bDebugThisFunction) {
           if (!$foundNode)
             echo "Error: $path not found in \$this->nodeIndex\n";
-          else 
+          else
             echo "Found node after ".($iIndex - $iLastIndex)." iterations\n";
         }
       }
@@ -3449,14 +3449,14 @@ function _sortByDocOrder($xPathSet) {
   /**
    * Evaluate a step from a XPathQuery expression at a specific contextPath.
    *
-   * Steps are the arguments of a XPathQuery when divided by a '/'. A contextPath is a 
-   * absolute XPath (or vector of XPaths) to a starting node(s) from which the step should 
+   * Steps are the arguments of a XPathQuery when divided by a '/'. A contextPath is a
+   * absolute XPath (or vector of XPaths) to a starting node(s) from which the step should
    * be evaluated.
    *
-   * @param  $steps        (array) Vector containing the remaining steps of the current 
+   * @param  $steps        (array) Vector containing the remaining steps of the current
    *                               XPathQuery expression.
    * @param  $context      (array) The context from which to evaluate
-   * @return               (array) Vector of absolute XPath's as a result of the step 
+   * @return               (array) Vector of absolute XPath's as a result of the step
    *                               evaluation.  The results will not necessarily be in doc order
    * @see    _evaluatePathExpr()
    */
@@ -3479,7 +3479,7 @@ function _evaluateStep($steps, $context) {
     $contextPaths = array();   // Create an array to save the new contexts.
     $step = trim(array_shift($steps)); // Get this step.
     if ($bDebugThisFunction) echo __LINE__.":Evaluating step $step\n";
-    
+
     $axis = $this->_getAxis($step); // Get the axis of the current step.
 
     // If there was no axis, then it must be a PrimaryExpr
@@ -3494,14 +3494,14 @@ function _evaluateStep($steps, $context) {
     } else {
       if ($bDebugThisFunction) { echo __LINE__.":Axis of step is:\n"; print_r($axis); echo "\n";}
       $method = '_handleAxis_' . $axis['axis']; // Create the name of the method.
-    
+
       // Check whether the axis handler is defined. If not display an error message.
       if (!method_exists($this, $method)) {
         $this->_displayError('While parsing an XPath query, the axis ' .
         $axis['axis'] . ' could not be handled, because this version does not support this axis.', __LINE__, __FILE__);
       }
-      if ($bDebugThisFunction) echo __LINE__.":Calling user method $method\n";        
-      
+      if ($bDebugThisFunction) echo __LINE__.":Calling user method $method\n";
+
       // Perform an axis action.
       $contextPaths = $this->$method($axis, $context['nodePath']);
       if ($bDebugThisFunction) { echo __LINE__.":We found these contexts from this step:\n"; print_r( $contextPaths ); echo "\n";}
@@ -3510,15 +3510,15 @@ function _evaluateStep($steps, $context) {
     // Check whether there are predicates.
     if (count($contextPaths) > 0 && count($axis['predicate']) > 0) {
       if ($bDebugThisFunction) echo __LINE__.":Filtering contexts by predicate...\n";
-      
+
       // Check whether each node fits the predicates.
       $contextPaths = $this->_checkPredicates($contextPaths, $axis['predicate']);
     }
 
     // Check whether there are more steps left.
     if (count($steps) > 0) {
-      if ($bDebugThisFunction) echo __LINE__.":Evaluating next step given the context of the first step...\n";        
-      
+      if ($bDebugThisFunction) echo __LINE__.":Evaluating next step given the context of the first step...\n";
+
       // Continue the evaluation of the next steps.
 
       // Run through the array.
@@ -3538,7 +3538,7 @@ function _evaluateStep($steps, $context) {
     } else {
       $result = $contextPaths; // Save the found contexts.
     }
-    
+
     //////////////////////////////////////////////
 
     $this->_closeDebugFunction($ThisFunctionName, $result, $bDebugThisFunction);
@@ -3546,12 +3546,12 @@ function _evaluateStep($steps, $context) {
     // Return the result.
     return $result;
   }
-  
+
   /**
    * Checks whether a node matches predicates.
    *
    * This method checks whether a list of nodes passed to this method match
-   * a given list of predicates. 
+   * a given list of predicates.
    *
    * @param  $xPathSet   (array)  Array of full paths of all nodes to be tested.
    * @param  $predicates (array)  Array of predicates to use.
@@ -3576,12 +3576,12 @@ function _checkPredicates($xPathSet, $predicates) {
     // Run through all predicates.
     $pSize = sizeOf($predicates);
     for ($j=0; $j<$pSize; $j++) {
-      $predicate = $predicates[$j]; 
+      $predicate = $predicates[$j];
       if ($bDebugThisFunction) echo "Evaluating predicate \"$predicate\"\n";
 
       // This will contain all the nodes that match this predicate
       $aNewSet = array();
-      
+
       // Run through all nodes.
       $contextSize = count($xPathSet);
       for ($contextPos=0; $contextPos<$contextSize; $contextPos++) {
@@ -3589,22 +3589,22 @@ function _checkPredicates($xPathSet, $predicates) {
 
         // Build the context for this predicate
         $context = array('nodePath' => $xPath, 'size' => $contextSize, 'pos' => $contextPos + 1);
-      
+
         // Check whether the predicate is just an number.
         if (preg_match('/^\d+$/', $predicate)) {
           if ($bDebugThisFunction) echo "Taking short cut and calling _handleFunction_position() directly.\n";
-          // Take a short cut.  If it is just a position, then call 
+          // Take a short cut.  If it is just a position, then call
           // _handleFunction_position() directly.  70% of the
           // time this will be the case. ## N.S
 //          $check = (bool) ($predicate == $context['pos']);
           $check = (bool) ($predicate == $this->_handleFunction_position('', $context));
-        } else {                
+        } else {
           // Else do the predicate check the long and through way.
           $check = $this->_evaluateExpr($predicate, $context);
         }
         if ($bDebugThisFunction) {
-          echo "Evaluating the predicate returned "; 
-          var_dump($check); 
+          echo "Evaluating the predicate returned ";
+          var_dump($check);
           echo "\n";
         }
 
@@ -3621,7 +3621,7 @@ function _checkPredicates($xPathSet, $predicates) {
         // Do we add it?
         if ($check) $aNewSet[] = $xPath;
       }
-       
+
       // Use the newly filtered list.
       $xPathSet = $aNewSet;
 
@@ -3637,7 +3637,7 @@ function _checkPredicates($xPathSet, $predicates) {
     // Return the array of nodes.
     return $result;
   }
-  
+
   /**
    * Evaluates an XPath function
    *
@@ -3649,7 +3649,7 @@ function _checkPredicates($xPathSet, $predicates) {
    *                                 passed to the function.
    * @param  $context       (array)  The context from which to evaluate
    * @return                (mixed)  This method returns the result of the evaluation of
-   *                                 the function. Depending on the function the type of the 
+   *                                 the function. Depending on the function the type of the
    *                                 return value can be different.
    * @see    evaluate()
    */
@@ -3675,7 +3675,7 @@ function _evaluateFunction($function, $arguments, $context) {
     $arguments = trim($arguments);
     // Create the name of the function handling function.
     $method = '_handleFunction_'. $function;
-    
+
     // Check whether the function handling function is available.
     if (!method_exists($this, $method)) {
       // Display an error message.
@@ -3683,11 +3683,11 @@ function _evaluateFunction($function, $arguments, $context) {
         "the function \"$function\" could not be handled, because this ".
         "version does not support this function.", __LINE__, __FILE__);
     }
-    if ($bDebugThisFunction) echo "Calling function $method($arguments)\n"; 
-    
+    if ($bDebugThisFunction) echo "Calling function $method($arguments)\n";
+
     // Return the result of the function.
     $result = $this->$method($arguments, $context);
-    
+
     //////////////////////////////////////////////
     // Return the nodes found.
 
@@ -3696,17 +3696,17 @@ function _evaluateFunction($function, $arguments, $context) {
     // Return the result.
     return $result;
   }
-    
+
   /**
    * Checks whether a node matches a node-test.
    *
    * This method checks whether a node in the document matches a given node-test.
    * A node test is something like text(), node(), or an element name.
    *
-   * @param  $contextPath (string)  Full xpath of the node, which should be tested for 
+   * @param  $contextPath (string)  Full xpath of the node, which should be tested for
    *                                matching the node-test.
    * @param  $nodeTest    (string)  String containing the node-test for the node.
-   * @return              (boolean) This method returns TRUE if the node matches the 
+   * @return              (boolean) This method returns TRUE if the node matches the
    *                                node-test, otherwise FALSE.
    * @see    evaluate()
    */
@@ -3720,7 +3720,7 @@ function _checkNodeTest($contextPath, $nodeTest) {
     }
     elseif (preg_match('/^[\w-:\.]+$/', $nodeTest)) {
        // http://www.w3.org/TR/2000/REC-xml-20001006#NT-Name
-       // The real spec for what constitutes whitespace is quite elaborate, and 
+       // The real spec for what constitutes whitespace is quite elaborate, and
        // we currently just hope that "\w" catches them all.  In reality it should
        // start with a letter too, not a number, but we've just left it simple.
        // It's just a node name test.  It should end with "/$nodeTest[x]"
@@ -3739,7 +3739,7 @@ function _checkNodeTest($contextPath, $nodeTest) {
             return TRUE; // Add this node to the list of nodes.
           }
           break;
-/******** NOT supported (yet?)          
+/******** NOT supported (yet?)
         case 'comment':  // Check whether the node has some comment.
           if (!empty($this->nodeIndex[$contextPath]['comment'])) {
             return TRUE; // Add this node to the list of nodes.
@@ -3748,7 +3748,7 @@ function _checkNodeTest($contextPath, $nodeTest) {
         case 'processing-instruction':
           $literal = $this->_afterstr($axis['node-test'], '('); // Get the literal argument.
           $literal = substr($literal, 0, strlen($literal) - 1); // Cut the literal.
-          
+
           // Check whether a literal was given.
           if (!empty($literal)) {
             // Check whether the node's processing instructions are matching the literals given.
@@ -3762,7 +3762,7 @@ function _checkNodeTest($contextPath, $nodeTest) {
             }
           }
           break;
-***********/            
+***********/
         default:  // Display an error message.
           $this->_displayError('While parsing an XPath query there was an undefined function called "' .
              str_replace($function, '<b>'.$function.'</b>', $this->currentXpathQuery) .'"', __LINE__, __FILE__);
@@ -3772,14 +3772,14 @@ function _checkNodeTest($contextPath, $nodeTest) {
       $this->_displayError("While parsing the XPath query \"{$this->currentXpathQuery}\" ".
         "an empty and therefore invalid node-test has been found.", __LINE__, __FILE__, FALSE);
     }
-    
+
     return FALSE; // Don't add this context.
   }
-  
+
   //-----------------------------------------------------------------------------------------
-  // XPath                    ------  XPath AXIS Handlers  ------                            
+  // XPath                    ------  XPath AXIS Handlers  ------
   //-----------------------------------------------------------------------------------------
-  
+
   /**
    * Retrieves axis information from an XPath query step.
    *
@@ -3787,25 +3787,25 @@ function _checkNodeTest($contextPath, $nodeTest) {
    * from a given step of an XPath query at a given node.  If it can't parse
    * the step, then we treat it as a PrimaryExpr.
    *
-   * [4]    Step            ::= AxisSpecifier NodeTest Predicate*  
-   *                            | AbbreviatedStep  
-   * [5]    AxisSpecifier   ::= AxisName '::'  
-   *                            | AbbreviatedAxisSpecifier 
-   * [12]   AbbreviatedStep ::= '.'  
-   *                            | '..'  
-   * [13]   AbbreviatedAxisSpecifier    
-   *                        ::=    '@'? 
-   * 
-   * [7]    NodeTest        ::= NameTest  
-   *                            | NodeType '(' ')'  
-   *                            | 'processing-instruction' '(' Literal ')'  
-   * [37]   NameTest        ::= '*'  
-   *                            | NCName ':' '*'  
-   *                            | QName  
-   * [38]   NodeType        ::= 'comment'  
-   *                            | 'text'  
-   *                            | 'processing-instruction'  
-   *                            | 'node' 
+   * [4]    Step            ::= AxisSpecifier NodeTest Predicate*
+   *                            | AbbreviatedStep
+   * [5]    AxisSpecifier   ::= AxisName '::'
+   *                            | AbbreviatedAxisSpecifier
+   * [12]   AbbreviatedStep ::= '.'
+   *                            | '..'
+   * [13]   AbbreviatedAxisSpecifier
+   *                        ::=    '@'?
+   *
+   * [7]    NodeTest        ::= NameTest
+   *                            | NodeType '(' ')'
+   *                            | 'processing-instruction' '(' Literal ')'
+   * [37]   NameTest        ::= '*'
+   *                            | NCName ':' '*'
+   *                            | QName
+   * [38]   NodeType        ::= 'comment'
+   *                            | 'text'
+   *                            | 'processing-instruction'
+   *                            | 'node'
    *
    * @param  $step     (string) String containing a step of an XPath query.
    * @return           (array)  Contains information about the axis found in the step, or FALSE
@@ -3843,7 +3843,7 @@ function _getAxis($step) {
       ///////////////////////////////////////////////////
       // Spot the steps that won't come with an axis
 
-      // Check whether the step is empty or only self. 
+      // Check whether the step is empty or only self.
       if (empty($step) OR ($step == '.') OR ($step == 'current()')) {
         // Set it to the default value.
         $step = '.';
@@ -3862,7 +3862,7 @@ function _getAxis($step) {
       ///////////////////////////////////////////////////
       // Pull off the predicates
 
-      // Check whether there are predicates and add the predicate to the list 
+      // Check whether there are predicates and add the predicate to the list
       // of predicates without []. Get contents of every [] found.
       $groups = $this->_getEndGroups($step);
 //print_r($groups);
@@ -3938,18 +3938,18 @@ function _getAxis($step) {
       // The only remaining way this can be a step, is if the remaining string is a simple name
       // or else a :* name.
       // http://www.w3.org/TR/xpath#NT-NameTest
-      // NameTest   ::= '*'  
-      //                | NCName ':' '*'  
-      //                | QName 
-      // QName      ::=  (Prefix ':')? LocalPart 
-      // Prefix     ::=  NCName 
-      // LocalPart  ::=  NCName 
+      // NameTest   ::= '*'
+      //                | NCName ':' '*'
+      //                | QName
+      // QName      ::=  (Prefix ':')? LocalPart
+      // Prefix     ::=  NCName
+      // LocalPart  ::=  NCName
       //
       // ie
-      // NameTest   ::= '*'  
-      //                | NCName ':' '*'  
+      // NameTest   ::= '*'
+      //                | NCName ':' '*'
       //                | (NCName ':')? NCName
-      // NCName ::=  (Letter | '_') (NCNameChar)* 
+      // NCName ::=  (Letter | '_') (NCNameChar)*
       $NCName = "[a-zA-Z_][\w\.\-_]*";
       if (preg_match("/^$NCName:$NCName$/", $step)
         || preg_match("/^$NCName:*$/", $step)) {
@@ -3962,7 +3962,7 @@ function _getAxis($step) {
         $LastFailedStep = '';
         $LastFailedContext = '';
         break $parseBlock;
-      } 
+      }
 
       // It's not a node then, we must treat it as a PrimaryExpr
       // Check for recursion
@@ -3975,9 +3975,9 @@ function _getAxis($step) {
         $LastFailedStep = $step;
         $axis = FALSE;
       }
-      
+
     } while(FALSE); // end parse block
-    
+
     // Check whether it's a valid axis.
     if ($axis !== FALSE) {
       if (!in_array($axis['axis'], array_merge($this->axes, array('function')))) {
@@ -3994,7 +3994,7 @@ function _getAxis($step) {
     // Return the axis information.
     return $axis;
   }
-   
+
 
   /**
    * Handles the XPath child axis.
@@ -4003,9 +4003,9 @@ function _getAxis($step) {
    * children to match the name specified after the '/'.
    *
    * @param  $axis        (array)  Array containing information about the axis.
-   * @param  $contextPath (string) xpath to starting node from which the axis should 
+   * @param  $contextPath (string) xpath to starting node from which the axis should
    *                               be processed.
-   * @return              (array)  A vector containing all nodes that were found, during 
+   * @return              (array)  A vector containing all nodes that were found, during
    *                               the evaluation of the axis.
    * @see    evaluate()
    */
@@ -4014,14 +4014,14 @@ function _handleAxis_child($axis, $contextPath) {
     if ($axis["node-test"] == "cdata") {
       if (!isSet($this->nodeIndex[$contextPath]['textParts']) ) return '';
       $tSize = sizeOf($this->nodeIndex[$contextPath]['textParts']);
-      for ($i=1; $i<=$tSize; $i++) { 
+      for ($i=1; $i<=$tSize; $i++) {
         $xPathSet[] = $contextPath . '/text()['.$i.']';
       }
     }
     else {
       // Get a list of all children.
       $allChildren = $this->nodeIndex[$contextPath]['childNodes'];
-      
+
       // Run through all children in the order they where set.
       $cSize = sizeOf($allChildren);
       for ($i=0; $i<$cSize; $i++) {
@@ -4046,19 +4046,19 @@ function _handleAxis_child($axis, $contextPath) {
     }
     return $xPathSet; // Return the nodeset.
   }
-  
+
   /**
    * Handles the XPath parent axis.
    *
    * @param  $axis        (array)  Array containing information about the axis.
    * @param  $contextPath (string) xpath to starting node from which the axis should be processed.
-   * @return              (array)  A vector containing all nodes that were found, during the 
+   * @return              (array)  A vector containing all nodes that were found, during the
    *                               evaluation of the axis.
    * @see    evaluate()
    */
   function _handleAxis_parent($axis, $contextPath) {
     $xPathSet = array(); // Create an empty node-set.
-    
+
     // Check whether the parent matches the node-test.
     $parentPath = $this->getParentXPath($contextPath);
     if ($this->_checkNodeTest($parentPath, $axis['node-test'])) {
@@ -4066,7 +4066,7 @@ function _handleAxis_parent($axis, $contextPath) {
     }
     return $xPathSet; // Return the nodeset.
   }
-  
+
   /**
    * Handles the XPath attribute axis.
    *
@@ -4077,10 +4077,10 @@ function _handleAxis_parent($axis, $contextPath) {
    */
   function _handleAxis_attribute($axis, $contextPath) {
     $xPathSet = array(); // Create an empty node-set.
-    
+
     // Check whether all nodes should be selected.
     $nodeAttr = $this->nodeIndex[$contextPath]['attributes'];
-    if ($axis['node-test'] == '*'  
+    if ($axis['node-test'] == '*'
         || $axis['node-test'] == 'node()') {
       foreach($nodeAttr as $key=>$dummy) { // Run through the attributes.
         $xPathSet[] = $contextPath.'/attribute::'.$key; // Add this node to the node-set.
@@ -4091,7 +4091,7 @@ function _handleAxis_attribute($axis, $contextPath) {
     }
     return $xPathSet; // Return the nodeset.
   }
-   
+
   /**
    * Handles the XPath self axis.
    *
@@ -4102,14 +4102,14 @@ function _handleAxis_attribute($axis, $contextPath) {
    */
   function _handleAxis_self($axis, $contextPath) {
     $xPathSet = array(); // Create an empty node-set.
-    
+
     // Check whether the context match the node-test.
     if ($this->_checkNodeTest($contextPath, $axis['node-test'])) {
       $xPathSet[] = $contextPath; // Add this node to the node-set.
     }
     return $xPathSet; // Return the nodeset.
   }
-  
+
   /**
    * Handles the XPath descendant axis.
    *
@@ -4120,10 +4120,10 @@ function _handleAxis_self($axis, $contextPath) {
    */
   function _handleAxis_descendant($axis, $contextPath) {
     $xPathSet = array(); // Create an empty node-set.
-    
+
     // Get a list of all children.
     $allChildren = $this->nodeIndex[$contextPath]['childNodes'];
-    
+
     // Run through all children in the order they where set.
     $cSize = sizeOf($allChildren);
     for ($i=0; $i<$cSize; $i++) {
@@ -4137,7 +4137,7 @@ function _handleAxis_descendant($axis, $contextPath) {
     }
     return $xPathSet; // Return the nodeset.
   }
-  
+
   /**
    * Handles the XPath ancestor axis.
    *
@@ -4148,9 +4148,9 @@ function _handleAxis_descendant($axis, $contextPath) {
    */
   function _handleAxis_ancestor($axis, $contextPath) {
     $xPathSet = array(); // Create an empty node-set.
-        
+
     $parentPath = $this->getParentXPath($contextPath); // Get the parent of the current node.
-    
+
     // Check whether the parent isn't super-root.
     if (!empty($parentPath)) {
       // Check whether the parent matches the node-test.
@@ -4162,7 +4162,7 @@ function _handleAxis_ancestor($axis, $contextPath) {
     }
     return $xPathSet; // Return the nodeset.
   }
-  
+
   /**
    * Handles the XPath namespace axis.
    *
@@ -4174,7 +4174,7 @@ function _handleAxis_ancestor($axis, $contextPath) {
   function _handleAxis_namespace($axis, $contextPath) {
     $this->_displayError("The axis 'namespace is not suported'", __LINE__, __FILE__, FALSE);
   }
-  
+
   /**
    * Handles the XPath following axis.
    *
@@ -4185,7 +4185,7 @@ function _handleAxis_namespace($axis, $contextPath) {
    */
   function _handleAxis_following($axis, $contextPath) {
     $xPathSet = array(); // Create an empty node-set.
-    
+
     do { // try-block
       $node = $this->nodeIndex[$contextPath]; // Get the current node
       $position = $node['pos'];               // Get the current tree position.
@@ -4209,7 +4209,7 @@ function _handleAxis_following($axis, $contextPath) {
     } while(FALSE);
     return $xPathSet; // Return the nodeset.
   }
-  
+
   /**
    * Handles the XPath preceding axis.
    *
@@ -4220,11 +4220,11 @@ function _handleAxis_following($axis, $contextPath) {
    */
   function _handleAxis_preceding($axis, $contextPath) {
     $xPathSet = array(); // Create an empty node-set.
-    
+
     // Run through all nodes of the document.
     foreach ($this->nodeIndex as $xPath=>$dummy) {
       if (empty($xPath)) continue; // skip super-Root
-      
+
       // Check whether this is the context node.
       if ($xPath == $contextPath) {
         break; // After this we won't look for more nodes.
@@ -4239,7 +4239,7 @@ function _handleAxis_preceding($axis, $contextPath) {
     }
     return $xPathSet; // Return the nodeset.
   }
-  
+
   /**
    * Handles the XPath following-sibling axis.
    *
@@ -4250,17 +4250,17 @@ function _handleAxis_preceding($axis, $contextPath) {
    */
   function _handleAxis_following_sibling($axis, $contextPath) {
     $xPathSet = array(); // Create an empty node-set.
-    
+
     // Get all children from the parent.
     $siblings = $this->_handleAxis_child($axis, $this->getParentXPath($contextPath));
     // Create a flag whether the context node was already found.
     $found = FALSE;
-    
+
     // Run through all siblings.
     $size = sizeOf($siblings);
     for ($i=0; $i<$size; $i++) {
       $sibling = $siblings[$i];
-      
+
       // Check whether the context node was already found.
       if ($found) {
         // Check whether the sibling matches the node-test.
@@ -4275,7 +4275,7 @@ function _handleAxis_following_sibling($axis, $contextPath) {
     }
     return $xPathSet; // Return the nodeset.
   }
-  
+
   /**
    * Handles the XPath preceding-sibling axis.
    *
@@ -4286,10 +4286,10 @@ function _handleAxis_following_sibling($axis, $contextPath) {
    */
   function _handleAxis_preceding_sibling($axis, $contextPath) {
     $xPathSet = array(); // Create an empty node-set.
-    
+
     // Get all children from the parent.
     $siblings = $this->_handleAxis_child($axis, $this->getParentXPath($contextPath));
-    
+
     // Run through all siblings.
     $size = sizeOf($siblings);
     for ($i=0; $i<$size; $i++) {
@@ -4305,7 +4305,7 @@ function _handleAxis_preceding_sibling($axis, $contextPath) {
     }
     return $xPathSet; // Return the nodeset.
   }
-  
+
   /**
    * Handles the XPath descendant-or-self axis.
    *
@@ -4316,7 +4316,7 @@ function _handleAxis_preceding_sibling($axis, $contextPath) {
    */
   function _handleAxis_descendant_or_self($axis, $contextPath) {
     $xPathSet = array(); // Create an empty node-set.
-    
+
     // Read the nodes.
     $xPathSet = array_merge(
                  $this->_handleAxis_self($axis, $contextPath),
@@ -4324,7 +4324,7 @@ function _handleAxis_descendant_or_self($axis, $contextPath) {
                );
     return $xPathSet; // Return the nodeset.
   }
-  
+
   /**
    * Handles the XPath ancestor-or-self axis.
    *
@@ -4337,7 +4337,7 @@ function _handleAxis_descendant_or_self($axis, $contextPath) {
    */
   function _handleAxis_ancestor_or_self ( $axis, $contextPath) {
     $xPathSet = array(); // Create an empty node-set.
-    
+
     // Read the nodes.
     $xPathSet = array_merge(
                  $this->_handleAxis_ancestor($axis, $contextPath),
@@ -4345,15 +4345,15 @@ function _handleAxis_ancestor_or_self ( $axis, $contextPath) {
                );
     return $xPathSet; // Return the nodeset.
   }
-  
-  
+
+
   //-----------------------------------------------------------------------------------------
-  // XPath                  ------  XPath FUNCTION Handlers  ------                          
+  // XPath                  ------  XPath FUNCTION Handlers  ------
   //-----------------------------------------------------------------------------------------
-  
+
    /**
     * Handles the XPath function last.
-    *    
+    *
     * @param  $arguments     (string) String containing the arguments that were passed to the function.
     * @param  $context       (array)  The context from which to evaluate the function
     * @return                (mixed)  Depending on the type of function being processed
@@ -4362,10 +4362,10 @@ function _handleAxis_ancestor_or_self ( $axis, $contextPath) {
   function _handleFunction_last($arguments, $context) {
     return $context['size'];
   }
-  
+
   /**
    * Handles the XPath function position.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4374,10 +4374,10 @@ function _handleFunction_last($arguments, $context) {
   function _handleFunction_position($arguments, $context) {
     return $context['pos'];
   }
-  
+
   /**
    * Handles the XPath function count.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4387,10 +4387,10 @@ function _handleFunction_count($arguments, $context) {
     // Evaluate the argument of the method as an XPath and return the number of results.
     return count($this->_evaluateExpr($arguments, $context));
   }
-  
+
   /**
    * Handles the XPath function id.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4412,10 +4412,10 @@ function _handleFunction_id($arguments, $context) {
     }
     return $resultXPaths; // Return the list of nodes.
   }
-  
+
   /**
    * Handles the XPath function name.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4435,12 +4435,12 @@ function _handleFunction_name($arguments, $context) {
      // Return a reference to the name of the node.
     return $this->_addLiteral($this->nodeIndex[$nodeSet[0]]['name']);
   }
-  
+
   /**
    * Handles the XPath function string.
    *
    * http://www.w3.org/TR/xpath#section-String-Functions
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4467,8 +4467,8 @@ function _handleFunction_string($arguments, $context) {
     }
     elseif (is_bool($arguments)) { // Check whether it's TRUE or FALSE and return as string.
       // ### Note that we used to return TRUE and FALSE which was incorrect according to the standard.
-      if ($arguments === TRUE) {        
-        $result = 'true'; 
+      if ($arguments === TRUE) {
+        $result = 'true';
       } else {
         $result = 'false';
       }
@@ -4478,7 +4478,7 @@ function _handleFunction_string($arguments, $context) {
     }
     elseif (!empty($arguments)) {
       // Spec says:
-      // "An object of a type other than the four basic types is converted to a string in a way that 
+      // "An object of a type other than the four basic types is converted to a string in a way that
       // is dependent on that type."
       // Use the argument as an XPath.
       $result = $this->_evaluateExpr($arguments, $context);
@@ -4494,10 +4494,10 @@ function _handleFunction_string($arguments, $context) {
     }
     return $result;
   }
-  
+
   /**
    * Handles the XPath function concat.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4516,10 +4516,10 @@ function _handleFunction_concat($arguments, $context) {
     $arguments = implode('', $arguments);  // Put the string together and return it.
     return $this->_addLiteral($arguments);
   }
-  
+
   /**
    * Handles the XPath function starts-with.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4535,10 +4535,10 @@ function _handleFunction_starts_with($arguments, $context) {
     // Check whether the first string starts with the second one.
     return  (bool) preg_match('/^/'.$second, $first);
   }
-  
+
   /**
    * Handles the XPath function contains.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4563,10 +4563,10 @@ function _handleFunction_contains($arguments, $context) {
       return TRUE;
     }
   }
-  
+
   /**
    * Handles the XPath function substring-before.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4582,10 +4582,10 @@ function _handleFunction_substring_before($arguments, $context) {
     // Return the substring.
     return $this->_addLiteral($this->_prestr(strval($first), strval($second)));
   }
-  
+
   /**
    * Handles the XPath function substring-after.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4601,10 +4601,10 @@ function _handleFunction_substring_after($arguments, $context) {
     // Return the substring.
     return $this->_addLiteral($this->_afterstr(strval($first), strval($second)));
   }
-  
+
   /**
    * Handles the XPath function substring.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4626,10 +4626,10 @@ function _handleFunction_substring($arguments, $context) {
       return $this->_addLiteral(substr(strval($arguments[0]), $arguments[1] - 1));
     }
   }
-  
+
   /**
    * Handles the XPath function string-length.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4650,7 +4650,7 @@ function _handleFunction_string_length($arguments, $context) {
    * of whitespace characters by a single space.
    * If the argument is omitted, it defaults to the context node converted to a string,
    * in other words the string-value of the context node
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                 (stri)g trimed string
@@ -4668,7 +4668,7 @@ function _handleFunction_normalize_space($arguments, $context) {
 
   /**
    * Handles the XPath function translate.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4688,7 +4688,7 @@ function _handleFunction_translate($arguments, $context) {
 
   /**
    * Handles the XPath function boolean.
-   *   
+   *
    * http://www.w3.org/TR/xpath#section-Boolean-Functions
    *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
@@ -4708,7 +4708,7 @@ function _handleFunction_boolean($arguments, $context) {
     elseif (is_array($arguments)) {
       return (count($arguments) > 0);
     }
-    // a number is true if and only if it is neither positive or negative zero nor NaN 
+    // a number is true if and only if it is neither positive or negative zero nor NaN
     // (Straight out of the XPath spec.. makes no sense?????)
     elseif (preg_match('/^[0-9]+(\.[0-9]+)?$/', $arguments) || preg_match('/^\.[0-9]+$/', $arguments)) {
       $number = doubleval($arguments);  // Convert the digits to a number.
@@ -4719,11 +4719,11 @@ function _handleFunction_boolean($arguments, $context) {
     elseif (($literal = $this->_asLiteral($arguments)) !== FALSE) {
       return (strlen($literal) != 0);
     }
-    // an object of a type other than the four basic types is converted to a boolean in a 
+    // an object of a type other than the four basic types is converted to a boolean in a
     // way that is dependent on that type
     else {
       // Spec says:
-      // "An object of a type other than the four basic types is converted to a number in a way 
+      // "An object of a type other than the four basic types is converted to a number in a way
       // that is dependent on that type"
       // Try to evaluate the argument as an XPath.
       $result = $this->_evaluateExpr($arguments, $context);
@@ -4735,10 +4735,10 @@ function _handleFunction_boolean($arguments, $context) {
       }
     }
   }
-  
+
   /**
    * Handles the XPath function not.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4750,10 +4750,10 @@ function _handleFunction_not($arguments, $context) {
 //echo "Before inversion: ".($bArgResult?"TRUE":"FALSE")."\n";
     return !$bArgResult;
   }
-  
+
   /**
    * Handles the XPath function TRUE.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4762,10 +4762,10 @@ function _handleFunction_not($arguments, $context) {
   function _handleFunction_true($arguments, $context) {
     return TRUE; // Return TRUE.
   }
-  
+
   /**
    * Handles the XPath function FALSE.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4774,10 +4774,10 @@ function _handleFunction_true($arguments, $context) {
   function _handleFunction_false($arguments, $context) {
     return FALSE; // Return FALSE.
   }
-  
+
   /**
    * Handles the XPath function lang.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4796,10 +4796,10 @@ function _handleFunction_lang($arguments, $context) {
     } // End while
     return FALSE;
   }
-  
+
   /**
    * Handles the XPath function number.
-   *   
+   *
    * http://www.w3.org/TR/xpath#section-Number-Functions
    *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
@@ -4816,7 +4816,7 @@ function _handleFunction_number($arguments, $context) {
     }
     // A bool
     elseif (is_bool($arguments)) {  // Return TRUE/FALSE as a number.
-      if ($arguments === TRUE) return 1; else return 0;  
+      if ($arguments === TRUE) return 1; else return 0;
     }
     // A node set
     elseif (is_array($arguments)) {
@@ -4836,7 +4836,7 @@ function _handleFunction_number($arguments, $context) {
     }
     else {
       // Spec says:
-      // "An object of a type other than the four basic types is converted to a number in a way 
+      // "An object of a type other than the four basic types is converted to a number in a way
       // that is dependent on that type"
       // Try to evaluate the argument as an XPath.
       $result = $this->_evaluateExpr($arguments, $context);
@@ -4851,7 +4851,7 @@ function _handleFunction_number($arguments, $context) {
 
   /**
    * Handles the XPath function sum.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4879,7 +4879,7 @@ function _handleFunction_sum($arguments, $context) {
 
   /**
    * Handles the XPath function floor.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4892,10 +4892,10 @@ function _handleFunction_floor($arguments, $context) {
     $arguments = doubleval($arguments); // Convert the arguments to a number.
     return floor($arguments);           // Return the result
   }
-  
+
   /**
    * Handles the XPath function ceiling.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4908,10 +4908,10 @@ function _handleFunction_ceiling($arguments, $context) {
     $arguments = doubleval($arguments); // Convert the arguments to a number.
     return ceil($arguments);            // Return the result
   }
-  
+
   /**
    * Handles the XPath function round.
-   *   
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4926,15 +4926,15 @@ function _handleFunction_round($arguments, $context) {
   }
 
   //-----------------------------------------------------------------------------------------
-  // XPath                  ------  XPath Extension FUNCTION Handlers  ------                          
+  // XPath                  ------  XPath Extension FUNCTION Handlers  ------
   //-----------------------------------------------------------------------------------------
 
   /**
    * Handles the XPath function x-lower.
    *
    * lower case a string.
-   *    string x-lower(string) 
-   *   
+   *    string x-lower(string)
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4951,8 +4951,8 @@ function _handleFunction_x_lower($arguments, $context) {
    * Handles the XPath function x-upper.
    *
    * upper case a string.
-   *    string x-upper(string) 
-   *   
+   *    string x-upper(string)
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -4969,23 +4969,23 @@ function _handleFunction_x_upper($arguments, $context) {
    * Handles the XPath function generate-id.
    *
    * Produce a unique id for the first node of the node set.
-   * 
+   *
    * Example usage, produces an index of all the nodes in an .xml document, where the content of each
    * "section" is the exported node as XML.
    *
    *   $aFunctions = $xPath->match('//');
-   *   
+   *
    *   foreach ($aFunctions as $Function) {
    *       $id = $xPath->match("generate-id($Function)");
    *       echo "<a href='#$id'>$Function</a><br>";
    *   }
-   *   
+   *
    *   foreach ($aFunctions as $Function) {
    *       $id = $xPath->match("generate-id($Function)");
    *       echo "<h2 id='$id'>$Function</h2>";
    *       echo htmlspecialchars($xPath->exportAsXml($Function));
    *   }
-   * 
+   *
    * @param  $arguments     (string) String containing the arguments that were passed to the function.
    * @param  $context       (array)  The context from which to evaluate the function
    * @return                (mixed)  Depending on the type of function being processed
@@ -5013,7 +5013,7 @@ function _handleFunction_generate_id($arguments, $context) {
   }
 
   //-----------------------------------------------------------------------------------------
-  // XPathEngine                ------  Help Stuff  ------                                   
+  // XPathEngine                ------  Help Stuff  ------
   //-----------------------------------------------------------------------------------------
 
   /**
@@ -5023,7 +5023,7 @@ function _handleFunction_generate_id($arguments, $context) {
    * are going to come back to you with their entities still encoded.  You can
    * use this function to remove these entites.
    *
-   * It makes use of the get_html_translation_table(HTML_ENTITIES) php library 
+   * It makes use of the get_html_translation_table(HTML_ENTITIES) php library
    * call, so is limited in the same ways.  At the time of writing this seemed
    * be restricted to iso-8859-1
    *
@@ -5064,12 +5064,12 @@ function decodeEntities($encodedData, $reverse=FALSE) {
 
     return $result;
   }
-  
+
   /**
    * Compare two nodes to see if they are equal (point to the same node in the doc)
    *
    * 2 nodes are considered equal if the absolute XPath is equal.
-   * 
+   *
    * @param  $node1 (mixed) Either an absolute XPath to an node OR a real tree-node (hash-array)
    * @param  $node2 (mixed) Either an absolute XPath to an node OR a real tree-node (hash-array)
    * @return        (bool)  TRUE if equal (see text above), FALSE if not (and on error).
@@ -5079,11 +5079,11 @@ function equalNodes($node1, $node2) {
     $xPath_2 = is_string($node2) ? $node2 : $this->getNodePath($node2);
     return (strncasecmp ($xPath_1, $xPath_2, strLen($xPath_1)) == 0);
   }
-  
+
   /**
    * Get the absolute XPath of a node that is in a document tree.
    *
-   * @param $node (array)  A real tree-node (hash-array)   
+   * @param $node (array)  A real tree-node (hash-array)
    * @return      (string) The string path to the node or FALSE on error.
    */
   function getNodePath($node) {
@@ -5094,7 +5094,7 @@ function getNodePath($node) {
       $pathInfo[] = array('name' => $node['name'], 'contextPos' => $node['contextPos']);
       $node = $node['parentNode'];
     } while (TRUE);
-    
+
     $xPath = '';
     for ($i=sizeOf($pathInfo)-1; $i>=0; $i--) {
       $xPath .= '/' . $pathInfo[$i]['name'] . '[' . $pathInfo[$i]['contextPos'] . ']';
@@ -5102,7 +5102,7 @@ function getNodePath($node) {
     if (empty($xPath)) return FALSE;
     return $xPath;
   }
-  
+
   /**
    * Retrieves the absolute parent XPath query.
    *
@@ -5114,14 +5114,14 @@ function getNodePath($node) {
    * @return            (string) returns the absolute XPath of the parent
    */
    function getParentXPath($absoluteXPath) {
-     $lastSlashPos = strrpos($absoluteXPath, '/'); 
+     $lastSlashPos = strrpos($absoluteXPath, '/');
      if ($lastSlashPos == 0) { // it's already the root path
        return ''; // 'super-root'
      } else {
        return (substr($absoluteXPath, 0, $lastSlashPos));
      }
    }
-  
+
   /**
    * Returns TRUE if the given node has child nodes below it
    *
@@ -5130,41 +5130,41 @@ function getParentXPath($absoluteXPath) {
    */
   function hasChildNodes($absoluteXPath) {
     if ($this->_indexIsDirty) $this->reindexNodeTree();
-    return (bool) (isSet($this->nodeIndex[$absoluteXPath]) 
+    return (bool) (isSet($this->nodeIndex[$absoluteXPath])
                    AND sizeOf($this->nodeIndex[$absoluteXPath]['childNodes']));
   }
-  
+
   /**
    * Translate all ampersands to it's literal entities '&amp;' and back.
    *
    * I wasn't aware of this problem at first but it's important to understand why we do this.
    * At first you must know:
    * a) PHP's XML parser *translates* all entities to the equivalent char E.g. &lt; is returned as '<'
-   * b) PHP's XML parser (in V 4.1.0) has problems with most *literal* entities! The only one's that are 
-   *    recognized are &amp;, &lt; &gt; and &quot;. *ALL* others (like &nbsp; &copy; a.s.o.) cause an 
+   * b) PHP's XML parser (in V 4.1.0) has problems with most *literal* entities! The only one's that are
+   *    recognized are &amp;, &lt; &gt; and &quot;. *ALL* others (like &nbsp; &copy; a.s.o.) cause an
    *    XML_ERROR_UNDEFINED_ENTITY error. I reported this as bug at http://bugs.php.net/bug.php?id=15092
    *    (It turned out not to be a 'real' bug, but one of those nice W3C-spec things).
-   * 
-   * Forget position b) now. It's just for info. Because the way we will solve a) will also solve b) too. 
+   *
+   * Forget position b) now. It's just for info. Because the way we will solve a) will also solve b) too.
    *
    * THE PROBLEM
    * To understand the problem, here a sample:
    * Given is the following XML:    "<AAA> &lt; &nbsp; &gt; </AAA>"
-   *   Try to parse it and PHP's XML parser will fail with a XML_ERROR_UNDEFINED_ENTITY becaus of 
-   *   the unknown litteral-entity '&nbsp;'. (The numeric equivalent '&#160;' would work though). 
+   *   Try to parse it and PHP's XML parser will fail with a XML_ERROR_UNDEFINED_ENTITY becaus of
+   *   the unknown litteral-entity '&nbsp;'. (The numeric equivalent '&#160;' would work though).
    * Next try is to use the numeric equivalent 160 for '&nbsp;', thus  "<AAA> &lt; &#160; &gt; </AAA>"
-   *   The data we receive in the tag <AAA> is  " <   > ". So we get the *translated entities* and 
+   *   The data we receive in the tag <AAA> is  " <   > ". So we get the *translated entities* and
    *   NOT the 3 entities &lt; &#160; &gt. Thus, we will not even notice that there were entities at all!
    *   In *most* cases we're not able to tell if the data was given as entity or as 'normal' char.
    *   E.g. When receiving a quote or a single space were not able to tell if it was given as 'normal' char
    *   or as &nbsp; or &quot;. Thus we loose the entity-information of the XML-data!
-   * 
+   *
    * THE SOLUTION
    * The better solution is to keep the data 'as is' by replacing the '&' before parsing begins.
    * E.g. Taking the original input from above, this would result in "<AAA> &amp;lt; &amp;nbsp; &amp;gt; </AAA>"
    * The data we receive now for the tag <AAA> is  " &lt; &nbsp; &gt; ". and that's what we want.
-   * 
-   * The bad thing is, that a global replace will also replace data in section that are NOT translated by the 
+   *
+   * The bad thing is, that a global replace will also replace data in section that are NOT translated by the
    * PHP XML-parser. That is comments (<!-- -->), IP-sections (stuff between <? ? >) and CDATA-block too.
    * So all data comming from those sections must be reversed. This is done during the XML parse phase.
    * So:
@@ -5189,7 +5189,7 @@ function _translateAmpersand($xmlSource, $reverse=FALSE) {
 
 /************************************************************************************************
 * ===============================================================================================
-*                                     X P a t h  -  Class                                        
+*                                     X P a t h  -  Class
 * ===============================================================================================
 ************************************************************************************************/
 
@@ -5198,12 +5198,12 @@ function _translateAmpersand($xmlSource, $reverse=FALSE) {
 define('XPATH_QUERYHIT_UNIQUE', 3);
 
 class XPath extends XPathEngine {
-    
+
   /**
    * Constructor of the class
    *
-   * Optionally you may call this constructor with the XML-filename to parse and the 
-   * XML option vector. A option vector sample: 
+   * Optionally you may call this constructor with the XML-filename to parse and the
+   * XML option vector. A option vector sample:
    *   $xmlOpt = array(XML_OPTION_CASE_FOLDING => FALSE, XML_OPTION_SKIP_WHITE => TRUE);
    *
    * @param  $userXmlOptions (array)  (optional) Vector of (<optionID>=><value>, <optionID>=><value>, ...)
@@ -5225,7 +5225,7 @@ function XPath($fileName='', $userXmlOptions=array()) {
       }
     }
   }
-  
+
   /**
    * Resets the object so it's able to take a new xml sting/file
    *
@@ -5236,23 +5236,23 @@ function reset() {
     parent::reset();
     $this->properties['modMatch'] = XPATH_QUERYHIT_ALL;
   }
-  
+
   //-----------------------------------------------------------------------------------------
-  // XPath                    ------  Get / Set Stuff  ------                                
+  // XPath                    ------  Get / Set Stuff  ------
   //-----------------------------------------------------------------------------------------
-  
+
   /**
    * Resolves and xPathQuery array depending on the property['modMatch']
    *
-   * Most of the modification functions of XPath will also accept a xPathQuery (instead 
-   * of an absolute Xpath). The only problem is that the query could match more the one 
+   * Most of the modification functions of XPath will also accept a xPathQuery (instead
+   * of an absolute Xpath). The only problem is that the query could match more the one
    * node. The question is, if the none, the fist or all nodes are to be modified.
-   * The behaver can be set with setModMatch()  
+   * The behaver can be set with setModMatch()
    *
    * @param $modMatch (int) One of the following:
-   *                        - XPATH_QUERYHIT_ALL (default) 
+   *                        - XPATH_QUERYHIT_ALL (default)
    *                        - XPATH_QUERYHIT_FIRST
-   *                        - XPATH_QUERYHIT_UNIQUE // If the query matches more then one node. 
+   *                        - XPATH_QUERYHIT_UNIQUE // If the query matches more then one node.
    * @see  _resolveXPathQuery()
    */
   function setModMatch($modMatch = XPATH_QUERYHIT_ALL) {
@@ -5262,26 +5262,26 @@ function setModMatch($modMatch = XPATH_QUERYHIT_ALL) {
       default: $this->properties['modMatch'] = XPATH_QUERYHIT_ALL;
     }
   }
-  
+
   //-----------------------------------------------------------------------------------------
-  // XPath                    ------  DOM Like Modification  ------                          
+  // XPath                    ------  DOM Like Modification  ------
   //-----------------------------------------------------------------------------------------
-  
+
   //-----------------------------------------------------------------------------------------
-  // XPath                  ------  Child (Node)  Set/Get  ------                           
+  // XPath                  ------  Child (Node)  Set/Get  ------
   //-----------------------------------------------------------------------------------------
-  
+
   /**
    * Retrieves the name(s) of a node or a group of document nodes.
-   *          
+   *
    * This method retrieves the names of a group of document nodes
    * specified in the argument.  So if the argument was '/A[1]/B[2]' then it
    * would return 'B' if the node did exist in the tree.
-   *          
-   * @param  $xPathQuery (mixed) Array or single full document path(s) of the node(s), 
+   *
+   * @param  $xPathQuery (mixed) Array or single full document path(s) of the node(s),
    *                             from which the names should be retrieved.
-   * @return             (mixed) Array or single string of the names of the specified 
-   *                             nodes, or just the individual name.  If the node did 
+   * @return             (mixed) Array or single string of the names of the specified
+   *                             nodes, or just the individual name.  If the node did
    *                             not exist, then returns FALSE.
    */
   function nodeName($xPathQuery) {
@@ -5297,7 +5297,7 @@ function nodeName($xPathQuery) {
     foreach($xPathSet as $xPath) {
       $node = &$this->getNode($xPath);
       if (!$node) {
-        // ### Fatal internal error?? 
+        // ### Fatal internal error??
         continue;
       }
       $result[] = $node['name'];
@@ -5307,20 +5307,20 @@ function nodeName($xPathQuery) {
     // Return result.
     return $result;
   }
-  
+
   /**
    * Removes a node from the XML document.
    *
-   * This method removes a node from the tree of nodes of the XML document. If the node 
-   * is a document node, all children of the node and its character data will be removed. 
-   * If the node is an attribute node, only this attribute will be removed, the node to which 
+   * This method removes a node from the tree of nodes of the XML document. If the node
+   * is a document node, all children of the node and its character data will be removed.
+   * If the node is an attribute node, only this attribute will be removed, the node to which
    * the attribute belongs as well as its children will remain unmodified.
    *
    * NOTE: When passing a xpath-query instead of an abs. Xpath.
    *       Depending on setModMatch() one, none or multiple nodes are affected.
    *
    * @param  $xPathQuery  (string) xpath to the node (See note above).
-   * @param  $autoReindex (bool)   (optional, default=TRUE) Reindex the document to reflect 
+   * @param  $autoReindex (bool)   (optional, default=TRUE) Reindex the document to reflect
    *                               the changes.  A performance helper.  See reindexNodeTree()
    * @return              (bool)   TRUE on success, FALSE on error;
    * @see    setModMatch(), reindexNodeTree()
@@ -5358,7 +5358,7 @@ function removeChild($xPathQuery, $autoReindex=TRUE) {
         $mustReindex = $autoReindex;
         // Flag the index as dirty; it's not uptodate. A reindex will be forced (if dirty) when exporting the XML doc
         $this->_indexIsDirty = TRUE;
-        
+
         $theNode = $this->nodeIndex[$absoluteXPath];
         $theNode['parentNode']['childNodes'][$theNode['pos']] =& $NULL;
         if ($bDebugThisFunction) echo "We removed the node '$absoluteXPath'.\n";
@@ -5367,19 +5367,19 @@ function removeChild($xPathQuery, $autoReindex=TRUE) {
       if ($mustReindex) $this->reindexNodeTree();
       $status = TRUE;
     } while(FALSE);
-    
+
     $this->_closeDebugFunction($ThisFunctionName, $status, $bDebugThisFunction);
 
     return $status;
   }
-  
+
   /**
    * Replace a node with any data string. The $data is taken 1:1.
    *
-   * This function will delete the node you define by $absoluteXPath (plus it's sub-nodes) and 
+   * This function will delete the node you define by $absoluteXPath (plus it's sub-nodes) and
    * substitute it by the string $text. Often used to push in not well formed HTML.
-   * WARNING: 
-   *   The $data is taken 1:1. 
+   * WARNING:
+   *   The $data is taken 1:1.
    *   You are in charge that the data you enter is valid XML if you intend
    *   to export and import the content again.
    *
@@ -5388,7 +5388,7 @@ function removeChild($xPathQuery, $autoReindex=TRUE) {
    *
    * @param  $xPathQuery  (string) xpath to the node (See note above).
    * @param  $data        (string) String containing the content to be set. *READONLY*
-   * @param  $autoReindex (bool)   (optional, default=TRUE) Reindex the document to reflect 
+   * @param  $autoReindex (bool)   (optional, default=TRUE) Reindex the document to reflect
    *                               the changes.  A performance helper.  See reindexNodeTree()
    * @return              (bool)   TRUE on success, FALSE on error;
    * @see    setModMatch(), replaceChild(), reindexNodeTree()
@@ -5416,7 +5416,7 @@ function replaceChildByData($xPathQuery, $data, $autoReindex=TRUE) {
         $mustReindex = $autoReindex;
         // Flag the index as dirty; it's not uptodate. A reindex will be forced (if dirty) when exporting the XML doc
         $this->_indexIsDirty = TRUE;
-        
+
         $absoluteXPath = $xPathSet[$i];
         $theNode = $this->nodeIndex[$absoluteXPath];
         $pos = $theNode['pos'];
@@ -5428,16 +5428,16 @@ function replaceChildByData($xPathQuery, $data, $autoReindex=TRUE) {
       if ($mustReindex) $this->reindexNodeTree();
       $status = TRUE;
     } while(FALSE);
-    
+
     $this->_closeDebugFunction($ThisFunctionName, ($status) ? 'Success' : '!!! FAILD !!!', $bDebugThisFunction);
 
     return $status;
   }
-  
+
   /**
    * Replace the node(s) that matches the xQuery with the passed node (or passed node-tree)
-   * 
-   * If the passed node is a string it's assumed to be XML and replaceChildByXml() 
+   *
+   * If the passed node is a string it's assumed to be XML and replaceChildByXml()
    * will be called.
    * NOTE: When passing a xpath-query instead of an abs. Xpath.
    *       Depending on setModMatch() one, none or multiple nodes are affected.
@@ -5446,7 +5446,7 @@ function replaceChildByData($xPathQuery, $data, $autoReindex=TRUE) {
    * @param  $node        (mixed)  String or Array (Usually a String)
    *                               If string: Vaild XML. E.g. "<A/>" or "<A> foo <B/> bar <A/>"
    *                               If array:  A Node (can be a whole sub-tree) (See comment in header)
-   * @param  $autoReindex (bool)   (optional, default=TRUE) Reindex the document to reflect 
+   * @param  $autoReindex (bool)   (optional, default=TRUE) Reindex the document to reflect
    *                               the changes.  A performance helper.  See reindexNodeTree()
    * @return              (array)  The last replaced $node (can be a whole sub-tree)
    * @see    reindexNodeTree()
@@ -5456,14 +5456,14 @@ function &replaceChild($xPathQuery, $node, $autoReindex=TRUE) {
     if (is_string($node)) {
       if (empty($node)) { //--sam. Not sure how to react on an empty string - think it's an error.
         return array();
-      } else { 
+      } else {
         if (!($node = $this->_xml2Document($node))) return FALSE;
       }
     }
-    
+
     // Special case if it's 'super root'. We then have to take the child node == top node
     if (empty($node['parentNode'])) $node = $node['childNodes'][0];
-    
+
     $status = FALSE;
     do { // try-block
       // Check for a valid xPathQuery
@@ -5473,13 +5473,13 @@ function &replaceChild($xPathQuery, $node, $autoReindex=TRUE) {
         break; // try-block
       }
       $mustReindex = FALSE;
-      
+
       // Make chages from 'bottom-up'. In this manner the modifications will not affect itself.
       for ($i=sizeOf($xPathSet)-1; $i>=0; $i--) {
         $mustReindex = $autoReindex;
         // Flag the index as dirty; it's not uptodate. A reindex will be forced (if dirty) when exporting the XML doc
         $this->_indexIsDirty = TRUE;
-        
+
         $absoluteXPath = $xPathSet[$i];
         $childNode =& $this->nodeIndex[$absoluteXPath];
         $parentNode =& $childNode['parentNode'];
@@ -5490,32 +5490,32 @@ function &replaceChild($xPathQuery, $node, $autoReindex=TRUE) {
       if ($mustReindex) $this->reindexNodeTree();
       $status = TRUE;
     } while(FALSE);
-    
+
     if (!$status) return FALSE;
     return $childNode;
   }
-  
+
   /**
    * Insert passed node (or passed node-tree) at the node(s) that matches the xQuery.
    *
-   * With parameters you can define if the 'hit'-node is shifted to the right or left 
+   * With parameters you can define if the 'hit'-node is shifted to the right or left
    * and if it's placed before of after the text-part.
-   * Per derfault the 'hit'-node is shifted to the right and the node takes the place 
-   * the of the 'hit'-node. 
+   * Per derfault the 'hit'-node is shifted to the right and the node takes the place
+   * the of the 'hit'-node.
    * NOTE: When passing a xpath-query instead of an abs. Xpath.
    *       Depending on setModMatch() one, none or multiple nodes are affected.
-   * 
-   * E.g. Following is given:           AAA[1]           
-   *                                  /       \          
-   *                              ..BBB[1]..BBB[2] ..    
+   *
+   * E.g. Following is given:           AAA[1]
+   *                                  /       \
+   *                              ..BBB[1]..BBB[2] ..
    *
    * a) insertChild('/AAA[1]/BBB[2]', <node CCC>)
    * b) insertChild('/AAA[1]/BBB[2]', <node CCC>, $shiftRight=FALSE)
    * c) insertChild('/AAA[1]/BBB[2]', <node CCC>, $shiftRight=FALSE, $afterText=FALSE)
    *
-   * a)                          b)                           c)                        
-   *          AAA[1]                       AAA[1]                       AAA[1]          
-   *        /    |   \                   /    |   \                   /    |   \        
+   * a)                          b)                           c)
+   *          AAA[1]                       AAA[1]                       AAA[1]
+   *        /    |   \                   /    |   \                   /    |   \
    *  ..BBB[1]..CCC[1]BBB[2]..     ..BBB[1]..BBB[2]..CCC[1]     ..BBB[1]..BBB[2]CCC[1]..
    *
    * #### Do a complete review of the "(optional)" tag after several arguments.
@@ -5526,7 +5526,7 @@ function &replaceChild($xPathQuery, $node, $autoReindex=TRUE) {
    *                               If array:  A Node (can be a whole sub-tree) (See comment in header)
    * @param  $shiftRight  (bool)   (optional, default=TRUE) Shift the target node to the right.
    * @param  $afterText   (bool)   (optional, default=TRUE) Insert after the text.
-   * @param  $autoReindex (bool)   (optional, default=TRUE) Reindex the document to reflect 
+   * @param  $autoReindex (bool)   (optional, default=TRUE) Reindex the document to reflect
    *                                the changes.  A performance helper.  See reindexNodeTree()
    * @return              (mixed)  FALSE on error (or no match). On success we return the path(s) to the newly
    *                               appended nodes. That is: Array of paths if more then 1 node was added or
@@ -5540,14 +5540,14 @@ function insertChild($xPathQuery, $node, $shiftRight=TRUE, $afterText=TRUE, $aut
     if (is_string($node)) {
       if (empty($node)) { //--sam. Not sure how to react on an empty string - think it's an error.
         return FALSE;
-      } else { 
+      } else {
         if (!($node = $this->_xml2Document($node))) return FALSE;
       }
     }
 
     // Special case if it's 'super root'. We then have to take the child node == top node
     if (empty($node['parentNode'])) $node = $node['childNodes'][0];
-    
+
     // Check for a valid xPathQuery
     $xPathSet = $this->_resolveXPathQuery($xPathQuery,'insertChild');
     if (sizeOf($xPathSet) === 0) {
@@ -5572,7 +5572,7 @@ function insertChild($xPathQuery, $node, $shiftRight=TRUE, $afterText=TRUE, $aut
       $mustReindex = $autoReindex;
       // Flag the index as dirty; it's not uptodate. A reindex will be forced (if dirty) when exporting the XML doc
       $this->_indexIsDirty = TRUE;
-      
+
       //Special case: It not possible to add siblings to the top node.
       if (empty($parentNode['name'])) continue;
       $newNode =& $this->cloneNode($node);
@@ -5588,7 +5588,7 @@ function insertChild($xPathQuery, $node, $shiftRight=TRUE, $afterText=TRUE, $aut
                                    array(''),
                                    array_slice($parentNode['textParts'], $pos)
                                  );
-      
+
       // We are going from bottom to top, but the user will want results from top to bottom.
       if ($mustReindex) {
         // We'll have to wait till after the reindex to get the full path to this new node.
@@ -5612,7 +5612,7 @@ function insertChild($xPathQuery, $node, $shiftRight=TRUE, $afterText=TRUE, $aut
     if (count($result) == 1) $result = $result[0];
     return $result;
   }
-  
+
   /**
    * Appends a child to anothers children.
    *
@@ -5624,7 +5624,7 @@ function insertChild($xPathQuery, $node, $shiftRight=TRUE, $afterText=TRUE, $aut
    *                               If string: Vaild XML. E.g. "<A/>" or "<A> foo <B/> bar <A/>"
    *                               If array:  A Node (can be a whole sub-tree) (See comment in header)
    * @param  $afterText   (bool)   (optional, default=FALSE) Insert after the text.
-   * @param  $autoReindex (bool)   (optional, default=TRUE) Reindex the document to reflect 
+   * @param  $autoReindex (bool)   (optional, default=TRUE) Reindex the document to reflect
    *                               the changes.  A performance helper.  See reindexNodeTree()
    * @return              (mixed)  FALSE on error (or no match). On success we return the path(s) to the newly
    *                               appended nodes. That is: Array of paths if more then 1 node was added or
@@ -5638,11 +5638,11 @@ function appendChild($xPathQuery, $node, $afterText=FALSE, $autoReindex=TRUE) {
     if (is_string($node)) {
       if (empty($node)) { //--sam. Not sure how to react on an empty string - think it's an error.
         return FALSE;
-      } else { 
+      } else {
         if (!($node = $this->_xml2Document($node))) return FALSE;
       }
     }
-    
+
     // Special case if it's 'super root'. We then have to take the child node == top node
     if (empty($node['parentNode'])) $node = $node['childNodes'][0];
 
@@ -5658,7 +5658,7 @@ function appendChild($xPathQuery, $node, $afterText=FALSE, $autoReindex=TRUE) {
       $mustReindex = $autoReindex;
       // Flag the index as dirty; it's not uptodate. A reindex will be forced (if dirty) when exporting the XML doc
       $this->_indexIsDirty = TRUE;
-      
+
       $absoluteXPath = $xPathSet[$i];
       $parentNode =& $this->nodeIndex[$absoluteXPath];
       $newNode =& $this->cloneNode($node);
@@ -5688,11 +5688,11 @@ function appendChild($xPathQuery, $node, $afterText=FALSE, $autoReindex=TRUE) {
       foreach ($newNodes as $newNode) {
         array_unshift($result, $newNode['xpath']);
       }
-    } 
+    }
     if (count($result) == 1) $result = $result[0];
     return $result;
   }
-  
+
   /**
    * Inserts a node before the reference node with the same parent.
    *
@@ -5704,7 +5704,7 @@ function appendChild($xPathQuery, $node, $afterText=FALSE, $autoReindex=TRUE) {
    *                               If string: Vaild XML. E.g. "<A/>" or "<A> foo <B/> bar <A/>"
    *                               If array:  A Node (can be a whole sub-tree) (See comment in header)
    * @param  $afterText   (bool)   (optional, default=FLASE) Insert after the text.
-   * @param  $autoReindex (bool)   (optional, default=TRUE) Reindex the document to reflect 
+   * @param  $autoReindex (bool)   (optional, default=TRUE) Reindex the document to reflect
    *                               the changes.  A performance helper.  See reindexNodeTree()
    * @return              (mixed)  FALSE on error (or no match). On success we return the path(s) to the newly
    *                               appended nodes. That is: Array of paths if more then 1 node was added or
@@ -5717,26 +5717,26 @@ function appendChild($xPathQuery, $node, $afterText=FALSE, $autoReindex=TRUE) {
   function insertBefore($xPathQuery, $node, $afterText=TRUE, $autoReindex=TRUE) {
     return $this->insertChild($xPathQuery, $node, $shiftRight=TRUE, $afterText, $autoReindex);
   }
-  
+
 
   //-----------------------------------------------------------------------------------------
-  // XPath                     ------  Attribute  Set/Get  ------                            
+  // XPath                     ------  Attribute  Set/Get  ------
   //-----------------------------------------------------------------------------------------
-  
-  /** 
+
+  /**
    * Retrieves a dedecated attribute value or a hash-array of all attributes of a node.
-   * 
-   * The first param $absoluteXPath must be a valid xpath OR a xpath-query that results 
-   * to *one* xpath. If the second param $attrName is not set, a hash-array of all attributes 
+   *
+   * The first param $absoluteXPath must be a valid xpath OR a xpath-query that results
+   * to *one* xpath. If the second param $attrName is not set, a hash-array of all attributes
    * of that node is returned.
    *
-   * Optionally you may pass an attrubute name in $attrName and the function will return the 
+   * Optionally you may pass an attrubute name in $attrName and the function will return the
    * string value of that attribute.
    *
    * @param  $absoluteXPath (string) Full xpath OR a xpath-query that results to *one* xpath.
    * @param  $attrName      (string) (Optional) The name of the attribute. See above.
-   * @return                (mixed)  hash-array or a string of attributes depending if the 
-   *                                 parameter $attrName was set (see above).  FALSE if the 
+   * @return                (mixed)  hash-array or a string of attributes depending if the
+   *                                 parameter $attrName was set (see above).  FALSE if the
    *                                 node or attribute couldn't be found.
    * @see    setAttribute(), removeAttribute()
    */
@@ -5752,7 +5752,7 @@ function getAttributes($absoluteXPath, $attrName=NULL) {
         // Case in-sensitive
         $attrName = strtoupper($attrName);
     }
-    
+
     // Return the complete list or just the desired element
     if (is_null($attrName)) {
       return $this->nodeIndex[$absoluteXPath]['attributes'];
@@ -5761,7 +5761,7 @@ function getAttributes($absoluteXPath, $attrName=NULL) {
     }
     return FALSE;
   }
-  
+
   /**
    * Set attributes of a node(s).
    *
@@ -5772,7 +5772,7 @@ function getAttributes($absoluteXPath, $attrName=NULL) {
    *
    * @param  $xPathQuery (string) xpath to the node (See note above).
    * @param  $name       (string) Attribute name.
-   * @param  $value      (string) Attribute value.   
+   * @param  $value      (string) Attribute value.
    * @param  $overwrite  (bool)   If the attribute is already set we overwrite it (see text above)
    * @return             (bool)   TRUE on success, FALSE on failure.
    * @see    getAttributes(), removeAttribute()
@@ -5780,7 +5780,7 @@ function getAttributes($absoluteXPath, $attrName=NULL) {
   function setAttribute($xPathQuery, $name, $value, $overwrite=TRUE) {
     return $this->setAttributes($xPathQuery, array($name => $value), $overwrite);
   }
-  
+
   /**
    * Version of setAttribute() that sets multiple attributes to node(s).
    *
@@ -5800,7 +5800,7 @@ function setAttributes($xPathQuery, $attributes, $overwrite=TRUE) {
     do { // try-block
       // The attributes parameter should be an associative array.
       if (!is_array($attributes)) break;  // try-block
-      
+
       // Check for a valid xPathQuery
       $xPathSet = $this->_resolveXPathQuery($xPathQuery,'setAttributes');
       foreach($xPathSet as $absoluteXPath) {
@@ -5814,16 +5814,16 @@ function setAttributes($xPathQuery, $attributes, $overwrite=TRUE) {
       }
       $status = TRUE;
     } while(FALSE); // END try-block
-    
+
     return $status;
   }
-  
+
   /**
    * Removes an attribute of a node(s).
    *
    * This method removes *ALL* attributres per default unless the second parameter $attrList is set.
    * $attrList can be either a single attr-name as string OR a vector of attr-names as array.
-   * E.g. 
+   * E.g.
    *  removeAttribute(<xPath>);                     # will remove *ALL* attributes.
    *  removeAttribute(<xPath>, 'A');                # will only remove attributes called 'A'.
    *  removeAttribute(<xPath>, array('A_1','A_2')); # will remove attribute 'A_1' and 'A_2'.
@@ -5838,15 +5838,15 @@ function setAttributes($xPathQuery, $attributes, $overwrite=TRUE) {
   function removeAttribute($xPathQuery, $attrList=NULL) {
     // Check for a valid xPathQuery
     $xPathSet = $this->_resolveXPathQuery($xPathQuery, 'removeAttribute');
-    
+
     if (!empty($attrList) AND is_string($attrList)) $attrList = array($attrList);
     if (!is_array($attrList)) return FALSE;
-    
+
     foreach($xPathSet as $absoluteXPath) {
       // If the attribute parameter wasn't set then remove all the attributes
       if ($attrList[0] === NULL) {
         $this->nodeIndex[$absoluteXPath]['attributes'] = array();
-        continue; 
+        continue;
       }
       // Remove all the elements in the array then.
       foreach($attrList as $name) {
@@ -5855,22 +5855,22 @@ function removeAttribute($xPathQuery, $attrList=NULL) {
     }
     return TRUE;
   }
-  
+
   //-----------------------------------------------------------------------------------------
-  // XPath                        ------  Text  Set/Get  ------                              
+  // XPath                        ------  Text  Set/Get  ------
   //-----------------------------------------------------------------------------------------
-  
+
   /**
    * Retrieve all the text from a node as a single string.
    *
-   * Sample  
+   * Sample
    * Given is: <AA> This <BB\>is <BB\>  some<BB\>text </AA>
    * Return of getData('/AA[1]') would be:  " This is   sometext "
-   * The first param $xPathQuery must be a valid xpath OR a xpath-query that 
-   * results to *one* xpath. 
+   * The first param $xPathQuery must be a valid xpath OR a xpath-query that
+   * results to *one* xpath.
    *
    * @param  $xPathQuery (string) xpath to the node - resolves to *one* xpath.
-   * @return             (mixed)  The returned string (see above), FALSE if the node 
+   * @return             (mixed)  The returned string (see above), FALSE if the node
    *                              couldn't be found or is not unique.
    * @see getDataParts()
    */
@@ -5879,20 +5879,20 @@ function getData($xPathQuery) {
     if ($aDataParts === FALSE) return FALSE;
     return implode('', $aDataParts);
   }
-  
+
   /**
    * Retrieve all the text from a node as a vector of strings
-   * 
+   *
    * Where each element of the array was interrupted by a non-text child element.
    *
-   * Sample  
+   * Sample
    * Given is: <AA> This <BB\>is <BB\>  some<BB\>text </AA>
    * Return of getDataParts('/AA[1]') would be:  array([0]=>' This ', [1]=>'is ', [2]=>'  some', [3]=>'text ');
-   * The first param $absoluteXPath must be a valid xpath OR a xpath-query that results 
-   * to *one* xpath. 
+   * The first param $absoluteXPath must be a valid xpath OR a xpath-query that results
+   * to *one* xpath.
    *
    * @param  $xPathQuery (string) xpath to the node - resolves to *one* xpath.
-   * @return             (mixed)  The returned array (see above), or FALSE if node is not 
+   * @return             (mixed)  The returned array (see above), or FALSE if node is not
    *                              found or is not unique.
    * @see getData()
    */
@@ -5915,22 +5915,22 @@ function getDataParts($xPathQuery) {
       return array($this->nodeIndex[$absoluteXPath]['attributes'][$attribute]);
     } else if (preg_match(":(.*)/text\(\)(\[(.*)\])?$:U", $xPathQuery, $matches)) {
       $absoluteXPath = $matches[1];
-      $textPartNr = $matches[2];      
+      $textPartNr = $matches[2];
       return array($this->nodeIndex[$absoluteXPath]['textParts'][$textPartNr]);
     } else {
       return $this->nodeIndex[$absoluteXPath]['textParts'];
     }
   }
-  
+
   /**
    * Retrieves a sub string of a text-part OR attribute-value.
    *
-   * This method retrieves the sub string of a specific text-part OR (if the 
+   * This method retrieves the sub string of a specific text-part OR (if the
    * $absoluteXPath references an attribute) the the sub string  of the attribute value.
-   * If no 'direct referencing' is used (Xpath ends with text()[<part-number>]), then 
+   * If no 'direct referencing' is used (Xpath ends with text()[<part-number>]), then
    * the first text-part of the node ist returned (if exsiting).
    *
-   * @param  $absoluteXPath (string) Xpath to the node (See note above).   
+   * @param  $absoluteXPath (string) Xpath to the node (See note above).
    * @param  $offset        (int)    (optional, default is 0) Starting offset. (Just like PHP's substr())
    * @param  $count         (number) (optional, default is ALL) Character count  (Just like PHP's substr())
    * @return                (mixed)  The sub string, FALSE if not found or on error
@@ -5942,9 +5942,9 @@ function substringData($absoluteXPath, $offset = 0, $count = NULL) {
       return substr($text, $offset);
     } else {
       return substr($text, $offset, $count);
-    } 
+    }
   }
-  
+
   /**
    * Replace a sub string of a text-part OR attribute-value.
    *
@@ -5967,11 +5967,11 @@ function replaceData($xPathQuery, $replacement, $offset = 0, $count = 0, $textPa
         $textSet[$i] = substr_replace($textSet[$i], $replacement, $offset, $count);
       } else {
         $textSet[$i] = substr_replace($textSet[$i], $replacement, $offset);
-      } 
+      }
     }
     return TRUE;
   }
-  
+
   /**
    * Insert a sub string in a text-part OR attribute-value.
    *
@@ -5987,12 +5987,12 @@ function replaceData($xPathQuery, $replacement, $offset = 0, $count = 0, $textPa
   function insertData($xPathQuery, $data, $offset=0) {
     return $this->replaceData($xPathQuery, $data, $offset, 0);
   }
-  
+
   /**
    * Append text data to the end of the text for an attribute OR node text-part.
    *
    * This method adds content to a node. If it's an attribute node, then
-   * the value of the attribute will be set, otherwise the passed data will append to 
+   * the value of the attribute will be set, otherwise the passed data will append to
    * character data of the node text-part. Per default the first text-part is taken.
    *
    * NOTE: When passing a xpath-query instead of an abs. Xpath.
@@ -6012,12 +6012,12 @@ function appendData($xPathQuery, $data, $textPartNr=1) {
     }
     return TRUE;
   }
-  
+
   /**
    * Delete the data of a node.
    *
    * This method deletes content of a node. If it's an attribute node, then
-   * the value of the attribute will be removed, otherwise the node text-part. 
+   * the value of the attribute will be removed, otherwise the node text-part.
    * will be deleted.  Per default the first text-part is deleted.
    *
    * NOTE: When passing a xpath-query instead of an abs. Xpath.
@@ -6038,14 +6038,14 @@ function deleteData($xPathQuery, $offset=0, $count=0, $textPartNr=1) {
         $textSet[$i] = "";
       else
         $textSet[$i] = substr_replace($textSet[$i],'', $offset, $count);
-    } 
+    }
     return TRUE;
   }
- 
+
   //-----------------------------------------------------------------------------------------
-  // XPath                      ------  Help Stuff  ------                                   
+  // XPath                      ------  Help Stuff  ------
   //-----------------------------------------------------------------------------------------
-   
+
   /**
    * Parse the XML to a node-tree. A so called 'document'
    *
@@ -6054,7 +6054,7 @@ function deleteData($xPathQuery, $offset=0, $count=0, $textPartNr=1) {
    */
   function &_xml2Document($xmlString) {
     $xmlOptions = array(
-                    XML_OPTION_CASE_FOLDING => $this->getProperties('caseFolding'), 
+                    XML_OPTION_CASE_FOLDING => $this->getProperties('caseFolding'),
                     XML_OPTION_SKIP_WHITE   => $this->getProperties('skipWhiteSpaces')
                   );
     $xmlParser =& new XPathEngine($xmlOptions);
@@ -6066,20 +6066,20 @@ function &_xml2Document($xmlString) {
     }
     return $xmlParser->getNode('/');
   }
-  
+
   /**
    * Get a reference-list to node text part(s) or node attribute(s).
-   * 
-   * If the Xquery references an attribute(s) (Xquery ends with attribute::), 
+   *
+   * If the Xquery references an attribute(s) (Xquery ends with attribute::),
    * then the text value of the node-attribute(s) is/are returned.
-   * Otherwise the Xquery is referencing to text part(s) of node(s). This can be either a 
-   * direct reference to text part(s) (Xquery ends with text()[<nr>]) or indirect reference 
+   * Otherwise the Xquery is referencing to text part(s) of node(s). This can be either a
+   * direct reference to text part(s) (Xquery ends with text()[<nr>]) or indirect reference
    * (a simple Xquery to node(s)).
    * 1) Direct Reference (Xquery ends with text()[<part-number>]):
    *   If the 'part-number' is omitted, the first text-part is assumed; starting by 1.
    *   Negative numbers are allowed, where -1 is the last text-part a.s.o.
    * 2) Indirect Reference (a simple  Xquery to node(s)):
-   *   Default is to return the first text part(s). Optionally you may pass a parameter 
+   *   Default is to return the first text part(s). Optionally you may pass a parameter
    *   $textPartNr to define the text-part you want;  starting by 1.
    *   Negative numbers are allowed, where -1 is the last text-part a.s.o.
    *
@@ -6091,7 +6091,7 @@ function &_xml2Document($xmlString) {
    *
    * @param   $xPathQuery (string) xpath to the node (See note above).
    * @param   $textPartNr (int)    String containing the content to be set.
-   * @return              (mixed)  A vector of *references* to the text that match, or 
+   * @return              (mixed)  A vector of *references* to the text that match, or
    *                               FALSE on error
    * @see XPathEngine::wholeText()
    */
@@ -6104,11 +6104,11 @@ function _getTextSet($xPathQuery, $textPartNr=1) {
       echo "Text Part Number: $textPartNr\n";
       echo "<hr>";
     }
-    
+
     $status = FALSE;
     $funcName = '_getTextSet';
     $textSet = array();
-    
+
     do { // try-block
       // Check if it's a Xpath reference to an attribut(s). Xpath ends with attribute::)
       if (preg_match(";(.*)/(attribute::|@)([^/]*)$;U", $xPathQuery, $matches)) {
@@ -6134,7 +6134,7 @@ function _getTextSet($xPathQuery, $textPartNr=1) {
         $status = TRUE;
         break; // try-block
       }
-      
+
       // Check if it's a Xpath reference direct to a text-part(s). (xpath ends with text()[<part-number>])
       if (preg_match(":(.*)/text\(\)(\[(.*)\])?$:U", $xPathQuery, $matches)) {
         $xPathQuery = $matches[1];
@@ -6180,7 +6180,7 @@ function _getTextSet($xPathQuery, $textPartNr=1) {
 
       $status = TRUE;
     } while (FALSE); // END try-block
-    
+
     if (!$status) $result = FALSE;
     else          $result = $textSet;
 
@@ -6188,7 +6188,7 @@ function _getTextSet($xPathQuery, $textPartNr=1) {
 
     return $result;
   }
-  
+
 
   /**
    * Resolves an xPathQuery vector for a node op for modification
@@ -6199,8 +6199,8 @@ function _getTextSet($xPathQuery, $textPartNr=1) {
    *
    * Also it demands that there be at least one node returned, and displays a suitable
    * error message if the returned xPathSet does not contain any nodes.
-   * 
-   * @param  $xPathQuery (string) An xpath query targeting a single node.  If empty() 
+   *
+   * @param  $xPathQuery (string) An xpath query targeting a single node.  If empty()
    *                              returns the root node and auto creates the root node
    *                              if it doesn't exist.
    * @param  $function   (string) The function in which this check was called
@@ -6231,14 +6231,14 @@ function _resolveXPathQueryForNodeMod($xPathQuery, $functionName) {
 
   /**
    * Resolves an xPathQuery vector depending on the property['modMatch']
-   * 
+   *
    * To:
-   *   - all matches, 
+   *   - all matches,
    *   - the first
    *   - none (If the query matches more then one node.)
    * see  setModMatch() for details
-   * 
-   * @param  $xPathQuery (string) An xpath query targeting a single node.  If empty() 
+   *
+   * @param  $xPathQuery (string) An xpath query targeting a single node.  If empty()
    *                              returns the root node (if it exists).
    * @param  $function   (string) The function in which this check was called
    * @return             (array)  Vector of $absoluteXPath's (May be empty)
@@ -6255,16 +6255,16 @@ function _resolveXPathQuery($xPathQuery, $function) {
       if (substr($xPathQuery, -1) === '/') break; // If the xPathQuery ends with '/' then it cannot be a good query.
       // If this xPathQuery is not absolute then attempt to evaluate it
       $xPathSet = $this->match($xPathQuery);
-      
+
       $resultSize = sizeOf($xPathSet);
       switch($this->properties['modMatch']) {
-        case XPATH_QUERYHIT_UNIQUE : 
+        case XPATH_QUERYHIT_UNIQUE :
           if ($resultSize >1) {
             $xPathSet = array();
             if ($this->properties['verboseLevel']) $this->_displayError("Canceled function '{$function}'. The query '{$xPathQuery}' mached {$resultSize} nodes and 'modMatch' is set to XPATH_QUERYHIT_UNIQUE.", __LINE__, __FILE__, FALSE);
           }
           break;
-        case XPATH_QUERYHIT_FIRST : 
+        case XPATH_QUERYHIT_FIRST :
           if ($resultSize >1) {
             $xPathSet = array($xPathSet[0]);
             if ($this->properties['verboseLevel']) $this->_displayError("Only modified first node in function '{$function}' because the query '{$xPathQuery}' mached {$resultSize} nodes and 'modMatch' is set to XPATH_QUERYHIT_FIRST.", __LINE__, __FILE__, FALSE);
@@ -6273,7 +6273,7 @@ function _resolveXPathQuery($xPathQuery, $function) {
         default: ; // DO NOTHING
       }
     } while (FALSE);
-    
+
     if ($this->properties['verboseLevel'] >= 2) $this->_displayMessage("'{$xPathQuery}' parameter from '{$function}' returned the following nodes: ".(count($xPathSet)?implode('<br>', $xPathSet):'[none]'), __LINE__, __FILE__);
     return $xPathSet;
   }
@@ -6295,45 +6295,45 @@ function _resolveXPathQuery($xPathQuery, $function) {
 /**
  * Produces a short title line.
  */
-function _title($title) { 
+function _title($title) {
   echo "<br><hr><b>" . htmlspecialchars($title) . "</b><hr>\n";
 }
 
-$self = isSet($_SERVER) ? $_SERVER['PHP_SELF'] : $PHP_SELF;
+$self = isSet($_SERVER) ? filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) : $PHP_SELF;
 if (basename($self) == 'XPath.class.php') {
   // The sampe source:
   $q = '?';
   $xmlSource = <<< EOD
   <{$q}Process_Instruction test="&copy;&nbsp;All right reserved" {$q}>
     <AAA foo="bar"> ,,1,,
-      ..1.. <![CDATA[ bla  bla 
+      ..1.. <![CDATA[ bla  bla
       newLine blo blo ]]>
       <BBB foo="bar">
         ..2..
-      </BBB>..3..<CC/>   ..4..</AAA> 
+      </BBB>..3..<CC/>   ..4..</AAA>
 EOD;
-  
+
   // The sample code:
   $xmlOptions = array(XML_OPTION_CASE_FOLDING => TRUE, XML_OPTION_SKIP_WHITE => TRUE);
   $xPath =& new XPath(FALSE, $xmlOptions);
   //$xPath->bDebugXmlParse = TRUE;
   if (!$xPath->importFromString($xmlSource)) { echo $xPath->getLastError(); exit; }
-  
+
   _title("Following was imported:");
   echo $xPath->exportAsHtml();
-  
+
   _title("Get some content");
   echo "Last text part in &lt;AAA&gt;: '" . $xPath->wholeText('/AAA[1]', -1) ."'<br>\n";
   echo "All the text in  &lt;AAA&gt;: '" . $xPath->wholeText('/AAA[1]') ."'<br>\n";
   echo "The attibute value  in  &lt;BBB&gt; using getAttributes('/AAA[1]/BBB[1]', 'FOO'): '" . $xPath->getAttributes('/AAA[1]', 'FOO') ."'<br>\n";
   echo "The attibute value  in  &lt;BBB&gt; using getData('/AAA[1]/@FOO'): '" . $xPath->getData('/AAA[1]/@FOO') ."'<br>\n";
-  
+
   _title("Append some additional XML below /AAA/BBB:");
   $xPath->appendChild('/AAA[1]/BBB[1]', '<CCC> Step 1. Append new node </CCC>', $afterText=FALSE);
   $xPath->appendChild('/AAA[1]/BBB[1]', '<CCC> Step 2. Append new node </CCC>', $afterText=TRUE);
   $xPath->appendChild('/AAA[1]/BBB[1]', '<CCC> Step 3. Append new node </CCC>', $afterText=TRUE);
   echo $xPath->exportAsHtml();
-  
+
   _title("Insert some additional XML below <AAA>:");
   $xPath->reindexNodeTree();
   $xPath->insertChild('/AAA[1]/BBB[1]', '<BB> Step 1. Insert new node </BB>', $shiftRight=TRUE, $afterText=TRUE);
@@ -6345,7 +6345,7 @@ function _title($title) {
   $xPath->reindexNodeTree();
   $xPath->replaceChild('/AAA[1]/BB[last()]', '<DDD> Replaced last BB </DDD>', $afterText=FALSE);
   echo $xPath->exportAsHtml();
-  
+
   _title("Replace second <BB> node with normal text");
   $xPath->reindexNodeTree();
   $xPath->replaceChildByData('/AAA[1]/BB[2]', '"Some new text"');
diff --git a/admin/phpsysinfo/includes/class.Template.inc.php b/admin/phpsysinfo/includes/class.Template.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/class.error.inc.php b/admin/phpsysinfo/includes/class.error.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/common_functions.php b/admin/phpsysinfo/includes/common_functions.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/index.html b/admin/phpsysinfo/includes/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/indicator.php b/admin/phpsysinfo/includes/indicator.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/ar_utf8.php b/admin/phpsysinfo/includes/lang/ar_utf8.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/bg.php b/admin/phpsysinfo/includes/lang/bg.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/big5.php b/admin/phpsysinfo/includes/lang/big5.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/br.php b/admin/phpsysinfo/includes/lang/br.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/ca.php b/admin/phpsysinfo/includes/lang/ca.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/cn.php b/admin/phpsysinfo/includes/lang/cn.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/cs.php b/admin/phpsysinfo/includes/lang/cs.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/ct.php b/admin/phpsysinfo/includes/lang/ct.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/da.php b/admin/phpsysinfo/includes/lang/da.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/de.php b/admin/phpsysinfo/includes/lang/de.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/en.php b/admin/phpsysinfo/includes/lang/en.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/es.php b/admin/phpsysinfo/includes/lang/es.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/et.php b/admin/phpsysinfo/includes/lang/et.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/eu.php b/admin/phpsysinfo/includes/lang/eu.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/fi.php b/admin/phpsysinfo/includes/lang/fi.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/fr.php b/admin/phpsysinfo/includes/lang/fr.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/gr.php b/admin/phpsysinfo/includes/lang/gr.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/he.php b/admin/phpsysinfo/includes/lang/he.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/hu.php b/admin/phpsysinfo/includes/lang/hu.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/id.php b/admin/phpsysinfo/includes/lang/id.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/index.html b/admin/phpsysinfo/includes/lang/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/is.php b/admin/phpsysinfo/includes/lang/is.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/it.php b/admin/phpsysinfo/includes/lang/it.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/ja.php b/admin/phpsysinfo/includes/lang/ja.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/jp.php b/admin/phpsysinfo/includes/lang/jp.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/ko.php b/admin/phpsysinfo/includes/lang/ko.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/lt.php b/admin/phpsysinfo/includes/lang/lt.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/lv.php b/admin/phpsysinfo/includes/lang/lv.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/nl.php b/admin/phpsysinfo/includes/lang/nl.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/no.php b/admin/phpsysinfo/includes/lang/no.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/pa_utf8.php b/admin/phpsysinfo/includes/lang/pa_utf8.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/pl.php b/admin/phpsysinfo/includes/lang/pl.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/pt-br.php b/admin/phpsysinfo/includes/lang/pt-br.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/pt.php b/admin/phpsysinfo/includes/lang/pt.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/ro.php b/admin/phpsysinfo/includes/lang/ro.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/ru.php b/admin/phpsysinfo/includes/lang/ru.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/sk.php b/admin/phpsysinfo/includes/lang/sk.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/sr.php b/admin/phpsysinfo/includes/lang/sr.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/sv.php b/admin/phpsysinfo/includes/lang/sv.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/tr.php b/admin/phpsysinfo/includes/lang/tr.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/lang/tw.php b/admin/phpsysinfo/includes/lang/tw.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/mb/class.hddtemp.inc.php b/admin/phpsysinfo/includes/mb/class.hddtemp.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/mb/class.healthd.inc.php b/admin/phpsysinfo/includes/mb/class.healthd.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/mb/class.hwsensors.inc.php b/admin/phpsysinfo/includes/mb/class.hwsensors.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/mb/class.lmsensors.inc.php b/admin/phpsysinfo/includes/mb/class.lmsensors.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/mb/class.mbm5.inc.php b/admin/phpsysinfo/includes/mb/class.mbm5.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/mb/class.mbmon.inc.php b/admin/phpsysinfo/includes/mb/class.mbmon.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/mb/index.html b/admin/phpsysinfo/includes/mb/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/os/class.BSD.common.inc.php b/admin/phpsysinfo/includes/os/class.BSD.common.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/os/class.Darwin.inc.php b/admin/phpsysinfo/includes/os/class.Darwin.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/os/class.FreeBSD.inc.php b/admin/phpsysinfo/includes/os/class.FreeBSD.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/os/class.HP-UX.inc.php b/admin/phpsysinfo/includes/os/class.HP-UX.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/os/class.Linux.inc.php b/admin/phpsysinfo/includes/os/class.Linux.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/os/class.NetBSD.inc.php b/admin/phpsysinfo/includes/os/class.NetBSD.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/os/class.OpenBSD.inc.php b/admin/phpsysinfo/includes/os/class.OpenBSD.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/os/class.SunOS.inc.php b/admin/phpsysinfo/includes/os/class.SunOS.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/os/class.WINNT.inc.php b/admin/phpsysinfo/includes/os/class.WINNT.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/os/class.parseProgs.inc.php b/admin/phpsysinfo/includes/os/class.parseProgs.inc.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/os/index.html b/admin/phpsysinfo/includes/os/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/system_footer.php b/admin/phpsysinfo/includes/system_footer.php
old mode 100644
new mode 100755
index 128fa3c0e..8926c79a9
--- a/admin/phpsysinfo/includes/system_footer.php
+++ b/admin/phpsysinfo/includes/system_footer.php
@@ -29,7 +29,7 @@
 
 if (! $hide_picklist) {
     echo "<center>\n";
-    $update_form = "<form method=\"POST\" action=\"" . htmlentities($_SERVER['PHP_SELF']) . "\">\n" . "\t" . $text['template'] . ":&nbsp;\n" . "\t<select name=\"template\">\n";
+    $update_form = "<form method=\"POST\" action=\"" . htmlentities(filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)) . "\">\n" . "\t" . $text['template'] . ":&nbsp;\n" . "\t<select name=\"template\">\n";
 
     $resDir = opendir( APP_ROOT . '/templates/' );
     while ( false !== ( $strFile = readdir( $resDir ) ) ) {
diff --git a/admin/phpsysinfo/includes/system_header.php b/admin/phpsysinfo/includes/system_header.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/xml/filesystems.php b/admin/phpsysinfo/includes/xml/filesystems.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/xml/hardware.php b/admin/phpsysinfo/includes/xml/hardware.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/xml/hddtemp.php b/admin/phpsysinfo/includes/xml/hddtemp.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/xml/index.html b/admin/phpsysinfo/includes/xml/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/xml/mbinfo.php b/admin/phpsysinfo/includes/xml/mbinfo.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/xml/memory.php b/admin/phpsysinfo/includes/xml/memory.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/xml/network.php b/admin/phpsysinfo/includes/xml/network.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/includes/xml/vitals.php b/admin/phpsysinfo/includes/xml/vitals.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/index.php b/admin/phpsysinfo/index.php
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/phpsysinfo.dtd b/admin/phpsysinfo/phpsysinfo.dtd
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/aq.css b/admin/phpsysinfo/templates/aq/aq.css
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/box.tpl b/admin/phpsysinfo/templates/aq/box.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/form.tpl b/admin/phpsysinfo/templates/aq/form.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/aq_background.gif b/admin/phpsysinfo/templates/aq/images/aq_background.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/bar_left.gif b/admin/phpsysinfo/templates/aq/images/bar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/bar_middle.gif b/admin/phpsysinfo/templates/aq/images/bar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/bar_right.gif b/admin/phpsysinfo/templates/aq/images/bar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/coininfd.gif b/admin/phpsysinfo/templates/aq/images/coininfd.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/coininfg.gif b/admin/phpsysinfo/templates/aq/images/coininfg.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/coinsupd.gif b/admin/phpsysinfo/templates/aq/images/coinsupd.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/coinsupg.gif b/admin/phpsysinfo/templates/aq/images/coinsupg.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/d.gif b/admin/phpsysinfo/templates/aq/images/d.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/fond.gif b/admin/phpsysinfo/templates/aq/images/fond.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/g.gif b/admin/phpsysinfo/templates/aq/images/g.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/index.html b/admin/phpsysinfo/templates/aq/images/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/inf.gif b/admin/phpsysinfo/templates/aq/images/inf.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/redbar_left.gif b/admin/phpsysinfo/templates/aq/images/redbar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/redbar_middle.gif b/admin/phpsysinfo/templates/aq/images/redbar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/redbar_right.gif b/admin/phpsysinfo/templates/aq/images/redbar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/space15_15.gif b/admin/phpsysinfo/templates/aq/images/space15_15.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/images/sup.gif b/admin/phpsysinfo/templates/aq/images/sup.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/aq/index.html b/admin/phpsysinfo/templates/aq/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/black/black.css b/admin/phpsysinfo/templates/black/black.css
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/black/box.tpl b/admin/phpsysinfo/templates/black/box.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/black/form.tpl b/admin/phpsysinfo/templates/black/form.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/black/images/index.html b/admin/phpsysinfo/templates/black/images/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/black/index.html b/admin/phpsysinfo/templates/black/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/blue/blue.css b/admin/phpsysinfo/templates/blue/blue.css
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/blue/box.tpl b/admin/phpsysinfo/templates/blue/box.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/blue/form.tpl b/admin/phpsysinfo/templates/blue/form.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/blue/images/bar_left.gif b/admin/phpsysinfo/templates/blue/images/bar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/blue/images/bar_middle.gif b/admin/phpsysinfo/templates/blue/images/bar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/blue/images/bar_right.gif b/admin/phpsysinfo/templates/blue/images/bar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/blue/images/index.html b/admin/phpsysinfo/templates/blue/images/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/blue/images/redbar_left.gif b/admin/phpsysinfo/templates/blue/images/redbar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/blue/images/redbar_middle.gif b/admin/phpsysinfo/templates/blue/images/redbar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/blue/images/redbar_right.gif b/admin/phpsysinfo/templates/blue/images/redbar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/blue/images/trans.gif b/admin/phpsysinfo/templates/blue/images/trans.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/blue/index.html b/admin/phpsysinfo/templates/blue/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/box.tpl b/admin/phpsysinfo/templates/bulix/box.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/bulix.css b/admin/phpsysinfo/templates/bulix/bulix.css
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/form.tpl b/admin/phpsysinfo/templates/bulix/form.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/images/bar_left.gif b/admin/phpsysinfo/templates/bulix/images/bar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/images/bar_middle.gif b/admin/phpsysinfo/templates/bulix/images/bar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/images/bar_right.gif b/admin/phpsysinfo/templates/bulix/images/bar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/images/index.html b/admin/phpsysinfo/templates/bulix/images/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/images/left_bar.gif b/admin/phpsysinfo/templates/bulix/images/left_bar.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/images/middle_bar.gif b/admin/phpsysinfo/templates/bulix/images/middle_bar.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/images/redbar_left.gif b/admin/phpsysinfo/templates/bulix/images/redbar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/images/redbar_middle.gif b/admin/phpsysinfo/templates/bulix/images/redbar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/images/redbar_right.gif b/admin/phpsysinfo/templates/bulix/images/redbar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/images/right_bar.gif b/admin/phpsysinfo/templates/bulix/images/right_bar.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/images/trans.gif b/admin/phpsysinfo/templates/bulix/images/trans.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/bulix/index.html b/admin/phpsysinfo/templates/bulix/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/classic/box.tpl b/admin/phpsysinfo/templates/classic/box.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/classic/classic.css b/admin/phpsysinfo/templates/classic/classic.css
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/classic/form.tpl b/admin/phpsysinfo/templates/classic/form.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/classic/images/bar_left.gif b/admin/phpsysinfo/templates/classic/images/bar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/classic/images/bar_middle.gif b/admin/phpsysinfo/templates/classic/images/bar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/classic/images/bar_right.gif b/admin/phpsysinfo/templates/classic/images/bar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/classic/images/index.html b/admin/phpsysinfo/templates/classic/images/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/classic/images/redbar_left.gif b/admin/phpsysinfo/templates/classic/images/redbar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/classic/images/redbar_middle.gif b/admin/phpsysinfo/templates/classic/images/redbar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/classic/images/redbar_right.gif b/admin/phpsysinfo/templates/classic/images/redbar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/classic/images/trans.gif b/admin/phpsysinfo/templates/classic/images/trans.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/classic/index.html b/admin/phpsysinfo/templates/classic/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/index.html b/admin/phpsysinfo/templates/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/box.tpl b/admin/phpsysinfo/templates/kde/box.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/form.tpl b/admin/phpsysinfo/templates/kde/form.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/background.gif b/admin/phpsysinfo/templates/kde/images/background.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/bar_left.gif b/admin/phpsysinfo/templates/kde/images/bar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/bar_middle.gif b/admin/phpsysinfo/templates/kde/images/bar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/bar_right.gif b/admin/phpsysinfo/templates/kde/images/bar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/coininfd.gif b/admin/phpsysinfo/templates/kde/images/coininfd.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/coininfg.gif b/admin/phpsysinfo/templates/kde/images/coininfg.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/coinsupd.gif b/admin/phpsysinfo/templates/kde/images/coinsupd.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/coinsupg.gif b/admin/phpsysinfo/templates/kde/images/coinsupg.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/d.gif b/admin/phpsysinfo/templates/kde/images/d.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/fond.gif b/admin/phpsysinfo/templates/kde/images/fond.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/g.gif b/admin/phpsysinfo/templates/kde/images/g.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/icons.gif b/admin/phpsysinfo/templates/kde/images/icons.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/index.html b/admin/phpsysinfo/templates/kde/images/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/inf.gif b/admin/phpsysinfo/templates/kde/images/inf.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/nobar_left.gif b/admin/phpsysinfo/templates/kde/images/nobar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/nobar_middle.gif b/admin/phpsysinfo/templates/kde/images/nobar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/nobar_right.gif b/admin/phpsysinfo/templates/kde/images/nobar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/redbar_left.gif b/admin/phpsysinfo/templates/kde/images/redbar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/redbar_middle.gif b/admin/phpsysinfo/templates/kde/images/redbar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/redbar_right.gif b/admin/phpsysinfo/templates/kde/images/redbar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/space15_15.gif b/admin/phpsysinfo/templates/kde/images/space15_15.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/sup.gif b/admin/phpsysinfo/templates/kde/images/sup.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/title_left.gif b/admin/phpsysinfo/templates/kde/images/title_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/title_mid.gif b/admin/phpsysinfo/templates/kde/images/title_mid.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/images/title_right.gif b/admin/phpsysinfo/templates/kde/images/title_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/index.html b/admin/phpsysinfo/templates/kde/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/kde/kde.css b/admin/phpsysinfo/templates/kde/kde.css
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/box.tpl b/admin/phpsysinfo/templates/metal/box.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/form.tpl b/admin/phpsysinfo/templates/metal/form.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/bar_left.gif b/admin/phpsysinfo/templates/metal/images/bar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/bar_middle.gif b/admin/phpsysinfo/templates/metal/images/bar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/bar_right.gif b/admin/phpsysinfo/templates/metal/images/bar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/coininfd.gif b/admin/phpsysinfo/templates/metal/images/coininfd.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/coininfg.gif b/admin/phpsysinfo/templates/metal/images/coininfg.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/coinsupd.gif b/admin/phpsysinfo/templates/metal/images/coinsupd.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/coinsupg.gif b/admin/phpsysinfo/templates/metal/images/coinsupg.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/d.gif b/admin/phpsysinfo/templates/metal/images/d.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/fond.gif b/admin/phpsysinfo/templates/metal/images/fond.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/g.gif b/admin/phpsysinfo/templates/metal/images/g.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/index.html b/admin/phpsysinfo/templates/metal/images/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/inf.gif b/admin/phpsysinfo/templates/metal/images/inf.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/metal_background.gif b/admin/phpsysinfo/templates/metal/images/metal_background.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/redbar_left.gif b/admin/phpsysinfo/templates/metal/images/redbar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/redbar_middle.gif b/admin/phpsysinfo/templates/metal/images/redbar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/redbar_right.gif b/admin/phpsysinfo/templates/metal/images/redbar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/space15_15.gif b/admin/phpsysinfo/templates/metal/images/space15_15.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/images/sup.gif b/admin/phpsysinfo/templates/metal/images/sup.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/index.html b/admin/phpsysinfo/templates/metal/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/metal/metal.css b/admin/phpsysinfo/templates/metal/metal.css
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/orange/box.tpl b/admin/phpsysinfo/templates/orange/box.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/orange/form.tpl b/admin/phpsysinfo/templates/orange/form.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/orange/images/bar_left.gif b/admin/phpsysinfo/templates/orange/images/bar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/orange/images/bar_middle.gif b/admin/phpsysinfo/templates/orange/images/bar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/orange/images/bar_right.gif b/admin/phpsysinfo/templates/orange/images/bar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/orange/images/index.html b/admin/phpsysinfo/templates/orange/images/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/orange/images/redbar_left.gif b/admin/phpsysinfo/templates/orange/images/redbar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/orange/images/redbar_middle.gif b/admin/phpsysinfo/templates/orange/images/redbar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/orange/images/redbar_right.gif b/admin/phpsysinfo/templates/orange/images/redbar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/orange/images/trans.gif b/admin/phpsysinfo/templates/orange/images/trans.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/orange/index.html b/admin/phpsysinfo/templates/orange/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/orange/orange.css b/admin/phpsysinfo/templates/orange/orange.css
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/typo3/box.tpl b/admin/phpsysinfo/templates/typo3/box.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/typo3/form.tpl b/admin/phpsysinfo/templates/typo3/form.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/typo3/images/bar_left.gif b/admin/phpsysinfo/templates/typo3/images/bar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/typo3/images/bar_middle.gif b/admin/phpsysinfo/templates/typo3/images/bar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/typo3/images/bar_right.gif b/admin/phpsysinfo/templates/typo3/images/bar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/typo3/images/index.html b/admin/phpsysinfo/templates/typo3/images/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/typo3/images/redbar_left.gif b/admin/phpsysinfo/templates/typo3/images/redbar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/typo3/images/redbar_middle.gif b/admin/phpsysinfo/templates/typo3/images/redbar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/typo3/images/redbar_right.gif b/admin/phpsysinfo/templates/typo3/images/redbar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/typo3/images/trans.gif b/admin/phpsysinfo/templates/typo3/images/trans.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/typo3/index.html b/admin/phpsysinfo/templates/typo3/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/typo3/typo3.css b/admin/phpsysinfo/templates/typo3/typo3.css
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/box.tpl b/admin/phpsysinfo/templates/windows_classic/box.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/form.tpl b/admin/phpsysinfo/templates/windows_classic/form.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/bar_left.gif b/admin/phpsysinfo/templates/windows_classic/images/bar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/bar_middle.gif b/admin/phpsysinfo/templates/windows_classic/images/bar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/bar_right.gif b/admin/phpsysinfo/templates/windows_classic/images/bar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/bottom.gif b/admin/phpsysinfo/templates/windows_classic/images/bottom.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/bottom_left_corner.gif b/admin/phpsysinfo/templates/windows_classic/images/bottom_left_corner.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/bottom_right_corner.gif b/admin/phpsysinfo/templates/windows_classic/images/bottom_right_corner.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/index.html b/admin/phpsysinfo/templates/windows_classic/images/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/left.gif b/admin/phpsysinfo/templates/windows_classic/images/left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/middle.gif b/admin/phpsysinfo/templates/windows_classic/images/middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/min_max.gif b/admin/phpsysinfo/templates/windows_classic/images/min_max.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/nobar_left.gif b/admin/phpsysinfo/templates/windows_classic/images/nobar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/nobar_middle.gif b/admin/phpsysinfo/templates/windows_classic/images/nobar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/nobar_right.gif b/admin/phpsysinfo/templates/windows_classic/images/nobar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/redbar_left.gif b/admin/phpsysinfo/templates/windows_classic/images/redbar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/redbar_middle.gif b/admin/phpsysinfo/templates/windows_classic/images/redbar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/redbar_right.gif b/admin/phpsysinfo/templates/windows_classic/images/redbar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/right.gif b/admin/phpsysinfo/templates/windows_classic/images/right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/spacer.gif b/admin/phpsysinfo/templates/windows_classic/images/spacer.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/top.gif b/admin/phpsysinfo/templates/windows_classic/images/top.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/upper_left_corner.gif b/admin/phpsysinfo/templates/windows_classic/images/upper_left_corner.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/upper_right_corner.gif b/admin/phpsysinfo/templates/windows_classic/images/upper_right_corner.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/yellowbar_left.gif b/admin/phpsysinfo/templates/windows_classic/images/yellowbar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/yellowbar_middle.gif b/admin/phpsysinfo/templates/windows_classic/images/yellowbar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/images/yellowbar_right.gif b/admin/phpsysinfo/templates/windows_classic/images/yellowbar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/index.html b/admin/phpsysinfo/templates/windows_classic/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/windows_classic/windows_classic.css b/admin/phpsysinfo/templates/windows_classic/windows_classic.css
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/box.tpl b/admin/phpsysinfo/templates/wintendoxp/box.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/form.tpl b/admin/phpsysinfo/templates/wintendoxp/form.tpl
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/aq_background.gif b/admin/phpsysinfo/templates/wintendoxp/images/aq_background.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/background.gif b/admin/phpsysinfo/templates/wintendoxp/images/background.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/bar_left.gif b/admin/phpsysinfo/templates/wintendoxp/images/bar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/bar_middle.gif b/admin/phpsysinfo/templates/wintendoxp/images/bar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/bar_right.gif b/admin/phpsysinfo/templates/wintendoxp/images/bar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/coininfd.gif b/admin/phpsysinfo/templates/wintendoxp/images/coininfd.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/coininfg.gif b/admin/phpsysinfo/templates/wintendoxp/images/coininfg.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/coinsupd.gif b/admin/phpsysinfo/templates/wintendoxp/images/coinsupd.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/coinsupg.gif b/admin/phpsysinfo/templates/wintendoxp/images/coinsupg.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/d.gif b/admin/phpsysinfo/templates/wintendoxp/images/d.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/fond.gif b/admin/phpsysinfo/templates/wintendoxp/images/fond.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/g.gif b/admin/phpsysinfo/templates/wintendoxp/images/g.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/icons.gif b/admin/phpsysinfo/templates/wintendoxp/images/icons.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/index.html b/admin/phpsysinfo/templates/wintendoxp/images/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/inf.gif b/admin/phpsysinfo/templates/wintendoxp/images/inf.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/nobar_left.gif b/admin/phpsysinfo/templates/wintendoxp/images/nobar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/nobar_middle.gif b/admin/phpsysinfo/templates/wintendoxp/images/nobar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/nobar_right.gif b/admin/phpsysinfo/templates/wintendoxp/images/nobar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/redbar_left.gif b/admin/phpsysinfo/templates/wintendoxp/images/redbar_left.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/redbar_middle.gif b/admin/phpsysinfo/templates/wintendoxp/images/redbar_middle.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/redbar_right.gif b/admin/phpsysinfo/templates/wintendoxp/images/redbar_right.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/space15_15.gif b/admin/phpsysinfo/templates/wintendoxp/images/space15_15.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/images/sup.gif b/admin/phpsysinfo/templates/wintendoxp/images/sup.gif
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/index.html b/admin/phpsysinfo/templates/wintendoxp/index.html
old mode 100644
new mode 100755
diff --git a/admin/phpsysinfo/templates/wintendoxp/wintendoxp.css b/admin/phpsysinfo/templates/wintendoxp/wintendoxp.css
old mode 100644
new mode 100755
diff --git a/admin/templates_c/.gitignore b/admin/templates_c/.gitignore
old mode 100644
new mode 100755
diff --git a/agent/Public/A2B_agent_remittance_conf.php b/agent/Public/A2B_agent_remittance_conf.php
index 086e8acf6..54fca6fbe 100644
--- a/agent/Public/A2B_agent_remittance_conf.php
+++ b/agent/Public/A2B_agent_remittance_conf.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_agent_remittance_req.php b/agent/Public/A2B_agent_remittance_req.php
index 71842f33f..cf280afa3 100644
--- a/agent/Public/A2B_agent_remittance_req.php
+++ b/agent/Public/A2B_agent_remittance_req.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_card_info.php b/agent/Public/A2B_card_info.php
index faf8a566b..e64330baa 100644
--- a/agent/Public/A2B_card_info.php
+++ b/agent/Public/A2B_card_info.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_entity_agent.php b/agent/Public/A2B_entity_agent.php
index af28fbd3c..980968ab8 100644
--- a/agent/Public/A2B_entity_agent.php
+++ b/agent/Public/A2B_entity_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_entity_callerid.php b/agent/Public/A2B_entity_callerid.php
index bf99ff5de..8d47ed05e 100644
--- a/agent/Public/A2B_entity_callerid.php
+++ b/agent/Public/A2B_entity_callerid.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_entity_card.php b/agent/Public/A2B_entity_card.php
index 9629f19f2..e2dc3021f 100644
--- a/agent/Public/A2B_entity_card.php
+++ b/agent/Public/A2B_entity_card.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -314,7 +314,7 @@ function sendValue(selvalue)
                 <tr>
                     <td colspan="2" align="center">
                     <input class="form_input_button"
-                TYPE="button" VALUE="<?php echo gettext("ADD CREDIT");?>" onClick="openURL('<?php echo $_SERVER['PHP_SELF']?>?form_action=addcredit&stitle=Card_Refilled&current_page=<?php echo $current_page?>&order=<?php echo $order?>&sens=<?php echo $sens?>&id=')">
+                TYPE="button" VALUE="<?php echo gettext("ADD CREDIT");?>" onClick="openURL('<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>?form_action=addcredit&stitle=Card_Refilled&current_page=<?php echo $current_page?>&order=<?php echo $order?>&sens=<?php echo $sens?>&id=')">
 
                     </td>
                 </tr>
@@ -358,7 +358,7 @@ function sendValue(selvalue)
 <b>&nbsp;<?php echo $HD_Form -> FG_NB_RECORD ?> <?php echo gettext("cards selected!"); ?>&nbsp;<?php echo gettext("Use the options below to batch update the selected cards.");?></b>
        <table align="center" border="0" width="65%"  cellspacing="1" cellpadding="2">
         <tbody>
-        <form name="updateForm" action="<?php echo $_SERVER['PHP_SELF']?>" method="post">
+        <form name="updateForm" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>" method="post">
         <INPUT type="hidden" name="batchupdate" value="1">
         <tr>
           <td align="left" class="bgcolor_001" >
@@ -448,7 +448,7 @@ function sendValue(selvalue)
           <td align="left"  class="bgcolor_001">
                 <?php
                     $begin_date = date("Y");
-                    $begin_date_plus = date("Y")+10;
+                    $begin_date_plus = date("Y") + 10;
                     $end_date = date("-m-d H:i:s");
                     $comp_date = "value='".$begin_date.$end_date."'";
                     $comp_date_plus = "value='".$begin_date_plus.$end_date."'";
diff --git a/agent/Public/A2B_entity_card_multi.php b/agent/Public/A2B_entity_card_multi.php
index b90ad5bd5..e45b56725 100644
--- a/agent/Public/A2B_entity_card_multi.php
+++ b/agent/Public/A2B_entity_card_multi.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -124,7 +124,7 @@
         $instance_iax_table = new Table($FG_TABLE_IAX_NAME, $FG_QUERY_ADITION_SIP_IAX_FIELDS);
     }
 
-    if ( (isset($sip)) ||  (isset($iax)) ) {
+    if (isset($sip) ||  isset($iax)) {
         $list_names = explode(",",$FG_QUERY_ADITION_SIP_IAX);
         $type = FRIEND_TYPE;
         $allow = FRIEND_ALLOW;
@@ -146,7 +146,7 @@
     $field_insert_refill = " credit,card_id, description";
     $instance_refill_table = new Table("cc_logrefill", $field_insert_refill);
 
-    for ($k=0;$k<$nbcard;$k++) {
+    for ($k=0; $k<$nbcard; $k++) {
         $arr_card_alias = gen_card_with_alias("cc_card", 0, $cardnumberlenght_list);
         $cardnum = $arr_card_alias[0];
         $useralias = $arr_card_alias[1];
@@ -154,15 +154,16 @@
         $passui_secret = MDP_NUMERIC(5).MDP_STRING(10).MDP_NUMERIC(5);
         $FG_ADITION_SECOND_ADD_VALUE  = "'$cardnum', '$useralias', '$addcredit', '$choose_tariff', 't', '$gen_id', '', '', '', '', '', '', '', '', $choose_simultaccess, '$choose_currency', $choose_typepaid, $creditlimit, $enableexpire, '$expirationdate', $expiredays, '$passui_secret', '$runservice', '$tag', '$id_group', '$discount', '$id_seria'";
 
-        if (DB_TYPE != "postgres") $FG_ADITION_SECOND_ADD_VALUE .= ",now() ";
-
+        if (DB_TYPE != "postgres") {
+            $FG_ADITION_SECOND_ADD_VALUE .= ",now() ";
+        }
         if (isset($sip)) $FG_ADITION_SECOND_ADD_VALUE .= ", 1";
         if (isset($iax)) $FG_ADITION_SECOND_ADD_VALUE .= ", 1";
 
         $id_cc_card = $instance_sub_table -> Add_table ($HD_Form -> DBHandle, $FG_ADITION_SECOND_ADD_VALUE, null, null, $HD_Form -> FG_TABLE_ID);
         //create refill for each cards
 
-        if ($addcredit>0) {
+        if ($addcredit > 0) {
             $value_insert_refill = "'$addcredit', '$id_cc_card', '$description_refill' ";
             $instance_refill_table -> Add_table ($HD_Form -> DBHandle, $value_insert_refill, null, null);
         }
@@ -316,7 +317,15 @@
     <br/>
 <?php }?>
 <table align="center"  class="bgcolor_001" border="0" width="65%">
-<form name="theForm" action="<?php echo $_SERVER['PHP_SELF'] ?>" method="POST">
+<form name="theForm" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) ?>" method="POST">
+<?php
+    if ($HD_Form->FG_CSRF_STATUS == true) {
+?>
+    <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+    <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+<?php
+    }
+?>
 <tr>
     <td align="left" width="100%">
     <strong>1)</strong> <?php echo gettext("Length of card number :");?>
diff --git a/agent/Public/A2B_entity_commission.php b/agent/Public/A2B_entity_commission.php
index 03b675c00..eeb7c2a50 100755
--- a/agent/Public/A2B_entity_commission.php
+++ b/agent/Public/A2B_entity_commission.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_entity_def_ratecard.php b/agent/Public/A2B_entity_def_ratecard.php
index e4085b0ec..92fe9ae5f 100644
--- a/agent/Public/A2B_entity_def_ratecard.php
+++ b/agent/Public/A2B_entity_def_ratecard.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -105,8 +105,9 @@
 }
 
 if (($form_action == "list") && ($HD_Form->FG_FILTER_SEARCH_FORM) && ($_POST['posted_search'] == 1) && is_numeric($mytariffgroup_id)) {
-    if (!empty ($HD_Form->FG_TABLE_CLAUSE))
+    if (!empty ($HD_Form->FG_TABLE_CLAUSE)) {
         $HD_Form->FG_TABLE_CLAUSE .= ' AND ';
+    }
 
     $HD_Form->FG_TABLE_CLAUSE = "idtariffplan='$mytariff_id'";
 
@@ -132,19 +133,19 @@
 }
 
 // DISPLAY THE UPDATE MESSAGE
-if (isset ($update_msg) && strlen($update_msg) > 0)
+if (isset ($update_msg) && strlen($update_msg) > 0) {
     echo $update_msg;
+}
 
 if ($popup_select) {
 ?>
 <SCRIPT LANGUAGE="javascript">
-<!-- Begin
-function sendValue(selvalue)
-{
+<!--
+function sendValue(selvalue) {
     window.opener.document.<?php echo $popup_formname ?>.<?php echo $popup_fieldname ?>.value = selvalue;
     window.close();
 }
-// End -->
+-->
 </script>
 <?php
 }
diff --git a/agent/Public/A2B_entity_friend.php b/agent/Public/A2B_entity_friend.php
index 086b6c6a1..fff923b5a 100644
--- a/agent/Public/A2B_entity_friend.php
+++ b/agent/Public/A2B_entity_friend.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -81,13 +81,17 @@
     $instance_table_friend = new Table('cc_card');
     $instance_table_friend -> Update_table ($HD_Form -> DBHandle, $friend_param_update, "id='$id_cc_card'", $func_table = null);
 
-    if ( $form_action == "add_sip" )	$TABLE_BUDDY = 'cc_sip_buddies';
-    else 	$TABLE_BUDDY = 'cc_iax_buddies';
-
+    if ( $form_action == "add_sip" ) {
+        $TABLE_BUDDY = 'cc_sip_buddies';
+    } else {
+        $TABLE_BUDDY = 'cc_iax_buddies';
+    }
     $instance_table_friend = new Table($TABLE_BUDDY,'*');
     $list_friend = $instance_table_friend -> Get_list ($HD_Form -> DBHandle, "id_cc_card='$id_cc_card'", null, null, null, null);
 
-    if (is_array($list_friend) && count($list_friend)>0) { Header ("Location: ".$HD_Form->FG_GO_LINK_AFTER_ACTION); exit();}
+    if (is_array($list_friend) && count($list_friend)>0) {
+        Header ("Location: ".$HD_Form->FG_GO_LINK_AFTER_ACTION); exit();
+    }
 
     $form_action = "add";
 
@@ -108,8 +112,8 @@
     $HD_Form->_vars = array_merge((array) $_GET, (array) $_POST);
 }
 
-$HD_Form -> FG_EDITION_LINK	= $_SERVER['PHP_SELF']."?form_action=ask-edit&atmenu=$atmenu&id=";
-$HD_Form -> FG_DELETION_LINK = $_SERVER['PHP_SELF']."?form_action=ask-delete&atmenu=$atmenu&id=";
+$HD_Form -> FG_EDITION_LINK	= filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?form_action=ask-edit&atmenu=$atmenu&id=";
+$HD_Form -> FG_DELETION_LINK = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?form_action=ask-delete&atmenu=$atmenu&id=";
 
 if ($id!="" || !is_null($id)) {
     $HD_Form -> FG_EDITION_CLAUSE = str_replace("%id", "$id", $HD_Form -> FG_EDITION_CLAUSE);
@@ -119,15 +123,14 @@
 if (!isset($action)) $action = $form_action;
 
 if (!USE_REALTIME) {
-
     // CHECK THE ACTION AND SET THE IS_SIP_IAX_CHANGE IF WE ADD/EDIT/REMOVE A RECORD
     if ($form_action == "add" || $form_action == "edit" || $form_action == "delete") {
         $_SESSION["is_sip_iax_change"]=1;
         if ($atmenu=='sip') {
             $_SESSION["is_sip_changed"]=1;
-          } else {
-              $_SESSION["is_iax_changed"]=1;
-          }
+        } else {
+            $_SESSION["is_iax_changed"]=1;
+        }
     }
 }
 
@@ -141,9 +144,18 @@
     echo $CC_help_sipfriend_list;
 
     if ( isset($_SESSION["is_sip_iax_change"]) && $_SESSION["is_sip_iax_change"]) { ?>
-          <table width="<?php echo $HD_Form -> FG_HTML_TABLE_WIDTH?>" border="0" align="center" cellpadding="0" cellspacing="0" >
+        <table width="<?php echo $HD_Form -> FG_HTML_TABLE_WIDTH?>" border="0" align="center" cellpadding="0" cellspacing="0" >
             <TR><TD style="border-bottom: medium dotted #ED2525" align="center"> <?php echo gettext("Changes detected on SIP/IAX Friends")?></TD></TR>
-            <TR><FORM NAME="sipfriend">
+            <TR>
+                <FORM NAME="sipfriend">
+                <?php
+                    if ($HD_Form->FG_CSRF_STATUS == true) {
+                ?>
+                    <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+                    <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+                <?php
+                    }
+                ?>
                 <td height="31" style="padding-left: 5px; padding-right: 3px;" align="center" class="bgcolor_013">
                 <font color=white><b>
                 <?php  if ( isset($_SESSION["is_sip_changed"]) && $_SESSION["is_sip_changed"] ) { ?>
@@ -154,9 +166,10 @@
                 IAX : <input class="form_input_button"  TYPE="button" VALUE=" GENERATE ADDITIONAL_A2BILLING_IAX.CONF "
                 onClick="self.location.href='./CC_generate_friend_file.php?atmenu=iaxfriend';">
                 <?php } ?>
-                </b></font></td></FORM>
+                </b></font></td>
+                </FORM>
             </TR>
-           </table>
+        </table>
     <?php  } // endif is_sip_iax_change
 
 }else echo $CC_help_sipfriend_edit;
@@ -169,6 +182,14 @@
       <td  class="bgcolor_021">
       <table width="100%" border="0" cellspacing="1" cellpadding="0">
           <form name="form1" method="post" action="">
+          <?php
+            if ($HD_Form->FG_CSRF_STATUS == true) {
+          ?>
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+            <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+          <?php
+            }
+          ?>
           <tr>
             <td bgcolor="#FFFFFF" class="fontstyle_006" width="100%">&nbsp;<?php echo gettext("CONFIGURATION TYPE")?> </td>
             <td bgcolor="#FFFFFF" class="fontstyle_006" align="center">
@@ -185,6 +206,7 @@
     </tr>
 </table>
 </div>
+
 <?php
 }
 
diff --git a/agent/Public/A2B_entity_logrefill.php b/agent/Public/A2B_entity_logrefill.php
index ef83c7a01..8b92eab3a 100644
--- a/agent/Public/A2B_entity_logrefill.php
+++ b/agent/Public/A2B_entity_logrefill.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_entity_logrefill_agent.php b/agent/Public/A2B_entity_logrefill_agent.php
index da8c34d6b..640011b20 100755
--- a/agent/Public/A2B_entity_logrefill_agent.php
+++ b/agent/Public/A2B_entity_logrefill_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -46,7 +46,7 @@
 $HD_Form->setDBHandler(DbConnect());
 $HD_Form->init();
 
-if ($id != "" || !is_null($id)) {
+if ($id != '' || !is_null($id)) {
     $HD_Form->FG_EDITION_CLAUSE = str_replace("%id", "$id", $HD_Form->FG_EDITION_CLAUSE);
 }
 
diff --git a/agent/Public/A2B_entity_moneysituation.php b/agent/Public/A2B_entity_moneysituation.php
index db93fd89e..0d93dacf1 100644
--- a/agent/Public/A2B_entity_moneysituation.php
+++ b/agent/Public/A2B_entity_moneysituation.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_entity_moneysituation_details.php b/agent/Public/A2B_entity_moneysituation_details.php
index 4a47878bb..af5c915e1 100644
--- a/agent/Public/A2B_entity_moneysituation_details.php
+++ b/agent/Public/A2B_entity_moneysituation_details.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_entity_password.php b/agent/Public/A2B_entity_password.php
index cf8f75a86..b846c73ba 100644
--- a/agent/Public/A2B_entity_password.php
+++ b/agent/Public/A2B_entity_password.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_entity_payment.php b/agent/Public/A2B_entity_payment.php
index 5ecb92e42..73600ee6c 100755
--- a/agent/Public/A2B_entity_payment.php
+++ b/agent/Public/A2B_entity_payment.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_entity_payment_agent.php b/agent/Public/A2B_entity_payment_agent.php
index 7fe12ed9f..3fee38136 100755
--- a/agent/Public/A2B_entity_payment_agent.php
+++ b/agent/Public/A2B_entity_payment_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_entity_paymentlog.php b/agent/Public/A2B_entity_paymentlog.php
index e2cbb34fe..304fe736f 100644
--- a/agent/Public/A2B_entity_paymentlog.php
+++ b/agent/Public/A2B_entity_paymentlog.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_entity_remittance_request.php b/agent/Public/A2B_entity_remittance_request.php
index 7ce149cd0..3fa8ca2a0 100644
--- a/agent/Public/A2B_entity_remittance_request.php
+++ b/agent/Public/A2B_entity_remittance_request.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_entity_secret.php b/agent/Public/A2B_entity_secret.php
index 43ab32df5..a2ea208b9 100755
--- a/agent/Public/A2B_entity_secret.php
+++ b/agent/Public/A2B_entity_secret.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_entity_signup_agent.php b/agent/Public/A2B_entity_signup_agent.php
index 710268a37..6ef2efc7d 100755
--- a/agent/Public/A2B_entity_signup_agent.php
+++ b/agent/Public/A2B_entity_signup_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -45,9 +45,9 @@
 
 ?>
 <style type="text/css">
-     #sexyBG { display: none; position: absolute; background: #000; opacity: 0.5; -moz-opacity: 0.5; -khtml-opacity: 0.5; filter: alpha(opacity=40); width: 100%; height: 100%; top: 0; left: 0; z-index: 99; }
-    #sexyBOX { padding-top:15px;display: none; position: absolute; background: #FCFCFC; color: #333; font-size: 14px; text-align: center; border: 1px solid #111; top: 200px; z-index: 100; }
-    .sexyX { margin-top:15px; font-size: 12px; color: #636D61; padding: 4px 0; border-top: 1px solid #636D61; background: #BDE5F8; }
+     #elegantBG { display: none; position: absolute; background: #000; opacity: 0.5; -moz-opacity: 0.5; -khtml-opacity: 0.5; filter: alpha(opacity=40); width: 100%; height: 100%; top: 0; left: 0; z-index: 99; }
+    #elegantBOX { padding-top:15px;display: none; position: absolute; background: #FCFCFC; color: #333; font-size: 14px; text-align: center; border: 1px solid #111; top: 200px; z-index: 100; }
+    .elegantX { margin-top:15px; font-size: 12px; color: #636D61; padding: 4px 0; border-top: 1px solid #636D61; background: #BDE5F8; }
 </style>
 <script type="text/javascript">
 var msg = '<?php echo gettext('click outside box to close'); ?>';
@@ -57,8 +57,8 @@ function agent(v) { return(Math.max(navigator.userAgent.toLowerCase().indexOf(v)
 function isset(v) { return((typeof(v)=='undefined' || v.length==0)?false:true); }
 function XYwin(v) { var z=Array($('#page-wrap').innerHeight()-2,$('#page-wrap').width()); return(isset(v)?z[v]:z); }
 
-function sexyTOG() { document.onclick=function(){ style('sexyBG').display='none'; style('sexyBOX').display='none'; document.onclick=function(){}; }; }
-function sexyBOX(v,b) { setTimeout("sexyTOG()",100); style('sexyBG').height=XYwin(0)+'px'; style('sexyBG').display='block'; getId('sexyBOX').innerHTML=v+'<div class="sexyX">('+msg+')'+"<\/div>"; style('sexyBOX').left=Math.round((XYwin(1)-b)/2)+'px'; style('sexyBOX').width=b+'px'; style('sexyBOX').display='block'; }
+function elegantTOG() { document.onclick=function(){ style('elegantBG').display='none'; style('elegantBOX').display='none'; document.onclick=function(){}; }; }
+function elegantBOX(v,b) { setTimeout("elegantTOG()",100); style('elegantBG').height=XYwin(0)+'px'; style('elegantBG').display='block'; getId('elegantBOX').innerHTML=v+'<div class="elegantX">('+msg+')'+"<\/div>"; style('elegantBOX').left=Math.round((XYwin(1)-b)/2)+'px'; style('elegantBOX').width=b+'px'; style('elegantBOX').display='block'; }
 </script>
 <?php
 $HD_Form -> setDBHandler (DbConnect());
@@ -72,8 +72,8 @@ function sexyBOX(v,b) { setTimeout("sexyTOG()",100); style('sexyBG').height=XYwi
 
 // #### HEADER SECTION
 $smarty->display('main.tpl'); ?>
-<div id="sexyBG"></div>
-<div id="sexyBOX" onmousedown="document.onclick=function(){};" onmouseup="setTimeout('sexyTOG()',1);"></div>
+<div id="elegantBG"></div>
+<div id="elegantBOX" onmousedown="document.onclick=function(){};" onmouseup="setTimeout('elegantTOG()',1);"></div>
 <?php
 
 // #### HELP SECTION
diff --git a/agent/Public/A2B_payment_info.php b/agent/Public/A2B_payment_info.php
index 43981974a..0a4a6f836 100644
--- a/agent/Public/A2B_payment_info.php
+++ b/agent/Public/A2B_payment_info.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_payment_info_agent.php b/agent/Public/A2B_payment_info_agent.php
index e48b01afb..12de6f1c7 100644
--- a/agent/Public/A2B_payment_info_agent.php
+++ b/agent/Public/A2B_payment_info_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_refill_info.php b/agent/Public/A2B_refill_info.php
index e06ccf5c8..4f0cd9835 100644
--- a/agent/Public/A2B_refill_info.php
+++ b/agent/Public/A2B_refill_info.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_refill_info_agent.php b/agent/Public/A2B_refill_info_agent.php
index e9a7584f7..9b39e551f 100644
--- a/agent/Public/A2B_refill_info_agent.php
+++ b/agent/Public/A2B_refill_info_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_signup_agent.php b/agent/Public/A2B_signup_agent.php
index 6e9eff36e..b02a4fdd5 100644
--- a/agent/Public/A2B_signup_agent.php
+++ b/agent/Public/A2B_signup_agent.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_support.php b/agent/Public/A2B_support.php
index 196db1209..5dcd316a5 100755
--- a/agent/Public/A2B_support.php
+++ b/agent/Public/A2B_support.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_ticket.php b/agent/Public/A2B_ticket.php
index ea96691eb..b44983afe 100755
--- a/agent/Public/A2B_ticket.php
+++ b/agent/Public/A2B_ticket.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/A2B_ticket_view.php b/agent/Public/A2B_ticket_view.php
index 0226468f8..7cc9570e0 100755
--- a/agent/Public/A2B_ticket_view.php
+++ b/agent/Public/A2B_ticket_view.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/CC_generate_friend_file.php b/agent/Public/CC_generate_friend_file.php
index db0351b32..7fc8ac158 100644
--- a/agent/Public/CC_generate_friend_file.php
+++ b/agent/Public/CC_generate_friend_file.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/PP_error.php b/agent/Public/PP_error.php
index 07811b97e..5cb1c5762 100644
--- a/agent/Public/PP_error.php
+++ b/agent/Public/PP_error.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/PP_intro.php b/agent/Public/PP_intro.php
index bdb430fb5..402913898 100644
--- a/agent/Public/PP_intro.php
+++ b/agent/Public/PP_intro.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/agentinfo.php b/agent/Public/agentinfo.php
index f69ff62d4..65193383d 100644
--- a/agent/Public/agentinfo.php
+++ b/agent/Public/agentinfo.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/call-last-month.php b/agent/Public/call-last-month.php
index 2aefae83c..2ca37bd16 100644
--- a/agent/Public/call-last-month.php
+++ b/agent/Public/call-last-month.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/call-log-customers.php b/agent/Public/call-log-customers.php
index 08f4caa64..29f12d31d 100644
--- a/agent/Public/call-log-customers.php
+++ b/agent/Public/call-log-customers.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/card-history.php b/agent/Public/card-history.php
index 27d25c4c8..26dda291a 100644
--- a/agent/Public/card-history.php
+++ b/agent/Public/card-history.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -318,7 +318,7 @@
                    <td class="tableBody" style="padding: 2px;" align="center" width="<?php echo $FG_TABLE_COL[$i][2]?>" >
                         <strong>
                         <?php  if (strtoupper($FG_TABLE_COL[$i][4])=="SORT") {?>
-                        <a href="<?php  echo $_SERVER['PHP_SELF']."?stitle=$stitle&atmenu=$atmenu&current_page=$current_page&order=".$FG_TABLE_COL[$i][1]."&sens="; if ($FG_SENS=="ASC") {echo"DESC";} else {echo"ASC";}
+                        <a href="<?php  echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?stitle=$stitle&atmenu=$atmenu&current_page=$current_page&order=".$FG_TABLE_COL[$i][1]."&sens="; if ($FG_SENS=="ASC") {echo"DESC";} else {echo"ASC";}
                         echo "&posted=$posted&Period=$Period&frommonth=$frommonth&fromstatsmonth=$fromstatsmonth&tomonth=$tomonth&tostatsmonth=$tostatsmonth&fromday=$fromday&fromstatsday_sday=$fromstatsday_sday&fromstatsmonth_sday=$fromstatsmonth_sday&today=$today&tostatsday_sday=$tostatsday_sday&tostatsmonth_sday=$tostatsmonth_sday";?>">
                         <font color="#FFFFFF"><?php  } ?>
                         <?php echo $FG_TABLE_COL[$i][0]?>
diff --git a/agent/Public/checkout_confirmation.php b/agent/Public/checkout_confirmation.php
index 997642122..6647444f8 100644
--- a/agent/Public/checkout_confirmation.php
+++ b/agent/Public/checkout_confirmation.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/checkout_payment.php b/agent/Public/checkout_payment.php
index 15d80c8c7..03b78b847 100644
--- a/agent/Public/checkout_payment.php
+++ b/agent/Public/checkout_payment.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -95,22 +95,17 @@
 $payment_modules = new payment;
 ?>
 <script language="javascript">
-function checkamount()
-{
-     if (document.checkout_amount.amount == "") {
+function checkamount() {
+    if (document.checkout_amount.amount == "") {
         alert('Please enter some amount.');
-
         return false;
     }
-
     return true;
 }
-</script>
-<script language="javascript"><!--
+
 var selected;
 
-function selectRowEffect(object, buttonSelect)
-{
+function selectRowEffect(object, buttonSelect) {
     if (!selected) {
         if (document.getElementById) {
             selected = document.getElementById('defaultSelected');
@@ -131,19 +126,16 @@ function selectRowEffect(object, buttonSelect)
     }
 }
 
-function rowOverEffect(object)
-{
+function rowOverEffect(object) {
     if (object.className == 'moduleRow') object.className = 'moduleRowOver';
 }
 
-function rowOutEffect(object)
-{
+function rowOutEffect(object) {
     if (object.className == 'moduleRowOver') object.className = 'moduleRow';
 }
 //--></script>
 
 <?php
-
 echo $payment_modules->javascript_validation();
 ?>
 
@@ -160,7 +152,14 @@ function rowOutEffect(object)
 echo tep_draw_form('checkout_amount', $form_action_url, 'post', 'onsubmit="checkamount()"');
 
 ?>
-
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
     <input name="item_id" type=hidden value="<?php echo $item_id?>">
     <input name="item_type" type=hidden value="<?php echo $item_type?>">
 
diff --git a/agent/Public/checkout_process.php b/agent/Public/checkout_process.php
index 463152fac..545da4e4c 100644
--- a/agent/Public/checkout_process.php
+++ b/agent/Public/checkout_process.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -90,7 +90,7 @@
 }
 
 $security_verify = true;
-$transaction_detail = serialize($_POST);
+$transaction_detail = base64_encode(serialize($_POST));
 
 $currencyObject = new currencies();
 $currencies_list = get_currencies();
diff --git a/agent/Public/checkout_success.php b/agent/Public/checkout_success.php
index 44de2915f..675be7150 100755
--- a/agent/Public/checkout_success.php
+++ b/agent/Public/checkout_success.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/form_data/FG_var_agent.inc b/agent/Public/form_data/FG_var_agent.inc
index 691144f53..c4d660790 100644
--- a/agent/Public/form_data/FG_var_agent.inc
+++ b/agent/Public/form_data/FG_var_agent.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,14 +27,14 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
 
-getpost_ifset(array('id', 'message', 'location', 'id_tariffgroup', 'options', 'credit', 
-'currency', 'locale', 'commission', 'vat', 'banner', 'language', 'perms', 'lastname', 'firstname', 'address', 'city', 'state', 
+getpost_ifset(array('id', 'message', 'location', 'id_tariffgroup', 'options', 'credit',
+'currency', 'locale', 'commission', 'vat', 'banner', 'language', 'perms', 'lastname', 'firstname', 'address', 'city', 'state',
 'country', 'zipcode', 'phone', 'email', 'fax'));
 
 
@@ -87,7 +87,7 @@ $HD_Form -> AddEditElement (gettext("CITY"),
 		"",
 		gettext("Insert the city"),
 		"" , "", "", "", "", "", "", "");
-		
+
 $HD_Form -> AddEditElement (gettext("STATE"),
 		"state",
 		'$value',
@@ -141,7 +141,7 @@ $HD_Form -> AddEditElement (gettext("FAX"),
 		"",
 		gettext("Insert the fax number"),
 		"" , "", "", "", "" , "", "", "");
-		
+
 
 $HD_Form -> AddEditElement (gettext("COMPANY"),
 		"company",
@@ -151,7 +151,7 @@ $HD_Form -> AddEditElement (gettext("COMPANY"),
 		"",
 		gettext("Insert the company"),
 		"" , "", "", "", "", "", "", "");
-	
+
 $FG_QUERY_EDITION = ' lastname, firstname, address, city, state, country, zipcode, email, phone,  fax, company';
 
 $HD_Form -> FieldEditElement ($FG_QUERY_EDITION);
@@ -161,6 +161,6 @@ $HD_Form -> FieldEditElement ($FG_QUERY_EDITION);
 $HD_Form -> FG_INTRO_TEXT_EDITION= gettext("Modify your informations");
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?message=success";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?message=success";
 
 
diff --git a/agent/Public/form_data/FG_var_callerid.inc b/agent/Public/form_data/FG_var_callerid.inc
index a5faab551..283888da8 100644
--- a/agent/Public/form_data/FG_var_callerid.inc
+++ b/agent/Public/form_data/FG_var_callerid.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -91,13 +91,13 @@ $HD_Form -> AddEditElement (gettext("ACTIVATED"),
 			   "" , "", "", "Yes :t, - No:f", "", "", "", "" );
 
 $HD_Form -> AddEditElement (gettext("ID CARD"),
-			   "id_cc_card",		
-			   "$value",	
-			   "POPUPVALUE",	
-			   "size=30 maxlength=50",	
-			   "4",	
+			   "id_cc_card",
+			   "$value",
+			   "POPUPVALUE",
+			   "size=30 maxlength=50",
+			   "4",
 			   gettext("Insert the Id CardNumber"),
-			    "" , "", "", "", "", 				
+			    "" , "", "", "", "",
 				"A2B_entity_card.php?popup_select=1&"
 				, ", 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 				gettext("Define the card number ID to use."));
@@ -137,9 +137,9 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/agent/Public/form_data/FG_var_card.inc b/agent/Public/form_data/FG_var_card.inc
index 9196e82b3..841e719ee 100644
--- a/agent/Public/form_data/FG_var_card.inc
+++ b/agent/Public/form_data/FG_var_card.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -38,7 +38,7 @@ getpost_ifset(array('id', 'username', 'useralias', 'uipass', 'credit', 'language
 'lastname', 'firstname', 'email', 'address','city', 'state', 'country', 'zipcode', 'phone', 'fax', 'inuse',
 'cid', 'runservice', 'firstusedate','expirationdate', 'enableexpire', 'expiredays', 'sip_buddy',
 'iax_buddy','popup_select', 'vat', 'autorefill', 'initialbalance', 'mac_addr', 'cardnumberlenght_list',
-'status',  'block', 'lock_pin', 'template_invoice', 'template_outstanding', 'description', 'voicemail_activated', 
+'status',  'block', 'lock_pin', 'template_invoice', 'template_outstanding', 'description', 'voicemail_activated',
 'voicemail_permitted','email_notification','credit_notification','notify_email', 'id_seria',
 'company_name' , 'company_website' , 'vat_rn' , 'traffic' , 'traffic_target','discount','restriction' ));
 
@@ -68,14 +68,14 @@ if (DELETE_FK_CARD) {
 	$HD_Form -> FG_FK_DELETE_MESSAGE = gettext("You are going to remove a card that have SIP/IAX accounts and/or CallerIDs attached to it ! Please confirm that you really want to remove this card ? ");
 }
 
-if (has_rights (ACX_GENERATE_CUSTOMER)) { 
+if (has_rights (ACX_GENERATE_CUSTOMER)) {
 	$HD_Form ->FG_LIST_ADDING_BUTTON1 = true;
 	$HD_Form ->FG_LIST_ADDING_BUTTON_LINK1 = "A2B_entity_card_multi.php?stitle=Card&section=".$_SESSION["menu_section"];
 	$HD_Form ->FG_LIST_ADDING_BUTTON_ALT1 = $HD_Form ->FG_LIST_ADDING_BUTTON_MSG1 = gettext("Generate Customers");
 	$HD_Form ->FG_LIST_ADDING_BUTTON_IMG1 = Images_Path ."/user_multi_add.png" ;
 }
 
-if (has_rights (ACX_CREATE_CUSTOMER)) { 
+if (has_rights (ACX_CREATE_CUSTOMER)) {
 	$HD_Form -> FG_ADDITION = true;
 	$HD_Form ->FG_LIST_ADDING_BUTTON2 = true;
 	$HD_Form ->FG_LIST_ADDING_BUTTON_LINK2 = "A2B_entity_card.php?form_action=ask-add&atmenu=card&stitle=Card&section=".$_SESSION["menu_section"];
@@ -123,7 +123,7 @@ foreach ($show_list_temp as $i => $value) {
 	if (!($pos === false)) {
 		$temp_ar = preg_split('/:/', $a);
 		$b = $temp_ar[1];
-		$a = strtolower(trim($temp_ar[0]));	
+		$a = strtolower(trim($temp_ar[0]));
 		if (strlen($a)>1) {
 		$show_list_sizes[$a] = $b;
 		}
@@ -136,7 +136,7 @@ $show_fields=array();
 $show_fields['id']=array(gettext("ID"), "cc_card.id", "3%", "center", "sort","", "", "", "", "", "", "");
 
 $show_fields['username']=array("Account Number", "username", "14%", "center", "sort", "", "30", "", "", "", "", "linktocustomer");
-if (!($popup_select>=1)) 
+if (!($popup_select>=1))
  $show_fields['useralias']=array("<acronym title=\"WEB UI LOGIN\">".gettext("LOGIN")."</acronym>", "useralias", "12%", "center", "sort","", "", "", "", "", "", "");
 
 $show_fields['lastname']=array(gettext("LASTNAME"), "lastname", "7%", "center", "sort", "15","", "", "", "", "", "");
@@ -166,7 +166,7 @@ if (!($popup_select>=1)) {
 	foreach ($show_list_temp as $i => $value) {
                 $show_list[$value]=$value;
 	}
-	
+
 	$FG_COL_QUERY='DISTINCT ';
 }
 $FG_COL_QUERY_FIELD='';
@@ -197,7 +197,7 @@ foreach ($show_list as $i => $value) {
 		$index = $index + 1;
 	}
 }
-if (strlen($FG_COL_QUERY_FIELD)>2){ 
+if (strlen($FG_COL_QUERY_FIELD)>2){
 	$FG_COL_QUERY_FIELD=substr( $FG_COL_QUERY_FIELD,2);
 }
 $FG_COL_QUERY_COUNT = count(preg_split('/,/',$FG_COL_QUERY_FIELD));
@@ -216,8 +216,8 @@ $HD_Form -> FG_LIMITE_DISPLAY = 10;
 
 // Code here for adding the fields in the Export File
 $HD_Form -> FieldExportElement(CARD_EXPORT_FIELD_LIST);
-if (!($popup_select>=1)) $HD_Form -> FG_EXPORT_CSV = true;
-if (!($popup_select>=1)) $HD_Form -> FG_EXPORT_XML = true;
+if (!($popup_select>=1)) $HD_Form -> FG_EXPORT_CSV = false;
+if (!($popup_select>=1)) $HD_Form -> FG_EXPORT_XML = false;
 $HD_Form -> FG_EXPORT_SESSION_VAR = "pr_export_entity_card";
 
 
@@ -259,7 +259,7 @@ $HD_Form -> AddSearchElement_Select(gettext("SELECT CURRENCY"), null, null, null
 
 
 if (($popup_select>=1)) {
-	
+
 	$HD_Form -> FG_OTHER_BUTTON1 = true;
 	$HD_Form -> FG_OTHER_BUTTON1_ALT = '<font color="red">&lt;select&gt;</font>';
 	$HD_Form -> FG_OTHER_BUTTON1_IMG = '';
@@ -273,29 +273,29 @@ if (($popup_select>=1)) {
 	}
 
 } else {
-	
+
 	if (has_rights (ACX_EDIT_CUSTOMER)) {
 		$HD_Form -> FG_EDITION = true;
 	}
-	
+
 	$HD_Form -> FG_INFO = true;
 	$HD_Form -> FG_INFO_LINK = "A2B_card_info.php?id=";
-	
-	if (has_rights (ACX_DELETE_CUSTOMER)) { 
+
+	if (has_rights (ACX_DELETE_CUSTOMER)) {
 		$HD_Form -> FG_DELETION = true;
 	}
-	
+
 	$FN_COLUMN_ID="col".($FG_COL_QUERY_COUNT);//get numbers of rows for needed fields
 	$FN_COLUMN_USERNAME="col".($FG_COL_QUERY_COUNT+1);
 	$FN_COLUMN_ALIAS="col".($FG_COL_QUERY_COUNT+2);
-	
-	if (has_rights (ACX_SIPCONF)) { 
+
+	if (has_rights (ACX_SIPCONF)) {
 		$HD_Form -> FG_OTHER_BUTTON1 = true;
 		$HD_Form -> FG_OTHER_BUTTON1_LINK="A2B_entity_friend.php?atmenu=sip&form_action=add_sip&stitle=Customers_Card&id_cc_card=|$FN_COLUMN_ID|&cardnumber=|$FN_COLUMN_USERNAME|&useralias=|$FN_COLUMN_ALIAS|";
 		$HD_Form -> FG_OTHER_BUTTON1_IMG = Images_Path . "/icon-sip.gif";
 		$HD_Form -> FG_OTHER_BUTTON1_ALT=gettext("SIP buddy");
 	}
-	
+
 	if (has_rights (ACX_IAXCONF)) {
 		$HD_Form -> FG_OTHER_BUTTON2 = true;
 		$HD_Form -> FG_OTHER_BUTTON2_LINK="A2B_entity_friend.php?atmenu=iax&form_action=add_iax&stitle=Customers_Card&id_cc_card=|$FN_COLUMN_ID|&cardnumber=|$FN_COLUMN_USERNAME|&useralias=|$FN_COLUMN_ALIAS|";
@@ -340,7 +340,7 @@ $HD_Form -> AddEditElement (gettext("ACCOUNT NUMBER"),
 			   "4",
 			   gettext("Insert the account number"),
 			   "" , "", "",	"", "" , "", "", '', null, null, gettext("Customer Information"));
-			   
+
 
 $HD_Form -> AddEditElement (gettext("WEBUI LOGIN"),
 			   "useralias",
@@ -362,7 +362,7 @@ $HD_Form -> AddEditElement (gettext("WEBUI PASSWORD"),
 			   "" , "", "",	"", "", "",	"", gettext("Password for customer to access to the web interface and view the balance.") );
 
 
-$balance_delete="";			   
+$balance_delete="";
 if (isset($form_action) && $form_action=="ask-delete") {
 	$HD_Form -> AddEditElement (gettext("BALANCE"),
 			   "credit",
@@ -376,7 +376,7 @@ if (isset($form_action) && $form_action=="ask-delete") {
 	$balance_delete = ",credit";
 }
 
-		   
+
 $HD_Form -> AddEditElement (gettext("CUSTOMER GROUP"),
 			   "id_group",
 			   "",
@@ -387,7 +387,7 @@ $HD_Form -> AddEditElement (gettext("CUSTOMER GROUP"),
 			   "name, id",
 			   " cc_card_group.id_agent=".$_SESSION['agent_id'] , "", "%1", "", "", "", '', "");
 
-		   
+
 $HD_Form -> AddEditElement (gettext("SERIA"),
                "id_seria",
                "",
@@ -504,8 +504,8 @@ $HD_Form -> AddEditElement (gettext("COMPANY NAME"),
 			   "",
 			   gettext("Insert Company name of this customer"),
 			   "" , "", "",	"", "", "" , "NO", "");
-			   
-			   
+
+
 $HD_Form -> AddEditElement (gettext("COMPANY WEBSITE"),
 			   "company_website",
 			   '$value',
@@ -528,7 +528,7 @@ if (isset($form_action) && ($form_action=="ask-add" || $form_action=="add")) {
 				   "tariffgroupname, id",
 				   "cc_tariffgroup.id = cc_agent_tariffgroup.id_tariffgroup AND cc_agent_tariffgroup.id_agent = ".$_SESSION['agent_id'] , "", "%1", "", "");
 
-	$callplan_add = ",tariff";	
+	$callplan_add = ",tariff";
 }
 
 $HD_Form -> AddEditElement (gettext("DIDGROUP"),
@@ -636,8 +636,8 @@ $HD_Form -> AddEditElement (gettext("CREDIT LIMIT NOTIFICATION"),
 			   "",
 			   "",
 			   "",
-			   "list" , "", "", "", $limits_notify_list , "%1", "", 
-			   gettext("currency : ").strtoupper(BASE_CURRENCY).'<BR>'.gettext("Low credit limit to alert the customer"), 
+			   "list" , "", "", "", $limits_notify_list , "%1", "",
+			   gettext("currency : ").strtoupper(BASE_CURRENCY).'<BR>'.gettext("Low credit limit to alert the customer"),
 			   "", '<OPTION  value="-1" selected>'.gettext("NOT DEFINED").'</OPTION>');
 
 
@@ -661,7 +661,7 @@ $HD_Form -> AddEditElement (gettext("EMAIL NOTIFICATION"),
 			   "" , "", "",	"", "", "" , "NO", "");
 
 
-if (ACT_VOICEMAIL) { 
+if (ACT_VOICEMAIL) {
 	$HD_Form -> AddEditElement (gettext("PERMITTED VOICEMAIL"),
 				   "voicemail_permitted",
 				   '1',
@@ -670,7 +670,7 @@ if (ACT_VOICEMAIL) {
 				   "",
 				   gettext("Choose if you want to enable the voicemail functionality for this account"),
 				   "" , "", "", "Yes :1, - No:0", "", "" , "", gettext("Enable the voicemail functionality for this account."));
-	
+
 	$HD_Form -> AddEditElement (gettext("ACTIVE VOICEMAIL SERVICE"),
 				   "voicemail_activated",
 				   '0',
@@ -713,9 +713,9 @@ $HD_Form -> AddEditElement (gettext("ENABLE EXPIRY"),
 
 
 $comp_zero = $comp_date_plus='';
-if (isset($form_action) && $form_action=="ask-add"){
+if (isset($form_action) && $form_action=="ask-add") {
 	$begin_date = date("Y");
-	$begin_date_plus = date("Y")+10;
+	$begin_date_plus = date("Y") + 10;
 	$end_date = date("-m-d H:i:s");
 	$comp_date = "value='".$begin_date.$end_date."'";
 	$comp_date_plus = "value='".$begin_date_plus.$end_date."'";
@@ -809,7 +809,7 @@ $HD_Form -> AddEditElement (gettext("INVOICE DAY"),
 			   "",
 			   "",
 			   "",
-			   "list" , "", "",	"", $invoiceday_list, "%1", "", gettext("Define the day of the month when the system will generate the customer invoice."), 
+			   "list" , "", "",	"", $invoiceday_list, "%1", "", gettext("Define the day of the month when the system will generate the customer invoice."),
 			   '', '', gettext("Invoice Status"));
 
 
@@ -830,7 +830,7 @@ $HD_Form -> AddEditElement (gettext("VAT REGISTRATION NUMBER "),
 			   "size=40 maxlength=40",
 			   "",
 			   gettext("Insert the VAT registration number of this customer"),
-			   "" , "", "",	"", "", "" , "NO", "");			   
+			   "" , "", "",	"", "", "" , "NO", "");
 
 
 $HD_Form -> AddEditElement (gettext("DISCOUNT"),
@@ -840,8 +840,8 @@ $HD_Form -> AddEditElement (gettext("DISCOUNT"),
                "",
                "",
                "",
-               "list" , "", "",     "", $discount_list, "%1", "", ""); 
-				
+               "list" , "", "",     "", $discount_list, "%1", "", "");
+
 
 $HD_Form -> AddEditElement (gettext("TRAFFIC PER MONTH"),
 			   "traffic",
@@ -851,7 +851,7 @@ $HD_Form -> AddEditElement (gettext("TRAFFIC PER MONTH"),
 			   "",
 			   gettext("Insert the traffic per month for this customer"),
 			   "" , "", "",	"", "", "" , "NO", "",
-			   '', '', gettext("TARGET TRAFFIC")); 
+			   '', '', gettext("TARGET TRAFFIC"));
 
 $HD_Form -> AddEditElement (gettext("TARGET TRAFFIC"),
 				"traffic_target",
@@ -862,7 +862,7 @@ $HD_Form -> AddEditElement (gettext("TARGET TRAFFIC"),
 				gettext("Insert the target traffic description"),
 				"" , "", "", "", "" , "", "", "");
 
-				
+
 $HD_Form -> AddEditElement (gettext("RESTRICTION"),
 			   "restriction",
 			   "0",
@@ -871,8 +871,8 @@ $HD_Form -> AddEditElement (gettext("RESTRICTION"),
 			   "",
 			   "",
 			   "list" , "", "",	"", $restriction_list, "%1", "", "",
-			   '', '', gettext("RESTRICTED NUMBERS")); 
-				
+			   '', '', gettext("RESTRICTED NUMBERS"));
+
 $HD_Form -> AddEditElement (gettext("RESTRICTED NUMBERS"),
 			   "restrictednumber",
 			   '$value',
@@ -886,7 +886,7 @@ $HD_Form -> AddEditElement (gettext("RESTRICTED NUMBERS"),
 			   "", "", "", "", "", "cc_restricted_phonenumber:number:number, id_card:id_card = %id::id_card:::::::0");
 
 
-			   
+
 $HD_Form -> AddEditElement (gettext("CALLERID"),
 			   "callerid",
 			   '$value',
@@ -966,8 +966,8 @@ if (isset($form_action) && $form_action=='delete' && USE_REALTIME) {
 	$_SESSION["is_iax_changed"]		= 1;
 }
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?section=".$_SESSION["menu_section"]."&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?section=".$_SESSION["menu_section"]."&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?section=".$_SESSION["menu_section"]."&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?section=".$_SESSION["menu_section"]."&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?section=".$_SESSION["menu_section"]."&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?section=".$_SESSION["menu_section"]."&id=";
 
 
diff --git a/agent/Public/form_data/FG_var_def_ratecard.inc b/agent/Public/form_data/FG_var_def_ratecard.inc
index 72788c343..8e9d29a0d 100644
--- a/agent/Public/form_data/FG_var_def_ratecard.inc
+++ b/agent/Public/form_data/FG_var_def_ratecard.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,26 +27,24 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
-
-
 getpost_ifset(array('id', 'idtariffplan', 'dialprefix', 'destination', 'buyrate', 'buyrateinitblock',
 'buyrateincrement', 'rateinitial', 'initblock', 'billingblock', 'connectcharge', 'disconnectcharge','disconnectcharge_after',
 'stepchargea', 'chargea', 'timechargea', 'billingblocka', 'stepchargeb', 'chargeb', 'timechargeb',
 'billingblockb', 'stepchargec', 'chargec', 'timechargec', 'billingblockc', 'startdate', 'stopdate',
-'starttime', 'endtime', 'id_trunk', 'musiconhold','tariffplan', 'tariffgroup','posted','id_outbound_cidgroup','rounding_calltime', 'rounding_threshold', 
+'starttime', 'endtime', 'id_trunk', 'musiconhold','tariffplan', 'tariffgroup','posted','id_outbound_cidgroup','rounding_calltime', 'rounding_threshold',
 'additional_block_charge', 'additional_block_charge_time', 'additional_grace','minimal_cost', 'idtariffgroup'));
 
 // put all the destination name to lowercase
-$_POST["destination"] = strtolower ($_POST["destination"]);
-
+if ($_POST["destination"]) {
+	$_POST["destination"] = strtolower ($_POST["destination"]);
+}
 $HD_Form = new FormHandler("cc_callplan_lcr LEFT JOIN cc_agent_tariffgroup ON tariffgroup_id=cc_agent_tariffgroup.id_tariffgroup", "Rates");
 
 
-
 $HD_Form -> FG_TABLE_ID = 'id';
 $HD_Form -> FG_TABLE_CLAUSE = "cc_agent_tariffgroup.id_agent=".$_SESSION['agent_id'];
 $HD_Form -> FG_DEBUG = 0;
@@ -57,7 +55,6 @@ $HD_Form -> FG_FILTER_SEARCH_SESSION_NAME = 'entity_ratecard_selection';
 
 $HD_Form -> SQL_GROUP = " GROUP BY dialprefix ";
 
-
 $musiconhold_list = array();
 $musiconhold_list[] = array( "No MusicOnHold", "");
 for ($i=1;$i<=NUM_MUSICONHOLD_CLASS;$i++){
@@ -73,7 +70,7 @@ $HD_Form -> AddViewElement("<acronym title=\"SELLING RATE\">".gettext("SR")."</a
 if (!$popup_select) $HD_Form -> AddViewElement(gettext("START-DATE"), "startdate", "13%", "center", "sort", "19", "", "", "", "", "", "display_dateformat");
 if (!$popup_select) $HD_Form -> AddViewElement(gettext("STOP-DATE"), "stopdate", "13%", "center", "sort", "19", "", "", "", "", "", "display_dateformat");
 if (!$popup_select) $HD_Form -> AddViewElement("<acronym title=\"CONNECT CHARGE\">".gettext("CC")."</acronym>", "connectcharge", "4%", "center", "sort");
- 
+
 if (!$popup_select) {
 	$HD_Form -> FieldViewElement ('destination, dialprefix, MIN(rateinitial) as rateinitial, startdate, stopdate, connectcharge');
 } else {
@@ -89,25 +86,23 @@ if ($popup_select) {
 	$HD_Form -> FG_OTHER_BUTTON1_IMG = '';
 
 	//echo $popup_select;
-	if ($popup_select == 1)
+	if ($popup_select == 1) {
 		$HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|param|');";
-	elseif ($popup_select == 2)
+	} elseif ($popup_select == 2) {
 		$HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sendValue('|col0|');";
+	}
 } else {
 	$HD_Form -> FieldExportElement (RATE_EXPORT_FIELD_LIST);
-	$HD_Form -> FG_EXPORT_CSV = true;
-	$HD_Form -> FG_EXPORT_XML = true;
+	$HD_Form -> FG_EXPORT_CSV = false;
+	$HD_Form -> FG_EXPORT_XML = false;
 	$HD_Form -> FG_EXPORT_SESSION_VAR = "pr_export_entity_rates";
-
 }
 
-
-$HD_Form -> CV_NO_FIELDS  = gettext("NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("HAVE BEEN CREATED."); 
+$HD_Form -> CV_NO_FIELDS  = gettext("NO")." ".strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("HAVE BEEN CREATED.");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
 
-
 // Search form
 $HD_Form -> FG_FILTER_SEARCH_FORM = true;
 $HD_Form -> FG_FILTER_SEARCH_TOP_TEXT = gettext("Define the criteria to search");
@@ -115,25 +110,21 @@ $HD_Form -> FG_FILTER_SEARCH_1_TIME = true;
 $HD_Form -> FG_FILTER_SEARCH_1_TIME_TEXT = gettext("START DATE");
 $HD_Form -> FG_FILTER_SEARCH_1_TIME_FIELD = 'startdate';
 
-
 $HD_Form -> AddSearchElement_C1(gettext("PREFIX"),'dialprefix','dialprefixtype');
 $HD_Form -> AddSearchElement_C2(gettext("RATE INITIAL"),'rateinitial1','rateinitial1type','rateinitial2','rateinitial2type','rateinitial');
 
 $HD_Form -> AddSearchElement_Select('SELECT CALLPLAN',"cc_tariffgroup,cc_agent_tariffgroup",
-									"cc_tariffgroup.id, cc_tariffgroup.tariffgroupname",
-									"cc_tariffgroup.id = cc_agent_tariffgroup.id_tariffgroup AND cc_agent_tariffgroup.id_agent=".$_SESSION['agent_id'],
-									"tariffgroupname","ASC","tariffgroup_id",1,null);
+	"cc_tariffgroup.id, cc_tariffgroup.tariffgroupname",
+	"cc_tariffgroup.id = cc_agent_tariffgroup.id_tariffgroup AND cc_agent_tariffgroup.id_agent=".$_SESSION['agent_id'],
+	"tariffgroupname","ASC","tariffgroup_id",1,null);
 
 
 $HD_Form -> FG_INTRO_TEXT_ADITION = $HD_Form -> FG_INTRO_TEXT_EDITION = gettext("Rates must be entered in the currency base : ").strtoupper(BASE_CURRENCY);
 $HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this")." ".$HD_Form->FG_INSTANCE_NAME.", ".gettext("click on the delete button.");
 $HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new")." ".$HD_Form->FG_INSTANCE_NAME."<br>".gettext("Fill the following fields and confirm by clicking on the button add.");
 
-
-
 $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_INSTANCE_NAME." ".gettext("has been inserted.")."<br>";
 
-
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue.");
 
@@ -148,6 +139,3 @@ if (isset($filterprefix)  &&  (strlen($filterprefix)>0)) {
     }
 	$HD_Form -> FG_TABLE_CLAUSE.="dialprefix like '$filterprefix%'";
 }
-
-
-
diff --git a/agent/Public/form_data/FG_var_friend.inc b/agent/Public/form_data/FG_var_friend.inc
index debb265e6..ff2658d72 100644
--- a/agent/Public/form_data/FG_var_friend.inc
+++ b/agent/Public/form_data/FG_var_friend.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,18 +27,18 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
-getpost_ifset(array('id_cc_card', 'cardnumber', 'id', 'name', 'amaflags', 'callgroup', 'accountcode', 'callerid', 'canreinvite', 'context', 'defaultip', 'dtmfmode', 
-'fromuser', 'fromdomain', 'host', 'insecure', 'language', 'mailbox', 'md5secret', 'nat', 'permit', 'deny', 'mask', 'pickupgroup', 'port', 'qualify', 
+getpost_ifset(array('id_cc_card', 'cardnumber', 'id', 'name', 'amaflags', 'callgroup', 'accountcode', 'callerid', 'canreinvite', 'context', 'defaultip', 'dtmfmode',
+'fromuser', 'fromdomain', 'host', 'insecure', 'language', 'mailbox', 'md5secret', 'nat', 'permit', 'deny', 'mask', 'pickupgroup', 'port', 'qualify',
 'restrictcid', 'rtptimeout', 'rtpholdtimeout', 'secret', 'type', 'username', 'disallow', 'allow', 'musiconhold', 'regseconds', 'ipaddr', 'cancallforward', 'regexten','friend_id'));
 
-getpost_ifset(array('defaultuser', 'subscribemwi', 'vmexten', 'cid_number', 'callingpres', 'usereqphone', 'incominglimit', 'subscribecontext', 'musicclass', 'mohsuggest', 
-'allowtransfer', 'autoframing', 'maxcallbitrate', 'outboundproxy', 'regserver', 'rtpkeepalive', 'dbsecret ', 'regcontext ', 'sourceaddress ', 'mohinterpret ', 
-'inkeys ', 'outkey ', ' sendani ', 'fullname ', ' maxauthreq ', 'encryption ', 'transfer ', 'jitterbuffer ', 'forcejitterbuffer ', 'codecpriority ', 'qualifysmoothing ', 
+getpost_ifset(array('defaultuser', 'subscribemwi', 'vmexten', 'cid_number', 'callingpres', 'usereqphone', 'incominglimit', 'subscribecontext', 'musicclass', 'mohsuggest',
+'allowtransfer', 'autoframing', 'maxcallbitrate', 'outboundproxy', 'regserver', 'rtpkeepalive', 'dbsecret ', 'regcontext ', 'sourceaddress ', 'mohinterpret ',
+'inkeys ', 'outkey ', ' sendani ', 'fullname ', ' maxauthreq ', 'encryption ', 'transfer ', 'jitterbuffer ', 'forcejitterbuffer ', 'codecpriority ', 'qualifysmoothing ',
 'qualifyfreqok ', 'qualifyfreqnotok ', 'timezone', 'adsi'));
 
 
@@ -51,9 +51,9 @@ if ($atmenu=='sip') {
 	}
 	$HD_Form -> FG_TABLE_ID = 'cc_sip_buddies.id';
 	$table_name = "cc_sip_buddies";
-	
+
 } else {
-	
+
 	if (!isset($form_action) || $form_action=="list") {
 		$HD_Form = new FormHandler("cc_iax_buddies LEFT JOIN cc_card ON cc_card.id=cc_iax_buddies.id_cc_card LEFT JOIN cc_card_group ON cc_card.id_group=cc_card_group.id","IAX Friend");
 		$HD_Form -> FG_TABLE_CLAUSE = " cc_card_group.id_agent=".$_SESSION['agent_id'] ;
@@ -95,7 +95,7 @@ $HD_Form ->FG_LIST_ADDING_BUTTON_IMG1 = Images_Path ."/telephone_add.png" ;
 $HD_Form -> FieldViewElement ("id_cc_card, $table_name.name, accountcode, secret, callerid, context, defaultip");
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -155,11 +155,11 @@ $HD_Form -> AddEditElement (gettext("ID CARD"),
 
 
 $HD_Form -> AddEditElement (gettext("NAME"),
-						   "name",			
-						   "$value",	
-						   "INPUT",	
-							"size=40 $maxi maxlength=40",	 
-						   "9",	
+						   "name",
+						   "$value",
+						   "INPUT",
+							"size=40 $maxi maxlength=40",
+						   "9",
 						   gettext("Insert the name"),
 						   "", "", "",	"", "", "",	"", "" );
 
@@ -205,11 +205,11 @@ $HD_Form -> AddEditElement (gettext("CID NUMBER"),
 
 
 $HD_Form -> AddEditElement (gettext("AMAFLAGS"),
-						   "amaflags",		
-						   '',	
-						   "INPUT",	
-						   "size=10 maxlength=7 $AMAFLAGS_default",	
-						   "",	
+						   "amaflags",
+						   '',
+						   "INPUT",
+						   "size=10 maxlength=7 $AMAFLAGS_default",
+						   "",
 						   gettext("Insert the amaflags"),
 						   "", "", "",	"", "", "",	"", "(default : billing)" );
 
@@ -232,7 +232,7 @@ $HD_Form -> AddEditElement (gettext("QUALIFY"),
                            "",
                            gettext("Insert the qualify"),
                            "", "", "", "", "", "",	"", "" );
-                           
+
 
 $HD_Form -> AddEditElement (gettext("DISALLOW"),
                            "disallow",
@@ -265,90 +265,90 @@ $HD_Form -> AddEditElement (gettext("HOST"),
 
 
 $HD_Form -> AddEditElement (gettext("CONTEXT"),
-						   "context",		
-						   '',	
-						   "INPUT",	
-						   "size=40 maxlength=40 $CONTEXT_default",	
-						   "",	
+						   "context",
+						   '',
+						   "INPUT",
+						   "size=40 maxlength=40 $CONTEXT_default",
+						   "",
 						   gettext("Insert the context"),
 						   "", "", "",	"", "", "",	"", gettext("set the context for this user (default : a2billing )"));
-						   
+
 
 $HD_Form -> AddEditElement (gettext("DEFAULTIP"),
-						   "defaultip",		
-						   '',	
-						   "INPUT",	
-						   "size=20 maxlength=15",	
-						   "",	
+						   "defaultip",
+						   '',
+						   "INPUT",
+						   "size=20 maxlength=15",
+						   "",
 						   gettext("Insert the defaultip"),
 						   "", "", "",	"", "", "",	"", "" );
-						   
+
 
 $HD_Form -> AddEditElement (gettext("LANGUAGE"),
-						   "language",		
-						   '',	
-						   "INPUT",	
-						   "size=10 maxlength=4",	
-						   "",	
+						   "language",
+						   '',
+						   "INPUT",
+						   "size=10 maxlength=4",
+						   "",
 						   gettext("Insert the language"),
 						   "", "", "",	"", "", "",	"", "" );
 
 
 $HD_Form -> AddEditElement (gettext("PORT"),
-						   "port",		
-						   '',	
-						   "INPUT",	
-						   "size=10 maxlength=5",	
-						   "",	
+						   "port",
+						   '',
+						   "INPUT",
+						   "size=10 maxlength=5",
+						   "",
 						   gettext("Insert the port"),
 						   "", "", "",	"", "", "",	"", "" );
 
 
-$HD_Form -> AddEditElement (gettext("REGSECONDS"),	
-						   "regseconds",		
-						   '4',	
-						   "INPUT",	
-						   "size=50 maxlength=40 $REGSECONDS_default",	
-						   "",	
+$HD_Form -> AddEditElement (gettext("REGSECONDS"),
+						   "regseconds",
+						   '4',
+						   "INPUT",
+						   "size=50 maxlength=40 $REGSECONDS_default",
+						   "",
 						   gettext("Insert the regseconds"),
 						   "", "", "",	"", "", "",	"", "" );
 
 
 $HD_Form -> AddEditElement (gettext("IPADDR"),
-						   "ipaddr",		
-						   '',	
-						   "INPUT",	
-						   "size=20 maxlength=15",	
-						   "",	
+						   "ipaddr",
+						   '',
+						   "INPUT",
+						   "size=20 maxlength=15",
+						   "",
 						   gettext("Insert the ipaddr"),
 						   "", "", "",	"", "", "",	"", "" );
-						   
+
 $HD_Form -> AddEditElement (gettext("MOHSUGGEST"),
-						   "mohsuggest",		
-						   '',	
-						   "INPUT",	
-						   "size=20 maxlength=20",	
-						   "",	
+						   "mohsuggest",
+						   '',
+						   "INPUT",
+						   "size=20 maxlength=20",
+						   "",
 						   gettext("Insert the mohsuggest"),
 						   "", "", "",	"", "", "",	"", "" );
 
-						   
+
 $HD_Form -> AddEditElement (gettext("AUTH"),
-						   "auth",		
-						   '',	
-						   "INPUT",	
-						   "size=20 maxlength=20",	
-						   "",	
+						   "auth",
+						   '',
+						   "INPUT",
+						   "size=20 maxlength=20",
+						   "",
 						   gettext("Insert the auth"),
 						   "", "", "",	"", "", "",	"", "" );
 
 
 $HD_Form -> AddEditElement (gettext("SETVAR"),
-						   "setvar",		
-						   '',	
-						   "INPUT",	
-						   "size=60 maxlength=200",	
-						   "",	
+						   "setvar",
+						   '',
+						   "INPUT",
+						   "size=60 maxlength=200",
+						   "",
 						   gettext("Insert the setvar"),
 						   "", "", "",	"", "", "",	"", "" );
 
@@ -362,11 +362,11 @@ $HD_Form -> AddEditElement (gettext("TYPE"),
                            "", "", "", "", "", "", "", gettext("type = friend | peer | user ( default : friend )"));
 
 $HD_Form -> AddEditElement (gettext("DENY"),
-						   "deny",		
-						   '',	
-						   "INPUT",	
-						   "size=60 maxlength=50",	
-						   "",	
+						   "deny",
+						   '',
+						   "INPUT",
+						   "size=60 maxlength=50",
+						   "",
 						   gettext("Insert the deny"),
 						   "", "", "",	"", "", "",	"", "" );
 
@@ -381,7 +381,7 @@ $HD_Form -> AddEditElement (gettext("PERMIT"),
 
 
 if ($atmenu=='sip') {
-	
+
 	$HD_Form -> AddEditElement (gettext("USERNAME"),
 	                           "username",
 	                           '',
@@ -390,7 +390,7 @@ if ($atmenu=='sip') {
 	                           "",
 	                           gettext("Insert the username"),
 	                           "", "", "", "", "", "",	"", "" );
-	
+
 	$HD_Form -> AddEditElement (gettext("MD5SECRET"),
 	                           "md5secret",
 	                           '',
@@ -399,8 +399,8 @@ if ($atmenu=='sip') {
 	                           "",
 	                           gettext("Insert the md5secret"),
 	                           "", "", "", "", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("NAT"),
 	                           "nat",
 	                           '4',
@@ -409,8 +409,8 @@ if ($atmenu=='sip') {
 	                           "",
 	                           gettext("Insert the nat"),
 	                           "", "", "", "", "", "",	"", gettext("nat = yes | no | never | route ( default : yes )") );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("DTMFMODE"),
 	                           "dtmfmode",
 	                           '',
@@ -419,9 +419,9 @@ if ($atmenu=='sip') {
 	                           "",
 	                           gettext("Insert the dtmfmode"),
 	                           "", "", "", "", "", "",	"", gettext("dtmfmode = RFC2833 | INFO | INBAND | AUTO ( default : RFC2833 )"));
-	
-	
-	
+
+
+
 	$HD_Form -> AddEditElement (gettext("CANREINVITE"),
 	                           "canreinvite",
 	                           '',
@@ -430,467 +430,467 @@ if ($atmenu=='sip') {
 	                           "",
 	                           gettext("Insert the canreinvite"),
 	                           "", "", "", "", "", "",	"", gettext("canreinvite : yes | no ( default : yes )"));
-	
-	
-	
-	
+
+
+
+
 	$HD_Form -> AddEditElement (gettext("CALLGROUP"),
-							   "callgroup",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "callgroup",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   gettext("Insert the callgroup"),
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
-	
-	
+
+
+
+
 	$HD_Form -> AddEditElement (gettext("FROMUSER"),
-							   "fromuser",		
-							   '',	
-							   "INPUT",	
-							   "size=40 maxlength=40",	
-							   "",	
+							   "fromuser",
+							   '',
+							   "INPUT",
+							   "size=40 maxlength=40",
+							   "",
 							   gettext("Insert the fromuser"),
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("FROMDOMAIN"),
-							   "fromdomain",		
-							   '',	
-							   "INPUT",	
-							   "size=40 maxlength=40",	
-							   "",	
+							   "fromdomain",
+							   '',
+							   "INPUT",
+							   "size=40 maxlength=40",
+							   "",
 							   gettext("Insert the fromdomain"),
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("INSECURE"),
-							   "insecure",		
-							   '',	
-							   "INPUT",	
-							   "size=20 maxlength=30",	
-							   "",	
+							   "insecure",
+							   '',
+							   "INPUT",
+							   "size=20 maxlength=30",
+							   "",
 							   gettext("Insert the insecure"),
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("MAILBOX"),
-							   "mailbox",		
-							   '',	
-							   "INPUT",	
-							   "size=60 maxlength=50",	
-							   "",	
+							   "mailbox",
+							   '',
+							   "INPUT",
+							   "size=60 maxlength=50",
+							   "",
 							   gettext("Insert the mailbox"),
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
-	
+
+
+
 	$HD_Form -> AddEditElement (gettext("MASK"),
-							   "mask",		
-							   '',	
-							   "INPUT",	
-							   "size=60 maxlength=50",	
-							   "",	
+							   "mask",
+							   '',
+							   "INPUT",
+							   "size=60 maxlength=50",
+							   "",
 							   gettext("Insert the mask"),
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("PICKUPGROUP"),
-							   "pickupgroup",		
-							   '',	
-							   "INPUT",	
-							   "size=15 maxlength=10",	
-							   "",	
+							   "pickupgroup",
+							   '',
+							   "INPUT",
+							   "size=15 maxlength=10",
+							   "",
 							   gettext("Insert the pickupgroup"),
 							   "", "", "",	"", "", "", "", "");
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("RESTRICTCID"),
-							   "restrictcid",		
-							   '',	
-							   "INPUT",	
-							   "size=7 maxlength=1",	
-							   "",	
+							   "restrictcid",
+							   '',
+							   "INPUT",
+							   "size=7 maxlength=1",
+							   "",
 							   gettext("Insert the restrictcid"),
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("RTPTIMEOUT"),
-							   "rtptimeout",		
-							   '',	
-							   "INPUT",	
-							   "size=7 maxlength=3",	
-							   "",	
+							   "rtptimeout",
+							   '',
+							   "INPUT",
+							   "size=7 maxlength=3",
+							   "",
 							   gettext("Insert the rtptimeout"),
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("RTPHOLDTIMEOUT"),
-							   "rtpholdtimeout",		
-							   '',	
-							   "INPUT",	
-							   "size=7 maxlength=3",	
-							   "",	
+							   "rtpholdtimeout",
+							   '',
+							   "INPUT",
+							   "size=7 maxlength=3",
+							   "",
 							   gettext("Insert the rtpholdtimeout"),
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("MUSICONHOLD"),
-							   "musiconhold",		
-							   '',	
-							   "INPUT",	
-							   "size=50 maxlength=40",	
-							   "",	
+							   "musiconhold",
+							   '',
+							   "INPUT",
+							   "size=50 maxlength=40",
+							   "",
 							   gettext("Insert the musiconhold"),
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("CANCALLFORWARD"),
-							   "cancallforward",		
-							   '',	
-							   "INPUT",	
-							   "size=7 maxlength=3 $CANCALLFORWARD_default",	
-							   "",	
+							   "cancallforward",
+							   '',
+							   "INPUT",
+							   "size=7 maxlength=3 $CANCALLFORWARD_default",
+							   "",
 							   gettext("Insert the cancallforward"),
 							   "", "", "",	"", "", "",	"", gettext("cancallforward = yes | no ( default : yes )"));
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("DEFAULTUSER"),
-							   "defaultuser",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "defaultuser",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-							   
-	
+
+
 	$HD_Form -> AddEditElement (gettext("SUBSCRIBEMWI"),
-							   "subscribemwi",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "subscribemwi",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("VMEXTEN"),
-							   "vmexten",		
-							   '',	
-							   "INPUT",	
-							   "size=20 maxlength=20",	
-							   "",	
+							   "vmexten",
+							   '',
+							   "INPUT",
+							   "size=20 maxlength=20",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("CALLINGPRES"),
-							   "callingpres",		
-							   '',	
-							   "INPUT",	
-							   "size=20 maxlength=20",	
-							   "",	
+							   "callingpres",
+							   '',
+							   "INPUT",
+							   "size=20 maxlength=20",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("USEREQPHONE"),
-							   "usereqphone",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "usereqphone",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("INCOMINGLIMIT"),
-							   "incominglimit",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "incominglimit",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("SUBSCRIBECONTEXT"),
-							   "subscribecontext",		
-							   '',	
-							   "INPUT",	
-							   "size=40 maxlength=40",	
-							   "",	
+							   "subscribecontext",
+							   '',
+							   "INPUT",
+							   "size=40 maxlength=40",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("MUSICCLASS"),
-							   "musicclass",		
-							   '',	
-							   "INPUT",	
-							   "size=20 maxlength=20",	
-							   "",	
+							   "musicclass",
+							   '',
+							   "INPUT",
+							   "size=20 maxlength=20",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("ALLOWTRANSFER"),
-							   "allowtransfer",		
-							   '',	
-							   "INPUT",	
-							   "size=20 maxlength=20",	
-							   "",	
+							   "allowtransfer",
+							   '',
+							   "INPUT",
+							   "size=20 maxlength=20",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("AUTOFRAMING"),
-							   "autoframing",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "autoframing",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("MAXCALLBITRATE"),
-							   "maxcallbitrate",		
-							   '',	
-							   "INPUT",	
-							   "size=15 maxlength=15",	
-							   "",	
+							   "maxcallbitrate",
+							   '',
+							   "INPUT",
+							   "size=15 maxlength=15",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("OUTBOUNDPROXY"),
-							   "outboundproxy",		
-							   '',	
-							   "INPUT",	
-							   "size=40 maxlength=40",	
-							   "",	
+							   "outboundproxy",
+							   '',
+							   "INPUT",
+							   "size=40 maxlength=40",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("REGSERVER"),
-							   "regserver",		
-							   '',	
-							   "INPUT",	
-							   "size=20 maxlength=20",	
-							   "",	
+							   "regserver",
+							   '',
+							   "INPUT",
+							   "size=20 maxlength=20",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("RTPKEEPALIVE"),
-							   "rtpkeepalive",		
-							   '',	
-							   "INPUT",	
-							   "size=15 maxlength=15",	
-							   "",	
+							   "rtpkeepalive",
+							   '',
+							   "INPUT",
+							   "size=15 maxlength=15",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
 
 } else {
-	
+
 	$HD_Form -> AddEditElement (gettext("TRUNK"),
-							   "trunk",		
-							   '',	
+							   "trunk",
+							   '',
 							   "INPUT",
-							   "size=7 maxlength=3 $TRUNK_default",	
-							   "",	
+							   "size=7 maxlength=3 $TRUNK_default",
+							   "",
 							   gettext("Define the iax trunking"),
 							   "", "", "",	"", "", "",	"", gettext("iax trunking = yes | no ( default : yes )"));
-						   
-	
+
+
 	$HD_Form -> AddEditElement (gettext("DBSECRET"),
-							   "dbsecret",		
-							   '',	
-							   "INPUT",	
-							   "size=40 maxlength=40",	
-							   "",	
+							   "dbsecret",
+							   '',
+							   "INPUT",
+							   "size=40 maxlength=40",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("REGCONTEXT"),
-							   "regcontext",		
-							   '',	
-							   "INPUT",	
-							   "size=40 maxlength=40",	
-							   "",	
+							   "regcontext",
+							   '',
+							   "INPUT",
+							   "size=40 maxlength=40",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("SOURCEADDRESS"),
-							   "sourceaddress",		
-							   '',	
-							   "INPUT",	
-							   "size=20 maxlength=10",	
-							   "",	
+							   "sourceaddress",
+							   '',
+							   "INPUT",
+							   "size=20 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
+
 	$HD_Form -> AddEditElement (gettext("MOHINTERPRET"),
-							   "mohinterpret",		
-							   '',	
-							   "INPUT",	
-							   "size=20 maxlength=20",	
-							   "",	
+							   "mohinterpret",
+							   '',
+							   "INPUT",
+							   "size=20 maxlength=20",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("INKEYS"),
-							   "inkeys",		
-							   '',	
-							   "INPUT",	
-							   "size=40 maxlength=40",	
-							   "",	
+							   "inkeys",
+							   '',
+							   "INPUT",
+							   "size=40 maxlength=40",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("OUTKEY"),
-							   "outkey",		
-							   '',	
-							   "INPUT",	
-							   "size=40 maxlength=40",	
-							   "",	
+							   "outkey",
+							   '',
+							   "INPUT",
+							   "size=40 maxlength=40",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
+
 	$HD_Form -> AddEditElement (gettext("SENDANI"),
-							   "sendani",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "sendani",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
+
 	$HD_Form -> AddEditElement (gettext("FULLNAME"),
-							   "fullname",		
-							   '',	
-							   "INPUT",	
-							   "size=40 maxlength=40",	
-							   "",	
+							   "fullname",
+							   '',
+							   "INPUT",
+							   "size=40 maxlength=40",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("MAXAUTHREQ"),
-							   "maxauthreq",		
-							   '',	
-							   "INPUT",	
-							   "size=15 maxlength=15",	
-							   "",	
+							   "maxauthreq",
+							   '',
+							   "INPUT",
+							   "size=15 maxlength=15",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("ENCRYPTION"),
-							   "encryption",		
-							   '',	
-							   "INPUT",	
-							   "size=20 maxlength=20",	
-							   "",	
+							   "encryption",
+							   '',
+							   "INPUT",
+							   "size=20 maxlength=20",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-							   
-	
+
+
 	$HD_Form -> AddEditElement (gettext("TRANSFER"),
-							   "transfer",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "transfer",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("JITTERBUFFER"),
-							   "jitterbuffer",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "jitterbuffer",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("FORCEJITTERBUFFER"),
-							   "forcejitterbuffer",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "forcejitterbuffer",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("CODECPRIORITY"),
-							   "codecpriority",		
-							   '',	
-							   "INPUT",	
-							   "size=40 maxlength=40",	
-							   "",	
+							   "codecpriority",
+							   '',
+							   "INPUT",
+							   "size=40 maxlength=40",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("QUALIFYSMOOTHING"),
-							   "qualifysmoothing",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "qualifysmoothing",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("QUALIFYFREQOK"),
-							   "qualifyfreqok",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "qualifyfreqok",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("QUALIFYFREQNOTOK"),
-							   "qualifyfreqnotok",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "qualifyfreqnotok",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("TIMEZONE"),
-							   "timezone",		
-							   '',	
-							   "INPUT",	
-							   "size=20 maxlength=20",	
-							   "",	
+							   "timezone",
+							   '',
+							   "INPUT",
+							   "size=20 maxlength=20",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
-	
-	
+
+
 	$HD_Form -> AddEditElement (gettext("ADSI"),
-							   "adsi",		
-							   '',	
-							   "INPUT",	
-							   "size=10 maxlength=10",	
-							   "",	
+							   "adsi",
+							   '',
+							   "INPUT",
+							   "size=10 maxlength=10",
+							   "",
 							   "",
 							   "", "", "",	"", "", "",	"", "" );
 
@@ -935,7 +935,7 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Once you have completed the form above, click on the CONTINUE button.");
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=$atmenu&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=$atmenu&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=$atmenu&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=$atmenu&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=$atmenu&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=$atmenu&stitle=Document&wh=AC&id=";
 
diff --git a/agent/Public/form_data/FG_var_logrefill.inc b/agent/Public/form_data/FG_var_logrefill.inc
index 0a5fb59c5..8360e6f0a 100644
--- a/agent/Public/form_data/FG_var_logrefill.inc
+++ b/agent/Public/form_data/FG_var_logrefill.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -58,7 +58,7 @@ $HD_Form -> AddViewElement(gettext("REFILL AMOUNT"), "cc_logrefill.credit", "10%
 
 $HD_Form -> FieldViewElement ('cc_logrefill.id, username, date, cc_logrefill.description, cc_logrefill.refill_type as refill_type, cc_logrefill.credit');
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -82,7 +82,3 @@ $HD_Form -> FG_FILTER_SEARCH_1_TIME_FIELD = 'date';
 $HD_Form -> AddSearchElement_C1(gettext("ACCOUNT NUMBER"), 'username','usernametype');
 $HD_Form -> AddSearchElement_C1(gettext("LASTNAME"),'lastname','lastnametype');
 $HD_Form -> AddSearchElement_C1(gettext("FIRSTNAME"),'firstname','firstnametype');
-
-
-
-
diff --git a/agent/Public/form_data/FG_var_logrefill_agent.inc b/agent/Public/form_data/FG_var_logrefill_agent.inc
index fb6943db8..20395aab7 100644
--- a/agent/Public/form_data/FG_var_logrefill_agent.inc
+++ b/agent/Public/form_data/FG_var_logrefill_agent.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,12 +27,10 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
-
-
 getpost_ifset(array('id', 'agent_id', 'date', 'credit','description'));
 
 
@@ -61,7 +59,7 @@ $HD_Form -> AddViewElement(gettext("REFILL AMOUNT"), "cc_logrefill.credit", "18%
 $HD_Form -> FieldViewElement ('cc_logrefill_agent.id, agent_id,agent_id, date, description, cc_logrefill_agent.refill_type as refill_type, cc_logrefill_agent.credit');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -70,12 +68,9 @@ $HD_Form -> FG_INFO = true;
 $HD_Form -> FG_INFO_LINK = "A2B_refill_info_agent.php?id=";
 
 
-
 if (!($popup_select>=1))	 $HD_Form -> FG_FILTER_SEARCH_FORM = true;
 $HD_Form -> FG_FILTER_SEARCH_SESSION_NAME = 'refill_agent_selection';
 $HD_Form -> FG_FILTER_SEARCH_TOP_TEXT = gettext('Define specific criteria to search for payments created.');
 $HD_Form -> FG_FILTER_SEARCH_1_TIME = true;
 $HD_Form -> FG_FILTER_SEARCH_1_TIME_TEXT = gettext('DATE');
 $HD_Form -> FG_FILTER_SEARCH_1_TIME_FIELD = 'date';
-
-
diff --git a/agent/Public/form_data/FG_var_moneysituation.inc b/agent/Public/form_data/FG_var_moneysituation.inc
index 568604722..47fb87584 100644
--- a/agent/Public/form_data/FG_var_moneysituation.inc
+++ b/agent/Public/form_data/FG_var_moneysituation.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -53,7 +53,7 @@ $HD_Form -> AddViewElement(gettext("TO PAY"), "to pay", "7%", "center", "sort",
 $HD_Form -> FieldViewElement ('cc_card.id, username, firstname, lastname, credit,cc_card.id,cc_card.id, cc_card.id, cc_card.id');
 
 $HD_Form -> FG_ACTION_SIZE_COLUMN = '15%';
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO").strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO").strtoupper($HD_Form->FG_INSTANCE_NAME)." ".gettext("CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -100,7 +100,7 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
diff --git a/agent/Public/form_data/FG_var_paymentlog.inc b/agent/Public/form_data/FG_var_paymentlog.inc
index c33aa53e3..6ac019e50 100644
--- a/agent/Public/form_data/FG_var_paymentlog.inc
+++ b/agent/Public/form_data/FG_var_paymentlog.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -48,7 +48,7 @@ $HD_Form ->FG_EDITION_CLAUSE = "cc_epayment_log.id = %id";
 
 $date_clause = "";
 
-if (DB_TYPE == "postgres") {		
+if (DB_TYPE == "postgres") {
 	 	$UNIX_TIMESTAMP = "";
 }else{
 		$UNIX_TIMESTAMP = "UNIX_TIMESTAMP";
@@ -60,7 +60,7 @@ if ($Period=="Month"){
 	if ($frommonth && isset($fromstatsmonth)) $date_clause.=" $UNIX_TIMESTAMP(cc_epayment_log.creationdate) >= $UNIX_TIMESTAMP('$fromstatsmonth-01')";
 	if ($tomonth && isset($tostatsmonth)) {
 		if (strlen($date_clause)>0) $date_clause.=" AND ";
-		$date_clause.=" $UNIX_TIMESTAMP(cc_epayment_log.creationdate) <= $UNIX_TIMESTAMP('".$tostatsmonth."-$lastdayofmonth 23:59:59')"; 
+		$date_clause.=" $UNIX_TIMESTAMP(cc_epayment_log.creationdate) <= $UNIX_TIMESTAMP('".$tostatsmonth."-$lastdayofmonth 23:59:59')";
 	}
 } else {
 	if ($fromday && isset($fromstatsday_sday) && isset($fromstatsmonth_sday)) {
@@ -74,7 +74,7 @@ if ($Period=="Month"){
 }
 
 if (strlen($HD_Form -> FG_TABLE_CLAUSE)>0 && strlen($enteradmin)>0) $HD_Form -> FG_TABLE_CLAUSE.=" AND ";
-if($enteradmin != "") { 
+if($enteradmin != "") {
 	if (strlen($HD_Form -> FG_TABLE_CLAUSE)>0) $HD_Form -> FG_TABLE_CLAUSE.=" AND ";
 	$HD_Form -> FG_TABLE_CLAUSE.=" iduser = '$enteradmin'";
 }
@@ -85,7 +85,7 @@ if($status >= 0 && $status != '') {
 	$HD_Form -> FG_TABLE_CLAUSE.=" cc_epayment_log.status = '$status'";
 }
 if (strlen($loglevel)>0 && strlen($date_clause)>0) $HD_Form -> FG_TABLE_CLAUSE.=" AND ";
-if(!empty($date_clause)) {	
+if(!empty($date_clause)) {
 	if (strlen($HD_Form -> FG_TABLE_CLAUSE)>0) $date_clause =" AND ".$date_clause;
 	$HD_Form -> FG_TABLE_CLAUSE.=" ".$date_clause;
 }
@@ -117,74 +117,74 @@ $HD_Form -> FG_DELETION = true;
 $HD_Form -> FG_ADDITION = false;
 
 $HD_Form -> AddEditElement (gettext("ID"),
-			   "id",		
-			   "$value",	
-			   "INPUT",	
-			   "size=10 READONLY maxlength=10",	
-			   "4",	
+			   "id",
+			   "$value",
+			   "INPUT",
+			   "size=10 READONLY maxlength=10",
+			   "4",
 			   gettext("Insert the Id "),
-			    "" , "", "", "", "", "", "", 
+			    "" , "", "", "", "", "", "",
 				gettext("Select the ID"));
 
 
 $HD_Form -> AddEditElement (gettext("DATE"),
-			   "creationdate",		
-			   '$value',	
-			   "INPUT",	
-			   "size=40 READONLY maxlength=40 ",	
-			   "10",	
+			   "creationdate",
+			   '$value',
+			   "INPUT",
+			   "size=40 READONLY maxlength=40 ",
+			   "10",
 			   gettext("Insert the creation date"),
 			   "" , "", "",	"", "", "", "", "" );
 
 
 $HD_Form -> AddEditElement (gettext("PAYMENT METHOD"),
-			   "paymentmethod",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=30",	
-			   "12",	
+			   "paymentmethod",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=30",
+			   "12",
 			   gettext("Insert the payment method"),
 			   "" , "", "",	"", "" , "", "", gettext("Enter the payment method ") );
 
 
-$HD_Form -> AddEditElement (gettext("STATUS"),	
-				"status",			
-				'$value',	
-				"SELECT",	
-				"",	
-				"",	
-				"", 
+$HD_Form -> AddEditElement (gettext("STATUS"),
+				"status",
+				'$value',
+				"SELECT",
+				"",
+				"",
+				"",
 				"list" , "", "",	"", $status_list, "%1", "", "" );
 
 $HD_Form -> AddEditElement (gettext("OWNER"),
-			   "cc_owner",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=30",	
-			   "12",	
+			   "cc_owner",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=30",
+			   "12",
 			   gettext("Insert the owner"),
 			   "" , "", "",	"", "" , "", "", gettext("Enter the owner") );
 
 
 $HD_Form -> AddEditElement (gettext("AMOUNT"),
-			   "amount",		
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=30",	
-			   "12",	
+			   "amount",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=30",
+			   "12",
 			   gettext("Insert the amount"),
 			   "" , "", "",	"", "" , "", "", gettext("Enter the amount ") );
 
 
 
 $HD_Form -> AddEditElement (gettext("ID CARD"),
-			   "card_id",		
-			   "$value",	
-			   "POPUPVALUE",	
-			   "size=30 maxlength=50",	
-			   "4",	
+			   "card_id",
+			   "$value",
+			   "POPUPVALUE",
+			   "size=30 maxlength=50",
+			   "4",
 			   gettext("Insert the Id CardNumber"),
-			    "" , "", "", "", "", 				
+			    "" , "", "", "", "",
 				"A2B_entity_card.php?popup_select=1&"
 				, ", 'CardNumberSelection','width=550,height=330,top=20,left=100,scrollbars=1'" ,
 				gettext("Select the Card Number ID"));
@@ -209,7 +209,7 @@ $HD_Form -> FG_INTRO_TEXT_EDITION= '';
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/agent/Public/form_data/FG_var_signup_agent.inc b/agent/Public/form_data/FG_var_signup_agent.inc
index 9f46d6982..bc1cb9e23 100644
--- a/agent/Public/form_data/FG_var_signup_agent.inc
+++ b/agent/Public/form_data/FG_var_signup_agent.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -59,14 +59,14 @@ $HD_Form -> FieldViewElement ('code, id_agent, id_tariffgroup ,id_group');
 
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!"); 
+$HD_Form -> CV_NO_FIELDS  = gettext("THERE IS NO ".strtoupper($HD_Form->FG_INSTANCE_NAME)." CREATED!");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
 $HD_Form -> FG_OTHER_BUTTON1 = true;
 $HD_Form -> FG_OTHER_BUTTON1_ALT = '<font color="red">URL</font>';
 $HD_Form -> FG_OTHER_BUTTON1_IMG = '';
-$HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:sexyBOX('".$A2B->config['signup']['urlcustomerinterface']."signup.php?key=|col0|',400);";
+$HD_Form -> FG_OTHER_BUTTON1_LINK = "javascript:elegantBOX('".$A2B->config['signup']['urlcustomerinterface']."signup.php?key=|col0|',400);";
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF'];
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL);
diff --git a/agent/Public/form_data/FG_var_ticket.inc b/agent/Public/form_data/FG_var_ticket.inc
index faad31c80..0422447ef 100755
--- a/agent/Public/form_data/FG_var_ticket.inc
+++ b/agent/Public/form_data/FG_var_ticket.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -179,8 +179,8 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/agent/Public/form_data/FG_var_ticket_agent.inc b/agent/Public/form_data/FG_var_ticket_agent.inc
index ff91b0a9e..c24b05329 100755
--- a/agent/Public/form_data/FG_var_ticket_agent.inc
+++ b/agent/Public/form_data/FG_var_ticket_agent.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -97,7 +97,7 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 ?>
diff --git a/agent/Public/graph_hourdetail.php b/agent/Public/graph_hourdetail.php
index 4ee5fdfd0..e86e5545e 100644
--- a/agent/Public/graph_hourdetail.php
+++ b/agent/Public/graph_hourdetail.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/graph_pie.php b/agent/Public/graph_pie.php
index 929b0210a..4f9b449e1 100644
--- a/agent/Public/graph_pie.php
+++ b/agent/Public/graph_pie.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -92,11 +92,7 @@
 $SQLcmd = '';
 
 $SQLcmd .= 'cc_card_group.id_agent = '.$_SESSION['agent_id'];
-if (isset ($dst) && ($dst > 0)) {
-    if (strlen($SQLcmd) > 0)
-        $SQLcmd .= " AND ";
-    $SQLcmd .= " calledstation='$dst' ";
-}
+$SQLcmd = do_field ( $SQLcmd, 'dst', 'calledstation' );
 if (isset ($entercustomer) && ($entercustomer > 0)) {
     if (strlen($SQLcmd) > 0)
         $SQLcmd .= " AND ";
diff --git a/agent/Public/graph_stat.php b/agent/Public/graph_stat.php
index dce9e19ff..f0bb56a70 100644
--- a/agent/Public/graph_stat.php
+++ b/agent/Public/graph_stat.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/graph_statbar.php b/agent/Public/graph_statbar.php
index 16d761d36..d9d1da9b2 100644
--- a/agent/Public/graph_statbar.php
+++ b/agent/Public/graph_statbar.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/index.php b/agent/Public/index.php
index afe0feeef..b78bb903b 100644
--- a/agent/Public/index.php
+++ b/agent/Public/index.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/logout.php b/agent/Public/logout.php
index c589f9f2d..8b33277be 100644
--- a/agent/Public/logout.php
+++ b/agent/Public/logout.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/agent/Public/templates/default/main.tpl b/agent/Public/templates/default/main.tpl
index 60cedeae0..75cb1c92d 100755
--- a/agent/Public/templates/default/main.tpl
+++ b/agent/Public/templates/default/main.tpl
@@ -35,7 +35,7 @@
 	</ul>
 	</div>
 	{/if}
-	
+
 	{if ($ACXCUSTOMER > 0) }
 	<div class="toggle_menu"><li>
 	<a href="javascript:;" class="toggle_menu" target="_self"> <div> <div id="menutitlebutton"> <img id="img1"
@@ -64,8 +64,8 @@
 	</ul>
 	</div>
 	{/if}
-	
-	
+
+
 	{if ($ACXSIGNUP > 0) }
 	<div class="toggle_menu"><li>
 	<a href="javascript:;" class="toggle_menu" target="_self"> <div> <div id="menutitlebutton"> <img id="img8"
@@ -89,7 +89,7 @@
 	</div>
 	{/if}
 
-	
+
 	{if ($ACXBILLING > 0)}
 	<div class="toggle_menu"><li>
 	<a href="javascript:;" class="toggle_menu" target="_self"> <div> <div id="menutitlebutton"> <img id="img2"
@@ -162,7 +162,7 @@
 		</ul>
 	</div>
 	{/if}
-	
+
 	{if ($ACXSUPPORT  > 0)}
 	<div class="toggle_menu"><li>
 	<a href="javascript:;" class="toggle_menu" target="_self"> <div> <div id="menutitlebutton"> <img id="img7"
@@ -185,7 +185,7 @@
 		</ul>
 	</div>
 	{/if}
-	
+
 
 </ul>
 </br>
@@ -209,6 +209,7 @@
 		<a href="PP_intro.php?ui_language=french" target="_parent"><img src="templates/{$SKIN_NAME}/images/flags/fr.gif" border="0" title="French" alt="French"></a>
 		<a href="PP_intro.php?ui_language=spanish" target="_parent"><img src="templates/{$SKIN_NAME}/images/flags/es.gif" border="0" title="Spanish" alt="Spanish"></a>
 		<a href="PP_intro.php?ui_language=greek" target="_parent"><img src="templates/{$SKIN_NAME}/images/flags/gr.gif" border="0" title="Greek" alt="Greek"></a>
+		<a href="PP_intro.php?ui_language=italian" target="_parent"><img src="templates/{$SKIN_NAME}/images/flags/it.gif" border="0" title="Italian" alt="Italian"></a>
 	</td>
 </tr>
 </table>
@@ -220,7 +221,7 @@
 		<p>Thank you for using A2Billing. However, we have detected that you have edited the Author’s names, Copyright or licensing information in the A2Billing Management Interface.</p>
 		<p>The <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" target="_blank">AGPL 3</a> license under which you are allowed to use A2Billing requires that the original copyright and license must be displayed and kept intact. Without this information being displayed, you do not have a right to use the software.</p>
 		<p>However, if it is important to you that the Author’s names, Copyright and License information is not displayed, possibly for publicity purposes; then we can offer you additional permissions to use and convey A2Billing, with these items removed, for a fee that will be used to help sponsor the continued development of A2Billing.</p>
-		<p>For more information, please go to <a target="_blank" href="http://www.star2billing.com/licensing">http://www.star2billing.com/licensing</a>.</p>
+		<p>For more information, please go to <a target="_blank" href="http://www.asterisk2billing.org/pricing/rebranding/">http://www.asterisk2billing.org/pricing/rebranding/</a>.</p>
 		<p>Yours,<br/>
 		The A2Billing Team<br/>
 		Star2Billing S.L</p>
diff --git a/agent/Public/userinfo.php b/agent/Public/userinfo.php
index 014a4135c..e1e97a2ee 100644
--- a/agent/Public/userinfo.php
+++ b/agent/Public/userinfo.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/common/admin_ui_locale/it_IT/LC_MESSAGES/messages.mo b/common/admin_ui_locale/it_IT/LC_MESSAGES/messages.mo
new file mode 100644
index 000000000..40490b1e4
Binary files /dev/null and b/common/admin_ui_locale/it_IT/LC_MESSAGES/messages.mo differ
diff --git a/common/admin_ui_locale/it_IT/LC_MESSAGES/messages.po b/common/admin_ui_locale/it_IT/LC_MESSAGES/messages.po
new file mode 100644
index 000000000..2432446b6
--- /dev/null
+++ b/common/admin_ui_locale/it_IT/LC_MESSAGES/messages.po
@@ -0,0 +1,12489 @@
+# A2Billing Admin Panel - PO File.
+# Copyright (C) 2004-2009 A2BILLING
+# This file is distributed under the same license as the PACKAGE package.
+# ARESKI <areski@gmail.com>.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-04-05 16:59+0200\n"
+"PO-Revision-Date: 2012-02-24 18:50+0100\n"
+"Last-Translator: Corrado <corrado.bove@gmail.com>\n"
+"Language-Team: ARESKI <areski@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"###Project-Id-Version: A2Billing Admin : 1.4\n"
+
+#: lib/Class.Realtime.php:96
+msgid "Could not open buddy file"
+msgstr "Il file non pu&ograve essere aperto"
+
+#: lib/Class.Realtime.php:115
+msgid "Impossible to write to the file"
+msgstr "Impossibile scrivere quel file"
+
+#: lib/customer.smarty.php:103
+#: lib/admin.smarty.php:68
+#: lib/agent.smarty.php:69
+msgid "This option is not available on the Demo!"
+msgstr "Questa opzione non &egrave disponibile nella Demo!"
+
+#: lib/epayment/methods/iridium.php:607
+msgid "We are sorry your transaction is failed. Please try later or check your provided information."
+msgstr "Spiacenti la transazione &egrave fallita. Riprova pi&ugrave tardi o controlla le informazioni fornite."
+
+#: lib/epayment/methods/iridium.php:611
+msgid "We are sorry your transaction is denied. Please try later or check your provided information."
+msgstr "Spiacenti la transazione &egrave stata negata. Riprova pi&ugrave tardi o controlla le informazioni fornite."
+
+#: lib/epayment/methods/iridium.php:620
+msgid "Your transaction is in progress."
+msgstr "Transazione in corso."
+
+#: lib/epayment/methods/iridium.php:624
+msgid "Your transaction was successful."
+msgstr "Transazione effettuata con successo."
+
+#: lib/support/classes/ticket.php:79
+#: lib/support/classes/ticket.php:233
+msgid "(AGENT)"
+msgstr "(AGENTE)"
+
+#: lib/support/classes/ticket.php:212
+msgid "(ADMINISTRATOR) "
+msgstr "(AMMINISTRATORE) "
+
+#: lib/support/classes/ticket.php:370
+#: lib/interface/constants.php:277
+#: lib/interface/constants.php:325
+#: lib/interface/constants.php:343
+#: Public/A2B_mass_mail.php:58
+#: Public/A2B_data_archiving.php:91
+#: Public/A2B_data_archiving.php:99
+#: Public/A2B_data_archiving.php:108
+msgid "NEW"
+msgstr "NUOVO"
+
+#: lib/support/classes/ticket.php:373
+msgid "FIXED"
+msgstr "FISSO"
+
+#: lib/support/classes/ticket.php:376
+msgid "REOPEN"
+msgstr "RIAPERTO"
+
+#: lib/support/classes/ticket.php:379
+msgid "CLOSED"
+msgstr "CHIUSO"
+
+#: lib/support/classes/ticket.php:382
+msgid "INVALID"
+msgstr "INVALIDO"
+
+#: lib/admin.help.php:35
+msgid "For further information please consult"
+msgstr "Per ulteriori informazioni visitare"
+
+#: lib/admin.help.php:35
+msgid "the online documention"
+msgstr "la documentazione on-line"
+
+#: lib/admin.help.php:55
+msgid "The Notification component is responsible for informing the Customer, via e-mail, that the account has reached a minimum credit."
+msgstr "L'utilit&agrave di Notifica &egrave incaricata di informare gli Utenti via e-mail, che il loro account ha raggiunto la soglia minima di credito."
+
+#: lib/admin.help.php:57
+msgid "Notification: You can see below all notifications received about some event."
+msgstr "Nota: Troverete, qui di seguito, tutte le notifiche ricevute su un evento."
+
+#: lib/admin.help.php:59
+msgid "This page shows the series list."
+msgstr "Questa pagina mostra l'elenco delle serie."
+
+#: lib/admin.help.php:59
+msgid "Series & serials is used for the creation of a card range specifically for accounting purposes instead of card id."
+msgstr "La Serie viene utilizzata per la creazione di una gamma di schede ai fini contabili, invece degli id scheda."
+
+#: lib/admin.help.php:61
+msgid "This page shows a group list."
+msgstr "Questa pagina visulaizza una lista gruppi. "
+
+#: lib/admin.help.php:61
+msgid "The Group field is used for grouping customers for quick search, batch update and reporting."
+msgstr "Il campo Gruppo viene utilizzato per raggruppare gli utenti in una rapida ricerca, per data e relazione."
+
+#: lib/admin.help.php:63
+msgid "Generate a specific crypted URL to configure signup with a customer group and call plan."
+msgstr "Genera un URL criptato, in particolare, per configurare la registrazione di un gruppo di utenti e il suo piano di chiamata."
+
+#: lib/admin.help.php:65
+msgid "Customers are listed below by account number. Each row corresponds to one customer, along with information such as their call plan, credit remaining, etc.</br>"
+msgstr "Gli Utenti sono elencati per numero di conto. Ogni riga corrisponde ad un utente, e contiene informazioni come il piano di numerazione, il credito residuo, ecc.</br>"
+
+#: lib/admin.help.php:65
+msgid "The SIP and IAX buttons create SIP and IAX entries to allow direct VoIP connections to the Asterisk server without further authentication."
+msgstr " I pulsanti SIP e IAX creano le voci che permettono i collegamenti diretti VoIP con il server Asterisk, senza ulteriori autenticazioni."
+
+#: lib/admin.help.php:67
+msgid "Import Customers from a CSV file."
+msgstr "Importa Utenti da un file CSV."
+
+#: lib/admin.help.php:69
+msgid "Customer information."
+msgstr "Informazione Utente."
+
+#: lib/admin.help.php:71
+msgid "Top up the account by selecting or typing in the account number directly, and enter the amount of credit to apply, then click ADD to confirm."
+msgstr "Modifica i dati dell'account facendo clic sul suo numero. Inserisci l'importo del credito da applicare, quindi fare clic su Aggiungi per confermare."
+
+#: lib/admin.help.php:73
+msgid "Create and edit the properties of each customer. Click <b>CONFIRM DATA</b> at the bottom of the page to save changes."
+msgstr "Crea e modifica le propriet&agrave di ogni utente. Clicca <b>CONFERMA DATI</b>, alla fine della pagina per salvare le modifiche."
+
+#: lib/admin.help.php:75
+msgid "Bulk create customers in a single step. <br> Set the properties of the batch such as initial credit, account type and currency, then click on the GENERATE CUSTOMERS button to create the batch."
+msgstr "Creare pi&ugrave utenti contemporaneamente. <br> Definire le proprietà del lotto come il credito iniziale, il tipo di account e di valuta, quindi fare clic sul tasto GENERA UTENTI per creare il lotto."
+
+#: lib/admin.help.php:77
+msgid "SIP and IAX Config will create a SIP or IAX entry on the Asterisk server, so that a customer can set up a SIP or IAX client to connect directly to the asterisk server without the need to enter an account and pin each time a call is made. When done, click on the CONFIRM DATA button, then click reload to apply the changes on the Asterisk server.</br>"
+msgstr "SIP e IAX Config creer&agrave i file SIP o IAX direttamente sul server Asterisk, in modo che un utente possa configurare un client SIP o IAX connettendosi direttamente al server Asterisk senza la necessit&agrave di inserire un account e PIN ogni volta che viene effettuata una chiamata. Quando hai finito, clicca sul pulsante CONFERMA DATI, quindi fare clic su ricarica per applicare le modifiche sul server Asterisk.</br>"
+
+#: lib/admin.help.php:78
+msgid "The customer must then enter the URL/IP address of the asterisk server into the SIP/IAX client, and use the Account Number and Secret word as the username and password."
+msgstr "Il cliente deve quindi immettere l'URL/indirizzo IP del server Asterisk nel client SIP/IAX e utilizzare il Numero Account e Password come nome utente e password."
+
+#: lib/admin.help.php:80
+msgid "Click reload to commit changes to Asterisk"
+msgstr "Fai clic su aggiorna per confermare le modifiche ad Asterisk"
+
+#: lib/admin.help.php:82
+msgid "Each SIP/IAX client is identified by a number of parameters.</br></br>"
+msgstr "Ogni SIP/IAX clinent &egrave indentificato da un numero di parametri.</br></br>"
+
+#: lib/admin.help.php:83
+msgid "More details on how to configure clients are on the Wiki"
+msgstr "Ulteriori dettagli su come configurare il client, sono sul Wiki"
+
+#: lib/admin.help.php:86
+msgid "Set the caller ID so that the customer calling in is authenticated on the basis of the callerID rather than with the account number"
+msgstr "Imposta l'ID chiamante in modo che l'utente sia autenticato sulla base del ID chiamante anzich&egrave col numero account"
+
+#: lib/admin.help.php:88
+msgid "This screen shows refills and payments made against each account, along with the current credit on each account. The initial amount of credit applied to the account is not included. The amount owing is calculated by subtracting payments from refills"
+msgstr "Questa schermata mostra ricariche e pagamenti effettuati nei confronti degli account, con il credito corrente su ogni scheda. L'importo iniziale del credito applicato alla scheda non &egrave incluso. L'importo dovuto &egrave calcolato sottraendo i pagamenti dalle ricariche."
+
+#: lib/admin.help.php:90
+msgid "Agents Commission history - The section below allows you to add commissions against an agent. Normally the commissions are generated automatically by the customer's payment."
+msgstr "Storico Commissioni Agente - La sezione seguente permette di aggiungere commissioni ad un agente. Normalmente le commissioni sono generate automaticamente dal pagamento dell'utente."
+
+#: lib/admin.help.php:92
+msgid "Agents Remittance request history - The section below allows you to confirm or refuse remittance request of an agent. The remittance reques are generated automatically by the agent."
+msgstr "Storico Richieste Rimesse Agenti - La sezione sotto permette di confermare o rifiutare le richieste di rimessa di un agente. Le richieste di rimessa sono generate automaticamente dall'agente."
+
+#: lib/admin.help.php:94
+msgid "Payment history - The section below allows you to add payments against a customer. Note that this does not change the balance on the account. Click on 'create associate refill' when you create a payment to top-up an account."
+msgstr "Storico Pagamenti - La sezione seguente consente di vedere i pagamenti nei confronti di un utente. Si noti che questi non cambiano il saldo della scheda. Clicca su 'crea ricarica associata' quando crei un pagamento per aggiungerlo ad un account."
+
+#: lib/admin.help.php:96
+msgid "Agent Payment history - The section below allows you to add payments against an agent. Note that this does not change the balance on the account. Click on 'create associate refill' when you create  a payment to top-up an account."
+msgstr "Storico Pagamenti Agenti - La sezione seguente consente di vedere i pagamenti nei confronti di un agente. Si noti che questi non cambiano il saldo dell'account. Clicca su 'crea ricarica associata' quando crei un pagamento per aggiungerlo ad un account."
+
+#: lib/admin.help.php:98
+msgid "Billing history - The section below allows you to see all billing generated by the batch for the customers, or also to run a billing manually for a specific customer. Note that this creates one invoice associated with the created billing."
+msgstr "Storico Fatturazione - La sezione seguente consente di vedere tutte le fatturazioni generate dal lotto degli utenti, o anche per emettere manualmente una fattura per un utente. Nota che questo crea una fattura associata alla fatturazione creata."
+
+#: lib/admin.help.php:100
+msgid "Billing history - The section below allows you see all billing generate by the batch for the agents , or also to run a billing manualy for a specific agent. Note that this create one invoice associate to the created billing."
+msgstr "Storico Fatturazione - La sezione seguente consente di vedere tutte le fatturazioni generate dal lotto degli agenti, o anche per emettere manualmente una fattura per un agente. Nota che questo crea una fattura associata alla fatturazione creata"
+
+#: lib/admin.help.php:102
+msgid "Refill history - The section below allows you to add refills against a customer. Note that this changes the balance on the account"
+msgstr "Storico Ricariche - La sezione seguente consente di ricaricare un utente. Nota che questo cambia il saldo dell'account."
+
+#: lib/admin.help.php:104
+msgid "Invoice history - The section below allows you to see and create invoices against a customer. Only the closed invoice can be seen on the customer interface."
+msgstr "Storico Fatture - La sezione seguente consente di vedere e creare le fatture di un utente. Sole le fatture chiuse possono essere visualizzate nell'interfaccia utente."
+
+#: lib/admin.help.php:106
+msgid "Receipt history - The section below allows you to see and create receipt against a customer. Only the closed receipt can be see in the customer interface. Receipts are only an information for the user and aren't used in the balance of the system."
+msgstr "Storico Ricevute - La sezione seguente consente di vedere e creare le ricevute di un utente. Sole le ricevute chiuse possono essere visualizzate nell'interfaccia utente. Le ricevuto sono solo informative per l'utente e non influenzano il saldo del sistema."
+
+#: lib/admin.help.php:108
+msgid "Agents Refill history - The section below allows you to add refills against an agent. Note that this changes the balance on the account."
+msgstr "Storico Ricariche Agenti - La sezione seguente consente di aggiungere ricariche ad un agente. Nota che questo cambia il saldo dell'account."
+
+#: lib/admin.help.php:110
+msgid "Paypal History - The section below shows all paypal receipts."
+msgstr "Storico di PayPal - La sezione seguente visualizza tutti i pagamenti di PayPal ricevuti."
+
+#: lib/admin.help.php:112
+msgid "Add payments to a customer's account!"
+msgstr "Aggiungi un pagamento ad un account utente!"
+
+#: lib/admin.help.php:114
+msgid "List of Call Plans, a Call Plan is a collection of ratecards. You can click on edit to add new ratecards to the Call Plan"
+msgstr "Lista Piani di Chiamata, un Piano di Chiamata &egrave un insieme di tariffe. Clicca su modifica per aggiungere una nuova tariffa a un Piano di Chiamata."
+
+#: lib/admin.help.php:116
+msgid "A Call Plan is a collection of ratecards."
+msgstr "Un Piano di Chiamata &egrave un insieme di tariffe."
+
+#: lib/admin.help.php:117
+msgid "The system will choose the most appropriate rate according to the Call Plan settings (LCR or LCD).<br/>"
+msgstr "Il sistema sceglier&agrave la tariffa pi&ugrave appropriata secondo il Piano di Chiamata (MCR o MCC.<br/>"
+
+#: lib/admin.help.php:118
+msgid "LCR : Least Cost Routing - Find the trunk with the cheapest carrier cost. (buying rate).<br>"
+msgstr "MCR : Minimo Costo di Routing - Trova il fascio del fornitore con meno costo. (tariffa d'acquisto).<br>"
+
+#: lib/admin.help.php:119
+msgid "LCD : Least Cost Dialing - Find the trunk with the cheapest retail rate (selling rate)."
+msgstr "MCC : Minimo Costo di Chiamata - Trova il fascio con tariffe di vendita meno costose (tariffa di vendita)."
+
+#: lib/admin.help.php:121
+msgid "List ratecards that have been created!<br>Ensure that a ratecard is added into the call plan under 'Call Plan'"
+msgstr "Lista tariffe che sono state create!<br>Assicurati che la tariffa venga aggiunta nel Piano di Chiamata sotto 'Piani di Chiamata'"
+
+#: lib/admin.help.php:123
+msgid "A ratecard is a set of rates defined and applied according to the dialling prefix, for instance 441 & 442 : UK Landline."
+msgstr "Una Scheda Tariffe &egrave un set di tariffe definite ed applicate secondo il prefisso chiamato, per esempio 0039 : ITALY Landline."
+
+#: lib/admin.help.php:124
+msgid "Each ratecard may have as many rates as you wish, however, if a dialling prefix cannot be matched when a call is made, then the call will be terminated."
+msgstr "Ogni scheda tariffe pu&ograve avere quante tariffe vuoi, comunque, se il prefisso chiamato non pu&ograve essere abbinato ad alcuna tariffa, la chiamata non sar&agrave effettuata."
+
+#: lib/admin.help.php:125
+msgid "A ratecard has a \"start date\", an \"expiry date\" and a you can define a default trunk, but if no trunk is defined, the ratecard default trunk will be used."
+msgstr "Una scheda tariffe ha una \"data inizio\", una \"data scadenza\" e puoi definire un fascio da usare, ma se il fascio non &egrave definito, sar&agrave usato il fascio di default della scheda tariffe."
+
+#: lib/admin.help.php:127
+msgid "Please select a ratecard and click on search to browse the different rates/dialing prefix of the selected ratecard."
+msgstr "Selezionare Una Scheda Tariffe e cliccare sul tasto 'Search' per visualizzare, modificare, aggiungere od eliminare le differenti tariffe/prefissi."
+
+#: lib/admin.help.php:129
+msgid "Please select an account, then enter the number you wish to call and press the \"SIMULATE\" button."
+msgstr "Selezionare un account, inserire il numero di telefono e cliccare sul tasto \"SIMULA\"."
+
+#: lib/admin.help.php:131
+msgid "Please fill in the fields below to set up the rate for each destination."
+msgstr "Compilare il campi seguenti per settare una tariffa per ogni destinazione."
+
+#: lib/admin.help.php:133
+msgid "This section is a utility to import ratecards from a CSV file."
+msgstr "Questa selezione &egrave un'utility per importare la scheda tariffe da un file CSV."
+
+#: lib/admin.help.php:134
+msgid "Define the ratecard name, the trunk to use and the fields that you wish to include from your csv files. Finally, select the csv files and click on the \"Import Ratecard\" button."
+msgstr "Scegli il nome della scheda tariffe, il fascio da usare e i campi addizionali che vuoi includere dal tuo file csv. Infine seleziona il file csv e clicca sul tasto \"Importa Scheda Tariffe\"."
+
+#: lib/admin.help.php:136
+msgid "This section is a utility to import Phonebooks from a CSV file."
+msgstr "Questa selezione &egrave un'utility per importare una Rubrica da un file CSV."
+
+#: lib/admin.help.php:137
+msgid "Define the phonebook name, the user to use and the fields that you wish to include from your csv files. Finally, select the csv files and click on the \"Import Phonebook\" button."
+msgstr "Scegli il nome della rubrica, l'utente da usare e i campi addizionali che vuoi includere dal tuo file csv. Infine seleziona il file csv e clicca sul tasto \"Importa Rubrica\"."
+
+#: lib/admin.help.php:139
+msgid "This is the second step of the import ratecard! <br>"
+msgstr "Questo &egrave il secondo passaggio dell'importazione della scheda tariffe! <br>"
+
+#: lib/admin.help.php:140
+msgid "The first line of your csv files has been read and the values are displayed below according to the fields"
+msgstr "La prima riga del tuo file csv &egrave stata letta ed i valori sono visualizzati sotto, secondo i campi che"
+
+#: lib/admin.help.php:141
+msgid " you decided to import on the ratecard! You can check the values and if there are correct,"
+msgstr " hai deciso di importare nella scheda tariffe! Controlla i valori, e se sono corretti,"
+
+#: lib/admin.help.php:142
+msgid " please select the same file and click on \"Continue to Import the Ratecard\" button..."
+msgstr " clicca sul tasto \"Continua Importazione Scheda Tariffe\"..."
+
+#: lib/admin.help.php:144
+msgid "Ratecard comfirmation page. <br>"
+msgstr "Risultato importazione Scheda Tariffe: <br>"
+
+#: lib/admin.help.php:145
+msgid "Import results, how many new rates have been imported, and the line numbers of the CSV files that generated errors."
+msgstr "quante nuove tariffe sono state importate, eventuali numeri di riga del file CSV che hanno generato errori, "
+
+#: lib/admin.help.php:147
+msgid "Trunk List."
+msgstr "Lista Fasci."
+
+#: lib/admin.help.php:147
+msgid "Trunks can be modified by clicking the edit button"
+msgstr "I Fasci possono essere modificati cliccando sul tasto 'modifica'"
+
+#: lib/admin.help.php:149
+msgid "Trunks are used to terminate the call!<br>"
+msgstr "I Fasci sono usati per effettuare la chiamata !<br>"
+
+#: lib/admin.help.php:150
+msgid "The trunk and ratecard is selected by the rating engine on the basis of the dialed digits."
+msgstr "Trunk e schede tariffe sono selezionati dal motore di valutazione in base al numero chiamato."
+
+#: lib/admin.help.php:151
+msgid "The trunk is used to dial out from your asterisk box which can be a zaptel interface or a voip provider."
+msgstr "Il fascio &egrave usato per chiamare dal tuo Asterisk sia con un canale Zaptel, sia con un fornitore VoIP."
+
+#: lib/admin.help.php:153
+msgid "Administrators - this shows a list of all the Administrators who have access to the Administrator interface."
+msgstr "Amministratori - Questa pagina mostra la lista degli amministratori ai quali hai accesso dall'interfaccia Amministratore."
+
+#: lib/admin.help.php:155
+msgid "The system log helps you track all events on your application. Log levels are the Importance Levels for the events - 1 is lowest level and 3 is highest level. 1 is used for Login, Logout and Page Visit. 2 is used for Add, Import, Export. 3 is for Update and Delete."
+msgstr "Attivit&agrave amministratori - Il sistema dei log ti aiuta a tenere traccia degli eventi della piattaforma. I 'Livello Log' sono Livelli di Importanza per gli eventi: 1 &egrave un livello basso e 3 un livello alto. 1 &egrave usato per Accesso, Uscita e Pagine Visitate. 2 &egrave usato per Inserimenti, Importazioni, Esportazioni. 3 &egrave per Aggiornamento e Cancellazione."
+
+#: lib/admin.help.php:157
+msgid "Status logs help you to keep track of the status of all customers. The status can be New, Active, Cancelled, Reserved, Waiting-MailConfirmation and Expired."
+msgstr "Stato - Il sistema dei log ti aiuta a tenere traccia degli stati di tutti gli utenti. Lo stato pu&ograve essere Nuovo, Attivo, Cancellato, Prenotato, In Attesa della Conferma Email e Scaduto"
+
+#: lib/admin.help.php:159
+msgid "Add administrator."
+msgstr "Aggiungi amministratore"
+
+#: lib/admin.help.php:161
+msgid "Listed below are the vouchers created on the system,.<br/>"
+msgstr "Lista Coupons - Ci sono Coupons creati nel sistema.<br/>"
+
+#: lib/admin.help.php:162
+msgid "Each row corresponds to a voucher and shows it's status, value and currency.."
+msgstr "Ogni riga corrisponde ad un coupon e mostra lo stato, il valore e la valuta..."
+
+#: lib/admin.help.php:163
+msgid "Create a single voucher, defining such properties as credit, tag, currency etc, click confirm when finished. <br/> The customer applies voucher credits to their account via the customer interface or via an IVR menu."
+msgstr "Per creare un singolo coupon, definisci le propriet&agrave come importo, tag, valuta, ecc., clicca su 'Conferma Dati' quando finito.<br> L'utente applicher&agrave l'importo del coupon al proprio account dalla interfaccia utente o tramite un men&ugrave IVR."
+
+#: lib/admin.help.php:165
+msgid "Bulk generate a batch of vouchers, defining such properties as credit and currency etc, click Generate Vouchers when finished.<br/>The customer applies voucher credit to their account via the customer interface."
+msgstr "Genera Coupon - Per generare un lotto di coupons, definisci le propriet&agrave come importo, tag, valuta, ecc., clicca su 'Genera Coup' quando finito.<br> L'utente applicher&agrave l'importo del coupon al proprio account dalla interfaccia utente."
+
+#: lib/admin.help.php:167
+msgid "Recurring services that decrement an account at timed intervals."
+msgstr "I servizi ricorrenti decrementano un account a intervalli di tempo."
+
+#: lib/admin.help.php:169
+msgid "Auto Refill report."
+msgstr "Rapporto Auto Ricarica."
+
+#: lib/admin.help.php:171
+msgid "Utility to apply a scheduled action on the account.<br>"
+msgstr "Utility per applicare un'azione pianificata su un account.<br>"
+
+#: lib/admin.help.php:172
+msgid "For example if you want to remove 10 cents everyday on each single account, it can be defined here, alternatively, if you now want to remove 1 credit every week but only 7 times on each account, the different rules/parameters below will define this."
+msgstr "Per esempio se vuoi detrarre 10 centesimi ogni giorno ad ogni singolo account, puoi definirlo qui, in alternativa, se voui ora detrarre 1 credito ogni settimana ma solo cinque volte per ogni account, le seguenti regole/parametri definiranno ci&ograve."
+
+#: lib/admin.help.php:174
+msgid "CID Group list. CID can be chosen by customers through the customer interface."
+msgstr "Lista Gruppi CID. Il CID pu&ograve essere scelto dall'utente attraverso l'interfaccia utente."
+
+#: lib/admin.help.php:176
+msgid "Outbound CID list. CID can be added by customers through the customer interface."
+msgstr "Lista CID in uscita. Il CID pu&ograve essere aggiunto dall'utente attraverso l'interfaccia utente."
+
+#: lib/admin.help.php:178
+msgid "CID group offers customers a group of CID numbers which can be selected for a ratecard for outgoing calls."
+msgstr "Il gruppo CID offre agli utenti un gruppo di numeri CID che possono essere usati con una scheda tariffe per le chiamate in uscita."
+
+#: lib/admin.help.php:180
+msgid "Outbound CID offers customers a number which will be selected randomly for a ratecard for outgoing calls"
+msgstr "I CID in uscita offrono agli utenti un numero che pu&ograve cambiare in modo casuale da usare con una scheda tariffe per le chiamate in uscita."
+
+#: lib/admin.help.php:182
+msgid "Currency data is automatically updated from Yahoo Financial."
+msgstr "I dati della valuta sono automaticamente aggiornati da Yahoo Financial"
+
+#: lib/admin.help.php:183
+msgid "For more information please visit the website http://finance.yahoo.com."
+msgstr "Per maggiori informazioni visitare il sito internet http://finance.yahoo.com."
+
+#: lib/admin.help.php:184
+msgid "The list below is based on your currency :"
+msgstr "La seguente lista &egrave basata sulla tua valuta :"
+
+#: lib/admin.help.php:186
+msgid "DID (or DDI) Group list. DID can be chosen by customers through the customer interface."
+msgstr "Lista Gruppi DID. Il DID pu&ograve essere scelto dall'utente attraverso l'interfaccia utente"
+
+#: lib/admin.help.php:188
+msgid "DID group offers customers a group of DID numbers which can be selected by the customer"
+msgstr "Il Gruppo DID offre all'utente un gruppo di numeri DID che pu&ograve essere selezionato dall'utente"
+
+#: lib/admin.help.php:190
+msgid "DID number list with destinations."
+msgstr "Lista dei numeri DID con i destinatari."
+
+#: lib/admin.help.php:192
+msgid "DID can be assigned to a customer to re-route calls to a SIP/IAX client or a PSTN number. The Priority sets the order in which the calls are to be routed to allow for failover or follow-me."
+msgstr "I DID possono essere assegnati ad un utente per girare le chiamata a un client SIP/IAX o a un numero PSTN. La priorit&agrave imposta l'ordine con cui le chiamate sono indirizzate, per consentire il 'Fallita' o 'Seguimi'. "
+
+#: lib/admin.help.php:194
+msgid "You can import lists of DIDs using a CSV file."
+msgstr "Puoi importare la lista dei DID usando un file CSV."
+
+#: lib/admin.help.php:196
+msgid "List the DIDs currently in use with the customer id and their destination number. <br/> You can use the search option to show the usage of a given DID or all DIDs."
+msgstr "Lista dei DID correntemente in uso con l'ID Scheda e il loro numero di destinazione. <br> Puoi usare l'opzione 'Search' per visualizzare l'uso di un dato DID o di tutti i DIDs."
+
+#: lib/admin.help.php:198
+msgid "Releasing DID put it in free stat and the user will not be monthly charged any more..."
+msgstr "Il rilascio di un DID lo mette in stato di libero e l'utente non avr&agrave pi&ugrave l'addebito mensile..."
+
+#: lib/admin.help.php:200
+msgid "Extra charges allow the billing of one-off or re-occurring monthly charges. These may be used as setup or service charges, etc..."
+msgstr "L'addebito extra permette la fatturazione una tantum o l'addebito mensile ricorrente. Pu&ograve essere utilizzato per oneri di installazione o di un servizio, ecc .."
+
+#: lib/admin.help.php:201
+msgid "Charges will appear to the user with the description you attach. Each charge that you create for a user will decrement his account."
+msgstr " L'addebito appare all'utente con la descrizione che inserisci di seguito. Ogni addebito creato per un utente ne decrementer&agrave il relativo l'account"
+
+#: lib/admin.help.php:203
+msgid "DID list and billing list."
+msgstr "Lista dei DID e lista fatturazioni."
+
+#: lib/admin.help.php:204
+msgid "You will see which customers have used your DIDs in past months and the traffic (amount of seconds)."
+msgstr "Puoi vedere quali utenti hanno usato i loro DIDs nel mese passato ed il traffico (totale dei secondi)."
+
+#: lib/admin.help.php:206
+msgid "Configure the mail template below."
+msgstr "Configura moduli email."
+
+#: lib/admin.help.php:207
+msgid "A Reminder email can be sent (see a2billing.conf) to customers having low credit, a confirmation mail can be sent to customers after their signup, etc..."
+msgstr "Un promemoria via email pu&ograve essere inviato (vedere a2billing.conf) ad un utente con poco credito, ad uno come conferma dopo la sua iscrizione, ecc..."
+
+#: lib/admin.help.php:209
+msgid "This section will allow you to create and edit campaigns. A campaign will be attached to a user in order to let him use the predictive dialler option. Predictive dialler will browse all the phone numbers from the campaign and perform outgoing calls."
+msgstr "Questa sezione ti permette di creare e modificare le campagne. Una campagna sar&agrave abbinata ad un utente in modo che possa usare l'opzione di chiamata prestabilita. La chiamata prestabilita, analizzer&agrave tutti i numeri della campagna ed effettuer&agrave la chiamata."
+
+#: lib/admin.help.php:211
+msgid "This section will allow you to create and edit campaign configs."
+msgstr "Questa sezione ti permette di creare ed editare la configurazione di una campagna."
+
+#: lib/admin.help.php:213
+msgid "Phone Number - here you will find a list of all the phone numbers attached to a campaign. You can add, remove and edit the phone numbers."
+msgstr "Nuumero di Telefono - Qui trovi una lista di tutti i numeri inseriti in una campagna. Puoi aggiungerli, rimuoverli o modificarli."
+
+#: lib/admin.help.php:215
+msgid "A Phonebook is a set of phone numbers. You can add, remove and edit the phonebook. You can also associate phonebooks to a campaign in the Campaign section."
+msgstr "La Rubrica è un elenco di numeri telefonici. Puoi aggiungerli, rimuoverli o modificarli. Puoi anche associarli ad una campagna nella relativa sezione."
+
+#: lib/admin.help.php:217
+msgid "This section will allow you to create and edit VOIP Providers for reporting purposes. "
+msgstr "Questa sezione ti permette di creare e modificare i Fornitori VOIP a scopo di segnalazione. "
+
+#: lib/admin.help.php:218
+msgid "A provider is the company/person that provides you with termination."
+msgstr "Un fornitore &egrave una societ&agrave/persona che ti fornisce il traffico di terminazione."
+
+#: lib/admin.help.php:220
+msgid "This section will allow you to restore or download an existing database backup. The restore process will delete the existing database and import the new one. You can also upload a database backup that you previously downloaded (make sure to use the same file format)."
+msgstr "Questa sezione ti permette di ripristinare o scaricare un backup esistente. Il processo di ripristino canceller&agrave l'attuale database ed importer&agrave il nuovo. Puoi anche caricare un precedente backup preventivamente scaricato (assicurati di usare lo stesso formato file)."
+
+#: lib/admin.help.php:222
+msgid "This section will allow you to backup an existing database context. The Backup process will export the whole database, so you can restore it later..."
+msgstr "Questa sezione ti permette di salvare un esistente database context. Il processo di backup esporter&agrave l'intero database, ripristinabile in seguito..."
+
+#: lib/admin.help.php:224
+msgid "This section will allow you to define the E-Commerce Production Setting."
+msgstr "Questa sezione ti permette di definire le impostazioni per l'E-Commerce."
+
+#: lib/admin.help.php:225
+msgid "This will be used by E-Commerce API to find out how we want the new account to be created."
+msgstr "Questa sar&agrave usata dalle API dell'E-Commerce per trovare come vogliamo che il nuovo account sia creato."
+
+#: lib/admin.help.php:227
+msgid "This section allows you to define the Speed dials for the customer."
+msgstr "Questa sezione permette di definire i Numeri Brevi per l'utente."
+
+#: lib/admin.help.php:228
+msgid "A Speed Dial will be entered on the IVR in order to make a shortcut to their preferred dialled phone number."
+msgstr "Un NUmero Breve sar&agrave inserito nell'IVR in modo da creare una scorciatoia per i numeri chiamati di frequente."
+
+#: lib/admin.help.php:230
+msgid "Prefix list with destinations."
+msgstr "Lista dei prefissi con destinazione."
+
+#: lib/admin.help.php:232
+msgid "Prefixe can be assigned to a Ratecard"
+msgstr "Un prefisso pu&ograve essere assegnato ad una scheda tariffe."
+
+#: lib/admin.help.php:234
+msgid "Utility to apply a scheduled monitor on trunks.<br>"
+msgstr "Utility che applica un monitoraggio previsto al fascio.<br>"
+
+#: lib/admin.help.php:235
+msgid "For example if you want to monitor ASR (answer seize ratio) or ALOC (average length of call) everyday on each single trunk, it can be defined here, the different parameters below will define the rules to apply the alarm."
+msgstr "Per esempio se vuoi monitorare RCR (rapporto chiamate risposte) o TMDC (tempo medio di chiamata) ogni giorno per ogni singolo fascio, puoi definirlo qui, i differenti parametri seguenti definiranno le regole da applicare all'allarme."
+
+#: lib/admin.help.php:237
+msgid "Alarms that monitors trunks at timed intervals."
+msgstr "Allarme che monitorizza i fasci ad intervalli di tempo."
+
+#: lib/admin.help.php:239
+msgid "IVR Monitoring, an extension should be configured for the admin to call and monitor through an IVR some important data from your system."
+msgstr "L'IVR Monitoring, un'estensione per permettere all'amministratore di chiamare e monitorare attraverso un IVR alcune importanti dati del sistema."
+
+#: lib/admin.help.php:241
+msgid "Browse your server log files."
+msgstr "Visualizza il file di log del server."
+
+#: lib/admin.help.php:242
+msgid "This tool can be used to extract and present information from various logfiles."
+msgstr "Questo strumento pu&ograve essere usato per estrarre e vedere informazioni di svariati file di log."
+
+#: lib/admin.help.php:244
+msgid ""
+"Callback will offer you an easy way to connect any phone to our Asterisk platform.\n"
+"Browse here the pending and completed callbacks. You will see that different parameters determine the callback, the way to reach the user, the time when we need to call him, the result of the last attempts, etc..."
+msgstr ""
+"Il Callback offre una facile strada per connettere qualsiasi telefono alla piattaforma Asterisk.\n"
+"Visualizza qui le chiamate callback sospese e completate. Vedrete i diversi parametri che determinano il callback, la strada per raggiungere l'utente, il momento in cui ne abbiamo avuto bisogno, il risultato degli ultimi tentativi, ecc..."
+
+#: lib/admin.help.php:247
+msgid "PACKAGES SYSTEM - FREE MINUTES, etc..."
+msgstr "SISTEMA A PACCHETTI - MINUTI GRATUITI, etc..."
+
+#: lib/admin.help.php:249
+msgid "SUBSCRIPTION FEE - You can bill the user  in a monthly, weekly or any time period for being subscribed on your service. The fee amount is defined here and the period through the cront configuration."
+msgstr "SOTTOSCRIZIONE CANONE - Puoi fatturare all'utente mensilmente, settimanalmente o periodicamente , per la sottoscrizione al servizio. L'importo del canone &egrave definito qui ed il periodo attraverso la configurazione del servizio ricorsivo."
+
+#: lib/admin.help.php:251
+msgid "SUBSCRIBER - You can make customers subscribe for any subscription and for a certain time."
+msgstr "ABBONATO - Puoi abbonare un utente per ogni sottoscrizione e per un determinato periodo."
+
+#: lib/admin.help.php:253
+msgid "SIGNUP SUBSCRIBER - You can make create a list of subscribers that the customers can subscribe."
+msgstr "SOTTOSCRIZIONE ABBONAMENTO - Puoi creare una lista di abbonamenti che gli utenti possono sottoscrivere."
+
+#: lib/admin.help.php:255
+msgid "Servers are used by the callback system through the asterisk manager in order to initiate the callback and outbound calls for your customers. You can add/modify the callback server to be used here. The AGI and callback modes need to be installed on those machines."
+msgstr "I servers sono usati dal sistema callback attraverso il amnager asterisk in modo da iniziare il callback e la chiamata in uscita per gli utenti. Puoi aggiungere/modificare il server callback da usare qui. Le AGI e le modalit&agrave di callback devono essere installati in quelle macchine"
+
+#: lib/admin.help.php:257
+msgid "Server Groups define the set of servers that are going to be used by the callback system. A callback is bound to a server group which will be used to dispatch the callback requests."
+msgstr "I Gruppi di Server definiscono un insieme di servers che sono usati dal sistema callback. Una callback &egrave legato a un gruppo di server che saranno usati per inviare le richieste di callback."
+
+#: lib/admin.help.php:259
+msgid "You can view all the transactions through the different epayment configured systems (Paypal, MoneyBookers, etc...). "
+msgstr "Puoi vedere tutte le transazioni effettuate attraverso i differenti sistemi di epayment configurati (Paypal, MoneyBookers, etc...)."
+
+#: lib/admin.help.php:261
+msgid "You can configure your epayment method here. It helps you to enable or disable the payment method. You can define the currency settings."
+msgstr "Puoi configurare i tui epayment qui. Puoi abilitare o disabilitare il metodo di pagamento. Puoi definire le impostazioni di valuta."
+
+#: lib/admin.help.php:263
+msgid "Epayment methods help you to collect payments from your customers."
+msgstr "I metodi di epayment ti aiutano a raccogliere i pagamenti dai tuoi utenti."
+
+#: lib/admin.help.php:265
+msgid "This action will generate agi-conf2 as a global configuration along with a list of all configurations."
+msgstr "Questa azione generer&agrave agi-conf2 come una configurazione globale con la lista di tutte le configurazioni."
+
+#: lib/admin.help.php:267
+msgid "Here is a list of all configuration groups. You can pick one and see its members."
+msgstr "Qui c'&egrave una lista di tutte le configurazioni dei gruppi. Puoi sceglierne uno e vedere i suoi membri."
+
+#: lib/admin.help.php:269
+msgid "Here you can see and edit the different A2Billing settings."
+msgstr "Qui puoi vedere e configurare le differenti impostazioni di A2Billing."
+
+#: lib/admin.help.php:271
+msgid "Payment log with status, payment methods , owner and creation date."
+msgstr "Log dei pagamenti con lo stato, metodo di pagamento, proprietario e data di creazione."
+
+#: lib/admin.help.php:273
+msgid "Here you can email a message to all of your users. To do this, an email will be sent out to the administrative email address supplied, with a blind carbon copy sent to all recipients. If you are emailing a large group of people please be patient after submitting and do not stop the page halfway through. It is normal for a mass emailing to take a long time and you will be notified when the script has completed."
+msgstr "Qui puoi inviare un messaggio a tutti i tuoi utenti. Per fare ci&ograve, una email sar&agrave inviata con l'indirizzo dell'amministratore fornito, inviato a tutti i destinatari con carta carbone nascosta. Se stai inviando ad un gran numero di persone, sii paziente e non fermare la pagina prima che sia completata. &Egrave normale per una email di massa un tempo lungo per la spedizione, ti sar&agrave notificato quando lo script avr&agrave finito."
+
+#: lib/admin.help.php:275
+msgid "You can see here, all tickets created. You can also add a new ticket for one customer."
+msgstr "Puoi vedere qui, tutti i ticket creati. Puoi anche aggiungerne uno nuovo per un utente."
+
+#: lib/admin.help.php:277
+msgid "You can see here, all tickets created by Agents. You can also add a new ticket for one Agent."
+msgstr "Puoi vedere qui, tutti i ticket creati dagli Agenti. Puoi anche aggiungerne uno nuovo per un Agente."
+
+#: lib/admin.help.php:279
+msgid "Here you can see all components which you use to handle the support task. You can use components to categorise the subject of the ticket. i.e : Tarification, Payment"
+msgstr "Qui puoi vedere tutti i componenti che si utilizzano per gestire l'attivit&agrave di supporto. Puoi usare i componenti per categorizzare il soggetti dei ticket. Es.: Tariffazione, Pagamento"
+
+#: lib/admin.help.php:281
+msgid "You can see here the Support Box, you need at least one support box to start support activity."
+msgstr "Qui puoi vedere i quadri dei supporti, devi averne almeno uno per avviare l'attivit&agrave di supporto."
+
+#: lib/admin.help.php:283
+msgid "Here you can archive the data. The Default listing will show you the previous 3 months data. But you can also search the data and archive it."
+msgstr "Qui puoi archiviare i dati. La lista di defaul visualizzer&agrave i precedenti 3 mesi di dati. Ma si possono anche cercare i dati ed archiviarli."
+
+#: lib/admin.help.php:285
+msgid "Agents - this shows a list of all of the Agents who have access to the Agent interface"
+msgstr "Agenti - Visualizza una lista di tutti gli Agenti che hanno accesso alll'interfaccia degli Agenti"
+
+#: lib/admin.help.php:287
+msgid "This shows a list of all signup key create for the Agents, this key is used to identify the default paramater for the subscription on the signup page"
+msgstr "Questo visualizza una lista di tutte le key di iscrizione create per l'Agente, questa key &egrave usata per identificare i parametri di default per la sottoscrizione nella pagina di iscrizione"
+
+#: lib/Class.SOAP-function.php:851
+#: lib/Form/Class.FormBO.php:287
+#: Public/A2B_entity_card_multi.php:145
+msgid "CREATION CARD REFILL"
+msgstr "CREAZIONE RICARICA SCHEDA"
+
+#: lib/common.defines.php:90
+msgid "Address line 1:"
+msgstr "Indirizzo linea 1:"
+
+#: lib/common.defines.php:91
+msgid "Address line 2:"
+msgstr "Indirizzo linea 2:"
+
+#: lib/common.defines.php:92
+msgid "Address line 3:"
+msgstr "Indirizzo linea 3:"
+
+#: lib/common.defines.php:93
+msgid "Postcode:"
+msgstr "Codice Postale"
+
+#: lib/common.defines.php:94
+msgid "Country:"
+msgstr "Nazione"
+
+#: lib/common.defines.php:95
+msgid "Telephone:"
+msgstr "Telefono"
+
+#: lib/common.defines.php:126
+msgid "This software has been created by Areski under AGPL licence. For futher information, feel free to contact me:"
+msgstr "Questo software &egrave stato creato da Aresky sotto la licenza AGPL. Per ulteriori informazioni, contattami: "
+
+#: lib/common.defines.php:132
+msgid "A2Billing Portal"
+msgstr "Portale VoIP"
+
+#: lib/Form/Class.ViewHandler.inc.php:72
+msgid "Archiving All "
+msgstr "Archivia Tutto "
+
+#: lib/Form/Class.ViewHandler.inc.php:86
+msgid "Sort"
+msgstr "Ordinamento"
+
+#: lib/Form/Class.ViewHandler.inc.php:106
+msgid "Records"
+msgstr "Records"
+
+#: lib/Form/Class.ViewHandler.inc.php:136
+msgid "FILTER ON "
+msgstr "FILTRA"
+
+#: lib/Form/Class.ViewHandler.inc.php:153
+msgid "FILTER ON"
+msgstr "FILTRER PAR"
+
+#: lib/Form/Class.ViewHandler.inc.php:166
+msgid "APPLY FILTER "
+msgstr "APPLICA FILTRO"
+
+#: lib/Form/Class.ViewHandler.inc.php:196
+#: Public/A2B_entity_phonenumber.php:299
+#: Public/form_data/FG_var_log_viewer.inc:82
+#: Public/A2B_log_activity_info.php:101
+msgid "ACTION"
+msgstr "AZIONE"
+
+#: lib/Form/Class.ViewHandler.inc.php:796
+msgid "DISPLAY"
+msgstr "VISUALIZZA"
+
+#: lib/Form/Class.ViewHandler.inc.php:825
+msgid "GO"
+msgstr "VAI"
+
+#: lib/Form/Class.ViewHandler.inc.php:829
+#: Public/call-log-customers.php:1373
+#: Public/call-dnid.php:950
+msgid "Export CSV"
+msgstr "Exporta CSV"
+
+#: lib/Form/Class.ViewHandler.inc.php:833
+#: Public/call-log-customers.php:1375
+#: Public/call-dnid.php:952
+msgid "Export XML"
+msgstr "Exporta XML"
+
+#: lib/Form/Class.FormHandler.EditForm.inc.php:223
+#: lib/Form/Class.FormHandler.EditForm.inc.php:399
+#: lib/Form/Class.FormHandler.EditForm.inc.php:780
+#: lib/Form/Class.FormHandler.DelForm.inc.php:161
+#: lib/Form/Class.FormHandler.AddForm.inc.php:158
+#: Public/call-log-customers.php:1113
+#: Public/call-count-reporting.php:422
+#: Public/card-history.php:315
+#: Public/A2B_detail_package.php:511
+#: Public/call-dnid.php:767
+msgid "No data found !!!"
+msgstr "Nessun dato trovato !!!"
+
+#: lib/Form/Class.FormHandler.EditForm.inc.php:282
+msgid "LIST "
+msgstr "LISTA"
+
+#: lib/Form/Class.FormHandler.EditForm.inc.php:333
+#: lib/interface/constants.php:64
+#: Public/A2B_entity_card.php:395
+#: Public/A2B_data_archiving.php:131
+#: Public/A2B_call_archiving.php:66
+#: Public/A2B_entity_card_multi.php:342
+msgid "No"
+msgstr "Non"
+
+#: lib/Form/Class.FormHandler.EditForm.inc.php:353
+#: lib/Form/Class.FormHandler.EditForm.inc.php:509
+#: lib/Form/Class.FormHandler.EditForm.inc.php:632
+msgid "Add a new"
+msgstr "Aggiungi una nuova"
+
+#: lib/Form/Class.FormHandler.EditForm.inc.php:440
+#: lib/Form/Class.FormHandler.EditForm.inc.php:567
+msgid "LIST"
+msgstr "LISTA"
+
+#: lib/Form/Class.FormBO.php:20
+msgid "This did is in use by customer id:"
+msgstr "Il DID &egrave usato dall'id utente:"
+
+#: lib/Form/Class.FormBO.php:318
+msgid "DELETION CARD REFILL"
+msgstr "CANCELLAZIONE RICARICA SCHEDA"
+
+#: lib/Form/Class.FormBO.php:337
+msgid "CORRECT COMMISSION AFTER CARD DELETED!"
+msgstr "CORREGGI LE COMMISSIONI DOPO LA CANCELLAZIONE DELLA SCHEDA!"
+
+#: lib/Form/Class.FormBO.php:363
+msgid "CREATION AGENT REFILL"
+msgstr "CREAZIONE RICARICA AGENTE"
+
+#: lib/Form/Class.FormBO.php:433
+msgid "SUBSCRIPTION INVOICE REMINDER"
+msgstr "SOTTOSCRIZIONE PROMEMORIA FATTURA"
+
+#: lib/Form/Class.FormBO.php:695
+msgid "SUMMARY OF CALLS"
+msgstr "SOMMARIO CHIAMATE"
+
+#: lib/Form/Class.FormBO.php:696
+msgid "Summary of the calls charged since the last billing."
+msgstr "Sommario delle chiamate addebitate dopo l'ultima fattura."
+
+#: lib/Form/Class.FormBO.php:713
+msgid "SUMMARY OF CHARGE"
+msgstr "TOTALE ADDEBITI"
+
+#: lib/Form/Class.FormBO.php:715
+msgid "Summary of the charge charged since the last billing."
+msgstr "Sommario degli addebiti fatti dall'ultima fattura."
+
+#: lib/Form/Class.FormBO.php:721
+#: lib/Form/Class.FormBO.php:751
+msgid "CHARGE :"
+msgstr "ADDEBITO :"
+
+#: lib/Form/Class.FormBO.php:740
+msgid "BILLING CHARGES"
+msgstr "FATTURE ADDEBITI"
+
+#: lib/Form/Class.FormBO.php:741
+msgid "This invoice is for some charges unpaid since the last billing."
+msgstr "Questa fattura &egrave per alcuni addebiti non pagati dall'utlima fatturazione."
+
+#: lib/Form/Class.FormBO.php:773
+msgid "BILLING POSTPAID"
+msgstr "FATTURA POSTPAGATA"
+
+#: lib/Form/Class.FormBO.php:774
+msgid "Invoice for POSTPAID"
+msgstr "Fattura POSTPAGATA"
+
+#: lib/Form/Class.FormBO.php:836
+#: lib/Form/Class.FormBO.php:838
+#: lib/Form/Class.FormBO.php:945
+#: lib/Form/Class.FormBO.php:947
+#: Public/form_data/FG_var_payment.inc:63
+#: Public/form_data/FG_var_payment_agent.inc:65
+msgid "REFILL"
+msgstr "RICARICA"
+
+#: lib/Form/Class.FormBO.php:840
+#: lib/Form/Class.FormBO.php:949
+msgid "Invoice for refill"
+msgstr "Fattura di ricarica"
+
+#: lib/Form/Class.FormBO.php:996
+msgid "AUTOMATICALY GENERATED COMMISSION!"
+msgstr "COMMISSIONI GENERATE AUTOMATICAMENTE"
+
+#: lib/Form/Class.SearchHandler.inc.php:24
+#: lib/Form/Class.SearchHandler.inc.php:100
+msgid "From :"
+msgstr "Da :"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:195
+#: Public/call-comp.php:266
+#: Public/call-last-month.php:97
+#: Public/call-log-customers.php:474
+#: Public/A2B_entity_paymentlog.php:90
+#: Public/call-count-reporting.php:177
+#: Public/A2B_call_archiving.php:246
+#: Public/A2B_entity_log_viewer.php:104
+#: Public/A2B_entity_statuslog.php:106
+#: Public/A2B_detail_package.php:264
+#: Public/call-dnid.php:412
+#: Public/A2B_trunk_report.php:182
+#: Public/call-daily-load.php:260
+#: Public/call-pnl-report.php:191
+#: Public/A2B_entity_paymentlog_agent.php:92
+msgid "January"
+msgstr "Gennaio"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:196
+#: Public/call-comp.php:266
+#: Public/call-last-month.php:97
+#: Public/call-log-customers.php:474
+#: Public/A2B_entity_paymentlog.php:90
+#: Public/call-count-reporting.php:177
+#: Public/A2B_call_archiving.php:246
+#: Public/A2B_entity_log_viewer.php:104
+#: Public/A2B_entity_statuslog.php:106
+#: Public/A2B_detail_package.php:264
+#: Public/call-dnid.php:412
+#: Public/A2B_trunk_report.php:182
+#: Public/call-daily-load.php:260
+#: Public/call-pnl-report.php:191
+#: Public/A2B_entity_paymentlog_agent.php:92
+msgid "February"
+msgstr "Febbraio"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:197
+#: Public/call-comp.php:266
+#: Public/call-last-month.php:97
+#: Public/call-log-customers.php:474
+#: Public/A2B_entity_paymentlog.php:90
+#: Public/call-count-reporting.php:177
+#: Public/A2B_call_archiving.php:246
+#: Public/A2B_entity_log_viewer.php:104
+#: Public/A2B_entity_statuslog.php:106
+#: Public/A2B_detail_package.php:264
+#: Public/call-dnid.php:412
+#: Public/A2B_trunk_report.php:182
+#: Public/call-daily-load.php:260
+#: Public/call-pnl-report.php:191
+#: Public/A2B_entity_paymentlog_agent.php:92
+msgid "March"
+msgstr "Marzo"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:198
+#: Public/call-comp.php:266
+#: Public/call-last-month.php:97
+#: Public/call-log-customers.php:474
+#: Public/A2B_entity_paymentlog.php:90
+#: Public/call-count-reporting.php:177
+#: Public/A2B_call_archiving.php:246
+#: Public/A2B_entity_log_viewer.php:104
+#: Public/A2B_entity_statuslog.php:106
+#: Public/A2B_detail_package.php:264
+#: Public/call-dnid.php:412
+#: Public/A2B_trunk_report.php:182
+#: Public/call-daily-load.php:260
+#: Public/call-pnl-report.php:191
+#: Public/A2B_entity_paymentlog_agent.php:92
+msgid "April"
+msgstr "Aprile"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:199
+#: Public/call-comp.php:266
+#: Public/call-last-month.php:97
+#: Public/call-log-customers.php:474
+#: Public/A2B_entity_paymentlog.php:90
+#: Public/call-count-reporting.php:177
+#: Public/A2B_call_archiving.php:246
+#: Public/A2B_entity_log_viewer.php:104
+#: Public/A2B_entity_statuslog.php:106
+#: Public/A2B_detail_package.php:264
+#: Public/call-dnid.php:412
+#: Public/A2B_trunk_report.php:182
+#: Public/call-daily-load.php:260
+#: Public/call-pnl-report.php:191
+#: Public/A2B_entity_paymentlog_agent.php:92
+msgid "May"
+msgstr "Maggio"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:200
+#: Public/call-comp.php:266
+#: Public/call-last-month.php:97
+#: Public/call-log-customers.php:474
+#: Public/A2B_entity_paymentlog.php:90
+#: Public/call-count-reporting.php:177
+#: Public/A2B_call_archiving.php:246
+#: Public/A2B_entity_log_viewer.php:104
+#: Public/A2B_entity_statuslog.php:106
+#: Public/A2B_detail_package.php:264
+#: Public/call-dnid.php:412
+#: Public/A2B_trunk_report.php:182
+#: Public/call-daily-load.php:260
+#: Public/call-pnl-report.php:191
+#: Public/A2B_entity_paymentlog_agent.php:92
+msgid "June"
+msgstr "Giugno"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:201
+#: Public/call-comp.php:266
+#: Public/call-last-month.php:97
+#: Public/call-log-customers.php:474
+#: Public/A2B_entity_paymentlog.php:90
+#: Public/call-count-reporting.php:177
+#: Public/A2B_call_archiving.php:246
+#: Public/A2B_entity_log_viewer.php:104
+#: Public/A2B_entity_statuslog.php:106
+#: Public/A2B_detail_package.php:264
+#: Public/call-dnid.php:412
+#: Public/A2B_trunk_report.php:182
+#: Public/call-daily-load.php:260
+#: Public/call-pnl-report.php:191
+#: Public/A2B_entity_paymentlog_agent.php:92
+msgid "July"
+msgstr "Luglio"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:202
+#: Public/call-comp.php:266
+#: Public/call-last-month.php:97
+#: Public/call-log-customers.php:474
+#: Public/A2B_entity_paymentlog.php:90
+#: Public/call-count-reporting.php:177
+#: Public/A2B_call_archiving.php:246
+#: Public/A2B_entity_log_viewer.php:104
+#: Public/A2B_entity_statuslog.php:106
+#: Public/A2B_detail_package.php:264
+#: Public/call-dnid.php:412
+#: Public/A2B_trunk_report.php:182
+#: Public/call-daily-load.php:260
+#: Public/call-pnl-report.php:191
+#: Public/A2B_entity_paymentlog_agent.php:92
+msgid "August"
+msgstr "Agosto"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:203
+#: Public/call-comp.php:266
+#: Public/call-last-month.php:97
+#: Public/call-log-customers.php:474
+#: Public/A2B_entity_paymentlog.php:90
+#: Public/call-count-reporting.php:177
+#: Public/A2B_call_archiving.php:246
+#: Public/A2B_entity_log_viewer.php:104
+#: Public/A2B_entity_statuslog.php:106
+#: Public/A2B_detail_package.php:264
+#: Public/call-dnid.php:412
+#: Public/A2B_trunk_report.php:182
+#: Public/call-daily-load.php:260
+#: Public/call-pnl-report.php:191
+#: Public/A2B_entity_paymentlog_agent.php:92
+msgid "September"
+msgstr "Settembre"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:204
+#: Public/call-comp.php:266
+#: Public/call-last-month.php:97
+#: Public/call-log-customers.php:474
+#: Public/A2B_entity_paymentlog.php:90
+#: Public/call-count-reporting.php:177
+#: Public/A2B_call_archiving.php:246
+#: Public/A2B_entity_log_viewer.php:104
+#: Public/A2B_entity_statuslog.php:106
+#: Public/A2B_detail_package.php:264
+#: Public/call-dnid.php:412
+#: Public/A2B_trunk_report.php:182
+#: Public/call-daily-load.php:260
+#: Public/call-pnl-report.php:191
+#: Public/A2B_entity_paymentlog_agent.php:92
+msgid "October"
+msgstr "Ottobre"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:205
+#: Public/call-comp.php:266
+#: Public/call-last-month.php:97
+#: Public/call-log-customers.php:474
+#: Public/A2B_entity_paymentlog.php:90
+#: Public/call-count-reporting.php:177
+#: Public/A2B_call_archiving.php:246
+#: Public/A2B_entity_log_viewer.php:104
+#: Public/A2B_entity_statuslog.php:106
+#: Public/A2B_detail_package.php:264
+#: Public/call-dnid.php:412
+#: Public/A2B_trunk_report.php:182
+#: Public/call-daily-load.php:260
+#: Public/call-pnl-report.php:191
+#: Public/A2B_entity_paymentlog_agent.php:92
+msgid "November"
+msgstr "Novembre"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:206
+#: Public/call-comp.php:266
+#: Public/call-last-month.php:97
+#: Public/call-log-customers.php:474
+#: Public/A2B_entity_paymentlog.php:90
+#: Public/call-count-reporting.php:177
+#: Public/A2B_call_archiving.php:246
+#: Public/A2B_entity_log_viewer.php:104
+#: Public/A2B_entity_statuslog.php:106
+#: Public/A2B_detail_package.php:264
+#: Public/call-dnid.php:412
+#: Public/A2B_trunk_report.php:182
+#: Public/call-daily-load.php:260
+#: Public/call-pnl-report.php:191
+#: Public/A2B_entity_paymentlog_agent.php:92
+msgid "December"
+msgstr "Dicembre"
+
+#: lib/Form/Class.SearchHandler.inc.php:57
+#: lib/Form/Class.SearchHandler.inc.php:131
+msgid "To :"
+msgstr "A :"
+
+#: lib/Form/Class.SearchHandler.inc.php:213
+#: Public/call-comp.php:303
+#: Public/call-comp.php:316
+#: Public/call-last-month.php:136
+#: Public/call-log-customers.php:618
+#: Public/call-log-customers.php:670
+#: Public/call-log-customers.php:723
+#: Public/A2B_entity_config.php:124
+#: Public/A2B_entity_config.php:162
+#: Public/A2B_entity_config.php:199
+#: Public/A2B_call_archiving.php:383
+#: Public/A2B_call_archiving.php:397
+#: Public/call-dnid.php:509
+#: Public/call-dnid.php:523
+#: Public/call-dnid.php:537
+#: Public/call-daily-load.php:289
+#: Public/A2B_entity_def_ratecard.php:548
+msgid "Exact"
+msgstr "Esatto"
+
+#: lib/Form/Class.SearchHandler.inc.php:214
+#: Public/call-comp.php:304
+#: Public/call-comp.php:317
+#: Public/call-last-month.php:137
+#: Public/call-log-customers.php:627
+#: Public/call-log-customers.php:679
+#: Public/call-log-customers.php:732
+#: Public/A2B_entity_config.php:129
+#: Public/A2B_entity_config.php:167
+#: Public/A2B_entity_config.php:204
+#: Public/A2B_call_archiving.php:384
+#: Public/A2B_call_archiving.php:398
+#: Public/call-dnid.php:510
+#: Public/call-dnid.php:524
+#: Public/call-dnid.php:538
+#: Public/call-daily-load.php:290
+#: Public/A2B_entity_def_ratecard.php:549
+msgid "Begins with"
+msgstr "Iniziano con"
+
+#: lib/Form/Class.SearchHandler.inc.php:215
+#: Public/call-comp.php:305
+#: Public/call-comp.php:318
+#: Public/call-last-month.php:138
+#: Public/call-log-customers.php:636
+#: Public/call-log-customers.php:688
+#: Public/call-log-customers.php:741
+#: Public/A2B_entity_config.php:134
+#: Public/A2B_entity_config.php:172
+#: Public/A2B_entity_config.php:209
+#: Public/A2B_call_archiving.php:385
+#: Public/A2B_call_archiving.php:399
+#: Public/call-dnid.php:511
+#: Public/call-dnid.php:525
+#: Public/call-dnid.php:539
+#: Public/call-daily-load.php:291
+#: Public/A2B_entity_def_ratecard.php:550
+msgid "Contains"
+msgstr "Contengono"
+
+#: lib/Form/Class.SearchHandler.inc.php:216
+#: Public/call-comp.php:306
+#: Public/call-comp.php:319
+#: Public/call-last-month.php:139
+#: Public/call-log-customers.php:645
+#: Public/call-log-customers.php:697
+#: Public/call-log-customers.php:750
+#: Public/A2B_entity_config.php:139
+#: Public/A2B_entity_config.php:177
+#: Public/A2B_entity_config.php:214
+#: Public/A2B_call_archiving.php:386
+#: Public/A2B_call_archiving.php:400
+#: Public/call-dnid.php:512
+#: Public/call-dnid.php:526
+#: Public/call-dnid.php:540
+#: Public/call-daily-load.php:292
+#: Public/A2B_entity_def_ratecard.php:551
+msgid "Ends with"
+msgstr "Finiscono con"
+
+#: lib/Form/Class.SearchHandler.inc.php:327
+msgid "There is"
+msgstr "C'&egrave"
+
+#: lib/Form/Class.SearchHandler.inc.php:327
+msgid "selected, use the option below if you are willing to make a batch updated of the selected cards."
+msgstr "selezionato, usa l'opzione seguente se sei disposto a fare un aggiornamento della scheda selezionata"
+
+#: lib/Form/Class.SearchHandler.inc.php:356
+#: Public/form_data/FG_var_card_group.inc:90
+#: Public/form_data/FG_var_tariffgroup.inc:159
+#: Public/form_data/FG_var_user.inc:77
+#: Public/form_data/FG_var_agent.inc:72
+#: Public/form_data/FG_var_def_ratecard.inc:186
+#: Public/A2B_entity_def_ratecard.php:340
+#: Public/A2B_entity_def_ratecard.php:514
+msgid "RATECARD"
+msgstr "SCHEDA TARIFFE"
+
+#: lib/Form/Class.SearchHandler.inc.php:375
+#: Public/form_data/FG_var_def_ratecard.inc:178
+#: Public/CC_ratecard_merging.php:146
+msgid "BUYRATE"
+msgstr "PREZZO ACQUISTO"
+
+#: lib/Form/Class.SearchHandler.inc.php:378
+#: lib/Form/Class.SearchHandler.inc.php:393
+#: lib/Form/Class.SearchHandler.inc.php:409
+#: lib/Form/Class.SearchHandler.inc.php:425
+#: lib/Form/Class.SearchHandler.inc.php:441
+#: lib/Form/Class.SearchHandler.inc.php:457
+#: lib/Form/Class.SearchHandler.inc.php:473
+#: lib/Form/Class.SearchHandler.inc.php:489
+#: lib/Form/Class.SearchHandler.inc.php:505
+#: Public/A2B_entity_def_ratecard.php:387
+#: Public/A2B_entity_def_ratecard.php:421
+msgid "Equal"
+msgstr "Stesso"
+
+#: lib/Form/Class.SearchHandler.inc.php:379
+#: lib/Form/Class.SearchHandler.inc.php:394
+#: lib/Form/Class.SearchHandler.inc.php:410
+#: lib/Form/Class.SearchHandler.inc.php:426
+#: lib/Form/Class.SearchHandler.inc.php:442
+#: lib/Form/Class.SearchHandler.inc.php:458
+#: lib/Form/Class.SearchHandler.inc.php:474
+#: lib/Form/Class.SearchHandler.inc.php:490
+#: lib/Form/Class.SearchHandler.inc.php:507
+#: Public/A2B_entity_phonenumber.php:229
+#: Public/A2B_entity_card.php:294
+#: Public/A2B_entity_card.php:342
+#: Public/A2B_entity_def_ratecard.php:388
+#: Public/A2B_entity_def_ratecard.php:422
+#: Public/templates/default/main.tpl:286
+#: Public/templates/default/main.tpl:375
+#: Public/templates/default/main.tpl:426
+#: Public/templates/default/main.tpl:450
+#: Public/A2B_entity_voucher.php:223
+msgid "Add"
+msgstr "Aggiungi"
+
+#: lib/Form/Class.SearchHandler.inc.php:380
+#: lib/Form/Class.SearchHandler.inc.php:395
+#: lib/Form/Class.SearchHandler.inc.php:411
+#: lib/Form/Class.SearchHandler.inc.php:427
+#: lib/Form/Class.SearchHandler.inc.php:443
+#: lib/Form/Class.SearchHandler.inc.php:459
+#: lib/Form/Class.SearchHandler.inc.php:475
+#: lib/Form/Class.SearchHandler.inc.php:491
+#: lib/Form/Class.SearchHandler.inc.php:508
+msgid "Substract"
+msgstr "Sottrarre"
+
+#: lib/Form/Class.SearchHandler.inc.php:390
+msgid "BUYRATEINITBLOCK"
+msgstr "SCATTO-INIZ.-TARIFFA-ACQUISTO"
+
+#: lib/Form/Class.SearchHandler.inc.php:406
+msgid "BUYRATEINCREMENT"
+msgstr "INCREMENTO-TARIFFA-ACQUISTO"
+
+#: lib/Form/Class.SearchHandler.inc.php:422
+#: Public/form_data/FG_var_def_ratecard.inc:179
+#: Public/CC_ratecard_merging.php:147
+msgid "RATE INITIAL"
+msgstr "TARIFFA INIZIALE"
+
+#: lib/Form/Class.SearchHandler.inc.php:438
+msgid "MIN DURATION"
+msgstr "DURATA MINIMA"
+
+#: lib/Form/Class.SearchHandler.inc.php:454
+msgid "BILLINGBLOCK"
+msgstr "FATTURAZIONE SCATTO"
+
+#: lib/Form/Class.SearchHandler.inc.php:470
+msgid "CONNECTCHARGE"
+msgstr "COSTO CONNESSIONE"
+
+#: lib/Form/Class.SearchHandler.inc.php:486
+msgid "DISCONNECTCHARGE"
+msgstr "COSTO DISCONNESSIONE"
+
+#: lib/Form/Class.SearchHandler.inc.php:502
+#: Public/form_data/FG_var_def_ratecard.inc:311
+msgid "DISCONNECT CHARGE THRESHOLD"
+msgstr "SOGLIA COSTO DISCONNESSIONE"
+
+#: lib/Form/Class.SearchHandler.inc.php:520
+msgid " BATCH UPDATE RATECARD "
+msgstr " AGGIORNAMENTO IN BLOCCO SCHEDA TARIFFE "
+
+#: lib/Form/Class.FormHandler.DelForm.inc.php:46
+msgid "Message"
+msgstr "Messaggio"
+
+#: lib/Form/Class.FormHandler.DelForm.inc.php:53
+msgid "You have "
+msgstr "Tu hai "
+
+#: lib/Form/Class.FormHandler.DelForm.inc.php:208
+msgid "Remove this "
+msgstr "Rimuovi questo "
+
+#: lib/Form/Class.FormHandler.inc.php:545
+msgid "No data found!"
+msgstr "Nessun dato trovato!"
+
+#: lib/Form/Class.FormHandler.inc.php:546
+msgid "DIRECTORY"
+msgstr "DIRECTORY"
+
+#: lib/Form/Class.FormHandler.inc.php:547
+msgid "list"
+msgstr "lista"
+
+#: lib/Form/Class.FormHandler.inc.php:548
+#: lib/Form/Class.FormHandler.inc.php:630
+msgid "Define criteria to make a precise search"
+msgstr "Definisci il criterio per effettuare una precisa richiesta"
+
+#: lib/Form/Class.FormHandler.inc.php:549
+msgid "You can browse through our"
+msgstr "Puoi visualizzare attraverso i nostri"
+
+#: lib/Form/Class.FormHandler.inc.php:549
+msgid "and modify their different properties"
+msgstr "e modificare la loro differenti propriet&agrave"
+
+#: lib/Form/Class.FormHandler.inc.php:550
+msgid "Delete this record"
+msgstr "Cancella questo record"
+
+#: lib/Form/Class.FormHandler.inc.php:551
+msgid "Edit this record"
+msgstr "Edita questo record"
+
+#: lib/Form/Class.FormHandler.inc.php:552
+msgid "The document has been created correctly. Now, you can define the different tariff that you want to associate."
+msgstr "Il documento &egrave stato creato correttamente. Ora puoi definire le differenti tariffe che vuoi accociare."
+
+#: lib/Form/Class.FormHandler.inc.php:553
+#: Public/form_data/FG_var_card_group.inc:147
+#: Public/form_data/FG_var_backup.inc:112
+#: Public/form_data/FG_var_subscription.inc:165
+#: Public/form_data/FG_var_subscription_signup.inc:129
+#: Public/form_data/FG_var_campaign_config.inc:151
+#: Public/form_data/FG_var_card.inc:975
+#: Public/form_data/FG_var_service.inc:252
+#: Public/form_data/FG_var_campaign.inc:318
+#: Public/form_data/FG_var_speeddial.inc:136
+#: Public/form_data/FG_var_provider.inc:105
+#: Public/form_data/FG_var_agentsituation.inc:75
+#: Public/form_data/FG_var_subscriber.inc:133
+#: Public/form_data/FG_var_moneysituation.inc:76
+#: Public/form_data/FG_var_card_seria.inc:100
+#: Public/form_data/FG_var_phonebook.inc:121
+#: Public/form_data/FG_var_did_billing.inc:101
+#: Public/form_data/FG_var_service_details.inc:70
+#: Public/form_data/FG_var_phonenumber.inc:159
+msgid "You can modify, through the following form, the different properties of your"
+msgstr "Puoi modificare, attraverso il seguente modulo, le differenti propriet&agrave del tuo "
+
+#: lib/Form/Class.FormHandler.inc.php:554
+#: Public/form_data/FG_var_did.inc:295
+#: Public/form_data/FG_var_did_destination.inc:200
+#: Public/form_data/FG_var_config_group.inc:89
+#: Public/form_data/FG_var_trunk.inc:265
+#: Public/form_data/FG_var_card_group.inc:148
+#: Public/form_data/FG_var_server.inc:132
+#: Public/form_data/FG_var_tariffgroup.inc:178
+#: Public/form_data/FG_var_backup.inc:113
+#: Public/form_data/FG_var_alarm.inc:182
+#: Public/form_data/FG_var_subscription.inc:166
+#: Public/form_data/FG_var_subscription_signup.inc:130
+#: Public/form_data/FG_var_campaign_config.inc:152
+#: Public/form_data/FG_var_card.inc:976
+#: Public/form_data/FG_var_user.inc:318
+#: Public/form_data/FG_var_agent.inc:392
+#: Public/form_data/FG_var_mailtemplate.inc:198
+#: Public/form_data/FG_var_def_ratecard.inc:626
+#: Public/form_data/FG_var_package.inc:142
+#: Public/form_data/FG_var_voucher.inc:210
+#: Public/form_data/FG_var_didgroup.inc:91
+#: Public/form_data/FG_var_support.inc:115
+#: Public/form_data/FG_var_outbound_cidgroup.php:64
+#: Public/form_data/FG_var_tariffplan.inc:166
+#: Public/form_data/FG_var_support_component.inc:127
+#: Public/form_data/FG_var_service.inc:253
+#: Public/form_data/FG_var_campaign.inc:319
+#: Public/form_data/FG_var_speeddial.inc:137
+#: Public/form_data/FG_var_charge.inc:178
+#: Public/form_data/FG_var_monitor.inc:160
+#: Public/form_data/FG_var_provider.inc:106
+#: Public/form_data/FG_var_server_group.inc:106
+#: Public/form_data/FG_var_transactions_agent.inc:80
+#: Public/form_data/FG_var_prefix.inc:125
+#: Public/form_data/FG_var_agentsituation.inc:76
+#: Public/form_data/FG_var_subscriber.inc:134
+#: Public/form_data/FG_var_transactions.inc:84
+#: Public/form_data/FG_var_outbound_cid.php:84
+#: Public/form_data/FG_var_moneysituation.inc:77
+#: Public/form_data/FG_var_friend.inc:942
+#: Public/form_data/FG_var_card_seria.inc:101
+#: Public/form_data/FG_var_phonebook.inc:122
+#: Public/form_data/FG_var_did_billing.inc:102
+#: Public/form_data/FG_var_service_details.inc:71
+#: Public/form_data/FG_var_ticket.inc:193
+#: Public/form_data/FG_var_phonenumber.inc:160
+#: Public/form_data/FG_var_ticket_agent.inc:170
+#: Public/form_data/FG_var_callback.inc:315
+#: Public/form_data/FG_var_restore.inc:100
+#: Public/form_data/FG_var_callerid.inc:120
+msgid "If you really want remove this"
+msgstr "Se vuoi realmente rimuovere questo"
+
+#: lib/Form/Class.FormHandler.inc.php:554
+msgid "Click on the delete button."
+msgstr "Clicca sul tasto 'Elimina'"
+
+#: lib/Form/Class.FormHandler.inc.php:555
+msgid "One"
+msgstr "Uno"
+
+#: lib/Form/Class.FormHandler.inc.php:555
+msgid "has been deleted!"
+msgstr "&egrave stato eliminato!"
+
+#: lib/Form/Class.FormHandler.inc.php:557
+#: Public/form_data/FG_var_did.inc:296
+#: Public/form_data/FG_var_did_destination.inc:201
+#: Public/form_data/FG_var_config_group.inc:90
+#: Public/form_data/FG_var_trunk.inc:266
+#: Public/form_data/FG_var_card_group.inc:149
+#: Public/form_data/FG_var_server.inc:133
+#: Public/form_data/FG_var_tariffgroup.inc:179
+#: Public/form_data/FG_var_backup.inc:114
+#: Public/form_data/FG_var_alarm.inc:183
+#: Public/form_data/FG_var_subscription.inc:167
+#: Public/form_data/FG_var_subscription_signup.inc:131
+#: Public/form_data/FG_var_campaign_config.inc:153
+#: Public/form_data/FG_var_card.inc:977
+#: Public/form_data/FG_var_user.inc:319
+#: Public/form_data/FG_var_agent.inc:393
+#: Public/form_data/FG_var_mailtemplate.inc:199
+#: Public/form_data/FG_var_def_ratecard.inc:627
+#: Public/form_data/FG_var_package.inc:143
+#: Public/form_data/FG_var_voucher.inc:211
+#: Public/form_data/FG_var_support.inc:116
+#: Public/form_data/FG_var_outbound_cidgroup.php:65
+#: Public/form_data/FG_var_tariffplan.inc:167
+#: Public/form_data/FG_var_support_component.inc:128
+#: Public/form_data/FG_var_service.inc:254
+#: Public/form_data/FG_var_campaign.inc:320
+#: Public/form_data/FG_var_speeddial.inc:138
+#: Public/form_data/FG_var_charge.inc:179
+#: Public/form_data/FG_var_monitor.inc:161
+#: Public/form_data/FG_var_provider.inc:107
+#: Public/form_data/FG_var_server_group.inc:107
+#: Public/form_data/FG_var_prefix.inc:126
+#: Public/form_data/FG_var_agentsituation.inc:77
+#: Public/form_data/FG_var_subscriber.inc:135
+#: Public/form_data/FG_var_outbound_cid.php:85
+#: Public/form_data/FG_var_moneysituation.inc:78
+#: Public/form_data/FG_var_friend.inc:943
+#: Public/form_data/FG_var_card_seria.inc:102
+#: Public/form_data/FG_var_phonebook.inc:123
+#: Public/form_data/FG_var_did_billing.inc:103
+#: Public/form_data/FG_var_service_details.inc:72
+#: Public/form_data/FG_var_ticket.inc:194
+#: Public/form_data/FG_var_phonenumber.inc:161
+#: Public/form_data/FG_var_ticket_agent.inc:171
+#: Public/form_data/FG_var_callback.inc:316
+#: Public/form_data/FG_var_restore.inc:101
+#: Public/form_data/FG_var_callerid.inc:121
+msgid "you can add easily a new"
+msgstr "puoi aggiungere facilmente un nuovo"
+
+#: lib/Form/Class.FormHandler.inc.php:557
+#: Public/form_data/FG_var_did.inc:296
+#: Public/form_data/FG_var_did_destination.inc:201
+#: Public/form_data/FG_var_config_group.inc:90
+#: Public/form_data/FG_var_trunk.inc:266
+#: Public/form_data/FG_var_card_group.inc:149
+#: Public/form_data/FG_var_server.inc:133
+#: Public/form_data/FG_var_tariffgroup.inc:179
+#: Public/form_data/FG_var_backup.inc:114
+#: Public/form_data/FG_var_alarm.inc:183
+#: Public/form_data/FG_var_subscription.inc:167
+#: Public/form_data/FG_var_subscription_signup.inc:131
+#: Public/form_data/FG_var_campaign_config.inc:153
+#: Public/form_data/FG_var_card.inc:977
+#: Public/form_data/FG_var_user.inc:319
+#: Public/form_data/FG_var_agent.inc:393
+#: Public/form_data/FG_var_mailtemplate.inc:199
+#: Public/form_data/FG_var_def_ratecard.inc:627
+#: Public/form_data/FG_var_package.inc:143
+#: Public/form_data/FG_var_voucher.inc:211
+#: Public/form_data/FG_var_support.inc:116
+#: Public/form_data/FG_var_outbound_cidgroup.php:65
+#: Public/form_data/FG_var_tariffplan.inc:167
+#: Public/form_data/FG_var_call.inc:136
+#: Public/form_data/FG_var_support_component.inc:128
+#: Public/form_data/FG_var_service.inc:254
+#: Public/form_data/FG_var_campaign.inc:320
+#: Public/form_data/FG_var_speeddial.inc:138
+#: Public/form_data/FG_var_charge.inc:179
+#: Public/form_data/FG_var_monitor.inc:161
+#: Public/form_data/FG_var_provider.inc:107
+#: Public/form_data/FG_var_server_group.inc:107
+#: Public/form_data/FG_var_prefix.inc:126
+#: Public/form_data/FG_var_agentsituation.inc:77
+#: Public/form_data/FG_var_subscriber.inc:135
+#: Public/form_data/FG_var_outbound_cid.php:85
+#: Public/form_data/FG_var_moneysituation.inc:78
+#: Public/form_data/FG_var_friend.inc:943
+#: Public/form_data/FG_var_card_seria.inc:102
+#: Public/form_data/FG_var_phonebook.inc:123
+#: Public/form_data/FG_var_did_billing.inc:103
+#: Public/form_data/FG_var_service_details.inc:72
+#: Public/form_data/FG_var_ticket.inc:194
+#: Public/form_data/FG_var_phonenumber.inc:161
+#: Public/form_data/FG_var_ticket_agent.inc:171
+#: Public/form_data/FG_var_callback.inc:316
+#: Public/form_data/FG_var_restore.inc:101
+#: Public/form_data/FG_var_callerid.inc:121
+msgid "Fill the following fields and confirm by clicking on the button add."
+msgstr "Compila i seguenti campi e conferma cliccando sul tasto 'Agg.'"
+
+#: lib/Form/Class.FormHandler.inc.php:558
+#: Public/form_data/FG_var_service_details.inc:75
+#: Public/form_data/FG_var_restore.inc:112
+msgid "Add a"
+msgstr "Aggiungi un"
+
+#: lib/Form/Class.FormHandler.inc.php:558
+#: Public/form_data/FG_var_service_details.inc:75
+#: Public/form_data/FG_var_restore.inc:112
+msgid "now."
+msgstr "ora."
+
+#: lib/Form/Class.FormHandler.inc.php:559
+#: lib/Form/Class.FormHandler.inc.php:560
+#: Public/form_data/FG_var_did.inc:299
+#: Public/form_data/FG_var_did_destination.inc:205
+#: Public/form_data/FG_var_config_group.inc:94
+#: Public/form_data/FG_var_trunk.inc:269
+#: Public/form_data/FG_var_card_group.inc:153
+#: Public/form_data/FG_var_server.inc:136
+#: Public/form_data/FG_var_tariffgroup.inc:184
+#: Public/form_data/FG_var_alarm.inc:187
+#: Public/form_data/FG_var_subscription.inc:171
+#: Public/form_data/FG_var_subscription_signup.inc:135
+#: Public/form_data/FG_var_campaign_config.inc:157
+#: Public/form_data/FG_var_card.inc:981
+#: Public/form_data/FG_var_user.inc:323
+#: Public/form_data/FG_var_agent.inc:397
+#: Public/form_data/FG_var_mailtemplate.inc:202
+#: Public/form_data/FG_var_def_ratecard.inc:630
+#: Public/form_data/FG_var_package.inc:146
+#: Public/form_data/FG_var_voucher.inc:214
+#: Public/form_data/FG_var_didgroup.inc:96
+#: Public/form_data/FG_var_support.inc:120
+#: Public/form_data/FG_var_outbound_cidgroup.php:69
+#: Public/form_data/FG_var_tariffplan.inc:170
+#: Public/form_data/FG_var_call.inc:139
+#: Public/form_data/FG_var_support_component.inc:132
+#: Public/form_data/FG_var_service.inc:257
+#: Public/form_data/FG_var_campaign.inc:324
+#: Public/form_data/FG_var_speeddial.inc:141
+#: Public/form_data/FG_var_charge.inc:183
+#: Public/form_data/FG_var_monitor.inc:165
+#: Public/form_data/FG_var_provider.inc:110
+#: Public/form_data/FG_var_server_group.inc:112
+#: Public/form_data/FG_var_prefix.inc:130
+#: Public/form_data/FG_var_subscriber.inc:139
+#: Public/form_data/FG_var_outbound_cid.php:89
+#: Public/form_data/FG_var_friend.inc:947
+#: Public/form_data/FG_var_card_seria.inc:105
+#: Public/form_data/FG_var_phonebook.inc:127
+#: Public/form_data/FG_var_did_billing.inc:107
+#: Public/form_data/FG_var_service_details.inc:76
+#: Public/form_data/FG_var_ticket.inc:198
+#: Public/form_data/FG_var_phonenumber.inc:165
+#: Public/form_data/FG_var_ticket_agent.inc:175
+#: Public/form_data/FG_var_callback.inc:320
+#: Public/form_data/FG_var_restore.inc:113
+#: Public/form_data/FG_var_callerid.inc:132
+msgid "Your new"
+msgstr "Il tuo nuovo"
+
+#: lib/Form/Class.FormHandler.inc.php:559
+msgid "has been inserted.<br>"
+msgstr "&egrave stato inserito.<br>"
+
+#: lib/Form/Class.FormHandler.inc.php:560
+msgid "hasn't been inserted."
+msgstr "non &egrave stato inserito."
+
+#: lib/Form/Class.FormHandler.inc.php:561
+msgid "You cannot choose more than one !"
+msgstr "Non puoi seceglierne pi&ugrave di uno !"
+
+#: lib/Form/Class.FormHandler.inc.php:563
+msgid "Are you sure to delete all records connected to this instance."
+msgstr "Sei sicuro di eliminare tutti i records collegati a questa istanza."
+
+#: lib/Form/Class.FormHandler.inc.php:565
+#: lib/Form/Class.FormHandler.inc.php:567
+msgid "CONFIRM DATA"
+msgstr "CONFERMA DATI"
+
+#: lib/Form/Class.FormHandler.inc.php:566
+msgid "DELETE"
+msgstr "ELIMINA"
+
+#: lib/Form/Class.FormHandler.inc.php:619
+#: lib/Form/Class.FormHandler.inc.php:837
+msgid "Delete this "
+msgstr "Elimina questo "
+
+#: lib/Form/Class.FormHandler.inc.php:620
+#: lib/Form/Class.FormHandler.inc.php:831
+msgid "Edit this "
+msgstr "Edita questa "
+
+#: lib/Form/Class.FormHandler.inc.php:651
+msgid "INSERTED"
+msgstr "INSERITO"
+
+#: lib/Form/Class.FormHandler.inc.php:652
+#: Public/form_data/FG_var_monitor.inc:63
+#: Public/form_data/FG_var_monitor.inc:145
+msgid "ENABLE"
+msgstr "ATTIVATO"
+
+#: lib/Form/Class.FormHandler.inc.php:653
+msgid "DISABLE"
+msgstr "DISATTIVATO"
+
+#: lib/Form/Class.FormHandler.inc.php:654
+#: Public/form_data/FG_var_package.inc:68
+msgid "FREE"
+msgstr "GRATUITO"
+
+#: lib/Form/Class.FormHandler.inc.php:806
+#: lib/Form/Class.FormHandler.inc.php:808
+msgid "You can browse through our "
+msgstr "Puoi visualizzare attraverso i nostri "
+
+#: lib/Form/Class.FormHandler.inc.php:806
+#: lib/Form/Class.FormHandler.inc.php:808
+msgid " and modify their different properties<br>"
+msgstr " e modificare le differenti propriet&agrave<br>"
+
+#: lib/Form/Class.FormHandler.inc.php:976
+msgid "(at least 3 characters)"
+msgstr "(almeno di 3 caratteri)"
+
+#: lib/Form/Class.FormHandler.inc.php:980
+msgid "(must match email structure. Example : name@domain.com)"
+msgstr "(deve corrispondere ad una struttura email. Esempio : nome@dominio.com)"
+
+#: lib/Form/Class.FormHandler.inc.php:984
+msgid "(at least 5 successive characters appear at the end of this string)"
+msgstr "(almeno 5 caratteri successivi appaiono alla fine di questa stringa)"
+
+#: lib/Form/Class.FormHandler.inc.php:988
+msgid "(at least 4 characters)"
+msgstr "(almeno 4 caratteri)"
+
+#: lib/Form/Class.FormHandler.inc.php:992
+msgid "(number format)"
+msgstr "(formato numero)"
+
+#: lib/Form/Class.FormHandler.inc.php:1000
+msgid "(only number with more that 8 digits)"
+msgstr "(solo numeri con pi&ugrave di 8 cifre)"
+
+#: lib/Form/Class.FormHandler.inc.php:1004
+msgid "(at least 8 digits using . or - or the space key)"
+msgstr "(utilizzando almeno 8 cifre, o - oppure il tasto spazio)"
+
+#: lib/Form/Class.FormHandler.inc.php:1008
+msgid "network adress format"
+msgstr "formato indirizzo rete"
+
+#: lib/Form/Class.FormHandler.inc.php:1012
+msgid "at least 1 character"
+msgstr "almeno 1 carattere"
+
+#: lib/Form/Class.FormHandler.inc.php:1020
+msgid "(AT LEAST 2 CARACTERS)"
+msgstr "(ALMENO 2 CARATTERI)"
+
+#: lib/Form/Class.FormHandler.inc.php:1024
+msgid "(NUMBER FORMAT WITH/WITHOUT DECIMAL, use '.' for decimal)"
+msgstr "(FORMATO NUMERO CON/SENZA DECIMALI, usa '.'per i decimali)"
+
+#: lib/Form/Class.FormHandler.inc.php:1040
+msgid "You must write something."
+msgstr "Devi scrivere qualcosa"
+
+#: lib/Form/Class.FormHandler.inc.php:1044
+msgid "8 characters alphanumeric"
+msgstr "8 caratteri alfanumerici"
+
+#: lib/Form/Class.FormHandler.inc.php:1051
+msgid "(at least 6 Alphanumeric characters)"
+msgstr "(almeno 6 caratteri alfanumerici)"
+
+#: lib/Form/Class.FormHandler.inc.php:1059
+#, fuzzy, php-format
+msgid "(PERCENT FORMAT WITH/WITHOUT DECIMAL, use '.' for decimal and don't use '%' character. e.g.: 12.4 )"
+msgstr "(FORMATO PERCENTUALE CON/SENZA DECIMALI, usa '.' per i decimali e non usare '%'. Es.: 12.4 )"
+
+#: lib/Form/Class.FormHandler.inc.php:1737
+msgid "error deletion"
+msgstr "errore eliminazione"
+
+#: lib/Form/Class.FormHandler.inc.php:1864
+msgid "ERROR_DUPLICATION"
+msgstr "ERRORE_DUPLICAZIONE"
+
+#: lib/Form/Class.FormHandler.inc.php:1950
+msgid "Done"
+msgstr "Fatto"
+
+#: lib/Form/Class.FormHandler.inc.php:1990
+msgid "Export Call Plan with LCR"
+msgstr "Esporta il Piano di Chiamata con MCR"
+
+#: lib/Form/Class.FormHandler.inc.php:1996
+msgid "Choose a call plan"
+msgstr "Scegli un Piano di Chiamata"
+
+#: lib/Form/Class.FormHandler.inc.php:2042
+msgid "THE CURRENT RATECARD"
+msgstr "LA CORRENTE SCHEDA TARIFFE"
+
+#: lib/Form/Class.FormHandler.inc.php:2053
+msgid "R A T E C A R D"
+msgstr "S C H E D A  T A R I F F E"
+
+#: lib/Form/Class.FormHandler.inc.php:2059
+#: Public/CC_ratecard_import.php:229
+msgid "Choose a ratecard"
+msgstr "Scegli una scheda tariffe"
+
+#: lib/Form/Class.FormHandler.AddForm.inc.php:211
+msgid "Create a new "
+msgstr "Crea una nuova "
+
+#: lib/Misc.php:523
+#: lib/Class.Notification.php:140
+msgid "UNKNOWN"
+msgstr "SCONOSCIUTO"
+
+#: lib/Misc.php:722
+msgid "First"
+msgstr "Primo"
+
+#: lib/Misc.php:723
+msgid "Prev"
+msgstr "Prec"
+
+#: lib/Misc.php:724
+#: Public/call-log-customers.php:1140
+#: Public/A2B_detail_package.php:533
+msgid "Next"
+msgstr "Pross"
+
+#: lib/Misc.php:725
+msgid "Last"
+msgstr "Ultimo"
+
+#: lib/Misc.php:815
+msgid "File size is greater than allowed limit."
+msgstr "Il file supera la grandezza permessa."
+
+#: lib/Misc.php:818
+msgid "You did not upload anything!"
+msgstr "Non hai caricato niente!"
+
+#: lib/Misc.php:821
+msgid "Failed to upload the file, The file you uploaded may not exist on disk."
+msgstr "Il caricamento del file &egrave fallito. Il file non esiste sul disco"
+
+#: lib/Misc.php:824
+msgid "file type is not allowed"
+msgstr "tipo di file non permesso"
+
+#: lib/Misc.php:1130
+msgid "Can't find our base_currency in cc_currencies."
+msgstr "Non posso trovare la valuta di base in cc_curriences."
+
+#: lib/Misc.php:1130
+#: lib/Misc.php:1153
+#: lib/Misc.php:1157
+#: lib/Misc.php:1167
+msgid "Currency update ABORTED."
+msgstr "Aggiornamento valuta ABORTITO."
+
+#: lib/Misc.php:1153
+msgid "The CSV file doesn't contain all the currencies we requested."
+msgstr "Il file CVS non contiene tutte le valute richieste."
+
+#: lib/Misc.php:1157
+msgid "At least one of the entries in the CSV file isn't a number."
+msgstr "Almeno un inserimento nel file CSV non &egrave un numero."
+
+#: lib/Misc.php:1167
+msgid "Our base_currency seems to be worthless."
+msgstr "La tua valuta di base sembra non avere alcun valore."
+
+#: lib/Misc.php:1205
+msgid "Success! All currencies are now updated."
+msgstr "Successo! Tutte le valute sono ora aggiornate."
+
+#: lib/Misc.php:1496
+msgid "GO TO CUSTOMER ACCOUNT"
+msgstr "VAI ALL'ACCOUNT UTENTE"
+
+#: lib/interface/constants.php:15
+#: Public/A2B_entity_phonenumber.php:293
+msgid "INFO"
+msgstr "INFO"
+
+#: lib/interface/constants.php:16
+msgid "SUCCESS"
+msgstr "SUCCESSO"
+
+#: lib/interface/constants.php:17
+msgid "WARNING"
+msgstr "ATTENZIONE"
+
+#: lib/interface/constants.php:18
+#: lib/interface/constants.php:72
+msgid "ERROR"
+msgstr "ERRORE"
+
+#: lib/interface/constants.php:24
+#: lib/interface/constants.php:38
+#: Public/A2B_mass_mail.php:74
+#: Public/A2B_data_archiving.php:57
+#: Public/A2B_data_archiving.php:62
+msgid "ENGLISH"
+msgstr "INGLESE"
+
+#: lib/interface/constants.php:25
+#: lib/interface/constants.php:39
+#: Public/A2B_mass_mail.php:75
+#: Public/A2B_data_archiving.php:58
+#: Public/A2B_data_archiving.php:63
+msgid "SPANISH"
+msgstr "SAGNOLO"
+
+#: lib/interface/constants.php:26
+#: lib/interface/constants.php:40
+#: Public/A2B_mass_mail.php:76
+#: Public/A2B_data_archiving.php:59
+#: Public/A2B_data_archiving.php:64
+msgid "FRENCH"
+msgstr "FRANCESE"
+
+#: lib/interface/constants.php:27
+#: lib/interface/constants.php:41
+msgid "RUSSIAN"
+msgstr "RUSSO"
+
+#: lib/interface/constants.php:28
+#: lib/interface/constants.php:42
+msgid "BRAZILIAN"
+msgstr "BRASILIANO"
+
+#: lib/interface/constants.php:29
+#: lib/interface/constants.php:43
+msgid "ITALIAN"
+msgstr "ITALIANO"
+
+#: lib/interface/constants.php:48
+msgid "NONE RESTRICTION USED"
+msgstr "NESSUNA RESTIZIONE USATA"
+
+#: lib/interface/constants.php:49
+msgid "CAN'T CALL RESTRICTED NUMBERS"
+msgstr "IMPOSSIBILE CHIAMARE I NUMERI LIMITATI"
+
+#: lib/interface/constants.php:50
+msgid "CAN ONLY CALL RESTRICTED NUMBERS"
+msgstr "PU&Ograve CHIAMARE SOLO I NUMERI LIMITATI"
+
+#: lib/interface/constants.php:55
+#: Public/call-comp.php:221
+#: Public/call-last-month.php:59
+#: Public/call-log-customers.php:378
+#: Public/form_data/FG_var_user.inc:75
+#: Public/A2B_call_archiving.php:205
+#: Public/A2B_entity_log_viewer.php:81
+#: Public/A2B_entity_statuslog.php:83
+#: Public/A2B_detail_package.php:223
+#: Public/call-dnid.php:345
+#: Public/call-daily-load.php:215
+#: Public/templates/default/main.tpl:65
+msgid "CUSTOMERS"
+msgstr "UTENTI"
+
+#: lib/interface/constants.php:56
+#: Public/templates/default/main.tpl:96
+msgid "AGENTS"
+msgstr "AGENTI"
+
+#: lib/interface/constants.php:57
+msgid "CUSTOMERS AND AGENTS"
+msgstr "UTENTI ED AGENTI"
+
+#: lib/interface/constants.php:63
+#: Public/A2B_entity_card.php:395
+#: Public/call-count-reporting.php:284
+#: Public/A2B_data_archiving.php:130
+#: Public/A2B_call_archiving.php:65
+#: Public/A2B_entity_card_multi.php:342
+msgid "Yes"
+msgstr "Si"
+
+#: lib/interface/constants.php:70
+msgid "PENDING"
+msgstr "SOSPESO"
+
+#: lib/interface/constants.php:71
+msgid "SENT"
+msgstr "INVIATO"
+
+#: lib/interface/constants.php:88
+#: Public/form_data/FG_var_trunk.inc:58
+#: Public/form_data/FG_var_trunk.inc:62
+msgid "Inactive"
+msgstr "Inattivo"
+
+#: lib/interface/constants.php:89
+#: Public/form_data/FG_var_trunk.inc:57
+#: Public/form_data/FG_var_trunk.inc:61
+msgid "Active"
+msgstr "Attivo"
+
+#: lib/interface/constants.php:110
+msgid "Fix per month + dialoutrate"
+msgstr "Fisso per mese + tariffa in uscita"
+
+#: lib/interface/constants.php:111
+msgid "Fix per month"
+msgstr "Fisso per mese"
+
+#: lib/interface/constants.php:112
+msgid "Only dialout rate"
+msgstr "Solo tariffa in uscita"
+
+#: lib/interface/constants.php:113
+#: lib/interface/constants.php:122
+#: Public/form_data/FG_var_diduse.inc:76
+msgid "Free"
+msgstr "Gratuito"
+
+#: lib/interface/constants.php:119
+msgid "Fix+Dial"
+msgstr "Fisso+Chiamata"
+
+#: lib/interface/constants.php:120
+msgid "Fix"
+msgstr "Fisso"
+
+#: lib/interface/constants.php:121
+msgid "Dial"
+msgstr "Chiamata"
+
+#: lib/interface/constants.php:128
+#: lib/interface/constants.php:375
+#: Public/A2B_mass_mail.php:70
+#: Public/A2B_entity_card.php:312
+#: Public/A2B_data_archiving.php:68
+#: Public/A2B_data_archiving.php:72
+#: Public/A2B_entity_card_multi.php:283
+msgid "INDIVIDUAL ACCESS"
+msgstr "ACCESSO INDIVIDUALE"
+
+#: lib/interface/constants.php:129
+#: lib/interface/constants.php:374
+#: Public/A2B_mass_mail.php:71
+#: Public/A2B_entity_card.php:313
+#: Public/form_data/FG_var_card.inc:619
+#: Public/A2B_data_archiving.php:69
+#: Public/A2B_data_archiving.php:73
+#: Public/A2B_entity_card_multi.php:284
+msgid "SIMULTANEOUS ACCESS"
+msgstr "ACCESSO SIMULTANEO"
+
+#: lib/interface/constants.php:135
+#: Public/A2B_data_archiving.php:115
+#: Public/A2B_entity_card_multi.php:300
+msgid "PREPAID CARD"
+msgstr "SCHEDA PREPAGATA"
+
+#: lib/interface/constants.php:136
+msgid "POSTPAID CARD"
+msgstr "SCHEDA POSTPAGATA"
+
+#: lib/interface/constants.php:146
+#: Public/A2B_entity_card_multi.php:312
+msgid "NO EXPIRATION"
+msgstr "NESSUNA SCADENZA"
+
+#: lib/interface/constants.php:147
+#: lib/interface/constants.php:386
+#: Public/A2B_entity_card.php:355
+#: Public/A2B_data_archiving.php:120
+#: Public/A2B_entity_card_multi.php:313
+msgid "EXPIRE DATE"
+msgstr "DATA SCADENZA"
+
+#: lib/interface/constants.php:148
+#: lib/interface/constants.php:387
+#: Public/A2B_entity_card.php:356
+#: Public/A2B_data_archiving.php:121
+#: Public/A2B_entity_card_multi.php:314
+msgid "EXPIRE DAYS SINCE FIRST USE"
+msgstr "GIORNI SCADENZA DAL PRIMO USO"
+
+#: lib/interface/constants.php:149
+#: lib/interface/constants.php:388
+#: Public/A2B_entity_card.php:357
+#: Public/A2B_data_archiving.php:122
+#: Public/A2B_entity_card_multi.php:315
+msgid "EXPIRE DAYS SINCE CREATION"
+msgstr "GIORNI SCADENZA DALLA CREAZIONE"
+
+#: lib/interface/constants.php:156
+#: lib/interface/constants.php:167
+msgid "OPEN"
+msgstr "APERTO"
+
+#: lib/interface/constants.php:157
+#: lib/interface/constants.php:168
+msgid "CLOSE"
+msgstr "CHIUSO"
+
+#: lib/interface/constants.php:175
+#: lib/interface/constants.php:189
+#: lib/interface/constants.php:212
+msgid "UNPAID"
+msgstr "DA PAGARE"
+
+#: lib/interface/constants.php:176
+#: lib/interface/constants.php:188
+#: lib/interface/constants.php:215
+msgid "PAID"
+msgstr "PAGATO"
+
+#: lib/interface/constants.php:186
+msgid "FIRSTUSE"
+msgstr "PRIMO USO"
+
+#: lib/interface/constants.php:187
+msgid "BILLED"
+msgstr "FATTURAZIONE"
+
+#: lib/interface/constants.php:213
+msgid "SENT-UNPAID"
+msgstr "INVIO-NON PAGATO"
+
+#: lib/interface/constants.php:214
+msgid "SENT-PAID"
+msgstr "INVIO-PAGATO"
+
+#: lib/interface/constants.php:222
+msgid "New"
+msgstr "Nuovo"
+
+#: lib/interface/constants.php:223
+msgid "Proceed"
+msgstr "Eseguito"
+
+#: lib/interface/constants.php:224
+msgid "In Process"
+msgstr "In corso"
+
+#: lib/interface/constants.php:230
+msgid "Failed"
+msgstr "Fallito"
+
+#: lib/interface/constants.php:231
+msgid "Successful"
+msgstr "Con successo"
+
+#: lib/interface/constants.php:232
+msgid "Not Sent"
+msgstr "Non inviato"
+
+#: lib/interface/constants.php:238
+msgid "Unlimited calls"
+msgstr "Chiamate illimitate"
+
+#: lib/interface/constants.php:239
+msgid "Number of Free calls"
+msgstr "Numero di chiamate Gratuite"
+
+#: lib/interface/constants.php:240
+msgid "Free seconds"
+msgstr "Secondi Gratuiti"
+
+#: lib/interface/constants.php:246
+msgid "Monthly"
+msgstr "Mensile"
+
+#: lib/interface/constants.php:247
+msgid "Weekly"
+msgstr "Settimanale"
+
+#: lib/interface/constants.php:253
+msgid "LCR : According to the buyer price"
+msgstr "MCR : Secondo il prezzo d'acquisto"
+
+#: lib/interface/constants.php:254
+msgid "LCD : According to the seller price"
+msgstr "MCC : Secondo il prezzo di vendita"
+
+#: lib/interface/constants.php:260
+msgid "LCR : buyer price"
+msgstr "MCR : prezzo d'acquisto"
+
+#: lib/interface/constants.php:261
+msgid "LCD : seller price"
+msgstr "MCC : prezzo di vendita"
+
+#: lib/interface/constants.php:267
+#: Public/form_data/FG_var_card_group.inc:130
+#: Public/form_data/FG_var_subscription_signup.inc:100
+msgid "NONE"
+msgstr "NESSUNA"
+
+#: lib/interface/constants.php:268
+#: lib/Class.Notification.php:109
+msgid "LOW"
+msgstr "BASSA"
+
+#: lib/interface/constants.php:269
+#: lib/Class.Notification.php:106
+msgid "MEDIUM"
+msgstr "MEDIA"
+
+#: lib/interface/constants.php:270
+#: lib/Class.Notification.php:104
+msgid "HIGH"
+msgstr "ALTA"
+
+#: lib/interface/constants.php:276
+#: Public/form_data/FG_var_ticket.inc:81
+#: Public/form_data/FG_var_ticket_agent.inc:74
+msgid "VIEWED"
+msgstr "VISTO"
+
+#: lib/interface/constants.php:284
+msgid "NOT USED"
+msgstr "NON USATO"
+
+#: lib/interface/constants.php:285
+#: Public/form_data/FG_var_voucher.inc:83
+#: Public/A2B_entity_voucher.php:188
+msgid "USED"
+msgstr "USATO"
+
+#: lib/interface/constants.php:295
+msgid "ANSWER"
+msgstr "RISPOSTA"
+
+#: lib/interface/constants.php:296
+msgid "BUSY"
+msgstr "OCCUPATO"
+
+#: lib/interface/constants.php:297
+msgid "NOANSWER"
+msgstr "SENZA RISPOSTA"
+
+#: lib/interface/constants.php:298
+#: lib/interface/constants.php:341
+#: lib/interface/constants.php:366
+#: Public/A2B_data_archiving.php:106
+msgid "CANCEL"
+msgstr "ANNULLATA"
+
+#: lib/interface/constants.php:299
+msgid "CONGESTION"
+msgstr "CONGESTIONE"
+
+#: lib/interface/constants.php:300
+msgid "CHANUNAVAIL"
+msgstr "CANALE NON DISPONIBILE"
+
+#: lib/interface/constants.php:301
+msgid "DONTCALL"
+msgstr "NON CHIAMA"
+
+#: lib/interface/constants.php:302
+msgid "TORTURE"
+msgstr "TORTURA"
+
+#: lib/interface/constants.php:303
+msgid "INVALIDARGS"
+msgstr "ARG. INVALIDO"
+
+#: lib/interface/constants.php:323
+#: lib/interface/constants.php:355
+#: Public/A2B_mass_mail.php:57
+#: Public/form_data/FG_var_did_destination.inc:75
+#: Public/form_data/FG_var_agent.inc:100
+#: Public/form_data/FG_var_agent.inc:113
+#: Public/form_data/FG_var_agent.inc:177
+#: Public/A2B_data_archiving.php:90
+#: Public/A2B_data_archiving.php:98
+msgid "ACTIVE"
+msgstr "ATTIVO"
+
+#: lib/interface/constants.php:324
+#: lib/interface/constants.php:341
+#: lib/interface/constants.php:356
+#: lib/interface/constants.php:366
+#: lib/interface/constants.php:433
+#: Public/A2B_mass_mail.php:56
+#: Public/A2B_data_archiving.php:89
+#: Public/A2B_data_archiving.php:97
+msgid "CANCELLED"
+msgstr "ANNULLATO"
+
+#: lib/interface/constants.php:326
+#: lib/interface/constants.php:344
+#: Public/A2B_mass_mail.php:59
+#: Public/A2B_data_archiving.php:92
+#: Public/A2B_data_archiving.php:100
+msgid "WAITING-MAILCONFIRMATION"
+msgstr "ATTESA-EMAIL CONFERMA"
+
+#: lib/interface/constants.php:327
+#: lib/interface/constants.php:345
+#: Public/A2B_mass_mail.php:60
+#: Public/form_data/FG_var_did.inc:67
+#: Public/A2B_data_archiving.php:93
+#: Public/A2B_data_archiving.php:101
+msgid "RESERVED"
+msgstr "PRENOTATO"
+
+#: lib/interface/constants.php:328
+#: lib/interface/constants.php:346
+#: Public/A2B_mass_mail.php:61
+#: Public/A2B_entity_phonenumber.php:314
+#: Public/A2B_data_archiving.php:94
+#: Public/A2B_data_archiving.php:102
+msgid "EXPIRED"
+msgstr "SCADUTO"
+
+#: lib/interface/constants.php:329
+#: lib/interface/constants.php:347
+msgid "SUSPENDED FOR UNDERPAYMENT"
+msgstr "SOSPESO PER MANCANZA PAGAMENTO"
+
+#: lib/interface/constants.php:330
+#: lib/interface/constants.php:348
+msgid "SUSPENDED FOR LITIGATION"
+msgstr "SOSPESO PER CONTROVERSIA"
+
+#: lib/interface/constants.php:331
+msgid "WAITING SUBSCRIPTION PAYMENT"
+msgstr "ATTESA SOTTOSCRIZIONE PAGAMENTO"
+
+#: lib/interface/constants.php:342
+#: lib/interface/constants.php:367
+#: Public/form_data/FG_var_did.inc:65
+#: Public/form_data/FG_var_did.inc:162
+#: Public/form_data/FG_var_did_destination.inc:146
+#: Public/form_data/FG_var_subscription_signup.inc:82
+#: Public/form_data/FG_var_voucher.inc:82
+#: Public/form_data/FG_var_voucher.inc:158
+#: Public/form_data/FG_var_support_component.inc:69
+#: Public/form_data/FG_var_support_component.inc:94
+#: Public/form_data/FG_var_outbound_cid.php:69
+#: Public/form_data/FG_var_callerid.inc:58
+#: Public/form_data/FG_var_callerid.inc:83
+#: Public/A2B_card_info.php:454
+#: Public/A2B_card_info.php:967
+#: Public/A2B_entity_voucher.php:203
+msgid "ACTIVATED"
+msgstr "ATTIVO"
+
+#: lib/interface/constants.php:344
+#: lib/interface/constants.php:430
+msgid "WAITING"
+msgstr "ATTESA"
+
+#: lib/interface/constants.php:345
+#: Public/A2B_data_archiving.php:110
+msgid "RESERV"
+msgstr "RISERVATO"
+
+#: lib/interface/constants.php:347
+msgid "SUS-PAY"
+msgstr "SOS.-PAG."
+
+#: lib/interface/constants.php:348
+msgid "SUS-LIT"
+msgstr "SOS.-CONT."
+
+#: lib/interface/constants.php:349
+msgid "WAITING-SUBSCRIPTION-PAYMENT"
+msgstr "ATTESA SOTTOSCRIZIONE PAGAMENTO"
+
+#: lib/interface/constants.php:349
+msgid "WAIT-PAY"
+msgstr "ATTESA PAGAMENTO"
+
+#: lib/interface/constants.php:385
+#: Public/A2B_entity_card.php:354
+#: Public/A2B_data_archiving.php:119
+msgid "NO EXPIRY"
+msgstr "NESSUNA SCADENZA"
+
+#: lib/interface/constants.php:394
+msgid "SQL"
+msgstr "SQL"
+
+#: lib/interface/constants.php:395
+msgid "SHELL SCRIPT"
+msgstr "SCRIPT SHELL"
+
+#: lib/interface/constants.php:401
+msgid "TEXT2SPEECH"
+msgstr "TEXT2SPEECH"
+
+#: lib/interface/constants.php:402
+msgid "UNIXTIME"
+msgstr "UNIXTIME"
+
+#: lib/interface/constants.php:403
+#: Public/A2B_package_manage_rates.php:191
+msgid "NUMBER"
+msgstr "NUMERO"
+
+#: lib/interface/constants.php:404
+msgid "DIGIT"
+msgstr "CIFRE"
+
+#: lib/interface/constants.php:410
+#: Public/A2B_refill_info_agent.php:91
+#: Public/A2B_remittance_info.php:91
+#: Public/form_data/FG_var_voucher.inc:138
+#: Public/form_data/FG_var_moneysituation_details.inc:50
+#: Public/form_data/FG_var_service.inc:85
+#: Public/form_data/FG_var_remittance_request.inc:70
+#: Public/form_data/FG_var_charge.inc:74
+#: Public/form_data/FG_var_charge.inc:131
+#: Public/form_data/FG_var_commission.inc:53
+#: Public/form_data/FG_var_transactions_agent.inc:54
+#: Public/form_data/FG_var_transactions.inc:54
+#: Public/form_data/FG_var_paymentlog.inc:168
+#: Public/form_data/FG_var_phonenumber.inc:61
+#: Public/form_data/FG_var_phonenumber.inc:82
+#: Public/form_data/FG_var_phonenumber.inc:124
+#: Public/form_data/FG_var_paymentlog_agent.inc:168
+#: Public/A2B_payment_info_agent.php:91
+#: Public/A2B_refill_info.php:91
+#: Public/A2B_payment_info.php:91
+msgid "AMOUNT"
+msgstr "IMPORTO"
+
+#: lib/interface/constants.php:411
+msgid "CORRECTION"
+msgstr "CORREZIONE"
+
+#: lib/interface/constants.php:412
+msgid "EXTRA FEE"
+msgstr "SUPPLEMENTO"
+
+#: lib/interface/constants.php:413
+msgid "AGENT REFUND"
+msgstr "RIMBORSO AGENTE"
+
+#: lib/interface/constants.php:419
+msgid "TO BALANCE"
+msgstr "SALDO"
+
+#: lib/interface/constants.php:420
+msgid "TO BANK"
+msgstr "BANCARIO"
+
+#: lib/interface/constants.php:431
+msgid "ACCEPTED"
+msgstr "ACCETTATO"
+
+#: lib/interface/constants.php:432
+msgid "REFUSED"
+msgstr "RIFIUTATO"
+
+#: lib/interface/constants.php:450
+#: Public/A2B_entity_card.php:424
+#: Public/A2B_entity_card_multi.php:368
+msgid "NO DISCOUNT"
+msgstr "NESSUNO SCONTO"
+
+#: lib/Class.A2Billing.php:391
+msgid "Invalid card number lenght defined in configuration."
+msgstr "Lunghezza numero scheda non valida nella configurazione."
+
+#: lib/Class.A2Billing.php:3280
+msgid "Error : Authentication Failed !!!"
+msgstr "Errore : Autenticazione fallita !!!"
+
+#: lib/Class.A2Billing.php:3320
+msgid "Error : Not enough credit to call !!!"
+msgstr "Errore : Credito insufficiente per chiamare !!!"
+
+#: lib/Class.A2Billing.php:3326
+msgid "Error : Card is not active!!!"
+msgstr "Errore : Scheda non attiva!!!"
+
+#: lib/Class.A2Billing.php:3332
+msgid "Error : Card is actually in use!!!"
+msgstr "Errore : Sceda attualmente in uso!!!"
+
+#: lib/Class.A2Billing.php:3341
+#: lib/Class.A2Billing.php:3349
+#: lib/Class.A2Billing.php:3357
+msgid "Error : Card have expired!!!"
+msgstr "Errore : Scheda scaduta!!!"
+
+#: lib/Class.Notification.php:77
+msgid "New SIP & IAX added : Friends conf have to be generated"
+msgstr "Nuovo SIP & IAX aggiunto : Friends conf &egrave stato generato"
+
+#: lib/Class.Notification.php:78
+msgid "New SIP added : Sip Friends conf have to be generated"
+msgstr "Nuovo SIP aggiunto : Sip Friends conf &egrave stato generato"
+
+#: lib/Class.Notification.php:79
+msgid "New IAX added : Iax Friends conf have to be generated"
+msgstr "Nuovo IAX aggiunto : Iax Friends conf &egrave stato generato"
+
+#: lib/Class.Notification.php:80
+msgid "New Ticket added by agent"
+msgstr "Nuovo Ticket aggiunto dall'agente"
+
+#: lib/Class.Notification.php:81
+msgid "New Ticket added by customer"
+msgstr "Nuovo Ticket aggiunto dall'utente"
+
+#: lib/Class.Notification.php:82
+msgid "DID Destination edited by customer"
+msgstr "Destinazione DID editata dall'utente"
+
+#: lib/Class.Notification.php:83
+msgid "New Remittance request added"
+msgstr "Nuova richiesta Rimessa aggiunta"
+
+#: lib/Class.Notification.php:84
+msgid "Added new sign-up"
+msgstr "Aggiunta nuova iscrizione"
+
+#: lib/Class.Notification.php:136
+msgid "BATCH"
+msgstr "LOTTO"
+
+#: lib/Class.Notification.php:138
+msgid "SOAP-SERVER"
+msgstr "SERVER-SOAP"
+
+#: Public/A2B_notification.php:140
+msgid "View All"
+msgstr "Visualizza Tutto"
+
+#: Public/A2B_notification.php:147
+#: Public/A2B_notification.php:231
+msgid "Newer"
+msgstr "Recenti"
+
+#: Public/A2B_notification.php:154
+#: Public/A2B_notification.php:238
+msgid "Older"
+msgstr "Maggiore"
+
+#: Public/A2B_notification.php:161
+#: Public/call-comp.php:444
+#: Public/call-log-customers.php:446
+#: Public/call-log-customers.php:1218
+#: Public/form_data/FG_var_invoice.inc:102
+#: Public/form_data/FG_var_log_viewer.inc:87
+#: Public/form_data/FG_var_user.inc:105
+#: Public/form_data/FG_var_agent.inc:105
+#: Public/form_data/FG_var_moneysituation_details.inc:49
+#: Public/form_data/FG_var_moneysituation_details.inc:63
+#: Public/form_data/FG_var_remittance_request.inc:69
+#: Public/form_data/FG_var_speeddial.inc:63
+#: Public/form_data/FG_var_charge.inc:73
+#: Public/form_data/FG_var_receipt.inc:88
+#: Public/form_data/FG_var_statuslog.inc:97
+#: Public/form_data/FG_var_paymentlog.inc:129
+#: Public/form_data/FG_var_did_billing.inc:47
+#: Public/form_data/FG_var_service_details.inc:50
+#: Public/form_data/FG_var_phonenumber.inc:62
+#: Public/form_data/FG_var_ticket_agent.inc:88
+#: Public/form_data/FG_var_paymentlog_agent.inc:129
+#: Public/call-count-reporting.php:160
+#: Public/card-history.php:161
+#: Public/A2B_detail_package.php:610
+#: Public/A2B_card_info.php:666
+#: Public/call-dnid.php:395
+#: Public/call-dnid.php:846
+#: Public/CC_entity_alarm_details.php:54
+#: Public/call-daily-load.php:375
+#: Public/CC_entity_service_details.php:56
+msgid "DATE"
+msgstr "DATA"
+
+#: Public/A2B_notification.php:164
+#: Public/card-history.php:166
+msgid "FROM"
+msgstr "DA"
+
+#: Public/A2B_notification.php:167
+#: Public/A2B_mass_mail.php:317
+#: Public/form_data/FG_var_mailtemplate.inc:98
+#: Public/form_data/FG_var_mailtemplate.inc:165
+msgid "SUBJECT"
+msgstr "SOGGETTO"
+
+#: Public/A2B_notification.php:170
+#: Public/form_data/FG_var_did_destination.inc:164
+#: Public/form_data/FG_var_ticket.inc:80
+#: Public/form_data/FG_var_ticket.inc:158
+#: Public/form_data/FG_var_ticket_agent.inc:73
+#: Public/form_data/FG_var_ticket_agent.inc:135
+#: Public/form_data/FG_var_callback.inc:209
+msgid "PRIORITY"
+msgstr "PRIORIT&Agrave"
+
+#: Public/A2B_notification.php:219
+msgid "Delete this Notification"
+msgstr "Elimina questa notifica"
+
+#: Public/A2B_notification.php:252
+msgid "No Notifications"
+msgstr "Nessuna notifica"
+
+#: Public/A2B_notification.php:284
+msgid "Do you want delete this notification ?"
+msgstr "Vuoi eliminare questa notifica ?"
+
+#: Public/A2B_refill_info_agent.php:72
+#: Public/A2B_refill_info.php:72
+msgid "REFILL INFO"
+msgstr "INFO RICARICA"
+
+#: Public/A2B_refill_info_agent.php:77
+#: Public/A2B_remittance_info.php:77
+#: Public/form_data/FG_var_card_group.inc:122
+#: Public/form_data/FG_var_logrefill_agent.inc:60
+#: Public/form_data/FG_var_logrefill_agent.inc:62
+#: Public/form_data/FG_var_remittance_request.inc:68
+#: Public/form_data/FG_var_commission.inc:51
+#: Public/form_data/FG_var_payment_agent.inc:58
+#: Public/form_data/FG_var_payment_agent.inc:60
+#: Public/form_data/FG_var_signup_agent.inc:53
+#: Public/form_data/FG_var_ticket_agent.inc:68
+#: Public/form_data/FG_var_ticket_agent.inc:106
+#: Public/A2B_payment_info_agent.php:77
+msgid "AGENT"
+msgstr "AGENTE"
+
+#: Public/A2B_refill_info_agent.php:99
+#: Public/A2B_remittance_info.php:99
+#: Public/form_data/FG_var_did_destination.inc:72
+#: Public/form_data/FG_var_alarm.inc:76
+#: Public/form_data/FG_var_package.inc:64
+#: Public/form_data/FG_var_didgroup.inc:63
+#: Public/form_data/FG_var_outbound_cidgroup.php:35
+#: Public/A2B_payment_info_agent.php:99
+#: Public/A2B_card_info.php:143
+#: Public/A2B_refill_info.php:99
+#: Public/A2B_log_activity_info.php:133
+#: Public/A2B_payment_info.php:99
+msgid "CREATION DATE"
+msgstr "DATA CREAZIONE"
+
+#: Public/A2B_refill_info_agent.php:107
+#: Public/form_data/FG_var_logrefill_agent.inc:65
+#: Public/form_data/FG_var_logrefill_agent.inc:138
+#: Public/form_data/FG_var_logrefill.inc:62
+#: Public/form_data/FG_var_logrefill.inc:147
+#: Public/form_data/FG_var_payment_agent.inc:156
+#: Public/A2B_refill_info.php:107
+msgid "REFILL TYPE"
+msgstr "TIPO RICARICA"
+
+#: Public/A2B_refill_info_agent.php:117
+#: Public/A2B_payment_info_agent.php:117
+#: Public/A2B_refill_info.php:117
+#: Public/A2B_payment_info.php:117
+msgid "DESCRIPTION "
+msgstr "DESCRIZIONE"
+
+#: Public/A2B_refill_info_agent.php:129
+msgid "REFILLS AGENT LIST"
+msgstr "LISTA RICARICHE AGENTE"
+
+#: Public/call-comp.php:72
+#: Public/call-count-reporting.php:91
+#: Public/A2B_call_archiving.php:73
+#: Public/graph_stat.php:55
+#: Public/graph_statbar.php:56
+#: Public/call-daily-load.php:68
+msgid "Calldate"
+msgstr "Data chiamata"
+
+#: Public/call-comp.php:73
+#: Public/A2B_call_archiving.php:74
+#: Public/graph_stat.php:56
+#: Public/graph_statbar.php:57
+#: Public/call-daily-load.php:69
+msgid "CalledNumber"
+msgstr "Numero Chiamato"
+
+#: Public/call-comp.php:74
+#: Public/call-log-customers.php:117
+#: Public/form_data/FG_var_prefix.inc:53
+#: Public/call-count-reporting.php:71
+#: Public/A2B_call_archiving.php:75
+#: Public/graph_stat.php:57
+#: Public/graph_statbar.php:58
+#: Public/call-daily-load.php:70
+#: Public/templates/default/main.tpl:259
+msgid "Destination"
+msgstr "Destinazioni"
+
+#: Public/call-comp.php:75
+#: Public/modules/calls_counts.php:105
+#: Public/modules/calls_lastmonth.php:151
+#: Public/call-log-customers.php:120
+#: Public/form_data/FG_var_call.inc:109
+#: Public/call-count-reporting.php:88
+#: Public/A2B_call_archiving.php:76
+#: Public/graph_stat.php:58
+#: Public/graph_statbar.php:59
+#: Public/call-dnid.php:112
+#: Public/call-daily-load.php:71
+msgid "Duration"
+msgstr "Durata"
+
+#: Public/call-comp.php:76
+#: Public/A2B_call_archiving.php:77
+#: Public/graph_stat.php:59
+#: Public/graph_statbar.php:60
+#: Public/call-daily-load.php:72
+msgid "CardUsed"
+msgstr "Utilizzo Sceda"
+
+#: Public/call-comp.php:77
+msgid "Terminatecause"
+msgstr "Causa terminazione"
+
+#: Public/call-comp.php:78
+#: Public/A2B_call_archiving.php:79
+#: Public/graph_stat.php:61
+#: Public/graph_statbar.php:62
+#: Public/call-daily-load.php:74
+msgid "IAX/SIP"
+msgstr "SIP/IAX"
+
+#: Public/call-comp.php:79
+#: Public/modules/calls_counts.php:99
+#: Public/modules/calls_lastmonth.php:153
+#: Public/A2B_call_archiving.php:81
+#: Public/graph_stat.php:63
+#: Public/graph_statbar.php:64
+#: Public/call-daily-load.php:75
+#: Public/A2B_receipt_view.php:216
+msgid "Cost"
+msgstr "Costo"
+
+#: Public/call-comp.php:227
+#: Public/call-last-month.php:65
+#: Public/call-log-customers.php:386
+#: Public/card-history.php:154
+#: Public/call-daily-load.php:221
+msgid "Enter the customer ID"
+msgstr "Immettere l'ID utente"
+
+#: Public/call-comp.php:233
+#: Public/call-last-month.php:71
+#: Public/call-log-customers.php:401
+#: Public/A2B_call_archiving.php:217
+#: Public/call-dnid.php:357
+#: Public/call-daily-load.php:227
+msgid "CallPlan"
+msgstr "Piano di Chiamata"
+
+#: Public/call-comp.php:235
+#: Public/call-last-month.php:73
+#: Public/call-log-customers.php:404
+#: Public/A2B_call_archiving.php:219
+#: Public/call-dnid.php:359
+#: Public/call-daily-load.php:229
+msgid "Provider"
+msgstr "Fornitore"
+
+#: Public/call-comp.php:239
+#: Public/call-last-month.php:77
+#: Public/call-log-customers.php:122
+#: Public/call-log-customers.php:413
+#: Public/A2B_call_archiving.php:223
+#: Public/call-dnid.php:363
+#: Public/call-daily-load.php:233
+#: Public/templates/default/main.tpl:179
+msgid "Trunk"
+msgstr "Fascio"
+
+#: Public/call-comp.php:241
+#: Public/call-last-month.php:79
+#: Public/call-log-customers.php:423
+#: Public/call-dnid.php:365
+#: Public/call-daily-load.php:235
+msgid "Rate"
+msgstr "Tariffa"
+
+#: Public/call-comp.php:251
+#: Public/A2B_entity_paymentlog.php:135
+#: Public/A2B_call_archiving.php:291
+#: Public/A2B_entity_log_viewer.php:149
+#: Public/A2B_entity_statuslog.php:151
+#: Public/call-daily-load.php:245
+#: Public/A2B_entity_paymentlog_agent.php:137
+msgid "SELECT DAY"
+msgstr "SELEZIONA IL GIORNO"
+
+#: Public/call-comp.php:256
+#: Public/call-last-month.php:94
+#: Public/call-log-customers.php:458
+#: Public/A2B_entity_paymentlog.php:88
+#: Public/A2B_entity_paymentlog.php:140
+#: Public/call-count-reporting.php:165
+#: Public/A2B_call_archiving.php:244
+#: Public/A2B_call_archiving.php:296
+#: Public/A2B_entity_log_viewer.php:102
+#: Public/A2B_entity_log_viewer.php:154
+#: Public/A2B_entity_statuslog.php:104
+#: Public/A2B_entity_statuslog.php:156
+#: Public/A2B_detail_package.php:262
+#: Public/A2B_detail_package.php:313
+#: Public/call-dnid.php:400
+#: Public/A2B_trunk_report.php:170
+#: Public/call-pnl-report.php:179
+#: Public/A2B_entity_paymentlog_agent.php:90
+#: Public/A2B_entity_paymentlog_agent.php:142
+msgid "From"
+msgstr "Da"
+
+#: Public/call-comp.php:285
+msgid "Number of days to compare"
+msgstr "Numero di giorni da confrontare"
+
+#: Public/call-comp.php:287
+#: Public/call-comp.php:288
+#: Public/call-comp.php:289
+#: Public/call-comp.php:290
+msgid "days"
+msgstr "giorni"
+
+#: Public/call-comp.php:298
+#: Public/call-last-month.php:131
+#: Public/call-dnid.php:504
+#: Public/call-daily-load.php:284
+msgid "CALLEDNUMBER"
+msgstr "NUMERO CHIAMATO"
+
+#: Public/call-comp.php:311
+#: Public/A2B_call_archiving.php:392
+#: Public/call-dnid.php:518
+msgid "SOURCE"
+msgstr "ORIGINE"
+
+#: Public/call-comp.php:329
+msgid "Graph"
+msgstr "Grafico"
+
+#: Public/call-comp.php:331
+msgid "Minutes by hours"
+msgstr "Minuti per ora"
+
+#: Public/call-comp.php:332
+msgid "Number of calls by hours"
+msgstr "Numero chiamate per ora"
+
+#: Public/call-comp.php:333
+msgid "Profits by hours"
+msgstr "Profitto per ora"
+
+#: Public/call-comp.php:334
+msgid "Sells by hours"
+msgstr "Vendita per ora"
+
+#: Public/call-comp.php:335
+msgid "Buys by hours"
+msgstr "Acquisto per ora"
+
+#: Public/call-comp.php:429
+#: Public/call-comp.php:506
+#: Public/call-log-customers.php:1337
+#: Public/A2B_detail_package.php:595
+#: Public/A2B_detail_package.php:655
+#: Public/call-dnid.php:930
+#: Public/call-daily-load.php:360
+#: Public/call-daily-load.php:414
+#: Public/A2B_receipt_edit.php:197
+msgid "TOTAL"
+msgstr "TOTALE"
+
+#: Public/call-comp.php:441
+#: Public/call-daily-load.php:372
+msgid "ASTERISK MINUTES"
+msgstr "MINUTI ASTERISK"
+
+#: Public/call-comp.php:445
+#: Public/call-log-customers.php:1220
+#: Public/A2B_detail_package.php:611
+#: Public/A2B_card_info.php:879
+#: Public/call-dnid.php:847
+#: Public/call-daily-load.php:376
+msgid "DURATION"
+msgstr "DURATA"
+
+#: Public/call-comp.php:446
+#: Public/call-log-customers.php:1221
+#: Public/A2B_detail_package.php:612
+#: Public/call-dnid.php:848
+#: Public/call-daily-load.php:377
+msgid "GRAPHIC"
+msgstr "GRAFICO"
+
+#: Public/call-comp.php:447
+#: Public/call-log-customers.php:1222
+#: Public/call-dnid.php:849
+#: Public/call-daily-load.php:378
+msgid "CALLS"
+msgstr "CHIAMATE"
+
+#: Public/call-comp.php:448
+#: Public/form_data/FG_var_did.inc:65
+#: Public/call-daily-load.php:379
+msgid "ACT"
+msgstr "ACT"
+
+#: Public/call-comp.php:449
+msgid "TOTAL SELL"
+msgstr "TOTALE VENDITA"
+
+#: Public/call-comp.php:450
+msgid "TOTAL BUY"
+msgstr "TOTALE ACQUISTO"
+
+#: Public/call-comp.php:451
+msgid "TOTAL PROFIT"
+msgstr "PROFITTO TOTALE"
+
+#: Public/call-comp.php:524
+#: Public/call-log-customers.php:1379
+#: Public/A2B_detail_package.php:667
+#: Public/call-dnid.php:957
+#: Public/call-daily-load.php:489
+msgid "No calls in your selection"
+msgstr "Nessuna chiamata nella tua selezione"
+
+#: Public/A2B_remittance_info.php:72
+msgid "REMITTANCE INFO"
+msgstr "INFO RIMESSA"
+
+#: Public/A2B_remittance_info.php:107
+msgid "REMITTANCE TYPE"
+msgstr "TIPO RIMESSA"
+
+#: Public/A2B_remittance_info.php:117
+msgid "REMITTANCE STATUS"
+msgstr "STATO RIMESSA"
+
+#: Public/A2B_remittance_info.php:131
+msgid "REMITTANCE LIST"
+msgstr "LISTA RIMESSE"
+
+#: Public/modules/customers_lastmonth.php:118
+#: Public/modules/payments_lastmonth.php:113
+#: Public/modules/calls_lastmonth.php:145
+#: Public/modules/refills_lastmonth.php:114
+msgid "Report by"
+msgstr "Rapporto per"
+
+#: Public/modules/customers_lastmonth.php:119
+#: Public/modules/payments_lastmonth.php:114
+#: Public/modules/calls_lastmonth.php:146
+#: Public/modules/refills_lastmonth.php:115
+msgid "Days"
+msgstr "Giorni"
+
+#: Public/modules/customers_lastmonth.php:120
+#: Public/modules/payments_lastmonth.php:115
+#: Public/modules/calls_lastmonth.php:147
+#: Public/modules/refills_lastmonth.php:116
+msgid "Months"
+msgstr "Mesi"
+
+#: Public/modules/customers_lastmonth.php:121
+#: Public/modules/payments_lastmonth.php:116
+#: Public/modules/refills_lastmonth.php:117
+msgid "Customer type :"
+msgstr "Tipo utente :"
+
+#: Public/modules/customers_lastmonth.php:122
+msgid "Customer Creation Date"
+msgstr "Data Creazione Utente"
+
+#: Public/modules/customers_lastmonth.php:123
+msgid "Customer Expiry Date"
+msgstr "Data Scadenza Utente"
+
+#: Public/modules/customers_lastmonth.php:124
+msgid "Customer First Used"
+msgstr "Primo Uso Utente"
+
+#: Public/modules/payments_lastmonth.php:117
+msgid "Total Number of Payments"
+msgstr "Numero totale di pagamenti"
+
+#: Public/modules/payments_lastmonth.php:118
+msgid "Total Payment Amount"
+msgstr "Importo Totale Pagamenti"
+
+#: Public/modules/calls_counts.php:86
+#: Public/call-pnl-report.php:549
+msgid "Total Calls"
+msgstr "Totale Chiamate"
+
+#: Public/modules/calls_counts.php:87
+#: Public/modules/calls_lastmonth.php:149
+msgid "Answered"
+msgstr "Chiamate Risposte"
+
+#: Public/modules/calls_counts.php:88
+msgid "Busy"
+msgstr "Occupate"
+
+#: Public/modules/calls_counts.php:89
+msgid "Unanswered"
+msgstr "Non risposte"
+
+#: Public/modules/calls_counts.php:90
+msgid "Cancelled"
+msgstr "Cancellate"
+
+#: Public/modules/calls_counts.php:91
+msgid "Congestion"
+msgstr "Congestione"
+
+#: Public/modules/calls_counts.php:92
+msgid "Unavailable"
+msgstr "Non disponibile"
+
+#: Public/modules/calls_counts.php:96
+#: Public/modules/calls_lastmonth.php:152
+#: Public/call-log-customers.php:126
+#: Public/call-count-reporting.php:89
+#: Public/call-dnid.php:114
+msgid "Sell"
+msgstr "Vendita"
+
+#: Public/modules/calls_counts.php:102
+#: Public/modules/calls_lastmonth.php:154
+msgid "Profit"
+msgstr "Profitto"
+
+#: Public/modules/calls_counts.php:106
+msgid "sec"
+msgstr "sec"
+
+#: Public/modules/calls_lastmonth.php:148
+msgid "Call type :"
+msgstr "Tipo Chiamata"
+
+#: Public/modules/calls_lastmonth.php:150
+msgid "Incomplete"
+msgstr "Incompleto"
+
+#: Public/modules/customers_numbers.php:73
+msgid "Total Number of Accounts "
+msgstr "Numero Totale di Accounts"
+
+#: Public/modules/customers_numbers.php:75
+msgid "Total Number of Active Accounts "
+msgstr "Numero Totale di Accounts Attivi"
+
+#: Public/modules/customers_numbers.php:78
+msgid "Cancelled Accounts "
+msgstr "Accounts Eliminati"
+
+#: Public/modules/customers_numbers.php:81
+msgid "New Accounts "
+msgstr "Nuovi Accounts"
+
+#: Public/modules/customers_numbers.php:84
+msgid "Account not yet Activated"
+msgstr "Account non ancora attivato"
+
+#: Public/modules/customers_numbers.php:87
+msgid "Accounts Reserved"
+msgstr "Account Prenotato"
+
+#: Public/modules/customers_numbers.php:90
+msgid "Accounts Expired"
+msgstr "Account Scaduto"
+
+#: Public/modules/customers_numbers.php:93
+msgid "Accounts Suspended "
+msgstr "Account Sospeso"
+
+#: Public/modules/refills_lastmonth.php:118
+msgid "Number of Refills"
+msgstr "Numero di Ricariche"
+
+#: Public/modules/refills_lastmonth.php:119
+msgid "Total Amount of Refills"
+msgstr "Importo Totale delle Ricariche"
+
+#: Public/modules/system_info.php:79
+msgid "Operation System Version"
+msgstr "Versione Sistema Operativo"
+
+#: Public/modules/system_info.php:80
+msgid "Asterisk Version"
+msgstr "Versione Asterik"
+
+#: Public/modules/system_info.php:81
+msgid "PHP Version"
+msgstr "Versione PHP"
+
+#: Public/modules/system_info.php:83
+msgid "A2B DataBase Version"
+msgstr "Versione DataBase A2B"
+
+#: Public/modules/system_info.php:84
+msgid "User Interface"
+msgstr "Interfaccia Utente"
+
+#: Public/modules/system_info.php:85
+msgid "User Interface Path"
+msgstr "Percorso Interfaccia Utente"
+
+#: Public/modules/system_info.php:86
+msgid "Server Name"
+msgstr "Nome Server"
+
+#: Public/modules/system_info.php:87
+msgid "Server Ip Address"
+msgstr "Indirizzo IP Server"
+
+#: Public/modules/system_info.php:88
+msgid "You Ip Address"
+msgstr "Tuo indirizzo IP"
+
+#: Public/modules/system_info.php:90
+msgid "MYSQL"
+msgstr "MYSQL"
+
+#: Public/modules/news.php:68
+msgid "Last news"
+msgstr "Ultime notizie"
+
+#: Public/A2B_mass_mail.php:79
+#: Public/A2B_data_archiving.php:160
+msgid "Define specific criteria to search for cards created."
+msgstr "Definisci specifici criteri per cercare la scheda creata."
+
+#: Public/A2B_mass_mail.php:80
+msgid "Creation date / Month"
+msgstr "Data di creazione / Mese"
+
+#: Public/A2B_mass_mail.php:81
+msgid "Creation date / Day"
+msgstr "Data di creazione / Giorno"
+
+#: Public/A2B_mass_mail.php:83
+#: Public/form_data/FG_var_did_destination.inc:74
+#: Public/form_data/FG_var_card.inc:232
+#: Public/form_data/FG_var_card.inc:324
+#: Public/form_data/FG_var_voucher.inc:99
+#: Public/form_data/FG_var_call.inc:44
+#: Public/form_data/FG_var_campaign.inc:73
+#: Public/form_data/FG_var_logrefill.inc:74
+#: Public/form_data/FG_var_charge.inc:72
+#: Public/form_data/FG_var_payment.inc:92
+#: Public/form_data/FG_var_subscriber.inc:51
+#: Public/form_data/FG_var_statuslog.inc:94
+#: Public/form_data/FG_var_ticket.inc:76
+#: Public/form_data/FG_var_ticket.inc:105
+#: Public/form_data/FG_var_callerid.inc:56
+#: Public/A2B_data_archiving.php:141
+#: Public/A2B_data_archiving.php:174
+#: Public/A2B_card_info.php:93
+#: Public/A2B_refill_info.php:77
+#: Public/A2B_payment_info.php:77
+msgid "ACCOUNT NUMBER"
+msgstr "NUMERO ACCOUNT"
+
+#: Public/A2B_mass_mail.php:84
+#: Public/form_data/FG_var_invoice.inc:123
+#: Public/form_data/FG_var_logrefill_agent.inc:88
+#: Public/form_data/FG_var_card.inc:135
+#: Public/form_data/FG_var_card.inc:234
+#: Public/form_data/FG_var_agent.inc:98
+#: Public/form_data/FG_var_agent.inc:109
+#: Public/form_data/FG_var_remittance_request.inc:84
+#: Public/form_data/FG_var_logrefill.inc:75
+#: Public/form_data/FG_var_payment.inc:93
+#: Public/form_data/FG_var_agentsituation.inc:57
+#: Public/form_data/FG_var_payment_agent.inc:87
+#: Public/form_data/FG_var_moneysituation.inc:45
+#: Public/form_data/FG_var_ticket_agent.inc:92
+#: Public/A2B_data_archiving.php:143
+#: Public/A2B_data_archiving.php:175
+msgid "LASTNAME"
+msgstr "NOME"
+
+#: Public/A2B_mass_mail.php:85
+#: Public/form_data/FG_var_log_viewer.inc:80
+#: Public/form_data/FG_var_logrefill_agent.inc:87
+#: Public/form_data/FG_var_card.inc:133
+#: Public/form_data/FG_var_card.inc:235
+#: Public/form_data/FG_var_user.inc:106
+#: Public/form_data/FG_var_user.inc:137
+#: Public/form_data/FG_var_agent.inc:96
+#: Public/form_data/FG_var_agent.inc:106
+#: Public/form_data/FG_var_agent.inc:150
+#: Public/form_data/FG_var_remittance_request.inc:83
+#: Public/form_data/FG_var_agentsituation.inc:56
+#: Public/form_data/FG_var_payment_agent.inc:86
+#: Public/form_data/FG_var_ticket_agent.inc:69
+#: Public/form_data/FG_var_ticket_agent.inc:91
+#: Public/A2B_data_archiving.php:176
+#: Public/A2B_admin_info.php:79
+#: Public/A2B_agent_info.php:77
+msgid "LOGIN"
+msgstr "LOGIN"
+
+#: Public/A2B_mass_mail.php:86
+#: Public/form_data/FG_var_card.inc:236
+#: Public/A2B_data_archiving.php:177
+msgid "MACADDRESS"
+msgstr "MACADDRESS"
+
+#: Public/A2B_mass_mail.php:87
+#: Public/A2B_mass_mail.php:333
+#: Public/form_data/FG_var_card.inc:153
+#: Public/form_data/FG_var_card.inc:233
+#: Public/form_data/FG_var_card.inc:412
+#: Public/form_data/FG_var_user.inc:236
+#: Public/form_data/FG_var_agent.inc:326
+#: Public/form_data/FG_var_support.inc:71
+#: Public/form_data/FG_var_support.inc:101
+#: Public/A2B_data_archiving.php:178
+#: Public/A2B_admin_info.php:144
+#: Public/A2B_card_info.php:290
+#: Public/A2B_agent_info.php:161
+msgid "EMAIL"
+msgstr "EMAIL"
+
+#: Public/A2B_mass_mail.php:88
+#: Public/A2B_data_archiving.php:179
+msgid "CUSTOMER ID (SERIAL)"
+msgstr "ID UTENTE (SERIALE)"
+
+#: Public/A2B_mass_mail.php:89
+#: Public/form_data/FG_var_card.inc:239
+#: Public/form_data/FG_var_agent.inc:110
+#: Public/form_data/FG_var_voucher.inc:80
+#: Public/form_data/FG_var_voucher.inc:101
+#: Public/form_data/FG_var_agentsituation.inc:43
+#: Public/form_data/FG_var_moneysituation.inc:47
+#: Public/A2B_data_archiving.php:180
+#: Public/A2B_entity_voucher.php:219
+msgid "CREDIT"
+msgstr "CREDITO"
+
+#: Public/A2B_mass_mail.php:90
+#: Public/form_data/FG_var_card.inc:240
+#: Public/A2B_data_archiving.php:181
+msgid "INUSE"
+msgstr "IN USO"
+
+#: Public/A2B_mass_mail.php:93
+#: Public/form_data/FG_var_card.inc:244
+#: Public/form_data/FG_var_card.inc:250
+#: Public/A2B_data_archiving.php:184
+#: Public/A2B_data_archiving.php:190
+msgid "SELECT LANGUAGE"
+msgstr "SELEZIONA LINGUA"
+
+#: Public/A2B_mass_mail.php:94
+#: Public/form_data/FG_var_card.inc:245
+#: Public/A2B_data_archiving.php:185
+msgid "SELECT TARIFF"
+msgstr "SELEZIONA TARIFFA"
+
+#: Public/A2B_mass_mail.php:95
+#: Public/form_data/FG_var_trunk.inc:115
+#: Public/form_data/FG_var_card.inc:246
+#: Public/form_data/FG_var_voucher.inc:104
+#: Public/form_data/FG_var_phonenumber.inc:85
+#: Public/A2B_data_archiving.php:186
+#: Public/A2B_entity_statuslog.php:225
+msgid "SELECT STATUS"
+msgstr "SELEZIONA STATO"
+
+#: Public/A2B_mass_mail.php:96
+#: Public/form_data/FG_var_card.inc:247
+#: Public/A2B_data_archiving.php:187
+msgid "SELECT ACCESS"
+msgstr "SELEZIONA ACCESSO"
+
+#: Public/A2B_mass_mail.php:97
+#: Public/form_data/FG_var_card.inc:249
+#: Public/form_data/FG_var_voucher.inc:106
+#: Public/A2B_data_archiving.php:189
+msgid "SELECT CURRENCY"
+msgstr "SELEZIONA VALUTA"
+
+#: Public/A2B_mass_mail.php:178
+#: Public/form_data/FG_var_mailtemplate.inc:205
+msgid "The followings tags will be replaced in the message by the value in the database."
+msgstr "I seguenti tags saranno sostituiti nel messaggio col valore del database."
+
+#: Public/A2B_mass_mail.php:179
+msgid "email of the customer"
+msgstr "email dell'utente"
+
+#: Public/A2B_mass_mail.php:180
+msgid "firstname of the customer"
+msgstr "nome dell'utente"
+
+#: Public/A2B_mass_mail.php:181
+msgid "lastname of the customer"
+msgstr "cognome dell'utente"
+
+#: Public/A2B_mass_mail.php:182
+msgid "credit of the customer in the system currency"
+msgstr "credito dell'utente nella valuta di sitema"
+
+#: Public/A2B_mass_mail.php:183
+msgid "credit of the customer in the own currency"
+msgstr "credito dell'utente nella propria valuta"
+
+#: Public/A2B_mass_mail.php:184
+msgid "currency of the customer"
+msgstr "valuta dell'utente"
+
+#: Public/A2B_mass_mail.php:185
+msgid "card number of the customer"
+msgstr "numero scheda dell'utente"
+
+#: Public/A2B_mass_mail.php:186
+msgid "password of the customer"
+msgstr "password dell'utente"
+
+#: Public/A2B_mass_mail.php:187
+msgid "login of the customer"
+msgstr "login dell'utente"
+
+#: Public/A2B_mass_mail.php:188
+msgid "credit notification of the customer"
+msgstr "notificazione credito dell'utente"
+
+#: Public/A2B_mass_mail.php:189
+msgid "base currency of system"
+msgstr "valuta di base del sitema"
+
+#: Public/A2B_mass_mail.php:211
+#: Public/A2B_entity_card.php:186
+#: Public/A2B_data_archiving.php:224
+msgid "SEARCH CUSTOMERS"
+msgstr "CERCA UTENTI"
+
+#: Public/A2B_mass_mail.php:237
+msgid "The e-mail has been sent to "
+msgstr "L'email &egrave stata inviata;"
+
+#: Public/A2B_mass_mail.php:237
+msgid " customer(s)!"
+msgstr " utente(i)!"
+
+#: Public/A2B_mass_mail.php:241
+msgid "There is some error sending e-mail :"
+msgstr "Ci sono errori inviando l'email"
+
+#: Public/A2B_mass_mail.php:262
+msgid "The mass mail tool is limited to 2000 mails. You can use the search module to send on different group of customer and overpass this limit."
+msgstr "Le email di massa sono limitate a 2000. Usa il modulo 'cerca' per inviare a differenti gruppi ed oltrepassare questo limite"
+
+#: Public/A2B_mass_mail.php:269
+#: Public/CC_ratecard_merging.php:232
+msgid "Record(s)"
+msgstr "Record(s)"
+
+#: Public/A2B_mass_mail.php:275
+#: Public/card-history.php:196
+msgid "TO"
+msgstr "A"
+
+#: Public/A2B_mass_mail.php:289
+msgid "Click on list customer to see them all"
+msgstr "Clicca sulla lista utenti per vederli tutti"
+
+#: Public/A2B_mass_mail.php:301
+msgid ">LOAD TEMPLATE<"
+msgstr ">CARICA MODELLO<"
+
+#: Public/A2B_mass_mail.php:305
+msgid "EMAIL FROM"
+msgstr "MITTENTE"
+
+#: Public/A2B_mass_mail.php:311
+#: Public/form_data/FG_var_mailtemplate.inc:156
+msgid "FROM NAME"
+msgstr "DA (nome)"
+
+#: Public/A2B_mass_mail.php:323
+msgid "MESSAGE"
+msgstr "MESSAGGIO"
+
+#: Public/A2B_mass_mail.php:340
+msgid "No Record Found!"
+msgstr "Nessun Record Trovato!"
+
+#: Public/CC_card_import_analyse.php:110
+#: Public/A2B_phonelist_import_analyse.php:105
+#: Public/CC_ratecard_import_analyse.php:105
+#: Public/A2B_entity_did_import_analyse.php:125
+msgid "File Save Failed, FILE="
+msgstr "Salvataggio file fallito, FILE="
+
+#: Public/CC_card_import_analyse.php:126
+#: Public/A2B_entity_did_import_analyse.php:141
+msgid "THE FILE DOESNOT EXIST"
+msgstr "IL FILE NON ESISTE"
+
+#: Public/CC_card_import_analyse.php:265
+msgid "The first line of your import is previewed below, please check to ensure that every is correct."
+msgstr "La prima riga della tua importazione &egrave visualizzata sotto, controlla che sia tutto corretto"
+
+#: Public/CC_card_import_analyse.php:272
+#: Public/A2B_phonelist_import_analyse.php:243
+#: Public/CC_ratecard_import_analyse.php:270
+#: Public/A2B_entity_did_import_analyse.php:300
+msgid "FIELD"
+msgstr "CAMPI"
+
+#: Public/CC_card_import_analyse.php:275
+#: Public/form_data/FG_var_transactions_agent.inc:56
+#: Public/form_data/FG_var_currencies.inc:50
+#: Public/form_data/FG_var_currencies.inc:84
+#: Public/form_data/FG_var_transactions.inc:56
+#: Public/form_data/FG_var_config.inc:154
+#: Public/form_data/FG_var_config.inc:204
+#: Public/form_data/FG_var_config.inc:212
+#: Public/A2B_entity_config.php:112
+#: Public/A2B_phonelist_import_analyse.php:246
+#: Public/CC_ratecard_import_analyse.php:273
+#: Public/A2B_entity_did_import_analyse.php:303
+msgid "VALUE"
+msgstr "VALORE"
+
+#: Public/CC_card_import_analyse.php:306
+#: Public/A2B_entity_did_import_analyse.php:344
+msgid "Please check if the datas above are correct"
+msgstr "Verifica se i dati sopra sono corretti"
+
+#: Public/CC_card_import_analyse.php:306
+#: Public/A2B_phonelist_import_analyse.php:283
+#: Public/CC_ratecard_import_analyse.php:311
+#: Public/A2B_entity_did_import_analyse.php:344
+msgid "If Yes"
+msgstr "Se Si"
+
+#: Public/CC_card_import_analyse.php:306
+#: Public/A2B_phonelist_import_analyse.php:283
+#: Public/CC_ratecard_import_analyse.php:311
+#: Public/A2B_entity_did_import_analyse.php:344
+msgid "you can continue the import. Otherwise you must fix your csv file!"
+msgstr "puoi continuare l'importazione. Altrimenti modifica il tuo file csv!"
+
+#: Public/CC_card_import_analyse.php:318
+msgid "Continue to Import the CARD's"
+msgstr "Continua l'importazione delle SCHEDE"
+
+#: Public/CC_card_import_analyse.php:351
+#: Public/A2B_phonelist_import_analyse.php:327
+#: Public/CC_ratecard_import_analyse.php:354
+msgid "Success"
+msgstr "Successo"
+
+#: Public/CC_card_import_analyse.php:351
+msgid "new cards have been imported."
+msgstr "le nuove scheda sono state importate."
+
+#: Public/CC_card_import_analyse.php:359
+#: Public/A2B_entity_did_import_analyse.php:398
+msgid "Line that has not been inserted!"
+msgstr "La riga non &egrave stata inserita!"
+
+#: Public/A2B_entity_invoice_conf.php:166
+msgid "Here you can configure information that you want to use to generate the invoice"
+msgstr "Qui puoi configurare le informazioni da usare per generare la fattura"
+
+#: Public/A2B_entity_invoice_conf.php:174
+msgid "Company Name"
+msgstr "Nome Societ&agrave"
+
+#: Public/A2B_entity_invoice_conf.php:178
+msgid "Insert your company name"
+msgstr "Inserire il nome della vostra societ&agrave"
+
+#: Public/A2B_entity_invoice_conf.php:183
+msgid "Address"
+msgstr "Indirizzo"
+
+#: Public/A2B_entity_invoice_conf.php:187
+msgid "Insert your address"
+msgstr "Inserisci il tuo indirizzo"
+
+#: Public/A2B_entity_invoice_conf.php:192
+msgid "Zip Code"
+msgstr "Codice Postale"
+
+#: Public/A2B_entity_invoice_conf.php:196
+msgid "Insert your zip code"
+msgstr "Inserisci il codice postale"
+
+#: Public/A2B_entity_invoice_conf.php:201
+msgid "City"
+msgstr "Citt&agrave"
+
+#: Public/A2B_entity_invoice_conf.php:205
+msgid "Insert your city"
+msgstr "Inserisci citt&agrave"
+
+#: Public/A2B_entity_invoice_conf.php:210
+msgid "Phone number"
+msgstr "Numero di telefono"
+
+#: Public/A2B_entity_invoice_conf.php:214
+msgid "Insert your phone number"
+msgstr "Inserisci il numero di telefono"
+
+#: Public/A2B_entity_invoice_conf.php:219
+msgid "Fax number"
+msgstr "Numero di Fax"
+
+#: Public/A2B_entity_invoice_conf.php:223
+msgid "Insert your fax number"
+msgstr "Inserisci il numero di fax"
+
+#: Public/A2B_entity_invoice_conf.php:228
+msgid "Email"
+msgstr "Email"
+
+#: Public/A2B_entity_invoice_conf.php:232
+msgid "Insert your email"
+msgstr "Insersci email"
+
+#: Public/A2B_entity_invoice_conf.php:237
+msgid "Web Site"
+msgstr "Sito Internet"
+
+#: Public/A2B_entity_invoice_conf.php:241
+msgid "Insert your Web site"
+msgstr "Insersci Sito Internet"
+
+#: Public/A2B_entity_invoice_conf.php:246
+msgid "VAT number"
+msgstr "Numero partita IVA"
+
+#: Public/A2B_entity_invoice_conf.php:250
+msgid "Insert your vat number"
+msgstr "Inserisci la partita IVA"
+
+#: Public/A2B_entity_invoice_conf.php:255
+msgid "Display Account number"
+msgstr "Visualizza Numero Account"
+
+#: Public/A2B_entity_invoice_conf.php:259
+msgid "YES"
+msgstr "SI"
+
+#: Public/A2B_entity_invoice_conf.php:260
+#: Public/form_data/FG_var_user.inc:110
+#: Public/form_data/FG_var_def_ratecard.inc:163
+#: Public/form_data/FG_var_voucher.inc:110
+#: Public/call-count-reporting.php:286
+msgid "NO"
+msgstr "NO"
+
+#: Public/A2B_entity_invoice_conf.php:262
+msgid "Choose if you want display the account number on the invoices"
+msgstr "Choissez si vous voulez afficher le numéro de compte sur les factures"
+
+#: Public/A2B_entity_invoice_conf.php:267
+#: Public/A2B_entity_password.php:158
+msgid "Save"
+msgstr "Salva"
+
+#: Public/A2B_entity_phonenumber.php:116
+#: Public/A2B_entity_card.php:121
+#: Public/A2B_entity_friend.php:98
+#: Public/A2B_entity_voucher.php:113
+msgid "Could not perform the batch update!"
+msgstr "Impossibile effettuare l'aggiornamento del lotto!"
+
+#: Public/A2B_entity_phonenumber.php:125
+#: Public/A2B_entity_card.php:136
+#: Public/A2B_entity_friend.php:108
+#: Public/A2B_entity_voucher.php:115
+msgid "The batch update has been successfully perform!"
+msgstr "L'aggiornamento del lotto &egrave stato eseguito con successo!"
+
+#: Public/A2B_entity_phonenumber.php:152
+msgid "SEARCH PHONENUMBER"
+msgstr "CERCA NUMERO di TELEFONO"
+
+#: Public/A2B_entity_phonenumber.php:152
+#: Public/A2B_entity_card.php:186
+#: Public/A2B_data_archiving.php:224
+#: Public/A2B_entity_invoice.php:87
+msgid "search activated"
+msgstr "cerca attivati"
+
+#: Public/A2B_entity_phonenumber.php:177
+#: Public/A2B_entity_card.php:225
+#: Public/A2B_entity_friend.php:269
+#: Public/A2B_entity_def_ratecard.php:304
+#: Public/A2B_entity_voucher.php:174
+msgid "BATCH UPDATE"
+msgstr "AGGIORNAMENTO LOTTO"
+
+#: Public/A2B_entity_phonenumber.php:181
+msgid "phonenumbers selected!"
+msgstr "numero telefono selezionato!"
+
+#: Public/A2B_entity_phonenumber.php:181
+msgid "Use the options below to batch update the selected phonenumbers."
+msgstr "Usa l'opzione seguente per aggiornare il lotto dei numeri telefonici selezionati."
+
+#: Public/A2B_entity_phonenumber.php:191
+msgid "Phonebook"
+msgstr "Rubrica"
+
+#: Public/A2B_entity_phonenumber.php:204
+msgid "Phonenumber"
+msgstr "Numero di telefono"
+
+#: Public/A2B_entity_phonenumber.php:214
+#: Public/form_data/FG_var_backup.inc:90
+#: Public/form_data/FG_var_currencies.inc:65
+msgid "Name"
+msgstr "Nome"
+
+#: Public/A2B_entity_phonenumber.php:225
+#: Public/form_data/FG_var_paymentlog.inc:101
+#: Public/form_data/FG_var_paymentlog_agent.inc:101
+msgid "Amount"
+msgstr "Importo"
+
+#: Public/A2B_entity_phonenumber.php:228
+#: Public/A2B_entity_card.php:293
+#: Public/A2B_entity_card.php:341
+#: Public/A2B_entity_voucher.php:222
+msgid "Equals"
+msgstr "Stessi"
+
+#: Public/A2B_entity_phonenumber.php:230
+#: Public/A2B_entity_card.php:295
+#: Public/A2B_entity_card.php:343
+#: Public/A2B_entity_def_ratecard.php:389
+#: Public/A2B_entity_def_ratecard.php:423
+#: Public/A2B_entity_voucher.php:224
+msgid "Subtract"
+msgstr "Sottratto"
+
+#: Public/A2B_entity_phonenumber.php:239
+#: Public/A2B_entity_card.php:249
+#: Public/form_data/FG_var_paymentlog.inc:99
+#: Public/form_data/FG_var_paymentlog_agent.inc:99
+#: Public/templates/default/main.tpl:83
+msgid "Status"
+msgstr "Stato"
+
+#: Public/A2B_entity_phonenumber.php:251
+#: Public/A2B_entity_card.php:450
+msgid "BATCH UPDATE CARD"
+msgstr "AGGIORNAMENTO LOTTO SCHEDE"
+
+#: Public/A2B_entity_phonenumber.php:290
+#: Public/form_data/FG_var_card.inc:701
+msgid "CAMPAIGN"
+msgstr "CAMPAGNA"
+
+#: Public/A2B_entity_phonenumber.php:296
+#: Public/form_data/FG_var_trunk.inc:104
+#: Public/form_data/FG_var_invoice.inc:105
+#: Public/form_data/FG_var_alarm.inc:74
+#: Public/form_data/FG_var_alarm.inc:158
+#: Public/form_data/FG_var_subscription.inc:62
+#: Public/form_data/FG_var_card.inc:145
+#: Public/form_data/FG_var_card.inc:587
+#: Public/form_data/FG_var_service.inc:87
+#: Public/form_data/FG_var_remittance_request.inc:72
+#: Public/form_data/FG_var_campaign.inc:74
+#: Public/form_data/FG_var_transactions_agent.inc:53
+#: Public/form_data/FG_var_receipt.inc:90
+#: Public/form_data/FG_var_transactions.inc:53
+#: Public/form_data/FG_var_outbound_cid.php:22
+#: Public/form_data/FG_var_statuslog.inc:96
+#: Public/form_data/FG_var_paymentlog.inc:149
+#: Public/form_data/FG_var_diduse.inc:85
+#: Public/form_data/FG_var_ticket.inc:82
+#: Public/form_data/FG_var_phonenumber.inc:63
+#: Public/form_data/FG_var_ticket_agent.inc:75
+#: Public/form_data/FG_var_callback.inc:62
+#: Public/form_data/FG_var_callback.inc:120
+#: Public/form_data/FG_var_paymentlog_agent.inc:149
+#: Public/A2B_entity_paymentlog.php:202
+#: Public/A2B_data_archiving.php:144
+#: Public/A2B_card_info.php:83
+#: Public/A2B_card_info.php:133
+#: Public/A2B_entity_paymentlog_agent.php:204
+msgid "STATUS"
+msgstr "STATO"
+
+#: Public/A2B_entity_phonenumber.php:316
+msgid "STARTED AND IN PROCESS"
+msgstr "AVVIATO E IN CORSO"
+
+#: Public/A2B_entity_phonenumber.php:317
+msgid "STARTED BUT NOT IN PROCESS : check the batch"
+msgstr "AVVIATO MA NON IN CORSO : controlla il lotto "
+
+#: Public/A2B_entity_phonenumber.php:318
+msgid "NOT STARTED"
+msgstr "NON AVVIATO"
+
+#: Public/A2B_entity_phonenumber.php:325
+msgid "RUN"
+msgstr "AVVIATO"
+
+#: Public/A2B_entity_phonenumber.php:326
+msgid "HOLD"
+msgstr "TRATTENUTA"
+
+#: Public/A2B_entity_phonenumber.php:327
+msgid "STOP"
+msgstr "STOP"
+
+#: Public/A2B_entity_phonenumber.php:328
+msgid "NO STATUS"
+msgstr "NESSUNO STATO"
+
+#: Public/export_csv.php:58
+msgid "ERROR CSV EXPORT"
+msgstr "ERRORE ESPORTAZIONE CSV"
+
+#: Public/call-last-month.php:89
+#: Public/A2B_entity_paymentlog.php:82
+#: Public/A2B_call_archiving.php:238
+#: Public/A2B_entity_log_viewer.php:96
+#: Public/A2B_entity_statuslog.php:98
+#: Public/A2B_entity_paymentlog_agent.php:84
+msgid "SELECT MONTH"
+msgstr "SELEZIONA IL MESE"
+
+#: Public/call-last-month.php:116
+msgid "Number of months to compare"
+msgstr "Numero di mesi da paragonare"
+
+#: Public/call-last-month.php:118
+#: Public/call-last-month.php:119
+#: Public/call-last-month.php:120
+#: Public/call-last-month.php:121
+#: Public/call-last-month.php:122
+#: Public/call-last-month.php:123
+msgid "months"
+msgstr "mesi"
+
+#: Public/call-last-month.php:163
+msgid "TRAFFIC"
+msgstr "TRAFFICO"
+
+#: Public/call-last-month.php:164
+#: Public/call-last-month.php:170
+#: Public/call-last-month.php:176
+msgid "Stat Graph"
+msgstr "Grafico Stato"
+
+#: Public/call-last-month.php:169
+#: Public/call-log-customers.php:1229
+#: Public/call-dnid.php:854
+msgid "PROFIT"
+msgstr "PROFITTO"
+
+#: Public/call-last-month.php:175
+#: Public/call-log-customers.php:1227
+#: Public/A2B_card_info.php:888
+#: Public/call-dnid.php:852
+msgid "SELL"
+msgstr "VENDITA"
+
+#: Public/CC_ticket_view.php:51
+msgid "Ticket updated successfully"
+msgstr "Ticket aggiornato con successo"
+
+#: Public/CC_ticket_view.php:58
+msgid "Ticket ID not found"
+msgstr "ID Ticket non trovato"
+
+#: Public/CC_ticket_view.php:99
+msgid "TICKET: "
+msgstr "TICKET: "
+
+#: Public/CC_ticket_view.php:100
+msgid "Number"
+msgstr "Numero"
+
+#: Public/CC_ticket_view.php:109
+msgid "BY : "
+msgstr "DA : "
+
+#: Public/CC_ticket_view.php:115
+msgid "PRIORITY : "
+msgstr "PRIORIT&Agrave : "
+
+#: Public/CC_ticket_view.php:118
+#: Public/A2B_invoice_edit.php:146
+#: Public/A2B_invoice_edit.php:321
+#: Public/A2B_receipt_edit.php:132
+#: Public/A2B_receipt_edit.php:233
+msgid "DATE : "
+msgstr "DATa : "
+
+#: Public/CC_ticket_view.php:123
+msgid "COMPONENT : "
+msgstr "COMPONENTE : "
+
+#: Public/CC_ticket_view.php:129
+#: Public/A2B_invoice_edit.php:167
+#: Public/A2B_invoice_edit.php:342
+#: Public/A2B_receipt_edit.php:138
+#: Public/A2B_receipt_edit.php:247
+msgid "DESCRIPTION : "
+msgstr "DESCRIZIONE : "
+
+#: Public/CC_ticket_view.php:159
+#: Public/A2B_invoice_edit.php:153
+msgid "STATUS : "
+msgstr "STATO : "
+
+#: Public/CC_ticket_view.php:178
+msgid "COMMENT : "
+msgstr "COMMENTO :"
+
+#: Public/CC_ticket_view.php:188
+#: Public/A2B_invoice_edit.php:350
+#: Public/A2B_agent_home.php:209
+#: Public/A2B_receipt_edit.php:255
+msgid "UPDATE"
+msgstr "AGGIORNAMENTO"
+
+#: Public/CC_ticket_view.php:202
+msgid "BY"
+msgstr "DA"
+
+#: Public/call-log-customers.php:56
+#: Public/call-dnid.php:57
+msgid "ERROR: Cannot download file "
+msgstr "ERRORE: Non posso scaricare il file."
+
+#: Public/call-log-customers.php:97
+#: Public/call-dnid.php:100
+msgid "STANDARD"
+msgstr "STANDARD"
+
+#: Public/call-log-customers.php:98
+#: Public/call-dnid.php:100
+msgid "SIP/IAX"
+msgstr "SIP/IAX"
+
+#: Public/call-log-customers.php:99
+#: Public/call-dnid.php:101
+msgid "DIDCALL"
+msgstr "CHIAMATA DID"
+
+#: Public/call-log-customers.php:100
+#: Public/call-dnid.php:101
+msgid "DID_VOIP"
+msgstr "VOIP_DID"
+
+#: Public/call-log-customers.php:101
+#: Public/A2B_card_info.php:175
+#: Public/call-dnid.php:101
+#: Public/templates/default/main.tpl:417
+msgid "CALLBACK"
+msgstr "CALLBACK"
+
+#: Public/call-log-customers.php:102
+#: Public/call-dnid.php:102
+msgid "PREDICT"
+msgstr "PREVISTO"
+
+#: Public/call-log-customers.php:103
+msgid "AUTO DIALER"
+msgstr "AUTO CHIAMATA"
+
+#: Public/call-log-customers.php:104
+msgid "DID-ALEG"
+msgstr "ALLEG.-DID"
+
+#: Public/call-log-customers.php:113
+#: Public/A2B_invoice_view.php:194
+#: Public/A2B_invoice_view.php:217
+#: Public/card-history.php:64
+#: Public/A2B_receipt_view.php:192
+#: Public/A2B_receipt_view.php:213
+msgid "Date"
+msgstr "DATa"
+
+#: Public/call-log-customers.php:114
+#: Public/A2B_entity_friend.php:283
+msgid "CallerID"
+msgstr "ID Chiamante:"
+
+#: Public/call-log-customers.php:115
+#: Public/call-log-customers.php:706
+#: Public/call-dnid.php:108
+#: Public/call-dnid.php:532
+#: Public/templates/default/main.tpl:180
+msgid "DNID"
+msgstr "DNID"
+
+#: Public/call-log-customers.php:116
+#: Public/form_data/FG_var_phonenumber.inc:93
+msgid "Phone Number"
+msgstr "Numero di telefono"
+
+#: Public/call-log-customers.php:118
+#: Public/call-dnid.php:378
+msgid "Buy Rate"
+msgstr "Prezzo Acquisto"
+
+#: Public/call-log-customers.php:119
+#: Public/call-dnid.php:380
+msgid "Sell Rate"
+msgstr "Prezzo Vendita"
+
+#: Public/call-log-customers.php:121
+msgid "Account"
+msgstr "Account"
+
+#: Public/call-log-customers.php:123
+msgid "Terminate Cause"
+msgstr "Causa Terminazione"
+
+#: Public/call-log-customers.php:123
+msgid "TC"
+msgstr "CT"
+
+#: Public/call-log-customers.php:124
+msgid "CallType"
+msgstr "Tipo Chiamata"
+
+#: Public/call-log-customers.php:125
+#: Public/call-count-reporting.php:90
+#: Public/call-dnid.php:113
+msgid "Buy"
+msgstr "Acquista"
+
+#: Public/call-log-customers.php:127
+#: Public/call-pnl-report.php:490
+#: Public/call-pnl-report.php:564
+msgid "Margin"
+msgstr "Margine"
+
+#: Public/call-log-customers.php:128
+msgid "Markup"
+msgstr "Ricarico"
+
+#: Public/call-log-customers.php:156
+#: Public/call-daily-load.php:89
+msgid " - Call Logs - "
+msgstr " - Logs Chiamate - "
+
+#: Public/call-log-customers.php:393
+msgid "Enter the customer number"
+msgstr "Inserire numero utente"
+
+#: Public/call-log-customers.php:500
+#: Public/call-log-customers.php:572
+#: Public/call-dnid.php:432
+#: Public/call-dnid.php:481
+msgid "Time :"
+msgstr "Ora:"
+
+#: Public/call-log-customers.php:532
+#: Public/A2B_entity_paymentlog.php:110
+#: Public/A2B_entity_paymentlog.php:170
+#: Public/call-count-reporting.php:195
+#: Public/A2B_call_archiving.php:266
+#: Public/A2B_call_archiving.php:326
+#: Public/A2B_entity_log_viewer.php:124
+#: Public/A2B_entity_log_viewer.php:184
+#: Public/A2B_entity_statuslog.php:126
+#: Public/A2B_entity_statuslog.php:186
+#: Public/A2B_detail_package.php:342
+#: Public/call-dnid.php:452
+#: Public/A2B_trunk_report.php:202
+#: Public/call-pnl-report.php:211
+#: Public/A2B_entity_paymentlog_agent.php:112
+#: Public/A2B_entity_paymentlog_agent.php:172
+msgid "To"
+msgstr "A "
+
+#: Public/call-log-customers.php:602
+#: Public/form_data/FG_var_phonenumber.inc:59
+#: Public/form_data/FG_var_phonenumber.inc:80
+msgid "PHONENUMBER"
+msgstr "NUM-TEL"
+
+#: Public/call-log-customers.php:653
+#: Public/form_data/FG_var_card.inc:912
+#: Public/form_data/FG_var_friend.inc:65
+#: Public/form_data/FG_var_friend.inc:173
+#: Public/form_data/FG_var_callback.inc:249
+#: Public/form_data/FG_var_callerid.inc:55
+#: Public/form_data/FG_var_callerid.inc:74
+msgid "CALLERID"
+msgstr "ID CHIAMANTE"
+
+#: Public/call-log-customers.php:760
+#: Public/call-dnid.php:546
+msgid "CALL TYPE"
+msgstr "TIPO CHIAMATA"
+
+#: Public/call-log-customers.php:774
+#: Public/call-dnid.php:552
+msgid "ALL CALLS"
+msgstr "TUTTE LE CHIAMATE"
+
+#: Public/call-log-customers.php:800
+#: Public/call-count-reporting.php:251
+#: Public/A2B_call_archiving.php:407
+#: Public/call-dnid.php:569
+msgid "OPTIONS"
+msgstr "OPZIONI"
+
+#: Public/call-log-customers.php:809
+#: Public/call-dnid.php:575
+msgid "SHOW CALLS"
+msgstr "MOSTRA CHIAMATE"
+
+#: Public/call-log-customers.php:821
+#: Public/call-dnid.php:579
+msgid "ANSWERED"
+msgstr "RISPOSTE"
+
+#: Public/call-log-customers.php:830
+#: Public/call-dnid.php:582
+msgid "ALL"
+msgstr "TUTTE"
+
+#: Public/call-log-customers.php:839
+#: Public/call-dnid.php:585
+msgid "NOT COMPLETED"
+msgstr "NON COMPLETATA"
+
+#: Public/call-log-customers.php:848
+#: Public/call-dnid.php:588
+msgid "CONGESTIONED"
+msgstr "CONGESTIONE"
+
+#: Public/call-log-customers.php:857
+#: Public/call-dnid.php:591
+msgid "BUSIED"
+msgstr "OCCUPATO"
+
+#: Public/call-log-customers.php:866
+#: Public/call-dnid.php:594
+msgid "NOT ANSWERED"
+msgstr "NON RISPOSTA"
+
+#: Public/call-log-customers.php:875
+#: Public/call-dnid.php:597
+msgid "CHANNEL UNAVAILABLE"
+msgstr "CANALE NON DISPONIBILE"
+
+#: Public/call-log-customers.php:884
+#: Public/call-dnid.php:600
+msgid "CANCELED"
+msgstr "ANNULLATA"
+
+#: Public/call-log-customers.php:892
+#: Public/call-count-reporting.php:292
+#: Public/A2B_call_archiving.php:424
+#: Public/call-dnid.php:608
+msgid "RESULT"
+msgstr "RISULATO"
+
+#: Public/call-log-customers.php:897
+#: Public/A2B_call_archiving.php:427
+#: Public/call-dnid.php:611
+msgid "mins"
+msgstr "min"
+
+#: Public/call-log-customers.php:906
+#: Public/A2B_call_archiving.php:427
+#: Public/call-dnid.php:611
+msgid "secs"
+msgstr "sec"
+
+#: Public/call-log-customers.php:917
+#: Public/form_data/FG_var_card.inc:148
+#: Public/form_data/FG_var_card.inc:578
+#: Public/form_data/FG_var_agent.inc:99
+#: Public/form_data/FG_var_agent.inc:112
+#: Public/form_data/FG_var_agent.inc:211
+#: Public/form_data/FG_var_voucher.inc:87
+#: Public/form_data/FG_var_voucher.inc:167
+#: Public/form_data/FG_var_transactions_agent.inc:55
+#: Public/form_data/FG_var_currencies.inc:48
+#: Public/form_data/FG_var_transactions.inc:55
+#: Public/call-count-reporting.php:303
+#: Public/A2B_data_archiving.php:147
+#: Public/A2B_call_archiving.php:432
+#: Public/A2B_card_info.php:341
+#: Public/call-dnid.php:616
+#: Public/A2B_entity_voucher.php:233
+#: Public/A2B_agent_info.php:194
+msgid "CURRENCY"
+msgstr "VALUTA"
+
+#: Public/call-log-customers.php:963
+#: Public/call-dnid.php:648
+msgid "Number of call"
+msgstr "Numero di chiamate"
+
+#: Public/call-log-customers.php:1132
+#: Public/A2B_detail_package.php:527
+msgid "Previous"
+msgstr "Precedente"
+
+#: Public/call-log-customers.php:1185
+msgid "Thanks to A2Billing, you have made a profit of over 500 euro !"
+msgstr "Grazie ad A2Billing, hai avuto un profitto di oltre 500 euro !"
+
+#: Public/call-log-customers.php:1186
+msgid "Support A2Billing by clicking on the Donate button bellow :"
+msgstr "Supporta A2Billing cliccando sul tasto 'Donate' :"
+
+#: Public/call-log-customers.php:1215
+#: Public/call-dnid.php:843
+msgid "TRAFFIC SUMMARY"
+msgstr "SOMMARIO TRAFFICO"
+
+#: Public/call-log-customers.php:1220
+#: Public/call-dnid.php:847
+msgid "DUR"
+msgstr "DUR"
+
+#: Public/call-log-customers.php:1224
+#: Public/call-dnid.php:850
+msgid "AVERAGE LENGTH OF CALL"
+msgstr "TEMPO MEDIO DI CHIAMATA"
+
+#: Public/call-log-customers.php:1224
+#: Public/call-dnid.php:850
+msgid "ALOC"
+msgstr "TMDC"
+
+#: Public/call-log-customers.php:1226
+#: Public/call-dnid.php:851
+msgid "ANSWER SEIZE RATIO"
+msgstr "RAPPORTO CHIAMATE RISPOSTE"
+
+#: Public/call-log-customers.php:1226
+#: Public/call-dnid.php:851
+msgid "ASR"
+msgstr "RCR"
+
+#: Public/call-log-customers.php:1228
+#: Public/A2B_card_info.php:885
+#: Public/call-dnid.php:853
+msgid "BUY"
+msgstr "ACQUISTO"
+
+#: Public/call-log-customers.php:1230
+#: Public/call-dnid.php:855
+msgid "MARGIN"
+msgstr "MARGINE"
+
+#: Public/call-log-customers.php:1231
+#: Public/call-dnid.php:856
+msgid "MARKUP"
+msgstr "RICARICO"
+
+#: Public/A2B_entity_password.php:79
+msgid "No value in New Password entered"
+msgstr "Nessun valore in Nuova Password immesso"
+
+#: Public/A2B_entity_password.php:85
+msgid "No Value in Confirm New Password entered"
+msgstr "Nessun valore in Conferma Nuova Password immesso"
+
+#: Public/A2B_entity_password.php:91
+msgid "Password length should be greater than or equal to 5"
+msgstr "I caratteri della Password devono essere almeno 5"
+
+#: Public/A2B_entity_password.php:97
+msgid "Value mismatch, New Password should be equal to Confirm New Password"
+msgstr "Non coincidente, Nuova Password deve essere uguale a Conferma Nuova Password"
+
+#: Public/A2B_entity_password.php:113
+msgid "Your password is updated successfully."
+msgstr "La tua password &egrave stata aggiornata con successo."
+
+#: Public/A2B_entity_password.php:120
+msgid "Wrong old password."
+msgstr "La tua vecchia password non &egrave corretta."
+
+#: Public/A2B_entity_password.php:126
+msgid "System is failed to update your password."
+msgstr "La mise &agrave; jour de votre mot de passe &agrave échoue. "
+
+#: Public/A2B_entity_password.php:137
+#: Public/templates/default/main.tpl:552
+msgid "Change Password"
+msgstr "Cambia Password"
+
+#: Public/A2B_entity_password.php:140
+msgid "Do not use \" or = characters in your password"
+msgstr "Non usare caratteri \" o = nella tua password"
+
+#: Public/A2B_entity_password.php:143
+msgid "Old Password"
+msgstr "Vecchia Password"
+
+#: Public/A2B_entity_password.php:147
+msgid "New Password"
+msgstr "Nuova Password"
+
+#: Public/A2B_entity_password.php:151
+msgid "Confirm Password"
+msgstr "Conferma Password"
+
+#: Public/A2B_phonelist_import.php:67
+msgid "Please, you must first select a phonebook !"
+msgstr "Seleziona prima una rubrica !"
+
+#: Public/A2B_phonelist_import.php:72
+#: Public/A2B_entity_did_import.php:89
+#: Public/CC_ratecard_import.php:77
+#: Public/CC_card_import.php:73
+msgid "Please, you must first select a file !"
+msgstr "Seleziona prima un file !"
+
+#: Public/A2B_phonelist_import.php:222
+msgid "New phonebooks have to be imported from a CSV file."
+msgstr "Le nuove rubriche devo essere importate da un file CSV."
+
+#: Public/A2B_phonelist_import.php:229
+msgid "Choose the phonebook to import"
+msgstr "Scegli una rubrica da importare"
+
+#: Public/A2B_phonelist_import.php:231
+msgid "Choose a phonebook"
+msgstr "Scegli una rubrica"
+
+#: Public/A2B_phonelist_import.php:243
+#: Public/A2B_entity_did_import.php:269
+#: Public/CC_ratecard_import.php:250
+#: Public/CC_card_import.php:231
+msgid "These fields are mandatory"
+msgstr "Questi campi sono obbligatori"
+
+#: Public/A2B_phonelist_import.php:246
+msgid "number"
+msgstr "numero"
+
+#: Public/A2B_phonelist_import.php:250
+#: Public/A2B_entity_did_import.php:277
+#: Public/CC_ratecard_import.php:259
+#: Public/CC_card_import.php:245
+msgid "Choose the additional fields to import from the CSV file"
+msgstr "Scegli i campi addizionali da importare dal file CSV"
+
+#: Public/A2B_phonelist_import.php:257
+#: Public/CC_ratecard_merging.php:269
+#: Public/A2B_entity_did_import.php:284
+#: Public/CC_ratecard_import.php:266
+#: Public/CC_card_import.php:252
+msgid "Unselected Fields..."
+msgstr "Campi non selezionati..."
+
+#: Public/A2B_phonelist_import.php:258
+msgid "name"
+msgstr "nome"
+
+#: Public/A2B_phonelist_import.php:259
+msgid "info"
+msgstr "info"
+
+#: Public/A2B_phonelist_import.php:271
+#: Public/CC_ratecard_merging.php:315
+#: Public/A2B_entity_did_import.php:301
+#: Public/CC_ratecard_import.php:317
+#: Public/CC_card_import.php:304
+msgid "Selected Fields..."
+msgstr "Campi Selezionati..."
+
+#: Public/A2B_phonelist_import.php:299
+msgid "Use the example below  to format the CSV file. Fields are separated by  ; or :"
+msgstr "Usa l'esempio sotto per creare il file CSV. I campi sono separati con ; o :"
+
+#: Public/A2B_phonelist_import.php:300
+#: Public/A2B_entity_did_import.php:322
+#: Public/CC_ratecard_import.php:349
+#: Public/CC_card_import.php:323
+msgid "(dot) . is used for decimal format."
+msgstr "il (punto) . &egrave usato per il formato decimale."
+
+#: Public/A2B_phonelist_import.php:304
+#: Public/A2B_entity_did_import.php:324
+#: Public/CC_ratecard_import.php:353
+#: Public/CC_card_import.php:325
+msgid "Complex Sample"
+msgstr "Esempio Complesso"
+
+#: Public/A2B_phonelist_import.php:305
+#: Public/A2B_entity_did_import.php:325
+#: Public/CC_ratecard_import.php:354
+#: Public/CC_card_import.php:326
+msgid "Simple Sample"
+msgstr "Esempio Semplice"
+
+#: Public/A2B_phonelist_import.php:321
+#: Public/A2B_entity_did_import.php:340
+#: Public/CC_ratecard_import.php:370
+#: Public/CC_card_import.php:341
+msgid "The maximum file size is "
+msgstr "La massima grandezza del file &egrave "
+
+#: Public/A2B_entity_card.php:129
+msgid "Could not perform refill log for the batch update!"
+msgstr "Non posso creare il log dell'aggiornamento lotto ricariche!"
+
+#: Public/A2B_entity_card.php:229
+#: Public/A2B_entity_friend.php:273
+msgid "cards selected!"
+msgstr "scheda selezionate!"
+
+#: Public/A2B_entity_card.php:229
+#: Public/A2B_entity_friend.php:273
+msgid "Use the options below to batch update the selected cards."
+msgstr "Usa l'opzione seguente per aggiornare il lotto delle scheda selezionate."
+
+#: Public/A2B_entity_card.php:239
+msgid "In use"
+msgstr "In uso"
+
+#: Public/A2B_entity_card.php:263
+#: Public/A2B_entity_translate.php:102
+msgid "Language"
+msgstr "Lingua"
+
+#: Public/A2B_entity_card.php:276
+msgid "Tariff"
+msgstr "Tariffa"
+
+#: Public/A2B_entity_card.php:290
+msgid "Credit"
+msgstr "Credito"
+
+#: Public/A2B_entity_card.php:310
+msgid "Access"
+msgstr "Accesso"
+
+#: Public/A2B_entity_card.php:322
+#: Public/A2B_entity_card_multi.php:289
+msgid "Currency"
+msgstr "Valuta"
+
+#: Public/A2B_entity_card.php:338
+msgid "Credit limit"
+msgstr "Limite di credito"
+
+#: Public/A2B_entity_card.php:352
+#: Public/A2B_entity_card_multi.php:310
+msgid "Enable expire"
+msgstr "Abilita scadenza"
+
+#: Public/A2B_entity_card.php:373
+msgid "Expiry date"
+msgstr "Data di scadenza"
+
+#: Public/A2B_entity_card.php:374
+#: Public/A2B_entity_card_multi.php:327
+msgid "(Format YYYY-MM-DD HH:MM:SS)"
+msgstr "(Format AAAA-MM-GG OO:MM:SS)"
+
+#: Public/A2B_entity_card.php:382
+msgid "Expiration days"
+msgstr "Giorni scadenza"
+
+#: Public/A2B_entity_card.php:392
+#: Public/A2B_entity_card_multi.php:341
+msgid "Run service"
+msgstr "Avvia servizio"
+
+#: Public/A2B_entity_card.php:405
+msgid "Group this batch belongs to"
+msgstr "Il gruppo appartiene a questo lotto"
+
+#: Public/A2B_entity_card.php:422
+msgid "Set discount to"
+msgstr "Imposta sconto a"
+
+# pb
+#: Public/A2B_entity_card.php:436
+msgid "Move to Seria"
+msgstr "Sposta al Seriale"
+
+#: Public/A2B_entity_card.php:466
+msgid "Changes detected on SIP/IAX Friends"
+msgstr "Rilevati cambi al SIP/IAX Friends"
+
+#: Public/A2B_entity_card.php:471
+#: Public/A2B_entity_friend.php:222
+msgid "GENERATE ADDITIONAL_A2BILLING_SIP.CONF"
+msgstr "GENERATO ADDITIONAL_A2BILLING_SIP.CONF"
+
+#: Public/A2B_entity_card.php:475
+#: Public/A2B_entity_friend.php:224
+msgid "GENERATE ADDITIONAL_A2BILLING_IAX.CONF"
+msgstr "GENERATO ADDITIONAL_A2BILLING_IAX.CONF"
+
+#: Public/A2B_entity_card.php:507
+msgid "Change the Account Number Length"
+msgstr "Cambia la Lunghezza del Numero dell'Account"
+
+#: Public/A2B_entity_card.php:512
+#: Public/A2B_entity_card_multi.php:248
+msgid "Digits"
+msgstr "Cifre"
+
+#: Public/A2B_entity_did_use.php:78
+msgid "If you really want release this DID , Click on the \trelease button."
+msgstr "Se davvero si vuole rilasciare questo DID, Clicca sul pulsante \tRilascia."
+
+#: Public/A2B_entity_did_use.php:85
+msgid "Release the DID "
+msgstr "Rilascia il DID"
+
+#: Public/A2B_entity_did_use.php:121
+msgid "Enter the DID id"
+msgstr "Inserisci l'id DID"
+
+#: Public/A2B_entity_did_use.php:126
+msgid "Options"
+msgstr "Opzioni"
+
+#: Public/A2B_entity_did_use.php:129
+msgid "Show"
+msgstr "Mostra"
+
+#: Public/A2B_entity_did_use.php:129
+msgid "Dids in use"
+msgstr "Dids in uso"
+
+#: Public/A2B_entity_did_use.php:131
+msgid "All Dids"
+msgstr "Tutti i Dids"
+
+#: Public/form_data/FG_var_did.inc:42
+msgid "Add DID"
+msgstr "Aggiungi DID"
+
+#: Public/form_data/FG_var_did.inc:59
+#: Public/form_data/FG_var_did.inc:104
+#: Public/form_data/FG_var_did_destination.inc:73
+#: Public/form_data/FG_var_did_destination.inc:135
+#: Public/form_data/FG_var_card_group.inc:88
+#: Public/form_data/FG_var_user.inc:84
+#: Public/form_data/FG_var_did_billing.inc:48
+#: Public/form_data/FG_var_diduse.inc:79
+#: Public/A2B_entity_did_import.php:272
+#: Public/A2B_card_info.php:961
+msgid "DID"
+msgstr "DID"
+
+#: Public/form_data/FG_var_did.inc:60
+#: Public/form_data/FG_var_ticket.inc:75
+#: Public/card-history.php:151
+msgid "CUSTOMER"
+msgstr "UTENTE"
+
+#: Public/form_data/FG_var_did.inc:61
+#: Public/form_data/FG_var_did.inc:114
+#: Public/form_data/FG_var_user.inc:76
+#: Public/form_data/FG_var_agent.inc:71
+#: Public/templates/default/main.tpl:302
+msgid "BILLING"
+msgstr "FATTURAZIONE"
+
+#: Public/form_data/FG_var_did.inc:62
+#: Public/form_data/FG_var_did.inc:123
+#: Public/form_data/FG_var_subscription.inc:132
+#: Public/form_data/FG_var_def_ratecard.inc:172
+#: Public/form_data/FG_var_def_ratecard.inc:473
+#: Public/form_data/FG_var_tariffplan.inc:62
+#: Public/form_data/FG_var_tariffplan.inc:100
+#: Public/form_data/FG_var_subscriber.inc:104
+msgid "START DATE"
+msgstr "DATA INIZIO"
+
+#: Public/form_data/FG_var_did.inc:63
+#: Public/form_data/FG_var_did.inc:141
+#: Public/form_data/FG_var_card.inc:538
+msgid "DIDGROUP"
+msgstr "GRUPPO DID"
+
+#: Public/form_data/FG_var_did.inc:64
+#: Public/form_data/FG_var_did.inc:151
+#: Public/form_data/FG_var_card.inc:455
+#: Public/form_data/FG_var_user.inc:210
+#: Public/form_data/FG_var_agent.inc:308
+#: Public/A2B_admin_info.php:135
+#: Public/A2B_card_info.php:281
+#: Public/A2B_agent_info.php:152
+msgid "COUNTRY"
+msgstr "NAZIONE"
+
+#: Public/form_data/FG_var_did.inc:66
+#: Public/form_data/FG_var_did_destination.inc:78
+#: Public/form_data/FG_var_trunk.inc:103
+#: Public/form_data/FG_var_tariffplan.inc:65
+msgid "MINUTES USED"
+msgstr "MINUTI UTILIZZATI"
+
+#: Public/form_data/FG_var_did.inc:66
+msgid "MU"
+msgstr "MU"
+
+#: Public/form_data/FG_var_did.inc:67
+msgid "RES"
+msgstr "RIS"
+
+#: Public/form_data/FG_var_did.inc:68
+#: Public/form_data/FG_var_did.inc:171
+msgid "MONTHLY RATE"
+msgstr "TARIFFA MENSILE"
+
+#: Public/form_data/FG_var_did.inc:68
+msgid "MR"
+msgstr "TM"
+
+#: Public/form_data/FG_var_did.inc:69
+#: Public/form_data/FG_var_did.inc:193
+#: Public/form_data/FG_var_def_ratecard.inc:261
+msgid "SELLING RATE"
+msgstr "PREZZO VENDITA"
+
+#: Public/form_data/FG_var_did.inc:69
+#: Public/form_data/FG_var_def_ratecard.inc:120
+msgid "SR"
+msgstr "PV"
+
+#: Public/form_data/FG_var_did.inc:74
+#: Public/form_data/FG_var_payment_configuration.inc:53
+#: Public/form_data/FG_var_config_group.inc:67
+#: Public/form_data/FG_var_paymentlog.inc:108
+#: Public/form_data/FG_var_config.inc:160
+#: Public/form_data/FG_var_paymentlog_agent.inc:108
+msgid "THERE ARE NO "
+msgstr "NON CI SONO "
+
+#: Public/form_data/FG_var_did.inc:110
+#: Public/form_data/FG_var_did_destination.inc:117
+msgid "Insert the DID"
+msgstr "Inserisci il DID"
+
+#: Public/form_data/FG_var_did.inc:112
+msgid "Define the DID's. If you ADD a new DID, NOT an EDIT, you can define a range of DID. <br>80412340210-80412340218 would add all DID's between the range, whereas DIDs separated by a comma e.g. 80412340210,80412340212,80412340214 would only add the individual DID listed."
+msgstr "Definisci i DID's. Quando aggiungi un nuovo DID, non quando lo editi, puoi definire una serie di DID. <br>80412340210-80412340218 aggiunger&agrave tutto l'intervallo di DID's, mentre DIDs separati da una virgola, es.: 80412340210,80412340212,80412340214 saranno aggiunti individualmente"
+
+#: Public/form_data/FG_var_did.inc:129
+#: Public/form_data/FG_var_def_ratecard.inc:479
+#: Public/form_data/FG_var_tariffplan.inc:106
+#: Public/form_data/FG_var_campaign.inc:177
+msgid "Insert the starting date"
+msgstr "Inserisci la data di inizio"
+
+#: Public/form_data/FG_var_did.inc:130
+#: Public/form_data/FG_var_did.inc:139
+#: Public/form_data/FG_var_def_ratecard.inc:480
+#: Public/form_data/FG_var_voucher.inc:193
+#: Public/form_data/FG_var_tariffplan.inc:116
+msgid "Format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"
+msgstr "Formato AAAA-MM-GG OO:MM:SS. Per esempio, '2004-12-31 00:23:00'"
+
+#: Public/form_data/FG_var_did.inc:132
+#: Public/form_data/FG_var_card.inc:742
+#: Public/form_data/FG_var_voucher.inc:186
+#: Public/form_data/FG_var_tariffplan.inc:63
+#: Public/form_data/FG_var_tariffplan.inc:109
+msgid "EXPIRY DATE"
+msgstr "DATA SCADENZA"
+
+#: Public/form_data/FG_var_did.inc:138
+#: Public/form_data/FG_var_card.inc:748
+#: Public/form_data/FG_var_voucher.inc:192
+#: Public/form_data/FG_var_tariffplan.inc:115
+#: Public/form_data/FG_var_campaign.inc:186
+msgid "Insert the expiration date"
+msgstr "Inserisci la data di scadenza"
+
+#: Public/form_data/FG_var_did.inc:168
+#: Public/form_data/FG_var_did_destination.inc:152
+#: Public/form_data/FG_var_voucher.inc:164
+#: Public/form_data/FG_var_callerid.inc:89
+msgid "Choose if you want to activate this card"
+msgstr "Choisissez si vous souhaitez activer cette carte"
+
+#: Public/form_data/FG_var_did.inc:177
+msgid "Insert the monthly rate"
+msgstr "Inserisci il canone mensile"
+
+#: Public/form_data/FG_var_did.inc:178
+#: Public/form_data/FG_var_card.inc:369
+#: Public/form_data/FG_var_card.inc:658
+#: Public/form_data/FG_var_agent.inc:200
+#: Public/form_data/FG_var_agent.inc:209
+#: Public/form_data/FG_var_agent.inc:234
+msgid "currency : "
+msgstr "valuta : "
+
+#: Public/form_data/FG_var_did.inc:179
+msgid "Define the renting cost for the customers."
+msgstr "Definisci il costo di locazione dell'utente."
+
+#: Public/form_data/FG_var_did.inc:182
+#: Public/form_data/FG_var_def_ratecard.inc:291
+msgid "CONNECT CHARGE"
+msgstr "SCATTO ALLA RISPOSTA"
+
+#: Public/form_data/FG_var_did.inc:188
+#: Public/form_data/FG_var_def_ratecard.inc:297
+msgid "Insert the connect charge"
+msgstr "Inserisci lo scatto alla risposta"
+
+#: Public/form_data/FG_var_did.inc:189
+msgid "Apply a connection charge to connect DID together"
+msgstr "Applica uno scatto alla risposta per connettere insieme i DID"
+
+#: Public/form_data/FG_var_did.inc:190
+msgid "DID On Net Charges"
+msgstr "Importo DID in rete"
+
+#: Public/form_data/FG_var_did.inc:199
+msgid "Insert the rate"
+msgstr "Inserisci la tariffa"
+
+#: Public/form_data/FG_var_did.inc:200
+msgid "The retail rate; or the cost per minute to apply to the customer to connect DID together, e.g. 0.02"
+msgstr "La tariffa al dettaglio; o il costo per minuto da applicare all'utente per connettere insieme i DID, es.: 0.02"
+
+#: Public/form_data/FG_var_did.inc:202
+msgid "CARRIER CONNECTION CHARGE"
+msgstr "SCATTO ALLA RISPOSTA FORNITORE"
+
+#: Public/form_data/FG_var_did.inc:208
+#: Public/form_data/FG_var_did.inc:247
+msgid "Insert a rate"
+msgstr "Inserisci una tariffa"
+
+#: Public/form_data/FG_var_did.inc:209
+#: Public/form_data/FG_var_did.inc:248
+msgid "The connection charge can be negative or positive"
+msgstr "Lo scatto alla risposta pu&ograve essere negativo o positivo"
+
+#: Public/form_data/FG_var_did.inc:210
+msgid "DID Ingress Charges"
+msgstr "Importo DID Ingresso"
+
+#: Public/form_data/FG_var_did.inc:212
+msgid "CARRIER COST PER MINUTE"
+msgstr "COSTO AL MINUTO DEL FORNITORE"
+
+#: Public/form_data/FG_var_did.inc:218
+#: Public/form_data/FG_var_did.inc:256
+msgid "Insert the connect cost"
+msgstr "Inserisci lo scatto alla risposta"
+
+#: Public/form_data/FG_var_did.inc:219
+msgid "The cost can be negative for Non geographic calls where there is an out-payment"
+msgstr "L'importo pu&ograve essere negativo per chiamate Non geografiche, dove c'&egrave un costo per l'uscita"
+
+#: Public/form_data/FG_var_did.inc:221
+msgid "CARRIER MIN DURATION"
+msgstr "DURATA MINUTI FORNITORE"
+
+#: Public/form_data/FG_var_did.inc:227
+#: Public/form_data/FG_var_def_ratecard.inc:247
+msgid "Insert the buyrate init block"
+msgstr "Inserisci lo scatto iniziale della tariffa d'acquisto"
+
+#: Public/form_data/FG_var_did.inc:228
+#: Public/form_data/FG_var_def_ratecard.inc:248
+msgid "Set the minimum duration charged by the carrier. (i.e. 30 secs)"
+msgstr "Imposta la durata minima addebitata dal fornitore. (p.e. 30 sec)"
+
+#: Public/form_data/FG_var_did.inc:231
+msgid "CARRIER BILLING BLOCK"
+msgstr "FATTURAZIONE SCATTO FORNITORE"
+
+#: Public/form_data/FG_var_did.inc:237
+#: Public/form_data/FG_var_did.inc:276
+#: Public/form_data/FG_var_def_ratecard.inc:257
+#: Public/form_data/FG_var_def_ratecard.inc:287
+msgid "Insert the billing block"
+msgstr "Inserisci la fatturazione scatto"
+
+#: Public/form_data/FG_var_did.inc:238
+#: Public/form_data/FG_var_def_ratecard.inc:258
+msgid "Set the billing increment, in seconds (billing block), that the carrier applies. (ie 30 secs)"
+msgstr "Imposta l'incremento della fatturazione, in secondi (blocco fatturazione), che il fornitore applica. (p.e. 30 sec)"
+
+#: Public/form_data/FG_var_did.inc:241
+msgid "RETAIL CONNECTION CHARGE"
+msgstr "SCATTO ALLA RISPOSTA AL DETTAGLIO"
+
+#: Public/form_data/FG_var_did.inc:250
+msgid "RETAIL COST PER MINUTE"
+msgstr "COSTO MINUTO AL DETTAGLIO"
+
+#: Public/form_data/FG_var_did.inc:257
+msgid "The cost can be negative where there is an out payment, or more usually, positive"
+msgstr "L'importo pu&ograve essere negativo dove c'&egrave un costo per l'uscita, o normalmente, positivo"
+
+#: Public/form_data/FG_var_did.inc:260
+msgid "RETAIL MIN DURATION"
+msgstr "DURATA MINIMA AL DETTAGLIO"
+
+#: Public/form_data/FG_var_did.inc:266
+#: Public/form_data/FG_var_def_ratecard.inc:277
+msgid "Insert the init block"
+msgstr "Inserisci il blocco iniziale"
+
+#: Public/form_data/FG_var_did.inc:267
+#: Public/form_data/FG_var_def_ratecard.inc:278
+msgid "Set the minimum duration to charge the customer (ie 60 seconds)"
+msgstr "Imposta la durata minima da addebitare all'utente (p.e. 60 secondi)"
+
+#: Public/form_data/FG_var_did.inc:270
+msgid "RETAIL BILLING BLOCK"
+msgstr "FATTURAZIONE SCATTO AL DETTAGLIO"
+
+#: Public/form_data/FG_var_did.inc:277
+#: Public/form_data/FG_var_def_ratecard.inc:288
+msgid "Set the billing increment in seconds to bill your customer."
+msgstr "Imposta l'incremento di fatturazione in secondi da fatturare all'utente"
+
+#: Public/form_data/FG_var_did.inc:295
+#: Public/form_data/FG_var_did_destination.inc:200
+#: Public/form_data/FG_var_config_group.inc:89
+#: Public/form_data/FG_var_trunk.inc:265
+#: Public/form_data/FG_var_card_group.inc:148
+#: Public/form_data/FG_var_server.inc:132
+#: Public/form_data/FG_var_tariffgroup.inc:178
+#: Public/form_data/FG_var_backup.inc:113
+#: Public/form_data/FG_var_alarm.inc:182
+#: Public/form_data/FG_var_subscription.inc:166
+#: Public/form_data/FG_var_subscription_signup.inc:130
+#: Public/form_data/FG_var_campaign_config.inc:152
+#: Public/form_data/FG_var_card.inc:976
+#: Public/form_data/FG_var_user.inc:318
+#: Public/form_data/FG_var_agent.inc:392
+#: Public/form_data/FG_var_mailtemplate.inc:198
+#: Public/form_data/FG_var_def_ratecard.inc:626
+#: Public/form_data/FG_var_package.inc:142
+#: Public/form_data/FG_var_voucher.inc:210
+#: Public/form_data/FG_var_didgroup.inc:91
+#: Public/form_data/FG_var_support.inc:115
+#: Public/form_data/FG_var_outbound_cidgroup.php:64
+#: Public/form_data/FG_var_tariffplan.inc:166
+#: Public/form_data/FG_var_support_component.inc:127
+#: Public/form_data/FG_var_service.inc:253
+#: Public/form_data/FG_var_campaign.inc:319
+#: Public/form_data/FG_var_speeddial.inc:137
+#: Public/form_data/FG_var_charge.inc:178
+#: Public/form_data/FG_var_monitor.inc:160
+#: Public/form_data/FG_var_provider.inc:106
+#: Public/form_data/FG_var_server_group.inc:106
+#: Public/form_data/FG_var_transactions_agent.inc:80
+#: Public/form_data/FG_var_prefix.inc:125
+#: Public/form_data/FG_var_agentsituation.inc:76
+#: Public/form_data/FG_var_subscriber.inc:134
+#: Public/form_data/FG_var_transactions.inc:84
+#: Public/form_data/FG_var_outbound_cid.php:84
+#: Public/form_data/FG_var_moneysituation.inc:77
+#: Public/form_data/FG_var_friend.inc:942
+#: Public/form_data/FG_var_card_seria.inc:101
+#: Public/form_data/FG_var_phonebook.inc:122
+#: Public/form_data/FG_var_did_billing.inc:102
+#: Public/form_data/FG_var_service_details.inc:71
+#: Public/form_data/FG_var_ticket.inc:193
+#: Public/form_data/FG_var_phonenumber.inc:160
+#: Public/form_data/FG_var_ticket_agent.inc:170
+#: Public/form_data/FG_var_callback.inc:315
+#: Public/form_data/FG_var_restore.inc:100
+#: Public/form_data/FG_var_callerid.inc:120
+msgid "click on the delete button."
+msgstr "clicca sul tasto 'Elimina'."
+
+#: Public/form_data/FG_var_did.inc:299
+#: Public/form_data/FG_var_did_destination.inc:205
+#: Public/form_data/FG_var_config_group.inc:94
+#: Public/form_data/FG_var_alarm.inc:187
+#: Public/form_data/FG_var_monitor.inc:165
+#: Public/form_data/FG_var_outbound_cid.php:89
+#: Public/form_data/FG_var_friend.inc:947
+msgid "has been inserted. <br>"
+msgstr "&egrave stato inserito. <br>"
+
+#: Public/form_data/FG_var_did.inc:302
+#: Public/form_data/FG_var_did_destination.inc:209
+#: Public/form_data/FG_var_config_group.inc:98
+#: Public/form_data/FG_var_card_group.inc:157
+#: Public/form_data/FG_var_tariffgroup.inc:187
+#: Public/form_data/FG_var_alarm.inc:191
+#: Public/form_data/FG_var_subscription.inc:175
+#: Public/form_data/FG_var_subscription_signup.inc:139
+#: Public/form_data/FG_var_campaign_config.inc:161
+#: Public/form_data/FG_var_user.inc:327
+#: Public/form_data/FG_var_agent.inc:401
+#: Public/form_data/FG_var_didgroup.inc:100
+#: Public/form_data/FG_var_support.inc:123
+#: Public/form_data/FG_var_outbound_cidgroup.php:73
+#: Public/form_data/FG_var_support_component.inc:135
+#: Public/form_data/FG_var_service.inc:260
+#: Public/form_data/FG_var_charge.inc:187
+#: Public/form_data/FG_var_monitor.inc:169
+#: Public/form_data/FG_var_provider.inc:113
+#: Public/form_data/FG_var_prefix.inc:134
+#: Public/form_data/FG_var_outbound_cid.php:93
+#: Public/form_data/FG_var_friend.inc:951
+#: Public/form_data/FG_var_card_seria.inc:108
+#: Public/form_data/FG_var_phonebook.inc:131
+#: Public/form_data/FG_var_paymentlog.inc:209
+#: Public/form_data/FG_var_config.inc:251
+#: Public/form_data/FG_var_ticket.inc:201
+#: Public/form_data/FG_var_phonenumber.inc:169
+#: Public/form_data/FG_var_ticket_agent.inc:178
+#: Public/form_data/FG_var_paymentlog_agent.inc:209
+msgid "Click 'Confirm Data' to continue"
+msgstr "Clicca su 'Conferma Dati' per continuare"
+
+#: Public/form_data/FG_var_did_destination.inc:52
+msgid "Add DESTINATION"
+msgstr "Aggiungi DESTINAZIONE"
+
+#: Public/form_data/FG_var_did_destination.inc:67
+msgid "Pending"
+msgstr "Sospeso"
+
+#: Public/form_data/FG_var_did_destination.inc:68
+msgid "Validated"
+msgstr "Attivato"
+
+#: Public/form_data/FG_var_did_destination.inc:71
+#: Public/form_data/FG_var_did_destination.inc:111
+#: Public/form_data/FG_var_def_ratecard.inc:117
+#: Public/form_data/FG_var_prefix.inc:96
+#: Public/CC_ratecard_merging.php:144
+#: Public/A2B_call_archiving.php:378
+#: Public/A2B_card_info.php:876
+#: Public/A2B_card_info.php:964
+msgid "DESTINATION"
+msgstr "DESTINAZIONE"
+
+#: Public/form_data/FG_var_did_destination.inc:76
+#: Public/A2B_card_info.php:970
+msgid "VOIP"
+msgstr "VOIP"
+
+#: Public/form_data/FG_var_did_destination.inc:77
+msgid "PRIOR"
+msgstr "PRIOR"
+
+#: Public/form_data/FG_var_did_destination.inc:79
+#: Public/form_data/FG_var_did_destination.inc:155
+msgid "VALIDATED"
+msgstr "ATTIVATO"
+
+#: Public/form_data/FG_var_did_destination.inc:89
+msgid "NO DID DESTINATIONS HAVE BEEN CREATED!"
+msgstr "NON SONO STATE CREATE DESTINAZIONI DID!"
+
+#: Public/form_data/FG_var_did_destination.inc:118
+msgid "Enter the phone number you wish to call, or the VoIP client to reach. (ie: 347894999 or SIP/jeremy@182.212.1.45). If the call is VoIP, the VoIP_Call must be set to yes."
+msgstr "Inserisci qui il numero che vuoi chiamare o il peer SIP/IAX/H233 da raggiungere (es.: 347894999 o SIP/mario@182.212.1.45). Per chiamare i peer SIP/IAX/H2323, bisogna abilitare l'opzione 'Chiamata Voip'."
+
+#: Public/form_data/FG_var_did_destination.inc:122
+#: Public/form_data/FG_var_card.inc:237
+#: Public/form_data/FG_var_campaign.inc:110
+#: Public/form_data/FG_var_campaign.inc:123
+#: Public/form_data/FG_var_charge.inc:119
+#: Public/form_data/FG_var_commission.inc:74
+#: Public/form_data/FG_var_payment.inc:118
+msgid "CUSTOMER ID"
+msgstr "ID UTENTE"
+
+#: Public/form_data/FG_var_did_destination.inc:128
+msgid "Insert the Id Customer ID"
+msgstr "Inserisci l'ID Utente"
+
+#: Public/form_data/FG_var_did_destination.inc:132
+#: Public/form_data/FG_var_subscriber.inc:92
+msgid "Set the Customer ID."
+msgstr "Imposta l'ID Utente."
+
+#: Public/form_data/FG_var_did_destination.inc:173
+msgid "VOIP_CALL"
+msgstr "CHIAMATA_VOIP"
+
+#: Public/form_data/FG_var_did_destination.inc:179
+msgid "Choose if you want to not use the trunk and let the asterisk call directly the destination (ie, Destination : SIP/jeremy@182.212.1.45)"
+msgstr "Scegliere se non si desidera utilizzare il fascio e chiamare direttamente la destinazione (es.:, Destinatione: SIP/mario@182.212.1.45)"
+
+#: Public/form_data/FG_var_did_destination.inc:199
+#: Public/form_data/FG_var_invoice.inc:199
+#: Public/form_data/FG_var_logrefill_agent.inc:149
+#: Public/form_data/FG_var_alarm.inc:181
+#: Public/form_data/FG_var_logrefill.inc:172
+#: Public/form_data/FG_var_commission.inc:157
+#: Public/form_data/FG_var_monitor.inc:159
+#: Public/form_data/FG_var_payment.inc:205
+#: Public/form_data/FG_var_receipt.inc:165
+#: Public/form_data/FG_var_payment_agent.inc:173
+#: Public/form_data/FG_var_currencies.inc:115
+msgid "You can modify, through the following form, the different properties of your "
+msgstr "Puoi modificare, attraverso il seguente campo, le differenti propriet&agrave del tuo "
+
+#: Public/form_data/FG_var_payment_configuration.inc:44
+#: Public/form_data/FG_var_paymentlog.inc:98
+#: Public/form_data/FG_var_paymentlog_agent.inc:98
+msgid "Payment Method"
+msgstr "Metodo di Pagamento"
+
+#: Public/form_data/FG_var_payment_configuration.inc:45
+msgid "File Name"
+msgstr "Nome File"
+
+#: Public/form_data/FG_var_payment_configuration.inc:51
+#: Public/form_data/FG_var_service.inc:113
+#: Public/form_data/FG_var_ticket.inc:89
+#: Public/form_data/FG_var_ticket_agent.inc:81
+msgid "VIEW DETAILS"
+msgstr "VISUALIZZA DETTAGLI"
+
+#: Public/form_data/FG_var_config_group.inc:61
+#: Public/form_data/FG_var_invoice.inc:103
+#: Public/form_data/FG_var_invoice.inc:125
+#: Public/form_data/FG_var_invoice.inc:164
+#: Public/form_data/FG_var_receipt.inc:89
+#: Public/form_data/FG_var_receipt.inc:130
+#: Public/form_data/FG_var_config.inc:152
+#: Public/form_data/FG_var_config.inc:185
+#: Public/form_data/FG_var_ticket.inc:77
+#: Public/form_data/FG_var_ticket.inc:139
+#: Public/form_data/FG_var_ticket_agent.inc:70
+#: Public/form_data/FG_var_ticket_agent.inc:116
+msgid "TITLE"
+msgstr "TITOLO"
+
+#: Public/form_data/FG_var_config_group.inc:62
+#: Public/form_data/FG_var_invoice.inc:173
+#: Public/form_data/FG_var_card_group.inc:66
+#: Public/form_data/FG_var_card_group.inc:113
+#: Public/form_data/FG_var_logrefill_agent.inc:129
+#: Public/form_data/FG_var_subscription_signup.inc:58
+#: Public/form_data/FG_var_subscription_signup.inc:103
+#: Public/form_data/FG_var_campaign_config.inc:67
+#: Public/form_data/FG_var_campaign_config.inc:95
+#: Public/form_data/FG_var_tariffplan.inc:128
+#: Public/form_data/FG_var_campaign.inc:281
+#: Public/form_data/FG_var_logrefill.inc:138
+#: Public/form_data/FG_var_payment_invoice.inc:51
+#: Public/form_data/FG_var_charge.inc:76
+#: Public/form_data/FG_var_charge.inc:150
+#: Public/form_data/FG_var_commission.inc:55
+#: Public/form_data/FG_var_commission.inc:124
+#: Public/form_data/FG_var_monitor.inc:61
+#: Public/form_data/FG_var_monitor.inc:100
+#: Public/form_data/FG_var_provider.inc:53
+#: Public/form_data/FG_var_provider.inc:92
+#: Public/form_data/FG_var_server_group.inc:78
+#: Public/form_data/FG_var_payment.inc:156
+#: Public/form_data/FG_var_receipt.inc:139
+#: Public/form_data/FG_var_payment_agent.inc:136
+#: Public/form_data/FG_var_card_seria.inc:64
+#: Public/form_data/FG_var_card_seria.inc:88
+#: Public/form_data/FG_var_phonebook.inc:69
+#: Public/form_data/FG_var_phonebook.inc:95
+#: Public/form_data/FG_var_config.inc:155
+#: Public/form_data/FG_var_config.inc:232
+#: Public/form_data/FG_var_ticket.inc:167
+#: Public/form_data/FG_var_ticket_agent.inc:144
+#: Public/A2B_entity_config.php:187
+#: Public/A2B_card_info.php:745
+#: Public/A2B_card_info.php:815
+#: Public/A2B_log_activity_info.php:109
+msgid "DESCRIPTION"
+msgstr "DESCRIZIONE"
+
+#: Public/form_data/FG_var_trunk.inc:46
+msgid "Add Trunk"
+msgstr "Aggiungi un Fascio"
+
+#: Public/form_data/FG_var_trunk.inc:65
+msgid "0"
+msgstr "0"
+
+#: Public/form_data/FG_var_trunk.inc:66
+msgid "1"
+msgstr "1"
+
+#: Public/form_data/FG_var_trunk.inc:77
+msgid "Use failover trunk"
+msgstr "Utilizza il fascio di scorta"
+
+#: Public/form_data/FG_var_trunk.inc:78
+msgid "Use next trunk"
+msgstr "Usa il prossimo fascio"
+
+#: Public/form_data/FG_var_trunk.inc:87
+msgid "You have some rates attached to this Trunk! Please comfirm that you really want to remove this Trunk? "
+msgstr "Hai delle tariffe abbinate a questo Fascio! Confermi che vuoi realmente eliminare questo Fascio? "
+
+#: Public/form_data/FG_var_trunk.inc:91
+#: Public/form_data/FG_var_invoice.inc:99
+#: Public/form_data/FG_var_log_viewer.inc:79
+#: Public/form_data/FG_var_logrefill_agent.inc:58
+#: Public/form_data/FG_var_tariffgroup.inc:70
+#: Public/form_data/FG_var_card.inc:129
+#: Public/form_data/FG_var_agent.inc:95
+#: Public/form_data/FG_var_agent.inc:104
+#: Public/form_data/FG_var_def_ratecard.inc:116
+#: Public/form_data/FG_var_voucher.inc:78
+#: Public/form_data/FG_var_billing_customer.inc:55
+#: Public/form_data/FG_var_didgroup.inc:61
+#: Public/form_data/FG_var_support.inc:69
+#: Public/form_data/FG_var_outbound_cidgroup.php:33
+#: Public/form_data/FG_var_tariffplan.inc:60
+#: Public/form_data/FG_var_call.inc:42
+#: Public/form_data/FG_var_support_component.inc:67
+#: Public/form_data/FG_var_remittance_request.inc:67
+#: Public/form_data/FG_var_logrefill.inc:58
+#: Public/form_data/FG_var_payment_invoice.inc:48
+#: Public/form_data/FG_var_commission.inc:49
+#: Public/form_data/FG_var_provider.inc:50
+#: Public/form_data/FG_var_payment.inc:58
+#: Public/form_data/FG_var_transactions_agent.inc:45
+#: Public/form_data/FG_var_receipt.inc:86
+#: Public/form_data/FG_var_agentsituation.inc:41
+#: Public/form_data/FG_var_payment_agent.inc:56
+#: Public/form_data/FG_var_transactions.inc:45
+#: Public/form_data/FG_var_moneysituation.inc:41
+#: Public/form_data/FG_var_card_seria.inc:62
+#: Public/form_data/FG_var_paymentlog.inc:118
+#: Public/form_data/FG_var_ticket.inc:74
+#: Public/form_data/FG_var_ticket_agent.inc:67
+#: Public/form_data/FG_var_callback.inc:59
+#: Public/form_data/FG_var_restore.inc:46
+#: Public/form_data/FG_var_paymentlog_agent.inc:118
+#: Public/A2B_data_archiving.php:140
+#: Public/A2B_call_archiving.php:72
+#: Public/A2B_card_info.php:663
+#: Public/A2B_card_info.php:736
+#: Public/A2B_card_info.php:806
+#: Public/A2B_log_activity_info.php:77
+msgid "ID"
+msgstr "ID"
+
+#: Public/form_data/FG_var_trunk.inc:92
+#: Public/form_data/FG_var_trunk.inc:97
+#: Public/form_data/FG_var_trunk.inc:160
+#: Public/form_data/FG_var_subscription.inc:60
+#: Public/form_data/FG_var_subscription.inc:104
+#: Public/form_data/FG_var_subscription_signup.inc:56
+#: Public/form_data/FG_var_subscription_signup.inc:74
+#: Public/form_data/FG_var_package.inc:63
+#: Public/form_data/FG_var_package.inc:85
+#: Public/form_data/FG_var_monitor.inc:59
+#: Public/form_data/FG_var_monitor.inc:80
+#: Public/form_data/FG_var_currencies.inc:74
+msgid "LABEL"
+msgstr "NOME FASCIO"
+
+#: Public/form_data/FG_var_trunk.inc:93
+#: Public/form_data/FG_var_trunk.inc:102
+msgid "PROVIDER"
+msgstr "FORNITORE"
+
+#: Public/form_data/FG_var_trunk.inc:98
+msgid "ADD_PREFIX"
+msgstr "AGGIUNGI PREFISSO"
+
+#: Public/form_data/FG_var_trunk.inc:99
+msgid "REMOVE_PREFIX"
+msgstr "RIMUOVI PREFISSOX"
+
+# pb
+#: Public/form_data/FG_var_trunk.inc:100
+msgid "TECH"
+msgstr "TECH"
+
+#: Public/form_data/FG_var_trunk.inc:101
+#: Public/form_data/FG_var_trunk.inc:112
+msgid "IP/HOST"
+msgstr "IP/HOST"
+
+#: Public/form_data/FG_var_trunk.inc:105
+msgid "MAXUSE"
+msgstr "MASSIMO UTILIZZO"
+
+#: Public/form_data/FG_var_trunk.inc:111
+#: Public/card-history.php:229
+msgid "Search"
+msgstr "Cerca"
+
+#: Public/form_data/FG_var_trunk.inc:114
+msgid "SELECT PROVIDER"
+msgstr "SELEZIONA FORNITORE"
+
+#: Public/form_data/FG_var_trunk.inc:118
+#: Public/form_data/FG_var_invoice.inc:110
+#: Public/form_data/FG_var_mailtemplate.inc:108
+#: Public/form_data/FG_var_billing_customer.inc:61
+#: Public/form_data/FG_var_outbound_cidgroup.php:41
+#: Public/form_data/FG_var_logrefill.inc:79
+#: Public/form_data/FG_var_payment_invoice.inc:57
+#: Public/form_data/FG_var_charge.inc:82
+#: Public/form_data/FG_var_payment.inc:68
+#: Public/form_data/FG_var_receipt.inc:95
+#: Public/form_data/FG_var_currencies.inc:55
+#: Public/form_data/FG_var_subscriber.inc:61
+#: Public/form_data/FG_var_friend.inc:85
+#: Public/form_data/FG_var_signup_agent.inc:62
+#: Public/form_data/FG_var_callerid.inc:63
+msgid "THERE IS NO "
+msgstr "NON C'&Egrave "
+
+#: Public/form_data/FG_var_trunk.inc:150
+msgid "VOIP-PROVIDER"
+msgstr "FORNITORE-VOIP"
+
+# pb
+#: Public/form_data/FG_var_trunk.inc:166
+msgid "Insert the trunkcode"
+msgstr "Inserisci il codice fascio"
+
+#: Public/form_data/FG_var_trunk.inc:167
+msgid "Unique and friendly name for the trunk"
+msgstr "Nome univoco del trunk (lo stesso impostato in Asterisk/FreePBX)"
+
+#: Public/form_data/FG_var_trunk.inc:169
+msgid "ADD PREFIX"
+msgstr "AGGIUNGI PREFISSO"
+
+#: Public/form_data/FG_var_trunk.inc:175
+msgid "Insert the trunkprefix"
+msgstr "Inserisci il prefisso per il fascio"
+
+#: Public/form_data/FG_var_trunk.inc:176
+msgid "Add a prefix to the dialled digits."
+msgstr "Aggiungi un prefisso al numero composto."
+
+#: Public/form_data/FG_var_trunk.inc:178
+msgid "REMOVE PREFIX"
+msgstr "RIMUOVI PREFISSO"
+
+#: Public/form_data/FG_var_trunk.inc:184
+msgid "Insert the removeprefix"
+msgstr "Inserisci il prefisso da rimuovere"
+
+#: Public/form_data/FG_var_trunk.inc:185
+msgid "Remove prefix from the dialed digits."
+msgstr "Rimuovi un prefisso dal numero composto."
+
+#: Public/form_data/FG_var_trunk.inc:187
+msgid "PROVIDER TECH"
+msgstr "TECNOLOGIA FASCIO"
+
+#: Public/form_data/FG_var_trunk.inc:193
+msgid "Insert the providertech"
+msgstr "Inserisci la tecnologia del fascio"
+
+#: Public/form_data/FG_var_trunk.inc:194
+msgid "Technology used on the trunk (SIP,IAX2,ZAP,H323)"
+msgstr "La tecnologia utilizzata per i fasci (SIP, IAX2, ZAP, H323)"
+
+#: Public/form_data/FG_var_trunk.inc:196
+msgid "PROVIDER IP"
+msgstr "IP FORNITORE"
+
+#: Public/form_data/FG_var_trunk.inc:202
+msgid "Insert the providerip"
+msgstr "Inserisci l'IP del fornitore"
+
+#: Public/form_data/FG_var_trunk.inc:203
+msgid "Set the IP or URL of the VoIP provider. Alternatively, put in the name of a previously defined trunk in Asterisk or FreePBX. (MyVoiPTrunk, ZAP4G etc.) You can use the following tags to as variables: %dialingnumber%, %cardnumber%. ie g2/1644787890wwwwwwwwww%dialingnumber%"
+msgstr "Definisci l'IP o URL del fornitore VoIP. In alternativa, puoi inserire il nome del fascio sopra definito (MioVoip, ZAP4G ecc...). Puoi usare i seguenti tags come variabili : %numerodigitato%, %numeroscheda%. Par exemple g2/1644787890wwwwwwwww%numerodigitato%"
+
+#: Public/form_data/FG_var_trunk.inc:205
+msgid "ADDITIONAL PARAMETER"
+msgstr "PARAMETRI ADDIZIONALI"
+
+#: Public/form_data/FG_var_trunk.inc:211
+msgid "Insert Additional parameters"
+msgstr "Inserisci i parametri Addizionali"
+
+#: Public/form_data/FG_var_trunk.inc:212
+msgid "Define any additional parameters that will be used when running the Dial Command in Asterisk. Use the following tags as variables  %dialingnumber%, %cardnumber%. ie 'D(ww%cardnumber%wwwwwwwwww%dialingnumber%)'"
+msgstr "Definisci tutti i parametri addizionali che saranno usati dal Dial Command di Asterisk. Usa i seguenti tags come variabili %numerodigitato%, %numeroscheda%. per esempio 'D(ww%numeroscheda%wwwwwwwwww%numerodigitato%)'"
+
+#: Public/form_data/FG_var_trunk.inc:214
+msgid "FAILOVER TRUNK"
+msgstr "FASCIO DI RISERVA"
+
+#: Public/form_data/FG_var_trunk.inc:222
+msgid "You can define another trunk in case of failover!"
+msgstr "Puoi definire un altro fascio come riserva!"
+
+#: Public/form_data/FG_var_trunk.inc:224
+msgid "CURRENT CONNECTIONS"
+msgstr "CONNESSIONI CORRENTI"
+
+#: Public/form_data/FG_var_trunk.inc:230
+msgid "Number of current connections"
+msgstr "Numero di connessioni correnti"
+
+#: Public/form_data/FG_var_trunk.inc:231
+msgid "Updated to show the number of channels currently in use on this trunk.If there are no channels in use, and the system shows that there are, manually reset this field back to zero."
+msgstr "Aggiornata mostra il numero di canali attualmente utilizzati dal fascio. Se non ci sono canali in uso, ed il sistema invece qui mostra che ci sono, resetta manualmente questo campo a zero."
+
+#: Public/form_data/FG_var_trunk.inc:233
+msgid "MAXIMUM CONNECTIONS"
+msgstr "CONNESSIONI MASSIME"
+
+#: Public/form_data/FG_var_trunk.inc:239
+msgid "Number of maximum simultaneous connections"
+msgstr "Numero massimo di connessioni simultanee"
+
+#: Public/form_data/FG_var_trunk.inc:240
+msgid "The maximum number of channels available to this trunk. Set to -1 to have an unlimited number of channels"
+msgstr "Il numero massimo di connessioni disponibile per questo fascio. Impostalo a -1 per avere un numero di canali illimitato"
+
+#: Public/form_data/FG_var_trunk.inc:249
+msgid "Specifies which trunk to use when the maximum number of connections is reached"
+msgstr "Specifica quale fascio deve essere usato quando il numero massimo di connessioni viene raggiunto"
+
+#: Public/form_data/FG_var_trunk.inc:258
+msgid "Define if this trunk is active or not"
+msgstr "Definisci se il fascio /&egrave attivo o no"
+
+#: Public/form_data/FG_var_trunk.inc:264
+msgid "Modify the properties of the trunk below."
+msgstr "Modifica le propriet&agrave del fascio."
+
+#: Public/form_data/FG_var_trunk.inc:269
+#: Public/form_data/FG_var_card_group.inc:153
+#: Public/form_data/FG_var_server.inc:136
+#: Public/form_data/FG_var_tariffgroup.inc:184
+#: Public/form_data/FG_var_subscription.inc:171
+#: Public/form_data/FG_var_subscription_signup.inc:135
+#: Public/form_data/FG_var_campaign_config.inc:157
+#: Public/form_data/FG_var_card.inc:981
+#: Public/form_data/FG_var_user.inc:323
+#: Public/form_data/FG_var_agent.inc:397
+#: Public/form_data/FG_var_mailtemplate.inc:202
+#: Public/form_data/FG_var_def_ratecard.inc:630
+#: Public/form_data/FG_var_package.inc:146
+#: Public/form_data/FG_var_voucher.inc:214
+#: Public/form_data/FG_var_didgroup.inc:96
+#: Public/form_data/FG_var_support.inc:120
+#: Public/form_data/FG_var_outbound_cidgroup.php:69
+#: Public/form_data/FG_var_tariffplan.inc:170
+#: Public/form_data/FG_var_call.inc:139
+#: Public/form_data/FG_var_support_component.inc:132
+#: Public/form_data/FG_var_campaign.inc:324
+#: Public/form_data/FG_var_speeddial.inc:141
+#: Public/form_data/FG_var_charge.inc:183
+#: Public/form_data/FG_var_provider.inc:110
+#: Public/form_data/FG_var_server_group.inc:112
+#: Public/form_data/FG_var_prefix.inc:130
+#: Public/form_data/FG_var_subscriber.inc:139
+#: Public/form_data/FG_var_card_seria.inc:105
+#: Public/form_data/FG_var_phonebook.inc:127
+#: Public/form_data/FG_var_did_billing.inc:107
+#: Public/form_data/FG_var_service_details.inc:76
+#: Public/form_data/FG_var_ticket.inc:198
+#: Public/form_data/FG_var_phonenumber.inc:165
+#: Public/form_data/FG_var_ticket_agent.inc:175
+#: Public/form_data/FG_var_callback.inc:320
+#: Public/form_data/FG_var_restore.inc:113
+#: Public/form_data/FG_var_callerid.inc:132
+msgid "has been inserted."
+msgstr "&egrave stata inserita."
+
+#: Public/form_data/FG_var_invoice.inc:67
+msgid "Edit invoice items"
+msgstr "Edita gli articoli della fattura"
+
+#: Public/form_data/FG_var_invoice.inc:74
+msgid "Close this invoice"
+msgstr "Chiudi questa fattura"
+
+#: Public/form_data/FG_var_invoice.inc:79
+msgid "Manage payments"
+msgstr "Gestisci i pagamenti"
+
+#: Public/form_data/FG_var_invoice.inc:84
+msgid "Add Invoice"
+msgstr "Aggiungi Fattura"
+
+#: Public/form_data/FG_var_invoice.inc:100
+#: Public/form_data/FG_var_invoice.inc:124
+msgid "REFERENCE"
+msgstr "RIFERIMENTO"
+
+#: Public/form_data/FG_var_invoice.inc:101
+#: Public/form_data/FG_var_billing_customer.inc:56
+#: Public/form_data/FG_var_speeddial.inc:62
+#: Public/form_data/FG_var_logrefill.inc:59
+#: Public/form_data/FG_var_commission.inc:50
+#: Public/form_data/FG_var_payment.inc:59
+#: Public/form_data/FG_var_receipt.inc:87
+msgid "ACCOUNT"
+msgstr "ACCOUNT"
+
+#: Public/form_data/FG_var_invoice.inc:104
+#: Public/form_data/FG_var_invoice.inc:132
+#: Public/form_data/FG_var_commission.inc:54
+msgid "PAID STATUS"
+msgstr "STATO PAGAMENTO"
+
+#: Public/form_data/FG_var_invoice.inc:106
+#: Public/form_data/FG_var_invoice.inc:127
+#: Public/form_data/FG_var_moneysituation_details.inc:64
+#: Public/form_data/FG_var_receipt.inc:91
+msgid "AMOUNT INCL VAT"
+msgstr "IMPORTO COMP.IVA"
+
+#: Public/form_data/FG_var_invoice.inc:122
+#: Public/form_data/FG_var_logrefill_agent.inc:89
+#: Public/form_data/FG_var_card.inc:152
+#: Public/form_data/FG_var_agent.inc:97
+#: Public/form_data/FG_var_agent.inc:108
+#: Public/form_data/FG_var_remittance_request.inc:85
+#: Public/form_data/FG_var_logrefill.inc:76
+#: Public/form_data/FG_var_payment.inc:94
+#: Public/form_data/FG_var_agentsituation.inc:58
+#: Public/form_data/FG_var_payment_agent.inc:88
+#: Public/form_data/FG_var_moneysituation.inc:44
+#: Public/form_data/FG_var_ticket_agent.inc:93
+msgid "FIRSTNAME"
+msgstr "COGNOME"
+
+#: Public/form_data/FG_var_invoice.inc:129
+#: Public/form_data/FG_var_card.inc:517
+#: Public/form_data/FG_var_payment_invoice.inc:52
+#: Public/form_data/FG_var_payment.inc:62
+#: Public/form_data/FG_var_payment.inc:187
+#: Public/form_data/FG_var_payment_agent.inc:64
+#: Public/A2B_payment_info_agent.php:107
+#: Public/A2B_payment_info.php:107
+msgid "PAYMENT TYPE"
+msgstr "TIPO DI PAGAMENTO"
+
+#: Public/form_data/FG_var_invoice.inc:130
+#: Public/form_data/FG_var_subscription_signup.inc:60
+#: Public/form_data/FG_var_subscription_signup.inc:113
+#: Public/form_data/FG_var_card.inc:143
+#: Public/form_data/FG_var_card.inc:527
+#: Public/form_data/FG_var_service.inc:197
+#: Public/form_data/FG_var_signup_agent.inc:54
+msgid "CALL PLAN"
+msgstr "PIANO DI CHIAMATA"
+
+#: Public/form_data/FG_var_invoice.inc:131
+#: Public/form_data/FG_var_card.inc:822
+#: Public/A2B_card_info.php:365
+msgid "INVOICE DAY"
+msgstr "GIORNO DELLA FATTURA"
+
+#: Public/form_data/FG_var_invoice.inc:139
+#: Public/form_data/FG_var_billing_customer.inc:70
+#: Public/form_data/FG_var_logrefill.inc:105
+#: Public/form_data/FG_var_receipt.inc:105
+msgid "ID CUSTOMER"
+msgstr "ID UTENTE"
+
+#: Public/form_data/FG_var_invoice.inc:142
+#: Public/form_data/FG_var_logrefill_agent.inc:99
+#: Public/form_data/FG_var_billing_customer.inc:73
+#: Public/form_data/FG_var_campaign.inc:129
+#: Public/form_data/FG_var_logrefill.inc:108
+#: Public/form_data/FG_var_charge.inc:125
+#: Public/form_data/FG_var_receipt.inc:108
+#: Public/form_data/FG_var_subscriber.inc:88
+#: Public/form_data/FG_var_ticket.inc:133
+msgid "Insert the Customer ID"
+msgstr "Inserisci l'ID Utente"
+
+#: Public/form_data/FG_var_invoice.inc:145
+#: Public/form_data/FG_var_billing_customer.inc:76
+#: Public/form_data/FG_var_logrefill.inc:111
+#: Public/form_data/FG_var_commission.inc:84
+#: Public/form_data/FG_var_payment.inc:128
+#: Public/form_data/FG_var_receipt.inc:111
+msgid "Select the Customer ID"
+msgstr "Seleziona l'ID Utente"
+
+#: Public/form_data/FG_var_invoice.inc:154
+#: Public/form_data/FG_var_receipt.inc:120
+msgid "INVOICE DATE"
+msgstr "DATA FATTURA"
+
+#: Public/form_data/FG_var_invoice.inc:160
+#: Public/form_data/FG_var_logrefill_agent.inc:117
+#: Public/form_data/FG_var_logrefill.inc:126
+#: Public/form_data/FG_var_commission.inc:111
+#: Public/form_data/FG_var_payment.inc:143
+#: Public/form_data/FG_var_receipt.inc:126
+#: Public/form_data/FG_var_payment_agent.inc:123
+msgid "Insert the current date"
+msgstr "Inserisci la data corrente"
+
+#: Public/form_data/FG_var_invoice.inc:169
+#: Public/form_data/FG_var_receipt.inc:135
+msgid "Insert the title of invoice, if you need one"
+msgstr "Inserisci il titolo della fattura, se ne hai bisogno"
+
+#: Public/form_data/FG_var_invoice.inc:179
+#: Public/form_data/FG_var_card_group.inc:119
+#: Public/form_data/FG_var_logrefill_agent.inc:135
+#: Public/form_data/FG_var_subscription_signup.inc:109
+#: Public/form_data/FG_var_campaign_config.inc:101
+#: Public/form_data/FG_var_tariffplan.inc:134
+#: Public/form_data/FG_var_campaign.inc:287
+#: Public/form_data/FG_var_logrefill.inc:144
+#: Public/form_data/FG_var_charge.inc:156
+#: Public/form_data/FG_var_commission.inc:130
+#: Public/form_data/FG_var_monitor.inc:106
+#: Public/form_data/FG_var_monitor.inc:133
+#: Public/form_data/FG_var_provider.inc:98
+#: Public/form_data/FG_var_server_group.inc:84
+#: Public/form_data/FG_var_payment.inc:162
+#: Public/form_data/FG_var_receipt.inc:145
+#: Public/form_data/FG_var_payment_agent.inc:142
+#: Public/form_data/FG_var_card_seria.inc:94
+#: Public/form_data/FG_var_phonebook.inc:101
+#: Public/form_data/FG_var_ticket.inc:173
+#: Public/form_data/FG_var_ticket_agent.inc:150
+msgid "Insert the description"
+msgstr "Inserisci la descrizione"
+
+#: Public/form_data/FG_var_invoice.inc:200
+#: Public/form_data/FG_var_logrefill_agent.inc:150
+#: Public/form_data/FG_var_billing_customer.inc:109
+#: Public/form_data/FG_var_logrefill.inc:173
+#: Public/form_data/FG_var_commission.inc:158
+#: Public/form_data/FG_var_payment.inc:206
+#: Public/form_data/FG_var_receipt.inc:166
+#: Public/form_data/FG_var_payment_agent.inc:174
+#: Public/form_data/FG_var_currencies.inc:116
+msgid "If you really want remove this "
+msgstr "Se realmente vuoi eliminare questa "
+
+#: Public/form_data/FG_var_invoice.inc:201
+#: Public/form_data/FG_var_logrefill_agent.inc:151
+#: Public/form_data/FG_var_billing_customer.inc:110
+#: Public/form_data/FG_var_logrefill.inc:174
+#: Public/form_data/FG_var_commission.inc:159
+#: Public/form_data/FG_var_payment.inc:207
+#: Public/form_data/FG_var_receipt.inc:167
+#: Public/form_data/FG_var_payment_agent.inc:175
+#: Public/form_data/FG_var_currencies.inc:117
+msgid "you can add easily a new "
+msgstr "puoi aggiungerne facilmente una nuova "
+
+#: Public/form_data/FG_var_invoice.inc:205
+#: Public/form_data/FG_var_logrefill_agent.inc:155
+#: Public/form_data/FG_var_billing_customer.inc:114
+#: Public/form_data/FG_var_logrefill.inc:178
+#: Public/form_data/FG_var_commission.inc:163
+#: Public/form_data/FG_var_payment.inc:211
+#: Public/form_data/FG_var_receipt.inc:171
+#: Public/form_data/FG_var_agentsituation.inc:82
+#: Public/form_data/FG_var_payment_agent.inc:179
+#: Public/form_data/FG_var_currencies.inc:121
+#: Public/form_data/FG_var_moneysituation.inc:94
+msgid "Your new "
+msgstr "La tua nuova "
+
+#: Public/form_data/FG_var_invoice.inc:209
+#: Public/form_data/FG_var_logrefill_agent.inc:159
+#: Public/form_data/FG_var_def_ratecard.inc:634
+#: Public/form_data/FG_var_voucher.inc:217
+#: Public/form_data/FG_var_logrefill.inc:182
+#: Public/form_data/FG_var_commission.inc:167
+#: Public/form_data/FG_var_payment.inc:215
+#: Public/form_data/FG_var_receipt.inc:175
+#: Public/form_data/FG_var_payment_agent.inc:183
+#: Public/form_data/FG_var_currencies.inc:125
+msgid "Click 'Confirm Data' to continue."
+msgstr "Clicca 'Conferma Dati' per continuare."
+
+#: Public/form_data/FG_var_log_viewer.inc:81
+msgid "LOGLEVEL"
+msgstr "LIVELLO LOG"
+
+#: Public/form_data/FG_var_log_viewer.inc:83
+msgid "description"
+msgstr "descrizione"
+
+#: Public/form_data/FG_var_log_viewer.inc:84
+#: Public/A2B_log_activity_info.php:117
+msgid "TABLENAME"
+msgstr "NOME TAVOLA"
+
+#: Public/form_data/FG_var_log_viewer.inc:85
+msgid "PAGENAME"
+msgstr "NOME PAGINA"
+
+#: Public/form_data/FG_var_log_viewer.inc:86
+#: Public/A2B_log_activity_info.php:125
+msgid "IPADDRESS"
+msgstr "INDIRIZZO IP"
+
+#: Public/form_data/FG_var_log_viewer.inc:92
+msgid "THERE IS NO LOG AVAILABLE!"
+msgstr "NON CI SONO LOGS DISPONIBILI!"
+
+#: Public/form_data/FG_var_card_group.inc:55
+msgid "You have some cards using this Customers Group! Please comfirm that you really want to remove this Customers Group ? "
+msgstr "Hai alcune schede che usano questo Gruppo Utenti! Confermi che vuoi realmnete eliminare questo Gruppo Utenti ? "
+
+#: Public/form_data/FG_var_card_group.inc:60
+#: Public/form_data/FG_var_campaign_config.inc:61
+msgid "Add Group"
+msgstr "Aggiungi Gruppo"
+
+#: Public/form_data/FG_var_card_group.inc:65
+#: Public/form_data/FG_var_card_group.inc:104
+#: Public/form_data/FG_var_tariffgroup.inc:71
+#: Public/form_data/FG_var_tariffgroup.inc:110
+#: Public/form_data/FG_var_alarm.inc:69
+#: Public/form_data/FG_var_alarm.inc:105
+#: Public/form_data/FG_var_campaign_config.inc:66
+#: Public/form_data/FG_var_campaign_config.inc:86
+#: Public/form_data/FG_var_user.inc:167
+#: Public/form_data/FG_var_didgroup.inc:62
+#: Public/form_data/FG_var_didgroup.inc:78
+#: Public/form_data/FG_var_support.inc:70
+#: Public/form_data/FG_var_support.inc:85
+#: Public/form_data/FG_var_support_component.inc:68
+#: Public/form_data/FG_var_support_component.inc:85
+#: Public/form_data/FG_var_service.inc:84
+#: Public/form_data/FG_var_service.inc:116
+#: Public/form_data/FG_var_campaign.inc:70
+#: Public/form_data/FG_var_speeddial.inc:61
+#: Public/form_data/FG_var_speeddial.inc:89
+#: Public/form_data/FG_var_transactions_agent.inc:48
+#: Public/form_data/FG_var_transactions.inc:48
+#: Public/form_data/FG_var_friend.inc:143
+#: Public/form_data/FG_var_card_seria.inc:63
+#: Public/form_data/FG_var_card_seria.inc:79
+#: Public/form_data/FG_var_phonebook.inc:68
+#: Public/form_data/FG_var_phonebook.inc:86
+#: Public/form_data/FG_var_service_details.inc:48
+#: Public/form_data/FG_var_phonenumber.inc:60
+#: Public/form_data/FG_var_phonenumber.inc:81
+#: Public/form_data/FG_var_phonenumber.inc:114
+#: Public/form_data/FG_var_restore.inc:47
+#: Public/A2B_admin_info.php:87
+#: Public/A2B_card_info.php:501
+msgid "NAME"
+msgstr "NOME"
+
+#: Public/form_data/FG_var_card_group.inc:70
+msgid "NO CUSTOMER GROUP CREATED!"
+msgstr "NESSUN GRUPPO UTENTI CREATO!"
+
+#: Public/form_data/FG_var_card_group.inc:82
+#: Public/form_data/FG_var_user.inc:146
+#: Public/form_data/FG_var_agent.inc:107
+#: Public/form_data/FG_var_agent.inc:159
+#: Public/A2B_agent_info.php:85
+msgid "PASSWORD"
+msgstr "PASSWORD"
+
+#: Public/form_data/FG_var_card_group.inc:83
+msgid "SIP IAX"
+msgstr "SIP IAX"
+
+#: Public/form_data/FG_var_card_group.inc:84
+msgid "CALL HISTORY"
+msgstr "STORICO CHIAMATE"
+
+#: Public/form_data/FG_var_card_group.inc:85
+msgid "PAYMENT HISTORY"
+msgstr "STORICO PAGAMENTI"
+
+#: Public/form_data/FG_var_card_group.inc:86
+#: Public/form_data/FG_var_voucher.inc:79
+#: Public/form_data/FG_var_voucher.inc:98
+#: Public/form_data/FG_var_voucher.inc:128
+msgid "VOUCHER"
+msgstr "COUPON"
+
+#: Public/form_data/FG_var_card_group.inc:87
+#: Public/form_data/FG_var_user.inc:89
+#: Public/templates/default/main.tpl:341
+msgid "INVOICES"
+msgstr "FATTURE"
+
+#: Public/form_data/FG_var_card_group.inc:89
+#: Public/form_data/FG_var_speeddial.inc:59
+#: Public/form_data/FG_var_speeddial.inc:79
+msgid "SPEED DIAL"
+msgstr "NUMERO BREVE"
+
+#: Public/form_data/FG_var_card_group.inc:91
+msgid "SIMULATOR"
+msgstr "SIMULATORE"
+
+#: Public/form_data/FG_var_card_group.inc:92
+#: Public/form_data/FG_var_user.inc:85
+msgid "CALL BACK"
+msgstr "CALL BACK"
+
+#: Public/form_data/FG_var_card_group.inc:94
+msgid "CALLER_ID"
+msgstr "ID UTENTE"
+
+#: Public/form_data/FG_var_card_group.inc:95
+#: Public/form_data/FG_var_user.inc:90
+#: Public/form_data/FG_var_agent.inc:75
+#: Public/templates/default/main.tpl:143
+msgid "SUPPORT"
+msgstr "SUPPORTO"
+
+#: Public/form_data/FG_var_card_group.inc:96
+#: Public/templates/default/main.tpl:28
+msgid "NOTIFICATION"
+msgstr "NOTIFICHE"
+
+#: Public/form_data/FG_var_card_group.inc:97
+msgid "AUTODIALER"
+msgstr "AUTO CHIAMATA"
+
+#: Public/form_data/FG_var_card_group.inc:98
+msgid "EDIT PERSONAL INFO"
+msgstr "MODIFICA INFO PERSONALI"
+
+#: Public/form_data/FG_var_card_group.inc:99
+msgid "SEE RECORDING"
+msgstr "VISTA REGISTRAZIONI"
+
+#: Public/form_data/FG_var_card_group.inc:109
+#: Public/form_data/FG_var_subscription_signup.inc:79
+#: Public/form_data/FG_var_campaign_config.inc:91
+#: Public/form_data/FG_var_provider.inc:88
+#: Public/form_data/FG_var_phonebook.inc:91
+msgid "Insert the provider name"
+msgstr "Inserirsci il nome fornitore"
+
+#: Public/form_data/FG_var_card_group.inc:132
+msgid "PERMISSION USER INTERFACE"
+msgstr "PERMESSI INTERFACCIA UTENTE"
+
+#: Public/form_data/FG_var_card_group.inc:139
+#: Public/form_data/FG_var_user.inc:163
+#: Public/form_data/FG_var_agent.inc:175
+msgid "To select several rights in the above ListBox, hold the CTRL key down while clicking the items"
+msgstr "Per selezionare contemporaneamente piu permessi, mantenere premuto il tasto CTRL mentre si cliccano le voci"
+
+#: Public/form_data/FG_var_card_group.inc:152
+#: Public/form_data/FG_var_subscription_signup.inc:134
+#: Public/form_data/FG_var_campaign_config.inc:156
+#: Public/form_data/FG_var_provider.inc:109
+#: Public/form_data/FG_var_card_seria.inc:104
+#: Public/form_data/FG_var_phonebook.inc:126
+msgid "Add $HD_Form->FG_INSTANCE_NAME."
+msgstr "Aggiungi $HD_Form->FG_INSTANCE_NAME."
+
+#: Public/form_data/FG_var_server.inc:44
+msgid "Add SERVER"
+msgstr "Aggiungi SERVER"
+
+#: Public/form_data/FG_var_server.inc:48
+msgid "ID GROUP"
+msgstr "ID GRUPPO"
+
+#: Public/form_data/FG_var_server.inc:49
+#: Public/form_data/FG_var_card.inc:136
+#: Public/form_data/FG_var_signup_agent.inc:55
+#: Public/form_data/FG_var_config.inc:156
+#: Public/form_data/FG_var_config.inc:175
+msgid "GROUP"
+msgstr "GRUPPO"
+
+#: Public/form_data/FG_var_server.inc:50
+#: Public/form_data/FG_var_server.inc:79
+msgid "SERVER HOSTNAME"
+msgstr "HOSTNAME SERVER"
+
+#: Public/form_data/FG_var_server.inc:51
+#: Public/form_data/FG_var_server.inc:88
+msgid "MANAGER HOST"
+msgstr "HOST MANAGER"
+
+#: Public/form_data/FG_var_server.inc:52
+#: Public/form_data/FG_var_server.inc:97
+msgid "MANAGER USERNAME"
+msgstr "NOME UTENTE MANAGER"
+
+#: Public/form_data/FG_var_server.inc:53
+msgid "LASTTIME USED"
+msgstr "ULTIMA UTILIZZAZIONE"
+
+#: Public/form_data/FG_var_server.inc:59
+#: Public/form_data/FG_var_tariffgroup.inc:84
+#: Public/form_data/FG_var_backup.inc:77
+#: Public/form_data/FG_var_package.inc:73
+#: Public/form_data/FG_var_moneysituation_details.inc:70
+#: Public/form_data/FG_var_didgroup.inc:69
+#: Public/form_data/FG_var_support.inc:75
+#: Public/form_data/FG_var_tariffplan.inc:72
+#: Public/form_data/FG_var_support_component.inc:75
+#: Public/form_data/FG_var_service.inc:98
+#: Public/form_data/FG_var_server_group.inc:57
+#: Public/form_data/FG_var_agentsituation.inc:63
+#: Public/form_data/FG_var_moneysituation.inc:55
+#: Public/form_data/FG_var_service_details.inc:60
+#: Public/form_data/FG_var_ticket.inc:91
+#: Public/form_data/FG_var_ticket_agent.inc:95
+#: Public/form_data/FG_var_restore.inc:55
+msgid "THERE IS NO"
+msgstr "NON C'&Egrave"
+
+#: Public/form_data/FG_var_server.inc:59
+#: Public/form_data/FG_var_tariffgroup.inc:84
+#: Public/form_data/FG_var_backup.inc:77
+#: Public/form_data/FG_var_package.inc:73
+#: Public/form_data/FG_var_moneysituation_details.inc:70
+#: Public/form_data/FG_var_didgroup.inc:69
+#: Public/form_data/FG_var_support.inc:75
+#: Public/form_data/FG_var_tariffplan.inc:72
+#: Public/form_data/FG_var_support_component.inc:75
+#: Public/form_data/FG_var_service.inc:98
+#: Public/form_data/FG_var_server_group.inc:57
+#: Public/form_data/FG_var_transactions_agent.inc:61
+#: Public/form_data/FG_var_prefix.inc:60
+#: Public/form_data/FG_var_agentsituation.inc:63
+#: Public/form_data/FG_var_transactions.inc:61
+#: Public/form_data/FG_var_outbound_cid.php:27
+#: Public/form_data/FG_var_moneysituation.inc:55
+#: Public/form_data/FG_var_service_details.inc:60
+#: Public/form_data/FG_var_ticket.inc:91
+#: Public/form_data/FG_var_ticket_agent.inc:95
+#: Public/form_data/FG_var_restore.inc:55
+msgid "CREATED!"
+msgstr "CREATI!"
+
+#: Public/form_data/FG_var_server.inc:69
+#: Public/form_data/FG_var_callback.inc:88
+msgid "SERVER GROUP"
+msgstr "GRUPPO DI SERVER"
+
+#: Public/form_data/FG_var_server.inc:85
+msgid "Insert the server hostname"
+msgstr "Inserisci l'hostname del server"
+
+#: Public/form_data/FG_var_server.inc:94
+msgid "Insert the manager host"
+msgstr "Inserisci l'host del manager"
+
+#: Public/form_data/FG_var_server.inc:103
+msgid "Insert the manager username"
+msgstr "Inserisci il nome utente del manager"
+
+#: Public/form_data/FG_var_server.inc:106
+msgid "MANAGER SECRET"
+msgstr "PASSWORD MANAGER"
+
+#: Public/form_data/FG_var_server.inc:112
+msgid "Insert the manager secret"
+msgstr "Inserisci la password del manager"
+
+#: Public/form_data/FG_var_server.inc:131
+#: Public/form_data/FG_var_user.inc:317
+#: Public/form_data/FG_var_agent.inc:391
+#: Public/form_data/FG_var_package.inc:141
+#: Public/form_data/FG_var_server_group.inc:105
+#: Public/form_data/FG_var_callback.inc:314
+msgid "Modify the properties of the"
+msgstr "Modifica le propriet&agrave del"
+
+#: Public/form_data/FG_var_server.inc:140
+#: Public/form_data/FG_var_package.inc:149
+#: Public/form_data/FG_var_tariffplan.inc:173
+#: Public/form_data/FG_var_campaign.inc:328
+#: Public/form_data/FG_var_server_group.inc:116
+#: Public/form_data/FG_var_callback.inc:324
+msgid "Setup those values to create the new"
+msgstr "Imposta questi valori per creare la nuova"
+
+#: Public/form_data/FG_var_logrefill_agent.inc:53
+#: Public/form_data/FG_var_logrefill.inc:52
+msgid "Add Refill"
+msgstr "Auto Ricarica"
+
+#: Public/form_data/FG_var_logrefill_agent.inc:64
+#: Public/form_data/FG_var_logrefill_agent.inc:111
+#: Public/form_data/FG_var_logrefill.inc:60
+#: Public/form_data/FG_var_logrefill.inc:120
+#: Public/A2B_card_info.php:809
+msgid "REFILL DATE"
+msgstr "DATA RICARICA"
+
+#: Public/form_data/FG_var_logrefill_agent.inc:66
+#: Public/form_data/FG_var_logrefill_agent.inc:120
+#: Public/form_data/FG_var_logrefill.inc:61
+#: Public/form_data/FG_var_logrefill.inc:129
+#: Public/A2B_card_info.php:812
+msgid "REFILL AMOUNT"
+msgstr "IMPORTO RICARICA"
+
+#: Public/form_data/FG_var_logrefill_agent.inc:71
+msgid "THERE IS NO AGENT REFILL CREATED!"
+msgstr "NON CI SONO RICARICHE AGENTE CREATE!"
+
+#: Public/form_data/FG_var_logrefill_agent.inc:96
+#: Public/form_data/FG_var_paymentlog_agent.inc:179
+msgid "ID AGENT"
+msgstr "ID AGENTE"
+
+#: Public/form_data/FG_var_logrefill_agent.inc:102
+#: Public/form_data/FG_var_commission.inc:96
+#: Public/form_data/FG_var_payment_agent.inc:108
+#: Public/form_data/FG_var_paymentlog_agent.inc:189
+msgid "Select the Agent ID"
+msgstr "Selezionare l'ID Agente"
+
+#: Public/form_data/FG_var_logrefill_agent.inc:126
+#: Public/form_data/FG_var_logrefill.inc:135
+msgid "Insert the credit amount"
+msgstr "Inserisci l'importo del credito"
+
+#: Public/form_data/FG_var_logrefill_agent.inc:127
+#: Public/form_data/FG_var_logrefill.inc:136
+#: Public/form_data/FG_var_commission.inc:121
+#: Public/form_data/FG_var_payment.inc:153
+#: Public/form_data/FG_var_payment_agent.inc:133
+msgid "Enter the amount in the currency base : "
+msgstr "Inserisci l'importo in valuta base : "
+
+#: Public/form_data/FG_var_logrefill_agent.inc:145
+#: Public/form_data/FG_var_logrefill.inc:154
+#: Public/form_data/FG_var_payment.inc:194
+#: Public/form_data/FG_var_payment_agent.inc:163
+msgid "Define type for payment and refill,if created."
+msgstr "Definisci i tipi di pagamenti e ricariche, se creati.."
+
+#: Public/form_data/FG_var_tariffgroup.inc:47
+msgid "Add Callplan"
+msgstr "Aggiungi Piano di Chiamata"
+
+#: Public/form_data/FG_var_tariffgroup.inc:59
+msgid "You have some cards using this Call Plan! Please comfirm that you really want to remove this Call Plan ? "
+msgstr "Hai delle schede che utilizzano questo Piano di Chiamata! Confermi che vuoi eliminare questo Piano di Chiamata ? "
+
+#: Public/form_data/FG_var_tariffgroup.inc:67
+msgid "Keep prefix"
+msgstr "Conserva il prefisso"
+
+#: Public/form_data/FG_var_tariffgroup.inc:68
+msgid "Remove prefix"
+msgstr "Rimuovi prefisso"
+
+#: Public/form_data/FG_var_tariffgroup.inc:72
+#: Public/form_data/FG_var_provider.inc:52
+#: Public/form_data/FG_var_ticket.inc:78
+#: Public/form_data/FG_var_ticket_agent.inc:71
+#: Public/form_data/FG_var_restore.inc:49
+msgid "CREATIONDATE"
+msgstr "DATA CREAZIONE"
+
+#: Public/form_data/FG_var_tariffgroup.inc:73
+#: Public/form_data/FG_var_tariffgroup.inc:120
+msgid "LC TYPE"
+msgstr "TIPO LC"
+
+#: Public/form_data/FG_var_tariffgroup.inc:74
+#: Public/form_data/FG_var_tariffgroup.inc:130
+#: Public/A2B_detail_package.php:85
+#: Public/A2B_detail_package.php:236
+msgid "PACKAGE"
+msgstr "PACCHETTO"
+
+#: Public/form_data/FG_var_tariffgroup.inc:75
+msgid "INTER PREFIX"
+msgstr "PREFISSO INTERN."
+
+#: Public/form_data/FG_var_tariffgroup.inc:116
+msgid "Insert the Call Plan name "
+msgstr "Inserisci il nome del Piano di Ciamata "
+
+#: Public/form_data/FG_var_tariffgroup.inc:138
+msgid "Set the Package Group offer if you wish to use one with this Call Plan"
+msgstr "Imposta un Pacchetto disponibile se vuoi usarlo con questo Piano di Chiamata "
+
+#: Public/form_data/FG_var_tariffgroup.inc:141
+msgid "REMOVE INTER PREFIX"
+msgstr "RIMUOVI PREFISSO INTERN."
+
+#: Public/form_data/FG_var_tariffgroup.inc:147
+msgid "Define if the international prefix will be removed to check the rate."
+msgstr "Definisci il prefisso internazionale da rimuovere per verificare la tariffa."
+
+#: Public/form_data/FG_var_tariffgroup.inc:148
+msgid "Remove the international access prefix (00 or 011) before matching the dialled digits with the rate card. E.G. If the dialled digits were 0044 for a call to the UK, only 44 would be delivered."
+msgstr "Rimuove il prefisso di accesso internazionale (00 o 011) prima di confrontare il numero digitato con la scheda tariffe. Es.: se il numero digitato inizia per 0044 per una chiamata in UK, solo il 44 sar&agrave recapitato."
+
+#: Public/form_data/FG_var_backup.inc:73
+msgid "An error occur when the system tried to backup of the database."
+msgstr "Si verifica un errore quando il sistema prova a salvare il database."
+
+#: Public/form_data/FG_var_backup.inc:73
+#: Public/form_data/FG_var_backup.inc:74
+msgid "Please check yours system settings for the backup section "
+msgstr "Controlla i tuoi settaggi di sistema per salvare la sezione "
+
+#: Public/form_data/FG_var_backup.inc:74
+msgid "An error occur when the system tried to compress the backup realized."
+msgstr "Si verifica un errore quando il sistema prova a comprimere il backup realizzato."
+
+#: Public/form_data/FG_var_backup.inc:96
+#: Public/form_data/FG_var_restore.inc:73
+msgid "Insert the name of backup"
+msgstr "Inserisci il nome del backup"
+
+#: Public/form_data/FG_var_backup.inc:97
+msgid "Name for the backup"
+msgstr "Nome del backup"
+
+#: Public/form_data/FG_var_backup.inc:99
+msgid "PATH"
+msgstr "PERCORSO"
+
+#: Public/form_data/FG_var_backup.inc:105
+msgid "Insert the patch for the backup file or leave the default path"
+msgstr "Inserisci il percorso per il file di backup, o lascia il percorso di default"
+
+#: Public/form_data/FG_var_backup.inc:106
+msgid "Path for the backup file or leave the default path set in a2billing.conf"
+msgstr "Percorso per il file di backup, o lascia il percorso di default impostato in a2billing.conf"
+
+#: Public/form_data/FG_var_backup.inc:118
+#: Public/form_data/FG_var_call.inc:138
+#: Public/form_data/FG_var_campaign.inc:323
+#: Public/form_data/FG_var_agentsituation.inc:81
+#: Public/form_data/FG_var_moneysituation.inc:93
+#: Public/form_data/FG_var_did_billing.inc:106
+#: Public/form_data/FG_var_callerid.inc:131
+msgid "Add a "
+msgstr "Aggiungi un "
+
+#: Public/form_data/FG_var_backup.inc:122
+#: Public/form_data/FG_var_agentsituation.inc:86
+#: Public/form_data/FG_var_moneysituation.inc:98
+#: Public/form_data/FG_var_did_billing.inc:111
+#: Public/form_data/FG_var_service_details.inc:80
+#: Public/form_data/FG_var_restore.inc:117
+msgid "Once you have completed the form above, click on the CONTINUE button."
+msgstr "Una volta completato il modulo superiore, clicca sul tasto 'CONTINUA'."
+
+#: Public/form_data/FG_var_alarm.inc:48
+msgid "Add Alarm"
+msgstr "Aggiungi Allarme"
+
+#: Public/form_data/FG_var_alarm.inc:60
+msgid "Apply alarm on ALOC too low or too high"
+msgstr "Attiva un allarme per il TMDC troppo basso o troppo alto"
+
+#: Public/form_data/FG_var_alarm.inc:61
+msgid "Apply alarm on ASR too low or too high"
+msgstr "Attiva un allarme per RCR troppo basso o troppo alto"
+
+#: Public/form_data/FG_var_alarm.inc:62
+msgid "Apply alarm on CIC too many"
+msgstr "Attiva un allarme per CIC troppo elevato"
+
+#: Public/form_data/FG_var_alarm.inc:70
+#: Public/form_data/FG_var_alarm.inc:114
+#: Public/form_data/FG_var_service.inc:86
+msgid "PERIOD"
+msgstr "PERIODO"
+
+#: Public/form_data/FG_var_alarm.inc:71
+#: Public/form_data/FG_var_alarm.inc:123
+#: Public/form_data/FG_var_remittance_request.inc:71
+#: Public/form_data/FG_var_friend.inc:341
+msgid "TYPE"
+msgstr "TIPO"
+
+#: Public/form_data/FG_var_alarm.inc:72
+msgid "MAX"
+msgstr "MASS."
+
+#: Public/form_data/FG_var_alarm.inc:73
+msgid "MIN"
+msgstr "MIN."
+
+#: Public/form_data/FG_var_alarm.inc:75
+#: Public/form_data/FG_var_alarm.inc:149
+#: Public/form_data/FG_var_user.inc:78
+#: Public/form_data/FG_var_def_ratecard.inc:125
+#: Public/form_data/FG_var_def_ratecard.inc:570
+#: Public/form_data/FG_var_tariffplan.inc:64
+#: Public/form_data/FG_var_tariffplan.inc:118
+#: Public/form_data/FG_var_friend.inc:688
+#: Public/A2B_entity_def_ratecard.php:324
+#: Public/A2B_entity_def_ratecard.php:499
+msgid "TRUNK"
+msgstr "FASCIO"
+
+#: Public/form_data/FG_var_alarm.inc:85
+msgid "There are no Alarms Created"
+msgstr "Non ci sono Allarmi Creati"
+
+#: Public/form_data/FG_var_alarm.inc:102
+msgid "View details"
+msgstr "Visualizza dettagli"
+
+#: Public/form_data/FG_var_alarm.inc:111
+msgid "Insert the alarm name"
+msgstr "Inserisci il nome dell'allarme"
+
+#: Public/form_data/FG_var_alarm.inc:121
+msgid "Interval to apply alarm"
+msgstr "Intervalllo da applicare all'allarme"
+
+#: Public/form_data/FG_var_alarm.inc:130
+msgid "ALOC (Average Length Of Call) ; ASR (Answer Seize Ratio) ; CIC (Consecutive Incomplete Calls)"
+msgstr "TMDC (Tempo Medio Della Chiamata) ; RCR (Rapporto Chiamate Risposte) ; CIC (Chiamate Incomplete Consecutive)"
+
+#: Public/form_data/FG_var_alarm.inc:132
+msgid "MAX VALUE"
+msgstr "VALORE MASSIMO"
+
+#: Public/form_data/FG_var_alarm.inc:138
+msgid "Insert the maximu value in"
+msgstr "Inserisci il valore massimo in"
+
+#: Public/form_data/FG_var_alarm.inc:139
+msgid "Input the maximum value (between 0 and 1 for ASR ; > 0 for ALOC in sec ; > 0 for CIC)"
+msgstr "Immetti il valore massimo (tra 0 e 1 per il RCR ; > 0 per il TMDC in sec. ; > 0 per le CIC)"
+
+#: Public/form_data/FG_var_alarm.inc:141
+msgid "MIN VALUE"
+msgstr "VALORE MINIMO"
+
+#: Public/form_data/FG_var_alarm.inc:148
+msgid "Input the minimum value (between 0 and 1 for ASR ; >= 0 for ALOC in sec ; not used by CIC) or leave it empty"
+msgstr "Immetti il valore minimo (tra 0 e 1 per il RCR ; > 0 per il TMDC in sec. ; > non usato per le CIC) o lasciare vuoto"
+
+#: Public/form_data/FG_var_alarm.inc:156
+msgid "Set if you want to apply the alarm on a specific trunk or leave empty for all trunk."
+msgstr "Impostalo se vuoi applicare un allarme su uno specifico fascio o lasciare vuoto per tutti i fasci."
+
+#: Public/form_data/FG_var_alarm.inc:167
+msgid "EMAIL TO SEND ALARM"
+msgstr "EMAIL DI INVIO ALLARME"
+
+#: Public/form_data/FG_var_alarm.inc:173
+msgid "Insert the email to send the alarm"
+msgstr "Insersici l'email di invio allarme"
+
+#: Public/form_data/FG_var_alarm.inc:186
+msgid "Add an alarm below"
+msgstr "Aggiungi un allarme"
+
+#: Public/form_data/FG_var_subscription.inc:47
+msgid "Add SUBSCRIPTION SERVICE"
+msgstr "Aggiugi SOTTOSCRIZIONE DI SERVIZIO"
+
+#: Public/form_data/FG_var_subscription.inc:61
+#: Public/form_data/FG_var_subscription.inc:113
+#: Public/A2B_card_info.php:672
+msgid "FEE"
+msgstr "CANONE"
+
+#: Public/form_data/FG_var_subscription.inc:63
+#: Public/form_data/FG_var_subscriber.inc:53
+msgid "DATE START"
+msgstr "DATA INIZIO"
+
+#: Public/form_data/FG_var_subscription.inc:64
+#: Public/form_data/FG_var_subscriber.inc:54
+msgid "DATE STOP"
+msgstr "DATA FINE"
+
+#: Public/form_data/FG_var_subscription.inc:65
+#: Public/form_data/FG_var_service.inc:88
+msgid "NBRUN"
+msgstr "NB-AVVIO"
+
+#: Public/form_data/FG_var_subscription.inc:66
+msgid "DATE LASTRUN"
+msgstr "DATA ULTIMO AVVIO"
+
+#: Public/form_data/FG_var_subscription.inc:67
+msgid "ACC PERFORM"
+msgstr "ESEGUIRE ACC."
+
+#: Public/form_data/FG_var_subscription.inc:68
+#: Public/CC_entity_service_details.php:58
+#: Public/CC_entity_service_details.php:111
+msgid "TOTAL CREDIT"
+msgstr "CREDITO TOTALE"
+
+#: Public/form_data/FG_var_subscription.inc:75
+msgid "There are no subscriptions created!"
+msgstr "Non ci sono sottoscrizioni create!"
+
+#: Public/form_data/FG_var_subscription.inc:110
+msgid "Insert the service label"
+msgstr "Insersici il nome del servizio"
+
+#: Public/form_data/FG_var_subscription.inc:119
+#: Public/form_data/FG_var_currencies.inc:90
+msgid "Insert the fee amount."
+msgstr "Inserisci l'importo del canone."
+
+#: Public/form_data/FG_var_subscription.inc:120
+msgid "Set the fee amount that the user have to pay per month."
+msgstr "Imposta l'importo del canone mensile pagato dall'utente.."
+
+#: Public/form_data/FG_var_subscription.inc:138
+#: Public/form_data/FG_var_subscriber.inc:110
+msgid "Insert the start date"
+msgstr "Inserisci la data di inizio"
+
+#: Public/form_data/FG_var_subscription.inc:139
+#: Public/form_data/FG_var_subscription.inc:148
+#: Public/form_data/FG_var_card.inc:749
+#: Public/form_data/FG_var_subscriber.inc:111
+#: Public/form_data/FG_var_subscriber.inc:120
+#: Public/form_data/FG_var_callback.inc:177
+msgid "please use the format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"
+msgstr "Usare il formato AAAA-MM-GG OO:MM:SS. Per esempio, '2004-12-31 00:23:00'"
+
+#: Public/form_data/FG_var_subscription.inc:141
+#: Public/form_data/FG_var_def_ratecard.inc:484
+#: Public/form_data/FG_var_subscriber.inc:113
+msgid "STOP DATE"
+msgstr "DATA FINE"
+
+#: Public/form_data/FG_var_subscription.inc:147
+#: Public/form_data/FG_var_def_ratecard.inc:490
+#: Public/form_data/FG_var_subscriber.inc:119
+msgid "Insert the stop date"
+msgstr "Inserisci la data fine"
+
+#: Public/form_data/FG_var_subscription.inc:151
+#: Public/form_data/FG_var_service.inc:188
+msgid "EMAIL TO SEND REPORT"
+msgstr "EMAIL DI INVIO RAPPORTO"
+
+#: Public/form_data/FG_var_subscription.inc:157
+#: Public/form_data/FG_var_service.inc:194
+msgid "Insert the email to send the report"
+msgstr "Inserisci l'email di invio rapporto"
+
+#: Public/form_data/FG_var_subscription.inc:170
+#: Public/form_data/FG_var_service.inc:256
+msgid "Add a service below"
+msgstr "Aggiungi un servizio col seguente modulo"
+
+#: Public/form_data/FG_var_subscription_signup.inc:51
+msgid "Add New Subscription in Signup"
+msgstr "Agg. Nuova Sottoscrizione di Iscrizione"
+
+#: Public/form_data/FG_var_subscription_signup.inc:57
+msgid "ACTIVITY"
+msgstr "ATTIVIT&Agrave"
+
+#: Public/form_data/FG_var_subscription_signup.inc:59
+#: Public/form_data/FG_var_subscriber.inc:52
+msgid "SERVICE"
+msgstr "SERVIZIO"
+
+#: Public/form_data/FG_var_subscription_signup.inc:64
+msgid "NO SUBSCRIPTION IN SIGNUP CREATED!"
+msgstr "NON CI SONO SOTTOSCRIZIONI DI ISCRIZIONE CREATE!"
+
+#: Public/form_data/FG_var_subscription_signup.inc:88
+msgid "Choose if you want to activate this subscriber in the signup"
+msgstr "Scegli se  vuoi attivare l'iscrizione di questo abbonato"
+
+#: Public/form_data/FG_var_subscription_signup.inc:92
+msgid "SUBSCRIPTION OPTIONS"
+msgstr "OPZIONI DI SOTTOSCRIZIONE"
+
+#: Public/form_data/FG_var_subscription_signup.inc:121
+msgid "Define the callplan to associate to your Subscription"
+msgstr "Imposta il Piano di Chiamata da associare alla tua Sottoscrizione"
+
+#: Public/form_data/FG_var_campaign_config.inc:56
+msgid "You have some campaign using this Configuration! Please comfirm that you really want to remove this Configuration ? "
+msgstr "Hai alcune campagne che utilizzano questa Configurazione! Confermi che vuoi realmente eliminare questa Configurazione ? "
+
+#: Public/form_data/FG_var_campaign_config.inc:68
+#: Public/form_data/FG_var_campaign_config.inc:105
+msgid "CAMPAIGN CONTEXT"
+msgstr "CONTESTO DELLA CAMPAGNA"
+
+#: Public/form_data/FG_var_campaign_config.inc:69
+msgid "CAMPAIGN FLATRATE"
+msgstr "CAMPAGNA TARIFFA FLAT"
+
+#: Public/form_data/FG_var_campaign_config.inc:74
+msgid "NO CAMPAIGN CONFIGURATION CREATED!"
+msgstr "NON CI SONO CONFIGURAZIONI DI CAMPAGNE CREATE!"
+
+#: Public/form_data/FG_var_campaign_config.inc:110
+msgid "Insert the context to use to forward the callback campaign"
+msgstr "Inserire il contesto da usare per inoltrare la campagna callback"
+
+#: Public/form_data/FG_var_campaign_config.inc:114
+msgid "CAMPAIGN FLAT RATE"
+msgstr "CAMPAGNA TARIFFA FISSA"
+
+#: Public/form_data/FG_var_campaign_config.inc:120
+msgid "Insert the flat rate"
+msgstr "Insersici la tariffa flat"
+
+#: Public/form_data/FG_var_campaign_config.inc:121
+msgid "The callback campaign system now can't use the billing system, you have to define cost for all callback "
+msgstr "Il sistema di campagna di callback, attualmente non può usare il sistema di fatturazione. Devi definire il costo del callback "
+
+#: Public/form_data/FG_var_campaign_config.inc:135
+#: Public/form_data/FG_var_service.inc:232
+msgid "CARD GROUP"
+msgstr "GRUPPO SCHEDE"
+
+#: Public/form_data/FG_var_card.inc:45
+msgid "Card"
+msgstr "Schede"
+
+#: Public/form_data/FG_var_card.inc:60
+msgid "You are going as well to remove all the SIP/IAX accounts & CallerIDs attached to this card! Please confirm that you really want to remove this card ? "
+msgstr "Stai anche eliminando tutti gli accounts SIP/IAX $ ID Chiamanti collegati a questa scheda. Confermi che vuoi realmente eliminare questa scheda ? "
+
+#: Public/form_data/FG_var_card.inc:63
+msgid "You are going to remove a card that have SIP/IAX accounts and/or CallerIDs attached to it ! Please confirm that you really want to remove this card ? "
+msgstr "Stai eliminando una scheda che ha degli accounts SIP/IAX e/o ID Chiamanti collegati ad essa. Confermi che vuoi realmente eliminare questa scheda ? "
+
+#: Public/form_data/FG_var_card.inc:69
+msgid "Generate Customers"
+msgstr "Genera Utenti"
+
+#: Public/form_data/FG_var_card.inc:74
+msgid "Add Customer"
+msgstr "Aggiungi Utente"
+
+#: Public/form_data/FG_var_card.inc:131
+#: Public/card-history.php:63
+msgid "Account Number"
+msgstr "Numero Account"
+
+#: Public/form_data/FG_var_card.inc:137
+#: Public/form_data/FG_var_card.inc:362
+#: Public/form_data/FG_var_agent.inc:193
+#: Public/A2B_data_archiving.php:142
+#: Public/A2B_card_info.php:333
+#: Public/A2B_agent_info.php:186
+msgid "BALANCE"
+msgstr "SALDO"
+
+#: Public/form_data/FG_var_card.inc:137
+#: Public/A2B_data_archiving.php:142
+msgid "BA"
+msgstr "SR"
+
+#: Public/form_data/FG_var_card.inc:141
+msgid "SERIE"
+msgstr "SERIE"
+
+#: Public/form_data/FG_var_card.inc:142
+#: Public/A2B_card_info.php:101
+msgid "SERIAL NUMBER"
+msgstr "NUMERO DI SERIE"
+
+#: Public/form_data/FG_var_card.inc:146
+#: Public/A2B_data_archiving.php:145
+msgid "LG"
+msgstr "LG"
+
+#: Public/form_data/FG_var_card.inc:147
+#: Public/A2B_data_archiving.php:146
+msgid "USE"
+msgstr "USO"
+
+#: Public/form_data/FG_var_card.inc:148
+#: Public/form_data/FG_var_agent.inc:99
+#: Public/form_data/FG_var_agent.inc:112
+#: Public/form_data/FG_var_transactions_agent.inc:55
+#: Public/form_data/FG_var_transactions.inc:55
+#: Public/A2B_data_archiving.php:147
+msgid "CUR"
+msgstr "VAL"
+
+#: Public/form_data/FG_var_card.inc:149
+#: Public/A2B_entity_friend.php:254
+#: Public/A2B_data_archiving.php:148
+#: Public/A2B_entity_card_multi.php:346
+msgid "SIP"
+msgstr "SIP"
+
+#: Public/form_data/FG_var_card.inc:150
+#: Public/A2B_entity_friend.php:253
+#: Public/A2B_data_archiving.php:149
+#: Public/A2B_entity_card_multi.php:346
+msgid "IAX"
+msgstr "IAX"
+
+#: Public/form_data/FG_var_card.inc:151
+#: Public/A2B_data_archiving.php:150
+msgid "ACD"
+msgstr "ACD"
+
+#: Public/form_data/FG_var_card.inc:154
+msgid "DISC"
+msgstr "DISC"
+
+#: Public/form_data/FG_var_card.inc:155
+#: Public/form_data/FG_var_outbound_cid.php:20
+#: Public/form_data/FG_var_outbound_cid.php:48
+#: Public/A2B_card_info.php:451
+msgid "CID"
+msgstr "CID"
+
+#: Public/form_data/FG_var_card.inc:201
+msgid "NO CARDS HAVE BEEN CREATED!"
+msgstr "NON SONO STATE CREATE SCHEDE!"
+
+#: Public/form_data/FG_var_card.inc:238
+#: Public/form_data/FG_var_card.inc:382
+msgid "SERIAL"
+msgstr "SERIALE"
+
+#: Public/form_data/FG_var_card.inc:243
+msgid "SELECT SERIE"
+msgstr "SELEZIONA SERIE"
+
+#: Public/form_data/FG_var_card.inc:248
+#: Public/A2B_entity_config.php:225
+#: Public/A2B_data_archiving.php:188
+msgid "SELECT GROUP"
+msgstr "SELEZIONA GRUPPO"
+
+#: Public/form_data/FG_var_card.inc:251
+msgid "SELECT PAYMENT TYPE"
+msgstr "TIPO DI PAGAMENTO"
+
+#: Public/form_data/FG_var_card.inc:286
+msgid "Auto Create SIP Config"
+msgstr "Creare automaticamente il SIP Config"
+
+#: Public/form_data/FG_var_card.inc:287
+msgid "Auto Create IAX Config"
+msgstr "Creare automaticamente lo IAX Config"
+
+#: Public/form_data/FG_var_card.inc:330
+msgid "Insert the account number"
+msgstr "Inserisci il numero account"
+
+#: Public/form_data/FG_var_card.inc:331
+msgid "Customer Information"
+msgstr "Informazioni Utente"
+
+#: Public/form_data/FG_var_card.inc:334
+msgid "WEBUI LOGIN"
+msgstr "UTENTE WEB"
+
+#: Public/form_data/FG_var_card.inc:340
+msgid "Insert the webui login"
+msgstr "Inserisci il login per il web"
+
+#: Public/form_data/FG_var_card.inc:344
+msgid "WEBUI PASSWORD"
+msgstr "PASSWORD WEB"
+
+#: Public/form_data/FG_var_card.inc:350
+#: Public/form_data/FG_var_agent.inc:165
+msgid "Insert the password"
+msgstr "Inserisci la password"
+
+#: Public/form_data/FG_var_card.inc:351
+msgid "Password for customer to access to the web interface and view the balance."
+msgstr "Password dell'utente per accedere all'interfaccia web e visualizzare il credito."
+
+#: Public/form_data/FG_var_card.inc:368
+#: Public/form_data/FG_var_voucher.inc:144
+msgid "Insert the number of credit"
+msgstr "Inserisci il numero di credito"
+
+#: Public/form_data/FG_var_card.inc:372
+msgid "CUSTOMER GROUP"
+msgstr "GRUPPO UTENTI"
+
+#: Public/form_data/FG_var_card.inc:390
+#: Public/form_data/FG_var_card.inc:546
+#: Public/form_data/FG_var_card.inc:659
+#: Public/form_data/FG_var_card.inc:709
+#: Public/form_data/FG_var_def_ratecard.inc:578
+#: Public/form_data/FG_var_def_ratecard.inc:589
+#: Public/form_data/FG_var_subscriber.inc:102
+#: Public/CC_ratecard_import.php:240
+#: Public/A2B_entity_def_ratecard.php:326
+#: Public/A2B_entity_def_ratecard.php:359
+msgid "NOT DEFINED"
+msgstr "NON DEFINITO"
+
+#: Public/form_data/FG_var_card.inc:393
+#: Public/form_data/FG_var_agent.inc:263
+#: Public/form_data/FG_var_statuslog.inc:95
+#: Public/A2B_card_info.php:218
+#: Public/A2B_agent_info.php:93
+msgid "LAST NAME"
+msgstr "COGNOME"
+
+#: Public/form_data/FG_var_card.inc:399
+msgid "Insert the lastname of the customers"
+msgstr "Inserire il cognome dell'utente"
+
+#: Public/form_data/FG_var_card.inc:400
+msgid "Personal Information"
+msgstr "Informazioni Personali"
+
+#: Public/form_data/FG_var_card.inc:402
+#: Public/form_data/FG_var_agent.inc:272
+#: Public/A2B_card_info.php:228
+#: Public/A2B_agent_info.php:101
+msgid "FIRST NAME"
+msgstr "NOME"
+
+#: Public/form_data/FG_var_card.inc:408
+msgid "Insert the firstname of the customers"
+msgstr "Inserisci il nome dell'utente"
+
+#: Public/form_data/FG_var_card.inc:418
+#: Public/form_data/FG_var_user.inc:242
+#: Public/form_data/FG_var_agent.inc:332
+#: Public/form_data/FG_var_support.inc:107
+msgid "Insert the email"
+msgstr "Inserisci l'email"
+
+#: Public/form_data/FG_var_card.inc:422
+#: Public/form_data/FG_var_user.inc:176
+#: Public/form_data/FG_var_agent.inc:281
+#: Public/A2B_admin_info.php:96
+#: Public/A2B_card_info.php:240
+#: Public/A2B_agent_info.php:111
+msgid "ADDRESS"
+msgstr "INDIRIZZO"
+
+#: Public/form_data/FG_var_card.inc:428
+msgid "Insert the address of the customers"
+msgstr "Inserisci l'indirizzo dell'utente"
+
+#: Public/form_data/FG_var_card.inc:432
+#: Public/form_data/FG_var_user.inc:184
+#: Public/form_data/FG_var_agent.inc:290
+#: Public/A2B_admin_info.php:115
+#: Public/A2B_card_info.php:260
+#: Public/A2B_agent_info.php:131
+msgid "CITY"
+msgstr "CITT&Agrave"
+
+#: Public/form_data/FG_var_card.inc:438
+#: Public/form_data/FG_var_agent.inc:296
+msgid "Insert the city"
+msgstr "Inserisci la citt&agrave"
+
+#: Public/form_data/FG_var_card.inc:442
+msgid "STATE/PROVINCE"
+msgstr "PROVINCIA"
+
+#: Public/form_data/FG_var_card.inc:448
+#: Public/form_data/FG_var_user.inc:208
+#: Public/form_data/FG_var_agent.inc:305
+msgid "Insert the state"
+msgstr "Inserisci la provincia"
+
+#: Public/form_data/FG_var_card.inc:465
+msgid "ZIP/POSTAL CODE"
+msgstr "CODICE POSTALE"
+
+#: Public/form_data/FG_var_card.inc:471
+msgid "Insert the zipcode"
+msgstr "Inserire il codice postale"
+
+#: Public/form_data/FG_var_card.inc:475
+#: Public/form_data/FG_var_speeddial.inc:60
+msgid "PHONE NUMBER"
+msgstr "NUMERO DI TELEFONO"
+
+#: Public/form_data/FG_var_card.inc:481
+msgid "Insert the phone number of the customers"
+msgstr "Inserisci il numero di telefono dell'utente"
+
+#: Public/form_data/FG_var_card.inc:485
+msgid "FAX NUMBER"
+msgstr "NUMERO DI FAX"
+
+#: Public/form_data/FG_var_card.inc:491
+msgid "Insert the fax number of the customers"
+msgstr "Inserisci il numero di fax dell'utente"
+
+#: Public/form_data/FG_var_card.inc:494
+#: Public/A2B_card_info.php:384
+msgid "COMPANY NAME"
+msgstr "SOCIET&Agrave"
+
+#: Public/form_data/FG_var_card.inc:500
+msgid "Insert Company name of this customer"
+msgstr "Inserisci il nome della societ&agrave dell'utente"
+
+#: Public/form_data/FG_var_card.inc:504
+#: Public/A2B_card_info.php:392
+msgid "COMPANY WEBSITE"
+msgstr "SITO SOCIET&Agrave"
+
+#: Public/form_data/FG_var_card.inc:510
+msgid "Insert the company website of this customer"
+msgstr "Inserire il sito della societ&agrave dell'utente"
+
+#: Public/form_data/FG_var_card.inc:524
+msgid "Customer Status"
+msgstr "Stato Cliente"
+
+#: Public/form_data/FG_var_card.inc:535
+msgid "Changing the call plan will result in the free minutes or free calls package being reset."
+msgstr "Cambiando il piano di chiamata saranno resettati eventuali minuti o pacchetti di chiamate gratuiti"
+
+#: Public/form_data/FG_var_card.inc:560
+#: Public/form_data/FG_var_friend.inc:865
+msgid "TIMEZONE"
+msgstr "FUSO ORARIO"
+
+#: Public/form_data/FG_var_card.inc:568
+#: Public/form_data/FG_var_agent.inc:245
+#: Public/form_data/FG_var_support.inc:72
+#: Public/form_data/FG_var_support.inc:93
+#: Public/form_data/FG_var_friend.inc:273
+#: Public/A2B_card_info.php:125
+#: Public/A2B_agent_info.php:210
+msgid "LANGUAGE"
+msgstr "LINGUA"
+
+#: Public/form_data/FG_var_card.inc:583
+#: Public/form_data/FG_var_agent.inc:216
+msgid "Currency used at the customer end."
+msgstr "Valuta utilizzata dall'utente finale."
+
+#: Public/form_data/FG_var_card.inc:596
+#: Public/A2B_card_info.php:183
+#: Public/A2B_card_info.php:186
+msgid "LOCK"
+msgstr "BLOCCO"
+
+#: Public/form_data/FG_var_card.inc:602
+msgid "Choose if you want to enable the lock on this account"
+msgstr "Scegli se vuoi abilitare il blocco di questo account"
+
+#: Public/form_data/FG_var_card.inc:603
+msgid "Enable lock for this account."
+msgstr "Abilita il blocco per questo account."
+
+#: Public/form_data/FG_var_card.inc:609
+#: Public/A2B_card_info.php:191
+msgid "LOCK PIN"
+msgstr "PIN DI SBLOCCO"
+
+#: Public/form_data/FG_var_card.inc:616
+msgid "Code required to make the call if the lock is active."
+msgstr "Codice richiesto per fare una chiamata con blocco attivo."
+
+#: Public/form_data/FG_var_card.inc:629
+msgid "RUN SERVICE"
+msgstr "ATTIVA SERVIZIO"
+
+#: Public/form_data/FG_var_card.inc:635
+msgid "Choose if you want to enable the service recurring on this account"
+msgstr "Scegli se vuoi abilitare il servizio ricorrente su questo account"
+
+#: Public/form_data/FG_var_card.inc:636
+msgid "Apply recurring service to this account."
+msgstr "Applica un servizio ricorrente a questo account."
+
+#: Public/form_data/FG_var_card.inc:639
+#: Public/A2B_card_info.php:349
+msgid "CREDIT LIMIT"
+msgstr "LIMITE DI CREDITO"
+
+#: Public/form_data/FG_var_card.inc:645
+msgid "Insert the credit limit"
+msgstr "Inserisci il limite di credito"
+
+#: Public/form_data/FG_var_card.inc:646
+msgid "Credit limit is only used for the postpaid account."
+msgstr "Il limite di credito &egrave solo usato per l'account postpagato ."
+
+#: Public/form_data/FG_var_card.inc:650
+msgid "CREDIT LIMIT NOTIFICATION"
+msgstr "LIMITE NOTIFICA CREDITO"
+
+#: Public/form_data/FG_var_card.inc:658
+msgid "Low credit limit to alert the customer"
+msgstr "Limite credito basso per allertare l'utente"
+
+#: Public/form_data/FG_var_card.inc:662
+msgid "PERMITTED NOTIFICATIONS BY MAIL"
+msgstr "PERMETTI NOTIFICA VIA EMAIL "
+
+#: Public/form_data/FG_var_card.inc:668
+msgid "Choose if you want to enable the notification by email for this account"
+msgstr "Scegli se vuoi abilitare la notifica via email per questo utente"
+
+#: Public/form_data/FG_var_card.inc:669
+msgid "Enable the notification by mail for this account."
+msgstr "Abilita la notifica via email per questo utente."
+
+#: Public/form_data/FG_var_card.inc:672
+msgid "EMAIL NOTIFICATION"
+msgstr "NOTIFICA EMAIL"
+
+#: Public/form_data/FG_var_card.inc:678
+msgid "Insert the email to notify this customer"
+msgstr "Inserisci l'email di notifica dell'utente"
+
+#: Public/form_data/FG_var_card.inc:682
+msgid "PERMITTED VOICEMAIL"
+msgstr "PERMETTI NOTIFICA VOICEMAIL"
+
+#: Public/form_data/FG_var_card.inc:688
+msgid "Choose if you want to enable the voicemail functionality for this account"
+msgstr "Scegli se vuoi abilitare la funzionati&agrave voicemail per questo account"
+
+#: Public/form_data/FG_var_card.inc:689
+msgid "Enable the voicemail functionality for this account."
+msgstr "Abilita la funzionati&agrave voicemail per questo account."
+
+#: Public/form_data/FG_var_card.inc:691
+msgid "ACTIVE VOICEMAIL SERVICE"
+msgstr "SERVIZIO VOICEMAIL ATTIVO"
+
+#: Public/form_data/FG_var_card.inc:697
+msgid "Customer can choose to enable the voicemail for this account"
+msgstr "L'Utente pu&ograve scegliere di abilitare la voicemail per questo account"
+
+#: Public/form_data/FG_var_card.inc:698
+msgid "Customer can enable the voicemail for this account."
+msgstr "L'Utente pu&ograve abilitare la voicemail per questo account"
+
+#: Public/form_data/FG_var_card.inc:712
+#: Public/A2B_data_archiving.php:166
+#: Public/A2B_card_info.php:159
+msgid "FIRST USE DATE"
+msgstr "DATA PRIMO UTILZZO"
+
+#: Public/form_data/FG_var_card.inc:722
+msgid "ENABLE EXPIRY"
+msgstr "ABILITA SCADENZA"
+
+#: Public/form_data/FG_var_card.inc:729
+msgid "Select method of expiry for the account."
+msgstr "Seleziona il metodo di scadenza per l'account."
+
+#: Public/form_data/FG_var_card.inc:753
+msgid "EXPIRY DAYS"
+msgstr "GIORNI SCADENZA"
+
+#: Public/form_data/FG_var_card.inc:759
+msgid "Insert the number of days after which the account will expire"
+msgstr "Inserisci il numero di giorni dopo i quali l'account scadr&agrave"
+
+#: Public/form_data/FG_var_card.inc:760
+msgid "The number of days after which the account will expire."
+msgstr "Il numero di giorni dopo i quali l'account scadrà."
+
+#: Public/form_data/FG_var_card.inc:763
+msgid "CREATE SIP CONFIG"
+msgstr "CREA SIP CONFIG"
+
+#: Public/form_data/FG_var_card.inc:769
+msgid "Choose if you want to enable the sip account"
+msgstr "Scegli se vuoi abilitare l'account sip"
+
+#: Public/form_data/FG_var_card.inc:770
+msgid "Create the SIP config automatically"
+msgstr "Crea il SIP config automaticamente"
+
+#: Public/form_data/FG_var_card.inc:773
+msgid "CREATE IAX CONFIG"
+msgstr "CREA IAX CONFIG"
+
+#: Public/form_data/FG_var_card.inc:779
+msgid "Choose if you want to enable the iax account"
+msgstr "Scegli se vuoi abilitare l'account iax"
+
+#: Public/form_data/FG_var_card.inc:780
+msgid "Create the IAX config automatically"
+msgstr "Crea lo IAX config automaticamente"
+
+#: Public/form_data/FG_var_card.inc:782
+msgid "MAC ADDRESS"
+msgstr "MAC ADDRESS"
+
+#: Public/form_data/FG_var_card.inc:788
+msgid "Insert the MAC address customers' device"
+msgstr "Inserisci il MAC address del dispositivo dell'utente"
+
+#: Public/form_data/FG_var_card.inc:789
+msgid "FORMAT: 00-08-74-4C-7F-1D"
+msgstr "FORMATO: 00-08-74-4C-7F-1D"
+
+#: Public/form_data/FG_var_card.inc:792
+msgid "IN USE"
+msgstr "IN SERVIZIO"
+
+#: Public/form_data/FG_var_card.inc:799
+msgid "Updated to show the number of concurrent calls in use by this customer. If there are no currently no calls, and the system shows that there are, manually reset this field back to zero."
+msgstr "Aggiornata mostra il numero di canali attualmente utilizzati dall'utente. Se non ci sono canali in uso, ed il sistema invece qui mostra che ci sono, resetta manualmente questo campo a zero."
+
+#: Public/form_data/FG_var_card.inc:801
+#: Public/form_data/FG_var_card.inc:809
+#: Public/A2B_card_info.php:357
+msgid "AUTOREFILL"
+msgstr "AUTO RICARICA"
+
+#: Public/form_data/FG_var_card.inc:807
+msgid "Choose if you want to enable the autorefill on this account"
+msgstr "Scegli se vuoi abilitare l'auto ricarica per questo account"
+
+#: Public/form_data/FG_var_card.inc:808
+msgid "Define if you want to authorize the autorefill to apply on this accout"
+msgstr "Definisci se vuoi autorizzare l'auto ricarica da applicare a questo account"
+
+#: Public/form_data/FG_var_card.inc:811
+msgid "INITIAL BALANCE"
+msgstr "SALDO INIZIALE"
+
+#: Public/form_data/FG_var_card.inc:817
+msgid "Insert the amount of the initial balance"
+msgstr "Inserisci l'importo del saldo iniziale"
+
+#: Public/form_data/FG_var_card.inc:818
+msgid "The initial balance is used by autorefill to reset the current balance to this amount"
+msgstr "Il saldo iniziale &egrave usato dall'auto ricarica per resattere il saldo corrente di questo account"
+
+#: Public/form_data/FG_var_card.inc:829
+msgid "Define the day of the month when the system will generate the customer invoice."
+msgstr "Definisce il giorno del mese in cui il sistema genera la fattura dell'utente."
+
+#: Public/form_data/FG_var_card.inc:830
+msgid "Invoice Status"
+msgstr "Stato Fattura"
+
+#: Public/form_data/FG_var_card.inc:838
+#: Public/form_data/FG_var_agent.inc:236
+#: Public/form_data/FG_var_agent.inc:243
+#: Public/A2B_invoice_view.php:220
+#: Public/A2B_invoice_edit.php:187
+#: Public/A2B_agent_info.php:202
+msgid "VAT"
+msgstr "IVA"
+
+#: Public/form_data/FG_var_card.inc:844
+#: Public/form_data/FG_var_agent.inc:242
+msgid "Insert the VAT"
+msgstr "Inserisci l'IVA"
+
+#: Public/form_data/FG_var_card.inc:845
+#, c-format
+msgid "VAT to add on the invoice of this customer. It should be a decimal value '21' this will be for 21% of VAT!"
+msgstr "IVA da aggiungere alla fattura di questo utente. Deve essere un valore decimale. '21' sar&agrave il 21% di IVA!"
+
+#: Public/form_data/FG_var_card.inc:848
+msgid "VAT REGISTRATION NUMBER "
+msgstr "NUMERO DI PARTITA IVA "
+
+#: Public/form_data/FG_var_card.inc:854
+msgid "Insert the VAT registration number of this customer"
+msgstr "Inserisci il numero di partita IVA "
+
+#: Public/form_data/FG_var_card.inc:858
+msgid "DISCOUNT"
+msgstr "SCONTO"
+
+#: Public/form_data/FG_var_card.inc:868
+#: Public/A2B_card_info.php:412
+msgid "TRAFFIC PER MONTH"
+msgstr "TRAFFICO MENSILE"
+
+#: Public/form_data/FG_var_card.inc:874
+msgid "Insert the traffic per month for this customer"
+msgstr "Inserisci il traffico mensile dell'utente"
+
+#: Public/form_data/FG_var_card.inc:876
+#: Public/form_data/FG_var_card.inc:878
+msgid "TARGET TRAFFIC"
+msgstr "OBIETTIVO TRAFFICO"
+
+#: Public/form_data/FG_var_card.inc:884
+msgid "Insert the target traffic description"
+msgstr "Inserisci la descrizione dell'obiettivo traffico"
+
+#: Public/form_data/FG_var_card.inc:888
+msgid "RESTRICTION"
+msgstr "LIMITAZIONE"
+
+#: Public/form_data/FG_var_card.inc:896
+#: Public/form_data/FG_var_card.inc:898
+msgid "RESTRICTED NUMBERS"
+msgstr "NUMERI LIMITATI"
+
+#: Public/form_data/FG_var_card.inc:904
+msgid "Insert numbers that restrict the customer"
+msgstr "Inserisci i numeri che limitano il cliente"
+
+#: Public/form_data/FG_var_card.inc:923
+msgid "CALLERID / CUSTOMER HISTORY"
+msgstr "ID CHIAMANTE / STORICO UTENTE"
+
+#: Public/form_data/FG_var_card.inc:929
+msgid "CUSTOMER HISTORY"
+msgstr "STORICO UTENTE"
+
+#: Public/form_data/FG_var_card.inc:985
+#: Public/form_data/FG_var_subscriber.inc:143
+msgid "Once you have completed the form above, click on Confirm Data"
+msgstr "Una volta completato il modulo sopra, clicca su 'CONFERMA DATI'"
+
+#: Public/form_data/FG_var_user.inc:42
+msgid "Add ADMINISTRATOR"
+msgstr "Aggiungi AMMINISTRATORE"
+
+#: Public/form_data/FG_var_user.inc:47
+msgid "Add ADMIN ACL"
+msgstr "Aggiungi ACL AMMIN."
+
+#: Public/form_data/FG_var_user.inc:79
+#: Public/form_data/FG_var_agent.inc:73
+msgid "CALL REPORT"
+msgstr "RAPPORTO CHIAMATA"
+
+#: Public/form_data/FG_var_user.inc:80
+msgid "CRONT SERVICE"
+msgstr "SERVIZIO CRONT"
+
+#: Public/form_data/FG_var_user.inc:81
+msgid "AGENT / ADMIN"
+msgstr "AGENTE / AMMIN."
+
+#: Public/form_data/FG_var_user.inc:82
+#: Public/templates/default/main.tpl:468
+msgid "MAINTENANCE"
+msgstr "MANUTENZIONE"
+
+#: Public/form_data/FG_var_user.inc:83
+#: Public/templates/default/main.tpl:502
+msgid "MAIL"
+msgstr "EMAIL"
+
+#: Public/form_data/FG_var_user.inc:86
+#: Public/templates/default/main.tpl:277
+msgid "OUTBOUND CID"
+msgstr "CID USCITA"
+
+#: Public/form_data/FG_var_user.inc:87
+#: Public/templates/default/main.tpl:366
+msgid "PACKAGE OFFER"
+msgstr "OFF. PACCHETTI"
+
+#: Public/form_data/FG_var_user.inc:88
+msgid "PREDICTIVE DIALER"
+msgstr "COMPOSITORE INTUITIVO"
+
+#: Public/form_data/FG_var_user.inc:91
+#: Public/templates/default/main.tpl:19
+msgid "DASHBOARD"
+msgstr "BACHECA"
+
+#: Public/form_data/FG_var_user.inc:92
+#: Public/templates/default/main.tpl:526
+msgid "SYSTEM SETTINGS"
+msgstr "IMPOST. SISTEMA"
+
+#: Public/form_data/FG_var_user.inc:93
+msgid "EDIT/DELETE REFILLS"
+msgstr "EDITA/ELIMINA RICARICHE"
+
+#: Public/form_data/FG_var_user.inc:94
+msgid "EDIT/DELETE PAYMENTS"
+msgstr "EDITA/ELIMINA PAGAMENTI"
+
+#: Public/form_data/FG_var_user.inc:95
+msgid "EDIT/DELETE CUSTOMERS"
+msgstr "EDITA/ELIMINA UTENTI"
+
+#: Public/form_data/FG_var_user.inc:96
+msgid "DELETE NOTIFICATIONS"
+msgstr "ELIMINA NOTIFICHE"
+
+#: Public/form_data/FG_var_user.inc:97
+msgid "DELETE CDR"
+msgstr "ELIMINA RDC"
+
+#: Public/form_data/FG_var_user.inc:98
+msgid "EDIT/DELETE ADMIN"
+msgstr "EDITA/ELIMINA ADMIN"
+
+#: Public/form_data/FG_var_user.inc:99
+msgid "EDIT/DELETE AGENT"
+msgstr "EDITA/ELIMINA AGENTE"
+
+#: Public/form_data/FG_var_user.inc:104
+#: Public/form_data/FG_var_user.inc:127
+msgid "USERID"
+msgstr "ID UTENTE"
+
+#: Public/form_data/FG_var_user.inc:110
+msgid "HAVE BEEN CREATED!"
+msgstr "&Egrave STATO CREATO!"
+
+#: Public/form_data/FG_var_user.inc:133
+msgid "Insert the userid"
+msgstr "Inserisci l'id utente"
+
+#: Public/form_data/FG_var_user.inc:143
+#: Public/form_data/FG_var_friend.inc:377
+msgid "Insert the username"
+msgstr "Inserisci il nome utente"
+
+#: Public/form_data/FG_var_user.inc:152
+msgid "Insert the Reseller password"
+msgstr "Inserisci la password Rivenditore"
+
+#: Public/form_data/FG_var_user.inc:156
+#: Public/form_data/FG_var_agent.inc:168
+msgid "PERMISSION"
+msgstr "PERMESSI"
+
+#: Public/form_data/FG_var_user.inc:173
+#: Public/form_data/FG_var_speeddial.inc:95
+#: Public/form_data/FG_var_server_group.inc:75
+#: Public/form_data/FG_var_friend.inc:149
+msgid "Insert the name"
+msgstr "Inserisci il nome"
+
+#: Public/form_data/FG_var_user.inc:182
+msgid "Insert the direction"
+msgstr "Inserisci la direzione"
+
+#: Public/form_data/FG_var_user.inc:190
+#: Public/form_data/FG_var_user.inc:216
+#: Public/form_data/FG_var_agent.inc:314
+msgid "Insert the country"
+msgstr "Inserisci la nazione"
+
+#: Public/form_data/FG_var_user.inc:193
+#: Public/form_data/FG_var_agent.inc:317
+msgid "ZIPCODE"
+msgstr "CODICE POSTALE"
+
+#: Public/form_data/FG_var_user.inc:199
+#: Public/form_data/FG_var_agent.inc:323
+msgid "Insert the zip code"
+msgstr "Inserisci il codice postale"
+
+#: Public/form_data/FG_var_user.inc:202
+#: Public/form_data/FG_var_agent.inc:299
+#: Public/A2B_admin_info.php:125
+#: Public/A2B_card_info.php:270
+#: Public/A2B_agent_info.php:141
+msgid "STATE"
+msgstr "REGIONE"
+
+#: Public/form_data/FG_var_user.inc:219
+#: Public/form_data/FG_var_agent.inc:335
+#: Public/form_data/FG_var_speeddial.inc:99
+#: Public/A2B_admin_info.php:153
+#: Public/A2B_card_info.php:299
+#: Public/A2B_card_info.php:498
+#: Public/A2B_agent_info.php:170
+msgid "PHONE"
+msgstr "TELEFONO"
+
+#: Public/form_data/FG_var_user.inc:225
+#: Public/form_data/FG_var_agent.inc:341
+msgid "Insert the telephone number"
+msgstr "Inserirsci il numero di telefono"
+
+#: Public/form_data/FG_var_user.inc:228
+#: Public/form_data/FG_var_agent.inc:344
+#: Public/A2B_admin_info.php:161
+#: Public/A2B_card_info.php:307
+#: Public/A2B_agent_info.php:178
+msgid "FAX"
+msgstr "FAX"
+
+#: Public/form_data/FG_var_user.inc:234
+#: Public/form_data/FG_var_agent.inc:350
+msgid "Insert the fax number"
+msgstr "Inserirsci il numero di fax"
+
+#: Public/form_data/FG_var_agent.inc:41
+#: Public/form_data/FG_var_agentsituation.inc:42
+msgid "Agent"
+msgstr "Agente"
+
+#: Public/form_data/FG_var_agent.inc:52
+msgid "Add AGENT"
+msgstr "Aggiungi AGENTE"
+
+#: Public/form_data/FG_var_agent.inc:57
+msgid "Edit agent homepage"
+msgstr "Edita la pagina home agente"
+
+#: Public/form_data/FG_var_agent.inc:70
+msgid "VIEW CUSTOMERS"
+msgstr "VISUALIZZA UTENTI"
+
+#: Public/form_data/FG_var_agent.inc:74
+msgid "MY ACCOUNT"
+msgstr "MIO ACCOUNT"
+
+#: Public/form_data/FG_var_agent.inc:76
+msgid "CREATE CUSTOMER"
+msgstr "CREA UTENTI"
+
+#: Public/form_data/FG_var_agent.inc:77
+msgid "EDIT CUSTOMER"
+msgstr "EDITA UTENTI"
+
+#: Public/form_data/FG_var_agent.inc:78
+msgid "DELETE CUSTOMER"
+msgstr "ELIMINA UTENTI"
+
+#: Public/form_data/FG_var_agent.inc:79
+msgid "GENERATE CUSTOMER"
+msgstr "GENERA UTENTI"
+
+#: Public/form_data/FG_var_agent.inc:80
+msgid "SIGNUP"
+msgstr "REGISTRAZIONE"
+
+#: Public/form_data/FG_var_agent.inc:81
+msgid "VOIP CONF"
+msgstr "VOIP CONF"
+
+#: Public/form_data/FG_var_agent.inc:82
+msgid "SEE CUSTOMERS CALLERID"
+msgstr "VEDI ID CHIAMANTI UTENTI"
+
+#: Public/form_data/FG_var_agent.inc:111
+msgid "COMMISSION"
+msgstr "COMMISSIONI"
+
+#: Public/form_data/FG_var_agent.inc:156
+msgid "Insert the login"
+msgstr "Inserisci il login"
+
+#: Public/form_data/FG_var_agent.inc:183
+msgid "Choose if you want to active the agent"
+msgstr "Scegli se vuoi attivare l'agente"
+
+#: Public/form_data/FG_var_agent.inc:184
+msgid "Enable agent"
+msgstr "Abilita agente"
+
+#: Public/form_data/FG_var_agent.inc:199
+msgid "amount of credit"
+msgstr "Importo del credito"
+
+#: Public/form_data/FG_var_agent.inc:202
+msgid "COMMISSION BALANCE"
+msgstr "SALDO COMMISSIONI"
+
+#: Public/form_data/FG_var_agent.inc:208
+msgid "amount of commission"
+msgstr "importo delle commissioni"
+
+#: Public/form_data/FG_var_agent.inc:218
+msgid "COMMISSION PERCENTAGE"
+msgstr "PERCENTUALE COMMISSIONI"
+
+#: Public/form_data/FG_var_agent.inc:224
+msgid "Insert the commision"
+msgstr "Inserisci la commissione"
+
+#: Public/form_data/FG_var_agent.inc:225
+msgid "Commission in percent"
+msgstr "Commissione in percentuale"
+
+#: Public/form_data/FG_var_agent.inc:227
+msgid "THRESHOLD REMITTANCE"
+msgstr "SOGLIA COMMISSIONI"
+
+#: Public/form_data/FG_var_agent.inc:233
+msgid "treshold remittance"
+msgstr "soglia rimessa"
+
+#: Public/form_data/FG_var_agent.inc:254
+msgid "COMPANY"
+msgstr "SOCIET&Agrave"
+
+#: Public/form_data/FG_var_agent.inc:260
+msgid "Insert the company"
+msgstr "Inserisci la societ&agrave"
+
+#: Public/form_data/FG_var_agent.inc:269
+msgid "Insert the lastname"
+msgstr "Inserisci il cognome"
+
+#: Public/form_data/FG_var_agent.inc:278
+msgid "Insert the firstname"
+msgstr "Inserisci il nome"
+
+#: Public/form_data/FG_var_agent.inc:287
+msgid "Insert the address"
+msgstr "Inserisci l'indirizzo"
+
+#: Public/form_data/FG_var_agent.inc:353
+msgid "BANK INFO"
+msgstr "INFO BANCA"
+
+#: Public/form_data/FG_var_agent.inc:359
+msgid "Insert the bank info of this agent"
+msgstr "Inserisci le informazioni bancarie di questo pagamento"
+
+#: Public/form_data/FG_var_agent.inc:370
+msgid "CALL PLAN USABLE"
+msgstr "PIANO DI CHIAMATA UTILIZZABILE"
+
+#: Public/form_data/FG_var_mailtemplate.inc:42
+msgid "mail template"
+msgstr "modello email"
+
+#: Public/form_data/FG_var_mailtemplate.inc:67
+msgid "Reminder"
+msgstr "Promemoria"
+
+#: Public/form_data/FG_var_mailtemplate.inc:68
+msgid "Signup"
+msgstr "Iscrizione"
+
+#: Public/form_data/FG_var_mailtemplate.inc:69
+msgid "Forget password"
+msgstr "Password dimenticata"
+
+#: Public/form_data/FG_var_mailtemplate.inc:70
+msgid "Signup confirmed"
+msgstr "Iscrizione confermata"
+
+#: Public/form_data/FG_var_mailtemplate.inc:71
+msgid "Payment Confirmation"
+msgstr "Conferma Pagamento"
+
+#: Public/form_data/FG_var_mailtemplate.inc:72
+msgid "Invoice"
+msgstr "Fattura"
+
+#: Public/form_data/FG_var_mailtemplate.inc:73
+msgid "EPayment Warning"
+msgstr "Attenzione: EPayment"
+
+#: Public/form_data/FG_var_mailtemplate.inc:74
+msgid "Did Payment confirmation"
+msgstr "Conferma Pagamento Did"
+
+#: Public/form_data/FG_var_mailtemplate.inc:75
+msgid "Did not payment warning"
+msgstr "Attenzione: Did non pagato"
+
+#: Public/form_data/FG_var_mailtemplate.inc:76
+msgid "Did released warning"
+msgstr "Attenzione: rilascio Did"
+
+#: Public/form_data/FG_var_mailtemplate.inc:77
+msgid "template1"
+msgstr "modello1"
+
+#: Public/form_data/FG_var_mailtemplate.inc:78
+msgid "template2"
+msgstr "modello2"
+
+#: Public/form_data/FG_var_mailtemplate.inc:79
+msgid "template3"
+msgstr "modello3"
+
+#: Public/form_data/FG_var_mailtemplate.inc:80
+msgid "template4"
+msgstr "modello4"
+
+#: Public/form_data/FG_var_mailtemplate.inc:81
+msgid "template5"
+msgstr "modello5"
+
+#: Public/form_data/FG_var_mailtemplate.inc:82
+msgid "template6"
+msgstr "modello6"
+
+#: Public/form_data/FG_var_mailtemplate.inc:83
+msgid "template7"
+msgstr "modello7"
+
+#: Public/form_data/FG_var_mailtemplate.inc:84
+msgid "template8"
+msgstr "modello8"
+
+#: Public/form_data/FG_var_mailtemplate.inc:85
+msgid "template9"
+msgstr "modello9"
+
+#: Public/form_data/FG_var_mailtemplate.inc:86
+msgid "New Ticket"
+msgstr "Nuovo Ticket"
+
+#: Public/form_data/FG_var_mailtemplate.inc:87
+msgid "Modify Ticket"
+msgstr "Modifica Ticket"
+
+#: Public/form_data/FG_var_mailtemplate.inc:88
+msgid "Invoice to Pay"
+msgstr "Fattura da Pagare"
+
+#: Public/form_data/FG_var_mailtemplate.inc:89
+msgid "Subscription Paid"
+msgstr "Sottoscrizione Pagata"
+
+#: Public/form_data/FG_var_mailtemplate.inc:90
+msgid "Subscription Unpaid"
+msgstr "Sottoscrizione non Pagata"
+
+#: Public/form_data/FG_var_mailtemplate.inc:91
+msgid "Subscription Disable Card"
+msgstr "Sottoscrizione Disabilita Scheda"
+
+#: Public/form_data/FG_var_mailtemplate.inc:94
+msgid "ID MAIL"
+msgstr "ID EMAIL"
+
+#: Public/form_data/FG_var_mailtemplate.inc:96
+msgid "MAILTYPE"
+msgstr "TIPO DI EMAIL"
+
+#: Public/form_data/FG_var_mailtemplate.inc:97
+msgid "FROMEMAIL"
+msgstr "EMAIL DA"
+
+#: Public/form_data/FG_var_mailtemplate.inc:115
+msgid "SELECT TEXT"
+msgstr "SELEZIONA TESTO"
+
+#: Public/form_data/FG_var_mailtemplate.inc:124
+msgid "Add MAIL TEMPLATE"
+msgstr "Aggiungi MODELLO EMAIL"
+
+#: Public/form_data/FG_var_mailtemplate.inc:138
+msgid "MAIL TYPE"
+msgstr "TIPO DI EMAIL"
+
+#: Public/form_data/FG_var_mailtemplate.inc:147
+msgid "FROM EMAIL"
+msgstr "EMAIL DA"
+
+#: Public/form_data/FG_var_mailtemplate.inc:153
+msgid "Insert the user fromemail"
+msgstr "Inserisci l'email mittente"
+
+#: Public/form_data/FG_var_mailtemplate.inc:162
+msgid "Insert the user fromname"
+msgstr "Inserisci il nome mittente "
+
+#: Public/form_data/FG_var_mailtemplate.inc:171
+#: Public/form_data/FG_var_mailtemplate.inc:180
+msgid "Insert the user subject"
+msgstr "Inserisci il soggetto"
+
+#: Public/form_data/FG_var_mailtemplate.inc:174
+msgid "MESSAGE TEXT"
+msgstr "TESTO MESSAGGIO"
+
+#: Public/form_data/FG_var_mailtemplate.inc:197
+msgid "Modify the contents of the email template below."
+msgstr "Modifica il contenuto del seguente modello email."
+
+#: Public/form_data/FG_var_mailtemplate.inc:201
+msgid "Add a new mail template"
+msgstr "Aggiungi un nuovo modello email"
+
+#: Public/form_data/FG_var_def_ratecard.inc:72
+msgid "EXPORTED LCR CALL PLAN"
+msgstr "ESPORTATO PIANO DI CHIAMATA MCR"
+
+#: Public/form_data/FG_var_def_ratecard.inc:107
+#: Public/form_data/FG_var_currencies.inc:44
+#: Public/A2B_package_manage_rates.php:215
+msgid "Add Rate"
+msgstr "Aggiungi Tariffa"
+
+#: Public/form_data/FG_var_def_ratecard.inc:118
+#: Public/form_data/FG_var_prefix.inc:87
+#: Public/CC_ratecard_merging.php:145
+#: Public/A2B_entity_def_ratecard.php:545
+msgid "PREFIX"
+msgstr "PREFISSO"
+
+#: Public/form_data/FG_var_def_ratecard.inc:119
+msgid "BR"
+msgstr "TA"
+
+#: Public/form_data/FG_var_def_ratecard.inc:121
+msgid "START-DATE"
+msgstr "DATA-INIZIO"
+
+#: Public/form_data/FG_var_def_ratecard.inc:122
+msgid "STOP-DATE"
+msgstr "DATA-FINE"
+
+#: Public/form_data/FG_var_def_ratecard.inc:123
+msgid "INITB"
+msgstr "SALDOINIZ."
+
+#: Public/form_data/FG_var_def_ratecard.inc:124
+msgid "CC"
+msgstr "SR"
+
+#: Public/form_data/FG_var_def_ratecard.inc:126
+msgid "RATE CARD"
+msgstr "SCHEDA TARIFFE"
+
+#: Public/form_data/FG_var_def_ratecard.inc:163
+#: Public/form_data/FG_var_voucher.inc:110
+msgid "HAVE BEEN CREATED."
+msgstr "&Egrave STATA CREATA."
+
+#: Public/form_data/FG_var_def_ratecard.inc:170
+msgid "Define the criteria to search"
+msgstr "Definire il criterio di ricerca"
+
+#: Public/form_data/FG_var_def_ratecard.inc:176
+#: Public/form_data/FG_var_def_ratecard.inc:592
+#: Public/form_data/FG_var_voucher.inc:81
+#: Public/form_data/FG_var_voucher.inc:100
+#: Public/form_data/FG_var_voucher.inc:148
+#: Public/CC_ratecard_merging.php:143
+#: Public/A2B_entity_def_ratecard.php:402
+#: Public/A2B_entity_def_ratecard.php:534
+#: Public/A2B_entity_voucher.php:248
+msgid "TAG"
+msgstr "ETICHETTA"
+
+#: Public/form_data/FG_var_def_ratecard.inc:177
+msgid "DIALING PREFIX"
+msgstr "PREFISSO CHIAMATA"
+
+#: Public/form_data/FG_var_def_ratecard.inc:197
+msgid "DIALPREFIX"
+msgstr "PREFISSO CHIAMATA"
+
+#: Public/form_data/FG_var_def_ratecard.inc:203
+msgid "Insert the dialing prefix, such as for UK '44' or for US '1' "
+msgstr "Inserisci il prefisso di chiamata. Per esempio: '33' per la Francia o '39' per l'Italia "
+
+#: Public/form_data/FG_var_def_ratecard.inc:205
+msgid "A) Add destination prefixes, ie '441' for UK Landlines.<br>B) Use 'defaultprefix' to setup a rate for all destinations where a specific rate is not provided.<br>C) if you ADD a rate, NOT an EDIT, you can define a range of prefixes. '32484-32487' adds all prefixes between 32484 and 32487. '32484,32386,32488' would add only the individual prefixes listed.<br>D) Asterisk extensions style + POSIX regex syntaxes are supported. '_447[7-9]XXXXXXXX' matches 12-digit UK mobiles. '_X{0,3}(112|999|911)' matches any 0-3 digits followed an emergency number. '_' can be used to add length, and raise the priority."
+msgstr "A) Aggiungi un prefisso di chiamata, es.: '39' per l'Italia.<br>B) Utilizza 'defaultprefix' per impostare una tariffa per tutte le destinazioni non previste nella scheda tariffe.<br>C) Se AGGIUNGI una tariffa, NON se la EDITI, puoi definire un intervallo di prefissi. '32484-32487 aggiunge tutti i prefissi compresi tra 32484 e 32487. '32484,32386,32488' aggiunger&agrave solo i prefissi individuali.<br>D) Estensioni stile Asterisk + sintassi POSIX sono supportate. '_393[7-9]XXXXXXXX' corrisponde a 12 cifre Italia Mobile. '_X{0,3}(112|999|911)' corrispoonde a sole 3 cifre digitate, come un numero di emergenza (112). '_' pu&ograve essere usato per aggiungere la lunghezza, e aumentare la priorit&agrave."
+
+#: Public/form_data/FG_var_def_ratecard.inc:208
+msgid "Destination Prefix"
+msgstr "Prefisso Destinazione"
+
+#: Public/form_data/FG_var_def_ratecard.inc:216
+msgid "Select the prefix destination corresponding to your prefix rate."
+msgstr "Seleziona il prefisso di destinazione corrispondente al tuo prefisso tariffa."
+
+#: Public/form_data/FG_var_def_ratecard.inc:216
+msgid "This is the label that appears against the Call Detail Record."
+msgstr "Qeusta &egrave l'etichetta che appare nel Rapporto Dettagli Chiamata"
+
+#: Public/form_data/FG_var_def_ratecard.inc:236
+msgid "Insert the buy rate"
+msgstr "Inserisci la tariffa d'acquisto"
+
+#: Public/form_data/FG_var_def_ratecard.inc:237
+msgid "Set the carrier cost, the price you pay for minutes."
+msgstr "Imposta il costo all'ingrosso, il prezzo che tu paghi per minuto."
+
+#: Public/form_data/FG_var_def_ratecard.inc:238
+msgid "Set the carrier cost for this destination."
+msgstr "Imposta il costo all'ingrosso per questa destinazione."
+
+#: Public/form_data/FG_var_def_ratecard.inc:241
+msgid "BUYRATE MIN DURATION"
+msgstr "MINIMA DURATA ACQUISTO"
+
+#: Public/form_data/FG_var_def_ratecard.inc:251
+msgid "BUYRATE BILLING BLOCK"
+msgstr "DURATA SCATTO ACQUISTO"
+
+#: Public/form_data/FG_var_def_ratecard.inc:267
+msgid "Insert the initial rate"
+msgstr "Inserisci la tariffa iniziale"
+
+#: Public/form_data/FG_var_def_ratecard.inc:268
+msgid "The retail rate; or the cost per minute to apply to the customer, e.g. 0.02"
+msgstr "Prezzo al dettaglio; costo al minuto applicato al cliente, es.: 0.02"
+
+#: Public/form_data/FG_var_def_ratecard.inc:268
+msgid "Define the selling cost for customers."
+msgstr "Definisci il prezzo di vendita per gli utenti"
+
+#: Public/form_data/FG_var_def_ratecard.inc:271
+msgid "SELLRATE MIN DURATION"
+msgstr "MINIMA DURATA VENDITA"
+
+# pb
+#: Public/form_data/FG_var_def_ratecard.inc:281
+msgid "SELLRATE BILLING BLOCK"
+msgstr "DURATA SCATTO VENDITA"
+
+#: Public/form_data/FG_var_def_ratecard.inc:298
+msgid "Apply a connection charge"
+msgstr "Applica uno scatto alla risposta"
+
+#: Public/form_data/FG_var_def_ratecard.inc:301
+msgid "DISCONNECT CHARGE"
+msgstr "SCATTO ALLA DISCONNESSIONE"
+
+#: Public/form_data/FG_var_def_ratecard.inc:307
+msgid "Insert the disconnect charge"
+msgstr "Inserisci lo scatto alla disconnessione"
+
+#: Public/form_data/FG_var_def_ratecard.inc:308
+msgid "Apply a disconnection charge"
+msgstr "Applica uno scatto alla disconnessione"
+
+#: Public/form_data/FG_var_def_ratecard.inc:317
+msgid "Insert the disconnect charge threshold"
+msgstr "Inserisci la soglia dello scatto alla disconnessione"
+
+#: Public/form_data/FG_var_def_ratecard.inc:318
+msgid "Apply the disconnection charge if the call duration is greater than this amount of seconds. If 0, it will always apply."
+msgstr "Applica lo scatto alla disconnessione se la durata della chiamata &egrave pi&ugrave lunga della quantit&agrave dei secondi. Se '0', sar&agrave sempre applicato."
+
+#: Public/form_data/FG_var_def_ratecard.inc:321
+msgid "MINIMUM CALL COST"
+msgstr "COSTO MINIMO CHIAMATA"
+
+#: Public/form_data/FG_var_def_ratecard.inc:327
+msgid "Insert the Minimum call cost"
+msgstr "Inserisci il costo minimo della chiamata"
+
+#: Public/form_data/FG_var_def_ratecard.inc:328
+msgid "Apply a minimum charge for the call."
+msgstr "Applica un costo minimo per la chiamata."
+
+#: Public/form_data/FG_var_def_ratecard.inc:333
+msgid "STEPCHARGE A"
+msgstr "COSTO MINIMO A"
+
+#: Public/form_data/FG_var_def_ratecard.inc:339
+msgid "Insert the stepcharge A"
+msgstr "Inserisci la misura costo A"
+
+#: Public/form_data/FG_var_def_ratecard.inc:340
+msgid "When entering in the cycle 'A', define the amount to charge for the entrance."
+msgstr "Accesso al ciclo A, definisci l'importo del costo per l'accesso."
+
+#: Public/form_data/FG_var_def_ratecard.inc:340
+msgid "Below we have the section to create progressive rates. Progressive rate aims to bill the customer at various rates according the duration of the call. For instance you can define that you can to bill the customer 0.33dollars for the first 2 minutes and then you want to bill him 0.45dollars for the rest of the call."
+msgstr "Sotto hai la sezione per creare delle tariffe progressive. La tariffa progressiva fattura all'utente varie tariffe a seconda della durata della chiamata. Per esempio puoi definire che l'utente paga 0.33 euro per i primi 2 minuti e 0.45 euro per il resto della chiamata"
+
+#: Public/form_data/FG_var_def_ratecard.inc:343
+msgid "CHARGE A"
+msgstr "TARIFFA A"
+
+#: Public/form_data/FG_var_def_ratecard.inc:349
+msgid "Insert the charge A"
+msgstr "Inserisci la tariffa A"
+
+#: Public/form_data/FG_var_def_ratecard.inc:350
+msgid "When entering in the cycle 'A', define the rate to apply."
+msgstr "Quando accede al ciclo 'A' definisci la tariffa da applicare."
+
+#: Public/form_data/FG_var_def_ratecard.inc:353
+msgid "TIMECHARGE A"
+msgstr "ADDEBITO TEMPO A"
+
+#: Public/form_data/FG_var_def_ratecard.inc:359
+msgid "Insert the time charge A"
+msgstr "Inserisci l'addebito di tempo A"
+
+#: Public/form_data/FG_var_def_ratecard.inc:360
+msgid "Define the duration of the cycle 'A'."
+msgstr "Definisci la durata del ciclo 'A'."
+
+#: Public/form_data/FG_var_def_ratecard.inc:363
+msgid "BILLING BLOCK A"
+msgstr "FATTURAZIONE SCATTO A"
+
+#: Public/form_data/FG_var_def_ratecard.inc:369
+msgid "Insert the billing block A"
+msgstr "Inserisci la fatturazione scatto A"
+
+#: Public/form_data/FG_var_def_ratecard.inc:370
+msgid "Define the duration of each billing block to apply the rate 'CHARGE A'."
+msgstr "Definisci la durata di ogni fatturazione scatto da applicare alla tariffa 'TARIFFA A'."
+
+#: Public/form_data/FG_var_def_ratecard.inc:373
+msgid "STEPCHARGE B"
+msgstr "COSTO MINIMO B"
+
+#: Public/form_data/FG_var_def_ratecard.inc:379
+msgid "Insert the stepcharge B"
+msgstr "Inserisci il costo minimo B"
+
+#: Public/form_data/FG_var_def_ratecard.inc:380
+msgid "When entering in the cycle 'B', define the amount to charge for the entrance."
+msgstr "Accesso al ciclo B, definisci l'importo del costo per l'accesso."
+
+#: Public/form_data/FG_var_def_ratecard.inc:383
+msgid "CHARGE B"
+msgstr "TARIFFA B"
+
+#: Public/form_data/FG_var_def_ratecard.inc:389
+msgid "Insert the charge B"
+msgstr "Inserisci la tariffa B"
+
+#: Public/form_data/FG_var_def_ratecard.inc:390
+msgid "When entering in the cycle 'B', define the rate to apply."
+msgstr "Quando accede al ciclo 'B' definisci la tariffa da applicare."
+
+#: Public/form_data/FG_var_def_ratecard.inc:393
+msgid "TIMECHARGE B"
+msgstr "ADDEBITO TEMPO B"
+
+#: Public/form_data/FG_var_def_ratecard.inc:399
+msgid "Insert the time charge B"
+msgstr "Inserisci l'addebito di tempo B"
+
+#: Public/form_data/FG_var_def_ratecard.inc:400
+msgid "Define the duration of the cycle 'B'."
+msgstr "Definisci la durata del ciclo 'B'."
+
+#: Public/form_data/FG_var_def_ratecard.inc:403
+msgid "BILLING BLOCK B"
+msgstr "FATTURAZIONE SCATTO B"
+
+#: Public/form_data/FG_var_def_ratecard.inc:409
+msgid "Insert the billing block B"
+msgstr "Inserisci la fatturazione scatto B"
+
+#: Public/form_data/FG_var_def_ratecard.inc:410
+msgid "Define the duration of each billing block to apply the rate 'CHARGE B'."
+msgstr "Definisci la durata di ogni fatturazione scatto da applicare alla tariffa 'TARIFFA B'."
+
+#: Public/form_data/FG_var_def_ratecard.inc:413
+msgid "STEPCHARGE C"
+msgstr "COSTO MINIMO C"
+
+#: Public/form_data/FG_var_def_ratecard.inc:420
+msgid "When entering in the cycle 'C', define the amount to charge for the entrance."
+msgstr "Accesso al ciclo C, definisci l'importo del costo per l'accesso."
+
+#: Public/form_data/FG_var_def_ratecard.inc:423
+msgid "CHARGE C"
+msgstr "TARIFFA C"
+
+#: Public/form_data/FG_var_def_ratecard.inc:429
+msgid "Insert the charge C"
+msgstr "Inserisci la tariffa C"
+
+#: Public/form_data/FG_var_def_ratecard.inc:430
+msgid "When entering in the cycle 'C', define the rate to apply."
+msgstr "Quando accede al ciclo 'C' definisci la tariffa da applicare."
+
+#: Public/form_data/FG_var_def_ratecard.inc:433
+msgid "TIMECHARGE C"
+msgstr "FATTURAZIONE SCATTO C"
+
+#: Public/form_data/FG_var_def_ratecard.inc:439
+msgid "Insert the time charge C"
+msgstr "Inserisci l'addebito di tempo C"
+
+#: Public/form_data/FG_var_def_ratecard.inc:440
+msgid "Define the duration of the cycle 'C'."
+msgstr "Definisci la durata del ciclo 'C'."
+
+#: Public/form_data/FG_var_def_ratecard.inc:443
+msgid "BILLING BLOCK C"
+msgstr "FATTURAZIONE SCATTO C"
+
+#: Public/form_data/FG_var_def_ratecard.inc:449
+msgid "Insert the billing block C"
+msgstr "Inserisci la fatturazione scatto C"
+
+#: Public/form_data/FG_var_def_ratecard.inc:450
+msgid "Define the duration of each billing block to apply the rate 'CHARGE C'."
+msgstr "Definisci la durata di ogni fatturazione scatto da applicare alla tariffa 'TARIFFA C'."
+
+#: Public/form_data/FG_var_def_ratecard.inc:453
+msgid "ANNOUNCE TIME CORRECTION"
+msgstr "CORREZIONE ORARIO ANNUNCIO"
+
+#: Public/form_data/FG_var_def_ratecard.inc:459
+msgid "insert corection for announce time"
+msgstr "Inserisci la correzione d'orario annuncio"
+
+#: Public/form_data/FG_var_def_ratecard.inc:460
+msgid "Define the multiplier on announce time for clients."
+msgstr "Definisci il moltiplicatore dell'orario d'annuncio per gli utenti."
+
+#: Public/form_data/FG_var_def_ratecard.inc:481
+msgid "Define the period when this rate table is active."
+msgstr "Definisci il periodo in cui questa tabella tariffe &egrave attiva."
+
+#: Public/form_data/FG_var_def_ratecard.inc:491
+msgid "Leave empty to apply this rate indefinitely. Format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00"
+msgstr "Lascia vuoto per applicare questa tariffa in modo indefinito. Formato AAAA-MM-GG OO:MM:SS. per esempio, '1986-03-26 10:05:34'"
+
+#: Public/form_data/FG_var_def_ratecard.inc:500
+msgid "START TIME"
+msgstr "ORA INIZIO"
+
+#: Public/form_data/FG_var_def_ratecard.inc:506
+msgid "Insert the start time"
+msgstr "Inserisci l'ora inizio"
+
+#: Public/form_data/FG_var_def_ratecard.inc:507
+msgid "Set the time and day of the week at the rate is first valid (ie Monday 00:00 is 0)"
+msgstr "Imposta l'ora ed il giorno della settimana della prima attivazione della tariffa (es.: Luned&igrave 00:00 &egrave 0)"
+
+#: Public/form_data/FG_var_def_ratecard.inc:510
+msgid "END TIME"
+msgstr "ORA FINE"
+
+#: Public/form_data/FG_var_def_ratecard.inc:516
+msgid "Insert the end time"
+msgstr "Inserisci l'ora fine"
+
+#: Public/form_data/FG_var_def_ratecard.inc:517
+msgid "Set the time and the day of the week that the rate is no longer valid. (ie Sunday 23:59 is 10079)"
+msgstr "Inserisci l'ora ed il giorno della settimana in cui la tariffa non &egrave pi&ugrave valida. (es.: Domenica 23:59 &egrave 10079)"
+
+#: Public/form_data/FG_var_def_ratecard.inc:520
+msgid "ROUNDING CALLTIME"
+msgstr "ARROTONDAMENTO TEMPO CHIAMATA"
+
+#: Public/form_data/FG_var_def_ratecard.inc:526
+msgid "Insert the rounding calltime"
+msgstr "Inserisci l'arrotondamento del tempo di chiamata"
+
+#: Public/form_data/FG_var_def_ratecard.inc:527
+msgid "Set the rounding calltime. All the selling rules will apply over this new calltime."
+msgstr "Imposta l'arrotondamento del tempo di chiamata. Tutte le regole di vendita saranno applicato oltre questo nuovo tempo di chiamata"
+
+#: Public/form_data/FG_var_def_ratecard.inc:530
+msgid "ROUNDING THRESHOLD"
+msgstr "SOGLIA ARROTONDAMENTO"
+
+#: Public/form_data/FG_var_def_ratecard.inc:536
+msgid "Insert the rounding threshold"
+msgstr "Inserisci la soglia dell'arrotondamento"
+
+#: Public/form_data/FG_var_def_ratecard.inc:537
+msgid "Set the rounding threshold"
+msgstr "Definisci la soglia dell'arrotondamento"
+
+#: Public/form_data/FG_var_def_ratecard.inc:540
+msgid "ADDITIONAL BLOCK CHARGE"
+msgstr "ADDEBITO SCATTO ADDIZIONALE"
+
+#: Public/form_data/FG_var_def_ratecard.inc:546
+msgid "Insert the additional block charge"
+msgstr "Inserisci l'addebito scatto addizionale"
+
+#: Public/form_data/FG_var_def_ratecard.inc:547
+msgid "Set the initial block charge"
+msgstr "Imposta l'addebito dello scatto iniziale "
+
+#: Public/form_data/FG_var_def_ratecard.inc:550
+msgid "ADDITIONAL BLOCK CHARGE TIME"
+msgstr "DURATA ADDEBITO SCATTO ADDIZIONALE"
+
+#: Public/form_data/FG_var_def_ratecard.inc:556
+msgid "Insert the additional block charge time"
+msgstr "Inserisci la durata addebito dello scatto addizionale"
+
+#: Public/form_data/FG_var_def_ratecard.inc:557
+msgid "Set the initial block charge time"
+msgstr "Imposta il tempo addebito dello scatto iniziale"
+
+#: Public/form_data/FG_var_def_ratecard.inc:560
+msgid "ADDITIONAL GRACE TIME"
+msgstr "TEMPO DI FAVORE ADDIZIONALE"
+
+#: Public/form_data/FG_var_def_ratecard.inc:566
+msgid "Insert the additional grace time in sec"
+msgstr "Inserisci il tempo addizionale di favore in sec."
+
+#: Public/form_data/FG_var_def_ratecard.inc:567
+msgid "Set the additional grace time in sec"
+msgstr "Imposta il tempo addizionale di favore in sec."
+
+#: Public/form_data/FG_var_def_ratecard.inc:578
+msgid "Set the trunk to use for this destination, or NOT DEFINED to use the rate card trunk."
+msgstr "Imposta il fascio da usare per questa destinazione, o NON DEFINITO per usare il fascio della scheda tariffe."
+
+#: Public/form_data/FG_var_def_ratecard.inc:581
+#: Public/A2B_entity_def_ratecard.php:357
+msgid "CIDGroup"
+msgstr "Gruppo CID"
+
+#: Public/form_data/FG_var_def_ratecard.inc:589
+msgid "Set the Outgoing CID Group to use for this destination, or NOT DEFINED to use the rate card trunk."
+msgstr "Definisci il Gruppo CID di Uscita per questa destinazione, o NON DEFINITO per usare il fascio della scheda tariffe."
+
+#: Public/form_data/FG_var_def_ratecard.inc:599
+msgid "Set a tag on this rate"
+msgstr "Imposta un etichetta per questa tariffa"
+
+#: Public/form_data/FG_var_def_ratecard.inc:603
+#: Public/form_data/FG_var_friend.inc:527
+msgid "MUSICONHOLD"
+msgstr "MUSICA ATTESA"
+
+#: Public/form_data/FG_var_def_ratecard.inc:625
+msgid "Rates must be entered in the currency base : "
+msgstr "le tariffe devono essere inserite nella valuta di base :"
+
+#: Public/form_data/FG_var_package.inc:47
+msgid "Add Package"
+msgstr "Aggiungi Pacchetto "
+
+#: Public/form_data/FG_var_package.inc:65
+#: Public/form_data/FG_var_package.inc:94
+#: Public/A2B_package_manage_rates.php:186
+msgid "PACKAGE TYPE"
+msgstr "TIPO PACCHETTO"
+
+#: Public/form_data/FG_var_package.inc:66
+#: Public/form_data/FG_var_package.inc:103
+msgid "BILLING TYPE"
+msgstr "TIPO FATTURAZIONE"
+
+#: Public/form_data/FG_var_package.inc:67
+#: Public/form_data/FG_var_package.inc:116
+msgid "STARTING DAY"
+msgstr "DATA INIZIO"
+
+#: Public/form_data/FG_var_package.inc:82
+msgid "Add rates"
+msgstr "Agg. tariffe"
+
+#: Public/form_data/FG_var_package.inc:91
+msgid "Insert the package label"
+msgstr "Inserisci l'etichetta pacchetto"
+
+#: Public/form_data/FG_var_package.inc:122
+msgid "Insert the start day"
+msgstr "Inserisci il giorno d'inizio"
+
+#: Public/form_data/FG_var_package.inc:123
+msgid "The value will be related to billing type ; if monthly accepted value are 1-31 ; if Weekly accepted value 1-7 (Monday to Sunday) "
+msgstr "Il valore sar&agrave collegato al tipo di fatturazione ; se mensile il valore sar&agrave 1-31 ; se settimanale il valore sar&agrave 1-7 (Dal Luned&igrave alla Domenica) "
+
+#: Public/form_data/FG_var_package.inc:126
+msgid "FREE UNITS"
+msgstr "UNIT&Agrave GRATUITE"
+
+#: Public/form_data/FG_var_package.inc:132
+msgid "Insert the amount of free time to call (seconds)"
+msgstr "Inserisci la quantit&agrave del tempo gratuito (secodni)"
+
+#: Public/form_data/FG_var_package.inc:133
+msgid "Insert the amount of free units, in seconds,for the FREE SECONDS mode. For NUMBER OF FREE CALLS insert the number of free calls"
+msgstr "Inserisci la quantit&agrave delle unit&agrave gratuite, in secondi, per il modo SECONDI GRATUITI. Per NUMERO DI CHIAMATE GRATUITE inserisci il numero delle chiamate gratuite"
+
+#: Public/form_data/FG_var_voucher.inc:69
+msgid "Generate Voucher"
+msgstr "GENERA COUPON"
+
+#: Public/form_data/FG_var_voucher.inc:74
+msgid "Add Voucher"
+msgstr "Aggiungi Coupon"
+
+#: Public/form_data/FG_var_voucher.inc:84
+msgid "ACCOUNT USED"
+msgstr "ACCOUNT UTILIZZATO"
+
+#: Public/form_data/FG_var_voucher.inc:85
+msgid "CREATED DATE"
+msgstr "DATA CREAZIONE"
+
+#: Public/form_data/FG_var_voucher.inc:86
+msgid "USED DATE"
+msgstr "DATA UTILIZZAZIONE"
+
+#: Public/form_data/FG_var_voucher.inc:105
+msgid "SELECT USED"
+msgstr "SELEZIONA UTILIZZAZIONE"
+
+#: Public/form_data/FG_var_voucher.inc:134
+msgid "Insert the voucher"
+msgstr "Inserisci il coupon"
+
+#: Public/form_data/FG_var_voucher.inc:154
+msgid "Insert the tag"
+msgstr "Inserisci l'etichetta"
+
+#: Public/form_data/FG_var_voucher.inc:209
+msgid "Modify the properties of the selected voucher."
+msgstr "Modifica le propriet&agrave del coupon selezionato."
+
+#: Public/form_data/FG_var_billing_customer.inc:52
+msgid "Add Billing"
+msgstr "Aggiungi Fatturazione"
+
+#: Public/form_data/FG_var_billing_customer.inc:57
+#: Public/form_data/FG_var_billing_customer.inc:83
+msgid "BILLING DATE"
+msgstr "DATA FATTURAZIONE"
+
+#: Public/form_data/FG_var_billing_customer.inc:89
+msgid "Insert the current date (YYYY-MM-DD)"
+msgstr "Inserisci la data attuale (AAAA-MM-GG)"
+
+#: Public/form_data/FG_var_didgroup.inc:46
+msgid "Add DID GROUP"
+msgstr "Aggiungi GRUPPO DID"
+
+#: Public/form_data/FG_var_didgroup.inc:58
+msgid "You have some cards using this DID Group! Please comfirm that you really want to remove this DID Group ? "
+msgstr "Alcune schede utilizzano questo Gruppo DID! Confermi che vuoi realmente eliminare questo Gruppo DID ? "
+
+#: Public/form_data/FG_var_didgroup.inc:84
+msgid "Insert the Did group name "
+msgstr "Inserisci il noma gruppo DID "
+
+#: Public/form_data/FG_var_didgroup.inc:90
+#: Public/form_data/FG_var_outbound_cidgroup.php:63
+msgid "Modify the properties of the DID Group"
+msgstr "Modifica le propriet&agrave del Gruppo DID"
+
+#: Public/form_data/FG_var_didgroup.inc:92
+msgid "you can add easily a new $HD_Form->FG_INSTANCE_NAME.<br>Fill the following fields and confirm by clicking on the button add."
+msgstr "puoi facilmente aggiungere un nuovo $HD_Form->FG_INSTANCE_NAME.<br>Riempi i seguenti campi e conferma cliccando sul tasto 'Aggiungi'."
+
+#: Public/form_data/FG_var_support.inc:52
+msgid "Add SUPPORT BOX"
+msgstr "Aggiungi QUADRO SUPPORTO"
+
+#: Public/form_data/FG_var_support.inc:65
+msgid "You have some components using this Support Box! Please comfirm that you really want to remove this Support Box ? "
+msgstr "Hai dei componenti che usano questo Quadro di Supporto! Confermi che vuoi realmente eliminare questo Quadro Supporto ? "
+
+#: Public/form_data/FG_var_support.inc:91
+#: Public/form_data/FG_var_support_component.inc:91
+msgid "Insert the Support Box name "
+msgstr "Inserisci il nome del Quadro di Supporto "
+
+#: Public/form_data/FG_var_outbound_cidgroup.php:13
+msgid "Add CallerID Group"
+msgstr "Aggiungi Gruppo ID Chiamanti"
+
+#: Public/form_data/FG_var_outbound_cidgroup.php:29
+msgid "You have some CID using this CID Group! Please comfirm that you really want to remove this CID Group ? "
+msgstr "Hai alcuni CID usati di questo Gruppo CID! Confermi che vuoi realmente eliminare questo Gruppo CID ? "
+
+#: Public/form_data/FG_var_outbound_cidgroup.php:34
+msgid "DIDGROUP NAME"
+msgstr "NOME GRUPPO DID"
+
+#: Public/form_data/FG_var_outbound_cidgroup.php:50
+msgid "CIDGROUPNAME"
+msgstr "NOME GRUPPO CID"
+
+# Alsion
+#: Public/form_data/FG_var_outbound_cidgroup.php:56
+msgid "Insert the CID Group Name "
+msgstr "Inserisci il nome del Gruppo CID "
+
+#: Public/form_data/FG_var_tariffplan.inc:47
+msgid "Add RateCard"
+msgstr "Aggiungi Scheda Tariffe"
+
+#: Public/form_data/FG_var_tariffplan.inc:57
+msgid "You are going as well to remove all the rates attached to this ratecard! Please comfirm that you really want to remove this ratecard and those rates ? "
+msgstr "Stai eliminando tutte le tariffe collegate a questa scheda tariffe! Confermi che vuoi realmente eliminare questa scheda tariffe e le sue tariffe ?"
+
+#: Public/form_data/FG_var_tariffplan.inc:61
+#: Public/form_data/FG_var_tariffplan.inc:83
+msgid "TARIFFNAME"
+msgstr "NOME TARIFFA"
+
+#: Public/form_data/FG_var_tariffplan.inc:66
+#: Public/form_data/FG_var_tariffplan.inc:142
+msgid "DNID PREFIX"
+msgstr "PREFISSO DNID"
+
+#: Public/form_data/FG_var_tariffplan.inc:67
+msgid "CID PREFIX"
+msgstr "PREFISSO CID"
+
+#: Public/form_data/FG_var_tariffplan.inc:89
+#: Public/form_data/FG_var_campaign.inc:94
+msgid "Insert the tariff name "
+msgstr "Inserisci il nome della tariffa "
+
+#: Public/form_data/FG_var_tariffplan.inc:107
+msgid "Please use the format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"
+msgstr "Usa il formato AAAA-MM-GG OO:MM:SS. Es.: '2012-12-31 01:23:00'"
+
+#: Public/form_data/FG_var_tariffplan.inc:148
+#: Public/form_data/FG_var_tariffplan.inc:158
+msgid "Insert the dnid prefix"
+msgstr "Inserisci il prefisso dnid"
+
+#: Public/form_data/FG_var_tariffplan.inc:149
+msgid "Set the DNID rules to choose the ratecard 'dnidprefix', by default, matches all DNID. For instance, Set the DNIDPrefix  to 900540540 to choose this ratecard when the DNID is 900540540"
+msgstr "Imposta le regole per scegliere la scheda tariffe 'dnidprefix', per default, corrisponde a tutti i DNID. Imposta il prefisso DNID a 900540540 per scegliere questa scheda tariffe quando il DNID &egrave 900540540"
+
+#: Public/form_data/FG_var_tariffplan.inc:152
+msgid "CALLERID PREFIX"
+msgstr "PREFISSO ID CHIAMANTE"
+
+#: Public/form_data/FG_var_tariffplan.inc:159
+msgid "Set the CallerID rules to choose the ratecard 'calleridprefix', by default, matches all callerID. For instance, Set the calleridprefix to 900540540 to choose this ratecard when the CallerID is 900540540."
+msgstr "Imposta le regole dell'ID Chiamante per scegliere la scheda tariffe 'calleridprefix', per default, corrisponde a tutti gli IDchiamanti. Per esempio, imposta il prefisso calleridprefix a 900540540 per scegliere questa scheda tariffe quando l'ID CHIAMANTE &egrave 900540540."
+
+#: Public/form_data/FG_var_tariffplan.inc:165
+msgid "Modify the properties of the rate card."
+msgstr "Modifica le propriet&agrave della scheda tariffe."
+
+#: Public/form_data/FG_var_call.inc:43
+msgid "CALLEDSTATION"
+msgstr "STAZIONE CHIAMATA"
+
+#: Public/form_data/FG_var_call.inc:50
+msgid "THERE IS NO CALL CREATED!"
+msgstr "NON CI SONO CHIAMATE CREATE!"
+
+#: Public/form_data/FG_var_call.inc:60
+msgid "CALL ID"
+msgstr "ID CHIAMANTE"
+
+#: Public/form_data/FG_var_call.inc:69
+#: Public/form_data/FG_var_speeddial.inc:109
+#: Public/form_data/FG_var_friend.inc:130
+#: Public/form_data/FG_var_phonebook.inc:105
+#: Public/form_data/FG_var_statuslog.inc:93
+#: Public/form_data/FG_var_paymentlog.inc:179
+#: Public/form_data/FG_var_callerid.inc:92
+msgid "ID CARD"
+msgstr "SCHEDA ID"
+
+#: Public/form_data/FG_var_call.inc:75
+#: Public/form_data/FG_var_speeddial.inc:115
+#: Public/form_data/FG_var_friend.inc:136
+#: Public/form_data/FG_var_phonebook.inc:111
+#: Public/form_data/FG_var_paymentlog.inc:185
+#: Public/form_data/FG_var_paymentlog_agent.inc:185
+#: Public/form_data/FG_var_callerid.inc:98
+msgid "Insert the Id CardNumber"
+msgstr "Inserisci il Numero Scheda ID"
+
+#: Public/form_data/FG_var_call.inc:79
+#: Public/form_data/FG_var_speeddial.inc:119
+#: Public/form_data/FG_var_callerid.inc:102
+msgid "Define the card number ID to use."
+msgstr "Definisci il numero di scheda ID, da usare."
+
+#: Public/form_data/FG_var_call.inc:81
+#: Public/A2B_card_info.php:873
+msgid "CALLED NUMBER"
+msgstr "NUMERO CHIAMATA"
+
+#: Public/form_data/FG_var_call.inc:91
+msgid "Source"
+msgstr "Origine"
+
+#: Public/form_data/FG_var_call.inc:100
+msgid "Dnid"
+msgstr "Dnid"
+
+#: Public/form_data/FG_var_call.inc:134
+msgid "Modify via the form below, the properties of the call"
+msgstr "Modifica col seguente modulo, le propriet&agrave della chiamata"
+
+#: Public/form_data/FG_var_call.inc:135
+msgid "If you really want remove this call, click on the delete button."
+msgstr "Se vuoi ralmente eliminare questa chiamata, clicca sul tasto 'Elimina'."
+
+#: Public/form_data/FG_var_call.inc:136
+msgid "you can add easily a new call"
+msgstr "puoi aggiungere facilmente una nuova chiamata"
+
+#: Public/form_data/FG_var_call.inc:143
+#: Public/form_data/FG_var_callerid.inc:136
+msgid "Click Confirm Data to apply your changes"
+msgstr "Clicca su 'Conferma Dati' per applicare i cambi"
+
+#: Public/form_data/FG_var_support_component.inc:50
+msgid "Add COMPONENT"
+msgstr "Aggiungi COMPONENTE"
+
+#: Public/form_data/FG_var_support_component.inc:62
+msgid "You have some tickets using this Support Component! Please comfirm that you really want to remove this Support Component? "
+msgstr "Hai alcuni tichets che usano questo Componente di Supporto! Confermi che vuoi realmente eliminare questo Componente di Supporto? "
+
+#: Public/form_data/FG_var_support_component.inc:70
+#: Public/form_data/FG_var_support_component.inc:113
+msgid "USER TYPE"
+msgstr "TIPO UTENTE"
+
+#: Public/form_data/FG_var_support_component.inc:71
+msgid "SUPPORT BOX"
+msgstr "QUADRO SUPPORTO"
+
+#: Public/form_data/FG_var_support_component.inc:100
+msgid "Choose if you want to activate this component"
+msgstr "Scegli se vuoi attivare questo componente"
+
+#: Public/form_data/FG_var_support_component.inc:103
+msgid "Support Box"
+msgstr "Quadro Supporto"
+
+#: Public/form_data/FG_var_support_component.inc:120
+msgid "Define who can use this component."
+msgstr "Definisci chi pu&ograve usare questo componente."
+
+#: Public/form_data/FG_var_service.inc:48
+msgid "Add RECURRING SERVICE"
+msgstr "Aggiungi SERVIZIO RICORRENTE"
+
+#: Public/form_data/FG_var_service.inc:62
+msgid "Apply Service every Y days"
+msgstr "Applica il Servizio ogni 'Y' giorni"
+
+#: Public/form_data/FG_var_service.inc:63
+msgid "Apply service if card not used in last X days"
+msgstr "Applica il servizio se la scheda non &egrave utilizzata negli ultimi 'X' giorni"
+
+#: Public/form_data/FG_var_service.inc:64
+msgid "Apply service if card has been used in the last X Days"
+msgstr "Applica il servizio se la scheda &egrave stata utilizzata negli ultimi 'X' giorni"
+
+#: Public/form_data/FG_var_service.inc:65
+msgid "No rule"
+msgstr "Nessuna regola"
+
+#: Public/form_data/FG_var_service.inc:72
+msgid "Never"
+msgstr "Mai"
+
+#: Public/form_data/FG_var_service.inc:73
+msgid "Account balance below zero"
+msgstr "Saldo account inferiore a zero"
+
+#: Public/form_data/FG_var_service.inc:74
+msgid "Max number of cycle reach"
+msgstr "Numero massimo di cicli raggiunti"
+
+#: Public/form_data/FG_var_service.inc:77
+msgid "Allow be charged into negative balance"
+msgstr "Permetti l'addebito con saldo negativo"
+
+#: Public/form_data/FG_var_service.inc:78
+msgid "Do partial charge but never go into negative balance"
+msgstr "Addebita parzialmente ma non andare mai in saldo negativo"
+
+#: Public/form_data/FG_var_service.inc:81
+msgid "List of groups below"
+msgstr "Lista di gruppi sotto"
+
+#: Public/form_data/FG_var_service.inc:82
+msgid "Any group"
+msgstr "Ogni gruppo"
+
+#: Public/form_data/FG_var_service.inc:89
+msgid "DATELASTRUN"
+msgstr "DATA ULTIMO AVVIO"
+
+#: Public/form_data/FG_var_service.inc:90
+msgid "CARDPERFORM"
+msgstr "FAI SCHEDA"
+
+#: Public/form_data/FG_var_service.inc:91
+#: Public/form_data/FG_var_service_details.inc:51
+#: Public/form_data/FG_var_autorefill.inc:49
+msgid "TOTALCREDIT"
+msgstr "CREDITO TOTALE"
+
+#: Public/form_data/FG_var_service.inc:122
+msgid "Insert the service name"
+msgstr "Inserisci il nome del servizio"
+
+#: Public/form_data/FG_var_service.inc:125
+msgid "AMOUNT CREDIT"
+msgstr "AMMONTARE CREDITO"
+
+#: Public/form_data/FG_var_service.inc:131
+msgid "Insert the number of credit to remove from the cards."
+msgstr "Inserisci l'importo da rimuovere dalla scheda."
+
+#: Public/form_data/FG_var_service.inc:132
+msgid "Set the amount of credit to remove from the card. 0 will remove all credit from the card use -1 for DID recurrent service."
+msgstr "Imposta l'importo da rimuovere dalla scheda. 0 rimuove tutto il credito dalla scheda in uso, -1 per il servizio ricorrente del DID."
+
+#: Public/form_data/FG_var_service.inc:134
+msgid "RULE"
+msgstr "REGOLA"
+
+#: Public/form_data/FG_var_service.inc:141
+msgid "where X - day number (X) in days <br>\tand Y = number set in period field"
+msgstr "dove X - 'NUMERO GIORNI (X)' in giorni<br>\te Y = numero impostato nel campo 'PERIODO (Y)'"
+
+#: Public/form_data/FG_var_service.inc:149
+msgid "Insert the daynumber"
+msgstr "Inserisci il numero di gironi"
+
+#: Public/form_data/FG_var_service.inc:150
+msgid "Set the number of days to apply to the rule above."
+msgstr "Imposta il numero di giorni per applicare la 'REGOLA' sopra. "
+
+#: Public/form_data/FG_var_service.inc:152
+msgid "PERIOD (Y)"
+msgstr "PERIODO (Y)"
+
+#: Public/form_data/FG_var_service.inc:159
+msgid "Interval to apply service"
+msgstr "Intervallo per applicare il servizio"
+
+#: Public/form_data/FG_var_service.inc:176
+msgid "Insert the max number of cycle"
+msgstr "Inserisci il numero massimi di cicli"
+
+#: Public/form_data/FG_var_service.inc:177
+msgid "Set the maximum number of times that the service should be applied."
+msgstr "Imposta il numero massimo di applicazioni del servizio."
+
+#: Public/form_data/FG_var_service.inc:207
+msgid "OPERATE MODE"
+msgstr "MODO OPERATORE"
+
+#: Public/form_data/FG_var_service.inc:214
+msgid "If you want to charge only part of sum in case if current balance less then amount, select second option. Will be charged only part of amount, cause balance to be 0.0"
+msgstr "Se vuoi addebitare solo parte della somma, nel caso il saldo corrente sia inferiore all'importo totale, seleziona la seconda opzione. Sar&agrave addebitato solo parte dell'importo, causa saldo a 0.0"
+
+#: Public/form_data/FG_var_service.inc:216
+msgid "SKIP GROUP"
+msgstr "SALTA GRUPPO"
+
+#: Public/form_data/FG_var_service.inc:223
+msgid "Select first option(default) to manualy select groups or select second option to use service for any group, discarding list below"
+msgstr "Scegli la prima opzione (default) per selezionare manualmente i gruppi, oppure scegli la seconda per usare qualsiasi gruppo, scartando la lista sotto"
+
+#: Public/form_data/FG_var_service.inc:257
+msgid "has been inserted"
+msgstr "&egrave stato inserito"
+
+#: Public/form_data/FG_var_remittance_request.inc:54
+msgid "ACCEPT THIS REQUEST"
+msgstr "ACCETTA QUESTA RICHIESTA"
+
+#: Public/form_data/FG_var_remittance_request.inc:61
+msgid "REFUSE THIS REQUEST"
+msgstr "RIFUTA QUESTA RICHIESTA"
+
+#: Public/form_data/FG_var_remittance_request.inc:86
+msgid "SELECT REQUEST TYPE"
+msgstr "SELEZIONA TIPO DI RICHIESTA"
+
+#: Public/form_data/FG_var_remittance_request.inc:87
+msgid "SELECT REQUEST STATUS"
+msgstr "SELEZIONA STATO"
+
+#: Public/form_data/FG_var_remittance_request.inc:91
+msgid "THERE ARE NO REMITTANCE REQUEST CREATED!"
+msgstr "NON CI SONO RICHIESTE DI RIMESSA CREATE!"
+
+#: Public/form_data/FG_var_campaign.inc:66
+msgid "Add CAMPAIGN"
+msgstr "Aggiungi CAMPAGNA"
+
+#: Public/form_data/FG_var_campaign.inc:71
+msgid "STARTING"
+msgstr "INIZIO"
+
+#: Public/form_data/FG_var_campaign.inc:72
+msgid "EXPIRATION"
+msgstr "SCADENZA"
+
+#: Public/form_data/FG_var_campaign.inc:79
+msgid "No campaigns have been created."
+msgstr "Non sono state create campagne."
+
+#: Public/form_data/FG_var_campaign.inc:88
+msgid "CAMPAIGN NAME"
+msgstr "NOME CAMPAGNA"
+
+#: Public/form_data/FG_var_campaign.inc:105
+msgid "Define if this campaign is active or not"
+msgstr "Definisci se questa campagna &egrave attiva o no"
+
+#: Public/form_data/FG_var_campaign.inc:116
+msgid "Insert the customer ID"
+msgstr "Inserisci l'ID utentet"
+
+#: Public/form_data/FG_var_campaign.inc:120
+msgid "Select the owner of this campaing, but you may not modify it in the future"
+msgstr "Seleziona il proprietario di questa campagna, che non potrai modificare in futuro."
+
+#: Public/form_data/FG_var_campaign.inc:130
+msgid "Customer ID Selected "
+msgstr "ID Utente Selezionato "
+
+#: Public/form_data/FG_var_campaign.inc:136
+msgid "CONFIG TO APPLY"
+msgstr "CONFIG DA APPLICARE"
+
+#: Public/form_data/FG_var_campaign.inc:144
+msgid "Define the configuration that you want apply on this campaign"
+msgstr "Definisci la configurazione che vuoi applicare a questa campagna"
+
+#: Public/form_data/FG_var_campaign.inc:160
+msgid "CID GROUP"
+msgstr "GRUPPO CID"
+
+#: Public/form_data/FG_var_campaign.inc:171
+msgid "STARTING DATE"
+msgstr "DATA INIZIO"
+
+#: Public/form_data/FG_var_campaign.inc:178
+#: Public/form_data/FG_var_campaign.inc:187
+msgid "Please respect the format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"
+msgstr "Rispetta il formato AAAA-MM-GG OO:MM:SS. Per esempio, '2012-02-31 08:31:00'"
+
+#: Public/form_data/FG_var_campaign.inc:180
+#: Public/A2B_card_info.php:151
+msgid "EXPIRATION DATE"
+msgstr "DATA SCADENZA"
+
+#: Public/form_data/FG_var_campaign.inc:190
+msgid "FREQUENCY"
+msgstr "FREQUENZA"
+
+#: Public/form_data/FG_var_campaign.inc:196
+msgid "Insert the frequency of callback in min "
+msgstr "Inserisci la frequenza del callback in minuti "
+
+#: Public/form_data/FG_var_campaign.inc:197
+msgid "Please insert the frequency in minutes"
+msgstr "Inserisci la frequenza in minuti"
+
+#: Public/form_data/FG_var_campaign.inc:199
+msgid "DAILY START TIME"
+msgstr "ORA AVVIO QUOTIDIANA"
+
+#: Public/form_data/FG_var_campaign.inc:205
+msgid "Insert the daily start time"
+msgstr "Inserisci l'ora d'avvio giornaliera"
+
+#: Public/form_data/FG_var_campaign.inc:206
+#: Public/form_data/FG_var_campaign.inc:215
+msgid "Please respect the format HH:MM:SS. For instance, '00:00:00'"
+msgstr "Rispetta il formato OO:MM:SS. Per esempio, '08:31:00'"
+
+#: Public/form_data/FG_var_campaign.inc:208
+msgid "DAILY STOP TIME"
+msgstr "ORA FINE QUOTIDIANA"
+
+#: Public/form_data/FG_var_campaign.inc:214
+msgid "Insert the daily stop time"
+msgstr "Inserisci l'ora di fine quotidiana"
+
+#: Public/form_data/FG_var_campaign.inc:218
+msgid "MONDAY"
+msgstr "LUNED&Igrave"
+
+#: Public/form_data/FG_var_campaign.inc:224
+#: Public/form_data/FG_var_campaign.inc:233
+#: Public/form_data/FG_var_campaign.inc:242
+msgid "Choose if you want to enable the campaign callback for the monday"
+msgstr "Scegli se vuoi abilitare la campagna callback il luned&igrave"
+
+#: Public/form_data/FG_var_campaign.inc:227
+msgid "TUESDAY"
+msgstr "MARTED&Igrave"
+
+#: Public/form_data/FG_var_campaign.inc:236
+msgid "WEDNESDAY"
+msgstr "MERCOLED&Igrave"
+
+#: Public/form_data/FG_var_campaign.inc:245
+msgid "THURSDAY"
+msgstr "GIOVED&Igrave"
+
+#: Public/form_data/FG_var_campaign.inc:251
+msgid "Choose if you want to enable the campaign callback for the thursday"
+msgstr "Scegli se vuoi abilitare la campagna callback il gioved&igrave"
+
+#: Public/form_data/FG_var_campaign.inc:254
+msgid "FRIDAY"
+msgstr "VENERD&Igrave"
+
+#: Public/form_data/FG_var_campaign.inc:260
+msgid "Choose if you want to enable the campaign callback for the friday"
+msgstr "Scegli se vuoi abilitare la campagna callback il venerd&igrave"
+
+#: Public/form_data/FG_var_campaign.inc:263
+msgid "SATURDAY"
+msgstr "SABATO"
+
+#: Public/form_data/FG_var_campaign.inc:269
+msgid "Choose if you want to enable the campaign callback for the saturday"
+msgstr "Scegli se vuoi abilitare la campagna callback il sabato"
+
+#: Public/form_data/FG_var_campaign.inc:272
+msgid "SUNDAY"
+msgstr "DOMENICA"
+
+#: Public/form_data/FG_var_campaign.inc:278
+msgid "Choose if you want to enable the campaign callback for the sunday"
+msgstr "Scegli se vuoi abilitare la campagna callback la domenica"
+
+#: Public/form_data/FG_var_campaign.inc:302
+msgid "PHONE BOOK"
+msgstr "RUBRICA"
+
+#: Public/form_data/FG_var_speeddial.inc:50
+msgid "Add Speed Dial"
+msgstr "Aggiungi Numero Breve"
+
+#: Public/form_data/FG_var_speeddial.inc:69
+msgid "NO SPEED DIALS HAVE BEEN CREATED!"
+msgstr "NON CI SONO NUMERI BREVI CREATI!"
+
+#: Public/form_data/FG_var_speeddial.inc:96
+msgid "Enter the name or label that will identify this speed dial"
+msgstr "Inserisci il nome etichetta che identificher&agrave questo numero breve"
+
+#: Public/form_data/FG_var_speeddial.inc:105
+msgid "Insert the phone"
+msgstr "Inserisci il telefono"
+
+#: Public/form_data/FG_var_speeddial.inc:106
+msgid "Enter the phone number for the speed dial."
+msgstr "Inserisci il numero di telefono per il numero breve."
+
+#: Public/form_data/FG_var_speeddial.inc:144
+msgid "Once you have completed the form above, click Confirm Data."
+msgstr "Una volta completato il modulo sopra, clicca su 'Conferma Dati'."
+
+#: Public/form_data/FG_var_logrefill.inc:157
+msgid "CREATE ASSOCIATE INVOICE"
+msgstr "CREA UNA FATTURA ASSOCIATA"
+
+#: Public/form_data/FG_var_logrefill.inc:163
+msgid "Choose if you want to create an invoice with this refill account"
+msgstr "Scegli se vuoi creare una fattura con questa ricarica account"
+
+#: Public/form_data/FG_var_payment_invoice.inc:49
+#: Public/form_data/FG_var_commission.inc:52
+#: Public/form_data/FG_var_commission.inc:105
+#: Public/form_data/FG_var_payment.inc:60
+#: Public/form_data/FG_var_payment.inc:137
+#: Public/form_data/FG_var_payment_agent.inc:62
+#: Public/form_data/FG_var_payment_agent.inc:117
+#: Public/A2B_card_info.php:739
+msgid "PAYMENT DATE"
+msgstr "DATA PAGAMENTO"
+
+#: Public/form_data/FG_var_payment_invoice.inc:50
+#: Public/form_data/FG_var_payment.inc:61
+#: Public/form_data/FG_var_payment.inc:146
+#: Public/form_data/FG_var_payment_agent.inc:63
+#: Public/form_data/FG_var_payment_agent.inc:126
+#: Public/A2B_card_info.php:742
+msgid "PAYMENT AMOUNT"
+msgstr "IMPORTO PAGAMENTO"
+
+#: Public/form_data/FG_var_charge.inc:58
+msgid "Add a Charge"
+msgstr "Aggiungi addebito"
+
+#: Public/form_data/FG_var_charge.inc:63
+msgid "Connection charge for DID setup"
+msgstr "Addebito per impostazione DID"
+
+#: Public/form_data/FG_var_charge.inc:64
+msgid "Monthly Charge for DID use"
+msgstr "Addebito Mensile per uso DID"
+
+#: Public/form_data/FG_var_charge.inc:65
+msgid "Subscription fee"
+msgstr "Canone sottoscrizione"
+
+#: Public/form_data/FG_var_charge.inc:66
+msgid "Extra charge"
+msgstr "Addebito supplementare"
+
+#: Public/form_data/FG_var_charge.inc:71
+msgid "ACCOUNT HOLDER"
+msgstr "TITOLARE ACCOUNT"
+
+#: Public/form_data/FG_var_charge.inc:75
+#: Public/form_data/FG_var_charge.inc:141
+msgid "CHARGE TYPE"
+msgstr "TIPO DI ADDEBITO"
+
+#: Public/form_data/FG_var_charge.inc:129
+#: Public/form_data/FG_var_ticket.inc:137
+msgid "Set the Customer ID"
+msgstr "Imposta l'ID Utente"
+
+#: Public/form_data/FG_var_charge.inc:137
+#: Public/form_data/FG_var_paymentlog.inc:174
+#: Public/form_data/FG_var_paymentlog_agent.inc:174
+msgid "Insert the amount"
+msgstr "Inserisci l'importo"
+
+#: Public/form_data/FG_var_charge.inc:177
+msgid "Modify the properties of the charge"
+msgstr "Modifica le propriet&agrave della scheda"
+
+#: Public/form_data/FG_var_commission.inc:46
+msgid "Add Commission"
+msgstr "Aggiungi Commissione"
+
+#: Public/form_data/FG_var_commission.inc:56
+msgid "LINK TO PAYMENT"
+msgstr "LINK AI PAGAMENTI"
+
+#: Public/form_data/FG_var_commission.inc:61
+msgid "THERE ARE NO COMMISSION AGENTS CREATED!"
+msgstr "NON CI SONO COMISSIONI AGENTE CREATE!"
+
+#: Public/form_data/FG_var_commission.inc:80
+#: Public/form_data/FG_var_payment.inc:124
+msgid "Insert the Customer ID "
+msgstr "Inserisci l'ID dell'Utente "
+
+#: Public/form_data/FG_var_commission.inc:86
+#: Public/form_data/FG_var_payment_agent.inc:98
+msgid "AGENT ID"
+msgstr "ID AGENTE"
+
+#: Public/form_data/FG_var_commission.inc:92
+msgid "Insert the AGENT ID "
+msgstr "Inserisci l'ID dell'AGENTE "
+
+#: Public/form_data/FG_var_commission.inc:114
+msgid "COMMISSION AMOUNT"
+msgstr "IMPORTO COMMISSIONI"
+
+#: Public/form_data/FG_var_commission.inc:120
+msgid "Insert the commission amount"
+msgstr "Inserisci l'importo delle commissioni"
+
+#: Public/form_data/FG_var_commission.inc:133
+msgid "PAYMENT ID"
+msgstr "ID VERSAMENTO"
+
+#: Public/form_data/FG_var_commission.inc:139
+msgid "Insert the Payment ID "
+msgstr "Inserisci l'ID del Versamento "
+
+#: Public/form_data/FG_var_commission.inc:143
+msgid "Select the Payment ID"
+msgstr "Seleziona l'ID del Versamento"
+
+#: Public/form_data/FG_var_commission.inc:145
+msgid "COMMISSION TYPE"
+msgstr "TIPO COMMISSIONE"
+
+#: Public/form_data/FG_var_commission.inc:152
+msgid "Define the type of this commission."
+msgstr "Definisci il tipo di commissione."
+
+#: Public/form_data/FG_var_monitor.inc:48
+msgid "Add Monitoring"
+msgstr "Aggiungi Fatturazione"
+
+#: Public/form_data/FG_var_monitor.inc:60
+#: Public/form_data/FG_var_monitor.inc:90
+msgid "DIAL CODE"
+msgstr "CODI POSTALE"
+
+#: Public/form_data/FG_var_monitor.inc:62
+msgid "TEXT"
+msgstr "TESTO"
+
+#: Public/form_data/FG_var_monitor.inc:69
+msgid "There are no monitoring created!"
+msgstr "Non ci sono monitoraggi creati!"
+
+#: Public/form_data/FG_var_monitor.inc:86
+msgid "Insert the label"
+msgstr "Inserisci l'etichetta"
+
+#: Public/form_data/FG_var_monitor.inc:96
+msgid "Insert the dial code"
+msgstr "Inserisci il codice postale"
+
+#: Public/form_data/FG_var_monitor.inc:109
+msgid "TEXT INTRO"
+msgstr "INTRO TESTO"
+
+#: Public/form_data/FG_var_monitor.inc:115
+msgid "Insert the text intro"
+msgstr "Inserisci la Destinazione"
+
+#: Public/form_data/FG_var_monitor.inc:118
+msgid "QUERY TYPE"
+msgstr "TIPO QUERY"
+
+#: Public/form_data/FG_var_monitor.inc:125
+msgid "Define type of the query that will be performed."
+msgstr "Definisci il tipo di query che sar&agrave eseguita."
+
+#: Public/form_data/FG_var_monitor.inc:127
+msgid "QUERY / SHELL SCRIPT"
+msgstr "SCRIPT SHELL / QUERY"
+
+#: Public/form_data/FG_var_monitor.inc:134
+msgid "Shell Script need to be copied into the directory"
+msgstr "Lo Script Shell deve essere copiato nella directory"
+
+#: Public/form_data/FG_var_monitor.inc:134
+msgid "Do not specify the path here."
+msgstr "Non specificare il percorso qui"
+
+#: Public/form_data/FG_var_monitor.inc:136
+msgid "SAY RESULT AS"
+msgstr "DI RISULTATO COME"
+
+#: Public/form_data/FG_var_monitor.inc:143
+msgid "Define type of result."
+msgstr "Definisci il tipo di risultato"
+
+#: Public/form_data/FG_var_monitor.inc:164
+msgid "Add the Monitoring below"
+msgstr "Aggiungi un monitoraggio sotto"
+
+#: Public/form_data/FG_var_provider.inc:44
+msgid "Add Provider"
+msgstr "Aggiungi Fornitore"
+
+#: Public/form_data/FG_var_provider.inc:51
+#: Public/form_data/FG_var_provider.inc:83
+msgid "PROVIDER NAME"
+msgstr "NOME FORNITORE"
+
+#: Public/form_data/FG_var_provider.inc:57
+msgid "NO PROVIDERS CREATED!"
+msgstr "NON CI SONO FORNITORI GREATI!"
+
+#: Public/form_data/FG_var_server_group.inc:44
+msgid "Add SERVER GROUP"
+msgstr "Aggiungi un GRUPPO DI SERVER"
+
+#: Public/form_data/FG_var_payment.inc:53
+#: Public/form_data/FG_var_payment_agent.inc:52
+msgid "Add Payment"
+msgstr "Aggiungi Pagamento"
+
+#: Public/form_data/FG_var_payment.inc:152
+#: Public/form_data/FG_var_payment_agent.inc:132
+msgid "Insert the payment amount"
+msgstr "Inserisci l'importo del pagamento"
+
+#: Public/form_data/FG_var_payment.inc:166
+#: Public/form_data/FG_var_payment_agent.inc:146
+msgid "CREATE ASSOCIATE REFILL"
+msgstr "CREA UNA RICARICA ASSOCIATA"
+
+#: Public/form_data/FG_var_payment.inc:172
+#: Public/form_data/FG_var_payment_agent.inc:152
+msgid "Choose if you want to create a refill with this payment account"
+msgstr "Scegliere se si desidera creare una ricarica con questo conto di pagamento"
+
+#: Public/form_data/FG_var_payment.inc:173
+#: Public/form_data/FG_var_payment_agent.inc:153
+msgid "Refill card account"
+msgstr "Ricarica scheda account"
+
+#: Public/form_data/FG_var_payment.inc:177
+msgid "CREATE AGENT COMMISSION "
+msgstr "CREA COMMISSIONE AGENTE "
+
+#: Public/form_data/FG_var_payment.inc:183
+msgid "Choose if you want to create a commission to an agent, if this customer is managed by one"
+msgstr "Scegli se vuoi creare una commissione ad un agente, che gestisce questo utente."
+
+#: Public/form_data/FG_var_payment.inc:184
+msgid "Commission for agent"
+msgstr "Commissione per l'agente"
+
+#: Public/form_data/FG_var_transactions_agent.inc:46
+#: Public/form_data/FG_var_transactions.inc:46
+msgid "ORDER DATE"
+msgstr "DATA ORDINE"
+
+#: Public/form_data/FG_var_transactions_agent.inc:47
+#: Public/form_data/FG_var_transactions.inc:47
+#: Public/A2B_detail_package.php:83
+msgid "CARDID"
+msgstr "ID SCEDA"
+
+#: Public/form_data/FG_var_transactions_agent.inc:49
+#: Public/form_data/FG_var_transactions.inc:49
+msgid "ITEM NAME"
+msgstr "NOME ARTICOLO"
+
+#: Public/form_data/FG_var_transactions_agent.inc:50
+#: Public/form_data/FG_var_transactions.inc:50
+msgid "ITEM ID"
+msgstr "ID ARTICOLO"
+
+#: Public/form_data/FG_var_transactions_agent.inc:51
+#: Public/form_data/FG_var_transactions.inc:51
+msgid "METHOD"
+msgstr "METODO"
+
+#: Public/form_data/FG_var_transactions_agent.inc:52
+#: Public/form_data/FG_var_transactions.inc:52
+msgid "CC NUMBER"
+msgstr "NUMERO CC"
+
+#: Public/form_data/FG_var_transactions_agent.inc:61
+#: Public/form_data/FG_var_prefix.inc:60
+#: Public/form_data/FG_var_transactions.inc:61
+#: Public/form_data/FG_var_outbound_cid.php:27
+msgid "THERE ARE NO"
+msgstr "NON CI SONO"
+
+#: Public/form_data/FG_var_prefix.inc:48
+msgid "Add PREFIX"
+msgstr "Aggiungi PREFISSO"
+
+#: Public/form_data/FG_var_prefix.inc:52
+msgid "Prefix"
+msgstr "Prefisso"
+
+#: Public/form_data/FG_var_prefix.inc:93
+msgid "Insert the Prefixe"
+msgstr "Inserisci il  Prefisso"
+
+#: Public/form_data/FG_var_prefix.inc:102
+msgid "Insert the Destination"
+msgstr "Inserisci la Destinazione"
+
+#: Public/form_data/FG_var_receipt.inc:66
+msgid "Edit receipt items"
+msgstr "Edita gli articoli ricevuti"
+
+#: Public/form_data/FG_var_receipt.inc:73
+msgid "Close this receipt"
+msgstr "Chiudi questa ricevuta"
+
+#: Public/form_data/FG_var_receipt.inc:78
+msgid "Add Receipt"
+msgstr "Aggiungi Ricevuta"
+
+#: Public/form_data/FG_var_agentsituation.inc:44
+msgid "COMMISSION BAL"
+msgstr "SALDO COMMISSIONI"
+
+#: Public/form_data/FG_var_agentsituation.inc:45
+msgid "TOTAL COM. ACCRUED"
+msgstr "TOTALE COMM. MATURATE"
+
+#: Public/form_data/FG_var_agentsituation.inc:46
+msgid "CUSTOMER REFILL BY AGENT"
+msgstr "UTENTE RICARICATO DALL'AGENTE"
+
+#: Public/form_data/FG_var_agentsituation.inc:47
+msgid "AGENT REFILL"
+msgstr "RICARICA AGENTE"
+
+#: Public/form_data/FG_var_agentsituation.inc:48
+msgid "AGENT PAYMENT"
+msgstr "PAGAMENTO AGENTE"
+
+#: Public/form_data/FG_var_payment_agent.inc:70
+msgid "THERE IS NO AGENT PAYMENT CREATED!"
+msgstr "NON CI SONO PAGAMENTI AGENTE CREATI!"
+
+#: Public/form_data/FG_var_payment_agent.inc:104
+msgid "Insert the Agent ID "
+msgstr "Inserisci l'ID Agente "
+
+#: Public/form_data/FG_var_currencies.inc:49
+msgid "DETAIL"
+msgstr "DETTAGLI"
+
+#: Public/form_data/FG_var_currencies.inc:71
+msgid "Insert the currency name"
+msgstr "Inserisci il nome valuta"
+
+#: Public/form_data/FG_var_currencies.inc:80
+msgid "Insert the currency label"
+msgstr "Inserisci l'etichetta valuta"
+
+#: Public/form_data/FG_var_currencies.inc:91
+msgid "Set the value of this currency in your base currency that the user have to pay per month."
+msgstr "Imposta il valore di questa moneta nella propria valuta di base che l'utente pagher&agrave mensilmente."
+
+#: Public/form_data/FG_var_currencies.inc:91
+msgid "Base currency :"
+msgstr "Valuta di base : "
+
+#: Public/form_data/FG_var_subscriber.inc:47
+msgid "Add SUBSCRIBER"
+msgstr "Aggiungi ABBONATO"
+
+#: Public/form_data/FG_var_subscriber.inc:55
+msgid "PRODUCT"
+msgstr "PRODOTTO"
+
+#: Public/form_data/FG_var_subscriber.inc:82
+msgid "ACCOUNT ID"
+msgstr "ID ACCOUNT"
+
+#: Public/form_data/FG_var_subscriber.inc:94
+msgid "ID SUBSCRIPTION SERVICE"
+msgstr "ID SOTTOSCRIZIONE SERVIZIO"
+
+#: Public/form_data/FG_var_subscriber.inc:122
+msgid "PRODUCT LABEL"
+msgstr "ETICHETTA PRODOTTO"
+
+#: Public/form_data/FG_var_subscriber.inc:128
+msgid "Enter the name of the product wich is subscribed"
+msgstr "Inserisci il nome del prodotto sottoscritto"
+
+#: Public/form_data/FG_var_subscriber.inc:138
+msgid "Apply subscription to account"
+msgstr "Applica sottoscrizione all'account."
+
+#: Public/form_data/FG_var_outbound_cid.php:14
+#: Public/form_data/FG_var_callerid.inc:43
+msgid "Add CallerID"
+msgstr "Aggiungi ID Chiamante"
+
+#: Public/form_data/FG_var_outbound_cid.php:21
+#: Public/form_data/FG_var_outbound_cid.php:59
+msgid "CIDGROUP"
+msgstr "GRUPPO CID"
+
+#: Public/form_data/FG_var_outbound_cid.php:54
+msgid "Insert the CID"
+msgstr "Inserisci il CID"
+
+#: Public/form_data/FG_var_outbound_cid.php:56
+msgid "Define the CallerID's. If you ADD a new CID, NOT an EDIT, you can define a range of CallerID. <br>80412340210-80412340218 would add all CID's between the range, whereas CIDs separated by a comma e.g. 80412340210,80412340212,80412340214 would only add the individual CID listed."
+msgstr "Definisci l'ID Chiamante. Se AGGIUNGI un CID, NON se la EDITI, puoi definire un intervallo di Id Chiamante. <br>80412340210-80412340218 aggiunger&agrave tutti i CID compresi nell'intervallo, mentre CID separati da una virgola, es.: 80412340210,80412340212,80412340214 saranno aggiunti individualmente."
+
+#: Public/form_data/FG_var_outbound_cid.php:75
+msgid "Choose if you want to activate this CallerID"
+msgstr "Scegli se vuoi attivare questo ID Chiamante"
+
+#: Public/form_data/FG_var_moneysituation.inc:42
+msgid "CardNumber"
+msgstr "Numero Scheda"
+
+# pb
+#: Public/form_data/FG_var_moneysituation.inc:43
+msgid "<acronym title=\"CARDALIAS\">ALIAS</acronym>"
+msgstr "<acronym title=\"ALIAS SCHEDA\">ALIAS</acronym>"
+
+#: Public/form_data/FG_var_moneysituation.inc:48
+#: Public/A2B_invoice_view.php:159
+msgid "INVOICE"
+msgstr "FATTURA"
+
+#: Public/form_data/FG_var_moneysituation.inc:49
+msgid "PAYMENT"
+msgstr "PAGAMENTO"
+
+#: Public/form_data/FG_var_moneysituation.inc:50
+msgid "TO PAY"
+msgstr "DA PAGARE"
+
+#: Public/form_data/FG_var_friend.inc:48
+msgid "SIP Config"
+msgstr "Config SIP"
+
+#: Public/form_data/FG_var_friend.inc:50
+msgid "IAX Config"
+msgstr "Config IAX"
+
+#: Public/form_data/FG_var_friend.inc:61
+msgid "CARDHOLDER"
+msgstr "TITOLARE SCHEDA"
+
+#: Public/form_data/FG_var_friend.inc:62
+#: Public/form_data/FG_var_friend.inc:371
+#: Public/A2B_card_info.php:554
+#: Public/A2B_card_info.php:600
+msgid "USERNAME"
+msgstr "NOME UTENTE"
+
+#: Public/form_data/FG_var_friend.inc:63
+#: Public/form_data/FG_var_friend.inc:153
+msgid "ACCOUNTCODE"
+msgstr "CODICE ACCOUNT"
+
+#: Public/form_data/FG_var_friend.inc:64
+#: Public/form_data/FG_var_friend.inc:203
+#: Public/A2B_card_info.php:557
+#: Public/A2B_card_info.php:603
+msgid "SECRET"
+msgstr "PASSWORD"
+
+#: Public/form_data/FG_var_friend.inc:66
+#: Public/form_data/FG_var_friend.inc:253
+#: Public/form_data/FG_var_callback.inc:70
+#: Public/form_data/FG_var_callback.inc:199
+msgid "CONTEXT"
+msgstr "CONTESTO"
+
+#: Public/form_data/FG_var_friend.inc:67
+#: Public/form_data/FG_var_friend.inc:263
+msgid "DEFAULTIP"
+msgstr "IP DEFAULT"
+
+#: Public/form_data/FG_var_friend.inc:74
+msgid "Add SIP Config"
+msgstr "Aggiungi Config SIP"
+
+#: Public/form_data/FG_var_friend.inc:76
+msgid "Add IAX Config"
+msgstr "Aggiungi Config IAX"
+
+#: Public/form_data/FG_var_friend.inc:140
+msgid "Insert the card ID."
+msgstr "Inserisci l'ID scheda"
+
+#: Public/form_data/FG_var_friend.inc:159
+msgid "Insert the accountcode"
+msgstr "Inserisci il codice account"
+
+#: Public/form_data/FG_var_friend.inc:163
+msgid "REGEXTEN"
+msgstr "REGEXTEN"
+
+#: Public/form_data/FG_var_friend.inc:169
+msgid "Insert the regexten"
+msgstr "Inserisci la regexten"
+
+#: Public/form_data/FG_var_friend.inc:179
+#: Public/form_data/FG_var_callback.inc:255
+msgid "Insert the callerid"
+msgstr "Inserisci l'id chiamante"
+
+#: Public/form_data/FG_var_friend.inc:183
+msgid "CID NUMBER"
+msgstr "NUMERO CID"
+
+#: Public/form_data/FG_var_friend.inc:189
+msgid "Insert the cid number"
+msgstr "Inserisci il numero cid"
+
+#: Public/form_data/FG_var_friend.inc:193
+msgid "AMAFLAGS"
+msgstr "AMAFLAGS"
+
+#: Public/form_data/FG_var_friend.inc:199
+msgid "Insert the amaflags"
+msgstr "Inserisci l'amaflags"
+
+#: Public/form_data/FG_var_friend.inc:209
+msgid "Insert the secret"
+msgstr "Inserisci la password"
+
+#: Public/form_data/FG_var_friend.inc:213
+msgid "QUALIFY"
+msgstr "QUALIFICA"
+
+#: Public/form_data/FG_var_friend.inc:219
+msgid "Insert the qualify"
+msgstr "Inserisci la qualifica"
+
+#: Public/form_data/FG_var_friend.inc:223
+msgid "DISALLOW"
+msgstr "VIETATI"
+
+#: Public/form_data/FG_var_friend.inc:229
+msgid "Insert the disallow"
+msgstr "Inserisci i codecs vietati"
+
+#: Public/form_data/FG_var_friend.inc:230
+msgid "need to disallow=all before we can use allow. ( default : all )"
+msgstr "Imposta 'VIETATI' = all prima di poter definire quelli 'PERMESSI'. (default: all)"
+
+#: Public/form_data/FG_var_friend.inc:233
+msgid "ALLOW"
+msgstr "PERMESSI"
+
+#: Public/form_data/FG_var_friend.inc:239
+msgid "Insert the allow"
+msgstr "Inseririsci quelli permessi"
+
+#: Public/form_data/FG_var_friend.inc:240
+msgid "Set allow codecs separated by a comma, e.g. gsm,alaw,ulaw ( default : ulaw,alaw,gsm,g729)"
+msgstr "Imposta i codecs permessi separati da virgola, es.: gsm,alaw,ulaw (default : ulaw,alaw,gsm,g729)"
+
+#: Public/form_data/FG_var_friend.inc:243
+msgid "HOST"
+msgstr "HOST"
+
+#: Public/form_data/FG_var_friend.inc:249
+msgid "Insert the host"
+msgstr "Inserisci l'host"
+
+#: Public/form_data/FG_var_friend.inc:250
+msgid "Use dynamic or set an IP ( default : dynamic )"
+msgstr "Usa dynamic o imposta IP"
+
+#: Public/form_data/FG_var_friend.inc:259
+#: Public/form_data/FG_var_callback.inc:205
+msgid "Insert the context"
+msgstr "Inserisci il contesto"
+
+#: Public/form_data/FG_var_friend.inc:260
+msgid "set the context for this user (default : a2billing )"
+msgstr "Imposta il contesto per questo utente (default : a2billing)"
+
+#: Public/form_data/FG_var_friend.inc:269
+msgid "Insert the defaultip"
+msgstr "Inserisci l'IP di default"
+
+#: Public/form_data/FG_var_friend.inc:279
+msgid "Insert the language"
+msgstr "Inserisci la lingua"
+
+#: Public/form_data/FG_var_friend.inc:283
+msgid "PORT"
+msgstr "PORTA"
+
+#: Public/form_data/FG_var_friend.inc:289
+msgid "Insert the port"
+msgstr "Inserisci la porta"
+
+#: Public/form_data/FG_var_friend.inc:293
+msgid "REGSECONDS"
+msgstr "SECONDI REG."
+
+#: Public/form_data/FG_var_friend.inc:299
+msgid "Insert the regseconds"
+msgstr "Inserisci i secondi di reg."
+
+#: Public/form_data/FG_var_friend.inc:303
+msgid "IPADDR"
+msgstr "INDIR.IP"
+
+#: Public/form_data/FG_var_friend.inc:309
+msgid "Insert the ipaddr"
+msgstr "Inserisci l'indir.Ip"
+
+#: Public/form_data/FG_var_friend.inc:312
+msgid "MOHSUGGEST"
+msgstr "MOH SUGGERITO"
+
+#: Public/form_data/FG_var_friend.inc:318
+msgid "Insert the mohsuggest"
+msgstr "Inserisci il moh suggerito"
+
+#: Public/form_data/FG_var_friend.inc:322
+msgid "AUTH"
+msgstr "AUTOR."
+
+#: Public/form_data/FG_var_friend.inc:328
+msgid "Insert the auth"
+msgstr "Inserisci l'autor."
+
+#: Public/form_data/FG_var_friend.inc:332
+msgid "SETVAR"
+msgstr "IMP.VAR"
+
+#: Public/form_data/FG_var_friend.inc:338
+msgid "Insert the setvar"
+msgstr "Inserisci la regione"
+
+#: Public/form_data/FG_var_friend.inc:347
+msgid "Insert the type"
+msgstr "Inserisci il tipo"
+
+#: Public/form_data/FG_var_friend.inc:348
+msgid "type = friend | peer | user ( default : friend )"
+msgstr "tipo = friend | peer | user (par défaut : friend )"
+
+#: Public/form_data/FG_var_friend.inc:350
+msgid "DENY"
+msgstr "RIFIUTA"
+
+#: Public/form_data/FG_var_friend.inc:356
+msgid "Insert the deny"
+msgstr "Inserisci quelli rifiutati"
+
+#: Public/form_data/FG_var_friend.inc:359
+msgid "PERMIT"
+msgstr "PERMESSI"
+
+#: Public/form_data/FG_var_friend.inc:365
+msgid "Insert the permit"
+msgstr "Inserisci quelli permessi"
+
+#: Public/form_data/FG_var_friend.inc:381
+msgid "MD5SECRET"
+msgstr "PASSWORD MD5"
+
+#: Public/form_data/FG_var_friend.inc:387
+msgid "Insert the md5secret"
+msgstr "Inserisci la password md5"
+
+#: Public/form_data/FG_var_friend.inc:391
+msgid "NAT"
+msgstr "NAT"
+
+#: Public/form_data/FG_var_friend.inc:397
+msgid "Insert the nat"
+msgstr "Inserisci la nat"
+
+#: Public/form_data/FG_var_friend.inc:398
+msgid "nat = yes | no | never | route ( default : yes )"
+msgstr "nat = yes | yes | never | route ( default: yes )"
+
+#: Public/form_data/FG_var_friend.inc:401
+msgid "DTMFMODE"
+msgstr "TONI DTMF"
+
+#: Public/form_data/FG_var_friend.inc:407
+msgid "Insert the dtmfmode"
+msgstr "Inserisci i toni dtmf"
+
+#: Public/form_data/FG_var_friend.inc:408
+msgid "dtmfmode = RFC2833 | INFO | INBAND | AUTO ( default : RFC2833 )"
+msgstr "toni dtmf = RFC2833 | INFO | INBAND | AUTO ( par défaut: RFC2833 )"
+
+#: Public/form_data/FG_var_friend.inc:412
+msgid "CANREINVITE"
+msgstr "CANREINVITE"
+
+#: Public/form_data/FG_var_friend.inc:418
+msgid "Insert the canreinvite"
+msgstr "Inserisci il canreinvite"
+
+#: Public/form_data/FG_var_friend.inc:419
+msgid "canreinvite : yes | no ( default : yes )"
+msgstr "canreinvite : yes | no ( default: yes )"
+
+#: Public/form_data/FG_var_friend.inc:424
+msgid "CALLGROUP"
+msgstr "CHIAMATA DI GRUPPO"
+
+#: Public/form_data/FG_var_friend.inc:430
+msgid "Insert the callgroup"
+msgstr "Inserisci la chiamata di gruppo"
+
+#: Public/form_data/FG_var_friend.inc:436
+msgid "FROMUSER"
+msgstr "DALL'UTENTE"
+
+#: Public/form_data/FG_var_friend.inc:442
+msgid "Insert the fromuser"
+msgstr "Inserisci dall'utente"
+
+#: Public/form_data/FG_var_friend.inc:446
+msgid "FROMDOMAIN"
+msgstr "DAL DOMINIO"
+
+#: Public/form_data/FG_var_friend.inc:452
+msgid "Insert the fromdomain"
+msgstr "Inserisci dal dominio"
+
+#: Public/form_data/FG_var_friend.inc:456
+msgid "INSECURE"
+msgstr "INSICURO"
+
+#: Public/form_data/FG_var_friend.inc:462
+msgid "Insert the insecure"
+msgstr "Inserisci insicuro"
+
+#: Public/form_data/FG_var_friend.inc:466
+msgid "MAILBOX"
+msgstr "EMAIL"
+
+#: Public/form_data/FG_var_friend.inc:472
+msgid "Insert the mailbox"
+msgstr "Inserisci l'email"
+
+#: Public/form_data/FG_var_friend.inc:477
+msgid "MASK"
+msgstr "MASCHERA"
+
+#: Public/form_data/FG_var_friend.inc:483
+msgid "Insert the mask"
+msgstr "Inserisci maschera"
+
+#: Public/form_data/FG_var_friend.inc:487
+msgid "PICKUPGROUP"
+msgstr "GRUPPO PICKUP"
+
+#: Public/form_data/FG_var_friend.inc:493
+msgid "Insert the pickupgroup"
+msgstr "Inserisci il gruppo pickup"
+
+#: Public/form_data/FG_var_friend.inc:497
+msgid "RESTRICTCID"
+msgstr "CID RISTRETTI"
+
+#: Public/form_data/FG_var_friend.inc:503
+msgid "Insert the restrictcid"
+msgstr "Inserisci i cid ristretti"
+
+#: Public/form_data/FG_var_friend.inc:507
+msgid "RTPTIMEOUT"
+msgstr "TIMEOUT RTP"
+
+#: Public/form_data/FG_var_friend.inc:513
+msgid "Insert the rtptimeout"
+msgstr "Inserisci il timeout rtp"
+
+#: Public/form_data/FG_var_friend.inc:517
+msgid "RTPHOLDTIMEOUT"
+msgstr "TIMEOUT RTP ATTESA"
+
+#: Public/form_data/FG_var_friend.inc:523
+msgid "Insert the rtpholdtimeout"
+msgstr "Inserisci il timeout rtp attesa"
+
+#: Public/form_data/FG_var_friend.inc:533
+msgid "Insert the musiconhold"
+msgstr "Inserisci la musica d'attesa"
+
+#: Public/form_data/FG_var_friend.inc:537
+msgid "CANCALLFORWARD"
+msgstr "PU&Ograve GIRARE CHIAMATA"
+
+#: Public/form_data/FG_var_friend.inc:543
+msgid "Insert the cancallforward"
+msgstr "Inserisci il pu&ograve girare chiamata"
+
+#: Public/form_data/FG_var_friend.inc:544
+msgid "cancallforward = yes | no ( default : yes )"
+msgstr "pu&ograve girare chiamata = si | no ( default : si )"
+
+#: Public/form_data/FG_var_friend.inc:547
+msgid "DEFAULTUSER"
+msgstr "UTENTE DEFAULT"
+
+#: Public/form_data/FG_var_friend.inc:557
+msgid "SUBSCRIBEMWI"
+msgstr "ABBONATO MWI"
+
+#: Public/form_data/FG_var_friend.inc:567
+msgid "VMEXTEN"
+msgstr "ESTENSIONE VM"
+
+#: Public/form_data/FG_var_friend.inc:577
+msgid "CALLINGPRES"
+msgstr "PRES. CHIAMANTE"
+
+#: Public/form_data/FG_var_friend.inc:587
+msgid "USEREQPHONE"
+msgstr "USA RICH.TELEFONO"
+
+#: Public/form_data/FG_var_friend.inc:597
+msgid "INCOMINGLIMIT"
+msgstr "LIMITE IN ARRIVO"
+
+#: Public/form_data/FG_var_friend.inc:607
+msgid "SUBSCRIBECONTEXT"
+msgstr "ABBONAMENTO CONTESTO"
+
+#: Public/form_data/FG_var_friend.inc:617
+msgid "MUSICCLASS"
+msgstr "CLASSE MUSICA"
+
+#: Public/form_data/FG_var_friend.inc:627
+msgid "ALLOWTRANSFER"
+msgstr "PERMETTI TRASFERIMENTO"
+
+#: Public/form_data/FG_var_friend.inc:637
+msgid "AUTOFRAMING"
+msgstr "AUTOFRAMING"
+
+#: Public/form_data/FG_var_friend.inc:647
+msgid "MAXCALLBITRATE"
+msgstr "MASSIMO BITRATE CHIAMATA"
+
+#: Public/form_data/FG_var_friend.inc:657
+msgid "OUTBOUNDPROXY"
+msgstr "PROXI USCITA"
+
+#: Public/form_data/FG_var_friend.inc:667
+msgid "REGSERVER"
+msgstr "SERVER REG."
+
+#: Public/form_data/FG_var_friend.inc:677
+msgid "RTPKEEPALIVE"
+msgstr "TIENI ATTIVO RTP"
+
+#: Public/form_data/FG_var_friend.inc:694
+msgid "Define the iax trunking"
+msgstr "Definisci il trunking iax"
+
+#: Public/form_data/FG_var_friend.inc:695
+msgid "iax trunking = yes | no ( default : yes )"
+msgstr "trunking iax = yes | no ( default : yes)"
+
+#: Public/form_data/FG_var_friend.inc:698
+msgid "DBSECRET"
+msgstr "PASSWORD DB"
+
+#: Public/form_data/FG_var_friend.inc:708
+msgid "REGCONTEXT"
+msgstr "CONTESTO REG."
+
+#: Public/form_data/FG_var_friend.inc:718
+msgid "SOURCEADDRESS"
+msgstr "INDIRIZZO SORGENTEE"
+
+#: Public/form_data/FG_var_friend.inc:727
+msgid "MOHINTERPRET"
+msgstr "PRE MOH INTER"
+
+#: Public/form_data/FG_var_friend.inc:737
+msgid "INKEYS"
+msgstr "CHIAVE IN"
+
+#: Public/form_data/FG_var_friend.inc:747
+msgid "OUTKEY"
+msgstr "CHIAVE OUT"
+
+#: Public/form_data/FG_var_friend.inc:756
+msgid "SENDANI"
+msgstr "INVIA ANI"
+
+#: Public/form_data/FG_var_friend.inc:765
+msgid "FULLNAME"
+msgstr "NOME COMPLETO"
+
+#: Public/form_data/FG_var_friend.inc:775
+msgid "MAXAUTHREQ"
+msgstr "MASSIMA AUT. RICH."
+
+#: Public/form_data/FG_var_friend.inc:785
+msgid "ENCRYPTION"
+msgstr "CRITTOGRAFIA"
+
+#: Public/form_data/FG_var_friend.inc:795
+msgid "TRANSFER"
+msgstr "TRASFERIMENTO"
+
+#: Public/form_data/FG_var_friend.inc:805
+msgid "JITTERBUFFER"
+msgstr "BUFFER JITTER"
+
+#: Public/form_data/FG_var_friend.inc:815
+msgid "FORCEJITTERBUFFER"
+msgstr "FORZA BUFFER JITTER"
+
+#: Public/form_data/FG_var_friend.inc:825
+msgid "CODECPRIORITY"
+msgstr "PRIORIT&Agrave CODICE"
+
+#: Public/form_data/FG_var_friend.inc:835
+msgid "QUALIFYSMOOTHING"
+msgstr "QUALIFICA SMOOTHING"
+
+#: Public/form_data/FG_var_friend.inc:845
+msgid "QUALIFYFREQOK"
+msgstr "QUALIFICA FREQOK"
+
+#: Public/form_data/FG_var_friend.inc:855
+msgid "QUALIFYFREQNOTOK"
+msgstr "QUALIFICA FREQNOTOK"
+
+#: Public/form_data/FG_var_friend.inc:875
+msgid "ADSI"
+msgstr "ADSI"
+
+#: Public/form_data/FG_var_friend.inc:885
+msgid "REQUITE CALL TOKEN"
+msgstr "RICOMPENSA TOKEN CHIAMATA"
+
+#: Public/form_data/FG_var_friend.inc:892
+#: Public/form_data/FG_var_friend.inc:902
+#: Public/form_data/FG_var_friend.inc:912
+msgid "No supported by Realtime"
+msgstr "Non supportato dal realtime"
+
+#: Public/form_data/FG_var_friend.inc:895
+msgid "MAX CALL NUMBERS"
+msgstr "MASSIMO NUMERO CHIAMATE"
+
+#: Public/form_data/FG_var_friend.inc:905
+msgid "MAX CALL NUMBERS NON VALIDATED"
+msgstr "MASSIMO NUMERO CHIAMATE NON VALIDE"
+
+#: Public/form_data/FG_var_card_seria.inc:53
+msgid "You have some cards using this Seria! Please comfirm that you really want to remove this seria ? "
+msgstr "Hai alcune schede che usano questa Seria! Confermi che vuoi realmente eliminare questa Seria ? "
+
+#: Public/form_data/FG_var_card_seria.inc:58
+msgid "Add Series"
+msgstr "Aggiungi Serie"
+
+#: Public/form_data/FG_var_card_seria.inc:65
+msgid "SEQUENCE NUMBER"
+msgstr "NUMERO SEQUENZA"
+
+#: Public/form_data/FG_var_card_seria.inc:69
+msgid "NO SERIES CREATED!"
+msgstr "NON CI SONO SERIE CREATE!"
+
+#: Public/form_data/FG_var_card_seria.inc:84
+msgid "Insert the Seria name"
+msgstr "Inserisci il nome Seria"
+
+#: Public/form_data/FG_var_signup_agent.inc:47
+msgid "Add Signup KEY"
+msgstr "Aggiungi Chiave Iscrizione"
+
+#: Public/form_data/FG_var_signup_agent.inc:52
+#: Public/form_data/FG_var_config.inc:153
+#: Public/form_data/FG_var_config.inc:194
+#: Public/A2B_entity_config.php:149
+msgid "KEY"
+msgstr "CHIAVE"
+
+#: Public/form_data/FG_var_phonebook.inc:59
+msgid "You have some phone using this PhoneBook! Please comfirm that you really want to remove this PhoneBook ? "
+msgstr "Hai alcuni telefoni che utilizzano questa Rubrica! Confermi che vuoi realmente eliminare questa Rubrica ? "
+
+#: Public/form_data/FG_var_phonebook.inc:64
+msgid "Add PhoneBook"
+msgstr "Aggiungi Rubrica"
+
+#: Public/form_data/FG_var_phonebook.inc:70
+msgid "CARD"
+msgstr "SCHEDA"
+
+#: Public/form_data/FG_var_phonebook.inc:74
+msgid "NO PHONEBOOK CREATED!"
+msgstr "NON CI SONO RUBRICHE CREATE!"
+
+#: Public/form_data/FG_var_phonebook.inc:115
+#: Public/form_data/FG_var_paymentlog.inc:189
+msgid "Select the Card Number ID"
+msgstr "Seleziona il Numero ID Scheda"
+
+#: Public/form_data/FG_var_statuslog.inc:39
+msgid "Status Log"
+msgstr "Log di Stato"
+
+#: Public/form_data/FG_var_statuslog.inc:101
+msgid "THERE IS NO STATUS LOG AVAILABLE!"
+msgstr "NON CI SONO LOG DI STATO DISPONIBILI!"
+
+#: Public/form_data/FG_var_paymentlog.inc:96
+#: Public/form_data/FG_var_paymentlog_agent.inc:96
+msgid "Id"
+msgstr "Id"
+
+#: Public/form_data/FG_var_paymentlog.inc:97
+#: Public/form_data/FG_var_paymentlog_agent.inc:97
+msgid "Created At"
+msgstr "At creato"
+
+#: Public/form_data/FG_var_paymentlog.inc:100
+#: Public/form_data/FG_var_paymentlog_agent.inc:100
+msgid "Owner"
+msgstr "Proprietario"
+
+#: Public/form_data/FG_var_paymentlog.inc:102
+msgid "CardID"
+msgstr "ID Scheda"
+
+#: Public/form_data/FG_var_paymentlog.inc:103
+msgid "Cardnumber"
+msgstr "Numero Scheda"
+
+#: Public/form_data/FG_var_paymentlog.inc:124
+#: Public/form_data/FG_var_paymentlog_agent.inc:124
+msgid "Insert the Id "
+msgstr "Inserisci l'Id "
+
+#: Public/form_data/FG_var_paymentlog.inc:126
+#: Public/form_data/FG_var_paymentlog_agent.inc:126
+msgid "Select the ID"
+msgstr "Seleziona l'ID"
+
+#: Public/form_data/FG_var_paymentlog.inc:135
+#: Public/form_data/FG_var_paymentlog_agent.inc:135
+msgid "Insert the creation date"
+msgstr "Inserisci la data di creazione"
+
+#: Public/form_data/FG_var_paymentlog.inc:139
+#: Public/form_data/FG_var_paymentlog_agent.inc:139
+msgid "PAYMENT METHOD"
+msgstr "METODO DI PAGAMENTO"
+
+#: Public/form_data/FG_var_paymentlog.inc:145
+#: Public/form_data/FG_var_paymentlog_agent.inc:145
+msgid "Insert the payment method"
+msgstr "Inserisci il metodo di pagamento"
+
+#: Public/form_data/FG_var_paymentlog.inc:146
+#: Public/form_data/FG_var_paymentlog_agent.inc:146
+msgid "Enter the payment method "
+msgstr "Inserisci il metodo di pagamento "
+
+#: Public/form_data/FG_var_paymentlog.inc:158
+#: Public/form_data/FG_var_paymentlog_agent.inc:158
+msgid "OWNER"
+msgstr "PROPRIETARIO"
+
+#: Public/form_data/FG_var_paymentlog.inc:164
+#: Public/form_data/FG_var_paymentlog_agent.inc:164
+msgid "Insert the owner"
+msgstr "Inserisci il proprietario"
+
+#: Public/form_data/FG_var_paymentlog.inc:165
+#: Public/form_data/FG_var_paymentlog_agent.inc:165
+msgid "Enter the owner"
+msgstr "Inserisci il proprietario"
+
+#: Public/form_data/FG_var_paymentlog.inc:175
+#: Public/form_data/FG_var_paymentlog_agent.inc:175
+msgid "Enter the amount "
+msgstr "Inserisci l'importo "
+
+#: Public/form_data/FG_var_did_billing.inc:49
+msgid "NB_CALL"
+msgstr "CHIAMATA_NB"
+
+#: Public/form_data/FG_var_did_billing.inc:50
+msgid "TOTAL_DURATION"
+msgstr "TOTALE DURATA"
+
+#: Public/form_data/FG_var_did_billing.inc:51
+msgid "TOTAL_COST"
+msgstr "COSTO TOTALE"
+
+#: Public/form_data/FG_var_did_billing.inc:52
+#: Public/form_data/FG_var_diduse.inc:81
+#: Public/A2B_detail_package.php:84
+msgid "CARDNUMBER"
+msgstr "NUMERO SCHEDA"
+
+#: Public/form_data/FG_var_did_billing.inc:65
+msgid "NO DID BILLING HAS BEEN CREATED!"
+msgstr "NON SONO STATE CREATE FATTURE DID!"
+
+#: Public/form_data/FG_var_diduse.inc:54
+#: Public/form_data/FG_var_diduse.inc:68
+msgid "Release this did"
+msgstr "Rilascia questo did"
+
+#: Public/form_data/FG_var_diduse.inc:75
+msgid "Reserved"
+msgstr "Prenotato"
+
+#: Public/form_data/FG_var_diduse.inc:78
+msgid "ID DID"
+msgstr "ID DID"
+
+#: Public/form_data/FG_var_diduse.inc:80
+msgid "ID card"
+msgstr "ID scheda"
+
+#: Public/form_data/FG_var_diduse.inc:83
+msgid "RESERVATION DATE"
+msgstr "DATA PRENOTAZIONE"
+
+#: Public/form_data/FG_var_diduse.inc:84
+msgid "LIBERATION DATE"
+msgstr "DATA LIBERAZIONE"
+
+#: Public/form_data/FG_var_diduse.inc:91
+msgid "THERE IS NO DID IN USE!"
+msgstr "NON CI SONO DID IN USO"
+
+#: Public/form_data/FG_var_service_details.inc:49
+msgid "NUMBEROFRUN"
+msgstr "NUMERO DI AVVIO"
+
+#: Public/form_data/FG_var_service_details.inc:52
+msgid "TOTALCARDPERFORM"
+msgstr "TOTALE OPERATO SCHEDA"
+
+#: Public/form_data/FG_var_config.inc:59
+msgid "yes"
+msgstr "si"
+
+#: Public/form_data/FG_var_config.inc:60
+msgid "no"
+msgstr "no"
+
+#: Public/form_data/FG_var_config.inc:80
+#: Public/form_data/FG_var_config.inc:87
+#: Public/templates/default/main.tpl:352
+msgid "Configuration"
+msgstr "Configurazione"
+
+#: Public/form_data/FG_var_config.inc:181
+msgid "This is the group of the configuration. Not editable!"
+msgstr "Questo &egrave il gruppo di configurazione. Non modificabile!"
+
+#: Public/form_data/FG_var_config.inc:182
+msgid "Group Name of the configuration variable"
+msgstr "Nome Gruppo della configurazione variabile"
+
+#: Public/form_data/FG_var_config.inc:191
+#: Public/form_data/FG_var_config.inc:200
+msgid "Insert the TITLE"
+msgstr "Inserisci il TITOLO"
+
+#: Public/form_data/FG_var_config.inc:192
+msgid "Title of the configuration variable"
+msgstr "Titolo della configurazione variabile"
+
+#: Public/form_data/FG_var_config.inc:201
+msgid "Key name of the configuration variable"
+msgstr "Nome chiave della configurazione variabile"
+
+#: Public/form_data/FG_var_config.inc:218
+msgid "Insert the Value"
+msgstr "Inserisci il Valore"
+
+#: Public/form_data/FG_var_config.inc:222
+msgid "LIST OF VALUES"
+msgstr "LISTA DEI VALORI"
+
+#: Public/form_data/FG_var_config.inc:229
+msgid "Insert the List of values, comma separated"
+msgstr "Inserisci la Lista dei valori, separati da virgola"
+
+#: Public/form_data/FG_var_config.inc:238
+msgid "Insert the Description"
+msgstr "Inserisci la Desctizione"
+
+#: Public/form_data/FG_var_ticket.inc:63
+#: Public/form_data/FG_var_ticket_agent.inc:57
+msgid "Add TICKET"
+msgstr "Aggiungi TICKET"
+
+#: Public/form_data/FG_var_ticket.inc:79
+#: Public/form_data/FG_var_ticket.inc:148
+#: Public/form_data/FG_var_ticket_agent.inc:72
+#: Public/form_data/FG_var_ticket_agent.inc:125
+msgid "COMPONENT"
+msgstr "COMPONENTE"
+
+#: Public/form_data/FG_var_ticket.inc:127
+msgid "CREATOR"
+msgstr "CREATORE"
+
+#: Public/form_data/FG_var_ticket.inc:145
+#: Public/form_data/FG_var_ticket_agent.inc:122
+msgid "Insert the Title of ticket "
+msgstr "Inserisci il titolo del ticket "
+
+#: Public/form_data/FG_var_autorefill.inc:47
+msgid "DATE RUN"
+msgstr "DATA AVVIO"
+
+# pb
+#: Public/form_data/FG_var_autorefill.inc:48
+msgid "TOTALCARD PERFORM"
+msgstr "TOTALE OPERATO SCHEDA"
+
+#: Public/form_data/FG_var_autorefill.inc:55
+msgid "THERE IS NO AUTOREFILL REPORT CREATED!"
+msgstr "NON CI SONO RAPPORTI AUTORICARICHE CREATI!"
+
+#: Public/form_data/FG_var_phonenumber.inc:50
+msgid "Add PHONE NUMBER"
+msgstr "Aggiungi NUMERO di TELEFONO"
+
+#: Public/form_data/FG_var_phonenumber.inc:58
+msgid "PHONEBOOK"
+msgstr "RUBRICA"
+
+#: Public/form_data/FG_var_phonenumber.inc:69
+msgid "No phone number has been created."
+msgstr "Non sono stati creati numeri di telefono."
+
+#: Public/form_data/FG_var_phonenumber.inc:84
+msgid "SELECT PHONEBOOK"
+msgstr "RUBRICA"
+
+#: Public/form_data/FG_var_phonenumber.inc:99
+msgid "Insert the phonenumber"
+msgstr "Inserisci numero di telefono"
+
+#: Public/form_data/FG_var_phonenumber.inc:100
+msgid "Enter here the phonenumber to call"
+msgstr "Inserisci qui il numero di telefono da chiamare"
+
+#: Public/form_data/FG_var_phonenumber.inc:103
+#: Public/templates/default/main.tpl:452
+msgid "Phone Book"
+msgstr "Rubrica"
+
+#: Public/form_data/FG_var_phonenumber.inc:120
+msgid "Insert the name "
+msgstr "Inserisci il nome "
+
+#: Public/form_data/FG_var_phonenumber.inc:130
+msgid "Insert the amount "
+msgstr "Inserisci l'importo "
+
+#: Public/form_data/FG_var_phonenumber.inc:141
+msgid "Define if this phone number is active or not"
+msgstr "Scegli se questo numero di telefono &egrave attivo o no"
+
+#: Public/form_data/FG_var_phonenumber.inc:144
+msgid "ADDITIONALINFO"
+msgstr "INFO SUPPLEMENTARI"
+
+#: Public/form_data/FG_var_phonenumber.inc:150
+msgid "Insert additional information"
+msgstr "Inserisci le informazioni supplementari"
+
+#: Public/form_data/FG_var_phonenumber.inc:164
+msgid "Add a $HD_Form->FG_INSTANCE_NAME now."
+msgstr "Aggiungi un $HD_Form->FG_INSTANCE_NAME adesso."
+
+#: Public/form_data/FG_var_callback.inc:39
+msgid "Callback"
+msgstr "Callback"
+
+#: Public/form_data/FG_var_callback.inc:49
+msgid "Add CALLBACK"
+msgstr "Aggiungi CALLBACK"
+
+#: Public/form_data/FG_var_callback.inc:60
+#: Public/form_data/FG_var_callback.inc:99
+msgid "UNIQUEID"
+msgstr "ID UNICO"
+
+#: Public/form_data/FG_var_callback.inc:61
+msgid "ENTRY TIME"
+msgstr "TEMPO INGRESSO"
+
+#: Public/form_data/FG_var_callback.inc:63
+msgid "SERVER IP"
+msgstr "IP SERVER"
+
+#: Public/form_data/FG_var_callback.inc:64
+msgid "NUMBER OF ATTEMPT"
+msgstr "NUMERO DI TENTATIVI"
+
+#: Public/form_data/FG_var_callback.inc:66
+#: Public/form_data/FG_var_callback.inc:160
+msgid "AGI RESULT"
+msgstr "RISULTATO AGI"
+
+#: Public/form_data/FG_var_callback.inc:67
+msgid "CALLBACK TIME"
+msgstr "ORA CALLBACK"
+
+#: Public/form_data/FG_var_callback.inc:68
+msgid "LAST_ATTEMPT"
+msgstr "ULTIMO_TENTATIVO"
+
+#: Public/form_data/FG_var_callback.inc:69
+#: Public/form_data/FG_var_callback.inc:180
+msgid "CHANNEL"
+msgstr "CANALE"
+
+#: Public/form_data/FG_var_callback.inc:71
+msgid "SERVER"
+msgstr "SERVER"
+
+#: Public/form_data/FG_var_callback.inc:77
+msgid "THERE IS NO CALLBACK CREATED!"
+msgstr "NON CI SONO CALLBACK CREATI!"
+
+#: Public/form_data/FG_var_callback.inc:105
+msgid "Insert the uniqueid"
+msgstr "Inserisci l'Id Unico"
+
+#: Public/form_data/FG_var_callback.inc:106
+msgid "This is an identifier to cross check the callback's request."
+msgstr "Questo &egrave un identificativo per verificare la richiesta di callback."
+
+#: Public/form_data/FG_var_callback.inc:106
+msgid "(useful if you have requests coming from an other platform through the API)"
+msgstr "(utile se hai una richiesta in arrivo da un'altra piattaforma attraverso le API)"
+
+#: Public/form_data/FG_var_callback.inc:130
+msgid "IP SERVER"
+msgstr "IP SERVER"
+
+#: Public/form_data/FG_var_callback.inc:136
+msgid "Insert the Ip Server"
+msgstr "Inserisci l'IP del Server"
+
+#: Public/form_data/FG_var_callback.inc:140
+msgid "NUMBER ATTEMPTS"
+msgstr "NUMERO DI TENTATIVI"
+
+#: Public/form_data/FG_var_callback.inc:146
+msgid "Insert the number of attempts"
+msgstr "Inserisci il numero di tentativi"
+
+#: Public/form_data/FG_var_callback.inc:150
+msgid "MANAGER RESULT"
+msgstr "RISULTATO MANAGER"
+
+#: Public/form_data/FG_var_callback.inc:156
+msgid "Insert the manager result"
+msgstr "Inserisci il risultato del manager"
+
+#: Public/form_data/FG_var_callback.inc:166
+msgid "Insert the agi result"
+msgstr "Inserisci il risultato delll'agi"
+
+#: Public/form_data/FG_var_callback.inc:170
+msgid "CALLBACK DATE"
+msgstr "DATA DI CALLBACK"
+
+#: Public/form_data/FG_var_callback.inc:186
+#: Public/form_data/FG_var_callback.inc:196
+msgid "Insert the channel"
+msgstr "Inserisci il  canale"
+
+#: Public/form_data/FG_var_callback.inc:187
+msgid "Channel on which to originate the call (SIP/123@1.1.1.4)"
+msgstr "Canale su cui proviene la chiamata (SIP/123@1.1.1.4)"
+
+#: Public/form_data/FG_var_callback.inc:187
+msgid "Define all the information requested by asterisk to generate the callback"
+msgstr "Definisci tutte le informazioni richieste da Asterisk per generare il callback"
+
+#: Public/form_data/FG_var_callback.inc:190
+msgid "EXTENSION"
+msgstr "ESTENSIONE"
+
+#: Public/form_data/FG_var_callback.inc:197
+msgid "Extension to use on connect (must use Context & Priority with it)"
+msgstr "Estensione da usare sul connesso (devi usare Contesto & Priorit&agrave con essa)"
+
+#: Public/form_data/FG_var_callback.inc:206
+msgid "Context to use on connect (must use Exten & Priority with it)"
+msgstr "Contesto da usare sul connesso (devi usare Esten & Priorit&agrave con esso)"
+
+#: Public/form_data/FG_var_callback.inc:215
+msgid "Insert the priority"
+msgstr "Inserisci la priorit&agrave"
+
+#: Public/form_data/FG_var_callback.inc:216
+msgid "Priority to use on connect (must use Context & Exten with it)"
+msgstr "Priorit&agrave da usare sul connesso (devi usare Contesto & Esten con essa)"
+
+#: Public/form_data/FG_var_callback.inc:219
+msgid "APPLICATION"
+msgstr "APPLICAZIONE"
+
+#: Public/form_data/FG_var_callback.inc:225
+msgid "Insert the application"
+msgstr "Inserisci l'applicazione"
+
+# pb
+#: Public/form_data/FG_var_callback.inc:226
+msgid "Application to use on connect : meetme or other (use Data for parameters)"
+msgstr "Applicazione da usare sul connesso : contattami o altro (utilizza Dati per i parametri"
+
+#: Public/form_data/FG_var_callback.inc:229
+#: Public/A2B_log_activity_info.php:141
+msgid "DATA"
+msgstr "DATI"
+
+#: Public/form_data/FG_var_callback.inc:235
+msgid "Insert the data"
+msgstr "Inserisci i dati"
+
+#: Public/form_data/FG_var_callback.inc:236
+msgid "Data if Application parameter is used"
+msgstr "Dati se parametro Applicazione &egrave usato "
+
+#: Public/form_data/FG_var_callback.inc:239
+msgid "TIMEOUT"
+msgstr "FINE TEMPO"
+
+#: Public/form_data/FG_var_callback.inc:245
+msgid "Insert the timeout"
+msgstr "Inserisci il fine tempo"
+
+#: Public/form_data/FG_var_callback.inc:246
+msgid "Timeout for the connection to happen (30000)"
+msgstr "Fine Tempo per la connessione se accade (30000)"
+
+#: Public/form_data/FG_var_callback.inc:256
+msgid "CallerID to use for the call"
+msgstr "Id Chiamante da usare per la chiamata"
+
+#: Public/form_data/FG_var_callback.inc:259
+msgid "variable"
+msgstr "variabile"
+
+#: Public/form_data/FG_var_callback.inc:265
+msgid "Insert the variable"
+msgstr "Inserisci la variabile"
+
+#: Public/form_data/FG_var_callback.inc:266
+msgid "Callback info for Asterisk (variable list to transfer to the channel) var1=23|var2=24|var3=25"
+msgstr "Info Callback per Asterisk (lista delle variabili da trasferire al canale) var1=23|var2=24|var3=25"
+
+#: Public/form_data/FG_var_callback.inc:269
+msgid "account"
+msgstr "account"
+
+#: Public/form_data/FG_var_callback.inc:275
+msgid "Insert the account"
+msgstr "Inserisci l'account"
+
+#: Public/form_data/FG_var_callback.inc:276
+msgid "Account code for the call for billing purpose"
+msgstr "Codice Account della chiamata per risultato fatturazione"
+
+#: Public/form_data/FG_var_callback.inc:279
+msgid "async"
+msgstr "async"
+
+#: Public/form_data/FG_var_callback.inc:285
+msgid "Insert the async"
+msgstr "Inserisci l'async"
+
+#: Public/form_data/FG_var_callback.inc:286
+msgid "For the origination to be asynchronous (allows multiple calls to be generated without waiting for a response)"
+msgstr "Per la creazione dell'asincronotion (permette di generare chiamate multiple senza attendere una risposta)"
+
+#: Public/form_data/FG_var_callback.inc:289
+msgid "actionid"
+msgstr "id azione"
+
+#: Public/form_data/FG_var_callback.inc:295
+msgid "Insert the actionid"
+msgstr "Inserisci l'id azione"
+
+#: Public/form_data/FG_var_callback.inc:296
+msgid "The request identifier. It allows you to identify the response to this request. You may use a number or a string. <br> Useful when you make several simultaneous requests. ActionID: ABC45678901234567890 "
+msgstr "La richiesta di identificazione. Permette di identificare il responso di questa richiesta. Puoi usare un numero o una sequenza. <br> Utile quando fai diverse richieste simultanee. ID Azione: ABC45678901234567890 "
+
+#: Public/form_data/FG_var_restore.inc:48
+msgid "FILE"
+msgstr "FILE"
+
+#: Public/form_data/FG_var_restore.inc:67
+msgid "Name "
+msgstr "Nome "
+
+#: Public/form_data/FG_var_restore.inc:74
+msgid "Name of the backup"
+msgstr "Nome del backup"
+
+#: Public/form_data/FG_var_restore.inc:83
+msgid "The backup file name"
+msgstr "Il nome del file di backup"
+
+#: Public/form_data/FG_var_restore.inc:106
+msgid "Restore"
+msgstr "Ripristino"
+
+#: Public/form_data/FG_var_restore.inc:110
+msgid "Download"
+msgstr "Scaricamento"
+
+#: Public/form_data/FG_var_paymentlog_agent.inc:102
+msgid "Agent ID"
+msgstr "ID Agente"
+
+#: Public/form_data/FG_var_paymentlog_agent.inc:103
+msgid "Agent LOGIN"
+msgstr "LOGIN Agente"
+
+#: Public/form_data/FG_var_callerid.inc:57
+msgid "CUSTOMER NAME"
+msgstr "INFO UTENTE"
+
+#: Public/form_data/FG_var_callerid.inc:63
+msgid " CREATED!"
+msgstr " CREATO!"
+
+#: Public/form_data/FG_var_callerid.inc:80
+msgid "Insert the CallerID"
+msgstr "Inserisci l'ID Chiamante"
+
+#: Public/form_data/FG_var_callerid.inc:119
+msgid "Modify via the form below, the properties of the callerID"
+msgstr "Modifica attraverso il seguente modulo, le propriet&agrave dell'ID chiamante"
+
+#: Public/A2B_payment_info_agent.php:72
+#: Public/A2B_payment_info.php:72
+msgid "PAYMENT INFO"
+msgstr "INFO PAGAMENTO"
+
+#: Public/A2B_payment_info_agent.php:126
+#: Public/A2B_payment_info.php:126
+msgid "LINK REFILL"
+msgstr "LINK RICARICA"
+
+#: Public/A2B_payment_info_agent.php:129
+#: Public/A2B_payment_info.php:129
+msgid "Link to the refill"
+msgstr "Link alla ricarica"
+
+#: Public/A2B_payment_info_agent.php:139
+msgid "PAYMENTS AGENT LIST"
+msgstr "LISTA PAGAMENTI AGENTE"
+
+#: Public/A2B_logfile.php:109
+msgid "Browse log file"
+msgstr "Sfoglia file di log"
+
+#: Public/A2B_logfile.php:112
+msgid "Filter"
+msgstr "Filtro"
+
+#: Public/A2B_signup_agent.php:128
+msgid "Create signup url for a specific agent, customer group and Call Plan."
+msgstr "Crea un url d'iscrizione per uno specifico agente, gruppo utenti e Piano di Chiamata."
+
+#: Public/A2B_signup_agent.php:135
+msgid "Select Agent"
+msgstr "Seleziona un agente"
+
+#: Public/A2B_signup_agent.php:138
+msgid "Choose an Agent "
+msgstr "Scegli un Agente"
+
+#: Public/A2B_signup_agent.php:159
+msgid "Choose the Call Plan to use"
+msgstr "Scegli il Piano di Chiamata da usare"
+
+#: Public/A2B_signup_agent.php:161
+#: Public/A2B_entity_card_multi.php:263
+msgid "Choose a Call Plan"
+msgstr "Scegli un Piano di Chiamata"
+
+#: Public/A2B_signup_agent.php:171
+msgid "Choose the Customer group to use"
+msgstr "Scegli il Gruppo Utenti da usare"
+
+#: Public/A2B_signup_agent.php:173
+msgid "Choose a Customer Group"
+msgstr "Scegli un Gruppo Utenti"
+
+#: Public/A2B_signup_agent.php:195
+msgid "RETURN TO URL KEY LIST"
+msgstr "RITORNA ALl'URL LISTA CHIAVI"
+
+#: Public/A2B_signup_agent.php:200
+msgid "ADD URL KEY"
+msgstr "AGGIUNGI UNA CHIAVE URL"
+
+#: Public/A2B_signup_agent.php:220
+msgid "URL"
+msgstr "URL"
+
+#: Public/A2B_signup_agent.php:220
+msgid "Link to the URL"
+msgstr "Link all'URL"
+
+#: Public/A2B_entity_config.php:236
+msgid "Select Group"
+msgstr "Seleziona Gruppo"
+
+#: Public/A2B_invoice_view.php:139
+#: Public/A2B_receipt_view.php:135
+msgid "SYSTEM CURRENCY"
+msgstr "VALUTA DI SISTEMA"
+
+#: Public/A2B_invoice_view.php:140
+#: Public/A2B_receipt_view.php:136
+msgid "CUSTOMER CURRENCY"
+msgstr "VALUTA UTENTE"
+
+#: Public/A2B_invoice_view.php:148
+msgid "Print"
+msgstr "Stampa"
+
+#: Public/A2B_invoice_view.php:167
+#: Public/A2B_invoice_view.php:184
+#: Public/A2B_receipt_view.php:168
+msgid "VAT nr."
+msgstr "Part.IVA"
+
+#: Public/A2B_invoice_view.php:180
+msgid "tel"
+msgstr "tel"
+
+#: Public/A2B_invoice_view.php:181
+#: Public/CC_card_import.php:269
+msgid "fax"
+msgstr "fax"
+
+#: Public/A2B_invoice_view.php:182
+msgid "mail"
+msgstr "email"
+
+#: Public/A2B_invoice_view.php:198
+msgid "Invoice number"
+msgstr "Numero di fattura"
+
+#: Public/A2B_invoice_view.php:203
+#: Public/A2B_receipt_view.php:198
+msgid "Client Account Number"
+msgstr "Numero Account Utente"
+
+#: Public/A2B_invoice_view.php:218
+#: Public/card-history.php:65
+#: Public/A2B_entity_config_generate_confirm.php:84
+#: Public/A2B_entity_config_generate_confirm.php:110
+#: Public/A2B_receipt_view.php:214
+msgid "Description"
+msgstr "Descrizione"
+
+#: Public/A2B_invoice_view.php:219
+msgid "Cost excl. VAT"
+msgstr "Costo escl. IVA"
+
+#: Public/A2B_invoice_view.php:221
+msgid "Cost incl. VAT"
+msgstr "Costo incl. IVA"
+
+#: Public/A2B_invoice_view.php:270
+msgid "Subtotal excl. VAT:"
+msgstr "Subtotale escl. IVA:"
+
+#: Public/A2B_invoice_view.php:283
+msgid "Total incl. VAT:"
+msgstr "Totale incl. IVA:"
+
+#: Public/A2B_entity_friend.php:214
+msgid "Link to Generate on SIP/IAX Friends"
+msgstr "Link al Generato Friends SIP/IAX"
+
+#: Public/A2B_entity_friend.php:217
+msgid "Realtime not active, you have to use the conf file for your system"
+msgstr "Realtime non attivo, devi usare il file di configurazione per il sistema"
+
+#: Public/A2B_entity_friend.php:233
+msgid "Reload Asterisk"
+msgstr "Ricarica Asterisk"
+
+#: Public/A2B_entity_friend.php:250
+msgid "CONFIGURATION TYPE"
+msgstr "TTIPO DI CONFIGURAZIONE"
+
+#: Public/A2B_entity_friend.php:294
+msgid "Context"
+msgstr "Contesto"
+
+#: Public/A2B_entity_friend.php:303
+msgid "BATCH UPDATE VOIP SETTINGS"
+msgstr "AGGIORNAMENTO LOTTO CONFIGURAZIONE VOIP"
+
+#: Public/call-count-reporting.php:80
+msgid "Account Used"
+msgstr "Account Usato"
+
+#: Public/call-count-reporting.php:93
+msgid "NbrCall"
+msgstr "Num. Chiamata"
+
+#: Public/call-count-reporting.php:110
+msgid " - Call Report - "
+msgstr " - Rapporto Chiamata - "
+
+#: Public/call-count-reporting.php:226
+msgid "Number in Result"
+msgstr "Numero Risultato"
+
+#: Public/call-count-reporting.php:233
+#: Public/call-count-reporting.php:234
+#: Public/call-count-reporting.php:235
+#: Public/call-count-reporting.php:236
+#: Public/call-count-reporting.php:237
+msgid "RESULTS"
+msgstr "RISULTATO"
+
+#: Public/call-count-reporting.php:259
+msgid "GROUP BY"
+msgstr "GRUPPO DI"
+
+#: Public/call-count-reporting.php:262
+msgid "Calls by user"
+msgstr "Chiamata per utente"
+
+#: Public/call-count-reporting.php:264
+msgid "Calls by destination"
+msgstr "Chiamata per destinazione"
+
+#: Public/call-count-reporting.php:270
+#: Public/A2B_call_archiving.php:413
+msgid "SHOW"
+msgstr "MOSTRA"
+
+#: Public/call-count-reporting.php:273
+#: Public/A2B_call_archiving.php:416
+msgid "Answered Calls"
+msgstr "Chiamate Risposte"
+
+#: Public/call-count-reporting.php:275
+#: Public/A2B_call_archiving.php:418
+msgid "All Calls"
+msgstr "Tutte le Chiamate"
+
+#: Public/call-count-reporting.php:281
+msgid "GROUP BY DAY"
+msgstr "GRUPPO PER GIORNO"
+
+#: Public/call-count-reporting.php:297
+msgid "Mins"
+msgstr "Min"
+
+#: Public/call-count-reporting.php:297
+msgid "Secs"
+msgstr "Sec"
+
+#: Public/A2B_data_archiving.php:106
+msgid "<acronym title=\"CANCELLED\">"
+msgstr "<acronym title=\"CANCELLATO\">"
+
+#: Public/A2B_data_archiving.php:107
+msgid "ACTIV"
+msgstr "ATTIVO"
+
+#: Public/A2B_data_archiving.php:107
+msgid "<acronym title=\"ACTIVE\">"
+msgstr "<acronym title=\"ATTIVO\">"
+
+#: Public/A2B_data_archiving.php:108
+msgid "<acronym title=\"NEW\">"
+msgstr "<acronym title=\"NUOVO\">"
+
+#: Public/A2B_data_archiving.php:109
+msgid "WAIT"
+msgstr "ATTESA"
+
+#: Public/A2B_data_archiving.php:109
+msgid "<acronym title=\"WAITING-MAILCONFIRMATION\">"
+msgstr "<acronym title=\"ATTESA-CONFERMA-EMAIL\">"
+
+#: Public/A2B_data_archiving.php:110
+msgid "<acronym title=\"RESERVED\">"
+msgstr "<acronym title=\"PRENOTATO\">"
+
+#: Public/A2B_data_archiving.php:111
+msgid "EXPIR"
+msgstr "SCADUTO"
+
+#: Public/A2B_data_archiving.php:111
+msgid "<acronym title=\"EXPIRED\">"
+msgstr "<acronym title=\"SCADUTO\">"
+
+#: Public/A2B_data_archiving.php:116
+#: Public/A2B_entity_card_multi.php:301
+msgid "POSTPAY CARD"
+msgstr "SCEDA POSTPAGATA"
+
+#: Public/A2B_data_archiving.php:126
+msgid "On"
+msgstr "Acceso"
+
+#: Public/A2B_data_archiving.php:127
+msgid "Off"
+msgstr "Spento"
+
+#: Public/A2B_data_archiving.php:156
+msgid "NO CUSTOMER SEARCHED!"
+msgstr "NON UTENTI CERCATI!"
+
+#: Public/A2B_data_archiving.php:162
+msgid "Creation date"
+msgstr "Data creazione"
+
+#: Public/A2B_data_archiving.php:170
+msgid "Select customer created more than"
+msgstr "Seleziona utente creato pi&ugrave di"
+
+#: Public/A2B_data_archiving.php:243
+#: Public/A2B_call_archiving.php:469
+msgid "ARCHIVING OPTIONS"
+msgstr "OPTIZIONI ARCHIVIAZIONE"
+
+#: Public/A2B_data_archiving.php:249
+#: Public/A2B_call_archiving.php:476
+msgid "Customer Archiving"
+msgstr "Archiviazione Utente"
+
+#: Public/A2B_data_archiving.php:250
+#: Public/A2B_call_archiving.php:475
+msgid "Calls Archiving"
+msgstr "Archiviazione Chiamate"
+
+#: Public/card-history.php:75
+msgid "Customer History"
+msgstr "Storico Scheda"
+
+#: Public/card-history.php:177
+#: Public/card-history.php:181
+#: Public/card-history.php:209
+msgid "JANUARY"
+msgstr "GENNAIO"
+
+#: Public/card-history.php:177
+#: Public/card-history.php:181
+#: Public/card-history.php:209
+msgid "FEBRUARY"
+msgstr "FEBBRAIO"
+
+#: Public/card-history.php:177
+#: Public/card-history.php:181
+#: Public/card-history.php:209
+msgid "MARCH"
+msgstr "MARZO"
+
+#: Public/card-history.php:177
+#: Public/card-history.php:181
+#: Public/card-history.php:209
+msgid "APRIL"
+msgstr "APRILE"
+
+#: Public/card-history.php:177
+#: Public/card-history.php:181
+#: Public/card-history.php:209
+msgid "MAY"
+msgstr "MAI"
+
+#: Public/card-history.php:177
+#: Public/card-history.php:181
+#: Public/card-history.php:209
+msgid "JUNE"
+msgstr "GIUGNO"
+
+#: Public/card-history.php:177
+#: Public/card-history.php:181
+#: Public/card-history.php:209
+msgid "JULY"
+msgstr "LUGLIO"
+
+#: Public/card-history.php:177
+#: Public/card-history.php:181
+#: Public/card-history.php:209
+msgid "AUGUST"
+msgstr "AGOSTO"
+
+#: Public/card-history.php:177
+#: Public/card-history.php:181
+#: Public/card-history.php:209
+msgid "SEPTEMBER"
+msgstr "SETTEMBRE"
+
+#: Public/card-history.php:177
+#: Public/card-history.php:181
+#: Public/card-history.php:209
+msgid "OCTOBER"
+msgstr "OTTOBRE"
+
+#: Public/card-history.php:177
+#: Public/card-history.php:181
+#: Public/card-history.php:209
+msgid "NOVEMBER"
+msgstr "NOVEMBRE"
+
+#: Public/card-history.php:177
+#: Public/card-history.php:181
+#: Public/card-history.php:209
+msgid "DECEMBER"
+msgstr "DICEMBRE"
+
+#: Public/CC_ratecard_merging.php:67
+msgid "No Source ratecard selected !"
+msgstr "Origine scheda tariffe non selezionata !"
+
+#: Public/CC_ratecard_merging.php:74
+msgid "No Destination ratecard selected !"
+msgstr "Destinazione scheda tariffe non selezionata !"
+
+#: Public/CC_ratecard_merging.php:80
+msgid "Source Ratecard Should be different from Destination ratecard!"
+msgstr "L'Origine della Scheda Tariffe deve esere differente dalla Destinazione scheda tariffe !"
+
+#: Public/CC_ratecard_merging.php:139
+msgid "Define the search criteria"
+msgstr "Definisci il criterio di ricerca"
+
+#: Public/CC_ratecard_merging.php:140
+msgid "Start Date / Month"
+msgstr "Data Inizio / Mese"
+
+#: Public/CC_ratecard_merging.php:141
+msgid "Start Date / Day"
+msgstr "Data Inizio / Giorno"
+
+#: Public/CC_ratecard_merging.php:239
+msgid "RATECARD SOURCE"
+msgstr "ORIGINE SCHEDA TARIFFE"
+
+#: Public/CC_ratecard_merging.php:242
+msgid "SOURCE RATECARD"
+msgstr "SCHEDA TARIFFE ORIGINE"
+
+#: Public/CC_ratecard_merging.php:250
+msgid "RATECARD TO UPDATE"
+msgstr "SCEDA TARIFFE DA AGGIRONARE"
+
+#: Public/CC_ratecard_merging.php:253
+msgid "DESTINATION RATECARD"
+msgstr "DESTINAZIONE SCHEDA TARIFFE"
+
+#: Public/CC_ratecard_merging.php:262
+msgid "Choose fields to merge"
+msgstr "Scegli i campi da unire "
+
+#: Public/CC_ratecard_merging.php:270
+#: Public/CC_ratecard_import.php:254
+msgid "destination"
+msgstr "destinazione"
+
+#: Public/CC_ratecard_merging.php:271
+#: Public/CC_ratecard_import.php:267
+msgid "buyrate"
+msgstr "prezzo acquisto"
+
+#: Public/CC_ratecard_merging.php:272
+msgid "rateinitial"
+msgstr "tariffa iniziale"
+
+#: Public/CC_ratecard_merging.php:273
+msgid "buyrateinitblock"
+msgstr "prezzo acquisto tariffa iniziale"
+
+#: Public/CC_ratecard_merging.php:274
+msgid "buyrateincrement"
+msgstr "incremento tariffa acquisto"
+
+#: Public/CC_ratecard_merging.php:275
+msgid "trunk"
+msgstr "fascio"
+
+#: Public/CC_ratecard_merging.php:276
+msgid "initblock"
+msgstr "trancheinitial"
+
+#: Public/CC_ratecard_merging.php:277
+msgid "billingblock"
+msgstr "blocco fatturazione"
+
+#: Public/CC_ratecard_merging.php:278
+msgid "connectcharge"
+msgstr "scatto alla risposta"
+
+#: Public/CC_ratecard_merging.php:279
+msgid "disconnectcharge"
+msgstr "scatto alla disconnessione"
+
+#: Public/CC_ratecard_merging.php:280
+msgid "stepchargea"
+msgstr "misura addebito a"
+
+#: Public/CC_ratecard_merging.php:281
+msgid "chargea"
+msgstr "addebito a"
+
+#: Public/CC_ratecard_merging.php:282
+msgid "timechargea"
+msgstr "tempo addebito a"
+
+#: Public/CC_ratecard_merging.php:283
+msgid "billingblocka"
+msgstr "blocco fatturazione a"
+
+#: Public/CC_ratecard_merging.php:285
+msgid "stepchargeb"
+msgstr "misura addebito b"
+
+# verif
+#: Public/CC_ratecard_merging.php:286
+msgid "chargeb"
+msgstr "addebito b"
+
+#: Public/CC_ratecard_merging.php:287
+msgid "timechargeb"
+msgstr "tempo addebito b"
+
+#: Public/CC_ratecard_merging.php:288
+msgid "billingblockb"
+msgstr "blocco fatturazione b"
+
+#: Public/CC_ratecard_merging.php:290
+msgid "stepchargec"
+msgstr "misura addebito c"
+
+#: Public/CC_ratecard_merging.php:291
+msgid "chargec"
+msgstr "addebito c"
+
+#: Public/CC_ratecard_merging.php:292
+msgid "timechargec"
+msgstr "tempo addebito c"
+
+#: Public/CC_ratecard_merging.php:293
+msgid "billingblockc"
+msgstr "blocco fatturazione c"
+
+#: Public/CC_ratecard_merging.php:295
+msgid "startdate"
+msgstr "data-inizio"
+
+#: Public/CC_ratecard_merging.php:296
+msgid "stopdate"
+msgstr "data-fine"
+
+#: Public/CC_ratecard_merging.php:298
+msgid "starttime"
+msgstr "ora inizio"
+
+#: Public/CC_ratecard_merging.php:299
+msgid "endtime"
+msgstr "ora fine"
+
+#: Public/CC_ratecard_merging.php:300
+#: Public/CC_ratecard_import.php:300
+msgid "tag"
+msgstr "etichetta"
+
+#: Public/CC_ratecard_merging.php:301
+#: Public/CC_ratecard_import.php:301
+msgid "rounding calltime"
+msgstr "arrotondamento durata chiamata"
+
+#: Public/CC_ratecard_merging.php:302
+#: Public/CC_ratecard_import.php:302
+msgid "rounding threshold"
+msgstr "arrotondamento soglia"
+
+#: Public/CC_ratecard_merging.php:303
+#: Public/CC_ratecard_import.php:303
+msgid "additional block charge"
+msgstr "blocco addebito addizionale"
+
+#: Public/CC_ratecard_merging.php:304
+#: Public/CC_ratecard_import.php:304
+msgid "additional block charge time"
+msgstr "blocco addebito addizionale durata"
+
+#: Public/A2B_phonelist_import_analyse.php:54
+msgid "No Phonebook defined !"
+msgstr "Non ci sono Rubriche definite !"
+
+#: Public/A2B_phonelist_import_analyse.php:121
+#: Public/CC_ratecard_import_analyse.php:119
+msgid "Error: Failed to open the file."
+msgstr "Errore: Impossibile aprire il file."
+
+#: Public/A2B_phonelist_import_analyse.php:236
+#: Public/CC_ratecard_import_analyse.php:265
+msgid "The first line of your import is previewed below, please check to ensure that every is correct"
+msgstr "La prima riga dell' importazione &egrave visualizzata sotto, controlla che tutto sia corretto"
+
+#: Public/A2B_phonelist_import_analyse.php:283
+#: Public/CC_ratecard_import_analyse.php:311
+msgid "Please check if the datas above are correct."
+msgstr "Verifica se i dati sopra sono corretti."
+
+#: Public/A2B_phonelist_import_analyse.php:327
+msgid "new phone number have been imported"
+msgstr "un nuovo numero di telefono &egrave stato importato"
+
+#: Public/A2B_phonelist_import_analyse.php:333
+#: Public/CC_ratecard_import_analyse.php:360
+msgid "Line that has not been inserted"
+msgstr "Linea che non pu&ograve essere inserita"
+
+#: Public/PP_error.php:56
+msgid "ERROR : ACCESS REFUSED"
+msgstr "ERRORE : ACCESSO RIFIUTATO"
+
+#: Public/PP_error.php:57
+msgid "Sorry a problem occur on our system, please try later!"
+msgstr "Spiacente, errore di sistema, riprova pi&ugrave tardi!"
+
+#: Public/PP_error.php:58
+msgid "There is an error on this page!"
+msgstr "C'&egrave un errore in questa pagina!"
+
+#: Public/PP_error.php:59
+msgid "Sorry, you don't have access to this page !"
+msgstr "Spiacente, non hai accesso a questa pagina !"
+
+#: Public/PP_error.php:60
+msgid "Invalid User Id !"
+msgstr "Id Utilisateur non valable !"
+
+#: Public/PP_error.php:61
+msgid "No such card number found. Please check your card number!"
+msgstr "Nessun numero scheda trovato. Controlla il tuo numero scheda!"
+
+#: Public/PP_error.php:71
+msgid "ERROR PAGE"
+msgstr "PAGINA ERRORE"
+
+#: Public/PP_error.php:88
+msgid "GO TO LOGIN PAGE"
+msgstr "VAI ALLA PAGINA DI LOGIN"
+
+#: Public/dashboard.php:75
+msgid "ACCOUNTS INFO"
+msgstr "INFO UTENTE"
+
+#: Public/dashboard.php:78
+msgid "REFILLS INFO"
+msgstr "INFO RICARICHE"
+
+#: Public/dashboard.php:81
+msgid "PAYMENTS INFO"
+msgstr "INFO PAGAMENTI"
+
+#: Public/dashboard.php:84
+msgid "CALLS INFO TODAY"
+msgstr "INFO CHIAMATE"
+
+#: Public/dashboard.php:87
+msgid "SYSTEM INFO"
+msgstr "INFO SISTEMA"
+
+#: Public/dashboard.php:90
+msgid "NEWS"
+msgstr "NUOVI"
+
+#: Public/A2B_entity_did_import.php:77
+#: Public/CC_card_import.php:62
+msgid "Insert emails on the Field!"
+msgstr "Inserisci email nel Campo!"
+
+#: Public/A2B_entity_did_import.php:235
+msgid "New DID have to be imported from a CSV file."
+msgstr "I nuovi DID saranno importati da un file CSV."
+
+#: Public/A2B_entity_did_import.php:242
+msgid "Choose a DIDGroup to use"
+msgstr "Scegli un Gruppo DID da usare"
+
+#: Public/A2B_entity_did_import.php:244
+msgid "Choose a DIDGroup"
+msgstr "Scegli un Gruppo DID"
+
+#: Public/A2B_entity_did_import.php:255
+msgid "Choose a Country to use"
+msgstr "Scegli una Nazione da usare"
+
+#: Public/A2B_entity_did_import.php:257
+msgid "Choose a Country"
+msgstr "Scegli una Nazione"
+
+#: Public/A2B_entity_did_import.php:273
+msgid "FIXRATE"
+msgstr "TARIFFA-FISSA"
+
+#: Public/A2B_entity_did_import.php:285
+#: Public/CC_card_import.php:240
+msgid "activated"
+msgstr "attivata"
+
+#: Public/A2B_entity_did_import.php:286
+msgid "startingdate"
+msgstr "data-inizio"
+
+#: Public/A2B_entity_did_import.php:287
+#: Public/CC_card_import.php:255
+msgid "expirationdate"
+msgstr "data-scadenza"
+
+#: Public/A2B_entity_did_import.php:288
+msgid "billingtype"
+msgstr "tipo fatturazione"
+
+#: Public/A2B_entity_did_import.php:321
+#: Public/CC_ratecard_import.php:348
+#: Public/CC_card_import.php:322
+msgid "Use the example below  to format the CSV file. Fields are separated by [,] or [;]"
+msgstr "Usa l'esempio sotto per creare il file CSV. I campi sono separati da [,] o [;]"
+
+#: Public/A2B_entity_signup_agent.php:54
+msgid "click outside box to close"
+msgstr "clicca fuori del riquadro per uscire"
+
+#: Public/A2B_call_archiving.php:78
+#: Public/graph_stat.php:60
+#: Public/graph_statbar.php:61
+#: Public/call-daily-load.php:73
+msgid "terminatecauseid"
+msgstr "id causa terminazione"
+
+#: Public/A2B_call_archiving.php:80
+#: Public/graph_stat.php:62
+#: Public/graph_statbar.php:63
+msgid "InitialRate"
+msgstr "Tariffa Iniziale"
+
+#: Public/A2B_call_archiving.php:211
+msgid "Enter the cardnumber"
+msgstr "Inserisci numero scheda"
+
+#: Public/A2B_call_archiving.php:225
+msgid "Ratecard ID"
+msgstr "ID Scheda Tariffe"
+
+#: Public/A2B_call_archiving.php:360
+msgid "Select card older than"
+msgstr "Seleziona proprietario scheda di"
+
+#: Public/graph_stat.php:255
+msgid "Statistic : Number of call by Hours"
+msgstr "Statistica : Numero di chiamate per Ora"
+
+#: Public/graph_stat.php:256
+#: Public/graph_statbar.php:234
+msgid "Statistic : Minutes by Hours"
+msgstr "Statistica : Minuti per Ora"
+
+#: Public/graph_stat.php:257
+msgid "Statistic : Profits by Hours"
+msgstr "Statistica : Profitto per Ora"
+
+#: Public/graph_stat.php:258
+msgid "Statistic : Sells by Hours"
+msgstr "Statistica : Vendite per Ora"
+
+#: Public/graph_stat.php:259
+msgid "Statistic : Buys by Hours"
+msgstr "Statistica : Acquisti per Ora"
+
+#: Public/A2B_asteriskinfo.php:183
+msgid "ASTERISK MANAGER ERROR"
+msgstr "ERRORE MANAGER ASTERISK"
+
+#: Public/A2B_asteriskinfo.php:229
+msgid "Summary"
+msgstr "Sommario"
+
+#: Public/A2B_asteriskinfo.php:248
+msgid "Refresh"
+msgstr "Aggiorna"
+
+#: Public/A2B_entity_voucher_multi.php:117
+msgid "Choose the number of vouchers to create"
+msgstr "Scegli il numero di coupons da creare"
+
+#: Public/A2B_entity_voucher_multi.php:118
+msgid "5 Voucher"
+msgstr "5 Coupons"
+
+#: Public/A2B_entity_voucher_multi.php:119
+msgid "10 Vouchers"
+msgstr "10 Coupons"
+
+#: Public/A2B_entity_voucher_multi.php:120
+msgid "50 Vouchers"
+msgstr "50 Coupons"
+
+#: Public/A2B_entity_voucher_multi.php:121
+msgid "100 Vouchers"
+msgstr "100 Coupons"
+
+#: Public/A2B_entity_voucher_multi.php:122
+msgid "200 Vouchers"
+msgstr "200 Coupons"
+
+#: Public/A2B_entity_voucher_multi.php:123
+msgid "500 Vouchers"
+msgstr "500 Coupons"
+
+#: Public/A2B_entity_voucher_multi.php:128
+msgid "Amount of credit"
+msgstr "Ammontare del credito"
+
+#: Public/A2B_entity_voucher_multi.php:151
+msgid "Expiration date"
+msgstr "Data scadenza"
+
+#: Public/A2B_entity_voucher_multi.php:151
+msgid "(respect the format YYYY-MM-DD HH:MM:SS)"
+msgstr "(rispetta il formato AAAA-MM-GG OO:MM:SS)"
+
+#: Public/A2B_entity_voucher_multi.php:154
+#: Public/A2B_entity_card_multi.php:350
+msgid "Tag"
+msgstr "Etichetta"
+
+#: Public/A2B_entity_restore.php:122
+msgid "Error uploading file"
+msgstr "Errore: Impossibile caricare il file."
+
+#: Public/A2B_entity_restore.php:160
+msgid "Upload a database backup"
+msgstr "Carica un backup del database."
+
+#: Public/A2B_entity_log_viewer.php:86
+msgid "ADMIN USER"
+msgstr "UTENTE ADMIN"
+
+#: Public/A2B_entity_log_viewer.php:216
+msgid "LOG LEVEL"
+msgstr "LIVELLO LOG"
+
+#: Public/A2B_detail_package.php:86
+msgid "USED MINUTES"
+msgstr "MINUTI USATI"
+
+#: Public/A2B_detail_package.php:87
+msgid "NB PERFORMED"
+msgstr "ESEGUITO NB"
+
+#: Public/A2B_detail_package.php:102
+msgid " - Package Info - "
+msgstr " - Info Pacchetto - "
+
+#: Public/A2B_detail_package.php:228
+msgid "Enter the card ID"
+msgstr "Inserisci l'ID della scheda"
+
+#: Public/A2B_detail_package.php:257
+msgid "Selection of the month"
+msgstr "Selezione del mese"
+
+#: Public/A2B_detail_package.php:309
+msgid "Selection of the day"
+msgstr "Selezione del giorno"
+
+#: Public/A2B_detail_package.php:388
+msgid "Calls with free minutes"
+msgstr "Minuti di chiamata gratuiti"
+
+#: Public/A2B_detail_package.php:549
+#: Public/call-dnid.php:792
+msgid "TOTAL COSTS"
+msgstr "COSTO TOTALE"
+
+#: Public/A2B_detail_package.php:550
+#: Public/call-dnid.php:793
+msgid "TOTAL BUYCOSTS"
+msgstr "COSTO TOTALE AQUISTO"
+
+#: Public/A2B_detail_package.php:551
+#: Public/call-dnid.php:794
+msgid "DIFFERENCE"
+msgstr "DIFFERENZA"
+
+#: Public/A2B_detail_package.php:607
+msgid "PACKAGE CARD : SUMMARY"
+msgstr "PACCETTO SCHEDA : SOMMARIO"
+
+#: Public/A2B_detail_package.php:613
+msgid "PERFORMED"
+msgstr "ESEGUITO"
+
+#: Public/A2B_admin_info.php:74
+msgid "ADMIN INFO"
+msgstr "INFO ADMIN"
+
+#: Public/A2B_admin_info.php:106
+#: Public/A2B_card_info.php:251
+#: Public/A2B_agent_info.php:122
+msgid "ZIP CODE"
+msgstr "CODICE POSTALE"
+
+#: Public/A2B_admin_info.php:173
+#: Public/A2B_agent_info.php:221
+msgid "AGENT LIST"
+msgstr "LISTA DEGLI AGENTI"
+
+#: Public/graph_statbar.php:233
+msgid "Statistic : Load by hours"
+msgstr "Statistica : Carico per ora"
+
+#: Public/A2B_entity_remittance_request.php:67
+msgid "REFILL BY REMITTANCE REQUEST"
+msgstr "RICARICA DA RICHISTA RIMESSA"
+
+#: Public/A2B_card_info.php:78
+msgid "ACCOUNT INFO"
+msgstr "INFO ACCOUNT"
+
+#: Public/A2B_card_info.php:109
+msgid "WEB ALIAS"
+msgstr "ALIAS WEB"
+
+#: Public/A2B_card_info.php:117
+msgid "WEB PASSWORD"
+msgstr "PASSWORD WEB"
+
+#: Public/A2B_card_info.php:167
+msgid "LAST USE DATE"
+msgstr "DATA ULTIMO UTILIZZO"
+
+#: Public/A2B_card_info.php:186
+msgid "UNLOCK"
+msgstr "SBLOCCA"
+
+#: Public/A2B_card_info.php:199
+msgid "LOCK DATE"
+msgstr "DATA DI BLOCCO"
+
+#: Public/A2B_card_info.php:212
+msgid "CUSTOMER INFO"
+msgstr "INFO UTENTE"
+
+#: Public/A2B_card_info.php:328
+msgid "ACCOUNT STATUS"
+msgstr "STATO ACCOUNT"
+
+#: Public/A2B_card_info.php:378
+msgid "COMPANY INFO"
+msgstr "INFO SOCIET&Agrave"
+
+#: Public/A2B_card_info.php:402
+msgid "VAT REGISTRATION NUMBER"
+msgstr "NUMERO PARTITA IVA"
+
+#: Public/A2B_card_info.php:421
+msgid "TARGET TRAFIC"
+msgstr "OBIETTIVO TRAFFICO"
+
+#: Public/A2B_card_info.php:446
+msgid "CALLER-ID LIST "
+msgstr "LISTA ID CHIAMANTE"
+
+#: Public/A2B_card_info.php:493
+msgid "SPEED-DIAL LIST "
+msgstr "LISTA NUMERI BREVI"
+
+#: Public/A2B_card_info.php:504
+msgid "SPEEDDIAL"
+msgstr "NUMERO BREVE"
+
+#: Public/A2B_card_info.php:549
+msgid "SIP-CONFIG"
+msgstr "CONFIG SIP"
+
+#: Public/A2B_card_info.php:595
+msgid "IAX-CONFIG"
+msgstr "CONFIG IAX"
+
+#: Public/A2B_card_info.php:637
+#: Public/A2B_card_info.php:1011
+msgid "CUSTOMERS LIST"
+msgstr "LISTA DEGLI UTENTI"
+
+#: Public/A2B_card_info.php:653
+msgid "Current Subscriptions"
+msgstr "Abbonamenti correnti"
+
+#: Public/A2B_card_info.php:669
+msgid "SUBSCRIPTION"
+msgstr "ABBONAMENTO"
+
+#: Public/A2B_card_info.php:675
+msgid "LINKS"
+msgstr "LISTA"
+
+#: Public/A2B_card_info.php:702
+msgid "Link to subscription"
+msgstr "Link agli abbonamenti"
+
+#: Public/A2B_card_info.php:703
+msgid "Delete subscription"
+msgstr "Cancella sottoscrizione"
+
+#: Public/A2B_card_info.php:726
+msgid "Recent Payments"
+msgstr "Pagamenti Recenti"
+
+#: Public/A2B_card_info.php:748
+msgid "ID REFILL"
+msgstr "ID RICARICA"
+
+#: Public/A2B_card_info.php:796
+msgid "Recent Refills"
+msgstr "Ricariche Recenti"
+
+#: Public/A2B_card_info.php:860
+msgid "Recent Calls"
+msgstr "Chiamate Recenti"
+
+#: Public/A2B_card_info.php:870
+msgid "CALL DATE"
+msgstr "DATA CHIAMATA"
+
+#: Public/A2B_card_info.php:882
+msgid "TERMINATE CAUSE"
+msgstr "CAUSA INTERRUZIONE"
+
+#: Public/A2B_card_info.php:891
+msgid "RATE"
+msgstr "TARIFFA"
+
+#: Public/A2B_card_info.php:929
+msgid "Link to the used rate"
+msgstr "Link alla tariffa usata"
+
+#: Public/A2B_card_info.php:951
+msgid "DIDs & DID Destination"
+msgstr "Destinazione DID & DIDs"
+
+#: Public/CC_generate_friend_file.php:74
+msgid "Cannot connect to the asterisk manager!<br>Please check your manager configuration."
+msgstr "Impossibile connetersi al manger Asterisk!<br>Controlla la configurazione del manager."
+
+#: Public/CC_generate_friend_file.php:123
+msgid "The sipfriend file has been generated : "
+msgstr "Il file sipfriend &egrave stato creato : "
+
+#: Public/CC_generate_friend_file.php:125
+msgid "The iaxfriend file has been generated : "
+msgstr "Il file iaxfriend &egrave stato creato : "
+
+#: Public/CC_generate_friend_file.php:131
+msgid "Click here to reload your asterisk server"
+msgstr "Clicca qui per ricaricare il server asterisk"
+
+#: Public/CC_generate_friend_file.php:136
+msgid "Asterisk has been reloaded."
+msgstr "Asterisk &egrave stato ricaricato."
+
+#: Public/call-dnid.php:109
+msgid "COUNT"
+msgstr "CONTEGGIO"
+
+#: Public/call-dnid.php:110
+msgid "AVG Rate"
+msgstr "Tariffa Media"
+
+#: Public/call-dnid.php:111
+msgid "AVG Sale"
+msgstr "Vendita Media"
+
+#: Public/call-dnid.php:131
+msgid " - DNID REPORT - "
+msgstr " - RAPPORTO DNID - "
+
+#: Public/call-dnid.php:351
+msgid "Enter the account number"
+msgstr "Iserisci il numero account"
+
+#: Public/A2B_trunk_report.php:165
+#: Public/call-pnl-report.php:174
+msgid "Select Day"
+msgstr "Seleziona Giorno"
+
+#: Public/A2B_trunk_report.php:235
+#: Public/call-pnl-report.php:245
+msgid "Select Time"
+msgstr "Seleziona Tempo"
+
+#: Public/A2B_trunk_report.php:249
+#: Public/A2B_trunk_report.php:257
+msgid "Select Trunk"
+msgstr "Seleziona Fascio"
+
+#: Public/CC_entity_alarm_details.php:55
+msgid "CALCULTED VALUE"
+msgstr "VALORA CALCOLATO"
+
+#: Public/CC_entity_alarm_details.php:123
+msgid "NUMBER OF RUN"
+msgstr "NUMERO DI AVVII"
+
+#: Public/CC_entity_alarm_details.php:124
+msgid "NUMBER OF SENT ALARM"
+msgstr "NUMERO DI INVIO ALLARMI"
+
+#: Public/CC_entity_alarm_details.php:125
+msgid "DATE LAST RUN"
+msgstr "DATA ULTIMO AVVIO"
+
+#: Public/CC_entity_alarm_details.php:138
+msgid "ALARM REPORT"
+msgstr "RAPPORTO ALLARMI"
+
+#: Public/CC_entity_alarm_details.php:279
+#: Public/CC_entity_service_details.php:248
+msgid "NOTHING FOUND"
+msgstr "NIENTE TROVATO"
+
+#: Public/A2B_entity_moneysituation.php:174
+msgid "NB TOTAL INVOICE"
+msgstr "TOTALE FATTURE NB"
+
+#: Public/A2B_entity_moneysituation.php:175
+msgid "NB INVOICE WITH ENOUGH PAYMENT "
+msgstr "FATTURE CON SUFFICIENTE PAGAMENTO NB "
+
+#: Public/A2B_entity_moneysituation.php:176
+msgid "NB INVOICE WITH PAID STATUS"
+msgstr "FATTURE SENZA LO STATO PAGATO NB"
+
+#: Public/A2B_entity_moneysituation.php:177
+msgid "NB INVOICE WITH UNPAID STATUS"
+msgstr "FATTURE CON STATO NON PAGATO NB"
+
+#: Public/call-daily-load.php:250
+msgid "Day"
+msgstr "Giorno"
+
+#: Public/call-daily-load.php:379
+msgid "Average Connection Time"
+msgstr "Tempo Medio Connessione"
+
+#: Public/call-daily-load.php:433
+msgid "Select the hour interval to see the details"
+msgstr "Seleziona intervallo ora per vedere i dettagli"
+
+#: Public/call-daily-load.php:440
+msgid "HOUR INTERVAL"
+msgstr "INTEVLLO ORA"
+
+#: Public/call-daily-load.php:458
+msgid "TYPE GRAPH"
+msgstr "TIPO GRAFICO"
+
+#: Public/call-daily-load.php:463
+msgid "FLUCTUATION GRAPH"
+msgstr "FLUTTUAZIONE GRAFICO"
+
+#: Public/call-daily-load.php:463
+msgid "WATCH CALLS GRAPH"
+msgstr "GUARDA GRAFICO CHIAMATE"
+
+#: Public/A2B_package_manage_rates.php:181
+msgid "PACKAGE: "
+msgstr "PACCHETTO"
+
+#: Public/A2B_package_manage_rates.php:182
+msgid "DATE: "
+msgstr "DATA : "
+
+#: Public/A2B_package_manage_rates.php:191
+msgid "per"
+msgstr "per"
+
+#: Public/A2B_package_manage_rates.php:192
+msgid "month"
+msgstr "mese"
+
+#: Public/A2B_package_manage_rates.php:192
+msgid "week"
+msgstr "settimana"
+
+#: Public/A2B_package_manage_rates.php:201
+msgid "RATES ASSIGNED"
+msgstr "PAGAMENTO ASSEGNATO"
+
+#: Public/A2B_package_manage_rates.php:216
+msgid "Del Rate"
+msgstr "Canc. Tariffa"
+
+#: Public/A2B_package_manage_rates.php:217
+msgid "Del All Rate"
+msgstr "Canc. Tutte le Tariffe"
+
+#: Public/A2B_entity_translate.php:123
+msgid "Subject"
+msgstr "Soggetto"
+
+#: Public/A2B_entity_translate.php:132
+msgid "Mail Text"
+msgstr "Testo Email"
+
+#: Public/A2B_entity_translate.php:146
+msgid "Once you have completed the form above, click on the Translate button."
+msgstr "Una volta completato il modulo sopra, clicca sul tasto 'Traduci'"
+
+#: Public/A2B_notifications.php:57
+msgid "All parameters relating to the Notifications module can be set using the Global Config available in System Settings menu."
+msgstr "Tutti i parametri rilasciati nel modulo Notifiche, possono essere impostati usando la Lista Globale disponibile nel men&ugrave Impostazioni di Sistema."
+
+#: Public/A2B_notifications.php:60
+msgid "System Settings - Global Config"
+msgstr "Impostazioni Sistema - Config Globale"
+
+#: Public/A2B_notifications.php:64
+msgid "You don't have enough rights to enable or disable the Notifications modules. Ask your administrator"
+msgstr "Non hai abbastanza diritti per abilitare o disabilitare il modulo di Notifica. Chiedi al tuo Amministratore"
+
+#: Public/A2B_notifications.php:89
+msgid "Currently, the cron process of notifications is activated."
+msgstr "Attualemente, il processo cron di notifica &egrave attivo."
+
+#: Public/A2B_notifications.php:90
+msgid "Currently, the cron process of notification is deactivated."
+msgstr "Attualemente, il processo cron di notifica &egrave inattivo."
+
+#: Public/A2B_notifications.php:92
+msgid "Make sure that the cron files are correctly configured in the crontab!"
+msgstr "Assicurati che il file cron siano correttamente configurati nel crontab!"
+
+#: Public/A2B_notifications.php:96
+#: Public/A2B_notifications.php:132
+#: Public/A2B_notifications.php:179
+msgid "Press"
+msgstr "Premi"
+
+#: Public/A2B_notifications.php:98
+#: Public/A2B_notifications.php:134
+#: Public/A2B_notifications.php:181
+msgid "Modify"
+msgstr "Modifica"
+
+#: Public/A2B_notifications.php:98
+msgid "to change enable or disable periodical notifications"
+msgstr "per abilitare o disabilitare le notifiche periodiche"
+
+#: Public/A2B_notifications.php:100
+msgid "You don't have enough rights To Enable or Disable the process of notification. Ask your administrator"
+msgstr "Non hai abbastanza diritti per Abilitare o Disabilitare il processo di notifica. Chiedi al tuo Amministratore"
+
+#: Public/A2B_notifications.php:128
+msgid "This box shows the possible values to choose from when the user receives a notification"
+msgstr "In questa casella sono riportati i valori possibili tra cui scegliere quando l'utente riceve una notifica"
+
+#: Public/A2B_notifications.php:134
+msgid "to change the values."
+msgstr "per cambiare i valori"
+
+#: Public/A2B_notifications.php:136
+msgid "You don't have enough rights to modify the list of values. Ask your administrator"
+msgstr "Non hai abbastanza diritti per modificare la lista dei valori. Chiedi al tuo Amministratore"
+
+#: Public/A2B_notifications.php:171
+msgid "Currently, the periodicity of notification is "
+msgstr "Attualmente, la periodicit&agrave della notifica &egrave "
+
+#: Public/A2B_notifications.php:172
+msgid " day"
+msgstr " giorno"
+
+#: Public/A2B_notifications.php:173
+msgid " days"
+msgstr " giorni"
+
+#: Public/A2B_notifications.php:181
+msgid "to change the periodicity"
+msgstr "per cambiare la periodicit&agrave"
+
+#: Public/A2B_notifications.php:183
+msgid "You don't have enough rights to modify the delay of notification. Ask your administrator"
+msgstr "Non hai abbastanza diritti per modificare il ritardo della notifica. Chiedi al tuo Amministratore"
+
+#: Public/CC_musiconhold.php:61
+msgid "CUSTOM THE MUSICONHOLD CLASS"
+msgstr "CLASSE DELLA MUSICA ATTESA UTENTE"
+
+#: Public/CC_ratecard_import_analyse.php:53
+msgid "No tariffplan defined !"
+msgstr "Nessun piano di tariffa definito !"
+
+#: Public/CC_ratecard_import_analyse.php:59
+msgid "No Trunk defined !"
+msgstr "Nessun Fascio definito !"
+
+#: Public/CC_ratecard_import_analyse.php:354
+msgid "new rates have been imported"
+msgstr "nuove tariffe sono state importate"
+
+#: Public/CC_ratecard_import.php:72
+msgid "Please, you must first select a ratecard !"
+msgstr "Devi prima selezionare una scheda tariffe !"
+
+#: Public/CC_ratecard_import.php:222
+msgid "New rate cards have to be imported from a CSV file."
+msgstr "Le nuove schede tariffe devono essere importate dal file CSV."
+
+#: Public/CC_ratecard_import.php:227
+msgid "Choose the ratecard to import"
+msgstr "Scegli la scheda tariffe da importare"
+
+#: Public/CC_ratecard_import.php:238
+msgid "Choose the trunk to use"
+msgstr "Scegli il fascio da usare"
+
+#: Public/CC_ratecard_import.php:253
+msgid "dialprefix"
+msgstr "prefisso di chiamata"
+
+#: Public/CC_ratecard_import.php:255
+msgid "selling rate"
+msgstr "tariffa vendita"
+
+#: Public/CC_ratecard_import.php:268
+msgid "buyrate min duration"
+msgstr "min. durata tariffa acquisto"
+
+#: Public/CC_ratecard_import.php:269
+msgid "buyrate billing block"
+msgstr "scatto fatturazione tariffa acquisto"
+
+#: Public/CC_ratecard_import.php:271
+msgid "sellrate min duration"
+msgstr "min. durata tariffa vendita"
+
+#: Public/CC_ratecard_import.php:272
+msgid "sellrate billing block"
+msgstr "scatto fatturazione tariffa vendita"
+
+#: Public/CC_ratecard_import.php:274
+msgid "connect charge"
+msgstr "scatto alla risposta"
+
+#: Public/CC_ratecard_import.php:275
+msgid "disconnect charge"
+msgstr "scatto disconnessione"
+
+#: Public/CC_ratecard_import.php:276
+msgid "disconnect charge threshold"
+msgstr "soglia scatto disconnessione"
+
+#: Public/CC_ratecard_import.php:278
+msgid "minimum call cost"
+msgstr "costo minimo chiamata"
+
+#: Public/CC_ratecard_import.php:280
+msgid "step charge a"
+msgstr "misura addebito a"
+
+#: Public/CC_ratecard_import.php:281
+msgid "charge a"
+msgstr "addebito a"
+
+#: Public/CC_ratecard_import.php:282
+msgid "time charge a"
+msgstr "tempo addebito a"
+
+#: Public/CC_ratecard_import.php:283
+msgid "billing block a"
+msgstr "blocco fatturazione a"
+
+#: Public/CC_ratecard_import.php:285
+msgid "step charge b"
+msgstr "misura addebito b"
+
+#: Public/CC_ratecard_import.php:286
+msgid "charge b"
+msgstr "addebito b"
+
+#: Public/CC_ratecard_import.php:287
+msgid "time charge b"
+msgstr "tempo addebito b"
+
+#: Public/CC_ratecard_import.php:288
+msgid "billing block b"
+msgstr "blocco fatturazione b"
+
+#: Public/CC_ratecard_import.php:290
+msgid "step charge c"
+msgstr "misura addebito c"
+
+#: Public/CC_ratecard_import.php:291
+msgid "charge c"
+msgstr "addebito c"
+
+#: Public/CC_ratecard_import.php:292
+msgid "time charge c"
+msgstr "tempo addebito c"
+
+#: Public/CC_ratecard_import.php:293
+msgid "billing block c"
+msgstr "blocco fatturazione c"
+
+#: Public/CC_ratecard_import.php:295
+msgid "start date"
+msgstr "data inizio"
+
+#: Public/CC_ratecard_import.php:296
+msgid "stop date"
+msgstr "data fine"
+
+#: Public/CC_ratecard_import.php:297
+msgid "additional grace"
+msgstr "comporto addizionale"
+
+#: Public/CC_ratecard_import.php:298
+msgid "start time"
+msgstr "ora inizio"
+
+#: Public/CC_ratecard_import.php:299
+msgid "end time"
+msgstr "ora fine"
+
+#: Public/CC_ratecard_import.php:305
+msgid "announce time correction"
+msgstr "correzione ora annuncio"
+
+#: Public/CC_ratecard_import.php:334
+msgid "Currency import as"
+msgstr "Importa la valuta in"
+
+#: Public/CC_ratecard_import.php:334
+msgid "Unit"
+msgstr "Unit&agrave"
+
+#: Public/CC_ratecard_import.php:335
+msgid "Cents"
+msgstr "Centesimi"
+
+#: Public/A2B_entity_invoice.php:87
+msgid "SEARCH INVOICE"
+msgstr "CERCA FATTURA"
+
+#: Public/A2B_invoice_edit.php:59
+#: Public/A2B_invoice_edit.php:100
+#: Public/A2B_receipt_edit.php:58
+#: Public/A2B_receipt_edit.php:94
+msgid "Date inserted is invalid, it must respect a date format YYYY-MM-DD HH:MM:SS (time is optional).<br/>"
+msgstr "La data inserita non &egrave valida, devi rispettare il formato AAAA-MM-GG OO:MM:SS (l'ora &egrave opzionale).<br/>"
+
+#: Public/A2B_invoice_edit.php:62
+#: Public/A2B_invoice_edit.php:103
+msgid "VAT inserted is invalid, it must be a number. Check the format.<br/>"
+msgstr "L'IVA inserita non &egrave valida, deve essere un numero. Verifica il formato.<br/>"
+
+#: Public/A2B_invoice_edit.php:65
+#: Public/A2B_invoice_edit.php:106
+#: Public/A2B_receipt_edit.php:61
+#: Public/A2B_receipt_edit.php:97
+msgid "Amount inserted is invalid, it must be a number. Check the format."
+msgstr "L'importo inserito non &egrave valido, deve essere un numero. Verifica il formato."
+
+#: Public/A2B_invoice_edit.php:132
+#: Public/A2B_invoice_manage_payment.php:117
+msgid "INVOICE: "
+msgstr "FATTURA: "
+
+#: Public/A2B_invoice_edit.php:133
+#: Public/A2B_invoice_manage_payment.php:118
+msgid "REF: "
+msgstr "RIF:"
+
+#: Public/A2B_invoice_edit.php:142
+#: Public/A2B_receipt_edit.php:129
+msgid "FOR : "
+msgstr "PER: "
+
+#: Public/A2B_invoice_edit.php:160
+#: Public/A2B_invoice_manage_payment.php:180
+msgid "PAID STATUS : "
+msgstr "STATO PAGAMENTO: "
+
+#: Public/A2B_invoice_edit.php:182
+msgid "PRICE EXCL. VAT"
+msgstr "PREZZO ESCL. IVA"
+
+#: Public/A2B_invoice_edit.php:192
+msgid "PRICE INCL. VAT"
+msgstr "PREZZO INCL. IVA"
+
+#: Public/A2B_invoice_edit.php:218
+#: Public/A2B_receipt_edit.php:173
+msgid "Edit Item"
+msgstr "Edita Articolo"
+
+#: Public/A2B_invoice_edit.php:219
+#: Public/A2B_receipt_edit.php:174
+msgid "Delete Item"
+msgstr "Elimina Articolo"
+
+#: Public/A2B_invoice_edit.php:250
+msgid "TOTAL EXCL. VAT"
+msgstr "TOTALE ESCL. IVA"
+
+#: Public/A2B_invoice_edit.php:282
+msgid "TOTAL INCL. VAT"
+msgstr "TOTALE INCL. IVA"
+
+#: Public/A2B_invoice_edit.php:310
+msgid "ADD INVOICE ITEM "
+msgstr "AGGIUNGI UN ARTICOLO FATTURA"
+
+#: Public/A2B_invoice_edit.php:328
+msgid "AMOUNT : "
+msgstr "IMPORTO: "
+
+#: Public/A2B_invoice_edit.php:335
+msgid "VAT : "
+msgstr "IVA : "
+
+#: Public/A2B_invoice_edit.php:350
+#: Public/A2B_agent_home.php:209
+#: Public/A2B_receipt_edit.php:255
+msgid "ADD"
+msgstr "AGGIUNTO"
+
+#: Public/A2B_entity_def_ratecard.php:185
+msgid "Could not perform the batch update"
+msgstr "Impossibile effettuare l'aggiornamento lotto"
+
+#: Public/A2B_entity_def_ratecard.php:187
+msgid "The batch update has been successfully perform"
+msgstr "L'aggiornamento lotto &egrave stato effettuato con successo"
+
+#: Public/A2B_entity_def_ratecard.php:308
+#: Public/A2B_entity_def_ratecard.php:481
+msgid "rates selected!"
+msgstr "tariffa selezionata!"
+
+#: Public/A2B_entity_def_ratecard.php:308
+#: Public/A2B_entity_def_ratecard.php:481
+msgid "Use the options below to batch update the selected rates."
+msgstr "Usa l'opzione sotto per aggiornare il lotto della tariffa selezionata."
+
+#: Public/A2B_entity_def_ratecard.php:433
+msgid "BATCH UPDATE RATECARD"
+msgstr "AGGIORNAMENTO LOTTO SCHEDA TARIFFE"
+
+#: Public/A2B_entity_def_ratecard.php:477
+#: Public/A2B_entity_def_ratecard.php:564
+msgid "BATCH ASSIGNED"
+msgstr "PAGAMENTO ASSEGNATO"
+
+#: Public/A2B_entity_def_ratecard.php:552
+msgid "Expression"
+msgstr "Espressione"
+
+#: Public/A2B_entity_def_ratecard.php:556
+msgid "With 'Expression' you can define a range of prefixes. '32484-32487' adds all prefixes between 32484 and 32487. '32484,32386,32488' would add only the individual prefixes listed."
+msgstr "Con Espressione tu puoi definire un intervallo di prefissi. '32484-32487' aggiunge tutti i prefissi compresi tra 32484 e 32487. '32484,32386,32488 aggiunger&agrave solo i prefissi individuali."
+
+#: Public/CC_entity_sim_ratecard.php:77
+msgid "Error card !!!"
+msgstr "Errore scheda !!!"
+
+#: Public/CC_entity_sim_ratecard.php:110
+msgid "No matching rate found !"
+msgstr "Nessuna tariffa corrispondente trovata !"
+
+#: Public/CC_entity_sim_ratecard.php:127
+msgid "RATECARD SIMULATOR"
+msgstr "SIMULATORE SCHEDE TARIFFE"
+
+#: Public/CC_entity_sim_ratecard.php:131
+msgid "NUMBER TO CALL"
+msgstr "NUMERO DA CHIAMARE"
+
+#: Public/CC_entity_sim_ratecard.php:134
+msgid "INITAL CREDIT"
+msgstr "CREDITO INIZIALE"
+
+#: Public/CC_entity_sim_ratecard.php:137
+msgid "Choose 0 to simulate with the account current credit"
+msgstr "Scegliere 0 per simulare con il credito del corrente account"
+
+#: Public/CC_entity_sim_ratecard.php:148
+msgid "Card ID"
+msgstr "ID Scheda"
+
+#: Public/CC_entity_sim_ratecard.php:158
+msgid "OR"
+msgstr "O"
+
+#: Public/CC_entity_sim_ratecard.php:168
+msgid "Card Number"
+msgstr "Numero di Scheda"
+
+#: Public/CC_entity_sim_ratecard.php:176
+msgid "SIMULATE"
+msgstr "SIMULA"
+
+#: Public/CC_entity_sim_ratecard.php:206
+msgid "Simulator found a rate for your destination"
+msgstr "Il Simulatore ha trovato una tariffa per la vostra destinazione"
+
+#: Public/CC_entity_sim_ratecard.php:212
+msgid "MORE THAN ONE ROUTE FOUND ON THE RATECARD"
+msgstr "TROVATA PI&Ugrave DI UNA ROTTA NELLA SCHEDA TARIFFE"
+
+#: Public/CC_entity_sim_ratecard.php:223
+msgid "PREFIX-RATECARD"
+msgstr "PREFISSO-SCHEDA TARIFFE"
+
+#: Public/CC_entity_sim_ratecard.php:228
+msgid "MAX DURATION FOR THE CALL"
+msgstr "DURATA MASSIMA CHIAMATA"
+
+#: Public/CC_entity_sim_ratecard.php:232
+#: Public/CC_entity_sim_ratecard.php:243
+#: Public/CC_entity_sim_ratecard.php:257
+#: Public/call-pnl-report.php:476
+msgid "Minutes"
+msgstr "Minuti"
+
+#: Public/CC_entity_sim_ratecard.php:239
+msgid "FREE TIME INCLUDED IN THE DURATION"
+msgstr "TEMPO GRATUITO INCLUSO NELLA DURATA"
+
+#: Public/CC_entity_sim_ratecard.php:251
+msgid "TIME ANNOUCEMENT FOR THE CALL"
+msgstr "TEMPO AVVISO CHIAMATA"
+
+#: Public/CC_entity_sim_ratecard.php:265
+msgid "Announce correction "
+msgstr "Correzione Annuncio "
+
+#: Public/CC_card_import.php:225
+msgid "New Cards have to be imported from a CSV file."
+msgstr "Le nuove Schede saranno importate da un file CSV."
+
+#: Public/CC_card_import.php:234
+msgid "username"
+msgstr "nome utente"
+
+#: Public/CC_card_import.php:235
+msgid "useralias"
+msgstr "alias utente"
+
+#: Public/CC_card_import.php:236
+msgid "uipass"
+msgstr "password web"
+
+#: Public/CC_card_import.php:237
+msgid "credit"
+msgstr "credito"
+
+#: Public/CC_card_import.php:238
+msgid "lastname"
+msgstr "cognnome"
+
+#: Public/CC_card_import.php:239
+msgid "firstname"
+msgstr "nome"
+
+#: Public/CC_card_import.php:241
+msgid "status"
+msgstr "stato"
+
+#: Public/CC_card_import.php:253
+msgid "creationdate"
+msgstr "data creazione"
+
+#: Public/CC_card_import.php:254
+msgid "firstusedate"
+msgstr "data primo utilizzo"
+
+#: Public/CC_card_import.php:256
+msgid "enableexpire"
+msgstr "abilita scadenza"
+
+#: Public/CC_card_import.php:257
+msgid "expiredays"
+msgstr "giorni scadenza"
+
+#: Public/CC_card_import.php:258
+msgid "tariff"
+msgstr "tariffa"
+
+#: Public/CC_card_import.php:259
+msgid "id_didgroup"
+msgstr "id_gruppo-did"
+
+#: Public/CC_card_import.php:260
+msgid "id_group"
+msgstr "id_gruppo"
+
+#: Public/CC_card_import.php:261
+msgid "address"
+msgstr "indirizzo"
+
+#: Public/CC_card_import.php:263
+msgid "city"
+msgstr "citt&agrave"
+
+#: Public/CC_card_import.php:264
+msgid "state"
+msgstr "regione"
+
+#: Public/CC_card_import.php:265
+msgid "country"
+msgstr "nazione"
+
+#: Public/CC_card_import.php:266
+msgid "zipcode"
+msgstr "codice postale"
+
+#: Public/CC_card_import.php:267
+msgid "phone"
+msgstr "telefono"
+
+#: Public/CC_card_import.php:268
+msgid "email"
+msgstr "email"
+
+#: Public/CC_card_import.php:270
+msgid "inuse"
+msgstr "in uso"
+
+#: Public/CC_card_import.php:271
+msgid "simultaccess"
+msgstr "accessi simultanei"
+
+#: Public/CC_card_import.php:273
+msgid "currency"
+msgstr "valuta"
+
+#: Public/CC_card_import.php:274
+msgid "lastuse"
+msgstr "ultimo uso"
+
+#: Public/CC_card_import.php:275
+msgid "nbused"
+msgstr "nb usato"
+
+#: Public/CC_card_import.php:276
+msgid "typepaid"
+msgstr "tipo pagamento"
+
+#: Public/CC_card_import.php:277
+msgid "creditlimit"
+msgstr "limite credito"
+
+#: Public/CC_card_import.php:278
+msgid "voipcall"
+msgstr "chiamata voip"
+
+#: Public/CC_card_import.php:279
+msgid "sip_buddy"
+msgstr "sip_buddy"
+
+#: Public/CC_card_import.php:280
+msgid "iax_buddy"
+msgstr "iax_buddy"
+
+#: Public/CC_card_import.php:281
+msgid "language"
+msgstr "lingua"
+
+#: Public/CC_card_import.php:282
+msgid "redial"
+msgstr "richiama"
+
+#: Public/CC_card_import.php:284
+msgid "nbservice"
+msgstr "servizio nb"
+
+#: Public/CC_card_import.php:285
+msgid "id_campaign"
+msgstr "id_campagna"
+
+#: Public/CC_card_import.php:286
+msgid "num_trials_done"
+msgstr "num. prove fatto"
+
+#: Public/CC_card_import.php:287
+msgid "callback"
+msgstr "callback"
+
+#: Public/CC_card_import.php:288
+msgid "vat"
+msgstr "iva"
+
+#: Public/CC_card_import.php:289
+msgid "servicelastrun"
+msgstr "ultimo avvio servizio"
+
+#: Public/CC_card_import.php:290
+msgid "initialbalance"
+msgstr "saldo iniziale"
+
+#: Public/CC_card_import.php:291
+msgid "invoiceday"
+msgstr "giorno fattura"
+
+#: Public/CC_card_import.php:292
+msgid "autorefill"
+msgstr "autoricarica"
+
+#: Public/CC_card_import.php:293
+msgid "loginkey"
+msgstr "chiave login"
+
+#: Public/CC_card_import.php:347
+msgid "Import Customer's"
+msgstr "Importa Utenti"
+
+#: Public/PP_intro.php:100
+msgid "If you find A2Billing useful, please donate to the A2Billing project by clicking the Donate button :"
+msgstr "Se trovate A2Billing utile, si prega di fare una donazione per il progetto A2Billing cliccando sul tasto 'Donate' :"
+
+#: Public/A2B_entity_did_import_analyse.php:55
+msgid "No DIDGroup defined !"
+msgstr "Non ci sono Gruppi DID definiti !"
+
+#: Public/A2B_entity_did_import_analyse.php:60
+msgid "No Country defined !"
+msgstr "Non c'&egrave la Nazione definita !"
+
+#: Public/A2B_entity_did_import_analyse.php:293
+msgid ""
+"As a preview for the import, we have made a quick analyze of the first line of your csv file.<br/>\n"
+"\t\tPlease check out if everything look correct!"
+msgstr ""
+"Anteprima importazione, &egrave stata fatta una veloce analisi della prima riga del tuo file CSV.<br/>\n"
+"\t\tVerifica se tutto &egrave corretto!"
+
+#: Public/A2B_entity_did_import_analyse.php:390
+msgid "The import of the new DID's have been realized with success!"
+msgstr "L'importazione del nuovo DID &egrave stata realizzata con successo!"
+
+#: Public/A2B_entity_did_import_analyse.php:391
+msgid "new DID's have been imported into your Database."
+msgstr "il nuovo DID &egrave stato importato nel Database."
+
+#: Public/templates/default/main.tpl:10
+msgid "HOME"
+msgstr "HOME"
+
+#: Public/templates/default/main.tpl:40
+msgid "LOGOUT"
+msgstr "USCITA"
+
+#: Public/templates/default/main.tpl:74
+#: Public/templates/default/main.tpl:105
+#: Public/templates/default/main.tpl:129
+#: Public/templates/default/main.tpl:257
+msgid "Add :: Search"
+msgstr "Aggiungi :: Cerca"
+
+#: Public/templates/default/main.tpl:75
+#: Public/templates/default/main.tpl:208
+#: Public/templates/default/main.tpl:454
+msgid "Import"
+msgstr "Importa"
+
+#: Public/templates/default/main.tpl:76
+msgid "VoIP Settings"
+msgstr "Impostazioni VoIP"
+
+#: Public/templates/default/main.tpl:77
+msgid "Caller-ID"
+msgstr "ID Chiamante:"
+
+#: Public/templates/default/main.tpl:78
+msgid "Credit Notification"
+msgstr "Notifica Credito"
+
+#: Public/templates/default/main.tpl:79
+#: Public/templates/default/main.tpl:258
+#: Public/templates/default/main.tpl:287
+msgid "Groups"
+msgstr "Gruppi"
+
+#: Public/templates/default/main.tpl:80
+msgid "Card series"
+msgstr "Serie Schede"
+
+#: Public/templates/default/main.tpl:81
+msgid "Speed Dial"
+msgstr "Numero Breve"
+
+#: Public/templates/default/main.tpl:82
+msgid "History"
+msgstr "Storico"
+
+#: Public/templates/default/main.tpl:106
+msgid "Signup URLs"
+msgstr "URL Iscrizioni"
+
+#: Public/templates/default/main.tpl:120
+msgid "ADMINS"
+msgstr "AMMINISTRATORI"
+
+#: Public/templates/default/main.tpl:130
+msgid "Access Control"
+msgstr "Controllo Accesso"
+
+#: Public/templates/default/main.tpl:152
+msgid "Customer Tickets"
+msgstr "Tickets Utenti"
+
+#: Public/templates/default/main.tpl:153
+msgid "Agent Tickets"
+msgstr "Tickets Agenti"
+
+#: Public/templates/default/main.tpl:154
+msgid "Ticket Components"
+msgstr "Componenti Tickets"
+
+#: Public/templates/default/main.tpl:155
+msgid "Support Boxes"
+msgstr "Quadro Supporto"
+
+#: Public/templates/default/main.tpl:168
+msgid "CALL REPORTS"
+msgstr "RAPP. CHIAMATE"
+
+#: Public/templates/default/main.tpl:177
+msgid "CDRs"
+msgstr "Rapporto Chiamate"
+
+#: Public/templates/default/main.tpl:178
+msgid "Call Count"
+msgstr "Conteggio Chiamate"
+
+#: Public/templates/default/main.tpl:181
+msgid "PNL"
+msgstr "PNL"
+
+#: Public/templates/default/main.tpl:182
+msgid "Compare Calls"
+msgstr "Confronta Chiamate"
+
+#: Public/templates/default/main.tpl:183
+msgid "Daily Traffic"
+msgstr "Traffico Giornaliero"
+
+#: Public/templates/default/main.tpl:184
+msgid "Monthly Traffic"
+msgstr "Traffico Mensile"
+
+#: Public/templates/default/main.tpl:197
+msgid "RATES"
+msgstr "TARIFFE"
+
+#: Public/templates/default/main.tpl:206
+msgid "Call Plan"
+msgstr "Piano di Chiamata"
+
+#: Public/templates/default/main.tpl:207
+msgid "RateCards"
+msgstr "Scheda Tariffe"
+
+#: Public/templates/default/main.tpl:209
+msgid "Merge"
+msgstr "Unisci"
+
+#: Public/templates/default/main.tpl:210
+msgid "Simulator"
+msgstr "Simulatore"
+
+#: Public/templates/default/main.tpl:211
+msgid "Rates"
+msgstr "Tariffe"
+
+#: Public/templates/default/main.tpl:224
+msgid "PROVIDERS"
+msgstr "FORNITORI"
+
+#: Public/templates/default/main.tpl:233
+msgid "Providers"
+msgstr "Fornitori"
+
+#: Public/templates/default/main.tpl:234
+msgid "Trunks"
+msgstr "Fasci"
+
+#: Public/templates/default/main.tpl:235
+msgid "Prefixes"
+msgstr "Prefissi"
+
+#: Public/templates/default/main.tpl:248
+msgid "INBOUND DID"
+msgstr "DID INGRESSO"
+
+#: Public/templates/default/main.tpl:260
+msgid "Import [CSV]"
+msgstr "Importa [CSV]"
+
+#: Public/templates/default/main.tpl:261
+msgid "Import [DIDX]"
+msgstr "Importa [DIDX]"
+
+#: Public/templates/default/main.tpl:262
+msgid "Usage"
+msgstr "Usati"
+
+#: Public/templates/default/main.tpl:263
+msgid "Billing"
+msgstr "Fatturazione"
+
+#: Public/templates/default/main.tpl:311
+msgid "Vouchers"
+msgstr "Coupons"
+
+#: Public/templates/default/main.tpl:312
+msgid "Customers Balance"
+msgstr "Bilancio Utenti"
+
+#: Public/templates/default/main.tpl:313
+#: Public/templates/default/main.tpl:322
+msgid "Transactions"
+msgstr "Transazioni"
+
+#: Public/templates/default/main.tpl:314
+msgid "Billings"
+msgstr "Fatturazioni"
+
+#: Public/templates/default/main.tpl:315
+#: Public/templates/default/main.tpl:323
+msgid "Refills"
+msgstr "Ricariche"
+
+#: Public/templates/default/main.tpl:316
+#: Public/templates/default/main.tpl:324
+msgid "Payments"
+msgstr "Pagamenti"
+
+#: Public/templates/default/main.tpl:317
+#: Public/templates/default/main.tpl:325
+msgid "E-Payment Log"
+msgstr "Log Pagamento-El."
+
+#: Public/templates/default/main.tpl:318
+msgid "Charges"
+msgstr "Addebiti"
+
+#: Public/templates/default/main.tpl:319
+msgid "Agents Balance"
+msgstr "Bilancio Agenti"
+
+#: Public/templates/default/main.tpl:320
+msgid "Commissions"
+msgstr "Commissioni"
+
+#: Public/templates/default/main.tpl:321
+msgid "Remittance Request"
+msgstr "Richiesta Rimesse"
+
+#: Public/templates/default/main.tpl:326
+msgid "Payment Methods"
+msgstr "Metodi di Pagamento"
+
+#: Public/templates/default/main.tpl:327
+msgid "Currency List"
+msgstr "Lista Valute"
+
+#: Public/templates/default/main.tpl:350
+msgid "Receipts"
+msgstr "Ricevute"
+
+#: Public/templates/default/main.tpl:351
+msgid "Invoices"
+msgstr "Fatture"
+
+#: Public/templates/default/main.tpl:376
+msgid "Details"
+msgstr "Dettagli"
+
+#: Public/templates/default/main.tpl:390
+msgid "RECUR SERVICE"
+msgstr "SERVIZI RICORR."
+
+#: Public/templates/default/main.tpl:399
+msgid "Account Service"
+msgstr "Servizi Ricorrenti"
+
+#: Public/templates/default/main.tpl:400
+msgid "Subscriptions Service"
+msgstr "Sottoscrizione Servizi"
+
+#: Public/templates/default/main.tpl:401
+msgid "Subscriptions SIGNUP"
+msgstr "Sottoscrizione abbonamenti"
+
+#: Public/templates/default/main.tpl:402
+msgid "Subscribers"
+msgstr "Abbonati"
+
+#: Public/templates/default/main.tpl:403
+msgid "AutoRefill Report"
+msgstr "Rapporto Autoricariche"
+
+#: Public/templates/default/main.tpl:427
+msgid "Server Group"
+msgstr "Gruppo Server"
+
+#: Public/templates/default/main.tpl:428
+msgid "Server"
+msgstr "Server"
+
+#: Public/templates/default/main.tpl:441
+msgid "CAMPAIGNS"
+msgstr "CAMPAGNE"
+
+#: Public/templates/default/main.tpl:451
+msgid "Config"
+msgstr "Configura"
+
+#: Public/templates/default/main.tpl:453
+msgid "Add Number"
+msgstr "Aggiungi Numero"
+
+#: Public/templates/default/main.tpl:477
+msgid "Alarms"
+msgstr "Allarmi"
+
+#: Public/templates/default/main.tpl:478
+msgid "Users Activity"
+msgstr "Attivit&agrave Utenti"
+
+#: Public/templates/default/main.tpl:479
+msgid "Database Backup"
+msgstr "Salvataggio Database"
+
+#: Public/templates/default/main.tpl:480
+msgid "Database Restore"
+msgstr "Ripristino Database"
+
+#: Public/templates/default/main.tpl:481
+msgid "MusicOnHold"
+msgstr "Musica d'attesa"
+
+#: Public/templates/default/main.tpl:482
+msgid "Upload File"
+msgstr "Carica File"
+
+#: Public/templates/default/main.tpl:483
+msgid "Watch Log files"
+msgstr "Guarda file di Log"
+
+#: Public/templates/default/main.tpl:484
+msgid "Archiving"
+msgstr "Archiviazione"
+
+#: Public/templates/default/main.tpl:488
+msgid "Monitoring"
+msgstr "Monitoraggio"
+
+#: Public/templates/default/main.tpl:511
+msgid "Mail templates"
+msgstr "Modelli Email"
+
+#: Public/templates/default/main.tpl:512
+msgid "Mass Mail"
+msgstr "Email multiple"
+
+#: Public/templates/default/main.tpl:535
+msgid "Global List"
+msgstr "Lista Globale"
+
+#: Public/templates/default/main.tpl:536
+msgid "Group List"
+msgstr "Lista Gruppi"
+
+#: Public/templates/default/main.tpl:537
+msgid "Add agi-conf"
+msgstr "Aggiungi agi-conf"
+
+#: Public/templates/default/main.tpl:538
+msgid "* Config Editor"
+msgstr "* Editor Config"
+
+#: Public/templates/default/main.tpl:540
+msgid "Asterisk GUI"
+msgstr ""
+
+#: Public/templates/default/index.tpl:50
+msgid "AUTHENTICATION"
+msgstr "AUTENTICAZIONE"
+
+#: Public/templates/default/index.tpl:58
+msgid "User"
+msgstr "Utente"
+
+#: Public/templates/default/index.tpl:62
+msgid "Password"
+msgstr "Password"
+
+#: Public/templates/default/index.tpl:91
+msgid "AUTHENTICATION REFUSED, please check your user/password!"
+msgstr "AUTENTICAZIONE RIFIUTATA, controlla il tuo utente/password!"
+
+#: Public/templates/default/index.tpl:93
+msgid "INACTIVE ACCOUNT, Please activate your account!"
+msgstr "ACCOUNT INATTIVO, Attiva il tuo account!"
+
+#: Public/templates/default/index.tpl:95
+msgid "BLOCKED ACCOUNT, Please contact the administrator!"
+msgstr "ACCOUNT BLOCCATO, contatta l'amministratore!"
+
+#: Public/A2B_currencies.php:90
+msgid "THE CURRENCY LIST IS BASED FROM YAHOO FINANCE"
+msgstr "LA LISTA VALUTE &Egrave BASATA SU YAHOO FINANCE"
+
+#: Public/A2B_currencies.php:91
+msgid "CLICK HERE TO UPDATE NOW"
+msgstr "CLICCA QUI PER AGGIORNARE ORA"
+
+#: Public/A2B_invoice_manage_payment.php:127
+msgid "TOTAL INVOICE EXCLUDE TVA"
+msgstr "TOTALE FATTURA ESCLUSA IVA"
+
+#: Public/A2B_invoice_manage_payment.php:138
+msgid "TOTAL INVOICE INCLUDE TVA"
+msgstr "TOTALE FATTURA COMPRESA IVA"
+
+#: Public/A2B_invoice_manage_payment.php:144
+msgid "TOTAL OF PAYMENTS ASSIGNED"
+msgstr "TOTALE DEI PAGAMENTI ASSEGNATI"
+
+#: Public/A2B_invoice_manage_payment.php:154
+msgid "PAYMENTS ASSIGNED"
+msgstr "PAGAMENTIASSEGNATI"
+
+#: Public/A2B_invoice_manage_payment.php:181
+msgid "CHANGE STATUS"
+msgstr "CAMBIA STATO"
+
+#: Public/CC_upload.php:126
+msgid "ERROR: your file type is not allowed"
+msgstr "ERRORE: tipo di file non permesso"
+
+#: Public/CC_upload.php:126
+msgid "or you didn't specify a file to upload"
+msgstr "o non hai specificato un file da caricare"
+
+#: Public/CC_upload.php:129
+msgid "ERROR: please get the file size less than"
+msgstr "ERRORE : prendere un file di grandezza inferiore a"
+
+#: Public/CC_upload.php:142
+msgid "No files selected!"
+msgstr "Non ci sono files selezionati!"
+
+#: Public/CC_upload.php:189
+msgid "File Upload"
+msgstr "Caricamento File"
+
+#: Public/CC_upload.php:191
+msgid "UPLOAD DIRECTORY"
+msgstr "DIRECTORY CARICAMENTO"
+
+#: Public/CC_upload.php:193
+msgid "Note that if you're using .wav, (eg, recorded with Microsoft Recorder) the file must be PCM Encoded, 16 Bits, at 8000Hz."
+msgstr "Se stai usando un .wav (es.: registrato con Registratore Microsoft), il file deve essere codificato PCM, 16 Bits, a 8000Hz."
+
+#: Public/CC_upload.php:194
+msgid "If the default path is not the correct edit the variables dir_store_mohmp3 and  dir_store_audio in the System Settings"
+msgstr "Se il percorso di default non &egrave corretto, modifica le variabili dir_stores_mohmp3 e dir_store_audio in Impostazioni Sistema "
+
+#: Public/CC_upload.php:211
+msgid "file types allowed"
+msgstr "tipo di file permesso"
+
+#: Public/CC_upload.php:223
+msgid "file size limit"
+msgstr "limite grandezza file"
+
+#: Public/CC_upload.php:242
+msgid "Upload"
+msgstr "Carica"
+
+#: Public/CC_upload.php:242
+msgid "Clear"
+msgstr "Annulla"
+
+#: Public/CC_upload.php:256
+msgid "FILE NAME"
+msgstr "NOME FILE"
+
+#: Public/CC_upload.php:257
+msgid "FILE TYPE"
+msgstr "TIPO DI FILE"
+
+#: Public/CC_upload.php:258
+msgid "FILE SIZE"
+msgstr "GRANDEZZA FILE"
+
+#: Public/CC_upload.php:259
+msgid "FUNCTIONS"
+msgstr "FUNZIONI"
+
+#: Public/CC_upload.php:265
+msgid "Error"
+msgstr "Errore"
+
+#: Public/CC_upload.php:265
+msgid "Cannot open directory"
+msgstr "Impossibile aprire la directory"
+
+#: Public/CC_upload.php:265
+msgid "Check if this directory exists and/or the permissions are properly set"
+msgstr "Verifica se la directory esiste e/o i permessi sono settati opportunamente"
+
+#: Public/CC_upload.php:287
+msgid "Are you sure to delete "
+msgstr "Sei sicuro di eliminare "
+
+#: Public/A2B_entity_config_generate_confirm.php:78
+msgid "Group Configurations"
+msgstr "Configurazioni Gruppo"
+
+#: Public/A2B_entity_config_generate_confirm.php:83
+#: Public/A2B_entity_config_generate_confirm.php:107
+msgid "Title"
+msgstr "Titolo"
+
+#: Public/A2B_entity_config_generate_confirm.php:102
+msgid "List of Configurations - We will create base on "
+msgstr "Lista delle Configurazioni - Creeremo sulla base "
+
+#: Public/A2B_entity_config_generate_confirm.php:108
+msgid "Key"
+msgstr "Chiave"
+
+#: Public/A2B_entity_config_generate_confirm.php:109
+msgid "Value"
+msgstr "Valore"
+
+#: Public/A2B_entity_config_generate_confirm.php:111
+#: Public/call-pnl-report.php:468
+msgid "Group"
+msgstr "Gruppo"
+
+#: Public/A2B_entity_config_generate_confirm.php:147
+msgid "CREATE"
+msgstr "CREA"
+
+#: Public/A2B_refill_info.php:129
+msgid "REFILLS LIST"
+msgstr "LISTA RICARICHE"
+
+#: Public/A2B_entity_payment_settings.php:58
+msgid "Record updated successfully"
+msgstr "Record aggiornato con successo"
+
+#: Public/A2B_entity_payment_settings.php:64
+msgid "Payment module ID not found"
+msgstr "ID del modulo di Pagamento non trovato"
+
+#: Public/A2B_entity_payment_settings.php:156
+msgid "CONFIGURATION"
+msgstr "CONFIGURAZIONE"
+
+#: Public/A2B_entity_card_multi.php:77
+msgid "- Choose a GROUP for the customers!"
+msgstr "- Scegli un gruppo per gli utenti!"
+
+#: Public/A2B_entity_card_multi.php:84
+msgid "- Choose a CALL PLAN for the customers!"
+msgstr "- Scegli un Piano di Chiamata per gli utenti!"
+
+#: Public/A2B_entity_card_multi.php:91
+msgid "- Choose a BALANCE (initial amount)  equal or higher than 0 for the customers!"
+msgstr "- Scegli un Saldo (importo iniziale) uguale o pi&ugrave di 0 per gli utenti!"
+
+#: Public/A2B_entity_card_multi.php:98
+msgid "- Choose an EXPIRATIONS DAYS  equal or higher than 0 for the customers!"
+msgstr "- Scegli un NUMERO GIORNI SCADENZA uguale o pi&ugrave di 0 per gli utenti!"
+
+#: Public/A2B_entity_card_multi.php:105
+msgid "- EXPIRATION DAY inserted is invalid, it must respect the date format YYYY-MM-DD HH:MM:SS (time is optional) !"
+msgstr "- I GIORNI DI SCADENZA inseriti non sono validi, evi rispettare il formato AAAA-MM-GG OO:MM:SS (l'ora &egrave opzionale) !"
+
+#: Public/A2B_entity_card_multi.php:112
+msgid "- Choose the number of customers that you want generate!"
+msgstr "- Scegli il numero di utenti che vuoi generare!"
+
+#: Public/A2B_entity_card_multi.php:241
+msgid "Length of card number :"
+msgstr "Lunghezza numero scheda :"
+
+#: Public/A2B_entity_card_multi.php:255
+msgid "Number of customers to create"
+msgstr "Numero di utenti da creare"
+
+#: Public/A2B_entity_card_multi.php:257
+msgid "(an high value will load your system!)"
+msgstr "(un valore alto caricher&agrave il sistema!)"
+
+#: Public/A2B_entity_card_multi.php:261
+msgid "Call plan"
+msgstr "Piano di Chiamata"
+
+#: Public/A2B_entity_card_multi.php:274
+msgid "Initial amount of credit"
+msgstr "Importo Iniziale di credito"
+
+#: Public/A2B_entity_card_multi.php:281
+msgid "Simultaneous access"
+msgstr "Accesso simultaneo"
+
+#: Public/A2B_entity_card_multi.php:298
+msgid "Card type"
+msgstr "Tipo di scheda"
+
+#: Public/A2B_entity_card_multi.php:306
+msgid "Credit Limit of postpay"
+msgstr "Limite Credito postpagato"
+
+#: Public/A2B_entity_card_multi.php:327
+msgid "Expiry Date"
+msgstr "Data Scadenza"
+
+#: Public/A2B_entity_card_multi.php:334
+msgid "Expiry days"
+msgstr "Giorni scadenza:"
+
+#: Public/A2B_entity_card_multi.php:346
+msgid "Create SIP/IAX Friends"
+msgstr "Crea SIP/IAX Friends"
+
+#: Public/A2B_entity_card_multi.php:354
+msgid "Customer group"
+msgstr "Gruppo utenti"
+
+#: Public/A2B_entity_card_multi.php:356
+msgid "Choose a group"
+msgstr "Scegli un gruppo"
+
+#: Public/A2B_entity_card_multi.php:366
+msgid "Discount"
+msgstr "Sconto"
+
+#: Public/A2B_entity_card_multi.php:375
+msgid "Serie"
+msgstr "Serie"
+
+#: Public/A2B_entity_card_multi.php:377
+msgid "Choose a Series"
+msgstr "Scegli una Serie"
+
+#: Public/A2B_entity_card_multi.php:386
+msgid "DID GROUP"
+msgstr "GRUPPO DID"
+
+#: Public/A2B_entity_card_multi.php:388
+msgid "Choose a DID Group"
+msgstr "Scegli un Gruppo DID"
+
+#: Public/CC_entity_service_details.php:57
+msgid "ACCOUNT DEDUCTED"
+msgstr "ACCOUNT DETRATTO"
+
+#: Public/CC_entity_service_details.php:107
+msgid "SERVICE NAME"
+msgstr "NOME SERVIZIO"
+
+#: Public/CC_entity_service_details.php:109
+msgid "EXECUTED "
+msgstr "ESEGUITO"
+
+#: Public/CC_entity_service_details.php:109
+msgid "TIME(S)"
+msgstr "TEMPO"
+
+#: Public/CC_entity_service_details.php:110
+msgid "Last executed date"
+msgstr "Ultima data esecuzione"
+
+#: Public/CC_entity_service_details.php:112
+msgid "TOTAL ACCOUNT DEDUCTED"
+msgstr "TOTALE ACCOUNT DETRATTO"
+
+#: Public/CC_entity_service_details.php:124
+msgid "SERVICE REPORT"
+msgstr "RAPPORTO SERVIZIO"
+
+#: Public/A2B_receipt_view.php:161
+msgid "RECEIPT"
+msgstr "RICEVUTA"
+
+#: Public/A2B_receipt_view.php:254
+msgid "Total :"
+msgstr "Totale"
+
+#: Public/A2B_log_activity_info.php:72
+msgid "LOG ACTIVITY INFO"
+msgstr "INFO ATTIVIT&Agrave LOG"
+
+#: Public/A2B_log_activity_info.php:85
+msgid "USER"
+msgstr "UTENTE"
+
+#: Public/A2B_log_activity_info.php:93
+msgid "LOG-LEVEL"
+msgstr "LIVELLO-LOG"
+
+#: Public/A2B_log_activity_info.php:152
+msgid "LOG LIST"
+msgstr "LISTA LOG"
+
+#: Public/call-pnl-report.php:259
+msgid "Report Type"
+msgstr "Tipo i Rapporto"
+
+#: Public/call-pnl-report.php:470
+msgid "Callplan"
+msgstr "Piano di Chiamata"
+
+#: Public/call-pnl-report.php:473
+msgid "Country"
+msgstr "Nazione"
+
+#: Public/call-pnl-report.php:475
+msgid "CallCount"
+msgstr "Conteggio Chiamate"
+
+#: Public/call-pnl-report.php:477
+#: Public/call-pnl-report.php:551
+msgid "Toll Free Cost"
+msgstr "Costo Numero Verde"
+
+#: Public/call-pnl-report.php:478
+msgid "Pay Phone Cost"
+msgstr "Costo Pagamento Telefonico"
+
+#: Public/call-pnl-report.php:479
+#: Public/call-pnl-report.php:553
+msgid "Origination Cost"
+msgstr "Costo Inizio"
+
+#: Public/call-pnl-report.php:480
+#: Public/call-pnl-report.php:554
+msgid "Credits"
+msgstr "Crediti"
+
+#: Public/call-pnl-report.php:481
+#: Public/call-pnl-report.php:555
+msgid "Total Cost"
+msgstr "Costo Totale"
+
+#: Public/call-pnl-report.php:482
+msgid "Toll Free Revenu"
+msgstr "Reddito Numero Verde"
+
+#: Public/call-pnl-report.php:483
+msgid "Pay Phone Revenu"
+msgstr "Reddito Telefono"
+
+#: Public/call-pnl-report.php:484
+msgid "Termination Revenu"
+msgstr "Reddito Teminazione"
+
+#: Public/call-pnl-report.php:485
+#: Public/call-pnl-report.php:559
+msgid "Extra Charges"
+msgstr "Importo supplementare"
+
+#: Public/call-pnl-report.php:486
+#: Public/call-pnl-report.php:560
+msgid "Total Revenue"
+msgstr "Reddito Totale"
+
+#: Public/call-pnl-report.php:487
+#: Public/call-pnl-report.php:561
+msgid "First Use"
+msgstr "Primo Uso"
+
+#: Public/call-pnl-report.php:488
+msgid "Avg Discount"
+msgstr "Media Sconto"
+
+#: Public/call-pnl-report.php:489
+#: Public/call-pnl-report.php:563
+msgid "Net Revenue"
+msgstr "Reddito Netto"
+
+#: Public/call-pnl-report.php:491
+#: Public/call-pnl-report.php:565
+msgid "Total Profit"
+msgstr "Profitto Totale"
+
+#: Public/call-pnl-report.php:517
+msgid "NO INFO!"
+msgstr "NO INFO!"
+
+#: Public/call-pnl-report.php:550
+msgid "Total Min"
+msgstr "Min. Totali"
+
+#: Public/call-pnl-report.php:552
+msgid "PayPhone Cost"
+msgstr "Costo Pagamento Telefono"
+
+#: Public/call-pnl-report.php:556
+msgid "Toll Free Revenue"
+msgstr "Reddito Numero Verde"
+
+#: Public/call-pnl-report.php:557
+msgid "Pay Phone Revenue"
+msgstr "Reddito Pagamento Telefono"
+
+#: Public/call-pnl-report.php:558
+msgid "Termination Revenue"
+msgstr "Reddito Terminazione"
+
+#: Public/call-pnl-report.php:562
+msgid "Average Discount"
+msgstr "Media Sconto"
+
+#: Public/A2B_payment_info.php:139
+msgid "PAYMENTS LIST"
+msgstr "LISTA PAGAMENTI"
+
+#: Public/A2B_entity_voucher.php:148
+msgid "SEARCH VOUCHERS"
+msgstr "CERCA COUPONS"
+
+#: Public/A2B_entity_voucher.php:178
+msgid "vouchers selected!"
+msgstr "coupons selezionati!"
+
+#: Public/A2B_entity_voucher.php:178
+msgid "Use the options below to batch update the selected vouchers."
+msgstr "Usa le opzioni sotto per aggiornare il lotto dei coupons selezionati."
+
+#: Public/A2B_entity_voucher.php:256
+msgid "BATCH UPDATE VOUCHER"
+msgstr "AGGIORNAMENTO LOTTO COUPON"
+
+#: Public/A2B_agent_home.php:51
+msgid "Home updated successfully"
+msgstr "Home aggiornata con successo"
+
+#: Public/A2B_agent_home.php:183
+msgid "MESSAGE : "
+msgstr "MESSAGGIO : "
+
+#: Public/A2B_agent_home.php:193
+msgid "TYPE : "
+msgstr "TIPO : "
+
+#: Public/A2B_agent_home.php:204
+msgid "logo "
+msgstr "logo "
+
+#: Public/A2B_agent_home.php:216
+msgid "Agent Home Page Preview"
+msgstr "Anteprima Pagina Home Agente"
+
+#: Public/A2B_agent_home.php:221
+msgid "No Message"
+msgstr "Nessun Messaggio"
+
+#: Public/A2B_agent_home.php:264
+msgid "Do you want delete this message ?"
+msgstr "Vuoi eliminare questo messaggio ?"
+
+#: Public/A2B_agent_info.php:72
+msgid "AGENT INFO"
+msgstr "INFO AGENTE"
+
+#: Public/A2B_receipt_edit.php:120
+msgid "RECEIPT: "
+msgstr "RICEVUTA"
+
+#: Public/A2B_receipt_edit.php:153
+msgid "PRICE"
+msgstr "PREZZO"
+
+#: Public/A2B_receipt_edit.php:222
+msgid "ADD RECEIPT ITEM "
+msgstr "AGGIUNGI ARTICOLO"
+
+#: Public/A2B_receipt_edit.php:240
+msgid "PRICE : "
+msgstr "PREZZO : "
+
diff --git a/common/agent_ui_locale/it_IT/LC_MESSAGES/messages.mo b/common/agent_ui_locale/it_IT/LC_MESSAGES/messages.mo
new file mode 100644
index 000000000..4911c981d
Binary files /dev/null and b/common/agent_ui_locale/it_IT/LC_MESSAGES/messages.mo differ
diff --git a/common/agent_ui_locale/it_IT/LC_MESSAGES/messages.po b/common/agent_ui_locale/it_IT/LC_MESSAGES/messages.po
new file mode 100644
index 000000000..f95aeb0db
--- /dev/null
+++ b/common/agent_ui_locale/it_IT/LC_MESSAGES/messages.po
@@ -0,0 +1,4717 @@
+# A2Billing Agent Panel - PO File.
+# Copyright (C) 2004-2009 A2BILLING
+# This file is distributed under the same license as the PACKAGE package.
+# ARESKI <areski@gmail.com>.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: A2Billing Agent : 1.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-02-18 00:40+0100\n"
+"PO-Revision-Date: 2012-02-19 15:57+0100\n"
+"Last-Translator: Corrado <corrado.bove@gmail.com>\n"
+"Language-Team: ARESKI <areski@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: lib/Class.Realtime.php:96
+#: Public/A2B_entity_card_multi.php:205
+#: Public/A2B_entity_card_multi.php:247
+msgid "Could not open buddy file"
+msgstr "Impossibile aprire il file buddy"
+
+#: lib/Class.Realtime.php:115
+#: Public/CC_generate_friend_file.php:117
+#: Public/CC_generate_friend_file.php:130
+#: Public/A2B_entity_card_multi.php:224
+#: Public/A2B_entity_card_multi.php:266
+msgid "Impossible to write to the file"
+msgstr "Impossibile scrivere sul file"
+
+#: lib/customer.smarty.php:103
+#: lib/admin.smarty.php:68
+#: lib/agent.smarty.php:69
+msgid "This option is not available on the Demo!"
+msgstr "Questa opzione non &egrave disponibile nella Demo!"
+
+#: lib/epayment/methods/iridium.php:607
+#: Public/checkout_success.php:71
+msgid "We are sorry your transaction is failed. Please try later or check your provided information."
+msgstr "Spiacenti, ma la transzione &egrave fallita. Si prega di riprovare più tardi o verificare le informazioni fornite"
+
+#: lib/epayment/methods/iridium.php:611
+#: Public/checkout_success.php:75
+msgid "We are sorry your transaction is denied. Please try later or check your provided information."
+msgstr "Spiacenti, ma la transazione &egrave stata negata. Si prega di riprovare più tardi o verificare le informazioni fornite"
+
+#: lib/epayment/methods/iridium.php:620
+#: Public/checkout_success.php:83
+msgid "Your transaction is in progress."
+msgstr "La transazione &egrave in corso"
+
+#: lib/epayment/methods/iridium.php:624
+#: Public/checkout_success.php:87
+msgid "Your transaction was successful."
+msgstr "Transazione effettuata con successo."
+
+#: lib/agent.defines.php:131
+msgid "Please select a payment method for your order."
+msgstr "Seleziona un metodo di pagamento per il tuo ordine"
+
+#: lib/agent.defines.php:133
+msgid "Credit Card"
+msgstr "Carta di Credito"
+
+#: lib/agent.defines.php:134
+#: lib/agent.defines.php:144
+msgid "Credit Card Test Info"
+msgstr "Test Info Carta di Credito"
+
+#: lib/agent.defines.php:134
+#: lib/agent.defines.php:144
+msgid "Expiry: Any"
+msgstr "Scadenza: Qualsiasi"
+
+#: lib/agent.defines.php:135
+msgid "Credit Card Type"
+msgstr "Tipo di Carta di Credito"
+
+#: lib/agent.defines.php:136
+msgid "Credit Card Owner"
+msgstr "Proprietario Carta di Credito"
+
+#: lib/agent.defines.php:137
+msgid "Credit Card Number"
+msgstr "Numero Carta di Credito"
+
+#: lib/agent.defines.php:138
+msgid "Credit Card Expiry Date"
+msgstr "Scadenza Carta di Credito"
+
+#: lib/agent.defines.php:139
+#: lib/agent.defines.php:152
+msgid "* The owner's name of the credit card must be at least"
+msgstr "* Il nome del proprietario della carta di credito deve essere almeno"
+
+#: lib/agent.defines.php:139
+#: lib/agent.defines.php:140
+#: lib/agent.defines.php:153
+msgid "characters"
+msgstr "caratteri"
+
+#: lib/agent.defines.php:140
+#: lib/agent.defines.php:153
+msgid "* The credit card number must be at least"
+msgstr "* Il numero della Carta di Credito deve essere almeno"
+
+#: lib/agent.defines.php:141
+msgid "Credit Card Error!"
+msgstr "Errore Carta di Cedito!"
+
+#: lib/agent.defines.php:145
+msgid "There has been an error processing your credit card"
+msgstr "Si &egrave verificato un errore durante l'elaborazione della carta di credito"
+
+#: lib/agent.defines.php:146
+msgid "Please check your credit card details!"
+msgstr "Verificare i dati della carta di credito!"
+
+#: lib/agent.defines.php:147
+msgid "Credit Card Owner:"
+msgstr "Proprietario Carta di Credito"
+
+#: lib/agent.defines.php:148
+msgid "Credit Card Number:"
+msgstr "Numero Carta di Credito"
+
+#: lib/agent.defines.php:149
+msgid "Credit Card Expiry Date:"
+msgstr "Scadenza Carta di Credito"
+
+#: lib/agent.defines.php:150
+msgid "Credit Card Checknumber:"
+msgstr "Numero di Controllo Carta di Credito"
+
+#: lib/agent.defines.php:151
+msgid "(located at the back of the credit card)"
+msgstr "(si trova nel retro della carta di credito)"
+
+#: lib/agent.defines.php:152
+msgid "characters."
+msgstr "caratteri"
+
+#: lib/support/classes/ticket.php:79
+#: lib/support/classes/ticket.php:233
+msgid "(AGENT)"
+msgstr "(AGENTE)"
+
+#: lib/support/classes/ticket.php:212
+msgid "(ADMINISTRATOR) "
+msgstr "(AMMINISTRATORE)"
+
+#: lib/support/classes/ticket.php:370
+#: lib/interface/constants.php:277
+#: lib/interface/constants.php:325
+#: lib/interface/constants.php:343
+msgid "NEW"
+msgstr "NUOVA"
+
+#: lib/support/classes/ticket.php:373
+msgid "FIXED"
+msgstr "FISSO"
+
+#: lib/support/classes/ticket.php:376
+msgid "REOPEN"
+msgstr "RIAPRE"
+
+#: lib/support/classes/ticket.php:379
+msgid "CLOSED"
+msgstr "CHIUSO"
+
+#: lib/support/classes/ticket.php:382
+msgid "INVALID"
+msgstr "INVALIDO"
+
+#: lib/Class.SOAP-function.php:851
+#: lib/Form/Class.FormBO.php:287
+#: Public/A2B_entity_card_multi.php:149
+msgid "CREATION CARD REFILL"
+msgstr "CREAZIONE RICARICA SCHEDA"
+
+#: lib/common.defines.php:90
+msgid "Address line 1:"
+msgstr "Indirizzo linea 1"
+
+#: lib/common.defines.php:91
+msgid "Address line 2:"
+msgstr "Indirizzo linea 2"
+
+#: lib/common.defines.php:92
+msgid "Address line 3:"
+msgstr "Indirizzo linea 3"
+
+#: lib/common.defines.php:93
+msgid "Postcode:"
+msgstr "Codice Postale"
+
+#: lib/common.defines.php:94
+msgid "Country:"
+msgstr "Nazione"
+
+#: lib/common.defines.php:95
+msgid "Telephone:"
+msgstr "Telefono"
+
+#: lib/common.defines.php:126
+msgid "This software has been created by Areski under AGPL licence. For futher information, feel free to contact me:"
+msgstr "Questo software &egrave; stato creato da Areski e distribuito sotto la licenza GPL. Per maggiori informazioni, contattarmi pure:"
+
+#: lib/common.defines.php:132
+msgid "A2Billing Portal"
+msgstr "Portale VoIP"
+
+#: lib/Form/Class.ViewHandler.inc.php:72
+msgid "Archiving All "
+msgstr "Archivia Tutto"
+
+#: lib/Form/Class.ViewHandler.inc.php:86
+msgid "Sort"
+msgstr "Ordinamento"
+
+#: lib/Form/Class.ViewHandler.inc.php:106
+msgid "Records"
+msgstr "Risultati"
+
+#: lib/Form/Class.ViewHandler.inc.php:136
+msgid "FILTER ON "
+msgstr "FILTRO SU"
+
+#: lib/Form/Class.ViewHandler.inc.php:153
+msgid "FILTER ON"
+msgstr "FILTRO SU"
+
+#: lib/Form/Class.ViewHandler.inc.php:166
+msgid "APPLY FILTER "
+msgstr "APPLICA FILTRO"
+
+#: lib/Form/Class.ViewHandler.inc.php:196
+msgid "ACTION"
+msgstr "AZIONE"
+
+#: lib/Form/Class.ViewHandler.inc.php:796
+msgid "DISPLAY"
+msgstr "VISUALIZZA"
+
+#: lib/Form/Class.ViewHandler.inc.php:825
+msgid "GO"
+msgstr "VAI"
+
+#: lib/Form/Class.ViewHandler.inc.php:829
+#: Public/call-log-customers.php:1344
+msgid "Export CSV"
+msgstr "Esporta CSV"
+
+#: lib/Form/Class.ViewHandler.inc.php:833
+#: Public/call-log-customers.php:1353
+msgid "Export XML"
+msgstr "Esporta XML"
+
+#: lib/Form/Class.FormHandler.EditForm.inc.php:223
+#: lib/Form/Class.FormHandler.EditForm.inc.php:399
+#: lib/Form/Class.FormHandler.EditForm.inc.php:780
+#: lib/Form/Class.FormHandler.DelForm.inc.php:161
+#: lib/Form/Class.FormHandler.AddForm.inc.php:158
+#: Public/call-log-customers.php:1077
+#: Public/card-history.php:401
+msgid "No data found !!!"
+msgstr "Nessun dato trovato!!!"
+
+#: lib/Form/Class.FormHandler.EditForm.inc.php:282
+msgid "LIST "
+msgstr "LISTA"
+
+#: lib/Form/Class.FormHandler.EditForm.inc.php:333
+#: lib/interface/constants.php:64
+#: Public/A2B_entity_card.php:484
+#: Public/A2B_entity_card_multi.php:436
+msgid "No"
+msgstr "No"
+
+#: lib/Form/Class.FormHandler.EditForm.inc.php:353
+#: lib/Form/Class.FormHandler.EditForm.inc.php:509
+#: lib/Form/Class.FormHandler.EditForm.inc.php:632
+msgid "Add a new"
+msgstr "Aggiungi un nuovo"
+
+#: lib/Form/Class.FormHandler.EditForm.inc.php:440
+#: lib/Form/Class.FormHandler.EditForm.inc.php:567
+msgid "LIST"
+msgstr "ELENCO"
+
+#: lib/Form/Class.FormBO.php:20
+msgid "This did is in use by customer id:"
+msgstr "Questo DID &egrave usato dall'id utente"
+
+#: lib/Form/Class.FormBO.php:318
+msgid "DELETION CARD REFILL"
+msgstr "CANCELLAZIONE RICARICA SCHEDA"
+
+#: lib/Form/Class.FormBO.php:337
+msgid "CORRECT COMMISSION AFTER CARD DELETED!"
+msgstr "CORREGGERE LA COMMISSIONE DOPO LA CANCELLAZIONE DELLA SCHEDA"
+
+#: lib/Form/Class.FormBO.php:363
+msgid "CREATION AGENT REFILL"
+msgstr "CREAZIONE RICARICA AGENTE"
+
+#: lib/Form/Class.FormBO.php:433
+msgid "SUBSCRIPTION INVOICE REMINDER"
+msgstr "SOTTOSCRIZIONE PROMEMORIA FATTURA"
+
+#: lib/Form/Class.FormBO.php:695
+msgid "SUMMARY OF CALLS"
+msgstr "SOMMARIO DELLE CHIAMATE"
+
+#: lib/Form/Class.FormBO.php:696
+msgid "Summary of the calls charged since the last billing"
+msgstr "Sintesi delle chiamate a pagamento dopo l'ultima fatturazione"
+
+#: lib/Form/Class.FormBO.php:713
+msgid "SUMMARY OF CHARGE"
+msgstr "SINTESI DI CARICA"
+
+#: lib/Form/Class.FormBO.php:715
+msgid "Summary of the charge charged since the last billing."
+msgstr "Sintesi dell'addebito effettuato dopo l'ultima fatturazione."
+
+#: lib/Form/Class.FormBO.php:721
+#: lib/Form/Class.FormBO.php:751
+msgid "CHARGE :"
+msgstr "ADDEBITO"
+
+#: lib/Form/Class.FormBO.php:740
+msgid "BILLING CHARGES"
+msgstr "FATTURE ADDEBITI"
+
+#: lib/Form/Class.FormBO.php:741
+msgid "This invoice is for some charges unpaid since the last billing."
+msgstr ""
+
+#: lib/Form/Class.FormBO.php:773
+msgid "BILLING POSTPAID"
+msgstr "FATTURAZIONE POST PAGATO"
+
+#: lib/Form/Class.FormBO.php:774
+msgid "Invoice for POSTPAID"
+msgstr "Fattura per POST PAGATO"
+
+#: lib/Form/Class.FormBO.php:836
+#: lib/Form/Class.FormBO.php:838
+#: lib/Form/Class.FormBO.php:945
+#: lib/Form/Class.FormBO.php:947
+#: Public/A2B_entity_card.php:282
+#: Public/form_data/FG_var_payment.inc:61
+msgid "REFILL"
+msgstr "RICARICA"
+
+#: lib/Form/Class.FormBO.php:840
+#: lib/Form/Class.FormBO.php:949
+msgid "Invoice for refill"
+msgstr "Fattura per ricarica"
+
+#: lib/Form/Class.FormBO.php:996
+msgid "AUTOMATICALY GENERATED COMMISSION!"
+msgstr "COMMISSIONI GENERATE AUTOMATICAMENTE"
+
+#: lib/Form/Class.SearchHandler.inc.php:24
+#: lib/Form/Class.SearchHandler.inc.php:100
+msgid "From :"
+msgstr "DA"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:195
+#: Public/call-last-month.php:94
+#: Public/call-log-customers.php:449
+#: Public/A2B_entity_paymentlog.php:104
+msgid "January"
+msgstr "Gennaio"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:196
+#: Public/call-last-month.php:94
+#: Public/call-log-customers.php:449
+#: Public/A2B_entity_paymentlog.php:104
+msgid "February"
+msgstr "Febbraio"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:197
+#: Public/call-last-month.php:94
+#: Public/call-log-customers.php:449
+#: Public/A2B_entity_paymentlog.php:104
+msgid "March"
+msgstr "Marzo"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:198
+#: Public/call-last-month.php:94
+#: Public/call-log-customers.php:449
+#: Public/A2B_entity_paymentlog.php:104
+msgid "April"
+msgstr "Aprile"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:199
+#: Public/call-last-month.php:94
+#: Public/call-log-customers.php:449
+#: Public/A2B_entity_paymentlog.php:104
+msgid "May"
+msgstr "Maggio"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:200
+#: Public/call-last-month.php:94
+#: Public/call-log-customers.php:449
+#: Public/A2B_entity_paymentlog.php:104
+msgid "June"
+msgstr "Giugno"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:201
+#: Public/call-last-month.php:94
+#: Public/call-log-customers.php:449
+#: Public/A2B_entity_paymentlog.php:104
+msgid "July"
+msgstr "Luglio"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:202
+#: Public/call-last-month.php:94
+#: Public/call-log-customers.php:449
+#: Public/A2B_entity_paymentlog.php:104
+msgid "August"
+msgstr "Agosto"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:203
+#: Public/call-last-month.php:94
+#: Public/call-log-customers.php:449
+#: Public/A2B_entity_paymentlog.php:104
+msgid "September"
+msgstr "Settembre"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:204
+#: Public/call-last-month.php:94
+#: Public/call-log-customers.php:449
+#: Public/A2B_entity_paymentlog.php:104
+msgid "October"
+msgstr "Ottobre"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:205
+#: Public/call-last-month.php:94
+#: Public/call-log-customers.php:449
+#: Public/A2B_entity_paymentlog.php:104
+msgid "November"
+msgstr "Novembre"
+
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:206
+#: Public/call-last-month.php:94
+#: Public/call-log-customers.php:449
+#: Public/A2B_entity_paymentlog.php:104
+msgid "December"
+msgstr "Dicembre"
+
+#: lib/Form/Class.SearchHandler.inc.php:57
+#: lib/Form/Class.SearchHandler.inc.php:131
+msgid "To :"
+msgstr "A"
+
+#: lib/Form/Class.SearchHandler.inc.php:213
+#: Public/call-last-month.php:133
+#: Public/call-log-customers.php:593
+#: Public/call-log-customers.php:645
+#: Public/call-log-customers.php:698
+msgid "Exact"
+msgstr "Esatto"
+
+#: lib/Form/Class.SearchHandler.inc.php:214
+#: Public/call-last-month.php:134
+#: Public/call-log-customers.php:602
+#: Public/call-log-customers.php:654
+#: Public/call-log-customers.php:707
+msgid "Begins with"
+msgstr "Inizia per"
+
+#: lib/Form/Class.SearchHandler.inc.php:215
+#: Public/call-last-month.php:135
+#: Public/call-log-customers.php:611
+#: Public/call-log-customers.php:663
+#: Public/call-log-customers.php:716
+msgid "Contains"
+msgstr "Contiene"
+
+#: lib/Form/Class.SearchHandler.inc.php:216
+#: Public/call-last-month.php:136
+#: Public/call-log-customers.php:620
+#: Public/call-log-customers.php:672
+#: Public/call-log-customers.php:725
+msgid "Ends with"
+msgstr "Finisce per"
+
+#: lib/Form/Class.SearchHandler.inc.php:327
+msgid "There is"
+msgstr "C'&egrave"
+
+#: lib/Form/Class.SearchHandler.inc.php:327
+msgid "selected, use the option below if you are willing to make a batch updated of the selected cards."
+msgstr "selezionata, utilizzare l'opzione qui sotto se siete disposti a fare un lotto aggiornato delle carte selezionate"
+
+#: lib/Form/Class.SearchHandler.inc.php:356
+#: Public/templates/default/main.tpl:128
+msgid "RATECARD"
+msgstr "TARIFFE"
+
+#: lib/Form/Class.SearchHandler.inc.php:375
+msgid "BUYRATE"
+msgstr "TARIFFA ACQUISTO"
+
+#: lib/Form/Class.SearchHandler.inc.php:378
+#: lib/Form/Class.SearchHandler.inc.php:393
+#: lib/Form/Class.SearchHandler.inc.php:409
+#: lib/Form/Class.SearchHandler.inc.php:425
+#: lib/Form/Class.SearchHandler.inc.php:441
+#: lib/Form/Class.SearchHandler.inc.php:457
+#: lib/Form/Class.SearchHandler.inc.php:473
+#: lib/Form/Class.SearchHandler.inc.php:489
+#: lib/Form/Class.SearchHandler.inc.php:505
+msgid "Equal"
+msgstr "Uguale"
+
+#: lib/Form/Class.SearchHandler.inc.php:379
+#: lib/Form/Class.SearchHandler.inc.php:394
+#: lib/Form/Class.SearchHandler.inc.php:410
+#: lib/Form/Class.SearchHandler.inc.php:426
+#: lib/Form/Class.SearchHandler.inc.php:442
+#: lib/Form/Class.SearchHandler.inc.php:458
+#: lib/Form/Class.SearchHandler.inc.php:474
+#: lib/Form/Class.SearchHandler.inc.php:490
+#: lib/Form/Class.SearchHandler.inc.php:507
+msgid "Add"
+msgstr "Aggiungi"
+
+#: lib/Form/Class.SearchHandler.inc.php:380
+#: lib/Form/Class.SearchHandler.inc.php:395
+#: lib/Form/Class.SearchHandler.inc.php:411
+#: lib/Form/Class.SearchHandler.inc.php:427
+#: lib/Form/Class.SearchHandler.inc.php:443
+#: lib/Form/Class.SearchHandler.inc.php:459
+#: lib/Form/Class.SearchHandler.inc.php:475
+#: lib/Form/Class.SearchHandler.inc.php:491
+#: lib/Form/Class.SearchHandler.inc.php:508
+msgid "Substract"
+msgstr "Sottrarre"
+
+#: lib/Form/Class.SearchHandler.inc.php:390
+msgid "BUYRATEINITBLOCK"
+msgstr "TARIFFA ACQUISTO INIZIALE"
+
+#: lib/Form/Class.SearchHandler.inc.php:406
+msgid "BUYRATEINCREMENT"
+msgstr "TARIFFA ACQUISTO INCREMENTO"
+
+#: lib/Form/Class.SearchHandler.inc.php:422
+#: Public/form_data/FG_var_def_ratecard.inc:120
+msgid "RATE INITIAL"
+msgstr "TARIFFA INIZIALE"
+
+#: lib/Form/Class.SearchHandler.inc.php:438
+msgid "MIN DURATION"
+msgstr "DURATA MINIMA"
+
+#: lib/Form/Class.SearchHandler.inc.php:454
+msgid "BILLINGBLOCK"
+msgstr "BLOCCO FATTURAZIONE"
+
+#: lib/Form/Class.SearchHandler.inc.php:470
+msgid "CONNECTCHARGE"
+msgstr "COSTO CONNESSIONE"
+
+#: lib/Form/Class.SearchHandler.inc.php:486
+msgid "DISCONNECTCHARGE"
+msgstr "COSTO DISCONNESSIONE"
+
+#: lib/Form/Class.SearchHandler.inc.php:502
+msgid "DISCONNECT CHARGE THRESHOLD"
+msgstr "SOGLIA DISCONNESSIONE"
+
+#: lib/Form/Class.SearchHandler.inc.php:520
+msgid " BATCH UPDATE RATECARD "
+msgstr "AGGIORNAMENTO LOTTO TARIFFE"
+
+#: lib/Form/Class.FormHandler.DelForm.inc.php:46
+#: Public/checkout_success.php:56
+msgid "Message"
+msgstr "Messaggio"
+
+#: lib/Form/Class.FormHandler.DelForm.inc.php:53
+msgid "You have "
+msgstr "Tu hai"
+
+#: lib/Form/Class.FormHandler.DelForm.inc.php:208
+msgid "Remove this "
+msgstr "Rimuovi questo"
+
+#: lib/Form/Class.FormHandler.inc.php:545
+msgid "No data found!"
+msgstr "Nessun dato trovato!"
+
+#: lib/Form/Class.FormHandler.inc.php:546
+msgid "DIRECTORY"
+msgstr "DIRECTORY"
+
+#: lib/Form/Class.FormHandler.inc.php:547
+msgid "list"
+msgstr "lista"
+
+#: lib/Form/Class.FormHandler.inc.php:548
+#: lib/Form/Class.FormHandler.inc.php:630
+msgid "Define criteria to make a precise search"
+msgstr "Definisci il criterio per una precisa ricerca"
+
+#: lib/Form/Class.FormHandler.inc.php:549
+msgid "You can browse through our"
+msgstr "&Egrave possibile navigare attraverso il nostro"
+
+#: lib/Form/Class.FormHandler.inc.php:549
+msgid "and modify their different properties"
+msgstr "e modificarne le diverse propriet&agrave"
+
+#: lib/Form/Class.FormHandler.inc.php:550
+msgid "Delete this record"
+msgstr "Cancella questo record"
+
+#: lib/Form/Class.FormHandler.inc.php:551
+msgid "Edit this record"
+msgstr "Edita questo record"
+
+#: lib/Form/Class.FormHandler.inc.php:552
+msgid "The document has been created correctly. Now, you can define the different tariff that you want to associate."
+msgstr "Il documento &egrave stato creato correttamente. Ora, puoi definire le diverse tariffe che si desidera associare"
+
+#: lib/Form/Class.FormHandler.inc.php:553
+#: Public/form_data/FG_var_card.inc:944
+#: Public/form_data/FG_var_moneysituation.inc:77
+msgid "You can modify, through the following form, the different properties of your"
+msgstr "Puoi modificare, attraverso il seguente modulo, le differenti proprietà della tua"
+
+#: lib/Form/Class.FormHandler.inc.php:554
+#: Public/form_data/FG_var_card.inc:945
+#: Public/form_data/FG_var_def_ratecard.inc:129
+#: Public/form_data/FG_var_moneysituation.inc:78
+#: Public/form_data/FG_var_friend.inc:925
+#: Public/form_data/FG_var_ticket.inc:172
+#: Public/form_data/FG_var_ticket_agent.inc:90
+#: Public/form_data/FG_var_callerid.inc:121
+msgid "If you really want remove this"
+msgstr "Vuoi realmente eliminare questo"
+
+#: lib/Form/Class.FormHandler.inc.php:554
+msgid "Click on the delete button."
+msgstr "Clicca sul tasto 'DELETE'"
+
+#: lib/Form/Class.FormHandler.inc.php:555
+msgid "One"
+msgstr "Uno"
+
+#: lib/Form/Class.FormHandler.inc.php:555
+msgid "has been deleted!"
+msgstr "&egrave stato eliminato"
+
+#: lib/Form/Class.FormHandler.inc.php:557
+#: Public/form_data/FG_var_card.inc:946
+#: Public/form_data/FG_var_def_ratecard.inc:130
+#: Public/form_data/FG_var_moneysituation.inc:79
+#: Public/form_data/FG_var_friend.inc:926
+#: Public/form_data/FG_var_ticket.inc:173
+#: Public/form_data/FG_var_ticket_agent.inc:91
+#: Public/form_data/FG_var_callerid.inc:122
+msgid "you can add easily a new"
+msgstr "puoi aggiungere facilmente un nuovo"
+
+#: lib/Form/Class.FormHandler.inc.php:557
+#: Public/form_data/FG_var_card.inc:946
+#: Public/form_data/FG_var_def_ratecard.inc:130
+#: Public/form_data/FG_var_moneysituation.inc:79
+#: Public/form_data/FG_var_friend.inc:926
+#: Public/form_data/FG_var_ticket.inc:173
+#: Public/form_data/FG_var_ticket_agent.inc:91
+#: Public/form_data/FG_var_callerid.inc:122
+msgid "Fill the following fields and confirm by clicking on the button add."
+msgstr "Riempi i seguenti campi e conferma cliccando sul tasto agg."
+
+#: lib/Form/Class.FormHandler.inc.php:558
+msgid "Add a"
+msgstr "Aggungi un"
+
+#: lib/Form/Class.FormHandler.inc.php:558
+msgid "now."
+msgstr "ora"
+
+#: lib/Form/Class.FormHandler.inc.php:559
+#: lib/Form/Class.FormHandler.inc.php:560
+#: Public/form_data/FG_var_card.inc:950
+#: Public/form_data/FG_var_def_ratecard.inc:134
+#: Public/form_data/FG_var_friend.inc:930
+#: Public/form_data/FG_var_ticket.inc:177
+#: Public/form_data/FG_var_ticket_agent.inc:95
+#: Public/form_data/FG_var_callerid.inc:132
+msgid "Your new"
+msgstr "Tuo nuovo"
+
+#: lib/Form/Class.FormHandler.inc.php:559
+msgid "has been inserted.<br>"
+msgstr "&egrave stato inserito<br>"
+
+#: lib/Form/Class.FormHandler.inc.php:560
+msgid "hasn't been inserted."
+msgstr "Non &egrave stato inserito"
+
+#: lib/Form/Class.FormHandler.inc.php:561
+msgid "You cannot choose more than one !"
+msgstr "Non puoi seceglierne pi&ugrave di uno!"
+
+#: lib/Form/Class.FormHandler.inc.php:563
+msgid "Are you sure to delete all records connected to this instance."
+msgstr "Sei sicuro di voler eliminare tutti i record collegati a questa istanza."
+
+#: lib/Form/Class.FormHandler.inc.php:565
+#: lib/Form/Class.FormHandler.inc.php:567
+msgid "CONFIRM DATA"
+msgstr "CONFERMA DATI"
+
+#: lib/Form/Class.FormHandler.inc.php:566
+msgid "DELETE"
+msgstr "ELIMINA"
+
+#: lib/Form/Class.FormHandler.inc.php:619
+#: lib/Form/Class.FormHandler.inc.php:837
+msgid "Delete this "
+msgstr "Elimina questo"
+
+#: lib/Form/Class.FormHandler.inc.php:620
+#: lib/Form/Class.FormHandler.inc.php:831
+msgid "Edit this "
+msgstr "Edita questo"
+
+#: lib/Form/Class.FormHandler.inc.php:651
+msgid "INSERTED"
+msgstr "INSERITO"
+
+#: lib/Form/Class.FormHandler.inc.php:652
+msgid "ENABLE"
+msgstr "ABILITA"
+
+#: lib/Form/Class.FormHandler.inc.php:653
+msgid "DISABLE"
+msgstr "DISABILITA"
+
+#: lib/Form/Class.FormHandler.inc.php:654
+msgid "FREE"
+msgstr "GRATIS"
+
+#: lib/Form/Class.FormHandler.inc.php:806
+#: lib/Form/Class.FormHandler.inc.php:808
+msgid "You can browse through our "
+msgstr "&Egrave possibile navigare attraverso il nostro"
+
+#: lib/Form/Class.FormHandler.inc.php:806
+#: lib/Form/Class.FormHandler.inc.php:808
+msgid " and modify their different properties<br>"
+msgstr " e modificarne le diverse propriet&agrave<br>"
+
+#: lib/Form/Class.FormHandler.inc.php:976
+msgid "(at least 3 characters)"
+msgstr "(almeno 3 caratteri)"
+
+#: lib/Form/Class.FormHandler.inc.php:980
+msgid "(must match email structure. Example : name@domain.com)"
+msgstr "(deve corrispondere la struttura email Es.: nome@dominio.com)"
+
+#: lib/Form/Class.FormHandler.inc.php:984
+msgid "(at least 5 successive characters appear at the end of this string)"
+msgstr "(almeno 5 caratteri successivi appaiono alla fine di questa stringa)"
+
+#: lib/Form/Class.FormHandler.inc.php:988
+msgid "(at least 4 characters)"
+msgstr "(almeno 4 caratteri)"
+
+#: lib/Form/Class.FormHandler.inc.php:992
+msgid "(number format)"
+msgstr "(formato numerico)"
+
+#: lib/Form/Class.FormHandler.inc.php:1000
+msgid "(only number with more that 8 digits)"
+msgstr "(solo numero con pi&ugrave di 8 cifre)"
+
+#: lib/Form/Class.FormHandler.inc.php:1004
+msgid "(at least 8 digits using . or - or the space key)"
+msgstr "(almeno 8 cifre usando . o - oppure il tasto spazio)"
+
+#: lib/Form/Class.FormHandler.inc.php:1008
+msgid "network adress format"
+msgstr "indirizzo in formato rete"
+
+#: lib/Form/Class.FormHandler.inc.php:1012
+msgid "at least 1 character"
+msgstr "almeno 1 carattere"
+
+#: lib/Form/Class.FormHandler.inc.php:1020
+msgid "(AT LEAST 2 CARACTERS)"
+msgstr "(ALMENO 2 CARATTERI)"
+
+#: lib/Form/Class.FormHandler.inc.php:1024
+msgid "(NUMBER FORMAT WITH/WITHOUT DECIMAL, use '.' for decimal)"
+msgstr "(FORMATO NUMERO CON/SENZA DECIMALI, usa '.' per i decimali)"
+
+#: lib/Form/Class.FormHandler.inc.php:1040
+msgid "You must write something."
+msgstr "Devi scrivere qualcosa"
+
+#: lib/Form/Class.FormHandler.inc.php:1044
+msgid "8 characters alphanumeric"
+msgstr "8 caratteri alfanumerici"
+
+#: lib/Form/Class.FormHandler.inc.php:1051
+msgid "(at least 6 Alphanumeric characters)"
+msgstr "(almeno 6 caratteri Alfanumerici)"
+
+#: lib/Form/Class.FormHandler.inc.php:1059
+#, php-format
+msgid "(PERCENT FORMAT WITH/WITHOUT DECIMAL, use '.' for decimal and don't use '%' character. e.g.: 12.4 )"
+msgstr "(FORMATO PERCENTUALE CON/SENZA DECIMALI, usa '.' per i decimali e non usare il carattere '%'. es.: 12.4 )"
+
+#: lib/Form/Class.FormHandler.inc.php:1737
+msgid "error deletion"
+msgstr "errore di cancellazione"
+
+#: lib/Form/Class.FormHandler.inc.php:1864
+msgid "ERROR_DUPLICATION"
+msgstr "ERRORE_DUPLICAZIONE"
+
+#: lib/Form/Class.FormHandler.inc.php:1950
+msgid "Done"
+msgstr "Fatto"
+
+#: lib/Form/Class.FormHandler.inc.php:1990
+msgid "Export Call Plan with LCR"
+msgstr "Esporta il Piano di Chiamata con MCR"
+
+#: lib/Form/Class.FormHandler.inc.php:1996
+msgid "Choose a call plan"
+msgstr "Seleziona una Tariffa"
+
+#: lib/Form/Class.FormHandler.inc.php:2042
+msgid "THE CURRENT RATECARD"
+msgstr "TARIFFA ATTUALE"
+
+#: lib/Form/Class.FormHandler.inc.php:2053
+msgid "R A T E C A R D"
+msgstr "T A R I F F A"
+
+#: lib/Form/Class.FormHandler.inc.php:2059
+msgid "Choose a ratecard"
+msgstr "Seleziona una Tariffa"
+
+#: lib/Form/Class.FormHandler.AddForm.inc.php:211
+msgid "Create a new "
+msgstr "Crea una nuova"
+
+#: lib/Misc.php:523
+#: lib/Class.Notification.php:140
+msgid "UNKNOWN"
+msgstr "SCONOSCIUTA"
+
+#: lib/Misc.php:722
+msgid "First"
+msgstr "Prima"
+
+#: lib/Misc.php:723
+msgid "Prev"
+msgstr "Prec"
+
+#: lib/Misc.php:724
+#: Public/call-log-customers.php:1100
+msgid "Next"
+msgstr "Succ"
+
+#: lib/Misc.php:725
+msgid "Last"
+msgstr "Ultima"
+
+#: lib/Misc.php:815
+msgid "File size is greater than allowed limit."
+msgstr "La grandezza del file &egrave maggiore del limite permesso"
+
+#: lib/Misc.php:818
+msgid "You did not upload anything!"
+msgstr "Non hai caricato niente!"
+
+#: lib/Misc.php:821
+msgid "Failed to upload the file, The file you uploaded may not exist on disk."
+msgstr "Caricamento del file fallito. Il file caricato pu&ograve non esistere nel disco."
+
+#: lib/Misc.php:824
+msgid "file type is not allowed"
+msgstr "tipo di file non permesso"
+
+#: lib/Misc.php:1130
+msgid "Can't find our base_currency in cc_currencies."
+msgstr "Non posso trovare la nostra base_currency in cc_currencies"
+
+#: lib/Misc.php:1130
+#: lib/Misc.php:1153
+#: lib/Misc.php:1157
+#: lib/Misc.php:1167
+msgid "Currency update ABORTED."
+msgstr "Aggiornamento valuta ABORTITO"
+
+#: lib/Misc.php:1153
+msgid "The CSV file doesn't contain all the currencies we requested."
+msgstr "Il file CSV non contiene tutte valute da noi richieste"
+
+#: lib/Misc.php:1157
+msgid "At least one of the entries in the CSV file isn't a number."
+msgstr "Almeno una delle voci nel file CSV non &egrave un numero"
+
+#: lib/Misc.php:1167
+msgid "Our base_currency seems to be worthless."
+msgstr "La nostra base_currency sembra essere inutile."
+
+#: lib/Misc.php:1205
+msgid "Success! All currencies are now updated."
+msgstr "Successo! Tutte le valute sono ora aggiornate"
+
+#: lib/Misc.php:1496
+msgid "GO TO CUSTOMER ACCOUNT"
+msgstr "VAI ALL'ACCOUNT UTENTE"
+
+#: lib/interface/constants.php:15
+msgid "INFO"
+msgstr "INFO"
+
+#: lib/interface/constants.php:16
+msgid "SUCCESS"
+msgstr "SUCCESSO"
+
+#: lib/interface/constants.php:17
+msgid "WARNING"
+msgstr "ATTENZIONE"
+
+#: lib/interface/constants.php:18
+#: lib/interface/constants.php:72
+msgid "ERROR"
+msgstr "ERRORE"
+
+#: lib/interface/constants.php:24
+#: lib/interface/constants.php:38
+msgid "ENGLISH"
+msgstr "INGLESE"
+
+#: lib/interface/constants.php:25
+#: lib/interface/constants.php:39
+msgid "SPANISH"
+msgstr "SPAGNOLO"
+
+#: lib/interface/constants.php:26
+#: lib/interface/constants.php:40
+msgid "FRENCH"
+msgstr "FRANCESE"
+
+#: lib/interface/constants.php:27
+#: lib/interface/constants.php:41
+msgid "RUSSIAN"
+msgstr "RUSSO"
+
+#: lib/interface/constants.php:28
+#: lib/interface/constants.php:42
+msgid "BRAZILIAN"
+msgstr "BRASILIANO"
+
+#: lib/interface/constants.php:29
+#: lib/interface/constants.php:43
+msgid "ITALIAN"
+msgstr "ITALIANO"
+
+#: lib/interface/constants.php:48
+msgid "NONE RESTRICTION USED"
+msgstr "NESSUNA LIMITAZIONE USATA"
+
+#: lib/interface/constants.php:49
+msgid "CAN'T CALL RESTRICTED NUMBERS"
+msgstr "IMPOSSIBILE CHIAMARE NUMERI LIMITATI"
+
+#: lib/interface/constants.php:50
+msgid "CAN ONLY CALL RESTRICTED NUMBERS"
+msgstr "&Egrave POSSIBILE CHIAMARE SOLO NUMERI LIMITATI"
+
+#: lib/interface/constants.php:55
+#: Public/call-last-month.php:64
+#: Public/call-log-customers.php:375
+#: Public/templates/default/main.tpl:46
+msgid "CUSTOMERS"
+msgstr "UTENTI"
+
+#: lib/interface/constants.php:56
+msgid "AGENTS"
+msgstr "AGENTI"
+
+#: lib/interface/constants.php:57
+msgid "CUSTOMERS AND AGENTS"
+msgstr "UTENTI ED AGENTI"
+
+#: lib/interface/constants.php:63
+#: Public/A2B_entity_card.php:484
+#: Public/A2B_entity_card_multi.php:436
+msgid "Yes"
+msgstr "Si"
+
+#: lib/interface/constants.php:70
+msgid "PENDING"
+msgstr "IN ATTESA"
+
+#: lib/interface/constants.php:71
+msgid "SENT"
+msgstr "INVIATA"
+
+#: lib/interface/constants.php:88
+msgid "Inactive"
+msgstr "Inattivo"
+
+#: lib/interface/constants.php:89
+msgid "Active"
+msgstr "Attivo"
+
+#: lib/interface/constants.php:110
+msgid "Fix per month + dialoutrate"
+msgstr "Fisso per mese + chiamate in uscita"
+
+#: lib/interface/constants.php:111
+msgid "Fix per month"
+msgstr "Fisso per mese"
+
+#: lib/interface/constants.php:112
+msgid "Only dialout rate"
+msgstr "Solo chiamate in uscita"
+
+#: lib/interface/constants.php:113
+#: lib/interface/constants.php:122
+msgid "Free"
+msgstr "Gratis"
+
+#: lib/interface/constants.php:119
+msgid "Fix+Dial"
+msgstr "Fisso+Chiamate"
+
+#: lib/interface/constants.php:120
+msgid "Fix"
+msgstr "Fisso"
+
+#: lib/interface/constants.php:121
+msgid "Dial"
+msgstr "Chiamate"
+
+#: lib/interface/constants.php:128
+#: lib/interface/constants.php:375
+#: Public/A2B_entity_card.php:415
+#: Public/A2B_entity_card_multi.php:377
+msgid "INDIVIDUAL ACCESS"
+msgstr "ACCESSO INDIVIDUALE"
+
+#: lib/interface/constants.php:129
+#: lib/interface/constants.php:374
+#: Public/A2B_entity_card.php:416
+#: Public/form_data/FG_var_card.inc:611
+#: Public/A2B_entity_card_multi.php:378
+msgid "SIMULTANEOUS ACCESS"
+msgstr "ACCESSI SIMULTANEI"
+
+#: lib/interface/constants.php:135
+#: Public/A2B_entity_card_multi.php:394
+msgid "PREPAID CARD"
+msgstr "SCHEDA PREPAGATA"
+
+#: lib/interface/constants.php:136
+msgid "POSTPAID CARD"
+msgstr "SCHEDA POSTAPAGATA"
+
+#: lib/interface/constants.php:146
+#: Public/A2B_entity_card_multi.php:406
+msgid "NO EXPIRATION"
+msgstr "NESSUNA SCADENZA"
+
+#: lib/interface/constants.php:147
+#: lib/interface/constants.php:386
+#: Public/A2B_entity_card.php:444
+#: Public/A2B_entity_card_multi.php:407
+msgid "EXPIRE DATE"
+msgstr "DATA SCADENZA"
+
+#: lib/interface/constants.php:148
+#: lib/interface/constants.php:387
+#: Public/A2B_entity_card.php:445
+#: Public/A2B_entity_card_multi.php:408
+msgid "EXPIRE DAYS SINCE FIRST USE"
+msgstr "SCADENZA GIORNI DAL PRIMO UTILIZZO"
+
+#: lib/interface/constants.php:149
+#: lib/interface/constants.php:388
+#: Public/A2B_entity_card.php:446
+#: Public/A2B_entity_card_multi.php:409
+msgid "EXPIRE DAYS SINCE CREATION"
+msgstr "GIORNI DI SCADENZA DALLA CREAZIONE"
+
+#: lib/interface/constants.php:156
+#: lib/interface/constants.php:167
+msgid "OPEN"
+msgstr "APERTO"
+
+#: lib/interface/constants.php:157
+#: lib/interface/constants.php:168
+msgid "CLOSE"
+msgstr "CHIUSO"
+
+#: lib/interface/constants.php:175
+#: lib/interface/constants.php:189
+#: lib/interface/constants.php:212
+msgid "UNPAID"
+msgstr "DA PAGARE"
+
+#: lib/interface/constants.php:176
+#: lib/interface/constants.php:188
+#: lib/interface/constants.php:215
+msgid "PAID"
+msgstr "PAGATO"
+
+#: lib/interface/constants.php:186
+msgid "FIRSTUSE"
+msgstr "PRIMO USO"
+
+#: lib/interface/constants.php:187
+msgid "BILLED"
+msgstr "FATTURATA"
+
+#: lib/interface/constants.php:213
+msgid "SENT-UNPAID"
+msgstr "INVIATA-DA PAGARE"
+
+#: lib/interface/constants.php:214
+msgid "SENT-PAID"
+msgstr "INVIATA-PAGATA"
+
+#: lib/interface/constants.php:222
+msgid "New"
+msgstr "Nuova"
+
+#: lib/interface/constants.php:223
+msgid "Proceed"
+msgstr "Procedere"
+
+#: lib/interface/constants.php:224
+msgid "In Process"
+msgstr "In Procedimento"
+
+#: lib/interface/constants.php:230
+msgid "Failed"
+msgstr "Fallito"
+
+#: lib/interface/constants.php:231
+msgid "Successful"
+msgstr "Successo"
+
+#: lib/interface/constants.php:232
+msgid "Not Sent"
+msgstr "Non Inviato"
+
+#: lib/interface/constants.php:238
+msgid "Unlimited calls"
+msgstr "Chiamate illimitate"
+
+#: lib/interface/constants.php:239
+msgid "Number of Free calls"
+msgstr "Numero di chiamate gratuite"
+
+#: lib/interface/constants.php:240
+msgid "Free seconds"
+msgstr "Secondi gratuiti"
+
+#: lib/interface/constants.php:246
+msgid "Monthly"
+msgstr "Mensile"
+
+#: lib/interface/constants.php:247
+msgid "Weekly"
+msgstr "Settimanale"
+
+#: lib/interface/constants.php:253
+msgid "LCR : According to the buyer price"
+msgstr "MCR : Secondo il prezzo d'acquisto"
+
+#: lib/interface/constants.php:254
+msgid "LCD : According to the seller price"
+msgstr "MCC : Secondo il prezzo di vendita"
+
+#: lib/interface/constants.php:260
+msgid "LCR : buyer price"
+msgstr "MCR : costo acquisto"
+
+#: lib/interface/constants.php:261
+msgid "LCD : seller price"
+msgstr "MCC : prezzo d'acquisto"
+
+#: lib/interface/constants.php:267
+msgid "NONE"
+msgstr "NESSUNA"
+
+#: lib/interface/constants.php:268
+#: lib/Class.Notification.php:109
+msgid "LOW"
+msgstr "BASSA"
+
+#: lib/interface/constants.php:269
+#: lib/Class.Notification.php:106
+msgid "MEDIUM"
+msgstr "MEDIA"
+
+#: lib/interface/constants.php:270
+#: lib/Class.Notification.php:104
+msgid "HIGH"
+msgstr "ALTA"
+
+#: lib/interface/constants.php:276
+#: Public/form_data/FG_var_ticket.inc:76
+msgid "VIEWED"
+msgstr "VISTI"
+
+#: lib/interface/constants.php:284
+msgid "NOT USED"
+msgstr "NON USATO"
+
+#: lib/interface/constants.php:285
+msgid "USED"
+msgstr "USATO"
+
+#: lib/interface/constants.php:295
+msgid "ANSWER"
+msgstr "RISPOSTA"
+
+#: lib/interface/constants.php:296
+msgid "BUSY"
+msgstr "OCCUPATO"
+
+#: lib/interface/constants.php:297
+msgid "NOANSWER"
+msgstr "NESSUNA RISPOSTA"
+
+#: lib/interface/constants.php:298
+#: lib/interface/constants.php:341
+#: lib/interface/constants.php:366
+msgid "CANCEL"
+msgstr "CANCELLATA"
+
+#: lib/interface/constants.php:299
+msgid "CONGESTION"
+msgstr "CONGESTIONE"
+
+#: lib/interface/constants.php:300
+msgid "CHANUNAVAIL"
+msgstr "CANALE NON DISPONIBILE"
+
+#: lib/interface/constants.php:301
+msgid "DONTCALL"
+msgstr "NON CHIAMATA"
+
+#: lib/interface/constants.php:302
+msgid "TORTURE"
+msgstr "TORTURA"
+
+#: lib/interface/constants.php:303
+msgid "INVALIDARGS"
+msgstr "ARGOMENTO INVALIDO"
+
+#: lib/interface/constants.php:323
+#: lib/interface/constants.php:355
+msgid "ACTIVE"
+msgstr "ATTIVO"
+
+#: lib/interface/constants.php:324
+#: lib/interface/constants.php:341
+#: lib/interface/constants.php:356
+#: lib/interface/constants.php:366
+#: lib/interface/constants.php:433
+msgid "CANCELLED"
+msgstr "CANCELLATA"
+
+#: lib/interface/constants.php:326
+#: lib/interface/constants.php:344
+msgid "WAITING-MAILCONFIRMATION"
+msgstr "IN ATTESA DELL'EMAIL DI CONFERMA"
+
+#: lib/interface/constants.php:327
+#: lib/interface/constants.php:345
+msgid "RESERVED"
+msgstr "PRENOTATO"
+
+#: lib/interface/constants.php:328
+#: lib/interface/constants.php:346
+msgid "EXPIRED"
+msgstr "SCADUTA"
+
+#: lib/interface/constants.php:329
+#: lib/interface/constants.php:347
+msgid "SUSPENDED FOR UNDERPAYMENT"
+msgstr "SOSPESO PER MANCATO PAGAMENTO"
+
+#: lib/interface/constants.php:330
+#: lib/interface/constants.php:348
+msgid "SUSPENDED FOR LITIGATION"
+msgstr "SOSPESO PER CONTENZIOSO"
+
+#: lib/interface/constants.php:331
+msgid "WAITING SUBSCRIPTION PAYMENT"
+msgstr "IN ATTESA SOTTOSCRIZIONE PAGAMENTO"
+
+#: lib/interface/constants.php:342
+#: lib/interface/constants.php:367
+#: Public/form_data/FG_var_callerid.inc:59
+#: Public/form_data/FG_var_callerid.inc:84
+#: Public/A2B_card_info.php:468
+#: Public/A2B_card_info.php:919
+msgid "ACTIVATED"
+msgstr "ATTIVATO"
+
+#: lib/interface/constants.php:344
+#: lib/interface/constants.php:430
+msgid "WAITING"
+msgstr "IN ATTESA"
+
+#: lib/interface/constants.php:345
+msgid "RESERV"
+msgstr "RISERV"
+
+#: lib/interface/constants.php:347
+msgid "SUS-PAY"
+msgstr "SOSP-PAG"
+
+#: lib/interface/constants.php:348
+msgid "SUS-LIT"
+msgstr "SOSP-CONT"
+
+#: lib/interface/constants.php:349
+msgid "WAITING-SUBSCRIPTION-PAYMENT"
+msgstr "IN ATTESA SOTTOSCRIZIONE PAGAMENTO"
+
+#: lib/interface/constants.php:349
+msgid "WAIT-PAY"
+msgstr "ATT-PAG"
+
+#: lib/interface/constants.php:385
+#: Public/A2B_entity_card.php:443
+msgid "NO EXPIRY"
+msgstr "NESSUNA SCADENZA"
+
+#: lib/interface/constants.php:394
+msgid "SQL"
+msgstr "SQL"
+
+#: lib/interface/constants.php:395
+msgid "SHELL SCRIPT"
+msgstr "SCRIPT SHELL"
+
+#: lib/interface/constants.php:401
+msgid "TEXT2SPEECH"
+msgstr "TEXT2SPEECH"
+
+#: lib/interface/constants.php:402
+msgid "UNIXTIME"
+msgstr "UNIXTIME"
+
+#: lib/interface/constants.php:403
+msgid "NUMBER"
+msgstr "NUMERO"
+
+#: lib/interface/constants.php:404
+msgid "DIGIT"
+msgstr "DIGITATE"
+
+#: lib/interface/constants.php:410
+#: Public/A2B_refill_info_agent.php:85
+#: Public/form_data/FG_var_moneysituation_details.inc:49
+#: Public/form_data/FG_var_remittance_request.inc:57
+#: Public/form_data/FG_var_commission.inc:52
+#: Public/form_data/FG_var_paymentlog.inc:169
+#: Public/A2B_payment_info_agent.php:85
+#: Public/A2B_refill_info.php:91
+#: Public/A2B_agent_remittance_req.php:180
+#: Public/A2B_payment_info.php:91
+#: Public/A2B_agent_remittance_conf.php:183
+msgid "AMOUNT"
+msgstr "IMPORTO"
+
+#: lib/interface/constants.php:411
+msgid "CORRECTION"
+msgstr "CORREZIONE"
+
+#: lib/interface/constants.php:412
+msgid "EXTRA FEE"
+msgstr "SUPPLEMENTO"
+
+#: lib/interface/constants.php:413
+msgid "AGENT REFUND"
+msgstr "RIMBORSO AGENTE"
+
+#: lib/interface/constants.php:419
+msgid "TO BALANCE"
+msgstr "TUO CREDITO"
+
+#: lib/interface/constants.php:420
+msgid "TO BANK"
+msgstr "ALLA BANCA"
+
+#: lib/interface/constants.php:431
+msgid "ACCEPTED"
+msgstr "ACCETTATO"
+
+#: lib/interface/constants.php:432
+msgid "REFUSED"
+msgstr "RIFIUTATO"
+
+#: lib/interface/constants.php:450
+#: Public/A2B_entity_card_multi.php:462
+msgid "NO DISCOUNT"
+msgstr "NESSUNO SCONTO"
+
+#: lib/Class.A2Billing.php:391
+msgid "Invalid card number lenght defined in configuration."
+msgstr "Lunghezza numero di scheda non valida definita nella configurazione."
+
+#: lib/Class.A2Billing.php:3276
+msgid "Error : Authentication Failed !!!"
+msgstr "Errore : Autenticazione Fallita !!!"
+
+#: lib/Class.A2Billing.php:3316
+msgid "Error : Not enough credit to call !!!"
+msgstr "Errore : Credito insufficiente per chiamare"
+
+#: lib/Class.A2Billing.php:3322
+msgid "Error : Card is not active!!!"
+msgstr "Errore : Scheda non attiva!!!"
+
+#: lib/Class.A2Billing.php:3328
+msgid "Error : Card is actually in use!!!"
+msgstr "Errore : La Scheda &egrave attualmente in uso!!!"
+
+#: lib/Class.A2Billing.php:3337
+#: lib/Class.A2Billing.php:3345
+#: lib/Class.A2Billing.php:3353
+msgid "Error : Card have expired!!!"
+msgstr "Errore : Scheda scaduta!!!"
+
+#: lib/Class.Notification.php:77
+msgid "New SIP & IAX added : Friends conf have to be generated"
+msgstr "Nuovo SIP & IAX aggiunto : Friends conf &egrave stato generato"
+
+#: lib/Class.Notification.php:78
+msgid "New SIP added : Sip Friends conf have to be generated"
+msgstr "Nuovo SIP aggiunto : Friends conf &egrave stato generato"
+
+#: lib/Class.Notification.php:79
+msgid "New IAX added : IAX Friends conf have to be generated"
+msgstr "Nuovo IAX aggiunt : Friends conf &egrave stato generato"
+
+#: lib/Class.Notification.php:80
+msgid "New Ticket added by agent"
+msgstr "Nuovo ticket aggiunto dall'agente"
+
+#: lib/Class.Notification.php:81
+msgid "New Ticket added by customer"
+msgstr "Nuovo ticket aggiunto dall'utente"
+
+#: lib/Class.Notification.php:82
+msgid "DID Destination edited by customer"
+msgstr "Destinazione DID editata dall'utente"
+
+#: lib/Class.Notification.php:83
+msgid "New Remittance request added"
+msgstr "Nuova richiesta di Rimessa aggiunta"
+
+#: lib/Class.Notification.php:84
+msgid "Added new sign-up"
+msgstr "Aggiunta nuova registrazione"
+
+#: lib/Class.Notification.php:136
+msgid "BATCH"
+msgstr "LOTTO"
+
+#: lib/Class.Notification.php:138
+msgid "SOAP-SERVER"
+msgstr "SOAP-SERVER"
+
+#: lib/agent.help.php:35
+msgid "For further information please consult"
+msgstr "Per ulteriori informazioni consultare"
+
+#: lib/agent.help.php:35
+msgid "the online documention"
+msgstr "documentazione online"
+
+#: lib/agent.help.php:55
+msgid "Agent list who have access to the Agent interface."
+msgstr "Lista di Agenti che hanno accesso all'interfaccia Agenti"
+
+#: lib/agent.help.php:57
+msgid "Personal information."
+msgstr "Informazioni personali"
+
+#: lib/agent.help.php:57
+msgid "You can update your personal information here."
+msgstr "Puoi aggiornare le tue informazioni personali qui"
+
+#: lib/agent.help.php:59
+msgid "Voip Config will create a SIP or IAX entry on the Asterisk server, so that a customer can set up a SIP or IAX client to connect directly to the asterisk server without the need to enter an account and pin each time a call is made. When done, click on the CONFIRM DATA button, then click reload to apply the changes on the Asterisk server.</br>"
+msgstr "Voip Config creer&agrave i file SIP o IAX direttamente sul server Asterisk, in modo che un utente possa configurare un client SIP o IAX connettendosi direttamente al server Asterisk senza la necessit&agrave di inserire un account e PIN ogni volta che viene effettuata una chiamata. Quando hai finito, clicca sul pulsante CONFERMA DATI, quindi fare clic su ricarica per applicare le modifiche sul server Asterisk.</br>"
+
+#: lib/agent.help.php:60
+msgid "The customer must then enter the URL/IP address of the asterisk server into the SIP/IAX client and use the account number and secret as the username and password."
+msgstr "Il cliente deve quindi immettere l'URL/indirizzo IP del server Asterisk nel client SIP/IAX e utilizzare il numero dell'account e la password come nome utente e password."
+
+#: lib/agent.help.php:62
+msgid "Click reload to commit changes to Asterisk"
+msgstr "Fai clic su aggiorna per confermare le modifiche ad Asterisk"
+
+#: lib/agent.help.php:64
+msgid "Generate a specific crypted URL and to configure signup with a customer group and call plan."
+msgstr "Genera un URL specifico criptato e configura la registrazione con un gruppo utenti ed un piano di chiamata."
+
+#: lib/agent.help.php:66
+msgid "On this page you will be able to change your password, You have to enter the New Password and Confirm it."
+msgstr "In questa pagina puoi cambiare la tua password. Devi immettere la nuova password e confermare."
+
+#: lib/agent.help.php:68
+msgid "On this page you will be able to create a remittance Remittance Request according to the commission accrued on your account.If the commission accrued is higher than a predefined threshold then it will be possible to ask a transfer on your balance or by a funds transfer."
+msgstr "In questa pagina sarai in grado di creare una Richiesta di Rimessa secondo le commissioni maturate sul tuo account. Se le commissioni maturate sono superiore alla soglia predefinita, allora sarà possibile chiedere il trasferimento sul tuo saldo o un trasferimento di fondi."
+
+#: lib/agent.help.php:70
+msgid "On this page you will be able to change your Secret used to crypt your generated signup URL, You have to enter the New Secret and Confirm it."
+msgstr "In questa pagina sarai in grado di cambiare la tua Password utilizzata per criptare l'URL di iscrizione, &Egrave necessario inserire la nuova Password e confermarla."
+
+#: lib/agent.help.php:72
+msgid "Customers are listed below by card number. Each row corresponds to one customer, along with information such as their call plan, credit remaining, etc.</br>"
+msgstr "Gli utenti sono di seguito elencati per numero di scheda. Ogni riga corrisponde ad un utente, insieme ad informazioni come il loro piano di chiamata, credito residuo, ecc </ br>"
+
+#: lib/agent.help.php:73
+msgid "The SIP and IAX buttons create SIP and IAX entries to allow direct VoIP connections to the Asterisk server without further authentication."
+msgstr "I tasti SIP e IAX creano i relativi file SIP e IAX per consentire collegamenti diretti al server VoIP Asterisk, senza ulteriori autenticazioni."
+
+#: lib/agent.help.php:75
+msgid "Payment history - The section below allows you to see payments against a customer. Note that this does not change the balance on the card. Click REFILL in Customer List page to top-up a card."
+msgstr "Storico pagamenti - La sezione seguente consente di vedere i pagamenti nei confronti di un utente. Si noti che questi non cambiano il saldo della scheda. Clicca su REFILL nella pagina Lista Utenti per aggiungerlo ad una scheda."
+
+#: lib/agent.help.php:77
+msgid "This screen shows refills and payments made against each account, along with the current credit on each card. The initial amount of credit applied to the card is not included. The amount owing is calculated by subtracting payments from refills"
+msgstr "Questa schermata mostra ricariche e pagamenti effettuati nei confronti degli account, con il credito corrente su ogni scheda. L'importo iniziale del credito applicato alla scheda non &egrave incluso. L'importo dovuto &egrave calcolato sottraendo i pagamenti dalle ricariche."
+
+#: lib/agent.help.php:79
+msgid "Agents Refill history - The section below allows you to see your refill."
+msgstr "Storico Ricariche Agente - La sezione sotto permette di vedere le tue ricariche."
+
+#: lib/agent.help.php:81
+msgid "Agent Payment history - The section below allows you to browse your payments."
+msgstr "Storico Pagamenti Agente - La sezione sotto permette di vedere i tuoi pagamenti."
+
+#: lib/agent.help.php:83
+msgid "You can see here, all tickets created. You can also add a new ticket for one customer."
+msgstr "Qui puoi vedere tutti i ticket creati. Puoi anche aggiungere un nuovo tiket per un utente."
+
+#: lib/agent.help.php:85
+msgid "This shows a list of all signup key create for this agent, this key is used to identify the default paramater for the subscription on the signup page"
+msgstr "Visualizza un elenco di tutte le chiavi iscrizione create per questo agente, questo tasto è utilizzato per identificare il parametro di default per la sottoscrizione nella pagina di registrazione"
+
+#: lib/agent.help.php:87
+msgid "Set the caller ID so that the customer calling in is authenticated on the basis of the callerID rather than with the account number"
+msgstr "Impostare l'ID del chiamante in modo che l'utente chiamante è autenticato sulla base dell'ID chiamante anzich&egrave con il numero dell'account"
+
+#: Public/A2B_refill_info_agent.php:72
+#: Public/A2B_refill_info.php:72
+msgid "REFILL INFO"
+msgstr "INFORMAZIONI RICARICA"
+
+#: Public/A2B_refill_info_agent.php:77
+#: Public/form_data/FG_var_logrefill_agent.inc:54
+#: Public/form_data/FG_var_commission.inc:50
+#: Public/form_data/FG_var_payment_agent.inc:53
+#: Public/form_data/FG_var_signup_agent.inc:53
+#: Public/A2B_payment_info_agent.php:77
+msgid "AGENT"
+msgstr "AGENTE"
+
+#: Public/A2B_refill_info_agent.php:93
+#: Public/A2B_payment_info_agent.php:93
+#: Public/A2B_card_info.php:155
+#: Public/A2B_refill_info.php:99
+#: Public/A2B_payment_info.php:99
+msgid "CREATION DATE"
+msgstr "DATA CREAZIONE"
+
+#: Public/A2B_refill_info_agent.php:101
+#: Public/form_data/FG_var_logrefill_agent.inc:58
+#: Public/form_data/FG_var_logrefill.inc:56
+#: Public/A2B_refill_info.php:107
+msgid "REFILL TYPE"
+msgstr "TIPO RICARICA"
+
+#: Public/A2B_refill_info_agent.php:111
+#: Public/A2B_payment_info_agent.php:111
+#: Public/A2B_refill_info.php:117
+#: Public/A2B_payment_info.php:117
+msgid "DESCRIPTION "
+msgstr "DESCRIZIONE"
+
+#: Public/A2B_refill_info_agent.php:123
+msgid "REFILLS AGENT LIST"
+msgstr "LISTA RICARICHE AGENTE"
+
+#: Public/export_csv.php:64
+msgid "ERROR CSV EXPORT"
+msgstr "ERRORE ESPORTAZIONE CSV"
+
+#: Public/call-last-month.php:70
+#: Public/call-log-customers.php:383
+msgid "Enter the customer ID"
+msgstr "Inserisci l'ID utente"
+
+#: Public/call-last-month.php:76
+#: Public/call-log-customers.php:397
+msgid "Rate"
+msgstr "Tariffa"
+
+#: Public/call-last-month.php:86
+#: Public/A2B_entity_paymentlog.php:96
+msgid "SELECT MONTH"
+msgstr "SELZIONA MESE"
+
+#: Public/call-last-month.php:91
+#: Public/call-log-customers.php:433
+#: Public/A2B_entity_paymentlog.php:102
+#: Public/A2B_entity_paymentlog.php:154
+msgid "From"
+msgstr "Da"
+
+#: Public/call-last-month.php:113
+msgid "Number of months to compare"
+msgstr "Numero di mesi da confrontare"
+
+#: Public/call-last-month.php:115
+#: Public/call-last-month.php:116
+#: Public/call-last-month.php:117
+#: Public/call-last-month.php:118
+#: Public/call-last-month.php:119
+#: Public/call-last-month.php:120
+msgid "months"
+msgstr "mesi"
+
+#: Public/call-last-month.php:128
+msgid "CALLEDNUMBER"
+msgstr "NUMERO CHIAMATO"
+
+#: Public/call-last-month.php:160
+msgid "TRAFFIC"
+msgstr "TRAFFICO"
+
+#: Public/call-last-month.php:161
+#: Public/call-last-month.php:167
+msgid "Stat Graph"
+msgstr "Stat Graf"
+
+#: Public/call-last-month.php:166
+#: Public/call-log-customers.php:1235
+#: Public/A2B_card_info.php:841
+msgid "SELL"
+msgstr "SELL"
+
+#: Public/call-log-customers.php:57
+msgid "ERROR: Cannot download file "
+msgstr "ERRORE: impossibile scaricare il file"
+
+#: Public/call-log-customers.php:98
+msgid "STANDARD"
+msgstr "STANDARD"
+
+#: Public/call-log-customers.php:99
+msgid "SIP/IAX"
+msgstr "SIP/IAX"
+
+#: Public/call-log-customers.php:100
+msgid "DIDCALL"
+msgstr "CHIAMATA DID"
+
+#: Public/call-log-customers.php:101
+msgid "DID_VOIP"
+msgstr "VOIP_DID"
+
+#: Public/call-log-customers.php:102
+#: Public/A2B_card_info.php:187
+msgid "CALLBACK"
+msgstr "CALLBACK"
+
+#: Public/call-log-customers.php:103
+msgid "PREDICT"
+msgstr "PREVISTO"
+
+#: Public/call-log-customers.php:104
+msgid "AUTO DIALER"
+msgstr "AUTO COMPOSITORE"
+
+#: Public/call-log-customers.php:105
+msgid "DID-ALEG"
+msgstr "ALLEG. DID"
+
+#: Public/call-log-customers.php:114
+#: Public/card-history.php:75
+msgid "Date"
+msgstr "Data"
+
+#: Public/call-log-customers.php:116
+msgid "CallerID"
+msgstr "ID chiamante"
+
+#: Public/call-log-customers.php:118
+#: Public/call-log-customers.php:681
+msgid "DNID"
+msgstr "DNID"
+
+#: Public/call-log-customers.php:119
+msgid "Phone Number"
+msgstr "Numero Telefonico"
+
+#: Public/call-log-customers.php:120
+#: Public/graph_stat.php:56
+#: Public/graph_statbar.php:58
+msgid "Destination"
+msgstr "Destinazione"
+
+#: Public/call-log-customers.php:121
+msgid "Sell Rate"
+msgstr "Tariffa vendita"
+
+#: Public/call-log-customers.php:122
+#: Public/graph_stat.php:57
+#: Public/graph_statbar.php:59
+msgid "Duration"
+msgstr "Durata"
+
+#: Public/call-log-customers.php:123
+msgid "Account"
+msgstr "Account"
+
+#: Public/call-log-customers.php:124
+msgid "Terminate Cause"
+msgstr "Causa Termine"
+
+#: Public/call-log-customers.php:124
+msgid "TC"
+msgstr "CT"
+
+#: Public/call-log-customers.php:125
+msgid "CallType"
+msgstr "Tipo chiamata"
+
+#: Public/call-log-customers.php:126
+msgid "Sell"
+msgstr "Vendere"
+
+#: Public/call-log-customers.php:149
+msgid " - Call Logs - "
+msgstr " - Dettaglio Chiamate - "
+
+#: Public/call-log-customers.php:392
+msgid "CallPlan"
+msgstr "Piano di Chiamata"
+
+#: Public/call-log-customers.php:421
+#: Public/call-log-customers.php:1211
+#: Public/form_data/FG_var_moneysituation_details.inc:48
+#: Public/form_data/FG_var_moneysituation_details.inc:63
+#: Public/form_data/FG_var_remittance_request.inc:56
+#: Public/form_data/FG_var_paymentlog.inc:130
+msgid "DATE"
+msgstr "DATA"
+
+#: Public/call-log-customers.php:475
+#: Public/call-log-customers.php:547
+msgid "Time :"
+msgstr "Ora"
+
+#: Public/call-log-customers.php:507
+#: Public/A2B_entity_paymentlog.php:124
+#: Public/A2B_entity_paymentlog.php:184
+msgid "To"
+msgstr "A"
+
+#: Public/call-log-customers.php:577
+msgid "PHONENUMBER"
+msgstr "NUMERO TELEFONICO"
+
+#: Public/call-log-customers.php:628
+#: Public/form_data/FG_var_card.inc:889
+#: Public/form_data/FG_var_friend.inc:79
+#: Public/form_data/FG_var_friend.inc:186
+#: Public/form_data/FG_var_callerid.inc:56
+#: Public/form_data/FG_var_callerid.inc:75
+msgid "CALLERID"
+msgstr "ID CHIAMANTE"
+
+#: Public/call-log-customers.php:735
+msgid "CALL TYPE"
+msgstr "TIPO DI CHIAMATA"
+
+#: Public/call-log-customers.php:749
+msgid "ALL CALLS"
+msgstr "TUTTE LE CHIAMATE"
+
+#: Public/call-log-customers.php:775
+msgid "OPTIONS"
+msgstr "OPZIONI"
+
+#: Public/call-log-customers.php:784
+msgid "SHOW CALLS"
+msgstr "MOSTRA CHIAMATE"
+
+#: Public/call-log-customers.php:796
+msgid "ANSWERED"
+msgstr "RISPOSTE"
+
+#: Public/call-log-customers.php:805
+msgid "ALL"
+msgstr "TUTTE"
+
+#: Public/call-log-customers.php:814
+msgid "NOT COMPLETED"
+msgstr "NON COMPLETATE"
+
+#: Public/call-log-customers.php:823
+msgid "CONGESTIONED"
+msgstr "CONGESTIONE"
+
+#: Public/call-log-customers.php:832
+msgid "BUSIED"
+msgstr "OCCUPATO"
+
+#: Public/call-log-customers.php:841
+msgid "NOT ANSWERED"
+msgstr "NON RISPOSTA"
+
+#: Public/call-log-customers.php:850
+msgid "CHANNEL UNAVAILABLE"
+msgstr "CANALE NON DISPONIBILE"
+
+#: Public/call-log-customers.php:859
+msgid "CANCELED"
+msgstr "CANCELLATA"
+
+#: Public/call-log-customers.php:867
+msgid "RESULT"
+msgstr "RISULTATO"
+
+#: Public/call-log-customers.php:872
+msgid "mins"
+msgstr "min"
+
+#: Public/call-log-customers.php:881
+msgid "secs"
+msgstr "sec"
+
+#: Public/call-log-customers.php:892
+#: Public/form_data/FG_var_card.inc:154
+#: Public/form_data/FG_var_card.inc:571
+#: Public/A2B_card_info.php:353
+msgid "CURRENCY"
+msgstr "VALUTA"
+
+#: Public/call-log-customers.php:938
+msgid "Number of call"
+msgstr ""
+
+#: Public/call-log-customers.php:1095
+msgid "Previous"
+msgstr "Precedente"
+
+#: Public/call-log-customers.php:1122
+msgid "TOTAL COSTS"
+msgstr "COSTI TOTALI"
+
+#: Public/call-log-customers.php:1129
+msgid "TOTAL BUYCOSTS"
+msgstr "COSTI ACQUISTO TOTALI"
+
+#: Public/call-log-customers.php:1138
+msgid "DIFFERENCE"
+msgstr "DIFFERENZA"
+
+#: Public/call-log-customers.php:1208
+msgid "TRAFFIC SUMMARY"
+msgstr "SINTESI DEL TRAFFICO"
+
+#: Public/call-log-customers.php:1213
+#: Public/A2B_card_info.php:832
+msgid "DURATION"
+msgstr "DURATA"
+
+#: Public/call-log-customers.php:1214
+msgid "DUR"
+msgstr "DUR"
+
+#: Public/call-log-customers.php:1217
+msgid "GRAPHIC"
+msgstr "GRAFICO"
+
+#: Public/call-log-customers.php:1220
+msgid "CALLS"
+msgstr "CHIAMATE"
+
+#: Public/call-log-customers.php:1224
+msgid "AVERAGE LENGTH OF CALL"
+msgstr "DURATA MEDIA DI CHIAMATA"
+
+#: Public/call-log-customers.php:1226
+msgid "ALOC"
+msgstr "DMDC"
+
+#: Public/call-log-customers.php:1230
+msgid "ANSWER SEIZE RATIO"
+msgstr "RAPPORTO CHIAMATE RISPOSTE"
+
+#: Public/call-log-customers.php:1232
+msgid "ASR"
+msgstr "RCR"
+
+#: Public/call-log-customers.php:1318
+msgid "TOTAL"
+msgstr "TOTALE"
+
+#: Public/call-log-customers.php:1362
+msgid "No calls in your selection"
+msgstr "Nessuna chiamata nella tua selezione"
+
+#: Public/A2B_entity_password.php:75
+msgid "No value in New Password entered"
+msgstr "Non inserito il valore Nuova Password"
+
+#: Public/A2B_entity_password.php:81
+msgid "No Value in Confirm New Password entered"
+msgstr "Non &egrave inserito il valore Conferma Nuova Password"
+
+#: Public/A2B_entity_password.php:87
+msgid "Password length should be greater than or equal to 5"
+msgstr "I caratteri della Password devono essere almeno 5"
+
+#: Public/A2B_entity_password.php:93
+msgid "Value mismatch, New Password should be equal to Confirm New Password"
+msgstr "Non coincidente, Nuova Password deve essere uguale a Conferma Nuova Password"
+
+#: Public/A2B_entity_password.php:111
+msgid "Your password is updated successfully."
+msgstr "La tua password &egrave stata aggiornata con successo."
+
+#: Public/A2B_entity_password.php:118
+msgid "Your old password is wrong."
+msgstr "La tua vecchia password non &egrave corretta."
+
+#: Public/A2B_entity_password.php:129
+msgid "Change Password"
+msgstr "Cambia Password"
+
+#: Public/A2B_entity_password.php:132
+msgid "Do not use \" or = characters in your password"
+msgstr "Non usare caratteri \" o = nella tua password"
+
+#: Public/A2B_entity_password.php:135
+msgid "Old Password"
+msgstr "Vecchia Password"
+
+#: Public/A2B_entity_password.php:139
+msgid "New Password"
+msgstr "Nuova Password"
+
+#: Public/A2B_entity_password.php:143
+msgid "Confirm Password"
+msgstr "Conferma Password"
+
+#: Public/A2B_entity_password.php:150
+#: Public/A2B_entity_secret.php:123
+msgid "Save"
+msgstr "Salva"
+
+#: Public/A2B_entity_card.php:136
+msgid "Could not perform the batch update!"
+msgstr "Impossibile eseguire l'aggiornamento lotto!"
+
+#: Public/A2B_entity_card.php:138
+msgid "The batch update has been successfully perform!"
+msgstr "L'aggiornamento lotto &egrave stato eseguito con successo!"
+
+#: Public/A2B_entity_card.php:183
+msgid "Refill executed "
+msgstr "Ricarica esguita"
+
+#: Public/A2B_entity_card.php:198
+msgid "GENERATED COMMISSION OF AN CUSTOMER REFILLED BY AN AGENT!"
+msgstr "COMMISSIONE GENERATA DA UNA RICARICA UTENTE DA PARTE DI UN AGENTE"
+
+#: Public/A2B_entity_card.php:229
+msgid "You don't have enough credit to do this refill. You have "
+msgstr "Non hai abbastanza credito per la ricarica. Tu hai"
+
+#: Public/A2B_entity_card.php:233
+msgid "Impossible to refill this card "
+msgstr "Impossibile ricaricare questa scheda"
+
+#: Public/A2B_entity_card.php:292
+msgid "CARD ID"
+msgstr "ID SCHEDA"
+
+#: Public/A2B_entity_card.php:294
+msgid "or"
+msgstr "o"
+
+#: Public/A2B_entity_card.php:297
+msgid "CARDNUMBER"
+msgstr "NUMERO-SCHEDA"
+
+#: Public/A2B_entity_card.php:305
+#: Public/form_data/FG_var_card.inc:247
+#: Public/form_data/FG_var_moneysituation.inc:47
+msgid "CREDIT"
+msgstr "CREDITO"
+
+#: Public/A2B_entity_card.php:313
+#: Public/form_data/FG_var_logrefill_agent.inc:57
+#: Public/form_data/FG_var_logrefill.inc:55
+#: Public/form_data/FG_var_commission.inc:54
+#: Public/form_data/FG_var_payment.inc:59
+#: Public/form_data/FG_var_payment_agent.inc:57
+#: Public/form_data/FG_var_ticket.inc:151
+#: Public/A2B_card_info.php:692
+#: Public/A2B_card_info.php:766
+msgid "DESCRIPTION"
+msgstr "DESCRIZIONE"
+
+#: Public/A2B_entity_card.php:323
+msgid "ADD CREDIT"
+msgstr "AGGIUNGI CREDITO"
+
+#: Public/A2B_entity_card.php:337
+msgid "SEARCH CARDS"
+msgstr "CERCA SCHEDE"
+
+#: Public/A2B_entity_card.php:337
+msgid "search activated"
+msgstr ""
+
+#: Public/A2B_entity_card.php:360
+msgid "BATCH UPDATE"
+msgstr "AGGIORNAMENTO LOTTO"
+
+#: Public/A2B_entity_card.php:364
+msgid "cards selected!"
+msgstr "scheda selezionata!"
+
+#: Public/A2B_entity_card.php:364
+msgid "Use the options below to batch update the selected cards."
+msgstr "Utilizzare le seguenti opzioni per aggiornare il lotto delle carte selezionate"
+
+#: Public/A2B_entity_card.php:374
+msgid "In use"
+msgstr "In uso"
+
+#: Public/A2B_entity_card.php:386
+#: Public/form_data/FG_var_paymentlog.inc:100
+msgid "Status"
+msgstr "Stato"
+
+#: Public/A2B_entity_card.php:400
+msgid "Language"
+msgstr "Lingua"
+
+#: Public/A2B_entity_card.php:413
+msgid "Access"
+msgstr "Acesso"
+
+#: Public/A2B_entity_card.php:425
+#: Public/A2B_entity_card_multi.php:383
+msgid "Currency"
+msgstr "Valuta"
+
+#: Public/A2B_entity_card.php:441
+#: Public/A2B_entity_card_multi.php:404
+msgid "Enable expire"
+msgstr ""
+
+#: Public/A2B_entity_card.php:462
+msgid "Expiry date"
+msgstr "Data scadenza"
+
+#: Public/A2B_entity_card.php:463
+#: Public/A2B_entity_card_multi.php:421
+msgid "(Format YYYY-MM-DD HH:MM:SS)"
+msgstr "(Formato AAAA-MM-GG OO:MM:SS"
+
+#: Public/A2B_entity_card.php:471
+msgid "Expiration days"
+msgstr "Giorni scadenza"
+
+#: Public/A2B_entity_card.php:481
+#: Public/A2B_entity_card_multi.php:435
+msgid "Run service"
+msgstr "Avvia servizio"
+
+#: Public/A2B_entity_card.php:492
+msgid "BATCH UPDATE CARD"
+msgstr "AGGIORNAMENTO LOTTO SCHEDE"
+
+#: Public/A2B_entity_card.php:508
+#: Public/A2B_entity_friend.php:152
+msgid "Changes detected on SIP/IAX Friends"
+msgstr "I cambiamenti rilevati su SIP/IAX Friends"
+
+#: Public/A2B_entity_card.php:513
+msgid "GENERATE ADDITIONAL_A2BILLING_SIP.CONF"
+msgstr "GENERA ADDITIONAL_A2BILLING_SIP.CONF"
+
+#: Public/A2B_entity_card.php:517
+msgid "GENERATE ADDITIONAL_A2BILLING_IAX.CONF"
+msgstr "GENERA ADDITIONAL_A2BILLING_IAX.CONF"
+
+#: Public/A2B_entity_card.php:548
+msgid "Change the Card Number Length"
+msgstr "Cambia la lunghezza del numero di Scheda"
+
+#: Public/A2B_entity_card.php:557
+#: Public/A2B_entity_card_multi.php:344
+msgid "Digits"
+msgstr "Cifre"
+
+#: Public/A2B_support.php:93
+msgid "Ticket added successfully"
+msgstr "Ticket aggiunto con successo"
+
+#: Public/A2B_support.php:117
+msgid "Create a NEW Support Ticket"
+msgstr "Crea un NUOVO Ticket di Supporto"
+
+#: Public/A2B_support.php:125
+msgid "Title"
+msgstr "Titolo"
+
+#: Public/A2B_support.php:133
+msgid "Priority"
+msgstr "Priorit&agrave"
+
+#: Public/A2B_support.php:146
+msgid "Component"
+msgstr "Componente"
+
+#: Public/A2B_support.php:169
+#: Public/card-history.php:76
+msgid "Description"
+msgstr "Descrizione"
+
+#: Public/A2B_support.php:177
+msgid "CREATE"
+msgstr "CREA"
+
+#: Public/agentinfo.php:92
+#: Public/form_data/FG_var_card.inc:401
+#: Public/form_data/FG_var_agent.inc:55
+#: Public/A2B_card_info.php:230
+msgid "LAST NAME"
+msgstr "COGNOME"
+
+#: Public/agentinfo.php:93
+#: Public/form_data/FG_var_card.inc:410
+#: Public/form_data/FG_var_agent.inc:64
+#: Public/A2B_card_info.php:240
+msgid "FIRST NAME"
+msgstr "NOME"
+
+#: Public/agentinfo.php:94
+#: Public/form_data/FG_var_card.inc:159
+#: Public/form_data/FG_var_card.inc:241
+#: Public/form_data/FG_var_card.inc:420
+#: Public/form_data/FG_var_agent.inc:118
+#: Public/A2B_card_info.php:302
+msgid "EMAIL"
+msgstr "EMAIL"
+
+#: Public/agentinfo.php:95
+#: Public/form_data/FG_var_agent.inc:127
+#: Public/A2B_card_info.php:311
+#: Public/A2B_card_info.php:513
+msgid "PHONE"
+msgstr "TELEFONO"
+
+#: Public/agentinfo.php:96
+#: Public/form_data/FG_var_agent.inc:136
+#: Public/A2B_card_info.php:319
+msgid "FAX"
+msgstr "FAX"
+
+#: Public/agentinfo.php:99
+#: Public/form_data/FG_var_card.inc:430
+#: Public/form_data/FG_var_agent.inc:73
+#: Public/A2B_card_info.php:252
+#: Public/A2B_agent_remittance_conf.php:179
+msgid "ADDRESS"
+msgstr "INDIRIZZO"
+
+#: Public/agentinfo.php:100
+#: Public/A2B_card_info.php:263
+msgid "ZIP CODE"
+msgstr "CODICE POSTALE"
+
+#: Public/agentinfo.php:101
+#: Public/form_data/FG_var_card.inc:440
+#: Public/form_data/FG_var_agent.inc:82
+#: Public/A2B_card_info.php:272
+msgid "CITY"
+msgstr "CITT&Agrave"
+
+#: Public/agentinfo.php:102
+#: Public/form_data/FG_var_agent.inc:91
+#: Public/A2B_card_info.php:282
+msgid "STATE"
+msgstr "PROVINCIA"
+
+#: Public/agentinfo.php:103
+#: Public/form_data/FG_var_card.inc:459
+#: Public/form_data/FG_var_agent.inc:100
+#: Public/A2B_card_info.php:293
+msgid "COUNTRY"
+msgstr "NAZIONE"
+
+#: Public/agentinfo.php:113
+msgid "EDIT PERSONAL INFORMATION"
+msgstr "MODIFICA LE IMPOSTAZIONI PERSONALI"
+
+#: Public/agentinfo.php:127
+msgid "AGENT ID"
+msgstr "ID AGENTE"
+
+#: Public/agentinfo.php:131
+#: Public/A2B_agent_remittance_req.php:139
+#: Public/A2B_agent_remittance_conf.php:129
+msgid "BALANCE REMAINING"
+msgstr "CREDITO RESIDUO"
+
+#: Public/agentinfo.php:139
+#: Public/A2B_agent_remittance_req.php:154
+#: Public/A2B_agent_remittance_conf.php:144
+msgid "REMITTANCE IN PROGRESS"
+msgstr "RIMESSA IN CORSO"
+
+#: Public/agentinfo.php:145
+#: Public/form_data/FG_var_moneysituation.inc:48
+#: Public/A2B_agent_remittance_req.php:150
+#: Public/A2B_agent_remittance_conf.php:140
+msgid "COMMISSION ACCRUED"
+msgstr "COMMISSIONI MATURATE"
+
+#: Public/agentinfo.php:155
+msgid "REMITTANCE REQUEST"
+msgstr "RICHIESTA RIMESSA"
+
+#: Public/agentinfo.php:170
+msgid "Click below to buy credit : "
+msgstr "Credito al lordo delle commissioni PayPal : "
+
+#: Public/form_data/FG_var_logrefill_agent.inc:53
+#: Public/form_data/FG_var_card.inc:135
+#: Public/form_data/FG_var_def_ratecard.inc:69
+#: Public/form_data/FG_var_remittance_request.inc:55
+#: Public/form_data/FG_var_logrefill.inc:52
+#: Public/form_data/FG_var_commission.inc:48
+#: Public/form_data/FG_var_payment.inc:55
+#: Public/form_data/FG_var_payment_agent.inc:52
+#: Public/form_data/FG_var_moneysituation.inc:42
+#: Public/form_data/FG_var_paymentlog.inc:119
+#: Public/form_data/FG_var_ticket.inc:69
+#: Public/form_data/FG_var_ticket_agent.inc:63
+#: Public/A2B_card_info.php:683
+#: Public/A2B_card_info.php:757
+msgid "ID"
+msgstr "ID"
+
+#: Public/form_data/FG_var_logrefill_agent.inc:55
+#: Public/form_data/FG_var_card.inc:139
+#: Public/form_data/FG_var_card.inc:243
+#: Public/form_data/FG_var_payment_agent.inc:54
+msgid "LOGIN"
+msgstr "LOGIN"
+
+#: Public/form_data/FG_var_logrefill_agent.inc:56
+#: Public/form_data/FG_var_logrefill.inc:54
+#: Public/A2B_card_info.php:760
+msgid "REFILL DATE"
+msgstr "DATA RICARICA"
+
+#: Public/form_data/FG_var_logrefill_agent.inc:59
+#: Public/form_data/FG_var_logrefill.inc:57
+#: Public/A2B_card_info.php:763
+msgid "REFILL AMOUNT"
+msgstr "IMPORTO RICARICA"
+
+#: Public/form_data/FG_var_logrefill_agent.inc:64
+#: Public/form_data/FG_var_logrefill.inc:61
+#: Public/form_data/FG_var_commission.inc:60
+#: Public/form_data/FG_var_payment.inc:66
+#: Public/form_data/FG_var_payment_agent.inc:63
+#: Public/form_data/FG_var_friend.inc:97
+#: Public/form_data/FG_var_signup_agent.inc:62
+#: Public/form_data/FG_var_callerid.inc:64
+msgid "THERE IS NO "
+msgstr "NON C'&Egrave"
+
+#: Public/form_data/FG_var_card.inc:65
+msgid "You are going as well to remove all the SIP/IAX accounts & CallerIDs attached to this card! Please confirm that you really want to remove this card ? "
+msgstr "Stai per rimuovere tutti gli account SIP/IAX e ID chiamanti collegati alla presente scheda! Confermai che desideri rimuovere questa scheda ? "
+
+#: Public/form_data/FG_var_card.inc:68
+msgid "You are going to remove a card that have SIP/IAX accounts and/or CallerIDs attached to it ! Please confirm that you really want to remove this card ? "
+msgstr "Stai per rimuovere una scheda che ha gli account SIP/IAX e/o ID chiamanti collegati ad essa! Confermi che desideri rimuovere questa scheda ? "
+
+#: Public/form_data/FG_var_card.inc:74
+msgid "Generate Customers"
+msgstr "Genera Utenti"
+
+#: Public/form_data/FG_var_card.inc:82
+msgid "Add Customer"
+msgstr "Aggiungi Utente"
+
+#: Public/form_data/FG_var_card.inc:141
+#: Public/form_data/FG_var_card.inc:242
+#: Public/form_data/FG_var_logrefill.inc:83
+#: Public/form_data/FG_var_payment.inc:90
+#: Public/form_data/FG_var_moneysituation.inc:45
+#: Public/A2B_agent_remittance_conf.php:175
+msgid "LASTNAME"
+msgstr "COGNOME"
+
+#: Public/form_data/FG_var_card.inc:142
+#: Public/form_data/FG_var_signup_agent.inc:55
+msgid "GROUP"
+msgstr "GRUPPO"
+
+#: Public/form_data/FG_var_card.inc:143
+#: Public/form_data/FG_var_card.inc:366
+#: Public/A2B_card_info.php:345
+msgid "BALANCE"
+msgstr "CREDITO"
+
+#: Public/form_data/FG_var_card.inc:143
+msgid "BA"
+msgstr "CR"
+
+#: Public/form_data/FG_var_card.inc:147
+#: Public/form_data/FG_var_card.inc:390
+msgid "SERIA"
+msgstr "SERIALE"
+
+#: Public/form_data/FG_var_card.inc:148
+#: Public/A2B_card_info.php:113
+msgid "SERIAL NUMBER"
+msgstr "NUMERO DI SERIE"
+
+#: Public/form_data/FG_var_card.inc:149
+msgid "Call Plan"
+msgstr "Piano di chiamata"
+
+#: Public/form_data/FG_var_card.inc:151
+#: Public/form_data/FG_var_card.inc:580
+#: Public/form_data/FG_var_remittance_request.inc:59
+#: Public/form_data/FG_var_paymentlog.inc:150
+#: Public/form_data/FG_var_ticket.inc:77
+#: Public/form_data/FG_var_ticket_agent.inc:69
+#: Public/A2B_entity_paymentlog.php:216
+#: Public/A2B_card_info.php:95
+#: Public/A2B_card_info.php:145
+msgid "STATUS"
+msgstr "STATO"
+
+#: Public/form_data/FG_var_card.inc:152
+msgid "LG"
+msgstr "LG"
+
+#: Public/form_data/FG_var_card.inc:153
+msgid "USE"
+msgstr "USO"
+
+#: Public/form_data/FG_var_card.inc:154
+msgid "CUR"
+msgstr "VAL"
+
+#: Public/form_data/FG_var_card.inc:155
+#: Public/A2B_entity_friend.php:184
+#: Public/A2B_entity_card_multi.php:440
+msgid "SIP"
+msgstr "SIP"
+
+#: Public/form_data/FG_var_card.inc:156
+#: Public/A2B_entity_friend.php:183
+#: Public/A2B_entity_card_multi.php:440
+msgid "IAX"
+msgstr "IAX"
+
+#: Public/form_data/FG_var_card.inc:157
+msgid "ACD"
+msgstr "ACD"
+
+#: Public/form_data/FG_var_card.inc:158
+#: Public/form_data/FG_var_logrefill.inc:84
+#: Public/form_data/FG_var_payment.inc:91
+#: Public/form_data/FG_var_moneysituation.inc:44
+#: Public/A2B_agent_remittance_conf.php:171
+msgid "FIRSTNAME"
+msgstr "NOME"
+
+#: Public/form_data/FG_var_card.inc:160
+msgid "DISC"
+msgstr "DISCO"
+
+#: Public/form_data/FG_var_card.inc:161
+#: Public/A2B_card_info.php:465
+msgid "CID"
+msgstr "CID"
+
+#: Public/form_data/FG_var_card.inc:209
+msgid "NO CARDS HAVE BEEN CREATED!"
+msgstr "NON SONO STATE CREATE SCHEDE"
+
+#: Public/form_data/FG_var_card.inc:240
+#: Public/form_data/FG_var_card.inc:334
+#: Public/form_data/FG_var_logrefill.inc:82
+#: Public/form_data/FG_var_payment.inc:89
+#: Public/form_data/FG_var_ticket.inc:71
+#: Public/form_data/FG_var_callerid.inc:57
+#: Public/A2B_card_info.php:105
+#: Public/A2B_refill_info.php:77
+#: Public/A2B_payment_info.php:77
+msgid "ACCOUNT NUMBER"
+msgstr "NUMERO ACCOUNT"
+
+#: Public/form_data/FG_var_card.inc:244
+msgid "MACADDRESS"
+msgstr "MACADDRESS"
+
+#: Public/form_data/FG_var_card.inc:245
+msgid "CUSTOMER ID"
+msgstr "ID UTENTE"
+
+#: Public/form_data/FG_var_card.inc:246
+msgid "SERIAL"
+msgstr "SERIALE"
+
+#: Public/form_data/FG_var_card.inc:248
+msgid "INUSE"
+msgstr "INUSO"
+
+#: Public/form_data/FG_var_card.inc:251
+msgid "SELECT SERIA"
+msgstr "SELEZIONA SERIALE"
+
+#: Public/form_data/FG_var_card.inc:252
+msgid "SELECT LANGUAGE"
+msgstr "SELEZIONA LINGUA"
+
+#: Public/form_data/FG_var_card.inc:253
+msgid "SELECT TARIFF"
+msgstr "SELEZIONA TARIFFA"
+
+#: Public/form_data/FG_var_card.inc:254
+msgid "SELECT STATUS"
+msgstr "SELEZIONA STATO"
+
+#: Public/form_data/FG_var_card.inc:255
+msgid "SELECT ACCESS"
+msgstr "SELEZIONA ACCESSO"
+
+#: Public/form_data/FG_var_card.inc:256
+msgid "SELECT GROUP"
+msgstr "SELEZIONA GRUPPO"
+
+#: Public/form_data/FG_var_card.inc:257
+msgid "SELECT CURRENCY"
+msgstr "SELEZIONA VALUA"
+
+#: Public/form_data/FG_var_card.inc:295
+msgid "SIP buddy"
+msgstr "SIP buddy"
+
+#: Public/form_data/FG_var_card.inc:302
+msgid "IAX buddy"
+msgstr "IAX buddy"
+
+#: Public/form_data/FG_var_card.inc:340
+msgid "Insert the account number"
+msgstr "Inserire il numero account"
+
+#: Public/form_data/FG_var_card.inc:341
+msgid "Customer Information"
+msgstr "Informazioni Utente"
+
+#: Public/form_data/FG_var_card.inc:344
+msgid "WEBUI LOGIN"
+msgstr "LOGIN WEB"
+
+#: Public/form_data/FG_var_card.inc:350
+msgid "Insert the webui login"
+msgstr "Inserisci il login web"
+
+#: Public/form_data/FG_var_card.inc:354
+msgid "WEBUI PASSWORD"
+msgstr "PASSWORD WEB"
+
+#: Public/form_data/FG_var_card.inc:360
+msgid "Insert the password"
+msgstr "Inserire la password"
+
+#: Public/form_data/FG_var_card.inc:361
+msgid "Password for customer to access to the web interface and view the balance."
+msgstr "Passowrd dell'utente per accedere all'interfaccia web e visualizzare il credito"
+
+#: Public/form_data/FG_var_card.inc:372
+msgid "Insert the number of credit"
+msgstr "Inserire il numero di crediti"
+
+#: Public/form_data/FG_var_card.inc:373
+#: Public/form_data/FG_var_card.inc:639
+msgid "currency : "
+msgstr "valuta"
+
+#: Public/form_data/FG_var_card.inc:379
+msgid "CUSTOMER GROUP"
+msgstr "GRUPPO UTENTE"
+
+#: Public/form_data/FG_var_card.inc:398
+#: Public/form_data/FG_var_card.inc:541
+#: Public/form_data/FG_var_card.inc:640
+#: Public/form_data/FG_var_card.inc:691
+msgid "NOT DEFINED"
+msgstr "NON DEFINITO"
+
+#: Public/form_data/FG_var_card.inc:407
+msgid "Insert the lastname of the customers"
+msgstr "Inserire il cognome dell'utente"
+
+#: Public/form_data/FG_var_card.inc:408
+msgid "Personal Information"
+msgstr "Informazioni Personali"
+
+#: Public/form_data/FG_var_card.inc:416
+msgid "Insert the firstname of the customers"
+msgstr "Inserire il nome dell'utente"
+
+#: Public/form_data/FG_var_card.inc:426
+#: Public/form_data/FG_var_agent.inc:124
+msgid "Insert the email"
+msgstr "Inserire l'email"
+
+#: Public/form_data/FG_var_card.inc:436
+msgid "Insert the address of the customers"
+msgstr "Inserire l'indirizzo dell'utente"
+
+#: Public/form_data/FG_var_card.inc:446
+#: Public/form_data/FG_var_agent.inc:88
+msgid "Insert the city"
+msgstr "Inserire la citt&agrave"
+
+#: Public/form_data/FG_var_card.inc:450
+msgid "STATE/PROVINCE"
+msgstr "STATO/PROVINCIA"
+
+#: Public/form_data/FG_var_card.inc:456
+#: Public/form_data/FG_var_agent.inc:97
+msgid "Insert the state"
+msgstr "Inserire lo stato"
+
+#: Public/form_data/FG_var_card.inc:469
+msgid "ZIP/POSTAL CODE"
+msgstr "CODICE POSTALE"
+
+#: Public/form_data/FG_var_card.inc:475
+msgid "Insert the zipcode"
+msgstr "Inserire cap"
+
+#: Public/form_data/FG_var_card.inc:479
+msgid "PHONE NUMBER"
+msgstr "NUMERO DI TELEFONO"
+
+#: Public/form_data/FG_var_card.inc:485
+msgid "Insert the phone number of the customers"
+msgstr "Inserire il numero di telefono dell'utente"
+
+#: Public/form_data/FG_var_card.inc:489
+msgid "FAX NUMBER"
+msgstr "NUMERO FAX"
+
+#: Public/form_data/FG_var_card.inc:495
+msgid "Insert the fax number of the customers"
+msgstr "Inserire il numero fax dell'utente"
+
+#: Public/form_data/FG_var_card.inc:498
+#: Public/A2B_card_info.php:396
+msgid "COMPANY NAME"
+msgstr "NOME SOCIET&Agrave"
+
+#: Public/form_data/FG_var_card.inc:504
+msgid "Insert Company name of this customer"
+msgstr "Inserisci il nome della Societ&agrave dell'utente "
+
+#: Public/form_data/FG_var_card.inc:508
+#: Public/A2B_card_info.php:404
+msgid "COMPANY WEBSITE"
+msgstr "SITO WEB SOCIET&Agrave"
+
+#: Public/form_data/FG_var_card.inc:514
+msgid "Insert the company website of this customer"
+msgstr "Inserire il sito web della societ&agrave dell'utente"
+
+#: Public/form_data/FG_var_card.inc:520
+#: Public/form_data/FG_var_signup_agent.inc:54
+msgid "CALL PLAN"
+msgstr "PIANO DI CHIAMATA"
+
+#: Public/form_data/FG_var_card.inc:533
+msgid "DIDGROUP"
+msgstr "GRUPPO DID"
+
+#: Public/form_data/FG_var_card.inc:553
+#: Public/form_data/FG_var_friend.inc:877
+msgid "TIMEZONE"
+msgstr "FUSO ORARIO"
+
+#: Public/form_data/FG_var_card.inc:561
+#: Public/form_data/FG_var_friend.inc:286
+#: Public/A2B_card_info.php:137
+msgid "LANGUAGE"
+msgstr "LINGUA"
+
+#: Public/form_data/FG_var_card.inc:576
+msgid "Currency used at the customer end."
+msgstr "valuta usata dall'utenete finale."
+
+#: Public/form_data/FG_var_card.inc:589
+#: Public/A2B_card_info.php:195
+#: Public/A2B_card_info.php:198
+msgid "LOCK"
+msgstr "BLOCCA"
+
+#: Public/form_data/FG_var_card.inc:595
+msgid "Choose if you want to enable the lock on this account"
+msgstr "Scegli se vuoi abilitare il blocco di questo account"
+
+#: Public/form_data/FG_var_card.inc:596
+msgid "Enable lock for this account."
+msgstr "Abilita il blocco per questo account"
+
+#: Public/form_data/FG_var_card.inc:602
+#: Public/A2B_card_info.php:203
+msgid "LOCK PIN"
+msgstr "BLOCCO PIN"
+
+#: Public/form_data/FG_var_card.inc:609
+msgid "Code required to make the call if the lock is active."
+msgstr "Codice richiesto per effettuare una chiamata quando &egrave attivo il blocco"
+
+#: Public/form_data/FG_var_card.inc:621
+msgid "RUN SERVICE"
+msgstr "AVVIA SERVIZIO"
+
+#: Public/form_data/FG_var_card.inc:627
+msgid "Choose if you want to enable the service recurring on this account"
+msgstr "Scegli se vuoi abilitare il servizio ricorrente su questo account"
+
+#: Public/form_data/FG_var_card.inc:628
+msgid "Apply recurring service to this account."
+msgstr "Applica il servizio ricorrente a questo account"
+
+#: Public/form_data/FG_var_card.inc:631
+msgid "CREDIT LIMIT NOTIFICATION"
+msgstr "NOTIFICA LIMITE CREDITO"
+
+#: Public/form_data/FG_var_card.inc:639
+msgid "Low credit limit to alert the customer"
+msgstr "Limite di credito basso per avvisare l'utente"
+
+#: Public/form_data/FG_var_card.inc:643
+msgid "PERMITTED NOTIFICATIONS BY MAIL"
+msgstr "PERMETTI LA NOTIFICA VIA EMAIL"
+
+#: Public/form_data/FG_var_card.inc:649
+msgid "Choose if you want to enable the notification by email for this account"
+msgstr "Scegliere se si desidera attivare la notifica via e-mail per questo account"
+
+#: Public/form_data/FG_var_card.inc:650
+msgid "Enable the notification by mail for this account."
+msgstr "Abilita la notifica via email per questo account"
+
+#: Public/form_data/FG_var_card.inc:653
+msgid "EMAIL NOTIFICATION"
+msgstr "EMAIL DI NOTIFICA"
+
+#: Public/form_data/FG_var_card.inc:659
+msgid "Insert the email to notify this customer"
+msgstr "Inserire l'email di notifica per questo utente"
+
+#: Public/form_data/FG_var_card.inc:664
+msgid "PERMITTED VOICEMAIL"
+msgstr "PERMETTI VOICEMAIL"
+
+#: Public/form_data/FG_var_card.inc:670
+msgid "Choose if you want to enable the voicemail functionality for this account"
+msgstr "Scegli se vuoi abilitare la funzionalit&agrave voicemail per questo account"
+
+#: Public/form_data/FG_var_card.inc:671
+msgid "Enable the voicemail functionality for this account."
+msgstr "Abilita la funzionalit&agrave voicemail per questo account"
+
+#: Public/form_data/FG_var_card.inc:673
+msgid "ACTIVE VOICEMAIL SERVICE"
+msgstr "ATTIVA IL SERVIZIO VOICEMAIL"
+
+#: Public/form_data/FG_var_card.inc:679
+msgid "Customer can choose to enable the voicemail for this account"
+msgstr "L'utente pu&ograve scegliere se abilitare la voicemail per questo account"
+
+#: Public/form_data/FG_var_card.inc:680
+msgid "Customer can enable the voicemail for this account."
+msgstr "L'utente pu&ograve abilitare la voicemail per questo account"
+
+#: Public/form_data/FG_var_card.inc:683
+msgid "CAMPAIGN"
+msgstr "CAMPAGNA"
+
+#: Public/form_data/FG_var_card.inc:694
+#: Public/A2B_card_info.php:171
+msgid "FIRST USE DATE"
+msgstr "DATA PRIMO USO"
+
+#: Public/form_data/FG_var_card.inc:704
+msgid "ENABLE EXPIRY"
+msgstr "ABILITA SCADENZA"
+
+#: Public/form_data/FG_var_card.inc:711
+msgid "Select method of expiry for the account."
+msgstr "Seleziona il metodo di scadenza dell'account"
+
+#: Public/form_data/FG_var_card.inc:724
+msgid "EXPIRY DATE"
+msgstr "DATA SCADENZA"
+
+#: Public/form_data/FG_var_card.inc:730
+msgid "Insert the expiration date"
+msgstr "Inserire la data scadenza"
+
+#: Public/form_data/FG_var_card.inc:731
+msgid "please respect the format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"
+msgstr "Rispettare il formato AAAA-MM-GG OO:MM:SS. Per esempio, '2004-12-31 00:23:00'"
+
+#: Public/form_data/FG_var_card.inc:735
+msgid "EXPIRY DAYS"
+msgstr "SCADENZA GIORNI"
+
+#: Public/form_data/FG_var_card.inc:741
+msgid "Insert the number of days after which the account will expire"
+msgstr "Inserire il numero di giorni dopo i quali l'account scadr&agrave"
+
+#: Public/form_data/FG_var_card.inc:742
+msgid "The number of days after which the account will expire."
+msgstr "Numero di giorni dopo i quali l'account scadr&agrav"
+
+#: Public/form_data/FG_var_card.inc:745
+msgid "CREATE SIP CONFIG"
+msgstr "CREARE SIP CONFIG"
+
+#: Public/form_data/FG_var_card.inc:751
+msgid "Choose if you want to enable the sip account"
+msgstr "Scegli se vuoi abilitare l'account sip"
+
+#: Public/form_data/FG_var_card.inc:752
+msgid "Create the SIP config automatically"
+msgstr "Creare il SIP config automaticamnete"
+
+#: Public/form_data/FG_var_card.inc:755
+msgid "CREATE IAX CONFIG"
+msgstr "CREARE IAX CONFIG"
+
+#: Public/form_data/FG_var_card.inc:761
+msgid "Choose if you want to enable the iax account"
+msgstr "Scegli se vuoi abilitare l'account iax"
+
+#: Public/form_data/FG_var_card.inc:762
+msgid "Create the IAX config automatically"
+msgstr "Creare lo IAX config automaticamente"
+
+#: Public/form_data/FG_var_card.inc:764
+msgid "MAC ADDRESS"
+msgstr "MAC ADDRESS"
+
+#: Public/form_data/FG_var_card.inc:770
+msgid "Insert the MAC address customers' device"
+msgstr "Inserire il MAC address del dispositivo dell'utente"
+
+#: Public/form_data/FG_var_card.inc:771
+msgid "FORMAT: 00-08-74-4C-7F-1D"
+msgstr ""
+
+#: Public/form_data/FG_var_card.inc:774
+msgid "IN USE"
+msgstr "IN USO"
+
+#: Public/form_data/FG_var_card.inc:781
+msgid "Updated to show the number of concurrent calls in use by this customer. If there are no currently no calls, and the system shows that there are, manually reset this field back to zero."
+msgstr "Aggiornato mostra il numero di chiamate contemporanee in uso dal cliente. Se non ci sono al momento chiamate, ed il sistema indica che ci sono, reimpostare manualmente questo campo di nuovo a zero."
+
+#: Public/form_data/FG_var_card.inc:783
+#: Public/form_data/FG_var_card.inc:791
+#: Public/A2B_card_info.php:369
+msgid "AUTOREFILL"
+msgstr "AUTO RICARICA"
+
+#: Public/form_data/FG_var_card.inc:789
+msgid "Choose if you want to enable the autorefill on this account"
+msgstr "Scegli se vuoi abilitare l'auro ricarica per questo account"
+
+#: Public/form_data/FG_var_card.inc:790
+msgid "Define if you want to authorize the autorefill to apply on this accout"
+msgstr "Definire se vuoi autorizzare l'auto ricarica da applicare a questo account"
+
+#: Public/form_data/FG_var_card.inc:793
+msgid "INITIAL BALANCE"
+msgstr "CREDITO INIZIALE"
+
+#: Public/form_data/FG_var_card.inc:799
+msgid "Insert the amount of the initial balance"
+msgstr "Inserisci il totale del credito iniziale"
+
+#: Public/form_data/FG_var_card.inc:800
+msgid "The initial balance is used by autorefill to reset the current balance to this amount"
+msgstr "Il credito iniziale &egrave usato dall'auto ricarica per ripristinare il saldo corrente a questo importo "
+
+#: Public/form_data/FG_var_card.inc:804
+#: Public/A2B_card_info.php:377
+msgid "INVOICE DAY"
+msgstr "GIORNO FATTURA"
+
+#: Public/form_data/FG_var_card.inc:811
+msgid "Define the day of the month when the system will generate the customer invoice."
+msgstr "Definisci il giorno del mese in cui il sistema genera la fattura dell'utente"
+
+#: Public/form_data/FG_var_card.inc:812
+msgid "Invoice Status"
+msgstr "Stato Fattura"
+
+#: Public/form_data/FG_var_card.inc:815
+#: Public/checkout_confirmation.php:154
+msgid "VAT"
+msgstr "IVA"
+
+#: Public/form_data/FG_var_card.inc:821
+msgid "Insert the number for the VAT"
+msgstr "Inserire il numero di p. IVA"
+
+#: Public/form_data/FG_var_card.inc:822
+#, c-format
+msgid "VAT to add on the invoice of this customer. it should be a decimal value '21' this will be for 21% of VAT!"
+msgstr "IVA da aggiungere sulla fattura di questo cliente. dovrebbe essere un valore decimale '21' sar&agrave per il 21% di IVA!"
+
+#: Public/form_data/FG_var_card.inc:825
+msgid "VAT REGISTRATION NUMBER "
+msgstr "NUMERO PARTITA IVA"
+
+#: Public/form_data/FG_var_card.inc:831
+msgid "Insert the VAT registration number of this customer"
+msgstr "Inserire il numero di partita IVA del cliente"
+
+#: Public/form_data/FG_var_card.inc:835
+msgid "DISCOUNT"
+msgstr "SCONTO"
+
+#: Public/form_data/FG_var_card.inc:845
+#: Public/A2B_card_info.php:425
+msgid "TRAFFIC PER MONTH"
+msgstr "TRAFFICO MENSILE"
+
+#: Public/form_data/FG_var_card.inc:851
+msgid "Insert the traffic per month for this customer"
+msgstr "Inserire il traffico mensile per questo utente"
+
+#: Public/form_data/FG_var_card.inc:853
+#: Public/form_data/FG_var_card.inc:855
+msgid "TARGET TRAFFIC"
+msgstr "OBIETTIVO MENSILE"
+
+#: Public/form_data/FG_var_card.inc:861
+msgid "Insert the target traffic description"
+msgstr "Inserire la descrizione dell'obiettivo traffico"
+
+#: Public/form_data/FG_var_card.inc:865
+msgid "RESTRICTION"
+msgstr "LIMITAZIONE"
+
+#: Public/form_data/FG_var_card.inc:873
+#: Public/form_data/FG_var_card.inc:875
+msgid "RESTRICTED NUMBERS"
+msgstr "NUMERI LIMITATI"
+
+#: Public/form_data/FG_var_card.inc:881
+msgid "Insert numbers that restrict the customer"
+msgstr "Inserire i numeri che limitano il cliente"
+
+#: Public/form_data/FG_var_card.inc:900
+msgid "CALLERID / CUSTOMER HISTORY"
+msgstr "ID CHIAMANTE / STORICO UTENTE"
+
+#: Public/form_data/FG_var_card.inc:904
+msgid "CUSTOMER HISTORY"
+msgstr "STORICO UTENTE"
+
+#: Public/form_data/FG_var_card.inc:945
+#: Public/form_data/FG_var_def_ratecard.inc:129
+#: Public/form_data/FG_var_moneysituation.inc:78
+#: Public/form_data/FG_var_friend.inc:925
+#: Public/form_data/FG_var_ticket.inc:172
+#: Public/form_data/FG_var_ticket_agent.inc:90
+#: Public/form_data/FG_var_callerid.inc:121
+msgid "click on the delete button."
+msgstr "clicca sul tasto 'ELIMINA'"
+
+#: Public/form_data/FG_var_card.inc:950
+#: Public/form_data/FG_var_def_ratecard.inc:134
+#: Public/form_data/FG_var_ticket.inc:177
+#: Public/form_data/FG_var_ticket_agent.inc:95
+#: Public/form_data/FG_var_callerid.inc:132
+msgid "has been inserted."
+msgstr "&egrave stato inserito"
+
+#: Public/form_data/FG_var_card.inc:954
+#: Public/form_data/FG_var_moneysituation.inc:99
+#: Public/form_data/FG_var_friend.inc:934
+msgid "Once you have completed the form above, click on the CONTINUE button."
+msgstr "Dopo aver completato il modulo sopra, clicca sul pulsante Continua."
+
+#: Public/form_data/FG_var_agent.inc:41
+msgid "Agent"
+msgstr "Agente"
+
+#: Public/form_data/FG_var_agent.inc:61
+msgid "Insert the lastname"
+msgstr "Inserire il cognome"
+
+#: Public/form_data/FG_var_agent.inc:70
+msgid "Insert the firstname"
+msgstr "Inserire il nome"
+
+#: Public/form_data/FG_var_agent.inc:79
+msgid "Insert the address"
+msgstr "Inserire l'indirizzo"
+
+#: Public/form_data/FG_var_agent.inc:106
+msgid "Insert the country"
+msgstr "Inserire il paese"
+
+#: Public/form_data/FG_var_agent.inc:109
+msgid "ZIPCODE"
+msgstr "CAP"
+
+#: Public/form_data/FG_var_agent.inc:115
+msgid "Insert the zip code"
+msgstr "Inserire il cap"
+
+#: Public/form_data/FG_var_agent.inc:133
+msgid "Insert the telephone number"
+msgstr "Inserire il numero di telefono"
+
+#: Public/form_data/FG_var_agent.inc:142
+msgid "Insert the fax number"
+msgstr "Inserire il numero di fax"
+
+#: Public/form_data/FG_var_agent.inc:146
+msgid "COMPANY"
+msgstr "SOCIET&Agrave"
+
+#: Public/form_data/FG_var_agent.inc:152
+msgid "Insert the company"
+msgstr "Inserire la societ&agrave"
+
+#: Public/form_data/FG_var_agent.inc:161
+msgid "Modify your informations"
+msgstr "Modifica le tue informazioni"
+
+#: Public/form_data/FG_var_agent.inc:163
+#: Public/form_data/FG_var_paymentlog.inc:210
+#: Public/form_data/FG_var_ticket.inc:180
+#: Public/form_data/FG_var_ticket_agent.inc:98
+msgid "Click 'Confirm Data' to continue"
+msgstr "Clicca su 'Conferma Dati' per continuare"
+
+#: Public/form_data/FG_var_def_ratecard.inc:70
+#: Public/A2B_card_info.php:829
+#: Public/A2B_card_info.php:916
+msgid "DESTINATION"
+msgstr "DESTINAZIONE"
+
+#: Public/form_data/FG_var_def_ratecard.inc:71
+#: Public/form_data/FG_var_def_ratecard.inc:119
+msgid "PREFIX"
+msgstr "PREFISSO"
+
+#: Public/form_data/FG_var_def_ratecard.inc:72
+msgid "SR"
+msgstr "CM"
+
+#: Public/form_data/FG_var_def_ratecard.inc:73
+msgid "START-DATE"
+msgstr "DATA-AVVIO"
+
+#: Public/form_data/FG_var_def_ratecard.inc:74
+msgid "STOP-DATE"
+msgstr "DATA-FINE"
+
+#: Public/form_data/FG_var_def_ratecard.inc:75
+msgid "CC"
+msgstr "CC"
+
+#: Public/form_data/FG_var_def_ratecard.inc:105
+msgid "NO"
+msgstr "NO"
+
+#: Public/form_data/FG_var_def_ratecard.inc:105
+msgid "HAVE BEEN CREATED."
+msgstr "&Egrave STATO CREATO"
+
+#: Public/form_data/FG_var_def_ratecard.inc:113
+msgid "Define the criteria to search"
+msgstr "Definisci il criterio di ricerca"
+
+#: Public/form_data/FG_var_def_ratecard.inc:115
+msgid "START DATE"
+msgstr "DATA-AVVIO"
+
+#: Public/form_data/FG_var_def_ratecard.inc:128
+msgid "Rates must be entered in the currency base : "
+msgstr "La Tariff deve essere inserita nella valuta base"
+
+#: Public/form_data/FG_var_def_ratecard.inc:138
+msgid "Click 'Confirm Data' to continue."
+msgstr "Clicca 'Conferma Dati' per continuare"
+
+#: Public/form_data/FG_var_moneysituation_details.inc:64
+msgid "AMOUNT INCL VAT"
+msgstr "IMPORTO INCL IVA"
+
+#: Public/form_data/FG_var_moneysituation_details.inc:68
+#: Public/form_data/FG_var_moneysituation.inc:56
+#: Public/form_data/FG_var_ticket.inc:86
+#: Public/form_data/FG_var_ticket_agent.inc:78
+msgid "THERE IS NO"
+msgstr "NON C'&Egrave ALCUN"
+
+#: Public/form_data/FG_var_moneysituation_details.inc:68
+#: Public/form_data/FG_var_moneysituation.inc:56
+#: Public/form_data/FG_var_ticket.inc:86
+#: Public/form_data/FG_var_ticket_agent.inc:78
+msgid "CREATED!"
+msgstr "CREATO"
+
+#: Public/form_data/FG_var_remittance_request.inc:50
+msgid "CANCEL THIS REQUEST"
+msgstr "CANCELLA QUESTA RICHIESTA"
+
+#: Public/form_data/FG_var_remittance_request.inc:58
+#: Public/form_data/FG_var_friend.inc:354
+msgid "TYPE"
+msgstr "TIPO"
+
+#: Public/form_data/FG_var_remittance_request.inc:64
+msgid "THERE ARE NO REMITTANCE REQUEST CREATED!"
+msgstr "NON CI SONO RICHIESTE DI RIMESSA CREATE"
+
+#: Public/form_data/FG_var_logrefill.inc:53
+#: Public/form_data/FG_var_commission.inc:49
+#: Public/form_data/FG_var_payment.inc:56
+msgid "ACCOUNT"
+msgstr "ACCOUNT"
+
+#: Public/form_data/FG_var_commission.inc:51
+#: Public/form_data/FG_var_payment.inc:57
+#: Public/form_data/FG_var_payment_agent.inc:55
+#: Public/A2B_card_info.php:686
+msgid "PAYMENT DATE"
+msgstr "DATA PAGAMENTO"
+
+#: Public/form_data/FG_var_commission.inc:53
+msgid "PAID STATUS"
+msgstr "STATO PAGAMENTO"
+
+#: Public/form_data/FG_var_commission.inc:55
+msgid "LINK TO PAYMENT"
+msgstr "LINK AL PAGAMENTO"
+
+#: Public/form_data/FG_var_payment.inc:58
+#: Public/form_data/FG_var_payment_agent.inc:56
+#: Public/A2B_card_info.php:689
+msgid "PAYMENT AMOUNT"
+msgstr "IMPORTO PAGAMENTO"
+
+#: Public/form_data/FG_var_payment.inc:60
+#: Public/form_data/FG_var_payment_agent.inc:58
+#: Public/A2B_payment_info_agent.php:101
+#: Public/A2B_payment_info.php:107
+msgid "PAYMENT TYPE"
+msgstr "TIPO PAGAMENTO"
+
+#: Public/form_data/FG_var_moneysituation.inc:43
+msgid "CardNumber"
+msgstr "Numero Scheda"
+
+#: Public/form_data/FG_var_moneysituation.inc:49
+msgid "INVOICE"
+msgstr "FATTURA"
+
+#: Public/form_data/FG_var_moneysituation.inc:50
+msgid "PAYMENT"
+msgstr "PAGAMENTO"
+
+#: Public/form_data/FG_var_moneysituation.inc:51
+msgid "TO PAY"
+msgstr "PAGARE"
+
+#: Public/form_data/FG_var_moneysituation.inc:94
+#: Public/form_data/FG_var_callerid.inc:131
+msgid "Add a "
+msgstr "Aggingi a"
+
+#: Public/form_data/FG_var_moneysituation.inc:95
+msgid "Your new "
+msgstr "La tua nuova"
+
+#: Public/form_data/FG_var_friend.inc:75
+msgid "CARDHOLDER"
+msgstr "PROPRITARIO CARTA"
+
+#: Public/form_data/FG_var_friend.inc:76
+#: Public/form_data/FG_var_friend.inc:384
+#: Public/A2B_card_info.php:574
+#: Public/A2B_card_info.php:621
+msgid "USERNAME"
+msgstr "NOME UTENTE"
+
+#: Public/form_data/FG_var_friend.inc:77
+#: Public/form_data/FG_var_friend.inc:166
+msgid "ACCOUNTCODE"
+msgstr "CODICE ACCOUNT"
+
+#: Public/form_data/FG_var_friend.inc:78
+#: Public/form_data/FG_var_friend.inc:216
+#: Public/A2B_card_info.php:577
+#: Public/A2B_card_info.php:624
+msgid "SECRET"
+msgstr "PASSWORD"
+
+#: Public/form_data/FG_var_friend.inc:80
+#: Public/form_data/FG_var_friend.inc:266
+msgid "CONTEXT"
+msgstr "CONTESTO"
+
+#: Public/form_data/FG_var_friend.inc:81
+#: Public/form_data/FG_var_friend.inc:276
+msgid "DEFAULTIP"
+msgstr "IP DEFAULT"
+
+#: Public/form_data/FG_var_friend.inc:86
+msgid "Add SIP Friend"
+msgstr "Aggiungi SIP Friend"
+
+#: Public/form_data/FG_var_friend.inc:88
+msgid "Add IAX Friend"
+msgstr "Aggiungi IAX Friend"
+
+#: Public/form_data/FG_var_friend.inc:143
+#: Public/form_data/FG_var_paymentlog.inc:180
+#: Public/form_data/FG_var_callerid.inc:93
+msgid "ID CARD"
+msgstr "ID SCHEDA"
+
+#: Public/form_data/FG_var_friend.inc:149
+#: Public/form_data/FG_var_paymentlog.inc:186
+#: Public/form_data/FG_var_callerid.inc:99
+msgid "Insert the Id CardNumber"
+msgstr "Inserire il Numero ID della Scheda"
+
+#: Public/form_data/FG_var_friend.inc:153
+msgid "Insert the card ID."
+msgstr "Inserire l'ID della scheda"
+
+#: Public/form_data/FG_var_friend.inc:156
+#: Public/A2B_card_info.php:516
+msgid "NAME"
+msgstr "NOME"
+
+#: Public/form_data/FG_var_friend.inc:162
+msgid "Insert the name"
+msgstr "Inserire il nome"
+
+#: Public/form_data/FG_var_friend.inc:172
+msgid "Insert the accountcode"
+msgstr "Inserire il codice account"
+
+#: Public/form_data/FG_var_friend.inc:176
+msgid "REGEXTEN"
+msgstr "REG.ESTENSIONE"
+
+#: Public/form_data/FG_var_friend.inc:182
+msgid "Insert the regexten"
+msgstr "Inserire la reg.estensione"
+
+#: Public/form_data/FG_var_friend.inc:192
+msgid "Insert the callerid"
+msgstr "Inserire l'id chiamante"
+
+#: Public/form_data/FG_var_friend.inc:196
+msgid "CID NUMBER"
+msgstr "NUMERO CID"
+
+#: Public/form_data/FG_var_friend.inc:202
+msgid "Insert the cid number"
+msgstr "Inserire il numero cid"
+
+#: Public/form_data/FG_var_friend.inc:206
+msgid "AMAFLAGS"
+msgstr "AMAFLAGS"
+
+#: Public/form_data/FG_var_friend.inc:212
+msgid "Insert the amaflags"
+msgstr "Inserire l'amaflags"
+
+#: Public/form_data/FG_var_friend.inc:222
+msgid "Insert the secret"
+msgstr "Inserire la password"
+
+#: Public/form_data/FG_var_friend.inc:226
+msgid "QUALIFY"
+msgstr "QUALIFICA"
+
+#: Public/form_data/FG_var_friend.inc:232
+msgid "Insert the qualify"
+msgstr "Inserire la qualifica"
+
+#: Public/form_data/FG_var_friend.inc:236
+msgid "DISALLOW"
+msgstr "VIETATI"
+
+#: Public/form_data/FG_var_friend.inc:242
+msgid "Insert the disallow"
+msgstr "Inserire i vietati"
+
+#: Public/form_data/FG_var_friend.inc:243
+msgid "Need to disallow=all before we can use allow. (default : all)"
+msgstr "Impostare 'VIETATI' = all prima di poter definire quelli 'PERMESSI'. (default: all)"
+
+#: Public/form_data/FG_var_friend.inc:246
+msgid "ALLOW"
+msgstr "PERMESSI"
+
+#: Public/form_data/FG_var_friend.inc:252
+msgid "Insert the allow"
+msgstr "Inserire quelli permessi"
+
+#: Public/form_data/FG_var_friend.inc:253
+msgid "Set allow codecs separated by a comma, e.g. gsm,alaw,ulaw (default : ulaw,alaw,gsm,g729)"
+msgstr "Impostare i codecs permessi separati da virgola, es.: gsm,alaw,ulaw (default : ulaw,alaw,gsm,g729)"
+
+#: Public/form_data/FG_var_friend.inc:256
+msgid "HOST"
+msgstr "HOST"
+
+#: Public/form_data/FG_var_friend.inc:262
+msgid "Insert the host"
+msgstr "Inserire l'host"
+
+#: Public/form_data/FG_var_friend.inc:263
+msgid "Use dynamic or set an IP (default : dynamic)"
+msgstr "Usa dynamic o imposta un IP (default : dynamic)"
+
+#: Public/form_data/FG_var_friend.inc:272
+msgid "Insert the context"
+msgstr "Inserire il contesto"
+
+#: Public/form_data/FG_var_friend.inc:273
+msgid "Set the context for this user (default : a2billing)"
+msgstr "Impostare il contesto per questo utente (default : a2billing)"
+
+#: Public/form_data/FG_var_friend.inc:282
+msgid "Insert the defaultip"
+msgstr "Inserire l'IP di default"
+
+#: Public/form_data/FG_var_friend.inc:292
+msgid "Insert the language"
+msgstr "Inserire la lingua"
+
+#: Public/form_data/FG_var_friend.inc:296
+msgid "PORT"
+msgstr "PORTA"
+
+#: Public/form_data/FG_var_friend.inc:302
+msgid "Insert the port"
+msgstr "Inserire la porta"
+
+#: Public/form_data/FG_var_friend.inc:306
+msgid "REGSECONDS"
+msgstr "SECONDI REG."
+
+#: Public/form_data/FG_var_friend.inc:312
+msgid "Insert the regseconds"
+msgstr "Inserire la reg.secondi"
+
+#: Public/form_data/FG_var_friend.inc:316
+msgid "IPADDR"
+msgstr "INDIR.IP"
+
+#: Public/form_data/FG_var_friend.inc:322
+msgid "Insert the ipaddr"
+msgstr "Inserire l'indir.ip"
+
+#: Public/form_data/FG_var_friend.inc:325
+msgid "MOHSUGGEST"
+msgstr "MOH SUGGERITO"
+
+#: Public/form_data/FG_var_friend.inc:331
+msgid "Insert the mohsuggest"
+msgstr "Inserire il moh suggerito"
+
+#: Public/form_data/FG_var_friend.inc:335
+msgid "AUTH"
+msgstr "AUTOR."
+
+#: Public/form_data/FG_var_friend.inc:341
+msgid "Insert the auth"
+msgstr "Inserire l'autor."
+
+#: Public/form_data/FG_var_friend.inc:345
+msgid "SETVAR"
+msgstr "IMP.VAR"
+
+#: Public/form_data/FG_var_friend.inc:351
+msgid "Insert the setvar"
+msgstr "Inserire l'imp.var"
+
+#: Public/form_data/FG_var_friend.inc:360
+msgid "Insert the type"
+msgstr "Inserire il tipo"
+
+#: Public/form_data/FG_var_friend.inc:361
+msgid "type = friend | peer | user (default : friend)"
+msgstr "tipo = friend | peer | user (default : friend)"
+
+#: Public/form_data/FG_var_friend.inc:363
+msgid "DENY"
+msgstr "RIFIUTA"
+
+#: Public/form_data/FG_var_friend.inc:369
+msgid "Insert the deny"
+msgstr "Inserire quelli rifiutati"
+
+#: Public/form_data/FG_var_friend.inc:372
+msgid "PERMIT"
+msgstr "PERMETTI"
+
+#: Public/form_data/FG_var_friend.inc:378
+msgid "Insert the permit"
+msgstr "Inserire quelli permessi"
+
+#: Public/form_data/FG_var_friend.inc:390
+msgid "Insert the username"
+msgstr "Inserire il nome utente"
+
+#: Public/form_data/FG_var_friend.inc:393
+msgid "MD5SECRET"
+msgstr "MD5 PASSWORD"
+
+#: Public/form_data/FG_var_friend.inc:399
+msgid "Insert the md5secret"
+msgstr "Inserire la md5 password"
+
+#: Public/form_data/FG_var_friend.inc:403
+msgid "NAT"
+msgstr "NAT"
+
+#: Public/form_data/FG_var_friend.inc:409
+msgid "Insert the nat"
+msgstr "Inserire la nat"
+
+#: Public/form_data/FG_var_friend.inc:410
+msgid "nat = yes | no | never | route (default : yes)"
+msgstr "nat = yes | no | never | route ( defaut: yes )"
+
+#: Public/form_data/FG_var_friend.inc:413
+msgid "DTMFMODE"
+msgstr "TONI DTMF"
+
+#: Public/form_data/FG_var_friend.inc:419
+msgid "Insert the dtmfmode"
+msgstr "Inserire i toni dtmf"
+
+#: Public/form_data/FG_var_friend.inc:420
+msgid "dtmfmode = RFC2833 | INFO | INBAND | AUTO (default : RFC2833)"
+msgstr "toni dtmf = RFC2833 | INFO | INBAND | AUTO (default : RFC2833)"
+
+#: Public/form_data/FG_var_friend.inc:424
+msgid "CANREINVITE"
+msgstr "CANREINVITE"
+
+#: Public/form_data/FG_var_friend.inc:430
+msgid "Insert the canreinvite"
+msgstr "Inserire il canreinvite"
+
+#: Public/form_data/FG_var_friend.inc:431
+msgid "canreinvite : yes | no (default : yes)"
+msgstr "canreinvite : si | no (default : si)"
+
+#: Public/form_data/FG_var_friend.inc:436
+msgid "CALLGROUP"
+msgstr "CHIAMATA DI GRUPPO"
+
+#: Public/form_data/FG_var_friend.inc:442
+msgid "Insert the callgroup"
+msgstr "Inserire la chiamata di gruppo"
+
+#: Public/form_data/FG_var_friend.inc:448
+msgid "FROMUSER"
+msgstr "DALL'UTENTE"
+
+#: Public/form_data/FG_var_friend.inc:454
+msgid "Insert the fromuser"
+msgstr "Inserire dall'utente"
+
+#: Public/form_data/FG_var_friend.inc:458
+msgid "FROMDOMAIN"
+msgstr "DAL DOMINIO"
+
+#: Public/form_data/FG_var_friend.inc:464
+msgid "Insert the fromdomain"
+msgstr "Inserire dal dominio"
+
+#: Public/form_data/FG_var_friend.inc:468
+msgid "INSECURE"
+msgstr "INSICURO"
+
+#: Public/form_data/FG_var_friend.inc:474
+msgid "Insert the insecure"
+msgstr "Inserire insicuro"
+
+#: Public/form_data/FG_var_friend.inc:478
+msgid "MAILBOX"
+msgstr "EMAIL"
+
+#: Public/form_data/FG_var_friend.inc:484
+msgid "Insert the mailbox"
+msgstr "Inserire l'email"
+
+#: Public/form_data/FG_var_friend.inc:489
+msgid "MASK"
+msgstr "MASCHERA"
+
+#: Public/form_data/FG_var_friend.inc:495
+msgid "Insert the mask"
+msgstr "Inserire la maschera"
+
+#: Public/form_data/FG_var_friend.inc:499
+msgid "PICKUPGROUP"
+msgstr "GRUPPO PICKUP"
+
+#: Public/form_data/FG_var_friend.inc:505
+msgid "Insert the pickupgroup"
+msgstr "Inserire il gruppo pickup"
+
+#: Public/form_data/FG_var_friend.inc:509
+msgid "RESTRICTCID"
+msgstr "CID RISTRETTI"
+
+#: Public/form_data/FG_var_friend.inc:515
+msgid "Insert the restrictcid"
+msgstr "Inserire i cid ristretti"
+
+#: Public/form_data/FG_var_friend.inc:519
+msgid "RTPTIMEOUT"
+msgstr "TIMEOUT RTP"
+
+#: Public/form_data/FG_var_friend.inc:525
+msgid "Insert the rtptimeout"
+msgstr "Inserire il timeout rtp"
+
+#: Public/form_data/FG_var_friend.inc:529
+msgid "RTPHOLDTIMEOUT"
+msgstr "TIMEOUT RTP ATTESA"
+
+#: Public/form_data/FG_var_friend.inc:535
+msgid "Insert the rtpholdtimeout"
+msgstr "Inserire il timeout rtp attesa"
+
+#: Public/form_data/FG_var_friend.inc:539
+msgid "MUSICONHOLD"
+msgstr "MUSICA ATTESA"
+
+#: Public/form_data/FG_var_friend.inc:545
+msgid "Insert the musiconhold"
+msgstr "Inserire la musica d'attesa"
+
+#: Public/form_data/FG_var_friend.inc:549
+msgid "CANCALLFORWARD"
+msgstr "PU&Ograve GIRARE CHIAMATA"
+
+#: Public/form_data/FG_var_friend.inc:555
+msgid "Insert the cancallforward"
+msgstr "Inserire il pu&ograve girare chiamata"
+
+#: Public/form_data/FG_var_friend.inc:556
+msgid "cancallforward = yes | no (default : yes)"
+msgstr "pu&ograve girare chiamata = si | no ( default : si )"
+
+#: Public/form_data/FG_var_friend.inc:559
+msgid "DEFAULTUSER"
+msgstr "UTENTE DEFAULT"
+
+#: Public/form_data/FG_var_friend.inc:569
+msgid "SUBSCRIBEMWI"
+msgstr "ABBONATO MWI"
+
+#: Public/form_data/FG_var_friend.inc:579
+msgid "VMEXTEN"
+msgstr "ESTENSIONE VM"
+
+#: Public/form_data/FG_var_friend.inc:589
+msgid "CALLINGPRES"
+msgstr "PRES. CHIAMANTE"
+
+#: Public/form_data/FG_var_friend.inc:599
+msgid "USEREQPHONE"
+msgstr "USA RICH.TELEFONO"
+
+#: Public/form_data/FG_var_friend.inc:609
+msgid "INCOMINGLIMIT"
+msgstr "LIMITE IN ARRIVO"
+
+#: Public/form_data/FG_var_friend.inc:619
+msgid "SUBSCRIBECONTEXT"
+msgstr "ABBONAMENTO CONTESTO"
+
+#: Public/form_data/FG_var_friend.inc:629
+msgid "MUSICCLASS"
+msgstr "CLASSE MUSICA"
+
+#: Public/form_data/FG_var_friend.inc:639
+msgid "ALLOWTRANSFER"
+msgstr "PERMETTI TRASFERIMENTO"
+
+#: Public/form_data/FG_var_friend.inc:649
+msgid "AUTOFRAMING"
+msgstr "AUTOFRAMING"
+
+#: Public/form_data/FG_var_friend.inc:659
+msgid "MAXCALLBITRATE"
+msgstr "MASSIMO BITRATE CHIAMATA"
+
+#: Public/form_data/FG_var_friend.inc:669
+msgid "OUTBOUNDPROXY"
+msgstr "PROXI USCITA"
+
+#: Public/form_data/FG_var_friend.inc:679
+msgid "REGSERVER"
+msgstr "SERVER REG."
+
+#: Public/form_data/FG_var_friend.inc:689
+msgid "RTPKEEPALIVE"
+msgstr "TIENI ATTIVO RTP"
+
+#: Public/form_data/FG_var_friend.inc:700
+msgid "TRUNK"
+msgstr "TRUNK"
+
+#: Public/form_data/FG_var_friend.inc:706
+msgid "Define the iax trunking"
+msgstr "Definire lo iax trunking"
+
+#: Public/form_data/FG_var_friend.inc:707
+msgid "iax trunking = yes | no (default : yes)"
+msgstr "iax trunking = yes | no (default : yes)"
+
+#: Public/form_data/FG_var_friend.inc:710
+msgid "DBSECRET"
+msgstr "DBSECRET"
+
+#: Public/form_data/FG_var_friend.inc:720
+msgid "REGCONTEXT"
+msgstr "REGCONTEXT"
+
+#: Public/form_data/FG_var_friend.inc:730
+msgid "SOURCEADDRESS"
+msgstr "SOURCEADDRESS"
+
+#: Public/form_data/FG_var_friend.inc:739
+msgid "MOHINTERPRET"
+msgstr "MOHINTERPRET"
+
+#: Public/form_data/FG_var_friend.inc:749
+msgid "INKEYS"
+msgstr "CHIAVE IN"
+
+#: Public/form_data/FG_var_friend.inc:759
+msgid "OUTKEY"
+msgstr "CHIAVE OUT"
+
+#: Public/form_data/FG_var_friend.inc:768
+msgid "SENDANI"
+msgstr "INVIA ANI"
+
+#: Public/form_data/FG_var_friend.inc:777
+msgid "FULLNAME"
+msgstr "NOME COMPLETO"
+
+#: Public/form_data/FG_var_friend.inc:787
+msgid "MAXAUTHREQ"
+msgstr "MASSIMA AUT. RICH."
+
+#: Public/form_data/FG_var_friend.inc:797
+msgid "ENCRYPTION"
+msgstr "CRITTOGRAFIA"
+
+#: Public/form_data/FG_var_friend.inc:807
+msgid "TRANSFER"
+msgstr "TRASFERIMENTO"
+
+#: Public/form_data/FG_var_friend.inc:817
+msgid "JITTERBUFFER"
+msgstr "BUFFER JITTER"
+
+#: Public/form_data/FG_var_friend.inc:827
+msgid "FORCEJITTERBUFFER"
+msgstr "FORZA BUFFER JITTER"
+
+#: Public/form_data/FG_var_friend.inc:837
+msgid "CODECPRIORITY"
+msgstr "CODECPRIORITY"
+
+#: Public/form_data/FG_var_friend.inc:847
+msgid "QUALIFYSMOOTHING"
+msgstr "QUALIFICA SMOOTHING"
+
+#: Public/form_data/FG_var_friend.inc:857
+msgid "QUALIFYFREQOK"
+msgstr "QUALIFICA FREQOK"
+
+#: Public/form_data/FG_var_friend.inc:867
+msgid "QUALIFYFREQNOTOK"
+msgstr "QUALIFICA FREQNOTOK"
+
+#: Public/form_data/FG_var_friend.inc:887
+msgid "ADSI"
+msgstr "ADSI"
+
+#: Public/form_data/FG_var_friend.inc:930
+msgid "has been inserted. <br>"
+msgstr "&egrave stato inserito. <br>"
+
+#: Public/form_data/FG_var_signup_agent.inc:47
+msgid "Add Signup KEY"
+msgstr "Aggiungi la CHIAVE di registrazione"
+
+#: Public/form_data/FG_var_signup_agent.inc:52
+msgid "KEY"
+msgstr "CHIAVE"
+
+#: Public/form_data/FG_var_paymentlog.inc:97
+msgid "Id"
+msgstr "Id"
+
+#: Public/form_data/FG_var_paymentlog.inc:98
+msgid "Created At"
+msgstr "Creato At"
+
+#: Public/form_data/FG_var_paymentlog.inc:99
+#: Public/checkout_confirmation.php:140
+msgid "Payment Method"
+msgstr "Metodo di pagamento"
+
+#: Public/form_data/FG_var_paymentlog.inc:101
+msgid "Owner"
+msgstr "Proprietario"
+
+#: Public/form_data/FG_var_paymentlog.inc:102
+#: Public/checkout_confirmation.php:144
+msgid "Amount"
+msgstr "Totale"
+
+#: Public/form_data/FG_var_paymentlog.inc:103
+msgid "CardID"
+msgstr "ID Scheda"
+
+#: Public/form_data/FG_var_paymentlog.inc:104
+msgid "Cardnumber"
+msgstr "Numero Scheda"
+
+#: Public/form_data/FG_var_paymentlog.inc:109
+msgid "THERE ARE NO "
+msgstr "NON CI SONO"
+
+#: Public/form_data/FG_var_paymentlog.inc:125
+msgid "Insert the Id "
+msgstr "Inserire l'Id"
+
+#: Public/form_data/FG_var_paymentlog.inc:127
+msgid "Select the ID"
+msgstr "Selezionare l'Id"
+
+#: Public/form_data/FG_var_paymentlog.inc:136
+msgid "Insert the creation date"
+msgstr "Inserire la data creazione"
+
+#: Public/form_data/FG_var_paymentlog.inc:140
+msgid "PAYMENT METHOD"
+msgstr "METODO DI PAGAMENO"
+
+#: Public/form_data/FG_var_paymentlog.inc:146
+msgid "Insert the payment method"
+msgstr "Inserire il metodo di pagamento"
+
+#: Public/form_data/FG_var_paymentlog.inc:147
+msgid "Enter the payment method "
+msgstr "Immettere il metodo di pagamento"
+
+#: Public/form_data/FG_var_paymentlog.inc:159
+msgid "OWNER"
+msgstr "PROPRIETARIO"
+
+#: Public/form_data/FG_var_paymentlog.inc:165
+msgid "Insert the owner"
+msgstr "Inserire il proprietario"
+
+#: Public/form_data/FG_var_paymentlog.inc:166
+msgid "Enter the owner"
+msgstr "Immettere il proprietario"
+
+#: Public/form_data/FG_var_paymentlog.inc:175
+msgid "Insert the amount"
+msgstr "Inserire il totale"
+
+#: Public/form_data/FG_var_paymentlog.inc:176
+msgid "Enter the amount "
+msgstr "Immettere il totale"
+
+#: Public/form_data/FG_var_paymentlog.inc:190
+msgid "Select the Card Number ID"
+msgstr "Selezionare il Numero ID della Scheda"
+
+#: Public/form_data/FG_var_ticket.inc:70
+msgid "CUSTOMER"
+msgstr "UTENTE"
+
+#: Public/form_data/FG_var_ticket.inc:72
+#: Public/form_data/FG_var_ticket.inc:124
+#: Public/form_data/FG_var_ticket_agent.inc:64
+msgid "TITLE"
+msgstr "TITOLO"
+
+#: Public/form_data/FG_var_ticket.inc:73
+#: Public/form_data/FG_var_ticket_agent.inc:65
+msgid "CREATIONDATE"
+msgstr "DATA CREAZIONE"
+
+#: Public/form_data/FG_var_ticket.inc:74
+#: Public/form_data/FG_var_ticket.inc:132
+#: Public/form_data/FG_var_ticket_agent.inc:66
+msgid "COMPONENT"
+msgstr "COMPONENTE"
+
+#: Public/form_data/FG_var_ticket.inc:75
+#: Public/form_data/FG_var_ticket.inc:142
+#: Public/form_data/FG_var_ticket_agent.inc:67
+msgid "PRIORITY"
+msgstr "PRIORIT&Agrave"
+
+#: Public/form_data/FG_var_ticket.inc:111
+msgid "CREATOR"
+msgstr "CRATORE"
+
+#: Public/form_data/FG_var_ticket.inc:117
+msgid "Insert the Customer ID"
+msgstr "Inserire l'ID dell'Utente"
+
+#: Public/form_data/FG_var_ticket.inc:121
+msgid "Set the Customer ID"
+msgstr "Imposta l'ID dell'Utente"
+
+#: Public/form_data/FG_var_ticket.inc:130
+msgid "Insert the Title of ticket "
+msgstr "Inserire il titolo del ticket"
+
+#: Public/form_data/FG_var_ticket.inc:157
+msgid "Insert the description"
+msgstr "Inserire la descrizione"
+
+#: Public/form_data/FG_var_ticket_agent.inc:68
+msgid "TO SEE?"
+msgstr "DA VEDERE?"
+
+#: Public/form_data/FG_var_callerid.inc:49
+msgid "Add CallerID"
+msgstr "Aggiungi ID chiamante"
+
+#: Public/form_data/FG_var_callerid.inc:58
+msgid "CUSTOMER NAME"
+msgstr "NOME UTENTE"
+
+#: Public/form_data/FG_var_callerid.inc:64
+msgid " CREATED!"
+msgstr " CREATO!"
+
+#: Public/form_data/FG_var_callerid.inc:81
+msgid "Insert the CallerID"
+msgstr "Inserire l'ID Chiamante"
+
+#: Public/form_data/FG_var_callerid.inc:90
+msgid "Choose if you want to activate this card"
+msgstr "Scegli se vuoi attivare questa scheda"
+
+#: Public/form_data/FG_var_callerid.inc:103
+msgid "Define the card number ID to use."
+msgstr "Definisci il numero ID della scheda da usare"
+
+#: Public/form_data/FG_var_callerid.inc:120
+msgid "Modify via the form below, the properties of the callerID"
+msgstr "Modifica attraverso il modulo sotto, le propiet&agrave dell'ID chiamante"
+
+#: Public/form_data/FG_var_callerid.inc:136
+msgid "Click Confirm Data to apply your changes"
+msgstr "Clicca Conferma Dati per applicare i cambi"
+
+#: Public/A2B_payment_info_agent.php:72
+#: Public/A2B_payment_info.php:72
+msgid "PAYMENT INFO"
+msgstr "INFO PAGAMENTI"
+
+#: Public/A2B_payment_info_agent.php:120
+#: Public/A2B_payment_info.php:126
+msgid "LINK REFILL"
+msgstr "LINK RICARICA"
+
+#: Public/A2B_payment_info_agent.php:123
+#: Public/A2B_payment_info.php:129
+msgid "Link to the refill"
+msgstr "Link alla ricarica"
+
+#: Public/A2B_payment_info_agent.php:133
+msgid "PAYMENTS AGENT LIST"
+msgstr "LISTA PAGAMENTI AGENTI"
+
+#: Public/A2B_ticket_view.php:51
+msgid "Ticket updated successfully"
+msgstr "Il ticket &egrave stato aggiornato con successo"
+
+#: Public/A2B_ticket_view.php:57
+msgid "Ticket ID not found"
+msgstr "ID del ticket non trovato"
+
+#: Public/A2B_ticket_view.php:93
+msgid "TICKET: "
+msgstr "TICKET: "
+
+#: Public/A2B_ticket_view.php:103
+msgid "BY : "
+msgstr "DA : "
+
+#: Public/A2B_ticket_view.php:109
+msgid "PRIORITY : "
+msgstr "PRIORIT&Agrave : "
+
+#: Public/A2B_ticket_view.php:112
+msgid "DATE : "
+msgstr "DATA : "
+
+#: Public/A2B_ticket_view.php:117
+msgid "COMPONENT : "
+msgstr "COMPONENTE : "
+
+#: Public/A2B_ticket_view.php:124
+msgid "DESCRIPTION : "
+msgstr "DESCRIZIONE : "
+
+#: Public/A2B_ticket_view.php:157
+msgid "STATUS : "
+msgstr "STATO : "
+
+#: Public/A2B_ticket_view.php:176
+msgid "COMMENT : "
+msgstr "COMMENTO : "
+
+#: Public/checkout_confirmation.php:100
+msgid "No Transaction ID found"
+msgstr "ID transazione non trovato"
+
+#: Public/checkout_confirmation.php:133
+msgid "Please confirm your order"
+msgstr "Conferma ordine"
+
+#: Public/checkout_confirmation.php:164
+msgid "Total Amount Incl. VAT"
+msgstr "Totale incl. IVA"
+
+#: Public/checkout_confirmation.php:181
+msgid "Please click button to confirm your order"
+msgstr "Clicca sul tasto per confermare l'ordine"
+
+#: Public/A2B_signup_agent.php:102
+msgid "Create signup url for a specific agent, customer group and Call Plan."
+msgstr "Crea una url di registrazione per uno specifico agente, gruppo utente e Piano di Chiamata"
+
+#: Public/A2B_signup_agent.php:109
+msgid "Choose the Call Plan to use"
+msgstr "Scegli il Piano di Chiamata da usare"
+
+#: Public/A2B_signup_agent.php:111
+#: Public/A2B_entity_card_multi.php:360
+msgid "Choose a Call Plan"
+msgstr "Scegli un Piano di Chiamata"
+
+#: Public/A2B_signup_agent.php:121
+msgid "Choose the Customer group to use"
+msgstr "Scegli un gruppo Utenti da usare"
+
+#: Public/A2B_signup_agent.php:123
+msgid "Choose a Customer Group"
+msgstr "Scegli un Gruppo Utente"
+
+#: Public/A2B_signup_agent.php:145
+msgid "RETURN TO URL KEY LIST"
+msgstr "RITORNA AL URL DELLA LISTA CHIAVI"
+
+#: Public/A2B_signup_agent.php:150
+msgid "ADD URL KEY"
+msgstr "AGGIUNGI CHIAVE URL"
+
+#: Public/A2B_signup_agent.php:168
+msgid "URL"
+msgstr "URL"
+
+#: Public/A2B_signup_agent.php:168
+msgid "Link to the URL"
+msgstr "Link al URL"
+
+#: Public/A2B_entity_paymentlog.php:149
+msgid "SELECT DAY"
+msgstr "SELEZIONA GIORNO"
+
+#: Public/A2B_entity_friend.php:180
+msgid "CONFIGURATION TYPE"
+msgstr "TIPO CONFIGURAZIONE"
+
+#: Public/card-history.php:97
+#: Public/templates/default/main.tpl:58
+msgid "Card History"
+msgstr "Storico Schede"
+
+#: Public/card-history.php:197
+msgid "SELECT BY MONTH"
+msgstr "SELEZIONA PER MESE"
+
+#: Public/card-history.php:203
+#: Public/card-history.php:254
+msgid "FROM"
+msgstr "DA"
+
+#: Public/card-history.php:207
+#: Public/card-history.php:228
+#: Public/card-history.php:267
+#: Public/card-history.php:295
+msgid "JANUARY"
+msgstr "GENNAIO"
+
+#: Public/card-history.php:207
+#: Public/card-history.php:228
+#: Public/card-history.php:267
+#: Public/card-history.php:295
+msgid "FEBRUARY"
+msgstr "FEBBRAIO"
+
+#: Public/card-history.php:207
+#: Public/card-history.php:228
+#: Public/card-history.php:267
+#: Public/card-history.php:295
+msgid "MARCH"
+msgstr "MARZO"
+
+#: Public/card-history.php:207
+#: Public/card-history.php:228
+#: Public/card-history.php:267
+#: Public/card-history.php:295
+msgid "APRIL"
+msgstr "APRILE"
+
+#: Public/card-history.php:207
+#: Public/card-history.php:228
+#: Public/card-history.php:267
+#: Public/card-history.php:295
+msgid "MAY"
+msgstr "MAGGIO"
+
+#: Public/card-history.php:207
+#: Public/card-history.php:228
+#: Public/card-history.php:267
+#: Public/card-history.php:295
+msgid "JUNE"
+msgstr "GIUGNO"
+
+#: Public/card-history.php:207
+#: Public/card-history.php:228
+#: Public/card-history.php:267
+#: Public/card-history.php:295
+msgid "JULY"
+msgstr "LUGLIO"
+
+#: Public/card-history.php:207
+#: Public/card-history.php:228
+#: Public/card-history.php:267
+#: Public/card-history.php:295
+msgid "AUGUST"
+msgstr "AGOSTO"
+
+#: Public/card-history.php:207
+#: Public/card-history.php:228
+#: Public/card-history.php:267
+#: Public/card-history.php:295
+msgid "SEPTEMBER"
+msgstr "SETTEMBRE"
+
+#: Public/card-history.php:207
+#: Public/card-history.php:228
+#: Public/card-history.php:267
+#: Public/card-history.php:295
+msgid "OCTOBER"
+msgstr "OTTOBRE"
+
+#: Public/card-history.php:207
+#: Public/card-history.php:228
+#: Public/card-history.php:267
+#: Public/card-history.php:295
+msgid "NOVEMBER"
+msgstr "NOVEMBRE"
+
+#: Public/card-history.php:207
+#: Public/card-history.php:228
+#: Public/card-history.php:267
+#: Public/card-history.php:295
+msgid "DECEMBER"
+msgstr "DICEMBRE"
+
+#: Public/card-history.php:223
+#: Public/card-history.php:282
+msgid "TO"
+msgstr "A"
+
+#: Public/card-history.php:249
+msgid "SELECT BY DAY"
+msgstr ""
+
+#: Public/card-history.php:316
+msgid "Search"
+msgstr "Cerca"
+
+#: Public/PP_error.php:56
+msgid "ERROR : ACCESS REFUSED"
+msgstr "ERRORE : ACCESSO RIFIUTATO"
+
+#: Public/PP_error.php:57
+msgid "Sorry a problem occur on our system, please try later!"
+msgstr "Spiacente, errore di sistema, prego riprovare pi&ugrave tardi!"
+
+#: Public/PP_error.php:58
+msgid "There is an error on this page!"
+msgstr "C'&egrave un errore in questa  pagina!"
+
+#: Public/PP_error.php:59
+msgid "Sorry, you don't have access to this page !"
+msgstr "Spiacente, non hai accesso a questa pagina !"
+
+#: Public/PP_error.php:60
+msgid "Invalid User Id !"
+msgstr "Id Utente non valido"
+
+#: Public/PP_error.php:61
+msgid "No such card number found. Please check your card number!"
+msgstr "Numero scheda non trovato. Controlla il numero scheda"
+
+#: Public/PP_error.php:71
+msgid "ERROR PAGE"
+msgstr "ERRORE PAGINA"
+
+#: Public/PP_error.php:88
+msgid "GO TO LOGIN PAGE"
+msgstr "VAI ALLA PAGINA DI LOGIN"
+
+#: Public/checkout_success.php:64
+msgid "Thank you for your purchase"
+msgstr "Grazie per l'acquisto"
+
+#: Public/checkout_success.php:79
+msgid "We are sorry your transaction is pending."
+msgstr "Spiacenti, la tua transazione &egrave sospesa"
+
+#: Public/A2B_entity_signup_agent.php:54
+msgid "click outside box to close"
+msgstr "clicca fuori dal riquadro per chiuderlo"
+
+#: Public/A2B_entity_agent.php:77
+msgid "Your personal information is updated successfully."
+msgstr "Le tue informazioni personali sono state aggiornate con successo."
+
+#: Public/graph_stat.php:54
+#: Public/graph_statbar.php:56
+msgid "Calldate"
+msgstr "Data chiamata"
+
+#: Public/graph_stat.php:55
+#: Public/graph_statbar.php:57
+msgid "CalledNumber"
+msgstr "Numero chiamato"
+
+#: Public/graph_stat.php:58
+#: Public/graph_statbar.php:60
+msgid "CardUsed"
+msgstr ""
+
+#: Public/graph_stat.php:59
+#: Public/graph_statbar.php:61
+msgid "terminatecauseid"
+msgstr "id causa terminazione"
+
+#: Public/graph_stat.php:60
+#: Public/graph_statbar.php:62
+msgid "IAX/SIP"
+msgstr "IAX/SIP"
+
+#: Public/graph_stat.php:61
+#: Public/graph_statbar.php:63
+msgid "InitialRate"
+msgstr "Tariffa iniziale"
+
+#: Public/graph_stat.php:62
+#: Public/graph_statbar.php:64
+msgid "Cost"
+msgstr "Costo"
+
+#: Public/graph_stat.php:259
+msgid "Statistic : Number of call by Hours"
+msgstr "Statistica : Numero di chiamate per Ora"
+
+#: Public/graph_stat.php:260
+#: Public/graph_statbar.php:234
+msgid "Statistic : Minutes by Hours"
+msgstr ""
+
+#: Public/graph_stat.php:261
+msgid "Statistic : Profits by Hours"
+msgstr "Statistica : Profitto per Ora"
+
+#: Public/graph_stat.php:262
+msgid "Statistic : Sells by Hours"
+msgstr "Statistica : Vendite per Ora"
+
+#: Public/graph_stat.php:263
+msgid "Statistic : Buys by Hours"
+msgstr "Statistica : Acquisto per Ora"
+
+#: Public/checkout_process.php:275
+msgid "No Such Customer exists."
+msgstr "Tale Utente non esiste"
+
+#: Public/checkout_payment.php:303
+msgid "Please enter the order amount"
+msgstr "Immettere il totale dell'importo"
+
+#: Public/checkout_payment.php:310
+msgid "Total Amount"
+msgstr "Totale Importo"
+
+#: Public/graph_statbar.php:233
+msgid "Statistic : Load by hours"
+msgstr "Statistiche : Carico per Ora"
+
+#: Public/A2B_card_info.php:90
+msgid "ACCOUNT INFO"
+msgstr "INFO ACCOUNT"
+
+#: Public/A2B_card_info.php:121
+msgid "WEB ALIAS"
+msgstr "ALIAS WEB"
+
+#: Public/A2B_card_info.php:129
+msgid "WEB PASSWORD"
+msgstr "PASSWORD WEB"
+
+#: Public/A2B_card_info.php:163
+msgid "EXPIRATION DATE"
+msgstr "DATA SCADENZA"
+
+#: Public/A2B_card_info.php:179
+msgid "LAST USE DATE"
+msgstr "DATA ULTIMO UTILIZZO"
+
+#: Public/A2B_card_info.php:198
+msgid "UNLOCK"
+msgstr "SBLOCCA"
+
+#: Public/A2B_card_info.php:211
+msgid "LOCK DATE"
+msgstr "DATA BLOCCO"
+
+#: Public/A2B_card_info.php:224
+msgid "CUSTOMER INFO"
+msgstr "INFO UTENTE"
+
+#: Public/A2B_card_info.php:340
+msgid "ACCOUNT STATUS"
+msgstr "STATO ACCOUNT"
+
+#: Public/A2B_card_info.php:361
+msgid "CREDIT LIMIT"
+msgstr "LIMITE CREDITO"
+
+#: Public/A2B_card_info.php:390
+msgid "COMPANY INFO"
+msgstr "INFO SOCIET&Agrave"
+
+#: Public/A2B_card_info.php:414
+msgid "VAT REGISTRATION NUMBER"
+msgstr "NUMERO PARTITA IVA"
+
+#: Public/A2B_card_info.php:434
+msgid "TARGET TRAFIC"
+msgstr "OBIETTIVO TRAFFICO"
+
+#: Public/A2B_card_info.php:460
+msgid "CALLER-ID LIST "
+msgstr "LISTA ID-CHIAMANTI"
+
+#: Public/A2B_card_info.php:508
+msgid "SPEED-DIAL LIST "
+msgstr "LISTA NUMERI-BREVI"
+
+#: Public/A2B_card_info.php:519
+msgid "SPEEDDIAL"
+msgstr "NUMERI BREVI"
+
+#: Public/A2B_card_info.php:569
+msgid "SIP-BUDDIES"
+msgstr "SIP-BUDDIES"
+
+#: Public/A2B_card_info.php:616
+msgid "IAX-BUDDIES"
+msgstr "IAX-BUDDIES"
+
+#: Public/A2B_card_info.php:657
+#: Public/A2B_card_info.php:960
+msgid "CUSTOMERS LIST"
+msgstr "LISTA UTENTI"
+
+#: Public/A2B_card_info.php:673
+msgid "Recent Payments"
+msgstr "Pagamenti Recenti"
+
+#: Public/A2B_card_info.php:747
+msgid "Recent Refills"
+msgstr "Ricariche Recenti"
+
+#: Public/A2B_card_info.php:813
+msgid "Recent Calls"
+msgstr "Chiamate Recenti"
+
+#: Public/A2B_card_info.php:823
+msgid "CALL DATE"
+msgstr "DATA CHIAMATA"
+
+#: Public/A2B_card_info.php:826
+msgid "CALLED NUMBER"
+msgstr "NUMERO CHIAMATA"
+
+#: Public/A2B_card_info.php:835
+msgid "TERMINATE CAUSE"
+msgstr "CAUSA TERMINATA"
+
+#: Public/A2B_card_info.php:838
+msgid "BUY"
+msgstr "ACQUISTA"
+
+#: Public/A2B_card_info.php:844
+msgid "LINK TO THE RATE"
+msgstr "LINK ALLA TARIFFA"
+
+#: Public/A2B_card_info.php:882
+msgid "Link to the used rate"
+msgstr "Link alla tariffa usata"
+
+#: Public/A2B_card_info.php:903
+msgid "DIDs & DID Destination"
+msgstr "Destinazione DIDs & DID"
+
+#: Public/A2B_card_info.php:913
+msgid "DID"
+msgstr "DID"
+
+#: Public/A2B_card_info.php:922
+msgid "VOIP"
+msgstr "VOIP"
+
+#: Public/CC_generate_friend_file.php:74
+msgid "Cannot connect to the asterisk manager!<br>Please check your manager configuration."
+msgstr "Impossibile connettersi al manager asterisk!<br>Controlla la configurazione del manager"
+
+#: Public/CC_generate_friend_file.php:106
+msgid "There is no "
+msgstr "Non c'&egrave"
+
+#: Public/CC_generate_friend_file.php:112
+msgid "Could not open the user configuration file :"
+msgstr "Impossibile aprire il file di configurazione utente"
+
+#: Public/CC_generate_friend_file.php:163
+msgid "The sipfriend file has been generated : "
+msgstr "Il file sipfriend &egrave stato creato"
+
+#: Public/CC_generate_friend_file.php:165
+msgid "The iaxfriend file has been generated : "
+msgstr "Il file iaxfriend &egrave stato creato"
+
+#: Public/CC_generate_friend_file.php:173
+msgid "Click here to reload your asterisk server"
+msgstr "Clicca qui per ricaricare il server asterisk"
+
+#: Public/CC_generate_friend_file.php:179
+msgid "Asterisk has been reloaded."
+msgstr "asterisk &egrave stato ricaricato"
+
+#: Public/A2B_entity_moneysituation.php:177
+msgid "NB TOTAL INVOICE"
+msgstr "NB TOTALE FATTURA"
+
+#: Public/A2B_entity_moneysituation.php:178
+msgid "NB INVOICE WITH ENOUGH PAYMENT "
+msgstr "NB FATTURA CON SUFFICIENTE PAGAMENTO"
+
+#: Public/A2B_entity_moneysituation.php:179
+msgid "NB INVOICE WITH PAID STATUS"
+msgstr "NB FATTURA CON STATO PAGATO"
+
+#: Public/A2B_entity_moneysituation.php:180
+msgid "NB INVOICE WITH UNPAID STATUS"
+msgstr "NB FATTURA CON STATO NON PAGATO"
+
+#: Public/templates/default/main.tpl:12
+msgid "HOME"
+msgstr "HOME"
+
+#: Public/templates/default/main.tpl:22
+msgid "MY ACCOUNT"
+msgstr "MIO ACCOUNT"
+
+#: Public/templates/default/main.tpl:31
+msgid "Account information"
+msgstr "Informazione account"
+
+#: Public/templates/default/main.tpl:32
+#: Public/templates/default/index.tpl:61
+msgid "Password"
+msgstr "Password"
+
+#: Public/templates/default/main.tpl:33
+msgid "Historic Remittance"
+msgstr "Storico Rimesse"
+
+#: Public/templates/default/main.tpl:55
+msgid "List Customers"
+msgstr "Lista Utenti"
+
+#: Public/templates/default/main.tpl:56
+msgid "Caller-ID"
+msgstr "ID-Chiamante"
+
+#: Public/templates/default/main.tpl:61
+msgid "VOIP Config"
+msgstr "Configurazione VOIP"
+
+#: Public/templates/default/main.tpl:76
+msgid "SIGNUP"
+msgstr "REGISTRAZIONE"
+
+#: Public/templates/default/main.tpl:85
+msgid "Signup Url List"
+msgstr "Lista Url Regitrazione"
+
+#: Public/templates/default/main.tpl:86
+msgid "Add New Signup Url"
+msgstr "Agg. Url Registrazione"
+
+#: Public/templates/default/main.tpl:100
+msgid "BILLING"
+msgstr "FATTURAZIONE"
+
+#: Public/templates/default/main.tpl:109
+msgid "Account balance"
+msgstr "Saldo account"
+
+#: Public/templates/default/main.tpl:110
+msgid "Own Refills"
+msgstr "Proprie Ricariche"
+
+#: Public/templates/default/main.tpl:111
+msgid "Own Payments"
+msgstr "Propri Pagamenti"
+
+#: Public/templates/default/main.tpl:112
+msgid "Customer's Refills"
+msgstr "Ricariche Utenti"
+
+#: Public/templates/default/main.tpl:113
+msgid "Customer's Payment"
+msgstr "Pagamenti Utenti"
+
+#: Public/templates/default/main.tpl:114
+msgid "Payment Log"
+msgstr "Log Pagamenti"
+
+#: Public/templates/default/main.tpl:115
+msgid "Commission"
+msgstr "Commissioni"
+
+#: Public/templates/default/main.tpl:137
+msgid "Browse Rates"
+msgstr "Visualizza Tariffe"
+
+#: Public/templates/default/main.tpl:150
+msgid "CALL REPORT"
+msgstr "CHIAMATE"
+
+#: Public/templates/default/main.tpl:159
+msgid "CDR Report"
+msgstr "Rapporto CDR"
+
+#: Public/templates/default/main.tpl:160
+msgid "Monthly Traffic"
+msgstr "Traffico Mensile"
+
+#: Public/templates/default/main.tpl:173
+msgid "SUPPORT"
+msgstr "SUPPORTO"
+
+#: Public/templates/default/main.tpl:182
+msgid "Customer Tickets"
+msgstr "Tickets Utente"
+
+#: Public/templates/default/main.tpl:183
+msgid "View and Create Tickets"
+msgstr "Visualizza e crea Tickets"
+
+#: Public/templates/default/main.tpl:194
+msgid "LOGOUT"
+msgstr "USCITA"
+
+#: Public/templates/default/index.tpl:49
+msgid "AUTHENTICATION"
+msgstr "AUTENTICAZIONE"
+
+#: Public/templates/default/index.tpl:57
+msgid "User"
+msgstr "Utente"
+
+#: Public/templates/default/index.tpl:90
+msgid "AUTHENTICATION REFUSED, please check your user/password!"
+msgstr "AUTENTICAZIONE RIFIUTATA : controlla utente/password!"
+
+#: Public/templates/default/index.tpl:92
+msgid "INACTIVE ACCOUNT, Please activate your account!"
+msgstr "ACCOUNT NON ATTIVO : Attiva il tuo account!"
+
+#: Public/templates/default/index.tpl:94
+msgid "BLOCKED ACCOUNT, Please contact the administrator!"
+msgstr "ACCOUNT BLOCCATO : Contattare l'amministratore!"
+
+#: Public/A2B_refill_info.php:129
+msgid "REFILLS LIST"
+msgstr "LISTA RICARICHE"
+
+#: Public/A2B_entity_secret.php:88
+msgid "Your secret is updated successfully."
+msgstr "Password aggiornata con successo."
+
+#: Public/A2B_entity_secret.php:95
+msgid "Your secret is not updated Correctly."
+msgstr "Password non aggiornata Correttamente."
+
+#: Public/A2B_entity_secret.php:106
+msgid "Change Secret"
+msgstr "Cambia Password"
+
+#: Public/A2B_entity_secret.php:112
+msgid "Old Secret"
+msgstr "Vecchia Password"
+
+#: Public/A2B_entity_secret.php:116
+msgid "New Secret"
+msgstr "Nuova Password"
+
+#: Public/A2B_entity_card_multi.php:77
+msgid "- Choose a GROUP for the customers!"
+msgstr "Scegli un Gruppo per l'utente!"
+
+#: Public/A2B_entity_card_multi.php:83
+msgid "- Choose a CALL PLAN for the customers!"
+msgstr "- Scegli un Piano di Chiamata per l'utente!"
+
+#: Public/A2B_entity_card_multi.php:89
+msgid "- Choose an EXPIRATIONS DAYS  equal or higher than 0 for the customers!"
+msgstr "- Scegli una DATA SCADENZA  uguale o pi&ugrave alta di 0 per l'utente!"
+
+#: Public/A2B_entity_card_multi.php:95
+msgid "- EXPIRATION DAY inserted is invalid, it must respect the date format YYYY-MM-DD HH:MM:SS (time is optional) !"
+msgstr "- La DATA SCADENZA inserita non &egrave valida, deve rispettare il formato AAAA-MM-GG OO:MM:SS (l'ora &egrave opzionale) !"
+
+#: Public/A2B_entity_card_multi.php:102
+msgid "- Choose the number of customers that you want generate!"
+msgstr "- Scegli il numero dell'utente che vuoi generare!"
+
+#: Public/A2B_entity_card_multi.php:337
+msgid "Length of card number :"
+msgstr "Lunghezza del numero scheda"
+
+#: Public/A2B_entity_card_multi.php:351
+msgid "Number of customers to create"
+msgstr "Numero dell'utente da creare"
+
+#: Public/A2B_entity_card_multi.php:353
+msgid "(max 100)"
+msgstr "(max 100)"
+
+#: Public/A2B_entity_card_multi.php:358
+msgid "Call plan"
+msgstr "Piano di chiamata"
+
+#: Public/A2B_entity_card_multi.php:371
+msgid "Initial amount of credit"
+msgstr "Saldo di credito iniziale"
+
+#: Public/A2B_entity_card_multi.php:375
+msgid "Simultaneous access"
+msgstr "Accessi simultanei"
+
+#: Public/A2B_entity_card_multi.php:392
+msgid "Card type"
+msgstr "Tipo scheda"
+
+#: Public/A2B_entity_card_multi.php:395
+msgid "POSTPAY CARD"
+msgstr "SCHEDA POSTPAGATA"
+
+#: Public/A2B_entity_card_multi.php:400
+msgid "Credit Limit of postpay"
+msgstr "Limite Credito di postepay"
+
+#: Public/A2B_entity_card_multi.php:421
+msgid "Expiry Date"
+msgstr "Data Scadenza"
+
+#: Public/A2B_entity_card_multi.php:428
+msgid "Expiry days"
+msgstr "Giorni scadenza"
+
+#: Public/A2B_entity_card_multi.php:440
+msgid "Create SIP/IAX Friends"
+msgstr "Crea SIP/IAX Friends"
+
+#: Public/A2B_entity_card_multi.php:444
+msgid "Tag"
+msgstr "Tag"
+
+#: Public/A2B_entity_card_multi.php:448
+msgid "Customer group"
+msgstr "Gruppo Utente"
+
+#: Public/A2B_entity_card_multi.php:450
+msgid "Choose a group"
+msgstr "Scegli un gruppo"
+
+#: Public/A2B_entity_card_multi.php:460
+msgid "Discount"
+msgstr "Sconto"
+
+#: Public/A2B_agent_remittance_req.php:106
+msgid "The amount entered is not a number"
+msgstr "L'importo inserito non &egrave un numero"
+
+#: Public/A2B_agent_remittance_req.php:112
+msgid "The amount entered is higher than the commission accrued"
+msgstr "L'importo inserito &egrave maggiore della commissione maturata"
+
+#: Public/A2B_agent_remittance_req.php:118
+msgid "The amount entered is lower than the threshold to do a remittance request"
+msgstr "L'importo inserito &egrave inferiore alla soglia per la richiesta di rimessa"
+
+#: Public/A2B_agent_remittance_req.php:124
+msgid "The amount entered must be positive"
+msgstr "L'importo inserito deve essere positivo"
+
+#: Public/A2B_agent_remittance_req.php:143
+#: Public/A2B_agent_remittance_conf.php:133
+msgid "THRESHOLD REMITTANCE REQUEST"
+msgstr "SOGLIA RICHIESTA RIMESSA"
+
+#: Public/A2B_agent_remittance_req.php:156
+msgid "REMITTANCE"
+msgstr "RIMESSA"
+
+#: Public/A2B_agent_remittance_req.php:156
+msgid "AVAILABLE"
+msgstr "DISPONIBILE"
+
+#: Public/A2B_agent_remittance_req.php:156
+msgid "UNAVAILABLE"
+msgstr "NON DISPONIBILE"
+
+#: Public/A2B_agent_remittance_req.php:171
+msgid "Remittance Request"
+msgstr "Richiesta Rimessa"
+
+#: Public/A2B_agent_remittance_req.php:176
+msgid "You have to use an amount higher than"
+msgstr "Devi usare un importo superiore a"
+
+#: Public/A2B_agent_remittance_req.php:184
+msgid "REMITTANCE TYPE"
+msgstr "TIPO RIMESSA"
+
+#: Public/A2B_agent_remittance_req.php:191
+#: Public/A2B_agent_remittance_conf.php:229
+msgid "Confirm"
+msgstr "Conferma"
+
+#: Public/A2B_agent_remittance_req.php:195
+msgid "Remittance Request is not available"
+msgstr "Richiesta Rimessa non disponibile"
+
+#: Public/A2B_agent_remittance_req.php:210
+#: Public/A2B_agent_remittance_conf.php:246
+msgid "One remittance request is already in progress for"
+msgstr "Una richiesta di rimessa &egrave in corso per"
+
+#: Public/A2B_payment_info.php:139
+msgid "PAYMENTS LIST"
+msgstr "LISTA PAGAMENTI"
+
+#: Public/A2B_agent_remittance_conf.php:101
+msgid "Invalid amount, is higher than the threshold to authorize a remittance"
+msgstr "Importo non valido, &egrave maggiore della soglia che autorizza una rimessa"
+
+#: Public/A2B_agent_remittance_conf.php:104
+msgid "Invalid amount, is higher than your commission Accrued"
+msgstr "Importo non valido, &egrave maggiore delle commissioni Maturate"
+
+#: Public/A2B_agent_remittance_conf.php:168
+msgid "Remittance Request Confirmation"
+msgstr "Conferma Richiesta Rimessa"
+
+#: Public/A2B_agent_remittance_conf.php:183
+msgid "AMOUNT (rounded for currency)"
+msgstr "Importo (arrotondato per la valuta)"
+
+#: Public/A2B_agent_remittance_conf.php:188
+msgid "AMOUNT IN "
+msgstr "IMPORTO IN"
+
+#: Public/A2B_agent_remittance_conf.php:193
+msgid "TRANSACTION TYPE"
+msgstr "TIPO TRANSAZIONE"
+
+#: Public/A2B_agent_remittance_conf.php:194
+msgid "withdraw to your bank account"
+msgstr "prelevare dal tuo conto bancario"
+
+#: Public/A2B_agent_remittance_conf.php:194
+msgid "withdraw to your balance"
+msgstr "prelevare dal tuo saldo"
+
+#: Public/A2B_agent_remittance_conf.php:198
+msgid "BANK INFO"
+msgstr "INFO BANCA"
+
+#: Public/A2B_agent_remittance_conf.php:209
+msgid "Request sent with success"
+msgstr "Richiesta inviata con successo"
+
+#: Public/A2B_agent_remittance_conf.php:211
+msgid "Request failed"
+msgstr "Richiesta fallita"
+
+#: Public/A2B_agent_remittance_conf.php:220
+msgid "Back to home page"
+msgstr "Indietro alla home page"
+
diff --git a/common/cust_ui_locale/it_IT/LC_MESSAGES/messages.mo b/common/cust_ui_locale/it_IT/LC_MESSAGES/messages.mo
index 1b3af0194..96f6fba34 100644
Binary files a/common/cust_ui_locale/it_IT/LC_MESSAGES/messages.mo and b/common/cust_ui_locale/it_IT/LC_MESSAGES/messages.mo differ
diff --git a/common/cust_ui_locale/it_IT/LC_MESSAGES/messages.po b/common/cust_ui_locale/it_IT/LC_MESSAGES/messages.po
index eefa7a99a..ebd804eea 100644
--- a/common/cust_ui_locale/it_IT/LC_MESSAGES/messages.po
+++ b/common/cust_ui_locale/it_IT/LC_MESSAGES/messages.po
@@ -1,732 +1,766 @@
 # A2Billing Customer Panel - PO File.
-# Copyright (C) 2004-2012 A2BILLING
+# Copyright (C) 2004-2009 A2BILLING
 # This file is distributed under the same license as the PACKAGE package.
 # ARESKI <areski@gmail.com>.
 #
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-20 14:38+0100\n"
-"PO-Revision-Date: 2009-03-30 15:17+0200\n"
-"Last-Translator: ARESKI <areski@gmail.com>\n"
+"POT-Creation-Date: 2011-02-18 00:40+0100\n"
+"PO-Revision-Date: 2012-02-19 01:15+0100\n"
+"Last-Translator: Corrado <corrado.bove@gmail.com>\n"
 "Language-Team: ARESKI <areski@gmail.com>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Project-Id-Version: \n"
 
-#: A2B_notification.php:75
+#: A2B_notification.php:76
 msgid "Your notification settings has successfully been updated."
-msgstr ""
+msgstr "Le tue impostazioni di notifica sono state aggiornate con successo"
 
-#: A2B_recurring_payment.php:139 A2B_recurring_payment.php:145
+#: A2B_recurring_payment.php:140
+#: A2B_recurring_payment.php:146
 msgid "Reccurring payment : automated refill"
-msgstr ""
+msgstr "Pagamento ricorrente : ricarica automatica"
 
-#: A2B_recurring_payment.php:155 checkout_process.php:370
+#: A2B_recurring_payment.php:156
+#: iridium_threed.php:315
+#: checkout_process.php:357
 msgid "CUSTOMER REFILL"
-msgstr ""
+msgstr "RICARICA CLIENTE"
 
-#: A2B_recurring_payment.php:156 lib/Form/Class.FormBO.php:836
-#: lib/Form/Class.FormBO.php:945 checkout_process.php:371
+#: A2B_recurring_payment.php:157
+#: iridium_threed.php:317
+#: lib/Form/Class.FormBO.php:840
+#: lib/Form/Class.FormBO.php:949
+#: checkout_process.php:358
 msgid "Invoice for refill"
-msgstr ""
+msgstr "Fattura per ricarica"
 
-#: A2B_recurring_payment.php:164
+#: A2B_recurring_payment.php:165
 msgid "Automated Refill : recurring payment"
-msgstr ""
+msgstr "Ricarica Automatica : pagamento ricorrente"
 
-#: A2B_recurring_payment.php:193 lib/Form/Class.FormBO.php:992
-#: checkout_process.php:405
+#: A2B_recurring_payment.php:194
+#: iridium_threed.php:387
+#: lib/Form/Class.FormBO.php:996
+#: checkout_process.php:392
 msgid "AUTOMATICALY GENERATED COMMISSION!"
-msgstr ""
+msgstr "COMMISSIONE GENERATA AUTOMATICAMENTE"
 
-#: A2B_entity_phonenumber.php:111
+#: A2B_entity_phonenumber.php:113
 msgid "CAMPAIGN"
-msgstr ""
+msgstr "CAMPAGNA"
 
-#: A2B_entity_phonenumber.php:114 lib/interface/constants.php:18
-#, fuzzy
+#: A2B_entity_phonenumber.php:116
+#: lib/interface/constants.php:15
 msgid "INFO"
-msgstr "Non esiste"
+msgstr "INFORMAZIONI"
 
-#: A2B_entity_phonenumber.php:117 form_data/FG_var_invoice.inc:70
-#: form_data/FG_var_campaign.inc:74 form_data/FG_var_ticket.inc:60
-#: form_data/FG_var_phonenumber.inc:66
-#, fuzzy
+#: A2B_entity_phonenumber.php:119
+#: form_data/FG_var_invoice.inc:70
+#: form_data/FG_var_campaign.inc:72
+#: form_data/FG_var_ticket.inc:60
+#: form_data/FG_var_phonenumber.inc:65
 msgid "STATUS"
-msgstr "REGIONE"
+msgstr "STATO"
 
-#: A2B_entity_phonenumber.php:120 lib/Form/Class.ViewHandler.inc.php:196
+#: A2B_entity_phonenumber.php:122
+#: lib/Form/Class.ViewHandler.inc.php:196
 msgid "ACTION"
 msgstr "AZIONE"
 
-#: A2B_entity_phonenumber.php:135 lib/interface/constants.php:411
-#: lib/interface/constants.php:434
+#: A2B_entity_phonenumber.php:137
+#: lib/interface/constants.php:328
+#: lib/interface/constants.php:346
 msgid "EXPIRED"
-msgstr ""
+msgstr "SCADUTA"
 
-#: A2B_entity_phonenumber.php:137
+#: A2B_entity_phonenumber.php:139
 msgid "STARTED AND IN PROCESS"
-msgstr ""
+msgstr "AVVIATO ED IN ESECUZIONE"
 
-#: A2B_entity_phonenumber.php:138
+#: A2B_entity_phonenumber.php:140
 msgid "STARTED BUT NOT IN PROCESS : check the batch"
-msgstr ""
+msgstr "AVVIATO MA NON IN ESECUZIONE : controllare il lotto"
 
-#: A2B_entity_phonenumber.php:139
-#, fuzzy
+#: A2B_entity_phonenumber.php:141
 msgid "NOT STARTED"
-msgstr "REGIONE"
+msgstr "NON AVVIATO"
 
-#: A2B_entity_phonenumber.php:146
+#: A2B_entity_phonenumber.php:148
 msgid "RUN"
-msgstr ""
+msgstr "FUNZIONA"
 
-#: A2B_entity_phonenumber.php:147
+#: A2B_entity_phonenumber.php:149
 msgid "HOLD"
-msgstr ""
+msgstr "OCCUPATO"
 
-#: A2B_entity_phonenumber.php:148
-#, fuzzy
+#: A2B_entity_phonenumber.php:150
 msgid "STOP"
-msgstr "A"
+msgstr "STOP"
 
-#: A2B_entity_phonenumber.php:149
+#: A2B_entity_phonenumber.php:151
 msgid "NO STATUS"
-msgstr ""
+msgstr "NO STATO"
 
-#: A2B_entity_password.php:72
+#: A2B_entity_password.php:77
 msgid "No value in New Password entered"
-msgstr ""
+msgstr "Non inserito il valore Nuova Password"
 
-#: A2B_entity_password.php:78
+#: A2B_entity_password.php:83
 msgid "No Value in Confirm New Password entered"
-msgstr ""
+msgstr "Non &egrave inserito il valore Conferma Nuova Password"
 
-#: A2B_entity_password.php:84
+#: A2B_entity_password.php:89
 msgid "Password length should be greater than or equal to 5"
-msgstr ""
+msgstr "I caratteri della Password devono essere almeno 5"
 
-#: A2B_entity_password.php:90
+#: A2B_entity_password.php:95
 msgid "Value mismatch, New Password should be equal to Confirm New Password"
-msgstr ""
+msgstr "Non coincidente, Nuova Password deve essere uguale a Conferma Nuova Password"
 
-#: A2B_entity_password.php:105
+#: A2B_entity_password.php:109
 msgid "Your password is updated successfully."
-msgstr ""
+msgstr "La tua password &egrave stata aggiornata con successo"
 
-#: A2B_entity_password.php:107
+#: A2B_entity_password.php:111
 msgid "Your old password is wrong."
-msgstr ""
+msgstr "La tua vecchia password non &egrave corretta"
 
-#: A2B_entity_password.php:115
+#: A2B_entity_password.php:119
 msgid "Change Password"
-msgstr ""
+msgstr "Cambia Password"
 
-#: A2B_entity_password.php:118
+#: A2B_entity_password.php:122
 msgid "Do not use \" or = characters in your password"
-msgstr ""
+msgstr "Non usare caratteri \" o = nella tua password"
 
-#: A2B_entity_password.php:121
+#: A2B_entity_password.php:125
 msgid "Old Password"
-msgstr ""
+msgstr "Vecchia Password"
 
-#: A2B_entity_password.php:125
+#: A2B_entity_password.php:129
 msgid "New Password"
-msgstr ""
+msgstr "Nuova Password"
 
-#: A2B_entity_password.php:129
+#: A2B_entity_password.php:133
 msgid "Confirm Password"
-msgstr ""
+msgstr "Conferma Password"
 
-#: A2B_entity_password.php:136
+#: A2B_entity_password.php:140
 msgid "Save"
-msgstr ""
+msgstr "Salva"
 
-#: A2B_phonelist_import.php:68
+#: A2B_phonelist_import.php:71
 msgid "Please, you must first select a phonebook !"
-msgstr ""
+msgstr "Seleziona prima una rubrica !"
 
-#: A2B_phonelist_import.php:74
+#: A2B_phonelist_import.php:76
 msgid "Please, you must first select a file !"
-msgstr ""
+msgstr "Seleziona prima un file !"
 
-#: A2B_phonelist_import.php:223
+#: A2B_phonelist_import.php:226
 msgid "New phonebooks have to imported from a CSV file."
-msgstr ""
+msgstr "Le nuove rubriche devo essere importate da un file CSV."
 
-#: A2B_phonelist_import.php:230
+#: A2B_phonelist_import.php:233
 msgid "Choose the phonebook to import"
-msgstr ""
+msgstr "Scegli una rubrica da importare"
 
-#: A2B_phonelist_import.php:232
+#: A2B_phonelist_import.php:235
 msgid "Choose a phonebook"
-msgstr ""
+msgstr "Scegli una rubrica"
 
-#: A2B_phonelist_import.php:243
+#: A2B_phonelist_import.php:247
 msgid "These fields are mandatory"
-msgstr ""
+msgstr "Questi campi sono obbligatori"
 
-#: A2B_phonelist_import.php:246
-#, fuzzy
+#: A2B_phonelist_import.php:250
 msgid "number"
-msgstr "Numero chiamato"
+msgstr "numero"
 
-#: A2B_phonelist_import.php:250
+#: A2B_phonelist_import.php:254
 msgid "Choose the additional fields to import from the CSV file"
-msgstr ""
+msgstr "Scegli i campi addizionali da importare dal file CSV"
 
-#: A2B_phonelist_import.php:257
+#: A2B_phonelist_import.php:261
 msgid "Unselected Fields..."
-msgstr ""
+msgstr "Campi non selezionati..."
 
-#: A2B_phonelist_import.php:258
+#: A2B_phonelist_import.php:262
 msgid "name"
-msgstr ""
+msgstr "nome"
 
-#: A2B_phonelist_import.php:259
+#: A2B_phonelist_import.php:263
 msgid "info"
-msgstr ""
+msgstr "info"
 
-#: A2B_phonelist_import.php:271
+#: A2B_phonelist_import.php:275
 msgid "Selected Fields..."
-msgstr ""
+msgstr "Campi selezionati"
 
-#: A2B_phonelist_import.php:294
-msgid "Use the example below  to format the CSV file. Fields are separated by [,] or [;]"
-msgstr ""
+#: A2B_phonelist_import.php:301
+msgid "Use the example below to format the CSV file. Fields are separated by [,] or [;]"
+msgstr "Usa l'esempio sotto per creare il file CSV. I campi sono separati con [,] o [;]"
 
-#: A2B_phonelist_import.php:295
+#: A2B_phonelist_import.php:302
 msgid "(dot) . is used for decimal format."
-msgstr ""
+msgstr "il (punto) . &egrave usato per il formato decimale."
 
-#: A2B_phonelist_import.php:298
+#: A2B_phonelist_import.php:306
 msgid "Complex Sample"
-msgstr ""
+msgstr "Esempio Complesso"
 
-#: A2B_phonelist_import.php:299
+#: A2B_phonelist_import.php:307
 msgid "Simple Sample"
-msgstr ""
+msgstr "Esempio Semplice"
 
-#: A2B_phonelist_import.php:314
+#: A2B_phonelist_import.php:323
 msgid "The maximum file size is "
-msgstr ""
+msgstr "La massima grandezza del file &egrave "
 
-#: A2B_phonelist_import.php:320
+#: A2B_phonelist_import.php:329
 msgid "Import Phonebook"
-msgstr ""
+msgstr "Importa Rubrica"
 
-#: A2B_entity_card.php:74
+#: A2B_entity_card.php:77
 msgid "Your personal information has successfully been updated."
-msgstr ""
+msgstr "Le tue informazioni personali sono state aggiornate con successo."
 
-#: simulator.php:85
+#: simulator.php:86
 msgid "Error card !!!"
-msgstr ""
+msgstr "Errore scheda"
 
-#: simulator.php:145
+#: simulator.php:146
 msgid "Simulator"
 msgstr "Simulatore"
 
-#: simulator.php:151
+#: simulator.php:152
 msgid "Enter the number you wish to call"
 msgstr "Digitare il numero di telefono del quale si vuole simulare la chiamata"
 
-#: simulator.php:156
+#: simulator.php:157
 msgid "YOUR BALANCE"
-msgstr "SUO CREDITO"
+msgstr "TUO CREDITO"
 
-#: simulator.php:164
-#, fuzzy
+#: simulator.php:165
 msgid "SEARCH"
-msgstr "Marzo"
+msgstr "CERCA"
 
-#: simulator.php:183
+#: simulator.php:185
 msgid "Simulator found a rate for your destination"
 msgstr "Il simulatore ha trovato una tariffa per la destinazione inserita"
 
-#: simulator.php:189
+#: simulator.php:191
 msgid "We found several destinations:"
 msgstr "Trovate pi&ugrave; destinazioni:"
 
-#: simulator.php:207 form_data/FG_var_did.inc:69 form_data/FG_var_did.inc:124
+#: simulator.php:209
+#: form_data/FG_var_did.inc:67
+#: form_data/FG_var_did.inc:122
 #: form_data/FG_var_ratecard.inc:56
 msgid "DESTINATION"
-msgstr "Destinazione"
+msgstr "DESTINAZIONE"
 
-#: simulator.php:212
+#: simulator.php:214
 msgid "CallTime available"
 msgstr "Durata massima della chiamata"
 
-#: simulator.php:214 call-history.php:332
+#: simulator.php:216
+#: call-history.php:380
 msgid "Minutes"
 msgstr "Minuti"
 
-#: simulator.php:242
+#: simulator.php:245
 msgid "The number, you have entered, is not correct!"
 msgstr "Il numero inserito non &egrave; corretto!"
 
-#: A2B_support.php:97
+#: A2B_support.php:98
 msgid "Ticket added successfully"
-msgstr ""
+msgstr "Ticket aggiunto con successo"
 
-#: A2B_support.php:100
+#: A2B_support.php:103
 msgid "Please complete the title and description portions of the form."
-msgstr ""
+msgstr "Completare il Titolo ed il campo Descrizione"
 
-#: A2B_support.php:102
+#: A2B_support.php:105
 msgid "Sorry, There was a problem creating your ticket."
-msgstr ""
+msgstr "Spiacente, c'&egrave un problema nella creazione del ticket "
 
-#: A2B_support.php:127
+#: A2B_support.php:130
 msgid "Create support ticket"
-msgstr ""
+msgstr "Crea il ticket di supporto"
 
-#: A2B_support.php:134
-#, fuzzy
+#: A2B_support.php:138
 msgid "Title"
-msgstr "TOTALE"
+msgstr "TITOLO"
 
-#: A2B_support.php:142
+#: A2B_support.php:146
 msgid "Priority"
-msgstr ""
+msgstr "Pritorit&agrave"
 
-#: A2B_support.php:146 lib/interface/constants.php:338
-#: A2B_entity_ratecard.php:92
+#: A2B_support.php:150
+#: lib/interface/constants.php:267
+#: A2B_entity_ratecard.php:97
 msgid "NONE"
-msgstr "NESSUNA"
+msgstr "TUTTE"
 
-#: A2B_support.php:147 lib/interface/constants.php:339
-#: lib/Class.Notification.php:115
+#: A2B_support.php:151
+#: lib/interface/constants.php:268
+#: lib/Class.Notification.php:109
 msgid "LOW"
-msgstr ""
+msgstr "BASSA"
 
-#: A2B_support.php:148 lib/interface/constants.php:340
-#: lib/Class.Notification.php:112
+#: A2B_support.php:152
+#: lib/interface/constants.php:269
+#: lib/Class.Notification.php:106
 msgid "MEDIUM"
-msgstr ""
+msgstr "MEDIA"
 
-#: A2B_support.php:149 lib/interface/constants.php:341
-#: lib/Class.Notification.php:110
+#: A2B_support.php:153
+#: lib/interface/constants.php:270
+#: lib/Class.Notification.php:104
 msgid "HIGH"
-msgstr ""
+msgstr "ALTA"
 
-#: A2B_support.php:155
+#: A2B_support.php:159
 msgid "Component"
-msgstr ""
-
-#: A2B_support.php:175 A2B_invoice_view.php:213 A2B_receipt_detail.php:136
-#: card-history.php:71 A2B_billing_preview.php:178 A2B_billing_preview.php:270
-#: A2B_receipt_preview_detail.php:218 A2B_receipt_view.php:201
+msgstr "Componente"
+
+#: A2B_support.php:179
+#: A2B_invoice_view.php:215
+#: A2B_receipt_detail.php:138
+#: card-history.php:76
+#: A2B_billing_preview.php:184
+#: A2B_billing_preview.php:277
+#: A2B_receipt_preview_detail.php:216
+#: A2B_receipt_view.php:201
 msgid "Description"
 msgstr "Descrizione"
 
-#: A2B_support.php:183
-#, fuzzy
+#: A2B_support.php:187
 msgid "CREATE"
 msgstr "CREATA!"
 
-#: form_data/FG_var_did.inc:62 lib/interface/constants.php:108
+#: iridium_threed.php:331
+#: checkout_process.php:365
+msgid "Refill ONLINE"
+msgstr "Ricarica OnLine"
+
+#: form_data/FG_var_did.inc:60
+#: lib/interface/constants.php:89
 msgid "Active"
-msgstr ""
+msgstr "Attiva"
 
-#: form_data/FG_var_did.inc:63 lib/interface/constants.php:107
+#: form_data/FG_var_did.inc:61
+#: lib/interface/constants.php:88
 msgid "Inactive"
-msgstr ""
+msgstr "Inattiva"
 
-#: form_data/FG_var_did.inc:66
+#: form_data/FG_var_did.inc:64
 msgid "Pending"
-msgstr ""
+msgstr "In attesa"
 
-#: form_data/FG_var_did.inc:67
-#, fuzzy
+#: form_data/FG_var_did.inc:65
 msgid "Validated"
-msgstr "Data chiamata"
+msgstr "Attivato"
 
-#: form_data/FG_var_did.inc:70 templates/default/main.tpl:64
+#: form_data/FG_var_did.inc:68
+#: templates/default/main.tpl:62
 msgid "DID"
 msgstr "SELEZIONE PASSANTE"
 
-#: form_data/FG_var_did.inc:71 form_data/FG_var_did.inc:134
-#: form_data/FG_var_callerid.inc:50 form_data/FG_var_callerid.inc:92
-#: lib/interface/constants.php:430 lib/interface/constants.php:460
+#: form_data/FG_var_did.inc:69
+#: form_data/FG_var_did.inc:132
+#: form_data/FG_var_callerid.inc:49
+#: form_data/FG_var_callerid.inc:91
+#: lib/interface/constants.php:342
+#: lib/interface/constants.php:367
 msgid "ACTIVATED"
 msgstr "ATTIVATO"
 
-#: form_data/FG_var_did.inc:72 form_data/FG_var_did.inc:143
+#: form_data/FG_var_did.inc:70
+#: form_data/FG_var_did.inc:141
 #: form_data/FG_var_ticket.inc:58
 msgid "PRIORITY"
-msgstr "Priorità"
+msgstr "Priorit&agrave"
 
-#: form_data/FG_var_did.inc:73
+#: form_data/FG_var_did.inc:71
 msgid "USED MINUTE"
 msgstr "MINUTI USATI"
 
-#: form_data/FG_var_did.inc:74 form_data/FG_var_signup.inc:229
-#: form_data/FG_var_card.inc:102 userinfo.php:113
+#: form_data/FG_var_did.inc:72
+#: form_data/FG_var_signup.inc:229
+#: form_data/FG_var_card.inc:102
+#: userinfo.php:116
 msgid "COUNTRY"
 msgstr "PAESE"
 
-#: form_data/FG_var_did.inc:75
-#, fuzzy
+#: form_data/FG_var_did.inc:73
 msgid "VALIDATED"
 msgstr "ATTIVATO"
 
-#: form_data/FG_var_did.inc:113
+#: form_data/FG_var_did.inc:111
 msgid "There are no destinations created"
-msgstr ""
+msgstr "Non ci sono destinazioni create"
 
-#: form_data/FG_var_did.inc:131
-msgid "Enter here the phonenumber you want to call or the SIP/IAX/H323 peer to reach (ie: 347894999 or SIP/jeremy@182.212.1.45). To call SIP/IAX/H323 peer, you need to enable the voip_call below (voip_call = Yes) "
-msgstr ""
+#: form_data/FG_var_did.inc:129
+msgid "Enter here the phonenumber you want to call or the SIP/IAX/H323 peer to reach (ie: 347894999 or SIP/jeremy@182.212.1.45). To call SIP/IAX/H323 peer, you need to enable the voip_call bellow (voip_call = Yes) "
+msgstr "Inserisci qui il numero che vuoi chiamare o il peer SIP/IAX/H233 da raggiungere (es.: 347894999 o SIP/mario@182.212.1.45). Per chiamare i peer SIP/IAX/H2323, bisogna abilitare l'opzione 'Chiamata Voip' "
 
-#: form_data/FG_var_did.inc:140 form_data/FG_var_callerid.inc:98
+#: form_data/FG_var_did.inc:138
+#: form_data/FG_var_callerid.inc:97
 msgid "Choose if you want to activate this card"
-msgstr ""
+msgstr "Scegli se vuoi attivare questa scheda"
 
-#: form_data/FG_var_did.inc:153
-#, fuzzy
+#: form_data/FG_var_did.inc:151
 msgid "VOIP_CALL"
-msgstr "Chiamata VoIP: "
+msgstr "CHIAMATA_VOIP: "
 
-#: form_data/FG_var_did.inc:159
+#: form_data/FG_var_did.inc:157
 msgid "Choose if you want to not use the trunk and let the asterisk call directly the destination (ie, Destination : SIP/jeremy@182.212.1.45)"
-msgstr ""
-
-#: form_data/FG_var_did.inc:171 form_data/FG_var_campaign.inc:297
-#: form_data/FG_var_speeddial.inc:118 form_data/FG_var_phonebook.inc:109
-#: form_data/FG_var_ticket.inc:80 form_data/FG_var_phonenumber.inc:145
-#: form_data/FG_var_callerid.inc:117 lib/Form/Class.FormHandler.inc.php:580
+msgstr "Scegliere se non si desidera utilizzare il trunk e chiamare direttamente la destinazione (es.:, Destinatione: SIP/mario@182.212.1.45)"
+
+#: form_data/FG_var_did.inc:169
+#: form_data/FG_var_campaign.inc:295
+#: form_data/FG_var_speeddial.inc:118
+#: form_data/FG_var_phonebook.inc:109
+#: form_data/FG_var_ticket.inc:80
+#: form_data/FG_var_phonenumber.inc:144
+#: form_data/FG_var_callerid.inc:116
+#: lib/Form/Class.FormHandler.inc.php:554
 msgid "If you really want remove this"
-msgstr ""
-
-#: form_data/FG_var_did.inc:171 form_data/FG_var_campaign.inc:297
-#: form_data/FG_var_speeddial.inc:118 form_data/FG_var_phonebook.inc:109
-#: form_data/FG_var_ticket.inc:80 form_data/FG_var_phonenumber.inc:145
-#: form_data/FG_var_callerid.inc:117
-#, fuzzy
+msgstr "Se tu voui veramente rimuovere questo"
+
+#: form_data/FG_var_did.inc:169
+#: form_data/FG_var_campaign.inc:295
+#: form_data/FG_var_speeddial.inc:118
+#: form_data/FG_var_phonebook.inc:109
+#: form_data/FG_var_ticket.inc:80
+#: form_data/FG_var_phonenumber.inc:144
+#: form_data/FG_var_callerid.inc:116
 msgid "click on the delete button."
 msgstr "fai click sul pulsante"
 
-#: form_data/FG_var_did.inc:172 form_data/FG_var_campaign.inc:298
-#: form_data/FG_var_speeddial.inc:119 form_data/FG_var_phonebook.inc:110
-#: form_data/FG_var_ticket.inc:81 form_data/FG_var_phonenumber.inc:146
-#: form_data/FG_var_callerid.inc:118 lib/Form/Class.FormHandler.inc.php:583
+#: form_data/FG_var_did.inc:170
+#: form_data/FG_var_campaign.inc:296
+#: form_data/FG_var_speeddial.inc:119
+#: form_data/FG_var_phonebook.inc:110
+#: form_data/FG_var_ticket.inc:81
+#: form_data/FG_var_phonenumber.inc:145
+#: form_data/FG_var_callerid.inc:117
+#: lib/Form/Class.FormHandler.inc.php:557
 msgid "you can add easily a new"
-msgstr ""
-
-#: form_data/FG_var_did.inc:172 form_data/FG_var_campaign.inc:298
-#: form_data/FG_var_speeddial.inc:119 form_data/FG_var_phonebook.inc:110
-#: form_data/FG_var_ticket.inc:81 form_data/FG_var_phonenumber.inc:146
-#: form_data/FG_var_callerid.inc:118 lib/Form/Class.FormHandler.inc.php:583
+msgstr "puoi facilmente aggiungerne una nuova"
+
+#: form_data/FG_var_did.inc:170
+#: form_data/FG_var_campaign.inc:296
+#: form_data/FG_var_speeddial.inc:119
+#: form_data/FG_var_phonebook.inc:110
+#: form_data/FG_var_ticket.inc:81
+#: form_data/FG_var_phonenumber.inc:145
+#: form_data/FG_var_callerid.inc:117
+#: lib/Form/Class.FormHandler.inc.php:557
 msgid "Fill the following fields and confirm by clicking on the button add."
-msgstr ""
+msgstr "Compila i seguenti campi e conferma cliccando sul tasto 'Agg'."
 
-#: form_data/FG_var_did.inc:176 form_data/FG_var_campaign.inc:302
-#: form_data/FG_var_speeddial.inc:124 form_data/FG_var_phonebook.inc:114
-#: form_data/FG_var_ticket.inc:85 form_data/FG_var_callerid.inc:124
-#: lib/Form/Class.FormHandler.inc.php:585
-#: lib/Form/Class.FormHandler.inc.php:586
+#: form_data/FG_var_did.inc:174
+#: form_data/FG_var_campaign.inc:300
+#: form_data/FG_var_speeddial.inc:124
+#: form_data/FG_var_phonebook.inc:114
+#: form_data/FG_var_ticket.inc:85
+#: form_data/FG_var_callerid.inc:123
+#: lib/Form/Class.FormHandler.inc.php:559
+#: lib/Form/Class.FormHandler.inc.php:560
 msgid "Your new"
-msgstr ""
+msgstr "Nuova"
 
-#: form_data/FG_var_did.inc:176 form_data/FG_var_campaign.inc:302
-#: form_data/FG_var_speeddial.inc:124 form_data/FG_var_phonebook.inc:114
-#: form_data/FG_var_ticket.inc:85 form_data/FG_var_callerid.inc:124
-#, fuzzy
+#: form_data/FG_var_did.inc:174
+#: form_data/FG_var_campaign.inc:300
+#: form_data/FG_var_speeddial.inc:124
+#: form_data/FG_var_phonebook.inc:114
+#: form_data/FG_var_ticket.inc:85
+#: form_data/FG_var_callerid.inc:123
 msgid "has been inserted."
-msgstr "è stata processata, Abbiamo aggiunto"
+msgstr "&egrave stata inserita"
 
-#: form_data/FG_var_did.inc:180
+#: form_data/FG_var_did.inc:178
 msgid "Setup those values to create or edit the "
-msgstr ""
+msgstr "Impostare il valore per creare o editare il"
 
 #: form_data/FG_var_invoice.inc:67
 msgid "REFERENCE"
-msgstr ""
+msgstr "RIFERIMENTO"
 
-#: form_data/FG_var_invoice.inc:68 form_data/FG_var_receipt.inc:67
-#: form_data/FG_var_phonenumber.inc:65 call-history.php:212
-#: call-history.php:540
+#: form_data/FG_var_invoice.inc:68
+#: form_data/FG_var_receipt.inc:67
+#: form_data/FG_var_phonenumber.inc:64
+#: call-history.php:259
+#: call-history.php:592
 msgid "DATE"
 msgstr "DATA"
 
-#: form_data/FG_var_invoice.inc:69 form_data/FG_var_receipt.inc:68
+#: form_data/FG_var_invoice.inc:69
+#: form_data/FG_var_receipt.inc:68
 #: form_data/FG_var_ticket.inc:55
-#, fuzzy
 msgid "TITLE"
-msgstr "REGIONE"
+msgstr "TITOLO"
 
-#: form_data/FG_var_invoice.inc:71 form_data/FG_var_receipt.inc:69
+#: form_data/FG_var_invoice.inc:71
+#: form_data/FG_var_receipt.inc:69
 msgid "AMOUNT INCL VAT"
-msgstr ""
+msgstr "IMPORTO INC. IVA"
 
 #: form_data/FG_var_invoice.inc:75
 msgid "THERE IS NO INVOICE CREATED!"
-msgstr ""
+msgstr "NON CI SONO FATTURE CREATE"
 
 #: form_data/FG_var_signup.inc:88
 msgid "No Call Plan id are defined"
-msgstr ""
+msgstr "Non ci sono ID per il Piano di Chiamata "
 
 #: form_data/FG_var_signup.inc:155
-#, fuzzy
 msgid "LANGUAGE"
-msgstr "COGNOME"
+msgstr "LINGUA"
 
 #: form_data/FG_var_signup.inc:163
-#, fuzzy
 msgid "CALL PLAN"
-msgstr "CHIAMATE PER DESTINAZIONE"
+msgstr "PIANO DI CHIAMATA"
 
-#: form_data/FG_var_signup.inc:175 form_data/FG_var_card.inc:53
-#, fuzzy
+#: form_data/FG_var_signup.inc:175
+#: form_data/FG_var_card.inc:53
 msgid "LASTNAME"
 msgstr "COGNOME"
 
 #: form_data/FG_var_signup.inc:180
-#, fuzzy
 msgid "Insert your lastname"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci cognome"
 
-#: form_data/FG_var_signup.inc:184 form_data/FG_var_card.inc:62
-#, fuzzy
+#: form_data/FG_var_signup.inc:184
+#: form_data/FG_var_card.inc:62
 msgid "FIRSTNAME"
 msgstr "NOME"
 
 #: form_data/FG_var_signup.inc:189
-#, fuzzy
 msgid "Insert your firstname"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci nome"
 
-#: form_data/FG_var_signup.inc:192 userinfo.php:104
+#: form_data/FG_var_signup.inc:192
+#: userinfo.php:107
 msgid "EMAIL"
 msgstr "EMAIL"
 
 #: form_data/FG_var_signup.inc:197
-#, fuzzy
 msgid "Insert your email"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci email"
 
-#: form_data/FG_var_signup.inc:199 form_data/FG_var_card.inc:72
-#: userinfo.php:109
+#: form_data/FG_var_signup.inc:199
+#: form_data/FG_var_card.inc:72
+#: userinfo.php:112
 msgid "ADDRESS"
 msgstr "INDIRIZZO"
 
 #: form_data/FG_var_signup.inc:204
 msgid "Insert your address"
-msgstr ""
+msgstr "Inserisci indirizzo"
 
-#: form_data/FG_var_signup.inc:208 form_data/FG_var_card.inc:82
-#: userinfo.php:111
+#: form_data/FG_var_signup.inc:208
+#: form_data/FG_var_card.inc:82
+#: userinfo.php:114
 msgid "CITY"
 msgstr "CITT&Agrave;"
 
 #: form_data/FG_var_signup.inc:213
-#, fuzzy
 msgid "Insert your city"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci citt&agrave"
 
-#: form_data/FG_var_signup.inc:217 form_data/FG_var_card.inc:92
+#: form_data/FG_var_signup.inc:217
+#: form_data/FG_var_card.inc:92
 msgid "STATE/PROVINCE"
-msgstr ""
+msgstr "PROVINCIA"
 
 #: form_data/FG_var_signup.inc:222
-#, fuzzy
 msgid "Insert your state"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci provincia"
 
-#: form_data/FG_var_signup.inc:239 form_data/FG_var_card.inc:113
-#, fuzzy
+#: form_data/FG_var_signup.inc:239
+#: form_data/FG_var_card.inc:113
 msgid "ZIP/POSTAL CODE"
 msgstr "CODICE POSTALE"
 
 #: form_data/FG_var_signup.inc:239
-#, fuzzy
 msgid "Insert your zipcode"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci codice postale"
 
-#: form_data/FG_var_signup.inc:257 form_data/FG_var_card.inc:122
+#: form_data/FG_var_signup.inc:257
+#: form_data/FG_var_card.inc:122
 msgid "TIMEZONE"
-msgstr ""
+msgstr "FUSO ORARIO"
 
-#: form_data/FG_var_signup.inc:268 form_data/FG_var_phonenumber.inc:62
-#: call-history.php:276
-#, fuzzy
+#: form_data/FG_var_signup.inc:268
+#: form_data/FG_var_phonenumber.inc:61
+#: call-history.php:324
 msgid "PHONENUMBER"
-msgstr "Novembre"
+msgstr "TELEFONO"
 
 #: form_data/FG_var_signup.inc:272
-#, fuzzy
 msgid "Insert your phone number"
-msgstr "Aggiungi un nuovo numero di telefono alla tua Selezione Passante"
+msgstr "Inserisci il tuo numero telefono"
 
 #: form_data/FG_var_signup.inc:276
-#, fuzzy
 msgid "FAXNUMBER"
-msgstr "NUMERO CARTA"
+msgstr "FAX"
 
 #: form_data/FG_var_signup.inc:280
-#, fuzzy
 msgid "Insert your fax number"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci numero fax"
 
 #: form_data/FG_var_signup.inc:284
-#, fuzzy
 msgid "COMPANY NAME"
-msgstr "Maggio"
+msgstr "SOCIET&Agrave"
 
 #: form_data/FG_var_signup.inc:288
-#, fuzzy
 msgid "Insert Company name of this customer"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci il nome societ&agrave per questo utente"
 
 #: form_data/FG_var_signup.inc:292
-#, fuzzy
 msgid "COMPANY WEBSITE"
-msgstr "Maggio"
+msgstr "SITOWEB"
 
 #: form_data/FG_var_signup.inc:296
-#, fuzzy
 msgid "Insert the company website of this customer"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci il sito web di questo utente"
 
 #: form_data/FG_var_signup.inc:300
 msgid "VAT REGISTRATION NUMBER "
-msgstr ""
+msgstr "PARTITA IVA"
 
 #: form_data/FG_var_signup.inc:304
-#, fuzzy
 msgid "Insert the VAT registration number of this customer"
-msgstr "Aggiungi un nuovo numero di telefono alla tua Selezione Passante"
+msgstr "Inserisci la Partita Iva di questo utente"
 
 #: form_data/FG_var_signup.inc:308
 msgid "TRAFFIC PER MONTH"
-msgstr ""
+msgstr "TRAFFICO MENSILE"
 
 #: form_data/FG_var_signup.inc:312
-#, fuzzy
 msgid "Insert the traffic per month for this customer"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci il traffico mensile per questo utente"
 
 #: form_data/FG_var_signup.inc:316
 msgid "TARGET TRAFFIC"
-msgstr ""
+msgstr "TARGET TRAFFICO "
 
 #: form_data/FG_var_signup.inc:320
 msgid "Insert the target traffic description"
-msgstr ""
+msgstr "Inserisci la descrizione del target traffico"
 
 #: form_data/FG_var_signup.inc:324
-#, fuzzy
 msgid "VERIFICATION"
-msgstr "Destinazione"
+msgstr "VERIFICA"
 
 #: form_data/FG_var_signup.inc:324
 msgid "Insert code from above picture"
-msgstr ""
+msgstr "Inserisci il codice della figura"
 
 #: form_data/FG_var_signup.inc:425
 msgid "You can modify, through the following form, the different properties of your "
-msgstr ""
+msgstr "Puoi modificare, attraverso il seguente campo, le differenti propriet&agrave del tuo"
 
 #: form_data/FG_var_signup.inc:426
 msgid "If you really want remove this "
-msgstr ""
+msgstr "Se vuoi realmente rimuovere questo"
 
 #: form_data/FG_var_signup.inc:427
 msgid "you can add easily a new "
-msgstr ""
+msgstr "puoi aggiungere facilmente una nuova"
 
 #: form_data/FG_var_signup.inc:430
 msgid "Thanks for registering with us.<br>A email with your information has been sent to your account "
-msgstr ""
+msgstr "Grazie per esserti registrato.<br>Un email con le tue informazioni ti &egrave stata inviata"
 
 #: form_data/FG_var_signup.inc:430
 msgid "Your card number is "
-msgstr ""
+msgstr "Il tuo Numero Scheda &egrave"
 
-#: form_data/FG_var_signup.inc:430 activate.php:109
-#: signup_confirmation.php:120
+#: form_data/FG_var_signup.inc:430
+#: activate.php:111
+#: signup_confirmation.php:121
 msgid "Your password is "
-msgstr ""
+msgstr "La tua password &egrave"
 
 #: form_data/FG_var_signup.inc:433
 msgid "SIGNUP"
-msgstr ""
+msgstr "REGISTRATI"
 
 #: form_data/FG_var_card.inc:59
-#, fuzzy
 msgid "Insert the lastname of the customers"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci il cognome dell'utente"
 
 #: form_data/FG_var_card.inc:68
-#, fuzzy
 msgid "Insert the firstname of the customers"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci il nome dell'utente"
 
 #: form_data/FG_var_card.inc:78
 msgid "Insert the address of the customers"
-msgstr ""
+msgstr "Inserisci l'inidirizzo dell'utente"
 
 #: form_data/FG_var_card.inc:88
-#, fuzzy
 msgid "Insert the city"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci la citt&agrave"
 
 #: form_data/FG_var_card.inc:98
-#, fuzzy
 msgid "Insert the state"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci la provincia"
 
 #: form_data/FG_var_card.inc:119
-#, fuzzy
 msgid "Insert the zipcode"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci il codice postale"
 
 #: form_data/FG_var_card.inc:132
-#, fuzzy
 msgid "PHONE NUMBER"
-msgstr "Novembre"
+msgstr "NUMERO TELEFONO"
 
 #: form_data/FG_var_card.inc:138
-#, fuzzy
 msgid "Insert the phone number of the customers"
-msgstr "Aggiungi un nuovo numero di telefono alla tua Selezione Passante"
+msgstr "Inserisci il numero di telefono dell'utente"
 
 #: form_data/FG_var_card.inc:142
-#, fuzzy
 msgid "FAX NUMBER"
-msgstr "NUMERO CARTA"
+msgstr "NUMERO FAX"
 
 #: form_data/FG_var_card.inc:148
 msgid "Insert the fax number of the customers"
-msgstr ""
+msgstr "Inserisci il numero fax dell'utente"
 
 #: form_data/FG_var_card.inc:152
 msgid "ACTIVE VOICEMAIL SERVICE"
-msgstr ""
+msgstr "ATTIVA IL SERVIZIO VOICEMAIL"
 
 #: form_data/FG_var_card.inc:158
 msgid "Customer can choose to enable the voicemail for this card"
-msgstr ""
+msgstr "L'utente pu&ograve scegliere di abilitare la voicemail per questa scheda"
 
 #: form_data/FG_var_card.inc:159
 msgid "Customer can enable the voicemail for this card."
-msgstr ""
+msgstr "L'utente pu&ograve abilitare la voicemail per questa scheda"
 
-#: form_data/FG_var_card.inc:169 form_data/FG_var_notify.inc:114
+#: form_data/FG_var_card.inc:169
+#: form_data/FG_var_notify.inc:114
 msgid "you can add easily update your information clicking on the button."
-msgstr ""
+msgstr "puoi facilmente aggiornare le tue informazioni cliccando sul tasto"
 
-#: form_data/FG_var_card.inc:172 form_data/FG_var_notify.inc:117
+#: form_data/FG_var_card.inc:172
+#: form_data/FG_var_notify.inc:117
 msgid "Your record has been updated."
-msgstr ""
+msgstr "Il tuo record &egrave stato aggiornato"
 
-#: form_data/FG_var_voucher.inc:45 A2B_entity_voucher.php:113
+#: form_data/FG_var_voucher.inc:45
+#: A2B_entity_voucher.php:116
 msgid "VOUCHER"
-msgstr "RICEVUTE"
+msgstr "COUPON"
 
 #: form_data/FG_var_voucher.inc:46
 msgid "CREDIT"
@@ -734,265 +768,260 @@ msgstr "CREDITO"
 
 #: form_data/FG_var_voucher.inc:54
 msgid "No vouchers have been used!"
-msgstr ""
+msgstr "Nessun coupon &egrave stato usato"
 
-#: form_data/FG_var_campaign.inc:66
+#: form_data/FG_var_campaign.inc:64
 msgid "Add CAMPAIGN"
-msgstr ""
-
-#: form_data/FG_var_campaign.inc:70 form_data/FG_var_speeddial.inc:53
-#: form_data/FG_var_speeddial.inc:90 form_data/FG_var_phonebook.inc:65
-#: form_data/FG_var_phonebook.inc:81 form_data/FG_var_phonenumber.inc:63
-#: form_data/FG_var_phonenumber.inc:102
+msgstr "Aggiungi CAMPAGNA"
+
+#: form_data/FG_var_campaign.inc:68
+#: form_data/FG_var_speeddial.inc:53
+#: form_data/FG_var_speeddial.inc:90
+#: form_data/FG_var_phonebook.inc:65
+#: form_data/FG_var_phonebook.inc:81
+#: form_data/FG_var_phonenumber.inc:62
+#: form_data/FG_var_phonenumber.inc:101
 msgid "NAME"
-msgstr "Nome"
+msgstr "NOME"
 
-#: form_data/FG_var_campaign.inc:71
-#, fuzzy
+#: form_data/FG_var_campaign.inc:69
 msgid "STARTINGDATE"
-msgstr "REGIONE"
+msgstr "DATA INIZIO"
 
-#: form_data/FG_var_campaign.inc:72
+#: form_data/FG_var_campaign.inc:70
 msgid "EXPIRATIONDATE"
-msgstr ""
+msgstr "DATA SCADENZA"
 
-#: form_data/FG_var_campaign.inc:73 A2B_entity_sipiax_info.php:85
-#, fuzzy
+#: form_data/FG_var_campaign.inc:71
+#: A2B_entity_sipiax_info.php:88
 msgid "CARD"
-msgstr "CHIAMATA"
+msgstr "SCHEDA"
 
-#: form_data/FG_var_campaign.inc:80
+#: form_data/FG_var_campaign.inc:78
 msgid "No campaigns have been created."
-msgstr ""
+msgstr "Non sono state create campagne"
 
-#: form_data/FG_var_campaign.inc:91
+#: form_data/FG_var_campaign.inc:89
 msgid "CAMPAIGN NAME"
-msgstr ""
+msgstr "NOME CAMPAGNA"
 
-#: form_data/FG_var_campaign.inc:97
-#, fuzzy
+#: form_data/FG_var_campaign.inc:95
 msgid "Insert the tariff name "
-msgstr "Inserisci nuovo"
+msgstr "Inserisci il nome tariffa"
 
-#: form_data/FG_var_campaign.inc:107
+#: form_data/FG_var_campaign.inc:105
 msgid "Define if this campaign is active or not"
-msgstr ""
+msgstr "Definire se questa campagna &egrave attiva o no"
 
-#: form_data/FG_var_campaign.inc:109
-#, fuzzy
+#: form_data/FG_var_campaign.inc:107
 msgid "CONFIG TO APPLY"
-msgstr "TIPO DI CONFIGURAZIONE"
+msgstr "CONFIGURAZIONE DA APPLICARE"
 
-#: form_data/FG_var_campaign.inc:117
+#: form_data/FG_var_campaign.inc:115
 msgid "Define the configuration that you want apply on this campaign"
-msgstr ""
+msgstr "Definire la configurazione che tu vuoi applicare a questa campagna"
 
-#: form_data/FG_var_campaign.inc:133
+#: form_data/FG_var_campaign.inc:131
 msgid "CID GROUP"
-msgstr ""
+msgstr "GRUPPO CID"
 
-#: form_data/FG_var_campaign.inc:143
-#, fuzzy
+#: form_data/FG_var_campaign.inc:141
 msgid "STARTING DATE"
-msgstr "PREZZO"
+msgstr "DATA INIZIO"
 
-#: form_data/FG_var_campaign.inc:149
-#, fuzzy
+#: form_data/FG_var_campaign.inc:147
 msgid "Insert the starting date"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci la data inizio"
 
-#: form_data/FG_var_campaign.inc:150 form_data/FG_var_campaign.inc:159
+#: form_data/FG_var_campaign.inc:148
+#: form_data/FG_var_campaign.inc:157
 msgid "Please respect the format YYYY-MM-DD HH:MM:SS. For instance, '2004-12-31 00:00:00'"
-msgstr ""
+msgstr "Rispettare il formato AAAA-MM-GG OO:MM:SS. Per esempio, '2004-12-31 00:23:00'"
 
-#: form_data/FG_var_campaign.inc:152
-#, fuzzy
+#: form_data/FG_var_campaign.inc:150
 msgid "EXPIRATION DATE"
-msgstr "TIPO DI CONFIGURAZIONE"
+msgstr "DATA SCADENZA"
 
-#: form_data/FG_var_campaign.inc:158
-#, fuzzy
+#: form_data/FG_var_campaign.inc:156
 msgid "Insert the expiration date"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci la data scadenza"
 
-#: form_data/FG_var_campaign.inc:161
+#: form_data/FG_var_campaign.inc:159
 msgid "FREQUENCY"
-msgstr ""
+msgstr "FREQUENZA"
 
-#: form_data/FG_var_campaign.inc:167
+#: form_data/FG_var_campaign.inc:165
 msgid "Insert the frequency of callback in min "
-msgstr ""
+msgstr "Inserisci la frequenza del callback in minuti"
 
-#: form_data/FG_var_campaign.inc:168
+#: form_data/FG_var_campaign.inc:166
 msgid "Please insert the frequency in minutes"
-msgstr ""
+msgstr "Inserisci la frequenza in minuti"
 
-#: form_data/FG_var_campaign.inc:170
+#: form_data/FG_var_campaign.inc:168
 msgid "DAILY STARTING TIME"
-msgstr ""
+msgstr "ORA DI AVVIO GIORNALIERO"
 
-#: form_data/FG_var_campaign.inc:176
-#, fuzzy
+#: form_data/FG_var_campaign.inc:174
 msgid "Insert the daily starting time"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci l'ora di avvio giornaliero"
 
-#: form_data/FG_var_campaign.inc:177 form_data/FG_var_campaign.inc:186
+#: form_data/FG_var_campaign.inc:175
+#: form_data/FG_var_campaign.inc:184
 msgid "Please respect the format HH:MM:SS. For instance, '00:00:00'"
-msgstr ""
+msgstr "Rispetta il formato OO:MM:SS. Es.: 00:23:00"
 
-#: form_data/FG_var_campaign.inc:179
+#: form_data/FG_var_campaign.inc:177
 msgid "DAILY STOPING TIME"
-msgstr ""
+msgstr "ORA DI FINE GIORNALIERO"
 
-#: form_data/FG_var_campaign.inc:185
-#, fuzzy
+#: form_data/FG_var_campaign.inc:183
 msgid "Insert the daily stoping time"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci l'ora di fine giornaliero"
 
-#: form_data/FG_var_campaign.inc:188
-#, fuzzy
+#: form_data/FG_var_campaign.inc:186
 msgid "MONDAY"
-msgstr "Maggio"
+msgstr "LUNED&Igrave"
 
-#: form_data/FG_var_campaign.inc:194 form_data/FG_var_campaign.inc:203
-#: form_data/FG_var_campaign.inc:212
+#: form_data/FG_var_campaign.inc:192
+#: form_data/FG_var_campaign.inc:201
+#: form_data/FG_var_campaign.inc:210
 msgid "Choose if you want to enable the campaign callback for the monday"
-msgstr ""
+msgstr "Scegli se vuoi attivare la campagna callback per il luned&igrave"
 
-#: form_data/FG_var_campaign.inc:197
+#: form_data/FG_var_campaign.inc:195
 msgid "TUESDAY"
-msgstr ""
+msgstr "MARTED&Igrave"
 
-#: form_data/FG_var_campaign.inc:206
+#: form_data/FG_var_campaign.inc:204
 msgid "WEDNESDAY"
-msgstr ""
+msgstr "MERCOLED&Igrave"
 
-#: form_data/FG_var_campaign.inc:215
+#: form_data/FG_var_campaign.inc:213
 msgid "THURSDAY"
-msgstr ""
+msgstr "GIOVED&Igrave"
 
-#: form_data/FG_var_campaign.inc:221
+#: form_data/FG_var_campaign.inc:219
 msgid "Choose if you want to enable the campaign callback for the thursday"
-msgstr ""
+msgstr "Scegli se vuoi attivare la campagna callback per il marted&igrave"
 
-#: form_data/FG_var_campaign.inc:224
+#: form_data/FG_var_campaign.inc:222
 msgid "FRIDAY"
-msgstr ""
+msgstr "VENERD&Igrave"
 
-#: form_data/FG_var_campaign.inc:230
+#: form_data/FG_var_campaign.inc:228
 msgid "Choose if you want to enable the campaign callback for the friday"
-msgstr ""
+msgstr "Scegli se vuoi attivare la campagna callback per il venerd&igrave"
 
-#: form_data/FG_var_campaign.inc:233
+#: form_data/FG_var_campaign.inc:231
 msgid "SATURDAY"
-msgstr ""
+msgstr "SABATO"
 
-#: form_data/FG_var_campaign.inc:239
+#: form_data/FG_var_campaign.inc:237
 msgid "Choose if you want to enable the campaign callback for the saturday"
-msgstr ""
+msgstr "Scegli se vuoi attivare la campagna callback per il sabato"
 
-#: form_data/FG_var_campaign.inc:242
-#, fuzzy
+#: form_data/FG_var_campaign.inc:240
 msgid "SUNDAY"
-msgstr "SOMMARIO"
+msgstr "DOMENICA"
 
-#: form_data/FG_var_campaign.inc:248
+#: form_data/FG_var_campaign.inc:246
 msgid "Choose if you want to enable the campaign callback for the sunday"
-msgstr ""
+msgstr "Scegli se vuoi attivare la campagna callback per la domenica"
 
-#: form_data/FG_var_campaign.inc:251 form_data/FG_var_payment.inc:53
-#: form_data/FG_var_phonebook.inc:66 form_data/FG_var_phonebook.inc:90
-#, fuzzy
+#: form_data/FG_var_campaign.inc:249
+#: form_data/FG_var_payment.inc:53
+#: form_data/FG_var_phonebook.inc:66
+#: form_data/FG_var_phonebook.inc:90
 msgid "DESCRIPTION"
-msgstr "Destinazione"
+msgstr "DESCRIZIONE"
 
-#: form_data/FG_var_campaign.inc:257 form_data/FG_var_phonebook.inc:96
-#, fuzzy
+#: form_data/FG_var_campaign.inc:255
+#: form_data/FG_var_phonebook.inc:96
 msgid "Insert the description"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci la descrizione"
 
-#: form_data/FG_var_campaign.inc:271
-#, fuzzy
+#: form_data/FG_var_campaign.inc:269
 msgid "PHONE BOOK"
-msgstr "TELEFONO"
-
-#: form_data/FG_var_campaign.inc:296 form_data/FG_var_speeddial.inc:117
-#: form_data/FG_var_phonebook.inc:108 form_data/FG_var_phonenumber.inc:144
-#: form_data/FG_var_callerid.inc:116 lib/Form/Class.FormHandler.inc.php:579
+msgstr "RUBRICA"
+
+#: form_data/FG_var_campaign.inc:294
+#: form_data/FG_var_speeddial.inc:117
+#: form_data/FG_var_phonebook.inc:108
+#: form_data/FG_var_phonenumber.inc:143
+#: form_data/FG_var_callerid.inc:115
+#: lib/Form/Class.FormHandler.inc.php:553
 msgid "You can modify, through the following form, the different properties of your"
-msgstr ""
+msgstr "Puoi modificare, attraverso il campo seguente, le differenti propriet&agrave del tuo"
 
-#: form_data/FG_var_campaign.inc:301
+#: form_data/FG_var_campaign.inc:299
 msgid "Add a "
-msgstr ""
+msgstr "Aggiungi un"
 
-#: form_data/FG_var_campaign.inc:306
+#: form_data/FG_var_campaign.inc:304
 msgid "Setup those values to create the new"
-msgstr ""
+msgstr "Imposta questi valori per creare la nuova"
 
-#: form_data/FG_var_speeddial.inc:51 form_data/FG_var_speeddial.inc:80
-#, fuzzy
+#: form_data/FG_var_speeddial.inc:51
+#: form_data/FG_var_speeddial.inc:80
 msgid "SPEEDDIAL"
-msgstr "RUBRICA VELOCE"
+msgstr "NUMERO BREVE"
 
-#: form_data/FG_var_speeddial.inc:52 form_data/FG_var_speeddial.inc:100
-#: userinfo.php:105
+#: form_data/FG_var_speeddial.inc:52
+#: form_data/FG_var_speeddial.inc:100
+#: userinfo.php:108
 msgid "PHONE"
 msgstr "TELEFONO"
 
 #: form_data/FG_var_speeddial.inc:57
 msgid "There are no speed dials created."
-msgstr ""
+msgstr "Non ci sono chiamate rapide create"
 
 #: form_data/FG_var_speeddial.inc:96
-#, fuzzy
 msgid "Insert the name"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci il nome"
 
 #: form_data/FG_var_speeddial.inc:97
 msgid "Enter here the name/label that will identify this speed dial"
-msgstr ""
+msgstr "Immetti il nome/etichetta che identifica questo Numero Breve"
 
 #: form_data/FG_var_speeddial.inc:106
-#, fuzzy
 msgid "Insert the phone"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci il telefono"
 
 #: form_data/FG_var_speeddial.inc:107
 msgid "Enter here the phonenumber you want to call for this speed dial"
-msgstr ""
+msgstr "Immetti qui il telefono per questa Numero Breve"
 
 #: form_data/FG_var_speeddial.inc:128
 msgid "Once you have completed the form above, click on the CONTINUE button."
-msgstr ""
+msgstr "Dopo aver completato il modulo di cui sopra, fare clic sul pulsante Continua"
 
 #: form_data/FG_var_payment.inc:40
 msgid "payment"
-msgstr ""
+msgstr "pagamento"
 
-#: form_data/FG_var_payment.inc:50 form_data/FG_var_receipt.inc:65
+#: form_data/FG_var_payment.inc:50
+#: form_data/FG_var_receipt.inc:65
 #: form_data/FG_var_ticket.inc:54
-#, fuzzy
 msgid "ID"
-msgstr "SELEZIONE PASSANTE"
+msgstr "ID"
 
 #: form_data/FG_var_payment.inc:51
-#, fuzzy
 msgid "PAYMENT DATE"
-msgstr "REGIONE"
+msgstr "DATA PAGAMENTO"
 
 #: form_data/FG_var_payment.inc:52
-#, fuzzy
 msgid "PAYMENT AMOUNT"
-msgstr "PAESE"
+msgstr "IMPORTO PAGAMENTO"
 
 #: form_data/FG_var_payment.inc:58
 msgid "Payment list"
-msgstr ""
+msgstr "Lista pagamenti"
 
 #: form_data/FG_var_payment.inc:59
 msgid "No payments have been made!"
-msgstr ""
+msgstr "Non sono stati effettuati pagamenti"
 
 #: form_data/FG_var_ratecard.inc:55
 msgid "PREFIX"
@@ -1000,434 +1029,453 @@ msgstr "PREFISSO"
 
 #: form_data/FG_var_ratecard.inc:57
 msgid "SR"
-msgstr "PR"
+msgstr "CM"
 
 #: form_data/FG_var_ratecard.inc:63
-#, fuzzy
 msgid "THERE IS NO RATECARD CREATED!"
-msgstr "TARIFFA ATTUALE"
+msgstr "NON CI SONO TARIFFE"
 
 #: form_data/FG_var_receipt.inc:66
-#, fuzzy
 msgid "ACCOUNT"
-msgstr "PAESE"
+msgstr "ACCOUNT"
 
 #: form_data/FG_var_receipt.inc:73
 msgid "THERE IS NO RECEIPT CREATED!"
-msgstr ""
+msgstr "NON CI SONO RICEVUTE CREATE"
 
-#: form_data/FG_var_phonebook.inc:38 form_data/FG_var_phonenumber.inc:92
-#: templates/default/main.tpl:116
+#: form_data/FG_var_phonebook.inc:38
+#: form_data/FG_var_phonenumber.inc:91
+#: templates/default/main.tpl:114
 msgid "Phone Book"
-msgstr ""
+msgstr "Rubrica"
 
 #: form_data/FG_var_phonebook.inc:56
 msgid "You have some phone using this PhoneBook! Please comfirm that you really want to remove this PhoneBook ? "
-msgstr ""
+msgstr "Ci sono alcuni telefoni che usano questa Rubrica! Confermi che vuoi realmente rimuovere questa Rubrica ?"
 
 #: form_data/FG_var_phonebook.inc:61
 msgid "Add PhoneBook"
-msgstr ""
+msgstr "Aggiungi Rubrica"
 
 #: form_data/FG_var_phonebook.inc:70
-#, fuzzy
 msgid "NO PHONEBOOK CREATED!"
-msgstr " CREATA!"
+msgstr "NESSUNA RUBRICA CREATA!"
 
 #: form_data/FG_var_phonebook.inc:86
-#, fuzzy
 msgid "Insert the provider name"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci il nome fornitore"
 
-#: form_data/FG_var_phonebook.inc:113 lib/Form/Class.SearchHandler.inc.php:365
-#: lib/Form/Class.SearchHandler.inc.php:380
-#: lib/Form/Class.SearchHandler.inc.php:396
-#: lib/Form/Class.SearchHandler.inc.php:412
-#: lib/Form/Class.SearchHandler.inc.php:428
-#: lib/Form/Class.SearchHandler.inc.php:444
-#: lib/Form/Class.SearchHandler.inc.php:460
-#: lib/Form/Class.SearchHandler.inc.php:476
-#: lib/Form/Class.SearchHandler.inc.php:493
+#: form_data/FG_var_phonebook.inc:113
+#: lib/Form/Class.SearchHandler.inc.php:379
+#: lib/Form/Class.SearchHandler.inc.php:394
+#: lib/Form/Class.SearchHandler.inc.php:410
+#: lib/Form/Class.SearchHandler.inc.php:426
+#: lib/Form/Class.SearchHandler.inc.php:442
+#: lib/Form/Class.SearchHandler.inc.php:458
+#: lib/Form/Class.SearchHandler.inc.php:474
+#: lib/Form/Class.SearchHandler.inc.php:490
+#: lib/Form/Class.SearchHandler.inc.php:507
 msgid "Add"
-msgstr ""
+msgstr "Aggiungi"
 
-#: form_data/FG_var_phonebook.inc:118 form_data/FG_var_ticket.inc:88
-#: form_data/FG_var_phonenumber.inc:154
+#: form_data/FG_var_phonebook.inc:118
+#: form_data/FG_var_ticket.inc:88
+#: form_data/FG_var_phonenumber.inc:153
 msgid "Click 'Confirm Data' to continue"
-msgstr ""
+msgstr "Clicca su 'Conferma Dati' per continuare"
 
 #: form_data/FG_var_notify.inc:82
 msgid "LIMIT CREDIT NOTIFICATION"
-msgstr ""
+msgstr "LIMITE DI NOTIFICA CREDITO"
 
 #: form_data/FG_var_notify.inc:88
-#, fuzzy
 msgid "Insert the number of credit when the customer receive a notification"
-msgstr "Aggiungi un nuovo numero di telefono alla tua Selezione Passante"
+msgstr "Inserisci il credito residuo quando l'utente riceve una notifica"
 
 #: form_data/FG_var_notify.inc:89
 msgid "currency : "
-msgstr ""
+msgstr "valuta"
 
 #: form_data/FG_var_notify.inc:89
 msgid "NOT DEFINED"
-msgstr ""
+msgstr "NON DEFINITO"
 
 #: form_data/FG_var_notify.inc:92
 msgid "PERMITTED NOTIFICATIONS BY MAIL"
-msgstr ""
+msgstr "PERMETTI LA NOTIFICA VIA EMAIL"
 
 #: form_data/FG_var_notify.inc:98
 msgid "Choose if you want to enable the notification by email for this card"
-msgstr ""
+msgstr "Scegli se vuoi abilitare la notifica via email per questa scheda"
 
 #: form_data/FG_var_notify.inc:99
 msgid "Enable Email Notification"
-msgstr ""
+msgstr "Abilita Notifica Email"
 
 #: form_data/FG_var_notify.inc:102
 msgid "EMAIL NOTIFICATION"
-msgstr ""
+msgstr "EMAIL DI NOTIFICA"
 
 #: form_data/FG_var_notify.inc:108
-#, fuzzy
 msgid "Insert the email to notify the customers"
-msgstr "Inserisci nuovo"
+msgstr "Inserisci l'email di notifica dell'utente"
 
 #: form_data/FG_var_ticket.inc:56
-#, fuzzy
 msgid "CREATIONDATE"
-msgstr "DURATA"
+msgstr "DATA CREAZIONE"
 
 #: form_data/FG_var_ticket.inc:57
-#, fuzzy
 msgid "COMPONENT"
-msgstr "Maggio"
+msgstr "COMPONENTE"
 
-#: form_data/FG_var_ticket.inc:59 lib/interface/constants.php:349
+#: form_data/FG_var_ticket.inc:59
+#: lib/interface/constants.php:276
 msgid "VIEWED"
-msgstr ""
+msgstr "VISTI"
 
 #: form_data/FG_var_ticket.inc:68
 msgid "There are no tickets created"
-msgstr ""
+msgstr "Non ci sono ticket creati"
 
 #: form_data/FG_var_phonenumber.inc:53
-#, fuzzy
 msgid "Add PHONE NUMBER"
-msgstr "Novembre"
+msgstr "Aggiungi NUMERO TELEFONO"
 
-#: form_data/FG_var_phonenumber.inc:61
-#, fuzzy
+#: form_data/FG_var_phonenumber.inc:60
 msgid "PHONEBOOK"
-msgstr "TELEFONO"
+msgstr "RUBRICA"
 
-#: form_data/FG_var_phonenumber.inc:64 form_data/FG_var_phonenumber.inc:111
-#: lib/interface/constants.php:515
-#, fuzzy
+#: form_data/FG_var_phonenumber.inc:63
+#: form_data/FG_var_phonenumber.inc:110
+#: lib/interface/constants.php:410
 msgid "AMOUNT"
-msgstr "PAESE"
+msgstr "IMPORTO"
 
-#: form_data/FG_var_phonenumber.inc:72
+#: form_data/FG_var_phonenumber.inc:71
 msgid "No phone numbers have been created"
-msgstr ""
+msgstr "Non sono stati creati numeri di telefono"
 
-#: form_data/FG_var_phonenumber.inc:83 templates/default/main.tpl:117
-#, fuzzy
+#: form_data/FG_var_phonenumber.inc:82
+#: templates/default/main.tpl:115
 msgid "Phone Number"
-msgstr "Aggiungi un nuovo numero di telefono alla tua Selezione Passante"
+msgstr "Numero Telefono"
 
-#: form_data/FG_var_phonenumber.inc:89
-#, fuzzy
+#: form_data/FG_var_phonenumber.inc:88
 msgid "Insert the phonenumber"
-msgstr "Aggiungi un nuovo numero di telefono alla tua Selezione Passante"
+msgstr "Inserisci il numero di telefono"
 
-#: form_data/FG_var_phonenumber.inc:90
-#, fuzzy
+#: form_data/FG_var_phonenumber.inc:89
 msgid "Enter here the phonenumber to call"
-msgstr "Digitare il numero di telefono del quale si vuole simulare la chiamata"
+msgstr "Numero per la simulazione"
 
-#: form_data/FG_var_phonenumber.inc:108
-#, fuzzy
+#: form_data/FG_var_phonenumber.inc:107
 msgid "Insert the name "
-msgstr "Inserisci nuovo"
+msgstr "Inserisci il nome"
 
-#: form_data/FG_var_phonenumber.inc:117
-#, fuzzy
+#: form_data/FG_var_phonenumber.inc:116
 msgid "Insert the amount "
-msgstr "Inserisci nuovo"
+msgstr "Inserisci l'importo"
 
-#: form_data/FG_var_phonenumber.inc:127
+#: form_data/FG_var_phonenumber.inc:126
 msgid "Define if this phone number is active or not"
-msgstr ""
+msgstr "Definire se questo numero di telefono &egrave attivo o no "
 
-#: form_data/FG_var_phonenumber.inc:129
+#: form_data/FG_var_phonenumber.inc:128
 msgid "ADDITIONALINFO"
-msgstr ""
+msgstr "INFORMAZIONI ADDIZIONALI"
 
-#: form_data/FG_var_phonenumber.inc:135
+#: form_data/FG_var_phonenumber.inc:134
 msgid "Insert additional information"
-msgstr ""
+msgstr "Inserisci informazioni addizionali"
 
-#: form_data/FG_var_phonenumber.inc:149
-#, fuzzy
+#: form_data/FG_var_phonenumber.inc:148
 msgid "Add a new phone number."
-msgstr "Aggiungi un nuovo numero di telefono alla tua Selezione Passante"
+msgstr "Aggiungi un nuovo numero di telefono"
 
-#: form_data/FG_var_phonenumber.inc:150
-#, fuzzy
+#: form_data/FG_var_phonenumber.inc:149
 msgid "Your new phone number has been inserted."
-msgstr "è stata processata, Abbiamo aggiunto"
+msgstr "Il nuovo numero di telefono &egrave stato aggiunto"
 
-#: form_data/FG_var_callerid.inc:39 call-history.php:100
-#, fuzzy
+#: form_data/FG_var_callerid.inc:39
+#: call-history.php:131
 msgid "CallerID"
-msgstr "Chiamata"
+msgstr "ID chiamante"
 
-#: form_data/FG_var_callerid.inc:49 form_data/FG_var_callerid.inc:82
-#, fuzzy
+#: form_data/FG_var_callerid.inc:48
+#: form_data/FG_var_callerid.inc:81
 msgid "CALLERID"
-msgstr "CHIAMATA"
+msgstr "ID CHIAMANTE"
 
-#: form_data/FG_var_callerid.inc:55
+#: form_data/FG_var_callerid.inc:54
 msgid "CallerID list"
-msgstr ""
+msgstr "Lista ID Chiamante"
 
-#: form_data/FG_var_callerid.inc:56
+#: form_data/FG_var_callerid.inc:55
 msgid "There are no Caller IDs created"
-msgstr ""
+msgstr "Non ci sono ID Chiamante creati"
 
-#: form_data/FG_var_callerid.inc:88
+#: form_data/FG_var_callerid.inc:87
 msgid "Insert the CallerID"
-msgstr ""
+msgstr "Inserisci ID Chiamante"
 
-#: form_data/FG_var_callerid.inc:123
+#: form_data/FG_var_callerid.inc:122
 msgid "You can add your home phone or cellphone number below to allow you to call in, be automatically recognized, and use your telephony services without having to enter your PIN."
-msgstr ""
+msgstr "Puoi aggiungere il tuo numero di casa o cellulare come ID Chiamante, sar&agrave automaticamente riconosciuto, e si potr&agrave usare il servizio telefonico senza inserire il PIN"
 
-#: form_data/FG_var_callerid.inc:127
+#: form_data/FG_var_callerid.inc:126
 msgid "Made your change to edit this callerid."
-msgstr ""
+msgstr "Cambia l'ID Chiamante"
 
-#: lib/customer.defines.php:112
+#: lib/customer.defines.php:114
 msgid "The expiry date entered for the credit card is invalid."
-msgstr ""
+msgstr "La data scadenza inserita della carta di credito non &egrave valida"
 
-#: lib/customer.defines.php:112
-#, fuzzy
+#: lib/customer.defines.php:114
 msgid "Please check the date and try again."
-msgstr "Impossibile connettersi al manager di Asterisk!<br>Prego controllare la configurazione del manager..."
+msgstr "Controllare la data e provare ancora"
 
-#: lib/customer.defines.php:113
+#: lib/customer.defines.php:115
 msgid "The credit card number entered is invalid."
-msgstr ""
+msgstr "Il numero di carta di credito non $egrave valido"
 
-#: lib/customer.defines.php:113
-#, fuzzy
+#: lib/customer.defines.php:115
 msgid "Please check the number and try again."
-msgstr "Impossibile connettersi al manager di Asterisk!<br>Prego controllare la configurazione del manager..."
+msgstr "Controllare il numero e provare ancora"
 
-#: lib/customer.defines.php:114
+#: lib/customer.defines.php:116
 msgid "The first four digits of the number entered are"
-msgstr ""
+msgstr "Le prima quattro cifre del numero digitato sono "
 
-#: lib/customer.defines.php:114
+#: lib/customer.defines.php:116
 msgid "If that number is correct, we do not accept that type of credit card."
-msgstr ""
+msgstr "Se il numero &egrave corretto, non accettiamo questo tipo di carte di credito"
 
-#: lib/customer.defines.php:114
+#: lib/customer.defines.php:116
 msgid "If it is wrong, please try again."
-msgstr ""
+msgstr "Se &egrave sbagliato, provare ancora"
 
-#: lib/customer.defines.php:121
+#: lib/customer.defines.php:123
 msgid "Errors have occured during the process of your form."
-msgstr ""
+msgstr "Si sono verificati delgi errori durante la compilazione del modulo "
 
-#: lib/customer.defines.php:121
-msgid "Please make the following corrections:\\n\\n"
+#: lib/customer.defines.php:123
+msgid ""
+"Please make the following corrections:\\n"
+"\\n"
 msgstr ""
+"Fai la seguente corrzione: \\n"
+"\\n"
 
-#: lib/customer.defines.php:122
+#: lib/customer.defines.php:124
 msgid "* The 'Review Text' must have at least"
-msgstr ""
+msgstr "* Il 'Testo della Recensione' deve avere almeno"
 
-#: lib/customer.defines.php:122 lib/customer.defines.php:134
-#: lib/customer.defines.php:135 lib/customer.defines.php:148
+#: lib/customer.defines.php:124
+#: lib/customer.defines.php:136
+#: lib/customer.defines.php:137
+#: lib/customer.defines.php:150
 msgid "characters"
-msgstr ""
+msgstr "caratteri"
 
-#: lib/customer.defines.php:123
+#: lib/customer.defines.php:125
 msgid "You must rate the product for your review."
-msgstr ""
+msgstr "&Egrave necessario valutare il prodotto per la tua opinione"
 
-#: lib/customer.defines.php:124 lib/customer.defines.php:126
+#: lib/customer.defines.php:126
+#: lib/customer.defines.php:128
 msgid "Please select a payment method for your order."
-msgstr ""
+msgstr "Seleziona un metodo di pagamento per il tuo ordine"
 
-#: lib/customer.defines.php:125
+#: lib/customer.defines.php:127
 msgid "This form has already been submitted. Please press Ok and wait for this process to be completed."
-msgstr ""
+msgstr "Questo modulo &egrave gi&agrave stato inviato. Premere Ok e attendere la conclusione del processo"
 
-#: lib/customer.defines.php:128
+#: lib/customer.defines.php:130
 msgid "Credit Card"
-msgstr ""
+msgstr "Carta di Credito"
 
-#: lib/customer.defines.php:129 lib/customer.defines.php:139
+#: lib/customer.defines.php:131
+#: lib/customer.defines.php:141
 msgid "Credit Card Test Info"
-msgstr ""
+msgstr "Test Info Carta di Credito"
 
-#: lib/customer.defines.php:129 lib/customer.defines.php:139
+#: lib/customer.defines.php:131
+#: lib/customer.defines.php:141
 msgid "Expiry: Any"
-msgstr ""
+msgstr "Scadenza: Qualsiasi"
 
-#: lib/customer.defines.php:130
+#: lib/customer.defines.php:132
 msgid "Credit Card Type"
-msgstr ""
+msgstr "Tipo di Carta di Credito"
 
-#: lib/customer.defines.php:131
+#: lib/customer.defines.php:133
 msgid "Credit Card Owner"
-msgstr ""
+msgstr "Proprietario Carta di Credito"
 
-#: lib/customer.defines.php:132
-#, fuzzy
+#: lib/customer.defines.php:134
 msgid "Credit Card Number"
-msgstr "Numero chiamato"
+msgstr "Numero Carta di Credito"
 
-#: lib/customer.defines.php:133
+#: lib/customer.defines.php:135
 msgid "Credit Card Expiry Date"
-msgstr ""
+msgstr "Scadenza Carta di Credito"
 
-#: lib/customer.defines.php:134 lib/customer.defines.php:147
+#: lib/customer.defines.php:136
+#: lib/customer.defines.php:149
 msgid "* The owner's name of the credit card must be at least"
-msgstr ""
+msgstr "* Il nome del proprietario della carta di credito deve essere almeno"
 
-#: lib/customer.defines.php:135 lib/customer.defines.php:148
+#: lib/customer.defines.php:137
+#: lib/customer.defines.php:150
 msgid "* The credit card number must be at least"
-msgstr ""
+msgstr "* Il numero della Carta di Credito deve essere almeno"
 
-#: lib/customer.defines.php:136
+#: lib/customer.defines.php:138
 msgid "Credit Card Error!"
-msgstr ""
+msgstr "Errore Carta di Cedito!"
 
-#: lib/customer.defines.php:140
+#: lib/customer.defines.php:142
 msgid "There has been an error processing your credit card"
-msgstr ""
+msgstr "Si &egrave verificato un errore durante l'elaborazione della carta di credito"
 
-#: lib/customer.defines.php:141
+#: lib/customer.defines.php:143
 msgid "Please check your credit card details!"
-msgstr ""
+msgstr "Verificare i dati della carta di credito!"
 
-#: lib/customer.defines.php:142
+#: lib/customer.defines.php:144
 msgid "Credit Card Owner:"
-msgstr ""
+msgstr "Proprietario Carta di Credito"
 
-#: lib/customer.defines.php:143
-#, fuzzy
+#: lib/customer.defines.php:145
 msgid "Credit Card Number:"
-msgstr "Numero chiamato"
+msgstr "Numero Carta di Credito"
 
-#: lib/customer.defines.php:144
+#: lib/customer.defines.php:146
 msgid "Credit Card Expiry Date:"
-msgstr ""
+msgstr "Scadenza Carta di Credito"
 
-#: lib/customer.defines.php:145
+#: lib/customer.defines.php:147
 msgid "Credit Card Checknumber:"
-msgstr ""
+msgstr "Numero di Controllo Carta di Credito"
 
-#: lib/customer.defines.php:146
+#: lib/customer.defines.php:148
 msgid "(located at the back of the credit card)"
-msgstr ""
+msgstr "(si trova nel retro della carta di credito)"
 
-#: lib/customer.defines.php:147
+#: lib/customer.defines.php:149
 msgid "characters."
-msgstr ""
+msgstr "caratteri"
 
-#: lib/Class.Realtime.php:94
+#: lib/Class.Realtime.php:96
 msgid "Could not open buddy file"
-msgstr ""
+msgstr "Impossibile aprire il file buddy"
 
-#: lib/Class.Realtime.php:113
+#: lib/Class.Realtime.php:115
 msgid "Impossible to write to the file"
-msgstr ""
+msgstr "Impossibile scrivere sul file"
 
-#: lib/customer.smarty.php:100 lib/admin.smarty.php:65 lib/agent.smarty.php:66
+#: lib/customer.smarty.php:103
+#: lib/admin.smarty.php:68
+#: lib/agent.smarty.php:69
 msgid "This option is not available on the Demo!"
-msgstr ""
+msgstr "Questa opzione non &egrave disponibile nella Demo!"
+
+#: lib/epayment/methods/iridium.php:607
+#: checkout_success.php:70
+msgid "We are sorry your transaction is failed. Please try later or check your provided information."
+msgstr "Spiacenti, ma la transzione &egrave fallita. Si prega di riprovare più tardi o verificare le informazioni fornite"
+
+#: lib/epayment/methods/iridium.php:611
+#: checkout_success.php:74
+msgid "We are sorry your transaction is denied. Please try later or check your provided information."
+msgstr "Spiacenti, ma la transazione &egrave stata negata. Si prega di riprovare più tardi o verificare le informazioni fornite"
+
+#: lib/epayment/methods/iridium.php:620
+#: checkout_success.php:82
+msgid "Your transaction is in progress."
+msgstr "La transazione &egrave in corso"
 
-#: lib/support/classes/ticket.php:78 lib/support/classes/ticket.php:236
+#: lib/epayment/methods/iridium.php:624
+#: checkout_success.php:86
+msgid "Your transaction was successful."
+msgstr "Transazione effettuata con successo."
+
+#: lib/support/classes/ticket.php:79
+#: lib/support/classes/ticket.php:233
 msgid "(AGENT)"
-msgstr ""
+msgstr "(AGENTE)"
 
-#: lib/support/classes/ticket.php:216
+#: lib/support/classes/ticket.php:212
 msgid "(ADMINISTRATOR) "
-msgstr ""
+msgstr "(AMMINISTRATORE)"
 
-#: lib/support/classes/ticket.php:377 lib/interface/constants.php:350
-#: lib/interface/constants.php:408 lib/interface/constants.php:431
+#: lib/support/classes/ticket.php:370
+#: lib/interface/constants.php:277
+#: lib/interface/constants.php:325
+#: lib/interface/constants.php:343
 msgid "NEW"
-msgstr ""
+msgstr "NUOVA"
 
-#: lib/support/classes/ticket.php:380
+#: lib/support/classes/ticket.php:373
 msgid "FIXED"
-msgstr ""
+msgstr "FISSO"
 
-#: lib/support/classes/ticket.php:383
+#: lib/support/classes/ticket.php:376
 msgid "REOPEN"
-msgstr ""
+msgstr "RIAPRE"
 
-#: lib/support/classes/ticket.php:386
+#: lib/support/classes/ticket.php:379
 msgid "CLOSED"
-msgstr ""
+msgstr "CHIUSO"
 
-#: lib/support/classes/ticket.php:389
+#: lib/support/classes/ticket.php:382
 msgid "INVALID"
-msgstr ""
+msgstr "INVALIDO"
 
-#: lib/Class.SOAP-function.php:829 lib/Form/Class.FormBO.php:283
+#: lib/Class.SOAP-function.php:851
+#: lib/Form/Class.FormBO.php:287
 msgid "CREATION CARD REFILL"
-msgstr ""
+msgstr "CREAZIONE RICARICA SCHEDA"
 
-#: lib/common.defines.php:87
+#: lib/common.defines.php:90
 msgid "Address line 1:"
-msgstr ""
+msgstr "Indirizzo linea 1"
 
-#: lib/common.defines.php:88
+#: lib/common.defines.php:91
 msgid "Address line 2:"
-msgstr ""
+msgstr "Indirizzo linea 2"
 
-#: lib/common.defines.php:89
+#: lib/common.defines.php:92
 msgid "Address line 3:"
-msgstr ""
+msgstr "Indirizzo linea 3"
 
-#: lib/common.defines.php:90
+#: lib/common.defines.php:93
 msgid "Postcode:"
-msgstr ""
+msgstr "Codice Postale"
 
-#: lib/common.defines.php:91
-#, fuzzy
+#: lib/common.defines.php:94
 msgid "Country:"
-msgstr "Seleziona Paese"
+msgstr "Nazione"
 
-#: lib/common.defines.php:92
+#: lib/common.defines.php:95
 msgid "Telephone:"
-msgstr ""
+msgstr "Telefono"
 
-#: lib/common.defines.php:119
-#, fuzzy
-msgid "This software has been created by Areski Belaid under AGPL licence. For futher information, feel free to contact me:"
+#: lib/common.defines.php:126
+msgid "This software has been created by Areski under AGPL licence. For futher information, feel free to contact me:"
 msgstr "Questo software &egrave; stato creato da Areski e distribuito sotto la licenza GPL. Per maggiori informazioni, contattarmi pure:"
 
-#: lib/common.defines.php:125
+#: lib/common.defines.php:132
 msgid "A2Billing Portal"
-msgstr ""
+msgstr "Portale A2Billing"
 
 #: lib/Form/Class.ViewHandler.inc.php:72
 msgid "Archiving All "
-msgstr ""
+msgstr "Archivia Tutto"
 
 #: lib/Form/Class.ViewHandler.inc.php:86
 msgid "Sort"
-msgstr ""
+msgstr "Ordinamento"
 
 #: lib/Form/Class.ViewHandler.inc.php:106
 msgid "Records"
@@ -1435,231 +1483,267 @@ msgstr "Risultati"
 
 #: lib/Form/Class.ViewHandler.inc.php:136
 msgid "FILTER ON "
-msgstr ""
+msgstr "FILTRO SU"
 
 #: lib/Form/Class.ViewHandler.inc.php:153
 msgid "FILTER ON"
-msgstr ""
+msgstr "FILTRO SU"
 
 #: lib/Form/Class.ViewHandler.inc.php:166
 msgid "APPLY FILTER "
-msgstr ""
+msgstr "APPLICA FILTRO"
 
 #: lib/Form/Class.ViewHandler.inc.php:796
 msgid "DISPLAY"
-msgstr "Visualizza"
+msgstr "VISUALIZZA"
 
 #: lib/Form/Class.ViewHandler.inc.php:825
 msgid "GO"
-msgstr "Vai"
+msgstr "VAI"
 
 #: lib/Form/Class.ViewHandler.inc.php:829
 msgid "Export CSV"
-msgstr ""
+msgstr "Esporta CSV"
 
 #: lib/Form/Class.ViewHandler.inc.php:833
 msgid "Export XML"
-msgstr ""
-
-#: lib/Form/Class.FormHandler.EditForm.inc.php:219
-#: lib/Form/Class.FormHandler.EditForm.inc.php:395
-#: lib/Form/Class.FormHandler.EditForm.inc.php:773
-#: lib/Form/Class.FormHandler.DelForm.inc.php:170
-#: lib/Form/Class.FormHandler.AddForm.inc.php:164
-#: CC_entity_edit_speeddial.php:274 CC_entity_edit_speeddial.php:476
-#: CC_entity_edit_speeddial.php:761 CC_entity_edit_speeddial.php:1005
-#: card-history.php:393 CC_entity_edit_did_destination.php:379
-#: CC_entity_edit_did_destination.php:588
-#: CC_entity_edit_did_destination.php:891
-#: CC_entity_edit_did_destination.php:1010
-#: CC_entity_edit_did_destination.php:1151 call-history.php:474
+msgstr "Esporta XML"
+
+#: lib/Form/Class.FormHandler.EditForm.inc.php:223
+#: lib/Form/Class.FormHandler.EditForm.inc.php:399
+#: lib/Form/Class.FormHandler.EditForm.inc.php:780
+#: lib/Form/Class.FormHandler.DelForm.inc.php:161
+#: lib/Form/Class.FormHandler.AddForm.inc.php:158
+#: CC_entity_edit_speeddial.php:298
+#: CC_entity_edit_speeddial.php:508
+#: CC_entity_edit_speeddial.php:800
+#: CC_entity_edit_speeddial.php:1046
+#: card-history.php:418
+#: CC_entity_edit_did_destination.php:407
+#: CC_entity_edit_did_destination.php:626
+#: CC_entity_edit_did_destination.php:944
+#: CC_entity_edit_did_destination.php:1066
+#: CC_entity_edit_did_destination.php:1208
+#: call-history.php:525
 msgid "No data found !!!"
 msgstr "Nessun dato trovato!!!"
 
-#: lib/Form/Class.FormHandler.EditForm.inc.php:278
+#: lib/Form/Class.FormHandler.EditForm.inc.php:282
 msgid "LIST "
-msgstr ""
+msgstr "LISTA"
 
-#: lib/Form/Class.FormHandler.EditForm.inc.php:329
-#: lib/interface/constants.php:78 CC_entity_edit_did_destination.php:697
+#: lib/Form/Class.FormHandler.EditForm.inc.php:333
+#: lib/interface/constants.php:64
+#: CC_entity_edit_did_destination.php:739
 msgid "No"
-msgstr ""
-
-#: lib/Form/Class.FormHandler.EditForm.inc.php:349
-#: lib/Form/Class.FormHandler.EditForm.inc.php:504
-#: lib/Form/Class.FormHandler.EditForm.inc.php:626
-#: CC_entity_edit_speeddial.php:422 CC_entity_edit_speeddial.php:607
-#: CC_entity_edit_did_destination.php:731
+msgstr "No"
+
+#: lib/Form/Class.FormHandler.EditForm.inc.php:353
+#: lib/Form/Class.FormHandler.EditForm.inc.php:509
+#: lib/Form/Class.FormHandler.EditForm.inc.php:632
+#: CC_entity_edit_speeddial.php:452
+#: CC_entity_edit_speeddial.php:642
+#: CC_entity_edit_did_destination.php:773
 msgid "Add a new"
-msgstr ""
-
-#: lib/Form/Class.FormHandler.EditForm.inc.php:436
-#: lib/Form/Class.FormHandler.EditForm.inc.php:562
-#: CC_entity_edit_speeddial.php:532 CC_entity_edit_speeddial.php:697
-#: CC_entity_edit_did_destination.php:642
-#: CC_entity_edit_did_destination.php:826
+msgstr "Aggiungi un nuovo"
+
+#: lib/Form/Class.FormHandler.EditForm.inc.php:440
+#: lib/Form/Class.FormHandler.EditForm.inc.php:567
+#: CC_entity_edit_speeddial.php:564
+#: CC_entity_edit_speeddial.php:733
+#: CC_entity_edit_did_destination.php:680
+#: CC_entity_edit_did_destination.php:875
 msgid "LIST"
 msgstr "ELENCO"
 
-#: lib/Form/Class.FormBO.php:18
+#: lib/Form/Class.FormBO.php:20
 msgid "This did is in use by customer id:"
-msgstr ""
+msgstr "Questo DID &egrave usato dall'id utente"
 
-#: lib/Form/Class.FormBO.php:314
+#: lib/Form/Class.FormBO.php:318
 msgid "DELETION CARD REFILL"
-msgstr ""
+msgstr "CANCELLAZIONE RICARICA SCHEDA"
 
-#: lib/Form/Class.FormBO.php:333
+#: lib/Form/Class.FormBO.php:337
 msgid "CORRECT COMMISSION AFTER CARD DELETED!"
-msgstr ""
+msgstr "CORREGGERE LA COMMISSIONE DOPO LA CANCELLAZIONE DELLA SCHEDA"
 
-#: lib/Form/Class.FormBO.php:359
+#: lib/Form/Class.FormBO.php:363
 msgid "CREATION AGENT REFILL"
-msgstr ""
+msgstr "CREAZIONE RICARICA AGENTE"
 
-#: lib/Form/Class.FormBO.php:429
+#: lib/Form/Class.FormBO.php:433
 msgid "SUBSCRIPTION INVOICE REMINDER"
-msgstr ""
+msgstr "SOTTOSCRIZIONE PROMEMORIA FATTURA"
 
-#: lib/Form/Class.FormBO.php:691
-#, fuzzy
+#: lib/Form/Class.FormBO.php:695
 msgid "SUMMARY OF CALLS"
-msgstr "SOMMARIO"
+msgstr "SOMMARIO DELLE CHIAMATE"
 
-#: lib/Form/Class.FormBO.php:692
+#: lib/Form/Class.FormBO.php:696
 msgid "Summary of the calls charged since the last billing"
-msgstr ""
+msgstr "Sintesi delle chiamate a pagamento dopo l'ultima fatturazione"
 
-#: lib/Form/Class.FormBO.php:709
+#: lib/Form/Class.FormBO.php:713
 msgid "SUMMARY OF CHARGE"
-msgstr ""
+msgstr "SINTESI DI CARICA"
 
-#: lib/Form/Class.FormBO.php:711 A2B_billing_preview.php:223
+#: lib/Form/Class.FormBO.php:715
+#: A2B_billing_preview.php:230
 msgid "Summary of the charge charged since the last billing."
-msgstr ""
+msgstr "Sintesi dell'addebito effettuato dopo l'ultima fatturazione."
 
-#: lib/Form/Class.FormBO.php:717 lib/Form/Class.FormBO.php:747
-#: A2B_billing_preview.php:103 A2B_billing_preview.php:112
-#: A2B_receipt_preview_detail.php:75
-#, fuzzy
+#: lib/Form/Class.FormBO.php:721
+#: lib/Form/Class.FormBO.php:751
+#: A2B_billing_preview.php:107
+#: A2B_billing_preview.php:116
+#: A2B_receipt_preview_detail.php:77
 msgid "CHARGE :"
-msgstr "PREZZO EXTRA"
+msgstr "ADDEBITO"
 
-#: lib/Form/Class.FormBO.php:736
-#, fuzzy
+#: lib/Form/Class.FormBO.php:740
 msgid "BILLING CHARGES"
-msgstr "MINUTI CARTA"
+msgstr "FATTURE ADDEBITI"
 
-#: lib/Form/Class.FormBO.php:737
+#: lib/Form/Class.FormBO.php:741
 msgid "This invoice is for some charges unpaid since the last billing."
-msgstr ""
+msgstr "Questa fattura &egrave per alcuni addebiti dopo l'ultima fatturazione"
 
-#: lib/Form/Class.FormBO.php:769
+#: lib/Form/Class.FormBO.php:773
 msgid "BILLING POSTPAID"
-msgstr ""
+msgstr "FATTURAZIONE POST PAGATO"
 
-#: lib/Form/Class.FormBO.php:770
+#: lib/Form/Class.FormBO.php:774
 msgid "Invoice for POSTPAID"
-msgstr ""
+msgstr "Fattura per POST PAGATO"
 
-#: lib/Form/Class.FormBO.php:832 lib/Form/Class.FormBO.php:834
-#: lib/Form/Class.FormBO.php:941 lib/Form/Class.FormBO.php:943
-#, fuzzy
+#: lib/Form/Class.FormBO.php:836
+#: lib/Form/Class.FormBO.php:838
+#: lib/Form/Class.FormBO.php:945
+#: lib/Form/Class.FormBO.php:947
 msgid "REFILL"
-msgstr "PREFISSO"
+msgstr "RICARICA"
 
-#: lib/Form/Class.SearchHandler.inc.php:23
-#: lib/Form/Class.SearchHandler.inc.php:97
+#: lib/Form/Class.SearchHandler.inc.php:24
+#: lib/Form/Class.SearchHandler.inc.php:100
 msgid "From :"
-msgstr ""
+msgstr "Da"
 
-#: lib/Form/Class.SearchHandler.inc.php:34 lib/interface/constants.php:250
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:195
 msgid "January"
 msgstr "Gennaio"
 
-#: lib/Form/Class.SearchHandler.inc.php:34 lib/interface/constants.php:251
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:196
 msgid "February"
 msgstr "Febbraio"
 
-#: lib/Form/Class.SearchHandler.inc.php:34 lib/interface/constants.php:252
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:197
 msgid "March"
 msgstr "Marzo"
 
-#: lib/Form/Class.SearchHandler.inc.php:34 lib/interface/constants.php:253
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:198
 msgid "April"
 msgstr "Aprile"
 
-#: lib/Form/Class.SearchHandler.inc.php:34 lib/interface/constants.php:254
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:199
 msgid "May"
 msgstr "Maggio"
 
-#: lib/Form/Class.SearchHandler.inc.php:34 lib/interface/constants.php:255
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:200
 msgid "June"
 msgstr "Giugno"
 
-#: lib/Form/Class.SearchHandler.inc.php:34 lib/interface/constants.php:256
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:201
 msgid "July"
 msgstr "Luglio"
 
-#: lib/Form/Class.SearchHandler.inc.php:34 lib/interface/constants.php:257
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:202
 msgid "August"
 msgstr "Agosto"
 
-#: lib/Form/Class.SearchHandler.inc.php:34 lib/interface/constants.php:258
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:203
 msgid "September"
 msgstr "Settembre"
 
-#: lib/Form/Class.SearchHandler.inc.php:34 lib/interface/constants.php:259
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:204
 msgid "October"
 msgstr "Ottobre"
 
-#: lib/Form/Class.SearchHandler.inc.php:34 lib/interface/constants.php:260
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:205
 msgid "November"
 msgstr "Novembre"
 
-#: lib/Form/Class.SearchHandler.inc.php:34 lib/interface/constants.php:261
+#: lib/Form/Class.SearchHandler.inc.php:35
+#: lib/interface/constants.php:206
 msgid "December"
 msgstr "Dicembre"
 
-#: lib/Form/Class.SearchHandler.inc.php:55
-#: lib/Form/Class.SearchHandler.inc.php:127
+#: lib/Form/Class.SearchHandler.inc.php:57
+#: lib/Form/Class.SearchHandler.inc.php:131
 msgid "To :"
-msgstr ""
+msgstr "A"
 
-#: lib/Form/Class.SearchHandler.inc.php:203 call-history.php:281
+#: lib/Form/Class.SearchHandler.inc.php:213
+#: call-history.php:329
 msgid "Exact"
 msgstr "Esatto"
 
-#: lib/Form/Class.SearchHandler.inc.php:204 call-history.php:282
+#: lib/Form/Class.SearchHandler.inc.php:214
+#: call-history.php:330
 msgid "Begins with"
 msgstr "Inizia per"
 
-#: lib/Form/Class.SearchHandler.inc.php:205 call-history.php:283
+#: lib/Form/Class.SearchHandler.inc.php:215
+#: call-history.php:331
 msgid "Contains"
 msgstr "Contiene"
 
-#: lib/Form/Class.SearchHandler.inc.php:206 call-history.php:284
+#: lib/Form/Class.SearchHandler.inc.php:216
+#: call-history.php:332
 msgid "Ends with"
 msgstr "Finisce per"
 
-#: lib/Form/Class.SearchHandler.inc.php:314
+#: lib/Form/Class.SearchHandler.inc.php:327
 msgid "There is"
-msgstr ""
+msgstr "C'&egrave"
 
-#: lib/Form/Class.SearchHandler.inc.php:314
+#: lib/Form/Class.SearchHandler.inc.php:327
 msgid "selected, use the option below if you are willing to make a batch updated of the selected cards."
-msgstr ""
+msgstr "selezionata, utilizzare l'opzione qui sotto se siete disposti a fare un lotto aggiornato delle carte selezionate"
 
-#: lib/Form/Class.SearchHandler.inc.php:342 templates/default/main.tpl:72
+#: lib/Form/Class.SearchHandler.inc.php:356
+#: templates/default/main.tpl:70
 msgid "RATECARD"
 msgstr "TARIFFE"
 
-#: lib/Form/Class.SearchHandler.inc.php:361
+#: lib/Form/Class.SearchHandler.inc.php:375
 msgid "BUYRATE"
-msgstr ""
+msgstr "TARIFFA ACQUISTO"
+
+#: lib/Form/Class.SearchHandler.inc.php:378
+#: lib/Form/Class.SearchHandler.inc.php:393
+#: lib/Form/Class.SearchHandler.inc.php:409
+#: lib/Form/Class.SearchHandler.inc.php:425
+#: lib/Form/Class.SearchHandler.inc.php:441
+#: lib/Form/Class.SearchHandler.inc.php:457
+#: lib/Form/Class.SearchHandler.inc.php:473
+#: lib/Form/Class.SearchHandler.inc.php:489
+#: lib/Form/Class.SearchHandler.inc.php:505
+msgid "Equal"
+msgstr "Uguale"
 
-#: lib/Form/Class.SearchHandler.inc.php:364
-#: lib/Form/Class.SearchHandler.inc.php:379
+#: lib/Form/Class.SearchHandler.inc.php:380
 #: lib/Form/Class.SearchHandler.inc.php:395
 #: lib/Form/Class.SearchHandler.inc.php:411
 #: lib/Form/Class.SearchHandler.inc.php:427
@@ -1667,2185 +1751,2148 @@ msgstr ""
 #: lib/Form/Class.SearchHandler.inc.php:459
 #: lib/Form/Class.SearchHandler.inc.php:475
 #: lib/Form/Class.SearchHandler.inc.php:491
-msgid "Equal"
-msgstr ""
-
-#: lib/Form/Class.SearchHandler.inc.php:366
-#: lib/Form/Class.SearchHandler.inc.php:381
-#: lib/Form/Class.SearchHandler.inc.php:397
-#: lib/Form/Class.SearchHandler.inc.php:413
-#: lib/Form/Class.SearchHandler.inc.php:429
-#: lib/Form/Class.SearchHandler.inc.php:445
-#: lib/Form/Class.SearchHandler.inc.php:461
-#: lib/Form/Class.SearchHandler.inc.php:477
-#: lib/Form/Class.SearchHandler.inc.php:494
+#: lib/Form/Class.SearchHandler.inc.php:508
 msgid "Substract"
-msgstr ""
+msgstr "Sottrarre"
 
-#: lib/Form/Class.SearchHandler.inc.php:376
+#: lib/Form/Class.SearchHandler.inc.php:390
 msgid "BUYRATEINITBLOCK"
-msgstr ""
+msgstr "TARIFFA ACQUISTO INIZIALE"
 
-#: lib/Form/Class.SearchHandler.inc.php:392
+#: lib/Form/Class.SearchHandler.inc.php:406
 msgid "BUYRATEINCREMENT"
-msgstr ""
+msgstr "TARIFFA ACQUISTO INCREMENTO"
 
-#: lib/Form/Class.SearchHandler.inc.php:408
+#: lib/Form/Class.SearchHandler.inc.php:422
 msgid "RATE INITIAL"
-msgstr ""
+msgstr "TARIFFA INIZIALE"
 
-#: lib/Form/Class.SearchHandler.inc.php:424
+#: lib/Form/Class.SearchHandler.inc.php:438
 msgid "MIN DURATION"
-msgstr ""
+msgstr "DURATA MINIMA"
 
-#: lib/Form/Class.SearchHandler.inc.php:440
+#: lib/Form/Class.SearchHandler.inc.php:454
 msgid "BILLINGBLOCK"
-msgstr ""
+msgstr "BLOCCO FATTURAZIONE"
 
-#: lib/Form/Class.SearchHandler.inc.php:456
-#, fuzzy
+#: lib/Form/Class.SearchHandler.inc.php:470
 msgid "CONNECTCHARGE"
-msgstr "PREZZO EXTRA"
+msgstr "COSTO CONNESSIONE"
 
-#: lib/Form/Class.SearchHandler.inc.php:472
+#: lib/Form/Class.SearchHandler.inc.php:486
 msgid "DISCONNECTCHARGE"
-msgstr ""
+msgstr "COSTO DISCONNESSIONE"
 
-#: lib/Form/Class.SearchHandler.inc.php:488
-#, fuzzy
+#: lib/Form/Class.SearchHandler.inc.php:502
 msgid "DISCONNECT CHARGE THRESHOLD"
-msgstr "PREZZO EXTRA"
+msgstr "SOGLIA DISCONNESSIONE"
 
-#: lib/Form/Class.SearchHandler.inc.php:503
-#, fuzzy
+#: lib/Form/Class.SearchHandler.inc.php:520
 msgid " BATCH UPDATE RATECARD "
-msgstr "TARIFFA ATTUALE"
+msgstr "AGGIORNAMENTO LOTTO TARIFFE"
 
-#: lib/Form/Class.FormHandler.DelForm.inc.php:55 checkout_success.php:53
+#: lib/Form/Class.FormHandler.DelForm.inc.php:46
+#: checkout_success.php:55
 msgid "Message"
-msgstr ""
+msgstr "Messaggio"
 
-#: lib/Form/Class.FormHandler.DelForm.inc.php:62
+#: lib/Form/Class.FormHandler.DelForm.inc.php:53
 msgid "You have "
-msgstr ""
+msgstr "Tu hai"
 
-#: lib/Form/Class.FormHandler.DelForm.inc.php:217
+#: lib/Form/Class.FormHandler.DelForm.inc.php:208
 msgid "Remove this "
-msgstr ""
+msgstr "Rimuovi questo"
 
-#: lib/Form/Class.FormHandler.inc.php:571
-#, fuzzy
+#: lib/Form/Class.FormHandler.inc.php:545
 msgid "No data found!"
-msgstr "Nessun dato trovato!!!"
+msgstr "Nessun dato trovato!"
 
-#: lib/Form/Class.FormHandler.inc.php:572
+#: lib/Form/Class.FormHandler.inc.php:546
 msgid "DIRECTORY"
-msgstr ""
+msgstr "DIRECTORY"
 
-#: lib/Form/Class.FormHandler.inc.php:573
+#: lib/Form/Class.FormHandler.inc.php:547
 msgid "list"
-msgstr ""
+msgstr "lista"
 
-#: lib/Form/Class.FormHandler.inc.php:574
-#: lib/Form/Class.FormHandler.inc.php:668
+#: lib/Form/Class.FormHandler.inc.php:548
+#: lib/Form/Class.FormHandler.inc.php:630
 msgid "Define criteria to make a precise search"
-msgstr ""
+msgstr "Definisci il criterio per una precisa ricerca"
 
-#: lib/Form/Class.FormHandler.inc.php:575
+#: lib/Form/Class.FormHandler.inc.php:549
 msgid "You can browse through our"
-msgstr ""
+msgstr "&Egrave possibile navigare attraverso il nostro"
 
-#: lib/Form/Class.FormHandler.inc.php:575
+#: lib/Form/Class.FormHandler.inc.php:549
 msgid "and modify their different properties"
-msgstr ""
+msgstr "e modificarne le diverse propriet&agrave"
 
-#: lib/Form/Class.FormHandler.inc.php:576
+#: lib/Form/Class.FormHandler.inc.php:550
 msgid "Delete this record"
-msgstr ""
+msgstr "Cancella questo record"
 
-#: lib/Form/Class.FormHandler.inc.php:577
+#: lib/Form/Class.FormHandler.inc.php:551
 msgid "Edit this record"
-msgstr ""
+msgstr "Edita questo record"
 
-#: lib/Form/Class.FormHandler.inc.php:578
+#: lib/Form/Class.FormHandler.inc.php:552
 msgid "The document has been created correctly. Now, you can define the different tariff that you want to associate."
-msgstr ""
+msgstr "Il documento &egrave stato creato correttamente. Ora, puoi definire le diverse tariffe che si desidera associare"
 
-#: lib/Form/Class.FormHandler.inc.php:580
+#: lib/Form/Class.FormHandler.inc.php:554
 msgid "Click on the delete button."
-msgstr ""
+msgstr "Clicca sul tasto 'DELETE'"
 
-#: lib/Form/Class.FormHandler.inc.php:581
+#: lib/Form/Class.FormHandler.inc.php:555
 msgid "One"
-msgstr ""
+msgstr "Uno"
 
-#: lib/Form/Class.FormHandler.inc.php:581
-#, fuzzy
+#: lib/Form/Class.FormHandler.inc.php:555
 msgid "has been deleted!"
-msgstr "è stata processata, Abbiamo aggiunto"
+msgstr "&egrave stato eliminato"
 
-#: lib/Form/Class.FormHandler.inc.php:584
+#: lib/Form/Class.FormHandler.inc.php:558
 msgid "Add a"
-msgstr ""
+msgstr "Aggungi un"
 
-#: lib/Form/Class.FormHandler.inc.php:584
+#: lib/Form/Class.FormHandler.inc.php:558
 msgid "now."
-msgstr ""
+msgstr "ora"
 
-#: lib/Form/Class.FormHandler.inc.php:585
-#, fuzzy
+#: lib/Form/Class.FormHandler.inc.php:559
 msgid "has been inserted.<br>"
-msgstr "è stata processata, Abbiamo aggiunto"
+msgstr "&egrave stato inserito<br>"
 
-#: lib/Form/Class.FormHandler.inc.php:586
-#, fuzzy
+#: lib/Form/Class.FormHandler.inc.php:560
 msgid "hasn't been inserted."
-msgstr "è stata processata, Abbiamo aggiunto"
+msgstr "Non &egrave stato inserito"
 
-#: lib/Form/Class.FormHandler.inc.php:587
+#: lib/Form/Class.FormHandler.inc.php:561
 msgid "You cannot choose more than one !"
-msgstr ""
+msgstr "Non puoi seceglierne pi&ugrave di uno!"
 
-#: lib/Form/Class.FormHandler.inc.php:589
+#: lib/Form/Class.FormHandler.inc.php:563
 msgid "Are you sure to delete all records connected to this instance."
-msgstr ""
+msgstr "Sei sicuro di voler eliminare tutti i record collegati a questa istanza."
 
-#: lib/Form/Class.FormHandler.inc.php:591
-#: lib/Form/Class.FormHandler.inc.php:593
+#: lib/Form/Class.FormHandler.inc.php:565
+#: lib/Form/Class.FormHandler.inc.php:567
 msgid "CONFIRM DATA"
-msgstr ""
+msgstr "CONFERMA DATI"
 
-#: lib/Form/Class.FormHandler.inc.php:592
-#, fuzzy
+#: lib/Form/Class.FormHandler.inc.php:566
 msgid "DELETE"
-msgstr "DATA"
+msgstr "ELIMINA"
 
-#: lib/Form/Class.FormHandler.inc.php:657
-#: lib/Form/Class.FormHandler.inc.php:840
+#: lib/Form/Class.FormHandler.inc.php:619
+#: lib/Form/Class.FormHandler.inc.php:837
 msgid "Delete this "
-msgstr ""
+msgstr "Elimina questo"
 
-#: lib/Form/Class.FormHandler.inc.php:658
-#: lib/Form/Class.FormHandler.inc.php:834
+#: lib/Form/Class.FormHandler.inc.php:620
+#: lib/Form/Class.FormHandler.inc.php:831
 msgid "Edit this "
-msgstr ""
+msgstr "Edita questo"
 
-#: lib/Form/Class.FormHandler.inc.php:689
+#: lib/Form/Class.FormHandler.inc.php:651
 msgid "INSERTED"
-msgstr ""
+msgstr "INSERITO"
 
-#: lib/Form/Class.FormHandler.inc.php:690
+#: lib/Form/Class.FormHandler.inc.php:652
 msgid "ENABLE"
-msgstr ""
+msgstr "ABILITA"
 
-#: lib/Form/Class.FormHandler.inc.php:691
+#: lib/Form/Class.FormHandler.inc.php:653
 msgid "DISABLE"
-msgstr ""
+msgstr "DISABILITA"
 
-#: lib/Form/Class.FormHandler.inc.php:692
+#: lib/Form/Class.FormHandler.inc.php:654
 msgid "FREE"
-msgstr ""
+msgstr "GRATIS"
 
-#: lib/Form/Class.FormHandler.inc.php:809
-#: lib/Form/Class.FormHandler.inc.php:811
+#: lib/Form/Class.FormHandler.inc.php:806
+#: lib/Form/Class.FormHandler.inc.php:808
 msgid "You can browse through our "
-msgstr ""
+msgstr "&Egrave possibile navigare attraverso il nostro"
 
-#: lib/Form/Class.FormHandler.inc.php:809
-#: lib/Form/Class.FormHandler.inc.php:811
+#: lib/Form/Class.FormHandler.inc.php:806
+#: lib/Form/Class.FormHandler.inc.php:808
 msgid " and modify their different properties<br>"
-msgstr ""
+msgstr " e modificarne le diverse propriet&agrave<br>"
 
-#: lib/Form/Class.FormHandler.inc.php:979
+#: lib/Form/Class.FormHandler.inc.php:976
 msgid "(at least 3 characters)"
-msgstr ""
+msgstr "(almeno 3 caratteri)"
 
-#: lib/Form/Class.FormHandler.inc.php:983
+#: lib/Form/Class.FormHandler.inc.php:980
 msgid "(must match email structure. Example : name@domain.com)"
-msgstr ""
+msgstr "(deve corrispondere la struttura email Es.: nome@dominio.com)"
 
-#: lib/Form/Class.FormHandler.inc.php:987
+#: lib/Form/Class.FormHandler.inc.php:984
 msgid "(at least 5 successive characters appear at the end of this string)"
-msgstr ""
+msgstr "(almeno 5 caratteri successivi appaiono alla fine di questa stringa)"
 
-#: lib/Form/Class.FormHandler.inc.php:991
+#: lib/Form/Class.FormHandler.inc.php:988
 msgid "(at least 4 characters)"
-msgstr ""
+msgstr "(almeno 4 caratteri)"
 
-#: lib/Form/Class.FormHandler.inc.php:995
+#: lib/Form/Class.FormHandler.inc.php:992
 msgid "(number format)"
-msgstr ""
+msgstr "(formato numerico)"
 
-#: lib/Form/Class.FormHandler.inc.php:1003
+#: lib/Form/Class.FormHandler.inc.php:1000
 msgid "(only number with more that 8 digits)"
-msgstr ""
+msgstr "(solo numero con pi&ugrave di 8 cifre)"
 
-#: lib/Form/Class.FormHandler.inc.php:1007
+#: lib/Form/Class.FormHandler.inc.php:1004
 msgid "(at least 8 digits using . or - or the space key)"
-msgstr ""
+msgstr "(almeno 8 cifre usando . o - oppure il tasto spazio)"
 
-#: lib/Form/Class.FormHandler.inc.php:1011
+#: lib/Form/Class.FormHandler.inc.php:1008
 msgid "network adress format"
-msgstr ""
+msgstr "indirizzo in formato rete"
 
-#: lib/Form/Class.FormHandler.inc.php:1015
+#: lib/Form/Class.FormHandler.inc.php:1012
 msgid "at least 1 character"
-msgstr ""
+msgstr "almeno 1 carattere"
 
-#: lib/Form/Class.FormHandler.inc.php:1023
+#: lib/Form/Class.FormHandler.inc.php:1020
 msgid "(AT LEAST 2 CARACTERS)"
-msgstr ""
+msgstr "(ALMENO 2 CARATTERI)"
 
-#: lib/Form/Class.FormHandler.inc.php:1027
+#: lib/Form/Class.FormHandler.inc.php:1024
 msgid "(NUMBER FORMAT WITH/WITHOUT DECIMAL, use '.' for decimal)"
-msgstr ""
+msgstr "(FORMATO NUMERO CON/SENZA DECIMALI, usa '.' per i decimali)"
 
-#: lib/Form/Class.FormHandler.inc.php:1043
+#: lib/Form/Class.FormHandler.inc.php:1040
 msgid "You must write something."
-msgstr ""
+msgstr "Devi scrivere qualcosa"
 
-#: lib/Form/Class.FormHandler.inc.php:1047
+#: lib/Form/Class.FormHandler.inc.php:1044
 msgid "8 characters alphanumeric"
-msgstr ""
+msgstr "8 caratteri alfanumerici"
 
-#: lib/Form/Class.FormHandler.inc.php:1054
+#: lib/Form/Class.FormHandler.inc.php:1051
 msgid "(at least 6 Alphanumeric characters)"
-msgstr ""
+msgstr "(almeno 6 caratteri Alfanumerici)"
 
-#: lib/Form/Class.FormHandler.inc.php:1062
+#: lib/Form/Class.FormHandler.inc.php:1059
 #, php-format
 msgid "(PERCENT FORMAT WITH/WITHOUT DECIMAL, use '.' for decimal and don't use '%' character. e.g.: 12.4 )"
-msgstr ""
+msgstr "(FORMATO PERCENTUALE CON/SENZA DECIMALI, usa '.' per i decimali e non usare il carattere '%'. es.: 12.4 )"
 
-#: lib/Form/Class.FormHandler.inc.php:1757
-#: CC_entity_edit_did_destination.php:216
+#: lib/Form/Class.FormHandler.inc.php:1737
+#: CC_entity_edit_did_destination.php:233
 msgid "error deletion"
-msgstr ""
+msgstr "errore di cancellazione"
 
-#: lib/Form/Class.FormHandler.inc.php:1884
+#: lib/Form/Class.FormHandler.inc.php:1864
 msgid "ERROR_DUPLICATION"
-msgstr ""
+msgstr "ERRORE_DUPLICAZIONE"
 
-#: lib/Form/Class.FormHandler.inc.php:1970
+#: lib/Form/Class.FormHandler.inc.php:1950
 msgid "Done"
-msgstr ""
+msgstr "Fatto"
 
-#: lib/Form/Class.FormHandler.inc.php:2010
+#: lib/Form/Class.FormHandler.inc.php:1990
 msgid "Export Call Plan with LCR"
-msgstr ""
+msgstr "Esporta il Piano di Chiamata con LCR"
 
-#: lib/Form/Class.FormHandler.inc.php:2016
-#, fuzzy
+#: lib/Form/Class.FormHandler.inc.php:1996
 msgid "Choose a call plan"
 msgstr "Seleziona una Tariffa"
 
-#: lib/Form/Class.FormHandler.inc.php:2062
+#: lib/Form/Class.FormHandler.inc.php:2042
 msgid "THE CURRENT RATECARD"
 msgstr "TARIFFA ATTUALE"
 
-#: lib/Form/Class.FormHandler.inc.php:2073
+#: lib/Form/Class.FormHandler.inc.php:2053
 msgid "R A T E C A R D"
-msgstr "T A R I F F E"
+msgstr "T A R I F F A"
 
-#: lib/Form/Class.FormHandler.inc.php:2079
+#: lib/Form/Class.FormHandler.inc.php:2059
 msgid "Choose a ratecard"
 msgstr "Seleziona una Tariffa"
 
-#: lib/Form/Class.FormHandler.AddForm.inc.php:217
+#: lib/Form/Class.FormHandler.AddForm.inc.php:211
 msgid "Create a new "
-msgstr ""
+msgstr "Crea una nuova"
 
-#: lib/Misc.php:580 lib/Class.Notification.php:150
+#: lib/Misc.php:523
+#: lib/Class.Notification.php:140
 msgid "UNKNOWN"
-msgstr ""
+msgstr "SCONOSCIUTA"
 
-#: lib/Misc.php:793
+#: lib/Misc.php:722
 msgid "First"
-msgstr ""
+msgstr "Prima"
 
-#: lib/Misc.php:794
+#: lib/Misc.php:723
+#: A2B_entity_did.php:459
 msgid "Prev"
-msgstr ""
+msgstr "Prec"
 
-#: lib/Misc.php:795 A2B_entity_did.php:427
+#: lib/Misc.php:724
+#: A2B_entity_did.php:429
 msgid "Next"
-msgstr "Prossimo"
+msgstr "Succ"
 
-#: lib/Misc.php:796
+#: lib/Misc.php:725
 msgid "Last"
-msgstr ""
+msgstr "Ultima"
 
-#: lib/Misc.php:887
+#: lib/Misc.php:815
 msgid "File size is greater than allowed limit."
-msgstr ""
+msgstr "La grandezza del file &egrave maggiore del limite permesso"
 
-#: lib/Misc.php:890
+#: lib/Misc.php:818
 msgid "You did not upload anything!"
-msgstr ""
+msgstr "Non hai caricato niente!"
 
-#: lib/Misc.php:892
+#: lib/Misc.php:821
 msgid "Failed to upload the file, The file you uploaded may not exist on disk."
-msgstr ""
+msgstr "Caricamento del file fallito. Il file caricato pu&ograve non esistere nel disco."
 
-#: lib/Misc.php:895
+#: lib/Misc.php:824
 msgid "file type is not allowed"
-msgstr ""
+msgstr "tipo di file non permesso"
 
-#: lib/Misc.php:1215
+#: lib/Misc.php:1130
 msgid "Can't find our base_currency in cc_currencies."
-msgstr ""
+msgstr "Non posso trovare la nostra base_currency in cc_currencies"
 
-#: lib/Misc.php:1215 lib/Misc.php:1238 lib/Misc.php:1242 lib/Misc.php:1252
+#: lib/Misc.php:1130
+#: lib/Misc.php:1153
+#: lib/Misc.php:1157
+#: lib/Misc.php:1167
 msgid "Currency update ABORTED."
-msgstr ""
+msgstr "Aggiornamento valuta ABORTITO"
 
-#: lib/Misc.php:1238
+#: lib/Misc.php:1153
 msgid "The CSV file doesn't contain all the currencies we requested."
-msgstr ""
+msgstr "Il file CSV non contiene tutte valute da noi richieste"
 
-#: lib/Misc.php:1242
+#: lib/Misc.php:1157
 msgid "At least one of the entries in the CSV file isn't a number."
-msgstr ""
+msgstr "Almeno una delle voci nel file CSV non &egrave un numero"
 
-#: lib/Misc.php:1252
+#: lib/Misc.php:1167
 msgid "Our base_currency seems to be worthless."
-msgstr ""
+msgstr "La nostra base_currency sembra essere inutile."
 
-#: lib/Misc.php:1290
+#: lib/Misc.php:1205
 msgid "Success! All currencies are now updated."
-msgstr ""
+msgstr "Successo! Tutte le valute sono ora aggiornate"
 
-#: lib/Misc.php:1580
-#, fuzzy
+#: lib/Misc.php:1496
 msgid "GO TO CUSTOMER ACCOUNT"
-msgstr "&nbsp;NESSUN ACCOUNT IAX&nbsp;"
+msgstr "VAI ALL'ACCOUNT UTENTE"
 
-#: lib/interface/constants.php:19
+#: lib/interface/constants.php:16
 msgid "SUCCESS"
-msgstr ""
+msgstr "SUCCESSO"
 
-#: lib/interface/constants.php:20
-#, fuzzy
+#: lib/interface/constants.php:17
 msgid "WARNING"
-msgstr "AZIONE"
+msgstr "ATTENZIONE"
 
-#: lib/interface/constants.php:21 lib/interface/constants.php:88
+#: lib/interface/constants.php:18
+#: lib/interface/constants.php:72
 msgid "ERROR"
-msgstr ""
+msgstr "ERRORE"
 
-#: lib/interface/constants.php:29 lib/interface/constants.php:46
+#: lib/interface/constants.php:24
+#: lib/interface/constants.php:38
 msgid "ENGLISH"
-msgstr ""
+msgstr "INGLESE"
 
-#: lib/interface/constants.php:30 lib/interface/constants.php:47
+#: lib/interface/constants.php:25
+#: lib/interface/constants.php:39
 msgid "SPANISH"
-msgstr ""
+msgstr "SPAGNOLO"
 
-#: lib/interface/constants.php:31 lib/interface/constants.php:48
+#: lib/interface/constants.php:26
+#: lib/interface/constants.php:40
 msgid "FRENCH"
-msgstr ""
+msgstr "FRANCESE"
 
-#: lib/interface/constants.php:32 lib/interface/constants.php:49
+#: lib/interface/constants.php:27
+#: lib/interface/constants.php:41
 msgid "RUSSIAN"
-msgstr ""
+msgstr "RUSSO"
 
-#: lib/interface/constants.php:33 lib/interface/constants.php:50
+#: lib/interface/constants.php:28
+#: lib/interface/constants.php:42
 msgid "BRAZILIAN"
-msgstr ""
+msgstr "BRASILIANO"
+
+#: lib/interface/constants.php:29
+#: lib/interface/constants.php:43
+msgid "ITALIAN"
+msgstr "ITALIANO"
 
-#: lib/interface/constants.php:58
+#: lib/interface/constants.php:48
 msgid "NONE RESTRICTION USED"
-msgstr ""
+msgstr "NESSUNA LIMITAZIONE USATA"
 
-#: lib/interface/constants.php:59
+#: lib/interface/constants.php:49
 msgid "CAN'T CALL RESTRICTED NUMBERS"
-msgstr ""
+msgstr "IMPOSSIBILE CHIAMARE NUMERI LIMITATI"
 
-#: lib/interface/constants.php:60
+#: lib/interface/constants.php:50
 msgid "CAN ONLY CALL RESTRICTED NUMBERS"
-msgstr ""
+msgstr "&Egrave POSSIBILE CHIAMARE SOLO NUMERI LIMITATI"
 
-#: lib/interface/constants.php:67
-#, fuzzy
+#: lib/interface/constants.php:55
 msgid "CUSTOMERS"
-msgstr "Ottobre"
+msgstr "UTENTI"
 
-#: lib/interface/constants.php:68
+#: lib/interface/constants.php:56
 msgid "AGENTS"
-msgstr ""
+msgstr "AGENTI"
 
-#: lib/interface/constants.php:69
+#: lib/interface/constants.php:57
 msgid "CUSTOMERS AND AGENTS"
-msgstr ""
+msgstr "UTENTI ED AGENTI"
 
-#: lib/interface/constants.php:77 A2B_entity_did.php:411
+#: lib/interface/constants.php:63
+#: A2B_entity_did.php:413
 msgid "Yes"
 msgstr "Si"
 
-#: lib/interface/constants.php:86
+#: lib/interface/constants.php:70
 msgid "PENDING"
-msgstr ""
+msgstr "IN ATTESA"
 
-#: lib/interface/constants.php:87
+#: lib/interface/constants.php:71
 msgid "SENT"
-msgstr ""
+msgstr "INVIATA"
 
-#: lib/interface/constants.php:139
+#: lib/interface/constants.php:110
 msgid "Fix per month + dialoutrate"
-msgstr ""
+msgstr "Fisso per mese + chiamate in uscita"
 
-#: lib/interface/constants.php:140
+#: lib/interface/constants.php:111
 msgid "Fix per month"
-msgstr ""
+msgstr "Fisso per mese"
 
-#: lib/interface/constants.php:141
+#: lib/interface/constants.php:112
 msgid "Only dialout rate"
-msgstr ""
+msgstr "Solo chiamate in uscita"
 
-#: lib/interface/constants.php:142 lib/interface/constants.php:153
+#: lib/interface/constants.php:113
+#: lib/interface/constants.php:122
 msgid "Free"
-msgstr ""
+msgstr "Gratis"
 
-#: lib/interface/constants.php:150
+#: lib/interface/constants.php:119
 msgid "Fix+Dial"
-msgstr ""
+msgstr "Fisso+Chiamate"
 
-#: lib/interface/constants.php:151
+#: lib/interface/constants.php:120
 msgid "Fix"
-msgstr ""
+msgstr "Fisso"
 
-#: lib/interface/constants.php:152
+#: lib/interface/constants.php:121
 msgid "Dial"
-msgstr ""
+msgstr "Chiamate"
 
-#: lib/interface/constants.php:161 lib/interface/constants.php:469
+#: lib/interface/constants.php:128
+#: lib/interface/constants.php:375
 msgid "INDIVIDUAL ACCESS"
-msgstr ""
+msgstr "ACCESSO INDIVIDUALE"
 
-#: lib/interface/constants.php:162 lib/interface/constants.php:468
+#: lib/interface/constants.php:129
+#: lib/interface/constants.php:374
 msgid "SIMULTANEOUS ACCESS"
-msgstr ""
+msgstr "ACCESSI SIMULTANEI"
 
-#: lib/interface/constants.php:170
-#, fuzzy
+#: lib/interface/constants.php:135
 msgid "PREPAID CARD"
-msgstr "TARIFFE"
+msgstr "SCHEDA PREPAGATA"
 
-#: lib/interface/constants.php:171
+#: lib/interface/constants.php:136
 msgid "POSTPAID CARD"
-msgstr ""
+msgstr "SCHEDA POSTAPAGATA"
 
-#: lib/interface/constants.php:186
-#, fuzzy
+#: lib/interface/constants.php:146
 msgid "NO EXPIRATION"
-msgstr "OPZIONI"
+msgstr "NESSUNA SCADENZA"
 
-#: lib/interface/constants.php:187 lib/interface/constants.php:485
+#: lib/interface/constants.php:147
+#: lib/interface/constants.php:386
 msgid "EXPIRE DATE"
-msgstr ""
+msgstr "DATA SCADENZA"
 
-#: lib/interface/constants.php:188 lib/interface/constants.php:486
+#: lib/interface/constants.php:148
+#: lib/interface/constants.php:387
 msgid "EXPIRE DAYS SINCE FIRST USE"
-msgstr ""
+msgstr "SCADENZA GIORNI DAL PRIMO UTILIZZO"
 
-#: lib/interface/constants.php:189 lib/interface/constants.php:487
+#: lib/interface/constants.php:149
+#: lib/interface/constants.php:388
 msgid "EXPIRE DAYS SINCE CREATION"
-msgstr ""
+msgstr "GIORNI DI SCADENZA DALLA CREAZIONE"
 
-#: lib/interface/constants.php:197 lib/interface/constants.php:213
+#: lib/interface/constants.php:156
+#: lib/interface/constants.php:167
 msgid "OPEN"
-msgstr ""
+msgstr "APERTO"
 
-#: lib/interface/constants.php:198 lib/interface/constants.php:214
+#: lib/interface/constants.php:157
+#: lib/interface/constants.php:168
 msgid "CLOSE"
-msgstr ""
+msgstr "CHIUSO"
 
-#: lib/interface/constants.php:223 lib/interface/constants.php:242
-#: lib/interface/constants.php:269
+#: lib/interface/constants.php:175
+#: lib/interface/constants.php:189
+#: lib/interface/constants.php:212
 msgid "UNPAID"
-msgstr ""
+msgstr "DA PAGARE"
 
-#: lib/interface/constants.php:224 lib/interface/constants.php:241
-#: lib/interface/constants.php:272
-#, fuzzy
+#: lib/interface/constants.php:176
+#: lib/interface/constants.php:188
+#: lib/interface/constants.php:215
 msgid "PAID"
-msgstr "SELEZIONE PASSANTE"
+msgstr "PAGATO"
 
-#: lib/interface/constants.php:239
-#, fuzzy
+#: lib/interface/constants.php:186
 msgid "FIRSTUSE"
-msgstr "NOME"
+msgstr "PRIMO USO"
 
-#: lib/interface/constants.php:240
+#: lib/interface/constants.php:187
 msgid "BILLED"
-msgstr ""
+msgstr "FATTURATA"
 
-#: lib/interface/constants.php:270
+#: lib/interface/constants.php:213
 msgid "SENT-UNPAID"
-msgstr ""
+msgstr "INVIATA-DA PAGARE"
 
-#: lib/interface/constants.php:271
+#: lib/interface/constants.php:214
 msgid "SENT-PAID"
-msgstr ""
+msgstr "INVIATA-PAGATA"
 
-#: lib/interface/constants.php:281 CC_entity_edit_speeddial.php:1038
-#: CC_entity_edit_did_destination.php:1183
+#: lib/interface/constants.php:222
+#: CC_entity_edit_speeddial.php:1080
+#: CC_entity_edit_did_destination.php:1240
 msgid "New"
-msgstr ""
+msgstr "Nuova"
 
-#: lib/interface/constants.php:282
+#: lib/interface/constants.php:223
 msgid "Proceed"
-msgstr ""
+msgstr "Procedere"
 
-#: lib/interface/constants.php:283
+#: lib/interface/constants.php:224
 msgid "In Process"
-msgstr ""
+msgstr "In Procedimento"
 
-#: lib/interface/constants.php:291
+#: lib/interface/constants.php:230
 msgid "Failed"
-msgstr ""
+msgstr "Fallito"
 
-#: lib/interface/constants.php:292
+#: lib/interface/constants.php:231
 msgid "Successful"
-msgstr ""
+msgstr "Successo"
 
-#: lib/interface/constants.php:293
+#: lib/interface/constants.php:232
 msgid "Not Sent"
-msgstr ""
+msgstr "Non Inviato"
 
-#: lib/interface/constants.php:301
+#: lib/interface/constants.php:238
 msgid "Unlimited calls"
-msgstr ""
+msgstr "Chiamate illimitate"
 
-#: lib/interface/constants.php:302
-#, fuzzy
+#: lib/interface/constants.php:239
 msgid "Number of Free calls"
-msgstr "Numero di chiamate"
+msgstr "Numero di chiamate gratuite"
 
-#: lib/interface/constants.php:303
-#, fuzzy
+#: lib/interface/constants.php:240
 msgid "Free seconds"
-msgstr "Secondi"
+msgstr "Secondi gratuiti"
 
-#: lib/interface/constants.php:311
+#: lib/interface/constants.php:246
 msgid "Monthly"
-msgstr ""
+msgstr "Mensile"
 
-#: lib/interface/constants.php:312
+#: lib/interface/constants.php:247
 msgid "Weekly"
-msgstr ""
+msgstr "Settimanale"
 
-#: lib/interface/constants.php:320
+#: lib/interface/constants.php:253
 msgid "LCR : According to the buyer price"
-msgstr ""
+msgstr "LCR : Secondo il prezzo d'acquisto"
 
-#: lib/interface/constants.php:321
+#: lib/interface/constants.php:254
 msgid "LCD : According to the seller price"
-msgstr ""
+msgstr "LCR : Secondo il prezzo di vendita"
 
-#: lib/interface/constants.php:329
+#: lib/interface/constants.php:260
 msgid "LCR : buyer price"
-msgstr ""
+msgstr "LCR : prezzo d'acquisto"
 
-#: lib/interface/constants.php:330
+#: lib/interface/constants.php:261
 msgid "LCD : seller price"
-msgstr ""
+msgstr "LCR : prezzo di vendita"
 
-#: lib/interface/constants.php:358
-#, fuzzy
+#: lib/interface/constants.php:284
 msgid "NOT USED"
-msgstr "REGIONE"
+msgstr "NON USATO"
 
-#: lib/interface/constants.php:359
+#: lib/interface/constants.php:285
 msgid "USED"
-msgstr ""
+msgstr "USATO"
 
-#: lib/interface/constants.php:374
+#: lib/interface/constants.php:295
 msgid "ANSWER"
-msgstr ""
+msgstr "RISPOSTA"
 
-#: lib/interface/constants.php:375
+#: lib/interface/constants.php:296
 msgid "BUSY"
-msgstr ""
+msgstr "OCCUPATO"
 
-#: lib/interface/constants.php:376
-#, fuzzy
+#: lib/interface/constants.php:297
 msgid "NOANSWER"
-msgstr "NESSUNA"
+msgstr "NESSUNA RISPOSTA"
 
-#: lib/interface/constants.php:377 lib/interface/constants.php:429
-#: lib/interface/constants.php:459
-#, fuzzy
+#: lib/interface/constants.php:298
+#: lib/interface/constants.php:341
+#: lib/interface/constants.php:366
 msgid "CANCEL"
-msgstr "CHIAMATA"
+msgstr "CANCELLATA"
 
-#: lib/interface/constants.php:378
-#, fuzzy
+#: lib/interface/constants.php:299
 msgid "CONGESTION"
-msgstr "AZIONE"
+msgstr "CONGESTIONE"
 
-#: lib/interface/constants.php:379
+#: lib/interface/constants.php:300
 msgid "CHANUNAVAIL"
-msgstr ""
+msgstr "CANALE NON DISPONIBILE"
 
-#: lib/interface/constants.php:380
-#, fuzzy
+#: lib/interface/constants.php:301
 msgid "DONTCALL"
-msgstr "CHIAMATA"
+msgstr "NON CHIAMATA"
 
-#: lib/interface/constants.php:381
-#, fuzzy
+#: lib/interface/constants.php:302
 msgid "TORTURE"
-msgstr "Origine"
+msgstr "TORTURA"
 
-#: lib/interface/constants.php:382
+#: lib/interface/constants.php:303
 msgid "INVALIDARGS"
-msgstr ""
+msgstr "ARGOMENTO INVALIDO"
 
-#: lib/interface/constants.php:406 lib/interface/constants.php:445
-#, fuzzy
+#: lib/interface/constants.php:323
+#: lib/interface/constants.php:355
 msgid "ACTIVE"
-msgstr "ATTIVATO"
+msgstr "ATTIVO"
 
-#: lib/interface/constants.php:407 lib/interface/constants.php:429
-#: lib/interface/constants.php:446 lib/interface/constants.php:459
-#: lib/interface/constants.php:543
-#, fuzzy
+#: lib/interface/constants.php:324
+#: lib/interface/constants.php:341
+#: lib/interface/constants.php:356
+#: lib/interface/constants.php:366
+#: lib/interface/constants.php:433
 msgid "CANCELLED"
-msgstr "CHIAMATA"
+msgstr "CANCELLATA"
 
-#: lib/interface/constants.php:409 lib/interface/constants.php:432
+#: lib/interface/constants.php:326
+#: lib/interface/constants.php:344
 msgid "WAITING-MAILCONFIRMATION"
-msgstr ""
+msgstr "IN ATTESA DELL'EMAIL DI CONFERMA"
 
-#: lib/interface/constants.php:410 lib/interface/constants.php:433
-#, fuzzy
+#: lib/interface/constants.php:327
+#: lib/interface/constants.php:345
 msgid "RESERVED"
-msgstr "REGISTRATO"
+msgstr "RISERVATO"
 
-#: lib/interface/constants.php:412 lib/interface/constants.php:435
+#: lib/interface/constants.php:329
+#: lib/interface/constants.php:347
 msgid "SUSPENDED FOR UNDERPAYMENT"
-msgstr ""
+msgstr "SOSPESO PER MANCATO PAGAMENTO"
 
-#: lib/interface/constants.php:413 lib/interface/constants.php:436
+#: lib/interface/constants.php:330
+#: lib/interface/constants.php:348
 msgid "SUSPENDED FOR LITIGATION"
-msgstr ""
+msgstr "SOSPESO PER CONTENZIOSO"
 
-#: lib/interface/constants.php:414
-#, fuzzy
+#: lib/interface/constants.php:331
 msgid "WAITING SUBSCRIPTION PAYMENT"
-msgstr "Destinazione"
+msgstr "IN ATTESA SOTTOSCRIZIONE PAGAMENTO"
 
-#: lib/interface/constants.php:432 lib/interface/constants.php:540
-#, fuzzy
+#: lib/interface/constants.php:344
+#: lib/interface/constants.php:430
 msgid "WAITING"
-msgstr "AZIONE"
+msgstr "IN ATTESA"
 
-#: lib/interface/constants.php:433
-#, fuzzy
+#: lib/interface/constants.php:345
 msgid "RESERV"
-msgstr "REGISTRATO"
+msgstr "RISERV"
 
-#: lib/interface/constants.php:435
+#: lib/interface/constants.php:347
 msgid "SUS-PAY"
-msgstr ""
+msgstr "SOSP.PAG."
 
-#: lib/interface/constants.php:436
+#: lib/interface/constants.php:348
 msgid "SUS-LIT"
-msgstr ""
+msgstr "SOSP-CONT"
 
-#: lib/interface/constants.php:437
-#, fuzzy
+#: lib/interface/constants.php:349
 msgid "WAITING-SUBSCRIPTION-PAYMENT"
-msgstr "Destinazione"
+msgstr "IN ATTESA SOTTOSCRIZIONE PAGAMENTO"
 
-#: lib/interface/constants.php:437
+#: lib/interface/constants.php:349
 msgid "WAIT-PAY"
-msgstr ""
+msgstr "ATT-PAG"
 
-#: lib/interface/constants.php:484
+#: lib/interface/constants.php:385
 msgid "NO EXPIRY"
-msgstr ""
+msgstr "NESSUNA SCADENZA"
 
-#: lib/interface/constants.php:495
+#: lib/interface/constants.php:394
 msgid "SQL"
-msgstr ""
+msgstr "SQL"
 
-#: lib/interface/constants.php:496
-#, fuzzy
+#: lib/interface/constants.php:395
 msgid "SHELL SCRIPT"
-msgstr "Destinazione"
+msgstr "SCRIPT SHELL"
 
-#: lib/interface/constants.php:504
+#: lib/interface/constants.php:401
 msgid "TEXT2SPEECH"
-msgstr ""
+msgstr "TEXT2SPEECH"
 
-#: lib/interface/constants.php:505
+#: lib/interface/constants.php:402
 msgid "UNIXTIME"
-msgstr ""
+msgstr "UNIXTIME"
 
-#: lib/interface/constants.php:506
-#, fuzzy
+#: lib/interface/constants.php:403
 msgid "NUMBER"
-msgstr "NUMERO CARTA"
+msgstr "NUMERO"
 
-#: lib/interface/constants.php:507
+#: lib/interface/constants.php:404
 msgid "DIGIT"
-msgstr ""
+msgstr "DIGITATE"
 
-#: lib/interface/constants.php:516
-#, fuzzy
+#: lib/interface/constants.php:411
 msgid "CORRECTION"
-msgstr "AZIONE"
+msgstr "CORREZIONE"
 
-#: lib/interface/constants.php:517
-#, fuzzy
+#: lib/interface/constants.php:412
 msgid "EXTRA FEE"
-msgstr "PREZZO EXTRA"
+msgstr "SUPPLEMENTO"
 
-#: lib/interface/constants.php:518
+#: lib/interface/constants.php:413
 msgid "AGENT REFUND"
-msgstr ""
+msgstr "RIMBORSO AGENTE"
 
-#: lib/interface/constants.php:526
-#, fuzzy
+#: lib/interface/constants.php:419
 msgid "TO BALANCE"
-msgstr "SUO CREDITO"
+msgstr "TUO CREDITO"
 
-#: lib/interface/constants.php:527
+#: lib/interface/constants.php:420
 msgid "TO BANK"
-msgstr ""
+msgstr "ALLA BANCA"
 
-#: lib/interface/constants.php:541
+#: lib/interface/constants.php:431
 msgid "ACCEPTED"
-msgstr ""
+msgstr "ACCETTATO"
 
-#: lib/interface/constants.php:542
-#, fuzzy
+#: lib/interface/constants.php:432
 msgid "REFUSED"
-msgstr "REGISTRATO"
+msgstr "RIFIUTATO"
 
-#: lib/interface/constants.php:565
-#, fuzzy
+#: lib/interface/constants.php:450
 msgid "NO DISCOUNT"
-msgstr "&nbsp;NESSUN ACCOUNT IAX&nbsp;"
+msgstr "NESSUNO SCONTO"
 
-#: lib/Class.A2Billing.php:386
+#: lib/Class.A2Billing.php:391
 msgid "Invalid card number lenght defined in configuration."
-msgstr ""
+msgstr "Lunghezza numero di scheda non valida definita nella configurazione."
 
-#: lib/Class.A2Billing.php:3418
+#: lib/Class.A2Billing.php:3276
 msgid "Error : Authentication Failed !!!"
-msgstr ""
+msgstr "Errore : Autenticazione Fallita !!!"
 
-#: lib/Class.A2Billing.php:3459
+#: lib/Class.A2Billing.php:3316
 msgid "Error : Not enough credit to call !!!"
-msgstr ""
+msgstr "Errore : Credito insufficiente per chiamare"
 
-#: lib/Class.A2Billing.php:3466
+#: lib/Class.A2Billing.php:3322
 msgid "Error : Card is not active!!!"
-msgstr ""
+msgstr "Errore : Scheda non attiva!!!"
 
-#: lib/Class.A2Billing.php:3473
+#: lib/Class.A2Billing.php:3328
 msgid "Error : Card is actually in use!!!"
-msgstr ""
+msgstr "Errore : La Scheda &egrave attualmente in uso!!!"
 
-#: lib/Class.A2Billing.php:3483 lib/Class.A2Billing.php:3492
-#: lib/Class.A2Billing.php:3501
+#: lib/Class.A2Billing.php:3337
+#: lib/Class.A2Billing.php:3345
+#: lib/Class.A2Billing.php:3353
 msgid "Error : Card have expired!!!"
-msgstr ""
+msgstr "Errore : Scheda scaduta!!!"
 
-#: lib/Class.Notification.php:79
+#: lib/Class.Notification.php:77
 msgid "New SIP & IAX added : Friends conf have to be generated"
-msgstr ""
+msgstr "Nuovo SIP & IAX aggiunto : Friends conf &egrave stato generato"
 
-#: lib/Class.Notification.php:80
+#: lib/Class.Notification.php:78
 msgid "New SIP added : Sip Friends conf have to be generated"
-msgstr ""
+msgstr "Nuovo SIP aggiunto : Friends conf &egrave stato generato"
 
-#: lib/Class.Notification.php:81
+#: lib/Class.Notification.php:79
 msgid "New IAX added : IAX Friends conf have to be generated"
-msgstr ""
+msgstr "Nuovo IAX aggiunt : Friends conf &egrave stato generato"
 
-#: lib/Class.Notification.php:82
+#: lib/Class.Notification.php:80
 msgid "New Ticket added by agent"
-msgstr ""
+msgstr "Nuovo ticket aggiunto dall'agente"
 
-#: lib/Class.Notification.php:83
+#: lib/Class.Notification.php:81
 msgid "New Ticket added by customer"
-msgstr ""
+msgstr "Nuovo ticket aggiunto dall'utente"
 
-#: lib/Class.Notification.php:84
+#: lib/Class.Notification.php:82
 msgid "DID Destination edited by customer"
-msgstr ""
+msgstr "Destinazione DID editata dall'utente"
 
-#: lib/Class.Notification.php:85
+#: lib/Class.Notification.php:83
 msgid "New Remittance request added"
-msgstr ""
+msgstr "Nuova richiesta di Rimessa aggiunta"
 
-#: lib/Class.Notification.php:86
+#: lib/Class.Notification.php:84
 msgid "Added new sign-up"
-msgstr ""
+msgstr "Aggiunta nuova registrazione"
 
-#: lib/Class.Notification.php:146
-#, fuzzy
+#: lib/Class.Notification.php:136
 msgid "BATCH"
-msgstr "Marzo"
+msgstr "LOTTO"
 
-#: lib/Class.Notification.php:148
+#: lib/Class.Notification.php:138
 msgid "SOAP-SERVER"
-msgstr ""
+msgstr "SOAP-SERVER"
 
-#: lib/customer.help.php:49
+#: lib/customer.help.php:47
 msgid "From here, you can use the web based screen phone. You need microphone and speakers on your PC."
-msgstr ""
+msgstr "Da qui, puoi usare il telefono via web. Devi avere microfono e cuffie."
 
-#: lib/customer.help.php:51
+#: lib/customer.help.php:49
 msgid "All calls are listed below. Search by month, day or status. Additionally, you can check the rate and price."
-msgstr "Tutte le chiamate sono elencate qui sotto. Ricercare per mese, giorno o stato. In pi&ugrave;, &egrave; possibile visualizzare la tariffa ed il prezzo"
+msgstr "Tutte le chiamate sono elencate qui sotto. Ricerca per data, numero chiamato o tipo di chiamata. &Egrave; possibile visualizzare la durata ed il costo."
 
-#: lib/customer.help.php:53
+#: lib/customer.help.php:51
 msgid "On this page, you can open a support ticket and consult the status of your existing ticket."
-msgstr ""
+msgstr "In questa pagina, puoi aprire un ticket di supporto e consultarne lo stato."
 
-#: lib/customer.help.php:55
-#, fuzzy
+#: lib/customer.help.php:53
 msgid "Personal information."
-msgstr "Destinazione"
+msgstr "Informazioni personali."
 
-#: lib/customer.help.php:55
+#: lib/customer.help.php:53
 msgid "You can update your personal information here."
-msgstr ""
+msgstr "Qui puoi aggiornare le tue informazioni personali."
 
-#: lib/customer.help.php:57
+#: lib/customer.help.php:55
 msgid "Notification settings."
-msgstr ""
+msgstr "Impostazioni notifiche"
 
-#: lib/customer.help.php:57
+#: lib/customer.help.php:55
 msgid "You can update your notification settings here."
-msgstr ""
+msgstr "Puoi aggiornare le tue impostazioni di notifica qui."
 
-#: lib/customer.help.php:59
+#: lib/customer.help.php:57
 msgid "Simulate the calling process to discover the cost per minute of a call, and the number of minutes you can call that number with your current credit."
 msgstr "Simulatore di chiamate: per conoscerne il costo al minuto e la durata complessiva massima, rispetto al proprio credito attuale."
 
-#: lib/customer.help.php:61
+#: lib/customer.help.php:59
 msgid "Configuration information for SIP and IAX Client. You can simply copy and paste it in your configuration files and do necessary modifications."
-msgstr ""
+msgstr "Informazioni di configurazione per SIP & IAX Client. Puoi semplicemente copiare ed incollare il testo con eventuali modifiche."
 
-#: lib/customer.help.php:63
+#: lib/customer.help.php:61
 msgid "On this page you will be able to change your password, You have to enter the New Password and Confirm it."
-msgstr ""
+msgstr "In questa pagina puoi cambiare la tua password. Devi immettere la nuova password e confermare."
 
-#: lib/customer.help.php:65
+#: lib/customer.help.php:63
 msgid "View Rates"
-msgstr ""
+msgstr "Visualizza Tariffe"
 
-#: lib/customer.help.php:67
+#: lib/customer.help.php:65
 msgid "Payment history - Record of payments made."
-msgstr ""
+msgstr "Storico pagamenti - Registro dei pagamenti effettuati."
 
-#: lib/customer.help.php:69
+#: lib/customer.help.php:67
 msgid "Voicemail - The section below allows you to see all your voicemail, listen to them and move them into other folders."
-msgstr ""
+msgstr "Voicemail - La sezione sotto ti permette di vedere tutte le tue voicemail, ascoltarle e spostarle in un altra cartella."
 
-#: lib/customer.help.php:71
+#: lib/customer.help.php:69
 msgid "Enter your voucher number to top up your card."
-msgstr ""
+msgstr "Inserisci il numero di coupon per ricaricare la tua scheda."
 
-#: lib/customer.help.php:73
+#: lib/customer.help.php:71
 msgid "This section will allow you to create and edit campaign. "
-msgstr ""
+msgstr "Questa sezione ti permette di creare e modificare le campagne."
 
-#: lib/customer.help.php:74
+#: lib/customer.help.php:72
 msgid "A campaign will be attached to a user in order to let him use the predictive-dialer option. "
-msgstr ""
+msgstr "Una campagna sar&agrave abbinata ad un utente in modo che possa usare l'opzione di chiamata prestabilita."
 
-#: lib/customer.help.php:75
+#: lib/customer.help.php:73
 msgid "Predictive dialer will browse all the phone numbers from the campaign and perform outgoing calls."
-msgstr ""
+msgstr "La chiamata prestabilita, analizzer&agrave tutti i numeri della campagna ed effettuer&agrave la chiamata."
 
-#: lib/customer.help.php:77
+#: lib/customer.help.php:75
 msgid "Phonelist are all the phone numbers attached to a campaign. You can add, remove and edit the phone numbers."
-msgstr ""
+msgstr "La Lista Telefoni sono tutti i numeri inseriti in una campagna. Puoi aggiungerli, rimuoverli o modificarli."
 
-#: lib/customer.help.php:79
+#: lib/customer.help.php:77
 msgid "Invoice history - The section below allows you to see and pay the invoices that you have to pay."
-msgstr ""
+msgstr "Storico fatture - La sezione sotto permette di vedere e pagare eventuali fatture inevase."
 
-#: lib/customer.help.php:81
+#: lib/customer.help.php:79
 msgid "Receipt history - The section below allows you to see the receipt that you received. you can see in them the summary of some withdrawal"
-msgstr ""
+msgstr "Storico ricevute - La sezione sotto permette di vedere le ricevute. Puoi vederne il sommario ed eventuali recessi"
 
-#: lib/customer.help.php:83
-msgid "Phonebook are set of phone numbers. You can add, remove and edit the phonebook. You can also associate phonebook to a campaign in the Campaign section"
-msgstr ""
+#: lib/customer.help.php:81
+msgid "Phonebook are set of phone numbers. You can add, remove and edit the phonebook. You can also associate phonebook to a campaign in the Campaign section."
+msgstr "La Rubrica &egrave un elenco di numeri telefonici. Puoi aggiungerli, rimuoverli o modificarli. Puoi anche associarli ad una campagna nella relativa sezione."
 
-#: lib/customer.help.php:85
+#: lib/customer.help.php:83
 msgid "Select the country below where you would like a DID, select a DID from the list and enter the destination you would like to assign it to."
-msgstr ""
+msgstr "Seleziona in basso il paese del quale si desidera un DID, selezionare un DID dall'elenco e inserire la destinazione che si desidera assegnare ad esso."
 
-#: lib/customer.help.php:87
+#: lib/customer.help.php:85
 msgid "After confirmation, the release of the did will be done immediately and you will not be monthly charged any more."
-msgstr ""
+msgstr "Dopo la conferma, il rilascio del DID sar&agrave fatto immediatamente e non ci saranno pi$ugrave relativi addebiti mensili."
 
-#: lib/customer.help.php:89
+#: lib/customer.help.php:87
 msgid "Map single digit to your most dialed numbers."
-msgstr ""
+msgstr "Imposta un Numero Breve al numero di telefono usato pi&ugrave di frequente."
 
-#: lib/customer.help.php:91
-#, fuzzy
+#: lib/customer.help.php:89
 msgid "Callback : Entre your phone number and the phone number you wish to call."
-msgstr "<font face='Arial, Helvetica, sans-serif' size='2' color='red'><b>Errore: bisogna specificare il proprio numero di telefono e il numero di telefono da chiamare!!!</b></font><br>"
+msgstr "Callback : Inserire il proprio numero di telefono ed il numero di telefono da chiamare."
 
-#: A2B_ticket_view.php:57
+#: A2B_ticket_view.php:58
 msgid "Ticket updated successfully"
-msgstr ""
+msgstr "Ticket aggiornato con successo"
 
-#: A2B_ticket_view.php:63
+#: A2B_ticket_view.php:64
 msgid "Ticket ID not found"
-msgstr ""
+msgstr "ID ticket non trovato"
 
-#: A2B_ticket_view.php:112
+#: A2B_ticket_view.php:114
 msgid "TICKET: "
-msgstr ""
+msgstr "TICKET: "
 
-#: A2B_ticket_view.php:120
+#: A2B_ticket_view.php:122
 msgid "BY : "
-msgstr ""
+msgstr "DA : "
 
-#: A2B_ticket_view.php:125
-#, fuzzy
+#: A2B_ticket_view.php:127
 msgid "PRIORITY : "
-msgstr "Priorità"
+msgstr "PRIORIT&Agrave : "
 
-#: A2B_ticket_view.php:128
-#, fuzzy
+#: A2B_ticket_view.php:130
 msgid "DATE : "
-msgstr "DATA"
+msgstr "DATA : "
 
-#: A2B_ticket_view.php:133
+#: A2B_ticket_view.php:135
 msgid "COMPONENT : "
-msgstr ""
+msgstr "COMPONENTE"
 
-#: A2B_ticket_view.php:139
-#, fuzzy
+#: A2B_ticket_view.php:141
 msgid "DESCRIPTION : "
-msgstr "Destinazione"
+msgstr "DESCRIZIONE : "
 
-#: A2B_ticket_view.php:168
+#: A2B_ticket_view.php:170
 msgid "STATUS : "
-msgstr ""
+msgstr "STATO : "
 
-#: A2B_ticket_view.php:187
+#: A2B_ticket_view.php:190
 msgid "COMMENT : "
-msgstr ""
+msgstr "COMMENTO : "
 
-#: checkout_confirmation.php:126
+#: checkout_confirmation.php:111
 msgid "No Transaction ID found"
-msgstr ""
+msgstr "ID Transazione non trovato"
 
-#: checkout_confirmation.php:158
+#: checkout_confirmation.php:144
 msgid "Please confirm your order"
-msgstr ""
+msgstr "Conferma ordine"
 
-#: checkout_confirmation.php:165
+#: checkout_confirmation.php:151
 msgid "Payment Method"
-msgstr ""
+msgstr "Metodo di Pagamento"
 
-#: checkout_confirmation.php:170
-#, fuzzy
+#: checkout_confirmation.php:156
 msgid "Amount"
-msgstr "COSTO TOTALE"
+msgstr "Importo"
 
-#: checkout_confirmation.php:181 A2B_invoice_view.php:215
-#: A2B_invoice_view.php:271 A2B_billing_preview.php:272 userinfo.php:246
-#: userinfo.php:272
+#: checkout_confirmation.php:166
+#: A2B_invoice_view.php:217
+#: A2B_invoice_view.php:274
+#: A2B_billing_preview.php:279
+#: userinfo.php:250
+#: userinfo.php:276
 msgid "VAT"
-msgstr ""
+msgstr "IVA"
 
-#: checkout_confirmation.php:192
-#, fuzzy
+#: checkout_confirmation.php:177
 msgid "Total Amount Incl. VAT"
-msgstr "COSTO TOTALE"
+msgstr "Importo totale comp. IVA"
 
-#: checkout_confirmation.php:210
+#: checkout_confirmation.php:194
 msgid "Please click button to confirm your order"
-msgstr ""
+msgstr "Clicca sul tasto per conferma ordine"
 
-#: callback.php:168
+#: callback.php:173
 msgid "Cannot insert the callback request in the spool!"
-msgstr ""
+msgstr "Impossibile inserire la richiesta di callabck"
 
-#: callback.php:170
+#: callback.php:175
 msgid "Your callback request has been queued correctly!"
-msgstr ""
+msgstr "La richiesta di callback &egrave stata inserita correttamente!"
 
-#: callback.php:175
+#: callback.php:180
 msgid "Error : You don t have enough credit to call you back!"
-msgstr ""
+msgstr "Errore : Non hai abbastanza credito per il callback!"
 
-#: callback.php:178
+#: callback.php:183
 msgid "Error : There is no route to call back your phonenumber!"
-msgstr ""
+msgstr "Errore . Non ci sono rotte per chiamare il tuo numero!"
 
-#: callback.php:184
-#, fuzzy
+#: callback.php:189
 msgid "Error : You have to specify your phonenumber and the number you wish to call!"
-msgstr "<font face='Arial, Helvetica, sans-serif' size='2' color='red'><b>Errore: bisogna specificare il proprio numero di telefono e il numero di telefono da chiamare!!!</b></font><br>"
+msgstr "Errore: bisogna specificare il proprio numero di telefono e il numero di telefono da chiamare!"
 
-#: callback.php:202
+#: callback.php:208
 msgid "You can initiate the callback by entering your phonenumber and the number you wish to call!"
-msgstr ""
+msgstr "Puoi iniziare il callback inserendo il tuo numero ed il numero da chiamare!"
 
-#: callback.php:211
-#, fuzzy
+#: callback.php:217
 msgid "Your Phone Number"
-msgstr "Aggiungi un nuovo numero di telefono alla tua Selezione Passante"
+msgstr "Tuo numero di telefono"
 
-#: callback.php:214
+#: callback.php:220
 msgid "The number you wish to call"
-msgstr ""
+msgstr "Numero da chiamare"
 
-#: callback.php:219
+#: callback.php:225
 msgid "Click here to Place Call"
-msgstr ""
+msgstr "Clicca qui per effettuare la chiamata"
 
-#: CC_entity_edit_speeddial.php:622
+#: CC_entity_edit_speeddial.php:657
 msgid "Voip Station"
-msgstr ""
+msgstr "Stazione Voip"
 
-#: CC_entity_edit_speeddial.php:1020
+#: CC_entity_edit_speeddial.php:1061
 msgid "Remove this Speed Dial"
-msgstr "Elimina il numero in Rubrica veloce"
+msgstr "Elimina questo Numero Breve"
 
-#: CC_entity_edit_speeddial.php:1020 CC_entity_edit_did_destination.php:1166
+#: CC_entity_edit_speeddial.php:1061
+#: CC_entity_edit_did_destination.php:1223
 msgid "Delete"
 msgstr "Elimina"
 
-#: CC_entity_edit_speeddial.php:1036
-#, fuzzy
+#: CC_entity_edit_speeddial.php:1078
 msgid "Deletetion"
 msgstr "Elimina"
 
-#: CC_entity_edit_speeddial.php:1038 CC_entity_edit_did_destination.php:1183
+#: CC_entity_edit_speeddial.php:1080
+#: CC_entity_edit_did_destination.php:1240
 msgid "Inserted"
-msgstr ""
+msgstr "Inserito"
 
-#: forgotpassword.php:54
+#: forgotpassword.php:56
 msgid "Please wait 1 minutes before making any other request for the forgot password!"
-msgstr ""
+msgstr "Attendere 1 minuto prima di effettuare un'altra richiesta di password dimenticata!"
 
-#: forgotpassword.php:83
+#: forgotpassword.php:85
 msgid "Error : Mail sender"
-msgstr ""
+msgstr "Errore : Mittente"
 
-#: forgotpassword.php:102
+#: forgotpassword.php:104
 msgid "Your login information email has been sent to you."
-msgstr ""
+msgstr "I dati di accesso ti sono stati inviati via email."
 
-#: forgotpassword.php:105
+#: forgotpassword.php:107
 msgid "No such login exists."
-msgstr ""
+msgstr "Non esiste tale login."
 
-#: forgotpassword.php:108
+#: forgotpassword.php:110
 msgid "Invalid Action."
-msgstr ""
+msgstr "Azione non valida."
 
-#: forgotpassword.php:111
+#: forgotpassword.php:113
 msgid "Please provide your email address to get your login information."
-msgstr ""
+msgstr "Fornisci il tuo indirizzo email per ricevere le credenziali."
 
-#: forgotpassword.php:124
+#: forgotpassword.php:127
 msgid "You must enter an email address!"
-msgstr ""
+msgstr "Devi inserire un indirizzo email!"
 
-#: A2B_invoice_view.php:143
+#: A2B_invoice_view.php:145
 msgid "Print"
-msgstr ""
+msgstr "Stampa"
 
-#: A2B_invoice_view.php:153
-#, fuzzy
+#: A2B_invoice_view.php:155
 msgid "INVOICE"
 msgstr "FATTURE"
 
-#: A2B_invoice_view.php:161 A2B_invoice_view.php:178 A2B_receipt_view.php:153
+#: A2B_invoice_view.php:163
+#: A2B_invoice_view.php:180
+#: A2B_receipt_view.php:155
 msgid "VAT nr."
-msgstr ""
+msgstr "IVA num."
 
-#: A2B_invoice_view.php:174
+#: A2B_invoice_view.php:176
 msgid "tel"
-msgstr ""
+msgstr "tel."
 
-#: A2B_invoice_view.php:175
+#: A2B_invoice_view.php:177
 msgid "fax"
-msgstr ""
+msgstr "fax"
 
-#: A2B_invoice_view.php:176
+#: A2B_invoice_view.php:178
 msgid "mail"
-msgstr ""
-
-#: A2B_invoice_view.php:188 A2B_invoice_view.php:212
-#: A2B_receipt_detail.php:116 A2B_receipt_detail.php:135 card-history.php:70
-#: A2B_billing_preview.php:156 A2B_billing_preview.php:177
-#: A2B_billing_preview.php:248 A2B_billing_preview.php:269
-#: A2B_receipt_preview_detail.php:217 call-history.php:99
-#: A2B_receipt_view.php:178 A2B_receipt_view.php:200
+msgstr "email"
+
+#: A2B_invoice_view.php:190
+#: A2B_invoice_view.php:214
+#: A2B_receipt_detail.php:118
+#: A2B_receipt_detail.php:137
+#: card-history.php:75
+#: A2B_billing_preview.php:162
+#: A2B_billing_preview.php:183
+#: A2B_billing_preview.php:255
+#: A2B_billing_preview.php:276
+#: A2B_receipt_preview_detail.php:215
+#: call-history.php:130
+#: A2B_receipt_view.php:179
+#: A2B_receipt_view.php:200
 msgid "Date"
 msgstr "DATA"
 
-#: A2B_invoice_view.php:192
-#, fuzzy
+#: A2B_invoice_view.php:194
 msgid "Invoice number"
-msgstr "Aggiungi un nuovo numero di telefono alla tua Selezione Passante"
+msgstr "Numero fattura"
 
-#: A2B_invoice_view.php:197 A2B_receipt_view.php:184
+#: A2B_invoice_view.php:199
+#: A2B_receipt_view.php:185
 msgid "Client Account Number"
-msgstr ""
+msgstr "Numero Account Utente"
 
-#: A2B_invoice_view.php:214 A2B_billing_preview.php:271
+#: A2B_invoice_view.php:216
+#: A2B_billing_preview.php:278
 msgid "Cost excl. VAT"
-msgstr ""
+msgstr "Costo escl. IVA"
 
-#: A2B_invoice_view.php:216 A2B_billing_preview.php:273
+#: A2B_invoice_view.php:218
+#: A2B_billing_preview.php:280
 msgid "Cost incl. VAT"
-msgstr ""
+msgstr "Costo incl. IVA"
 
-#: A2B_invoice_view.php:264 A2B_billing_preview.php:319
+#: A2B_invoice_view.php:267
+#: A2B_billing_preview.php:327
 msgid "Subtotal excl. VAT:"
-msgstr ""
+msgstr "Subtotale escl. IVA"
 
-#: A2B_invoice_view.php:277 A2B_billing_preview.php:332
+#: A2B_invoice_view.php:280
+#: A2B_billing_preview.php:340
 msgid "Total incl. VAT:"
-msgstr ""
+msgstr "Totale incl. IVA"
 
-#: A2B_receipt_detail.php:88 A2B_receipt_detail.php:95
-#: A2B_receipt_preview_detail.php:171 A2B_receipt_preview_detail.php:178
+#: A2B_receipt_detail.php:90
+#: A2B_receipt_detail.php:97
+#: A2B_receipt_preview_detail.php:169
+#: A2B_receipt_preview_detail.php:176
 msgid "Page"
-msgstr ""
+msgstr "Pagina"
 
-#: A2B_receipt_detail.php:107
+#: A2B_receipt_detail.php:109
 msgid "RECEIPT DETAIL"
-msgstr ""
+msgstr "DETTAGLIO RICEVUTA"
 
-#: A2B_receipt_detail.php:137 A2B_billing_preview.php:179
-#: A2B_receipt_preview_detail.php:219 call-history.php:106
+#: A2B_receipt_detail.php:139
+#: A2B_billing_preview.php:185
+#: A2B_receipt_preview_detail.php:217
+#: call-history.php:137
 #: A2B_receipt_view.php:202
 msgid "Cost"
 msgstr "Costo"
 
-#: A2B_receipt_detail.php:172 A2B_receipt_preview_detail.php:256
-#, fuzzy
+#: A2B_receipt_detail.php:175
+#: A2B_receipt_preview_detail.php:254
 msgid "Total Page"
-msgstr "TOTALE"
+msgstr "Totale pagine"
 
-#: A2B_receipt_detail.php:179 A2B_receipt_preview_detail.php:262
-#, fuzzy
+#: A2B_receipt_detail.php:182
+#: A2B_receipt_preview_detail.php:260
 msgid "Total Receipt :"
-msgstr "TOTALE"
+msgstr "Totale ricevute"
 
-#: card-history.php:93
+#: card-history.php:100
 msgid "Card History"
-msgstr ""
+msgstr "Storico Scheda"
 
-#: card-history.php:188
-#, fuzzy
+#: card-history.php:207
 msgid "SELECT BY MONTH"
-msgstr "SELEZIONE MESE"
+msgstr "SELEZIONA IL MESE"
 
-#: card-history.php:194 card-history.php:243 call-history.php:217
+#: card-history.php:213
+#: card-history.php:264
+#: call-history.php:264
 msgid "FROM"
-msgstr "Da"
+msgstr "DA"
 
-#: card-history.php:197 card-history.php:217 card-history.php:255
-#: card-history.php:282 call-history.php:230 call-history.php:257
+#: card-history.php:217
+#: card-history.php:238
+#: card-history.php:277
+#: card-history.php:305
+#: call-history.php:277
+#: call-history.php:305
 msgid "JANUARY"
-msgstr "Gennaio"
+msgstr "GENNAIO"
 
-#: card-history.php:197 card-history.php:217 card-history.php:255
-#: card-history.php:282 call-history.php:230 call-history.php:257
+#: card-history.php:217
+#: card-history.php:238
+#: card-history.php:277
+#: card-history.php:305
+#: call-history.php:277
+#: call-history.php:305
 msgid "FEBRUARY"
-msgstr "Febbraio"
+msgstr "FEBBRAIO"
 
-#: card-history.php:197 card-history.php:217 card-history.php:255
-#: card-history.php:282 call-history.php:230 call-history.php:257
+#: card-history.php:217
+#: card-history.php:238
+#: card-history.php:277
+#: card-history.php:305
+#: call-history.php:277
+#: call-history.php:305
 msgid "MARCH"
-msgstr "Marzo"
+msgstr "MARZO"
 
-#: card-history.php:197 card-history.php:217 card-history.php:255
-#: card-history.php:282 call-history.php:230 call-history.php:257
+#: card-history.php:217
+#: card-history.php:238
+#: card-history.php:277
+#: card-history.php:305
+#: call-history.php:277
+#: call-history.php:305
 msgid "APRIL"
-msgstr "Abrile"
+msgstr "APRILE"
 
-#: card-history.php:197 card-history.php:217 card-history.php:255
-#: card-history.php:282 call-history.php:230 call-history.php:257
+#: card-history.php:217
+#: card-history.php:238
+#: card-history.php:277
+#: card-history.php:305
+#: call-history.php:277
+#: call-history.php:305
 msgid "MAY"
-msgstr "Maggio"
+msgstr "MAGGIO"
 
-#: card-history.php:197 card-history.php:217 card-history.php:255
-#: card-history.php:282 call-history.php:230 call-history.php:257
+#: card-history.php:217
+#: card-history.php:238
+#: card-history.php:277
+#: card-history.php:305
+#: call-history.php:277
+#: call-history.php:305
 msgid "JUNE"
-msgstr "Giugno"
+msgstr "GIUGNO"
 
-#: card-history.php:197 card-history.php:217 card-history.php:255
-#: card-history.php:282 call-history.php:230 call-history.php:257
+#: card-history.php:217
+#: card-history.php:238
+#: card-history.php:277
+#: card-history.php:305
+#: call-history.php:277
+#: call-history.php:305
 msgid "JULY"
-msgstr "Luglio"
+msgstr "LUGLIO"
 
-#: card-history.php:197 card-history.php:217 card-history.php:255
-#: card-history.php:282 call-history.php:230 call-history.php:257
+#: card-history.php:217
+#: card-history.php:238
+#: card-history.php:277
+#: card-history.php:305
+#: call-history.php:277
+#: call-history.php:305
 msgid "AUGUST"
-msgstr "Agosto"
+msgstr "AGOSTO"
 
-#: card-history.php:197 card-history.php:217 card-history.php:255
-#: card-history.php:282 call-history.php:230 call-history.php:257
+#: card-history.php:217
+#: card-history.php:238
+#: card-history.php:277
+#: card-history.php:305
+#: call-history.php:277
+#: call-history.php:305
 msgid "SEPTEMBER"
-msgstr "Settembre"
+msgstr "SETTEMBRE"
 
-#: card-history.php:197 card-history.php:217 card-history.php:255
-#: card-history.php:282 call-history.php:230 call-history.php:257
+#: card-history.php:217
+#: card-history.php:238
+#: card-history.php:277
+#: card-history.php:305
+#: call-history.php:277
+#: call-history.php:305
 msgid "OCTOBER"
-msgstr "Ottobre"
+msgstr "OTTOBRE"
 
-#: card-history.php:197 card-history.php:217 card-history.php:255
-#: card-history.php:282 call-history.php:230 call-history.php:257
+#: card-history.php:217
+#: card-history.php:238
+#: card-history.php:277
+#: card-history.php:305
+#: call-history.php:277
+#: call-history.php:305
 msgid "NOVEMBER"
-msgstr "Novembre"
+msgstr "NOVEMBRE"
 
-#: card-history.php:197 card-history.php:217 card-history.php:255
-#: card-history.php:282 call-history.php:230 call-history.php:257
+#: card-history.php:217
+#: card-history.php:238
+#: card-history.php:277
+#: card-history.php:305
+#: call-history.php:277
+#: call-history.php:305
 msgid "DECEMBER"
-msgstr "Dicembre"
+msgstr "DICEMBRE"
 
-#: card-history.php:213 card-history.php:270 call-history.php:245
+#: card-history.php:233
+#: card-history.php:292
+#: call-history.php:292
 msgid "TO"
 msgstr "A"
 
-#: card-history.php:238
-#, fuzzy
+#: card-history.php:259
 msgid "SELECT BY DAY"
-msgstr "RUBRICA VELOCE"
+msgstr "SELEZIONARE IL GIORNO"
 
-#: card-history.php:303 call-history.php:359
+#: card-history.php:326
+#: call-history.php:407
 msgid "Search"
 msgstr "Cerca"
 
-#: A2B_phonelist_import_analyse.php:52
+#: A2B_phonelist_import_analyse.php:54
 msgid "No Phonebook defined !"
-msgstr ""
+msgstr "Nessuna Rubrica definita"
 
-#: A2B_phonelist_import_analyse.php:99
+#: A2B_phonelist_import_analyse.php:109
 msgid "File Save Failed, FILE="
-msgstr ""
+msgstr "Salvataggio file fallito, FILE="
 
-#: A2B_phonelist_import_analyse.php:113
+#: A2B_phonelist_import_analyse.php:125
 msgid "Error: Failed to open the file."
-msgstr ""
+msgstr "Errore: Apertura file fallita"
 
-#: A2B_phonelist_import_analyse.php:237
+#: A2B_phonelist_import_analyse.php:250
 msgid "The first line of your import is previewed below, please check to ensure that every is correct"
-msgstr ""
+msgstr "La prima riga dell' importazione &egrave visualizzata sotto, si prega di controllare che tutto sia corretto"
 
-#: A2B_phonelist_import_analyse.php:244
+#: A2B_phonelist_import_analyse.php:257
 msgid "FIELD"
-msgstr ""
+msgstr "CAMPO"
 
-#: A2B_phonelist_import_analyse.php:247
+#: A2B_phonelist_import_analyse.php:260
 msgid "VALUE"
-msgstr ""
+msgstr "VALORE"
 
-#: A2B_phonelist_import_analyse.php:284
-#, fuzzy
+#: A2B_phonelist_import_analyse.php:297
 msgid "Please check if the datas above are correct."
-msgstr "Impossibile connettersi al manager di Asterisk!<br>Prego controllare la configurazione del manager..."
+msgstr "Controllare se i dati di cui sopra sono corretti."
 
-#: A2B_phonelist_import_analyse.php:284
-#, fuzzy
+#: A2B_phonelist_import_analyse.php:297
 msgid "If Yes"
-msgstr "Si"
+msgstr "Se Si"
 
-#: A2B_phonelist_import_analyse.php:284
+#: A2B_phonelist_import_analyse.php:297
 msgid "you can continue the import. Otherwise you must fix your csv file!"
-msgstr ""
+msgstr "puoi continuare l'importazione. Altrimenti modifica il file csv!"
 
-#: A2B_phonelist_import_analyse.php:296
+#: A2B_phonelist_import_analyse.php:309
 msgid "Continue to Import the RateCard"
-msgstr ""
+msgstr "Continua con l'importazione della Tariffa"
 
-#: A2B_phonelist_import_analyse.php:328
-#, fuzzy
+#: A2B_phonelist_import_analyse.php:341
 msgid "Success"
-msgstr "Origine"
+msgstr "Successo"
 
-#: A2B_phonelist_import_analyse.php:328
+#: A2B_phonelist_import_analyse.php:341
 msgid "new phone number have been imported"
-msgstr ""
+msgstr "nuovo numero di telefono &egrave stato importato"
 
-#: A2B_phonelist_import_analyse.php:334
-#, fuzzy
+#: A2B_phonelist_import_analyse.php:347
 msgid "Line that has not been inserted"
-msgstr "è stata processata, Abbiamo aggiunto"
+msgstr "Linea che non &egrave stata inserita"
 
-#: PP_error.php:44
+#: PP_error.php:45
 msgid "ERROR : ACCESS REFUSED"
 msgstr "ERRORE : ACCESSO RIFIUTATO"
 
-#: PP_error.php:45
+#: PP_error.php:46
 msgid "Sorry a problem occur on our system, please try later!"
-msgstr "Spiacente, errore di sistema, prego riprovare più tardi!"
+msgstr "Spiacente, errore di sistema, prego riprovare pi&ugrave tardi!"
 
-#: PP_error.php:46
+#: PP_error.php:47
 msgid "There is an error on this page!"
-msgstr "Errore di pagina!"
+msgstr "C'&egrave un errore in questa  pagina!"
 
-#: PP_error.php:47
-#, fuzzy
+#: PP_error.php:48
 msgid "Sorry, you don't have access to this page !"
-msgstr "Spiacente, accesso non consentito!"
+msgstr "Spiacente, non hai accesso a questa pagina !"
 
-#: PP_error.php:59
+#: PP_error.php:60
 msgid "ERROR PAGE"
-msgstr ""
+msgstr "ERRORE PAGINA"
 
-#: PP_error.php:72
+#: PP_error.php:73
 msgid "GO TO LOGIN PAGE"
-msgstr ""
+msgstr "VAI ALLA PAGINA DI LOGIN"
 
-#: A2B_billing_preview.php:80
+#: A2B_billing_preview.php:83
 msgid "Cost of calls between the "
-msgstr ""
+msgstr "Costo delle chiamate tra i"
 
-#: A2B_billing_preview.php:84
+#: A2B_billing_preview.php:87
 msgid "Cost of calls before the "
-msgstr ""
+msgstr "Costo delle chiamate prima del "
 
-#: A2B_billing_preview.php:146
-#, fuzzy
+#: A2B_billing_preview.php:152
 msgid "PREVIEW NEXT RECEIPT"
-msgstr "FATTURE"
+msgstr "ANTEPRIMA PROSSIMA RICEVUTA"
 
-#: A2B_billing_preview.php:163 A2B_billing_preview.php:255
-#, fuzzy
+#: A2B_billing_preview.php:169
+#: A2B_billing_preview.php:262
 msgid "Client number"
-msgstr "Aggiungi un nuovo numero di telefono alla tua Selezione Passante"
+msgstr "Numero cliente"
 
-#: A2B_billing_preview.php:214 A2B_receipt_view.php:236
-#, fuzzy
+#: A2B_billing_preview.php:221
+#: A2B_receipt_view.php:238
 msgid "Total:"
 msgstr "TOTALE"
 
-#: A2B_billing_preview.php:225
+#: A2B_billing_preview.php:232
 msgid "Summary of calls since the last billing."
-msgstr ""
+msgstr "Riassunto delle chiamate dopo l'ultima fatturazione."
 
-#: A2B_billing_preview.php:239
-#, fuzzy
+#: A2B_billing_preview.php:246
 msgid "PREVIEW NEXT INVOICE"
-msgstr "FATTURE"
+msgstr "ANTEPRIMA PROSSIMA FATTURA"
 
-#: A2B_billing_preview.php:341
+#: A2B_billing_preview.php:349
 msgid "This invoice is for some charges unpaid since the last billing, and for the negative balance."
-msgstr ""
+msgstr "Questa fattura è per alcuni oneri non pagati dopo l'ultima di fatturazione, e per il saldo negativo."
 
-#: checkout_success.php:61
+#: checkout_success.php:63
 msgid "Thank you for your purchase"
-msgstr ""
+msgstr "Grazie per l'acquisto"
 
-#: checkout_success.php:67
-msgid "We are sorry your transaction is failed. Please try later or check your provided information."
-msgstr ""
-
-#: checkout_success.php:71
-msgid "We are sorry your transaction is denied. Please try later or check your provided information."
-msgstr ""
-
-#: checkout_success.php:75
+#: checkout_success.php:78
 msgid "We are sorry your transaction is pending."
-msgstr ""
-
-#: checkout_success.php:79
-msgid "Your transaction is in progress."
-msgstr ""
-
-#: checkout_success.php:83
-msgid "Your transaction was successful."
-msgstr ""
+msgstr "Spiacenti, la tua transazione &egrave sospesa."
 
-#: A2B_receipt_preview_detail.php:190
+#: A2B_receipt_preview_detail.php:188
 msgid "PREVIEW NEXT RECEIPT DETAIL"
-msgstr ""
+msgstr "ANTEPRIMA DETTAGLI PROSSIMA RICEVUTA"
 
-#: A2B_entity_sipiax_info.php:57
+#: A2B_entity_sipiax_info.php:59
 msgid "IAX Config"
-msgstr ""
+msgstr "Configurazione IAX"
 
-#: A2B_entity_sipiax_info.php:58
+#: A2B_entity_sipiax_info.php:60
 msgid "iax.conf"
-msgstr ""
+msgstr "iax.conf"
 
-#: A2B_entity_sipiax_info.php:61
+#: A2B_entity_sipiax_info.php:63
 msgid "SIP Config"
 msgstr "Configurazione SIP"
 
-#: A2B_entity_sipiax_info.php:62
+#: A2B_entity_sipiax_info.php:64
 msgid "sip.conf"
-msgstr ""
+msgstr "sip. conf"
 
-#: A2B_entity_sipiax_info.php:89
+#: A2B_entity_sipiax_info.php:92
 msgid "CONFIGURATION TYPE"
 msgstr "TIPO DI CONFIGURAZIONE"
 
-#: A2B_entity_sipiax_info.php:92
-#, fuzzy
+#: A2B_entity_sipiax_info.php:95
 msgid "IAX"
-msgstr "FAX"
+msgstr "IAX"
 
-#: A2B_entity_sipiax_info.php:93
+#: A2B_entity_sipiax_info.php:96
 msgid "SIP"
-msgstr ""
+msgstr "SIP"
 
-#: A2B_entity_sipiax_info.php:114
-#, fuzzy
+#: A2B_entity_sipiax_info.php:117
 msgid "Username"
-msgstr "Inserisci nuovo"
+msgstr "Nome utente"
 
-#: A2B_entity_sipiax_info.php:115 templates/default/index.tpl:58
+#: A2B_entity_sipiax_info.php:118
+#: templates/default/index.tpl:61
 msgid "Password"
-msgstr ""
+msgstr "Password"
 
-#: A2B_entity_sipiax_info.php:117
+#: A2B_entity_sipiax_info.php:120
 msgid "To configure your Asterisk server, copy and paste this into your "
-msgstr ""
+msgstr "Per configurare il server Asterisk, copia e incolla questo nel tuo "
 
-#: A2B_entity_sipiax_info.php:158
+#: A2B_entity_sipiax_info.php:165
 msgid "The peer is not defined, please contact your Administrator!"
-msgstr ""
+msgstr "Il peer non &egrave definito, contattare l'Amministratore!"
 
-#: signup_service.php:60
+#: signup_service.php:64
 msgid "SELECT THE SERVICE THAT YOU WANT SUBSCRIBE"
-msgstr ""
+msgstr "SELEZIONARE IL SERVIZIO DA SOTTOSCRIVERE"
 
-#: signup_service.php:70
-#, fuzzy
+#: signup_service.php:74
 msgid "SERVICE"
-msgstr "REGISTRATO"
+msgstr "SERVIZIO"
 
-#: signup_service.php:99
+#: signup_service.php:103
 msgid "SUBSCRIBE THIS SERVICE"
-msgstr ""
+msgstr "SOTTOSCRIVI QUESTO SERVIZIO"
 
-#: A2B_entity_speeddial.php:91
+#: A2B_entity_speeddial.php:92
 msgid "Enter the number which you wish to assign to the code here"
-msgstr "Digitare il numero di telefono da assegnare al codice Rubrica Veloce"
+msgstr "Inserire il telefono ed il nome da assegnare al Numero Breve"
 
-#: A2B_entity_speeddial.php:97
+#: A2B_entity_speeddial.php:98
 msgid "Speed Dial code"
-msgstr ""
+msgstr "Numero Breve"
 
-#: A2B_entity_speeddial.php:108 call-history.php:102 A2B_entity_did.php:413
+#: A2B_entity_speeddial.php:109
+#: call-history.php:133
+#: A2B_entity_did.php:415
 msgid "Destination"
 msgstr "Destinazione"
 
-#: A2B_entity_speeddial.php:110
+#: A2B_entity_speeddial.php:111
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
-#: A2B_entity_speeddial.php:114
+#: A2B_entity_speeddial.php:115
 msgid "ASSIGN NUMBER TO SPEEDDIAL"
-msgstr "ASSEGNA UN NUMERO A UNA VOCE DI RUBRICA VELOCE"
+msgstr "ASSEGNA UN NUMERO BREVE"
 
 #: checkout_process.php:284
 msgid "No Such Customer exists."
-msgstr ""
+msgstr "Tale Utente non esiste"
 
-#: checkout_process.php:378
-msgid "Refill ONLINE"
-msgstr ""
-
-#: checkout_process.php:435
+#: checkout_process.php:421
 msgid "Invoice Payment Ref: "
-msgstr ""
+msgstr "Rif. Pagamento Fattura"
 
-#: A2B_entity_callerid.php:93
+#: A2B_entity_callerid.php:98
 msgid "CALLER ID :"
-msgstr ""
+msgstr "ID CHIAMANTE"
 
-#: A2B_entity_callerid.php:97
+#: A2B_entity_callerid.php:102
 msgid "ADD NEW CALLERID"
-msgstr ""
+msgstr "AGGIUNGI NUOVO ID CHIAMANTE"
 
-#: A2B_entity_callerid.php:110
+#: A2B_entity_callerid.php:115
 msgid "You are not allowed to add more CallerID."
-msgstr ""
+msgstr "Non ti &egrave permesso aggiungere altri ID Chiamanti."
 
-#: A2B_entity_callerid.php:112
+#: A2B_entity_callerid.php:117
 msgid "Remove one if you are willing to use an other CallerID."
-msgstr ""
+msgstr "Rimuoverne uno per poter impostare un altro ID Chiamante."
 
-#: A2B_entity_callerid.php:114
+#: A2B_entity_callerid.php:119
 msgid "Max CallerId"
-msgstr ""
+msgstr "Massimi ID Chiamanti"
 
-#: checkout_payment.php:297
-#, fuzzy
+#: checkout_payment.php:306
 msgid "Please enter the order amount"
-msgstr " credito al tuo account!"
+msgstr "Inserire l'importo dell'ordine"
 
-#: checkout_payment.php:304
-#, fuzzy
+#: checkout_payment.php:313
 msgid "Total Amount"
-msgstr "COSTO TOTALE"
+msgstr "Importo Totale"
 
-#: userinfo.php:60
+#: userinfo.php:61
 msgid "Error loading your account information!"
-msgstr ""
+msgstr "Errore caricamento dati del tuo account!"
 
-#: userinfo.php:102
+#: userinfo.php:105
 msgid "LAST NAME"
 msgstr "COGNOME"
 
-#: userinfo.php:103
+#: userinfo.php:106
 msgid "FIRST NAME"
 msgstr "NOME"
 
-#: userinfo.php:106
+#: userinfo.php:109
 msgid "FAX"
 msgstr "FAX"
 
-#: userinfo.php:110
+#: userinfo.php:113
 msgid "ZIP CODE"
 msgstr "CODICE POSTALE"
 
-#: userinfo.php:112
+#: userinfo.php:115
 msgid "STATE"
 msgstr "REGIONE"
 
-#: userinfo.php:124
+#: userinfo.php:127
 msgid "EDIT PERSONAL INFORMATION"
-msgstr ""
+msgstr "MODIFICA IMPOSTAZIONI PERSONALI"
 
-#: userinfo.php:138
+#: userinfo.php:141
 msgid "CARD NUMBER"
-msgstr "NUMERO CARTA"
+msgstr "NUMERO SCHEDA"
 
-#: userinfo.php:142
+#: userinfo.php:145
 msgid "BALANCE REMAINING"
-msgstr "SALDO RESTANTE"
+msgstr "SALDO"
 
-#: userinfo.php:149
-#, fuzzy
+#: userinfo.php:152
 msgid "CALLING PACKAGE"
-msgstr "MINUTI CARTA"
+msgstr "PACCHETTO CHIAMATE"
 
-#: userinfo.php:155
-#, fuzzy
+#: userinfo.php:158
 msgid "PACKAGE MINUTES REMAINING"
-msgstr "SALDO RESTANTE"
+msgstr "RIMANENZA PACCHETO CHIAMATE"
 
-#: userinfo.php:157
-#, fuzzy
+#: userinfo.php:160
 msgid "PACKAGE MINUTES USED"
-msgstr "MINUTI USATI"
+msgstr "MINUTI USATI DEL PACCHETTO"
 
-#: userinfo.php:173
+#: userinfo.php:176
 msgid "Your subscription for an automique refill success"
-msgstr ""
+msgstr "L'abbonamento al servizio di ricarica automatica &egrave stato attivato"
 
-#: userinfo.php:176
+#: userinfo.php:179
 msgid "Your subscription for an automique refill faild"
-msgstr ""
+msgstr "L'abbonamento al servizio di ricarica automatica &egrave fallito"
 
-#: userinfo.php:193
-#, fuzzy
+#: userinfo.php:196
 msgid "Click below to buy credit : "
-msgstr "Fai click qui per acquistare"
+msgstr "Credito al lordo delle commissioni PayPal : "
 
-#: userinfo.php:225
+#: userinfo.php:229
 msgid "BUY NOW"
-msgstr ""
+msgstr "ACQUISTA ORA"
 
-#: userinfo.php:241
-#, fuzzy
+#: userinfo.php:245
 msgid "Click below to subscribe an automated refill : "
-msgstr "Fai click qui per acquistare"
+msgstr "Clicca sotto per sottoscrivere una ricarica automatica : "
 
-#: userinfo.php:248
+#: userinfo.php:252
 msgid "for each"
-msgstr ""
+msgstr "per ogni"
 
-#: userinfo.php:250
+#: userinfo.php:254
 msgid "Days"
-msgstr ""
+msgstr "Giorni"
 
-#: userinfo.php:253
-#, fuzzy
+#: userinfo.php:257
 msgid "Months"
-msgstr "Minuti"
+msgstr "Mesi"
 
-#: userinfo.php:255
-#, fuzzy
+#: userinfo.php:259
 msgid "Years"
-msgstr "Si"
+msgstr "Anni"
 
-#: userinfo.php:271
+#: userinfo.php:275
 msgid "Automated refill"
-msgstr ""
+msgstr "Ricarica automatica"
 
-#: userinfo.php:297
-#, fuzzy
+#: userinfo.php:301
 msgid "SUBSCRIPTION"
-msgstr "Destinazione"
+msgstr "SOTTOSCRIZIONE"
 
-#: CC_entity_edit_did_destination.php:530
+#: CC_entity_edit_did_destination.php:565
 msgid "Add a new "
-msgstr ""
+msgstr "aggiungi una nuova"
 
-#: CC_entity_edit_did_destination.php:1166
+#: CC_entity_edit_did_destination.php:1223
 msgid "Remove this DID DESTINATION"
-msgstr "Elimina questa Destinazione"
+msgstr "Elimina questa Destinazione DID"
 
-#: CC_entity_edit_did_destination.php:1181
+#: CC_entity_edit_did_destination.php:1238
 msgid "Deletion"
-msgstr ""
+msgstr "Cancellazione"
+
+#: call-history.php:58
+msgid "ERROR: Cannot download file "
+msgstr "ERRORE: il file non pu&ograve essere scaricato "
 
-#: call-history.php:84
-#, fuzzy
+#: call-history.php:115
 msgid "STANDARD"
-msgstr "REGIONE"
+msgstr "STANDARD"
 
-#: call-history.php:85
-#, fuzzy
+#: call-history.php:116
 msgid "SIP/IAX"
-msgstr "FAX"
+msgstr "SIP/IAX"
 
-#: call-history.php:86
-#, fuzzy
+#: call-history.php:117
 msgid "DIDCALL"
-msgstr "CHIAMATA"
+msgstr "CHIAMATA DID"
 
-#: call-history.php:87
+#: call-history.php:118
 msgid "DID_VOIP"
-msgstr ""
+msgstr "VOIP DID"
 
-#: call-history.php:88 templates/default/main.tpl:80
+#: call-history.php:119
+#: templates/default/main.tpl:78
 msgid "CALLBACK"
 msgstr "CALLBACK"
 
-#: call-history.php:89
-#, fuzzy
+#: call-history.php:120
 msgid "PREDICT"
-msgstr "CREDITO"
+msgstr "PREVISTO"
 
-#: call-history.php:90
+#: call-history.php:121
 msgid "AUTO DIALER"
-msgstr ""
+msgstr "AUTO COMPOSITORE"
 
-#: call-history.php:91
-#, fuzzy
+#: call-history.php:122
 msgid "DID-ALEG"
-msgstr "CHIAMATA"
+msgstr "ALLEG. DID"
 
-#: call-history.php:101
-#, fuzzy
+#: call-history.php:132
 msgid "PhoneNumber"
-msgstr "Aggiungi un nuovo numero di telefono alla tua Selezione Passante"
+msgstr "Numero Telefonico"
 
-#: call-history.php:103
+#: call-history.php:134
 msgid "Duration"
 msgstr "Durata"
 
-#: call-history.php:104
+#: call-history.php:135
 msgid "Terminate Cause"
-msgstr "Causa Terminazione"
+msgstr "Causa Termine"
 
-#: call-history.php:104
+#: call-history.php:135
 msgid "TC"
 msgstr "CT"
 
-#: call-history.php:105
-#, fuzzy
+#: call-history.php:136
 msgid "CallType"
 msgstr "Tipo chiamata"
 
-#: call-history.php:116
+#: call-history.php:154
 msgid "Call Logs"
 msgstr "Dettaglio Chiamate"
 
-#: call-history.php:289
-#, fuzzy
+#: call-history.php:337
 msgid "CALL TYPE"
-msgstr "STORICO CHIAMATE"
+msgstr "TIPO CHIAMATE"
 
-#: call-history.php:295
-#, fuzzy
+#: call-history.php:343
 msgid "ALL CALLS"
-msgstr "CHIAMATE"
+msgstr "TUTTE LE CHIAMATE"
 
-#: call-history.php:312
+#: call-history.php:360
 msgid "OPTIONS"
 msgstr "OPZIONI"
 
-#: call-history.php:317
+#: call-history.php:365
 msgid "SHOW"
 msgstr "MOSTRA"
 
-#: call-history.php:320
+#: call-history.php:368
 msgid "Answered Calls"
 msgstr "Chiamate Risposte"
 
-#: call-history.php:322
+#: call-history.php:370
 msgid "All Calls"
 msgstr "Tutte le Chiamate"
 
-#: call-history.php:329
+#: call-history.php:377
 msgid "RESULT"
-msgstr ""
+msgstr "RISULTATO"
 
-#: call-history.php:332
+#: call-history.php:380
 msgid "Seconds"
 msgstr "Secondi"
 
-#: call-history.php:337
+#: call-history.php:385
 msgid "CURRENCY"
 msgstr "VALUTA"
 
-#: call-history.php:367
+#: call-history.php:416
 msgid "Number of Calls"
 msgstr "Numero di chiamate"
 
-#: call-history.php:487
+#: call-history.php:538
 msgid "PREVIOUS"
 msgstr "Precedente"
 
-#: call-history.php:493
+#: call-history.php:544
 msgid "NEXT"
 msgstr "Seguente"
 
-#: call-history.php:525
+#: call-history.php:577
 msgid "SUMMARY"
 msgstr "SOMMARIO"
 
-#: call-history.php:537
+#: call-history.php:589
 msgid "CALLING CARD MINUTES"
-msgstr "MINUTI CARTA"
+msgstr "MINUTI SCHEDA"
 
-#: call-history.php:541
+#: call-history.php:593
 msgid "DURATION"
 msgstr "DURATA"
 
-#: call-history.php:542
+#: call-history.php:594
 msgid "GRAPHIC"
 msgstr "GRAFICO"
 
-#: call-history.php:543
+#: call-history.php:595
 msgid "CALLS"
 msgstr "CHIAMATE"
 
-#: call-history.php:544
+#: call-history.php:596
 msgid "AVERAGE LENGTH OF CALL"
 msgstr "TEMPO MEDIO DI CHIAMATA"
 
-#: call-history.php:544
+#: call-history.php:596
 msgid "ALOC"
 msgstr "TMDC"
 
-#: call-history.php:545
+#: call-history.php:597
 msgid "TOTAL COST"
 msgstr "COSTO TOTALE"
 
-#: call-history.php:594
+#: call-history.php:646
 msgid "TOTAL"
 msgstr "TOTALE"
 
-#: call-history.php:606
+#: call-history.php:658
 msgid "No calls in your selection"
-msgstr "Nessuna chiamata nella selezione corrente!"
+msgstr "Nessuna chiamata nella tua selezione"
 
-#: activate.php:42
+#: activate.php:43
 msgid "Sorry the activation has been sent already, please wait 1 minute before making any other try !"
-msgstr ""
+msgstr "Spieacenti l'attivazione $egrave gi&agrave stata inviata, attendere 1 minuto prima di farne un'altra !"
 
-#: activate.php:101
+#: activate.php:103
 msgid "Welcome! Your account has been successfully activated. Thank you!"
-msgstr ""
+msgstr "Benvenuti! Il tuo account &egrave stato creato. Grazie!"
 
-#: activate.php:103 signup_confirmation.php:114
+#: activate.php:105
+#: signup_confirmation.php:115
 msgid "Thank you for registering with us !"
-msgstr ""
+msgstr "Grazie per esserti registrato con noi !"
 
-#: activate.php:104 signup_confirmation.php:115
+#: activate.php:106
+#: signup_confirmation.php:116
 msgid "An email confirming your information has been sent to"
-msgstr ""
+msgstr "Una email di conferma informazioni ti &egrave stata inviata"
 
-#: activate.php:106 signup_confirmation.php:117
+#: activate.php:108
+#: signup_confirmation.php:118
 msgid "Your cardnumber is "
-msgstr ""
+msgstr "Il tuo numero scheda &egrave "
 
-#: activate.php:107 signup_confirmation.php:118
-#, fuzzy
+#: activate.php:109
+#: signup_confirmation.php:119
 msgid "To login to your account :"
-msgstr " credito al tuo account!"
+msgstr "Accedi al tuo account :"
 
-#: activate.php:108 signup_confirmation.php:119
+#: activate.php:110
+#: signup_confirmation.php:120
 msgid "Your card alias (login) is "
-msgstr ""
+msgstr "Il tuo alias (login) $egrave "
 
-#: activate.php:113
+#: activate.php:115
 msgid "Follow the link to access your account : "
-msgstr ""
+msgstr "Segui il link per accedere al tuo account : "
 
-#: activate.php:135
+#: activate.php:137
 msgid "Your account is already activated."
-msgstr ""
+msgstr "Il tuo account &egrave gi&agrave attivato."
 
-#: activate.php:139
+#: activate.php:141
 msgid "Your account cannot be activated please contact <br/> the website administrator or retry later."
-msgstr ""
+msgstr "Il tuo account non pu&ograve essere attivato <br/> si prega di contattare l'amministratore del sito o riprovare pi&ugrave tardi."
 
 #: templates/default/main.tpl:12
 msgid "ACCOUNT INFO"
-msgstr "INFORMAZIONI"
+msgstr "INFO ACCOUNT"
 
 #: templates/default/main.tpl:15
-#, fuzzy
 msgid "VOICEMAIL"
-msgstr "EMAIL"
+msgstr "VOICEMAIL"
 
 #: templates/default/main.tpl:19
 msgid "SIP/IAX INFO"
-msgstr ""
+msgstr "INFO SIP/IAX"
 
 #: templates/default/main.tpl:23
 msgid "CALL HISTORY"
 msgstr "STORICO CHIAMATE"
 
 #: templates/default/main.tpl:27
-#, fuzzy
 msgid "PAYMENT HISTORY"
-msgstr "STORICO CHIAMATE"
+msgstr "STORICO PAGAMENTI"
 
 #: templates/default/main.tpl:32
 msgid "VOUCHERS"
-msgstr "RICEVUTE"
+msgstr "COUPONS"
 
 #: templates/default/main.tpl:43
 msgid "INVOICES"
 msgstr "FATTURE"
 
-#: templates/default/main.tpl:53
+#: templates/default/main.tpl:52
 msgid "View Receipts"
-msgstr ""
+msgstr "Visualizza ricevute"
 
-#: templates/default/main.tpl:54
+#: templates/default/main.tpl:53
 msgid "View Invoices"
-msgstr ""
+msgstr "Visualizza fatture"
 
-#: templates/default/main.tpl:55
+#: templates/default/main.tpl:54
 msgid "Preview Next Billing"
-msgstr ""
+msgstr "Anteprima fatturazione successiva"
 
-#: templates/default/main.tpl:68
+#: templates/default/main.tpl:66
 msgid "SPEED DIAL"
-msgstr "RUBRICA VELOCE"
+msgstr "NUMERI BREVI"
 
-#: templates/default/main.tpl:76
+#: templates/default/main.tpl:74
 msgid "SIMULATOR"
-msgstr ""
+msgstr "SIMULATORE"
 
-#: templates/default/main.tpl:84
+#: templates/default/main.tpl:82
 msgid "ADD CALLER ID"
-msgstr ""
+msgstr "AGGIUNGI ID CHIAMANTE"
 
-#: templates/default/main.tpl:88
+#: templates/default/main.tpl:86
 msgid "PASSWORD"
-msgstr ""
+msgstr "PASSWORD"
 
-#: templates/default/main.tpl:92
+#: templates/default/main.tpl:90
 msgid "SUPPORT"
-msgstr ""
+msgstr "SUPPORTO"
 
-#: templates/default/main.tpl:96
-#, fuzzy
+#: templates/default/main.tpl:94
 msgid "NOTIFICATION"
-msgstr "Destinazione"
+msgstr "NOTIFICA"
 
-#: templates/default/main.tpl:106
+#: templates/default/main.tpl:104
 msgid "AUTO DIALLER"
-msgstr ""
+msgstr "AUTO COMPOSITORE"
 
-#: templates/default/main.tpl:115
+#: templates/default/main.tpl:113
 msgid "Campaign's"
-msgstr ""
+msgstr "Campagne"
 
-#: templates/default/main.tpl:118
+#: templates/default/main.tpl:116
 msgid "Import Phone List"
-msgstr ""
+msgstr "Importa Lista Telefoni"
 
-#: templates/default/main.tpl:128
+#: templates/default/main.tpl:126
 msgid "LOGOUT"
 msgstr "USCITA"
 
-#: templates/default/index.tpl:46
-#, fuzzy
+#: templates/default/index.tpl:49
 msgid "AUTHENTICATION"
-msgstr "Destinazione"
+msgstr "AUTENTICAZIONE"
 
-#: templates/default/index.tpl:54
+#: templates/default/index.tpl:57
 msgid "User"
-msgstr ""
+msgstr "Utente"
 
-#: templates/default/index.tpl:91
+#: templates/default/index.tpl:95
 msgid "Forgot your password ?"
-msgstr ""
+msgstr "Password dimenticata ?"
 
-#: templates/default/index.tpl:91 templates/default/index.tpl:94
+#: templates/default/index.tpl:95
+#: templates/default/index.tpl:98
 msgid "Click here"
-msgstr ""
+msgstr "Clicca qui"
 
-#: templates/default/index.tpl:94
+#: templates/default/index.tpl:98
 msgid "To sign up"
-msgstr ""
+msgstr "Per registrarsi"
 
-#: templates/default/index.tpl:103
+#: templates/default/index.tpl:107
 msgid "AUTHENTICATION REFUSED : please check your user/password!"
-msgstr ""
+msgstr "AUTENTICAZIONE RIFIUTATA : controlla utente/password!"
 
-#: templates/default/index.tpl:105
+#: templates/default/index.tpl:109
 msgid "INACTIVE ACCOUNT : Your account need to be activated!"
-msgstr ""
+msgstr "ACCOUNT NON ATTIVO : Il tuo account deve essere attivato!"
 
-#: templates/default/index.tpl:107
+#: templates/default/index.tpl:111
 msgid "BLOCKED ACCOUNT : Please contact the administrator!"
-msgstr ""
+msgstr "ACCOUNT BLOCCATO : Contattare l'amministratore!"
 
-#: templates/default/index.tpl:109
+#: templates/default/index.tpl:113
 msgid "NEW ACCOUNT : Your account has not been validate yet!"
-msgstr ""
+msgstr "NUOVO ACCOUNT : Il tuo account non &egrave stato ancora validato!"
 
-#: signup_confirmation.php:45
+#: signup_confirmation.php:46
 msgid "Sorry the confirmation email has been sent already, multi-signup are not authorized! Please wait 2 minutes before making any other signup!"
-msgstr ""
+msgstr "Spiacenti l'email di conferma è stata gi&agrave spedita, le multi-registrazioni non sono consentite! Si prega di attendere 2 minuti prima di fare qualsiasi altra registrazione!"
 
-#: signup_confirmation.php:50
+#: signup_confirmation.php:51
 msgid "Error : No User Created."
-msgstr ""
+msgstr "Errore : Utente non creato."
 
-#: signup_confirmation.php:69
+#: signup_confirmation.php:70
 msgid "Error : No email Template Found"
-msgstr ""
+msgstr "Errore : Nessun modello di email trovato "
 
-#: signup_confirmation.php:81
+#: signup_confirmation.php:82
 msgid "Error : No such user found in database"
-msgstr ""
+msgstr "Errore : Nessun utente trovato nel database"
 
-#: signup_confirmation.php:107
+#: signup_confirmation.php:108
 msgid "SIGNUP CONFIRMATION"
-msgstr ""
+msgstr "CONFERMA REGISTRAZIONE"
 
-#: signup_confirmation.php:111
+#: signup_confirmation.php:112
 msgid "thank you for registering with us!"
-msgstr ""
+msgstr "grazie per la tua registrazione con noi!"
 
-#: signup_confirmation.php:112
+#: signup_confirmation.php:113
 msgid "An activation email has been sent to"
-msgstr ""
+msgstr "Ti &egrave stata inviata un'email di attivazione"
 
-#: A2B_entity_did.php:96
+#: A2B_entity_did.php:82
 msgid "The following Destinaton-DID has been relesed:"
-msgstr ""
+msgstr "La seguente Destinazione DID &egrave stata rilasciata:"
 
-#: A2B_entity_did.php:122
+#: A2B_entity_did.php:108
 msgid "Error : Sending mail"
-msgstr ""
+msgstr "Errore : Invio posta"
 
-#: A2B_entity_did.php:140
+#: A2B_entity_did.php:126
 msgid "If you really want release this DID , Click on the release button."
-msgstr ""
+msgstr "Se davvero si vuole rilasciare questo DID, Clicca sul pulsante Rilascia."
 
-#: A2B_entity_did.php:147
+#: A2B_entity_did.php:133
 msgid "Release the DID "
-msgstr ""
+msgstr "Rilascia il DID"
 
-#: A2B_entity_did.php:196
+#: A2B_entity_did.php:183
 msgid "The following Destinaton for your DID has been added:"
-msgstr ""
+msgstr "La seguente Destinazione per il tuo DID &egrave stata aggiunta:"
 
-#: A2B_entity_did.php:355
+#: A2B_entity_did.php:360
 msgid "Buy New DID"
-msgstr "Acquista una nuova Selezione Passante"
+msgstr "Acquista Nuovo DID"
 
-#: A2B_entity_did.php:355
+#: A2B_entity_did.php:360
 msgid "Add Phone Number to your DID"
-msgstr "Aggiungi un nuovo numero di telefono alla tua Selezione Passante"
+msgstr "Aggiungi un Numero al tuo DID"
 
-#: A2B_entity_did.php:355
+#: A2B_entity_did.php:360
 msgid "Release DID"
-msgstr ""
+msgstr "Rilascia DID"
 
-#: A2B_entity_did.php:371
+#: A2B_entity_did.php:376
 msgid "Select Country"
-msgstr "Seleziona Paese"
+msgstr "Seleziona Nazione"
 
-#: A2B_entity_did.php:388
+#: A2B_entity_did.php:390
 msgid "Select Virtual Phone Number"
-msgstr ""
+msgstr "Seleziona Numero di Telefono Virtuale"
 
-#: A2B_entity_did.php:393
-#, fuzzy
+#: A2B_entity_did.php:395
 msgid "Monthly:"
-msgstr "Minuti"
+msgstr "Mensile:"
 
-#: A2B_entity_did.php:394
+#: A2B_entity_did.php:396
 msgid "B-Leg Connect:"
-msgstr ""
+msgstr "B-Leg Connessione:"
 
-#: A2B_entity_did.php:395
+#: A2B_entity_did.php:397
 msgid "B-Leg Rate:"
-msgstr ""
+msgstr "B-Leg Tariffa:"
 
-#: A2B_entity_did.php:396
+#: A2B_entity_did.php:398
 msgid "A-Leg Connect:"
-msgstr ""
+msgstr "A-Leg Connessione:"
 
-#: A2B_entity_did.php:397
+#: A2B_entity_did.php:399
 msgid "A-Leg Rate:"
-msgstr ""
+msgstr "A-Leg Tariffa:"
 
-#: A2B_entity_did.php:411
+#: A2B_entity_did.php:413
 msgid "VOIP CALL : "
-msgstr "Chiamata VoIP: "
+msgstr "CHIAMATA VOIP : "
 
-#: A2B_entity_did.php:411
+#: A2B_entity_did.php:413
 msgid "NO"
-msgstr "Non esiste"
+msgstr "NO"
 
-#: A2B_entity_did.php:416
+#: A2B_entity_did.php:418
 msgid "Enter the phone number you wish to call, or the SIP/IAX client to reach  (ie: 347894999 or SIP/jeremy@182.212.1.45). In order to call a VoIP number, you will need to enable voip_call"
-msgstr ""
+msgstr "Inserire il numero di telefono da chiamare, o il SIP / IAX client da raggiungere (es.: 347894999 o SIP / mario @ 182.212.1.45). Per chiamare un numero VoIP, sarà necessario attivare la chiamata voip"
 
-#: A2B_entity_did.php:420
+#: A2B_entity_did.php:422
 msgid "If you release the did you will not be monthly charged any more."
-msgstr ""
+msgstr "Se rilasci il DID non ci saranno pi$ugrave relativi addebiti mensili."
 
-#: A2B_entity_did.php:429
-#, fuzzy
+#: A2B_entity_did.php:431
 msgid "Add phone number"
-msgstr "Aggiungi un nuovo numero di telefono alla tua Selezione Passante"
+msgstr "Aggiungi un numero di telefono"
 
-#: A2B_entity_did.php:431 A2B_entity_did.php:457 A2B_entity_did.php:480
+#: A2B_entity_did.php:433
+#: A2B_entity_did.php:462
+#: A2B_entity_did.php:485
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
-#: A2B_entity_did.php:447
+#: A2B_entity_did.php:449
 msgid "Confirm the purchase of the DID "
-msgstr ""
+msgstr "Conferma acquisto DID"
 
-#: A2B_entity_did.php:452
+#: A2B_entity_did.php:454
 msgid "A monthly fee of "
-msgstr ""
+msgstr "Un canone mensile di "
 
-#: A2B_entity_did.php:452
-#, fuzzy
+#: A2B_entity_did.php:454
 msgid " will be carried out from your acount"
-msgstr " credito al tuo account!"
+msgstr " sar&agrave detratto dal tuo account"
 
-#: A2B_entity_did.php:468
+#: A2B_entity_did.php:473
 msgid "The purchase of the DID is done "
-msgstr ""
+msgstr "L'aquisto del DID &egrave fatto "
 
-#: A2B_entity_did.php:469
+#: A2B_entity_did.php:474
 msgid "The purchase of the DID cannot be done, the VoIP destination have to be a proper URI"
-msgstr ""
+msgstr "L'aquisto del DID non pu&ograve essere fatto, la destinazione VoIP deve essere un URI corretto"
 
-#: A2B_entity_did.php:470
+#: A2B_entity_did.php:475
 msgid "The purchase of the DID cannot be done, your credit of  "
-msgstr ""
+msgstr "L'aquisto del DID non pu&ograve essere fatto, il tuo credito di "
 
-#: A2B_entity_did.php:470
+#: A2B_entity_did.php:475
 msgid " is lower than Fixerate of the DID  "
-msgstr ""
+msgstr " &egrave meno della Tariffa fissa del DID "
 
-#: A2B_entity_did.php:470
-#, fuzzy
+#: A2B_entity_did.php:475
 msgid "Please reload your account "
-msgstr " credito al tuo account!"
+msgstr "Prego ricarica il tuo account "
 
-#: A2B_receipt_view.php:146
-#, fuzzy
+#: A2B_receipt_view.php:148
 msgid "RECEIPT"
-msgstr "CREDITO"
+msgstr "RICEVUTA"
 
-#: A2B_entity_voucher.php:65
+#: A2B_entity_voucher.php:68
 msgid "System Error : the currency table is incomplete!"
-msgstr ""
+msgstr "Errore di sistema : la tavola valute $egrave incompleta!"
 
-#: A2B_entity_voucher.php:74
-#, fuzzy
+#: A2B_entity_voucher.php:77
 msgid "The voucher"
 msgstr "La ricevuta"
 
-#: A2B_entity_voucher.php:74
+#: A2B_entity_voucher.php:77
 msgid "has been used, We added"
-msgstr "è stata processata, Abbiamo aggiunto"
+msgstr "&egrave stato usato, credito aggiunto"
 
-#: A2B_entity_voucher.php:74
+#: A2B_entity_voucher.php:77
 msgid "credit on your account!"
 msgstr " credito al tuo account!"
 
-#: A2B_entity_voucher.php:77
-#, fuzzy
+#: A2B_entity_voucher.php:80
 msgid "This voucher doesn't exist !"
-msgstr "Questa ricevuta non esiste!"
+msgstr "Questo coupon non esiste !"
 
-#: A2B_entity_voucher.php:80
+#: A2B_entity_voucher.php:83
 msgid "The voucher should be a number !"
-msgstr ""
+msgstr "Il copupon deve essere un numero !"
 
-#: A2B_entity_voucher.php:118
+#: A2B_entity_voucher.php:121
 msgid "USE VOUCHER"
-msgstr "UTILIZZA RICEVUTE"
-
-#~ msgid "Source"
-#~ msgstr "Origine"
-
-#~ msgid "Account/Phone"
-#~ msgstr "Account/Telefono"
-
-#~ msgid "SIP WEB-PHONE"
-#~ msgstr "SIP WEB-PHONE"
-
-#~ msgid "Click to start SIP WebPhone"
-#~ msgstr "Fai click per aprire il WebPhone SIP"
-
-#~ msgid "IAX WEB-PHONE"
-#~ msgstr "IAX WEB-PHONE"
-
-#~ msgid "NO IAX ACCOUNT"
-#~ msgstr "&nbsp;NESSUN ACCOUNT IAX&nbsp;"
-
-#~ msgid "START IAX PHONE"
-#~ msgstr "Fai click per aprire il WebPhone SIP"
-
-#, fuzzy
-#~ msgid "Deletion confirmation"
-#~ msgstr "Destinazione"
-
-#~ msgid "WEB-PHONE"
-#~ msgstr "TELEFONO WEB"
-
-#~ msgid "Call"
-#~ msgstr "Chiamata"
-
-#, fuzzy
-#~ msgid "Call Plan"
-#~ msgstr "Chiamata"
-
-#, fuzzy
-#~ msgid "Free minutes"
-#~ msgstr "Minuti"
-
-#~ msgid "Sorry, this page is in construction !"
-#~ msgstr "Spiacente, questa pagina è in costruzione!"
+msgstr "USA COUPON"
 
-#~ msgid "Here you can view your ratecards"
-#~ msgstr "Qui &egrave; possibile consultare le tariffe"
diff --git a/common/lib/COPYING b/common/lib/COPYING
old mode 100644
new mode 100755
diff --git a/common/lib/Class.A2Billing.php b/common/lib/Class.A2Billing.php
index 81b8f412a..5351d005b 100755
--- a/common/lib/Class.A2Billing.php
+++ b/common/lib/Class.A2Billing.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -133,6 +133,8 @@ class A2Billing
     public $uniqueid;
     public $accountcode;
     public $dnid;
+    public $orig_dnid;
+    public $orig_ext;
     public $extension;
 
     // from apply_rules, if a prefix is removed we keep it to track exactly what the user introduce
@@ -149,8 +151,8 @@ class A2Billing
     public $hostname = '';
     public $currency = 'usd';
 
-    public $groupe_mode = false;
-    public $groupe_id = '';
+    public $group_mode = false;
+    public $group_id = '';
     public $mode = '';
     public $timeout;
     public $newdestination;
@@ -205,6 +207,10 @@ class A2Billing
 
     public $callback_beep_to_enter_destination = False;
 
+    // custom CDR variables
+    public $CDR_CUSTOM_SQL = '';
+    public $CDR_CUSTOM_VAL = '';
+
     /**
     * CC_TESTING variables
     * for developer purpose, will replace some get_data inputs in order to test the application from shell
@@ -217,6 +223,12 @@ class A2Billing
     // List of dialstatus
     public $dialstatus_rev_list;
 
+    // Interrupt digit, if not empty - someone entered something during playing balance
+    public $interrupt_digit = '';
+
+    // Escape digits, @TODO: move to settings if will be needed
+    public $escape_digits = '0123456789ABCD#*';
+
     /* CONSTRUCTOR */
     public function A2Billing()
     {
@@ -254,12 +266,10 @@ public function Hangupsignal()
     public function debug($level, $agi, $file, $line, $buffer_debug)
     {
         $file = basename($file);
-
         // VERBOSE
         if ($this->agiconfig['verbosity_level'] >= $level && $agi) {
             $agi->verbose('file:' . $file . ' - line:' . $line . ' - uniqueid:' . $this->uniqueid . ' - ' . $buffer_debug);
         }
-
         // LOG INTO FILE
         if ($this->agiconfig['logging_level'] >= $level) {
             $this->write_log($buffer_debug, 1, "[file:$file - line:$line - uniqueid:" . $this->uniqueid . "]:");
@@ -271,12 +281,9 @@ public function debug($level, $agi, $file, $line, $buffer_debug)
     */
     public function write_log($output, $tobuffer = 1, $line_file_info = '')
     {
-        //$tobuffer = 0;
-
         if (strlen($this->log_file) > 1) {
             $string_log = "[" . date("d/m/Y H:i:s") . "]:" . $line_file_info . "[CallerID:" . $this->CallerID . "]:[CN:" . $this->cardnumber . "]:[$output]\n";
             if ($this->CC_TESTING) echo $string_log;
-
             $this->BUFFER .= $string_log;
             if (!$tobuffer || $this->CC_TESTING) {
                 error_log($this->BUFFER, 3, $this->log_file);
@@ -317,12 +324,6 @@ public function load_conf(&$agi, $config = NULL, $webui = 0, $idconfig = 1, $opt
             exit;
         }
 
-        /*  We don't need to do this twice.  load_conf_db() will do it
-        // If optconfig is specified, stuff vals and vars into 'a2billing' config array.
-        foreach ($optconfig as $var=>$val) {
-            $this->config["agi-conf$idconfig"][$var] = $val;
-        }*/
-
         // conf for the database connection
         if (!isset($this->config['database']['hostname'])) $this->config['database']['hostname'] = 'localhost';
         if (!isset($this->config['database']['port']))     $this->config['database']['port']     = '5432';
@@ -339,14 +340,11 @@ public function load_conf(&$agi, $config = NULL, $webui = 0, $idconfig = 1, $opt
     public function load_conf_db(&$agi, $config = NULL, $webui = 0, $idconfig = 1, $optconfig = array())
     {
         $this->idconfig = $idconfig;
-        // load config
         $config_table = new Table("cc_config", "config_key as cfgkey, config_value as cfgvalue, config_group_title as cfggname, config_valuetype as cfgtype");
         $this->DbConnect();
-
         $config_res = $config_table->Get_list($this->DBHandle, "");
         if (!$config_res) {
             echo 'Error : cannot load conf : load_conf_db';
-
             return false;
         }
 
@@ -584,12 +582,15 @@ public function load_conf_db(&$agi, $config = NULL, $webui = 0, $idconfig = 1, $
         if (isset($this->config["agi-conf$idconfig"]['debugshell']) && $this->config["agi-conf$idconfig"]['debugshell'] == 1 && isset($agi)) $agi->nlinetoread = 0;
 
         if (!isset($this->config["agi-conf$idconfig"]['ivr_voucher'])) $this->config["agi-conf$idconfig"]['ivr_voucher'] = 0;
-        if (!isset($this->config["agi-conf$idconfig"]['ivr_voucher_prefixe'])) $this->config["agi-conf$idconfig"]['ivr_voucher_prefixe'] = 8;
+        if (!isset($this->config["agi-conf$idconfig"]['ivr_voucher_prefix'])) $this->config["agi-conf$idconfig"]['ivr_voucher_prefix'] = 8;
         if (!isset($this->config["agi-conf$idconfig"]['jump_voucher_if_min_credit'])) $this->config["agi-conf$idconfig"]['jump_voucher_if_min_credit'] = 0;
         if (!isset($this->config["agi-conf$idconfig"]['failover_lc_prefix'])) $this->config["agi-conf$idconfig"]['failover_lc_prefix'] = 0;
         if (!isset($this->config["agi-conf$idconfig"]['cheat_on_announcement_time'])) $this->config["agi-conf$idconfig"]['cheat_on_announcement_time'] = 0;
         if (!isset($this->config["agi-conf$idconfig"]['busy_timeout'])) $this->config["agi-conf$idconfig"]['busy_timeout'] = 1;
         if (!isset($this->config["agi-conf$idconfig"]['lcr_mode'])) $this->config["agi-conf$idconfig"]['lcr_mode'] = 0;
+        if (!isset($this->config["agi-conf$idconfig"]['default_accountcode'])) $this->config["agi-conf$idconfig"]['default_accountcode'] = '';
+        if (!isset($this->config["agi-conf$idconfig"]['default_accountcode_all'])) $this->config["agi-conf$idconfig"]['default_accountcode_all'] = 0;
+        if (!isset($this->config["agi-conf$idconfig"]['force_rerouting'])) $this->config["agi-conf$idconfig"]['force_rerouting'] = 0;
 
         // Define the agiconfig property
         $this->agiconfig = $this->config["agi-conf$idconfig"];
@@ -613,7 +614,6 @@ public function conlog($str, $vbl = 1)
     {
         global $agi;
         static $busy = false;
-
         if ($this->agiconfig['debug'] != false) {
             if (!$busy) { // no conlogs inside conlog!!!
                 $busy = true;
@@ -630,7 +630,6 @@ public function play_menulanguage($agi)
     {
         // MENU LANGUAGE
         if ($this->agiconfig['play_menulanguage'] == 1) {
-
             $list_prompt_menulang = explode(':', $this->agiconfig['conf_order_menulang']);
             $i = 1;
             foreach ($list_prompt_menulang as $lg_value) {
@@ -644,25 +643,20 @@ public function play_menulanguage($agi)
             }
 
             $this->debug(DEBUG, $agi, __FILE__, __LINE__, "RES Menu Language DTMF : " . $res_dtmf["result"]);
-
             $this->languageselected = $res_dtmf["result"];
 
             if ($this->languageselected > 0 && $this->languageselected <= sizeof($list_prompt_menulang)) {
                 $language = $list_prompt_menulang[$this->languageselected - 1];
             } else {
-                if (strlen($this->agiconfig['force_language']) == 2) {
+                if (strlen($this->agiconfig['force_language']) > 0) {
                     $language = strtolower($this->agiconfig['force_language']);
                 } else {
                     $language = 'en';
                 }
-
             }
-
             $this->current_language = $language;
-
             $this->debug(DEBUG, $agi, __FILE__, __LINE__, " CURRENT LANGUAGE : " . $language);
 
-
             if ($this->agiconfig['asterisk_version'] == "1_2") {
                 $lg_var_set = 'LANGUAGE()';
             } else {
@@ -672,7 +666,7 @@ public function play_menulanguage($agi)
             $this->debug(INFO, $agi, __FILE__, __LINE__, "[SET $lg_var_set $language]");
             $this->languageselected = 1;
 
-        } elseif (strlen($this->agiconfig['force_language']) == 2) {
+        } elseif (strlen($this->agiconfig['force_language']) > 0) {
 
             $this->debug(DEBUG, $agi, __FILE__, __LINE__, "FORCE LANGUAGE : " . $this->agiconfig['force_language']);
             $this->languageselected = 1;
@@ -688,24 +682,80 @@ public function play_menulanguage($agi)
         }
     }
 
-
+    /*
+     * function sanitize_agi_data
+     */
+    public function sanitize_agi_data($input)
+    {
+        // Remove whitespaces (not a must though)
+        $input = trim($input);
+        $input = str_replace('--', '', $input);
+        $input = str_replace(';', '', $input);
+        $input = str_replace('/*', '', $input);
+        $input = str_replace('(', '', $input);
+        $input = str_replace('[', '', $input);
+        // Sql Injection
+        $input = str_ireplace('HAVING', '', $input);
+        $input = str_ireplace('UNION', '', $input);
+        $input = str_ireplace('SUBSTRING', '', $input);
+        $input = str_ireplace('INSERT', '', $input);
+        $input = str_ireplace('INTO', '', $input);
+        $input = str_ireplace('ASCII', '', $input);
+        $input = str_ireplace('SHA1', '', $input);
+        $input = str_ireplace('MD5', '', $input);
+        $input = str_ireplace('ROW_COUNT', '', $input);
+        $input = str_ireplace('CONCAT', '', $input);
+        $input = str_ireplace('WHERE', '', $input);
+        $input = str_ireplace('SELECT', '', $input);
+        $input = str_ireplace('UPDATE', '', $input);
+        $input = str_ireplace('DROP', '', $input);
+        $input = str_ireplace('DELETE', '', $input);
+        $input = str_ireplace('TRUE', '', $input);
+        $input = str_ireplace('FALSE', '', $input);
+
+        if (!(stripos($input, ' or 1') === FALSE)) {
+            return false;
+        }
+        if (!(stripos($input, ' or true') === FALSE)) {
+            return false;
+        }
+        if (strlen($input) >= 30) {
+            return false;
+        }
+        $input = addslashes($input);
+        return $input;
+    }
 
     /*
     * intialize evironement variables from the agi values
     */
     public function get_agi_request_parameter($agi)
     {
-        $this->CallerID    = $agi->request['agi_callerid'];
-        $this->channel     = $agi->request['agi_channel'];
-        $this->uniqueid    = $agi->request['agi_uniqueid'];
-        $this->accountcode = $agi->request['agi_accountcode'];
-        //$this->dnid      = $agi->request['agi_dnid'];
+        $A2B_CUSTOM1 = substr($agi->get_variable("A2B_CUSTOM1", true), 0, 20);
+        $A2B_CUSTOM2 = substr($agi->get_variable("A2B_CUSTOM2", true), 0, 20);
+        $A2B_CUSTOM1 = $this->sanitize_agi_data($A2B_CUSTOM1);
+        $A2B_CUSTOM2 = $this->sanitize_agi_data($A2B_CUSTOM2);
+
+        $this->CDR_CUSTOM_SQL = ", a2b_custom1, a2b_custom2";
+        $this->CDR_CUSTOM_VAL = ", '" . $A2B_CUSTOM1 . "', '" . $A2B_CUSTOM2 . "'";
+
+        $this->CallerID    = $this->sanitize_agi_data($agi->request['agi_callerid']);
+        $this->channel     = $this->sanitize_agi_data($agi->request['agi_channel']);
+        $this->uniqueid    = $this->sanitize_agi_data($agi->request['agi_uniqueid']);
+        $this->orig_dnid   = $this->sanitize_agi_data($agi->request['agi_dnid']);
+        $this->orig_ext    = $this->sanitize_agi_data($agi->request['agi_extension']);
         $extension         = str_replace("|", '', $agi->request['agi_extension']);
         $extension         = str_replace(",", '', $extension);
         $extension         = str_replace("(", '', $extension);
         $extension         = str_replace(")", '', $extension);
-        $this->dnid        = $agi->request['agi_extension'] ;
-
+        $this->dnid        = $this->sanitize_agi_data($agi->request['agi_extension']);
+        if ($this->agiconfig['default_accountcode_all'] && !empty($this->agiconfig['default_accountcode'])) {
+            $this->accountcode = $this->agiconfig['default_accountcode'];
+        } elseif (empty($agi->request['agi_accountcode']) && !empty($this->agiconfig['default_accountcode'])) {
+            $this->accountcode = $this->agiconfig['default_accountcode'];
+        } else {
+            $this->accountcode = $this->sanitize_agi_data($agi->request['agi_accountcode']);
+        }
         //Call function to find the cid number
         $this->isolate_cid();
 
@@ -811,14 +861,22 @@ public function callingcard_ivr_authorize($agi, &$RateEngine, $try_num, $call2di
             }
             $this->debug(DEBUG, $agi, __FILE__, __LINE__, "[USE_DNID DESTINATION ::> " . $this->destination . "]");
         } else {
-            if ($this->callback_beep_to_enter_destination) {
-                $res_dtmf = $agi->get_data('beep', 6000, 20);
+            if ($this->is_interrupted()) {
+                $this->debug(DEBUG, $agi, __FILE__, __LINE__, "[CONTINUE GATHERING DTMF ::> " . $this->interrupt_digit . "]");
+
+                $this->destination = $this->interrupt_digit;
+                $this->interrupt_digit = '';
+                $agi->fastpass_get_data($this->destination, null, 6000, 20);
             } else {
-                $res_dtmf = $agi->get_data($prompt_enter_dest, 6000, 20);
+                if ($this->callback_beep_to_enter_destination) {
+                    $res_dtmf = $agi->get_data('beep', 6000, 20);
+                } else {
+                    $res_dtmf = $agi->get_data($prompt_enter_dest, 6000, 20);
+                }
+                $this->destination = $res_dtmf["result"];
             }
 
-            $this->debug(DEBUG, $agi, __FILE__, __LINE__, "RES DTMF : " . $res_dtmf["result"]);
-            $this->destination = $res_dtmf["result"];
+            $this->debug(DEBUG, $agi, __FILE__, __LINE__, "RES DTMF : " . $this->destination);
         }
 
         //REDIAL FIND THE LAST DIALED NUMBER (STORED IN THE DATABASE)
@@ -827,6 +885,16 @@ public function callingcard_ivr_authorize($agi, &$RateEngine, $try_num, $call2di
             $this->debug(DEBUG, $agi, __FILE__, __LINE__, "[REDIAL : DTMF DESTINATION ::> " . $this->destination . "]");
         }
 
+        //REDIAL FIND THE LAST DIALED NUMBER (STORED IN THE DATABASE)
+        if (strlen($this->destination) <= 2 && is_numeric($this->destination) && $this->destination >= 0) {
+            $QUERY = "SELECT phone FROM cc_speeddial WHERE id_cc_card = '" . $this->id_card . "' AND speeddial = '" . $this->destination . "'";
+            $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY);
+            if (is_array($result)) {
+                $this->destination = $result[0][0];
+            }
+            $this->debug(INFO, $agi, __FILE__, __LINE__, "SPEEDIAL REPLACE DESTINATION ::> " . $this->destination);
+        }
+
         //Check if Account have restriction
         if ($this->restriction == 1 || $this->restriction == 2) {
 
@@ -860,14 +928,6 @@ public function callingcard_ivr_authorize($agi, &$RateEngine, $try_num, $call2di
             }
         }
 
-        //REDIAL FIND THE LAST DIALED NUMBER (STORED IN THE DATABASE)
-        if (strlen($this->destination) <= 2 && is_numeric($this->destination) && $this->destination >= 0) {
-            $QUERY = "SELECT phone FROM cc_speeddial WHERE id_cc_card = '" . $this->id_card . "' AND speeddial = '" . $this->destination . "'";
-            $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY);
-            if (is_array($result)) $this->destination = $result[0][0];
-            $this->debug(INFO, $agi, __FILE__, __LINE__, "SPEEDIAL REPLACE DESTINATION ::> " . $this->destination);
-        }
-
         // FOR TESTING : ENABLE THE DESTINATION NUMBER
         if ($this->CC_TESTING) $this->destination = "1800300200";
 
@@ -942,7 +1002,7 @@ public function callingcard_ivr_authorize($agi, &$RateEngine, $try_num, $call2di
                         }
                         if (($minutes > 0) || ($seconds == 0)) {
                             if ($minutes == 1) {
-                                if ((strtolower($this->current_language) == 'ru')) {
+                                if ((stripos($this->current_language, 'ru') === 0)) {
                                     $agi->stream_file('digits/1f', '#');
                                 } else {
                                     $agi->say_number($minutes);
@@ -950,7 +1010,7 @@ public function callingcard_ivr_authorize($agi, &$RateEngine, $try_num, $call2di
                                 $agi->stream_file('prepaid-minute', '#');
                             } else {
                                 $agi->say_number($minutes);
-                                if ((strtolower($this->current_language) == 'ru') && (($minutes % 10 == 2) || ($minutes % 10 == 3) || ($minutes % 10 == 4))) {
+                                if ((stripos($this->current_language, 'ru') === 0) && (($minutes % 10 == 2) || ($minutes % 10 == 3) || ($minutes % 10 == 4))) {
                                     // test for the specific grammatical rules in RUssian
                                     $agi->stream_file('prepaid-minute2', '#');
                                 } else {
@@ -961,7 +1021,7 @@ public function callingcard_ivr_authorize($agi, &$RateEngine, $try_num, $call2di
                         if ($seconds > 0) {
                                 if ($minutes > 0) $agi->stream_file('vm-and', '#');
                                 if ($seconds == 1) {
-                                        if ((strtolower($this->current_language) == 'ru')) {
+                                        if ((stripos($this->current_language, 'ru') === 0)) {
                                                 $agi->stream_file('digits/1f', '#');
                                         } else {
                                                 $agi->say_number($seconds);
@@ -969,7 +1029,7 @@ public function callingcard_ivr_authorize($agi, &$RateEngine, $try_num, $call2di
                                         $agi->stream_file('prepaid-second', '#');
                                 } else {
                                         $agi->say_number($seconds);
-                                        if ((strtolower($this->current_language) == 'ru') && (($seconds % 10 == 2) || ($seconds % 10 == 3) || ($seconds % 10 == 4))) {
+                                        if ((stripos($this->current_language, 'ru') === 0) && (($seconds % 10 == 2) || ($seconds % 10 == 3) || ($seconds % 10 == 4))) {
                                                 // test for the specific grammatical rules in RUssian
                                                 $agi->stream_file('prepaid-second2', '#');
                                         } else {
@@ -1006,6 +1066,7 @@ public function callingcard_ivr_authorize($agi, &$RateEngine, $try_num, $call2di
 
             // STRIP * FROM DESTINATION NUMBER
             $this->destination = str_replace('*', '', $this->destination);
+            $this->destination = str_replace('.', '', $this->destination);
 
             $this->save_redial_number($agi, $this->destination);
 
@@ -1155,7 +1216,7 @@ public function call_sip_iax_buddy($agi, &$RateEngine, $try_num)
                 $this->debug(INFO, $agi, __FILE__, __LINE__, "EXEC StopMixMonitor (" . $this->uniqueid . ")");
             }
 
-            $this->debug(INFO, $agi, __FILE__, __LINE__, "[" . $this->tech . " Friend][K=$k]:[ANSWEREDTIME=" . $answeredtime . "-DIALSTATUS=" . $dialstatus . "]");
+            $this->debug(INFO, $agi, __FILE__, __LINE__, "[" . $this->tech . " Friend]:[ANSWEREDTIME=" . $answeredtime . "-DIALSTATUS=" . $dialstatus . "]");
 
             //# Ooh, something actually happend!
             if ($dialstatus == "BUSY") {
@@ -1185,12 +1246,9 @@ public function call_sip_iax_buddy($agi, &$RateEngine, $try_num)
             }
 
             if ($answeredtime > 0) {
-                $this->debug(DEBUG, $agi, __FILE__, __LINE__, "[CC_RATE_ENGINE_UPDATESYSTEM: usedratecard K=$K - (answeredtime=$answeredtime :: dialstatus=$dialstatus :: cost=$cost)]");
-                $QUERY = "INSERT INTO cc_call (uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, calledstation, " .
-                    " terminatecauseid, stoptime, sessionbill, id_tariffplan, id_ratecard, id_trunk, src, sipiax) VALUES " .
-                    "('" . $this->uniqueid . "', '" . $this->channel . "', '" . $this->id_card . "', '" . $this->hostname . "',";
-                $QUERY .= " CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND ";
-                $QUERY .= ", '$answeredtime', '" . $card_alias . "', '$terminatecauseid', now(), '0', '0', '0', '0', '$this->CallerID', '1' )";
+                $this->debug(DEBUG, $agi, __FILE__, __LINE__, "[CC_RATE_ENGINE_UPDATESYSTEM: (answeredtime=$answeredtime :: dialstatus=$dialstatus :: cost=$cost)]");
+
+                $QUERY = "INSERT INTO cc_call (uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, calledstation, terminatecauseid, stoptime, sessionbill, id_tariffplan, id_ratecard, id_trunk, src, sipiax $this->CDR_CUSTOM_SQL) VALUES ('" . $this->uniqueid . "', '" . $this->channel . "', '" . $this->id_card . "', '" . $this->hostname . "', CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND, '$answeredtime', '" . $card_alias . "', '$terminatecauseid', now(), '0', '0', '0', '0', '$this->CallerID', '1' $this->CDR_CUSTOM_VAL)";
 
                 $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY, 0);
 
@@ -1200,21 +1258,17 @@ public function call_sip_iax_buddy($agi, &$RateEngine, $try_num)
 
         if ($this->voicemail) {
 
-            if (($dialstatus == "CHANUNAVAIL") ||
-                ($dialstatus == "CONGESTION") ||
-                ($dialstatus == "NOANSWER")) {
+            if (($dialstatus == "CHANUNAVAIL") || ($dialstatus == "CONGESTION") || ($dialstatus == "NOANSWER")) {
                 // The following section will send the caller to VoiceMail
                 // with the unavailable priority.
                 $this->debug(INFO, $agi, __FILE__, __LINE__, "[STATUS] CHANNEL UNAVAILABLE - GOTO VOICEMAIL ($dest_username)");
-
                 $vm_parameters = $this->format_parameters($dest_username . '|u');
                 $agi->exec(VoiceMail, $vm_parameters);
             }
 
             if (($dialstatus == "BUSY")) {
                 // The following section will send the caller to VoiceMail with the busy priority.
-                $this->debug(INFO, $agi, __FILE__, __LINE__, "[STATUS] CHANNEL BUSY - GOTO VOICEMAIL ($dest_username)");
-
+                $this->debug(INFO, $agi, __FILE__, __LINE__, "[STATUS] CHANNEL BUSY - GO VOICEMAIL ($dest_username)");
                 $vm_parameters = $this->format_parameters($dest_username . '|b');
                 $agi->exec(VoiceMail, $vm_parameters);
             }
@@ -1344,10 +1398,8 @@ public function call_did($agi, &$RateEngine, $listdestination)
                         }
 
                         $QUERY = "INSERT INTO cc_call (uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, calledstation, " .
-                            " terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, id_trunk, src, sipiax) VALUES " .
-                            "('" . $this->uniqueid . "', '" . $this->channel . "', '" . $this->id_card . "', '" . $this->hostname . "',";
-                        $QUERY .= " CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND ";
-                        $QUERY .= ", '$answeredtime', '" . $inst_listdestination[4] . "', '$terminatecauseid', now(), '0', '0', '0', '0', '0', '$this->CallerID', '3' )";
+                            " terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, id_trunk, src, sipiax $this->CDR_CUSTOM_SQL) VALUES " .
+                            "('" . $this->uniqueid . "', '" . $this->channel . "', '" . $this->id_card . "', '" . $this->hostname . "', CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND, '$answeredtime', '" . $inst_listdestination[4] . "', '$terminatecauseid', now(), '0', '0', '0', '0', '0', '$this->CallerID', '3' $this->CDR_CUSTOM_VAL)";
 
                         $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY, 0);
                         $this->debug(INFO, $agi, __FILE__, __LINE__, "[DID CALL - LOG CC_CALL: SQL: $QUERY]:[result:$result]");
@@ -1610,11 +1662,7 @@ public function call_2did($agi, &$RateEngine, $listdestination)
                         //CALL2DID CDR is free
 
                         /* CDR A-LEG OF DID CALL */
-                        $QUERY = "INSERT INTO cc_call (uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, calledstation, " .
-                                " terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, id_trunk, src, sipiax) VALUES " .
-                                "('" . $this->uniqueid . "', '" . $this->channel . "', '" . $my_id_card . "', '" . $this->hostname . "',";
-                        $QUERY .= " CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND ";
-                        $QUERY .= ", '$answeredtime', '" . $inst_listdestination[10] . "', '$terminatecauseid', now(), '0', '0', '0', '0', '0', '$this->CallerID', '3' )";
+                        $QUERY = "INSERT INTO cc_call (uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, calledstation, terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, id_trunk, src, sipiax $this->CDR_CUSTOM_SQL) VALUES ('" . $this->uniqueid . "', '" . $this->channel . "', '" . $my_id_card . "', '" . $this->hostname . "', CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND, '$answeredtime', '" . $inst_listdestination[10] . "', '$terminatecauseid', now(), '0', '0', '0', '0', '0', '$this->CallerID', '3' $this->CDR_CUSTOM_VAL)";
 
                         $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY, 0);
                         $this->debug(INFO, $agi, __FILE__, __LINE__, "[DID CALL - LOG CC_CALL: SQL: $QUERY]:[result:$result]");
@@ -1625,11 +1673,7 @@ public function call_2did($agi, &$RateEngine, $listdestination)
                         $cost = ($answeredtime/60) * abs($selling_rate) + abs($connection_charge);
 
                         /* CDR A-LEG OF DID CALL */
-                        $QUERY = "INSERT INTO cc_call (uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, calledstation, " .
-                                " terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, id_trunk, src, sipiax) VALUES " .
-                                "('" . $this->uniqueid . "', '" . $this->channel . "', '" . $my_id_card . "', '" . $this->hostname . "',";
-                        $QUERY .= " CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND ";
-                        $QUERY .= ", '$answeredtime', '". $listdestination[0][10] . "', '$terminatecauseid', now(), '$cost', '0', '0', '0', '0', '$this->CallerID', '3' )";
+                        $QUERY = "INSERT INTO cc_call (uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, calledstation, terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, id_trunk, src, sipiax $this->CDR_CUSTOM_SQL) VALUES ('" . $this->uniqueid . "', '" . $this->channel . "', '" . $my_id_card . "', '" . $this->hostname . "', CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND, '$answeredtime', '". $listdestination[0][10] . "', '$terminatecauseid', now(), '$cost', '0', '0', '0', '0', '$this->CallerID', '3' $this->CDR_CUSTOM_VAL)";
 
                         $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY, 0);
                         $this->debug(INFO, $agi, __FILE__, __LINE__, "[DID CALL - LOG CC_CALL: SQL: $QUERY]:[result:$result]");
@@ -1721,26 +1765,17 @@ public function call_2did($agi, &$RateEngine, $listdestination)
                         //CALL2DID CDR is free
 
                         /* CDR A-LEG OF DID CALL */
-                        $QUERY = "INSERT INTO cc_call (uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, calledstation, " .
-                                " terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, id_trunk, src, sipiax) VALUES " .
-                                "('" . $this->uniqueid . "', '" . $this->channel . "', '" . $my_id_card . "', '" . $this->hostname . "',";
-                        $QUERY .= " CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND ";
-                        $QUERY .= ", '$answeredtime', '" . $inst_listdestination[10] . "', '$terminatecauseid', now(), '0', '0', '0', '0', '0', '$this->CallerID', '3' )";
+                        $QUERY = "INSERT INTO cc_call (uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, calledstation, terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, id_trunk, src, sipiax $this->CDR_CUSTOM_SQL) VALUES ('" . $this->uniqueid . "', '" . $this->channel . "', '" . $my_id_card . "', '" . $this->hostname . "', CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND, '$answeredtime', '" . $inst_listdestination[10] . "', '$terminatecauseid', now(), '0', '0', '0', '0', '0', '$this->CallerID', '3' $this->CDR_CUSTOM_VAL)";
 
                         $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY, 0);
                         $this->debug(INFO, $agi, __FILE__, __LINE__, "[DID CALL - LOG CC_CALL: SQL: $QUERY]:[result:$result]");
 
                     } else {
-
                         //CALL2DID CDR is not free
                         $cost = ($answeredtime/60) * abs($selling_rate) + abs($connection_charge);
 
                         /* CDR A-LEG OF DID CALL */
-                        $QUERY = "INSERT INTO cc_call (uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, calledstation, " .
-                                " terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, id_trunk, src, sipiax) VALUES " .
-                                "('" . $this->uniqueid . "', '" . $this->channel . "', '" . $my_id_card . "', '" . $this->hostname . "',";
-                        $QUERY .= " CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND ";
-                        $QUERY .= ", '$answeredtime', '". $listdestination[0][10] . "', '$terminatecauseid', now(), '$cost', '0', '0', '0', '0', '$this->CallerID', '3' )";
+                        $QUERY = "INSERT INTO cc_call (uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, calledstation, terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, id_trunk, src, sipiax $this->CDR_CUSTOM_SQL) VALUES " . "('" . $this->uniqueid . "', '" . $this->channel . "', '" . $my_id_card . "', '" . $this->hostname . "', CURRENT_TIMESTAMP - INTERVAL $answeredtime SECOND, '$answeredtime', '". $listdestination[0][10] . "', '$terminatecauseid', now(), '$cost', '0', '0', '0', '0', '$this->CallerID', '3' $this->CDR_CUSTOM_VAL)";
 
                         $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY, 0);
                         $this->debug(INFO, $agi, __FILE__, __LINE__, "[DID CALL - LOG CC_CALL: SQL: $QUERY]:[result:$result]");
@@ -1880,11 +1915,9 @@ public function bill_did_aleg($agi, $inst_listdestination, $b_leg_answeredtime =
             $aleg_retail_cost += $aleg_retail_connect_charge;
             $aleg_retail_cost += ($aleg_retail_callduration / 60) * $aleg_retail_cost_min;
 
-            $QUERY_COLUMN = " uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, real_sessiontime, calledstation, " .
-                            " terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, " .
-                            " id_trunk, src, sipiax, buycost, dnid";
+            $QUERY_COLUMN = " uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, real_sessiontime, calledstation, terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, id_trunk, src, sipiax, buycost, dnid";
             $calltype = '7'; // DID-ALEG
-            $QUERY = "INSERT INTO cc_call ($QUERY_COLUMN) VALUES (" .
+            $QUERY = "INSERT INTO cc_call ($QUERY_COLUMN $this->CDR_CUSTOM_SQL) VALUES (" .
                         "'" . $this->uniqueid . "', " .
                         "'" . $this->channel . "'," .
                         "'" . $this->id_card . "'," .
@@ -1904,7 +1937,7 @@ public function bill_did_aleg($agi, $inst_listdestination, $b_leg_answeredtime =
                         "'$calltype', " .
                         "'$aleg_carrier_cost', " .
                         "'" . $this->dnid . "'" .
-                        ")";
+                        "$this->CDR_CUSTOM_VAL)";
 
             $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY, 0);
             $this->debug(INFO, $agi, __FILE__, __LINE__, "[DID CALL - LOG CC_CALL: SQL: $QUERY]:[result:$result]");
@@ -1921,12 +1954,10 @@ public function bill_did_aleg($agi, $inst_listdestination, $b_leg_answeredtime =
             $terminatecauseid = 1; // ANSWERED
             $aleg_carrier_cost = 0;
 
-            $QUERY_COLUMN = " uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, real_sessiontime, calledstation, " .
-                            " terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, " .
-                            " id_trunk, src, sipiax, buycost, dnid";
+            $QUERY_COLUMN = " uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, real_sessiontime, calledstation, terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard,  id_trunk, src, sipiax, buycost, dnid";
 
             $calltype = '7'; // DID-ALEG
-            $QUERY = "INSERT INTO cc_call ($QUERY_COLUMN) VALUES (" .
+            $QUERY = "INSERT INTO cc_call ($QUERY_COLUMN $this->CDR_CUSTOM_SQL) VALUES (" .
                         "'" . $this->uniqueid . "', " .
                         "'" . $this->channel . "'," .
                         "'" . $this->id_card . "'," .
@@ -1946,7 +1977,7 @@ public function bill_did_aleg($agi, $inst_listdestination, $b_leg_answeredtime =
                         "'$calltype', " .
                         "'$aleg_carrier_cost', " .
                         "'" . $this->dnid . "'" .
-                        ")";
+                        "$this->CDR_CUSTOM_VAL )";
 
             $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY, 0);
             $this->debug(INFO, $agi, __FILE__, __LINE__, "[DID CALL ZERO - LOG CC_CALL: SQL: $QUERY]:[result:$result]");
@@ -1959,7 +1990,7 @@ public function fct_say_time_2_call($agi, $timeout, $rate = 0)
         // set destination and timeout
         // say 'you have x minutes and x seconds'
         $minutes = intval($timeout / 60);
-        $seconds = $timeout % 60;
+        $seconds = $timeout % 60; $seconds = 0;
 
         $this->debug(DEBUG, $agi, __FILE__, __LINE__, "TIMEOUT::> " . $this->timeout . " : minutes=$minutes - seconds=$seconds");
         if (!($minutes > 0) && !($seconds > 10)) {
@@ -1976,7 +2007,7 @@ public function fct_say_time_2_call($agi, $timeout, $rate = 0)
             $agi->stream_file('prepaid-you-have', '#');
             if ($minutes > 0) {
                 if ($minutes == 1) {
-                    if ((strtolower($this->current_language) == 'ru')) {
+                    if ((stripos($this->current_language, 'ru') === 0)) {
                     $agi->stream_file('digits/1f', '#');
                     } else {
                         $agi->say_number($minutes);
@@ -1984,7 +2015,7 @@ public function fct_say_time_2_call($agi, $timeout, $rate = 0)
                     $agi->stream_file('prepaid-minute', '#');
                 } else {
                     $agi->say_number($minutes);
-                    if ((strtolower($this->current_language) == 'ru') && (($minutes % 10 == 2) || ($minutes % 10 == 3) || ($minutes % 10 == 4))) {
+                    if ((stripos($this->current_language, 'ru') === 0) && (($minutes % 10 == 2) || ($minutes % 10 == 3) || ($minutes % 10 == 4))) {
                         // test for the specific grammatical rules in RUssian
                         $agi->stream_file('prepaid-minute2', '#');
                     } else {
@@ -1997,7 +2028,7 @@ public function fct_say_time_2_call($agi, $timeout, $rate = 0)
                     $agi->stream_file('vm-and', '#');
                 }
                 if ($seconds == 1) {
-                    if ((strtolower($this->current_language) == 'ru')) {
+                    if ((stripos($this->current_language, 'ru') === 0)) {
                         $agi->stream_file('digits/1f', '#');
                     } else {
                         $agi->say_number($seconds);
@@ -2005,7 +2036,7 @@ public function fct_say_time_2_call($agi, $timeout, $rate = 0)
                     }
                 } else {
                     $agi->say_number($seconds);
-                    if ((strtolower($this->current_language) == 'ru') && (($seconds % 10 == 2) || ($seconds % 10 == 3) || ($seconds % 10 == 4))) {
+                    if ((stripos($this->current_language, 'ru') === 0) && (($seconds % 10 == 2) || ($seconds % 10 == 3) || ($seconds % 10 == 4))) {
                         // test for the specific grammatical rules in RUssian
                         $agi->stream_file('prepaid-second2', '#');
                     } else {
@@ -2040,9 +2071,9 @@ public function fct_say_balance($agi, $credit, $fromvoucher = 0)
         }
 
         $credit_cur = $credit / $mycur;
-        list($units, $cents) = preg_split('/[.]/', sprintf('%01.2f', $credit_cur));
+        list($units, $cents) = preg_split('/[.]/', $this->round_customer_balance($credit_cur));
 
-        $this->debug(DEBUG, $agi, __FILE__, __LINE__, "[BEFORE: $credit_cur SPRINTF : " . sprintf('%01.2f', $credit_cur) . "]");
+        $this->debug(DEBUG, $agi, __FILE__, __LINE__, "[BEFORE: $credit_cur AFTER: " . $this->round_customer_balance($credit_cur) . "]");
 
         if (isset($this->agiconfig['currency_association_internal'][strtolower($this->currency)])) {
             $units_audio = $this->agiconfig['currency_association_internal'][strtolower($this->currency)];
@@ -2069,63 +2100,161 @@ public function fct_say_balance($agi, $credit, $fromvoucher = 0)
 
         // say 'you have x dollars and x cents'
         if ($fromvoucher != 1)
-            $agi->stream_file('prepaid-you-have', '#');
+            $interrupt = $agi->stream_file('prepaid-you-have', $this->escape_digits);
         else
-            $agi->stream_file('prepaid-account_refill', '#');
+            $interrupt = $agi->stream_file('prepaid-account_refill', $this->escape_digits);
+
+        if ($this->is_interrupted($interrupt))
+            return;
 
         if ($units == 0 && $cents == 0) {
-            $agi->say_number(0);
-            if (($this->current_language == 'ru') && (strtolower($this->currency) == 'usd')) {
-                $agi->stream_file($units_audio, '#');
+            $interrupt = $agi->say_number(0);
+            if ($this->is_interrupted($interrupt))
+                return;
+
+            if ((stripos($this->current_language, 'ru') === 0) && (strtolower($this->currency) == 'usd')) {
+                $interrupt = $agi->stream_file($units_audio, $this->escape_digits);
             } else {
-                $agi->stream_file($unit_audio, '#');
+                $interrupt = $agi->stream_file($unit_audio, $this->escape_digits);
             }
+
+            if ($this->is_interrupted($interrupt))
+                return;
         } else {
             if ($units > 1) {
-                $agi->say_number($units);
+                $interrupt = $agi->say_number($units, $this->escape_digits);
+                if ($this->is_interrupted($interrupt))
+                    return;
 
-                if (($this->current_language == 'ru') && (strtolower($this->currency) == 'usd') && (($units % 10 == 0) || ($units % 10 == 2) || ($units % 10 == 3) || ($units % 10 == 4))) {
+                if ((stripos($this->current_language, 'ru') === 0) && (strtolower($this->currency) == 'usd') && (($units % 10 == 0) || ($units % 10 == 2) || ($units % 10 == 3) || ($units % 10 == 4))) {
                     // test for the specific grammatical rules in Russian
-                    $agi->stream_file('dollar2', '#');
-                } elseif (($this->current_language == 'ru') && (strtolower($this->currency) == 'usd') && ($units % 10 == 1)) {
+                    $interrupt = $agi->stream_file('dollar2', $this->escape_digits);
+                } elseif ((stripos($this->current_language, 'ru') === 0) && (strtolower($this->currency) == 'usd') && ($units % 10 == 1)) {
                     // test for the specific grammatical rules in Russian
-                    $agi->stream_file($unit_audio, '#');
+                    $interrupt = $agi->stream_file($unit_audio, $this->escape_digits);
                 } else {
-                    $agi->stream_file($units_audio, '#');
+                    $interrupt = $agi->stream_file($units_audio, $this->escape_digits);
                 }
             } else {
-                $agi->say_number($units);
+                $interrupt = $agi->say_number($units);
+                if ($this->is_interrupted($interrupt))
+                    return;
 
-                if (($this->current_language == 'ru') && (strtolower($this->currency) == 'usd') && ($units == 0)) {
-                    $agi->stream_file($units_audio, '#');
+                if ((stripos($this->current_language, 'ru') === 0) && (strtolower($this->currency) == 'usd') && ($units == 0)) {
+                    $interrupt = $agi->stream_file($units_audio, $this->escape_digits);
                 } else {
-                    $agi->stream_file($unit_audio, '#');
+                    $interrupt = $agi->stream_file($unit_audio, $this->escape_digits);
                 }
             }
 
+            if ($this->is_interrupted($interrupt))
+                return;
+
             if ($units > 0 && $cents > 0) {
-                $agi->stream_file('vm-and', '#');
+                $interrupt = $agi->stream_file('vm-and', $this->escape_digits);
+                if ($this->is_interrupted($interrupt))
+                    return;
             }
             if ($cents > 0) {
-                $agi->say_number($cents);
+                $interrupt = $agi->say_number($cents);
+                if ($this->is_interrupted($interrupt))
+                    return;
+
                 if ($cents > 1) {
-                    if ((strtolower($this->currency) == 'usd') && ($this->current_language == 'ru') && (($cents % 10 == 2) || ($cents % 10 == 3) || ($cents % 10 == 4))) {
+                    if ((strtolower($this->currency) == 'usd') && (stripos($this->current_language, 'ru') === 0) && (($cents % 10 == 2) || ($cents % 10 == 3) || ($cents % 10 == 4))) {
                         // test for the specific grammatical rules in RUssian
-                        $agi->stream_file('prepaid-cent2', '#');
-                    } elseif ((strtolower($this->currency) == 'usd') && ($this->current_language == 'ru') && ($cents % 10 == 1)) {
+                        $interrupt = $agi->stream_file('prepaid-cent2', $this->escape_digits);
+                    } elseif ((strtolower($this->currency) == 'usd') && (stripos($this->current_language, 'ru') === 0) && ($cents % 10 == 1)) {
                         // test for the specific grammatical rules in RUssian
-                        $agi->stream_file($cent_audio, '#');
+                        $interrupt = $agi->stream_file($cent_audio, $this->escape_digits);
                     } else {
-                        $agi->stream_file($cents_audio, '#');
+                        $interrupt = $agi->stream_file($cents_audio, $this->escape_digits);
                     }
                 } else {
-                    $agi->stream_file($cent_audio, '#');
+                    $interrupt = $agi->stream_file($cent_audio, $this->escape_digits);
                 }
-
+                if ($this->is_interrupted($interrupt))
+                    return;
             }
         }
     }
 
+    /**
+     * Function to check entered digit during playing audio
+     *
+     * @param array|null $data data from "say number", "say digits", "stream file"
+     * @return boolean
+     */
+    protected function is_interrupted($data = null) {
+        if (is_array($data) && isset($data['result']) && !empty($data['result'])) {
+            $this->interrupt_digit = chr($data['result']);
+        }
+        return strlen($this->interrupt_digit) > 0;
+    }
+
+    /**
+     * Check if card group is allowed in the AGI config (param "allowed_groups")
+     *
+     * @param integer $group_id
+     * @return boolean
+     */
+    public function is_group_allowed($group_id) {
+        $result = true;
+        if (!empty($group_id) && is_array($this->agiconfig) && !empty($this->agiconfig['allowed_groups'])) {
+            $result = in_array($group_id, explode(',', preg_replace('/[^\d\,]/', '', $this->agiconfig['allowed_groups'])));
+        }
+        return $result;
+    }
+
+    /**
+     * Round balance for customer based on global setting (param "customer_balance_precision")
+     *
+     * @param float $balance
+     * @return string
+     */
+    public function round_customer_balance($balance) {
+        $precision = isset($this->config['global']['customer_balance_precision']) ? intval($this->config['global']['customer_balance_precision']) : 2;
+        if ($precision <= 0) {
+            $balance = floor($balance);
+        }
+        return number_format($balance, $precision, '.', '');
+    }
+
+    /**
+     * Add auth failure log
+     *
+     * @param string $reason Optional
+     */
+    public function log_auth_failure($reason = '') {
+        $cid = !empty($this->CallerID) ? $this->DBHandle->escape($this->CallerID) : '';
+        $reason = !empty($reason) ? $this->DBHandle->escape($reason) : '';
+        $params = array();
+        foreach (array('cardnumber', 'CallerID', 'mode', 'useralias', 'username', 'id_card', 'idconfig', 'accountcode', 'dnid', 'cardholder_lastname', 'cardholder_firstname', 'cardholder_email') as $param)
+            $params[] = $param . ' = ' . $this->$param;
+        $dump = $this->DBHandle->escape(implode("\r\n", $params));
+
+        // try to detect customer
+        $id_card = 0;
+        if (!empty($this->id_card)) { // possibly we have a card id
+            $id_card = $this->id_card;
+        } else if (!empty($this->username)) { // try to find possible customer by username
+            $sql = "select id from cc_card where username = '{$this->username}' limit 1";
+            $result = $this->instance_table->SQLExec($this->DBHandle, $sql);
+            if (is_array($result) && count($result)) {
+                $id_card = $result[0][0];
+            }
+        } else if (!empty($this->CallerID)) { // try to find possible customer by caller ID
+            $sql = "select id_cc_card from cc_callerid where cid = '{$this->CallerID}' limit 1";
+            $result = $this->instance_table->SQLExec($this->DBHandle, $sql);
+            if (is_array($result) && count($result)) {
+                $id_card = $result[0][0];
+            }
+        }
+
+        // adding log
+        $sql = "insert into cc_auth_failures_log (cid, reason, dump, id_card) values ('$cid', '$reason', '$dump', '$id_card')";
+        $this->instance_table->SQLExec($this->DBHandle, $sql);
+    }
 
     /**
     *  Function to play the initial rate
@@ -2149,7 +2278,7 @@ public function fct_say_rate($agi, $rate)
         $credit_cur = $rate / $mycur;
 
         list($units, $cents) = preg_split('/[.]/', $credit_cur);
-        if (substr($cents, 2) > 0) $point = substr($cents, 2);
+        if (substr($cents, 2) > 0) $point = substr($cents, 2, 1);
         if (strlen($cents) > 2) $cents = substr($cents, 0, 2);
         if ($units == '') $units = 0;
         if ($cents == '') $cents = 0;
@@ -2177,10 +2306,10 @@ public function fct_say_rate($agi, $rate)
             if ($units >= 1) {
                 $agi->say_number($units);
 
-                if (($this->current_language == 'ru') && (strtolower($this->currency) == 'usd') && (($units % 10 == 2) || ($units % 10 == 3) || ($units % 10 == 4))) {
+                if ((stripos($this->current_language, 'ru') === 0) && (strtolower($this->currency) == 'usd') && (($units % 10 == 2) || ($units % 10 == 3) || ($units % 10 == 4))) {
                     // test for the specific grammatical rules in RUssian
                     $agi->stream_file('dollar2', '#');
-                } elseif (($this->current_language == 'ru') && (strtolower($this->currency) == 'usd') && ($units%10 == 1)) {
+                } elseif ((stripos($this->current_language, 'ru') === 0) && (strtolower($this->currency) == 'usd') && ($units%10 == 1)) {
                     // test for the specific grammatical rules in RUssian
                     $agi->stream_file($unit_audio, '#');
                 } else {
@@ -2203,10 +2332,10 @@ public function fct_say_rate($agi, $rate)
                     $agi->say_number($point);
                 }
                 if ($cents > 1) {
-                    if ((strtolower($this->currency) == 'usd') && ($this->current_language == 'ru') && (($cents % 10 == 2) || ($cents%10 == 3) || ($cents % 10 == 4))) {
+                    if ((strtolower($this->currency) == 'usd') && (stripos($this->current_language, 'ru') === 0) && (($cents % 10 == 2) || ($cents%10 == 3) || ($cents % 10 == 4))) {
                         // test for the specific grammatical rules in RUssian
                         $agi->stream_file('prepaid-cent2', '#');
-                    } elseif ((strtolower($this->currency) == 'usd') && ($this->current_language == 'ru') && ($cents % 10 == 1)) {
+                    } elseif ((strtolower($this->currency) == 'usd') && (stripos($this->current_language, 'ru') === 0) && ($cents % 10 == 1)) {
                         // test for the specific grammatical rules in RUssian
                         $agi->stream_file($cent_audio, '#');
                     } else {
@@ -2497,14 +2626,12 @@ public function callingcard_cid_sanitize($agi)
 
         if (!is_array($result)) {
             $this->debug(DEBUG, $agi, __FILE__, __LINE__, "[CID_SANITIZE - CID: NO DATA]");
-
             return '';
         }
         for ($i = 0; $i < count($result); $i++) {
             $this->debug(DEBUG, $agi, __FILE__, __LINE__, "[CID_SANITIZE - CID COMPARING: " . substr($result[$i][0], strlen($this->CallerID) * -1) . " to " . $this->CallerID . "]");
             if (substr($result[$i][0], strlen($this->CallerID) * -1) == $this->CallerID) {
                 $this->debug(DEBUG, $agi, __FILE__, __LINE__, "[CID_SANITIZE - CID: " . $result[$i][0] . "]");
-
                 return $result[$i][0];
             }
         }
@@ -2611,9 +2738,7 @@ public function update_callback_campaign($agi)
 
         $duration = time() - $now;
         ///create campaign cdr
-        $QUERY_CALL = "INSERT INTO cc_call (uniqueid, sessionid, card_id,calledstation, sipiax, sessionbill , sessiontime , stoptime ,starttime) VALUES ('" . $this->uniqueid . "', '" . $this->channel . "', '" .
-                $userid . "','" . $called . "',6, " . $cost . ", " . $duration . " , CURRENT_TIMESTAMP , ";
-        $QUERY_CALL .= "DATE_SUB(CURRENT_TIMESTAMP, INTERVAL $duration SECOND )";
+        $QUERY_CALL = "INSERT INTO cc_call (uniqueid, sessionid, card_id, calledstation, sipiax, sessionbill, sessiontime, stoptime, starttime $this->CDR_CUSTOM_SQL) VALUES ('" . $this->uniqueid . "', '" . $this->channel . "', '" . $userid . "','" . $called . "',6, " . $cost . ", " . $duration . " , CURRENT_TIMESTAMP , DATE_SUB(CURRENT_TIMESTAMP, INTERVAL $duration SECOND) $this->CDR_CUSTOM_VAL)";
 
         $this->debug(DEBUG, $agi, __FILE__, __LINE__, "[INSERT CAMPAIGN CALL : " . $QUERY_CALL);
         $this->instance_table->SQLExec($this->DBHandle, $QUERY_CALL);
@@ -2641,12 +2766,13 @@ public function callingcard_ivr_authenticate($agi)
                     " cc_card.language, cc_card.username, removeinterprefix, cc_card.redial, enableexpire, UNIX_TIMESTAMP(expirationdate), " .
                     " expiredays, nbused, UNIX_TIMESTAMP(firstusedate), UNIX_TIMESTAMP(cc_card.creationdate), cc_card.currency, " .
                     " cc_card.lastname, cc_card.firstname, cc_card.email, cc_card.uipass, cc_card.id_campaign, cc_card.id, useralias, " .
-                    " cc_card.status, cc_card.voicemail_permitted, cc_card.voicemail_activated, cc_card.restriction, cc_country.countryprefix" .
+                    " cc_card.status, cc_card.voicemail_permitted, cc_card.voicemail_activated, cc_card.restriction, cc_country.countryprefix, cc_card.id_group " .
                     " FROM cc_callerid " .
                     " LEFT JOIN cc_card ON cc_callerid.id_cc_card = cc_card.id " .
                     " LEFT JOIN cc_tariffgroup ON cc_card.tariff = cc_tariffgroup.id " .
                     " LEFT JOIN cc_country ON cc_card.country = cc_country.countrycode " .
-                    " WHERE cc_callerid.cid = '" . $this->CallerID . "'";
+                    " LEFT JOIN cc_provider ON cc_card.id = cc_provider.id_cc_card " .
+				    " WHERE cc_callerid.cid = '" . $this->CallerID . "' AND cc_provider.id IS NULL";
             $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY);
             $this->debug(DEBUG, $agi, __FILE__, __LINE__, print_r($result, true));
 
@@ -2759,6 +2885,7 @@ public function callingcard_ivr_authenticate($agi)
                 $this->voicemail            = ($result[0][29] && $result[0][30]) ? 1 : 0;
                 $this->restriction          = $result[0][31];
                 $this->countryprefix        = $result[0][32];
+                $this->group_id             = $result[0][33];
 
                 if (strlen($language) == 2 && !($this->languageselected >= 1)) {
 
@@ -2871,7 +2998,7 @@ public function callingcard_ivr_authenticate($agi)
                                 " redial, enableexpire, UNIX_TIMESTAMP(expirationdate), expiredays, nbused, UNIX_TIMESTAMP(firstusedate), " .
                                 " UNIX_TIMESTAMP(cc_card.creationdate), cc_card.currency, cc_card.lastname, cc_card.firstname, cc_card.email, " .
                                 " cc_card.uipass, cc_card.id_campaign, cc_card.id, useralias, status, voicemail_permitted, voicemail_activated, " .
-                                " cc_card.restriction, cc_country.countryprefix " .
+                                " cc_card.restriction, cc_country.countryprefix, cc_card.id_group " .
                                 " FROM cc_card " .
                                 " LEFT JOIN cc_tariffgroup ON tariff = cc_tariffgroup.id " .
                                 " LEFT JOIN cc_country ON cc_card.country = cc_country.countrycode " .
@@ -2934,6 +3061,7 @@ public function callingcard_ivr_authenticate($agi)
                     $this->voicemail            = ($result[0][25] && $result[0][26]) ? 1 : 0;
                     $this->restriction          = $result[0][27];
                     $this->countryprefix        = $result[0][28];
+                    $this->group_id             = $result[0][29];
 
                     if ($this->typepaid == 1) $this->credit = $this->credit + $this->creditlimit;
                 }
@@ -3053,12 +3181,14 @@ public function callingcard_ivr_authenticate($agi)
                 if (!isset($this->cardnumber) || strlen($this->cardnumber) == 0) {
                     $prompt = "prepaid-no-card-entered";
                     $this->debug(DEBUG, $agi, __FILE__, __LINE__, strtoupper($prompt));
+                    $this->log_auth_failure($prompt);
                     continue;
                 }
 
                 if (strlen($this->cardnumber) > CARDNUMBER_LENGTH_MAX || strlen($this->cardnumber) < CARDNUMBER_LENGTH_MIN) {
                     $prompt = "prepaid-invalid-digits";
                     $this->debug(DEBUG, $agi, __FILE__, __LINE__, strtoupper($prompt));
+                    $this->log_auth_failure($prompt);
                     continue;
                 }
                 $this->accountcode = $this->username = $this->cardnumber;
@@ -3067,10 +3197,11 @@ public function callingcard_ivr_authenticate($agi)
                             " enableexpire, UNIX_TIMESTAMP(expirationdate), expiredays, nbused, UNIX_TIMESTAMP(firstusedate), " .
                             " UNIX_TIMESTAMP(cc_card.creationdate), cc_card.currency, cc_card.lastname, cc_card.firstname, cc_card.email, " .
                             " cc_card.uipass, cc_card.id, cc_card.id_campaign, cc_card.id, useralias, status, voicemail_permitted, " .
-                            " voicemail_activated, cc_card.restriction, cc_country.countryprefix " .
+                            " voicemail_activated, cc_card.restriction, cc_country.countryprefix, cc_card.id_group " .
                             " FROM cc_card LEFT JOIN cc_tariffgroup ON tariff = cc_tariffgroup.id " .
                             " LEFT JOIN cc_country ON cc_card.country = cc_country.countrycode " .
-                            " WHERE username = '" . $this->cardnumber . "'";
+                            " LEFT JOIN cc_provider ON cc_card.id = cc_provider.id_cc_card " .
+							" WHERE username = '" . $this->cardnumber . "' AND cc_provider.id IS NULL";
 
                 $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY);
                 $this->debug(DEBUG, $agi, __FILE__, __LINE__, print_r($result, true));
@@ -3078,6 +3209,7 @@ public function callingcard_ivr_authenticate($agi)
                 if (!is_array($result)) {
                     $prompt = "prepaid-auth-fail";
                     $this->debug(DEBUG, $agi, __FILE__, __LINE__, strtoupper($prompt));
+                    $this->log_auth_failure($prompt);
                     continue;
                 } else {
                     // WE ARE GOING TO CHECK IF THE CALLERID IS CORRECT FOR THIS CARD
@@ -3132,6 +3264,7 @@ public function callingcard_ivr_authenticate($agi)
                 $this->voicemail            = ($result[0][26] && $result[0][27]) ? 1 : 0;
                 $this->restriction          = $result[0][28];
                 $this->countryprefix        = $result[0][29];
+                $this->group_id             = $result[0][30];
 
                 if ($this->typepaid == 1) $this->credit = $this->credit + $this->creditlimit;
 
@@ -3234,6 +3367,12 @@ public function callingcard_ivr_authenticate($agi)
             $res = -2;
         }
 
+        if ($res == 0 && !$this->is_group_allowed($this->group_id)) {
+            $this->debug(DEBUG, $agi, __FILE__, __LINE__, "[GROUP IS NOT ALLOWED] group_id=" . $this->group_id);
+            $prompt = "prepaid-auth-fail";
+            $res = -2;
+        }
+
         if (($retries < 3) && $res == 0) {
 
             $this->callingcard_acct_start_inuse($agi, 1);
@@ -3244,6 +3383,7 @@ public function callingcard_ivr_authenticate($agi)
             }
 
         } elseif ($res == -2) {
+            $this->log_auth_failure($prompt);
             $agi->stream_file($prompt, '#');
         } else {
             $res = -1;
@@ -3284,12 +3424,14 @@ public function callingcard_ivr_authenticate_minimum($agi)
             if (!isset($this->cardnumber) || strlen($this->cardnumber) == 0) {
                 $prompt = "prepaid-no-card-entered";
                 $this->debug(DEBUG, $agi, __FILE__, __LINE__, strtoupper($prompt));
+                $this->log_auth_failure($prompt);
                 continue;
             }
 
             if (strlen($this->cardnumber) > CARDNUMBER_LENGTH_MAX || strlen($this->cardnumber) < CARDNUMBER_LENGTH_MIN) {
                 $prompt = "prepaid-invalid-digits";
                 $this->debug(DEBUG, $agi, __FILE__, __LINE__, strtoupper($prompt));
+                $this->log_auth_failure($prompt);
                 continue;
             }
             $this->accountcode = $this->username = $this->cardnumber;
@@ -3298,10 +3440,11 @@ public function callingcard_ivr_authenticate_minimum($agi)
                         " enableexpire, UNIX_TIMESTAMP(expirationdate), expiredays, nbused, UNIX_TIMESTAMP(firstusedate), " .
                         " UNIX_TIMESTAMP(cc_card.creationdate), cc_card.currency, cc_card.lastname, cc_card.firstname, cc_card.email, " .
                         " cc_card.uipass, cc_card.id, cc_card.id_campaign, cc_card.id, useralias, status, voicemail_permitted, voicemail_activated, " .
-                        " cc_card.restriction, cc_country.countryprefix " .
+                        " cc_card.restriction, cc_country.countryprefix, cc_card.id_group " .
                         " FROM cc_card LEFT JOIN cc_tariffgroup ON tariff = cc_tariffgroup.id " .
                         " LEFT JOIN cc_country ON cc_card.country = cc_country.countrycode " .
-                        " WHERE username = '" . $this->cardnumber . "'";
+						" LEFT JOIN cc_provider ON cc_card.id = cc_provider.id_cc_card " .
+						" WHERE username = '" . $this->cardnumber . "' AND cc_provider.id IS NULL";
 
             $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY);
             $this->debug(DEBUG, $agi, __FILE__, __LINE__, print_r($result, true));
@@ -3309,6 +3452,7 @@ public function callingcard_ivr_authenticate_minimum($agi)
             if (!is_array($result)) {
                 $prompt = "prepaid-auth-fail";
                 $this->debug(DEBUG, $agi, __FILE__, __LINE__, strtoupper($prompt));
+                $this->log_auth_failure($prompt);
                 continue;
             }
 
@@ -3341,6 +3485,7 @@ public function callingcard_ivr_authenticate_minimum($agi)
             $this->voicemail            = ($result[0][26] && $result[0][27]) ? 1 : 0;
             $this->restriction          = $result[0][28];
             $this->countryprefix        = $result[0][29];
+            $this->group_id             = $result[0][30];
 
             if ($this->typepaid == 1) $this->credit = $this->credit + $this->creditlimit;
 
@@ -3394,9 +3539,17 @@ public function callingcard_ivr_authenticate_minimum($agi)
             }
             break;
         }//end for
+
+        if ($res == 0 && !$this->is_group_allowed($this->group_id)) {
+            $this->debug(DEBUG, $agi, __FILE__, __LINE__, "[GROUP IS NOT ALLOWED] group_id=" . $this->group_id);
+            $prompt = "prepaid-auth-fail";
+            $res = -2;
+        }
+
         if (($retries < 3) && $res == 0) {
             $this->callingcard_acct_start_inuse($agi, 1);
         } elseif ($res == -2) {
+            $this->log_auth_failure($prompt);
             $agi->stream_file($prompt, '#');
         } else {
             $res = -1;
@@ -3413,10 +3566,12 @@ public function callingcard_ivr_authenticate_light(&$error_msg, $simbalance)
         $QUERY = "SELECT credit, tariff, activated, inuse, simultaccess, typepaid, creditlimit, language, removeinterprefix, redial, enableexpire, " .
                     " UNIX_TIMESTAMP(expirationdate), expiredays, nbused, UNIX_TIMESTAMP(firstusedate), UNIX_TIMESTAMP(cc_card.creationdate), " .
                     " cc_card.currency, cc_card.lastname, cc_card.firstname, cc_card.email, cc_card.uipass, cc_card.id_campaign, status, " .
-                    " voicemail_permitted, voicemail_activated, cc_card.restriction, cc_country.countryprefix " .
+                    " voicemail_permitted, voicemail_activated, cc_card.restriction, cc_country.countryprefix, cc_card.id_group " .
                     " FROM cc_card LEFT JOIN cc_tariffgroup ON tariff = cc_tariffgroup.id " .
                     " LEFT JOIN cc_country ON cc_card.country = cc_country.countrycode " .
-                    " WHERE username = '" . $this->cardnumber . "'";
+                    " LEFT JOIN cc_provider ON cc_card.id = cc_provider.id_cc_card " .
+					" WHERE username = '". $this->cardnumber . "' AND cc_provider.id IS NULL";
+
         $result = $this->instance_table->SQLExec($this->DBHandle, $QUERY);
 
         if (!is_array($result)) {
@@ -3455,6 +3610,7 @@ public function callingcard_ivr_authenticate_light(&$error_msg, $simbalance)
         $this->voicemail            = ($result[0][23] && $result[0][24]) ? 1 : 0;
         $this->restriction          = $result[0][25];
         $this->countryprefix        = $result[0][26];
+        $this->group_id             = $result[0][27];
 
         if ($this->typepaid == 1)
             $this->credit = $this->credit + $this->creditlimit;
@@ -3494,10 +3650,10 @@ public function callingcard_ivr_authenticate_light(&$error_msg, $simbalance)
                 // expire days since first use
                 $date_will_expire = $this->firstusedate + (60 * 60 * 24 * $this->expiredays);
                 if (intval($date_will_expire - time()) < 0) { // CARD EXPIRED :(
-                $error_msg = '<font face="Arial, Helvetica, sans-serif" size="2" color="red"><b>' . gettext("Error : Card have expired!!!") . '</b></font><br>';
+                    $error_msg = '<font face="Arial, Helvetica, sans-serif" size="2" color="red"><b>' . gettext("Error : Card have expired!!!") . '</b></font><br>';
 
-                return 0;
-            }
+                    return 0;
+                }
 
             } elseif ($this->enableexpire == 3 && $this->creationdate != '00000000000000' && strlen($this->creationdate) > 5 && ($this->expiredays > 0)) {
                 // expire days since creation
@@ -3510,6 +3666,11 @@ public function callingcard_ivr_authenticate_light(&$error_msg, $simbalance)
             }
         }
 
+        if (!$this->is_group_allowed($this->group_id)) {
+            $error_msg = '<font face="Arial, Helvetica, sans-serif" size="2" color="red"><b>' . gettext("Error : Group is not allowed") . '</b></font><br>';
+            return 0;
+        }
+
         return 1;
     }
 
@@ -3592,7 +3753,6 @@ public function DbConnect()
     {
         $ADODB_CACHE_DIR = '/tmp';
         /* $ADODB_FETCH_MODE = ADODB_FETCH_ASSOC; */
-        require_once 'adodb/adodb.inc.php';
 
         if ($this->config['database']['dbtype'] == "postgres") {
             $datasource = 'pgsql://' . $this->config['database']['user'] . ':' . $this->config['database']['password'] . '@' . $this->config['database']['hostname'] . '/' . $this->config['database']['dbname'];
@@ -3600,12 +3760,12 @@ public function DbConnect()
             $datasource = 'mysqli://' . $this->config['database']['user'] . ':' . $this->config['database']['password'] . '@' . $this->config['database']['hostname'] . '/' . $this->config['database']['dbname'];
         }
         $this->DBHandle = NewADOConnection($datasource);
-        if (!$this->DBHandle) die("Connection failed");
-
-        if ($this->config['database']['dbtype'] == "mysqli") {
+        if (!$this->DBHandle) {
+            die("Connection failed");
+        }
+        if ($this->config['database']['dbtype'] == "mysql") {
             $this->DBHandle->Execute('SET AUTOCOMMIT = 1');
         }
-
         return true;
     }
 
@@ -3639,7 +3799,7 @@ public function DbReConnect($agi)
                 $this->debug(FATAL, $agi, __FILE__, __LINE__, "[DB CONNECTION LOST] CDR NOT POSTED");
                 die("Reconnection failed");
             }
-            if ($this->config['database']['dbtype'] == "mysqli") {
+            if ($this->config['database']['dbtype'] == "mysql") {
                 $this->DBHandle->Execute('SET AUTOCOMMIT = 1');
             }
 
@@ -3708,6 +3868,10 @@ public function run_dial($agi, $dialstr)
     {
         $dialstr = $this->format_parameters($dialstr);
 
+        // set asterisk cdr information
+        $agi->set_variable('CDR(accountcode)', $this->accountcode);
+        $agi->set_variable('CDR(userfield)', $this->destination);
+
         // Run dial command
         $res_dial = $agi->exec("DIAL $dialstr");
 
@@ -3928,4 +4092,37 @@ public function extract_cond_values($value)
         return $output;
     }
 
+    public function agicnf($key, $default = null) {
+        return is_array($this->agiconfig) && isset($this->agiconfig[$key]) ? $this->agiconfig[$key] : $default;
+    }
+
+    /**
+     * Smart prefix removing function
+     *
+     * @param string $removeprefix Supported format: SEARCH_PLAIN[{,}/SEARCH_REGEX/[{-}REPLACEMENT][{-}STOP_FLAG]{,}/SEARCH_REGEX/{,}SEARCH_PLAIN{-}REPLACEMENT{,}etc...] Separators are: {,} - between rules , {-} - between SEARCH and REPLACEMENT rules and STOP sign (if 3rd parameter greater than 0 - than rule process will be stoped if current rule was applied; if / found in the rule - it is being recognized as REGEX; default for REPLACEMENT is empty string; default for STOP_FLAG is zero).
+     * @param string $destination Dialed number
+     * @return string The fixed destination
+     */
+    public function removePrefix($removeprefix, $destination) {
+        $removeprefix = str_replace('\\\\\\\\', '\\', $removeprefix);
+        $rules = preg_split("/\{\,\}/", $removeprefix);
+        foreach ($rules as $rule) {
+            $parts = preg_split("/\{\-\}/", $rule);
+            $search = trim($parts[0]);
+            $replace = isset($parts[1]) ? $parts[1] : '';
+            $stop = isset($parts[2]) ? $parts[2] : false;
+            $old_destination = $destination;
+
+            if ($search{0} == '/') { // it is regex
+                $destination = preg_replace($search, $replace, $destination);
+            } else { // it is plain
+                if (strncmp($destination, $search, strlen($search)) == 0)
+                    $destination = substr_replace($destination, $replace, 0, strlen($search));
+            }
+            if ($old_destination != $destination && $stop)
+                break;
+        }
+        return $destination;
+    }
+
 };
diff --git a/common/lib/Class.Connection.php b/common/lib/Class.Connection.php
old mode 100644
new mode 100755
index 0a2aed3ba..c2c1a6604
--- a/common/lib/Class.Connection.php
+++ b/common/lib/Class.Connection.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Rachid <rachid.belaid@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -44,17 +44,15 @@ private function __construct()
         if (DB_TYPE == "postgres") {
             $datasource = 'pgsql://' . USER . ':' . PASS . '@' . HOST . '/' . DBNAME;
         } else {
-            $datasource = 'mysql://' . USER . ':' . PASS . '@' . HOST . '/' . DBNAME;
+            $datasource = 'mysqli://' . USER . ':' . PASS . '@' . HOST . '/' . DBNAME;
         }
 
         $DBHandle = NewADOConnection($datasource);
         if (!$DBHandle)
             die("Connection failed");
 
-        if (DB_TYPE == "mysqli") {
+        if (DB_TYPE == "mysql") {
             $DBHandle->Execute('SET AUTOCOMMIT=1');
-        }
-        if (DB_TYPE == "mysqli" || DB_TYPE == "mysql") {
             $DBHandle->Execute("SET NAMES 'UTF8'");
         }
 
@@ -66,7 +64,6 @@ public static function GetDBHandler()
         if (empty (self :: $DBHandler)) {
             $connection = new Connection();
         }
-
         return self :: $DBHandler;
     }
 
@@ -77,7 +74,6 @@ public static function CleanExecute($QUERY)
         } else {
             $connection = self :: $DBHandler;
         }
-
         if (DB_TYPE == "postgres") {
             if (empty (self :: $MytoPgklass)) {
                 self :: $MytoPgklass = new MytoPg(0);
@@ -86,8 +82,6 @@ public static function CleanExecute($QUERY)
             // convert MySQLisms to be Postgres compatible
             self :: $MytoPgklass -> My_to_Pg($QUERY);
         }
-
         return $connection -> Execute($QUERY);
     }
-
-}
+}
\ No newline at end of file
diff --git a/common/lib/Class.Logger.php b/common/lib/Class.Logger.php
index f96ce1429..5aa42e4d6 100755
--- a/common/lib/Class.Logger.php
+++ b/common/lib/Class.Logger.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/common/lib/Class.Mail.php b/common/lib/Class.Mail.php
old mode 100644
new mode 100755
index 8269b3989..23e3b06ec
--- a/common/lib/Class.Mail.php
+++ b/common/lib/Class.Mail.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Rachid <rachid.belaid@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -140,10 +140,11 @@ public function __construct($type, $id_card = null, $lg = null, $msg = null, $ti
             if (!empty ($lg)) {
                 $tmpl_clause .= " AND ( id_language = '$lg' OR  id_language = 'en' )";
                 $order_field = 'id_language';
-                if (strcasecmp($lg, 'en') < 0)
+                if (strcasecmp($lg, 'en') < 0) {
                     $order = 'ASC';
-                else
+                } else {
                     $order = 'DESC';
+                }
             } elseif (!is_null($id_card) && is_numeric($id_card)) {
                 $card_table = new Table("cc_card", "*, IF((typepaid=1) AND (creditlimit IS NOT NULL), credit + creditlimit, credit) AS real_credit");
                 $card_clause = " id = " . $id_card;
@@ -154,10 +155,11 @@ public function __construct($type, $id_card = null, $lg = null, $msg = null, $ti
                 if (!empty ($language)) {
                     $tmpl_clause .= " AND ( id_language = '$language' OR  id_language = 'en' )";
                     $order_field = 'id_language';
-                    if (strcasecmp($language, 'en') < 0)
+                    if (strcasecmp($language, 'en') < 0) {
                         $order = 'ASC';
-                    else
+                    } else {
                         $order = 'DESC';
+                    }
                 }
             }
             $result_tmpl = $tmpl_table->Get_list($DBHandle, $tmpl_clause, $order_field, $order);
diff --git a/common/lib/Class.MytoPg.php b/common/lib/Class.MytoPg.php
old mode 100644
new mode 100755
diff --git a/common/lib/Class.Notification.php b/common/lib/Class.Notification.php
old mode 100644
new mode 100755
index 3484cbcf5..be1595a94
--- a/common/lib/Class.Notification.php
+++ b/common/lib/Class.Notification.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Rachid <rachid.belaid@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -76,14 +76,15 @@ public function __construct($id, $date, $key, $priority, $from_type, $from_id, $
 
     public static function getAllKey()
     {
-        return array("sip_iax_changed" 		=> gettext("New SIP & IAX added : Friends conf have to be generated"),
-                      "sip_changed" 		=> gettext("New SIP added : Sip Friends conf have to be generated"),
-                      "iax_changed"			=> gettext("New IAX added : IAX Friends conf have to be generated"),
-                      "ticket_added_agent" 	=> gettext("New Ticket added by agent"),
-                      "ticket_added_cust" 	=> gettext("New Ticket added by customer"),
-                      "did_destination_edited_cust" => gettext("DID Destination edited by customer"),
-                      "remittance_added_agent"	=> gettext("New Remittance request added"),
-                      "added_new_signup"	=> gettext("Added new sign-up"));
+        return array(
+            "sip_iax_changed" => gettext("New SIP & IAX added : Friends conf have to be generated"),
+            "sip_changed" => gettext("New SIP added : Sip Friends conf have to be generated"),
+            "iax_changed" => gettext("New IAX added : IAX Friends conf have to be generated"),
+            "ticket_added_agent" => gettext("New Ticket added by agent"),
+            "ticket_added_cust" => gettext("New Ticket added by customer"),
+            "did_destination_edited_cust" => gettext("DID Destination edited by customer"),
+            "remittance_added_agent" => gettext("New Remittance request added"),
+            "added_new_signup" => gettext("Added new sign-up"));
     }
     public function getId()
     {
@@ -187,8 +188,6 @@ public function getUrl()
             }
             $link .= $this->link_id;
         }
-
         return $link;
     }
-
-}
+}
\ No newline at end of file
diff --git a/common/lib/Class.NotificationsDAO.php b/common/lib/Class.NotificationsDAO.php
old mode 100644
new mode 100755
index 0526cdab4..b31a310c3
--- a/common/lib/Class.NotificationsDAO.php
+++ b/common/lib/Class.NotificationsDAO.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Rachid <rachid.belaid@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/common/lib/Class.RateEngine.php b/common/lib/Class.RateEngine.php
index 6ec95230c..d81e8523b 100755
--- a/common/lib/Class.RateEngine.php
+++ b/common/lib/Class.RateEngine.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -151,7 +151,7 @@ public function rate_engine_findrates(&$A2B, $phonenumber, $tariffgroupid)
         id_cc_package_offer, tp_trunk.status, rt_trunk.status, tp_trunk.inuse, rt_trunk.inuse,
         tp_trunk.maxuse, rt_trunk.maxuse, tp_trunk.if_max_use, rt_trunk.if_max_use, cc_ratecard.rounding_calltime AS rounding_calltime,
         cc_ratecard.rounding_threshold AS rounding_threshold, cc_ratecard.additional_block_charge AS additional_block_charge, cc_ratecard.additional_block_charge_time AS additional_block_charge_time,
-        cc_ratecard.additional_grace AS additional_grace, cc_ratecard.minimal_cost AS minimal_cost, disconnectcharge_after, announce_time_correction
+        cc_ratecard.additional_grace AS additional_grace, cc_ratecard.minimal_cost AS minimal_cost, disconnectcharge_after, announce_time_correction, cc_tariffplan.id AS tp_id
 
         FROM cc_tariffgroup
         RIGHT JOIN cc_tariffgroup_plan ON cc_tariffgroup_plan.idtariffgroup = cc_tariffgroup.id
@@ -160,13 +160,24 @@ public function rate_engine_findrates(&$A2B, $phonenumber, $tariffgroupid)
         LEFT JOIN cc_trunk AS rt_trunk ON cc_ratecard.id_trunk = rt_trunk.id_trunk
         LEFT JOIN cc_trunk AS tp_trunk ON cc_tariffplan.id_trunk = tp_trunk.id_trunk
 
-        WHERE cc_tariffgroup.id = $tariffgroupid AND ($prefixclause)
+        " . ($A2B->id_card > 0 ? "
+        LEFT JOIN cc_provider AS rt_provider ON rt_trunk.id_provider = rt_provider.id 
+        LEFT JOIN cc_provider AS tp_provider ON tp_trunk.id_provider = tp_provider.id
+        " : "") . "
+        
+        WHERE cc_ratecard.is_disabled = 0
+        AND cc_tariffgroup.id = $tariffgroupid AND ($prefixclause)
         AND startingdate <= CURRENT_TIMESTAMP AND (expirationdate > CURRENT_TIMESTAMP OR expirationdate IS NULL)
         AND startdate <= CURRENT_TIMESTAMP AND (stopdate > CURRENT_TIMESTAMP OR stopdate IS NULL)
         $sql_clause_days
         AND idtariffgroup = '$tariffgroupid'
         AND (dnidprefix = SUBSTRING('$mydnid', 1, length(dnidprefix)) OR (dnidprefix = 'all' $DNID_SUB_QUERY))
         AND (calleridprefix = SUBSTRING('$mycallerid', 1, length(calleridprefix)) OR (calleridprefix = 'all' $CID_SUB_QUERY))
+
+        " . ($A2B->id_card > 0 ? "
+        AND ( IF(!isNull(tp_provider.id_cc_card), tp_provider.id_cc_card != '" . $A2B->id_card . "', 1) AND IF(!isNull(rt_provider.id_cc_card), rt_provider.id_cc_card != '" . $A2B->id_card . "', 1))
+        " : "") . "
+        
         ORDER BY LENGTH(dialprefix) DESC";
 
         $A2B->instance_table = new Table();
@@ -879,6 +890,11 @@ public function rate_engine_calculcost(&$A2B, $callduration, $K = 0)
                 $callduration = 0;
             }
 
+            // Fix for promotion package causing balance to go negative.
+            if ($this ->freetimetocall_used <= $callduration){
+                $callduration = $callduration - $this->freetimetocall_used;
+            }
+
             $cost -= ($callduration / 60) * $rateinitial;
             if ($this->debug_st) echo "1.a cost: $cost\n";
             $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[TEMP - CC_RATE_ENGINE_CALCULCOST: 1. COST: $cost]:[ ($callduration/60) * $rateinitial ]");
@@ -1133,11 +1149,8 @@ public function rate_engine_updatesystem(&$A2B, &$agi, $calledstation, $doibill
         $id_card_package_offer = (!is_numeric($id_card_package_offer)) ? 'NULL' : "'$id_card_package_offer'";
         $calldestination = (!is_numeric($calldestination)) ? 'DEFAULT' : "'$calldestination'";
 
-        $QUERY_COLUMN = "uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, real_sessiontime, calledstation, " .
-            " terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, " .
-            " id_trunk, src, sipiax, buycost, id_card_package_offer, dnid, destination";
-        $QUERY = "INSERT INTO cc_call ($QUERY_COLUMN) VALUES ('" . $A2B->uniqueid . "', '" . $A2B->channel . "', " .
-            "$card_id, '" . $A2B->hostname . "', ";
+        $QUERY_COLUMN = "uniqueid, sessionid, card_id, nasipaddress, starttime, sessiontime, real_sessiontime, calledstation, terminatecauseid, stoptime, sessionbill, id_tariffgroup, id_tariffplan, id_ratecard, id_trunk, src, sipiax, buycost, id_card_package_offer, dnid, destination";
+        $QUERY = "INSERT INTO cc_call ($QUERY_COLUMN $A2B->CDR_CUSTOM_SQL) VALUES ('" . $A2B->uniqueid . "', '" . $A2B->channel . "', " . "$card_id, '" . $A2B->hostname . "', ";
 
         if ($A2B->config["global"]['cache_enabled']) {
             $QUERY .= " datetime(strftime('%s', 'now') - $sessiontime, 'unixepoch', 'localtime')";
@@ -1152,9 +1165,7 @@ public function rate_engine_updatesystem(&$A2B, &$agi, $calledstation, $doibill
             $QUERY .= "now()";
         }
 
-        $QUERY .= " , '$signe_cc_call" . a2b_round(abs($cost)) . "', " .
-                    " $id_tariffgroup, $id_tariffplan, $id_ratecard, '" . $this->usedtrunk . "', '" . $A2B->CallerID . "', '$calltype', " .
-                    " '$buycost', $id_card_package_offer, '" . $A2B->dnid . "', $calldestination)";
+        $QUERY .= " , '$signe_cc_call" . a2b_round(abs($cost)) . "', " . " $id_tariffgroup, $id_tariffplan, $id_ratecard, '" . $this->usedtrunk . "', '" . $A2B->CallerID . "', '$calltype', " . " '$buycost', $id_card_package_offer, '" . $A2B->dnid . "', $calldestination $A2B->CDR_CUSTOM_VAL)";
 
         if ($A2B->config["global"]['cache_enabled']) {
              //insert query in the cache system
@@ -1206,6 +1217,9 @@ public function rate_engine_updatesystem(&$A2B, &$agi, $calledstation, $doibill
             $QUERY = "UPDATE cc_tariffplan SET secondusedreal = secondusedreal + $sessiontime WHERE id = $id_tariffplan";
             $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, $QUERY);
             $result = $A2B->instance_table->SQLExec($A2B->DBHandle, $QUERY, 0);
+
+            // updating trunk counters
+            updateTrunkCounters($this->usedtrunk, $sessiontime);
         }
     }
 
@@ -1225,12 +1239,286 @@ public function trunk_start_inuse($agi, $A2B, $inuse)
         return 0;
     }
 
+    /*
+    * Perform call with using tariffplan's trunks list
+    */
+    public function rate_engine_performcall_algo($k, &$tp, $agi, $destination, &$A2B, $typecall = 0) {
+
+        if (!is_array($tp) || !isset($tp['id'])) {
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[BAD TARIFFPLAN!]");
+            return false;
+        }
+
+        $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[TARIFFPLAN ID = {$tp['id']}]");
+
+        $algo = "t.id_trunk asc";
+        if ($tp['trunk_algo'] == 1) { // priority
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[SELECT ALGO = PRIORITY]");
+            $algo = "t.priority desc";
+        } else if ($tp['trunk_algo'] == 2) { // random
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[SELECT ALGO = RANDOM]");
+            $algo = "rand()";
+        } else if ($tp['trunk_algo'] == 3) { // load balance
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[SELECT ALGO = LOAD BALANCE]");
+            $algo = "t.inuse asc, rand()";
+        } else if ($tp['trunk_algo'] == 4) { // priority - random
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[SELECT ALGO = PRIORITY-RANDOM]");
+            $algo = "t.priority desc, rand()";
+        } else if ($tp['trunk_algo'] == 5) { // minutes per day
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[SELECT ALGO = MINUTES PER DAY]");
+            $algo = "tc.seconds asc";
+        } else if ($tp['trunk_algo'] == 6) { // calls per day
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[SELECT ALGO = CALLS PER DAY]");
+            $algo = "tc.success_calls asc";
+        } else if ($tp['trunk_algo'] == 7) { // acd
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[SELECT ALGO = ACD]");
+            $algo = "if(tc.success_calls > 0, tc.seconds / tc.success_calls, 0) desc";
+        }
+
+        // getting trunks by algo
+        $A2B->instance_table = new Table();
+        $QUERY = "
+            select t.* from cc_trunk t 
+            left join cc_trunk_counter tc on (tc.id_trunk = t.id_trunk and tc.calldate = getCurDateByTrunkTZ(t.id_trunk))
+            where t.id_trunk in (select tp_t.idtrunk from cc_tariffplan_trunk tp_t where tp_t.idtariffplan = '" . $tp['id'] . "') and t.status = 1 
+            order by $algo
+        ";
+        $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, $QUERY);
+        $trunks = $A2B->instance_table->SQLExec($A2B->DBHandle, $QUERY);
+
+        if (!is_array($trunks) || count($trunks) == 0) {
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[TRUNKS NOT DEFINED!]");
+            return false;
+        }
+
+        // dial to trunks list by algo
+        $i = 0;
+        $max_long = 36000000; //Maximum 10 hours
+        $old_destination = $destination;
+        $this->dialstatus = 'CHANUNAVAIL';
+        foreach ($trunks as &$t) {
+            $i++;
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[USING TRUNK: POSITION=$i, TRUNK_ID={$t['id_trunk']}, TRUNK_PRIORITY={$t['priority']}]");
+
+            $destination         = $old_destination;
+            $this->usedtrunk     = $t['id_trunk'];
+            $prefix              = $t['trunkprefix'];
+            $tech                = $t['providertech'];
+            $ipaddress           = $t['providerip'];
+            $removeprefix        = $t['removeprefix'];
+            $timeout             = $this->ratecard_obj[$k]['timeout'];
+            $musiconhold         = $this->ratecard_obj[$k][39];
+            $addparameter        = $t['addparameter'];
+            $cidgroupid          = $this->ratecard_obj[$k][44];
+            $inuse               = $t['inuse'];
+            $maxuse              = $t['maxuse'];
+            $minutes_per_day     = intval($t['minutes_per_day']);
+            $attempt_statuses    = preg_split('/\,/', trim(strtolower(preg_replace('/\s/', '', $t['attempt_statuses']))), null, PREG_SPLIT_NO_EMPTY);
+            $attempt_condition   = $t['attempt_condition'];
+            $attempt_count       = $t['attempt_count'];
+            $attempt_delay       = $t['attempt_delay'];
+            $calls_per_day       = $t['calls_per_day'];
+
+            // check limits
+            $counters = getTrunkCounters($this->usedtrunk);
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "Counters: \n" . print_r($counters, true));
+            $minutes_per_day_reached = false;
+            $trunk_on_pause = false;
+            $calls_per_day_reached = false;
+            if (!empty($counters) && is_array($counters)) {
+                if ($minutes_per_day > 0)
+                    $minutes_per_day_reached = ($counters['minutes'] > $minutes_per_day);
+                if ($attempt_delay > 0)
+                    $trunk_on_pause = (($counters['last_call_time'] + $attempt_delay) >= time());
+                if ($calls_per_day > 0)
+                    $calls_per_day_reached = (intval($counters['success_calls']) >= $calls_per_day);
+            }
+
+            $err = false;
+            if ($minutes_per_day_reached) {
+                $err = "This trunk cannot be used because minutes limit exceeded. Now use next trunk\n";
+            } else if ($trunk_on_pause) {
+                $err = "This trunk cannot be used because on pause. Now use next trunk\n";
+            } else if ($calls_per_day_reached) {
+                $err = "This trunk cannot be used because calls per day limit exceeded. Now use next trunk\n";
+            } else if ($maxuse != -1 && $inuse >= $maxuse) {
+                $err = "This trunk cannot be used because maximum number of connections is reached. Now use next trunk\n";
+            }
+
+            if (!empty($err)) {
+                $A2B->debug(WARN, $agi, __FILE__, __LINE__, $err);
+                continue;
+            }
+
+            // applying prefix rule(s)
+            $destination = $A2B->removePrefix($removeprefix, $destination);
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[UPDATED DESTINATION: $destination]");
+
+            if ($typecall == 1) $timeout = $A2B->config["callback"]['predictivedialer_maxtime_tocall'];
+
+            $dialparams = str_replace("%timeout%", min($timeout * 1000, $max_long), $A2B->agiconfig['dialcommand_param']);
+            $dialparams = str_replace("%timeoutsec%", min($timeout, $max_long), $dialparams);
+
+            if (strlen($musiconhold) > 0 && $musiconhold != "selected") {
+                $dialparams .= "m";
+                $myres = $agi->exec("SETMUSICONHOLD $musiconhold");
+                $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "EXEC SETMUSICONHOLD $musiconhold");
+            }
+
+            if ($A2B->agiconfig['record_call'] == 1) {
+                $command_mixmonitor = "MixMonitor {$A2B->uniqueid}.{$A2B->agiconfig['monitor_formatfile']}|b";
+                $command_mixmonitor = $A2B->format_parameters($command_mixmonitor);
+                $myres = $agi->exec($command_mixmonitor);
+                $A2B->debug(INFO, $agi, __FILE__, __LINE__, $command_mixmonitor);
+            }
+
+            $pos_dialingnumber = strpos($ipaddress, '%dialingnumber%');
+
+            $ipaddress = str_replace("%cardnumber%", $A2B->cardnumber, $ipaddress);
+            $ipaddress = str_replace("%dialingnumber%", $prefix . $destination, $ipaddress);
+
+            if ($pos_dialingnumber !== false) {
+                $dialstr = "$tech/$ipaddress" . $dialparams;
+            } else {
+                if ($A2B->agiconfig['switchdialcommand'] == 1) {
+                    $dialstr = "$tech/$prefix$destination@$ipaddress" . $dialparams;
+                } else {
+                    $dialstr = "$tech/$ipaddress/$prefix$destination" . $dialparams;
+                }
+            }
+
+            //ADDITIONAL PARAMETER             %dialingnumber%, %cardnumber%
+            if (strlen($addparameter) > 0) {
+                $addparameter = str_replace("%cardnumber%", $A2B->cardnumber, $addparameter);
+                $addparameter = str_replace("%dialingnumber%", $prefix . $destination, $addparameter);
+                $dialstr .= $addparameter;
+            }
+
+            $A2B->debug(INFO, $agi, __FILE__, __LINE__, "app_callingcard: Dialing '$dialstr' with timeout of '$timeout'.\n");
+
+            //# Channel: technology/number@ip_of_gw_to PSTN
+            //# Channel: SIP/3465078XXXXX@11.150.54.xxx   /     SIP/phone1@192.168.1.6
+            // exten => 1879,1,Dial(SIP/34650XXXXX@255.XX.7.XX,20,tr)
+            // Dial(IAX2/guest@misery.digium.com/s@default)
+            //$myres = $agi->agi_exec("EXEC DIAL SIP/3465078XXXXX@254.20.7.28|30|HL(" . ($timeout * 60 * 1000) . ":60000:30000)");
+
+            $QUERY = "SELECT cid FROM cc_outbound_cid_list WHERE activated = 1 AND outbound_cid_group = $cidgroupid ORDER BY RAND() LIMIT 1";
+
+            $A2B->instance_table = new Table();
+            $cidresult = $A2B->instance_table->SQLExec($A2B->DBHandle, $QUERY);
+            $outcid = 0;
+            if (is_array($cidresult) && count($cidresult) > 0) {
+                $outcid = $cidresult[0][0];
+                # Uncomment this line if you want to save the outbound_cid in the CDR
+                //$A2B->CallerID = $outcid;
+                $agi->set_callerid($outcid);
+                $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[EXEC SetCallerID : $outcid]");
+            }
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "app_callingcard: CIDGROUPID='$cidgroupid' OUTBOUND CID SELECTED IS '$outcid'.");
+
+            // Count this call on the trunk
+            $this->trunk_start_inuse($agi, $A2B, 1);
+
+            // dial to trunk
+            $attempts_made = 0;
+            do {
+                if ($attempts_made > 0)
+                    sleep(1);
+
+                $A2B->debug(INFO, $agi, __FILE__, __LINE__, "DIAL $dialstr");
+                $myres = $A2B->run_dial($agi, $dialstr);
+                $attempts_made++;
+
+                // check connection after dial(long pause)
+                $A2B->DbReConnect($agi);
+
+                $answeredtime = $agi->get_variable("ANSWEREDTIME");
+                $this->real_answeredtime = $this->answeredtime = $answeredtime['data'];
+                $dialstatus = $agi->get_variable("DIALSTATUS");
+                $this->dialstatus = $dialstatus['data'];
+
+                if (!count($attempt_statuses))
+                    break;
+
+                // check if we need to make one more attempt to this trunk
+                $cond_result = in_array(strtolower($this->dialstatus), $attempt_statuses);
+            } while ($attempts_made <= $attempt_count && (($attempt_condition == 0 && $cond_result) || ($attempt_condition == 1 && !$cond_result)));
+
+            // Count this call on the trunk
+            $this->trunk_start_inuse($agi, $A2B, 0);
+
+            if ($A2B->agiconfig['record_call'] == 1) {
+                $myres = $agi->exec("StopMixMonitor");
+                $A2B->debug(INFO, $agi, __FILE__, __LINE__, "EXEC StopMixMonitor (" . $A2B->uniqueid . ")");
+            }
+
+            $hc_code = $agi->get_variable("HANGUPCAUSE");
+            $hc_code = $hc_code['data'];
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[DIALSTATUS=" . $this->dialstatus . ", HANGUPCAUSE=$hc_code]");
+
+            // Check for algo interruption
+            $QUERY = "SELECT * FROM cc_tariffplan WHERE id = '" . $this->ratecard_obj[$k]['tp_id'] . "'";
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[$QUERY]");
+            $A2B->instance_table = new Table();
+            $result = $A2B->instance_table->SQLExec($A2B->DBHandle, $QUERY);
+            if (is_array($result) && count($result) > 0) {
+                $break_codes = $result[0]['algo_break_hc'];
+                if (strlen($break_codes) > 0) {
+                    $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[BREAKING HANGUPCAUSE CODES: $break_codes]");
+                    $break_codes = explode(',', $break_codes);
+                    if (is_array($break_codes) && in_array($hc_code, $break_codes)) {
+                        $A2B->debug(INFO, $agi, __FILE__, __LINE__, "Interrupting TRUNK ALGO because break code matched ( $hc_code )");
+                        break;
+                    }
+                }
+            }
+
+            if ($A2B->agiconfig['force_rerouting']) { // force rerouting logic
+                if ($this->dialstatus === "ANSWER") {
+                    $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "-> dialstatus : " . $this->dialstatus . ", answered time is " . $this->answeredtime . " \n");
+
+                    // performed call
+                    $this->usedratecard = $k;
+                    $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[USEDRATECARD=" . $this->usedratecard . "]");
+                    return true;
+                }
+                // force reset CDR and save it keeping custom variables
+                $agi->exec("ResetCDR", "wv");
+            } else { // Default interruption logic
+                if ($this->dialstatus === "BUSY") {
+                    $this->real_answeredtime = $this->answeredtime = 0;
+                    if ($A2B->agiconfig['busy_timeout'] > 0)
+                        $res_busy = $agi->exec("Busy " . $A2B->agiconfig['busy_timeout']);
+                    $agi->stream_file('prepaid-isbusy', '#');
+                } elseif ($this->dialstatus === "NOANSWER") {
+                    $this->real_answeredtime = $this->answeredtime = 0;
+                    $agi->stream_file('sound-prepaid-noanswer', '#');
+                } elseif ($this->dialstatus === "CANCEL") {
+                    $this->real_answeredtime = $this->answeredtime = 0;
+                } elseif ($this->dialstatus === "ANSWER") {
+                    $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "-> dialstatus : " . $this->dialstatus . ", answered time is " . $this->answeredtime . " \n");
+                } else {
+                    continue;
+                }
+
+                // performed call
+                $this->usedratecard = $k;
+                $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[USEDRATECARD=" . $this->usedratecard . "]");
+                return true;
+            }
+
+        }
+
+        return false;
+    }
+
     /*
         RATE ENGINE - PERFORM CALLS
         $typecall = 1->predictive dialer
     */
     public function rate_engine_performcall($agi, $destination, &$A2B, $typecall = 0)
     {
+        $this->dialstatus = 'CHANUNAVAIL';
         $max_long = 36000000; //Maximum 10 hours
         $old_destination = $destination;
 
@@ -1242,6 +1530,32 @@ public function rate_engine_performcall($agi, $destination, &$A2B, $typecall = 0
                 $this->usedtrunk = $this->ratecard_obj[$k][34];
                 $usetrunk_failover = 1;
             } else {
+
+                // getting tariffplan and dialing algorithm
+                $id_tariffplan = $this->ratecard_obj[$k][3];
+                $QUERY = "select * from cc_tariffplan where id = '$id_tariffplan' limit 1";
+                $A2B->instance_table = new Table();
+                $result = $A2B->instance_table->SQLExec($A2B->DBHandle, $QUERY);
+                $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, $QUERY);
+
+                if (is_array($result) && count($result) > 0) {
+                    $tp = $result[0];
+                    if (intval($tp['trunk_algo']) > 0) {
+                        $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[USING TARIFFPLAN TRUNKS LIST]");
+
+                        // special algo dialing
+                        if ($this->rate_engine_performcall_algo($k, $tp, $agi, $destination, $A2B, $typecall)) {
+                            return true;
+                        }
+
+                        $A2B->debug(WARN, $agi, __FILE__, __LINE__, "These trunks cannot be used, because of some conditions. Using next rate.\n");
+                        continue 1;
+                    }
+                }
+
+                // standard dialing
+                $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[USING TARIFFPLAN TRUNK]");
+
                 $usetrunk = 29;
                 $this->usedtrunk = $this->ratecard_obj[$k][29];
                 $usetrunk_failover = 0;
@@ -1260,8 +1574,9 @@ public function rate_engine_performcall($agi, $destination, &$A2B, $typecall = 0
             $maxuse         = $this->ratecard_obj[$k][50 + $usetrunk_failover];
             $ifmaxuse       = $this->ratecard_obj[$k][52 + $usetrunk_failover];
 
-            if (strncmp($destination, $removeprefix, strlen($removeprefix)) == 0)
-                $destination = substr($destination, strlen($removeprefix));
+            // applying prefix rule(s)
+            $destination = $A2B->removePrefix($removeprefix, $destination);
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[UPDATED DESTINATION: $destination]");
 
             if ($typecall == 1) $timeout = $A2B->config["callback"]['predictivedialer_maxtime_tocall'];
 
@@ -1326,45 +1641,88 @@ public function rate_engine_performcall($agi, $destination, &$A2B, $typecall = 0
             }
             $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "app_callingcard: CIDGROUPID='$cidgroupid' OUTBOUND CID SELECTED IS '$outcid'.");
 
-            if ($maxuse == -1 || $inuse < $maxuse) {
+            // get additional trunk params
+            $QUERY = "select minutes_per_day, attempt_statuses, attempt_condition, attempt_count, attempt_delay, calls_per_day from cc_trunk where id_trunk = '$this->usedtrunk' limit 1";
+            $result = $A2B->instance_table->SQLExec($A2B->DBHandle, $QUERY);
+            $minutes_per_day     = intval($result[0][0]);
+            $attempt_statuses    = preg_split('/\,/', trim(strtolower(preg_replace('/\s/', '', $result[0][1]))), null, PREG_SPLIT_NO_EMPTY);
+            $attempt_condition   = $result[0][2];
+            $attempt_count       = $result[0][3];
+            $attempt_delay       = $result[0][4];
+            $calls_per_day       = $result[0][5];
+
+            // check limits
+            $counters = getTrunkCounters($this->usedtrunk);
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "Counters: \n" . print_r($counters, true));
+            $minutes_per_day_reached = false;
+            $trunk_on_pause = false;
+            $calls_per_day_reached = false;
+            if (!is_null($counters)) {
+                if ($minutes_per_day > 0)
+                    $minutes_per_day_reached = ($counters['minutes'] > $minutes_per_day);
+                if ($attempt_delay > 0)
+                    $trunk_on_pause = (($counters['last_call_time'] + $attempt_delay) >= time());
+                if ($calls_per_day > 0)
+                    $calls_per_day_reached = (intval($counters['success_calls']) >= $calls_per_day);
+            }
+
+            if ($ifmaxuse == 1) {
+                $A2B->debug(WARN, $agi, __FILE__, __LINE__, "This trunk cannot be used because maximum number of connections is reached. Now use next trunk\n");
+                continue 1;
+            } else if ($minutes_per_day_reached) {
+                $A2B->debug(WARN, $agi, __FILE__, __LINE__, "This trunk cannot be used because minutes limit exceeded. Now use failover trunk\n");
+            } else if ($trunk_on_pause) {
+                $A2B->debug(WARN, $agi, __FILE__, __LINE__, "This trunk cannot be used because it is on pause. Now use failover trunk\n");
+            } else if ($calls_per_day_reached) {
+                $A2B->debug(WARN, $agi, __FILE__, __LINE__, "This trunk cannot be used because calls per day limit exceeded. Now use failover trunk\n");
+            } else if ($maxuse != -1 && $inuse >= $maxuse) {
+                $A2B->debug(WARN, $agi, __FILE__, __LINE__, "This trunk cannot be used because maximum number of connections is reached. Now use failover trunk\n");
+            } else {
+
                 // Count this call on the trunk
                 $this->trunk_start_inuse($agi, $A2B, 1);
 
-                $myres = $A2B->run_dial($agi, $dialstr);
-                //exec('Dial', trim("$type/$identifier|$timeout|$options|$url", '|'));
+                // dial to trunk
+                $attempts_made = 0;
+                do {
+                    if ($attempts_made > 0)
+                        sleep(1);
 
-                $A2B->debug(INFO, $agi, __FILE__, __LINE__, "DIAL $dialstr");
+                    $A2B->debug(INFO, $agi, __FILE__, __LINE__, "DIAL $dialstr");
+                    $myres = $A2B->run_dial($agi, $dialstr);
+                    $attempts_made++;
 
-                // check connection after dial(long pause)
-                $A2B->DbReConnect($agi);
+                    // check connection after dial(long pause)
+                    $A2B->DbReConnect($agi);
+
+                    $answeredtime = $agi->get_variable("ANSWEREDTIME");
+                    $this->real_answeredtime = $this->answeredtime = $answeredtime['data'];
+                    $dialstatus = $agi->get_variable("DIALSTATUS");
+                    $this->dialstatus = $dialstatus['data'];
+
+                    if (!count($attempt_statuses))
+                        break;
+
+                    // check if we need to make one more attempt to this trunk
+                    $cond_result = in_array(strtolower($this->dialstatus), $attempt_statuses);
+                } while ($attempts_made <= $attempt_count && (($attempt_condition == 0 && $cond_result) || ($attempt_condition == 1 && !$cond_result)));
 
                 // Count this call on the trunk
                 $this->trunk_start_inuse($agi, $A2B, 0);
-            } else {
-                if ($ifmaxuse == 1) {
-                    $A2B->debug(WARN, $agi, __FILE__, __LINE__, "This trunk cannot be used because maximum number of connections is reached. Now use next trunk\n");
-                    continue 1;
-                } else {
-                    $A2B->debug(WARN, $agi, __FILE__, __LINE__, "This trunk cannot be used because maximum number of connections is reached. Now use failover trunk\n");
+
+                if ($A2B->agiconfig['record_call'] == 1) {
+                    $myres = $agi->exec("StopMixMonitor");
+                    $A2B->debug(INFO, $agi, __FILE__, __LINE__, "EXEC StopMixMonitor (" . $A2B->uniqueid . ")");
                 }
-            }
 
-            if ($A2B->agiconfig['record_call'] == 1) {
-                $myres = $agi->exec("StopMixMonitor");
-                $A2B->debug(INFO, $agi, __FILE__, __LINE__, "EXEC StopMixMonitor (" . $A2B->uniqueid . ")");
             }
 
-            $answeredtime = $agi->get_variable("ANSWEREDTIME");
-            $this->real_answeredtime = $this->answeredtime = $answeredtime['data'];
-            $dialstatus = $agi->get_variable("DIALSTATUS");
-            $this->dialstatus = $dialstatus['data'];
-
             //$this->answeredtime='60';
             //$this->dialstatus='ANSWERED';
 
             // LOOOOP FOR THE FAILOVER LIMITED TO failover_recursive_limit
             $loop_failover = 0;
-            while ($loop_failover <= $A2B->agiconfig['failover_recursive_limit'] && is_numeric($failover_trunk) && $failover_trunk >= 0 && (($this->dialstatus == "CHANUNAVAIL") || ($this->dialstatus == "CONGESTION") || ($inuse >= $maxuse && $maxuse != -1))) {
+            while ($loop_failover <= $A2B->agiconfig['failover_recursive_limit'] && is_numeric($failover_trunk) && $failover_trunk >= 0 && ($this->dialstatus == "CHANUNAVAIL" || $this->dialstatus == "CONGESTION")) {
                 $loop_failover++;
                 $this->real_answeredtime = $this->answeredtime = 0;
                 $this->usedtrunk = $failover_trunk;
@@ -1373,7 +1731,7 @@ public function rate_engine_performcall($agi, $destination, &$A2B, $typecall = 0
 
                 $destination = $old_destination;
 
-                $QUERY = "SELECT trunkprefix, providertech, providerip, removeprefix, failover_trunk, status, inuse, maxuse, if_max_use FROM cc_trunk WHERE id_trunk = '$failover_trunk'";
+                $QUERY = "SELECT trunkprefix, providertech, providerip, removeprefix, failover_trunk, status, inuse, maxuse, if_max_use, minutes_per_day, attempt_statuses, attempt_condition, attempt_count, attempt_delay, calls_per_day FROM cc_trunk WHERE id_trunk = '$failover_trunk'";
                 $A2B->instance_table = new Table();
                 $result = $A2B->instance_table->SQLExec($A2B->DBHandle, $QUERY);
 
@@ -1389,6 +1747,12 @@ public function rate_engine_performcall($agi, $destination, &$A2B, $typecall = 0
                     $inuse               = $result[0][6];
                     $maxuse              = $result[0][7];
                     $ifmaxuse            = $result[0][8];
+                    $minutes_per_day     = intval($result[0][9]);
+                    $attempt_statuses    = preg_split('/\,/', trim(strtolower(preg_replace('/\s/', '', $result[0][10]))), null, PREG_SPLIT_NO_EMPTY);
+                    $attempt_condition   = $result[0][11];
+                    $attempt_count       = $result[0][12];
+                    $attempt_delay       = $result[0][13];
+                    $calls_per_day       = $result[0][14];
 
                     if (strncmp($destination, $removeprefix, strlen($removeprefix)) == 0) {
                         $destination = substr($destination, strlen($removeprefix));
@@ -1403,17 +1767,76 @@ public function rate_engine_performcall($agi, $destination, &$A2B, $typecall = 0
                         continue 2;
                     }
 
+                    // check limits
+                    $counters = getTrunkCounters($failover_trunk);
+                    $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "Counters: \n" . print_r($counters, true));
+                    $minutes_per_day_reached = false;
+                    $trunk_on_pause = false;
+                    $calls_per_day_reached = false;
+                    if (!is_null($counters)) {
+                        if ($minutes_per_day > 0)
+                            $minutes_per_day_reached = ($counters['minutes'] > $minutes_per_day);
+                        if ($attempt_delay > 0)
+                            $trunk_on_pause = (($counters['last_call_time'] + $attempt_delay) >= time());
+                        if ($calls_per_day > 0)
+                            $calls_per_day_reached = (intval($counters['success_calls']) >= $calls_per_day);
+                    }
+
                     if ($maxuse != -1 && $inuse >= $maxuse) {
                         $A2B->debug(WARN, $agi, __FILE__, __LINE__, "Failover trunk cannot be used because maximum number of connections on this trunk is already reached.\n");
 
                         // use failover trunk
                         if ($ifmaxuse == 0) {
                             $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "Now using its failover trunk\n");
+
+                            // IF THE FAILOVER TRUNK IS SAME AS THE ACTUAL TRUNK WE BREAK
+                            if ($next_failover_trunk == $failover_trunk) {
+                                break;
+                            } else {
+                                $failover_trunk = $next_failover_trunk;
+                            }
+
                             continue 1;
                         } else {
                             $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "Now using next trunk\n");
                             continue 2;
                         }
+
+                    } else if ($minutes_per_day_reached) {
+                        $A2B->debug( WARN, $agi, __FILE__, __LINE__, "Failover trunk cannot be used because minutes limit exceeded. Now using its failover trunk\n");
+
+                        // IF THE FAILOVER TRUNK IS SAME AS THE ACTUAL TRUNK WE BREAK
+                        if ($next_failover_trunk == $failover_trunk) {
+                            break;
+                        } else {
+                            $failover_trunk = $next_failover_trunk;
+                        }
+
+                        continue 1;
+
+                    } else if ($trunk_on_pause) {
+                        $A2B->debug( WARN, $agi, __FILE__, __LINE__, "Failover trunk cannot be used because on pause. Now using its failover trunk\n");
+
+                        // IF THE FAILOVER TRUNK IS SAME AS THE ACTUAL TRUNK WE BREAK
+                        if ($next_failover_trunk == $failover_trunk) {
+                            break;
+                        } else {
+                            $failover_trunk = $next_failover_trunk;
+                        }
+
+                        continue 1;
+
+                    } else if ($calls_per_day_reached) {
+                        $A2B->debug( WARN, $agi, __FILE__, __LINE__, "Failover trunk cannot be used because calls per day limit exceeded. Now using its failover trunk\n");
+
+                        // IF THE FAILOVER TRUNK IS SAME AS THE ACTUAL TRUNK WE BREAK
+                        if ($next_failover_trunk == $failover_trunk) {
+                            break;
+                        } else {
+                            $failover_trunk = $next_failover_trunk;
+                        }
+
+                        continue 1;
                     }
 
                     $pos_dialingnumber = strpos($ipaddress, '%dialingnumber%');
@@ -1438,29 +1861,40 @@ public function rate_engine_performcall($agi, $destination, &$A2B, $typecall = 0
                     // Count this call on the trunk
                     $this->trunk_start_inuse($agi, $A2B, 1);
 
-                    $myres = $A2B->run_dial($agi, $dialstr);
-                    $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "DIAL FAILOVER $dialstr");
+                    // dial to trunk
+                    $attempts_made = 0;
+                    do {
+                        if ($attempts_made > 0)
+                            sleep(1);
 
-                    // check connection after dial(long pause)
-                    $A2B->DbReConnect($agi);
+                        $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "DIAL FAILOVER $dialstr");
+                        $myres = $A2B->run_dial($agi, $dialstr);
+                        $attempts_made++;
 
-                    // Count this call on the trunk
-                    $this->trunk_start_inuse($agi, $A2B, 0);
+                        // check connection after dial(long pause)
+                        $A2B->DbReConnect($agi);
 
-                    $answeredtime = $agi->get_variable("ANSWEREDTIME");
-                    $this->real_answeredtime = $this->answeredtime = $answeredtime['data'];
+                        $answeredtime = $agi->get_variable("ANSWEREDTIME");
+                        $this->real_answeredtime = $this->answeredtime = $answeredtime['data'];
+                        $dialstatus = $agi->get_variable("DIALSTATUS");
+                        $this->dialstatus = $dialstatus['data'];
 
-                    $dialstatus = $agi->get_variable("DIALSTATUS");
-                    $this->dialstatus = $dialstatus['data'];
+                        if (!count($attempt_statuses))
+                            break;
+
+                        // check if we need to make one more attempt to this trunk
+                        $cond_result = in_array(strtolower($this->dialstatus), $attempt_statuses);
+                    } while ($attempts_made <= $attempt_count && (($attempt_condition == 0 && $cond_result) || ($attempt_condition == 1 && !$cond_result)));
+
+                    // Count this call on the trunk
+                    $this->trunk_start_inuse($agi, $A2B, 0);
 
                     $A2B->debug(INFO, $agi, __FILE__, __LINE__, "[FAILOVER K=$k]:[ANSTIME=" . $this->answeredtime . "-DIALSTATUS=" . $this->dialstatus . "]");
 
                 }
-                // IF THE FAILOVER TRUNK IS SAME AS THE ACTUAL TRUNK WE BREAK
-                if ($next_failover_trunk == $failover_trunk) {
+                // If the failover trunk is same as the actual trunk we break
+                if ($this->usedtrunk == $failover_trunk) {
                     break;
-                } else {
-                    $failover_trunk = $next_failover_trunk;
                 }
 
             } // END FOR LOOP FAILOVER
@@ -1476,14 +1910,13 @@ public function rate_engine_performcall($agi, $destination, &$A2B, $typecall = 0
                 $agi-> stream_file('prepaid-noanswer', '#');
             } elseif ($this->dialstatus == "CANCEL") {
                 $this->real_answeredtime = $this->answeredtime = 0;
-            } elseif (($this->dialstatus == "CHANUNAVAIL") ||
-                    ($this->dialstatus == "CONGESTION")) {
+            } elseif ($this->dialstatus == "CHANUNAVAIL" || $this->dialstatus == "CONGESTION") {
                 $this->real_answeredtime = $this->answeredtime = 0;
                 // Check if we will failover for LCR/LCD prefix - better false for an exact billing on resell
                 if ($A2B->agiconfig['failover_lc_prefix']) {
                     continue;
                 }
-
+                $this->usedratecard = $k;
                 return false;
             } elseif ($this->dialstatus == "ANSWER") {
                 $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "-> dialstatus : " . $this->dialstatus . ", answered time is " . $this->answeredtime . " \n");
@@ -1499,7 +1932,23 @@ public function rate_engine_performcall($agi, $destination, &$A2B, $typecall = 0
         $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[USEDRATECARD - FAIL =" . $this->usedratecard . "]");
 
         return false;
+    }
 
+    public function hangup($agi, &$A2B) {
+        $parts = explode('_', $A2B->agiconfig['asterisk_version']);
+        $asterisk_version = (is_array($parts) && count($parts) == 2) ? intval($parts[1]) : 0;
+        if ($asterisk_version >= 4) { // 1_4 and more
+            $code = 21;
+            $list = constants::getDialStatus_Q931_List();
+            if (isset($list[$this->dialstatus]))
+                $code = $list[$this->dialstatus];
+
+            // make smart hangup
+            $A2B->debug(DEBUG, $agi, __FILE__, __LINE__, "[SMART HANGUP, Q931 cause: $code ($this->dialstatus)");
+            $agi->exec("Hangup $code");
+        } else {
+            $agi->hangup();
+        }
     }
 
 };
diff --git a/common/lib/Class.Realtime.php b/common/lib/Class.Realtime.php
old mode 100644
new mode 100755
index 124f24b77..53e953a58
--- a/common/lib/Class.Realtime.php
+++ b/common/lib/Class.Realtime.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Rachid <rachid.belaid@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/common/lib/Class.SOAP-function.php b/common/lib/Class.SOAP-function.php
index 1a66a9bc4..e8c23b49a 100644
--- a/common/lib/Class.SOAP-function.php
+++ b/common/lib/Class.SOAP-function.php
@@ -681,7 +681,7 @@ public function Create_Ratecard($security_key, $instance)
         }
 
         $begin_date = date("Y");
-        $begin_date_plus = date("Y")+25;
+        $begin_date_plus = date("Y") + 10;
         $end_date = date("-m-d H:i:s");
         $startingdate = $begin_date.$end_date;
         $expirationdate = $begin_date_plus.$end_date;
@@ -750,7 +750,7 @@ public function Create_Voucher($security_key, $credit, $units, $currency)
         $func_fields = "voucher, credit, activated, currency, expirationdate";
         $id_name = "id";
 
-        $begin_date_plus = date("Y") + 25;
+        $begin_date_plus = date("Y") + 10;
         $end_date = date("-m-d H:i:s");
         $expirationdate = $begin_date_plus.$end_date;
         $arr_voucher = array();
@@ -926,7 +926,7 @@ public function Create_DID($security_key, $account_id, $id_didgroup, $rate, $con
         $arr_did = array();
 
         $begin_date = date("Y");
-        $begin_date_plus = date("Y")+25;
+        $begin_date_plus = date("Y") + 10;
         $end_date = date("-m-d H:i:s");
         $startingdate = $begin_date.$end_date;
         $expirationdate = $begin_date_plus.$end_date;
diff --git a/common/lib/Class.Table.php b/common/lib/Class.Table.php
index 688c21e5a..a4e51a15d 100755
--- a/common/lib/Class.Table.php
+++ b/common/lib/Class.Table.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author	  Belaid Arezqui <areski@gmail.com>
  * @license	 http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package	 A2Billing
@@ -38,7 +38,7 @@
 * @package    Table
 * @author     Arezqui Belaid <areski _atl_ gmail com>
 * @author     Steve Dommett <steve@st4vs.net>
-* @copyright  2004-2012 A2Billing
+* @copyright  2004-2015 A2Billing
 * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
 * @version    CVS: $Id:$
 * @since      File available since Release 1.0
diff --git a/common/lib/Form/Class.FormBO.php b/common/lib/Form/Class.FormBO.php
old mode 100644
new mode 100755
index def63f6da..dda8eb2d3
--- a/common/lib/Form/Class.FormBO.php
+++ b/common/lib/Form/Class.FormBO.php
@@ -661,7 +661,7 @@ public static function proccessing_billing_customer()
             $clause_call_billing .= "stoptime >= '" .$result[0][1]."' AND ";
             $clause_charge .= "creationdate >= '".$result[0][1]."' AND  ";
             $desc_billing = "Calls cost between the ".$result[0][1]." and  $date_bill" ;
-            $desc_billing_postpaid="Amount for period between the ".date("Y-m-d", strtotime($result[0][1]) + $oneday)." and $date_bill";
+            $desc_billing_postpaid="Amount for period between the ".date("Y-m-d", strtotime($result[0][1]))." and $date_bill";
             $start_date = $result[0][1];
         } else {
             $desc_billing = "Calls cost before the $date_bill" ;
diff --git a/common/lib/Form/Class.FormHandler.AddForm.inc.php b/common/lib/Form/Class.FormHandler.AddForm.inc.php
old mode 100644
new mode 100755
index 4ad86fe09..2fc7a01b0
--- a/common/lib/Form/Class.FormHandler.AddForm.inc.php
+++ b/common/lib/Form/Class.FormHandler.AddForm.inc.php
@@ -6,7 +6,7 @@
 
 <script language="JavaScript" src="./javascript/calonlydays.js"></script>
 
-    <FORM action=<?php echo $_SERVER['PHP_SELF']; ?> id="myForm" method="post" name="myForm">
+    <FORM action=<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL); ?> id="myForm" method="post" name="myForm">
 
     <TABLE cellspacing="2" class="addform_table1">
         <INPUT type="hidden" name="form_action" value="add">
diff --git a/common/lib/Form/Class.FormHandler.DelForm.inc.php b/common/lib/Form/Class.FormHandler.DelForm.inc.php
old mode 100644
new mode 100755
index 8206469fc..34339a84e
--- a/common/lib/Form/Class.FormHandler.DelForm.inc.php
+++ b/common/lib/Form/Class.FormHandler.DelForm.inc.php
@@ -2,36 +2,28 @@
 
 $processed = $this->getProcessed();
 
-if ($form_action == "ask-delete")
-{
-    if ($this -> isFKDataExists() == false)
-    {
-        //if($this-> FG_FK_DELETE_ALLOWED == true && $this->FG_FK_WARNONLY == false)
-        {
-            $this-> FG_FK_DELETE_ALLOWED = false;
-            $this -> FG_ISCHILDS = false;
-            $this-> FG_FK_WARNONLY = false;
-            $this->FG_FK_DELETE_CONFIRM = false;
-        }
-
+if ($form_action == "ask-delete") {
+    if ($this -> isFKDataExists() == false) {
+        //if($this-> FG_FK_DELETE_ALLOWED == true && $this->FG_FK_WARNONLY == false){
+        $this-> FG_FK_DELETE_ALLOWED = false;
+        $this -> FG_ISCHILDS = false;
+        $this-> FG_FK_WARNONLY = false;
+        $this->FG_FK_DELETE_CONFIRM = false;
     }
-
 }
 ?>
 
 <script language="JavaScript" type="text/JavaScript">
-<!--
 function sendto(action, record, field_inst, instance){
   document.myForm.submit();
 }
-//-->
 </script>
 
 <?php
 if ($this->FG_FK_DELETE_CONFIRM && $form_action == "ask-del-confirm" && $this-> FG_FK_DELETE_ALLOWED)
 { ?>
 
-<FORM action=<?php echo $_SERVER['PHP_SELF']?> id="myForm" method="post" name="myForm">
+<FORM action=<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?> id="myForm" method="post" name="myForm">
 	<INPUT type="hidden" name="id" value="<?php echo $id?>">
 	<INPUT type="hidden" name="atmenu" value="<?php echo $atmenu?>">
 	<INPUT type="hidden" name="form_action" value="delete">
@@ -91,7 +83,7 @@ function sendto(action, record, field_inst, instance){
 	  	<td class="delform_table3_td1" valign="top"> <span class="textnegrita"><?php echo $this->FG_INTRO_TEXT_ASK_DELETION?></span></td>
 	</tr>
 </table>
-<FORM action=<?php echo $_SERVER['PHP_SELF']?> id="myForm" method="post" name="myForm">
+<FORM action=<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?> id="myForm" method="post" name="myForm">
 	<INPUT type="hidden" name="id" value="<?php echo $id?>">
 	<INPUT type="hidden" name="atmenu" value="<?php echo $atmenu?>">
     <INPUT type="hidden" name="fkCount" value="<?php echo $this -> FG_FK_RECORDS_COUNT;?>">
@@ -103,6 +95,14 @@ function sendto(action, record, field_inst, instance){
     <?php }else { ?>
     <INPUT type="hidden" name="form_action" value="delete">
     <?php }  ?>
+    <?php
+        if ($this->FG_CSRF_STATUS == true) {
+    ?>
+        <input type="hidden" name="<?php echo $this->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $this->FG_FORM_UNIQID; ?>" />
+        <input type="hidden" name="<?php echo $this->FG_CSRF_FIELD ?>" value="<?php echo $this->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
 
 	<?php
 	if (!is_null($this->FG_QUERY_EDITION_HIDDEN_FIELDS) && $this->FG_QUERY_EDITION_HIDDEN_FIELDS!=""){
diff --git a/common/lib/Form/Class.FormHandler.EditForm.inc.php b/common/lib/Form/Class.FormHandler.EditForm.inc.php
old mode 100644
new mode 100755
index 014db6bd0..fe1a5df84
--- a/common/lib/Form/Class.FormHandler.EditForm.inc.php
+++ b/common/lib/Form/Class.FormHandler.EditForm.inc.php
@@ -4,48 +4,43 @@
 
 <script language="JavaScript" src="./javascript/calonlydays.js"></script>
 <script language="JavaScript" type="text/JavaScript">
-<!--
+
 function MM_openBrWindow(theURL,winName,features) {
-  window.open(theURL,winName,features);
+    window.open(theURL,winName,features);
 }
 
-function sendto(action, record, field_inst, instance)
-{
-  //alert ("action:" + action);
-  document.myForm.form_action.value = action;
-  document.myForm.sub_action.value = record;
-  if (field_inst != null) document.myForm.elements[field_inst].value = instance;
-  document.myForm.submit();
+function sendto(action, record, field_inst, instance) {
+    document.myForm.form_action.value = action;
+    document.myForm.sub_action.value = record;
+    if (field_inst != null) document.myForm.elements[field_inst].value = instance;
+    document.myForm.submit();
 }
 
-function sendtolittle(direction)
-{
-  document.myForm.action=direction;
-  document.myForm.submit();
-
+function sendtolittle(direction) {
+    document.myForm.action=direction;
+    document.myForm.submit();
 }
-//-->
 </script>
 
-<FORM action=<?php echo $_SERVER['PHP_SELF']?> method=post name="myForm" id="myForm">
+<FORM action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) ?>" method="POST" name="myForm" id="myForm">
 
 <table class="editform_table1" cellspacing="2">
-        <INPUT type="hidden" name="id" value="<?php echo $id?>">
-        <INPUT type="hidden" name="form_action" value="edit">
-        <INPUT type="hidden" name="sub_action" value="">
-        <INPUT type="hidden" name="atmenu" value="<?php echo $atmenu?>">
-        <INPUT type="hidden" name="stitle" value="<?php echo $stitle?>">
-        <INPUT type="hidden" name="current_page" value="<?php echo $processed['current_page'];?>">
-        <INPUT type="hidden" name="order" value="<?php echo $processed['order'];?>">
-        <INPUT type="hidden" name="sens" value="<?php echo $processed['sens'];?>">
-        <?php
-        if ($this->FG_CSRF_STATUS == true) {
-        ?>
-            <input type="hidden" name="<?php echo $this->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $this->FG_FORM_UNIQID; ?>" />
-            <input type="hidden" name="<?php echo $this->FG_CSRF_FIELD ?>" value="<?php echo $this->FG_CSRF_TOKEN; ?>" />
-        <?php
-        }
-        ?>
+    <INPUT type="hidden" name="id" value="<?php echo $id?>">
+    <INPUT type="hidden" name="form_action" value="edit">
+    <INPUT type="hidden" name="sub_action" value="">
+    <INPUT type="hidden" name="atmenu" value="<?php echo $atmenu?>">
+    <INPUT type="hidden" name="stitle" value="<?php echo $stitle?>">
+    <INPUT type="hidden" name="current_page" value="<?php echo $processed['current_page'];?>">
+    <INPUT type="hidden" name="order" value="<?php echo $processed['order'];?>">
+    <INPUT type="hidden" name="sens" value="<?php echo $processed['sens'];?>">
+    <?php
+    if ($this->FG_CSRF_STATUS == true) {
+    ?>
+        <input type="hidden" name="<?php echo $this->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $this->FG_FORM_UNIQID; ?>" />
+        <input type="hidden" name="<?php echo $this->FG_CSRF_FIELD ?>" value="<?php echo $this->FG_CSRF_TOKEN; ?>" />
+    <?php
+    }
+    ?>
 
 <?php
     if (!empty($this->FG_QUERY_EDITION_HIDDEN_FIELDS)) {
diff --git a/common/lib/Form/Class.FormHandler.inc.php b/common/lib/Form/Class.FormHandler.inc.php
old mode 100644
new mode 100755
index 7be5473ad..48a06d680
--- a/common/lib/Form/Class.FormHandler.inc.php
+++ b/common/lib/Form/Class.FormHandler.inc.php
@@ -543,24 +543,45 @@ function FormHandler ($tablename=null, $instance_name=null, $action=null, $table
 
 		$this -> set_regular_expression();
 
-		$this->_action = $action ? $action : $_SERVER['PHP_SELF'];
+		$this ->_action = $action ? $action : filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL);
 
         // If anti CSRF protection is enabled
         if ($this->FG_CSRF_STATUS == true) {
             // Initializing anti csrf token (Generate a key, concat it with salt and hash it)
             $this -> FG_CSRF_TOKEN_KEY = $this->genCsrfTokenKey();
-            $this -> FG_CSRF_TOKEN     = $this->FG_CSRF_TOKEN_SALT.$this->FG_CSRF_TOKEN_KEY;
-            $this -> FG_CSRF_TOKEN     = hash('SHA256', $this->FG_CSRF_TOKEN);
-
-            $this -> FG_FORM_UNIQID                                   = uniqid();
-            $this -> FG_FORM_RECEIVED_UNIQID                          = $_POST[$this->FG_FORM_UNIQID_FIELD];
-            $this -> FG_CSRF_RECEIVED_TOKEN                           = $_SESSION[$this->FG_FORM_RECEIVED_UNIQID]['CSRF_TOKEN'];
-            $_SESSION['CSRF_TOKEN'][$this->FG_FORM_RECEIVED_UNIQID] = $this->FG_CSRF_TOKEN;
+            $this -> FG_CSRF_TOKEN = $this->FG_CSRF_TOKEN_SALT.$this->FG_CSRF_TOKEN_KEY;
+            $this -> FG_CSRF_TOKEN = hash('SHA256', $this->FG_CSRF_TOKEN);
+            $this -> FG_FORM_UNIQID = uniqid();
+            // print $this -> FG_FORM_UNIQID;
+            // echo "<br/>------_POST-------<br/>";
+            // print_r($_POST);
+            // echo "<br/>-------_SESSION------<br/>";
+            // print_r($_SESSION);
+
+            $this -> FG_FORM_RECEIVED_UNIQID = $_POST[$this->FG_FORM_UNIQID_FIELD];
+            $this -> FG_FORM_RECEIVED_TOKEN = $_POST[$this->FG_CSRF_FIELD];
+            $this -> FG_CSRF_RECEIVED_TOKEN = $_SESSION['CSRF_TOKEN'][$this->FG_FORM_RECEIVED_UNIQID];
+            $_SESSION['CSRF_TOKEN'][$this->FG_FORM_UNIQID] = $this->FG_CSRF_TOKEN;
+            // echo "<br/>------_SESSION::-------<br/>";
+            // print_r($_SESSION);
 
             if ($this->FG_DEBUG) {
+                echo 'FG_FORM_UNIQID : '.$this->FG_FORM_UNIQID.'<br />';
                 echo 'CSRF NEW TOKEN : '.$this->FG_CSRF_TOKEN.'<br />';
                 echo 'CSRF RECEIVED TOKEN : '.$this->FG_CSRF_RECEIVED_TOKEN.'<br />';
             }
+            if (!empty($_POST)) {
+                // Check CSRF
+                if (!$this -> FG_CSRF_RECEIVED_TOKEN or
+                    ($this -> FG_CSRF_RECEIVED_TOKEN != $this -> FG_FORM_RECEIVED_TOKEN)){
+                    echo "CSRF Error!";
+                    exit();
+                } else {
+                    //Remove key from the session
+                    // echo "Remove key from the session";
+                    unset($_SESSION['CSRF_TOKEN'][$this->FG_FORM_RECEIVED_UNIQID]);
+                }
+            }
         }
 
 		$this->_vars = array_merge((array)$_GET, (array)$_POST);
@@ -595,7 +616,6 @@ function FormHandler ($tablename=null, $instance_name=null, $action=null, $table
 		if($this -> FG_ENABLE_LOG == 1) {
 			$this -> logger = new Logger();
 		}
-
 	}
 
 
@@ -651,8 +671,8 @@ function init ()
 		$ext_link ='';
 		if (is_numeric($processed['current_page']))$ext_link.="&current_page=".$processed['current_page'];
 		if (!empty($processed['order']) && !empty($processed['sens']))$ext_link.="&order=".$processed['order']."&sens=".$processed['sens'];
-		$this -> FG_EDITION_LINK	= $_SERVER['PHP_SELF']."?form_action=ask-edit".$ext_link."&id=";
-		$this -> FG_DELETION_LINK	= $_SERVER['PHP_SELF']."?form_action=ask-delete".$ext_link."&id=";
+		$this -> FG_EDITION_LINK	= filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?form_action=ask-edit".$ext_link."&id=";
+		$this -> FG_DELETION_LINK	= filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?form_action=ask-delete".$ext_link."&id=";
 
 		$this -> FG_DELETE_ALT = gettext("Delete this ").$this -> FG_INSTANCE_NAME;
 		$this -> FG_EDIT_ALT = gettext("Edit this ").$this -> FG_INSTANCE_NAME;
@@ -708,7 +728,7 @@ function &getProcessed()
 		return $this->_processed;
 	}
 
-	function cleanInput($input)
+	function sanitize_tag($input)
 	{
 		$search = array(
 		    '@<script[^>]*?>.*?</script>@si',   // Strip out javascript
@@ -736,7 +756,6 @@ function cleanInput($input)
 	 * @ 6. $char_limit
 	 * @ 7. $lie_type ("lie", "list") , where lie is used for sql. ( TODO : any reason to keep lie instead of sql ?.)
 	 * @ 8. $lie_with (SQL query with the tag '%1' || a defined list: $tablelist["nbcode"] )
-
 	 * OLD
 	 * @ 8. $lie_with tablename
 	 * @ 9. $lie_fieldname
@@ -865,11 +884,9 @@ function set_alttext ($alttext_edit=null, $alttext_delete=null)
 	 * @.8 $feed_selectfield - if the fieldtype = SELECT, [define a sql to feed it] OR [define a array to use]
 	 * @.9 $displayformat_selectfield - if the fieldtype = SELECT and fieldname of sql > 1 is useful to define the format to show the data (ie: "%1 : (%2)")
 	 * @.10 $config_radiobouttonfield - if the fieldtype = RADIOBUTTON : config format - valuename1 :value1, valuename2 :value2,...  (ie: "Yes :t, - No:f")
-
 	 * @.12 $check_emptyvalue - ("no" or "yes") if "no" we we check the regularexpression only if a value has been entered
 	 * @.13 $attach2table - yes
 	 * @.14 $attach2table_conf - "doc_tariff:call_tariff_id:call_tariff:webm_retention, id, country_id:id IN (select call_tariff_id from doc_tariff where document_id = %id) AND cttype='PHONE':document_id:%1 - (%3):2:country:label, id:%1:id='%1'"
-
 	 * @.END $comment - set a comment to display below the field
      */
 
@@ -1151,14 +1168,14 @@ function perform_action (&$form_action){
 			case "ask-add":
 			case "add":
 			   if(!$this->FG_ADDITION){
-			   		Header ("Location: ". $_SERVER['PHP_SELF']);
+			   		Header ("Location: ". filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL));
 			   		die();
 			   	}
 			   break;
 			case "ask-edit":
 			case "edit":
 				 if(!$this->FG_EDITION){
-			   		Header ("Location: ". $_SERVER['PHP_SELF']);
+			   		Header ("Location: ". filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL));
 			   		die();
 			   	}
 			   break;
@@ -1166,7 +1183,7 @@ function perform_action (&$form_action){
 			case "ask-delete":
 			case "delete":
 			   if(!$this->FG_DELETION){
-			   		Header ("Location: ". $_SERVER['PHP_SELF']);
+			   		Header ("Location: ". filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL));
 			   		die();
 			   }
 			   break;
@@ -1189,7 +1206,7 @@ function perform_action (&$form_action){
 			if(!empty($this->FG_GO_LINK_AFTER_ACTION_DELETE)){
 				Header ("Location: ".$this->FG_GO_LINK_AFTER_ACTION_DELETE.$processed['id']);
 			}else{
-				Header ("Location: ". $_SERVER['PHP_SELF']);
+				Header ("Location: ". filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL));
 			}
 			die();
 		}
@@ -1214,7 +1231,7 @@ function perform_action (&$form_action){
                     case 'edit':
                     case 'delete':
                         if ($this->_processed[$this->FG_CSRF_RECEIVED_FIELD] != $this->FG_CSRF_RECEIVED_TOKEN) {
-                            Header ("Location: ". $_SERVER['PHP_SELF']);
+                            Header ("Location: ". filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL));
                             die();
                         }
                     break;
@@ -2000,9 +2017,18 @@ function create_select_form()
 	<?php  if (!empty($this->FG_TOP_FILTER_NAME)) echo "<font size=\"1\">$this->FG_TOP_FILTER_NAME</font><br>"; ?>
 
 	<!-- ** ** ** ** ** Part for the select form  ** ** ** ** ** -->
-	<FORM METHOD=POST ACTION="<?php echo $_SERVER['PHP_SELF']?>?s=1&t=0&order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
-	<INPUT TYPE="hidden" NAME="posted" value=1>
-	<INPUT TYPE="hidden" NAME="current_page" value=0>
+	<FORM METHOD="POST" ACTION="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>?s=1&t=0&order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
+	<INPUT TYPE="hidden" NAME="posted" value="1">
+	<INPUT TYPE="hidden" NAME="current_page" value="0">
+    <?php
+        if ($this->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $this->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $this->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $this->FG_CSRF_FIELD ?>" value="<?php echo $this->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
+
 		<table class="form_selectform" cellspacing="1">
 
 			<tr>
@@ -2027,7 +2053,7 @@ function create_select_form()
 						<input type="image"  name="image16" align="top" border="0" src="<?php echo Images_Path_Main;?>/button-search.gif" />
 						<?php
 						if(!empty($_SESSION['def_ratecard_tariffgroup'])) { ?>
-                    	- <a href="<?php echo $_SERVER['PHP_SELF']?>?cancelsearch_callplanlcr=true"><font color="red"><b><img src="<?php echo KICON_PATH; ?>/button_cancel.gif" height="16"> Cancel Search</b></font></a>&nbsp;
+                    	- <a href="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>?cancelsearch_callplanlcr=true"><font color="red"><b><img src="<?php echo KICON_PATH; ?>/button_cancel.gif" height="16"> Cancel Search</b></font></a>&nbsp;
                     <?php } ?>
 	  				</td>
 
@@ -2064,9 +2090,18 @@ function create_select_form_client($table_cluase = "")
 	  <!-- ** ** ** ** ** Part for the select form  ** ** ** ** ** -->
 
 		<table class="form_selectform" >
-			<FORM METHOD=POST ACTION="<?php echo $_SERVER['PHP_SELF']?>?s=1&t=0&order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
-				<INPUT TYPE="hidden" NAME="posted" value=1>
-				<INPUT TYPE="hidden" NAME="current_page" value=0>
+			<FORM METHOD="POST" ACTION="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>?s=1&t=0&order=<?php echo $order?>&sens=<?php echo $sens?>&current_page=<?php echo $current_page?>">
+				<INPUT TYPE="hidden" NAME="posted" value="1">
+				<INPUT TYPE="hidden" NAME="current_page" value="0">
+
+                <?php
+                    if ($this->FG_CSRF_STATUS == true) {
+                ?>
+                    <INPUT type="hidden" name="<?php echo $this->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $this->FG_FORM_UNIQID; ?>" />
+                    <INPUT type="hidden" name="<?php echo $this->FG_CSRF_FIELD ?>" value="<?php echo $this->FG_CSRF_TOKEN; ?>" />
+                <?php
+                    }
+                ?>
 
 			<tr>
 				<td align="left" valign="top" class="form_selectform_td1">
diff --git a/common/lib/Form/Class.SearchHandler.inc.php b/common/lib/Form/Class.SearchHandler.inc.php
old mode 100644
new mode 100755
index c5dcab458..c875b8db6
--- a/common/lib/Form/Class.SearchHandler.inc.php
+++ b/common/lib/Form/Class.SearchHandler.inc.php
@@ -8,9 +8,17 @@
     <center>
         <b><?php echo $this -> FG_FILTER_SEARCH_TOP_TEXT?></b>
         <table class="searchhandler_table1">
-        <FORM METHOD=POST ACTION="<?php echo $_SERVER['PHP_SELF']?>?s=<?php echo $processed['s']?>&t=<?php echo $processed['t']?>&order=<?php echo $processed['order']?>&sens=<?php echo $processed['sens']?>&current_page=<?php echo $processed['current_page']?>">
+        <FORM METHOD="POST" ACTION="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>?s=<?php echo $processed['s']?>&t=<?php echo $processed['t']?>&order=<?php echo $processed['order']?>&sens=<?php echo $processed['sens']?>&current_page=<?php echo $processed['current_page']?>">
         <INPUT TYPE="hidden" NAME="posted_search" value="1">
         <INPUT TYPE="hidden" NAME="current_page" value="0">
+        <?php
+            if ($this->FG_CSRF_STATUS == true) {
+        ?>
+            <INPUT type="hidden" name="<?php echo $this->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $this->FG_FORM_UNIQID; ?>" />
+            <INPUT type="hidden" name="<?php echo $this->FG_CSRF_FIELD ?>" value="<?php echo $this->FG_CSRF_TOKEN; ?>" />
+        <?php
+            }
+        ?>
 
         <?php if ($this -> FG_FILTER_SEARCH_1_TIME) { ?>
             <tr>
@@ -287,9 +295,9 @@
                 <td class="bgcolor_005" align="center">
                     <input type="image"  name="image16" align="top" border="0" src="<?php echo Images_Path_Main;?>/button-search.gif" />
                     <?php if (isset($_SESSION[$this->FG_FILTER_SEARCH_SESSION_NAME]) && strlen($_SESSION[$this->FG_FILTER_SEARCH_SESSION_NAME])>10 ) { ?>
-                        - <a href="<?php echo $_SERVER['PHP_SELF']?>?cancelsearch=true"><font color="red"><b><img src="<?php echo KICON_PATH; ?>/button_cancel.gif" height="16"> Cancel Search</b></font></a>&nbsp;
+                        - <a href="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>?cancelsearch=true"><font color="red"><b><img src="<?php echo KICON_PATH; ?>/button_cancel.gif" height="16"> Cancel Search</b></font></a>&nbsp;
                         <?php if ($this -> FG_FILTER_SEARCH_DELETE_ALL) { ?>
-                            - <a href="<?php echo $_SERVER['PHP_SELF']?>?deleteselected=true" onclick="return confirm('<?php echo "Are you sure to delete ".$this -> FG_NB_RECORD." selected records?";?>');"><font color="red"><b>Delete All</b></font></a>
+                            - <a href="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>?deleteselected=true" onclick="return confirm('<?php echo "Are you sure to delete ".$this -> FG_NB_RECORD." selected records?";?>');"><font color="red"><b>Delete All</b></font></a>
                         <?php } ?>
                     <?php } ?>
                   </td>
@@ -314,7 +322,7 @@
 <b><?php echo gettext("There is");?>&nbsp;<?php echo $nb_record ?>&nbsp;<?php echo gettext("selected, use the option below if you are willing to make a batch updated of the selected cards.");?></b>
        <table cellspacing="1"  class="searchhandler_table4">
         <tbody>
-        <form name="updateForm" action="<?php echo $_SERVER['PHP_SELF']?>" method="post">
+        <form name="updateForm" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>" method="post">
         <INPUT type="hidden" name="batchupdate" value="1">
 
         <tr>
diff --git a/common/lib/Form/Class.ViewHandler.inc.php b/common/lib/Form/Class.ViewHandler.inc.php
old mode 100644
new mode 100755
index 9da3c187c..7497dec43
--- a/common/lib/Form/Class.ViewHandler.inc.php
+++ b/common/lib/Form/Class.ViewHandler.inc.php
@@ -2,9 +2,9 @@
 
 // Hack to allow PHP4 use stripos() that is only supported in PHP5
 if (!function_exists("stripos")) {
-	function stripos($str,$needle) {
-		return strpos(strtolower($str),strtolower($needle));
-	}
+    function stripos($str,$needle) {
+        return strpos(strtolower($str),strtolower($needle));
+    }
 }
 
 
@@ -16,845 +16,844 @@ function stripos($str,$needle) {
 
 
 if( !($popup_select>=1) &&($this->FG_LIST_ADDING_BUTTON1 || $this->FG_LIST_ADDING_BUTTON2)) {
-	?>
-	<table align="right"><tr align="right">
-        <td align="right"> 
-		<?php if($this->FG_LIST_ADDING_BUTTON1) {?>
-			<a href="<?php echo $this -> FG_LIST_ADDING_BUTTON_LINK1	?>"> <?php echo $this -> FG_LIST_ADDING_BUTTON_MSG1?>&nbsp;&nbsp;<img src="<?php echo $this -> FG_LIST_ADDING_BUTTON_IMG1?>" border="0" title="<?php echo $this->FG_LIST_ADDING_BUTTON_ALT1?>" alt="<?php echo $this->FG_LIST_ADDING_BUTTON_ALT1?>"></a>
-		<?php  } //END IF ?>
-		&nbsp;
-		<?php if($this->FG_LIST_ADDING_BUTTON2) {?>
-			<a href="<?php echo $this -> FG_LIST_ADDING_BUTTON_LINK2	?>"> <?php echo $this -> FG_LIST_ADDING_BUTTON_MSG2?>&nbsp;&nbsp;<img src="<?php echo $this -> FG_LIST_ADDING_BUTTON_IMG2?>" border="0" title="<?php echo $this->FG_LIST_ADDING_BUTTON_ALT2?>" alt="<?php echo $this->FG_LIST_ADDING_BUTTON_ALT2?>"></a>
-		<?php  } //END IF ?>
-		  </td>
-	 </tr></table>
+    ?>
+    <table align="right"><tr align="right">
+        <td align="right">
+        <?php if($this->FG_LIST_ADDING_BUTTON1) {?>
+            <a href="<?php echo $this -> FG_LIST_ADDING_BUTTON_LINK1    ?>"> <?php echo $this -> FG_LIST_ADDING_BUTTON_MSG1?>&nbsp;&nbsp;<img src="<?php echo $this -> FG_LIST_ADDING_BUTTON_IMG1?>" border="0" title="<?php echo $this->FG_LIST_ADDING_BUTTON_ALT1?>" alt="<?php echo $this->FG_LIST_ADDING_BUTTON_ALT1?>"></a>
+        <?php  } //END IF ?>
+        &nbsp;
+        <?php if($this->FG_LIST_ADDING_BUTTON2) {?>
+            <a href="<?php echo $this -> FG_LIST_ADDING_BUTTON_LINK2    ?>"> <?php echo $this -> FG_LIST_ADDING_BUTTON_MSG2?>&nbsp;&nbsp;<img src="<?php echo $this -> FG_LIST_ADDING_BUTTON_IMG2?>" border="0" title="<?php echo $this->FG_LIST_ADDING_BUTTON_ALT2?>" alt="<?php echo $this->FG_LIST_ADDING_BUTTON_ALT2?>"></a>
+        <?php  } //END IF ?>
+          </td>
+     </tr></table>
 <?php  } //END IF ?>
 <br>
 <?php
 
 if ((count($list)>0) && is_array($list)){
-	$ligne_number=0;
+    $ligne_number=0;
 ?>
 
 <script language="JavaScript" type="text/JavaScript">
-<!--
-function openURLFilter(theLINK)
-{
-	selInd = document.theFormFilter.choose_list.selectedIndex;
-	if(selInd==0){return false;}
-	goURL = document.theFormFilter.choose_list.options[selInd].value;
-	this.location.href = theLINK + goURL;
+function openURLFilter(theLINK) {
+    selInd = document.theFormFilter.choose_list.selectedIndex;
+    if(selInd==0){return false;}
+    goURL = document.theFormFilter.choose_list.options[selInd].value;
+    this.location.href = theLINK + goURL;
 }
-//-->
 </script>
 
 <img src="<?php echo Images_Path_Main;?>/clear.gif" width="1" height="1"/>
-       
+
 
 <div align="center" style="">
       <table width="<?php echo $this->FG_VIEW_TABLE_WITDH; ?>" align="center" border="0" cellpadding="0" cellspacing="0">
-	  <?php  IF ($this -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE){ ?>
-		<TR>
-		  <TD class="tdstyle_002"><span>
-          	  <b><?php echo $this -> CV_TEXT_TITLE_ABOVE_TABLE?></b></span>
-		  </TD>
+      <?php  IF ($this -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE){ ?>
+        <TR>
+          <TD class="tdstyle_002"><span>
+              <b><?php echo $this -> CV_TEXT_TITLE_ABOVE_TABLE?></b></span>
+          </TD>
         </TR>
-	   <?php  } //END IF ?>
-	  <?php  IF ($this -> CV_DO_ARCHIVE_ALL){ ?>
-		<TR>
-			<FORM NAME="theFormFilter" action="<?php echo $_SERVER['PHP_SELF']?>">
-			<input type="hidden" name="atmenu" value="<?php echo $processed['atmenu']?>">
-			<input type="hidden" name="popup_select" value="<?php echo $processed['popup_select']?>">
-			<input type="hidden" name="popup_formname" value="<?php echo $processed['popup_formname']?>">
-			<input type="hidden" name="popup_fieldname" value="<?php echo $processed['popup_fieldname']?>">
-			<input type="hidden" name="archive" value="true">
+       <?php  } //END IF ?>
+      <?php  IF ($this -> CV_DO_ARCHIVE_ALL){ ?>
+        <TR>
+            <FORM NAME="theFormFilter" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)?>">
+            <input type="hidden" name="atmenu" value="<?php echo $processed['atmenu']?>">
+            <input type="hidden" name="popup_select" value="<?php echo $processed['popup_select']?>">
+            <input type="hidden" name="popup_formname" value="<?php echo $processed['popup_formname']?>">
+            <input type="hidden" name="popup_fieldname" value="<?php echo $processed['popup_fieldname']?>">
+            <input type="hidden" name="archive" value="true">
             <td class="viewhandler_filter_td1">
-				<input type="SUBMIT" value="<?php echo gettext("Archiving All ");?>" class="form_input_button" onclick="return confirm('This action will archive the data, Are you sure?');"/>
-			</td>
-			</FORM>
+                <input type="SUBMIT" value="<?php echo gettext("Archiving All ");?>" class="form_input_button" onclick="return confirm('This action will archive the data, Are you sure?');"/>
+            </td>
+            </FORM>
         </TR>
-	   <?php  } //END IF ?>
-	   <?php  IF ($this -> CV_DISPLAY_FILTER_ABOVE_TABLE){ ?>
-	   <TR><FORM NAME="theFormFilter">
-	   		<input type="hidden" name="popup_select" value="<?php echo $processed['popup_select']?>">
-			<input type="hidden" name="popup_formname" value="<?php echo $processed['popup_formname']?>">
-			<input type="hidden" name="popup_fieldname" value="<?php echo $processed['popup_fieldname']?>">
-                        
+       <?php  } //END IF ?>
+       <?php  IF ($this -> CV_DISPLAY_FILTER_ABOVE_TABLE){ ?>
+       <TR>
+       <FORM NAME="theFormFilter">
+            <input type="hidden" name="popup_select" value="<?php echo $processed['popup_select']?>">
+            <input type="hidden" name="popup_formname" value="<?php echo $processed['popup_formname']?>">
+            <input type="hidden" name="popup_fieldname" value="<?php echo $processed['popup_fieldname']?>">
+
             <TD class="tdstyle_002"><SPAN>
-				<SELECT name="choose_list" size="1" class="form_input_select" style="width: 185px;" onchange="openURLFilter('<?php echo $_SERVER['PHP_SELF'].$this->CV_FILTER_ABOVE_TABLE_PARAM?>')">
-
-					<OPTION><?php echo gettext("Sort");?></OPTION>
-
-					<?php
-						// TODO not sure for what should be used that, because exist already a filter.
-						if (!isset($list_site)) $list_site = $list;
-						foreach ($list_site as $recordset){
-					?>
-					<OPTION class=input value='<?php echo $recordset[0]?>'  <?php if ($recordset[0]==$site_id) echo "selected";?>><?php echo $recordset[1]?></OPTION>
-					<?php 	 }
-					?>
-				</SELECT>
-			  </SPAN></TD></FORM>
+                <SELECT name="choose_list" size="1" class="form_input_select" style="width: 185px;" onchange="openURLFilter('<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL).$this->CV_FILTER_ABOVE_TABLE_PARAM?>')">
+
+                <OPTION><?php echo gettext("Sort");?></OPTION>
+
+                <?php
+                    // TODO not sure for what should be used that, because exist already a filter.
+                    if (!isset($list_site)) $list_site = $list;
+                    foreach ($list_site as $recordset){
+                ?>
+                <OPTION class=input value='<?php echo $recordset[0]?>'  <?php if ($recordset[0]==$site_id) echo "selected";?>><?php echo $recordset[1]?></OPTION>
+                <?php    }
+                ?>
+                </SELECT>
+              </SPAN></TD>
+        </FORM>
         </TR>
-		<?php  } //END IF ?>
+        <?php  } //END IF ?>
 
-		<tr>
+        <tr>
           <td class="viewhandler_table2_td3">
             <table border="0" cellpadding="0" cellspacing="0" width="100%">
                 <tr>
                   <td><span class="viewhandler_span1"> - <?php echo strtoupper($this->CV_TITLE_TEXT) ?>  - </span>
-                  	  <span class="viewhandler_span1"> <?php echo $this -> FG_NB_RECORD.' '.gettext("Records"); ?></span>	
+                      <span class="viewhandler_span1"> <?php echo $this -> FG_NB_RECORD.' '.gettext("Records"); ?></span>
                   </td>
-                  
+
                 </tr>
             </table></td>
         </tr>
 
-		<?php
-		// Add filter  FG_FILTER_APPLY , FG_FILTERFIELD and FG_FILTER_FORM_ACTION
-		if ($this -> FG_FILTER_APPLY || $this -> FG_FILTER_APPLY2){
-		?>
-		<tr><FORM NAME="theFormFilter" action="<?php echo $_SERVER['PHP_SELF']?>">
-			<input type="hidden" name="atmenu" value="<?php echo $processed['atmenu']?>">
-			<input type="hidden" name="popup_select" value="<?php echo $processed['popup_select']?>">
-			<input type="hidden" name="popup_formname" value="<?php echo $processed['popup_formname']?>">
-			<input type="hidden" name="popup_fieldname" value="<?php echo $processed['popup_fieldname']?>">
-            <?php 
-            	foreach ($processed as $key => $val) {
-            		if ($key!='current_page' && $key!='id') {
-            	?>
+        <?php
+        // Add filter  FG_FILTER_APPLY , FG_FILTERFIELD and FG_FILTER_FORM_ACTION
+        if ($this -> FG_FILTER_APPLY || $this -> FG_FILTER_APPLY2){
+        ?>
+        <tr><FORM NAME="theFormFilter" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL);?>">
+            <input type="hidden" name="atmenu" value="<?php echo $processed['atmenu']?>">
+            <input type="hidden" name="popup_select" value="<?php echo $processed['popup_select']?>">
+            <input type="hidden" name="popup_formname" value="<?php echo $processed['popup_formname']?>">
+            <input type="hidden" name="popup_fieldname" value="<?php echo $processed['popup_fieldname']?>">
+            <?php
+                foreach ($processed as $key => $val) {
+                    if (strlen($key) >=1 && $key!='current_page' && $key!='id') {
+                ?>
                    <input type="hidden" name="<?php echo $key?>" value="<?php echo $val?>">
-             	<?php  
-             		}
-            	}
+                <?php
+                    }
+                }
              ?>
-			<INPUT type="hidden" name="form_action"	value="<?php echo $this->FG_FILTER_FORM_ACTION ?>">
+            <INPUT type="hidden" name="form_action" value="<?php echo $this->FG_FILTER_FORM_ACTION ?>">
             <td class="viewhandler_filter_td1">
-			<span >
-			<?php if ($this -> FG_FILTER_APPLY){ ?>
-
-				<font class="viewhandler_filter_on"><?php echo gettext("FILTER ON ");?> <?php echo strtoupper($this->FG_FILTERFIELDNAME)?> :</font>
-				<INPUT type="text" name="filterprefix" value="<?php if(!empty($processed['filterprefix'])) echo $processed['filterprefix']; ?>" class="form_input_text">
-
-				<INPUT type="hidden" name="filterfield"	value="<?php echo $this->FG_FILTERFIELD?>">
-				<?php
-				if ($this -> FG_FILTERTYPE == 'INPUT'){
-					// IT S OK
-				}elseif ($this -> FG_FILTERTYPE == 'POPUPVALUE'){
-				?>
-					<a href="#" onclick="window.open('<?php echo $this->FG_FILTERPOPUP[0]?>popup_formname=theFormFilter&popup_fieldname=filterprefix' <?php echo $this->FG_FILTERPOPUP[1]?>);"><img src="<?php echo Images_Path_Main;?>/icon_arrow_orange.gif"/></a>
-				<?php
-				}
-
-			}
-
-			if ($this -> FG_FILTER_APPLY2){ ?>
-				&nbsp;&nbsp;&nbsp;&nbsp; - &nbsp;&nbsp;&nbsp;&nbsp;
-				<font class="viewhandler_filter_on"><?php echo gettext("FILTER ON");?><?php echo strtoupper($this->FG_FILTERFIELDNAME2)?> :</font>
-				<INPUT type="text" name="filterprefix2" value="" class="form_input_text">
-				<INPUT type="hidden" name="filterfield2"	value="<?php echo $this->FG_FILTERFIELD2?>">
-				<?php
-				if ($this -> FG_FILTERTYPE2 == 'INPUT') {
-					// IT S OK
-				} elseif ($this -> FG_FILTERTYPE2 == 'POPUPVALUE') {
-				?>
-					<a href="#" onclick="window.open('<?php echo $this->FG_FILTERPOPUP2[0]?>popup_formname=theFormFilter&popup_fieldname=filterprefix2' <?php echo $this->FG_FILTERPOPUP2[1]?>);"><img src="<?php echo Images_Path_Main;?>/icon_arrow_orange.gif"/></a>
-				<?php
-				}
-			}
-			?>
-				<input type="SUBMIT" value="<?php echo gettext("APPLY FILTER ");?>" class="form_input_button"/>
-			</span>
-			</td></FORM>
+            <span >
+            <?php if ($this -> FG_FILTER_APPLY){ ?>
+
+                <font class="viewhandler_filter_on"><?php echo gettext("FILTER ON ");?> <?php echo strtoupper($this->FG_FILTERFIELDNAME)?> :</font>
+                <INPUT type="text" name="filterprefix" value="<?php if(!empty($processed['filterprefix'])) echo $processed['filterprefix']; ?>" class="form_input_text">
+
+                <INPUT type="hidden" name="filterfield" value="<?php echo $this->FG_FILTERFIELD?>">
+                <?php
+                if ($this -> FG_FILTERTYPE == 'INPUT'){
+                    // IT S OK
+                }elseif ($this -> FG_FILTERTYPE == 'POPUPVALUE'){
+                ?>
+                    <a href="#" onclick="window.open('<?php echo $this->FG_FILTERPOPUP[0]?>popup_formname=theFormFilter&popup_fieldname=filterprefix' <?php echo $this->FG_FILTERPOPUP[1]?>);"><img src="<?php echo Images_Path_Main;?>/icon_arrow_orange.gif"/></a>
+                <?php
+                }
+
+            }
+
+            if ($this -> FG_FILTER_APPLY2){ ?>
+                &nbsp;&nbsp;&nbsp;&nbsp; - &nbsp;&nbsp;&nbsp;&nbsp;
+                <font class="viewhandler_filter_on"><?php echo gettext("FILTER ON");?><?php echo strtoupper($this->FG_FILTERFIELDNAME2)?> :</font>
+                <INPUT type="text" name="filterprefix2" value="" class="form_input_text">
+                <INPUT type="hidden" name="filterfield2"    value="<?php echo $this->FG_FILTERFIELD2?>">
+                <?php
+                if ($this -> FG_FILTERTYPE2 == 'INPUT') {
+                    // IT S OK
+                } elseif ($this -> FG_FILTERTYPE2 == 'POPUPVALUE') {
+                ?>
+                    <a href="#" onclick="window.open('<?php echo $this->FG_FILTERPOPUP2[0]?>popup_formname=theFormFilter&popup_fieldname=filterprefix2' <?php echo $this->FG_FILTERPOPUP2[1]?>);"><img src="<?php echo Images_Path_Main;?>/icon_arrow_orange.gif"/></a>
+                <?php
+                }
+            }
+            ?>
+                <input type="SUBMIT" value="<?php echo gettext("APPLY FILTER ");?>" class="form_input_button"/>
+            </span>
+            </td></FORM>
         </tr>
-		<?php } ?>
+        <?php } ?>
 
         <TR>
           <TD>
-			<TABLE border="0" cellPadding="2" cellSpacing="2" width="100%">
-				<TR class="form_head">
-				<?php
-					  for($i=0;$i<$this->FG_NB_TABLE_COL;$i++){
-				?>
-				 <td class="tableBody" style="padding: 2px;" align="center" width="<?php echo $this->FG_TABLE_COL[$i][2]?>" >
-						<strong>
-						<?php  if (strtoupper($this->FG_TABLE_COL[$i][4])=="SORT"){?>
-						<a href="<?php  echo $_SERVER['PHP_SELF']."?stitle=$stitle&atmenu=$atmenu&current_page=$current_page&letter=".$processed["letter"]."&popup_select=".$processed["popup_select"]."&order=".$this->FG_TABLE_COL[$i][1]."&sens="; if ($this->FG_SENS=="ASC"){echo"DESC";}else{echo"ASC";} echo $this-> CV_FOLLOWPARAMETERS;?>">
-						<font color="#FFFFFF"><?php  } ?>
-						<?php echo $this->FG_TABLE_COL[$i][0]?>
-						<?php if ($this->FG_ORDER==$this->FG_TABLE_COL[$i][1] && $this->FG_SENS=="ASC"){?>
-						&nbsp;<img src="<?php echo Images_Path_Main;?>/icon_up_12x12.GIF" border="0">
-						<?php }elseif ($this->FG_ORDER==$this->FG_TABLE_COL[$i][1] && $this->FG_SENS=="DESC"){?>
-						&nbsp;<img src="<?php echo Images_Path_Main;?>/icon_down_12x12.GIF" border="0">
-						<?php }?>
-						<?php  if (strtoupper($this->FG_TABLE_COL[$i][4])=="SORT"){?>
-						</font></a>
-						<?php }?>
-						</strong></TD>
-			   <?php }
-				 if ($this->FG_DELETION || $this->FG_INFO || $this->FG_EDITION || $this -> FG_OTHER_BUTTON1 || $this -> FG_OTHER_BUTTON2 || $this -> FG_OTHER_BUTTON3 || $this -> FG_OTHER_BUTTON4 ){ ?>
-					 <td width="<?php echo $this->FG_ACTION_SIZE_COLUMN?>" align="center" class="tableBody" ><strong> <?php echo gettext("ACTION");?></strong> </td>
-			   <?php } ?>
+            <TABLE border="0" cellPadding="2" cellSpacing="2" width="100%">
+                <TR class="form_head">
+                <?php
+                      for($i=0;$i<$this->FG_NB_TABLE_COL;$i++){
+                ?>
+                 <td class="tableBody" style="padding: 2px;" align="center" width="<?php echo $this->FG_TABLE_COL[$i][2]?>" >
+                        <strong>
+                        <?php  if (strtoupper($this->FG_TABLE_COL[$i][4])=="SORT"){?>
+                        <a href="<?php  echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?stitle=$stitle&atmenu=$atmenu&current_page=$current_page&letter=".$processed["letter"]."&popup_select=".$processed["popup_select"]."&order=".$this->FG_TABLE_COL[$i][1]."&sens="; if ($this->FG_SENS=="ASC"){echo"DESC";}else{echo"ASC";} echo $this-> CV_FOLLOWPARAMETERS;?>">
+                        <font color="#FFFFFF"><?php  } ?>
+                        <?php echo $this->FG_TABLE_COL[$i][0]?>
+                        <?php if ($this->FG_ORDER==$this->FG_TABLE_COL[$i][1] && $this->FG_SENS=="ASC"){?>
+                        &nbsp;<img src="<?php echo Images_Path_Main;?>/icon_up_12x12.GIF" border="0">
+                        <?php }elseif ($this->FG_ORDER==$this->FG_TABLE_COL[$i][1] && $this->FG_SENS=="DESC"){?>
+                        &nbsp;<img src="<?php echo Images_Path_Main;?>/icon_down_12x12.GIF" border="0">
+                        <?php }?>
+                        <?php  if (strtoupper($this->FG_TABLE_COL[$i][4])=="SORT"){?>
+                        </font></a>
+                        <?php }?>
+                        </strong></TD>
+               <?php }
+                 if ($this->FG_DELETION || $this->FG_INFO || $this->FG_EDITION || $this -> FG_OTHER_BUTTON1 || $this -> FG_OTHER_BUTTON2 || $this -> FG_OTHER_BUTTON3 || $this -> FG_OTHER_BUTTON4 ){ ?>
+                     <td width="<?php echo $this->FG_ACTION_SIZE_COLUMN?>" align="center" class="tableBody" ><strong> <?php echo gettext("ACTION");?></strong> </td>
+               <?php } ?>
                 </TR>
-		<?php
-			/**********************   START BUILDING THE TABLE WITH BROWSING VALUES ************************/
-			for ($ligne_number=0;$ligne_number<count($list);$ligne_number++){
-		?>
-
-				<TR bgcolor="<?php echo $this->FG_TABLE_ALTERNATE_ROW_COLOR[$ligne_number%2]?>"  onmouseover="bgColor='#FFDEA6'" onMouseOut="bgColor='<?php echo $this->FG_TABLE_ALTERNATE_ROW_COLOR[$ligne_number%2]?>'">
-		  		<?php
-				$k=0;
-				for($i=0;$i<$this->FG_NB_TABLE_COL;$i++) {
-					/**********************   select the mode to browse define the column value : lie, list, value, eval.... ************************/
-					if ($this->FG_TABLE_COL[$i][6]=="lie") {
-
-						$instance_sub_table = new Table($this->FG_TABLE_COL[$i][7], $this->FG_TABLE_COL[$i][8]);
-						$sub_clause = str_replace("%id", $list[$ligne_number][$i-$k], $this->FG_TABLE_COL[$i][9]);
-
-						$select_list = $instance_sub_table -> Get_list ($this->DBHandle, $sub_clause, null, null, null, null, null, null, null, 10);
-						$field_list_sun = preg_split('/,/', $this->FG_TABLE_COL[$i][8]);
-						$record_display = $this->FG_TABLE_COL[$i][10];
-
-						for ($l=1;$l<=count($field_list_sun);$l++){
-							$record_display = str_replace("%$l", $select_list[0][$l-1], $record_display);
-						}
-
-					} elseif($this->FG_TABLE_COL[$i][6]=="lie_link") {
-
-						$instance_sub_table = new Table($this->FG_TABLE_COL[$i][7], $this->FG_TABLE_COL[$i][8]);
-						$sub_clause = str_replace("%id", $list[$ligne_number][$i-$k], $this->FG_TABLE_COL[$i][9]);
-						$select_list = $instance_sub_table -> Get_list ($this->DBHandle, $sub_clause, null, null, null, null, null, null, null, 10);
-						
-						if (is_array($select_list)) {
-							$field_list_sun = preg_split('/,/',$this->FG_TABLE_COL[$i][8]);
-							$record_display = $this->FG_TABLE_COL[$i][10];
-							$link = $this->FG_TABLE_COL[$i][12];
-							if (stripos($this->FG_TABLE_COL[$i][12],'form_action')===false) $link .= "?form_action=ask-edit&";
-							else $link .= "?";
-							$link.= "id=".$select_list[0][1];
-							for ($l=1;$l<=count($field_list_sun);$l++){
-								$val = str_replace("%$l", $select_list[0][$l-1], $record_display);
-								$record_display = "<a href='$link'>$val</a>";
-							}
-						} else {
-							$record_display="";
-						}
-					} elseif ($this->FG_TABLE_COL[$i][6]=="eval") {
-
-						$string_to_eval = $this->FG_TABLE_COL[$i][7]; // %4-%3
-						for ($ll=15;$ll>=0;$ll--){
-							if ($list[$ligne_number][$ll]=='') $list[$ligne_number][$ll]=0;
-							$string_to_eval = str_replace("%$ll", $list[$ligne_number][$ll], $string_to_eval);
-						}
-						eval("\$eval_res = $string_to_eval;");
-						$record_display = $eval_res;
-						
-					} elseif ($this->FG_TABLE_COL[$i][6]=="list") {
-
-						$select_list = $this->FG_TABLE_COL[$i][7];
-						$record_display = $select_list[$list[$ligne_number][$i-$k]][0];
-						
-					} elseif ($this->FG_TABLE_COL[$i][6]=="list-conf") {
-
-						$select_list = $this->FG_TABLE_COL[$i][7];
-						$key_config =  $list[$ligne_number][$i-$k + 3];
-						$record_display = $select_list[$key_config][0];
-						
-					} elseif ($this->FG_TABLE_COL[$i][6]=="value") {
-
-						$record_display = $this->FG_TABLE_COL[$i][7];
-						$k++;
-						
-					} else {
-
-						$record_display = $list[$ligne_number][$i-$k];
-
-					}
-
-					/**********************   IF LENGHT OF THE VALUE IS TOO LONG IT MIGHT BE CUT ************************/
-					if ( is_numeric($this->FG_TABLE_COL[$i][5]) && (strlen($record_display) > $this->FG_TABLE_COL[$i][5])  ){
-						$record_display = substr($record_display, 0, $this->FG_TABLE_COL[$i][5])."";
-					} ?>
-					<TD vAlign="top" align="<?php echo $this->FG_TABLE_COL[$i][3]?>" class="tableBody"><?php
-						$origlist[$ligne_number][$i-$k] = $list[$ligne_number][$i-$k];
-						$list[$ligne_number][$i-$k] = $record_display;
-
-						if (isset ($this->FG_TABLE_COL[$i][11]) && strlen($this->FG_TABLE_COL[$i][11])>1) {
-							print call_user_func($this->FG_TABLE_COL[$i][11], $record_display);
-						} else {
-							echo stripslashes($record_display);
-						}
-						?>
-					</TD>
-
-		 		 <?php  } ?>
-
-				  	<?php if($this->FG_EDITION  || $this->FG_INFO || $this->FG_DELETION || $this -> FG_OTHER_BUTTON1 || $this -> FG_OTHER_BUTTON2 || $this -> FG_OTHER_BUTTON3 || $this -> FG_OTHER_BUTTON4 ){?>
-					  <TD align="center" vAlign=top class=tableBodyRight>
-					
-						<?php if($this->FG_INFO){?>&nbsp; <a href="<?php echo $this->FG_INFO_LINK?><?php echo $list[$ligne_number][$this->FG_NB_TABLE_COL]?>"><img src="<?php echo Images_Path_Main;?>/<?php echo $this->FG_INFO_IMG?>" border="0" title="<?php echo $this->FG_INFO_ALT?>" alt="<?php echo $this->FG_INFO_ALT?>"></a><?php } ?>
-						<?php if($this->FG_EDITION){
-							$check = true;
-					  		$condition_eval=$this->FG_EDITION_CONDITION;
-							$check_eval=false;	
-					  		if (!empty($this->FG_EDITION_CONDITION) && (preg_match ('/col[0-9]/i', $this->FG_EDITION_CONDITION))) {
-					  			$check =false;
-								for ($h=count($list[$ligne_number]);$h>=0;$h--){
-									$findme = "|col$h|";
-									$pos = stripos($condition_eval, $findme);
-									if ($pos !== false) {
-										$condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
-									}
-								}
-								eval('$check_eval = '.$condition_eval.';');	
-							}
-					  		if($check || $check_eval){
-							
-							?>&nbsp; <a href="<?php echo $this->FG_EDITION_LINK?><?php echo $list[$ligne_number][$this->FG_NB_TABLE_COL]?>"><img src="<?php echo Images_Path_Main;?>/<?php echo $this->FG_EDITION_IMG?>" border="0" title="<?php echo $this->FG_EDIT_ALT?>" alt="<?php echo $this->FG_EDIT_ALT?>"></a>
-						<?php }
-							} ?>
+        <?php
+            /**********************   START BUILDING THE TABLE WITH BROWSING VALUES ************************/
+            for ($ligne_number=0;$ligne_number<count($list);$ligne_number++){
+        ?>
+
+                <TR bgcolor="<?php echo $this->FG_TABLE_ALTERNATE_ROW_COLOR[$ligne_number%2]?>"  onmouseover="bgColor='#FFDEA6'" onMouseOut="bgColor='<?php echo $this->FG_TABLE_ALTERNATE_ROW_COLOR[$ligne_number%2]?>'">
+                <?php
+                $k=0;
+                for($i=0;$i<$this->FG_NB_TABLE_COL;$i++) {
+                    /**********************   select the mode to browse define the column value : lie, list, value, eval.... ************************/
+                    if ($this->FG_TABLE_COL[$i][6]=="lie") {
+
+                        $instance_sub_table = new Table($this->FG_TABLE_COL[$i][7], $this->FG_TABLE_COL[$i][8]);
+                        $sub_clause = str_replace("%id", $list[$ligne_number][$i-$k], $this->FG_TABLE_COL[$i][9]);
+
+                        $select_list = $instance_sub_table -> Get_list ($this->DBHandle, $sub_clause, null, null, null, null, null, null, null, 10);
+                        $field_list_sun = preg_split('/,/', $this->FG_TABLE_COL[$i][8]);
+                        $record_display = $this->FG_TABLE_COL[$i][10];
+
+                        for ($l=1;$l<=count($field_list_sun);$l++){
+                            $record_display = str_replace("%$l", $select_list[0][$l-1], $record_display);
+                        }
+
+                    } elseif($this->FG_TABLE_COL[$i][6]=="lie_link") {
+
+                        $instance_sub_table = new Table($this->FG_TABLE_COL[$i][7], $this->FG_TABLE_COL[$i][8]);
+                        $sub_clause = str_replace("%id", $list[$ligne_number][$i-$k], $this->FG_TABLE_COL[$i][9]);
+                        $select_list = $instance_sub_table -> Get_list ($this->DBHandle, $sub_clause, null, null, null, null, null, null, null, 10);
+
+                        if (is_array($select_list)) {
+                            $field_list_sun = preg_split('/,/',$this->FG_TABLE_COL[$i][8]);
+                            $record_display = $this->FG_TABLE_COL[$i][10];
+                            $link = $this->FG_TABLE_COL[$i][12];
+                            if (stripos($this->FG_TABLE_COL[$i][12],'form_action')===false) $link .= "?form_action=ask-edit&";
+                            else $link .= "?";
+                            $link.= "id=".$select_list[0][1];
+                            for ($l=1;$l<=count($field_list_sun);$l++){
+                                $val = str_replace("%$l", $select_list[0][$l-1], $record_display);
+                                $record_display = "<a href='$link'>$val</a>";
+                            }
+                        } else {
+                            $record_display="";
+                        }
+                    } elseif ($this->FG_TABLE_COL[$i][6]=="eval") {
+
+                        $string_to_eval = $this->FG_TABLE_COL[$i][7]; // %4-%3
+                        for ($ll=15;$ll>=0;$ll--){
+                            if ($list[$ligne_number][$ll]=='') $list[$ligne_number][$ll]=0;
+                            $string_to_eval = str_replace("%$ll", $list[$ligne_number][$ll], $string_to_eval);
+                        }
+                        eval("\$eval_res = $string_to_eval;");
+                        $record_display = $eval_res;
+
+                    } elseif ($this->FG_TABLE_COL[$i][6]=="list") {
+
+                        $select_list = $this->FG_TABLE_COL[$i][7];
+                        $record_display = $select_list[$list[$ligne_number][$i-$k]][0];
+
+                    } elseif ($this->FG_TABLE_COL[$i][6]=="list-conf") {
+
+                        $select_list = $this->FG_TABLE_COL[$i][7];
+                        $key_config =  $list[$ligne_number][$i-$k + 3];
+                        $record_display = $select_list[$key_config][0];
+
+                    } elseif ($this->FG_TABLE_COL[$i][6]=="value") {
+
+                        $record_display = $this->FG_TABLE_COL[$i][7];
+                        $k++;
+
+                    } else {
+
+                        $record_display = $list[$ligne_number][$i-$k];
+
+                    }
+
+                    /**********************   IF LENGHT OF THE VALUE IS TOO LONG IT MIGHT BE CUT ************************/
+                    if ( is_numeric($this->FG_TABLE_COL[$i][5]) && (strlen($record_display) > $this->FG_TABLE_COL[$i][5])  ){
+                        $record_display = substr($record_display, 0, $this->FG_TABLE_COL[$i][5])."";
+                    } ?>
+                    <TD vAlign="top" align="<?php echo $this->FG_TABLE_COL[$i][3]?>" class="tableBody"><?php
+                        $origlist[$ligne_number][$i-$k] = $list[$ligne_number][$i-$k];
+                        $list[$ligne_number][$i-$k] = $record_display;
+
+                        if (isset ($this->FG_TABLE_COL[$i][11]) && strlen($this->FG_TABLE_COL[$i][11])>1) {
+                            print call_user_func($this->FG_TABLE_COL[$i][11], $record_display);
+                        } else {
+                            echo stripslashes($record_display);
+                        }
+                        ?>
+                    </TD>
+
+                 <?php  } ?>
+
+                    <?php if($this->FG_EDITION  || $this->FG_INFO || $this->FG_DELETION || $this -> FG_OTHER_BUTTON1 || $this -> FG_OTHER_BUTTON2 || $this -> FG_OTHER_BUTTON3 || $this -> FG_OTHER_BUTTON4 ){?>
+                      <TD align="center" vAlign=top class=tableBodyRight>
+
+                        <?php if($this->FG_INFO){?>&nbsp; <a href="<?php echo $this->FG_INFO_LINK?><?php echo $list[$ligne_number][$this->FG_NB_TABLE_COL]?>"><img src="<?php echo Images_Path_Main;?>/<?php echo $this->FG_INFO_IMG?>" border="0" title="<?php echo $this->FG_INFO_ALT?>" alt="<?php echo $this->FG_INFO_ALT?>"></a><?php } ?>
+                        <?php if($this->FG_EDITION){
+                            $check = true;
+                            $condition_eval=$this->FG_EDITION_CONDITION;
+                            $check_eval=false;
+                            if (!empty($this->FG_EDITION_CONDITION) && (preg_match ('/col[0-9]/i', $this->FG_EDITION_CONDITION))) {
+                                $check =false;
+                                for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                    $findme = "|col$h|";
+                                    $pos = stripos($condition_eval, $findme);
+                                    if ($pos !== false) {
+                                        $condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
+                                    }
+                                }
+                                eval('$check_eval = '.$condition_eval.';');
+                            }
+                            if($check || $check_eval){
+
+                            ?>&nbsp; <a href="<?php echo $this->FG_EDITION_LINK?><?php echo $list[$ligne_number][$this->FG_NB_TABLE_COL]?>"><img src="<?php echo Images_Path_Main;?>/<?php echo $this->FG_EDITION_IMG?>" border="0" title="<?php echo $this->FG_EDIT_ALT?>" alt="<?php echo $this->FG_EDIT_ALT?>"></a>
+                        <?php }
+                            } ?>
                         <?php if($this->FG_DELETION && !in_array($list[$ligne_number][$this->FG_NB_TABLE_COL],$this->FG_DELETION_FORBIDDEN_ID) ){
-                        	$check = true;
-					  		$condition_eval=$this->FG_DELETION_CONDITION;
-							$check_eval=false;	
-					  		if (!empty($this->FG_DELETION_CONDITION) && (preg_match ('/col[0-9]/', $this->FG_DELETION_CONDITION))) {
-					  			$check =false;
-								for ($h=count($list[$ligne_number]);$h>=0;$h--){
-									$findme = "|col$h|";
-									$pos = stripos($condition_eval, $findme);
-									if ($pos !== false) {
-										$condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
-									}
-								}
-								eval('$check_eval = '.$condition_eval.';');	
-							}
-					  		if ($check || $check_eval) {
-                        	
-                        	?>&nbsp;  <a href="<?php echo $this->FG_DELETION_LINK?><?php echo $list[$ligne_number][$this->FG_NB_TABLE_COL]?>"><img src="<?php echo Images_Path_Main;?>/<?php echo $this->FG_DELETION_IMG?>" border="0" title="<?php echo $this->FG_DELETE_ALT?>" alt="<?php echo $this->FG_DELETE_ALT?>"></a>
-                        	<?php }
-                   		     } ?>
-					  	<?php if($this->FG_OTHER_BUTTON1){ 
-					  	
-					  		$check = true;
-					  		$condition_eval=$this->FG_OTHER_BUTTON1_CONDITION;
-							$check_eval=false;	
-					  		if (!empty($this->FG_OTHER_BUTTON1_CONDITION) && (preg_match ('/col[0-9]/i', $this->FG_OTHER_BUTTON1_CONDITION))) {
-					  			$check =false;
-								for ($h=count($list[$ligne_number]);$h>=0;$h--){
-									$findme = "|col$h|";
-									$pos = stripos($condition_eval, $findme);
-									if ($pos !== false) {
-										$condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
-									}
-								}
-								eval('$check_eval = '.$condition_eval.';');	
-							}
-					  		if ($check || $check_eval) {
-					  		?>
-							<a href="<?php
-								$new_FG_OTHER_BUTTON1_LINK = $this -> FG_OTHER_BUTTON1_LINK;
-								// we should depreciate |param| and only use |col|
-								if (strpos($this -> FG_OTHER_BUTTON1_LINK,"|param|")){
-									$new_FG_OTHER_BUTTON1_LINK = str_replace("|param|",$list[$ligne_number][$this->FG_NB_TABLE_COL],$this -> FG_OTHER_BUTTON1_LINK);
-									// SHOULD DO SMTH BETTER WITH paramx and get the x number to find the value to use
-								}
-								if (strpos($this -> FG_OTHER_BUTTON1_LINK,"|param1|")){
-									$new_FG_OTHER_BUTTON1_LINK = str_replace("|param1|",$list[$ligne_number][$this->FG_NB_TABLE_COL-1],$this -> FG_OTHER_BUTTON1_LINK);
-								}
-
-								// REPLACE |colX|  where is a numero of the column by the column value
-								if ((preg_match ('/col[0-9]/i', $new_FG_OTHER_BUTTON1_LINK))) {
-									for ($h=count($list[$ligne_number]);$h>=0;$h--) {
-										$findme = "|col$h|";
-										$pos = stripos($new_FG_OTHER_BUTTON1_LINK, $findme);
-										if ($pos !== false) {
-											$new_FG_OTHER_BUTTON1_LINK = str_replace($findme,$list[$ligne_number][$h],$new_FG_OTHER_BUTTON1_LINK);
-										}
-									}
-								}
-
-								// REPLACE |col_origX|  where is a numero of the column by the column value
-								if (preg_match ('/col_orig[0-9]/i', $new_FG_OTHER_BUTTON1_LINK)) {
-									for ($h=count($list[$ligne_number]);$h>=0;$h--) {
-										$findme = "|col_orig$h|";
-										$pos = stripos($new_FG_OTHER_BUTTON1_LINK, $findme);
-										if ($pos !== false) {
-											$new_FG_OTHER_BUTTON1_LINK = str_replace($findme,$origlist[$ligne_number][$h],$new_FG_OTHER_BUTTON1_LINK);
-										}
-									}
-								}
-
-								echo $new_FG_OTHER_BUTTON1_LINK;
-								
-								$extra_html = "";
-								
-								if (!empty($this->FG_OTHER_BUTTON1_HTML_ID) && (preg_match ('/col[0-9]/i',$this->FG_OTHER_BUTTON1_HTML_ID))) {
-									$temp_id =$this->FG_OTHER_BUTTON1_HTML_ID;
-									for ($h=count($list[$ligne_number]);$h>=0;$h--) {
-										$findme = "|col$h|";
-										$pos = stripos($temp_id, $findme);
-										if ($pos !== false) {
-											$temp_id = str_replace($findme,$origlist[$ligne_number][$h],$temp_id);
-										}
-									}
-									$extra_html.=' id="'.$temp_id.'"';
-								}
-								
-					  			if (!empty($this->FG_OTHER_BUTTON1_HTML_CLASS)) {
-									$extra_html.= ' class="'.$this->FG_OTHER_BUTTON1_HTML_CLASS.'" ';
-								}
-								
-								if (substr($new_FG_OTHER_BUTTON1_LINK,-1)=='=') echo $list[$ligne_number][$this->FG_NB_TABLE_COL];
-								if (strlen($this -> FG_OTHER_BUTTON1_IMG)==0) {
-									echo '"'.$extra_html.'> '.'<span class="cssbutton">'.$this->FG_OTHER_BUTTON1_ALT.'</span>';
-								} else {
-									?>"<?php echo $extra_html ?>><img src="<?php echo $this -> FG_OTHER_BUTTON1_IMG?>" border="0" title="<?php echo $this->FG_OTHER_BUTTON1_ALT?>" alt="<?php echo $this->FG_OTHER_BUTTON1_ALT?>"><?php
-								}
-								?></a>
-						<?php } 
-			  				}
-						?>
-						<?php if($this->FG_OTHER_BUTTON2){ 
-						
-							$check = true;
-					  		$condition_eval=$this->FG_OTHER_BUTTON2_CONDITION;
-							$check_eval=false;	
-					  		if (!empty($this->FG_OTHER_BUTTON2_CONDITION) && (preg_match ('/col[0-9]/i', $this->FG_OTHER_BUTTON2_CONDITION))) {
-					  			$check =false;
-								for ($h=count($list[$ligne_number]);$h>=0;$h--){
-									$findme = "|col$h|";
-									$pos = stripos($condition_eval, $findme);
-									if ($pos !== false) {
-										$condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
-									}
-								}
-								eval('$check_eval = '.$condition_eval.';');
-								}
-					  		if($check || $check_eval){
-							?>
-							<a href="<?php
-								$new_FG_OTHER_BUTTON2_LINK = $this -> FG_OTHER_BUTTON2_LINK;
-								if (strpos($this -> FG_OTHER_BUTTON2_LINK,"|param|")){
-									$new_FG_OTHER_BUTTON2_LINK = str_replace("|param|",$list[$ligne_number][$this->FG_NB_TABLE_COL],$this -> FG_OTHER_BUTTON2_LINK);
-									// SHOULD DO SMTH BETTER WITH paramx and get the x number to find the value to use
-								}
-								if (strpos($this -> FG_OTHER_BUTTON2_LINK,"|param1|")){
-									$new_FG_OTHER_BUTTON2_LINK = str_replace("|param1|",$list[$ligne_number][$this->FG_NB_TABLE_COL-1],$this -> FG_OTHER_BUTTON2_LINK);
-								}
-
-								// REPLACE |colX|  where is a numero of the column by the column value
-								if (preg_match ('/col[0-9]/i', $new_FG_OTHER_BUTTON2_LINK)) {
-									for ($h=count($list[$ligne_number]);$h>=0;$h--){
-										$findme = "|col$h|";
-										$pos = stripos($new_FG_OTHER_BUTTON2_LINK, $findme);
-										if ($pos !== false) {
-											$new_FG_OTHER_BUTTON2_LINK = str_replace($findme,$list[$ligne_number][$h],$new_FG_OTHER_BUTTON2_LINK);
-										}
-									}
-								}
-
-								// REPLACE |col_origX|  where is a numero of the column by the column value
-								if (preg_match ('/col_orig[0-9]/i', $new_FG_OTHER_BUTTON2_LINK)) {
-									for ($h=count($list[$ligne_number]);$h>=0;$h--){
-										$findme = "|col_orig$h|";
-										$pos = stripos($new_FG_OTHER_BUTTON2_LINK, $findme);
-										if ($pos !== false) {
-											$new_FG_OTHER_BUTTON2_LINK = str_replace($findme,$origlist[$ligne_number][$h],$new_FG_OTHER_BUTTON2_LINK);
-										}
-									}
-								}
-								echo $new_FG_OTHER_BUTTON2_LINK;
-								
-								$extra_html="";
-								
-								if(!empty($this->FG_OTHER_BUTTON2_HTML_ID) && (preg_match ('/col[0-9]/i',$this->FG_OTHER_BUTTON2_HTML_ID))){
-									$temp_id =$this->FG_OTHER_BUTTON2_HTML_ID;
-									for ($h=count($list[$ligne_number]);$h>=0;$h--){
-										$findme = "|col$h|";
-										$pos = stripos($temp_id, $findme);
-										if ($pos !== false) {
-											$temp_id = str_replace($findme,$origlist[$ligne_number][$h],$temp_id);
-										}
-									}
-									$extra_html.=' id="'.$temp_id.'"';
-									
-								}
-								
-					  			if(!empty($this->FG_OTHER_BUTTON2_HTML_CLASS) ){
-									$extra_html.= ' class="'.$this->FG_OTHER_BUTTON2_HTML_CLASS.'" ';
-								}
-								
-								
-								
-								if (substr($new_FG_OTHER_BUTTON2_LINK,-1)=='=') echo $list[$ligne_number][$this->FG_NB_TABLE_COL];
-								if (strlen($this -> FG_OTHER_BUTTON2_IMG)==0){
-									echo '"'.$extra_html.'> '.'<span class="cssbutton">'.$this->FG_OTHER_BUTTON2_ALT.'</span>';
-								}else{
-									?>" <?php echo $extra_html ?> ><img src="<?php echo $this -> FG_OTHER_BUTTON2_IMG?>" border="0" title="<?php echo $this->FG_OTHER_BUTTON2_ALT?>" alt="<?php echo $this->FG_OTHER_BUTTON2_ALT?>"><?php
-
-								}
-								?></a>
-						<?php }
-							} ?>
-						<?php if($this->FG_OTHER_BUTTON3){
-							$check = true;
-					  		$condition_eval=$this->FG_OTHER_BUTTON3_CONDITION;
-							$check_eval=false;	
-					  		if (!empty($this->FG_OTHER_BUTTON3_CONDITION) && (preg_match ('/col[0-9]/i', $this->FG_OTHER_BUTTON3_CONDITION))) {
-					  			$check =false;
-									for ($h=count($list[$ligne_number]);$h>=0;$h--){
-										$findme = "|col$h|";
-										$pos = stripos($condition_eval, $findme);
-										if ($pos !== false) {
-											$condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
-										}
-									}
-							eval('$check_eval = '.$condition_eval.';');	
-								}
-					  		if($check || $check_eval){
-							?>
-							<a href="<?php
-								$new_FG_OTHER_BUTTON3_LINK = $this -> FG_OTHER_BUTTON3_LINK;
-								if (strpos($this -> FG_OTHER_BUTTON3_LINK,"|param|")){
-									$new_FG_OTHER_BUTTON3_LINK = str_replace("|param|",$list[$ligne_number][$this->FG_NB_TABLE_COL],$this -> FG_OTHER_BUTTON3_LINK);
-									// SHOULD DO SMTH BETTER WITH paramx and get the x number to find the value to use
-								}
-								if (strpos($this -> FG_OTHER_BUTTON3_LINK,"|param1|")){
-									$new_FG_OTHER_BUTTON3_LINK = str_replace("|param1|",$list[$ligne_number][$this->FG_NB_TABLE_COL-1],$this -> FG_OTHER_BUTTON3_LINK);
-								}
-
-								// REPLACE |colX|  where is a numero of the column by the column value
-								if (preg_match ('/col[0-9]/i', $new_FG_OTHER_BUTTON3_LINK)) {
-									for ($h=0;$h<=$this->FG_NB_TABLE_COL;$h++){
-										$findme = "|col$h|";
-										$pos = stripos($new_FG_OTHER_BUTTON3_LINK, $findme);
-										if ($pos !== false) {
-											$new_FG_OTHER_BUTTON3_LINK = str_replace($findme,$list[$ligne_number][$h],$new_FG_OTHER_BUTTON3_LINK);
-										}
-									}
-								}
-
-								// REPLACE |col_origX|  where is a numero of the column by the column value
-								if (preg_match ('/col_orig[0-9]/i', $new_FG_OTHER_BUTTON3_LINK)) {
-										for ($h=count($list[$ligne_number]);$h>=0;$h--){
-										$findme = "|col_orig$h|";
-										$pos = stripos($new_FG_OTHER_BUTTON3_LINK, $findme);
-										if ($pos !== false) {
-											$new_FG_OTHER_BUTTON3_LINK = str_replace($findme,$origlist[$ligne_number][$h],$new_FG_OTHER_BUTTON3_LINK);
-										}
-									}
-								}
-								echo $new_FG_OTHER_BUTTON3_LINK;
-								
-								$extra_html="";
-								
-								if(!empty($this->FG_OTHER_BUTTON3_HTML_ID) && (preg_match ('/col[0-9]/i',$this->FG_OTHER_BUTTON3_HTML_ID))){
-									$temp_id =$this->FG_OTHER_BUTTON3_HTML_ID;
-									for ($h=count($list[$ligne_number]);$h>=0;$h--){
-										$findme = "|col$h|";
-										$pos = stripos($temp_id, $findme);
-										if ($pos !== false) {
-											$temp_id = str_replace($findme,$origlist[$ligne_number][$h],$temp_id);
-										}
-									}
-									$extra_html.=' id="'.$temp_id.'"';
-									
-								}
-								
-					  			if(!empty($this->FG_OTHER_BUTTON3_HTML_CLASS) ){
-									$extra_html.= ' class="'.$this->FG_OTHER_BUTTON3_HTML_CLASS.'" ';
-								}
-								
-								
-								
-								if (substr($new_FG_OTHER_BUTTON3_LINK,-1)=='=') echo $list[$ligne_number][$this->FG_NB_TABLE_COL];
-								if (strlen($this -> FG_OTHER_BUTTON3_IMG)==0){
-									echo '"'.$extra_html.'> '.'<span class="cssbutton">'.$this->FG_OTHER_BUTTON3_ALT.'</span>';
-								}else{
-									?>" <?php echo $extra_html ?> ><img src="<?php echo $this -> FG_OTHER_BUTTON3_IMG?>" border="0" title="<?php echo $this->FG_OTHER_BUTTON3_ALT?>" alt="<?php echo $this->FG_OTHER_BUTTON3_ALT?>"><?php
-
-								}
-								?></a>
-						<?php }
-							} ?>
-						<?php if($this->FG_OTHER_BUTTON4){
-							$check = true;
-					  		$condition_eval=$this->FG_OTHER_BUTTON4_CONDITION;
-							$check_eval=false;	
-					  		if (!empty($this->FG_OTHER_BUTTON4_CONDITION) && (preg_match ('/col[0-9]/i', $this->FG_OTHER_BUTTON4_CONDITION))) {
-					  			$check =false;
-									for ($h=count($list[$ligne_number]);$h>=0;$h--){
-										$findme = "|col$h|";
-										$pos = stripos($condition_eval, $findme);
-										if ($pos !== false) {
-											$condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
-										}
-									}
-							eval('$check_eval = '.$condition_eval.';');	
-								}
-					  		if($check || $check_eval){
-							?>
-							<a href="<?php
-								$new_FG_OTHER_BUTTON4_LINK = $this -> FG_OTHER_BUTTON4_LINK;
-								if (strpos($this -> FG_OTHER_BUTTON4_LINK,"|param|")){
-									$new_FG_OTHER_BUTTON4_LINK = str_replace("|param|",$list[$ligne_number][$this->FG_NB_TABLE_COL],$this -> FG_OTHER_BUTTON4_LINK);
-									// SHOULD DO SMTH BETTER WITH paramx and get the x number to find the value to use
-								}
-								if (strpos($this -> FG_OTHER_BUTTON4_LINK,"|param1|")){
-									$new_FG_OTHER_BUTTON4_LINK = str_replace("|param1|",$list[$ligne_number][$this->FG_NB_TABLE_COL-1],$this -> FG_OTHER_BUTTON4_LINK);
-								}
-
-								// REPLACE |colX|  where is a numero of the column by the column value
-								if (preg_match ('/col[0-9]/i', $new_FG_OTHER_BUTTON4_LINK)) {
-									for ($h=0;$h<=$this->FG_NB_TABLE_COL;$h++){
-										$findme = "|col$h|";
-										$pos = stripos($new_FG_OTHER_BUTTON4_LINK, $findme);
-										if ($pos !== false) {
-											$new_FG_OTHER_BUTTON4_LINK = str_replace($findme,$list[$ligne_number][$h],$new_FG_OTHER_BUTTON4_LINK);
-										}
-									}
-								}
-
-								// REPLACE |col_origX|  where is a numero of the column by the column value
-								if (preg_match ('/col_orig[0-9]/i', $new_FG_OTHER_BUTTON4_LINK)) {
-										for ($h=count($list[$ligne_number]);$h>=0;$h--){
-										$findme = "|col_orig$h|";
-										$pos = stripos($new_FG_OTHER_BUTTON4_LINK, $findme);
-										if ($pos !== false) {
-											$new_FG_OTHER_BUTTON4_LINK = str_replace($findme,$origlist[$ligne_number][$h],$new_FG_OTHER_BUTTON4_LINK);
-										}
-									}
-								}
-								echo $new_FG_OTHER_BUTTON4_LINK;
-								
-								$extra_html="";
-								
-								if(!empty($this->FG_OTHER_BUTTON4_HTML_ID) && (preg_match ('/col[0-9]/i',$this->FG_OTHER_BUTTON4_HTML_ID))){
-									$temp_id =$this->FG_OTHER_BUTTON4_HTML_ID;
-									for ($h=count($list[$ligne_number]);$h>=0;$h--){
-										$findme = "|col$h|";
-										$pos = stripos($temp_id, $findme);
-										if ($pos !== false) {
-											$temp_id = str_replace($findme,$origlist[$ligne_number][$h],$temp_id);
-										}
-									}
-									$extra_html.=' id="'.$temp_id.'"';
-									
-								}
-								
-					  			if(!empty($this->FG_OTHER_BUTTON4_HTML_CLASS) ){
-									$extra_html.= ' class="'.$this->FG_OTHER_BUTTON4_HTML_CLASS.'" ';
-								}
-								
-								
-								
-								if (substr($new_FG_OTHER_BUTTON4_LINK,-1)=='=') echo $list[$ligne_number][$this->FG_NB_TABLE_COL];
-								if (strlen($this -> FG_OTHER_BUTTON4_IMG)==0){
-									echo '"'.$extra_html.'> '.'<span class="cssbutton">'.$this->FG_OTHER_BUTTON4_ALT.'</span>';
-								}else{
-									?>" <?php echo $extra_html ?> ><img src="<?php echo $this -> FG_OTHER_BUTTON4_IMG?>" border="0" title="<?php echo $this->FG_OTHER_BUTTON4_ALT?>" alt="<?php echo $this->FG_OTHER_BUTTON4_ALT?>"><?php
-
-								}
-								?></a>
-						<?php }
-						} 
- 
-						if($this->FG_OTHER_BUTTON5){
-							$check = true;
-					  		$condition_eval=$this->FG_OTHER_BUTTON5_CONDITION;
-							$check_eval=false;	
-					  		if (!empty($this->FG_OTHER_BUTTON5_CONDITION) && (preg_match ('/col[0-9]/i', $this->FG_OTHER_BUTTON5_CONDITION))) {
-					  			$check =false;
-									for ($h=count($list[$ligne_number]);$h>=0;$h--){
-										$findme = "|col$h|";
-										$pos = stripos($condition_eval, $findme);
-										if ($pos !== false) {
-											$condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
-										}
-									}
-							eval('$check_eval = '.$condition_eval.';');	
-								}
-					  		if($check || $check_eval){
-							?>
-							<a href="<?php
-								$new_FG_OTHER_BUTTON5_LINK = $this -> FG_OTHER_BUTTON5_LINK;
-								if (strpos($this -> FG_OTHER_BUTTON5_LINK,"|param|")){
-									$new_FG_OTHER_BUTTON5_LINK = str_replace("|param|",$list[$ligne_number][$this->FG_NB_TABLE_COL],$this -> FG_OTHER_BUTTON5_LINK);
-									// SHOULD DO SMTH BETTER WITH paramx and get the x number to find the value to use
-								}
-								if (strpos($this -> FG_OTHER_BUTTON5_LINK,"|param1|")){
-									$new_FG_OTHER_BUTTON5_LINK = str_replace("|param1|",$list[$ligne_number][$this->FG_NB_TABLE_COL-1],$this -> FG_OTHER_BUTTON5_LINK);
-								}
-
-								// REPLACE |colX|  where is a numero of the column by the column value
-								if (preg_match ('/col[0-9]/i', $new_FG_OTHER_BUTTON5_LINK)) {
-									for ($h=0;$h<=$this->FG_NB_TABLE_COL;$h++){
-										$findme = "|col$h|";
-										$pos = stripos($new_FG_OTHER_BUTTON5_LINK, $findme);
-										if ($pos !== false) {
-											$new_FG_OTHER_BUTTON5_LINK = str_replace($findme,$list[$ligne_number][$h],$new_FG_OTHER_BUTTON5_LINK);
-										}
-									}
-								}
-
-								// REPLACE |col_origX|  where is a numero of the column by the column value
-								if (preg_match ('/col_orig[0-9]/i', $new_FG_OTHER_BUTTON5_LINK)) {
-										for ($h=count($list[$ligne_number]);$h>=0;$h--){
-										$findme = "|col_orig$h|";
-										$pos = stripos($new_FG_OTHER_BUTTON5_LINK, $findme);
-										if ($pos !== false) {
-											$new_FG_OTHER_BUTTON5_LINK = str_replace($findme,$origlist[$ligne_number][$h],$new_FG_OTHER_BUTTON5_LINK);
-										}
-									}
-								}
-								echo $new_FG_OTHER_BUTTON5_LINK;
-								
-								$extra_html="";
-								
-								if(!empty($this->FG_OTHER_BUTTON5_HTML_ID) && (preg_match ('/col[0-9]/i',$this->FG_OTHER_BUTTON5_HTML_ID))){
-									$temp_id =$this->FG_OTHER_BUTTON5_HTML_ID;
-									for ($h=count($list[$ligne_number]);$h>=0;$h--){
-										$findme = "|col$h|";
-										$pos = stripos($temp_id, $findme);
-										if ($pos !== false) {
-											$temp_id = str_replace($findme,$origlist[$ligne_number][$h],$temp_id);
-										}
-									}
-									$extra_html.=' id="'.$temp_id.'"';
-				
-								}
-								
-					  			if(!empty($this->FG_OTHER_BUTTON5_HTML_CLASS) ){
-									$extra_html.= ' class="'.$this->FG_OTHER_BUTTON5_HTML_CLASS.'" ';
-								}
-								
-								
-								
-								if (substr($new_FG_OTHER_BUTTON5_LINK,-1)=='=') echo $list[$ligne_number][$this->FG_NB_TABLE_COL];
-								if (strlen($this -> FG_OTHER_BUTTON5_IMG)==0){
-									echo '"'.$extra_html.'> '.'<span class="cssbutton">'.$this->FG_OTHER_BUTTON5_ALT.'</span>';
-								}else{
-									?>" <?php echo $extra_html ?> ><img src="<?php echo $this -> FG_OTHER_BUTTON5_IMG?>" border="0" title="<?php echo $this->FG_OTHER_BUTTON5_ALT?>" alt="<?php echo $this->FG_OTHER_BUTTON5_ALT?>"><?php
-
-								}
-								?></a>
-						<?php
-							 }
-						} 
-						?>
-						
-
-					  </TD>
-					<?php  } ?>
-
-					</TR>
-				<?php
-					} //  for (ligne_number=0;ligne_number<count($list);$ligne_number++)
-					while ($ligne_number < 7){
-				?>
-					<TR bgcolor="<?php echo $this->FG_TABLE_ALTERNATE_ROW_COLOR[$ligne_number%2]?>">
-				  		<?php
-							$REMOVE_COL = ($this->FG_OTHER_BUTTON1 || $this->FG_OTHER_BUTTON2 || $this->FG_OTHER_BUTTON3 || $this->FG_OTHER_BUTTON4 || $this->FG_EDITION || $this->FG_INFO || $this->FG_DELETION )? 0 : 1;
-							for($i=0;$i<$this->FG_NB_TABLE_COL-$REMOVE_COL;$i++){
-				 		 ?>
-                 		 <TD vAlign=top class="tableBody">&nbsp;</TD>
-				 		 <?php  } ?>
-                 		 <TD align="center" vAlign=top class="tableBodyRight">&nbsp;</TD>
-					</TR>
-
-				<?php
-						$ligne_number++;
-					} //END_WHILE
-				 ?>
+                            $check = true;
+                            $condition_eval=$this->FG_DELETION_CONDITION;
+                            $check_eval=false;
+                            if (!empty($this->FG_DELETION_CONDITION) && (preg_match ('/col[0-9]/', $this->FG_DELETION_CONDITION))) {
+                                $check =false;
+                                for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                    $findme = "|col$h|";
+                                    $pos = stripos($condition_eval, $findme);
+                                    if ($pos !== false) {
+                                        $condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
+                                    }
+                                }
+                                eval('$check_eval = '.$condition_eval.';');
+                            }
+                            if ($check || $check_eval) {
+
+                            ?>&nbsp;  <a href="<?php echo $this->FG_DELETION_LINK?><?php echo $list[$ligne_number][$this->FG_NB_TABLE_COL]?>"><img src="<?php echo Images_Path_Main;?>/<?php echo $this->FG_DELETION_IMG?>" border="0" title="<?php echo $this->FG_DELETE_ALT?>" alt="<?php echo $this->FG_DELETE_ALT?>"></a>
+                            <?php }
+                             } ?>
+                        <?php if($this->FG_OTHER_BUTTON1){
+
+                            $check = true;
+                            $condition_eval=$this->FG_OTHER_BUTTON1_CONDITION;
+                            $check_eval=false;
+                            if (!empty($this->FG_OTHER_BUTTON1_CONDITION) && (preg_match ('/col[0-9]/i', $this->FG_OTHER_BUTTON1_CONDITION))) {
+                                $check =false;
+                                for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                    $findme = "|col$h|";
+                                    $pos = stripos($condition_eval, $findme);
+                                    if ($pos !== false) {
+                                        $condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
+                                    }
+                                }
+                                eval('$check_eval = '.$condition_eval.';');
+                            }
+                            if ($check || $check_eval) {
+                            ?>
+                            <a href="<?php
+                                $new_FG_OTHER_BUTTON1_LINK = $this -> FG_OTHER_BUTTON1_LINK;
+                                // we should depreciate |param| and only use |col|
+                                if (strpos($this -> FG_OTHER_BUTTON1_LINK,"|param|")){
+                                    $new_FG_OTHER_BUTTON1_LINK = str_replace("|param|",$list[$ligne_number][$this->FG_NB_TABLE_COL],$this -> FG_OTHER_BUTTON1_LINK);
+                                    // SHOULD DO SMTH BETTER WITH paramx and get the x number to find the value to use
+                                }
+                                if (strpos($this -> FG_OTHER_BUTTON1_LINK,"|param1|")){
+                                    $new_FG_OTHER_BUTTON1_LINK = str_replace("|param1|",$list[$ligne_number][$this->FG_NB_TABLE_COL-1],$this -> FG_OTHER_BUTTON1_LINK);
+                                }
+
+                                // REPLACE |colX|  where is a numero of the column by the column value
+                                if ((preg_match ('/col[0-9]/i', $new_FG_OTHER_BUTTON1_LINK))) {
+                                    for ($h=count($list[$ligne_number]);$h>=0;$h--) {
+                                        $findme = "|col$h|";
+                                        $pos = stripos($new_FG_OTHER_BUTTON1_LINK, $findme);
+                                        if ($pos !== false) {
+                                            $new_FG_OTHER_BUTTON1_LINK = str_replace($findme,$list[$ligne_number][$h],$new_FG_OTHER_BUTTON1_LINK);
+                                        }
+                                    }
+                                }
+
+                                // REPLACE |col_origX|  where is a numero of the column by the column value
+                                if (preg_match ('/col_orig[0-9]/i', $new_FG_OTHER_BUTTON1_LINK)) {
+                                    for ($h=count($list[$ligne_number]);$h>=0;$h--) {
+                                        $findme = "|col_orig$h|";
+                                        $pos = stripos($new_FG_OTHER_BUTTON1_LINK, $findme);
+                                        if ($pos !== false) {
+                                            $new_FG_OTHER_BUTTON1_LINK = str_replace($findme,$origlist[$ligne_number][$h],$new_FG_OTHER_BUTTON1_LINK);
+                                        }
+                                    }
+                                }
+
+                                echo $new_FG_OTHER_BUTTON1_LINK;
+
+                                $extra_html = "";
+
+                                if (!empty($this->FG_OTHER_BUTTON1_HTML_ID) && (preg_match ('/col[0-9]/i',$this->FG_OTHER_BUTTON1_HTML_ID))) {
+                                    $temp_id =$this->FG_OTHER_BUTTON1_HTML_ID;
+                                    for ($h=count($list[$ligne_number]);$h>=0;$h--) {
+                                        $findme = "|col$h|";
+                                        $pos = stripos($temp_id, $findme);
+                                        if ($pos !== false) {
+                                            $temp_id = str_replace($findme,$origlist[$ligne_number][$h],$temp_id);
+                                        }
+                                    }
+                                    $extra_html.=' id="'.$temp_id.'"';
+                                }
+
+                                if (!empty($this->FG_OTHER_BUTTON1_HTML_CLASS)) {
+                                    $extra_html.= ' class="'.$this->FG_OTHER_BUTTON1_HTML_CLASS.'" ';
+                                }
+
+                                if (substr($new_FG_OTHER_BUTTON1_LINK,-1)=='=') echo $list[$ligne_number][$this->FG_NB_TABLE_COL];
+                                if (strlen($this -> FG_OTHER_BUTTON1_IMG)==0) {
+                                    echo '"'.$extra_html.'> '.'<span class="cssbutton">'.$this->FG_OTHER_BUTTON1_ALT.'</span>';
+                                } else {
+                                    ?>"<?php echo $extra_html ?>><img src="<?php echo $this -> FG_OTHER_BUTTON1_IMG?>" border="0" title="<?php echo $this->FG_OTHER_BUTTON1_ALT?>" alt="<?php echo $this->FG_OTHER_BUTTON1_ALT?>"><?php
+                                }
+                                ?></a>
+                        <?php }
+                            }
+                        ?>
+                        <?php if($this->FG_OTHER_BUTTON2){
+
+                            $check = true;
+                            $condition_eval=$this->FG_OTHER_BUTTON2_CONDITION;
+                            $check_eval=false;
+                            if (!empty($this->FG_OTHER_BUTTON2_CONDITION) && (preg_match ('/col[0-9]/i', $this->FG_OTHER_BUTTON2_CONDITION))) {
+                                $check =false;
+                                for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                    $findme = "|col$h|";
+                                    $pos = stripos($condition_eval, $findme);
+                                    if ($pos !== false) {
+                                        $condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
+                                    }
+                                }
+                                eval('$check_eval = '.$condition_eval.';');
+                                }
+                            if($check || $check_eval){
+                            ?>
+                            <a href="<?php
+                                $new_FG_OTHER_BUTTON2_LINK = $this -> FG_OTHER_BUTTON2_LINK;
+                                if (strpos($this -> FG_OTHER_BUTTON2_LINK,"|param|")){
+                                    $new_FG_OTHER_BUTTON2_LINK = str_replace("|param|",$list[$ligne_number][$this->FG_NB_TABLE_COL],$this -> FG_OTHER_BUTTON2_LINK);
+                                    // SHOULD DO SMTH BETTER WITH paramx and get the x number to find the value to use
+                                }
+                                if (strpos($this -> FG_OTHER_BUTTON2_LINK,"|param1|")){
+                                    $new_FG_OTHER_BUTTON2_LINK = str_replace("|param1|",$list[$ligne_number][$this->FG_NB_TABLE_COL-1],$this -> FG_OTHER_BUTTON2_LINK);
+                                }
+
+                                // REPLACE |colX|  where is a numero of the column by the column value
+                                if (preg_match ('/col[0-9]/i', $new_FG_OTHER_BUTTON2_LINK)) {
+                                    for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                        $findme = "|col$h|";
+                                        $pos = stripos($new_FG_OTHER_BUTTON2_LINK, $findme);
+                                        if ($pos !== false) {
+                                            $new_FG_OTHER_BUTTON2_LINK = str_replace($findme,$list[$ligne_number][$h],$new_FG_OTHER_BUTTON2_LINK);
+                                        }
+                                    }
+                                }
+
+                                // REPLACE |col_origX|  where is a numero of the column by the column value
+                                if (preg_match ('/col_orig[0-9]/i', $new_FG_OTHER_BUTTON2_LINK)) {
+                                    for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                        $findme = "|col_orig$h|";
+                                        $pos = stripos($new_FG_OTHER_BUTTON2_LINK, $findme);
+                                        if ($pos !== false) {
+                                            $new_FG_OTHER_BUTTON2_LINK = str_replace($findme,$origlist[$ligne_number][$h],$new_FG_OTHER_BUTTON2_LINK);
+                                        }
+                                    }
+                                }
+                                echo $new_FG_OTHER_BUTTON2_LINK;
+
+                                $extra_html="";
+
+                                if(!empty($this->FG_OTHER_BUTTON2_HTML_ID) && (preg_match ('/col[0-9]/i',$this->FG_OTHER_BUTTON2_HTML_ID))){
+                                    $temp_id =$this->FG_OTHER_BUTTON2_HTML_ID;
+                                    for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                        $findme = "|col$h|";
+                                        $pos = stripos($temp_id, $findme);
+                                        if ($pos !== false) {
+                                            $temp_id = str_replace($findme,$origlist[$ligne_number][$h],$temp_id);
+                                        }
+                                    }
+                                    $extra_html.=' id="'.$temp_id.'"';
+
+                                }
+
+                                if(!empty($this->FG_OTHER_BUTTON2_HTML_CLASS) ){
+                                    $extra_html.= ' class="'.$this->FG_OTHER_BUTTON2_HTML_CLASS.'" ';
+                                }
+
+
+
+                                if (substr($new_FG_OTHER_BUTTON2_LINK,-1)=='=') echo $list[$ligne_number][$this->FG_NB_TABLE_COL];
+                                if (strlen($this -> FG_OTHER_BUTTON2_IMG)==0){
+                                    echo '"'.$extra_html.'> '.'<span class="cssbutton">'.$this->FG_OTHER_BUTTON2_ALT.'</span>';
+                                }else{
+                                    ?>" <?php echo $extra_html ?> ><img src="<?php echo $this -> FG_OTHER_BUTTON2_IMG?>" border="0" title="<?php echo $this->FG_OTHER_BUTTON2_ALT?>" alt="<?php echo $this->FG_OTHER_BUTTON2_ALT?>"><?php
+
+                                }
+                                ?></a>
+                        <?php }
+                            } ?>
+                        <?php if($this->FG_OTHER_BUTTON3){
+                            $check = true;
+                            $condition_eval=$this->FG_OTHER_BUTTON3_CONDITION;
+                            $check_eval=false;
+                            if (!empty($this->FG_OTHER_BUTTON3_CONDITION) && (preg_match ('/col[0-9]/i', $this->FG_OTHER_BUTTON3_CONDITION))) {
+                                $check =false;
+                                    for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                        $findme = "|col$h|";
+                                        $pos = stripos($condition_eval, $findme);
+                                        if ($pos !== false) {
+                                            $condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
+                                        }
+                                    }
+                            eval('$check_eval = '.$condition_eval.';');
+                                }
+                            if($check || $check_eval){
+                            ?>
+                            <a href="<?php
+                                $new_FG_OTHER_BUTTON3_LINK = $this -> FG_OTHER_BUTTON3_LINK;
+                                if (strpos($this -> FG_OTHER_BUTTON3_LINK,"|param|")){
+                                    $new_FG_OTHER_BUTTON3_LINK = str_replace("|param|",$list[$ligne_number][$this->FG_NB_TABLE_COL],$this -> FG_OTHER_BUTTON3_LINK);
+                                    // SHOULD DO SMTH BETTER WITH paramx and get the x number to find the value to use
+                                }
+                                if (strpos($this -> FG_OTHER_BUTTON3_LINK,"|param1|")){
+                                    $new_FG_OTHER_BUTTON3_LINK = str_replace("|param1|",$list[$ligne_number][$this->FG_NB_TABLE_COL-1],$this -> FG_OTHER_BUTTON3_LINK);
+                                }
+
+                                // REPLACE |colX|  where is a numero of the column by the column value
+                                if (preg_match ('/col[0-9]/i', $new_FG_OTHER_BUTTON3_LINK)) {
+                                    for ($h=0;$h<=$this->FG_NB_TABLE_COL;$h++){
+                                        $findme = "|col$h|";
+                                        $pos = stripos($new_FG_OTHER_BUTTON3_LINK, $findme);
+                                        if ($pos !== false) {
+                                            $new_FG_OTHER_BUTTON3_LINK = str_replace($findme,$list[$ligne_number][$h],$new_FG_OTHER_BUTTON3_LINK);
+                                        }
+                                    }
+                                }
+
+                                // REPLACE |col_origX|  where is a numero of the column by the column value
+                                if (preg_match ('/col_orig[0-9]/i', $new_FG_OTHER_BUTTON3_LINK)) {
+                                        for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                        $findme = "|col_orig$h|";
+                                        $pos = stripos($new_FG_OTHER_BUTTON3_LINK, $findme);
+                                        if ($pos !== false) {
+                                            $new_FG_OTHER_BUTTON3_LINK = str_replace($findme,$origlist[$ligne_number][$h],$new_FG_OTHER_BUTTON3_LINK);
+                                        }
+                                    }
+                                }
+                                echo $new_FG_OTHER_BUTTON3_LINK;
+
+                                $extra_html="";
+
+                                if(!empty($this->FG_OTHER_BUTTON3_HTML_ID) && (preg_match ('/col[0-9]/i',$this->FG_OTHER_BUTTON3_HTML_ID))){
+                                    $temp_id =$this->FG_OTHER_BUTTON3_HTML_ID;
+                                    for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                        $findme = "|col$h|";
+                                        $pos = stripos($temp_id, $findme);
+                                        if ($pos !== false) {
+                                            $temp_id = str_replace($findme,$origlist[$ligne_number][$h],$temp_id);
+                                        }
+                                    }
+                                    $extra_html.=' id="'.$temp_id.'"';
+
+                                }
+
+                                if(!empty($this->FG_OTHER_BUTTON3_HTML_CLASS) ){
+                                    $extra_html.= ' class="'.$this->FG_OTHER_BUTTON3_HTML_CLASS.'" ';
+                                }
+
+
+
+                                if (substr($new_FG_OTHER_BUTTON3_LINK,-1)=='=') echo $list[$ligne_number][$this->FG_NB_TABLE_COL];
+                                if (strlen($this -> FG_OTHER_BUTTON3_IMG)==0){
+                                    echo '"'.$extra_html.'> '.'<span class="cssbutton">'.$this->FG_OTHER_BUTTON3_ALT.'</span>';
+                                }else{
+                                    ?>" <?php echo $extra_html ?> ><img src="<?php echo $this -> FG_OTHER_BUTTON3_IMG?>" border="0" title="<?php echo $this->FG_OTHER_BUTTON3_ALT?>" alt="<?php echo $this->FG_OTHER_BUTTON3_ALT?>"><?php
+
+                                }
+                                ?></a>
+                        <?php }
+                            } ?>
+                        <?php if($this->FG_OTHER_BUTTON4){
+                            $check = true;
+                            $condition_eval=$this->FG_OTHER_BUTTON4_CONDITION;
+                            $check_eval=false;
+                            if (!empty($this->FG_OTHER_BUTTON4_CONDITION) && (preg_match ('/col[0-9]/i', $this->FG_OTHER_BUTTON4_CONDITION))) {
+                                $check =false;
+                                    for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                        $findme = "|col$h|";
+                                        $pos = stripos($condition_eval, $findme);
+                                        if ($pos !== false) {
+                                            $condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
+                                        }
+                                    }
+                            eval('$check_eval = '.$condition_eval.';');
+                                }
+                            if($check || $check_eval){
+                            ?>
+                            <a href="<?php
+                                $new_FG_OTHER_BUTTON4_LINK = $this -> FG_OTHER_BUTTON4_LINK;
+                                if (strpos($this -> FG_OTHER_BUTTON4_LINK,"|param|")){
+                                    $new_FG_OTHER_BUTTON4_LINK = str_replace("|param|",$list[$ligne_number][$this->FG_NB_TABLE_COL],$this -> FG_OTHER_BUTTON4_LINK);
+                                    // SHOULD DO SMTH BETTER WITH paramx and get the x number to find the value to use
+                                }
+                                if (strpos($this -> FG_OTHER_BUTTON4_LINK,"|param1|")){
+                                    $new_FG_OTHER_BUTTON4_LINK = str_replace("|param1|",$list[$ligne_number][$this->FG_NB_TABLE_COL-1],$this -> FG_OTHER_BUTTON4_LINK);
+                                }
+
+                                // REPLACE |colX|  where is a numero of the column by the column value
+                                if (preg_match ('/col[0-9]/i', $new_FG_OTHER_BUTTON4_LINK)) {
+                                    for ($h=0;$h<=$this->FG_NB_TABLE_COL;$h++){
+                                        $findme = "|col$h|";
+                                        $pos = stripos($new_FG_OTHER_BUTTON4_LINK, $findme);
+                                        if ($pos !== false) {
+                                            $new_FG_OTHER_BUTTON4_LINK = str_replace($findme,$list[$ligne_number][$h],$new_FG_OTHER_BUTTON4_LINK);
+                                        }
+                                    }
+                                }
+
+                                // REPLACE |col_origX|  where is a numero of the column by the column value
+                                if (preg_match ('/col_orig[0-9]/i', $new_FG_OTHER_BUTTON4_LINK)) {
+                                        for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                        $findme = "|col_orig$h|";
+                                        $pos = stripos($new_FG_OTHER_BUTTON4_LINK, $findme);
+                                        if ($pos !== false) {
+                                            $new_FG_OTHER_BUTTON4_LINK = str_replace($findme,$origlist[$ligne_number][$h],$new_FG_OTHER_BUTTON4_LINK);
+                                        }
+                                    }
+                                }
+                                echo $new_FG_OTHER_BUTTON4_LINK;
+
+                                $extra_html="";
+
+                                if(!empty($this->FG_OTHER_BUTTON4_HTML_ID) && (preg_match ('/col[0-9]/i',$this->FG_OTHER_BUTTON4_HTML_ID))){
+                                    $temp_id =$this->FG_OTHER_BUTTON4_HTML_ID;
+                                    for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                        $findme = "|col$h|";
+                                        $pos = stripos($temp_id, $findme);
+                                        if ($pos !== false) {
+                                            $temp_id = str_replace($findme,$origlist[$ligne_number][$h],$temp_id);
+                                        }
+                                    }
+                                    $extra_html.=' id="'.$temp_id.'"';
+
+                                }
+
+                                if(!empty($this->FG_OTHER_BUTTON4_HTML_CLASS) ){
+                                    $extra_html.= ' class="'.$this->FG_OTHER_BUTTON4_HTML_CLASS.'" ';
+                                }
+
+
+
+                                if (substr($new_FG_OTHER_BUTTON4_LINK,-1)=='=') echo $list[$ligne_number][$this->FG_NB_TABLE_COL];
+                                if (strlen($this -> FG_OTHER_BUTTON4_IMG)==0){
+                                    echo '"'.$extra_html.'> '.'<span class="cssbutton">'.$this->FG_OTHER_BUTTON4_ALT.'</span>';
+                                }else{
+                                    ?>" <?php echo $extra_html ?> ><img src="<?php echo $this -> FG_OTHER_BUTTON4_IMG?>" border="0" title="<?php echo $this->FG_OTHER_BUTTON4_ALT?>" alt="<?php echo $this->FG_OTHER_BUTTON4_ALT?>"><?php
+
+                                }
+                                ?></a>
+                        <?php }
+                        }
+
+                        if($this->FG_OTHER_BUTTON5){
+                            $check = true;
+                            $condition_eval=$this->FG_OTHER_BUTTON5_CONDITION;
+                            $check_eval=false;
+                            if (!empty($this->FG_OTHER_BUTTON5_CONDITION) && (preg_match ('/col[0-9]/i', $this->FG_OTHER_BUTTON5_CONDITION))) {
+                                $check =false;
+                                    for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                        $findme = "|col$h|";
+                                        $pos = stripos($condition_eval, $findme);
+                                        if ($pos !== false) {
+                                            $condition_eval = str_replace($findme,$list[$ligne_number][$h],$condition_eval);
+                                        }
+                                    }
+                            eval('$check_eval = '.$condition_eval.';');
+                                }
+                            if($check || $check_eval){
+                            ?>
+                            <a href="<?php
+                                $new_FG_OTHER_BUTTON5_LINK = $this -> FG_OTHER_BUTTON5_LINK;
+                                if (strpos($this -> FG_OTHER_BUTTON5_LINK,"|param|")){
+                                    $new_FG_OTHER_BUTTON5_LINK = str_replace("|param|",$list[$ligne_number][$this->FG_NB_TABLE_COL],$this -> FG_OTHER_BUTTON5_LINK);
+                                    // SHOULD DO SMTH BETTER WITH paramx and get the x number to find the value to use
+                                }
+                                if (strpos($this -> FG_OTHER_BUTTON5_LINK,"|param1|")){
+                                    $new_FG_OTHER_BUTTON5_LINK = str_replace("|param1|",$list[$ligne_number][$this->FG_NB_TABLE_COL-1],$this -> FG_OTHER_BUTTON5_LINK);
+                                }
+
+                                // REPLACE |colX|  where is a numero of the column by the column value
+                                if (preg_match ('/col[0-9]/i', $new_FG_OTHER_BUTTON5_LINK)) {
+                                    for ($h=0;$h<=$this->FG_NB_TABLE_COL;$h++){
+                                        $findme = "|col$h|";
+                                        $pos = stripos($new_FG_OTHER_BUTTON5_LINK, $findme);
+                                        if ($pos !== false) {
+                                            $new_FG_OTHER_BUTTON5_LINK = str_replace($findme,$list[$ligne_number][$h],$new_FG_OTHER_BUTTON5_LINK);
+                                        }
+                                    }
+                                }
+
+                                // REPLACE |col_origX|  where is a numero of the column by the column value
+                                if (preg_match ('/col_orig[0-9]/i', $new_FG_OTHER_BUTTON5_LINK)) {
+                                        for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                        $findme = "|col_orig$h|";
+                                        $pos = stripos($new_FG_OTHER_BUTTON5_LINK, $findme);
+                                        if ($pos !== false) {
+                                            $new_FG_OTHER_BUTTON5_LINK = str_replace($findme,$origlist[$ligne_number][$h],$new_FG_OTHER_BUTTON5_LINK);
+                                        }
+                                    }
+                                }
+                                echo $new_FG_OTHER_BUTTON5_LINK;
+
+                                $extra_html="";
+
+                                if(!empty($this->FG_OTHER_BUTTON5_HTML_ID) && (preg_match ('/col[0-9]/i',$this->FG_OTHER_BUTTON5_HTML_ID))){
+                                    $temp_id =$this->FG_OTHER_BUTTON5_HTML_ID;
+                                    for ($h=count($list[$ligne_number]);$h>=0;$h--){
+                                        $findme = "|col$h|";
+                                        $pos = stripos($temp_id, $findme);
+                                        if ($pos !== false) {
+                                            $temp_id = str_replace($findme,$origlist[$ligne_number][$h],$temp_id);
+                                        }
+                                    }
+                                    $extra_html.=' id="'.$temp_id.'"';
+
+                                }
+
+                                if(!empty($this->FG_OTHER_BUTTON5_HTML_CLASS) ){
+                                    $extra_html.= ' class="'.$this->FG_OTHER_BUTTON5_HTML_CLASS.'" ';
+                                }
+
+
+
+                                if (substr($new_FG_OTHER_BUTTON5_LINK,-1)=='=') echo $list[$ligne_number][$this->FG_NB_TABLE_COL];
+                                if (strlen($this -> FG_OTHER_BUTTON5_IMG)==0){
+                                    echo '"'.$extra_html.'> '.'<span class="cssbutton">'.$this->FG_OTHER_BUTTON5_ALT.'</span>';
+                                }else{
+                                    ?>" <?php echo $extra_html ?> ><img src="<?php echo $this -> FG_OTHER_BUTTON5_IMG?>" border="0" title="<?php echo $this->FG_OTHER_BUTTON5_ALT?>" alt="<?php echo $this->FG_OTHER_BUTTON5_ALT?>"><?php
+
+                                }
+                                ?></a>
+                        <?php
+                             }
+                        }
+                        ?>
+
+
+                      </TD>
+                    <?php  } ?>
+
+                    </TR>
+                <?php
+                    } //  for (ligne_number=0;ligne_number<count($list);$ligne_number++)
+                    while ($ligne_number < 7){
+                ?>
+                    <TR bgcolor="<?php echo $this->FG_TABLE_ALTERNATE_ROW_COLOR[$ligne_number%2]?>">
+                        <?php
+                            $REMOVE_COL = ($this->FG_OTHER_BUTTON1 || $this->FG_OTHER_BUTTON2 || $this->FG_OTHER_BUTTON3 || $this->FG_OTHER_BUTTON4 || $this->FG_EDITION || $this->FG_INFO || $this->FG_DELETION )? 0 : 1;
+                            for($i=0;$i<$this->FG_NB_TABLE_COL-$REMOVE_COL;$i++){
+                         ?>
+                         <TD vAlign=top class="tableBody">&nbsp;</TD>
+                         <?php  } ?>
+                         <TD align="center" vAlign=top class="tableBodyRight">&nbsp;</TD>
+                    </TR>
+
+                <?php
+                        $ligne_number++;
+                    } //END_WHILE
+                 ?>
                 <TR>
                   <TD class="tableDivider" colSpan=<?php echo $this->FG_TOTAL_TABLE_COL?>><IMG height=1 src="<?php echo Images_Path_Main;?>/clear.gif" width=1></TD>
                 </TR>
             </TABLE>
 
-		  </TD>
+          </TD>
         </TR>
-		<?php if ($this->CV_DISPLAY_BROWSE_PAGE){ ?>
+        <?php if ($this->CV_DISPLAY_BROWSE_PAGE){ ?>
         <TR >
           <TD height=16 style="PADDING-LEFT: 5px; PADDING-RIGHT: 3px">
-			<TABLE border=0 cellPadding=0 cellSpacing=0 width="100%">
+            <TABLE border=0 cellPadding=0 cellSpacing=0 width="100%">
                 <TR>
                   <TD align="right" valign="bottom"><span class="viewhandler_span2">
-					<?php
-					$c_url = $_SERVER['PHP_SELF'].'?stitle='.$stitle.'&atmenu='.$atmenu.'&current_page=%s'."&filterprefix=".$processed['filterprefix']."&order=".$processed['order']."&sens=".$processed['sens']."&mydisplaylimit=".$processed['mydisplaylimit']."&popup_select=".$processed["popup_select"]."&letter=".$processed["letter"].$this-> CV_FOLLOWPARAMETERS;
-					if (!is_null($letter) && ($letter!=""))   $c_url .= "&letter=".$processed['letter'];
-					$this -> printPages($this -> CV_CURRENT_PAGE+1, $this -> FG_NB_RECORD_MAX, $c_url) ;
-					?>
-					</span>
+                    <?php
+                    $c_url = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL).'?stitle='.$stitle.'&atmenu='.$atmenu.'&current_page=%s'."&filterprefix=".$processed['filterprefix']."&order=".$processed['order']."&sens=".$processed['sens']."&mydisplaylimit=".$processed['mydisplaylimit']."&popup_select=".$processed["popup_select"]."&letter=".$processed["letter"].$this-> CV_FOLLOWPARAMETERS;
+                    if (!is_null($letter) && ($letter!=""))   $c_url .= "&letter=".$processed['letter'];
+                    $this -> printPages($this -> CV_CURRENT_PAGE+1, $this -> FG_NB_RECORD_MAX, $c_url) ;
+                    ?>
+                    </span>
                   </TD>
             </TABLE></TD>
         </TR>
-		<?php  	} 	?>
-
-        <FORM name="otherForm2" action="<?php echo $_SERVER['PHP_SELF']; ?>">
-		<tr><td>
-		<?php if ($this->CV_DISPLAY_RECORD_LIMIT){ ?>
-			<?php echo gettext("DISPLAY");?>
-			<input type="hidden" name="stitle" value="<?php echo $stitle?>">
-			<input type="hidden" name="atmenu" value="<?php echo $atmenu?>">
-			<input type="hidden" name="order" value="<?php echo $processed['order']?>">
-			<input type="hidden" name="sens" value="<?php echo $processed['sens']?>">
-			<input type="hidden" name="current_page" value="0">
-			<input type="hidden" name="filterprefix" value="<?php echo $processed['filterprefix']?>">
-			<input type="hidden" name="popup_select" value="<?php echo $processed['popup_select']?>">
-			<input type="hidden" name="popup_formname" value="<?php echo $processed['popup_formname']?>">
-			<input type="hidden" name="popup_fieldname" value="<?php echo $processed['popup_fieldname']?>">
-			<input type="hidden" name="type" value="<?php echo $processed['type']?>">
-			<input type="hidden" name="id" value="<?php echo $processed['id']?>">
-            <?php 
-            	foreach ($processed as $key => $val) {
-            		if ($key!='current_page' && $key!='id') {
-            	?>
+        <?php   }   ?>
+
+        <FORM name="otherForm2" action="<?php echo filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL); ?>">
+        <tr><td>
+        <?php if ($this->CV_DISPLAY_RECORD_LIMIT){ ?>
+            <?php echo gettext("DISPLAY");?>
+            <input type="hidden" name="stitle" value="<?php echo $stitle?>">
+            <input type="hidden" name="atmenu" value="<?php echo $atmenu?>">
+            <input type="hidden" name="order" value="<?php echo $processed['order']?>">
+            <input type="hidden" name="sens" value="<?php echo $processed['sens']?>">
+            <input type="hidden" name="current_page" value="0">
+            <input type="hidden" name="filterprefix" value="<?php echo $processed['filterprefix']?>">
+            <input type="hidden" name="popup_select" value="<?php echo $processed['popup_select']?>">
+            <input type="hidden" name="popup_formname" value="<?php echo $processed['popup_formname']?>">
+            <input type="hidden" name="popup_fieldname" value="<?php echo $processed['popup_fieldname']?>">
+            <input type="hidden" name="type" value="<?php echo $processed['type']?>">
+            <input type="hidden" name="id" value="<?php echo $processed['id']?>">
+            <?php
+                foreach ($processed as $key => $val) {
+                    if ($key!='current_page' && $key!='id') {
+                ?>
                    <input type="hidden" name="<?php echo $key?>" value="<?php echo $val?>">
-             	<?php  
-             		}
-            	}
+                <?php
+                    }
+                }
              ?>
-			<select name="mydisplaylimit" size="1" class="form_input_select">
-			<?php $session_limit = $this->FG_TABLE_NAME."-displaylimit"; ?>
-			
-				<option value="10" <?php if($_SESSION[$session_limit]==10 || empty($_SESSION[$session_limit])) echo "selected" ?>>10</option>
-				<option value="50" <?php if(is_numeric($_SESSION[$session_limit]) && $_SESSION[$session_limit]==50 ) echo "selected" ?>>50</option>
-				<option value="100" <?php if( is_numeric($_SESSION[$session_limit]) && $_SESSION[$session_limit]==100 ) echo "selected" ?>>100</option>
-				<option value="ALL" <?php if( is_numeric($_SESSION[$session_limit]) && $_SESSION[$session_limit]>100 ) echo "selected" ?>>All</option>
-			</select>
-			<input class="form_input_button"  value=" <?php echo gettext("GO");?> " type="SUBMIT">
-			&nbsp; &nbsp; &nbsp;
-		<?php  	} 	?>
-		<?php if ($this->FG_EXPORT_CSV){ ?>
-		 - &nbsp; &nbsp; <a href="export_csv.php?var_export=<?php echo $this->FG_EXPORT_SESSION_VAR ?>&var_export_type=type_csv" target="_blank" ><img src="<?php echo Images_Path;?>/excel.gif" border="0" height="30"/><?php echo gettext("Export CSV");?></a>
-
-		<?php  	} 	?>
+            <select name="mydisplaylimit" size="1" class="form_input_select">
+            <?php $session_limit = $this->FG_TABLE_NAME."-displaylimit"; ?>
+
+                <option value="10" <?php if($_SESSION[$session_limit]==10 || empty($_SESSION[$session_limit])) echo "selected" ?>>10</option>
+                <option value="50" <?php if(is_numeric($_SESSION[$session_limit]) && $_SESSION[$session_limit]==50 ) echo "selected" ?>>50</option>
+                <option value="100" <?php if( is_numeric($_SESSION[$session_limit]) && $_SESSION[$session_limit]==100 ) echo "selected" ?>>100</option>
+                <option value="ALL" <?php if( is_numeric($_SESSION[$session_limit]) && $_SESSION[$session_limit]>100 ) echo "selected" ?>>All</option>
+            </select>
+            <input class="form_input_button"  value=" <?php echo gettext("GO");?> " type="SUBMIT">
+            &nbsp; &nbsp; &nbsp;
+        <?php   }   ?>
+        <?php if ($this->FG_EXPORT_CSV){ ?>
+         - &nbsp; &nbsp; <a href="export_csv.php?var_export=<?php echo $this->FG_EXPORT_SESSION_VAR ?>&var_export_type=type_csv" target="_blank" ><img src="<?php echo Images_Path;?>/excel.gif" border="0" height="30"/><?php echo gettext("Export CSV");?></a>
+
+        <?php   }   ?>
         <?php if ($this->FG_EXPORT_XML){ ?>
-		 - &nbsp; &nbsp; <a href="export_csv.php?var_export=<?php echo $this->FG_EXPORT_SESSION_VAR ?>&var_export_type=type_xml" target="_blank" ><img src="<?php echo Images_Path;?>/icons_xml.gif" border="0" height="32"/><?php echo gettext("Export XML");?></a>
+         - &nbsp; &nbsp; <a href="export_csv.php?var_export=<?php echo $this->FG_EXPORT_SESSION_VAR ?>&var_export_type=type_xml" target="_blank" ><img src="<?php echo Images_Path;?>/icons_xml.gif" border="0" height="32"/><?php echo gettext("Export XML");?></a>
 
-		<?php  	}?>
+        <?php   }?>
 
-		</td></tr>
-		</FORM>
+        </td></tr>
+        </FORM>
       </table>
    </div>
 <?php
-	}else{
+    }else{
 ?>
-    
-    
-	<br><br>
-	<div align="center">
-	<table width="80%" border="0" align="center">
-		
-		<tr>
-			<td align="center">
-				<?php echo $this -> CV_NO_FIELDS;?><br>
-			</td>
-		</tr>
-	</table>
-	</div>
-	<br><br>
-<?php 
-	}//end_if
+
+
+    <br><br>
+    <div align="center">
+    <table width="80%" border="0" align="center">
+
+        <tr>
+            <td align="center">
+                <?php echo $this -> CV_NO_FIELDS;?><br>
+            </td>
+        </tr>
+    </table>
+    </div>
+    <br><br>
+<?php
+    }//end_if
 ?>
diff --git a/common/lib/Misc.php b/common/lib/Misc.php
index 10f5f3f0f..1c64bb97c 100755
--- a/common/lib/Misc.php
+++ b/common/lib/Misc.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -226,9 +226,9 @@ function write_log($logfile, $output)
 }
 
 /*
- * function cleanInput
+ * function sanitize_tag
  */
-function cleanInput($input)
+function sanitize_tag($input)
 {
     $search = array (
         '@<script[^>]*?>.*?</script>@si', // Strip out javascript
@@ -248,14 +248,15 @@ function cleanInput($input)
 function sanitize_data($input)
 {
     if (is_array($input)) {
+        // Sanitize Array
         foreach ($input as $var => $val) {
             $output[$var] = sanitize_data($val);
         }
     } else {
-
         // Remove whitespaces (not a must though)
         $input = trim($input);
         $input = str_replace('--', '', $input);
+        $input = str_replace('..', '', $input);
         $input = str_replace(';', '', $input);
         $input = str_replace('/*', '', $input);
 
@@ -265,30 +266,80 @@ function sanitize_data($input)
         $input = str_ireplace('SUBSTRING', '', $input);
         $input = str_ireplace('ASCII', '', $input);
         $input = str_ireplace('SHA1', '', $input);
-        $input = str_ireplace('MD5', '', $input);
-        $input = str_ireplace('SCRIPT', '', $input);
+        #MD5 is used by md5secret
+        #$input = str_ireplace('MD5', '', $input);
         $input = str_ireplace('ROW_COUNT', '', $input);
         $input = str_ireplace('SELECT', '', $input);
+        $input = str_ireplace('INSERT', '', $input);
+        $input = str_ireplace('CASE WHEN', '', $input);
+        $input = str_ireplace('INFORMATION_SCHEMA', '', $input);
+        $input = str_ireplace('DROP', '', $input);
+        $input = str_ireplace('RLIKE', '', $input);
+        $input = str_ireplace(' IF', '', $input);
+        $input = str_ireplace(' OR ', '', $input);
+        $input = str_ireplace('\\', '', $input);
+        //$input = str_ireplace('DELETE', '', $input);
+        $input = str_ireplace('CONCAT', '', $input);
+        $input = str_ireplace('WHERE', '', $input);
         $input = str_ireplace('UPDATE', '', $input);
-
-        if (!(stripos($input, ' or 1') === FALSE)) {
-            return false;
-        }
-        if (!(stripos($input, ' or true') === FALSE)) {
-            return false;
-        }
+        $input = str_ireplace(' or 1', '', $input);
+        $input = str_ireplace(' or true', '', $input);
+        //Permutation - in mailing admin/Public/A2B_entity_mailtemplate.php
+        // we use url with key=$loginkey$
+        $input = str_ireplace('=$', '+$', $input);
+        $input = str_ireplace('=', '', $input);
+        $input = str_ireplace('+$', '=$', $input);
 
         if (get_magic_quotes_gpc()) {
             $input = stripslashes($input);
         }
-        $input = cleanInput($input);
+        $input = sanitize_tag($input);
 
         $output = addslashes($input);
     }
-
     return $output;
 }
 
+/*
+ * Sanitize all Post Get variables
+ */
+function sanitize_post_get() {
+    if ($_POST) {
+        foreach ($_POST as $key => $value) {
+            $key = filter_var($key, FILTER_CALLBACK, array("options"=>"sanitize_data"));
+            $value = filter_var($value, FILTER_CALLBACK, array("options"=>"sanitize_data"));
+            $key = filter_var($key, FILTER_SANITIZE_STRING);
+            if (is_array($value)) {
+                foreach ($value as $subkey => $subvalue) {
+                    $subkey = filter_var($subkey, FILTER_SANITIZE_STRING);
+                    $subvalue = filter_var($subvalue, FILTER_SANITIZE_STRING);
+                    $value[$subkey] = $subvalue;
+                }
+            } else {
+                $value = filter_var($value, FILTER_SANITIZE_STRING);
+            }
+            $_POST[$key] = $value;
+        }
+    }
+    if ($_GET) {
+        foreach ($_GET as $key => $value) {
+            $key = filter_var($key, FILTER_CALLBACK, array("options"=>"sanitize_data"));
+            $value = filter_var($value, FILTER_CALLBACK, array("options"=>"sanitize_data"));
+            $key = filter_var($key, FILTER_SANITIZE_STRING);
+            if (is_array($value)) {
+                foreach ($value as $subkey => $subvalue) {
+                    $subkey = filter_var($subkey, FILTER_SANITIZE_STRING);
+                    $subvalue = filter_var($subvalue, FILTER_SANITIZE_STRING);
+                    $value[$subkey] = $subvalue;
+                }
+            } else {
+                $value = filter_var($value, FILTER_SANITIZE_STRING);
+            }
+            $_GET[$key] = $value;
+        }
+    }
+}
+
 /*
  * function getpost_ifset
  */
@@ -303,23 +354,12 @@ function getpost_ifset($test_vars)
         if (isset ($_POST[$test_var])) {
             global $$test_var;
             $$test_var = $_POST[$test_var];
-            $$test_var = sanitize_data($$test_var);
-            if ($test_var == 'username' || $test_var == 'filterprefix') {
-                //rebuild the search parameter to filter character to format card number
-                $filtered_char = array (
-                    " ",
-                    "-",
-                    "_",
-                    "(",
-                    ")",
-                    "+"
-                );
-                $$test_var = str_replace($filtered_char, "", $$test_var);
 
-            }
         } elseif (isset ($_GET[$test_var])) {
             global $$test_var;
             $$test_var = $_GET[$test_var];
+        }
+        if (isset($$test_var)) {
             $$test_var = sanitize_data($$test_var);
             //rebuild the search parameter to filter character to format card number
             if ($test_var == 'username' || $test_var == 'filterprefix') {
@@ -472,6 +512,11 @@ function display_2bill($var, $currency = BASE_CURRENCY)
     echo number_format($var, 3) . ' ' . strtoupper($currency);
 }
 
+function display_pre($var)
+{
+    echo '<pre>' . $var . '</pre>';
+}
+
 function remove_prefix($phonenumber)
 {
     if (substr($phonenumber, 0, 3) == "011") {
@@ -741,15 +786,19 @@ function generate_unique_value($table, $len, $field)
 /*
  * function gen_card_with_alias
  */
-function gen_card_with_alias($table = "cc_card", $api = 0, $length_cardnumber = LEN_CARDNUMBER, $DBHandle = null)
+function gen_card_with_alias($table = "cc_card", $api = 0, $length_cardnumber = LEN_CARDNUMBER, $DBHandle = null, &$useralias_next = null)
 {
     if (!isset($DBHandle)) {
         $DBHandle = DbConnect();
     }
 
+    $useralias_next_length = strlen($useralias_next);
+    $useralias_next_value = intval($useralias_next);
+
     for ($k = 0; $k <= 200; $k++) {
         $card_gen = MDP($length_cardnumber);
-        $alias_gen = MDP(LEN_ALIASNUMBER);
+        $alias_gen = $useralias_next_length ? $useralias_next : MDP(LEN_ALIASNUMBER);
+
         if ($k == 200) {
             if ($api) {
                 global $mail_content, $email_alarm, $logfile;
@@ -769,8 +818,14 @@ function gen_card_with_alias($table = "cc_card", $api = 0, $length_cardnumber =
         if ($resmax)
             $numrow = $resmax->RecordCount();
 
+        if ($useralias_next_length) {
+            $useralias_next_value++;
+            $useralias_next = sprintf('%0' . $useralias_next_length . 'd', $useralias_next_value);
+        }
+
         if ($numrow != 0)
             continue;
+
         $arr_val[0] = $card_gen;
         $arr_val[1] = $alias_gen;
 
@@ -1179,6 +1234,7 @@ function currencies_update_yahoo ($DBHandle, $instance_table)
 {
     $FG_DEBUG = 0;
     $strong_currency = 'EUR';
+    // http://download.finance.yahoo.com/d/quotes.csv?s=USDEUR=X+USDGBP=X&f=sl1d1t1c1ohgv&e=.csv
     $url = "http://download.finance.yahoo.com/d/quotes.csv?s=";
     $return = "";
 
@@ -1186,7 +1242,7 @@ function currencies_update_yahoo ($DBHandle, $instance_table)
     $old_currencies = $instance_table->SQLExec($DBHandle, $QUERY);
 
     // we will retrieve a .CSV file e.g. USD to EUR and USD to CAD with a URL like:
-    // http://download.finance.yahoo.com/d/quotes.csv?s=USDEUR=X+USDCAD=X&f=l1
+    // http://download.finance.yahoo.com/d/quotes.csv?s=USDEUR=X+USDCAD=X&f=sl1d1t1c1ohgv
     if (is_array($old_currencies)) {
         $num_cur = count($old_currencies);
         if ($FG_DEBUG >= 1)
@@ -1195,8 +1251,8 @@ function currencies_update_yahoo ($DBHandle, $instance_table)
             if ($FG_DEBUG >= 1)
                 $return .= $old_currencies[$i][0] . ' - ' . $old_currencies[$i][1] . ' - ' . $old_currencies[$i][2] . "\n";
             // Finish and add termination ?
-            if ($i +1 == $num_cur) {
-                $url .= $strong_currency . $old_currencies[$i][1] . "=X&f=l1";
+            if ($i+1 == $num_cur) {
+                $url .= $strong_currency . $old_currencies[$i][1] . "=X&f=sl1d1t1c1ohgv";
             } else {
                 $url .= $strong_currency . $old_currencies[$i][1] . "=X+";
             }
@@ -1212,48 +1268,58 @@ function currencies_update_yahoo ($DBHandle, $instance_table)
             return gettext("Can't find our base_currency in cc_currencies.") . ' ' . gettext('Currency update ABORTED.');
         }
 
-        // Call wget to download the URL to the .CVS file
-        $command = "wget '" . $url . "' -O /tmp/currencies.cvs  2>&1";
+        // Call wget to download the URL to the .CSV file
+        $command = "wget '" . $url . "' -O /tmp/currencies.csv  2>&1";
         exec($command, $output);
         if ($FG_DEBUG >= 1)
-            $return .= "wget '" . $url . "' -O /tmp/currencies.cvs\n" . $output;
+            $return .= "wget '" . $url . "' -O /tmp/currencies.csv\n" . $output;
 
         // get the file with the currencies to update the database
-        $currencies = file("/tmp/currencies.cvs");
+        $currencies = file("/tmp/currencies.csv");
 
         // trim off any leading/trailing comments/headers that may have been added
-        $i = 0;
-        while (!is_numeric(trim($currencies[$i]))) {
-            $i++;
-        }
-        $currencies = array_slice($currencies, $i, $num_cur);
+        // $i = 0;
+        // while (!is_numeric(trim($currencies[$i]))) {
+        //     $i++;
+        //     if ($i > 200) {
+        //         return "Error Currency Loop";
+        //     }
+        // }
+        // $currencies = array_slice($currencies, $i, $num_cur);
 
         // do some simple checks to try to verify we've received exactly one
         // valid response for each currency we requested
         $num_res = count($currencies);
-        if ($num_res < $num_cur) {
-            return gettext("The CSV file doesn't contain all the currencies we requested.") . ' ' . gettext('Currency update ABORTED.');
-        }
-        for ($i = 0; $i < $num_cur; $i++) {
-            if (!is_numeric(trim($currencies[$i]))) {
-                return gettext("At least one of the entries in the CSV file isn't a number.") . ' ' . gettext('Currency update ABORTED.');
-            }
-        }
+        // if ($num_res < $num_cur) {
+        //     return gettext("The CSV file doesn't contain all the currencies we requested.") . ' ' . gettext('Currency update ABORTED.');
+        // }
+        // for ($i = 0; $i < $num_cur; $i++) {
+        //     if (!is_numeric(trim($currencies[$i]))) {
+        //         return gettext("At least one of the entries in the CSV file isn't a number.") . ' ' . gettext('Currency update ABORTED.');
+        //     }
+        // }
 
         // Find base_currency's value in $strong_currency to help avoid Yahoo's
-        // early truncation,  and therefore win back a lot of accuracy
-        $base_value = $currencies[$index_base_currency];
+        // early truncation, and therefore keep a level of accuracy
+        $line_base_value = $currencies[$index_base_currency];
+        $arr_value = explode(',', $line_base_value);
+        if (!is_array($arr_value)) {
+            return gettext('Error fetching currencies... Currency update ABORTED!');
+        }
+        $base_value = $arr_value[1];
 
         // Check our base_currency will still fund our addiction to tea and biscuits
         if (round($base_value, 5) < 0.00001) {
-            return gettext('Our base_currency seems to be worthless.') . ' ' . gettext('Currency update ABORTED.');
+            return gettext('The base_currency is too small. Currency update ABORTED!');
         }
 
         // update each row we originally retrieved from cc_currencies
-        $i = 0;
-        foreach ($currencies as $currency) {
-
-            $currency = trim($currency);
+        $i = -1;
+        foreach ($currencies as $line_currency) {
+            $i++;
+            $line_currency = trim($line_currency);
+            $line_ex = explode(',', $line_currency);
+            $currency = trim($line_ex[1]);
 
             if ($currency != 0) {
                 $currency = $base_value / $currency;
@@ -1265,11 +1331,11 @@ function currencies_update_yahoo ($DBHandle, $instance_table)
             }
 
             // if the currency is base_currency then set to exactly 1.00000
-            if ($i == $index_base_currency)
+            if ($i == $index_base_currency) {
                 $currency = 1;
+            }
 
             $QUERY = "UPDATE cc_currencies SET value='$currency'";
-
             // if we've changed base_currency,  update each SQL row to reflect this
             if (BASE_CURRENCY != $old_currencies[$i][2]) {
                 $QUERY .= ", basecurrency='" . BASE_CURRENCY . "'";
@@ -1280,9 +1346,9 @@ function currencies_update_yahoo ($DBHandle, $instance_table)
             if ($FG_DEBUG >= 1)
                 $return .= "$QUERY -> [$result]\n";
 
-            $i++;
-            if ($i > 2000)
+            if ($i > 200) {
                 return $return;
+            }
         }
         $return .= gettext('Success! All currencies are now updated.');
     }
@@ -1486,9 +1552,7 @@ function check_cp()
     $pos = strpos($pageURL, 'phpsysinfo');
 
     if ($pos === false) {
-
         $footer_content = file_get_contents("templates/default/footer.tpl");
-
         $pos_copyright = strpos($footer_content, '$COPYRIGHT');
         if ($pos_copyright === false) {
             return $ret_val;
@@ -1580,3 +1644,97 @@ function Display_Login_Button ($DBHandle, $id)
 
     return $content;
 }
+
+function display_minute_used($id_trunk) {
+    $counters = getTrunkCounters($id_trunk);
+
+    display_minute(!is_null($counters) ? $counters['seconds'] : 0);
+}
+
+function display_wholeminute_used($id_trunk) {
+    $counters = getTrunkCounters($id_trunk);
+
+    echo !is_null($counters) ? $counters['minutes'] : 0;
+}
+
+function display_calls_used($id_trunk) {
+    $counters = getTrunkCounters($id_trunk);
+
+    echo !is_null($counters) ? $counters['success_calls'] : 0;
+}
+
+function getTrunkCounters($id_trunk) {
+    $id_trunk = intval($id_trunk);
+    if ($id_trunk <= 0)
+        return null;
+
+    global $DBHandle;
+    if (!is_object($DBHandle))
+        $DBHandle = DbConnect();
+
+    static $instance_table = null;
+    if ($instance_table === null)
+        $instance_table = new Table();
+
+    $QUERY = "select * from cc_trunk_counter where id_trunk = '$id_trunk' and calldate = getCurDateByTrunkTZ($id_trunk) limit 1";
+    $result = $instance_table->SQLExec($DBHandle, $QUERY);
+
+    return (is_array($result) && count($result) > 0) ? $result[0] : null;
+}
+
+function updateTrunkCounters($id_trunk, $sessiontime) {
+    $id_trunk = intval($id_trunk);
+    if ($id_trunk <= 0 || $sessiontime <= 0)
+        return;
+
+    global $DBHandle;
+    if (!is_object($DBHandle))
+        $DBHandle = DbConnect();
+
+    static $instance_table = null;
+    if ($instance_table === null)
+        $instance_table = new Table();
+
+    $counters = getTrunkCounters($id_trunk);
+    if (!$counters) {
+        $QUERY = "insert into cc_trunk_counter set id_trunk = '$id_trunk', calldate = getCurDateByTrunkTZ($id_trunk), seconds = 0, last_call_time = 0, success_calls = 0, minutes = 0";
+        $instance_table->SQLExec($DBHandle, $QUERY, 0);
+    }
+
+    $minutes = ceil($sessiontime / 60);
+
+    $QUERY = "UPDATE cc_trunk_counter SET minutes = minutes + $minutes,  seconds = seconds + $sessiontime, last_call_time = '" . time() . "', success_calls = success_calls + 1 WHERE id_trunk = '$id_trunk' and calldate = getCurDateByTrunkTZ($id_trunk)";
+    $instance_table->SQLExec($DBHandle, $QUERY, 0);
+}
+
+function eraseTrunkCounters($id_trunk) {
+    $id_trunk = intval($id_trunk);
+    if ($id_trunk <= 0)
+        return;
+
+    global $DBHandle;
+    if (!is_object($DBHandle))
+        $DBHandle = DbConnect();
+
+    static $instance_table = null;
+    if ($instance_table === null)
+        $instance_table = new Table();
+
+    $QUERY = "delete from cc_trunk_counter where id_trunk = '$id_trunk' and calldate = getCurDateByTrunkTZ($id_trunk)";
+    $instance_table->SQLExec($DBHandle, $QUERY, 0);
+}
+
+function display_timezone($id_tz) {
+    global $DBHandle;
+    if (!is_object($DBHandle))
+        $DBHandle = DbConnect();
+
+    static $instance_table = null;
+    if ($instance_table === null)
+        $instance_table = new Table();
+
+    $QUERY = "select * from cc_timezone where id = '$id_tz' limit 1";
+    $result = $instance_table->SQLExec($DBHandle, $QUERY);
+
+    echo (is_array($result) && count($result) > 0) ? $result[0]['gmtzone'] : '';
+}
\ No newline at end of file
diff --git a/common/lib/PhpQuickProfiler.php b/common/lib/PhpQuickProfiler.php
old mode 100644
new mode 100755
diff --git a/common/lib/ProcessHandler.php b/common/lib/ProcessHandler.php
old mode 100644
new mode 100755
index 89eb0ddb3..d154a8ac0
--- a/common/lib/ProcessHandler.php
+++ b/common/lib/ProcessHandler.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/common/lib/admin.defines.php b/common/lib/admin.defines.php
index 15bbf8bfc..0a3a9dcdb 100755
--- a/common/lib/admin.defines.php
+++ b/common/lib/admin.defines.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -30,6 +30,22 @@
  *
  *
 **/
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+/* prevent XSS */
+$_GET   = filter_input_array(INPUT_GET, FILTER_SANITIZE_STRING);
+$_POST  = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+// filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) = $_SERVER['PHP_SELF'];
+// $PHPSELF = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL);
+
+define ("WRITELOG_QUERY", false);
+define ("FSROOT", substr(dirname(__FILE__),0,-3));
+define ("LIBDIR", FSROOT."lib/");
+
+// INCLUDE MISC
+include (FSROOT."lib/Misc.php");
+
+sanitize_post_get();
 
 define ("PHP_QUICK_PROFILER", false);
 // Include PHP-Quick-Profiler
@@ -37,22 +53,15 @@
 $objProf = new PhpQuickProfiler(0);
 $profiler = new PhpQuickProfiler($objProf->getMicroTime());
 
-define ("WRITELOG_QUERY", false);
-define ("FSROOT", substr(dirname(__FILE__),0,-3));
-define ("LIBDIR", FSROOT."lib/");
 
 include_once (FSROOT."lib/interface/constants.php");
 include_once (dirname(__FILE__)."/Class.A2Billing.php");
-require_once 'adodb/adodb.inc.php'; // AdoDB
 include_once (dirname(__FILE__)."/Class.Table.php");
 include_once (dirname(__FILE__)."/Class.Connection.php");
 include_once (dirname(__FILE__)."/Class.Realtime.php");
 
 // USE PHPMAILER
 include_once (FSROOT."lib/mail/class.phpmailer.php");
-
-// INCLUDE MISC
-include (FSROOT."lib/Misc.php");
 include (dirname(__FILE__)."/Class.NotificationsDAO.php");
 include (dirname(__FILE__)."/Class.Notification.php");
 include (dirname(__FILE__)."/Class.Mail.php");
diff --git a/common/lib/admin.help.php b/common/lib/admin.help.php
old mode 100644
new mode 100755
index bec4d0466..ec59a5984
--- a/common/lib/admin.help.php
+++ b/common/lib/admin.help.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/common/lib/admin.module.access.php b/common/lib/admin.module.access.php
index c52f747ab..07f6c9056 100755
--- a/common/lib/admin.module.access.php
+++ b/common/lib/admin.module.access.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/common/lib/admin.smarty.php b/common/lib/admin.smarty.php
old mode 100644
new mode 100755
index e14272825..d6fd52030
--- a/common/lib/admin.smarty.php
+++ b/common/lib/admin.smarty.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -31,15 +31,22 @@
  *
 **/
 
+
+// use Factory\SmartyFactory;
+
+
 error_reporting(E_ALL ^ (E_NOTICE | E_WARNING));
 
 define( 'FULL_PATH', dirname(__FILE__) . '/' );
-define( 'SMARTY_DIR', FULL_PATH . '/smarty/' );
+define( 'SMARTY_DIR', FULL_PATH . '../../vendor/smarty/smarty/libs/' );
 define( 'TEMPLATE_DIR',  '../Public/templates/' );
 define( 'TEMPLATE_C_DIR', '../templates_c/' );
 
-require_once SMARTY_DIR . 'Smarty.class.php';
-$smarty = new Smarty;
+// $smarty = SmartyFactory::getInstance();
+#Remove the factory, for some reasons it doesnt work on PHP 5.3 / CentOs 6
+
+require_once SMARTY_DIR . 'SmartyBC.class.php';
+$smarty = new SmartyBC();
 
 $skin_name = $_SESSION["stylefile"];
 
diff --git a/common/lib/adodb/adodb-active-record.inc.php b/common/lib/adodb/adodb-active-record.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-csvlib.inc.php b/common/lib/adodb/adodb-csvlib.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-datadict.inc.php b/common/lib/adodb/adodb-datadict.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-error.inc.php b/common/lib/adodb/adodb-error.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-errorhandler.inc.php b/common/lib/adodb/adodb-errorhandler.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-errorpear.inc.php b/common/lib/adodb/adodb-errorpear.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-exceptions.inc.php b/common/lib/adodb/adodb-exceptions.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-iterator.inc.php b/common/lib/adodb/adodb-iterator.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-lib.inc.php b/common/lib/adodb/adodb-lib.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-memcache.lib.inc.php b/common/lib/adodb/adodb-memcache.lib.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-pager.inc.php b/common/lib/adodb/adodb-pager.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-pear.inc.php b/common/lib/adodb/adodb-pear.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-perf.inc.php b/common/lib/adodb/adodb-perf.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-php4.inc.php b/common/lib/adodb/adodb-php4.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-time.inc.php b/common/lib/adodb/adodb-time.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-xmlschema.inc.php b/common/lib/adodb/adodb-xmlschema.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb-xmlschema03.inc.php b/common/lib/adodb/adodb-xmlschema03.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/adodb.inc.php b/common/lib/adodb/adodb.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/datadict/datadict-access.inc.php b/common/lib/adodb/datadict/datadict-access.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/datadict/datadict-db2.inc.php b/common/lib/adodb/datadict/datadict-db2.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/datadict/datadict-firebird.inc.php b/common/lib/adodb/datadict/datadict-firebird.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/datadict/datadict-generic.inc.php b/common/lib/adodb/datadict/datadict-generic.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/datadict/datadict-ibase.inc.php b/common/lib/adodb/datadict/datadict-ibase.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/datadict/datadict-informix.inc.php b/common/lib/adodb/datadict/datadict-informix.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/datadict/datadict-mssql.inc.php b/common/lib/adodb/datadict/datadict-mssql.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/datadict/datadict-mssqlnative.inc.php b/common/lib/adodb/datadict/datadict-mssqlnative.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/datadict/datadict-mysql.inc.php b/common/lib/adodb/datadict/datadict-mysql.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/datadict/datadict-oci8.inc.php b/common/lib/adodb/datadict/datadict-oci8.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/datadict/datadict-postgres.inc.php b/common/lib/adodb/datadict/datadict-postgres.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/datadict/datadict-sapdb.inc.php b/common/lib/adodb/datadict/datadict-sapdb.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/datadict/datadict-sybase.inc.php b/common/lib/adodb/datadict/datadict-sybase.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-access.inc.php b/common/lib/adodb/drivers/adodb-access.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-ado.inc.php b/common/lib/adodb/drivers/adodb-ado.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-ado5.inc.php b/common/lib/adodb/drivers/adodb-ado5.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-ado_access.inc.php b/common/lib/adodb/drivers/adodb-ado_access.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-ado_mssql.inc.php b/common/lib/adodb/drivers/adodb-ado_mssql.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-borland_ibase.inc.php b/common/lib/adodb/drivers/adodb-borland_ibase.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-csv.inc.php b/common/lib/adodb/drivers/adodb-csv.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-db2.inc.php b/common/lib/adodb/drivers/adodb-db2.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-fbsql.inc.php b/common/lib/adodb/drivers/adodb-fbsql.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-firebird.inc.php b/common/lib/adodb/drivers/adodb-firebird.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-ibase.inc.php b/common/lib/adodb/drivers/adodb-ibase.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-informix.inc.php b/common/lib/adodb/drivers/adodb-informix.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-informix72.inc.php b/common/lib/adodb/drivers/adodb-informix72.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-ldap.inc.php b/common/lib/adodb/drivers/adodb-ldap.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-mssql.inc.php b/common/lib/adodb/drivers/adodb-mssql.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-mssql_n.inc.php b/common/lib/adodb/drivers/adodb-mssql_n.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-mssqlnative.inc.php b/common/lib/adodb/drivers/adodb-mssqlnative.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-mssqlpo.inc.php b/common/lib/adodb/drivers/adodb-mssqlpo.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-mysql.inc.php b/common/lib/adodb/drivers/adodb-mysql.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-mysqli.inc.php b/common/lib/adodb/drivers/adodb-mysqli.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-mysqlt.inc.php b/common/lib/adodb/drivers/adodb-mysqlt.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-netezza.inc.php b/common/lib/adodb/drivers/adodb-netezza.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-oci8.inc.php b/common/lib/adodb/drivers/adodb-oci8.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-oci805.inc.php b/common/lib/adodb/drivers/adodb-oci805.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-oci8po.inc.php b/common/lib/adodb/drivers/adodb-oci8po.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-odbc.inc.php b/common/lib/adodb/drivers/adodb-odbc.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-odbc_db2.inc.php b/common/lib/adodb/drivers/adodb-odbc_db2.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-odbc_mssql.inc.php b/common/lib/adodb/drivers/adodb-odbc_mssql.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-odbc_oracle.inc.php b/common/lib/adodb/drivers/adodb-odbc_oracle.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-odbtp.inc.php b/common/lib/adodb/drivers/adodb-odbtp.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-odbtp_unicode.inc.php b/common/lib/adodb/drivers/adodb-odbtp_unicode.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-oracle.inc.php b/common/lib/adodb/drivers/adodb-oracle.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-pdo.inc.php b/common/lib/adodb/drivers/adodb-pdo.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-pdo_mssql.inc.php b/common/lib/adodb/drivers/adodb-pdo_mssql.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-pdo_mysql.inc.php b/common/lib/adodb/drivers/adodb-pdo_mysql.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-pdo_oci.inc.php b/common/lib/adodb/drivers/adodb-pdo_oci.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-pdo_pgsql.inc.php b/common/lib/adodb/drivers/adodb-pdo_pgsql.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-postgres.inc.php b/common/lib/adodb/drivers/adodb-postgres.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-postgres64.inc.php b/common/lib/adodb/drivers/adodb-postgres64.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-postgres7.inc.php b/common/lib/adodb/drivers/adodb-postgres7.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-postgres8.inc.php b/common/lib/adodb/drivers/adodb-postgres8.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-proxy.inc.php b/common/lib/adodb/drivers/adodb-proxy.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-sapdb.inc.php b/common/lib/adodb/drivers/adodb-sapdb.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-sqlanywhere.inc.php b/common/lib/adodb/drivers/adodb-sqlanywhere.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-sqlite.inc.php b/common/lib/adodb/drivers/adodb-sqlite.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-sqlitepo.inc.php b/common/lib/adodb/drivers/adodb-sqlitepo.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-sybase.inc.php b/common/lib/adodb/drivers/adodb-sybase.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-sybase_ase.inc.php b/common/lib/adodb/drivers/adodb-sybase_ase.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/drivers/adodb-vfp.inc.php b/common/lib/adodb/drivers/adodb-vfp.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-ar.inc.php b/common/lib/adodb/lang/adodb-ar.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-bg.inc.php b/common/lib/adodb/lang/adodb-bg.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-bgutf8.inc.php b/common/lib/adodb/lang/adodb-bgutf8.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-ca.inc.php b/common/lib/adodb/lang/adodb-ca.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-cn.inc.php b/common/lib/adodb/lang/adodb-cn.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-cz.inc.php b/common/lib/adodb/lang/adodb-cz.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-da.inc.php b/common/lib/adodb/lang/adodb-da.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-de.inc.php b/common/lib/adodb/lang/adodb-de.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-en.inc.php b/common/lib/adodb/lang/adodb-en.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-es.inc.php b/common/lib/adodb/lang/adodb-es.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-esperanto.inc.php b/common/lib/adodb/lang/adodb-esperanto.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-fa.inc.php b/common/lib/adodb/lang/adodb-fa.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-fr.inc.php b/common/lib/adodb/lang/adodb-fr.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-hu.inc.php b/common/lib/adodb/lang/adodb-hu.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-it.inc.php b/common/lib/adodb/lang/adodb-it.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-nl.inc.php b/common/lib/adodb/lang/adodb-nl.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-pl.inc.php b/common/lib/adodb/lang/adodb-pl.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-pt-br.inc.php b/common/lib/adodb/lang/adodb-pt-br.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-ro.inc.php b/common/lib/adodb/lang/adodb-ro.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-ru1251.inc.php b/common/lib/adodb/lang/adodb-ru1251.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-sv.inc.php b/common/lib/adodb/lang/adodb-sv.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb-uk1251.inc.php b/common/lib/adodb/lang/adodb-uk1251.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/lang/adodb_th.inc.php b/common/lib/adodb/lang/adodb_th.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/license.txt b/common/lib/adodb/license.txt
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/pear/Auth/Container/ADOdb.php b/common/lib/adodb/pear/Auth/Container/ADOdb.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/pear/readme.Auth.txt b/common/lib/adodb/pear/readme.Auth.txt
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/perf/perf-db2.inc.php b/common/lib/adodb/perf/perf-db2.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/perf/perf-informix.inc.php b/common/lib/adodb/perf/perf-informix.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/perf/perf-mssql.inc.php b/common/lib/adodb/perf/perf-mssql.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/perf/perf-mssqlnative.inc.php b/common/lib/adodb/perf/perf-mssqlnative.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/perf/perf-mysql.inc.php b/common/lib/adodb/perf/perf-mysql.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/perf/perf-oci8.inc.php b/common/lib/adodb/perf/perf-oci8.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/perf/perf-postgres.inc.php b/common/lib/adodb/perf/perf-postgres.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/pivottable.inc.php b/common/lib/adodb/pivottable.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/readme.txt b/common/lib/adodb/readme.txt
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/rsfilter.inc.php b/common/lib/adodb/rsfilter.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/server.php b/common/lib/adodb/server.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-compress-bzip2.php b/common/lib/adodb/session/adodb-compress-bzip2.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-compress-gzip.php b/common/lib/adodb/session/adodb-compress-gzip.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-cryptsession.php b/common/lib/adodb/session/adodb-cryptsession.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-cryptsession2.php b/common/lib/adodb/session/adodb-cryptsession2.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-encrypt-mcrypt.php b/common/lib/adodb/session/adodb-encrypt-mcrypt.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-encrypt-md5.php b/common/lib/adodb/session/adodb-encrypt-md5.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-encrypt-secret.php b/common/lib/adodb/session/adodb-encrypt-secret.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-encrypt-sha1.php b/common/lib/adodb/session/adodb-encrypt-sha1.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-sess.txt b/common/lib/adodb/session/adodb-sess.txt
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-session-clob.php b/common/lib/adodb/session/adodb-session-clob.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-session-clob2.php b/common/lib/adodb/session/adodb-session-clob2.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-session.php b/common/lib/adodb/session/adodb-session.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-session2.php b/common/lib/adodb/session/adodb-session2.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-sessions.mysql.sql b/common/lib/adodb/session/adodb-sessions.mysql.sql
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-sessions.oracle.clob.sql b/common/lib/adodb/session/adodb-sessions.oracle.clob.sql
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/adodb-sessions.oracle.sql b/common/lib/adodb/session/adodb-sessions.oracle.sql
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/crypt.inc.php b/common/lib/adodb/session/crypt.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/old/adodb-cryptsession.php b/common/lib/adodb/session/old/adodb-cryptsession.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/old/adodb-session-clob.php b/common/lib/adodb/session/old/adodb-session-clob.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/old/adodb-session.php b/common/lib/adodb/session/old/adodb-session.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/old/crypt.inc.php b/common/lib/adodb/session/old/crypt.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/session_schema.xml b/common/lib/adodb/session/session_schema.xml
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/session/session_schema2.xml b/common/lib/adodb/session/session_schema2.xml
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/toexport.inc.php b/common/lib/adodb/toexport.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/tohtml.inc.php b/common/lib/adodb/tohtml.inc.php
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/xmlschema.dtd b/common/lib/adodb/xmlschema.dtd
old mode 100644
new mode 100755
diff --git a/common/lib/adodb/xmlschema03.dtd b/common/lib/adodb/xmlschema03.dtd
old mode 100644
new mode 100755
diff --git a/common/lib/agent.defines.php b/common/lib/agent.defines.php
index 75d52b56e..927a42adc 100755
--- a/common/lib/agent.defines.php
+++ b/common/lib/agent.defines.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -30,6 +30,21 @@
  *
  *
 **/
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+/* prevent XSS */
+$_GET   = filter_input_array(INPUT_GET, FILTER_SANITIZE_STRING);
+$_POST  = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+// $PHPSELF = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL);
+
+define ("WRITELOG_QUERY", false);
+define ("FSROOT", substr(dirname(__FILE__),0,-3));
+define ("LIBDIR", FSROOT."lib/");
+
+// INCLUDE MISC
+include (FSROOT."lib/Misc.php");
+
+sanitize_post_get();
 
 define ("PHP_QUICK_PROFILER", false);
 // Include PHP-Quick-Profiler
@@ -42,16 +57,12 @@
 
 include (FSROOT."lib/interface/constants.php");
 include_once (dirname(__FILE__)."/Class.A2Billing.php");
-require_once 'adodb/adodb.inc.php'; // AdoDB
 include_once (dirname(__FILE__)."/Class.Table.php");
 include_once (dirname(__FILE__)."/Class.Connection.php");
 include_once (dirname(__FILE__)."/Class.Realtime.php");
 
 // USE PHPMAILER
 include_once (FSROOT."lib/mail/class.phpmailer.php");
-
-// INCLUDE MISC
-include (FSROOT."lib/Misc.php");
 include (dirname(__FILE__)."/Class.NotificationsDAO.php");
 include (dirname(__FILE__)."/Class.Notification.php");
 include (dirname(__FILE__)."/Class.Mail.php");
diff --git a/common/lib/agent.help.php b/common/lib/agent.help.php
old mode 100644
new mode 100755
index 634420e86..c8556b8a3
--- a/common/lib/agent.help.php
+++ b/common/lib/agent.help.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/common/lib/agent.module.access.php b/common/lib/agent.module.access.php
index 0e6332e60..fc0fde947 100755
--- a/common/lib/agent.module.access.php
+++ b/common/lib/agent.module.access.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/common/lib/agent.smarty.php b/common/lib/agent.smarty.php
old mode 100644
new mode 100755
index 3cb79fb53..047c51ae6
--- a/common/lib/agent.smarty.php
+++ b/common/lib/agent.smarty.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -31,16 +31,20 @@
  *
 **/
 
+// use Factory\SmartyFactory;
+
 error_reporting(E_ALL ^ (E_NOTICE | E_WARNING));
 
 define( 'FULL_PATH', dirname(__FILE__) . '/' );
-define( 'SMARTY_DIR', FULL_PATH . '/smarty/' );
+define( 'SMARTY_DIR', FULL_PATH . '../../vendor/smarty/smarty/libs/' );
 define( 'TEMPLATE_DIR',  '../Public/templates/' );
 define( 'TEMPLATE_C_DIR', '../templates_c/' );
 
-require_once SMARTY_DIR . 'Smarty.class.php';
+// $smarty = SmartyFactory::getInstance();
+#Remove the factory, for some reasons it doesnt work on PHP 5.3 / CentOs 6
 
-$smarty = new Smarty;
+require_once SMARTY_DIR . 'SmartyBC.class.php';
+$smarty = new SmartyBC();
 
 $skin_name = $_SESSION["stylefile"];
 
diff --git a/common/lib/common.defines.php b/common/lib/common.defines.php
index 1b2bf0cb9..ebe2b1515 100755
--- a/common/lib/common.defines.php
+++ b/common/lib/common.defines.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -120,7 +120,7 @@
 define ("EMAILCONTACT", "sales@star2billing.com");
 
 // A2BILLING INFO
-define ("COPYRIGHT", "A2Billing v2.0.3 is a ".'<a href="http://www.star2billing.com/solutions/voip-billing/" target="_blank">voip billing software</a>' . " licensed under the ".'<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" target="_blank">AGPL 3</a>' . ". <br/>" . "Copyright (C) 2004-2012 - Star2billing S.L. <a href=\"http://www.star2billing.com\" target=\"_blank\">http://www.star2billing.com/</a>");
+define ("COPYRIGHT", "A2Billing v2.2.0 is a ".'<a href="http://www.star2billing.com/solutions/voip-billing/" target="_blank">voip billing software</a>' . " licensed under the ".'<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" target="_blank">AGPL 3</a>' . ". <br/>" . "Copyright (C) 2004-2015 - Star2billing S.L. <a href=\"http://www.star2billing.com\" target=\"_blank\">http://www.star2billing.com/</a>");
 
 define ("CCMAINTITLE", gettext("A2Billing Portal"));
 
diff --git a/common/lib/config_functions.php b/common/lib/config_functions.php
old mode 100644
new mode 100755
index b89369edc..b6d2ad95f
--- a/common/lib/config_functions.php
+++ b/common/lib/config_functions.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/common/lib/customer.defines.php b/common/lib/customer.defines.php
index d07dec52e..53414df00 100755
--- a/common/lib/customer.defines.php
+++ b/common/lib/customer.defines.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -31,26 +31,35 @@
  *
 **/
 
-define ("PHP_QUICK_PROFILER", false);
-// Include PHP-Quick-Profiler
-require_once 'PhpQuickProfiler.php';
-$profiler = new PhpQuickProfiler(PhpQuickProfiler::getMicroTime());
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+/* prevent XSS */
+$_GET   = filter_input_array(INPUT_GET, FILTER_SANITIZE_STRING);
+$_POST  = filter_input_array(INPUT_POST, FILTER_SANITIZE_STRING);
+// $PHPSELF = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL);
 
 define ("WRITELOG_QUERY",false);
 define ("FSROOT", substr(dirname(__FILE__),0,-3));
 define ("LIBDIR", FSROOT."lib/");
 
+// INCLUDE MISC
+include (FSROOT."lib/Misc.php");
+
+sanitize_post_get();
+
+define ("PHP_QUICK_PROFILER", false);
+// Include PHP-Quick-Profiler
+require_once 'PhpQuickProfiler.php';
+$profiler = new PhpQuickProfiler(PhpQuickProfiler::getMicroTime());
+
 include (FSROOT."lib/interface/constants.php");
 include_once (dirname(__FILE__)."/Class.A2Billing.php");
-require_once 'adodb/adodb.inc.php'; // AdoDB
 include_once (dirname(__FILE__)."/Class.Table.php");
 include_once (dirname(__FILE__)."/Class.Connection.php");
 include_once (dirname(__FILE__)."/Class.Realtime.php");
 
 // USE PHPMAILER
 include_once (FSROOT."lib/mail/class.phpmailer.php");
-// INCLUDE FILES
-include (FSROOT."lib/Misc.php");
 include (dirname(__FILE__)."/Class.NotificationsDAO.php");
 include (dirname(__FILE__)."/Class.Notification.php");
 include (dirname(__FILE__)."/Class.Mail.php");
diff --git a/common/lib/customer.help.php b/common/lib/customer.help.php
old mode 100644
new mode 100755
index 4437b41a5..751213420
--- a/common/lib/customer.help.php
+++ b/common/lib/customer.help.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/common/lib/customer.module.access.php b/common/lib/customer.module.access.php
index ea91c9c20..7ddd5b456 100755
--- a/common/lib/customer.module.access.php
+++ b/common/lib/customer.module.access.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/common/lib/customer.smarty.php b/common/lib/customer.smarty.php
index ebe12b95a..9123b4fdc 100755
--- a/common/lib/customer.smarty.php
+++ b/common/lib/customer.smarty.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -31,16 +31,20 @@
  *
 **/
 
+// use Factory\SmartyFactory;
+
 error_reporting(E_ALL ^ (E_NOTICE | E_WARNING));
 
 define( 'FULL_PATH', dirname(__FILE__) . '/' );
-define( 'SMARTY_DIR', FULL_PATH . '/smarty/' );
+define( 'SMARTY_DIR', FULL_PATH . '../../vendor/smarty/smarty/libs/' );
 define( 'TEMPLATE_DIR',  './templates/' );
 define( 'TEMPLATE_C_DIR', './templates_c/' );
 
-require_once SMARTY_DIR . 'Smarty.class.php';
+// $smarty = SmartyFactory::getInstance();
+#Remove the factory, for some reasons it doesnt work on PHP 5.3 / CentOs 6
 
-$smarty = new Smarty;
+require_once SMARTY_DIR . 'SmartyBC.class.php';
+$smarty = new SmartyBC();
 
 $skin_name = $_SESSION["stylefile"];
 
diff --git a/common/lib/didx.php b/common/lib/didx.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/classes/box.php b/common/lib/epayment/classes/box.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/classes/cc_validation.php b/common/lib/epayment/classes/cc_validation.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/classes/currencies.php b/common/lib/epayment/classes/currencies.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/classes/objectinfo.php b/common/lib/epayment/classes/objectinfo.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/classes/order.php b/common/lib/epayment/classes/order.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/classes/payment.php b/common/lib/epayment/classes/payment.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/classes/sessions.php b/common/lib/epayment/classes/sessions.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/classes/table_block.php b/common/lib/epayment/classes/table_block.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/includes/general.php b/common/lib/epayment/includes/general.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/includes/html_output.php b/common/lib/epayment/includes/html_output.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/includes/loadconfiguration.php b/common/lib/epayment/includes/loadconfiguration.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/includes/methods/moneybookers.php b/common/lib/epayment/includes/methods/moneybookers.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/includes/methods/paypal.php b/common/lib/epayment/includes/methods/paypal.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/includes/methods/plugnpay.php b/common/lib/epayment/includes/methods/plugnpay.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/includes/sessions.php b/common/lib/epayment/includes/sessions.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/methods/moneybookers.php b/common/lib/epayment/methods/moneybookers.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/methods/paypal.php b/common/lib/epayment/methods/paypal.php
old mode 100644
new mode 100755
diff --git a/common/lib/epayment/methods/plugnpay.php b/common/lib/epayment/methods/plugnpay.php
old mode 100644
new mode 100755
diff --git a/common/lib/font/index.php b/common/lib/font/index.php
old mode 100644
new mode 100755
diff --git a/common/lib/font/makefont/index.php b/common/lib/font/makefont/index.php
old mode 100644
new mode 100755
diff --git a/common/lib/iam_csvdump.php b/common/lib/iam_csvdump.php
old mode 100644
new mode 100755
diff --git a/common/lib/index.php b/common/lib/index.php
old mode 100644
new mode 100755
diff --git a/common/lib/interface/constants.php b/common/lib/interface/constants.php
index 8537ffac3..9388b0847 100644
--- a/common/lib/interface/constants.php
+++ b/common/lib/interface/constants.php
@@ -2,7 +2,7 @@
 
 class constants
 {
-    public function reverse_array($arr)
+    public static function reverse_array($arr)
     {
         $reverted_arr = array();
         foreach ($arr as $ind => $val_arr) {
@@ -12,7 +12,7 @@ public function reverse_array($arr)
         return $reverted_arr;
     }
 
-    public function getMsgTypeList()
+    public static function getMsgTypeList()
     {
         $msgtype_list = array();
         $msgtype_list["0"] = array( gettext("INFO"),"0","msg_info");
@@ -23,7 +23,7 @@ public function getMsgTypeList()
         return $msgtype_list;
     }
 
-    public function getLanguagesList()
+    public static function getLanguagesList()
     {
         $language_list = array();
         $language_list["0"] = array( gettext("ENGLISH"), "en");
@@ -35,12 +35,12 @@ public function getLanguagesList()
         return $language_list;
     }
 
-    public function getLanguagesRevertList()
+    public static function getLanguagesRevertList()
     {
         return Constants::reverse_array(Constants::getLanguagesList());
     }
 
-    public function getLanguages()
+    public static function getLanguages()
     {
         $language_list = array();
         $language_list["en"] = array( gettext("ENGLISH"));
@@ -52,7 +52,7 @@ public function getLanguages()
         return $language_list;
     }
 
-    public function getRestrictionList()
+    public static function getRestrictionList()
     {
         $restriction_list = array();
         $restriction_list["0"] = array( gettext("NONE RESTRICTION USED"), "0");
@@ -61,7 +61,7 @@ public function getRestrictionList()
 
         return $restriction_list;
     }
-    public function getComponentUserTypeList()
+    public static function getComponentUserTypeList()
     {
         $usertype_list = array();
         $usertype_list["0"] = array( gettext("CUSTOMERS"), "0");
@@ -71,7 +71,7 @@ public function getComponentUserTypeList()
         return $usertype_list;
     }
 
-    public function getYesNoList()
+    public static function getYesNoList()
     {
         $yesno = array();
         $yesno["1"] = array( gettext("Yes"), "1");
@@ -80,7 +80,7 @@ public function getYesNoList()
         return $yesno;
     }
 
-    public function getCallbackStatusList()
+    public static function getCallbackStatusList()
     {
         $status_list = array();
         $status_list["PENDING"] = array( gettext("PENDING"), "PENDING");
@@ -90,7 +90,7 @@ public function getCallbackStatusList()
         return $status_list;
     }
 
-    public function getPeriodsList()
+    public static function getPeriodsList()
     {
           $period_list = array();
         $period_list["1"]  = array( "Hourly", "1");
@@ -101,7 +101,7 @@ public function getPeriodsList()
         return $period_list;
     }
 
-    public function getActivationList()
+    public static function getActivationList()
     {
         $actived_list = array();
         $actived_list["0"] = array( gettext("Inactive"), "0");
@@ -110,14 +110,14 @@ public function getActivationList()
         return $actived_list;
     }
 
-    public function getActivation_Revert_List()
+    public static function getActivation_Revert_List()
     {
             $cnts = new Constants();
 
         return $cnts->reverse_array(Constants::getActivationList());
     }
 
-    public function getActivationTrueFalseList()
+    public static function getActivationTrueFalseList()
     {
         $actived_list = array();
         $actived_list["t"] = array( "Active", "t");
@@ -400,6 +400,22 @@ public static function getDialStatus_Revert_List()
         return $dialstatus_rev_list;
     }
 
+    public static function getDialStatus_Q931_List()
+    {
+        $dialstatus_list = array();
+        $dialstatus_list["ANSWER"]       = 16;
+        $dialstatus_list["BUSY"]         = 17;
+        $dialstatus_list["NOANSWER"]     = 18;
+        $dialstatus_list["CANCEL"]       = 21;
+        $dialstatus_list["CONGESTION"]   = 42;
+        $dialstatus_list["CHANUNAVAIL"]  = 34;
+        $dialstatus_list["DONTCALL"]     = 29;
+        $dialstatus_list["TORTURE"]      = 21;
+        $dialstatus_list["INVALIDARGS"]  = 21;
+
+        return $dialstatus_list;
+    }
+
     public static function getCardStatus_List()
     {
         $cardstatus_list = array();
@@ -595,4 +611,40 @@ public static function getMusicOnHold_List()
         return $musiconhold_list;
     }
 
+    public static function getTrunkAlgo_List()
+    {
+        $list = array();
+        $list["0"] = array( gettext("Use default"), "0");
+        $list["1"] = array( gettext("Trunks list : priority"), "1");
+        $list["2"] = array( gettext("Trunks list : random"), "2");
+        $list["3"] = array( gettext("Trunks list : load balance"), "3");
+        $list["4"] = array( gettext("Trunks list : priority - random"), "4");
+        $list["5"] = array( gettext("Trunks list : minutes per day"), "5");
+        $list["6"] = array( gettext("Trunks list : calls per day"), "6");
+        $list["7"] = array( gettext("Trunks list : ACD (ratio desc)"), "7");
+
+        return $list;
+    }
+
+    public static function getTimezones_List() {
+        if (empty ($handle))
+            $handle = DbConnect();
+
+        static $instance_table = null;
+        if ($instance_table === null)
+            $instance_table = new Table();
+
+        $QUERY = "select * from cc_timezone order by gmtoffset asc";
+        $result = $instance_table->SQLExec($handle, $QUERY);
+
+        $list = array();
+        if (is_array($result) && count($result) > 0) {
+            foreach ($result as $row) {
+                $list[$row['id']] = array( $row['gmtzone'], $row['id']);
+            }
+        }
+
+        return $list;
+    }
+
 }
diff --git a/common/lib/jpgraph_lib/flag_mapping b/common/lib/jpgraph_lib/flag_mapping
new file mode 100644
index 000000000..7f9c3c5fa
--- /dev/null
+++ b/common/lib/jpgraph_lib/flag_mapping
@@ -0,0 +1,237 @@
+class JpCountryFlags {
+
+$iCountryFlags = array(
+    'Afghanistan' => 'afgh.gif',
+    'Republic of Angola' => 'agla.gif',
+    'Republic of Albania' => 'alba.gif',
+    'Alderney' => 'alde.gif',
+    'Democratic and Popular Republic of Algeria' => 'alge.gif',
+    'Territory of American Samoa' => 'amsa.gif',
+    'Principality of Andorra' => 'andr.gif',
+    'British Overseas Territory of Anguilla' => 'angu.gif',
+    'Antarctica' => 'anta.gif',
+    'Argentine Republic' => 'arge.gif',
+    'League of Arab States' => 'arle.gif',
+    'Republic of Armenia' => 'arme.gif',
+    'Aruba' => 'arub.gif',
+    'Commonwealth of Australia' => 'astl.gif',
+    'Republic of Austria' => 'aust.gif',
+    'Azerbaijani Republic' => 'azer.gif',
+    'British Antarctic Territory' => 'bant.gif',
+    'Kingdom of Belgium' => 'belg.gif',
+    'British Overseas Territory of Bermuda' => 'berm.gif',
+    'Commonwealth of the Bahamas' => 'bhms.gif',
+    'Kingdom of Bahrain' => 'bhrn.gif',
+    'Republic of Belarus' => 'blru.gif',
+    'Republic of Bolivia' => 'blva.gif',
+    'Belize' => 'blze.gif',
+    'Republic of Benin' => 'bnin.gif',
+    'Republic of Botswana' => 'bots.gif',
+    'Federative Republic of Brazil' => 'braz.gif',
+    'Barbados' => 'brbd.gif',
+    'British Indian Ocean Territory' => 'brin.gif',
+    'Brunei Darussalam' => 'brun.gif',
+    'Republic of Burkina' => 'bufa.gif',
+    'Republic of Bulgaria' => 'bulg.gif',
+    'Republic of Burundi' => 'buru.gif',
+    'Overseas Territory of the British Virgin Islands' => 'bvis.gif',
+    'Central African Republic' => 'cafr.gif',
+    'Kingdom of Cambodia' => 'camb.gif',
+    'Republic of Cameroon' => 'came.gif',
+    'Dominion of Canada' => 'cana.gif',
+    'Caribbean Community' => 'cari.gif',
+    'Republic of Cape Verde' => 'cave.gif',
+    'Republic of Chad' => 'chad.gif',
+    'Republic of Chile' => 'chil.gif',
+    'Territory of Christmas Island' => 'chms.gif',
+    'Commonwealth of Independent States' => 'cins.gif',
+    'Cook Islands' => 'ckis.gif',
+    'Republic of Colombia' => 'clmb.gif',
+    'Territory of Cocos Islands' => 'cois.gif',
+    'Commonwealth' => 'comn.gif',
+    'Union of the Comoros' => 'como.gif',
+    'Republic of the Congo' => 'cong.gif',
+    'Republic of Costa Rica' => 'corc.gif',
+    'Republic of Croatia' => 'croa.gif',
+    'Republic of Cuba' => 'cuba.gif',
+    'British Overseas Territory of the Cayman Islands' => 'cyis.gif',
+    'Republic of Cyprus' => 'cypr.gif',
+    'The Czech Republic' => 'czec.gif',
+    'Kingdom of Denmark' => 'denm.gif',
+    'Republic of Djibouti' => 'djib.gif',
+    'Commonwealth of Dominica' => 'domn.gif',
+    'Dominican Republic' => 'dore.gif',
+    'Republic of Ecuador' => 'ecua.gif',
+    'Arab Republic of Egypt' => 'egyp.gif',
+    'Republic of El Salvador' => 'elsa.gif',
+    'England' => 'engl.gif',
+    'Republic of Equatorial Guinea' => 'eqgu.gif',
+    'State of Eritrea' => 'erit.gif',
+    'Republic of Estonia' => 'estn.gif',
+    'Ethiopia' => 'ethp.gif',
+    'European Union' => 'euun.gif',
+    'British Overseas Territory of the Falkland Islands' => 'fais.gif',
+    'International Federation of Vexillological Associations' => 'fiav.gif',
+    'Republic of Fiji' => 'fiji.gif',
+    'Republic of Finland' => 'finl.gif',
+    'Territory of French Polynesia' => 'fpol.gif',
+    'French Republic' => 'fran.gif',
+    'Overseas Department of French Guiana' => 'frgu.gif',
+    'Gabonese Republic' => 'gabn.gif',
+    'Republic of the Gambia' => 'gamb.gif',
+    'Republic of Georgia' => 'geor.gif',
+    'Federal Republic of Germany' => 'germ.gif',
+    'Republic of Ghana' => 'ghan.gif',
+    'Gibraltar' => 'gibr.gif',
+    'Hellenic Republic' => 'grec.gif',
+    'State of Grenada' => 'gren.gif',
+    'Overseas Department of Guadeloupe' => 'guad.gif',
+    'Territory of Guam' => 'guam.gif',
+    'Republic of Guatemala' => 'guat.gif',
+    'The Bailiwick of Guernsey' => 'guer.gif',
+    'Republic of Guinea' => 'guin.gif',
+    'Republic of Haiti' => 'hait.gif',
+    'Hong Kong Special Administrative Region' => 'hokn.gif',
+    'Republic of Honduras' => 'hond.gif',
+    'Republic of Hungary' => 'hung.gif',
+    'Republic of Iceland' => 'icel.gif',
+    'International Committee of the Red Cross' => 'icrc.gif',
+    'Republic of India' => 'inda.gif',
+    'Republic of Indonesia' => 'indn.gif',
+    'Republic of Iraq' => 'iraq.gif',
+    'Republic of Ireland' => 'irel.gif',
+    'Organization of the Islamic Conference' => 'isco.gif',
+    'Isle of Man' => 'isma.gif',
+    'State of Israel' => 'isra.gif',
+    'Italian Republic' => 'ital.gif',
+    'Jamaica' => 'jama.gif',
+    'Japan' => 'japa.gif',
+    'The Bailiwick of Jersey' => 'jers.gif',
+    'Hashemite Kingdom of Jordan' => 'jord.gif',
+    'Republic of Kazakhstan' => 'kazk.gif',
+    'Republic of Kenya' => 'keny.gif',
+    'Republic of Kiribati' => 'kirb.gif',
+    'State of Kuwait' => 'kuwa.gif',
+    'Kyrgyz Republic' => 'kyrg.gif',
+    'Republic of Latvia' => 'latv.gif',
+    'Lebanese Republic' => 'leba.gif',
+    'Kingdom of Lesotho' => 'lest.gif',
+    'Republic of Liberia' => 'libe.gif',
+    'Principality of Liechtenstein' => 'liec.gif',
+    'Republic of Lithuania' => 'lith.gif',
+    'Grand Duchy of Luxembourg' => 'luxe.gif',
+    'Macao Special Administrative Region' => 'maca.gif',
+    'Republic of Macedonia' => 'mace.gif',
+    'Republic of Madagascar' => 'mada.gif',
+    'Republic of the Marshall Islands' => 'mais.gif',
+    'Republic of Maldives' => 'mald.gif',
+    'Republic of Mali' => 'mali.gif',
+    'Federation of Malaysia' => 'mals018.gif',
+    'Republic of Malta' => 'malt.gif',
+    'Republic of Malawi' => 'malw.gif',
+    'Overseas Department of Martinique' => 'mart.gif',
+    'Islamic Republic of Mauritania' => 'maur.gif',
+    'Territorial Collectivity of Mayotte' => 'mayt.gif',
+    'United Mexican States' => 'mexc.gif',
+    'Federated States of Micronesia' => 'micr.gif',
+    'Midway Islands' => 'miis.gif',
+    'Republic of Moldova' => 'mold.gif',
+    'Principality of Monaco' => 'mona.gif',
+    'Republic of Mongolia' => 'mong.gif',
+    'British Overseas Territory of Montserrat' => 'mont.gif',
+    'Kingdom of Morocco' => 'morc.gif',
+    'Republic of Mozambique' => 'moza.gif',
+    'Republic of Mauritius' => 'mrts.gif',
+    'Union of Myanmar' => 'myan.gif',
+    'Republic of Namibia' => 'namb.gif',
+    'North Atlantic Treaty Organization' => 'nato.gif',
+    'Republic of Nauru' => 'naur.gif',
+    'Turkish Republic of Northern Cyprus' => 'ncyp.gif',
+    'Netherlands Antilles' => 'nean.gif',
+    'Kingdom of Nepal' => 'nepa.gif',
+    'Kingdom of the Netherlands' => 'neth.gif',
+    'Territory of Norfolk Island' => 'nfis.gif',
+    'Federal Republic of Nigeria' => 'ngra.gif',
+    'Republic of Nicaragua' => 'nica.gif',
+    'Republic of Niger' => 'nigr.gif',
+    'Niue' => 'niue.gif',
+    'Commonwealth of the Northern Mariana Islands' => 'nmar.gif',
+    'Province of Northern Ireland' => 'noir.gif',
+    'Nordic Council' => 'nord.gif',
+    'Kingdom of Norway' => 'norw.gif',
+    'Territory of New Caledonia and Dependencies' => 'nwca.gif',
+    'New Zealand' => 'nwze.gif',
+    'Organization of American States' => 'oast.gif',
+    'Organization of African Unity' => 'oaun.gif',
+    'International Olympic Committee' => 'olym.gif',
+    'Sultanate of Oman' => 'oman.gif',
+    'Organization of Petroleum Exporting Countries' => 'opec.gif',
+    'Islamic Republic of Pakistan' => 'paks.gif',
+    'Republic of Palau' => 'pala.gif',
+    'Independent State of Papua New Guinea' => 'pang.gif',
+    'Republic of Paraguay' => 'para.gif',
+    'Republic of the Philippines' => 'phil.gif',
+    'British Overseas Territory of the Pitcairn Islands' => 'piis.gif',
+    'Republic of Poland' => 'pola.gif',
+    'Republic of Portugal' => 'port.gif',
+    'Commonwealth of Puerto Rico' => 'purc.gif',
+    'State of Qatar' => 'qata.gif',
+    'Russian Federation' => 'russ.gif',
+    'Republic of Rwanda' => 'rwan.gif',
+    'Kingdom of Saudi Arabia' => 'saar.gif',
+    'Republic of San Marino' => 'sama.gif',
+    'Nordic Sami Conference' => 'sami.gif',
+    'Sark' => 'sark.gif',
+    'Scotland' => 'scot.gif',
+    'Principality of Seborga' => 'sebo.gif',
+    'Republic of Sierra Leone' => 'sile.gif',
+    'Republic of Singapore' => 'sing.gif',
+    'Republic of Korea' => 'skor.gif',
+    'Republic of Slovenia' => 'slva.gif',
+    'Somali Republic' => 'smla.gif',
+    'Republic of Somaliland' => 'smld.gif',
+    'Republic of South Africa' => 'soaf.gif',
+    'Solomon Islands' => 'sois.gif',
+    'Kingdom of Spain' => 'span.gif',
+    'Secretariat of the Pacific Community' => 'spco.gif',
+    'Democratic Socialist Republic of Sri Lanka' => 'srla.gif',
+    'Saint Lucia' => 'stlu.gif',
+    'Republic of the Sudan' => 'suda.gif',
+    'Republic of Suriname' => 'surn.gif',
+    'Slovak Republic' => 'svka.gif',
+    'Kingdom of Sweden' => 'swdn.gif',
+    'Swiss Confederation' => 'swit.gif',
+    'Syrian Arab Republic' => 'syra.gif',
+    'Kingdom of Swaziland' => 'szld.gif',
+    'Republic of China' => 'taiw.gif',
+    'Republic of Tajikistan' => 'tajk.gif',
+    'United Republic of Tanzania' => 'tanz.gif',
+    'Kingdom of Thailand' => 'thal.gif',
+    'Autonomous Region of Tibet' => 'tibe.gif',
+    'Turkmenistan' => 'tkst.gif',
+    'Togolese Republic' => 'togo.gif',
+    'Tokelau' => 'toke.gif',
+    'Kingdom of Tonga' => 'tong.gif',
+    'Tristan da Cunha' => 'trdc.gif',
+    'Tromelin' => 'tris.gif',
+    'Republic of Tunisia' => 'tuns.gif',
+    'Republic of Turkey' => 'turk.gif',
+    'Tuvalu' => 'tuva.gif',
+    'United Arab Emirates' => 'uaem.gif',
+    'Republic of Uganda' => 'ugan.gif',
+    'Ukraine' => 'ukrn.gif',
+    'United Kingdom of Great Britain' => 'unkg.gif',
+    'United Nations' => 'unna.gif',
+    'United States of America' => 'unst.gif',
+    'Oriental Republic of Uruguay' => 'urgy.gif',
+    'Virgin Islands of the United States' => 'usvs.gif',
+    'Republic of Uzbekistan' => 'uzbk.gif',
+    'State of the Vatican City' => 'vacy.gif',
+    'Republic of Vanuatu' => 'vant.gif',
+    'Bolivarian Republic of Venezuela' => 'venz.gif',
+    'Republic of Yemen' => 'yemn.gif',
+    'Democratic Republic of Congo' => 'zare.gif',
+    'Republic of Zimbabwe' => 'zbwe.gif' 
+) ;
+
+
diff --git a/common/lib/jpgraph_lib/flags.dat b/common/lib/jpgraph_lib/flags.dat
new file mode 100644
index 000000000..1cd2e7234
Binary files /dev/null and b/common/lib/jpgraph_lib/flags.dat differ
diff --git a/common/lib/jpgraph_lib/flags_thumb100x100.dat b/common/lib/jpgraph_lib/flags_thumb100x100.dat
new file mode 100644
index 000000000..545e7ade5
Binary files /dev/null and b/common/lib/jpgraph_lib/flags_thumb100x100.dat differ
diff --git a/common/lib/jpgraph_lib/flags_thumb35x35.dat b/common/lib/jpgraph_lib/flags_thumb35x35.dat
new file mode 100644
index 000000000..7335011ec
Binary files /dev/null and b/common/lib/jpgraph_lib/flags_thumb35x35.dat differ
diff --git a/common/lib/jpgraph_lib/flags_thumb60x60.dat b/common/lib/jpgraph_lib/flags_thumb60x60.dat
new file mode 100644
index 000000000..6107d084e
Binary files /dev/null and b/common/lib/jpgraph_lib/flags_thumb60x60.dat differ
diff --git a/common/lib/jpgraph_lib/fonts/DejaVuSans-Bold.ttf b/common/lib/jpgraph_lib/fonts/DejaVuSans-Bold.ttf
new file mode 100644
index 000000000..ac313d269
Binary files /dev/null and b/common/lib/jpgraph_lib/fonts/DejaVuSans-Bold.ttf differ
diff --git a/common/lib/jpgraph_lib/fonts/DejaVuSans-BoldOblique.ttf b/common/lib/jpgraph_lib/fonts/DejaVuSans-BoldOblique.ttf
new file mode 100644
index 000000000..c818ae6e7
Binary files /dev/null and b/common/lib/jpgraph_lib/fonts/DejaVuSans-BoldOblique.ttf differ
diff --git a/common/lib/jpgraph_lib/fonts/DejaVuSans-Oblique.ttf b/common/lib/jpgraph_lib/fonts/DejaVuSans-Oblique.ttf
new file mode 100644
index 000000000..d5ac60d6a
Binary files /dev/null and b/common/lib/jpgraph_lib/fonts/DejaVuSans-Oblique.ttf differ
diff --git a/common/lib/jpgraph_lib/fonts/DejaVuSans.ttf b/common/lib/jpgraph_lib/fonts/DejaVuSans.ttf
new file mode 100644
index 000000000..a99969e1b
Binary files /dev/null and b/common/lib/jpgraph_lib/fonts/DejaVuSans.ttf differ
diff --git a/common/lib/jpgraph_lib/fonts/FF_FONT0-Bold.gdf b/common/lib/jpgraph_lib/fonts/FF_FONT0-Bold.gdf
new file mode 100644
index 000000000..3b371f8a6
Binary files /dev/null and b/common/lib/jpgraph_lib/fonts/FF_FONT0-Bold.gdf differ
diff --git a/common/lib/jpgraph_lib/fonts/FF_FONT0.gdf b/common/lib/jpgraph_lib/fonts/FF_FONT0.gdf
new file mode 100644
index 000000000..e231b7131
Binary files /dev/null and b/common/lib/jpgraph_lib/fonts/FF_FONT0.gdf differ
diff --git a/common/lib/jpgraph_lib/fonts/FF_FONT1-Bold.gdf b/common/lib/jpgraph_lib/fonts/FF_FONT1-Bold.gdf
new file mode 100644
index 000000000..d62f0b3bb
Binary files /dev/null and b/common/lib/jpgraph_lib/fonts/FF_FONT1-Bold.gdf differ
diff --git a/common/lib/jpgraph_lib/fonts/FF_FONT1.gdf b/common/lib/jpgraph_lib/fonts/FF_FONT1.gdf
new file mode 100644
index 000000000..7b5b0f628
Binary files /dev/null and b/common/lib/jpgraph_lib/fonts/FF_FONT1.gdf differ
diff --git a/common/lib/jpgraph_lib/fonts/FF_FONT2-Bold.gdf b/common/lib/jpgraph_lib/fonts/FF_FONT2-Bold.gdf
new file mode 100644
index 000000000..6e402847c
Binary files /dev/null and b/common/lib/jpgraph_lib/fonts/FF_FONT2-Bold.gdf differ
diff --git a/common/lib/jpgraph_lib/fonts/FF_FONT2.gdf b/common/lib/jpgraph_lib/fonts/FF_FONT2.gdf
new file mode 100644
index 000000000..50bca09e0
Binary files /dev/null and b/common/lib/jpgraph_lib/fonts/FF_FONT2.gdf differ
diff --git a/common/lib/jpgraph_lib/gd_image.inc.php b/common/lib/jpgraph_lib/gd_image.inc.php
new file mode 100644
index 000000000..fecc40153
--- /dev/null
+++ b/common/lib/jpgraph_lib/gd_image.inc.php
@@ -0,0 +1,2304 @@
+<?php
+//=======================================================================
+// File:        GD_IMAGE.INC.PHP
+// Description: PHP Graph Plotting library. Low level image drawing routines
+// Created:     2001-01-08, refactored 2008-03-29
+// Ver:         $Id: gd_image.inc.php 1922 2010-01-11 11:42:50Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+require_once 'jpgraph_rgb.inc.php';
+require_once 'jpgraph_ttf.inc.php';
+require_once 'imageSmoothArc.php';
+
+// Line styles
+define('LINESTYLE_SOLID',1);
+define('LINESTYLE_DOTTED',2);
+define('LINESTYLE_DASHED',3);
+define('LINESTYLE_LONGDASH',4);
+
+// The DEFAULT_GFORMAT sets the default graphic encoding format, i.e.
+// PNG, JPG or GIF depending on what is installed on the target system
+// in that order.
+if( !DEFINED("DEFAULT_GFORMAT") ) {
+    define("DEFAULT_GFORMAT","auto");
+}
+
+//========================================================================
+// CLASS Image
+// Description: The very coor image drawing class that encapsulates all
+//              calls to the GD library
+//              Note: The class used by the library is the decendant
+//              class RotImage which extends the Image class with transparent
+//              rotation.
+//=========================================================================
+class Image {
+    public $img=null;
+    public $rgb=null;
+    public $img_format;
+    public $ttf=null;
+    public $line_style=LINESTYLE_SOLID;
+    public $current_color,$current_color_name;
+    public $original_width=0, $original_height=0;
+    public $plotwidth=0,$plotheight=0;
+
+    // for __get, __set
+    private $_left_margin=30,$_right_margin=30,$_top_margin=20,$_bottom_margin=30;
+    //private $_plotwidth=0,$_plotheight=0;
+    private $_width=0, $_height=0;
+    private $_line_weight=1;
+
+    protected $expired=true;
+    protected $lastx=0, $lasty=0;
+    protected $obs_list=array();
+    protected $font_size=12,$font_family=FF_DEFAULT, $font_style=FS_NORMAL;
+    protected $font_file='';
+    protected $text_halign="left",$text_valign="bottom";
+    protected $use_anti_aliasing=false;
+    protected $quality=null;
+    protected $colorstack=array(),$colorstackidx=0;
+    protected $canvascolor = 'white' ;
+    protected $langconv = null ;
+    protected $iInterlace=false;
+    protected $bbox_cache = array(); // STore the last found tetx bounding box
+    protected $ff_font0;
+    protected $ff_font0_bold;
+    protected $ff_font1;
+    protected $ff_font1_bold;
+    protected $ff_font2;
+    protected $ff_font2_bold;
+
+
+    //---------------
+    // CONSTRUCTOR
+    function __construct($aWidth=0,$aHeight=0,$aFormat=DEFAULT_GFORMAT,$aSetAutoMargin=true) {
+
+        $this->original_width  = $aWidth;
+        $this->original_height = $aHeight;
+        $this->CreateImgCanvas($aWidth, $aHeight);
+
+        if( $aSetAutoMargin ) {
+            $this->SetAutoMargin();
+        }
+
+        if( !$this->SetImgFormat($aFormat) ) {
+            JpGraphError::RaiseL(25081,$aFormat);//("JpGraph: Selected graphic format is either not supported or unknown [$aFormat]");
+        }
+        $this->ttf = new TTF();
+        $this->langconv = new LanguageConv();
+
+        $this->ff_font0 =  imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT0.gdf");
+        $this->ff_font1 =  imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT1.gdf");
+        $this->ff_font2 =  imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT2.gdf");
+        $this->ff_font1_bold =  imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT1-Bold.gdf");
+        $this->ff_font2_bold =  imageloadfont(dirname(__FILE__) . "/fonts/FF_FONT2-Bold.gdf");
+    }
+
+    // Enable interlacing in images
+    function SetInterlace($aFlg=true) {
+        $this->iInterlace=$aFlg;
+    }
+
+    // Should we use anti-aliasing. Note: This really slows down graphics!
+    function SetAntiAliasing($aFlg=true) {
+        $this->use_anti_aliasing = $aFlg;
+        if( function_exists('imageantialias') ) {
+            imageantialias($this->img,$aFlg);
+        }
+        else {
+            JpGraphError::RaiseL(25128);//('The function imageantialias() is not available in your PHP installation. Use the GD version that comes with PHP and not the standalone version.')
+        }
+    }
+
+    function GetAntiAliasing() {
+        return $this->use_anti_aliasing ;
+    }
+
+    function CreateRawCanvas($aWidth=0,$aHeight=0) {
+
+        $aWidth  *= SUPERSAMPLING_SCALE;
+        $aHeight *= SUPERSAMPLING_SCALE;
+
+        if( $aWidth <= 1 || $aHeight <= 1 ) {
+            JpGraphError::RaiseL(25082,$aWidth,$aHeight);//("Illegal sizes specified for width or height when creating an image, (width=$aWidth, height=$aHeight)");
+        }
+
+        $this->img = @imagecreatetruecolor($aWidth, $aHeight);
+        if( $this->img < 1 ) {
+            JpGraphError::RaiseL(25126);
+            //die("Can't create truecolor image. Check that you really have GD2 library installed.");
+        }
+        $this->SetAlphaBlending();
+
+        if( $this->iInterlace ) {
+            imageinterlace($this->img,1);
+        }
+        if( $this->rgb != null ) {
+            $this->rgb->img = $this->img ;
+        }
+        else {
+            $this->rgb = new RGB($this->img);
+        }
+    }
+
+    function CloneCanvasH() {
+        $oldimage = $this->img;
+        $this->CreateRawCanvas($this->width,$this->height);
+        imagecopy($this->img,$oldimage,0,0,0,0,$this->width,$this->height);
+        return $oldimage;
+    }
+
+    function CreateImgCanvas($aWidth=0,$aHeight=0) {
+
+        $old = array($this->img,$this->width,$this->height);
+
+        $aWidth = round($aWidth);
+        $aHeight = round($aHeight);
+
+        $this->width=$aWidth;
+        $this->height=$aHeight;
+
+
+        if( $aWidth==0 || $aHeight==0 ) {
+            // We will set the final size later.
+            // Note: The size must be specified before any other
+            // img routines that stroke anything are called.
+            $this->img = null;
+            $this->rgb = null;
+            return $old;
+        }
+
+        $this->CreateRawCanvas($aWidth,$aHeight);
+        // Set canvas color (will also be the background color for a
+        // a pallett image
+        $this->SetColor($this->canvascolor);
+        $this->FilledRectangle(0,0,$this->width-1,$this->height-1);
+
+        return $old ;
+    }
+
+    function CopyCanvasH($aToHdl,$aFromHdl,$aToX,$aToY,$aFromX,$aFromY,$aWidth,$aHeight,$aw=-1,$ah=-1) {
+        if( $aw === -1 ) {
+            $aw = $aWidth;
+            $ah = $aHeight;
+            $f = 'imagecopyresized';
+        }
+        else {
+            $f = 'imagecopyresampled';
+        }
+        $f($aToHdl,$aFromHdl,$aToX,$aToY,$aFromX,$aFromY, $aWidth,$aHeight,$aw,$ah);
+    }
+
+    function Copy($fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth=-1,$fromHeight=-1) {
+        $this->CopyCanvasH($this->img,$fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth,$fromHeight);
+    }
+
+    function CopyMerge($fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth=-1,$fromHeight=-1,$aMix=100) {
+        if( $aMix == 100 ) {
+            $this->CopyCanvasH($this->img,$fromImg,
+            $toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth,$fromHeight);
+        }
+        else {
+            if( ($fromWidth  != -1 && ($fromWidth != $toWidth)) || ($fromHeight != -1 && ($fromHeight != $fromHeight)) ) {
+                // Create a new canvas that will hold the re-scaled original from image
+                if( $toWidth <= 1 || $toHeight <= 1 ) {
+                    JpGraphError::RaiseL(25083);//('Illegal image size when copying image. Size for copied to image is 1 pixel or less.');
+                }
+
+                $tmpimg = @imagecreatetruecolor($toWidth, $toHeight);
+
+                if( $tmpimg < 1 ) {
+                    JpGraphError::RaiseL(25084);//('Failed to create temporary GD canvas. Out of memory ?');
+                }
+                $this->CopyCanvasH($tmpimg,$fromImg,0,0,0,0,
+                $toWidth,$toHeight,$fromWidth,$fromHeight);
+                $fromImg = $tmpimg;
+            }
+            imagecopymerge($this->img,$fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$aMix);
+        }
+    }
+
+    static function GetWidth($aImg=null) {
+        if( $aImg === null ) {
+            $aImg = $this->img;
+        }
+        return imagesx($aImg);
+    }
+
+    static function GetHeight($aImg=null) {
+        if( $aImg === null ) {
+            $aImg = $this->img;
+        }
+        return imagesy($aImg);
+    }
+
+    static function CreateFromString($aStr) {
+        $img = imagecreatefromstring($aStr);
+        if( $img === false ) {
+            JpGraphError::RaiseL(25085);
+            //('An image can not be created from the supplied string. It is either in a format not supported or the string is representing an corrupt image.');
+        }
+        return $img;
+    }
+
+    function SetCanvasH($aHdl) {
+        $this->img = $aHdl;
+        $this->rgb->img = $aHdl;
+    }
+
+    function SetCanvasColor($aColor) {
+        $this->canvascolor = $aColor ;
+    }
+
+    function SetAlphaBlending($aFlg=true) {
+        ImageAlphaBlending($this->img,$aFlg);
+    }
+
+    function SetAutoMargin() {
+        $min_bm=5;
+        $lm = min(40,$this->width/7);
+        $rm = min(20,$this->width/10);
+        $tm = max(5,$this->height/7);
+        $bm = max($min_bm,$this->height/6);
+        $this->SetMargin($lm,$rm,$tm,$bm);
+    }
+
+    //---------------
+    // PUBLIC METHODS
+
+    function SetFont($family,$style=FS_NORMAL,$size=10) {
+        $this->font_family=$family;
+        $this->font_style=$style;
+        $this->font_size=$size*SUPERSAMPLING_SCALE;
+        $this->font_file='';
+        if( ($this->font_family==FF_FONT1 || $this->font_family==FF_FONT2) && $this->font_style==FS_BOLD ){
+            ++$this->font_family;
+        }
+        if( $this->font_family > FF_FONT2+1 ) { // A TTF font so get the font file
+
+            // Check that this PHP has support for TTF fonts
+            if( !function_exists('imagettfbbox') ) {
+                // use internal font when php is configured without '--with-ttf'
+                $this->font_family = FF_FONT1;
+//                JpGraphError::RaiseL(25087);//('This PHP build has not been configured with TTF support. You need to recompile your PHP installation with FreeType support.');
+            } else {
+                $this->font_file = $this->ttf->File($this->font_family,$this->font_style);
+            }
+        }
+    }
+
+    // Get the specific height for a text string
+    function GetTextHeight($txt="",$angle=0) {
+        $tmp = preg_split('/\n/',$txt);
+        $n = count($tmp);
+        $m=0;
+        for($i=0; $i< $n; ++$i) {
+            $m = max($m,strlen($tmp[$i]));
+        }
+
+        if( $this->font_family <= FF_FONT2+1 ) {
+            if( $angle==0 ) {
+                $h = imagefontheight($this->font_family);
+                if( $h === false ) {
+                    JpGraphError::RaiseL(25088);//('You have a misconfigured GD font support. The call to imagefontwidth() fails.');
+                }
+
+                return $n*$h;
+            }
+            else {
+                $w = @imagefontwidth($this->font_family);
+                if( $w === false ) {
+                    JpGraphError::RaiseL(25088);//('You have a misconfigured GD font support. The call to imagefontwidth() fails.');
+                }
+
+                return $m*$w;
+            }
+        }
+        else {
+            $bbox = $this->GetTTFBBox($txt,$angle);
+            return $bbox[1]-$bbox[5]+1;
+        }
+    }
+
+    // Estimate font height
+    function GetFontHeight($angle=0) {
+        $txt = "XOMg";
+        return $this->GetTextHeight($txt,$angle);
+    }
+
+    // Approximate font width with width of letter "O"
+    function GetFontWidth($angle=0) {
+        $txt = 'O';
+        return $this->GetTextWidth($txt,$angle);
+    }
+
+    // Get actual width of text in absolute pixels. Note that the width is the
+    // texts projected with onto the x-axis. Call with angle=0 to get the true
+    // etxt width.
+    function GetTextWidth($txt,$angle=0) {
+
+        $tmp = preg_split('/\n/',$txt);
+        $n = count($tmp);
+        if( $this->font_family <= FF_FONT2+1 ) {
+
+            $m=0;
+            for($i=0; $i < $n; ++$i) {
+                $l=strlen($tmp[$i]);
+                if( $l > $m ) {
+                    $m = $l;
+                }
+            }
+
+            if( $angle==0 ) {
+                $w = @imagefontwidth($this->font_family);
+                if( $w === false ) {
+                    JpGraphError::RaiseL(25088);//('You have a misconfigured GD font support. The call to imagefontwidth() fails.');
+                }
+                return $m*$w;
+            }
+            else {
+                // 90 degrees internal so height becomes width
+                $h = @imagefontheight($this->font_family);
+                if( $h === false ) {
+                    JpGraphError::RaiseL(25089);//('You have a misconfigured GD font support. The call to imagefontheight() fails.');
+                }
+                return $n*$h;
+            }
+        }
+        else {
+            // For TTF fonts we must walk through a lines and find the
+            // widest one which we use as the width of the multi-line
+            // paragraph
+            $m=0;
+            for( $i=0; $i < $n; ++$i ) {
+                $bbox = $this->GetTTFBBox($tmp[$i],$angle);
+                $mm =  $bbox[2] - $bbox[0];
+                if( $mm > $m )
+                    $m = $mm;
+            }
+            return $m;
+        }
+    }
+
+
+    // Draw text with a box around it
+    function StrokeBoxedText($x,$y,$txt,$dir=0,$fcolor="white",$bcolor="black",
+                             $shadowcolor=false,$paragraph_align="left",
+                             $xmarg=6,$ymarg=4,$cornerradius=0,$dropwidth=3) {
+
+		$oldx = $this->lastx;
+		$oldy = $this->lasty;
+
+        if( !is_numeric($dir) ) {
+            if( $dir=="h" ) $dir=0;
+            elseif( $dir=="v" ) $dir=90;
+            else JpGraphError::RaiseL(25090,$dir);//(" Unknown direction specified in call to StrokeBoxedText() [$dir]");
+        }
+
+        if( $this->font_family >= FF_FONT0 && $this->font_family <= FF_FONT2+1) {
+            $width=$this->GetTextWidth($txt,$dir) ;
+            $height=$this->GetTextHeight($txt,$dir) ;
+        }
+        else {
+            $width=$this->GetBBoxWidth($txt,$dir) ;
+            $height=$this->GetBBoxHeight($txt,$dir) ;
+        }
+
+        $height += 2*$ymarg;
+        $width  += 2*$xmarg;
+
+        if( $this->text_halign=="right" )      $x -= $width;
+        elseif( $this->text_halign=="center" ) $x -= $width/2;
+
+        if( $this->text_valign=="bottom" )     $y -= $height;
+        elseif( $this->text_valign=="center" ) $y -= $height/2;
+
+        $olda = $this->SetAngle(0);
+
+        if( $shadowcolor ) {
+            $this->PushColor($shadowcolor);
+            $this->FilledRoundedRectangle($x-$xmarg+$dropwidth,$y-$ymarg+$dropwidth,
+                                          $x+$width+$dropwidth,$y+$height-$ymarg+$dropwidth,
+                                          $cornerradius);
+            $this->PopColor();
+            $this->PushColor($fcolor);
+            $this->FilledRoundedRectangle($x-$xmarg,$y-$ymarg,
+                                          $x+$width,$y+$height-$ymarg,
+                                          $cornerradius);
+            $this->PopColor();
+            $this->PushColor($bcolor);
+            $this->RoundedRectangle($x-$xmarg,$y-$ymarg,
+                                    $x+$width,$y+$height-$ymarg,$cornerradius);
+            $this->PopColor();
+        }
+        else {
+            if( $fcolor ) {
+                $oc=$this->current_color;
+                $this->SetColor($fcolor);
+                $this->FilledRoundedRectangle($x-$xmarg,$y-$ymarg,$x+$width,$y+$height-$ymarg,$cornerradius);
+                $this->current_color=$oc;
+            }
+            if( $bcolor ) {
+                $oc=$this->current_color;
+                $this->SetColor($bcolor);
+                $this->RoundedRectangle($x-$xmarg,$y-$ymarg,$x+$width,$y+$height-$ymarg,$cornerradius);
+                $this->current_color=$oc;
+            }
+        }
+
+        $h=$this->text_halign;
+        $v=$this->text_valign;
+        $this->SetTextAlign("left","top");
+
+        $debug=false;
+        $this->StrokeText($x, $y, $txt, $dir, $paragraph_align,$debug);
+
+        $bb = array($x-$xmarg,$y+$height-$ymarg,$x+$width,$y+$height-$ymarg,
+                    $x+$width,$y-$ymarg,$x-$xmarg,$y-$ymarg);
+        $this->SetTextAlign($h,$v);
+
+        $this->SetAngle($olda);
+		$this->lastx = $oldx;
+		$this->lasty = $oldy;
+
+        return $bb;
+    }
+
+    // Draw text with a box around it. This time the box will be rotated
+    // with the text. The previous method will just make a larger enough non-rotated
+    // box to hold the text inside.
+    function StrokeBoxedText2($x,$y,$txt,$dir=0,$fcolor="white",$bcolor="black",
+                             $shadowcolor=false,$paragraph_align="left",
+                             $xmarg=6,$ymarg=4,$cornerradius=0,$dropwidth=3) {
+
+       // This version of boxed text will stroke a rotated box round the text
+       // thta will follow the angle of the text.
+       // This has two implications:
+       // 1) This methos will only support TTF fonts
+       // 2) The only two alignment that makes sense are centered or baselined
+
+       if( $this->font_family <= FF_FONT2+1 ) {
+           JpGraphError::RaiseL(25131);//StrokeBoxedText2() Only support TTF fonts and not built in bitmap fonts
+       }
+
+		$oldx = $this->lastx;
+		$oldy = $this->lasty;
+        $dir = $this->NormAngle($dir);
+
+        if( !is_numeric($dir) ) {
+            if( $dir=="h" ) $dir=0;
+            elseif( $dir=="v" ) $dir=90;
+            else JpGraphError::RaiseL(25090,$dir);//(" Unknown direction specified in call to StrokeBoxedText() [$dir]");
+        }
+
+        $width=$this->GetTextWidth($txt,0) + 2*$xmarg;
+        $height=$this->GetTextHeight($txt,0) + 2*$ymarg ;
+        $rect_width=$this->GetBBoxWidth($txt,$dir) ;
+        $rect_height=$this->GetBBoxHeight($txt,$dir) ;
+
+        $baseline_offset = $this->bbox_cache[1]-1;
+
+        if( $this->text_halign=="center" ) {
+            if( $dir >= 0 && $dir <= 90 ) {
+
+                $x -= $rect_width/2;
+                $x += sin($dir*M_PI/180)*$height;
+                $y += $rect_height/2;                
+
+            } elseif( $dir >= 270 && $dir <= 360 ) {
+
+                $x -= $rect_width/2;
+                $y -= $rect_height/2;
+                $y += cos($dir*M_PI/180)*$height;
+
+            } elseif( $dir >= 90 && $dir <= 180 ) {
+
+                $x += $rect_width/2;
+                $y += $rect_height/2;
+                $y += cos($dir*M_PI/180)*$height;
+
+            }
+            else {
+                // $dir > 180 &&  $dir < 270
+                $x += $rect_width/2;
+                $x += sin($dir*M_PI/180)*$height;
+                $y -= $rect_height/2;
+            }
+        }
+
+        // Rotate the box around this point
+        $this->SetCenter($x,$y);
+        $olda = $this->SetAngle(-$dir);
+
+        // We need to use adjusted coordinats for the box to be able
+        // to draw the box below the baseline. This cannot be done before since
+        // the rotating point must be the original x,y since that is arounbf the
+        // point where the text will rotate and we cannot change this since
+        // that is where the GD/GreeType will rotate the text
+
+
+        // For smaller <14pt font we need to do some additional
+        // adjustments to make it look good
+        if( $this->font_size < 14 ) {
+            $x -= 2;
+            $y += 2;
+        }
+        else {
+          //  $y += $baseline_offset;
+        }
+
+        if( $shadowcolor ) {
+            $this->PushColor($shadowcolor);
+            $this->FilledRectangle($x-$xmarg+$dropwidth,$y+$ymarg+$dropwidth-$height,
+                                          $x+$width+$dropwidth,$y+$ymarg+$dropwidth);
+                                          //$cornerradius);
+            $this->PopColor();
+            $this->PushColor($fcolor);
+            $this->FilledRectangle($x-$xmarg, $y+$ymarg-$height,
+                                          $x+$width, $y+$ymarg);
+                                          //$cornerradius);
+            $this->PopColor();
+            $this->PushColor($bcolor);
+            $this->Rectangle($x-$xmarg,$y+$ymarg-$height,
+                                    $x+$width,$y+$ymarg);
+                                    //$cornerradius);
+            $this->PopColor();
+        }
+        else {
+            if( $fcolor ) {
+                $oc=$this->current_color;
+                $this->SetColor($fcolor);
+                $this->FilledRectangle($x-$xmarg,$y+$ymarg-$height,$x+$width,$y+$ymarg);//,$cornerradius);
+                $this->current_color=$oc;
+            }
+            if( $bcolor ) {
+                $oc=$this->current_color;
+                $this->SetColor($bcolor);
+                $this->Rectangle($x-$xmarg,$y+$ymarg-$height,$x+$width,$y+$ymarg);//,$cornerradius);
+                $this->current_color=$oc;
+            }
+        }
+
+        if( $this->font_size < 14 ) {
+            $x += 2;
+            $y -= 2;
+        }
+        else {
+
+            // Restore the original y before we stroke the text
+           // $y -= $baseline_offset;
+
+        }
+
+        $this->SetCenter(0,0);
+        $this->SetAngle($olda);
+
+        $h=$this->text_halign;
+        $v=$this->text_valign;
+        if( $this->text_halign == 'center') {
+            $this->SetTextAlign('center','basepoint');
+        }
+        else {
+            $this->SetTextAlign('basepoint','basepoint');
+        }
+
+        $debug=false;
+        $this->StrokeText($x, $y, $txt, $dir, $paragraph_align,$debug);
+
+        $bb = array($x-$xmarg, $y+$height-$ymarg,
+                    $x+$width, $y+$height-$ymarg,
+                    $x+$width, $y-$ymarg,
+                    $x-$xmarg, $y-$ymarg);
+
+        $this->SetTextAlign($h,$v);
+        $this->SetAngle($olda);
+
+		$this->lastx = $oldx;
+		$this->lasty = $oldy;
+
+        return $bb;
+    }
+
+    // Set text alignment
+    function SetTextAlign($halign,$valign="bottom") {
+        $this->text_halign=$halign;
+        $this->text_valign=$valign;
+    }
+
+    function _StrokeBuiltinFont($x,$y,$txt,$dir,$paragraph_align,&$aBoundingBox,$aDebug=false) {
+
+        if( is_numeric($dir) && $dir!=90 && $dir!=0)
+        JpGraphError::RaiseL(25091);//(" Internal font does not support drawing text at arbitrary angle. Use TTF fonts instead.");
+
+        $h=$this->GetTextHeight($txt);
+        $fh=$this->GetFontHeight();
+        $w=$this->GetTextWidth($txt);
+
+        if( $this->text_halign=="right") {
+            $x -= $dir==0 ? $w : $h;
+        }
+        elseif( $this->text_halign=="center" ) {
+            // For center we subtract 1 pixel since this makes the middle
+            // be prefectly in the middle
+            $x -= $dir==0 ? $w/2-1 : $h/2;
+        }
+        if( $this->text_valign=="top" ) {
+            $y += $dir==0 ? $h : $w;
+        }
+        elseif( $this->text_valign=="center" ) {
+            $y += $dir==0 ? $h/2 : $w/2;
+        }
+
+        $use_font = $this->font_family;
+
+        if( $dir==90 ) {
+            imagestringup($this->img,$use_font,$x,$y,$txt,$this->current_color);
+            $aBoundingBox = array(round($x),round($y),round($x),round($y-$w),round($x+$h),round($y-$w),round($x+$h),round($y));
+            if( $aDebug ) {
+                // Draw bounding box
+                $this->PushColor('green');
+                $this->Polygon($aBoundingBox,true);
+                $this->PopColor();
+            }
+        }
+        else {
+            if( preg_match('/\n/',$txt) ) {
+                $tmp = preg_split('/\n/',$txt);
+                for($i=0; $i < count($tmp); ++$i) {
+                    $w1 = $this->GetTextWidth($tmp[$i]);
+                    if( $paragraph_align=="left" ) {
+                        imagestring($this->img,$use_font,$x,$y-$h+1+$i*$fh,$tmp[$i],$this->current_color);
+                    }
+                    elseif( $paragraph_align=="right" ) {
+                        imagestring($this->img,$use_font,$x+($w-$w1),$y-$h+1+$i*$fh,$tmp[$i],$this->current_color);
+                    }
+                    else {
+                        imagestring($this->img,$use_font,$x+$w/2-$w1/2,$y-$h+1+$i*$fh,$tmp[$i],$this->current_color);
+                    }
+                }
+            }
+            else {
+                //Put the text
+                imagestring($this->img,$use_font,$x,$y-$h+1,$txt,$this->current_color);
+            }
+            if( $aDebug ) {
+                // Draw the bounding rectangle and the bounding box
+                $p1 = array(round($x),round($y),round($x),round($y-$h),round($x+$w),round($y-$h),round($x+$w),round($y));
+
+                // Draw bounding box
+                $this->PushColor('green');
+                $this->Polygon($p1,true);
+                $this->PopColor();
+
+            }
+            $aBoundingBox=array(round($x),round($y),round($x),round($y-$h),round($x+$w),round($y-$h),round($x+$w),round($y));
+        }
+    }
+
+    function AddTxtCR($aTxt) {
+        // If the user has just specified a '\n'
+        // instead of '\n\t' we have to add '\r' since
+        // the width will be too muchy otherwise since when
+        // we print we stroke the individually lines by hand.
+        $e = explode("\n",$aTxt);
+        $n = count($e);
+        for($i=0; $i<$n; ++$i) {
+            $e[$i]=str_replace("\r","",$e[$i]);
+        }
+        return implode("\n\r",$e);
+    }
+
+    function NormAngle($a) {
+        // Normalize angle in degrees
+        // Normalize angle to be between 0-360
+        while( $a > 360 )
+            $a -= 360;
+        while( $a < -360 )
+            $a += 360;
+        if( $a < 0 )
+            $a = 360 + $a;
+        return $a;
+    }
+
+    function imagettfbbox_fixed($size, $angle, $fontfile, $text) {
+
+
+        if( ! USE_LIBRARY_IMAGETTFBBOX ) {
+
+            $bbox = @imagettfbbox($size, $angle, $fontfile, $text);
+            if( $bbox === false ) {
+                JpGraphError::RaiseL(25092,$this->font_file);
+                //("There is either a configuration problem with TrueType or a problem reading font file (".$this->font_file."). Make sure file exists and is in a readable place for the HTTP process. (If 'basedir' restriction is enabled in PHP then the font file must be located in the document root.). It might also be a wrongly installed FreeType library. Try uppgrading to at least FreeType 2.1.13 and recompile GD with the correct setup so it can find the new FT library.");
+            }
+            $this->bbox_cache = $bbox;
+            return $bbox;
+        }
+
+        // The built in imagettfbbox is buggy for angles != 0 so
+        // we calculate this manually by getting the bounding box at
+        // angle = 0 and then rotate the bounding box manually
+        $bbox = @imagettfbbox($size, 0, $fontfile, $text);
+        if( $bbox === false ) {
+            JpGraphError::RaiseL(25092,$this->font_file);
+            //("There is either a configuration problem with TrueType or a problem reading font file (".$this->font_file."). Make sure file exists and is in a readable place for the HTTP process. (If 'basedir' restriction is enabled in PHP then the font file must be located in the document root.). It might also be a wrongly installed FreeType library. Try uppgrading to at least FreeType 2.1.13 and recompile GD with the correct setup so it can find the new FT library.");
+        }
+
+        $angle = $this->NormAngle($angle);
+
+        $a = $angle*M_PI/180;
+        $ca = cos($a);
+        $sa = sin($a);
+        $ret = array();
+
+        // We always add 1 pixel to the left since the left edge of the bounding
+        // box is sometimes coinciding with the first pixel of the text
+        //$bbox[0] -= 1;
+        //$bbox[6] -= 1;
+        
+        // For roatated text we need to add extra width for rotated
+        // text since the kerning and stroking of the TTF is not the same as for
+        // text at a 0 degree angle
+
+        if( $angle > 0.001 && abs($angle-360) > 0.001 ) {
+            $h = abs($bbox[7]-$bbox[1]);
+            $w = abs($bbox[2]-$bbox[0]);
+
+            $bbox[0] -= 2;
+            $bbox[6] -= 2;
+            // The width is underestimated so compensate for that
+            $bbox[2] += round($w*0.06);
+            $bbox[4] += round($w*0.06);
+
+            // and we also need to compensate with increased height
+            $bbox[5] -= round($h*0.1);
+            $bbox[7] -= round($h*0.1);
+
+            if( $angle > 90 ) {
+                // For angles > 90 we also need to extend the height further down
+                // by the baseline since that is also one more problem
+                $bbox[1] += round($h*0.15);
+                $bbox[3] += round($h*0.15);
+
+                // and also make it slighty less height
+                $bbox[7] += round($h*0.05);
+                $bbox[5] += round($h*0.05);
+
+                // And we need to move the box slightly top the rright (from a tetx perspective)
+                $bbox[0] += round($w*0.02);
+                $bbox[6] += round($w*0.02);
+
+                if( $angle > 180 ) {
+                    // And we need to move the box slightly to the left (from a text perspective)
+                    $bbox[0] -= round($w*0.02);
+                    $bbox[6] -= round($w*0.02);
+                    $bbox[2] -= round($w*0.02);
+                    $bbox[4] -= round($w*0.02);
+
+                }
+
+            }
+            for($i = 0; $i < 7; $i += 2) {
+                $ret[$i] = round($bbox[$i] * $ca + $bbox[$i+1] * $sa);
+                $ret[$i+1] = round($bbox[$i+1] * $ca - $bbox[$i] * $sa);
+            }
+            $this->bbox_cache = $ret;
+            return $ret;
+        }
+        else {
+            $this->bbox_cache = $bbox;
+            return $bbox;
+        }
+    }
+
+    // Deprecated
+    function GetTTFBBox($aTxt,$aAngle=0) {
+        $bbox = $this->imagettfbbox_fixed($this->font_size,$aAngle,$this->font_file,$aTxt);
+         return $bbox;
+    }
+
+    function GetBBoxTTF($aTxt,$aAngle=0) {
+        // Normalize the bounding box to become a minimum
+        // enscribing rectangle
+
+        $aTxt = $this->AddTxtCR($aTxt);
+
+        if( !is_readable($this->font_file) ) {
+            JpGraphError::RaiseL(25093,$this->font_file);
+            //('Can not read font file ('.$this->font_file.') in call to Image::GetBBoxTTF. Please make sure that you have set a font before calling this method and that the font is installed in the TTF directory.');
+        }
+        $bbox = $this->imagettfbbox_fixed($this->font_size,$aAngle,$this->font_file,$aTxt);
+
+        if( $aAngle==0 ) return $bbox;
+
+        if( $aAngle >= 0 ) {
+            if(  $aAngle <= 90 ) { //<=0
+                $bbox = array($bbox[6],$bbox[1],$bbox[2],$bbox[1],
+                              $bbox[2],$bbox[5],$bbox[6],$bbox[5]);
+            }
+            elseif(  $aAngle <= 180 ) { //<= 2
+                $bbox = array($bbox[4],$bbox[7],$bbox[0],$bbox[7],
+                              $bbox[0],$bbox[3],$bbox[4],$bbox[3]);
+            }
+            elseif(  $aAngle <= 270 )  { //<= 3
+                $bbox = array($bbox[2],$bbox[5],$bbox[6],$bbox[5],
+                              $bbox[6],$bbox[1],$bbox[2],$bbox[1]);
+            }
+            else {
+                $bbox = array($bbox[0],$bbox[3],$bbox[4],$bbox[3],
+                              $bbox[4],$bbox[7],$bbox[0],$bbox[7]);
+            }
+        }
+        elseif(  $aAngle < 0 ) {
+            if( $aAngle <= -270 ) { // <= -3
+                $bbox = array($bbox[6],$bbox[1],$bbox[2],$bbox[1],
+                              $bbox[2],$bbox[5],$bbox[6],$bbox[5]);
+            }
+            elseif( $aAngle <= -180 ) { // <= -2
+                $bbox = array($bbox[0],$bbox[3],$bbox[4],$bbox[3],
+                              $bbox[4],$bbox[7],$bbox[0],$bbox[7]);
+            }
+            elseif( $aAngle <= -90 ) { // <= -1
+                $bbox = array($bbox[2],$bbox[5],$bbox[6],$bbox[5],
+                              $bbox[6],$bbox[1],$bbox[2],$bbox[1]);
+            }
+            else {
+                $bbox = array($bbox[0],$bbox[3],$bbox[4],$bbox[3],
+                              $bbox[4],$bbox[7],$bbox[0],$bbox[7]);
+            }
+        }
+        return $bbox;
+    }
+
+    function GetBBoxHeight($aTxt,$aAngle=0) {
+        $box = $this->GetBBoxTTF($aTxt,$aAngle);
+        return abs($box[7]-$box[1]);
+    }
+
+    function GetBBoxWidth($aTxt,$aAngle=0) {
+        $box = $this->GetBBoxTTF($aTxt,$aAngle);
+        return $box[2]-$box[0]+1;
+    }
+
+
+    function _StrokeTTF($x,$y,$txt,$dir,$paragraph_align,&$aBoundingBox,$debug=false) {
+
+        // Setup default inter line margin for paragraphs to be
+        // 3% of the font height.
+        $ConstLineSpacing = 0.03 ;
+
+        // Remember the anchor point before adjustment
+        if( $debug ) {
+            $ox=$x;
+            $oy=$y;
+        }
+
+        if( !preg_match('/\n/',$txt) || ($dir>0 && preg_match('/\n/',$txt)) ) {
+            // Format a single line
+
+            $txt = $this->AddTxtCR($txt);
+            $bbox=$this->GetBBoxTTF($txt,$dir);
+            $width  = $this->GetBBoxWidth($txt,$dir);
+            $height = $this->GetBBoxHeight($txt,$dir);
+
+            // The special alignment "basepoint" is mostly used internally
+            // in the library. This will put the anchor position at the left
+            // basepoint of the tetx. This is the default anchor point for
+            // TTF text.
+
+            if( $this->text_valign != 'basepoint' ) {
+                // Align x,y ot lower left corner of bbox
+                
+
+                if( $this->text_halign=='right' ) {
+                    $x -= $width;
+                    $x -= $bbox[0];
+                }
+                elseif( $this->text_halign=='center' ) {
+                    $x -= $width/2;
+                    $x -= $bbox[0];
+                }
+                elseif( $this->text_halign=='baseline' ) {
+                    // This is only support for text at 90 degree !!
+                    // Do nothing the text is drawn at baseline by default
+                }
+
+                if( $this->text_valign=='top' ) {
+                    $y -= $bbox[1]; // Adjust to bottom of text
+                    $y += $height;
+                }
+                elseif( $this->text_valign=='center' ) {
+                    $y -= $bbox[1]; // Adjust to bottom of text
+                    $y += $height/2;
+                }
+                elseif( $this->text_valign=='baseline' ) {
+                    // This is only support for text at 0 degree !!
+                    // Do nothing the text is drawn at baseline by default
+                }
+            } 
+            ImageTTFText ($this->img, $this->font_size, $dir, $x, $y,
+                          $this->current_color,$this->font_file,$txt);
+
+            // Calculate and return the co-ordinates for the bounding box
+            $box = $this->imagettfbbox_fixed($this->font_size,$dir,$this->font_file,$txt);
+            $p1 = array();
+
+            for($i=0; $i < 4; ++$i) {
+                $p1[] = round($box[$i*2]+$x);
+                $p1[] = round($box[$i*2+1]+$y);
+            }
+            $aBoundingBox = $p1;
+
+            // Debugging code to highlight the bonding box and bounding rectangle
+            // For text at 0 degrees the bounding box and bounding rectangle are the
+            // same
+            if( $debug ) {
+            // Draw the bounding rectangle and the bounding box
+
+                $p = array();
+                $p1 = array();
+
+                for($i=0; $i < 4; ++$i) {
+                    $p[] =  $bbox[$i*2]+$x ;
+                    $p[] =  $bbox[$i*2+1]+$y;
+                    $p1[] = $box[$i*2]+$x ;
+                    $p1[] = $box[$i*2+1]+$y ;
+                }
+
+                // Draw bounding box
+                $this->PushColor('green');
+                $this->Polygon($p1,true);
+                $this->PopColor();
+
+                // Draw bounding rectangle
+                $this->PushColor('darkgreen');
+                $this->Polygon($p,true);
+                $this->PopColor();
+
+                // Draw a cross at the anchor point
+                $this->PushColor('red');
+                $this->Line($ox-15,$oy,$ox+15,$oy);
+                $this->Line($ox,$oy-15,$ox,$oy+15);
+                $this->PopColor();
+            }
+        }
+        else {
+            // Format a text paragraph
+            $fh=$this->GetFontHeight();
+
+            // Line margin is 25% of font height
+            $linemargin=round($fh*$ConstLineSpacing);
+            $fh += $linemargin;
+            $w=$this->GetTextWidth($txt);
+
+            $y -= $linemargin/2;
+            $tmp = preg_split('/\n/',$txt);
+            $nl = count($tmp);
+            $h = $nl * $fh;
+
+            if( $this->text_halign=='right') {
+                $x -= $dir==0 ? $w : $h;
+            }
+            elseif( $this->text_halign=='center' ) {
+                $x -= $dir==0 ? $w/2 : $h/2;
+            }
+
+            if( $this->text_valign=='top' ) {
+                $y += $dir==0 ? $h : $w;
+            }
+            elseif( $this->text_valign=='center' ) {
+                $y += $dir==0 ? $h/2 : $w/2;
+            }
+
+            // Here comes a tricky bit.
+            // Since we have to give the position for the string at the
+            // baseline this means thaht text will move slightly up
+            // and down depending on any of it's character descend below
+            // the baseline, for example a 'g'. To adjust the Y-position
+            // we therefore adjust the text with the baseline Y-offset
+            // as used for the current font and size. This will keep the
+            // baseline at a fixed positoned disregarding the actual
+            // characters in the string.
+            $standardbox = $this->GetTTFBBox('Gg',$dir);
+            $yadj = $standardbox[1];
+            $xadj = $standardbox[0];
+            $aBoundingBox = array();
+            for($i=0; $i < $nl; ++$i) {
+                $wl = $this->GetTextWidth($tmp[$i]);
+                $bbox = $this->GetTTFBBox($tmp[$i],$dir);
+                if( $paragraph_align=='left' ) {
+                    $xl = $x;
+                }
+                elseif( $paragraph_align=='right' ) {
+                    $xl = $x + ($w-$wl);
+                }
+                else {
+                    // Center
+                    $xl = $x + $w/2 - $wl/2 ;
+                }
+
+                // In theory we should adjust with full pre-lead to get the lines
+                // lined up but this doesn't look good so therfore we only adjust with
+                // half th pre-lead
+                $xl -= $bbox[0]/2;
+                $yl = $y - $yadj;
+                //$xl = $xl- $xadj;
+                ImageTTFText($this->img, $this->font_size, $dir, $xl, $yl-($h-$fh)+$fh*$i,
+                             $this->current_color,$this->font_file,$tmp[$i]);
+
+               // echo "xl=$xl,".$tmp[$i]." <br>";
+                if( $debug  ) {
+                    // Draw the bounding rectangle around each line
+                    $box=@ImageTTFBBox($this->font_size,$dir,$this->font_file,$tmp[$i]);
+                    $p = array();
+                    for($j=0; $j < 4; ++$j) {
+                        $p[] = $bbox[$j*2]+$xl;
+                        $p[] = $bbox[$j*2+1]+$yl-($h-$fh)+$fh*$i;
+                    }
+
+                    // Draw bounding rectangle
+                    $this->PushColor('darkgreen');
+                    $this->Polygon($p,true);
+                    $this->PopColor();
+                }
+            }
+
+            // Get the bounding box
+            $bbox = $this->GetBBoxTTF($txt,$dir);
+            for($j=0; $j < 4; ++$j) {
+                $bbox[$j*2]+= round($x);
+                $bbox[$j*2+1]+= round($y - ($h-$fh) - $yadj);
+            }
+            $aBoundingBox = $bbox;
+
+            if( $debug ) {
+                // Draw a cross at the anchor point
+                $this->PushColor('red');
+                $this->Line($ox-25,$oy,$ox+25,$oy);
+                $this->Line($ox,$oy-25,$ox,$oy+25);
+                $this->PopColor();
+            }
+
+        }
+    }
+
+    function StrokeText($x,$y,$txt,$dir=0,$paragraph_align="left",$debug=false) {
+
+        $x = round($x);
+        $y = round($y);
+
+        // Do special language encoding
+        $txt = $this->langconv->Convert($txt,$this->font_family);
+
+        if( !is_numeric($dir) ) {
+            JpGraphError::RaiseL(25094);//(" Direction for text most be given as an angle between 0 and 90.");
+        }
+
+        if( $this->font_family >= FF_FONT0 && $this->font_family <= FF_FONT2+1) {
+            $this->_StrokeBuiltinFont($x,$y,$txt,$dir,$paragraph_align,$boundingbox,$debug);
+        }
+        elseif( $this->font_family >= _FIRST_FONT && $this->font_family <= _LAST_FONT)  {
+            $this->_StrokeTTF($x,$y,$txt,$dir,$paragraph_align,$boundingbox,$debug);
+        }
+        else {
+            JpGraphError::RaiseL(25095);//(" Unknown font font family specification. ");
+        }
+        return $boundingbox;
+    }
+
+    function SetMargin($lm,$rm,$tm,$bm) {
+
+        $this->left_margin=$lm;
+        $this->right_margin=$rm;
+        $this->top_margin=$tm;
+        $this->bottom_margin=$bm;
+
+        $this->plotwidth  = $this->width  - $this->left_margin - $this->right_margin;
+        $this->plotheight = $this->height - $this->top_margin  - $this->bottom_margin;
+
+        if( $this->width  > 0 && $this->height > 0 ) {
+            if( $this->plotwidth < 0  || $this->plotheight < 0 ) {
+            	JpGraphError::RaiseL(25130, $this->plotwidth, $this->plotheight);
+                //JpGraphError::raise("To small plot area. ($lm,$rm,$tm,$bm : $this->plotwidth x $this->plotheight). With the given image size and margins there is to little space left for the plot. Increase the plot size or reduce the margins.");
+            }
+        }
+    }
+
+    function SetTransparent($color) {
+        imagecolortransparent ($this->img,$this->rgb->allocate($color));
+    }
+
+    function SetColor($color,$aAlpha=0) {
+        $this->current_color_name = $color;
+        $this->current_color=$this->rgb->allocate($color,$aAlpha);
+        if( $this->current_color == -1 ) {
+            $tc=imagecolorstotal($this->img);
+            JpGraphError::RaiseL(25096);
+            //("Can't allocate any more colors. Image has already allocated maximum of <b>$tc colors</b>. This might happen if you have anti-aliasing turned on together with a background image or perhaps gradient fill since this requires many, many colors. Try to turn off anti-aliasing. If there is still a problem try downgrading the quality of the background image to use a smaller pallete to leave some entries for your graphs. You should try to limit the number of colors in your background image to 64. If there is still problem set the constant DEFINE(\"USE_APPROX_COLORS\",true); in jpgraph.php This will use approximative colors when the palette is full. Unfortunately there is not much JpGraph can do about this since the palette size is a limitation of current graphic format and what the underlying GD library suppports.");
+        }
+        return $this->current_color;
+    }
+
+    function PushColor($color) {
+        if( $color != "" ) {
+            $this->colorstack[$this->colorstackidx]=$this->current_color_name;
+            $this->colorstack[$this->colorstackidx+1]=$this->current_color;
+            $this->colorstackidx+=2;
+            $this->SetColor($color);
+        }
+        else {
+            JpGraphError::RaiseL(25097);//("Color specified as empty string in PushColor().");
+        }
+    }
+
+    function PopColor() {
+        if( $this->colorstackidx < 1 ) {
+            JpGraphError::RaiseL(25098);//(" Negative Color stack index. Unmatched call to PopColor()");
+        }
+        $this->current_color=$this->colorstack[--$this->colorstackidx];
+        $this->current_color_name=$this->colorstack[--$this->colorstackidx];
+    }
+
+
+    function SetLineWeight($weight) {
+        $old = $this->line_weight;
+        imagesetthickness($this->img,$weight);
+        $this->line_weight = $weight;
+        return $old;
+    }
+
+    function SetStartPoint($x,$y) {
+        $this->lastx=round($x);
+        $this->lasty=round($y);
+    }
+
+    function Arc($cx,$cy,$w,$h,$s,$e) {
+        // GD Arc doesn't like negative angles
+        while( $s < 0) $s += 360;
+        while( $e < 0) $e += 360;
+        imagearc($this->img,round($cx),round($cy),round($w),round($h),$s,$e,$this->current_color);
+    }
+
+    function FilledArc($xc,$yc,$w,$h,$s,$e,$style='') {
+        $s = round($s);
+        $e = round($e);
+        while( $s < 0 ) $s += 360;
+        while( $e < 0 ) $e += 360;
+        if( $style=='' )
+        $style=IMG_ARC_PIE;
+        if( abs($s-$e) > 0 ) {
+            imagefilledarc($this->img,round($xc),round($yc),round($w),round($h),$s,$e,$this->current_color,$style);
+//            $this->DrawImageSmoothArc($this->img,round($xc),round($yc),round($w),round($h),$s,$e,$this->current_color,$style);
+        }
+    }
+
+    function FilledCakeSlice($cx,$cy,$w,$h,$s,$e) {
+        $this->CakeSlice($cx,$cy,$w,$h,$s,$e,$this->current_color_name);
+    }
+
+    function CakeSlice($xc,$yc,$w,$h,$s,$e,$fillcolor="",$arccolor="") {
+        $s = round($s); $e = round($e);
+        $w = round($w); $h = round($h);
+        $xc = round($xc); $yc = round($yc);
+        if( $s == $e ) {
+            // A full circle. We draw this a plain circle
+            $this->PushColor($fillcolor);
+            imagefilledellipse($this->img,$xc,$yc,2*$w,2*$h,$this->current_color);
+
+            // If antialiasing is used then we often don't have any color no the surrounding
+            // arc. So, we need to check for this special case so we don't send an empty
+            // color to the push function. In this case we use the fill color for the arc as well
+            if( $arccolor != '' ) {
+                $this->PopColor();
+                $this->PushColor($arccolor);
+            }
+            imageellipse($this->img,$xc,$yc,2*$w,2*$h,$this->current_color);
+            $this->Line($xc,$yc,cos($s*M_PI/180)*$w+$xc,$yc+sin($s*M_PI/180)*$h);
+            $this->PopColor();
+        }
+        else {
+            $this->PushColor($fillcolor);
+            $this->FilledArc($xc,$yc,2*$w,2*$h,$s,$e);
+            $this->PopColor();
+            if( $arccolor != "" ) {
+                $this->PushColor($arccolor);
+                // We add 2 pixels to make the Arc() better aligned with
+                // the filled arc.
+                imagefilledarc($this->img,$xc,$yc,2*$w,2*$h,$s,$e,$this->current_color,IMG_ARC_NOFILL | IMG_ARC_EDGED ) ;
+                $this->PopColor();
+            }
+        }
+    }
+
+    function Ellipse($xc,$yc,$w,$h) {
+        $this->Arc($xc,$yc,$w,$h,0,360);
+    }
+
+    function Circle($xc,$yc,$r) {
+        imageellipse($this->img,round($xc),round($yc),$r*2,$r*2,$this->current_color);
+//        $this->DrawImageSmoothArc($this->img,round($xc),round($yc),$r*2+1,$r*2+1,0,360,$this->current_color);
+//        $this->imageSmoothCircle($this->img, round($xc),round($yc), $r*2+1, $this->current_color);
+    }
+
+    function FilledCircle($xc,$yc,$r) {
+        imagefilledellipse($this->img,round($xc),round($yc),2*$r,2*$r,$this->current_color);
+//        $this->DrawImageSmoothArc($this->img, round($xc), round($yc), 2*$r, 2*$r, 0, 360, $this->current_color);
+    }
+
+    // Linear Color InterPolation
+    function lip($f,$t,$p) {
+        $p = round($p,1);
+        $r = $f[0] + ($t[0]-$f[0])*$p;
+        $g = $f[1] + ($t[1]-$f[1])*$p;
+        $b = $f[2] + ($t[2]-$f[2])*$p;
+        return array($r,$g,$b);
+    }
+
+    // Set line style dashed, dotted etc
+    function SetLineStyle($s) {
+        if( is_numeric($s) ) {
+            if( $s<1 || $s>4 ) {
+                JpGraphError::RaiseL(25101,$s);//(" Illegal numeric argument to SetLineStyle(): ($s)");
+            }
+        }
+        elseif( is_string($s) ) {
+            if( $s == "solid" ) $s=1;
+            elseif( $s == "dotted" ) $s=2;
+            elseif( $s == "dashed" ) $s=3;
+            elseif( $s == "longdashed" ) $s=4;
+            else {
+                JpGraphError::RaiseL(25102,$s);//(" Illegal string argument to SetLineStyle(): $s");
+            }
+        }
+        else {
+            JpGraphError::RaiseL(25103,$s);//(" Illegal argument to SetLineStyle $s");
+        }
+        $old = $this->line_style;
+        $this->line_style=$s;
+        return $old;
+    }
+
+    // Same as Line but take the line_style into account
+    function StyleLine($x1,$y1,$x2,$y2,$aStyle='', $from_grid_class = false) {
+        if( $this->line_weight <= 0 ) return;
+
+        if( $aStyle === '' ) {
+            $aStyle = $this->line_style;
+        }
+
+        $dashed_line_method = 'DashedLine';
+        if ($from_grid_class) {
+            $dashed_line_method = 'DashedLineForGrid';
+        }
+
+        // Add error check since dashed line will only work if anti-alias is disabled
+        // this is a limitation in GD
+
+        if( $aStyle == 1 ) {
+            // Solid style. We can handle anti-aliasing for this
+            $this->Line($x1,$y1,$x2,$y2);
+        }
+        else {
+            // Since the GD routines doesn't handle AA for styled line
+            // we have no option than to turn it off to get any lines at
+            // all if the weight > 1
+            $oldaa = $this->GetAntiAliasing();
+            if( $oldaa && $this->line_weight > 1 ) {
+                 $this->SetAntiAliasing(false);
+            }
+
+            switch( $aStyle ) {
+                case 2: // Dotted
+                    $this->$dashed_line_method($x1,$y1,$x2,$y2,2,6);
+                    break;
+                case 3: // Dashed
+                    $this->$dashed_line_method($x1,$y1,$x2,$y2,5,9);
+                    break;
+                case 4: // Longdashes
+                    $this->$dashed_line_method($x1,$y1,$x2,$y2,9,13);
+                    break;
+                default:
+                    JpGraphError::RaiseL(25104,$this->line_style);//(" Unknown line style: $this->line_style ");
+                    break;
+            }
+            if( $oldaa ) {
+                $this->SetAntiAliasing(true);
+            }
+        }
+    }
+
+    function DashedLine($x1,$y1,$x2,$y2,$dash_length=1,$dash_space=4) {
+
+        if( $this->line_weight <= 0 ) return;
+
+        // Add error check to make sure anti-alias is not enabled.
+        // Dashed line does not work with anti-alias enabled. This
+        // is a limitation in GD.
+        if( $this->use_anti_aliasing ) {
+//            JpGraphError::RaiseL(25129); // Anti-alias can not be used with dashed lines. Please disable anti-alias or use solid lines.
+        }
+        
+        $x1 = round($x1);
+        $x2 = round($x2);
+        $y1 = round($y1);
+        $y2 = round($y2);
+
+        $dash_length *= SUPERSAMPLING_SCALE;
+        $dash_space  *= SUPERSAMPLING_SCALE;
+
+        $style = array_fill(0,$dash_length,$this->current_color);
+        $style = array_pad($style,$dash_space,IMG_COLOR_TRANSPARENT);
+        imagesetstyle($this->img, $style);
+        imageline($this->img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED);
+
+        $this->lastx = $x2;
+        $this->lasty = $y2;
+    }
+
+    function DashedLineForGrid($x1,$y1,$x2,$y2,$dash_length=1,$dash_space=4) {
+
+        if( $this->line_weight <= 0 ) return;
+
+        // Add error check to make sure anti-alias is not enabled.
+        // Dashed line does not work with anti-alias enabled. This
+        // is a limitation in GD.
+        if( $this->use_anti_aliasing ) {
+//            JpGraphError::RaiseL(25129); // Anti-alias can not be used with dashed lines. Please disable anti-alias or use solid lines.
+        }
+        
+        $x1 = round($x1);
+        $x2 = round($x2);
+        $y1 = round($y1);
+        $y2 = round($y2);
+        
+        /*
+        $dash_length *= $this->scale;
+        $dash_space  *= $this->scale;
+        */
+
+        $dash_length = 2;
+        $dash_length = 4;
+        imagesetthickness($this->img, 1);
+        $style = array_fill(0,$dash_length, $this->current_color); //hexdec('CCCCCC'));
+        $style = array_pad($style,$dash_space,IMG_COLOR_TRANSPARENT);
+        imagesetstyle($this->img, $style);
+        imageline($this->img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED);
+
+        $this->lastx = $x2;
+        $this->lasty = $y2;
+    }
+
+    function Line($x1,$y1,$x2,$y2) {
+
+        if( $this->line_weight <= 0 ) return;
+
+        $x1 = round($x1);
+        $x2 = round($x2);
+        $y1 = round($y1);
+        $y2 = round($y2);
+
+        imageline($this->img,$x1,$y1,$x2,$y2,$this->current_color);
+//        $this->DrawLine($this->img, $x1, $y1, $x2, $y2, $this->line_weight, $this->current_color);
+        $this->lastx=$x2;
+        $this->lasty=$y2;
+    }
+
+    function Polygon($p,$closed=FALSE,$fast=FALSE) {
+
+        if( $this->line_weight <= 0 ) return;
+
+        $n=count($p);
+        $oldx = $p[0];
+        $oldy = $p[1];
+        if( $fast ) {
+            for( $i=2; $i < $n; $i+=2 ) {
+                imageline($this->img,$oldx,$oldy,$p[$i],$p[$i+1],$this->current_color);
+                $oldx = $p[$i];
+                $oldy = $p[$i+1];
+            }
+            if( $closed ) {
+                imageline($this->img,$p[$n*2-2],$p[$n*2-1],$p[0],$p[1],$this->current_color);
+            }
+        }
+        else {
+            for( $i=2; $i < $n; $i+=2 ) {
+                $this->StyleLine($oldx,$oldy,$p[$i],$p[$i+1]);
+                $oldx = $p[$i];
+                $oldy = $p[$i+1];
+            }
+            if( $closed ) {
+                $this->StyleLine($oldx,$oldy,$p[0],$p[1]);
+            }
+        }
+    }
+
+    function FilledPolygon($pts) {
+        $n=count($pts);
+        if( $n == 0 ) {
+            JpGraphError::RaiseL(25105);//('NULL data specified for a filled polygon. Check that your data is not NULL.');
+        }
+        for($i=0; $i < $n; ++$i) {
+            $pts[$i] = round($pts[$i]);
+        }
+        $old = $this->line_weight;
+        imagesetthickness($this->img,1);
+        imagefilledpolygon($this->img,$pts,count($pts)/2,$this->current_color);
+        $this->line_weight = $old;
+        imagesetthickness($this->img,$old);
+    }
+
+    function Rectangle($xl,$yu,$xr,$yl) {
+        $this->Polygon(array($xl,$yu,$xr,$yu,$xr,$yl,$xl,$yl,$xl,$yu));
+    }
+
+    function FilledRectangle($xl,$yu,$xr,$yl) {
+        $this->FilledPolygon(array($xl,$yu,$xr,$yu,$xr,$yl,$xl,$yl));
+    }
+
+    function FilledRectangle2($xl,$yu,$xr,$yl,$color1,$color2,$style=1) {
+        // Fill a rectangle with lines of two colors
+        if( $style===1 ) {
+            // Horizontal stripe
+            if( $yl < $yu ) {
+                $t = $yl; $yl=$yu; $yu=$t;
+            }
+            for( $y=$yu; $y <= $yl; ++$y) {
+                $this->SetColor($color1);
+                $this->Line($xl,$y,$xr,$y);
+                ++$y;
+                $this->SetColor($color2);
+                $this->Line($xl,$y,$xr,$y);
+            }
+        }
+        else {
+            if( $xl < $xl ) {
+                $t = $xl; $xl=$xr; $xr=$t;
+            }
+            for( $x=$xl; $x <= $xr; ++$x) {
+                $this->SetColor($color1);
+                $this->Line($x,$yu,$x,$yl);
+                ++$x;
+                $this->SetColor($color2);
+                $this->Line($x,$yu,$x,$yl);
+            }
+        }
+    }
+
+    function ShadowRectangle($xl,$yu,$xr,$yl,$fcolor=false,$shadow_width=4,$shadow_color='darkgray',$useAlpha=true) {
+        // This is complicated by the fact that we must also handle the case where
+        // the reactangle has no fill color
+        $xl = floor($xl);
+        $yu = floor($yu);
+        $xr = floor($xr);
+        $yl = floor($yl);
+        $this->PushColor($shadow_color);
+        $shadowAlpha=0;
+        $this->SetLineWeight(1);
+        $this->SetLineStyle('solid');
+        $basecolor = $this->rgb->Color($shadow_color);
+        $shadow_color = array($basecolor[0],$basecolor[1],$basecolor[2],);
+        for( $i=0; $i < $shadow_width; ++$i ) {
+            $this->SetColor($shadow_color,$shadowAlpha);
+            $this->Line($xr-$shadow_width+$i,   $yu+$shadow_width,
+                        $xr-$shadow_width+$i,   $yl-$shadow_width-1+$i);
+            $this->Line($xl+$shadow_width,   $yl-$shadow_width+$i,
+                        $xr-$shadow_width+$i,   $yl-$shadow_width+$i);
+            if( $useAlpha ) $shadowAlpha += 1.0/$shadow_width;
+        }
+
+        $this->PopColor();
+        if( $fcolor==false ) {
+            $this->Rectangle($xl,$yu,$xr-$shadow_width-1,$yl-$shadow_width-1);
+        }
+        else {
+            $this->PushColor($fcolor);
+            $this->FilledRectangle($xl,$yu,$xr-$shadow_width-1,$yl-$shadow_width-1);
+            $this->PopColor();
+            $this->Rectangle($xl,$yu,$xr-$shadow_width-1,$yl-$shadow_width-1);
+        }
+    }
+
+    function FilledRoundedRectangle($xt,$yt,$xr,$yl,$r=5) {
+        if( $r==0 ) {
+            $this->FilledRectangle($xt,$yt,$xr,$yl);
+            return;
+        }
+
+        // To avoid overlapping fillings (which will look strange
+        // when alphablending is enabled) we have no choice but
+        // to fill the five distinct areas one by one.
+
+        // Center square
+        $this->FilledRectangle($xt+$r,$yt+$r,$xr-$r,$yl-$r);
+        // Top band
+        $this->FilledRectangle($xt+$r,$yt,$xr-$r,$yt+$r);
+        // Bottom band
+        $this->FilledRectangle($xt+$r,$yl-$r,$xr-$r,$yl);
+        // Left band
+        $this->FilledRectangle($xt,$yt+$r,$xt+$r,$yl-$r);
+        // Right band
+        $this->FilledRectangle($xr-$r,$yt+$r,$xr,$yl-$r);
+
+        // Topleft & Topright arc
+        $this->FilledArc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
+        $this->FilledArc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
+
+        // Bottomleft & Bottom right arc
+        $this->FilledArc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
+        $this->FilledArc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
+
+    }
+
+    function RoundedRectangle($xt,$yt,$xr,$yl,$r=5) {
+
+        if( $r==0 ) {
+            $this->Rectangle($xt,$yt,$xr,$yl);
+            return;
+        }
+
+        // Top & Bottom line
+        $this->Line($xt+$r,$yt,$xr-$r,$yt);
+        $this->Line($xt+$r,$yl,$xr-$r,$yl);
+
+        // Left & Right line
+        $this->Line($xt,$yt+$r,$xt,$yl-$r);
+        $this->Line($xr,$yt+$r,$xr,$yl-$r);
+
+        // Topleft & Topright arc
+        $this->Arc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
+        $this->Arc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
+
+        // Bottomleft & Bottomright arc
+        $this->Arc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
+        $this->Arc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
+    }
+
+    function FilledBevel($x1,$y1,$x2,$y2,$depth=2,$color1='white@0.4',$color2='darkgray@0.4') {
+        $this->FilledRectangle($x1,$y1,$x2,$y2);
+        $this->Bevel($x1,$y1,$x2,$y2,$depth,$color1,$color2);
+    }
+
+    function Bevel($x1,$y1,$x2,$y2,$depth=2,$color1='white@0.4',$color2='black@0.5') {
+        $this->PushColor($color1);
+        for( $i=0; $i < $depth; ++$i ) {
+            $this->Line($x1+$i,$y1+$i,$x1+$i,$y2-$i);
+            $this->Line($x1+$i,$y1+$i,$x2-$i,$y1+$i);
+        }
+        $this->PopColor();
+
+        $this->PushColor($color2);
+        for( $i=0; $i < $depth; ++$i ) {
+            $this->Line($x1+$i,$y2-$i,$x2-$i,$y2-$i);
+            $this->Line($x2-$i,$y1+$i,$x2-$i,$y2-$i-1);
+        }
+        $this->PopColor();
+    }
+
+    function StyleLineTo($x,$y) {
+        $this->StyleLine($this->lastx,$this->lasty,$x,$y);
+        $this->lastx=$x;
+        $this->lasty=$y;
+    }
+
+    function LineTo($x,$y) {
+        $this->Line($this->lastx,$this->lasty,$x,$y);
+        $this->lastx=$x;
+        $this->lasty=$y;
+    }
+
+    function Point($x,$y) {
+        imagesetpixel($this->img,round($x),round($y),$this->current_color);
+    }
+
+    function Fill($x,$y) {
+        imagefill($this->img,round($x),round($y),$this->current_color);
+    }
+
+    function FillToBorder($x,$y,$aBordColor) {
+        $bc = $this->rgb->allocate($aBordColor);
+        if( $bc == -1 ) {
+            JpGraphError::RaiseL(25106);//('Image::FillToBorder : Can not allocate more colors');
+        }
+        imagefilltoborder($this->img,round($x),round($y),$bc,$this->current_color);
+    }
+
+    function SetExpired($aFlg=true) {
+        $this->expired = $aFlg;
+    }
+
+    // Generate image header
+    function Headers() {
+
+        // In case we are running from the command line with the client version of
+        // PHP we can't send any headers.
+        $sapi = php_sapi_name();
+        if( $sapi == 'cli' ) return;
+
+        // These parameters are set by headers_sent() but they might cause
+        // an undefined variable error unless they are initilized
+        $file='';
+        $lineno='';
+        if( headers_sent($file,$lineno) ) {
+            $file=basename($file);
+            $t = new ErrMsgText();
+            $msg = $t->Get(10,$file,$lineno);
+            die($msg);
+        }
+
+        if ($this->expired) {
+            header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . "GMT");
+            header("Cache-Control: no-cache, must-revalidate");
+            header("Pragma: no-cache");
+        }
+        header("Content-type: image/$this->img_format");
+    }
+
+    // Adjust image quality for formats that allow this
+    function SetQuality($q) {
+        $this->quality = $q;
+    }
+
+    // Stream image to browser or to file
+    function Stream($aFile="") {
+        $this->DoSupersampling();
+
+        $func="image".$this->img_format;
+        if( $this->img_format=="jpeg" && $this->quality != null ) {
+            $res = @$func($this->img,$aFile,$this->quality);
+        }
+        else {
+            if( $aFile != "" ) {
+                $res = @$func($this->img,$aFile);
+                if( !$res ) {
+                    JpGraphError::RaiseL(25107,$aFile);//("Can't write to file '$aFile'. Check that the process running PHP has enough permission.");
+                }
+            }
+            else {
+                $res = @$func($this->img);
+                if( !$res ) {
+                    JpGraphError::RaiseL(25108);//("Can't stream image. This is most likely due to a faulty PHP/GD setup. Try to recompile PHP and use the built-in GD library that comes with PHP.");
+                }
+
+            }
+        }
+    }
+
+    // Do SuperSampling using $scale
+    function DoSupersampling() {
+        if (SUPERSAMPLING_SCALE <= 1) {
+            return $this->img;
+        }
+
+        $dst_img = @imagecreatetruecolor($this->original_width, $this->original_height);
+        imagecopyresampled($dst_img, $this->img, 0, 0, 0, 0, $this->original_width, $this->original_height, $this->width, $this->height);
+        $this->Destroy();
+        return $this->img = $dst_img;
+    }
+
+    // Clear resources used by image (this is normally not used since all resources are/should be
+    // returned when the script terminates
+    function Destroy() {
+        imagedestroy($this->img);
+    }
+
+    // Specify image format. Note depending on your installation
+    // of PHP not all formats may be supported.
+    function SetImgFormat($aFormat,$aQuality=75) {
+        $this->quality = $aQuality;
+        $aFormat = strtolower($aFormat);
+        $tst = true;
+        $supported = imagetypes();
+        if( $aFormat=="auto" ) {
+            if( $supported & IMG_PNG )      $this->img_format="png";
+            elseif( $supported & IMG_JPG )  $this->img_format="jpeg";
+            elseif( $supported & IMG_GIF )  $this->img_format="gif";
+            elseif( $supported & IMG_WBMP ) $this->img_format="wbmp";
+            elseif( $supported & IMG_XPM )  $this->img_format="xpm";
+            else {
+                JpGraphError::RaiseL(25109);//("Your PHP (and GD-lib) installation does not appear to support any known graphic formats. You need to first make sure GD is compiled as a module to PHP. If you also want to use JPEG images you must get the JPEG library. Please see the PHP docs for details.");
+            }
+            return true;
+        }
+        else {
+            if( $aFormat=="jpeg" || $aFormat=="png" || $aFormat=="gif" ) {
+                if( $aFormat=="jpeg" && !($supported & IMG_JPG) )       $tst=false;
+                elseif( $aFormat=="png" && !($supported & IMG_PNG) )    $tst=false;
+                elseif( $aFormat=="gif" && !($supported & IMG_GIF) )    $tst=false;
+                elseif( $aFormat=="wbmp" && !($supported & IMG_WBMP) )  $tst=false;
+                elseif( $aFormat=="xpm" && !($supported & IMG_XPM) )    $tst=false;
+                else {
+                    $this->img_format=$aFormat;
+                    return true;
+                }
+            }
+            else {
+                $tst=false;
+            }
+            if( !$tst ) {
+                JpGraphError::RaiseL(25110,$aFormat);//(" Your PHP installation does not support the chosen graphic format: $aFormat");
+            }
+        }
+    }
+
+    /**
+    * Draw Line
+    */
+    function DrawLine($im, $x1, $y1, $x2, $y2, $weight, $color) {
+        if ($weight == 1) {
+            return imageline($im,$x1,$y1,$x2,$y2,$color);
+        }
+
+        $angle=(atan2(($y1 - $y2), ($x2 - $x1))); 
+
+        $dist_x = $weight * (sin($angle)) / 2;
+        $dist_y = $weight * (cos($angle)) / 2;
+        
+        $p1x=ceil(($x1 + $dist_x));
+        $p1y=ceil(($y1 + $dist_y));
+        $p2x=ceil(($x2 + $dist_x));
+        $p2y=ceil(($y2 + $dist_y));
+        $p3x=ceil(($x2 - $dist_x));
+        $p3y=ceil(($y2 - $dist_y));
+        $p4x=ceil(($x1 - $dist_x));
+        $p4y=ceil(($y1 - $dist_y));
+
+        $array=array($p1x,$p1y,$p2x,$p2y,$p3x,$p3y,$p4x,$p4y);
+        imagefilledpolygon ( $im, $array, (count($array)/2), $color );
+
+        // for antialias
+        imageline($im, $p1x, $p1y, $p2x, $p2y, $color);
+        imageline($im, $p3x, $p3y, $p4x, $p4y, $color);
+        return;
+
+
+
+          return imageline($this->img,$x1,$y1,$x2,$y2,$this->current_color);
+      $weight = 8;
+        if ($weight <= 1) {
+          return imageline($this->img,$x1,$y1,$x2,$y2,$this->current_color);
+        }
+
+        $pts = array();
+
+        $weight /= 2;
+
+        if ($y2 - $y1 == 0) {
+            // x line
+            $pts = array();
+            $pts[] = $x1; $pts[] = $y1 - $weight;
+            $pts[] = $x1; $pts[] = $y1 + $weight;
+            $pts[] = $x2; $pts[] = $y2 + $weight;
+            $pts[] = $x2; $pts[] = $y2 - $weight;
+
+        } elseif ($x2 - $x1 == 0) {
+            // y line
+            $pts = array();
+            $pts[] = $x1 - $weight; $pts[] = $y1;
+            $pts[] = $x1 + $weight; $pts[] = $y1;
+            $pts[] = $x2 + $weight; $pts[] = $y2;
+            $pts[] = $x2 - $weight; $pts[] = $y2;
+
+        } else {
+            
+            var_dump($x1, $x2, $y1, $y2);
+            $length = sqrt(pow($x2 - $x1, 2) + pow($y2 - $y1, 2));
+            var_dump($length);exit;
+            exit;
+  
+/*
+            $lean = ($y2 - $y1) / ($x2 - $x1);
+            $lean2 = -1 / $lean;
+            $sin = $lean / ($y2 - $y1);
+            $cos = $lean / ($x2 - $x1);
+
+            $pts[] = $x1 + (-$weight * $sin); $pts[] = $y1 + (-$weight * $cos);
+            $pts[] = $x1 + (+$weight * $sin); $pts[] = $y1 + (+$weight * $cos);
+            $pts[] = $x2 + (+$weight * $sin); $pts[] = $y2 + (+$weight * $cos);
+            $pts[] = $x2 + (-$weight * $sin); $pts[] = $y2 + (-$weight * $cos);
+*/
+        }
+
+//print_r($pts);exit;
+        if (count($pts)/2 < 3) {
+            return;
+        } 
+
+        imagesetthickness($im, 1);
+        imagefilledpolygon($im, $pts,count($pts)/2, $color);
+
+
+        $weight *= 2;
+
+//        $this->DrawImageSmoothArc($im, $x1, $y1, $weight, $weight, 0, 360, $color);
+//        $this->DrawImageSmoothArc($im, $x2, $y2, $weight, $weight, 0, 360, $color);
+    }
+
+
+    function DrawImageSmoothArc($im, $xc, $yc, $w, $h, $s, $e, $color, $style = null) {
+        $tmp = $s;
+        $s = (360 - $e) / 180 * M_PI;
+        $e = (360 - $tmp) / 180 * M_PI;
+        return imageSmoothArc($im, round($xc), round($yc), round($w), round($h), $this->CreateColorForImageSmoothArc($color), $s, $e);
+    }
+
+    function CreateColorForImageSmoothArc($color) {
+        $alpha = $color >> 24 & 0xFF; 
+        $red   = $color >> 16 & 0xFF;
+        $green = $color >> 8 & 0xFF;
+        $blue  = $color & 0xFF;
+
+//var_dump($alpha, $red, $green, $blue);exit;
+
+        return array($red, $green, $blue, $alpha);
+    }
+
+    function imageSmoothCircle( &$img, $cx, $cy, $cr, $color ) {
+        $ir = $cr;
+        $ix = 0;
+        $iy = $ir;
+        $ig = 2 * $ir - 3;
+        $idgr = -6;
+        $idgd = 4 * $ir - 10;
+        $fill = imageColorExactAlpha( $img, $color[ 'R' ], $color[ 'G' ], $color[ 'B' ], 0 );
+        imageLine( $img, $cx + $cr - 1, $cy, $cx, $cy, $fill );
+        imageLine( $img, $cx - $cr + 1, $cy, $cx - 1, $cy, $fill );
+        imageLine( $img, $cx, $cy + $cr - 1, $cx, $cy + 1, $fill );
+        imageLine( $img, $cx, $cy - $cr + 1, $cx, $cy - 1, $fill );
+        $draw = imageColorExactAlpha( $img, $color[ 'R' ], $color[ 'G' ], $color[ 'B' ], 42 );
+        imageSetPixel( $img, $cx + $cr, $cy, $draw );
+        imageSetPixel( $img, $cx - $cr, $cy, $draw );
+        imageSetPixel( $img, $cx, $cy + $cr, $draw );
+        imageSetPixel( $img, $cx, $cy - $cr, $draw );
+        while ( $ix <= $iy - 2 ) {
+            if ( $ig < 0 ) {
+                $ig += $idgd;
+                $idgd -= 8;
+                $iy--;
+            } else {
+                $ig += $idgr;
+                $idgd -= 4;
+            }
+            $idgr -= 4;
+            $ix++;
+            imageLine( $img, $cx + $ix, $cy + $iy - 1, $cx + $ix, $cy + $ix, $fill );
+            imageLine( $img, $cx + $ix, $cy - $iy + 1, $cx + $ix, $cy - $ix, $fill );
+            imageLine( $img, $cx - $ix, $cy + $iy - 1, $cx - $ix, $cy + $ix, $fill );
+            imageLine( $img, $cx - $ix, $cy - $iy + 1, $cx - $ix, $cy - $ix, $fill );
+            imageLine( $img, $cx + $iy - 1, $cy + $ix, $cx + $ix, $cy + $ix, $fill );
+            imageLine( $img, $cx + $iy - 1, $cy - $ix, $cx + $ix, $cy - $ix, $fill );
+            imageLine( $img, $cx - $iy + 1, $cy + $ix, $cx - $ix, $cy + $ix, $fill );
+            imageLine( $img, $cx - $iy + 1, $cy - $ix, $cx - $ix, $cy - $ix, $fill );
+            $filled = 0;
+            for ( $xx = $ix - 0.45; $xx < $ix + 0.5; $xx += 0.2 ) {
+                for ( $yy = $iy - 0.45; $yy < $iy + 0.5; $yy += 0.2 ) {
+                    if ( sqrt( pow( $xx, 2 ) + pow( $yy, 2 ) ) < $cr ) $filled += 4;
+                }
+            }
+            $draw = imageColorExactAlpha( $img, $color[ 'R' ], $color[ 'G' ], $color[ 'B' ], ( 100 - $filled ) );
+            imageSetPixel( $img, $cx + $ix, $cy + $iy, $draw );
+            imageSetPixel( $img, $cx + $ix, $cy - $iy, $draw );
+            imageSetPixel( $img, $cx - $ix, $cy + $iy, $draw );
+            imageSetPixel( $img, $cx - $ix, $cy - $iy, $draw );
+            imageSetPixel( $img, $cx + $iy, $cy + $ix, $draw );
+            imageSetPixel( $img, $cx + $iy, $cy - $ix, $draw );
+            imageSetPixel( $img, $cx - $iy, $cy + $ix, $draw );
+            imageSetPixel( $img, $cx - $iy, $cy - $ix, $draw );
+        }
+    }
+
+    function __get($name) {
+
+        if (strpos($name, 'raw_') !== false) {
+            // if $name == 'raw_left_margin' , return $this->_left_margin;
+            $variable_name = '_' . str_replace('raw_', '', $name);
+            return $this->$variable_name;
+        }
+
+        $variable_name = '_' . $name; 
+
+        if (isset($this->$variable_name)) {
+            return $this->$variable_name * SUPERSAMPLING_SCALE;
+        } else {
+            JpGraphError::RaiseL('25132', $name);
+        } 
+    }
+
+    function __set($name, $value) {
+        $this->{'_'.$name} = $value;
+    }
+
+} // CLASS
+
+//===================================================
+// CLASS RotImage
+// Description: Exactly as Image but draws the image at
+// a specified angle around a specified rotation point.
+//===================================================
+class RotImage extends Image {
+    public $a=0;
+    public $dx=0,$dy=0,$transx=0,$transy=0;
+    private $m=array();
+
+    function __construct($aWidth,$aHeight,$a=0,$aFormat=DEFAULT_GFORMAT,$aSetAutoMargin=true) {
+        parent::__construct($aWidth,$aHeight,$aFormat,$aSetAutoMargin);
+        $this->dx=$this->left_margin+$this->plotwidth/2;
+        $this->dy=$this->top_margin+$this->plotheight/2;
+        $this->SetAngle($a);
+    }
+
+    function SetCenter($dx,$dy) {
+        $old_dx = $this->dx;
+        $old_dy = $this->dy;
+        $this->dx=$dx;
+        $this->dy=$dy;
+        $this->SetAngle($this->a);
+        return array($old_dx,$old_dy);
+    }
+
+    function SetTranslation($dx,$dy) {
+        $old = array($this->transx,$this->transy);
+        $this->transx = $dx;
+        $this->transy = $dy;
+        return $old;
+    }
+
+    function UpdateRotMatrice()  {
+        $a = $this->a;
+        $a *= M_PI/180;
+        $sa=sin($a); $ca=cos($a);
+        // Create the rotation matrix
+        $this->m[0][0] = $ca;
+        $this->m[0][1] = -$sa;
+        $this->m[0][2] = $this->dx*(1-$ca) + $sa*$this->dy ;
+        $this->m[1][0] = $sa;
+        $this->m[1][1] = $ca;
+        $this->m[1][2] = $this->dy*(1-$ca) - $sa*$this->dx ;
+    }
+
+    function SetAngle($a) {
+        $tmp = $this->a;
+        $this->a = $a;
+        $this->UpdateRotMatrice();
+        return $tmp;
+    }
+
+    function Circle($xc,$yc,$r) {
+        list($xc,$yc) = $this->Rotate($xc,$yc);
+        parent::Circle($xc,$yc,$r);
+    }
+
+    function FilledCircle($xc,$yc,$r) {
+        list($xc,$yc) = $this->Rotate($xc,$yc);
+        parent::FilledCircle($xc,$yc,$r);
+    }
+
+
+    function Arc($xc,$yc,$w,$h,$s,$e) {
+        list($xc,$yc) = $this->Rotate($xc,$yc);
+        $s += $this->a;
+        $e += $this->a;
+        parent::Arc($xc,$yc,$w,$h,$s,$e);
+    }
+
+    function FilledArc($xc,$yc,$w,$h,$s,$e,$style='') {
+        list($xc,$yc) = $this->Rotate($xc,$yc);
+        $s += $this->a;
+        $e += $this->a;
+        parent::FilledArc($xc,$yc,$w,$h,$s,$e);
+    }
+
+    function SetMargin($lm,$rm,$tm,$bm) {
+        parent::SetMargin($lm,$rm,$tm,$bm);
+        $this->dx=$this->left_margin+$this->plotwidth/2;
+        $this->dy=$this->top_margin+$this->plotheight/2;
+        $this->UpdateRotMatrice();
+    }
+
+    function Rotate($x,$y) {
+        // Optimization. Ignore rotation if Angle==0 || Angle==360
+        if( $this->a == 0 || $this->a == 360 ) {
+            return array($x + $this->transx, $y + $this->transy );
+        }
+        else {
+            $x1=round($this->m[0][0]*$x + $this->m[0][1]*$y,1) + $this->m[0][2] + $this->transx;
+            $y1=round($this->m[1][0]*$x + $this->m[1][1]*$y,1) + $this->m[1][2] + $this->transy;
+            return array($x1,$y1);
+        }
+    }
+
+    function CopyMerge($fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth=-1,$fromHeight=-1,$aMix=100) {
+        list($toX,$toY) = $this->Rotate($toX,$toY);
+        parent::CopyMerge($fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth,$fromHeight,$aMix);
+
+    }
+
+    function ArrRotate($pnts) {
+        $n = count($pnts)-1;
+        for($i=0; $i < $n; $i+=2) {
+            list ($x,$y) = $this->Rotate($pnts[$i],$pnts[$i+1]);
+            $pnts[$i] = $x; $pnts[$i+1] = $y;
+        }
+        return $pnts;
+    }
+
+    function DashedLine($x1,$y1,$x2,$y2,$dash_length=1,$dash_space=4) {
+        list($x1,$y1) = $this->Rotate($x1,$y1);
+        list($x2,$y2) = $this->Rotate($x2,$y2);
+        parent::DashedLine($x1,$y1,$x2,$y2,$dash_length,$dash_space);
+    }
+
+    function Line($x1,$y1,$x2,$y2) {
+        list($x1,$y1) = $this->Rotate($x1,$y1);
+        list($x2,$y2) = $this->Rotate($x2,$y2);
+        parent::Line($x1,$y1,$x2,$y2);
+    }
+
+    function Rectangle($x1,$y1,$x2,$y2) {
+        // Rectangle uses Line() so it will be rotated through that call
+        parent::Rectangle($x1,$y1,$x2,$y2);
+    }
+
+    function FilledRectangle($x1,$y1,$x2,$y2) {
+        if( $y1==$y2 || $x1==$x2 )
+        $this->Line($x1,$y1,$x2,$y2);
+        else
+        $this->FilledPolygon(array($x1,$y1,$x2,$y1,$x2,$y2,$x1,$y2));
+    }
+
+    function Polygon($pnts,$closed=FALSE,$fast=FALSE) {
+        // Polygon uses Line() so it will be rotated through that call unless
+        // fast drawing routines are used in which case a rotate is needed
+        if( $fast ) {
+            parent::Polygon($this->ArrRotate($pnts));
+        }
+        else {
+            parent::Polygon($pnts,$closed,$fast);
+        }
+    }
+
+    function FilledPolygon($pnts) {
+        parent::FilledPolygon($this->ArrRotate($pnts));
+    }
+
+    function Point($x,$y) {
+        list($xp,$yp) = $this->Rotate($x,$y);
+        parent::Point($xp,$yp);
+    }
+
+    function StrokeText($x,$y,$txt,$dir=0,$paragraph_align="left",$debug=false) {
+        list($xp,$yp) = $this->Rotate($x,$y);
+        return parent::StrokeText($xp,$yp,$txt,$dir,$paragraph_align,$debug);
+    }
+}
+
+//=======================================================================
+// CLASS ImgStreamCache
+// Description: Handle caching of graphs to files. All image output goes
+//              through this class
+//=======================================================================
+class ImgStreamCache {
+    private $cache_dir, $timeout=0;  // Infinite timeout
+    //---------------
+    // CONSTRUCTOR
+    function __construct($aCacheDir=CACHE_DIR) {
+        $this->cache_dir = $aCacheDir;
+    }
+
+    //---------------
+    // PUBLIC METHODS
+
+    // Specify a timeout (in minutes) for the file. If the file is older then the
+    // timeout value it will be overwritten with a newer version.
+    // If timeout is set to 0 this is the same as infinite large timeout and if
+    // timeout is set to -1 this is the same as infinite small timeout
+    function SetTimeout($aTimeout) {
+        $this->timeout=$aTimeout;
+    }
+
+    // Output image to browser and also write it to the cache
+    function PutAndStream($aImage,$aCacheFileName,$aInline,$aStrokeFileName) {
+
+        // Check if we should always stroke the image to a file
+        if( _FORCE_IMGTOFILE ) {
+            $aStrokeFileName = _FORCE_IMGDIR.GenImgName();
+        }
+
+        if( $aStrokeFileName != '' ) {
+
+            if( $aStrokeFileName == 'auto' ) {
+                $aStrokeFileName = GenImgName();
+            }
+
+            if( file_exists($aStrokeFileName) ) {
+
+                // Wait for lock (to make sure no readers are trying to access the image)
+                $fd = fopen($aStrokeFileName,'w');
+                $lock = flock($fd, LOCK_EX);
+
+                // Since the image write routines only accepts a filename which must not
+                // exist we need to delete the old file first
+                if( !@unlink($aStrokeFileName) ) {
+                    $lock = flock($fd, LOCK_UN);
+                    JpGraphError::RaiseL(25111,$aStrokeFileName);
+                    //(" Can't delete cached image $aStrokeFileName. Permission problem?");
+                }
+                $aImage->Stream($aStrokeFileName);
+                $lock = flock($fd, LOCK_UN);
+                fclose($fd);
+
+            }
+            else {
+                $aImage->Stream($aStrokeFileName);
+            }
+
+            return;
+        }
+
+        if( $aCacheFileName != '' && USE_CACHE) {
+
+            $aCacheFileName = $this->cache_dir . $aCacheFileName;
+            if( file_exists($aCacheFileName) ) {
+                if( !$aInline ) {
+                    // If we are generating image off-line (just writing to the cache)
+                    // and the file exists and is still valid (no timeout)
+                    // then do nothing, just return.
+                    $diff=time()-filemtime($aCacheFileName);
+                    if( $diff < 0 ) {
+                        JpGraphError::RaiseL(25112,$aCacheFileName);
+                        //(" Cached imagefile ($aCacheFileName) has file date in the future!!");
+                    }
+                    if( $this->timeout>0 && ($diff <= $this->timeout*60) ) return;
+                }
+
+                // Wait for lock (to make sure no readers are trying to access the image)
+                $fd = fopen($aCacheFileName,'w');
+                $lock = flock($fd, LOCK_EX);
+
+                if( !@unlink($aCacheFileName) ) {
+                    $lock = flock($fd, LOCK_UN);
+                    JpGraphError::RaiseL(25113,$aStrokeFileName);
+                    //(" Can't delete cached image $aStrokeFileName. Permission problem?");
+                }
+                $aImage->Stream($aCacheFileName);
+                $lock = flock($fd, LOCK_UN);
+                fclose($fd);
+
+            }
+            else {
+                $this->MakeDirs(dirname($aCacheFileName));
+                if( !is_writeable(dirname($aCacheFileName)) ) {
+                    JpGraphError::RaiseL(25114,$aCacheFileName);
+                    //('PHP has not enough permissions to write to the cache file '.$aCacheFileName.'. Please make sure that the user running PHP has write permission for this file if you wan to use the cache system with JpGraph.');
+                }
+                $aImage->Stream($aCacheFileName);
+            }
+
+            $res=true;
+            // Set group to specified
+            if( CACHE_FILE_GROUP != '' ) {
+                $res = @chgrp($aCacheFileName,CACHE_FILE_GROUP);
+            }
+            if( CACHE_FILE_MOD != '' ) {
+                $res = @chmod($aCacheFileName,CACHE_FILE_MOD);
+            }
+            if( !$res ) {
+                JpGraphError::RaiseL(25115,$aStrokeFileName);
+                //(" Can't set permission for cached image $aStrokeFileName. Permission problem?");
+            }
+
+            $aImage->Destroy();
+            if( $aInline ) {
+                if ($fh = @fopen($aCacheFileName, "rb") ) {
+                    $aImage->Headers();
+                    fpassthru($fh);
+                    return;
+                }
+                else {
+                    JpGraphError::RaiseL(25116,$aFile);//(" Cant open file from cache [$aFile]");
+                }
+            }
+        }
+        elseif( $aInline ) {
+            $aImage->Headers();
+            $aImage->Stream();
+            return;
+        }
+    }
+
+    function IsValid($aCacheFileName) {
+        $aCacheFileName = $this->cache_dir.$aCacheFileName;
+        if ( USE_CACHE && file_exists($aCacheFileName) ) {
+            $diff=time()-filemtime($aCacheFileName);
+            if( $this->timeout>0 && ($diff > $this->timeout*60) ) {
+                return false;
+            }
+            else {
+                return true;
+            }
+        }
+        else {
+            return false;
+        }
+    }
+
+    function StreamImgFile($aImage,$aCacheFileName) {
+        $aCacheFileName = $this->cache_dir.$aCacheFileName;
+        if ( $fh = @fopen($aCacheFileName, 'rb') ) {
+            $lock = flock($fh, LOCK_SH);
+            $aImage->Headers();
+            fpassthru($fh);
+            $lock = flock($fh, LOCK_UN);
+            fclose($fh);
+            return true;
+        }
+        else {
+            JpGraphError::RaiseL(25117,$aCacheFileName);//(" Can't open cached image \"$aCacheFileName\" for reading.");
+        }
+    }
+
+    // Check if a given image is in cache and in that case
+    // pass it directly on to web browser. Return false if the
+    // image file doesn't exist or exists but is to old
+    function GetAndStream($aImage,$aCacheFileName) {
+        if( $this->Isvalid($aCacheFileName) ) {
+            $this->StreamImgFile($aImage,$aCacheFileName);
+        }
+        else {
+            return false;
+        }
+    }
+
+    //---------------
+    // PRIVATE METHODS
+    // Create all necessary directories in a path
+    function MakeDirs($aFile) {
+        $dirs = array();
+        // In order to better work when open_basedir is enabled
+        // we do not create directories in the root path
+        while ( $aFile != '/' && !(file_exists($aFile)) ) {
+            $dirs[] = $aFile.'/';
+            $aFile = dirname($aFile);
+        }
+        for ($i = sizeof($dirs)-1; $i>=0; $i--) {
+            if(! @mkdir($dirs[$i],0777) ) {
+                JpGraphError::RaiseL(25118,$aFile);//(" Can't create directory $aFile. Make sure PHP has write permission to this directory.");
+            }
+            // We also specify mode here after we have changed group.
+            // This is necessary if Apache user doesn't belong the
+            // default group and hence can't specify group permission
+            // in the previous mkdir() call
+            if( CACHE_FILE_GROUP != "" ) {
+                $res=true;
+                $res =@chgrp($dirs[$i],CACHE_FILE_GROUP);
+                $res = @chmod($dirs[$i],0777);
+                if( !$res ) {
+                    JpGraphError::RaiseL(25119,$aFile);//(" Can't set permissions for $aFile. Permission problems?");
+                }
+            }
+        }
+        return true;
+    }
+} // CLASS Cache
+
+?>
diff --git a/common/lib/jpgraph_lib/imageSmoothArc.php b/common/lib/jpgraph_lib/imageSmoothArc.php
new file mode 100644
index 000000000..a1d581ff4
--- /dev/null
+++ b/common/lib/jpgraph_lib/imageSmoothArc.php
@@ -0,0 +1,344 @@
+<?php
+
+/*
+    
+    Copyright (c) 2006-2008 Ulrich Mierendorff
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+    
+    Changelog:
+    version 1.1
+        - improved the rendering speed by ~20%
+        
+        - Thanks to Matthias Mächler for fixing some small errors:
+            * uninitialized variables
+            * deprecated passing of $img reference in imageSmoothArc ()
+    
+    version 1.0
+        Release of rewritten script
+
+*/
+
+function imageSmoothArcDrawSegment (&$img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY, $color, $start, $stop, $seg)
+{
+    // Originally written from scratch by Ulrich Mierendorff, 06/2006
+    // Rewritten and improved, 04/2007, 07/2007
+    
+    // Please do not use THIS function directly. Scroll down to imageSmoothArc(...).
+    
+    $fillColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], $color[3] );
+    
+    $xStart = abs($a * cos($start));
+    $yStart = abs($b * sin($start));
+    $xStop  = abs($a * cos($stop));
+    $yStop  = abs($b * sin($stop));
+    $dxStart = 0;
+    $dyStart = 0;
+    $dxStop = 0;
+    $dyStop = 0;
+    if ($xStart != 0)
+        $dyStart = $yStart/$xStart;
+    if ($xStop != 0)
+        $dyStop = $yStop/$xStop;
+    if ($yStart != 0)
+        $dxStart = $xStart/$yStart;
+    if ($yStop != 0)
+        $dxStop = $xStop/$yStop;
+    if (abs($xStart) >= abs($yStart)) {
+        $aaStartX = true;
+    } else {
+        $aaStartX = false;
+    }
+    if ($xStop >= $yStop) {
+        $aaStopX = true;
+    } else {
+        $aaStopX = false;
+    }
+    //$xp = +1; $yp = -1; $xa = +1; $ya = 0;
+    for ( $x = 0; $x < $a; $x += 1 ) {
+        /*$y = $b * sqrt( 1 - ($x*$x)/($a*$a) );
+        
+        $error = $y - (int)($y);
+        $y = (int)($y);
+        
+        $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error );*/
+        
+        $_y1 = $dyStop*$x;
+        $_y2 = $dyStart*$x;
+        if ($xStart > $xStop)
+        {
+            $error1 = $_y1 - (int)($_y1);
+            $error2 = 1 - $_y2 + (int)$_y2;
+            $_y1 = $_y1-$error1;
+            $_y2 = $_y2+$error2;
+        }
+        else
+        {
+            $error1 = 1 - $_y1 + (int)$_y1;
+            $error2 = $_y2 - (int)($_y2);
+            $_y1 = $_y1+$error1;
+            $_y2 = $_y2-$error2;
+        }
+        /*
+        if ($aaStopX)
+            $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 );
+        if ($aaStartX)
+            $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 );
+        */
+        
+        if ($seg == 0 || $seg == 2)
+        {
+            $i = $seg;
+            if (!($start > $i*M_PI/2 && $x > $xStart)) {
+                if ($i == 0) {
+                    $xp = +1; $yp = -1; $xa = +1; $ya = 0;
+                } else {
+                    $xp = -1; $yp = +1; $xa = 0; $ya = +1;
+                }
+                if ( $stop < ($i+1)*(M_PI/2) && $x <= $xStop ) {
+                    $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 );
+                    $y1 = $_y1; if ($aaStopX) imageSetPixel($img, $cx+$xp*($x)+$xa, $cy+$yp*($y1+1)+$ya, $diffColor1);
+                    
+                } else {
+                    $y = $b * sqrt( 1 - ($x*$x)/($a*$a) );
+                    $error = $y - (int)($y);
+                    $y = (int)($y);
+                    $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error );
+                    $y1 = $y; if ($x < $aaAngleX ) imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y1+1)+$ya, $diffColor);
+                }
+                if ($start > $i*M_PI/2 && $x <= $xStart) {
+                    $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 );
+                    $y2 = $_y2; if ($aaStartX) imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y2-1)+$ya, $diffColor2);
+                } else {
+                    $y2 = 0;
+                }
+                if ($y2 <= $y1) imageLine($img, $cx+$xp*$x+$xa, $cy+$yp*$y1+$ya , $cx+$xp*$x+$xa, $cy+$yp*$y2+$ya, $fillColor);
+            }
+        }
+        
+        if ($seg == 1 || $seg == 3)
+        {
+            $i = $seg;
+            if (!($stop < ($i+1)*M_PI/2 && $x > $xStop)) {
+                if ($i == 1) {
+                    $xp = -1; $yp = -1; $xa = 0; $ya = 0;
+                } else {
+                    $xp = +1; $yp = +1; $xa = 1; $ya = 1;
+                }
+                if ( $start > $i*M_PI/2 && $x < $xStart ) {
+                    $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 );
+                    $y1 = $_y2; if ($aaStartX) imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y1+1)+$ya, $diffColor2);
+                    
+                } else {
+                    $y = $b * sqrt( 1 - ($x*$x)/($a*$a) );
+                    $error = $y - (int)($y);
+                    $y = (int) $y;
+                    $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error );
+                    $y1 = $y; if ($x < $aaAngleX ) imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y1+1)+$ya, $diffColor);
+                }
+                if ($stop < ($i+1)*M_PI/2 && $x <= $xStop) {
+                    $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 );
+                    $y2 = $_y1; if ($aaStopX)  imageSetPixel($img, $cx+$xp*$x+$xa, $cy+$yp*($y2-1)+$ya, $diffColor1);
+                } else {
+                    $y2 = 0;
+                }
+                if ($y2 <= $y1) imageLine($img, $cx+$xp*$x+$xa, $cy+$yp*$y1+$ya, $cx+$xp*$x+$xa, $cy+$yp*$y2+$ya, $fillColor);
+            }
+        }
+    }
+    
+    ///YYYYY
+    
+    for ( $y = 0; $y < $b; $y += 1 ) {
+        /*$x = $a * sqrt( 1 - ($y*$y)/($b*$b) );
+        
+        $error = $x - (int)($x);
+        $x = (int)($x);
+        
+        $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error );
+        */
+        $_x1 = $dxStop*$y;
+        $_x2 = $dxStart*$y;
+        if ($yStart > $yStop)
+        {
+            $error1 = $_x1 - (int)($_x1);
+            $error2 = 1 - $_x2 + (int)$_x2;
+            $_x1 = $_x1-$error1;
+            $_x2 = $_x2+$error2;
+        }
+        else
+        {
+            $error1 = 1 - $_x1 + (int)$_x1;
+            $error2 = $_x2 - (int)($_x2);
+            $_x1 = $_x1+$error1;
+            $_x2 = $_x2-$error2;
+        }
+/*
+        if (!$aaStopX)
+            $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 );
+        if (!$aaStartX)
+            $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 );
+*/
+        
+        if ($seg == 0 || $seg == 2)
+        {
+            $i = $seg;
+            if (!($start > $i*M_PI/2 && $y > $yStop)) {
+                if ($i == 0) {
+                    $xp = +1; $yp = -1; $xa = 1; $ya = 0;
+                } else {
+                    $xp = -1; $yp = +1; $xa = 0; $ya = 1;
+                }
+                if ( $stop < ($i+1)*(M_PI/2) && $y <= $yStop ) {
+                    $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 );
+                    $x1 = $_x1; if (!$aaStopX) imageSetPixel($img, $cx+$xp*($x1-1)+$xa, $cy+$yp*($y)+$ya, $diffColor1);
+                } 
+                if ($start > $i*M_PI/2 && $y < $yStart) {
+                    $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 );
+                    $x2 = $_x2; if (!$aaStartX) imageSetPixel($img, $cx+$xp*($x2+1)+$xa, $cy+$yp*($y)+$ya, $diffColor2);
+                } else {
+                    $x = $a * sqrt( 1 - ($y*$y)/($b*$b) );
+                    $error = $x - (int)($x);
+                    $x = (int)($x);
+                    $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error );
+                    $x1 = $x; if ($y < $aaAngleY && $y <= $yStop ) imageSetPixel($img, $cx+$xp*($x1+1)+$xa, $cy+$yp*$y+$ya, $diffColor);
+                }
+            }
+        }
+        
+        if ($seg == 1 || $seg == 3)
+        {
+            $i = $seg;
+            if (!($stop < ($i+1)*M_PI/2 && $y > $yStart)) {
+                if ($i == 1) {
+                    $xp = -1; $yp = -1; $xa = 0; $ya = 0;
+                } else {
+                    $xp = +1; $yp = +1; $xa = 1; $ya = 1;
+                }
+                if ( $start > $i*M_PI/2 && $y < $yStart ) {
+                    $diffColor2 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error2 );
+                    $x1 = $_x2; if (!$aaStartX) imageSetPixel($img, $cx+$xp*($x1-1)+$xa, $cy+$yp*$y+$ya,  $diffColor2);
+                } 
+                if ($stop < ($i+1)*M_PI/2 && $y <= $yStop) {
+                    $diffColor1 = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error1 );
+                    $x2 = $_x1; if (!$aaStopX)  imageSetPixel($img, $cx+$xp*($x2+1)+$xa, $cy+$yp*$y+$ya, $diffColor1);
+                } else {
+                    $x = $a * sqrt( 1 - ($y*$y)/($b*$b) );
+                    $error = $x - (int)($x);
+                    $x = (int)($x);
+                    $diffColor = imageColorExactAlpha( $img, $color[0], $color[1], $color[2], 127-(127-$color[3])*$error );
+                    $x1 = $x; if ($y < $aaAngleY  && $y < $yStart) imageSetPixel($img,$cx+$xp*($x1+1)+$xa,  $cy+$yp*$y+$ya, $diffColor);
+                }
+            }
+        }
+    }
+}
+
+
+function imageSmoothArc ( &$img, $cx, $cy, $w, $h, $color, $start, $stop)
+{
+    // Originally written from scratch by Ulrich Mierendorff, 06/2006
+    // Rewritten and improved, 04/2007, 07/2007
+    // compared to old version:
+    // + Support for transparency added
+    // + Improved quality of edges & antialiasing
+    
+    // note: This function does not represent the fastest way to draw elliptical
+    // arcs. It was written without reading any papers on that subject. Better
+    // algorithms may be twice as fast or even more.
+    
+    // what it cannot do: It does not support outlined arcs, only filled
+    
+    // Parameters:
+    // $cx      - Center of ellipse, X-coord
+    // $cy      - Center of ellipse, Y-coord
+    // $w       - Width of ellipse ($w >= 2)
+    // $h       - Height of ellipse ($h >= 2 )
+    // $color   - Color of ellipse as a four component array with RGBA
+    // $start   - Starting angle of the arc, no limited range!
+    // $stop    - Stop     angle of the arc, no limited range!
+    // $start _can_ be greater than $stop!
+    // If any value is not in the given range, results are undefined!
+    
+    // This script does not use any special algorithms, everything is completely
+    // written from scratch; see http://de.wikipedia.org/wiki/Ellipse for formulas.
+    
+    while ($start < 0)
+        $start += 2*M_PI;
+    while ($stop < 0)
+        $stop += 2*M_PI;
+    
+    while ($start > 2*M_PI)
+        $start -= 2*M_PI;
+    
+    while ($stop > 2*M_PI)
+        $stop -= 2*M_PI;
+    
+    
+    if ($start > $stop)
+    {
+        imageSmoothArc ( $img, $cx, $cy, $w, $h, $color, $start, 2*M_PI);
+        imageSmoothArc ( $img, $cx, $cy, $w, $h, $color, 0, $stop);
+        return;
+    }
+    
+    $a = 1.0*round ($w/2);
+    $b = 1.0*round ($h/2);
+    $cx = 1.0*round ($cx);
+    $cy = 1.0*round ($cy);
+    
+    $aaAngle = atan(($b*$b)/($a*$a)*tan(0.25*M_PI));
+    $aaAngleX = $a*cos($aaAngle);
+    $aaAngleY = $b*sin($aaAngle);
+    
+    $a -= 0.5; // looks better...
+    $b -= 0.5;
+    
+    for ($i=0; $i<4;$i++)
+    {
+        if ($start < ($i+1)*M_PI/2)
+        {
+            if ($start > $i*M_PI/2)
+            {
+                if ($stop > ($i+1)*M_PI/2)
+                {
+                    imageSmoothArcDrawSegment($img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY , $color, $start, ($i+1)*M_PI/2, $i);
+                }
+                else
+                {
+                    imageSmoothArcDrawSegment($img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY, $color, $start, $stop, $i);
+                    break;
+                }
+            }
+            else
+            {
+                if ($stop > ($i+1)*M_PI/2)
+                {
+                    imageSmoothArcDrawSegment($img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY, $color, $i*M_PI/2, ($i+1)*M_PI/2, $i);
+                }
+                else
+                {
+                    imageSmoothArcDrawSegment($img, $cx, $cy, $a, $b, $aaAngleX, $aaAngleY, $color, $i*M_PI/2, $stop, $i);
+                    break;
+                }
+            }
+        }
+    }
+}
+?>
diff --git a/common/lib/jpgraph_lib/imgdata_balls.inc b/common/lib/jpgraph_lib/imgdata_balls.inc
old mode 100644
new mode 100755
diff --git a/common/lib/jpgraph_lib/imgdata_balls.inc.php b/common/lib/jpgraph_lib/imgdata_balls.inc.php
new file mode 100644
index 000000000..ee5db4927
--- /dev/null
+++ b/common/lib/jpgraph_lib/imgdata_balls.inc.php
@@ -0,0 +1,1061 @@
+<?php
+//=======================================================================
+// File:        IMGDATA_ROUNDBALLS.INC
+// Description: Base64 encoded images for small round markers
+// Created:     2003-03-20
+// Ver:         $Id: imgdata_balls.inc.php 1106 2009-02-22 20:16:35Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+class ImgData_Balls extends ImgData {
+    protected $name = 'Round Balls';
+    protected $an = array(MARK_IMG_LBALL => 'imgdata_large',
+    MARK_IMG_MBALL => 'imgdata_small',
+    MARK_IMG_SBALL => 'imgdata_xsmall',
+    MARK_IMG_BALL => 'imgdata_xsmall');
+    protected $colors,$index,$maxidx;
+    private $colors_1 = array('blue','lightblue','brown','darkgreen',
+         'green','purple','red','gray','yellow','silver','gray');
+    private $index_1  = array('blue'=>9,'lightblue'=>1,'brown'=>6,'darkgreen'=>7,
+         'green'=>8,'purple'=>4,'red'=>0,'gray'=>5,'silver'=>3,'yellow'=>2);
+    private $maxidx_1 = 9 ;
+
+    private $colors_2 = array('blue','bluegreen','brown','cyan',
+     'darkgray','greengray','gray','green',
+     'greenblue','lightblue','lightred',
+     'purple','red','white','yellow');
+     
+
+    private $index_2 =  array('blue'=>9,'bluegreen'=>13,'brown'=>8,'cyan'=>12,
+     'darkgray'=>5,'greengray'=>6,'gray'=>2,'green'=>10,
+     'greenblue'=>3,'lightblue'=>1,'lightred'=>14,
+     'purple'=>7,'red'=>0,'white'=>11,'yellow'=>4);
+     
+    private $maxidx_2 = 14 ;
+
+
+    private $colors_3 = array('bluegreen','cyan','darkgray','greengray',
+     'gray','graypurple','green','greenblue','lightblue',
+     'lightred','navy','orange','purple','red','yellow');
+
+    private $index_3 = array('bluegreen'=>1,'cyan'=>11,'darkgray'=>14,'greengray'=>10,
+    'gray'=>3,'graypurple'=>4,'green'=>9,'greenblue'=>7,
+    'lightblue'=>13,'lightred'=>0,'navy'=>2,'orange'=>12,
+    'purple'=>8,'red'=>5,'yellow'=>6);
+    private $maxidx_3 = 14 ;
+
+    protected $imgdata_large, $imgdata_small, $imgdata_xsmall ;
+
+
+    function GetImg($aMark,$aIdx) {
+        switch( $aMark ) {
+            case MARK_IMG_SBALL:
+            case MARK_IMG_BALL:
+                $this->colors = $this->colors_3;
+                $this->index = $this->index_3 ;
+                $this->maxidx = $this->maxidx_3 ;
+                break;
+            case MARK_IMG_MBALL:
+                $this->colors = $this->colors_2;
+                $this->index = $this->index_2 ;
+                $this->maxidx = $this->maxidx_2 ;
+                break;
+            default:
+                $this->colors = $this->colors_1;
+                $this->index = $this->index_1 ;
+                $this->maxidx = $this->maxidx_1 ;
+                break;
+        }
+        return parent::GetImg($aMark,$aIdx);
+    }
+
+    function __construct() {
+
+        //==========================================================
+        // File: bl_red.png
+        //==========================================================
+        $this->imgdata_large[0][0]= 1072 ;
+        $this->imgdata_large[0][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAByF'.
+     'BMVEX/////////xsb/vb3/lIz/hIT/e3v/c3P/c2v/a2v/Y2P/'.
+     'UlL/Skr/SkL/Qjn/MTH/MSn/KSn/ISH/IRj/GBj/GBD/EBD/EA'.
+     'j/CAj/CAD/AAD3QkL3MTH3KSn3KSH3GBj3EBD3CAj3AAD1zMzv'.
+     'QkLvISHvIRjvGBjvEBDvEAjvAADnUlLnSkrnMTnnKSnnIRjnGB'.
+     'DnEBDnCAjnAADec3PeSkreISHeGBjeGBDeEAjWhITWa2vWUlLW'.
+     'SkrWISnWGBjWEBDWEAjWCAjWAADOnp7Oa2vOGCHOGBjOGBDOEB'.
+     'DOCAjOAADJrq7Gt7fGGBjGEBDGCAjGAADEpKS/v7+9QkK9GBC9'.
+     'EBC9CAi9AAC1e3u1a2u1Skq1KSm1EBC1CAi1AACtEBCtCBCtCA'.
+     'itAACngYGlCAilAACghIScOTmcCAicAACYgYGUGAiUCAiUAAiU'.
+     'AACMKSmMEACMAACEa2uEGAiEAAB7GBh7CAB7AABzOTlzGBBzCA'.
+     'BzAABrSkprOTlrGBhrAABjOTljAABaQkJaOTlaCABaAABSKSlS'.
+     'GBhSAABKKSlKGBhKAABCGBhCCABCAAA5CAA5AAAxCAAxAAApCA'.
+     'ApAAAhAAAYAACc9eRyAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgF'.
+     'HUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkRFD'.
+     'UHLytKAAAB4UlEQVR4nGNgIAK4mGjrmNq6BmFIWMmISUpKSmk5'.
+     'B8ZEokj4qoiLiQCBgqald3xaBpKMj6y4sLCQkJCIvIaFV0RaUR'.
+     'lCSk5cWEiAn19ASN7QwisuraihHiajKyEixM/NwckjoKrvEACU'.
+     'qumpg7pAUlREiJdNmZmLT9/cMzwps7Smc3I2WEpGUkxYkJuFiY'.
+     'lTxszePzY1v7Shc2oX2D+K4iLCgjzsrOw8embuYUmZeTVtPVOn'.
+     'gqSslYAOF+Ln4ZHWtXMPTcjMrWno7J82rRgoZWOsqaCgrqaqqm'.
+     'fn5peQmlsK1DR52vRaoFSIs5GRoYG5ub27n19CYm5pdVPnxKnT'.
+     'pjWDpLydnZwcHTz8QxMSEnJLgDL9U6dNnQ6Sio4PDAgICA+PTU'.
+     'zNzSkph8hADIxKS46Pj0tKTc3MLSksqWrtmQySAjuDIT8rKy0r'.
+     'Kz+vtLSmur6jb9JUIJgGdjxDQUVRUVFpaUVNQ1NrZ9+kKVOmTZ'.
+     'k6vR0sldJUAwQNTU2dnX0TgOJTQLrSIYFY2dPW1NbW2TNxwtQp'.
+     'U6ZMmjJt2rRGWNB3TO7vnzh5MsgSoB6gy7sREdY7bRrQEDAGOb'.
+     'wXOQW0TJsOEpwClmxBTTbZ7UDVIPkp7dkYaYqhuLa5trYYUxwL'.
+     'AADzm6uekAAcXAAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: bl_bluegreen.png
+        //==========================================================
+        $this->imgdata_large[1][0]= 1368 ;
+        $this->imgdata_large[1][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABm'.
+     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
+     'B3RJTUUH0wMMFi8hE9b2uAAABOVJREFUeNq9lk2sJFUVx3+3qv'.
+     'tW95t57zFvhiFxmCFRUJRoNCQiJARMhiFx/Igxii5goTG6ZDAu'.
+     '/EhcSCIrTAgLEiKsJ8ywABNZEMJXEDYCukAmjgjzBkK/j35V1d'.
+     '333FtV97io97pfzwxfG86qcu/N+Z3zP+fcW/Apmfk4hx57+R/6'.
+     'Rqmc9ykhsWjlsUngAA1fXIQ7b73pI/186IGHnn9dH/8frC8v4I'.
+     'PiG53uaerR4GmKkv31mB8cyfjd946ZTwR66qVX9OTWIi8UKUv9'.
+     'BOrZXpYZvFeiBvzI0fgSUSFKwbVG+Pl1V3HH0VvNR4KeeukV/f'.
+     'PmMmdHhst76aXD64AbeVQ9bjNHaiGOC2o3wLrAb2/4LL/84ffn'.
+     'fCdzkOdayKpLppBemrBsU5Y1Zdmm9LJdGU6E/t4M24Q26jRDRL'.
+     'j3mdc49cSTekFsMzs5XuTsyLDUNSDQ25NwKOly9YIl22MYhJr/'.
+     'uoDtBBoT0CxBRGYOAhibIaOCe//2MpfM6KHnX9cXipSlbkKWmS'.
+     'nk9iv38J0jixw7vJfrTMYBOvhSoQHJBS09ANELloAGDxW8tfoW'.
+     'J+5/UC8CPS0LU7r3SpYarr7M8rmFjMPLXT6/33L4si7Z2GCrQC'.
+     '+0ctlOaNs9DReV8vSLr85ndPLpZ/WNvHW+01kAVFBOGvJx0wYg'.
+     'Sp47RIQ4Emwa8FGJXlDxSCFo5YlVgAo2hwPue/hRndboTV3EW2'.
+     'Wp3k6wBp8q56QiWzecW6vwQfnPRkAWhFgILnq08jQ+R2nlUzzN'.
+     'uES9Q7Vd+9fba7NmWJW61db2247qACmcjxXr45psYphsFGSLBu'.
+     'kIajxqtjNwHkvAjQt0sg3crhPA2+fPz0CuyNFOghsGsr19mnFg'.
+     'DGwrRm8UoAtNmQPQtRXDgdC4HImCFEKcCE0oieUWUYq2LtbiGp'.
+     'mBQmppfIkjw45DK0QNNkvQ0jMBtPL0UnDRM1rN+cxKwzvOo2NP'.
+     'tykR9a1kfpZNDLMG6QDYJqCTBvUe1+uxs+YKyPoGrTwY2HhvC4'.
+     'CDWQd5d4xNApNQEEMgjgLdUCLBQ5cprL/trwNwKG2IUmDqDFd5'.
+     'sr5BWrlxuSdLDFEFlqAzXGc4zFjupqh6uqYihpxJcEgp026l2w'.
+     '7wFUv7Z6AvrfRo/n0OYzPwIKE3HUKAJg2otMBiElnsF7wngis9'.
+     '3ZDjNnLi7huCWUZfueZKTu/M0V3HvmkOFDVxVKDG04ScejSgW5'.
+     'V0q5JYFEghuDLHlTmToqDeGOCKIVtrW9hsdmXufEcNLPSXuPHa'.
+     'a+bvuh9df5AH/v5PDFmbWQC3Mx+TVvfGVTRB2CodNgT2JBX003'.
+     'aANZAYS/BxCv32TV/l2C03G7jgmfjGiT/qmeEmibEYm7XzAO2k'.
+     'A+pbgHhBgydqu54YO5eRiLCy7yDvPP6Xqf+5Z+Lu277OYuOpiw'.
+     'H15oBmlNOMcmK5RbP+PrEscGU+DSAxdg4CICIkxnLP8aNz63Og'.
+     'H3/rdvOb795GVhuaYo0oBc3GGrEsUPVTwO6a7LYd+X51x3Hu/t'.
+     'lP5tS65FN+6okn9U+n/sqb596dTvhOF+02myXTmkQNrOw7yD3H'.
+     'j14E+UDQjp24/0E9/eKrbA4HH3aMK1b2ccvXvswjv//1J/s5ud'.
+     'Due/hRPfP+OmfOrk7vrn7a48ihA3zh8CH+8Iuffiw/n4r9H1ZZ'.
+     '0zz7G56hAAAAAElFTkSuQmCC' ; 
+
+        //==========================================================
+        // File: bl_yellow.png
+        //==========================================================
+        $this->imgdata_large[2][0]= 1101 ;
+        $this->imgdata_large[2][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAB2l'.
+     'BMVEX//////////+///+f//9b//8b//73//7X//63//6X//5T/'.
+     '/4z//4T//3P//2v//1r//0r//0L//zH//yn//yH//xj//xD//w'.
+     'j//wD/90L/9zn/9zH/9xj/9xD/9wj/9wD39yn37zn37zH37yH3'.
+     '7xD37wj37wDv70Lv50rv50Lv5znv5yHv5xjv5wjv5wDn51Ln5x'.
+     'Dn3jHn3iHn3hjn3hDn3gje3oze3nPe3lLe1oze1nPe1lLe1ine'.
+     '1iHe1hje1hDe1gje1gDW1qXW1mvWzqXWzkLWzhjWzhDWzgjWzg'.
+     'DOzrXOzq3OzpzOzgDOxkrOxinOxhjOxhDOxgjOxgDGxqXGxnvG'.
+     'xmvGvRjGvRDGvQjGvQDFxbnAvr6/v7+9vaW9vZS9vQi9vQC9tR'.
+     'C9tQi9tQC7u7W1tZS1tXu1tTG1tQi1rRC1rQi1rQCtrYytrSGt'.
+     'rQitrQCtpYStpSGtpQitpQClpYSlpXulpQClnBClnAilnACcnG'.
+     'ucnAicnACclAiclACUlFqUlCmUlAiUlACUjFKUjAiUjACMjFKM'.
+     'jEqMjACMhACEhACEewB7ezF7exB7ewB7cwBzcylzcwBzaxBzaw'.
+     'BraxhrawhrawBrYxBrYwBjYwBjWgBaWgBaUgCXBwRMAAAAAXRS'.
+     'TlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAd'.
+     'LdfvwAAAAHdElNRQfTAwkRFBKiJZ4hAAAB7ElEQVR4nI3S+1vS'.
+     'UBgHcB67WJmIMWAVdDHEDLBC6Go0slj3Ft0m9RRBWQEmFZFDEM'.
+     'Qgt0EMFBY7p/+198hj1kM/9N1+++x73rOd6XT/kStnTx4fPzd9'.
+     'uwfOjFhomj7smAhwj/6Cm2O0xUwy6g7cCL99uCW3jtBmE7lsdr'.
+     'fvejgpzP7uEDFRRoqy2k8xQPnypo2BUMP6waF9Vpf3ciiSzErL'.
+     'XTkPc0zDe3bsHDAcc00yoVgqL3UWN2iENpspff+2vn6D0+NnZ9'.
+     '6lC5K6RuSqBTZn1O/a3rd7v/MSez+WyIpVFX8GuuCA9SjD4N6B'.
+     'oRNTfo5PCAVR0fBXoIuOQzab1XjwwNHx00GOj8/nKtV1DdeArk'.
+     '24R+0ul9PjmbrHPYl+EipyU0OoQSjg8/m83kl/MMhx0fjCkqio'.
+     'SMOE7t4JMAzDsizH81AqSdW2hroLPg4/CEF4PhKNx98vlevrbY'.
+     'QQXgV6kXwVfjkTiSXmhYVcSa7DIE1DOENe7GM6lUym0l+EXKks'.
+     'K20VAeH2M0JvVgrZfL5Qqkiy0lRVaMBd7H7EZUmsiJJcrTdVja'.
+     'wGpdbTLj3/3qwrUOjAfGgg4LnNA5tdQx14Hm00QFBm65hfNzAm'.
+     '+yIFhFtzuj+z2MI/MQn6Uez5pz4Ua41G7VumB/6RX4zMr1TKBr'.
+     'SXAAAAAElFTkSuQmCC' ; 
+
+        //==========================================================
+        // File: bl_silver.png
+        //==========================================================
+        $this->imgdata_large[3][0]= 1481 ;
+        $this->imgdata_large[3][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAMAAAAM7l6QAAADAF'.
+     'BMVEUAAADOzs7Gxsa9vb21tbXOxsbOzsbGzsb3///O1ta1vb2c'.
+     'paVSWlpKWlpSY2ve5+97hIze7/9aY2vO5/9zhJRaa3tSY3PGzt'.
+     'aMlJxrc3tja3NKUlpCSlK1vcZze4RSWmPW5/+Upb3G3v9zhJxS'.
+     'Y3t7jKVaa4TO3veltc6ElK1re5Rjc4ycpbV7hJRaY3M5QlLn7/'.
+     '/Gzt6lrb2EjJzO3v9ja3vG1ve9zu+1xueltdacrc6UpcaMnL1C'.
+     'SlqElLV7jK1zhKVre5zW3u/O1ue1vc6ttcaMlKVze4xrc4RSWm'.
+     'tKUmPG1v+9zve1xu+tveeltd6crdbe5/+9xt6cpb17hJxaY3s5'.
+     'QlrW3vfO1u/Gzue1vdattc6lrcaUnLWMlK2EjKVze5Rrc4xja4'.
+     'RSWnNKUmtCSmO9xuecpcZ7hKVaY4TW3v/O1vfGzu+1vd6ttdal'.
+     'rc69xu+UnL2MlLWEjK1ze5xrc5R7hK1ja4zO1v+1veettd6lrd'.
+     'aMlL3Gzv/39//W1t7Gxs61tb29vcatrbWlpa2cnKWUlJyEhIx7'.
+     'e4TW1ufGxta1tcZSUlqcnK3W1u+UlKW9vda1tc57e4ytrcalpb'.
+     '1ra3vOzu9jY3OUlK29vd6MjKWEhJxaWmtSUmNzc4xKSlpjY3tK'.
+     'SmNCQlqUjJzOxs7///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
+     'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
+     'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
+     'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
+     'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
+     'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
+     'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'.
+     'AAAAAAAAAAAAAAAAAAAAAAAAD///9fnkWVAAAAAnRSTlP/AOW3'.
+     'MEoAAAABYktHRP+lB/LFAAAACXBIWXMAAABFAAAARQBP+QatAA'.
+     'AB/klEQVR42mNgxAsYqCdd3+lcb4hLmj8wMMvEu8DCMqYbU9op'.
+     'UEFB2MTb26eyysomFl06XEEhUCHLpAKo2z/fujikEUVaXUFBMB'.
+     'BouLePuV+VVWGRciIXknSEsImCQd3//xwmPr65llaFcSFJHkjS'.
+     '3iYmWUDZ//8NfCr989NjNUMSUyTg0jneSiaCINn/gmlVQM12qg'.
+     'lJnp5waTMTE5NAkCyHWZW/lXWNfUlikmdYK0zax7siS4EDKJtd'.
+     'mQeU1XRwLBdLkRGASucWmGVnZ4dnhZvn5lmm29iVOWpnJqcuko'.
+     'JKR1Wm5eTkRKYF5eblp9sU2ZeUJiV7zbfVg0pH56UFBQXNjIqK'.
+     'jgkujItX1koKTVmYajsdKu2qETVhwgSXiUDZ2Bn9xqUeoZ5e0t'.
+     'LzYYZ3B092ndjtOnmKTmycW1s7SHa+l5dtB8zlccE6RlN0dGbM'.
+     'mDVbd5KupNBcL6+F82XgHouLj5vRP2PWLGNdd4+ppnxe8tJec6'.
+     'XnNsKkm0uVQ5RDRHQTPTym68nPlZbvkfYCexsa5rpJ2qXa5Umm'.
+     'ocmec3m8vHjmSs+fgxyhC5JDQ8WSPT2lvbzm8vDIe0nbtiBLN8'.
+     '8BigNdu1B6Lsje+fPbUFMLi5TMfGmvHi/puUAv23q2YCTFNqH5'.
+     'MvPnSwPh3HasCbm3XUpv+nS5VtrkEkwAANSTpGHdye9PAAAASn'.
+     'RFWHRzaWduYXR1cmUANGJkODkyYmE4MWZhNTk4MTIyNDJjNjUx'.
+     'NzZhY2UxMDAzOGFhZjdhZWIyNzliNTM2ZGFmZDlkM2RiNDU3Zm'.
+     'NlNT9CliMAAAAASUVORK5CYII=' ; 
+
+        //==========================================================
+        // File: bl_purple.png
+        //==========================================================
+        $this->imgdata_large[4][0]= 1149 ;
+        $this->imgdata_large[4][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAACAV'.
+     'BMVEX/////////7///5///1v//xv//rf//pf//lP//jP//hP//'.
+     'c///a///Wv//Wvf/Uv//Sv//Qv//Qvf/Off/Mf//Kf//If//If'.
+     'f/GP//GPf/EP//EPf/CP//CPf/CO//AP//APf3Oe/3Kff3Ke/3'.
+     'Ie/3GO/3EO/3AO/vSu/vSufvOefvMefvIefvGOfvEOfvCOfvAO'.
+     'fnUufnSufnMd7nId7nGN7nGNbnEN7nCN7nAN7ejN7ejNbec97e'.
+     'c9beUtbeQtbeIdbeGNbeENbeCNbeANbWpdbWa9bWQs7WGM7WEM'.
+     '7WCM7WAM7Otc7Orc7OnM7OSsbOIb3OGMbOEMbOCMbOAM7OAMbG'.
+     'pcbGnMbGe8bGa8bGKbXGEL3GCL3GAL3FucXBu73AvsC/v7+9pb'.
+     '29Ka29GLW9ELW9CLW9AL29ALW5rrm1lLW1e7W1MbW1GKW1EK21'.
+     'CLW1CK21AK2tjK2thKWtMaWtIaWtGJytCK2tCKWtAK2tAKWlhK'.
+     'Wle6WlEJylCJylAKWlAJyca5ycGJScEJScCJScAJycAJSUWpSU'.
+     'UoyUKZSUEIyUCIyUAJSUAIyMUoyMSoyMIYSMEISMCISMAIyMAI'.
+     'SECHuEAISEAHt7MXt7EHt7CHt7AHt7AHNzKXNzEGtzAHNzAGtr'.
+     'GGtrEGNrCGtrAGtrAGNjCFpjAGNjAFpaAFpaAFIpZn4bAAAAAX'.
+     'RSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsS'.
+     'AdLdfvwAAAAHdElNRQfTAwkRFB0ymoOwAAAB9UlEQVR4nGNgIA'.
+     'K42hhqGtm5+WFIWClKycvLK6gbuARGoEj4aMjLSElISUir6Tt7'.
+     'x+aEIWR8leQlwEBSTc/CK7awLguuR0lGQkJMVFRUTFJVzwko1d'.
+     'oFk9OQl5IQE+Dh5hVR0TV3CkkvbJgyASJjDZIR5GBl5eRX0TH1'.
+     'DEqrbJ2ypBEspSgvJSXKw8bMxMavbOLoGZNf1TZlybw4oIyfLN'.
+     'BxotxsLEzsQiaOHkFpBQ2905esrAZK2SpIAaUEuDm5+LTNPAKj'.
+     'C+pbps1evrIDKGWnLictKSkuLKyoZQyUya9o7Z2+YMXKGUApew'.
+     'M9PTVdXR0TEwf3wOjUirruafOXL18xFyjl72Kpb25qaurg4REU'.
+     'EFVe2zJ5zpLlK1aCpbydnZ2dnDwDA6NTopLLeiZNXbB8BcTAyP'.
+     'TQ0JDg4KCY1NS83JKmiVOBepYvX9UPlAovzEiPSU/LLyior2vq'.
+     'mjZr3vLlIF01IC+XVhUWFlZW1Lc290ycOGfxohVATSsXx4Oksn'.
+     'vaWlsb2tq6J0+bM2/RohVA81asbIcEYueU3t7JU6ZNnwNyGkhm'.
+     '+cp5CRCppJnzZ8+ZM3/JUogECBbBIixr8Yqly8FCy8F6ltUgoj'.
+     'lz7sqVK2ByK+cVMSCDxoUrwWDVysXt8WhJKqG4Y8bcuTP6qrGk'.
+     'QwwAABiMu7T4HMi4AAAAAElFTkSuQmCC' ; 
+
+        //==========================================================
+        // File: bl_gray.png
+        //==========================================================
+        $this->imgdata_large[5][0]= 905 ;
+        $this->imgdata_large[5][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAABO1'.
+     'BMVEX////////3///39/fv7+/e5+fW3t7Wzs7WxsbG1tbGzsbG'.
+     'xsbDxMS/v7++wMC+v7+9zsa9xsa9vb29tbW9ra29pa24uLi1xs'.
+     'a1vb21tbWxtrattbWmpqalra2cra2cpaWcnJycjIyUpaWUnJyU'.
+     'lJSUjIyMnJyMnJSMlJSMlIyMjJSMjIyElJSElIyEjIyEhIR7jI'.
+     'x7hIR7hHt7e3t7e3N7e2tzhIRze3tze3Nzc3Nre3trc3Nrc2tr'.
+     'a2tjc3Njc2tja3Nja2tjY2NjWlpaa2taY2taY2NaY1paWlpaUl'.
+     'JSY2NSY1pSWlpSWlJSUlJSUkpKWlpKWlJKUlpKUlJKUkpKSkpK'.
+     'SkJCUlJCUkJCSkpCSkJCQkI5Sko5QkI5Qjk5OUI5OTkxQkIxOT'.
+     'kxMTkxMTEpMTEhMTEhKSkYISEpy7AFAAAAAXRSTlMAQObYZgAA'.
+     'AAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdE'.
+     'lNRQfTAwkRFQfW40uLAAABx0lEQVR4nI3SbXfSMBQA4NV3nce5'.
+     'TecAHUywRMHSgFuBCFsQUqwBS1OsWQh0GTj//y8wZUzdwQ/efM'.
+     'tzcm/uuXdj4z9ic/PR9k4qk1qDnf0X2/uZzKt8GaRvSubg4LVp'.
+     'mkWzCGAT/i3Zsm2XNQHLsm2n2937LaaNnGoJFAEo27B50qN0ay'.
+     'Wg26lXsw8fP8nmzcJb2CbsnF5JmmCE8ncN404KvLfsYwd7/MdV'.
+     'Pdgl/VbKMIzbuwVgVZw2JlSKJTVJ3609vWUY957lgAUd1KNcqr'.
+     'yWnOcOPn8q7d5/8PywAqsOOiVDrn42NFk+HQ7dVuXNYeFdBTpN'.
+     'nY5JdZl8xI5Y+HXYaTVqEDp1hAnRohZM03EUjMdhn5wghOoNnD'.
+     'wSK7KiiDPqEtz+iD4ctdyAifNYzUnScBSxwPd6GLfRURW7Ay5i'.
+     'pS5bmrY8348C5vvUI+TLiIVSJrVA0heK/GDkJxYMRoyfCSmk4s'.
+     'uWc3yic/oBo4yF374LGQs5Xw0GyQljI8bYmEsxVUoKxa6HMpAT'.
+     'vgyhU2mR8uU1pXmsa8ezqb6U4mwWF/5MeY8uLtQ0nmmQ8UWYvb'.
+     'EcJaYWar7QhztrO5Wr4Q4hDbAG/4hfTAF2iCiWrCEAAAAASUVO'.
+     'RK5CYII=' ; 
+
+        //==========================================================
+        // File: bl_brown.png
+        //==========================================================
+        $this->imgdata_large[6][0]= 1053 ;
+        $this->imgdata_large[6][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAMAAADzN3VRAAABoV'.
+     'BMVEX////Gzs7GvbXGrZTGpXu9nHO1nHO1nIy9taXGxs7GtaXO'.
+     'nHPGlFrGjEq9hEq1hEqte0Klczmcazmce1KtnIzGxsbGvb3OlF'.
+     'LOlFq9hFKte0qcc0KUYzGEWimMc1K9ta3OnGvOnGPWnGO9jFq9'.
+     'jFKlc0KUazmMYzl7UilzUjGtpZzGxr3GnGPWpWvepXO1hFJ7Wj'.
+     'FrSiFjUjG1ra3GnHPvxpT/5733zpythFKUa0KEYzlzUilaOSF7'.
+     'Wjm9jErvvYz/99b///f/78bnrYS1hFqle0p7UjFrSiljQiFCMR'.
+     'iMhHO9lGvGjFLWnGv/3q3////erXuthEqlc0paQiFKMRhSQin/'.
+     '1qX/997//++cc0pjSilaQilKORhCKRiclIy9pYzGlGPntYT33q'.
+     '3vvZSEWjlSOSE5KRB7c2O1lHutczmthFqte1JrWkqtjGtCKRBa'.
+     'SjmljGuca0KMYzGMaznOztaclISUYzmEWjFKOSF7a1qEYzFaSi'.
+     'GUjISEa0pKOSm9vb2llIxaQhg5IQiEc2tzY0paORilnJy1raVS'.
+     'OSljUkJjWkKTpvQWAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHU'.
+     'gAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkREiei'.
+     'zP2EAAAB9UlEQVR4nGWS/VfSUBjHL5QluhhBxtwyWcCus5Blpm'.
+     'wDC4ONaWXCyBi7RMZmpQ2Bypm9W/byV3cHHo/W88s95/s5z/d5'.
+     'uwCcCh/4L3zAf+bs0NC588On9QAYGSUuBINk6GI4cmnsBLk8Go'.
+     '1SFEGMkzRzZeLq5JE8FvDHouw1lqXiCZJOcnCKnx4AcP0GBqmZ'.
+     'mRgRT9MMB4Wbs7cGSXNRik3dnp9fiMUzNCNKgpzN9bsaWaQo9s'.
+     '7dfH7pXiFTZCBU1JK27LmtBO8TDx7mV1eXHqXXyiIUFLWiVzHx'.
+     'BxcJIvV4/cn6wkqmWOOwmVE3UQOAp6HxRKL5bGPj+VwhUhalFq'.
+     '8alm5vAt+LlySZTsebzcKrraIIW4JqZC3N3ga+1+EQTZKZta1M'.
+     'pCZCSeDViqVrThsEdsLJZLJYLpZrHVGScrKBvTQNtQHY6XIM02'.
+     'E6Ik7odRW1Dzy3N28n3kGuB3tQagm7UMBFXI/sATAs7L5vdbEs'.
+     '8Lycm923NB0j5wMe6KOsKIIyxcuqauxbrmlqyEWfPmPy5assY1'.
+     'U1SvWKZWom9nK/HfQ3+v2HYZSMStayTNN0PYKqg11P1nWsWq7u'.
+     '4gJeY8g9PLrddNXRdW8Iryv86I3ja/9s26gvukhDdvUQnIjlKr'.
+     'IdZCNH+3Xw779qbG63f//ZOzb6C4+ofdbzERrSAAAAAElFTkSu'.
+     'QmCC' ; 
+
+        //==========================================================
+        // File: bl_darkgreen.png
+        //==========================================================
+        $this->imgdata_large[7][0]= 1113 ;
+        $this->imgdata_large[7][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAB2l'.
+     'BMVEX////////3///v///n/+/e99bW/+/W99bO786/v7++vr69'.
+     '/96999a7wb24vbu1/9a1zqW1u7itxrWosq6l772l1qWlxrWlxq'.
+     '2lva2cxpSU562U3q2UxqWUvaWUpZyM77WM57WMvYyMtZyMrZyM'.
+     'pZSMnJSEvZyEtYyErZSElIx7zpR7xpx7xpR7vZR7jIRz1pRzxp'.
+     'RzjIRrzpRrzoxrxoxrtYRrrYxrrXtrpYRrhHNjzoxjxoxjxoRj'.
+     'vYRjtYRjrXtjpXtjlGNje2tazoxazoRaxoxaxoRavYRatYRatX'.
+     'tarXtapXNanHNajFpae2tSzoRSxoRSvXtStXtSrXtSrXNSpXNS'.
+     'nHNSnGtSlGtSlGNSjGtSjGNKvXtKtXNKrXNKpWtKnGtKlGNKjG'.
+     'NKhGNKhFJKc1pKa1JCrWtCpWtCnGtClGNCjGNCjFpChFpCe1JC'.
+     'a1JCY1I5pWs5nGM5lGM5jFo5hFo5e1o5c0o5WkoxjFoxhFoxhF'.
+     'Ixe1Ixc1Ixc0oxa0ophFIpe0opc0opa0opa0IpY0IpWkIpWjkp'.
+     'UkIpUjkhc0oha0IhY0IhWjkhWjEhUjkhUjEhSjEhSikhQjEhQi'.
+     'kYWjkYSjEYSikYQjEYQikQSikQQikQQiEQOSExf8saAAAAAXRS'.
+     'TlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAd'.
+     'LdfvwAAAAHdElNRQfTAwkRFCaDkWqUAAAB+ElEQVR4nI3S+1vS'.
+     'UBgHcGZlPV0ks/vFrmQWFimJjiwiYUJWjFBWFhClyZCy5hLrwA'.
+     'x2EIwJC1w7zf2vnU0re+iHvs9++7x7zznvORbLf+TA6ct9fYMX'.
+     'jrfAUYefpp+/iM1ykxf/lmuhUZ/PTwXC8dml5Wcd23o5H5Mk6b'.
+     '5NUU8icXbhS67rNzn9JDnguOEYGQtEEtwC+Crs3RJ76P5A/znr'.
+     'vsNX7wQnEiwHCtK7TTkW8rvdZ9uJtvZTLkxpHhSrP66bNEj7/P'.
+     '3WNoLYeeSWQQCIpe9lQw7RNEU5rDsIYtcJ14Nocg7kRUlBNkxn'.
+     'YmGKcp7cv3vPwR7XOJPmc0VYU3Sv0e9NOBAYG7Hbz/cMjTMveZ'.
+     'CHkqxuTBv0PhYJB4N3XR6PJ5rMAPMnpGUxDX1IxSeMTEaZp1OZ'.
+     'nGAIQiYtsalUIhFlmGTy3sO3AizJCKn6DKYryxzHsWyaneMzr6'.
+     'cWxRVZVlFTe4SpE3zm+U/4+whyiwJcWVMQNr3XONirVWAklxcE'.
+     'EdbqchPhjhVzGpeqhUKhWBQhLElr9fo3pDaQPrw5xOl1CGG1JE'.
+     'k1uYEBIVkrb02+o6RItfq6rBhbw/tuINT96766KhuqYpY3UFPF'.
+     'BbY/19yZ1XF1U0UNBa9T7rZsz80K0jWk6bpWGW55UzbvTHZ+3t'.
+     'vbAv/IT+K1uCmhIrKJAAAAAElFTkSuQmCC' ; 
+
+        //==========================================================
+        // File: bl_green.png
+        //==========================================================
+        $this->imgdata_large[8][0]= 1484 ;
+        $this->imgdata_large[8][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABm'.
+     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
+     'B3RJTUUH0wMMFjM4kcoDJQAABVlJREFUeNq9ll2MJFUVx3/11V'.
+     'Vd/TE9vU0v4zLDwJIF16jBqLAPhsRXEiDqg0QTJiQSjcSNvCzw'.
+     'sBEDDxizhvAAxBgf1oR9QF9NiE9ESFZkQyZB5WtddmdnZ3qqqr'.
+     'uqbt367Cofqu3ZZpWVaDzJfbkf53//55z/PVdZXV3l/2H6f7Lp'.
+     '5VdOV/4Nb+GmHpUeA7AdBNxc3kafNb73jRPK9Xwon8ToxVefqU'.
+     'b91wibH5EkCQBCizFihTSviHUHR0hWws9xe3wvJ7/7nPKpgX5y'.
+     '9oFqt3eOgWniRBoAbUBGGqZUibSYaeoT2B5bnkdaSA6793Cv/S'.
+     'QPPbihXBfo5VdOV+8dfgnvwAU62YH5fCZ12sDujFkwyegCqTrB'.
+     'iUOKTOJKj8jr88jS8zy6cXwBTP048nuHX0I0nDlIp7RpTG7kM0'.
+     'sdyAYsTVukUuWGhlWHMq0ITL92lnUp9R1Obz/GmTNnqn9bDD8/'.
+     '+0D1oX0O0zQZZDYCsK2j3Gl9jQqDfHiei8GfiKVLlsZkJaBAN1'.
+     '0i6PgwUbB0GxG5/PrtE/xLRr959Znqw9452oVNI+jiJhnr1pe4'.
+     'k29zB1/nFr5Kj7tpt1YYhJ0FJ7nUYbcJQBgahN2MzeCP/OipR6'.
+     'prgN6Qr6ELFQFUWoRpNVjlKwxZB8DCpE+PtfEKqV1cUzxpVudu'.
+     'GTBHA5Y1g99e+dUio9O/P1Vpq+/WE5GGjDSMoAtAQjrf3C52IP'.
+     'QxpY4WK2hpReka9Gfrhqgz0bACRoCWjDh56kQ1z9FeuUUQxVhK'.
+     'B92sD1VahM+bAJgcoJhGjP/6Ln8rAgDiRCVRKiIzxMkkodBJ85'.
+     'im1IlEHbE4k1xyNveL4YP8HarmGJIOpqyjeQmfNHmTvnqZTWBt'.
+     'vIJXpPwlukJSuSTKGK3pEwtJmiX00ZlInTyNscImO6XBITvH1c'.
+     '8vVt2OucdKvIyeKRTNCivsEMgcpg6taYs30nfq0Gqg6hOSSFJ4'.
+     'BSnJPht0IqEjWmOGocEI6F0J94F0qaL6BntTF0MtUfweKQKAPU'.
+     'Wwp4OcVnQAmVb0p9DLOzjEhEKnGRmoRc7EzRGlwA6NujAKG4yP'.
+     '6Sjwc4aVznZ7DK0xXdkDoJf0kGmFBniFBOBGcZSCCSKd0IwN0k'.
+     'IS+QZWCGVZex4BnUxya3+Zt9iugQbcRFpIAtuHvAZulPUdLhUJ'.
+     'RqegI3WcqaSXddlT3idsWMSRRGkEtNwmyTifAwyBo7LP+11J0e'.
+     '7tM7pZOYblHkBLcqZ5LcYtw6Wbd4CM3SpE9foYZsIHoqDKCrbz'.
+     'mLSQtPwmuhXgtBLs0GBdbXOhFGB7WBKO2F8GXt9/VO97Ya3atF'.
+     '7nUHnwGjGGQqcPxFEdFqURkEidiZszAERoYIsGju1hq21kWee3'.
+     'bw15+8WpsvAy3K1+i3JkkhZyPpxxjjPOsfOYiZ+TFhLPzQnHOU'.
+     'tpzGB2dgA4tscIkKIx19Cxg/fPL7vQJu47eXt1VvsDK8pwPueZ'.
+     'PuZoQMOqhRoJHSs0kKLBWjvjYinmeQGw1TaX1RFdfZ3LMzYLjA'.
+     'C++dkn6AaH2Nobk6cxEzdnuG0TdC8zvdJkN0hqkFkO/jwL0fxa'.
+     'so8sBcuFzQ+/+MRC+BeAHnpwQzn++ee5KT9Eshuy46dcKAXm32'.
+     '0uzPQhS4GttkH2GQID2Wc0Y4LtAbDxhZ/x5A+e/uTG9+jGceXH'.
+     '9/ySnnIXnUzOxXe1038mW3ZynNmam4yYWkO+f9cv+Oljz16/lV'.
+     '9tDz/9nerc1hm8ZEScSRK7VvtYl1i1dklsOKyvc+zg/bzw1O8+'.
+     '/efkajt56kR1ydlEJBc5H46xzbrJ3dY9wrB7hGcff+6/+279L+'.
+     '0fHxyiE8XMLl4AAAAASUVORK5CYII=' ; 
+
+        //==========================================================
+        // File: bl_blue.png
+        //==========================================================
+        $this->imgdata_large[9][0]= 1169 ;
+        $this->imgdata_large[9][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAACEF'.
+     'BMVEX/////////7//35//v1v/exv/Wvf/Wrf/Wpf/Orf+/v7+9'.
+     'tc69jP+9hP+5ucW1tc6tlP+rq7Wlpdalpcalpb2cnM6cnMacc/'.
+     '+cWv+UlLWUjN6UjK2Uc/+Ma/+MUv+EhKWEa/+EQvd7e8Z7e7V7'.
+     'e6V7c957Wv9za9Zza8ZzSv9ra5xrSv9rOf9rMe9jUudjQv9jOe'.
+     '9aWpRaUt5aUpRaSu9aSudSUoxSSs5SSoxSMf9KQtZKOfdKMedK'.
+     'Kf9KKe9CKf9CKb1CKa1CIfdCIedCId45MXs5Kfc5If85Iec5Id'.
+     'Y5GP8xMbUxMXsxKc4xKZQxIf8xGP8xGO8xGN4xGNYxGL0xGK0p'.
+     'KXMpIYwpGP8pGO8pGOcpGNYpGM4pEP8pEPcpEOcpEN4pENYpEM'.
+     'YpEL0hGKUhEP8hEPchEO8hEOchEN4hENYhEM4hEMYhELUhCP8h'.
+     'CO8hCN4YGJwYGGsYEL0YEK0YEHMYCN4YCM4YCMYYCL0YCKUYAP'.
+     '8QEJQQEIwQEHsQEGsQCM4QCLUQCK0QCKUQCJwQCJQQCIwQCHMQ'.
+     'CGsQAP8QAPcQAO8QAOcQAN4QANYQAM4QAMYQAL0QALUQAKUQAJ'.
+     'QQAIQICGsICGMIAO8IANYIAL0IALUIAK0IAKUIAJwIAJQIAIwI'.
+     'AIQIAHsIAHMIAGsIAGMAAN4AAMYAAK0AAJQAAIwAAIQAAHMAAG'.
+     'sAAGMAAFrR1dDlAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
+     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkRFRPMOZ'.
+     '/2AAAB+klEQVR4nGNgIAIIqeqZmBqpi2JISNml5lVXV3d198Yo'.
+     'oUjwm1SnxsbGRsSm5ZfNXO4tjCTjVh0ABhFx6QV9E1Y0S8JkuN'.
+     '3yAgLc7W3t/QPi4jPKJ8ye1yoIlTKpjvVy15eVUbN0i4zKLJ8w'.
+     'ae6qcKgLqmMj3PUFWFl5NJ0CExLLJzbNW7BWCyxlXR0ba6/Axs'.
+     'zELmfnkRBT0QiSKgXJCOflxUbYy3KyMHEoOrtEZ1c2TZ6/cMl6'.
+     'eaCUamdsbIC7tjgPr4SBS3BMMVDTwkXr1hsDpYy6UmMj/O0tdX'.
+     'QNbDxjknJLWqYsXLx0vStQynxGflpkZGCgs7Onp29SbtNkoMy6'.
+     'pevCgFJWy3oyMuKjgoKCPWNCvEuqWhcsWrJ06XqQlPnMvrKyrM'.
+     'TomJjkZAfHlNa2qdOWrlu63gcopbG8v7+hvLwip7g4JdSxsLZu'.
+     '8dKlS9ettwBKic2eNXHChIkTG5tKqgpr2uo6loLAehWQx0LnzJ'.
+     '49p6mpeXLLlNq6RUvqly6dvnR9Bx9ISnnlvLmT582bMr9t4aL2'.
+     '+vrp60GaDCGB6Ld6wfwFCxYCJZYsXQ+SmL6+FBryInVrFi1atH'.
+     'jJkqVQsH6pNCzCJNvXrQW6CmQJREYFEc2CYevXrwMLAyXXl0oz'.
+     'IAOt0vVQUGSIkabkDV3DwlzNVDAksAAAfUbNQRCwr88AAAAASU'.
+     'VORK5CYII=' ; 
+
+        //==========================================================
+        // File: bs_red.png
+        //==========================================================
+        $this->imgdata_small[0][0]= 437 ;
+        $this->imgdata_small[0][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAk1'.
+     'BMVEX////////GxsbGra3/xsbOhITWhIT/hIT/e3v/c3P/a2vG'.
+     'UlK1SkrOUlL/Y2PWUlLGSkrnUlLeSkrnSkr/SkqEGBj/KSmlGB'.
+     'jeGBjvGBj3GBj/EBD/CAj/AAD3AADvAADnAADeAADWAADOAADG'.
+     'AAC9AAC1AACtAAClAACcAACUAACMAACEAAB7AABzAABrAABjAA'.
+     'BuukXBAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ'.
+     'cwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGDNEMgOYAAAAm0'.
+     'lEQVR4nI3Q3RKCIBAFYGZMy9RKzX7MVUAUlQTe/+kS0K49d3wD'.
+     '7JlFaG+CvIR3FvzPXgpLatxevVVS+Jzv0BDGk/UJwOkQ1ph2g/'.
+     'Ct5ACX4wNT1o/zzUoJUFUGBiGfVnDTYGJgmrWy8iKEtp0Bpd2d'.
+     'jLGu56MB7f4JOOfDJAwoNwslk/jOUi+Jts6RVNrC1hkhPy50Ef'.
+     'u79/ADQMQSGQ8bBywAAAAASUVORK5CYII=' ; 
+
+
+        //==========================================================
+        // File: bs_lightblue.png
+        //==========================================================
+        $this->imgdata_small[1][0]= 657 ;
+        $this->imgdata_small[1][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAABVl'.
+     'BMVEX////////d///AwMC7wcS08P+y+P+xxdCwxM+uws2twMur'.
+     'vsinzNynytylzuKhyN6e5v6d5P+d1fOcwNWcu8ub4f+at8iZ3v'.
+     '+ZvdGY2/yW2f+VscGU1vuT1fqTr72Sx+SSxeKR0fWRz/GPz/OP'.
+     'rr+OyeqMy+6Myu2LyeyKxueJudSGw+SGorGDvt+Cvd6CvN2Aud'.
+     'p+uNd+t9Z9tdV8tdR8tNN6sc94r813rct2q8h0qcZ0qMVzp8Rx'.
+     'o8Bwor5tn7ptnrptnrlsnbhqmbRpmbNpi51ol7Flkqtkkqtkka'.
+     'pjj6hijaRhjaZgi6NfiqJfiaFdh55bhJtag5pZgphYgJZYf5VX'.
+     'cn9Ve5FSeI1RdopRdYlQdYlPc4dPcoZPcoVNcINLboBLbH9GZn'.
+     'hGZXdFZHZEY3RDYnJCXW4/W2s/WWg+Wmo7VmU7VGM7U2E6VGM6'.
+     'VGI5UV82T1wGxheQAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHU'.
+     'gAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGTok'.
+     '9Yp9AAAAtElEQVR4nGNgIBaw8wkpKghzwvksPAKiUsraprYiLF'.
+     'ARXkE2JiZ1PXMHXzGIAIekOFBE08TGLTCOCyzCLyvDxsZqZOnk'.
+     'E56kAhaRV9NQUjW2tPcMjs9wBYsY6Oobmlk7egRGpxZmgkW0zC'.
+     '2s7Jy9giKT8gohaiQcnVzc/UNjkrMLCyHmcHr7BYREJKTlFxbm'.
+     'QOxiEIuKTUzJKgQCaZibpdOzQfwCOZibGRi4dcJyw3S4iQ4HAL'.
+     'qvIlIAMH7YAAAAAElFTkSuQmCC' ; 
+
+        //==========================================================
+        // File: bs_gray.png
+        //==========================================================
+        $this->imgdata_small[2][0]= 550 ;
+        $this->imgdata_small[2][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAAQCAMAAADH72RtAAABI1'.
+     'BMVEX///8AAAD8EAD8IAD8NAD8RAD8VAAYGBi/v7+goKCCgoJk'.
+     'ZGRGRkb8yAD83AD87AD8/AD4+ADo+ADY+ADI+AC0+ACk+ACU+A'.
+     'CE+AB0/ABk/ABU/ABE/AAw/AAg/AAQ/AAA/AAA+AAA6BAA2CAA'.
+     'yDQAtEQApFQAlGQAhHQAdIgAZJgAVKgARLgAMMgAINwAEOwAAP'.
+     'wAAPgIAPAQAOgYAOAkANgsANA0AMg8AMBEALhMALBUAKhcAKBo'.
+     'AJhwAJB4AIiAAID////4+Pjy8vLs7Ozm5ubg4ODa2trT09PNzc'.
+     '3Hx8fBwcG7u7u1tbWurq6oqKiioqKcnJyWlpaQkJCJiYmDg4N9'.
+     'fX13d3dxcXFra2tkZGReXl5YWFhSUlJMTExGRkZAQEA1BLn4AA'.
+     'AAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIA'.
+     'AAsSAdLdfvwAAAAHdElNRQfTAwkUGiIctEHoAAAAfElEQVR4nI'.
+     '2N2xKDIAwF+bZ2kAa8cNFosBD//yvKWGh9dN+yk9kjxH28R7ze'.
+     'wzBOYSX6CaNB927Z9qZ66KTSNmBM7UU9Hx2c5qjmJaWCaV5j4t'.
+     'o1ANr40sn5a+x4biElrqHgrXMeac/c1nEpFHG0LSFoo/jO/BeF'.
+     'lJnFbT58ayUf0BpA8wAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: bs_greenblue.png
+        //==========================================================
+        $this->imgdata_small[3][0]= 503 ;
+        $this->imgdata_small[3][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAxl'.
+     'BMVEX///////+/v79znJQhSkJ7raU5hHtjraVKnJRCjIRClIyU'.
+     '9++E595avbVaxr2/v7+ctbWcvb17nJxrjIx7paUxQkK9//+Mvb'.
+     '17ra2Evb17tbVCY2MQGBiU5+ec9/eM5+d71tZanJxjra1rvb1j'.
+     'tbVSnJxara1rzs5jxsZKlJRChIQpUlIhQkJatbVSpaU5c3MxY2'.
+     'MYMTEQISFavb1Sra1KnJxCjIw5e3sxa2spWlpClJQhSkoYOTkp'.
+     'Y2MhUlIQKSkIGBgQMTH+e30mAAAAAXRSTlMAQObYZgAAAAFiS0'.
+     'dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfT'.
+     'AwkUGTIqLgJPAAAAqklEQVR4nI2QVxOCMBCEM6Mi2OiCvSslJB'.
+     'CUoqjn//9TYgCfubf9Zu9uZxFqO+rscO7b6l/LljMZX29J2pNr'.
+     'YjmX4ZaIEs2NeiWO19NNacl8rHAyD4LR6jjw6PMRdTjZE0JOiU'.
+     'dDv2ALTlzRvSdCCfAHGCc7yRPSrAQRQOWxKc3C/IUjBlDdUcM8'.
+     '97vFGwBY9QsZGBc/A4DWZNbeXIPWZEZI0c2lqSute/gCO9MXGY'.
+     '4/IOkAAAAASUVORK5CYII=' ; 
+
+        //==========================================================
+        // File: bs_yellow.png
+        //==========================================================
+        $this->imgdata_small[4][0]= 507 ;
+        $this->imgdata_small[4][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAzF'.
+     'BMVEX///////+/v79zYwCMewDOxoTWzoTezkr/5wj/5wDnzgDe'.
+     'xgC1pQCtnACllACcjACUhABjWgDGvVK1rUrOxlLGvUqEexilnB'.
+     'jv3hj35xj/7wj/7wD35wDv3gDn1gDezgDWxgDOvQDGtQC9rQCE'.
+     'ewB7cwBzawBrYwDWzlLn3lLe1krn3kre1hi9tQC1rQCtpQClnA'.
+     'CclACUjACMhAD/9wC/v7///8bOzoT//4T//3v//3P//2v//2Pn'.
+     '50r//0r//yn39xj//xD//wBjYwDO8noaAAAAAXRSTlMAQObYZg'.
+     'AAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAH'.
+     'dElNRQfTAwkUGSDZl3MHAAAAqElEQVR4nI3QWRNDMBAA4My09E'.
+     'IF1SME0VT1okXvM/3//6kEfbZv+81eswA0DfHxRpOV+M+zkDGG'.
+     'rL63zCoJ2ef2RLZDIqNqYexyvFrY9ePkxGWdpvfzC7tEGtIRly'.
+     'nqzboFKMlizAXbNnZyiFUKAy4bZ+B6W0lRaQDLmg4h/k7eFwDL'.
+     'OWIky8qhXUBQ7gKGmsxpC+ah1TdriwByqG8GQNDNr6kLjf/wAx'.
+     'KgEq+FpPbfAAAAAElFTkSuQmCC' ; 
+
+        //==========================================================
+        // File: bs_darkgray.png
+        //==========================================================
+        $this->imgdata_small[5][0]= 611 ;
+        $this->imgdata_small[5][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAABJl'.
+     'BMVEX////////o8v/f6O7W4OnR3PXL1OTL0evEyLvCzePAwMC/'.
+     'v7a8wsq7t7C1xum1vtS1q6GzopmyxeKsrsOqvNWoq7anvN+nsb'.
+     'qhrcGgqbGfpq6cp7+bqMuVmJKRm7yPlKKMnL6FkKWFipOEkLSE'.
+     'j6qEhoqAiaB+jqd8haF7hZR4iJt4g5l3hZl2gIt2cod1hJVzeY'.
+     'VzboJvhp9sfJJsb41peY1pd5xpdoVod4xndI5lcHxka4BjcYVg'.
+     'Z3BfboFbb4lbZnZbYntaZ4laZYVZV3JYYWpXX3JWWm5VX4RVW2'.
+     'NUYX9SXHxPWn5OVFxNWWtNVXVMVWFKV3xHUGZGU3dGTldFSlxE'.
+     'Sk9ESXBCRlNBS3k/SGs/RU4+R1k9R2U6RFU2PUg0PEQxNU0ECL'.
+     'QWAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAA'.
+     'CxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGQmbJetrAAAAtklEQV'.
+     'R4nGNgwAK4JZTNNOWlYDxhMT4ZDTOzQE1uMF9CiJWVU0LbxDlS'.
+     'G8QVF+FnZ2KRNHAIiPUHaZGSlmZj5lH19A1KjLUA8lXU5MWllF'.
+     'yjo30TYr2BfG19G11b37CEeN84H38gX1HbwTUkOjo+zjfG3hLI'.
+     'l1exCvCNCwnxjfMz0gTyRdXNHXx9fUNCQu2MwU6SN3ZwD42LCH'.
+     'W30IK4T8vUJSAkNMhDiwPqYiktXWN9JZj7UQAAjWEfhlG+kScA'.
+     'AAAASUVORK5CYII=' ; 
+
+
+        //==========================================================
+        // File: bs_darkgreen.png
+        //==========================================================
+        $this->imgdata_small[6][0]= 666 ;
+        $this->imgdata_small[6][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAABX1'.
+     'BMVEX////////l/+nAwMC86r+8wb28wby8wLy78sCzw7SywrSx'.
+     'wLKwvrGuvK+syK+ryq2rx62n36ym3aumxKmk2qij0Keh16ahva'.
+     'Og1aSguKKe06KeuaCetZ+d0KGdtZ+bz6Cay56ZyZ2Zwp2Zr5qZ'.
+     'rpqYwJuXyZuXrJmVw5mUxZiTxJeTw5eTq5WRwJWPtJKOvZKKuI'.
+     '6Kt42Kn4yJt42ItIuGsomFsYmEsIiEr4eDr4eBrIR/qoN+qIJ8'.
+     'poB7pH56o356on14nnt2nXl0mndzmnZzmXZymHVwlXNvlHJukn'.
+     'FtiHBqjm1qjW1oi2toiWpniWplh2hlhmdkhWdig2VggGNgf2Je'.
+     'fmFdfGBde19bbl1aeFxXdFpWclhVclhVcVdUcFZTb1VSbVRQal'.
+     'JPaVFKY0xKYkxJYUtIYEpHX0lEWkZCWERCV0NCVkM/U0A+U0A+'.
+     'UUA+UEA9Uj89UT48Tj45TDvewfrHAAAAAXRSTlMAQObYZgAAAA'.
+     'FiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElN'.
+     'RQfTAwkUGRjxlcuZAAAAtElEQVR4nGNgIBZw8osqqIpzw/msfI'.
+     'IiUmr6lo6SbFARASEOJiYtQ2uXADmIAJeEGFBE18LBMySBBywi'.
+     'LC/LwcFiZuvmH5WiAxZR0tRW1DC3dfYJS8zyAouYGBibWtm7+o'.
+     'TEpZfkgEX0rG3snNx9Q2NSCksgaqRd3Ty8gyLiU/NKSiDmcPsF'.
+     'BodHJ2UUlZTkQ+xikIlNSE7LLgECZagL2VQyc0H8YnV2uD94jS'.
+     'ILIo14iQ4HALarJBNwbJVNAAAAAElFTkSuQmCC' ; 
+
+        //==========================================================
+        // File: bs_purple.png
+        //==========================================================
+        $this->imgdata_small[7][0]= 447 ;
+        $this->imgdata_small[7][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAnF'.
+     'BMVEX///////+/v7/Gvca9rb3Grcb/xv+1hLWte629hL21e7XG'.
+     'hMbWhNbOe87We9b/hP//e/97OXv/c///a///Y/+cOZz/Sv/WOd'.
+     'bnOefvOe//Kf9jCGNrCGv/EP//CP/nCOf/AP/3APfvAO/nAOfe'.
+     'AN7WANbOAM7GAMa9AL21ALWtAK2lAKWcAJyUAJSMAIyEAIR7AH'.
+     'tzAHNrAGtjAGPP1sZnAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgF'.
+     'HUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGS'.
+     'o5QpoZAAAAnElEQVR4nI3Q2xJDMBAG4MyQokWrZz3oSkJISJH3'.
+     'f7dK0Gv/Xb7J7vyzCK0NjtPsHuH/2wlhTE7LnTNLCO/TFQjjIp'.
+     'hHAA6bY06LSqppMAY47x+04HXTba2kAFlmQKr+YuVDCGUG2k6/'.
+     'rNwYK8rKwKCnPxHnVS0aA3rag4UQslUGhrlk0Kpv1+sx3tLZ6w'.
+     'dtYemMkOsnz8R3V9/hB87DEu2Wos5+AAAAAElFTkSuQmCC' ; 
+
+
+        //==========================================================
+        // File: bs_brown.png
+        //==========================================================
+        $this->imgdata_small[8][0]= 677 ;
+        $this->imgdata_small[8][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAABaF'.
+     'BMVEX//////////8X/3oD/3nj/1HX/0Gr/xGP/rkv/gBf+iS/2'.
+     'bAL1agDxaQDuZwDrZwLpZQDmZQLlZADjcx7gZATeYQDdZgraXw'.
+     'DZXwHYXgDXiEvXZAvUjlfUXwXTjVfTbR7ShUvRbR7RWwDMWQDL'.
+     'WADKooLKWADJoYLJgkvHWATGoILFn4LFgEvFVgDEZx7EVQDDt6'.
+     '/DVQDCt6/CnoLChlfCVADAwMC+hFe+UgC8UgC6UQC4gVe4UAC3'.
+     'gVe3UAC1gFe1eUu1TwC1TgCzTgCwTQKuTACrSgCqSgCpSgCpSQ'.
+     'CodEulSACkRwCiRgCdRACcRACaQwCYQgCWQgKVQQCVQACUQACS'.
+     'UR6RPwCOPgCNPQCLPACKPACJOwCEOQCBOAB+NwB9NgB8NgB7NQ'.
+     'B6NwJ4NAB3RR52MwB0MgBuLwBtLwBsLwBqLgBpLQBkLQJiKgBh'.
+     'KgBgKwRcKABbKQJbJwBaKQRaJwBYKAJVJQDZvdIYAAAAAXRSTl'.
+     'MAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLd'.
+     'fvwAAAAHdElNRQfTAwkUGho0tvl2AAAAtklEQVR4nGNgIBaoSg'.
+     'mLKGpowfkGMty8AqJKpi4mRlAROR5ONg4JFUv3YHOIgDo/HwsT'.
+     'q6yps29EsjZYREFIkJ2ZS9/OMzA20wEsIi8uKSZtaOPmH5WSFw'.
+     'YW0VRW07Vw8vCLSMguLwCL6FlaObp6B0TGZxSXQ9TouHv6+IXG'.
+     'JGYWlpdDzNEKCgmPjkvLKS0vL4LYxWAen5SelV8OBNZQFxrZ5h'.
+     'aC+GX2MDczMBh7pZakehkTHQ4AA0Am/jsB5gkAAAAASUVORK5C'.
+     'YII=' ; 
+
+        //==========================================================
+        // File: bs_blue.png
+        //==========================================================
+        $this->imgdata_small[9][0]= 436 ;
+        $this->imgdata_small[9][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAk1'.
+     'BMVEX///////+/v7+trcbGxv+EhM6EhNaEhP97e/9zc/9ra/9S'.
+     'UsZKSrVSUs5jY/9SUtZKSsZSUudKSt5KSudKSv8YGIQpKf8YGK'.
+     'UYGN4YGO8YGPcQEP8ICP8AAP8AAPcAAO8AAOcAAN4AANYAAM4A'.
+     'AMYAAL0AALUAAK0AAKUAAJwAAJQAAIwAAIQAAHsAAHMAAGsAAG'.
+     'ONFkFbAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ'.
+     'cwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGhNNakHSAAAAmk'.
+     'lEQVR4nI3P2xKCIBAGYGfM6SBWo1nauIqogaDA+z9dK9Lhrv47'.
+     'vtl/2A2CfxNlJRRp9IETYGraJeEb7ocLNKznia8A7Db7umWDUG'.
+     'sxAzhurxRHxok4KQGqCuEhlL45oU1D2w5BztY4KRhj/bCAsetM'.
+     '2uObjwvY8/oX50JItYDxSyZSTrO2mNhvGMbaWAevnbFIcpuTr7'.
+     't+5AkyfBIKSJHdSQAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: bs_green.png
+        //==========================================================
+        $this->imgdata_small[10][0]= 452 ;
+        $this->imgdata_small[10][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAn1'.
+     'BMVEX///////+/v7+/v7/G/8aUxpSMvYyUzpSMzoyM1oxarVqE'.
+     '/4R7/3tavVpKnEpaxlpz/3Nr/2tKtUpj/2Na51pKzkpK1kpK50'.
+     'pK/0oYcxgp/ykYlBgY3hgY7xgY9xgQ/xAI/wgA/wAA9wAA7wAA'.
+     '5wAA3gAA1gAAzgAAxgAAvQAAtQAArQAApQAAnAAAlAAAjAAAhA'.
+     'AAewAAcwAAawAAYwA0tyxUAAAAAXRSTlMAQObYZgAAAAFiS0dE'.
+     'AIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAw'.
+     'kUGgW5vvSDAAAAnklEQVR4nI3QSxKCMAwA0M4gqCgoiiJ+kEAL'.
+     'LQUq0PufzX7ENdnlJZNkgtDS2CYZvK6bf+7EoKLA9cH5SQzv6A'.
+     'YloTywsAbYr44FrlgrXCMJwHl3xxVtuuFkJAPIcw2tGB9GcFli'.
+     'oqEf5GTkSUhVMw2TtD0XSlnDOw3SznE5520vNEi7CwW9+Ayjyq'.
+     'U/3+yPuq5gvhkhL0xlGnqL//AFf14UIh4mkEkAAAAASUVORK5C'.
+     'YII=' ; 
+
+
+        //==========================================================
+        // File: bs_white.png
+        //==========================================================
+        $this->imgdata_small[11][0]= 480 ;
+        $this->imgdata_small[11][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAAQCAYAAADwMZRfAAAABm'.
+     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
+     'B3RJTUUH0wMLFTsY/ewvBQAAAW1JREFUeJytkz2u4jAUhT/jic'.
+     'gfBUKiZhE0bIKeVbCWrIKenp6eDiGlCEEEBArIxvzGU4xeZjLk'.
+     'jWb05lRXuvbx+exr4bouX1Xjyw7Atz81F4uFBYjjGIDhcCjq1o'.
+     'k6nN1uZwFerxfP55Msy1itVmRZBsB4PK6YveHkeW5d18XzPIIg'.
+     'wPd9Wq0WnU6HMAxJkoQoiuynOIfDwUopkVIihKAoCgAcx6Hdbm'.
+     'OMIU1T5vN55eBKEikljUYDIX6kFUKU9e8aDAZlmjcca+1b7TgO'.
+     '1+uVy+VS9nzfr8e53++VzdZaiqIgz3OMMWitOZ/PaK0JgqDeRC'.
+     'mF53lIKYGfr3O73TDGoJQiTVO01nS73XqT4/FIs9kkCAIej0eZ'.
+     'brPZEMcxSZKgtQZgMpmIWpN+vy+m06n1PK9yTx8Gy+WS/X5Pr9'.
+     'er9GuHLYoiG4YhSilOpxPr9Zrtdlti/JriU5MPjUYjq7UuEWaz'.
+     '2d+P/b/qv/zi75oetJcv7QQXAAAAAElFTkSuQmCC' ; 
+
+
+        //==========================================================
+        // File: bs_cyan.png
+        //==========================================================
+        $this->imgdata_small[12][0]= 633 ;
+        $this->imgdata_small[12][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAABPl'.
+     'BMVEX////////F///AwMCvxsaC1NSC0dGCz8+CzMyA//94//91'.
+     '//9q//9j//9X4uJX09NXz89Xx8dXxMRL//9L5uZL3d1L2NhLxs'.
+     'ZLt7cv//8e9fUe8fEe7u4e398epqYehoYX//8L+PgK//8F9fUE'.
+     '/v4E5+cEb28EZ2cC//8C/v4C/f0CzMwCrq4Cjo4CdXUCaWkCZW'.
+     'UB/PwA//8A/f0A+/sA8/MA7e0A7OwA6+sA5eUA5OQA4uIA4eEA'.
+     '3NwA2toA2NgA1dUA09MA0tIA0NAAysoAxsYAxcUAxMQAv78Avr'.
+     '4AvLwAtrYAtbUAs7MAsLAAra0Aq6sAqKgApaUApKQAoqIAoKAA'.
+     'n58AmpoAlZUAk5MAkpIAkJAAj48AjIwAiYkAh4cAf38AfX0Ae3'.
+     'sAenoAcnIAcHAAa2sAaWkAaGgAYmIUPEuTAAAAAXRSTlMAQObY'.
+     'ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAA'.
+     'AHdElNRQfTAwkUGQDi+VPPAAAAtElEQVR4nGNgIBawikipyIiy'.
+     'wfksfJpGRkamNtr8LFARPiMFHmFDcztXfwGoFi0jLiZuZRtnry'.
+     'BddrCIiJEGL6eklYO7X3iCOFhE2thESdHawdUnJDZFDiyiamZh'.
+     'aevk5h0UlZSpBhaRtbN3dPHwDY5MSM+EqBFzc/f0DgiLTkjLzI'.
+     'SYw6bjHxgaEZeckZmpD7GLQSAqJj4xNRMIBGFuFtRLA/ENhGBu'.
+     'ZmDgkJBXl5fgIDocAAKcINaFePT4AAAAAElFTkSuQmCC' ; 
+
+        //==========================================================
+        // File: bs_bluegreen.png
+        //==========================================================
+        $this->imgdata_small[13][0]= 493 ;
+        $this->imgdata_small[13][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAvV'.
+     'BMVEX///////+/v79j//855/8x3v851v9Spb1C1v8AOUqEtcZK'.
+     'lK1StdYxzv8hxv8AY4QASmNSlK1KpcZKtd4YQlIYnM4YrecIvf'.
+     '8AtfcAre8AjL0AhLUAc5wAa5QAWnsAQloAKTkAGCFKhJxKrdYY'.
+     'jL0Ypd4Atf8ArfcApecAnN4AlM4AjMYAe60Ac6UAY4wAUnNSnL'.
+     '0AlNYAWoQASmsAOVIAITGEtc4YWnsAUnsAMUqtvcaErcYAKUIA'.
+     'GCkAECHUyVh/AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAA'.
+     'AJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGxNUcXCT'.
+     'AAAAqUlEQVR4nI2Q1xKCMBREM2NHLCCogAGCjd6SqLT8/2cZKT'.
+     '6zb3tm987OBWCsXoejp8rC35fi4+l6gXFZlD0Rz6fZ1tdDmKR9'.
+     'RdOmkzmP7DDpilfX3SzvRgQ/Vr1uiZplfsCBiVf03RJd140wgj'.
+     'kmNqMtuYXcxyYmNWJdRoYwzpM9qRvGujuCmSR7q7ARY00/MiWk'.
+     'sCnjkobNEm1+HknDZgAqR0GKU43+wxdu2hYzbsHU6AAAAABJRU'.
+     '5ErkJggg==' ; 
+
+        //==========================================================
+        // File: bs_lightred.png
+        //==========================================================
+        $this->imgdata_small[14][0]= 532 ;
+        $this->imgdata_small[14][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAA3l'.
+     'BMVEX///////+/v7/Gvb0hGBj/5///3v//zu//1u//xucpGCG9'.
+     'nK21lKVSQkp7Wms5KTExISlaOUpjQlIhEBj/tdbOhKXnrcbGjK'.
+     'Wla4TetcbGnK2EWmv/rc73pcZ7UmOcY3vOpbW1jJzenLW9e5Rz'.
+     'Slq1c4xrQlJSOULGhJz/pcb3nL2chIzOnK33rcbelK3WjKWMWm'.
+     'vGe5SEUmM5ISnOtb3GrbXerb3vpb2ca3v/rcaUY3POhJxCKTF7'.
+     'SlrWnK21e4ytc4TvnLXnlK2la3taOUK1lJxrSlLGhJRjQkpSMT'.
+     'lw+q2nAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ'.
+     'cwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAwkUGjoP2Nm+AAAAr0'.
+     'lEQVR4nGNgIBaYiOk62imYwPnMkiIyso76yhJSzFARMxkRNk49'.
+     'a3t5OW6oFk1LVkYOfWUHKxUXiEYzLS12DnN3VXkjIRtFsIiSk5'.
+     '6evqGqhYGKugAfWMRa1FpD2UHeQEXQRlgALCJur+rgbCUNFOAS'.
+     'hqjRkZe3MpBTcwEKCEPMMTGSs3Xz8OQHCnBBHckt6OJpIyAMBD'.
+     'wwN/MYc4H4LK4wNzMwmGrzcvFqmxIdDgDiHRT6VVQkrAAAAABJ'.
+     'RU5ErkJggg==' ;
+
+        //==========================================================
+        // File: bxs_lightred.png
+        //==========================================================
+        $this->imgdata_xsmall[0][0]= 432 ;
+        $this->imgdata_xsmall[0][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAA3l'.
+     'BMVEX///////+/v7/Gvb0hGBj/5///3v//zu//1u//xucpGCG9'.
+     'nK21lKVSQkp7Wms5KTExISlaOUpjQlIhEBj/tdbOhKXnrcbGjK'.
+     'Wla4TetcbGnK2EWmv/rc73pcZ7UmOcY3vOpbW1jJzenLW9e5Rz'.
+     'Slq1c4xrQlJSOULGhJz/pcb3nL2chIzOnK33rcbelK3WjKWMWm'.
+     'vGe5SEUmM5ISnOtb3GrbXerb3vpb2ca3v/rcaUY3POhJxCKTF7'.
+     'SlrWnK21e4ytc4TvnLXnlK2la3taOUK1lJxrSlLGhJRjQkpSMT'.
+     'lw+q2nAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ'.
+     'cwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAwkUKBOgGhWjAAAAS0'.
+     'lEQVR4nGNgQAEmunYmEJaMCKe1vBxYzJKVQ9lKBSSupKdnaKGi'.
+     'zgdkiqs6WKnYcIGYJnK2HvzCwmCNgi42wsLCECNMeXlNUY0HAL'.
+     'DaB7Du8MiEAAAAAElFTkSuQmCC' ; 
+
+        //==========================================================
+        // File: bxs_bluegreen.png
+        //==========================================================
+        $this->imgdata_xsmall[1][0]= 397 ;
+        $this->imgdata_xsmall[1][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAvV'.
+     'BMVEX///////+/v79j//855/8x3v851v9Spb1C1v8AOUqEtcZK'.
+     'lK1StdYxzv8hxv8AY4QASmNSlK1KpcZKtd4YQlIYnM4YrecIvf'.
+     '8AtfcAre8AjL0AhLUAc5wAa5QAWnsAQloAKTkAGCFKhJxKrdYY'.
+     'jL0Ypd4Atf8ArfcApecAnN4AlM4AjMYAe60Ac6UAY4wAUnNSnL'.
+     '0AlNYAWoQASmsAOVIAITGEtc4YWnsAUnsAMUqtvcaErcYAKUIA'.
+     'GCkAECHUyVh/AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAA'.
+     'AJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAwkUKDVyF5Be'.
+     'AAAASUlEQVR4nGNgQAFmYqJcEJaEOJ+UrD5YTJKFTZrfGCQuaq'.
+     'glLWvMaQ5kqujo6hnbKIKYXPr68gp2dmCNJiZAlh3ECGsREWtU'.
+     '4wF1kwdpAHfnSwAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: bxs_navy.png
+        //==========================================================
+        $this->imgdata_xsmall[2][0]= 353 ;
+        $this->imgdata_xsmall[2][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAk1'.
+     'BMVEX///////+/v7+trcbGxv+EhM6EhNaEhP97e/9zc/9ra/9S'.
+     'UsZKSrVSUs5jY/9SUtZKSsZSUudKSt5KSudKSv8YGIQpKf8YGK'.
+     'UYGN4YGO8YGPcQEP8ICP8AAP8AAPcAAO8AAOcAAN4AANYAAM4A'.
+     'AMYAAL0AALUAAK0AAKUAAJwAAJQAAIwAAIQAAHsAAHMAAGsAAG'.
+     'ONFkFbAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ'.
+     'cwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAwkUJxXO4axZAAAAR0'.
+     'lEQVR4nGNgQAGskhKsEJaslIi8ijpYTJaDU1FVAyQuKSujoKKh'.
+     'LQ5kSigpqWro6oOYrOoaWroGBmCNWiCWAdQwUVFWVOMBOp4GCJ'.
+     's5S60AAAAASUVORK5CYII=' ; 
+
+        //==========================================================
+        // File: bxs_gray.png
+        //==========================================================
+        $this->imgdata_xsmall[3][0]= 492 ;
+        $this->imgdata_xsmall[3][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAABI1'.
+     'BMVEX///8AAAD8EAD8IAD8NAD8RAD8VAAYGBi/v7+goKCCgoJk'.
+     'ZGRGRkb8yAD83AD87AD8/AD4+ADo+ADY+ADI+AC0+ACk+ACU+A'.
+     'CE+AB0/ABk/ABU/ABE/AAw/AAg/AAQ/AAA/AAA+AAA6BAA2CAA'.
+     'yDQAtEQApFQAlGQAhHQAdIgAZJgAVKgARLgAMMgAINwAEOwAAP'.
+     'wAAPgIAPAQAOgYAOAkANgsANA0AMg8AMBEALhMALBUAKhcAKBo'.
+     'AJhwAJB4AIiAAID////4+Pjy8vLs7Ozm5ubg4ODa2trT09PNzc'.
+     '3Hx8fBwcG7u7u1tbWurq6oqKiioqKcnJyWlpaQkJCJiYmDg4N9'.
+     'fX13d3dxcXFra2tkZGReXl5YWFhSUlJMTExGRkZAQEA1BLn4AA'.
+     'AAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxEA'.
+     'AAsRAX9kX5EAAAAHdElNRQfTAwkUKC74clmyAAAAQklEQVR4nG'.
+     'NgQAVBYVCGt5dXYEQ0mOnp5h4QFgVmeri6+4dHxYMVeHoFRUTH'.
+     'gTUFBIZBWAwMkZEx8bFQM2Lj0UwHANc/DV6yq/BiAAAAAElFTk'.
+     'SuQmCC' ; 
+
+        //==========================================================
+        // File: bxs_graypurple.png
+        //==========================================================
+        $this->imgdata_xsmall[4][0]= 542 ;
+        $this->imgdata_xsmall[4][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAABSl'.
+     'BMVEX////////11P/MqdvKrNfAwMC+u7+9u7+4rr24lsi3rby3'.
+     'lMe1rLq1o720q7i0oL20ksSzoryyqbaykMGxlb2wkL+vnbiujb'.
+     '2sjLuri7qpl7GoirWoibenmK2mla6mjLKmhrSllauki7CjhrCj'.
+     'hLGihLChg6+ggq2fkqadkKOcfqqai6Gag6WYe6WXeqSWeaOTd6'.
+     'CTd5+Rdp6RdZ6RdZ2Qg5eOc5qMcpiLcZeJb5WIbpOHbZKGbJGE'.
+     'a4+CaY2AZ4t/Z4p/Zop/Zol+Zol7ZIZ6Y4V5YoR1ZH11X391Xn'.
+     '9zXX1yXXtxXHtvWnluWXhsV3VqVnNpVXJoVHFnU3BmUm9jUGth'.
+     'VGdgTmheTGZcS2RcSmRaSWJYR19XRl5SQllRQlhQQVdPQFZOP1'.
+     'VLPlFJO09IPE5IOk5FOEtEN0lDOEpDOElDNklCNkc/M0XhbrfD'.
+     'AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACx'.
+     'EAAAsRAX9kX5EAAAAHdElNRQfTAwkUKCgREfyHAAAATUlEQVR4'.
+     'nGNgQAEcIko8EBY3M5Ougy+IxSXMwmTsFsAHZMqrSRvZB0W7A5'.
+     'k6FlYugXEZICaPr394Um4uSAFDRFRCbm4uxAihsDAhVOMBHT0L'.
+     'hkeRpo8AAAAASUVORK5CYII=' ; 
+
+        //==========================================================
+        // File: bxs_red.png
+        //==========================================================
+        $this->imgdata_xsmall[5][0]= 357 ;
+        $this->imgdata_xsmall[5][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAk1'.
+     'BMVEX////////GxsbGra3/xsbOhITWhIT/hIT/e3v/c3P/a2vG'.
+     'UlK1SkrOUlL/Y2PWUlLGSkrnUlLeSkrnSkr/SkqEGBj/KSmlGB'.
+     'jeGBjvGBj3GBj/EBD/CAj/AAD3AADvAADnAADeAADWAADOAADG'.
+     'AAC9AAC1AACtAAClAACcAACUAACMAACEAAB7AABzAABrAABjAA'.
+     'BuukXBAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZ'.
+     'cwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAwkUIyjy5SVMAAAAS0'.
+     'lEQVR4nGNgQAFsUpJsEJastIi8ijpYTJaDU0FVgxXIlJKVUVDR'.
+     '0BYHMiUUlVQ1dPVBTDZ1dS1dAwOQAgYtbSDLAGIEq6goK6rxAD'.
+     'yXBg73lwGUAAAAAElFTkSuQmCC' ; 
+
+        //==========================================================
+        // File: bxs_yellow.png
+        //==========================================================
+        $this->imgdata_xsmall[6][0]= 414 ;
+        $this->imgdata_xsmall[6][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAzF'.
+     'BMVEX///////+/v79zYwCMewDOxoTWzoTezkr/5wj/5wDnzgDe'.
+     'xgC1pQCtnACllACcjACUhABjWgDGvVK1rUrOxlLGvUqEexilnB'.
+     'jv3hj35xj/7wj/7wD35wDv3gDn1gDezgDWxgDOvQDGtQC9rQCE'.
+     'ewB7cwBzawBrYwDWzlLn3lLe1krn3kre1hi9tQC1rQCtpQClnA'.
+     'CclACUjACMhAD/9wC/v7///8bOzoT//4T//3v//3P//2v//2Pn'.
+     '50r//0r//yn39xj//xD//wBjYwDO8noaAAAAAXRSTlMAQObYZg'.
+     'AAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAH'.
+     'dElNRQfTAwkUIzoBXFQEAAAAS0lEQVR4nGNgQAFsDhJsEJaTo5'.
+     '2skj5YzMnSSk7ZwBzIlOSUklPiMxYHMnW4FXT5VNVBTDZeXiNV'.
+     'QUGQAgYBYyBLEGIEq5gYK6rxAH4kBmHBaMQQAAAAAElFTkSuQm'.
+     'CC' ; 
+
+        //==========================================================
+        // File: bxs_greenblue.png
+        //==========================================================
+        $this->imgdata_xsmall[7][0]= 410 ;
+        $this->imgdata_xsmall[7][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAxl'.
+     'BMVEX///////+/v79znJQhSkJ7raU5hHtjraVKnJRCjIRClIyU'.
+     '9++E595avbVaxr2/v7+ctbWcvb17nJxrjIx7paUxQkK9//+Mvb'.
+     '17ra2Evb17tbVCY2MQGBiU5+ec9/eM5+d71tZanJxjra1rvb1j'.
+     'tbVSnJxara1rzs5jxsZKlJRChIQpUlIhQkJatbVSpaU5c3MxY2'.
+     'MYMTEQISFavb1Sra1KnJxCjIw5e3sxa2spWlpClJQhSkoYOTkp'.
+     'Y2MhUlIQKSkIGBgQMTH+e30mAAAAAXRSTlMAQObYZgAAAAFiS0'.
+     'dEAIgFHUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElNRQfT'.
+     'AwkUJy5/6kV9AAAATUlEQVR4nGNgQAGCyuyCEJaGugKHviVYzF'.
+     'hO3sxCWwDIVNLTM9PXtpEGMhW12Cy0DR1ATEFLSxZ7BweQAgYd'.
+     'HUMHBweIEQKiogKoxgMAo/4H5AfSehsAAAAASUVORK5CYII=' ; 
+
+        //==========================================================
+        // File: bxs_purple.png
+        //==========================================================
+        $this->imgdata_xsmall[8][0]= 364 ;
+        $this->imgdata_xsmall[8][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAnF'.
+     'BMVEX///////+/v7/Gvca9rb3Grcb/xv+1hLWte629hL21e7XG'.
+     'hMbWhNbOe87We9b/hP//e/97OXv/c///a///Y/+cOZz/Sv/WOd'.
+     'bnOefvOe//Kf9jCGNrCGv/EP//CP/nCOf/AP/3APfvAO/nAOfe'.
+     'AN7WANbOAM7GAMa9AL21ALWtAK2lAKWcAJyUAJSMAIyEAIR7AH'.
+     'tzAHNrAGtjAGPP1sZnAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgF'.
+     'HUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAwkUIj'.
+     'mBTjT/AAAASUlEQVR4nGNgQAGskhKsEJaCrJiSuhZYTEFASFlD'.
+     'GyQuqSCnrK6tJwpkiquoamgbGIGYrFpaugbGxmCNunpAljHECB'.
+     'ZBQRZU4wFSMAZsXeM71AAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: bxs_green.png
+        //==========================================================
+        $this->imgdata_xsmall[9][0]= 370 ;
+        $this->imgdata_xsmall[9][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAAAn1'.
+     'BMVEX///////+/v7+/v7/G/8aUxpSMvYyUzpSMzoyM1oxarVqE'.
+     '/4R7/3tavVpKnEpaxlpz/3Nr/2tKtUpj/2Na51pKzkpK1kpK50'.
+     'pK/0oYcxgp/ykYlBgY3hgY7xgY9xgQ/xAI/wgA/wAA9wAA7wAA'.
+     '5wAA3gAA1gAAzgAAxgAAvQAAtQAArQAApQAAnAAAlAAAjAAAhA'.
+     'AAewAAcwAAawAAYwA0tyxUAAAAAXRSTlMAQObYZgAAAAFiS0dE'.
+     'AIgFHUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAw'.
+     'kUKBrZxq0HAAAATElEQVR4nGNgQAGccrIcEJaivISyhjaIxa7I'.
+     'I6CiqcMKZMopKqho6OhLA5kyqmqaOobGICartraeoYkJSAGDnj'.
+     '6QZQIxgk1Skg3VeABlVgbItqEBUwAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: bxs_darkgreen.png
+        //==========================================================
+        $this->imgdata_xsmall[10][0]= 563 ;
+        $this->imgdata_xsmall[10][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAABX1'.
+     'BMVEX////////l/+nAwMC86r+8wb28wby8wLy78sCzw7SywrSx'.
+     'wLKwvrGuvK+syK+ryq2rx62n36ym3aumxKmk2qij0Keh16ahva'.
+     'Og1aSguKKe06KeuaCetZ+d0KGdtZ+bz6Cay56ZyZ2Zwp2Zr5qZ'.
+     'rpqYwJuXyZuXrJmVw5mUxZiTxJeTw5eTq5WRwJWPtJKOvZKKuI'.
+     '6Kt42Kn4yJt42ItIuGsomFsYmEsIiEr4eDr4eBrIR/qoN+qIJ8'.
+     'poB7pH56o356on14nnt2nXl0mndzmnZzmXZymHVwlXNvlHJukn'.
+     'FtiHBqjm1qjW1oi2toiWpniWplh2hlhmdkhWdig2VggGNgf2Je'.
+     'fmFdfGBde19bbl1aeFxXdFpWclhVclhVcVdUcFZTb1VSbVRQal'.
+     'JPaVFKY0xKYkxJYUtIYEpHX0lEWkZCWERCV0NCVkM/U0A+U0A+'.
+     'UUA+UEA9Uj89UT48Tj45TDvewfrHAAAAAXRSTlMAQObYZgAAAA'.
+     'FiS0dEAIgFHUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElN'.
+     'RQfTAwkUKCFozUQjAAAATUlEQVR4nGNgQAGcoqrcEJYQB5OhSw'.
+     'CIxSXGwWThGcIDZCppK5o7hyV6AZl6NnbuoSmFICZ3YHB0RkkJ'.
+     'SAFDbEJaSUkJxAjeyEheVOMBQj4MOEkWew4AAAAASUVORK5CYI'.
+     'I=' ; 
+
+        //==========================================================
+        // File: bxs_cyan.png
+        //==========================================================
+        $this->imgdata_xsmall[11][0]= 530 ;
+        $this->imgdata_xsmall[11][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAABPl'.
+     'BMVEX////////F///AwMCvxsaC1NSC0dGCz8+CzMyA//94//91'.
+     '//9q//9j//9X4uJX09NXz89Xx8dXxMRL//9L5uZL3d1L2NhLxs'.
+     'ZLt7cv//8e9fUe8fEe7u4e398epqYehoYX//8L+PgK//8F9fUE'.
+     '/v4E5+cEb28EZ2cC//8C/v4C/f0CzMwCrq4Cjo4CdXUCaWkCZW'.
+     'UB/PwA//8A/f0A+/sA8/MA7e0A7OwA6+sA5eUA5OQA4uIA4eEA'.
+     '3NwA2toA2NgA1dUA09MA0tIA0NAAysoAxsYAxcUAxMQAv78Avr'.
+     '4AvLwAtrYAtbUAs7MAsLAAra0Aq6sAqKgApaUApKQAoqIAoKAA'.
+     'n58AmpoAlZUAk5MAkpIAkJAAj48AjIwAiYkAh4cAf38AfX0Ae3'.
+     'sAenoAcnIAcHAAa2sAaWkAaGgAYmIUPEuTAAAAAXRSTlMAQObY'.
+     'ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAA'.
+     'AHdElNRQfTAwkUKQFKuFWqAAAATUlEQVR4nGNgQAGsUjJsEJaR'.
+     'grC5qz9YzIiL28YriB3IlDZRsnYNiZUDMmXtHT2CE9JBTDb/wI'.
+     'jkzEyQAoaomMTMzEyIERzy8hyoxgMAN2MLVPW0f4gAAAAASUVO'.
+     'RK5CYII=' ; 
+
+        //==========================================================
+        // File: bxs_orange.png
+        //==========================================================
+        $this->imgdata_xsmall[12][0]= 572 ;
+        $this->imgdata_xsmall[12][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAABaF'.
+     'BMVEX//////////8X/3oD/3nj/1HX/0Gr/xGP/rkv/gBf+iS/2'.
+     'bAL1agDxaQDuZwDrZwLpZQDmZQLlZADjcx7gZATeYQDdZgraXw'.
+     'DZXwHYXgDXiEvXZAvUjlfUXwXTjVfTbR7ShUvRbR7RWwDMWQDL'.
+     'WADKooLKWADJoYLJgkvHWATGoILFn4LFgEvFVgDEZx7EVQDDt6'.
+     '/DVQDCt6/CnoLChlfCVADAwMC+hFe+UgC8UgC6UQC4gVe4UAC3'.
+     'gVe3UAC1gFe1eUu1TwC1TgCzTgCwTQKuTACrSgCqSgCpSgCpSQ'.
+     'CodEulSACkRwCiRgCdRACcRACaQwCYQgCWQgKVQQCVQACUQACS'.
+     'UR6RPwCOPgCNPQCLPACKPACJOwCEOQCBOAB+NwB9NgB8NgB7NQ'.
+     'B6NwJ4NAB3RR52MwB0MgBuLwBtLwBsLwBqLgBpLQBkLQJiKgBh'.
+     'KgBgKwRcKABbKQJbJwBaKQRaJwBYKAJVJQDZvdIYAAAAAXRSTl'.
+     'MAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxEAAAsRAX9k'.
+     'X5EAAAAHdElNRQfTAwkUJBSSy88MAAAATUlEQVR4nGNgQAGqwo'.
+     'paEBYPJ4eKezCIpc7HwmrqG6ENZMpLihm6RaWEAZl6Vo7ekRnF'.
+     'IKZWSHhcTnk5SAFDfFJWeXk5xAjj1FRjVOMBeFwNcWYSLjsAAA'.
+     'AASUVORK5CYII=' ; 
+
+        //==========================================================
+        // File: bxs_lightblue.png
+        //==========================================================
+        $this->imgdata_xsmall[13][0]= 554 ;
+        $this->imgdata_xsmall[13][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAMAAAC67D+PAAABVl'.
+     'BMVEX////////d///AwMC7wcS08P+y+P+xxdCwxM+uws2twMur'.
+     'vsinzNynytylzuKhyN6e5v6d5P+d1fOcwNWcu8ub4f+at8iZ3v'.
+     '+ZvdGY2/yW2f+VscGU1vuT1fqTr72Sx+SSxeKR0fWRz/GPz/OP'.
+     'rr+OyeqMy+6Myu2LyeyKxueJudSGw+SGorGDvt+Cvd6CvN2Aud'.
+     'p+uNd+t9Z9tdV8tdR8tNN6sc94r813rct2q8h0qcZ0qMVzp8Rx'.
+     'o8Bwor5tn7ptnrptnrlsnbhqmbRpmbNpi51ol7Flkqtkkqtkka'.
+     'pjj6hijaRhjaZgi6NfiqJfiaFdh55bhJtag5pZgphYgJZYf5VX'.
+     'cn9Ve5FSeI1RdopRdYlQdYlPc4dPcoZPcoVNcINLboBLbH9GZn'.
+     'hGZXdFZHZEY3RDYnJCXW4/W2s/WWg+Wmo7VmU7VGM7U2E6VGM6'.
+     'VGI5UV82T1wGxheQAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHU'.
+     'gAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElNRQfTAwkUJziL'.
+     'PvAsAAAATUlEQVR4nGNgQAHsQgqcEJYgG5Oegy+IxSHOxmTiFs'.
+     'gFZMprKBnbB8e7AplaFlbOQUl5ICanX0BEWmEhSAFDVGxKYWEh'.
+     'xAjusDBuVOMBJO8LrFHRAykAAAAASUVORK5CYII=' ; 
+
+        //==========================================================
+        // File: bxs_darkgray.png
+        //==========================================================
+        $this->imgdata_xsmall[14][0]= 574 ;
+        $this->imgdata_xsmall[14][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABm'.
+     'JLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAAsRAAALEQF/ZF+RAAAB'.
+     'iElEQVR42k3QPU8TYRwA8P//ebkXrgdIColXRAOEkJqbaExMut'.
+     'DBhE1GNjYHPg+DG6ODiU6QOLjVxITBcFKBYCstlAC2Bz17fe76'.
+     'vLD6+wg/1FpTRFR5lpaub/u1eGBGaAT4HneD4OlXx7avtDYUjT'.
+     'HQabd2Ti8e3vVSKzxrtHS32wIpFVldno22Nqvvg2Bhl0gp/aNm'.
+     'vJ3qqXAtLIva+ks1H0wqlSXi4+d6+OFTfRsAfHJx2d1od24rZP'.
+     'xP2HzopINr1mkesX7ccojqif0v9crxWXODZTno3+dNGA7uWLsd'.
+     'mUYU4fHJCViMG9umLBmM4L6fagZGg9QKfjZ+Qfy3C3G/B3mugF'.
+     'IHHNcDf64E3KJALApk2p8CSolUUqLjFkyxOGMsTtFyJ+Wz57NQ'.
+     '8DghS4sLB0svioeZZo7nPhFoUKZDIVFbglkTTnl5/rC8snjAkJ'.
+     'Bk/XV5LxHC/v7tR8jzTFPbg8LENK9WX0Vv31T2AEmCSmlKCCoh'.
+     'ROnP1U1tPFYjJBRcbtzSf+GPsFTAQBq1n4AAAABKdEVYdHNpZ2'.
+     '5hdHVyZQBiYzYyMDIyNjgwYThjODMyMmUxNjk0NWUzZjljOGFh'.
+     'N2VmZWFhMjA4OTE2ZjkwOTdhZWE1MzYyMjk0MWRkM2I5EqaPDA'.
+     'AAAABJRU5ErkJggg==' ; 
+    }
+}
+
+?>
diff --git a/common/lib/jpgraph_lib/imgdata_bevels.inc b/common/lib/jpgraph_lib/imgdata_bevels.inc
old mode 100644
new mode 100755
diff --git a/common/lib/jpgraph_lib/imgdata_bevels.inc.php b/common/lib/jpgraph_lib/imgdata_bevels.inc.php
new file mode 100644
index 000000000..c98fa571f
--- /dev/null
+++ b/common/lib/jpgraph_lib/imgdata_bevels.inc.php
@@ -0,0 +1,104 @@
+<?php
+//=======================================================================
+// File:        IMGDATA_BEVELS.INC
+// Description: Base64 encoded images for round bevels
+// Created:     2003-03-20
+// Ver:         $Id: imgdata_bevels.inc.php 1106 2009-02-22 20:16:35Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+class ImgData_Bevels extends ImgData {
+    protected $name = 'Round Bevels';
+    protected $an = array(MARK_IMG_BEVEL => 'imgdata');
+
+    protected $colors = array('green','purple','orange','red','yellow');
+    protected $index  = array('green'=>1,'purple'=>4,'orange'=>2,'red'=>0,'yellow'=>3);
+    protected $maxidx = 4 ;
+
+    protected $imgdata ;
+
+    function __construct() {
+        //==========================================================
+        // File: bullets_balls_red_013.png
+        //==========================================================
+        $this->imgdata[0][0]= 337 ;
+        $this->imgdata[0][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAM1'.
+     'BMVEX////////27t/f3+LFwcmNxMuxm62DmqKth1VpZmIWg6fv'.
+     'HCa7K0BwMEytCjFnIyUlEBg9vhQvAAAAAXRSTlMAQObYZgAAAA'.
+     'FiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElN'.
+     'RQfTAxcBNhk+pYJVAAAAl0lEQVR4nE2Q2xLDIAgFHUWBKJf//9'.
+     'oekmbafVDZARRbK/pYTKP9WNcNv64zzUdd9BjmrgnsVXRNSzO3'.
+     'CJ5ahdhy0XKQkxld1kxb45j7dp0x2lBNOyVgQpMaoadX7Hs7zr'.
+     'P1yKj47DKBnKaBKiSAkNss7O6PkMx6kIgYXISQJpcZCqdY6KR+'.
+     'J1PkS5Xob/h7MNz8x6D3fz5DKQjpkZOBYAAAAABJRU5ErkJggg'.
+     '==' ; 
+
+        //==========================================================
+        // File: bullets_balls_green_013.png
+        //==========================================================
+        $this->imgdata[1][0]= 344 ;
+        $this->imgdata[1][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAM1'.
+     'BMVEX////////27t/e3+K3vriUub/Dm18j4xc3ob10k0ItqQlU'.
+     'e5JBmwpxY1ENaKBgUh0iHgwsSre9AAAAAXRSTlMAQObYZgAAAA'.
+     'FiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElN'.
+     'RQfTAxcBNTfJXtxZAAAAnklEQVR4nE2QWY4EMQhDUVhSIRC4/2'.
+     'kbaqLp9p+f2AxAayAzDfiK9znPORuvH0x8Ss9z6I9sHp6tcxE9'.
+     'nLmWmebmt5F5p2AR0+C9AWpLBjXRaZsCAT3SqklVp0YkAWaGtd'.
+     'c5Z41/STYpPzW7BjyiRrwkVmQto/Cw9tNEMvsgcekyCyFPboIu'.
+     'IsuXiKffYB4NK4r/h6d4g9HPPwCR7i8+GscIiiaonUAAAAAASU'.
+     'VORK5CYII=' ; 
+
+        //==========================================================
+        // File: bullets_balls_oy_035.png
+        //==========================================================
+        $this->imgdata[2][0]= 341 ;
+        $this->imgdata[2][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAM1'.
+     'BMVEX////////27t/f3+K5tbqNwcjnkjXjbxR2i5anfEoNkbis'.
+     'PBxpU0sZbZejKgdqIRIlERIwYtkYAAAAAXRSTlMAQObYZgAAAA'.
+     'FiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElN'.
+     'RQfTAxcBNgK0wEu5AAAAm0lEQVR4nE3QVxIEIQgEUErAgTHA/U'.
+     '+7zbipf9RXgoGo0liMmX6RdSPLPtZM9F4LuuSIaZtZWffiU6Iz'.
+     'Y8SOMF0NogBj30ioGRGLZgiPvce1TbIRz6oBQEbOFGK0rIoxrn'.
+     '5hDomMA1cfGRCaRVhjS3gkzheM+4HtnlkXcvdZhWG4qZawewe6'.
+     '9Jnz/TKLB/ML6HUepn//QczazuwFO/0Ivpolhi4AAAAASUVORK'.
+     '5CYII=' ; 
+
+        //==========================================================
+        // File: bullets_balls_oy_036.png
+        //==========================================================
+        $this->imgdata[3][0]= 340 ;
+        $this->imgdata[3][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAM1'.
+     'BMVEX////////27t/e3+LO3hfYzz65ubiNwci6uQ12ipadgVGa'.
+     'fwsNkbhnVkcaZ5dwSA8lFg7CEepmAAAAAXRSTlMAQObYZgAAAA'.
+     'FiS0dEAIgFHUgAAAAJcEhZcwAACxEAAAsRAX9kX5EAAAAHdElN'.
+     'RQfTAxcCBySi1nevAAAAjElEQVR4nFXPWw7EIAgFUNMoCMhj/6'.
+     'staKczc/2RkwjS2glQ+w3YytgXCXCZpRo8gJdGxZadJws13CUP'.
+     '4SZI4MYiUxypeiGGw1XShVBTNN9kLXP2GRrZPFvKgd7z/sqGGV'.
+     '7C7r7r3l09alYN3iA8Yn+ImdVrNoEeSRqJPAaHfhZzLYwXstdZ'.
+     'rP3n2bvdAI4INwtihiwAAAAASUVORK5CYII=' ;
+
+        //==========================================================
+        // File: bullets_balls_pp_019.png
+        //==========================================================
+        $this->imgdata[4][0]= 334 ;
+        $this->imgdata[4][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAMAAAAMs7fIAAAAM1'.
+     'BMVEX////+/v7i4eO/w8eHxcvKroNVormtfkjrMN2BeXQrepPc'.
+     'Esy4IL+OFaR7F25LHF8mFRh5XXtUAAAAAXRSTlMAQObYZgAAAA'.
+     'FiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElN'.
+     'RQfTAxcBNgkjEpIxAAAAlElEQVR4nE2QAQ7FIAhDDTAVndL7n3'.
+     'ZV/7JfEwMvFIWUlkTMVNInbVv5ZeJqG7Smh2QTBwJBpsdizAZP'.
+     '5NyW0awhK8kYodnZxS6ECvPRp2sI+y7PBv1mN02KH7h77QCJ8D'.
+     '4VvY5NUgEmCwj6ZMzHtJRgRSXwC1gfcqJJH0GBnSnK1kUQ72DY'.
+     'CPBv+MCS/e0jib77eQAJxwiEWm7hFwAAAABJRU5ErkJggg==' ; 
+
+    }
+}
+
+
+?>
diff --git a/common/lib/jpgraph_lib/imgdata_diamonds.inc b/common/lib/jpgraph_lib/imgdata_diamonds.inc
old mode 100644
new mode 100755
diff --git a/common/lib/jpgraph_lib/imgdata_diamonds.inc.php b/common/lib/jpgraph_lib/imgdata_diamonds.inc.php
new file mode 100644
index 000000000..a0d6a4215
--- /dev/null
+++ b/common/lib/jpgraph_lib/imgdata_diamonds.inc.php
@@ -0,0 +1,177 @@
+<?php
+//=======================================================================
+// File:        IMGDATA_DIAMONDS.INC
+// Description: Base64 encoded images for diamonds
+// Created:     2003-03-20
+// Ver:         $Id: imgdata_diamonds.inc.php 1106 2009-02-22 20:16:35Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+class ImgData_Diamonds extends ImgData {
+    protected $name = 'Diamonds';
+    protected $an = array(MARK_IMG_DIAMOND =>'imgdata');
+    protected $colors = array('lightblue','darkblue','gray',
+   'blue','pink','purple','red','yellow');
+    protected $index  = array('lightblue' =>7,'darkblue'=>2,'gray'=>6,
+   'blue'=>4,'pink'=>1,'purple'=>5,'red'=>0,'yellow'=>3);
+
+    protected $maxidx = 7 ;
+    protected $imgdata ;
+
+    function __construct() {
+        //==========================================================
+        // File: diam_red.png
+        //==========================================================
+        $this->imgdata[0][0]= 668 ;
+        $this->imgdata[0][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbCAMAAAC6CgRnAAAA/F'.
+     'BMVEX///////+cAAD/AADOAABjAABrAADWGBjOCAj/CAj/GBj/'.
+     'EBCcCAiMOTl7KSl7ISFzGBilGBjOEBBrCAjv5+eMQkK1QkKtMT'.
+     'GtKSnWKSn/KSlzEBCcEBDexsb/tbXOe3ucWlqcUlKUSkr/e3vn'.
+     'a2u9UlL/a2uEMTHeUlLeSkqtOTn/UlL/SkrWOTn/QkL/OTmlIS'.
+     'H/MTH/ISH39/f/9/f35+fezs7/5+fvzs7WtbXOra3nvb3/zs7G'.
+     'nJzvtbXGlJTepaW9jIy1hITWlJS1e3uta2ulY2P/lJTnhITne3'.
+     'vGY2O9Wlr/c3PeY2O1Skr/Y2P/WlreQkLWISGlEBCglEUaAAAA'.
+     'AXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAA'.
+     'sSAdLdfvwAAAAHdElNRQfTAwsWEw5WI4qnAAABGUlEQVR4nHXQ'.
+     '1XLDMBAFUKUCM1NiO8zcpIxpp8z0//9SWY7b2LHv6EU6s1qtAN'.
+     'iMBAojLPkigpJvogKC4pxDuQipjanlICXof1RQDkYEF21mKIfg'.
+     '/GGKtjAmOKt9oSyuCU7OhyiDCQnjowGfRnooCJIkiWJvv8NxnG'.
+     'nyNAwFcekvZpPP3mu7Vrp8fOq8DYbTyjdnAvBj7Jbd7nP95urs'.
+     '+MC2D6unF+Cu0VJULQBAlsOQuueN3Hrp2nGUvqppemBZ0aU7Se'.
+     'SXvYZFMKaLJn7MH3btJmZEMEmGSOreqy0SI/4ffo3uiUOYEACy'.
+     'OFopmNWlP5uZd9uPWmUoxvK9ilO9NtBo6mS7KkZD0fOJYqgGBU'.
+     'S/T7OKCAA9tfsFOicXcbxt29cAAAAASUVORK5CYII=' ; 
+
+        //==========================================================
+        // File: diam_pink.png
+        //==========================================================
+        $this->imgdata[1][0]= 262 ;
+        $this->imgdata[1][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbBAMAAAB/+ulmAAAAEl'.
+     'BMVEX///+AgID/M5n/Zpn/zMz/mZn1xELhAAAAAXRSTlMAQObY'.
+     'ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAA'.
+     'AHdElNRQfTAwsWEi3tX8qUAAAAbUlEQVR4nFXJwQ3AMAhDUdRm'.
+     'kKojuCswABf2X6UEEiC+WF+PyDfoGEuvwXogq3Rk1Y6W0tBSG8'.
+     '6Uwpla6CmJnpoYKRsjjb/Y63vo9kIkLcZCCsbGYGwMRqIzEp1R'.
+     'OBmFk9HQGA2N0ZEIz5HX+h/jailYpfz4dAAAAABJRU5ErkJggg'.
+     '==' ; 
+
+        //==========================================================
+        // File: diam_blue.png
+        //==========================================================
+        $this->imgdata[2][0]= 662 ;
+        $this->imgdata[2][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbCAMAAAC6CgRnAAAA+V'.
+     'BMVEX///+AgIAAAJwAAP8AAM4AAGMAAGsQEP8YGHMQEHMYGP8Q'.
+     'EKUICJwICM5KSpQxMYQpKXsYGNYQEM4ICGsICP97e85aWpw5OY'.
+     'xSUv85ObVCQt4xMa0pKa0hIaUpKf+9vd6EhLVra+dzc/9SUr1r'.
+     'a/9aWt5SUt5CQrVaWv9KSv8hIXs5Of8xMf8pKdYhIdYYGKUhIf'.
+     '/Ozs739//v7/fn5+/v7//n5/fW1ufOzufOzu/W1v+trc69veel'.
+     'pc6trd6UlMa9vf+MjL21tfe1tf+UlNZzc61ra6Wlpf+EhOeMjP'.
+     '9ra8ZSUpyEhP9CQoxKSrVCQv85Od4xMdYQENZnJhlWAAAAAXRS'.
+     'TlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAd'.
+     'LdfvwAAAAHdElNRQfTAwsWEx3Snct5AAABFklEQVR4nHXR5XbD'.
+     'IBgGYM6AuHsaqbvOfeuknev9X8xISbplSd5/8JyXwwcA/I0AKm'.
+     'PFchVBdvKNKggKQx2VIoRwMZihMiQE49YUlWBCcPL0hYq4ITh+'.
+     'qKECUoLDZWqoQNA766F/mJHlHXblPJJNiyURhM5eU9cNw5BlmS'.
+     'IrLOLxhzfotF7vwO2j3ez2ap/TmW4AIM7DoN9+tu+vLk6Pdg9O'.
+     '6ufXjfXLm6pxPACSJIpRFAa+/26DhuK6qjbiON40k0N3skjOvm'.
+     'NijBmchF5mi+1jhQqDmWyIzPp1hUlrv8On5l+6mMm1tigFNyrt'.
+     '5R97g+FKKyGKkTNKesXPJTZXOFIrUoKiypcTQVHjK4g8H2dWEQ'.
+     'B8bvUDLSQXSr41rmEAAAAASUVORK5CYII=' ; 
+
+        //==========================================================
+        // File: diam_yellow.png
+        //==========================================================
+        $this->imgdata[3][0]= 262 ;
+        $this->imgdata[3][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbBAMAAAB/+ulmAAAAEl'.
+     'BMVEX///+AgIBmMwCZZgD/zADMmQD/QLMZAAAAAXRSTlMAQObY'.
+     'ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAA'.
+     'AHdElNRQfTAwsWEwcv/zIDAAAAbUlEQVR4nFXJwQ3AMAhDUdRm'.
+     'kKojuCswABf2X6UEEiC+WF+PyDfoGEuvwXogq3Rk1Y6W0tBSG8'.
+     '6Uwpla6CmJnpoYKRsjjb/Y63vo9kIkLcZCCsbGYGwMRqIzEp1R'.
+     'OBmFk9HQGA2N0ZEIz5HX+h/jailYpfz4dAAAAABJRU5ErkJggg'.
+     '==' ; 
+
+        //==========================================================
+        // File: diam_lightblue.png
+        //==========================================================
+        $this->imgdata[4][0]= 671 ;
+        $this->imgdata[4][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbCAMAAAC6CgRnAAAA/1'.
+     'BMVEX///+AgIAAnP8A//8Azv8AY/8Aa/8I//8Y1v8Izv8Y//8Q'.
+     '//8InP8Qzv8Ypf85jP8he/8Yc/8Ia/8pe/8p//8p1v9Ctf8xrf'.
+     '8prf8QnP8Qc/9CjP+1//97//9r//9S//9K//9C//85//8x//8h'.
+     '//9r5/9K3v9S3v851v97zv9Svf85rf8hpf/G3v9SnP9anP9KlP'.
+     '8xhP/n7//v7+f3///n///O//+U//9z//9j//9a//975/9C3v8h'.
+     '1v+E5/+17/9j3v/O7//n9/+95/+l3v9jxv+U1v8Qpf9avf9Ktf'.
+     '+Uxv+11v97tf9rrf+cxv+Mvf9jpf+tzv+Etf/O3v/39/8Akkxr'.
+     'AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACx'.
+     'IAAAsSAdLdfvwAAAAHdElNRQfTAwsWEiHk6Ya/AAABGUlEQVR4'.
+     'nHXQ13KDMBAF0J2o0E01GHDvJa7p3em95/+/JQJMYjDc0Yt0Zr'.
+     'VaAaxHgtxwbSGPkGQpOIeQ2ORxJiJmNWYZyAhZR0WcgQGhViU0'.
+     'nEGoedDHGxgRapRPcRpXhOr7XZzCmLjaXk9IIjvkOEmSRLG62+'.
+     'F5XlEElhA5sW21GvXj6mGlDBfnJ51lr9svnvEKwH1hu2QPbwd3'.
+     'N9eXVzuL7/Hn29frdKaamgcgy67L3HFG9gDefV+dm5qme4YRXL'.
+     'oVR374mRqUELZYosf84XAxISFRQuMh4rrH8YxGSP6HX6H97NNQ'.
+     'KEAaR08qCeuSnx2a8zIPWqUowtKHSRK91rAw0elmVYQFVc8mhq'.
+     '7p5RD7Ps3IIwA9sfsFxFUX6eZ4Zh4AAAAASUVORK5CYII=' ; 
+
+        //==========================================================
+        // File: diam_purple.png
+        //==========================================================
+        $this->imgdata[5][0]= 657 ;
+        $this->imgdata[5][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbCAMAAAC6CgRnAAAA/F'.
+     'BMVEX///////8xAP/OAP+cAP9jAP9rAP+cCP85CP/OEP9SKf/O'.
+     'CP9CEP9zGP9rCP+lGP/WOf/WIf9KIf9jOf+MQv+EMf97If9zEP'.
+     '+1Sv+lIf/ne//eUv/na//n5//Oxv/Wzv+chP9zUv97Wv9rQv9a'.
+     'Mf9KGP/v5/+te/97Kf+9Y/+tOf+tKf+lEP/vtf/WMf/WKf/v7+'.
+     'f39/+tnP+9rf9rSv9jQv9CGP+ljP+EY//Gtf+tlP+Ma/9zSv/e'.
+     'zv+UUv+9lP+cWv+lY/+cUv+MOf+EKf+UQv/Opf/OhP/Ga/+1Qv'.
+     '/Oe/+9Uv/ntf/eWv/eSv/WGP/3zv/vlP/WEP//9/+pL4oHAAAA'.
+     'AXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAA'.
+     'sSAdLdfvwAAAAHdElNRQfTAwsWEjX+M1LCAAABDklEQVR4nHXQ'.
+     '1bLDIBAGYFqIEW+ksbr7cXd3ff93OUCamdOE/Mxw882yywLwPz'.
+     '+gNKotlRFUVnNUQlCxTMRFCKEdE+MgpJaEiIOU4DKaoSIygtb3'.
+     'FBUQrm3xjPK4JvXjK0A5hFniYSBtIilQVYUm+X0KTVNiYah+2q'.
+     'ulFb8nUbSovD2+TCavwXQWmnMA6ro+di+uR5cPzfPhVqPV3N1p'.
+     'n3b3+rimAWAYhP3xnXd7P6oc9vadPsa1wYEs00dFQRAFehlX21'.
+     '25Sg9NOgwF5jeNTjVL9om0TjDc1lmeCKZ17nFPzhPtSRt6J06R'.
+     'WKUoeG3MoXRa/wjLHGLodwZcotPqjsYngnWslRBZH91hWTbpD2'.
+     'EdF1ECWW1SAAAAAElFTkSuQmCC' ; 
+
+        //==========================================================
+        // File: diam_gray.png
+        //==========================================================
+        $this->imgdata[6][0]= 262 ;
+        $this->imgdata[6][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbBAMAAAB/+ulmAAAAEl'.
+     'BMVEX//////wAzMzNmZmbMzMyZmZlq4Qo5AAAAAXRSTlMAQObY'.
+     'ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAA'.
+     'AHdElNRQfTAwsWExZFTxLxAAAAbUlEQVR4nFXJwQ3AMAhDUdRm'.
+     'kKojuCswABf2X6UEEiC+WF+PyDfoGEuvwXogq3Rk1Y6W0tBSG8'.
+     '6Uwpla6CmJnpoYKRsjjb/Y63vo9kIkLcZCCsbGYGwMRqIzEp1R'.
+     'OBmFk9HQGA2N0ZEIz5HX+h/jailYpfz4dAAAAABJRU5ErkJggg'.
+     '==' ; 
+
+        //==========================================================
+        // File: diam_blgr.png
+        //==========================================================
+        $this->imgdata[7][0]= 262 ;
+        $this->imgdata[7][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABsAAAAbBAMAAAB/+ulmAAAAEl'.
+     'BMVEX///+AgIBmzP9m///M//+Z//8hMmBVAAAAAXRSTlMAQObY'.
+     'ZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAA'.
+     'AHdElNRQfTAwsWEwCxm6egAAAAbUlEQVR4nFXJwQ3AMAhDUdRm'.
+     'kKojuCswABf2X6UEEiC+WF+PyDfoGEuvwXogq3Rk1Y6W0tBSG8'.
+     '6Uwpla6CmJnpoYKRsjjb/Y63vo9kIkLcZCCsbGYGwMRqIzEp1R'.
+     'OBmFk9HQGA2N0ZEIz5HX+h/jailYpfz4dAAAAABJRU5ErkJggg'.
+     '==' ; 
+    }
+}
+
+?>
diff --git a/common/lib/jpgraph_lib/imgdata_pushpins.inc b/common/lib/jpgraph_lib/imgdata_pushpins.inc
old mode 100644
new mode 100755
diff --git a/common/lib/jpgraph_lib/imgdata_pushpins.inc.php b/common/lib/jpgraph_lib/imgdata_pushpins.inc.php
new file mode 100644
index 000000000..e59b7427b
--- /dev/null
+++ b/common/lib/jpgraph_lib/imgdata_pushpins.inc.php
@@ -0,0 +1,517 @@
+<?php
+//=======================================================================
+// File: IMGDATA_PUSHPINS.INC
+// Description: Base64 encoded images for pushpins
+// Created:  2003-03-20
+// Ver:  $Id: imgdata_pushpins.inc.php 1106 2009-02-22 20:16:35Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+class ImgData_PushPins extends ImgData {
+    protected $name = 'Push pins';
+    protected $an = array(MARK_IMG_PUSHPIN => 'imgdata_small',
+    MARK_IMG_SPUSHPIN => 'imgdata_small',
+    MARK_IMG_LPUSHPIN => 'imgdata_large');
+
+    protected $colors = array('blue','green','orange','pink','red');
+    protected $index  = array('red' => 0, 'orange' => 1, 'pink' => 2, 'blue' => 3, 'green' => 4 ) ;
+    protected $maxidx = 4 ;
+    protected $imgdata_large, $imgdata_small ;
+
+    function __construct() {
+
+        // The anchor should be where the needle "hits" the paper
+        // (bottom left corner)
+        $this->anchor_x = 0;
+        $this->anchor_y = 1;
+
+        //==========================================================
+        // File: ppl_red.png
+        //==========================================================
+        $this->imgdata_large[0][0]= 2490 ;
+        $this->imgdata_large[0][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABm'.
+     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
+     'B3RJTUUH0wMKBh4Ryh89CgAACUdJREFUeJy9mNtTFFcexz+/7p'.
+     '4Lw1wZJKDGCAwmDAqUySamcCq1ed6k9mn3UfMP7F+1T3nYqn2J'.
+     'lZdoDEjpbq0KG8EBFBFBEJye6Zmenkv32Ydu5GYiUMmeqq6uqT'.
+     '6Xz3zP73aOcIKmAQkIFyD3N/jrBPwlKjLQEglVlJKyUjR3u7cc'.
+     'WLoP3/4dvv03LNrQ8I6x1rFbDML9kOmHvh7IRHU9JKmUSG8vpF'.
+     'IoXX/TV0AiEM5A5jT0noFMFMJHXUt/d5f9TUAbhtQ3cPFruDog'.
+     '8klHMnmO0dGYe/myOJGINEwTz3F2higFXgy8PpAkOC+h8hoaCt'.
+     '4ppHFcQAWSgOQlyI/p+lUjmRxWAwNJd3xca/f34yoFi4tgmjtD'.
+     'NIFkJ4xcgBCgVqEBFJ9DqcZea/gNAAVEg7AOGYnHe9XoaJd3+X'.
+     'LISSSwnz6lsbKCZ9sHh4UVdBkwdA6cPwNnIfJPmC3Ctgft3wwQ'.
+     'QPkvTZJJnbExzfvsM2nMzVG7e5fG48d4lnXwTwEYCjJxuHQBog'.
+     'BHUfKkgAIIhiGk06hTp/Dm5qS1uYlXLvtWd4gPgIiCrAEcVckT'.
+     'Ab5p7TaYJrK1hQaEenrwSiVfQdc91P0kSp7Ii89D5ksY/kAkLy'.
+     'IZXFdXkQjS1YUSEbdcRu168V6+HTUNIKJDRwdE+sBIQmP9Ld59'.
+     'bEBA3of4F/D+uXb7rGaaCSmXI3pPj64PDaHCYfEqFVSjgWo2D2'.
+     '73XlJNQTgCyQykIuBWoNKEeh1aLXBPBCggGdBOgxZVSjoajVhH'.
+     'o5HWlIpq4bCQSgm9vXhK4ZZKh5SUYygp4J1EQVUD9xlU18BJQD'.
+     'bUbJ5T5XJStyxN9fSI099P3baxV1dRloW2h2ivx/yakg2ot6F1'.
+     'EkCa4G1D+zVEq5ArKTWM42Q6HUczQV7U66w9e0ZpdRXlOIQ5vF'.
+     'VHUXILKify4jiEzkOqC3peQMoBQymFlMt4Dx6wUSxSsm2UZXEK'.
+     'P30QvOUt8/2Sd78CdWwFDTA+gsw3cOlPcPUD+CQB52oQ21RKXM'.
+     'eRhGXhOg7VoKrx8KuS4ygZhVg3ZI8FGIfwR9BVgAtfwxdXdP3L'.
+     '86nUR91dXelNXTeWWy10paQHX602YAP1ADASAL7LJvFtMpOCc0'.
+     'cG3FHuGlz6Gr4YEpnoTCbzsdHRbOzy5RCRiLRMk5rjyOtAimwA'.
+     'U4U3SurBN/0wnAASBCVDIKpB4kiAB5Ub0/UvO9LpPAMDGfn005'.
+     'AxPCzxep3Q6iqPLUseBoufCZRsAE6g5g5kKIDfKUj3wnpAG8QB'.
+     '/Z1OIqANQuI65AtwNScyYXR2XlAXL2YZHzcklRKWl5GVFXFtGx'.
+     'MoAiV/EQaAGH6BUQNWgQpwFngv+Ca8KUAQEBcwgTJHyMV7679R'.
+     'XS8YqdSI6u/PMD5ukMtJY3GR2uQkr5aXeWVZOEALmA8WsIAxfL'.
+     'd0goVLAdCOd+/YpgqeVtBv4yiA++q/RKKXixe7GB8PSyoljcVF'.
+     'yg8fyubyMpulEk2lyAIfAAvAC+B+oOQFoAt/+0rAejB/EzjNri'.
+     'vvqNnCd64jxcE39V8spnP+vMbAgDSePKE2NcXm06dslMuUlcID'.
+     'TuFvqwXMBU8N39bGgRR+ki0Dz4L5DSAe9NGD7zq+6kcN1L6H2b'.
+     'ao5WWaQHllRTafPmWrVMJUimoAQrBYJFjQwre7B6A8YAi8LCgD'.
+     '5DVo6/hbb/iHK1KggvFeD3hHziQKEMuiNTNDbXGRTdtmw7Iwla'.
+     'KGH0oqwbscLOoG46rAY6AOzRhY74PT6QuUKEN4PegXxd/yEDTT'.
+     'YMWOk+oEaLkuFdNk0zTZwjfkavDUArXWgGXgFb4dEShXhfYqlI'.
+     'ow3w9rg3B6ED60IOOA5oEYQBrcpG+mj9bg0VG8GMJhVDZLyzAo'.
+     'VSq8rFYxXXefcjVgG9+uisDrXUCApoKSBcUHMBmHhfcgNwhtD3'.
+     'q9IG6Lr15b4OUTmPwBJt8JqGuapp05o0mhoHnptLQfPsR+8IBK'.
+     'uYyNH3yr+B77LHheA3tK1Ta+IrMeTL2C6Xl48TOsNWDDgAz7s5'.
+     '/r+krP/eddCsbj8fDQ4GBm9MqVvvRXX2VULBayRGRzaYn1SoWa'.
+     'UjgB4PIB5QK4ZgBXBKaAHxQsrED1H7CRgCUPwgHZDqACmhWwXv'.
+     '2aDRqGYeRyufS169cvThQKV88PDuYbW1vJ5VRK+5euqxWlPMdX'.
+     'SRqgreHbZGN3ijfKBXBTAeh2Fdwi2MofshP/dvKwCmKhp4m83Y'.
+     'vj8Xg4l8tlCoXC0MTExMTFkZE/1m37wvLGRvKRacoD1209E7Fc'.
+     'pZwYREOQqEJ4z3HskHLsz4AoXykPIBSN0t3dTTQafROoHdumXC'.
+     '4fjoMiog0ODiauX7+eLxQKV3O53ETdti88nJnJ3rl505ifmWm3'.
+     'arWSodR8GNbycDoNHy5C5jFold1k8d+DyvELNwg93d18/vnn9P'.
+     'X1oes6nufx/Plz7t+/fxhQKSWJRCI5NjaWHxkZKdj1+sjSwkJm'.
+     '+uZN/dZ337VqCwullGUVdZjsgIUC5LqhrUPvCugWuApeApPAzY'.
+     'PKHWyaphGNRunt7WVwcBARwfM8Ojo6sCzrMKBhGLphGFEF2Wq1'.
+     '2jc7M5OZ/vHH0MPbt93awkJJmeZsC6ZaMK3DCwvWdNioQUb5B6'.
+     'AdBR+9SzkAz/NwHIeXL18iIui6TjgcJplMMjY2th8wHo+Hh4aG'.
+     'MsPDw6fddru7+Phxx51bt/RbN260qwsLpZhlFZsw9QJ+2Pbrga'.
+     'oJG2FY2oKwuTtVEz9uV34NbqdtbW0xPT1NNBoF4MyZM1y5coWu'.
+     'rq5dQBHRcrlc4tq1a/l8Pj9RMs38ndu3Ez//9JNXLRZNyuXZJk'.
+     'xVYKoExQpsK/+IaAuYb7no8zjC/R+A4zisrq7u+53NZjl16tQ+'.
+     'QIlEIslsNpuPRCJXZ2dnh2/duNFRW1oy07a96MKd575yxRqU1B'.
+     '5vPMpF5HHa1tYW9+7do7Ozc/eQpZTSQ6FQt1Lq8pMnT/5w7969'.
+     'nuLcXE1rNufO9fRMhlKpOyvt9qPtVmvb25fFfvvWbrepVCqHwo'.
+     'xaX19vff/996ZhGC8qlkW9Wt1Onz073fXxxz+6MB+9e9dUjuO+'.
+     '7ebq9wLdB9hoNCrr6+s/4wf3FCJW3fPmTZhXsNWCprjuW66Dfr'.
+     '928KAfBhJAEgiJSLuzs7OSTqctoFkqlZRt26j/I+L/AGjPTN4d'.
+     'Nqn4AAAAAElFTkSuQmCC' ; 
+
+        //==========================================================
+        // File: ppl_orange.png
+        //==========================================================
+        $this->imgdata_large[1][0]= 2753 ;
+        $this->imgdata_large[1][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABm'.
+     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
+     'B3RJTUUH0wMLFQ0VCkHCzQAACk5JREFUeJytmGtzG0d2hp8zNw'.
+     'AEcRdJ6EJK9FL0CqZUm9jWbkwq3vhDstl8dmLvz8rP2H8Q75ZT'.
+     'pkRfpLgqsS6WIFEKGYkiSBCDO+banQ8DUpRWEkklXQUUqlCDfv'.
+     'rp857pgfAOQ4AMOJdg4R/hX96Hf06bvDc5iT07i8yeg8ksiIAI'.
+     '4TBi/ds9/vivD/njapNHvRBfHXMu410AM+BUoVSF05NQsi1sO4'.
+     '8402AXwLQTuP31OAZO2aG0MEn14iSlnI1z3LnMk8IZYJyBwjIs'.
+     '/TWsVIWPJkvMFS4zMfMhUp5BsoCpAAEBLYKaMFGn00jBxnvu02'.
+     '35+JHmSJEnBpQEcPo38MmCxd/nS9Ry71Ga/g1W9a8gn0GsHkgA'.
+     '6DGjxkqb5CoO+YxF3A3p+jGjQUzoK+L/V0ADzFMwtSR8eLbAr8'.
+     'uXOTf9NzhTc0geSLUQcYHgYEH786RMg0zWJHV2Aitv4x/HpHVS'.
+     'QA2YBqTTGIUq5qkPMWaWkVwPnPtAA/BevmZcjxaaUtHh8pJJGu'.
+     'DpCB9FvT7A7YT7S3p5vFMNzmWo/O0MSx/Ms3TqI8r59zFTfUQe'.
+     'I7SBODE3tnfoIxYnNHligwik0zAzDdVpyKbA8sff5YAeMEwgkV'.
+     'cufQeTJzZoCsaFLKXPTnNpoUTNsSgJmNoGsuNQjIDwYD2HlnZy'.
+     'k++yxTKXZfKTU8zOpjhneeQYkorSmGERtIlICBKRbLX+y98YN3'.
+     'ADcNIm+bJD4U3pPnmbEaRgYVRTGBkDSSsmxKfY7ZLuDJA4hdjl'.
+     'JEgyBB2SJOvQ9RzTpNKoEwNq0CNFvOXR3/HxMgYVPObaz8kPmh'.
+     'hkEWMatAfRONGGvLizyOE9P8KkpwhPDAgQKJQbELUD0oOIhbbH'.
+     'JeVTmowxjAgZutB5AoOngA+2DdYrcTyOyYZP9+QpBvI29vwEhb'.
+     'It042BVQgDy9KTMfkwQG1A9ACCLlgBBGUwxxoc52WDh2ATyEPp'.
+     '1hoaPvrEBh0Dq5an9OUsl/9hylk5b5c+mowLc4E2Jtw4Eoljyf'.
+     'ogA/AGEAagNRjGyUxOmEycyVA5EWDBxrmUp3ytLIv/NJP69Goh'.
+     '+9mFydIvS5PZYkvH1oY/RFtKymlwBFQAgQd+kAA6qSQ8pvn2mp'.
+     'SkJkuVFHPHBnQMrEt5Sl+e4/Lvp51PF1PF5Xy6WMvOWZXMom8z'.
+     'OZTQ8+j5sbQiMEwopsCIwRtBGIJSCdzbTGo9NimkDcgdC7Bg49'.
+     'TG5n4/nfr0Si77WdYp1YzyZEkWPdteaEnB7pPqBTxuIf/VgciE'.
+     'SgasCPwh+GNIkaNNag1RiPge5pEhMQVjfoLcF+eoXSvbKxedwn'.
+     'LKzC3KWbOi5/sW5a44/SHFUSgVA7SCzRG0AvA9mPOgFIETgu4n'.
+     'Ww0wNQWFAqRSL6D2ZQYBdDrQ7R7jXiwgRcvIL02makuTmWtpM/'.
+     '+BlLMl5vuWzLVEuwH6oYnR1KS8kJINGXMM2YdfRlALoQoQQKeb'.
+     'bDVwoMdxQMaLCwLo96HZTF5HbrEhmOftianfZisfzueKv7ZmrX'.
+     'MsjhxKXZGBjzyeEHmSE3oWiggtyVGmE8DTIXTC5NxgAxOAGUM8'.
+     'fun9mnSSLQ/CxNzOTgJ3LIMgoGwkKBiiMyaVviHVkdCO4FEKNv'.
+     'LQzWBYHfITPa4UBVM0LR/WB7ARJsdDDTjA6deYFIFUOimJ3d0E'.
+     'sNdLavYYgBpthqKcjiiJRO8K6CK0CsJTjfQAGaJtD9vQFAxNNQ'.
+     '1FB0yBAfA8gdMAIagLoCVAen0M00zMOTYShNDtoHs9CAIUoI4E'.
+     '1IBihCdNhsMhsj6NuV7BCC2IBpBqQaaFOENCCeiEsO1BO4RQgy'.
+     'I5Hm4k4oIU9MrgZSAdBeTabZz+ODxKQRRBFBJo6IUc51anYRQo'.
+     'dto+24FNxYCiaWKkQsj00KkO4gxRRkAngJ868M0u3OkkM+hxQA'.
+     'cQ7YD7GO5XYSsPZybh/TCkFIYY+kWniTW4Q7jXgHvHMhiRpmuW'.
+     'ca08GZkkZ/nY6TZMNhCnf2CuPoDVJvxpB+q9BHA8Ag1uH+oP4c'.
+     'YEPCzDwmzSLquShHW/E0YRbG/BjZtw40hAy7aNzJlzRn75E6N0'.
+     'qiwTzafI7kOU3gWrhzZC2iHcbsPqLlxvJnCt4KC1RYAL3I5hzY'.
+     'Xv/huePYCtITQMKEnyB4KQvMURuJvw889HGSwUCs7CwkLpo6tX'.
+     'Ty/+7nel6VLGDn/8N9m+eZuo1UP8iNhLau6b3RfmOsHBGTUYw9'.
+     'WBNeDrGB4+h/4qNLKwTnLbHj9CJw/6GoIh9Jpvq0HHcayFhYXi'.
+     'l3/4w9LK8vLKexfma3G/mb/3n1njTivS7tNQaaU1grQDjJ868D'.
+     'Axx6vmxnBrY9C9IcSbSXbavNjb/S3eN6/0m1JcKBScixcvllZW'.
+     'Vi6uLC8v12q1v/M8b/HxVjP//YYr32yE4dYWvShO0ogi14xwxq'.
+     'F4rbnxZ3cMjtpvEEeMvwA0TdOYn5/PffHFF7Vr166tvPeLXyx7'.
+     'nrd4+/btyg/frFo//Xgncnd67qCn78earQqcmYD3fSi1wPCTSV'.
+     '3gzqvm9uFOMl5nUAqFQn5paal26dKla57vf7D+6FHph9VV88af'.
+     'vgq79bo70e3VT2l9A3hYg4UiRALVHTCHSZvYBm4A//6quf8zoG'.
+     '3bpuM4acMwKr1+//SDe/dK31+/bv90/Xrcq9fduNW6rbVeC+E7'.
+     'gWdD2DKg4UEpBmPcm10RuScida31ntb62HAigoigDw6Gh0axWH'.
+     'QWFhZKi4uLZ+I4PrVer2e+u37dXPvqq6hbr7tOp1NXWq89h6/b'.
+     '8FBB34WGBesdcPrj38lkMkGlUuml0+mu53nR3t4eo9HoSLhMJk'.
+     'OlUiGdTuN5Hq7rvgA0TdO4cOFC7vPPP6/VarXldqdTu7m2lrv7'.
+     '7beq++BBO263b/tKrfWSXlbvwJ6CuAtDgTYiaBFMw6BSqfDxxx'.
+     '+rarWqGo0GN2/eZGtrC6XenAkRoVKpcPXqVWZmZmg0Gty6desF'.
+     'oIhIOp3Ol8vlmmVZK3fv3Lm09uc/Zwbr653ccPgoNIzvnmn99Z'.
+     '7W9QG46lAaM5mM2l95GIYUi0VOnz7N7OwsWmsymQzyuse5Q8Mw'.
+     'DNLpNDMzM5w/f/7A6AGgUkoajYa9urpayOXzUz/fvZutr68Pim'.
+     'F4/2y1+n2o9Q/ru7uPesPhXnyo4A+vfHp6mmazybNnz9jZ2UFr'.
+     'TbPZJAhe+8/aS0Mphed5NBoNABqNBqPR6MWBVWstvu/nnj9/Pv'.
+     'vo0aPq5uZmPBgM/qcwPf39xV/9ajU1M3Nvq9PZaw8GoT50PjdN'.
+     'k6mpKa5cucL58+eJ45j19XWePHnCzs4OnudhmiaWZRGGIVH05r'.
+     'yEYYjrumxubrKxsfFyDQJ6NBp1Pc+7C4jWumBaVm+kVL2l1H2l'.
+     '1G6otS+H6V6z8u3tbVzXpdFooJRicXGRqakptre3uXXr1ltrcT'.
+     'Qa8ezZszemWAE9rfUdYBOwtVLRbrPZ+48ff+wDvuu6Sr3MB4Dr'.
+     'uty6desgfa1WC3iRyrNnz4pSSmezWUzTfGtYtNYcdvC/9sMlgP'.
+     'n5N4cAAAAASUVORK5CYII=' ; 
+
+        //==========================================================
+        // File: ppl_pink.png
+        //==========================================================
+        $this->imgdata_large[2][0]= 2779 ;
+        $this->imgdata_large[2][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABm'.
+     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
+     'B3RJTUUH0wMLFQolY9lkpgAACmhJREFUeJy9mOtzFNl5h5+3b9'.
+     'Mz0kzPBWmEVtIiWYhIiC0HCDhB8lb8ISk7nzdZ5+/zJ/8BTmpT'.
+     '660CZLwG1pVFgBkgGIHECEaa+/T9nHzQCCQuRpCNz6mp6g893U'.
+     '8/c37ve3qEjxiC4OA4n/Lp/EUu/tsMM/+aEWduVBx7WhdkShcY'.
+     'xUH2zo0Dwod/5N6vf8V//PoGdx8M8EOFPtK9jI8BdHCcMuVSmf'.
+     'LxHLmSZdm2U8xIbmKETDGDZZnIy4dBbCynyGhphurEDBOlHFnn'.
+     'qPcyPxTOwDCOccw7w5nlBRZWylI+ny/mZ6rL1dzUZ5/IWGZU3D'.
+     'ZIOMQDDaJcHDVGWUbJBi9odVr0QoVSPzigIEaZ8vgSS/8wZU3/'.
+     'k1fylipz5dLM2WlrZqHKaGCKbEbontq3KAKWQyZfZKTgYqc9Bp'.
+     '2I2PcJ4ogk/UEBQcwipbFZmT13vDBx8fhnE1Ofnp9yJopFyT3X'.
+     'yANfks0QHSQMDaL37pOxMLIu2UyVkjVKLjyKSeuD8dAYCFkso1'.
+     'gYMaeWJ40T56cl8yAi/O4FSa2P6kYczIDsgVpAqcDImZPMuAB1'.
+     'dkLQtcc8a/bwox8IUHAxZVxGZMouSLVYwKuMkD5IxN+JSdsRJB'.
+     'pexuTVgYYM6EoGmxkmg3/hEhNUMr/hd7dqbOzExMn/GRDAxWZc'.
+     'j3I8HiXfMjF2FQowKw7pjoN6E/Llw/GBJj8qxVOMlX4ipxc/lY'.
+     'kl2zBLkmrTcEzMkoNoRLVidLi/9g+Z3I+1xRHX5EcAihxnbPRv'.
+     'OTU9kZSmpKPy9FTGrLimPZ1H+UiyGaF67w6n7E1DwMngFDxGvc'.
+     'w70v0xZUby5IxjlIyMssUJrJwVWkXBdbXvSvwEibcSdKCAFI16'.
+     '4/sc0SRo9cGAGq1DwvQFzV6DVuBiV4zYnlEts6A2TSPcSiXoxo'.
+     'QqJCEEFMbQ2b69o5qMiOOPqIMQkagu/aSL7waE8101WFShLjk9'.
+     'yxgEvjRUiyYd+gwAjY2J9VpXfZ/JEXLhDp3OR6U4T97+hEnPwx'.
+     'tv4HsRjy2tTQSFzQgDUnwSLBQRI+x1ZgcH87Vcv4SF19Kt0ezS'.
+     '1h9s0Ma25pgr/YJfnLnEysok0+ezjM6EBLldGqKIJYuDRhOQEJ'.
+     'Oih8X9Q0xmcXNjlCofBJgn78wxVz7L2YWf8tPPz1hnfjbjzfxN'.
+     'qVwutq2etZXUQSXikcXGIgUiUkJSDIQMJgYGJsaB3c7b1qQ4GZ'.
+     'xSkdGZIwMeNLfK6uezMnvJK3pLxeVixfvMsyVjSNSO6IV9adPG'.
+     'AArkEEz8oUkFmBjYGO80qfd6pCWIayD59wIKcsjcKqufn7JO/S'.
+     'xfyi+5c24pey5rZ09mJRNkiDdT/tzbkBr3SYkpMYpgEaIJSYhI'.
+     'kSOY1GhilAQk5ntDIojxCZ/kf87Pl85xbuWEnLiUy+cW3NNuJX'.
+     'MmY5meKf6mT7wZS+THdOjxlG06tIlIOMZxchSxcFFEGAwAGGME'.
+     'jwyZYSnWL3cXWiIUbUI6hO/vxXuFOV84ycmlBWthNeflTjuzTi'.
+     'lzJmM5s46Ej0J63/ZoPmoy6PYxtYVNhmfs0mbAND1mmKVMBY1L'.
+     'mxA1LN7WgXQbCApNhKJHRIM+DQbv7yQGhjnJ5NgFuXBuxpu5mD'.
+     'udm3LPuY7pmZLUE6L1SIJaIPFuDAqyw9lnwDYv6NFHkWJh4ZDB'.
+     'wCBFD3uMxsTAwcBAiElpE/KcPg36dIiOvpsRxDCyhmlP2YY9ZU'.
+     'v8NMb/1id+FGO0DTztkSXLOONUqeITsMkW2zwnJEIDFhYGx+A1'.
+     'kwK4mASkvKDPc3p0iYhRRwYUhZLUTyV6Eu0t4s1Y4kcx6W6KaM'.
+     'EZThcXH59RRhGEgIAddnBwNEBKqqpUtWBIF22YDIhJsbEkJqFN'.
+     'qLtERHs7GnUkwISEQAf0uj30bY39PzbiC6qrDu2cExJ69Nhhhz'.
+     '59UlIUipCQOnVi4sjG7ubJBy6um0C+he/0iDHQKIQERYyKFLqr'.
+     'SI/W6kJCnvOcrWSLSquC1/Jw9Ks3R0FQKHr0uMc9bnCDGjX69A'.
+     'H0XlcJkibN5jOe/alCZStHbjJL9lSMLkXExvCXRiDV6GZEeGeX'.
+     '3TvvBVQoEjfBL/v0rT75Th7VU5C8gktI6NLlMY+5yU3WWGODDf'.
+     'r098tHpNFNH7/2lKdXXdz7efLzVaqJIBOCmK8AJUlI6g0aV+9y'.
+     '9+p7AR3bMQpTBWPy7yeN6fy0jNwewfpvC9Xe+3kFoUuXe9zj5n'.
+     'BusEGHjh6GIAGawC2FWuvSvbbF1maFylZAsC1ISZADBiVNSJrP'.
+     'eX73MY//skHP85z5+fnSxQsXj//4n39cmnPn7LbZlsajBmEnBL'.
+     '1nuEGDG9x4aa5Ldz+h0RCuBqwBv1Wo+7vs9r7n++0MmYeAM+zB'.
+     '+61EK1QUEnbbtN+9Bh3Hsebn54u//PdfLq9eWl2ZnZ1dSnaSwu'.
+     'Pin40b9g3doKE0WoNIl65xj3v75njd3BBubQi6ExKmDWkMRKSl'.
+     'tSbVKQcMao1Go5Ugb0+x53nOyZMnSysrKydXLq1cWlxa/McgCB'.
+     'Yev3hU+GPrD3I5/q94k3pXYQY58q6B5Bs0HB//neaGx00gyWaz'.
+     'VCoV7bquCoKAnZ0dfN/f03egLGj0m3XQNE1jdnY2/+WXXy6trq'.
+     '6uzP3oR5eCIFi4detW5feXL1vr679Let37zVB3/mQytjXJwmSB'.
+     'wikHp9ShY0RESqObwPrr5oBERKhUKly4cIFqtUq9XufmzZtsbW'.
+     '2hXvuDwTTNtxZq8TyvsLy8vLS4uLgahOHphw8elL69fNlc++qr'.
+     'uFOrNXPddm1cczVL5f5P+Lv5MuOJgTGxwYbZpZsCdeAq8M1Bcw'.
+     'CGYeC6LtVqlRMnTjAyMkKn0yGXyx0N0LZt03Ec1zCMSrfXO37v'.
+     'zp3S769csb+/ciXt1mrNdHf3ltZ6Lca8ZpJsduhtCdb2gEFJoQ'.
+     'xADYHuHDS3f32lFEEQUK/XGRkZoVAocP78eZaXl9FaI/Jq25Uk'.
+     'yWHAYrHozM/PlxYWFibTND32sFbLXrtyxVz76qukXas1M61WTW'.
+     'm99gx+20TdN9jqtfjP7QzOwwYNp037Zd0DukDnIByA1pqdnR2+'.
+     '++472u02Z8+eZWJiAsMwDsEBRNGBzYJpmsaJEyfyX3zxxdLS0t'.
+     'KlVqu1dP3q1cLta9ekU6u1dat1J9b6Sk9kraV1rYXegW7apDYw'.
+     'kFY6fPc4MNTw88bwfZ/NzU2UUnieRxAEiAiGcXiXfcigiIjruo'.
+     'VyubxkWdbK7fX1xWvffFMInjzBM82uMT5+p++6V1UUrSe7u03t'.
+     '+8lezlKt3gHyl0aSJDQaDa5fv876+vo+w6FzDq1BpZRsb2/bly'.
+     '9f9vL5/Njdu3fzG0+eMJHNxsfn532vXN5NPG/7abPZal6/Hvfe'.
+     'kroPHfsm98f7AHW9Xo+//vrrlmVZm71+37QNw3JnZ9PK4uJGpV'.
+     'pt4Dh+vLGhsrmcfv1iHzu01m89HjIdCon2fb8TBMHtvYeRUn50'.
+     '1Oj4vqp3Ok1f5LYSadfr9dQfDN642P/XeF2DA+SBAuA4jkOhUK'.
+     'BQKESO43S11p3BYBDt7u4y+CtB/i/q7jp1GMiw2AAAAABJRU5E'.
+     'rkJggg==' ; 
+
+        //==========================================================
+        // File: ppl_blue.png
+        //==========================================================
+        $this->imgdata_large[3][0]= 2284 ;
+        $this->imgdata_large[3][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABm'.
+     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
+     'B3RJTUUH0wMLFRAiTZAL3gAACHlJREFUeJy9mGtv29YZgJ9zKF'.
+     'F3y/Q9jh05tuQkarKgbYasde0UBdZgwNou/Vqga/sD9mP2B4a1'.
+     'BbZ9atFPxb5sqOtmXbI19bqsluPYiR3HN90vFEWRZx/IJI5zqa'.
+     'x0OwBBSgR5Hj7v+55zSEFXTUgIJyA9C6/9RsjMjAyFIxxJCDc7'.
+     'iBqKgyZACGg3G2x9+xXf/fG33P3mC9qNKsp1O+1JdkEnQTdgIO'.
+     'ttCSMUi8gj072MnugllAyB9G8rBGi6RsToJTF6iuRoFi1kHKZf'.
+     '7fB8Iggj0/Dy23D2dakNTR3JDsXPvzstxmZGRMER1EwHhQAEgE'.
+     'CLhIkPD6InY9S3djGLJVBtQP1Qb4HDAyoJYQOOZkPx49nhTH9i'.
+     '7MUBGT7egxkJgd70wZS/CUkoZtA/fRoE1DZ2ACiv52ibReCp4e'.
+     '7CIEHomxDiuVdGTqUnf/ZeOjR8fpiVXZul5ZrY3bWwbdcLr/dA'.
+     'AAIpAwQjUWIjQ+g9HZvswiCgBVF9/SI6OSLGzo0i+oLi6+Utbq'.
+     '+bKEftgwOE/0Ohocf66M+cBjo22U2RQLIHMhmYnvaOpR9S8bSU'.
+     'UqCURGpRkuMZMm9cIvPGJZLj0yBjT2LprkiSkykx9cuXIhOnUs'.
+     'm+QNC2XdG02ggBTcvFabsPWwTPpBAChSCgh4kYBpoeplWp47Qs'.
+     '7EYDt21xINzd5GCAxLExRl89Z+nHjpbKMmjbmkgfDzI0JEW53K'.
+     'Jaa6NcAOEX8v52uJzsBlAS6u0hcnTIccPRqhWPCUcLD+s1EaUp'.
+     'HCEhEMCyHNpt9SjgIU12A6iw6xb123vYhaaKjB9tlgMD5X+uBp'.
+     'zdkpg6azA8EaNQtKlVba+Xez4eCntnJrsDdFsW5nYFpxlFN846'.
+     'DXe8utkM4mhi+EgQmjYbS2WqexZKk6BpjwJ2YlK5VjeA3pNDiH'.
+     'YjRWPzPE7tmBo8EWwGhkXx+z3uXL7D3rU97LIF8RBEAl6lK/Uo'.
+     '6JNM1rZ2aTcr3eUgIQOGTgbdwXMGyRejenLYTvQGbAdRuetSud'.
+     'OivVuFZgtCEgICghICnZoMhmlVTPR49LCAEkQUhk/B7KXe0MWf'.
+     'nxj8xVR/cDheK14WZmtVMJSBnlGoN6FmQq0FLfdwJgORKPHRo/'.
+     'Snzx4G0F/FjJ4KiOdmjPCrrx8bffnMybMv9MQGNG3rzlVqtR1B'.
+     'sh/CYXCD4Aag1oCW7ZnUOjSp6WFi/QNEB8Y7BfTNjZyCmUvJ0I'.
+     'XXT47MTp98Ybon9VZCk8cVazfqlNargsY34G7ByAlIjkHd9CCr'.
+     'LbBdiHViUgiECuDKYCdz8b2cywREdiYZOj8zNnLuzOTzx6ODp+'.
+     'OaGaqwVzBFqz0Idhz2loE7YEwBLaAJLQcKbW8qjAcBF5Jh0AMP'.
+     'IOHe6kxgtb3UMO2OxkF//ffK28nQqxfvm3szrtnDVa799Qb/+v'.
+     'NtsbNSpm3tAv8B+w7Ub0FhAyoBcMPec9oK6raXk48ziQBXQcmC'.
+     'pT3YqHa0mpEBkTR6wz/Jjo2cy04+fzwxdDquNfQKO7sFUbpu0c'.
+     'wp3JoAYsA42Bbkl4GCryUNDEM7Avm6Z/CgSYBWG8pNuFuDu1Wo'.
+     'tjoxKIJGeHIiM/jmK9NnX5ycuJQMtUcqXPvLDTa+qIie4hAJ1U'.
+     'vdrmO2HaDfB931twJgAn1A4lGT96obPHPLBbhVgUoTHHWo9aAA'.
+     'JVAKpyKEmQNzWRENAsL18ycKjAFN/9gCNvzLB/390MMmE7pnDi'.
+     'Bvwt0K5Jv3O+0oB22nJ1Vvjb/UMhOpcKknqN1OiMB2DNHU2G5s'.
+     'sVndpGJVcZXjX1IAlvw9PmhRQcOFPhsSDkiBrQR1G7brgs0a7D'.
+     'ag3FK4rguqBXarI4Nt1SJv5gls7TEWtJDRBO2GwnIs8maevFnA'.
+     'Gx6awLZvzeTBu4kFbLigijC47pscpx0xyDfkvtUEnlarCDtrUC'.
+     't2HGIhvPHVdVwqjTIrxRU2a5uUrYoP0QZ2gMvACl7+3V/LuKDq'.
+     'sJuDy597516+CEezIHXv7vcgXQu2l+Bvn8He9Y4AE4kgk5P9DE'.
+     'R6aFdq5Et5Nit3yTf3m9sBcsAN3+D98c0Fit5JawE25r1zg1Fo'.
+     '5B8GFD7g+nVYnu8EUEop9XTa0N/9dUbqcphP/rDJzbUClVbpgR'.
+     'y2fXM3fND95qj75J8AC6BWPINfVSBieK+x+6cS5UCzCLu3oFV9'.
+     'GqCMx2NGOp2Znpv7aXZudsool3T5J/179sxVlHJ4kGPrP2COBX'.
+     '/7DmiApWCjxIMXpYNznYuXM+6TAKWUMppOZzLvv//ery5cuDCT'.
+     'SqVS336bCwr1JfAPB9r+2KAFwJS+OcETzZHz/7v3etl6ipz77X'.
+     'GAMh6PG+l0OjM3NzczOzs3k0pNnFlbW43+e/GKtMqrblSsF03V'.
+     'WHcJA0PjIAzvg9JTze2H67g9DjAwOTmZ+uCDD96anZ2dnZiYmF'.
+     '5dW41++Lvfa1fnr7qllVK9103mXNTnJgPA+YugsvB3HTaEl+Qs'.
+     'AZ/yeHPPDCiTyaRx5syZbGoilV1dW00szC9oV+avusuLy0Xd0X'.
+     'MgFkDM+zkYBZEHV8f7wwKu84zmngQoNU0LaZoWUa4K31y5qX/8'.
+     '4cfyyvwVN5/L10NOKNeg8UmDxoKF5Vfj1xXAgD0JrgAcvBDfel'.
+     'a4g4AykUgY6XR6emJiIru2ttZXq9S0K19eUcuLy8WQE8o5OAsN'.
+     'Ggsmpl+NpoL1g9X4UBU+C9xDgEKIwNTUVOqdd955M9mbnJ3/cj'.
+     '6Vu5aTheXCQXNdVeMzAwJSCGEA2XKpnF1cXIzlFnOVhJPIKdR+'.
+     'c88ctq4AlVKsrKzw0UcfKcC5uXqzXnNqSzb2pwLxOHP/l7Z/BN'.
+     'eB01LKt4HTrusKvGr8jB+hGn8MQAkYQMrfw4Nq/MFPtf+rdvDb'.
+     'k8QL+/5Z4Uepxm7bfwHuTAVUWpWaqAAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: ppl_green.png
+        //==========================================================
+        $this->imgdata_large[4][0]= 2854 ;
+        $this->imgdata_large[4][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABm'.
+     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
+     'B3RJTUUH0wMLFQ4hANhluwAACrNJREFUeJytmF1zE1eagJ+3u9'.
+     'XdkvUty2AbmLEtEzDBgZ0UpDBOalNTUzU3czl7tct/2n+wt3M/'.
+     'NVM12SSTQQSyW2TA+QAJQogtYYFtyfrqL3WfvWj5g8AEjzfvhS'.
+     'SXjk8//Zz3Pf3qCMcJAWxMKlT4kH+jwu/FknnJSUItKFHzCrKA'.
+     'BggBQx5ziz/wn/yBz3hED4/oaJfSjgVoYjJJgTLTZCjohp7IGT'.
+     'k5aZ4kb+bRTR30Q7djj8f/kpPMUSCFedRL6W8e8qMQNE6S4xpv'.
+     'c5HrTPFubiJ3ZnlyOXV59rJYU5Z00h1c3d0brxAiUkScRijisk'.
+     '6XLTyiN3s8HuAJpniXa/q8/pt8Or+0kF8oXJm5YiydWcIpOrJu'.
+     'rjOQwd54AQwsMpTJYhPSoYuLQ58An/DnBQSdImXO8avsTPbqpc'.
+     'lLp67OXDVzMznZLGxSs2qyIRu4at8gKHQEC50kE1icxqCAdxST'.
+     'xjEA44tqaJlERl8uLWvvnX5PHuQfcCdxh5qq0aX76vj4WgWyXO'.
+     'QiNgBP8IAaddr08X8+wHFmJSQhBbPAZGoSZSt5wQs6qoNC7UEd'.
+     '4AEoLIQSCaCCy78Dv8Tiv1hjjW1CRj8XIAgEKqDtt9keboMJZa'.
+     'vMjuzQVd3Xr9prTJo+GF/jKZea95R25Lxs8jg5qFGiwDnOS0mW'.
+     'NE0rjNRIt3WbklUCA9mV3Zdz8OBT/JfCQLB0SKYVVjGFYSfx/E'.
+     '26ow4e6uDujlPFQpE0FU6P8qNTHdXJdEdda0qf0itWBVM3pa/3'.
+     'ccUlIECJet0cAJoeYk5EZCeS5IwEoerSxccJBwRqFFf38QCTaO'.
+     'TRVFKJm3NTbtLNSyh2IkhIXsvLCesEGNCWdmwyruSD/z9kUlRc'.
+     '3bqNlSxhJNJ43p5JITrOEis8Qtr0cXEpU/JT/pmO18n2vb42pU'.
+     '3JnDnHMBqyPlpnoAaxhr2llv1ZUBqEGlqYwDQMsskMOcMgVL3Y'.
+     'ZOQTHAcQQiIGjHCwCaiovjrv4hbcpKuJJjIcDHm685RGr4GLCx'.
+     'YHkAcrLoAoDSLBiAQrMkjqybHJCbxgh+7xAC1MpsgzwRwD3qHL'.
+     'WyTIBdlAa6u2rHfXaew06PV78ZZjAwleNnkolECoH5i090wOcY'.
+     '+TgwYzFHiPi1zkOkXexeAMASnVU+LiyiA1wFUuaqggACLizeWw'.
+     'ycMzyssmVYKkbpGyC5T+OUALk2mKLHKWf+ED/az+YW42d66YL+'.
+     'aNrmEEzQCFEnKw368EgEvcN1m80eTIQIt0TFOjMJHkzNEBBYPp'.
+     'sblf8QHzrORO5JaWZ5ZLl6cuJyyxpNPv4PZdoT+GyIxBfI5uUg'.
+     'eJMCwP2/bIHO1JEudcgUUWOceKNq99mCvnzs5PzRcuTV4y5mRO'.
+     'SMIjo47z5S7a94oQCNKgJsZwO7D/IDNg3/LLhRNXt4JohBb4aG'.
+     '82GLdXcf93mQ+Y43r2RHZp+cRy6cqJK4l8MS+tdItaqiYtc0Mm'.
+     'QpfJARh98HYh9IiXVcaAo58wGb+LBAjbSPgCOcoSa0wzxXtc08'.
+     '/pv8mfyL+9MLVQvDJ1JVHJV6SZbFI1qtTsB+KlehRtRTGE8Afo'.
+     'P4DRcAxiEudhAHjjzz+ubgX4oHowakHQOlqzICQwyVPITGVOXi'.
+     'xfLF6aumzmczl5lHzMff2+fCdPaGttEkXoLQAO9B7C6EugPYby'.
+     'gVPjGXc5eIbNAJPjGwiAbaAJUQv8wVG7GROkJFpyOqn/ovgLba'.
+     '44L0+sDaraXb6jzq7aBQWjBOyUoHcaopOgmaA3IRyNDZnA1HjO'.
+     'HSBkr7eEFDAEngHrQCf+/s2A8cSiSkqcKUeeTjwFy2Jd78t3+L'.
+     'TR4itIiBLwLQhzkJyB5Cx4HXDaENVQCBAQcRqFIHTRaBIvuYXg'.
+     'AdsouuNxEL0ZUBHnSQp66R73zYfUtQ6OytKT8RckQAJQoLtgO5'.
+     'BJgj0D/WfgdyHaAHx8THoUcbGx8ciwhUl3bDEiToURPooeI7pH'.
+     'MziK9Yd9nU5a6GgKjOH41vsgI4hAcyC5AZkapF+AoYNrjjsuhx'.
+     'FbtPmeB5ykyQQzTPAWAQWC8S9oAI0QRRuPb9jkmyMZNAOTklvC'.
+     'GGYZaFkGmkVAh8h4DtKFMIBunG+pB5B5AIkGBDsQ+qBiL20caj'.
+     'zhJknq5KlgMkLjJHJos4kYEbFJi5vc5eYbATVN02bNWe19+32t'.
+     'aJWlFm3wbf8Rz5NbDFJdlOFBF/g7cBf0JkrbBb+F6j1DOduEkU'.
+     '8bWCOiSofPWadBnSZDWmgUkEMGhZCINut8S/0NBtPptFlZrBSu'.
+     'vnt1+ndnflfIp9OJ/279Ubbbd+lP7KBKPoEBsgnqLph/BRzwdS'.
+     'LnBUFvHcfdpRsGPAGqwMco6jynz+e0SPKYCHMfLX5VKHwcenR+'.
+     'Igd1XTcqlUr+xn/cePv91fevzy8sLO2OtrOpWkqL7gXKSAVRdh'.
+     'ZFEmEXoYkwBNqovoc/3GHH3aUR+jwC1oD/AWrANi4hGwyBzqEG'.
+     'Vvb77Dgi0eT1VZzJZMxKpVJYXV1dXF1dXVm6sPSvruue3Xzcyj'.
+     '6/syvDzwj0lNazK6Fj5LFCRZouZpBABj6jXouu3+Np6HNvDHaf'.
+     'g91t74msbMuOJicnSSaTKKUQEUQEpRSO69But1/dB0VEm5uby9'.
+     'y4cWNpdXX1+sLCworrume//PuXpeqnVeOban0U1PW2kcx+O9L7'.
+     'Te9sUB4lWFR9SqNtNGcHx+/RDD2+Am4D94CnQA8OjjlEhMnyJC'.
+     'srK8zOzu7BiYioMAzZ2Njg9u3brwIqpSSXy2WXl5eXLly4sOo4'.
+     'zoV6vV6oflrVP/7Tx8Hmw1Zb6ydqmpWp7ha8h4O3gjOhzVANmF'.
+     'XPMNQWvdDnCXCXuHR+APqH4fbCtm2mp6eZn59H13WJuYXRaKSU'.
+     'UiSTyVcBdV3XDcOwRaTU7/en19bWCn/79G+JL/76RbhZ22y7u+'.
+     '6ahl71nPDz/nO17m7wAxlabFOihy4+DvAcqAMbPzZ3OFzX5dmz'.
+     'Z2iahoiosUUVhiGNRgPHcV4GzGQy5uLiYuH8+fMzo9FoslarJW'.
+     '9+elP75E+fBJu1zY7qqpqBUW3T/niohnVvy+1zm5aVtp+WE2XT'.
+     'nrHFzbjh1tYLz3XdPjD4R3BKKba2tqhWq4dzUO3noBPn4H5PKy'.
+     'LaO++8U7hx48byhQsXVne7u6tf3/v64t3P7mbq9+odt+OuaWi3'.
+     'PLxbW2ytubjbQCgiMnt6VlaurWgz0zM0m02q1WrUaDSUUuqI56'.
+     'ivDxE5MCgiYllWtlwuL5mmufLV/a/O/uXPf9Ff1F+80Lv6Yx29'.
+     '2qHzyZBh3cdvc7gaTZuZkzPh/Py8ACqVSv1/uPZDKXUAGEWRtF'.
+     'qtxEcffZTL5XLF+2v39fqjeivshA/TpP83JLwzYFBzcA4370Cc'.
+     'S81nTRBUs9lkOByi1GuOPI4Rh3+26JZlnSkWi781DOPXvV4v3+'.
+     '/2G0R8kSBxB/jew+tERK+c49m2TblcxrZtXNfl+fPneJ6HZVmU'.
+     'y2VJJpNyaJ9TSinlOA5bW1u4rntkQA0oAG8D54gb9W3ianxM3A'.
+     'e/cn73U3Hq1Cm5du2aPjs7a+ztcSIShmE4ajQa6tatWzQajZ+0'.
+     'fbiKI+It4SvijVUj7kL2qvGfgkskEqTTaZmcnDROnTplJhIJTU'.
+     'QiwPd9P/Q8T6XTaQzDIAiCfzjP/wFVfszuFqdHXgAAAABJRU5E'.
+     'rkJggg==' ; 
+
+
+        //==========================================================
+        // File: pp_red.png
+        //==========================================================
+        $this->imgdata_small[0][0]= 384 ;
+        $this->imgdata_small[0][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABm'.
+     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsSAAALEgHS3X78AAAA'.
+     'B3RJTUUH0wMJFhouFobZrQAAAQ1JREFUeJyV1dFtwyAQBuD/og'.
+     'xQdYxa8gRY6hJ0jK6QdohMkTEuE5wUj5ERen05IoLvID7Jkn2G'.
+     'j8MgTMyMXqRlUQBYq9ydmaL2h1cwqD7l30t+L1iwlbYFRegY7I'.
+     'SHjkEifGg4ww3aBa/l4+9AhxWWr/dLhEunXUGHq6yGniw3QkOw'.
+     '3jJ7UBd82n/VVAlAtvsfp98lAj2sAJOhU4AeQ7DC1ubVBODWDJ'.
+     'TtCsEWa6u5M1NeFs1NzgdtuhHGtj+9Q2IDppQUAL6Cyrlz0gDN'.
+     'ohSMiJCt861672EiAhEhESG3woJ9V9OKTkwRKbdqz4cHmFLSFg'.
+     's69+LvAZKdeZ/n89uLnd2g0S+gjd5g8zzjH5Y/eLLi+NPEAAAA'.
+     'AElFTkSuQmCC' ; 
+
+        //==========================================================
+        // File: pp_orange.png
+        //==========================================================
+        $this->imgdata_small[1][0]= 403 ;
+        $this->imgdata_small[1][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABm'.
+     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsSAAALEgHS3X78AAAA'.
+     'B3RJTUUH0wMJFhwAnApz5AAAASBJREFUeJyN1dFthDAMBuDf7S'.
+     '3BCm2VCRKpS4QxbhikW6IewzcBqm6Fm6JyH7iEEByCn5AJH38g'.
+     'BBIRHNUzBAWAGNfe/SrUGv92CtNt309BrfFdMGPjvt9CD8Fyml'.
+     'ZZaDchRgA/59FDMD18pvNoNyHxMnUmgLmPHoJ+CqqfMaNAH22C'.
+     'fgqKRwR+GRpxGjXBEiuXDBWQhTK3plxijyWWvtKVS5KNG1xM8I'.
+     'OBr7geV1WupDqpmTAPKjCqLhxk/z0PImQmjKrAuI6vMXlhFroD'.
+     'vfdqITXWqg2YMSJEAFcReoag6UXU2DzPG8w5t09YYsAyLWvHrL'.
+     'HUy6D3XmvMAAhAay8kAJpBosX4vt0G4+4Jam6s6Rz1fgFG0ncA'.
+     'f3XfOQcA+Acv5IUSdQw9hgAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: pp_pink.png
+        //==========================================================
+        $this->imgdata_small[2][0]= 419 ;
+        $this->imgdata_small[2][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABm'.
+     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsSAAALEgHS3X78AAAA'.
+     'B3RJTUUH0wMJFhsQzvz1RwAAATBJREFUeJyd1MFthDAQheF/oi'.
+     'gF+JYWQKICkCJRA1vGtrDbxFbhGvY0HVjCLeS2BeTiHFgTB2wg'.
+     'eRISstCnmcG2qCpbuXf3ADBQzWsPfZfS9y9HsEu4/Fo33Wf4Fx'.
+     'gxL3a1XkI3wbTNXHLoboVeLFUYDqObYBy+Fw/Uh9DdCmtOwIjF'.
+     'YvG76CZoOhNGRmpO8zz30CJoOhMAqlDxFzQLppgXj2XaNlP7FF'.
+     'GLL7ccMYCBgZERgCvXLBrfi2DEclmiKZwFY4tp6sW26bVfnede'.
+     'e5Hc5dC2bUgrXGKqWrwcXnNYDjmCrcCIiQgDcFYV05kQ8SXmnB'.
+     'NgPiVN06wrTDGAhz5EWY/FOccTk+cTnHM/YNu2YYllgFxCWuUM'.
+     'ikzGx+2Gc+4N+CoJW8n+5a2UKm2aBoBvGA6L7wfl8aoAAAAASU'.
+     'VORK5CYII=' ; 
+
+
+        //==========================================================
+        // File: pp_blue.png
+        //==========================================================
+        $this->imgdata_small[3][0]= 883 ;
+        $this->imgdata_small[3][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAMAAAC6V+0/AAACi1'.
+     'BMVEX///8AAAAAADMAAGYAAJkAAMwAAP8zAAAzADMzAGYzAJkz'.
+     'AMwzAP9mAABmADNmAGZmAJlmAMxmAP+ZAACZADOZAGaZAJmZAM'.
+     'yZAP/MAADMADPMAGbMAJnMAMzMAP//AAD/ADP/AGb/AJn/AMz/'.
+     'AP8AMwAAMzMAM2YAM5kAM8wAM/8zMwAzMzMzM2YzM5kzM8wzM/'.
+     '9mMwBmMzNmM2ZmM5lmM8xmM/+ZMwCZMzOZM2aZM5mZM8yZM//M'.
+     'MwDMMzPMM2bMM5nMM8zMM///MwD/MzP/M2b/M5n/M8z/M/8AZg'.
+     'AAZjMAZmYAZpkAZswAZv8zZgAzZjMzZmYzZpkzZswzZv9mZgBm'.
+     'ZjNmZmZmZplmZsxmZv+ZZgCZZjOZZmaZZpmZZsyZZv/MZgDMZj'.
+     'PMZmbMZpnMZszMZv//ZgD/ZjP/Zmb/Zpn/Zsz/Zv8AmQAAmTMA'.
+     'mWYAmZkAmcwAmf8zmQAzmTMzmWYzmZkzmcwzmf9mmQBmmTNmmW'.
+     'ZmmZlmmcxmmf+ZmQCZmTOZmWaZmZmZmcyZmf/MmQDMmTPMmWbM'.
+     'mZnMmczMmf//mQD/mTP/mWb/mZn/mcz/mf8AzAAAzDMAzGYAzJ'.
+     'kAzMwAzP8zzAAzzDMzzGYzzJkzzMwzzP9mzABmzDNmzGZmzJlm'.
+     'zMxmzP+ZzACZzDOZzGaZzJmZzMyZzP/MzADMzDPMzGbMzJnMzM'.
+     'zMzP//zAD/zDP/zGb/zJn/zMz/zP8A/wAA/zMA/2YA/5kA/8wA'.
+     '//8z/wAz/zMz/2Yz/5kz/8wz//9m/wBm/zNm/2Zm/5lm/8xm//'.
+     '+Z/wCZ/zOZ/2aZ/5mZ/8yZ///M/wDM/zPM/2bM/5nM/8zM////'.
+     '/wD//zP//2b//5n//8z///9jJVUgAAAAAXRSTlMAQObYZgAAAA'.
+     'FiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElN'.
+     'RQfTAwkWGTNerea3AAAAYUlEQVR4nHXNwQ3AIAxDUUfyoROxRZ'.
+     'icARin0EBTIP3Hp1gBRqSqYo0seqjZpnngojlWBir5+b8o06lM'.
+     'ha5uFKEpDZulV8l52axhVzqaCdxQp32qVSSwC1wN3fYiw7b76w'.
+     'bN4SMue4/KbwAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: pp_green.png
+        //==========================================================
+        $this->imgdata_small[4][0]= 447 ;
+        $this->imgdata_small[4][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABm'.
+     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsSAAALEgHS3X78AAAA'.
+     'B3RJTUUH0wMJFhkLdq9eKQAAAUxJREFUeJyN1LFVwzAQxvH/8f'.
+     'IeDS0FLKABlN6eIwPYAzCHB0gWYI2jj+i1ABUTQN4TRSQ7iiWZ'.
+     'qxLn9Mt9ydmiqrSq930AYFiu6YdKrf/hP1gYQn6960PxwBaYMG'.
+     'E9UA3dBFtVQjdBOQmBakLennK0CapRwbZRZ3N0O/IeEsqp3HKL'.
+     'Smtt5pUZgTPg4gdDud+6xoS97wM2rsxxmRSoTgoVcMZsXJkBho'.
+     'SmKqCuOuEtls6nmGMFPTUmxBKx/MeyNfQGLoOOiC2ddsxb1Kzv'.
+     'ZzUqu5IXbGDvBJf+hDisi77qFSuhq7Xpuu66TyJLRGbsXVUPxV'.
+     'SxsgkzDMt0mKT3/RcjL8C5hHnvJToXY0xYRZ4xnVKsV/S+a8YA'.
+     'AvCb3s9g13UhYj+TTo93B3fApRV1FVlEAD6H42DjN9/WvzDYuJ'.
+     'dL5b1/ji+/IX8EGWP4AwRii8PdFHTqAAAAAElFTkSuQmCC' ; 
+    }
+}
+
+?>
diff --git a/common/lib/jpgraph_lib/imgdata_squares.inc b/common/lib/jpgraph_lib/imgdata_squares.inc
old mode 100644
new mode 100755
diff --git a/common/lib/jpgraph_lib/imgdata_squares.inc.php b/common/lib/jpgraph_lib/imgdata_squares.inc.php
new file mode 100644
index 000000000..895dc936d
--- /dev/null
+++ b/common/lib/jpgraph_lib/imgdata_squares.inc.php
@@ -0,0 +1,150 @@
+<?php
+//=======================================================================
+// File:        IMGDATA_SQUARES.INC
+// Description: Base64 encoded images for squares
+// Created:     2003-03-20
+// Ver:         $Id: imgdata_squares.inc.php 1106 2009-02-22 20:16:35Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+class ImgData_Squares extends ImgData {
+    protected $name = 'Squares';
+    protected $an = array(MARK_IMG_SQUARE =>'imgdata');
+
+    protected $colors = array('bluegreen','blue','green',
+   'lightblue','orange','purple','red','yellow');
+    protected $index  = array('bluegreen' =>2,'blue'=>5,'green'=>6,
+   'lightblue'=>0,'orange'=>7,'purple'=>4,'red'=>3,'yellow'=>1);
+    protected $maxidx = 7 ;
+    protected $imgdata ;
+
+    function ImgData_Squares () {
+        //==========================================================
+        //sq_lblue.png
+        //==========================================================
+        $this->imgdata[0][0]= 362 ;
+        $this->imgdata[0][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAIAAADZrBkAAAAABm'.
+     'JLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsRAAALEQF/ZF+RAAAA'.
+     'B3RJTUUH0wMLFgojiPx/ygAAAPdJREFUeNpj/P377+kzHx89/c'.
+     'VAHNBQ5VBX52HavPWWjg6nnDQbkXoUFTnnL7zD9PPXrz17HxCj'.
+     'E6Jn6fL7H7/+ZWJgYCBGJ7IeBgYGJogofp1oehDa8OjE1IOiDa'.
+     'tOrHoYGBhY0NwD0enirMDAwMDFxYRVD7ptyDrNTAU0NXix6sGu'.
+     'jYGBgZOT9e/f/0xMjFyczFgVsGAKCfBza2kKzpl3hIuT1c9Xb/'.
+     'PW58/foKchJqx6tmy98vbjj8cvPm/afMnXW1JShA2fNmQ9EBFc'.
+     'Opnw6MGjkwm/Hlw6mQjqwaqTiRg9mDoZv//4M2/+UYJ64EBWgj'.
+     'cm2hwA8l24oNDl+DMAAAAASUVORK5CYII=' ; 
+
+        //==========================================================
+        //sq_yellow.png
+        //==========================================================
+        $this->imgdata[1][0]= 338 ;
+        $this->imgdata[1][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAAWl'.
+     'BMVEX////+/+H+/9/9/9v8/8P8/8H8/7v8/7n6/4P5/335/3n5'.
+     '/3X4/1f4/1P3/031/w30/wn0/wPt+ADp9ADm8ADk7gDc5gDa5A'.
+     'DL1ADFzgCwuACqsgClrABzeAC9M0MzAAAAAWJLR0QAiAUdSAAA'.
+     'AAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9MDCxYEDlOgDj'.
+     'EAAAB+SURBVHjaVcpbCsQgDEDRGERGKopjDa2a/W9zfLWj9/Nw'.
+     'Ac21ZRBOtZlRN9ApzSYFaDUj79KIorRDbJNO9bN/GUSh2ZRJFJ'.
+     'S18iorURBiyksO8buT0zkfYaUqzI91ckfhWhoGXTLzsDjI68Sz'.
+     'pGMjrzPzauA/iXk1AtykmvgBC8UcWUdc9HkAAAAASUVORK5CYI'.
+     'I=' ; 
+
+        //==========================================================
+        //sq_blgr.png
+        //==========================================================
+        $this->imgdata[2][0]= 347 ;
+        $this->imgdata[2][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAAZl'.
+     'BMVEX////0+vv0+vrz+fry+frv+Png7e/d7e/a6+zY6+250tSz'.
+     '0tSyztCtztGM0NWIz9SDzdNfsLVcrrRZrbJOp61MpqtIr7dHn6'.
+     'RErrZArLQ6q7M2g4kygYcsp68npa4ctr8QZ20JnqepKsl4AAAA'.
+     'AWJLR0QAiAUdSAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU'.
+     '1FB9MDCxYEByp8tpUAAAB7SURBVHjaVcjRFoIgDADQWZpWJpjY'.
+     'MsnG//9kzIFn3McLzfArDA3MndFjrhvgfDHFBEB9pt0CVzwrY3'.
+     'n2yicjhY4vTSp0nbXtN+hCV53SHDWe61dZY+/9463r2XuifHAM'.
+     '0SoH+6xEcovUlCfefeFSIwfTTQ3fB+pi4lV/bTIgvmaA7a0AAA'.
+     'AASUVORK5CYII=' ; 
+
+        //==========================================================
+        //sq_red.png
+        //==========================================================
+        $this->imgdata[3][0]= 324 ;
+        $this->imgdata[3][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAAXV'.
+     'BMVEX////++Pn99/j99ff99fb98/X98/T98PL55uj43+P24+bw'.
+     'kKPvjaHviJ3teJHpxMnoL2Pjs73WW3rWNljVWXnUVnbUK1DTJk'.
+     '3SUHPOBz/KQmmxPVmuOFasNFOeIkWVka/fAAAAAWJLR0QAiAUd'.
+     'SAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9MDCxYEHd'.
+     'ceT+8AAABtSURBVHjaVchbAkMwEAXQq6i3VrQiQfa/zDYTw8z5'.
+     'PCjGt9JVWFt1XWPh1fWNdfDy+tq6WPfRUPENNKnSnXNWPB4uv2'.
+     'b54nSZ8jHrMtOxvWZZZtpD4KP6xLkO9/AhzhaCOMhJh68cOjzV'.
+     '/K/4Ac2cG+nBcaRuAAAAAElFTkSuQmCC' ; 
+
+        //==========================================================
+        //sq_pink.png
+        //==========================================================
+        $this->imgdata[4][0]= 445 ;
+        $this->imgdata[4][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAApV'.
+     'BMVEX////6+Pz69/v49Pr38/r17/jr4+/l3Onj2efh1ua/L+i+'.
+     'q8m+Lue9Lua8qsS8LuW8LeS7pca5LOG4LN+2Y9O2YNW1ZdO1Kt'.
+     'y0atC0aNGzb82zbc6zKtuzKdqycsuwa8qtJtOISZ2GRpuFN6GE'.
+     'NqCDQpmCMZ+BPpd/LJ1/K519S5B9Jpx9Jpt9JZt6RY11BJZ1BJ'.
+     'V0BJV0BJRzBJNvNoRtIoJUEmdZ/XbrAAAAAWJLR0QAiAUdSAAA'.
+     'AAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9MDCxYDF3iKMD'.
+     'YAAACeSURBVHjaVczbEoIgGARgCiMtrexoWpaa2FHUgvd/tH4Y'.
+     'BnEvv9ldhNPradPnnGBUTtPDzMRPSIF46SaBoR25dYjz3I20Lb'.
+     'ek6BgQz73Il7KKpSgCO0pTHU0886J1sCe0ZYbALjGhjFnEM2es'.
+     'VhZVI4d+B1QtfnV47ywCEaKeP/p7JdLejSYt0j6NIiOq1wJZIs'.
+     'QTDA0ELHwhPBCwyR/Cni9cOmzJtwAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        //sq_blue.png
+        //==========================================================
+        $this->imgdata[5][0]= 283 ;
+        $this->imgdata[5][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAAQl'.
+     'BMVEX////4+fz39/z19vvy8vru7/ni4+7g4fHW1ue8vteXmt6B'.
+     'hdhiZ7FQVaZETcxCSJo1Oq4zNoMjKakhJHcKFaMEC2jRVYdWAA'.
+     'AAAWJLR0QAiAUdSAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0'.
+     'SU1FB9MDCxYDN0PkEP4AAABfSURBVHjaVchHAoAgDATAVcCCIF'.
+     'j4/1elJEjmOFDHKVgDv4iz640gLs+LMF6ZUv/VqcXXplU7Gqpy'.
+     'PFzBT5qml9NzlOX259riWHlS4kOffviHD8PQYZx2EFMPRkw+9Q'.
+     'FSnRPeWEDzKAAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        //sq_green.png
+        //==========================================================
+        $this->imgdata[6][0]= 325 ;
+        $this->imgdata[6][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAAXV'.
+     'BMVEX////2+vX1+vX1+fT0+fPz+PPx9/Dv9u7u9e3h7uHe697a'.
+     '6dnO2s3I1sa10LOvza2ay5aEwYBWlE9TqE5Tkk1RkEpMrUJMg0'.
+     'hKiUNGpEFBojw8oTcsbScaYBMWlwmMT0NtAAAAAWJLR0QAiAUd'.
+     'SAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9MDCxYEFd'.
+     'nFx90AAABuSURBVHjaVc9HAoAgDADB2HuJWLDx/2cKBITscW4L'.
+     '5byzMIWtZobNDZIZtrcCGZsRQ8GwvRSRNxIiMuysODKG3alikl'.
+     'ueOPlpKTLBaRmOZxQxaXlfb5ZWI9om4WntrXiDSJzp7SBkwMQa'.
+     'FEy0VR/NAB2kNuj7rgAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        //sq_orange.png
+        //==========================================================
+        $this->imgdata[7][0]= 321 ;
+        $this->imgdata[7][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAMAAABhEH5lAAAAUV'.
+     'BMVEX/////8+n/8uf/8OP/59H/5Mv/zqH/zJ3/ypv/yJf/vYH/'.
+     'u33/uXn/n0n/nUX/m0H/lzn/ljf/lDP/kS3/kCv/iR//hxv/fg'.
+     'n/fAX/eQDYZgDW6ia5AAAAAWJLR0QAiAUdSAAAAAlwSFlzAAAL'.
+     'EgAACxIB0t1+/AAAAAd0SU1FB9MDCxYEJIgbx+cAAAB2SURBVH'.
+     'jaVczRCoQwDETRbLAWLZSGUA35/w/dVI0283i4DODew3YESmWW'.
+     'kg5gWkoQAe6TleUQI/66Sy7i56+kLk7cht2N0+hcnJgQu0SqiC'.
+     '1SzSIbzWSi6gavqJ63wSduRi2f+kwyD5rEukwCdZ1kGAMGMfv9'.
+     'AbWuGMOr5COSAAAAAElFTkSuQmCC' ; 
+    }
+}
+
+?>
diff --git a/common/lib/jpgraph_lib/imgdata_stars.inc b/common/lib/jpgraph_lib/imgdata_stars.inc
old mode 100644
new mode 100755
diff --git a/common/lib/jpgraph_lib/imgdata_stars.inc.php b/common/lib/jpgraph_lib/imgdata_stars.inc.php
new file mode 100644
index 000000000..bc696902a
--- /dev/null
+++ b/common/lib/jpgraph_lib/imgdata_stars.inc.php
@@ -0,0 +1,144 @@
+<?php
+//=======================================================================
+// File:        IMGDATA_STARS.INC
+// Description: Base64 encoded images for stars
+// Created:     2003-03-20
+// Ver:         $Id: imgdata_stars.inc.php 1106 2009-02-22 20:16:35Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+
+class ImgData_Stars extends ImgData {
+    protected $name = 'Stars';
+    protected $an = array(MARK_IMG_STAR => 'imgdata');
+
+    protected $colors = array('bluegreen','lightblue','purple','blue','green','pink','red','yellow');
+    protected $index  = array('bluegreen'=>3,'lightblue'=>4,'purple'=>1,
+   'blue'=>5,'green'=>0,'pink'=>7,'red'=>2,'yellow'=>6);
+    protected $maxidx = 7 ;
+    protected $imgdata ;
+
+    function __construct() {
+        //==========================================================
+        // File: bstar_green_001.png
+        //==========================================================
+        $this->imgdata[0][0]= 329 ;
+        $this->imgdata[0][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAAUV'.
+     'BMVEX///////+/v7+83rqcyY2Q/4R7/15y/1tp/05p/0lg/zdX'.
+     '/zdX/zVV/zdO/zFJ9TFJvDFD4yg+8Bw+3iU68hwurhYotxYosx'.
+     'YokBoTfwANgQFUp7DWAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgF'.
+     'HUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJj'.
+     'CRyxgTAAAAcUlEQVR4nH3MSw6AIAwEUBL/IKBWwXL/g0pLojUS'.
+     'ZzGLl8ko9Zumhr5iy66/GH0dp49llNPB5sTotDY5PVuLG6tnM9'.
+     'CVKSIe1joSgPsAKSuANNaENFQvTAGzmheSkUpMBWeJZwqBT8wo'.
+     'hmysD4bnnPsC/x8ItUdGPfAAAAAASUVORK5CYII=' ; 
+        //==========================================================
+        // File: bstar_blred.png
+        //==========================================================
+        $this->imgdata[1][0]= 325 ;
+        $this->imgdata[1][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
+     'BMVEX///+/v79uRJ6jWPOSUtKrb+ejWO+gWPaGTruJTr6rZvF2'.
+     'RqC2ocqdVuCeV+egV/GsnLuIXL66rMSpcOyATbipY/OdWOp+VK'.
+     'aTU9WhV+yJKBoLAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
+     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJwynv1'.
+     'XVAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
+     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
+     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
+     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: bstar_red_001.png
+        //==========================================================
+        $this->imgdata[2][0]= 325 ;
+        $this->imgdata[2][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
+     'BMVEX///+/v7+eRFHzWG3SUmHnb37vWGr2WHG7Tlm+TljxZneg'.
+     'Rk3KoaXgVmXnV2nxV227nJ++XGzErK3scIS4TVzzY3fqWG2mVF'.
+     'zVU2PsV2rJFw9VAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
+     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJzCI0C'.
+     'lSAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
+     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
+     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
+     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: bstar_blgr_001.png
+        //==========================================================
+        $this->imgdata[3][0]= 325 ;
+        $this->imgdata[3][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
+     'BMVEX///+/v79Ehp5Yx/NSq9Jvw+dYwu9YzfZOmbtOmb5myPFG'.
+     'gqChvcpWteBXvedXxvGcsbtcpb6su8RwzOxNmrhjyvNYwupUjK'.
+     'ZTr9VXwOyJhmWNAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
+     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJTC65k'.
+     'vQAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
+     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
+     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
+     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: bstar_blgr_002.png
+        //==========================================================
+        $this->imgdata[4][0]= 325 ;
+        $this->imgdata[4][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
+     'BMVEX///+/v79EnpxY8/FS0dJv5+dY7+9Y9vBOubtOur5m8fFG'.
+     'nKChycpW3uBX5+ZX8e2curtcvrqswsRw7OdNuLZj8/BY6udUpK'.
+     'ZT1dRX7OtNkrW5AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
+     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJgXHeN'.
+     'wwAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
+     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
+     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
+     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: bstar_blue_001.png
+        //==========================================================
+        $this->imgdata[5][0]= 325 ;
+        $this->imgdata[5][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
+     'BMVEX///+/v79EY55Yi/NSetJvledYiO9YkPZOb7tObr5mkvFG'.
+     'X6ChrcpWgOBXhedXi/Gcpbtcf76sssRwnOxNcbhjk/NYiepUbK'.
+     'ZTfdVXh+ynNEzzAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
+     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJhStyP'.
+     'zCAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
+     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
+     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
+     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: bstar_oy_007.png
+        //==========================================================
+        $this->imgdata[6][0]= 325 ;
+        $this->imgdata[6][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
+     'BMVEX///+/v7+ejUTz11jSvVLn02/v1lj21li7q06+r07x2mag'.
+     'lUbKxKHgy1bnz1fx1Ve7t5y+qlzEwqzs03C4pE3z2WPqz1imml'.
+     'TVv1Ps01dGRjeyAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
+     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJjsGGc'.
+     'GbAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
+     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
+     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
+     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
+
+        //==========================================================
+        // File: bstar_lred.png
+        //==========================================================
+        $this->imgdata[7][0]= 325 ;
+        $this->imgdata[7][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABQAAAASCAMAAABsDg4iAAAATl'.
+     'BMVEX///+/v7+eRJPzWN3SUr7nb9TvWNj2WOS7Tqi+TqnxZtyg'.
+     'Ro/KocPgVsjnV9LxV927nLa+XLTErL7scN24TarzY9/qWNemVJ'.
+     'jVU8LsV9VCwcc9AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgA'.
+     'AAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTAxYTJxi9ZY'.
+     'GoAAAAcElEQVR4nH3MyQ6AIAwEUFIqiwju2///qLQmWiJxDnN4'.
+     'mYxSv5lqGCs2nvaLLtZx/VhGOW1MjnPJWp0zsw2wsUY2jd09BY'.
+     'DFmESC+BwA5UCUxhqAhqrA4CGrLpCMVGK4sZe4B+/5RLdiyMb6'.
+     'on/PuS9CdQNC7yBXEQAAAABJRU5ErkJggg==' ; 
+    }
+}
+
+?>
diff --git a/common/lib/jpgraph_lib/index.php b/common/lib/jpgraph_lib/index.php
old mode 100644
new mode 100755
diff --git a/common/lib/jpgraph_lib/jpg-config.inc b/common/lib/jpgraph_lib/jpg-config.inc
old mode 100644
new mode 100755
diff --git a/common/lib/jpgraph_lib/jpg-config.inc.php b/common/lib/jpgraph_lib/jpg-config.inc.php
new file mode 100644
index 000000000..ea16c1e22
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpg-config.inc.php
@@ -0,0 +1,138 @@
+<?php
+//=======================================================================
+// File:        JPG-CONFIG.INC
+// Description: Configuration file for JpGraph library
+// Created:     2004-03-27
+// Ver:         $Id: jpg-config.inc.php 1871 2009-09-29 05:56:39Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+
+//------------------------------------------------------------------------
+// Directories for cache and font directory.
+//
+// CACHE_DIR:
+// The full absolute name of the directory to be used to store the
+// cached image files. This directory will not be used if the USE_CACHE
+// define (further down) is false. If you enable the cache please note that
+// this directory MUST be readable and writable for the process running PHP.
+// Must end with '/'
+//
+// TTF_DIR:
+// Directory where TTF fonts can be found. Must end with '/'
+//
+// The default values used if these defines are left commented out are:
+//
+// UNIX:
+//   CACHE_DIR /tmp/jpgraph_cache/
+//   TTF_DIR   /usr/share/fonts/truetype/
+//   MBTTF_DIR /usr/share/fonts/truetype/
+//
+// WINDOWS:
+//   CACHE_DIR $SERVER_TEMP/jpgraph_cache/
+//   TTF_DIR   $SERVER_SYSTEMROOT/fonts/
+//   MBTTF_DIR $SERVER_SYSTEMROOT/fonts/
+//
+//------------------------------------------------------------------------
+// define('CACHE_DIR','/tmp/jpgraph_cache/');
+// define('TTF_DIR','/usr/share/fonts/TrueType/');
+// define('MBTTF_DIR','/usr/share/fonts/TrueType/');
+
+//-------------------------------------------------------------------------
+// Cache directory specification for use with CSIM graphs that are
+// using the cache.
+// The directory must be the filesysystem name as seen by PHP
+// and the 'http' version must be the same directory but as
+// seen by the HTTP server relative to the 'htdocs' ddirectory.
+// If a relative path is specified it is taken to be relative from where
+// the image script is executed.
+// Note: The default setting is to create a subdirectory in the
+// directory from where the image script is executed and store all files
+// there. As ususal this directory must be writeable by the PHP process.
+define('CSIMCACHE_DIR','csimcache/');
+define('CSIMCACHE_HTTP_DIR','csimcache/');
+
+//------------------------------------------------------------------------
+// Various JpGraph Settings. Adjust accordingly to your
+// preferences. Note that cache functionality is turned off by
+// default (Enable by setting USE_CACHE to true)
+//------------------------------------------------------------------------
+
+// Deafult locale for error messages.
+// This defaults to English = 'en'
+define('DEFAULT_ERR_LOCALE','en');
+
+// Deafult graphic format set to 'auto' which will automatically
+// choose the best available format in the order png,gif,jpeg
+// (The supported format depends on what your PHP installation supports)
+define('DEFAULT_GFORMAT','auto');
+
+// Should the cache be used at all? By setting this to false no
+// files will be generated in the cache directory.
+// The difference from READ_CACHE being that setting READ_CACHE to
+// false will still create the image in the cache directory
+// just not use it. By setting USE_CACHE=false no files will even
+// be generated in the cache directory.
+define('USE_CACHE',false);
+
+// Should we try to find an image in the cache before generating it?
+// Set this define to false to bypass the reading of the cache and always
+// regenerate the image. Note that even if reading the cache is
+// disabled the cached will still be updated with the newly generated
+// image. Set also 'USE_CACHE' below.
+define('READ_CACHE',true);
+
+// Determine if the error handler should be image based or purely
+// text based. Image based makes it easier since the script will
+// always return an image even in case of errors.
+define('USE_IMAGE_ERROR_HANDLER',true);
+
+// Should the library examine the global php_errmsg string and convert
+// any error in it to a graphical representation. This is handy for the
+// occasions when, for example, header files cannot be found and this results
+// in the graph not being created and just a 'red-cross' image would be seen.
+// This should be turned off for a production site.
+define('CATCH_PHPERRMSG',true);
+
+// Determine if the library should also setup the default PHP
+// error handler to generate a graphic error mesage. This is useful
+// during development to be able to see the error message as an image
+// instead as a 'red-cross' in a page where an image is expected.
+define('INSTALL_PHP_ERR_HANDLER',false);
+
+// Should usage of deprecated functions and parameters give a fatal error?
+// (Useful to check if code is future proof.)
+define('ERR_DEPRECATED',true);
+
+// The builtin GD function imagettfbbox() fuction which calculates the bounding box for
+// text using TTF fonts is buggy. By setting this define to true the library
+// uses its own compensation for this bug. However this will give a
+// slightly different visual apparance than not using this compensation.
+// Enabling this compensation will in general give text a bit more space to more
+// truly reflect the actual bounding box which is a bit larger than what the
+// GD function thinks.
+define('USE_LIBRARY_IMAGETTFBBOX',true);
+
+//------------------------------------------------------------------------
+// The following constants should rarely have to be changed !
+//------------------------------------------------------------------------
+
+// What group should the cached file belong to
+// (Set to '' will give the default group for the 'PHP-user')
+// Please note that the Apache user must be a member of the
+// specified group since otherwise it is impossible for Apache
+// to set the specified group.
+define('CACHE_FILE_GROUP','www');
+
+// What permissions should the cached file have
+// (Set to '' will give the default persmissions for the 'PHP-user')
+define('CACHE_FILE_MOD',0664);
+
+// Default theme class name
+define('DEFAULT_THEME_CLASS', 'UniversalTheme');
+
+define('SUPERSAMPLING', true);
+define('SUPERSAMPLING_SCALE', 1);
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph.php b/common/lib/jpgraph_lib/jpgraph.php
old mode 100644
new mode 100755
index af4ae5222..0fc29c0b9
--- a/common/lib/jpgraph_lib/jpgraph.php
+++ b/common/lib/jpgraph_lib/jpgraph.php
@@ -1,542 +1,317 @@
 <?php
 //=======================================================================
-// File:	JPGRAPH.PHP
-// Description:	PHP4 Graph Plotting library. Base module.
-// Created: 	2001-01-08
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph.php,v 1.242.2.96 2005/01/16 20:51:53 aditus Exp $
+// File:        JPGRAPH.PHP
+// Description: PHP Graph Plotting library. Base module.
+// Created:     2001-01-08
+// Ver:         $Id: jpgraph.php 1924 2010-01-11 14:03:26Z ljp $
 //
-// License:	This code is released under QPL 1.0
-// Copyright (C) 2001,2002,2003,2004 Johan Persson Aditus Consulting
+// Copyright (c) Asial Corporation. All rights reserved.
 //========================================================================
 
-require_once 'jpg-config.inc';
+require_once('jpg-config.inc.php');
+require_once('jpgraph_gradient.php');
+require_once('jpgraph_errhandler.inc.php');
+require_once('jpgraph_ttf.inc.php');
+require_once('jpgraph_rgb.inc.php');
+require_once('jpgraph_text.inc.php');
+require_once('jpgraph_legend.inc.php');
+require_once('jpgraph_theme.inc.php');
+require_once('gd_image.inc.php');
 
 // Version info
-DEFINE('JPG_VERSION','1.17beta2');
+define('JPG_VERSION','3.5.0b1');
 
-// For internal use only
-DEFINE("_JPG_DEBUG",false);
-DEFINE("_FORCE_IMGTOFILE",false);
-DEFINE("_FORCE_IMGDIR",'/tmp/jpgimg/');
+// Minimum required PHP version
+define('MIN_PHPVERSION','5.1.0');
 
-//------------------------------------------------------------------------
-// Automatic settings of path for cache and font directory
-// if they have not been previously specified
-//------------------------------------------------------------------------
-if (USE_CACHE) {
-    if (!defined('CACHE_DIR')) {
-    if ( strstr( PHP_OS, 'WIN') ) {
-        if ( empty($_SERVER['TEMP']) ) {
-        die('JpGraph Error: No path specified for CACHE_DIR. Please specify CACHE_DIR manually in jpg-config.inc');
-        } else {
-        DEFINE('CACHE_DIR', $_SERVER['TEMP'] . '/');
-        }
-    } else {
-        DEFINE('CACHE_DIR','/tmp/jpgraph_cache/');
-    }
-    }
-} elseif ( !defined('CACHE_DIR') ) {
-    DEFINE('CACHE_DIR', '');
-}
+// Special file name to indicate that we only want to calc
+// the image map in the call to Graph::Stroke() used
+// internally from the GetHTMLCSIM() method.
+define('_CSIM_SPECIALFILE','_csim_special_');
 
-if (!defined('TTF_DIR')) {
-    if (strstr( PHP_OS, 'WIN') ) {
-    $sroot = getenv('SystemRoot');
-        if ( empty($sroot) ) {
-        die('JpGraph Error: No path specified for TTF_DIR and path can not be determined automatically. Please specify TTF_DIR manually (in jpg-config.inc).');
-        } else {
-      DEFINE('TTF_DIR', $sroot.'/fonts/');
-        }
-    } else {
-    DEFINE('TTF_DIR','/usr/X11R6/lib/X11/fonts/truetype/');
-    }
-}
+// HTTP GET argument that is used with image map
+// to indicate to the script to just generate the image
+// and not the full CSIM HTML page.
+define('_CSIM_DISPLAY','_jpg_csimd');
+
+// Special filename for Graph::Stroke(). If this filename is given
+// then the image will NOT be streamed to browser of file. Instead the
+// Stroke call will return the handler for the created GD image.
+define('_IMG_HANDLER','__handle');
 
-//------------------------------------------------------------------
-// Constants which are used as parameters for the method calls
-//------------------------------------------------------------------
-
-// TTF Font families
-DEFINE("FF_COURIER",10);
-DEFINE("FF_VERDANA",11);
-DEFINE("FF_TIMES",12);
-DEFINE("FF_COMIC",14);
-DEFINE("FF_ARIAL",15);
-DEFINE("FF_GEORGIA",16);
-DEFINE("FF_TREBUCHE",17);
-
-// Gnome Vera font
-// Available from http://www.gnome.org/fonts/
-DEFINE("FF_VERA",19);
-DEFINE("FF_VERAMONO",20);
-DEFINE("FF_VERASERIF",21);
-
-// Chinese font
-DEFINE("FF_SIMSUN",30);
-DEFINE("FF_CHINESE",31);
-DEFINE("FF_BIG5",31);
-
-// Japanese font
-DEFINE("FF_MINCHO",40);
-DEFINE("FF_PMINCHO",41);
-DEFINE("FF_GOTHIC",42);
-DEFINE("FF_PGOTHIC",43);
-
-// Limits for TTF fonts
-DEFINE('_FF_FIRST',10);
-DEFINE('_FF_LAST',43);
-
-// Older deprecated fonts
-DEFINE("FF_BOOK",91);    // Deprecated fonts from 1.9
-DEFINE("FF_HANDWRT",92); // Deprecated fonts from 1.9
-
-// TTF Font styles
-DEFINE("FS_NORMAL",9001);
-DEFINE("FS_BOLD",9002);
-DEFINE("FS_ITALIC",9003);
-DEFINE("FS_BOLDIT",9004);
-DEFINE("FS_BOLDITALIC",9004);
-
-//Definitions for internal font, new style
-DEFINE("FF_FONT0",1);
-DEFINE("FF_FONT1",2);
-DEFINE("FF_FONT2",4);
+// Special filename for Graph::Stroke(). If this filename is given
+// the image will be stroked to a file with a name based on the script name.
+define('_IMG_AUTO','auto');
 
 // Tick density
-DEFINE("TICKD_DENSE",1);
-DEFINE("TICKD_NORMAL",2);
-DEFINE("TICKD_SPARSE",3);
-DEFINE("TICKD_VERYSPARSE",4);
+define("TICKD_DENSE",1);
+define("TICKD_NORMAL",2);
+define("TICKD_SPARSE",3);
+define("TICKD_VERYSPARSE",4);
 
 // Side for ticks and labels.
-DEFINE("SIDE_LEFT",-1);
-DEFINE("SIDE_RIGHT",1);
-DEFINE("SIDE_DOWN",-1);
-DEFINE("SIDE_BOTTOM",-1);
-DEFINE("SIDE_UP",1);
-DEFINE("SIDE_TOP",1);
+define("SIDE_LEFT",-1);
+define("SIDE_RIGHT",1);
+define("SIDE_DOWN",-1);
+define("SIDE_BOTTOM",-1);
+define("SIDE_UP",1);
+define("SIDE_TOP",1);
 
 // Legend type stacked vertical or horizontal
-DEFINE("LEGEND_VERT",0);
-DEFINE("LEGEND_HOR",1);
+define("LEGEND_VERT",0);
+define("LEGEND_HOR",1);
 
 // Mark types for plot marks
-DEFINE("MARK_SQUARE",1);
-DEFINE("MARK_UTRIANGLE",2);
-DEFINE("MARK_DTRIANGLE",3);
-DEFINE("MARK_DIAMOND",4);
-DEFINE("MARK_CIRCLE",5);
-DEFINE("MARK_FILLEDCIRCLE",6);
-DEFINE("MARK_CROSS",7);
-DEFINE("MARK_STAR",8);
-DEFINE("MARK_X",9);
-DEFINE("MARK_LEFTTRIANGLE",10);
-DEFINE("MARK_RIGHTTRIANGLE",11);
-DEFINE("MARK_FLASH",12);
-DEFINE("MARK_IMG",13);
-DEFINE("MARK_FLAG1",14);
-DEFINE("MARK_FLAG2",15);
-DEFINE("MARK_FLAG3",16);
-DEFINE("MARK_FLAG4",17);
+define("MARK_SQUARE",1);
+define("MARK_UTRIANGLE",2);
+define("MARK_DTRIANGLE",3);
+define("MARK_DIAMOND",4);
+define("MARK_CIRCLE",5);
+define("MARK_FILLEDCIRCLE",6);
+define("MARK_CROSS",7);
+define("MARK_STAR",8);
+define("MARK_X",9);
+define("MARK_LEFTTRIANGLE",10);
+define("MARK_RIGHTTRIANGLE",11);
+define("MARK_FLASH",12);
+define("MARK_IMG",13);
+define("MARK_FLAG1",14);
+define("MARK_FLAG2",15);
+define("MARK_FLAG3",16);
+define("MARK_FLAG4",17);
 
 // Builtin images
-DEFINE("MARK_IMG_PUSHPIN",50);
-DEFINE("MARK_IMG_SPUSHPIN",50);
-DEFINE("MARK_IMG_LPUSHPIN",51);
-DEFINE("MARK_IMG_DIAMOND",52);
-DEFINE("MARK_IMG_SQUARE",53);
-DEFINE("MARK_IMG_STAR",54);
-DEFINE("MARK_IMG_BALL",55);
-DEFINE("MARK_IMG_SBALL",55);
-DEFINE("MARK_IMG_MBALL",56);
-DEFINE("MARK_IMG_LBALL",57);
-DEFINE("MARK_IMG_BEVEL",58);
+define("MARK_IMG_PUSHPIN",50);
+define("MARK_IMG_SPUSHPIN",50);
+define("MARK_IMG_LPUSHPIN",51);
+define("MARK_IMG_DIAMOND",52);
+define("MARK_IMG_SQUARE",53);
+define("MARK_IMG_STAR",54);
+define("MARK_IMG_BALL",55);
+define("MARK_IMG_SBALL",55);
+define("MARK_IMG_MBALL",56);
+define("MARK_IMG_LBALL",57);
+define("MARK_IMG_BEVEL",58);
 
 // Inline defines
-DEFINE("INLINE_YES",1);
-DEFINE("INLINE_NO",0);
+define("INLINE_YES",1);
+define("INLINE_NO",0);
 
 // Format for background images
-DEFINE("BGIMG_FILLPLOT",1);
-DEFINE("BGIMG_FILLFRAME",2);
-DEFINE("BGIMG_COPY",3);
-DEFINE("BGIMG_CENTER",4);
+define("BGIMG_FILLPLOT",1);
+define("BGIMG_FILLFRAME",2);
+define("BGIMG_COPY",3);
+define("BGIMG_CENTER",4);
+define("BGIMG_FREE",5);
 
 // Depth of objects
-DEFINE("DEPTH_BACK",0);
-DEFINE("DEPTH_FRONT",1);
+define("DEPTH_BACK",0);
+define("DEPTH_FRONT",1);
 
 // Direction
-DEFINE("VERTICAL",1);
-DEFINE("HORIZONTAL",0);
+define("VERTICAL",1);
+define("HORIZONTAL",0);
 
 // Axis styles for scientific style axis
-DEFINE('AXSTYLE_SIMPLE',1);
-DEFINE('AXSTYLE_BOXIN',2);
-DEFINE('AXSTYLE_BOXOUT',3);
-DEFINE('AXSTYLE_YBOXIN',4);
-DEFINE('AXSTYLE_YBOXOUT',5);
+define('AXSTYLE_SIMPLE',1);
+define('AXSTYLE_BOXIN',2);
+define('AXSTYLE_BOXOUT',3);
+define('AXSTYLE_YBOXIN',4);
+define('AXSTYLE_YBOXOUT',5);
 
 // Style for title backgrounds
-DEFINE('TITLEBKG_STYLE1',1);
-DEFINE('TITLEBKG_STYLE2',2);
-DEFINE('TITLEBKG_STYLE3',3);
-DEFINE('TITLEBKG_FRAME_NONE',0);
-DEFINE('TITLEBKG_FRAME_FULL',1);
-DEFINE('TITLEBKG_FRAME_BOTTOM',2);
-DEFINE('TITLEBKG_FRAME_BEVEL',3);
-DEFINE('TITLEBKG_FILLSTYLE_HSTRIPED',1);
-DEFINE('TITLEBKG_FILLSTYLE_VSTRIPED',2);
-DEFINE('TITLEBKG_FILLSTYLE_SOLID',3);
+define('TITLEBKG_STYLE1',1);
+define('TITLEBKG_STYLE2',2);
+define('TITLEBKG_STYLE3',3);
+define('TITLEBKG_FRAME_NONE',0);
+define('TITLEBKG_FRAME_FULL',1);
+define('TITLEBKG_FRAME_BOTTOM',2);
+define('TITLEBKG_FRAME_BEVEL',3);
+define('TITLEBKG_FILLSTYLE_HSTRIPED',1);
+define('TITLEBKG_FILLSTYLE_VSTRIPED',2);
+define('TITLEBKG_FILLSTYLE_SOLID',3);
+
+// Styles for axis labels background
+define('LABELBKG_NONE',0);
+define('LABELBKG_XAXIS',1);
+define('LABELBKG_YAXIS',2);
+define('LABELBKG_XAXISFULL',3);
+define('LABELBKG_YAXISFULL',4);
+define('LABELBKG_XYFULL',5);
+define('LABELBKG_XY',6);
+
 
 // Style for background gradient fills
-DEFINE('BGRAD_FRAME',1);
-DEFINE('BGRAD_MARGIN',2);
-DEFINE('BGRAD_PLOT',3);
+define('BGRAD_FRAME',1);
+define('BGRAD_MARGIN',2);
+define('BGRAD_PLOT',3);
 
 // Width of tab titles
-DEFINE('TABTITLE_WIDTHFIT',0);
-DEFINE('TABTITLE_WIDTHFULL',-1);
+define('TABTITLE_WIDTHFIT',0);
+define('TABTITLE_WIDTHFULL',-1);
 
 // Defines for 3D skew directions
-DEFINE('SKEW3D_UP',0);
-DEFINE('SKEW3D_DOWN',1);
-DEFINE('SKEW3D_LEFT',2);
-DEFINE('SKEW3D_RIGHT',3);
+define('SKEW3D_UP',0);
+define('SKEW3D_DOWN',1);
+define('SKEW3D_LEFT',2);
+define('SKEW3D_RIGHT',3);
+
+// For internal use only
+define("_JPG_DEBUG",false);
+define("_FORCE_IMGTOFILE",false);
+define("_FORCE_IMGDIR",'/tmp/jpgimg/');
 
-//
-// Get hold of gradient class (In Version 2.x)
-// A client of the library has to manually include this
-//
-require_once 'jpgraph_gradient.php';
 
 //
-// A wrapper class that is used to access the specified error object
-// (to hide the global error parameter and avoid having a GLOBAL directive
-// in all methods.
+// Automatic settings of path for cache and font directory
+// if they have not been previously specified
 //
-class JpGraphError
-{
-    public function Install($aErrObject)
-    {
-    GLOBAL $__jpg_err;
-    $__jpg_err = $aErrObject;
-    }
-    public function Raise($aMsg,$aHalt=true)
-    {
-    GLOBAL $__jpg_err;
-    $tmp = new $__jpg_err;
-    $tmp->Raise($aMsg,$aHalt);
+if(USE_CACHE) {
+    if (!defined('CACHE_DIR')) {
+        if ( strstr( PHP_OS, 'WIN') ) {
+            if( empty($_SERVER['TEMP']) ) {
+                $t = new ErrMsgText();
+                $msg = $t->Get(11,$file,$lineno);
+                die($msg);
+            }
+            else {
+                define('CACHE_DIR', $_SERVER['TEMP'] . '/');
+            }
+        } else {
+            define('CACHE_DIR','/tmp/jpgraph_cache/');
+        }
     }
 }
-
-//
-// ... and install the default error handler
-//
-if (USE_IMAGE_ERROR_HANDLER) {
-    $__jpg_err = "JpGraphErrObjectImg";
-} else {
-    $__jpg_err = "JpGraphErrObject";
+elseif( !defined('CACHE_DIR') ) {
+    define('CACHE_DIR', '');
 }
 
 //
-// Make GD sanity check
+// Setup path for western/latin TTF fonts
 //
-if ( !function_exists("imagetypes") || !function_exists('imagecreatefromstring') ) {
-    JpGraphError::Raise("This PHP installation is not configured with the GD library. Please recompile PHP with GD support to run JpGraph. (Neither function imagetypes() nor imagecreatefromstring() does exist)");
+if (!defined('TTF_DIR')) {
+    if (strstr( PHP_OS, 'WIN') ) {
+        $sroot = getenv('SystemRoot');
+        if( empty($sroot) ) {
+            $t = new ErrMsgText();
+            $msg = $t->Get(12,$file,$lineno);
+            die($msg);
+        }
+        else {
+            define('TTF_DIR', $sroot.'/fonts/');
+        }
+    } else {
+        define('TTF_DIR','/usr/share/fonts/truetype/');
+    }
 }
 
 //
-// Routine to determine if GD1 or GD2 is installed
+// Setup path for MultiByte TTF fonts (japanese, chinese etc.)
 //
-function CheckGDVersion()
-{
-    $GDfuncList = get_extension_funcs('gd');
-    if( !$GDfuncList ) return 0 ;
-    else {
-    if( in_array('imagegd2',$GDfuncList) &&
-        in_array('imagecreatetruecolor',$GDfuncList))
-
-        return 2;
-    else
-        return 1;
+if (!defined('MBTTF_DIR')) {
+    if (strstr( PHP_OS, 'WIN') ) {
+        $sroot = getenv('SystemRoot');
+        if( empty($sroot) ) {
+            $t = new ErrMsgText();
+            $msg = $t->Get(12,$file,$lineno);
+            die($msg);
+        }
+        else {
+            define('MBTTF_DIR', $sroot.'/fonts/');
+        }
+    } else {
+        define('MBTTF_DIR','/usr/share/fonts/truetype/');
     }
 }
 
 //
-// Check what version of the GD library is installed.
+// Check minimum PHP version
 //
-$GLOBALS['gd2'] = false;
-if (USE_LIBRARY_GD2 === 'auto') {
-    $gdversion = CheckGDVersion();
-    if ($gdversion == 2) {
-    $GLOBALS['gd2'] = true;
-    $GLOBALS['copyfunc'] = 'imagecopyresampled';
-    } elseif ($gdversion == 1) {
-    $GLOBALS['gd2'] = false;
-    $GLOBALS['copyfunc'] = 'imagecopyresized';
-    } else {
-    JpGraphError::Raise(" Your PHP installation does not seem to have the required GD library. Please see the PHP documentation on how to install and enable the GD library.");
-    }
-} else {
-    $GLOBALS['gd2'] = USE_LIBRARY_GD2;
-    $GLOBALS['copyfunc'] = USE_LIBRARY_GD2 ? 'imagecopyresampled' : 'imagecopyresized';
+function CheckPHPVersion($aMinVersion) {
+    list($majorC, $minorC, $editC) = preg_split('/[\/.-]/', PHP_VERSION);
+    list($majorR, $minorR, $editR) = preg_split('/[\/.-]/', $aMinVersion);
+
+    if ($majorC != $majorR) return false;
+    if ($majorC < $majorR) return false;
+    // same major - check minor
+    if ($minorC > $minorR) return true;
+    if ($minorC < $minorR) return false;
+    // and same minor
+    if ($editC  >= $editR)  return true;
+    return true;
 }
 
 //
-// First of all set up a default error handler
+// Make sure PHP version is high enough
 //
-
-//=============================================================
-// The default trivial text error handler.
-//=============================================================
-class JpGraphErrObject
-{
-    public $iTitle = "JpGraph Error";
-    public $iDest = false;
-
-    public function JpGraphErrObject()
-    {
-    // Empty. Reserved for future use
-    }
-
-    public function SetTitle($aTitle)
-    {
-    $this->iTitle = $aTitle;
-    }
-
-    public function SetStrokeDest($aDest)
-    {
-    $this->iDest = $aDest;
-    }
-
-    // If aHalt is true then execution can't continue. Typical used for fatal errors.
-    public function Raise($aMsg,$aHalt=true)
-    {
-    $aMsg = $this->iTitle.' '.$aMsg;
-    if ($this->iDest) {
-        $f = @fopen($this->iDest,'a');
-        if ($f) {
-        @fwrite($f,$aMsg);
-        @fclose($f);
-        }
-    }
-    if( $aHalt )
-        die();
-    }
+if( !CheckPHPVersion(MIN_PHPVERSION) ) {
+    JpGraphError::RaiseL(13,PHP_VERSION,MIN_PHPVERSION);
+    die();
 }
 
-//==============================================================
-// An image based error handler
-//==============================================================
-class JpGraphErrObjectImg extends JpGraphErrObject
-{
-    public function Raise($aMsg,$aHalt=true)
-    {
-    $img_iconerror =
-        'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAAaV'.
-        'BMVEX//////2Xy8mLl5V/Z2VvMzFi/v1WyslKlpU+ZmUyMjEh/'.
-        'f0VyckJlZT9YWDxMTDjAwMDy8sLl5bnY2K/MzKW/v5yyspKlpY'.
-        'iYmH+MjHY/PzV/f2xycmJlZVlZWU9MTEXY2Ms/PzwyMjLFTjea'.
-        'AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACx'.
-        'IAAAsSAdLdfvwAAAAHdElNRQfTBgISOCqusfs5AAABLUlEQVR4'.
-        '2tWV3XKCMBBGWfkranCIVClKLd/7P2Q3QsgCxjDTq+6FE2cPH+'.
-        'xJ0Ogn2lQbsT+Wrs+buAZAV4W5T6Bs0YXBBwpKgEuIu+JERAX6'.
-        'wM2rHjmDdEITmsQEEmWADgZm6rAjhXsoMGY9B/NZBwJzBvn+e3'.
-        'wHntCAJdGu9SviwIwoZVDxPB9+Rc0TSEbQr0j3SA1gwdSn6Db0'.
-        '6Tm1KfV6yzWGQO7zdpvyKLKBDmRFjzeB3LYgK7r6A/noDAfjtS'.
-        'IXaIzbJSv6WgUebTMV4EoRB8a2mQiQjgtF91HdKDKZ1gtFtQjk'.
-        'YcWaR5OKOhkYt+ZsTFdJRfPAApOpQYJTNHvCRSJR6SJngQadfc'.
-        'vd69OLMddVOPCGVnmrFD8bVYd3JXfxXPtLR/+mtv59/ALWiiMx'.
-        'qL72fwAAAABJRU5ErkJggg==' ;
-
-    if( function_exists("imagetypes") )
-        $supported = imagetypes();
-    else
-        $supported = 0;
-
-    if( !function_exists('imagecreatefromstring') )
-        $supported = 0;
-
-    if ( ob_get_length() || headers_sent() || !($supported & IMG_PNG) ) {
-        // Special case for headers already sent or that the installation doesn't support
-        // the PNG format (which the error icon is encoded in).
-        // Dont return an image since it can't be displayed
-        die($this->iTitle.' '.$aMsg);
-    }
-
-    $aMsg = wordwrap($aMsg,55);
-    $lines = substr_count($aMsg,"\n");
-
-    // Create the error icon GD
-    $erricon = Image::CreateFromString(base64_decode($img_iconerror));
-
-    // Create an image that contains the error text.
-    $w=400;
-    $h=100 + 15*max(0,$lines-3);
-
-    $img = new Image($w,$h);
-
-    // Drop shadow
-    $img->SetColor("gray");
-    $img->FilledRectangle(5,5,$w-1,$h-1,10);
-    $img->SetColor("gray:0.7");
-    $img->FilledRectangle(5,5,$w-3,$h-3,10);
-
-    // Window background
-    $img->SetColor("lightblue");
-    $img->FilledRectangle(1,1,$w-5,$h-5);
-    $img->CopyCanvasH($img->img,$erricon,5,30,0,0,40,40);
-
-    // Window border
-    $img->SetColor("black");
-    $img->Rectangle(1,1,$w-5,$h-5);
-    $img->Rectangle(0,0,$w-4,$h-4);
-
-    // Window top row
-    $img->SetColor("darkred");
-    for($y=3; $y < 18; $y += 2 )
-        $img->Line(1,$y,$w-6,$y);
-
-    // "White shadow"
-    $img->SetColor("white");
-
-    // Left window edge
-    $img->Line(2,2,2,$h-5);
-    $img->Line(2,2,$w-6,2);
-
-    // "Gray button shadow"
-    $img->SetColor("darkgray");
-
-    // Gray window shadow
-    $img->Line(2,$h-6,$w-5,$h-6);
-    $img->Line(3,$h-7,$w-5,$h-7);
-
-    // Window title
-    $m = floor($w/2-5);
-    $l = 100;
-    $img->SetColor("lightgray:1.3");
-    $img->FilledRectangle($m-$l,2,$m+$l,16);
-
-    // Stroke text
-    $img->SetColor("darkred");
-    $img->SetFont(FF_FONT2,FS_BOLD);
-    $img->StrokeText($m-50,15,$this->iTitle);
-    $img->SetColor("black");
-    $img->SetFont(FF_FONT1,FS_NORMAL);
-    $txt = new Text($aMsg,52,25);
-    $txt->Align("left","top");
-    $txt->Stroke($img);
-    if ($this->iDest) {
-           $img->Stream($this->iDest);
-    } else {
-        $img->Headers();
-        $img->Stream();
-    }
-    if( $aHalt )
-        die();
-    }
+//
+// Make GD sanity check
+//
+if( !function_exists("imagetypes") || !function_exists('imagecreatefromstring') ) {
+    JpGraphError::RaiseL(25001);
+    //("This PHP installation is not configured with the GD library. Please recompile PHP with GD support to run JpGraph. (Neither function imagetypes() nor imagecreatefromstring() does exist)");
 }
 
 //
 // Setup PHP error handler
 //
-function _phpErrorHandler($errno,$errmsg,$filename, $linenum, $vars)
-{
+function _phpErrorHandler($errno,$errmsg,$filename, $linenum, $vars) {
     // Respect current error level
-    if ( $errno & error_reporting() ) {
-    JpGraphError::Raise('In '.basename($filename).'#'.$linenum."\n".$errmsg);
+    if( $errno & error_reporting() ) {
+        JpGraphError::RaiseL(25003,basename($filename),$linenum,$errmsg);
     }
 }
 
-if (INSTALL_PHP_ERR_HANDLER) {
+if( INSTALL_PHP_ERR_HANDLER ) {
     set_error_handler("_phpErrorHandler");
 }
 
 //
-//Check if there were any warnings, perhaps some wrong includes by the
-//user
+// Check if there were any warnings, perhaps some wrong includes by the user. In this
+// case we raise it immediately since otherwise the image will not show and makes
+// debugging difficult. This is controlled by the user setting CATCH_PHPERRMSG
 //
-if ( isset($GLOBALS['php_errormsg']) ) {
-    JpGraphError::Raise("General PHP error : ".$GLOBALS['php_errormsg']);
+if( isset($GLOBALS['php_errormsg']) && CATCH_PHPERRMSG && !preg_match('/|Deprecated|/i', $GLOBALS['php_errormsg']) ) {
+    JpGraphError::RaiseL(25004,$GLOBALS['php_errormsg']);
 }
 
-
 // Useful mathematical function
 function sign($a) {return $a >= 0 ? 1 : -1;}
 
+//
 // Utility function to generate an image name based on the filename we
 // are running from and assuming we use auto detection of graphic format
 // (top level), i.e it is safe to call this function
 // from a script that uses JpGraph
-function GenImgName()
-{
-    global $_SERVER;
-
+//
+function GenImgName() {
     // Determine what format we should use when we save the images
     $supported = imagetypes();
-    if( $supported & IMG_PNG )	   $img_format="png";
+    if( $supported & IMG_PNG )    $img_format="png";
     elseif( $supported & IMG_GIF ) $img_format="gif";
     elseif( $supported & IMG_JPG ) $img_format="jpeg";
+    elseif( $supported & IMG_WBMP ) $img_format="wbmp";
+    elseif( $supported & IMG_XPM ) $img_format="xpm";
 
-    if( !isset($_SERVER['PHP_SELF']) )
-    JpGraphError::Raise(" Can't access PHP_SELF, PHP global variable. You can't run PHP from command line if you want to use the 'auto' naming of cache or image files.");
-    $fname = basename($_SERVER['PHP_SELF']);
-    if ( !empty($_SERVER['QUERY_STRING']) ) {
-    $q = @$_SERVER['QUERY_STRING'];
-    $fname .= '?'.preg_replace("/\W/", "_", $q).'.'.$img_format;
-    } else {
-    $fname = substr($fname,0,strlen($fname)-4).'.'.$img_format;
-    }
-
-    return $fname;
-}
-
-class LanguageConv
-{
-    public $g2312 = null ;
-
-    public function Convert($aTxt,$aFF)
-    {
-    if (LANGUAGE_CYRILLIC) {
-        if (CYRILLIC_FROM_WINDOWS) {
-        $aTxt = convert_cyr_string($aTxt, "w", "k");
-        }
-        $isostring = convert_cyr_string($aTxt, "k", "i");
-        $unistring = LanguageConv::iso2uni($isostring);
-
-        return $unistring;
-    } elseif ($aFF === FF_SIMSUN) {
-        // Do Chinese conversion
-        if ($this->g2312 == null) {
-        include_once 'jpgraph_gb2312.php';
-        $this->g2312 = new GB2312toUTF8();
-        }
-
-        return $this->g2312->gb2utf8($aTxt);
-    } elseif ($aFF === FF_CHINESE) {
-        if ( !function_exists('iconv') ) {
-        JpGraphError::Raise('Usage of FF_CHINESE (FF_BIG5) font family requires that your PHP setup has the iconv() function. By default this is not compiled into PHP (needs the "--width-iconv" when configured).');
-        }
-
-        return iconv('BIG5','UTF-8',$aTxt);
-    } else
 
-        return $aTxt;
+    if( !isset($_SERVER['PHP_SELF']) ) {
+        JpGraphError::RaiseL(25005);
+        //(" Can't access PHP_SELF, PHP global variable. You can't run PHP from command line if you want to use the 'auto' naming of cache or image files.");
     }
-
-    // Translate iso encoding to unicode
-    public function iso2uni ($isoline)
-    {
-    for ($i=0; $i < strlen($isoline); $i++) {
-        $thischar=substr($isoline,$i,1);
-        $charcode=ord($thischar);
-        $uniline.=($charcode>175) ? "&#" . (1040+($charcode-176)). ";" : $thischar;
+    $fname = basename($_SERVER['PHP_SELF']);
+    if( !empty($_SERVER['QUERY_STRING']) ) {
+        $q = @$_SERVER['QUERY_STRING'];
+        $fname .= '_'.preg_replace("/\W/", "_", $q).'.'.$img_format;
     }
-
-    return $uniline;
+    else {
+        $fname = substr($fname,0,strlen($fname)-4).'.'.$img_format;
     }
+    return $fname;
 }
 
 //===================================================
@@ -545,216 +320,168 @@ public function iso2uni ($isoline)
 // time measurement of generating graphs. Multiple
 // timers can be started.
 //===================================================
-class JpgTimer
-{
-    public $start;
-    public $idx;
-//---------------
-// CONSTRUCTOR
-    public function JpgTimer()
-    {
-    $this->idx=0;
-    }
+class JpgTimer {
+    private $start, $idx;
 
-//---------------
-// PUBLIC METHODS
+    function __construct() {
+        $this->idx=0;
+    }
 
     // Push a new timer start on stack
-    public function Push()
-    {
-    list($ms,$s)=explode(" ",microtime());
-    $this->start[$this->idx++]=floor($ms*1000) + 1000*$s;
+    function Push() {
+        list($ms,$s)=explode(" ",microtime());
+        $this->start[$this->idx++]=floor($ms*1000) + 1000*$s;
     }
 
     // Pop the latest timer start and return the diff with the
     // current time
-    public function Pop()
-    {
-    assert($this->idx>0);
-    list($ms,$s)=explode(" ",microtime());
-    $etime=floor($ms*1000) + (1000*$s);
-    $this->idx--;
-
-    return $etime-$this->start[$this->idx];
+    function Pop() {
+        assert($this->idx>0);
+        list($ms,$s)=explode(" ",microtime());
+        $etime=floor($ms*1000) + (1000*$s);
+        $this->idx--;
+        return $etime-$this->start[$this->idx];
     }
 } // Class
 
-$gJpgBrandTiming = BRAND_TIMING;
 //===================================================
 // CLASS DateLocale
 // Description: Hold localized text used in dates
 //===================================================
-class DateLocale
-{
-    public $iLocale = 'C'; // environmental locale be used by default
-
-    public $iDayAbb = null;
-    public $iShortDay = null;
-    public $iShortMonth = null;
-    public $iMonthName = null;
-
-//---------------
-// CONSTRUCTOR
-    public function DateLocale()
-    {
-    settype($this->iDayAbb, 'array');
-    settype($this->iShortDay, 'array');
-    settype($this->iShortMonth, 'array');
-    settype($this->iMonthName, 'array');
+class DateLocale {
 
+    public $iLocale = 'C'; // environmental locale be used by default
+    private $iDayAbb = null, $iShortDay = null, $iShortMonth = null, $iMonthName = null;
 
-    $this->Set('C');
+    function __construct() {
+        settype($this->iDayAbb, 'array');
+        settype($this->iShortDay, 'array');
+        settype($this->iShortMonth, 'array');
+        settype($this->iMonthName, 'array');
+        $this->Set('C');
     }
 
-//---------------
-// PUBLIC METHODS
-    public function Set($aLocale)
-    {
-    if ( in_array($aLocale, array_keys($this->iDayAbb)) ) {
-        $this->iLocale = $aLocale;
-
-        return TRUE;  // already cached nothing else to do!
-    }
+    function Set($aLocale) {
+        if ( in_array($aLocale, array_keys($this->iDayAbb)) ){
+            $this->iLocale = $aLocale;
+            return TRUE;  // already cached nothing else to do!
+        }
 
-    $pLocale = setlocale(LC_TIME, 0); // get current locale for LC_TIME
-    $res = @setlocale(LC_TIME, $aLocale);
-    if (! $res) {
-        JpGraphError::Raise("You are trying to use the locale ($aLocale) which your PHP installation does not support. Hint: Use '' to indicate the default locale for this geographic region.");
+        $pLocale = setlocale(LC_TIME, 0); // get current locale for LC_TIME
 
-        return FALSE;
-    }
+        if (is_array($aLocale)) {
+            foreach ($aLocale as $loc) {
+                $res = @setlocale(LC_TIME, $loc);
+                if ( $res ) {
+                    $aLocale = $loc;
+                    break;
+                }
+            }
+        }
+        else {
+            $res = @setlocale(LC_TIME, $aLocale);
+        }
 
-    $this->iLocale = $aLocale;
+        if ( ! $res ) {
+            JpGraphError::RaiseL(25007,$aLocale);
+            //("You are trying to use the locale ($aLocale) which your PHP installation does not support. Hint: Use '' to indicate the default locale for this geographic region.");
+            return FALSE;
+        }
 
-    for ( $i = 0, $ofs = 0 - strftime('%w'); $i < 7; $i++, $ofs++ ) {
-        $day = strftime('%a', strtotime("$ofs day"));
-        $day{0} = strtoupper($day{0});
-        $this->iDayAbb[$aLocale][]= $day{0};
-        $this->iShortDay[$aLocale][]= $day;
-    }
+        $this->iLocale = $aLocale;
+        for( $i = 0, $ofs = 0 - strftime('%w'); $i < 7; $i++, $ofs++ ) {
+            $day = strftime('%a', strtotime("$ofs day"));
+            $day[0] = strtoupper($day[0]);
+            $this->iDayAbb[$aLocale][]= $day[0];
+            $this->iShortDay[$aLocale][]= $day;
+        }
 
-    for ($i=1; $i<=12; ++$i) {
-        list($short ,$full) = explode('|', strftime("%b|%B",strtotime("2001-$i-01")));
-        $this->iShortMonth[$aLocale][] = ucfirst($short);
-        $this->iMonthName [$aLocale][] = ucfirst($full);
-    }
+        for($i=1; $i<=12; ++$i) {
+            list($short ,$full) = explode('|', strftime("%b|%B",strtotime("2001-$i-01")));
+            $this->iShortMonth[$aLocale][] = ucfirst($short);
+            $this->iMonthName [$aLocale][] = ucfirst($full);
+        }
 
-    // Return to original locale
-    setlocale(LC_TIME, $pLocale);
+        setlocale(LC_TIME, $pLocale);
 
-    return TRUE;
+        return TRUE;
     }
 
 
-    public function GetDayAbb()
-    {
-    return $this->iDayAbb[$this->iLocale];
+    function GetDayAbb() {
+        return $this->iDayAbb[$this->iLocale];
     }
 
-    public function GetShortDay()
-    {
-    return $this->iShortDay[$this->iLocale];
+    function GetShortDay() {
+        return $this->iShortDay[$this->iLocale];
     }
 
-    public function GetShortMonth()
-    {
-    return $this->iShortMonth[$this->iLocale];
+    function GetShortMonth() {
+        return $this->iShortMonth[$this->iLocale];
     }
 
-    public function GetShortMonthName($aNbr)
-    {
-    return $this->iShortMonth[$this->iLocale][$aNbr];
+    function GetShortMonthName($aNbr) {
+        return $this->iShortMonth[$this->iLocale][$aNbr];
     }
 
-    public function GetLongMonthName($aNbr)
-    {
-    return $this->iMonthName[$this->iLocale][$aNbr];
+    function GetLongMonthName($aNbr) {
+        return $this->iMonthName[$this->iLocale][$aNbr];
     }
 
-    public function GetMonth()
-    {
-    return $this->iMonthName[$this->iLocale];
+    function GetMonth() {
+        return $this->iMonthName[$this->iLocale];
     }
 }
 
+// Global object handlers
 $gDateLocale = new DateLocale();
 $gJpgDateLocale = new DateLocale();
 
+//=======================================================
+// CLASS Footer
+// Description: Encapsulates the footer line in the Graph
+//=======================================================
+class Footer {
+    public $iLeftMargin = 3, $iRightMargin = 3, $iBottomMargin = 3 ;
+    public $left,$center,$right;
+    private $iTimer=null, $itimerpoststring='';
 
-//===================================================
-// CLASS FuncGenerator
-// Description: Utility class to help generate data for function plots.
-// The class supports both parametric and regular functions.
-//===================================================
-class FuncGenerator
-{
-    public $iFunc='',$iXFunc='',$iMin,$iMax,$iStepSize;
-
-    public function FuncGenerator($aFunc,$aXFunc='')
-    {
-    $this->iFunc = $aFunc;
-    $this->iXFunc = $aXFunc;
+    function __construct() {
+        $this->left = new Text();
+        $this->left->ParagraphAlign('left');
+        $this->center = new Text();
+        $this->center->ParagraphAlign('center');
+        $this->right = new Text();
+        $this->right->ParagraphAlign('right');
     }
 
-    public function E($aXMin,$aXMax,$aSteps=50)
-    {
-    $this->iMin = $aXMin;
-    $this->iMax = $aXMax;
-    $this->iStepSize = ($aXMax-$aXMin)/$aSteps;
-
-    if( $this->iXFunc != '' )
-        $t = 'for ($i='.$aXMin.'; $i<='.$aXMax.'; $i += '.$this->iStepSize.') {$ya[]='.$this->iFunc.';$xa[]='.$this->iXFunc.';}';
-    elseif( $this->iFunc != '' )
-        $t = 'for ($x='.$aXMin.'; $x<='.$aXMax.'; $x += '.$this->iStepSize.') {$ya[]='.$this->iFunc.';$xa[]=$x;} $x='.$aXMax.';$ya[]='.$this->iFunc.';$xa[]=$x;';
-    else
-        JpGraphError::Raise('FuncGenerator : No function specified. ');
+    function SetTimer($aTimer,$aTimerPostString='') {
+        $this->iTimer = $aTimer;
+        $this->itimerpoststring = $aTimerPostString;
+    }
 
-    @eval($t);
+    function SetMargin($aLeft=3,$aRight=3,$aBottom=3) {
+        $this->iLeftMargin = $aLeft;
+        $this->iRightMargin = $aRight;
+        $this->iBottomMargin = $aBottom;
+    }
 
-    // If there is an error in the function specifcation this is the only
-    // way we can discover that.
-    if( empty($xa) || empty($ya) )
-        JpGraphError::Raise('FuncGenerator : Syntax error in function specification ');
+    function Stroke($aImg) {
+        $y = $aImg->height - $this->iBottomMargin;
+        $x = $this->iLeftMargin;
+        $this->left->Align('left','bottom');
+        $this->left->Stroke($aImg,$x,$y);
 
-    return array($xa,$ya);
-    }
-}
+        $x = ($aImg->width - $this->iLeftMargin - $this->iRightMargin)/2;
+        $this->center->Align('center','bottom');
+        $this->center->Stroke($aImg,$x,$y);
 
-//=======================================================
-// CLASS Footer
-// Description: Encapsulates the footer line in the Graph
-//=======================================================
-class Footer
-{
-    public $left,$center,$right;
-    public $iLeftMargin = 3;
-    public $iRightMargin = 3;
-    public $iBottomMargin = 3;
-
-    public function Footer()
-    {
-    $this->left = new Text();
-    $this->left->ParagraphAlign('left');
-    $this->center = new Text();
-    $this->center->ParagraphAlign('center');
-    $this->right = new Text();
-    $this->right->ParagraphAlign('right');
-    }
-
-    public function Stroke($aImg)
-    {
-    $y = $aImg->height - $this->iBottomMargin;
-    $x = $this->iLeftMargin;
-    $this->left->Align('left','bottom');
-    $this->left->Stroke($aImg,$x,$y);
-
-    $x = ($aImg->width - $this->iLeftMargin - $this->iRightMargin)/2;
-    $this->center->Align('center','bottom');
-    $this->center->Stroke($aImg,$x,$y);
-
-    $x = $aImg->width - $this->iRightMargin;
-    $this->right->Align('right','bottom');
-    $this->right->Stroke($aImg,$x,$y);
+        $x = $aImg->width - $this->iRightMargin;
+        $this->right->Align('right','bottom');
+        if( $this->iTimer != null ) {
+            $this->right->Set( $this->right->t . sprintf('%.3f',$this->iTimer->Pop()/1000.0) . $this->itimerpoststring );
+        }
+        $this->right->Stroke($aImg,$x,$y);
     }
 }
 
@@ -763,722 +490,888 @@ public function Stroke($aImg)
 // CLASS Graph
 // Description: Main class to handle graphs
 //===================================================
-class Graph
-{
-    public $cache=null;		// Cache object (singleton)
-    public $img=null;			// Img object (singleton)
-    public $plots=array();	// Array of all plot object in the graph (for Y 1 axis)
-    public $y2plots=array();// Array of all plot object in the graph (for Y 2 axis)
-    public $xscale=null;		// X Scale object (could be instance of LinearScale or LogScale
-    public $yscale=null,$y2scale=null;
-    public $iIcons = array();      // Array of Icons to add to
-    public $cache_name;		// File name to be used for the current graph in the cache directory
-    public $xgrid=null;		// X Grid object (linear or logarithmic)
+class Graph {
+    public $cache=null;   // Cache object (singleton)
+    public $img=null;   // Img object (singleton)
+    public $plots=array();  // Array of all plot object in the graph (for Y 1 axis)
+    public $y2plots=array();  // Array of all plot object in the graph (for Y 2 axis)
+    public $ynplots=array();
+    public $xscale=null;  // X Scale object (could be instance of LinearScale or LogScale
+    public $yscale=null,$y2scale=null, $ynscale=array();
+    public $iIcons = array();  // Array of Icons to add to
+    public $cache_name;   // File name to be used for the current graph in the cache directory
+    public $xgrid=null;   // X Grid object (linear or logarithmic)
     public $ygrid=null,$y2grid=null; //dito for Y
-    public $doframe=true,$frame_color=array(0,0,0), $frame_weight=1;	// Frame around graph
-    public $boxed=false, $box_color=array(0,0,0), $box_weight=1;		// Box around plot area
-    public $doshadow=false,$shadow_width=4,$shadow_color=array(102,102,102);	// Shadow for graph
-    public $xaxis=null;		// X-axis (instane of Axis class)
-    public $yaxis=null, $y2axis=null;	// Y axis (instance of Axis class)
-    public $margin_color=array(200,200,200);	// Margin color of graph
-    public $plotarea_color=array(255,255,255);	// Plot area color
-    public $title,$subtitle,$subsubtitle; 	// Title and subtitle(s) text object
-    public $axtype="linlin";	// Type of axis
-    public $xtick_factor;	// Factot to determine the maximum number of ticks depending on the plot with
-    public $texts=null, $y2texts=null;		// Text object to ge shown in the graph
+    public $doframe,$frame_color, $frame_weight; // Frame around graph
+    public $boxed=false, $box_color='black', $box_weight=1;  // Box around plot area
+    public $doshadow=false,$shadow_width=4,$shadow_color='gray@0.5'; // Shadow for graph
+    public $xaxis=null;   // X-axis (instane of Axis class)
+    public $yaxis=null, $y2axis=null, $ynaxis=array(); // Y axis (instance of Axis class)
+    public $margin_color; // Margin color of graph
+    public $plotarea_color=array(255,255,255); // Plot area color
+    public $title,$subtitle,$subsubtitle;  // Title and subtitle(s) text object
+    public $axtype="linlin";  // Type of axis
+    public $xtick_factor,$ytick_factor; // Factor to determine the maximum number of ticks depending on the plot width
+    public $texts=null, $y2texts=null; // Text object to ge shown in the graph
     public $lines=null, $y2lines=null;
     public $bands=null, $y2bands=null;
-    public $text_scale_off=0;	// Text scale offset in world coordinates
-    public $background_image="",$background_image_type=-1,$background_image_format="png";
+    public $text_scale_off=0, $text_scale_abscenteroff=-1; // Text scale in fractions and for centering bars
+    public $background_image='',$background_image_type=-1,$background_image_format="png";
     public $background_image_bright=0,$background_image_contr=0,$background_image_sat=0;
+    public $background_image_xpos=0,$background_image_ypos=0;
     public $image_bright=0, $image_contr=0, $image_sat=0;
     public $inline;
-    public $showcsim=0,$csimcolor="red"; //debug stuff, draw the csim boundaris on the image if <>0
-    public $grid_depth=DEPTH_BACK;	// Draw grid under all plots as default
+    public $showcsim=0,$csimcolor="red";//debug stuff, draw the csim boundaris on the image if <>0
+    public $grid_depth=DEPTH_BACK; // Draw grid under all plots as default
     public $iAxisStyle = AXSTYLE_SIMPLE;
     public $iCSIMdisplay=false,$iHasStroked = false;
     public $footer;
-    public $csimcachename = '', $csimcachetimeout = 0;
+    public $csimcachename = '', $csimcachetimeout = 0, $iCSIMImgAlt='';
     public $iDoClipping = false;
     public $y2orderback=true;
     public $tabtitle;
     public $bkg_gradtype=-1,$bkg_gradstyle=BGRAD_MARGIN;
     public $bkg_gradfrom='navy', $bkg_gradto='silver';
+    public $plot_gradtype=-1,$plot_gradstyle=BGRAD_MARGIN;
+    public $plot_gradfrom='silver', $plot_gradto='navy';
+
     public $titlebackground = false;
-    var	$titlebackground_color = 'lightblue',
-    $titlebackground_style = 1,
-    $titlebackground_framecolor = 'blue',
-    $titlebackground_framestyle = 2,
-    $titlebackground_frameweight = 1,
-    $titlebackground_bevelheight = 3 ;
+    public $titlebackground_color = 'lightblue',
+           $titlebackground_style = 1,
+           $titlebackground_framecolor,
+           $titlebackground_framestyle,
+           $titlebackground_frameweight,
+           $titlebackground_bevelheight;
     public $titlebkg_fillstyle=TITLEBKG_FILLSTYLE_SOLID;
     public $titlebkg_scolor1='black',$titlebkg_scolor2='white';
-    public $framebevel = false, $framebeveldepth = 2 ;
-    public $framebevelborder = false, $framebevelbordercolor='black';
-    public $framebevelcolor1='white@0.4', $framebevelcolor2='black@0.4';
+    public $framebevel, $framebeveldepth;
+    public $framebevelborder, $framebevelbordercolor;
+    public $framebevelcolor1, $framebevelcolor2;
     public $background_image_mix=100;
     public $background_cflag = '';
     public $background_cflag_type = BGIMG_FILLPLOT;
     public $background_cflag_mix = 100;
     public $iImgTrans=false,
-    $iImgTransHorizon = 100,$iImgTransSkewDist=150,
-    $iImgTransDirection = 1, $iImgTransMinSize = true,
-    $iImgTransFillColor='white',$iImgTransHighQ=false,
-    $iImgTransBorder=false,$iImgTransHorizonPos=0.5;
-
-//---------------
-// CONSTRUCTOR
-
-    // aWIdth 		Width in pixels of image
-    // aHeight  	Height in pixels of image
-    // aCachedName	Name for image file in cache directory
-    // aTimeOut		Timeout in minutes for image in cache
-    // aInline		If true the image is streamed back in the call to Stroke()
-    //			If false the image is just created in the cache
-    public function Graph($aWidth=300,$aHeight=200,$aCachedName="",$aTimeOut=0,$aInline=true)
-    {
-    GLOBAL $gJpgBrandTiming;
-    // If timing is used create a new timing object
-    if ($gJpgBrandTiming) {
-        global $tim;
-        $tim = new JpgTimer();
-        $tim->Push();
-    }
-
-    if ( !is_numeric($aWidth) || !is_numeric($aHeight) ) {
-        JpGraphError::Raise('Image width/height argument in Graph::Graph() must be numeric');
-    }
+           $iImgTransHorizon = 100,$iImgTransSkewDist=150,
+           $iImgTransDirection = 1, $iImgTransMinSize = true,
+           $iImgTransFillColor='white',$iImgTransHighQ=false,
+           $iImgTransBorder=false,$iImgTransHorizonPos=0.5;
+    public $legend;
+    public $graph_theme;
+    protected $iYAxisDeltaPos=50;
+    protected $iIconDepth=DEPTH_BACK;
+    protected $iAxisLblBgType = 0,
+              $iXAxisLblBgFillColor = 'lightgray', $iXAxisLblBgColor = 'black',
+              $iYAxisLblBgFillColor = 'lightgray', $iYAxisLblBgColor = 'black';
+    protected $iTables=NULL;
+
+    protected $isRunningClear = false;
+    protected $inputValues;
+    protected $isAfterSetScale = false;
+
+    // aWIdth   Width in pixels of image
+    // aHeight   Height in pixels of image
+    // aCachedName Name for image file in cache directory
+    // aTimeOut  Timeout in minutes for image in cache
+    // aInline  If true the image is streamed back in the call to Stroke()
+    //   If false the image is just created in the cache
+    function __construct($aWidth=300,$aHeight=200,$aCachedName='',$aTimeout=0,$aInline=true) {
+
+        if( !is_numeric($aWidth) || !is_numeric($aHeight) ) {
+            JpGraphError::RaiseL(25008);//('Image width/height argument in Graph::Graph() must be numeric');
+        }
+
+        // Initialize frame and margin
+        $this->InitializeFrameAndMargin();
+
+        // Automatically generate the image file name based on the name of the script that
+        // generates the graph
+        if( $aCachedName == 'auto' ) {
+            $aCachedName=GenImgName();
+        }
+
+        // Should the image be streamed back to the browser or only to the cache?
+        $this->inline=$aInline;
+
+        $this->img = new RotImage($aWidth,$aHeight);
+        $this->cache  = new ImgStreamCache();
+
+        // Window doesn't like '?' in the file name so replace it with an '_'
+        $aCachedName = str_replace("?","_",$aCachedName);
+        $this->SetupCache($aCachedName, $aTimeout);
+
+        $this->title = new Text();
+        $this->title->ParagraphAlign('center');
+        $this->title->SetFont(FF_DEFAULT,FS_NORMAL); //FF_FONT2, FS_BOLD
+        $this->title->SetMargin(5);
+        $this->title->SetAlign('center');
+
+        $this->subtitle = new Text();
+        $this->subtitle->ParagraphAlign('center');
+        $this->subtitle->SetMargin(3);
+        $this->subtitle->SetAlign('center');
+
+        $this->subsubtitle = new Text();
+        $this->subsubtitle->ParagraphAlign('center');
+        $this->subsubtitle->SetMargin(3);
+        $this->subsubtitle->SetAlign('center');
+
+        $this->legend = new Legend();
+        $this->footer = new Footer();
+
+        // If the cached version exist just read it directly from the
+        // cache, stream it back to browser and exit
+        if( $aCachedName!='' && READ_CACHE && $aInline ) {
+            if( $this->cache->GetAndStream($this->img,$aCachedName) ) {
+                exit();
+            }
+        }
 
-    // Automatically generate the image file name based on the name of the script that
-    // generates the graph
-    if( $aCachedName=="auto" )
-        $aCachedName=GenImgName();
+        $this->SetTickDensity(); // Normal density
 
-    // Should the image be streamed back to the browser or only to the cache?
-    $this->inline=$aInline;
+        $this->tabtitle = new GraphTabTitle();
 
-    $this->img	= new RotImage($aWidth,$aHeight);
+        if (!$this->isRunningClear) {
+            $this->inputValues = array();
+            $this->inputValues['aWidth'] = $aWidth;
+            $this->inputValues['aHeight'] = $aHeight;
+            $this->inputValues['aCachedName'] = $aCachedName;
+            $this->inputValues['aTimeout'] = $aTimeout;
+            $this->inputValues['aInline'] = $aInline;
 
-    $this->cache 	= new ImgStreamCache($this->img);
-    $this->cache->SetTimeOut($aTimeOut);
+            $theme_class = DEFAULT_THEME_CLASS;
+            if (class_exists($theme_class)) {
+                $this->graph_theme = new $theme_class();
+            }
+        }
+    }
 
-    $this->title = new Text();
-    $this->title->ParagraphAlign('center');
-    $this->title->SetFont(FF_FONT2,FS_BOLD);
-    $this->title->SetMargin(3);
-    $this->title->SetAlign('center');
+    function InitializeFrameAndMargin() {
+        $this->doframe=true;
+        $this->frame_color='black';
+        $this->frame_weight=1; 
 
-    $this->subtitle = new Text();
-    $this->subtitle->ParagraphAlign('center');
-    $this->subtitle->SetMargin(2);
-    $this->subtitle->SetAlign('center');
+        $this->titlebackground_framecolor = 'blue';
+        $this->titlebackground_framestyle = 2;
+        $this->titlebackground_frameweight = 1;
+        $this->titlebackground_bevelheight = 3;
+        $this->titlebkg_fillstyle=TITLEBKG_FILLSTYLE_SOLID;
+        $this->titlebkg_scolor1='black';
+        $this->titlebkg_scolor2='white';
+        $this->framebevel = false;
+        $this->framebeveldepth = 2;
+        $this->framebevelborder = false;
+        $this->framebevelbordercolor='black';
+        $this->framebevelcolor1='white@0.4';
+        $this->framebevelcolor2='black@0.4';
 
-    $this->subsubtitle = new Text();
-    $this->subsubtitle->ParagraphAlign('center');
-    $this->subsubtitle->SetMargin(2);
-    $this->subsubtitle->SetAlign('center');
+        $this->margin_color = array(250,250,250);
+    }
 
-    $this->legend = new Legend();
-    $this->footer = new Footer();
+    function SetupCache($aFilename,$aTimeout=60) {
+        $this->cache_name = $aFilename;
+        $this->cache->SetTimeOut($aTimeout);
+    }
 
-    // If the cached version exist just read it directly from the
-    // cache, stream it back to browser and exit
-    if( $aCachedName!="" && READ_CACHE && $aInline )
-        if ( $this->cache->GetAndStream($aCachedName) ) {
-        exit();
-        }
+    // Enable final image perspective transformation
+    function Set3DPerspective($aDir=1,$aHorizon=100,$aSkewDist=120,$aQuality=false,$aFillColor='#FFFFFF',$aBorder=false,$aMinSize=true,$aHorizonPos=0.5) {
+        $this->iImgTrans = true;
+        $this->iImgTransHorizon = $aHorizon;
+        $this->iImgTransSkewDist= $aSkewDist;
+        $this->iImgTransDirection = $aDir;
+        $this->iImgTransMinSize = $aMinSize;
+        $this->iImgTransFillColor=$aFillColor;
+        $this->iImgTransHighQ=$aQuality;
+        $this->iImgTransBorder=$aBorder;
+        $this->iImgTransHorizonPos=$aHorizonPos;
+    }
 
-    $this->cache_name = $aCachedName;
-    $this->SetTickDensity(); // Normal density
+    function SetUserFont($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
+        $this->img->ttf->SetUserFont($aNormal,$aBold,$aItalic,$aBoldIt);
+    }
 
-    $this->tabtitle = new GraphTabTitle();
+    function SetUserFont1($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
+        $this->img->ttf->SetUserFont1($aNormal,$aBold,$aItalic,$aBoldIt);
     }
-//---------------
-// PUBLIC METHODS
 
-    // Enable final image perspective transformation
-    public function Set3DPerspective($aDir=1,$aHorizon=100,$aSkewDist=120,$aQuality=false,$aFillColor='#FFFFFF',$aBorder=false,$aMinSize=true,$aHorizonPos=0.5)
-    {
-    $this->iImgTrans = true;
-    $this->iImgTransHorizon = $aHorizon;
-    $this->iImgTransSkewDist= $aSkewDist;
-    $this->iImgTransDirection = $aDir;
-    $this->iImgTransMinSize = $aMinSize;
-    $this->iImgTransFillColor=$aFillColor;
-    $this->iImgTransHighQ=$aQuality;
-    $this->iImgTransBorder=$aBorder;
-    $this->iImgTransHorizonPos=$aHorizonPos;
+    function SetUserFont2($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
+        $this->img->ttf->SetUserFont2($aNormal,$aBold,$aItalic,$aBoldIt);
     }
 
+    function SetUserFont3($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
+        $this->img->ttf->SetUserFont3($aNormal,$aBold,$aItalic,$aBoldIt);
+    }
 
+    // Set Image format and optional quality
+    function SetImgFormat($aFormat,$aQuality=75) {
+        $this->img->SetImgFormat($aFormat,$aQuality);
+    }
 
     // Should the grid be in front or back of the plot?
-    public function SetGridDepth($aDepth)
-    {
-    $this->grid_depth=$aDepth;
+    function SetGridDepth($aDepth) {
+        $this->grid_depth=$aDepth;
+    }
+
+    function SetIconDepth($aDepth) {
+        $this->iIconDepth=$aDepth;
     }
 
     // Specify graph angle 0-360 degrees.
-    public function SetAngle($aAngle)
-    {
-    $this->img->SetAngle($aAngle);
+    function SetAngle($aAngle) {
+        $this->img->SetAngle($aAngle);
     }
 
-    public function SetAlphaBlending($aFlg=true)
-    {
-    $this->img->SetAlphaBlending($aFlg);
+    function SetAlphaBlending($aFlg=true) {
+        $this->img->SetAlphaBlending($aFlg);
     }
 
     // Shortcut to image margin
-    public function SetMargin($lm,$rm,$tm,$bm)
-    {
-    $this->img->SetMargin($lm,$rm,$tm,$bm);
+    function SetMargin($lm,$rm,$tm,$bm) {
+        $this->img->SetMargin($lm,$rm,$tm,$bm);
     }
 
-    public function SetY2OrderBack($aBack=true)
-    {
-    $this->y2orderback = $aBack;
+    function SetY2OrderBack($aBack=true) {
+        $this->y2orderback = $aBack;
     }
 
     // Rotate the graph 90 degrees and set the margin
     // when we have done a 90 degree rotation
-    public function Set90AndMargin($lm=0,$rm=0,$tm=0,$bm=0)
-    {
-    $lm = $lm ==0 ? floor(0.2 * $this->img->width)  : $lm ;
-    $rm = $rm ==0 ? floor(0.1 * $this->img->width)  : $rm ;
-    $tm = $tm ==0 ? floor(0.2 * $this->img->height) : $tm ;
-    $bm = $bm ==0 ? floor(0.1 * $this->img->height) : $bm ;
+    function Set90AndMargin($lm=0,$rm=0,$tm=0,$bm=0) {
+        $lm = $lm ==0 ? floor(0.2 * $this->img->width)  : $lm ;
+        $rm = $rm ==0 ? floor(0.1 * $this->img->width)  : $rm ;
+        $tm = $tm ==0 ? floor(0.2 * $this->img->height) : $tm ;
+        $bm = $bm ==0 ? floor(0.1 * $this->img->height) : $bm ;
 
-    $adj = ($this->img->height - $this->img->width)/2;
-    $this->img->SetMargin($tm-$adj,$bm-$adj,$rm+$adj,$lm+$adj);
-    $this->img->SetCenter(floor($this->img->width/2),floor($this->img->height/2));
-    $this->SetAngle(90);
-    if ( empty($this->yaxis) || empty($this->xaxis) ) {
-        JpgraphError::Raise('You must specify what scale to use with a call to Graph::SetScale()');
-    }
-    $this->xaxis->SetLabelAlign('right','center');
-    $this->yaxis->SetLabelAlign('center','bottom');
+        $adj = ($this->img->height - $this->img->width)/2;
+        $this->img->SetMargin($tm-$adj,$bm-$adj,$rm+$adj,$lm+$adj);
+        $this->img->SetCenter(floor($this->img->width/2),floor($this->img->height/2));
+        $this->SetAngle(90);
+        if( empty($this->yaxis) || empty($this->xaxis) ) {
+            JpgraphError::RaiseL(25009);//('You must specify what scale to use with a call to Graph::SetScale()');
+        }
+        $this->xaxis->SetLabelAlign('right','center');
+        $this->yaxis->SetLabelAlign('center','bottom');
     }
 
-    public function SetClipping($aFlg=true)
-    {
-    $this->iDoClipping = $aFlg ;
+    function SetClipping($aFlg=true) {
+        $this->iDoClipping = $aFlg ;
     }
 
     // Add a plot object to the graph
-    public function Add(&$aPlot)
-    {
-    if( $aPlot == null )
-        JpGraphError::Raise("Graph::Add() You tried to add a null plot to the graph.");
-    if( is_array($aPlot) && count($aPlot) > 0 )
-        $cl = strtolower(get_class($aPlot[0]));
-    else
-        $cl = strtolower(get_class($aPlot));
-
-    if( $cl == 'text' )
-        $this->AddText($aPlot);
-    elseif( $cl == 'plotline' )
-        $this->AddLine($aPlot);
-    elseif( $cl == 'plotband' )
-        $this->AddBand($aPlot);
-    elseif( $cl == 'iconplot' )
-        $this->AddIcon($aPlot);
-    else
-        $this->plots[] = &$aPlot;
-    }
-
-    public function AddIcon(&$aIcon)
-    {
-    if ( is_array($aIcon) ) {
-        for($i=0; $i < count($aIcon); ++$i )
-        $this->iIcons[]=&$aIcon[$i];
-    } else {
-        $this->iIcons[] = $aIcon ;
+    function Add($aPlot) {
+        if( $aPlot == null ) {
+            JpGraphError::RaiseL(25010);//("Graph::Add() You tried to add a null plot to the graph.");
+        }
+        if( is_array($aPlot) && count($aPlot) > 0 ) {
+            $cl = $aPlot[0];
+        }
+        else {
+            $cl = $aPlot;
+        }
+
+        if( $cl instanceof Text ) $this->AddText($aPlot);
+        elseif( class_exists('PlotLine',false) && ($cl instanceof PlotLine) )  $this->AddLine($aPlot);
+        elseif( class_exists('PlotBand',false) && ($cl instanceof PlotBand) ) $this->AddBand($aPlot);
+        elseif( class_exists('IconPlot',false) && ($cl instanceof IconPlot) ) $this->AddIcon($aPlot);
+        elseif( class_exists('GTextTable',false) && ($cl instanceof GTextTable) ) $this->AddTable($aPlot);
+        else {
+            if( is_array($aPlot) ) {
+                $this->plots = array_merge($this->plots,$aPlot);
+            }
+            else {
+                $this->plots[] = $aPlot;
+            }
+        }
+
+        if ($this->graph_theme) {
+            $this->graph_theme->SetupPlot($aPlot);
+        }
+    }
+
+    function AddTable($aTable) {
+        if( is_array($aTable) ) {
+            for($i=0; $i < count($aTable); ++$i ) {
+                $this->iTables[]=$aTable[$i];
+            }
+        }
+        else {
+            $this->iTables[] = $aTable ;
+        }
     }
+
+    function AddIcon($aIcon) {
+        if( is_array($aIcon) ) {
+            for($i=0; $i < count($aIcon); ++$i ) {
+                $this->iIcons[]=$aIcon[$i];
+            }
+        }
+        else {
+            $this->iIcons[] = $aIcon ;
+        }
     }
 
     // Add plot to second Y-scale
-    public function AddY2(&$aPlot)
-    {
-    if( $aPlot == null )
-        JpGraphError::Raise("Graph::AddY2() You tried to add a null plot to the graph.");
-
-    if( is_array($aPlot) && count($aPlot) > 0 )
-        $cl = strtolower(get_class($aPlot[0]));
-    else
-        $cl = strtolower(get_class($aPlot));
-
-    if( $cl == 'text' )
-        $this->AddText($aPlot,true);
-    elseif( $cl == 'plotline' )
-        $this->AddLine($aPlot,true);
-    elseif( $cl == 'plotband' )
-        $this->AddBand($aPlot,true);
-    else
-        $this->y2plots[] = &$aPlot;
+    function AddY2($aPlot) {
+        if( $aPlot == null ) {
+            JpGraphError::RaiseL(25011);//("Graph::AddY2() You tried to add a null plot to the graph.");
+        }
+
+        if( is_array($aPlot) && count($aPlot) > 0 ) {
+            $cl = $aPlot[0];
+        }
+        else {
+            $cl = $aPlot;
+        }
+
+        if( $cl instanceof Text ) {
+            $this->AddText($aPlot,true);
+        }
+        elseif( class_exists('PlotLine',false) && ($cl instanceof PlotLine) ) {
+            $this->AddLine($aPlot,true);
+        }
+        elseif( class_exists('PlotBand',false) && ($cl instanceof PlotBand) ) {
+            $this->AddBand($aPlot,true);
+        }
+        else {
+            $this->y2plots[] = $aPlot;
+        }
+
+        if ($this->graph_theme) {
+            $this->graph_theme->SetupPlot($aPlot);
+        }
     }
 
-    // Add text object to the graph
-    public function AddText(&$aTxt,$aToY2=false)
-    {
-    if( $aTxt == null )
-        JpGraphError::Raise("Graph::AddText() You tried to add a null text to the graph.");
-    if ($aToY2) {
-        if ( is_array($aTxt) ) {
-        for($i=0; $i < count($aTxt); ++$i )
-            $this->y2texts[]=&$aTxt[$i];
-        } else
-        $this->y2texts[] = &$aTxt;
-    } else {
-        if ( is_array($aTxt) ) {
-        for($i=0; $i < count($aTxt); ++$i )
-            $this->texts[]=&$aTxt[$i];
-        } else
-        $this->texts[] = &$aTxt;
+    // Add plot to the extra Y-axises
+    function AddY($aN,$aPlot) {
+
+        if( $aPlot == null ) {
+            JpGraphError::RaiseL(25012);//("Graph::AddYN() You tried to add a null plot to the graph.");
+        }
+
+        if( is_array($aPlot) && count($aPlot) > 0 ) {
+            $cl = $aPlot[0];
+        }
+        else {
+            $cl = $aPlot;
+        }
+
+        if( ($cl instanceof Text) ||
+            (class_exists('PlotLine',false) && ($cl instanceof PlotLine)) ||
+            (class_exists('PlotBand',false) && ($cl instanceof PlotBand)) ) {
+            JpGraph::RaiseL(25013);//('You can only add standard plots to multiple Y-axis');
+        }
+        else {
+            $this->ynplots[$aN][] = $aPlot;
+        }
+
+        if ($this->graph_theme) {
+            $this->graph_theme->SetupPlot($aPlot);
+        }
     }
+
+    // Add text object to the graph
+    function AddText($aTxt,$aToY2=false) {
+        if( $aTxt == null ) {
+            JpGraphError::RaiseL(25014);//("Graph::AddText() You tried to add a null text to the graph.");
+        }
+        if( $aToY2 ) {
+            if( is_array($aTxt) ) {
+                for($i=0; $i < count($aTxt); ++$i ) {
+                    $this->y2texts[]=$aTxt[$i];
+                }
+            }
+            else {
+                $this->y2texts[] = $aTxt;
+            }
+        }
+        else {
+            if( is_array($aTxt) ) {
+                for($i=0; $i < count($aTxt); ++$i ) {
+                    $this->texts[]=$aTxt[$i];
+                }
+            }
+            else {
+                $this->texts[] = $aTxt;
+            }
+        }
     }
 
     // Add a line object (class PlotLine) to the graph
-    public function AddLine(&$aLine,$aToY2=false)
-    {
-    if( $aLine == null )
-        JpGraphError::Raise("Graph::AddLine() You tried to add a null line to the graph.");
-
-    if ($aToY2) {
-         if ( is_array($aLine) ) {
-        for($i=0; $i < count($aLine); ++$i )
-            $this->y2lines[]=&$aLine[$i];
-        } else
-        $this->y2lines[] = &$aLine;
-    } else {
-         if ( is_array($aLine) ) {
-        for($i=0; $i < count($aLine); ++$i )
-            $this->lines[]=&$aLine[$i];
-        } else
-        $this->lines[] = &$aLine;
-    }
+    function AddLine($aLine,$aToY2=false) {
+        if( $aLine == null ) {
+            JpGraphError::RaiseL(25015);//("Graph::AddLine() You tried to add a null line to the graph.");
+        }
+
+        if( $aToY2 ) {
+            if( is_array($aLine) ) {
+                for($i=0; $i < count($aLine); ++$i ) {
+                    //$this->y2lines[]=$aLine[$i];
+                    $this->y2plots[]=$aLine[$i];
+                }
+            }
+            else {
+                //$this->y2lines[] = $aLine;
+                $this->y2plots[]=$aLine;
+            }
+        }
+        else {
+            if( is_array($aLine) ) {
+                for($i=0; $i<count($aLine); ++$i ) {
+                    //$this->lines[]=$aLine[$i];
+                    $this->plots[]=$aLine[$i];
+                }
+            }
+            else {
+                //$this->lines[] = $aLine;
+                $this->plots[] = $aLine;
+            }
+        }
     }
 
     // Add vertical or horizontal band
-    public function AddBand(&$aBand,$aToY2=false)
-    {
-    if( $aBand == null )
-        JpGraphError::Raise(" Graph::AddBand() You tried to add a null band to the graph.");
-
-    if ($aToY2) {
-        if ( is_array($aBand) ) {
-        for($i=0; $i < count($aBand); ++$i )
-            $this->y2bands[] = &$aBand[$i];
-        } else
-        $this->y2bands[] = &$aBand;
-    } else {
-        if ( is_array($aBand) ) {
-        for($i=0; $i < count($aBand); ++$i )
-            $this->bands[] = &$aBand[$i];
-        } else
-        $this->bands[] = &$aBand;
+    function AddBand($aBand,$aToY2=false) {
+        if( $aBand == null ) {
+            JpGraphError::RaiseL(25016);//(" Graph::AddBand() You tried to add a null band to the graph.");
+        }
+
+        if( $aToY2 ) {
+            if( is_array($aBand) ) {
+                for($i=0; $i < count($aBand); ++$i ) {
+                    $this->y2bands[] = $aBand[$i];
+                }
+            }
+            else {
+                $this->y2bands[] = $aBand;
+            }
+        }
+        else {
+            if( is_array($aBand) ) {
+                for($i=0; $i < count($aBand); ++$i ) {
+                    $this->bands[] = $aBand[$i];
+                }
+            }
+            else {
+                $this->bands[] = $aBand;
+            }
+        }
     }
+
+    function SetPlotGradient($aFrom='navy',$aTo='silver',$aGradType=2) {
+        $this->plot_gradtype=$aGradType;
+        $this->plot_gradfrom = $aFrom;
+        $this->plot_gradto = $aTo;
     }
 
-    public function SetBackgroundGradient($aFrom='navy',$aTo='silver',$aGradType=2,$aStyle=BGRAD_FRAME)
-    {
-    $this->bkg_gradtype=$aGradType;
-    $this->bkg_gradstyle=$aStyle;
-    $this->bkg_gradfrom = $aFrom;
-    $this->bkg_gradto = $aTo;
+    function SetBackgroundGradient($aFrom='navy',$aTo='silver',$aGradType=2,$aStyle=BGRAD_FRAME) {
+        $this->bkg_gradtype=$aGradType;
+        $this->bkg_gradstyle=$aStyle;
+        $this->bkg_gradfrom = $aFrom;
+        $this->bkg_gradto = $aTo;
     }
 
     // Set a country flag in the background
-    public function SetBackgroundCFlag($aName,$aBgType=BGIMG_FILLPLOT,$aMix=100)
-    {
-    $this->background_cflag = $aName;
-    $this->background_cflag_type = $aBgType;
-    $this->background_cflag_mix = $aMix;
+    function SetBackgroundCFlag($aName,$aBgType=BGIMG_FILLPLOT,$aMix=100) {
+        $this->background_cflag = $aName;
+        $this->background_cflag_type = $aBgType;
+        $this->background_cflag_mix = $aMix;
     }
 
     // Alias for the above method
-    public function SetBackgroundCountryFlag($aName,$aBgType=BGIMG_FILLPLOT,$aMix=100)
-    {
-    $this->background_cflag = $aName;
-    $this->background_cflag_type = $aBgType;
-    $this->background_cflag_mix = $aMix;
+    function SetBackgroundCountryFlag($aName,$aBgType=BGIMG_FILLPLOT,$aMix=100) {
+        $this->background_cflag = $aName;
+        $this->background_cflag_type = $aBgType;
+        $this->background_cflag_mix = $aMix;
     }
 
 
     // Specify a background image
-    public function SetBackgroundImage($aFileName,$aBgType=BGIMG_FILLPLOT,$aImgFormat="auto")
-    {
-    if ($GLOBALS['gd2'] && !USE_TRUECOLOR) {
-        JpGraphError::Raise("You are using GD 2.x and are trying to use a background images on a non truecolor image. To use background images with GD 2.x you <b>must</b> enable truecolor by setting the USE_TRUECOLOR constant to TRUE. Due to a bug in GD 2.0.1 using any truetype fonts with truecolor images will result in very poor quality fonts.");
-    }
+    function SetBackgroundImage($aFileName,$aBgType=BGIMG_FILLPLOT,$aImgFormat='auto') {
 
-    // Get extension to determine image type
-    if ($aImgFormat == "auto") {
-        $e = explode('.',$aFileName);
-        if (!$e) {
-        JpGraphError::Raise('Incorrect file name for Graph::SetBackgroundImage() : '.$aFileName.' Must have a valid image extension (jpg,gif,png) when using autodetection of image type');
-        }
+        // Get extension to determine image type
+        if( $aImgFormat == 'auto' ) {
+            $e = explode('.',$aFileName);
+            if( !$e ) {
+                JpGraphError::RaiseL(25018,$aFileName);//('Incorrect file name for Graph::SetBackgroundImage() : '.$aFileName.' Must have a valid image extension (jpg,gif,png) when using autodetection of image type');
+            }
 
-        $valid_formats = array('png', 'jpg', 'gif');
-        $aImgFormat = strtolower($e[count($e)-1]);
-        if ($aImgFormat == 'jpeg') {
-        $aImgFormat = 'jpg';
-        } elseif (!in_array($aImgFormat, $valid_formats) ) {
-        JpGraphError::Raise('Unknown file extension ($aImgFormat) in Graph::SetBackgroundImage() for filename: '.$aFileName);
+            $valid_formats = array('png', 'jpg', 'gif');
+            $aImgFormat = strtolower($e[count($e)-1]);
+            if ($aImgFormat == 'jpeg')  {
+                $aImgFormat = 'jpg';
+            }
+            elseif (!in_array($aImgFormat, $valid_formats) )  {
+                JpGraphError::RaiseL(25019,$aImgFormat);//('Unknown file extension ($aImgFormat) in Graph::SetBackgroundImage() for filename: '.$aFileName);
+            }
         }
-    }
-
-    $this->background_image = $aFileName;
-    $this->background_image_type=$aBgType;
-    $this->background_image_format=$aImgFormat;
-    }
 
-    public function SetBackgroundImageMix($aMix)
-    {
-    $this->background_image_mix = $aMix ;
+        $this->background_image = $aFileName;
+        $this->background_image_type=$aBgType;
+        $this->background_image_format=$aImgFormat;
     }
 
-    // Adjust brightness and constrast for background image
-    public function AdjBackgroundImage($aBright,$aContr=0,$aSat=0)
-    {
-    $this->background_image_bright=$aBright;
-    $this->background_image_contr=$aContr;
-    $this->background_image_sat=$aSat;
+    function SetBackgroundImageMix($aMix) {
+        $this->background_image_mix = $aMix ;
     }
 
-    // Adjust brightness and constrast for image
-    public function AdjImage($aBright,$aContr=0,$aSat=0)
-    {
-    $this->image_bright=$aBright;
-    $this->image_contr=$aContr;
-    $this->image_sat=$aSat;
+    // Adjust background image position
+    function SetBackgroundImagePos($aXpos,$aYpos) {
+        $this->background_image_xpos = $aXpos ;
+        $this->background_image_ypos = $aYpos ;
     }
 
     // Specify axis style (boxed or single)
-    public function SetAxisStyle($aStyle)
-    {
+    function SetAxisStyle($aStyle) {
         $this->iAxisStyle = $aStyle ;
     }
 
     // Set a frame around the plot area
-    public function SetBox($aDrawPlotFrame=true,$aPlotFrameColor=array(0,0,0),$aPlotFrameWeight=1)
-    {
-    $this->boxed = $aDrawPlotFrame;
-    $this->box_weight = $aPlotFrameWeight;
-    $this->box_color = $aPlotFrameColor;
+    function SetBox($aDrawPlotFrame=true,$aPlotFrameColor=array(0,0,0),$aPlotFrameWeight=1) {
+        $this->boxed = $aDrawPlotFrame;
+        $this->box_weight = $aPlotFrameWeight;
+        $this->box_color = $aPlotFrameColor;
     }
 
     // Specify color for the plotarea (not the margins)
-    public function SetColor($aColor)
-    {
-    $this->plotarea_color=$aColor;
+    function SetColor($aColor) {
+        $this->plotarea_color=$aColor;
     }
 
     // Specify color for the margins (all areas outside the plotarea)
-    public function SetMarginColor($aColor)
-    {
-    $this->margin_color=$aColor;
+    function SetMarginColor($aColor) {
+        $this->margin_color=$aColor;
     }
 
     // Set a frame around the entire image
-    public function SetFrame($aDrawImgFrame=true,$aImgFrameColor=array(0,0,0),$aImgFrameWeight=1)
-    {
-    $this->doframe = $aDrawImgFrame;
-    $this->frame_color = $aImgFrameColor;
-    $this->frame_weight = $aImgFrameWeight;
+    function SetFrame($aDrawImgFrame=true,$aImgFrameColor=array(0,0,0),$aImgFrameWeight=1) {
+        $this->doframe = $aDrawImgFrame;
+        $this->frame_color = $aImgFrameColor;
+        $this->frame_weight = $aImgFrameWeight;
     }
 
-    public function SetFrameBevel($aDepth=3,$aBorder=false,$aBorderColor='black',$aColor1='white@0.4',$aColor2='darkgray@0.4',$aFlg=true)
-    {
-    $this->framebevel = $aFlg ;
-    $this->framebeveldepth = $aDepth ;
-    $this->framebevelborder = $aBorder ;
-    $this->framebevelbordercolor = $aBorderColor ;
-    $this->framebevelcolor1 = $aColor1 ;
-    $this->framebevelcolor2 = $aColor2 ;
+    function SetFrameBevel($aDepth=3,$aBorder=false,$aBorderColor='black',$aColor1='white@0.4',$aColor2='darkgray@0.4',$aFlg=true) {
+        $this->framebevel = $aFlg ;
+        $this->framebeveldepth = $aDepth ;
+        $this->framebevelborder = $aBorder ;
+        $this->framebevelbordercolor = $aBorderColor ;
+        $this->framebevelcolor1 = $aColor1 ;
+        $this->framebevelcolor2 = $aColor2 ;
 
-    $this->doshadow = false ;
+        $this->doshadow = false ;
     }
 
     // Set the shadow around the whole image
-    public function SetShadow($aShowShadow=true,$aShadowWidth=5,$aShadowColor=array(102,102,102))
-    {
-    $this->doshadow = $aShowShadow;
-    $this->shadow_color = $aShadowColor;
-    $this->shadow_width = $aShadowWidth;
-    $this->footer->iBottomMargin += $aShadowWidth;
-    $this->footer->iRightMargin += $aShadowWidth;
+    function SetShadow($aShowShadow=true,$aShadowWidth=5,$aShadowColor='darkgray') {
+        $this->doshadow = $aShowShadow;
+        $this->shadow_color = $aShadowColor;
+        $this->shadow_width = $aShadowWidth;
+        $this->footer->iBottomMargin += $aShadowWidth;
+        $this->footer->iRightMargin += $aShadowWidth;
     }
 
     // Specify x,y scale. Note that if you manually specify the scale
     // you must also specify the tick distance with a call to Ticks::Set()
-    public function SetScale($aAxisType,$aYMin=1,$aYMax=1,$aXMin=1,$aXMax=1)
-    {
-    $this->axtype = $aAxisType;
-
-    if( $aYMax < $aYMin || $aXMax < $aXMin )
-        JpGraphError::Raise('Graph::SetScale(): Specified Max value must be larger than the specified Min value.');
-
-    $yt=substr($aAxisType,-3,3);
-    if( $yt=="lin" )
-        $this->yscale = new LinearScale($aYMin,$aYMax);
-    elseif ($yt == "int") {
-        $this->yscale = new LinearScale($aYMin,$aYMax);
-        $this->yscale->SetIntScale();
-    } elseif( $yt=="log" )
-        $this->yscale = new LogScale($aYMin,$aYMax);
-    else
-        JpGraphError::Raise("Unknown scale specification for Y-scale. ($aAxisType)");
-
-    $xt=substr($aAxisType,0,3);
-    if ($xt == "lin" || $xt == "tex") {
-        $this->xscale = new LinearScale($aXMin,$aXMax,"x");
-        $this->xscale->textscale = ($xt == "tex");
-    } elseif ($xt == "int") {
-        $this->xscale = new LinearScale($aXMin,$aXMax,"x");
-        $this->xscale->SetIntScale();
-    } elseif( $xt == "log" )
-        $this->xscale = new LogScale($aXMin,$aXMax,"x");
-    else
-        JpGraphError::Raise(" Unknown scale specification for X-scale. ($aAxisType)");
-
-    $this->xaxis = new Axis($this->img,$this->xscale);
-    $this->yaxis = new Axis($this->img,$this->yscale);
-    $this->xgrid = new Grid($this->xaxis);
-    $this->ygrid = new Grid($this->yaxis);
-    $this->ygrid->Show();
-    }
+    function SetScale($aAxisType,$aYMin=1,$aYMax=1,$aXMin=1,$aXMax=1) {
+        $this->axtype = $aAxisType;
 
-    // Specify secondary Y scale
-    public function SetY2Scale($aAxisType="lin",$aY2Min=1,$aY2Max=1)
-    {
-    if( $aAxisType=="lin" )
-        $this->y2scale = new LinearScale($aY2Min,$aY2Max);
-    elseif ($aAxisType == "int") {
-        $this->y2scale = new LinearScale($aY2Min,$aY2Max);
-        $this->y2scale->SetIntScale();
-    } elseif ($aAxisType=="log") {
-        $this->y2scale = new LogScale($aY2Min,$aY2Max);
-    } else JpGraphError::Raise("JpGraph: Unsupported Y2 axis type: $aAxisType\nMust be one of (lin,log,int)");
+        if( $aYMax < $aYMin || $aXMax < $aXMin ) {
+            JpGraphError::RaiseL(25020);//('Graph::SetScale(): Specified Max value must be larger than the specified Min value.');
+        }
 
-    $this->y2axis = new Axis($this->img,$this->y2scale);
-    $this->y2axis->scale->ticks->SetDirection(SIDE_LEFT);
-    $this->y2axis->SetLabelSide(SIDE_RIGHT);
+        $yt=substr($aAxisType,-3,3);
+        if( $yt == 'lin' ) {
+            $this->yscale = new LinearScale($aYMin,$aYMax);
+        }
+        elseif( $yt == 'int' ) {
+            $this->yscale = new LinearScale($aYMin,$aYMax);
+            $this->yscale->SetIntScale();
+        }
+        elseif( $yt == 'log' ) {
+            $this->yscale = new LogScale($aYMin,$aYMax);
+        }
+        else {
+            JpGraphError::RaiseL(25021,$aAxisType);//("Unknown scale specification for Y-scale. ($aAxisType)");
+        }
 
-    // Deafult position is the max x-value
-    $this->y2grid = new Grid($this->y2axis);
+        $xt=substr($aAxisType,0,3);
+        if( $xt == 'lin' || $xt == 'tex' ) {
+            $this->xscale = new LinearScale($aXMin,$aXMax,'x');
+            $this->xscale->textscale = ($xt == 'tex');
+        }
+        elseif( $xt == 'int' ) {
+            $this->xscale = new LinearScale($aXMin,$aXMax,'x');
+            $this->xscale->SetIntScale();
+        }
+        elseif( $xt == 'dat' ) {
+            $this->xscale = new DateScale($aXMin,$aXMax,'x');
+        }
+        elseif( $xt == 'log' ) {
+            $this->xscale = new LogScale($aXMin,$aXMax,'x');
+        }
+        else {
+            JpGraphError::RaiseL(25022,$aAxisType);//(" Unknown scale specification for X-scale. ($aAxisType)");
+        }
+
+        $this->xaxis = new Axis($this->img,$this->xscale);
+        $this->yaxis = new Axis($this->img,$this->yscale);
+        $this->xgrid = new Grid($this->xaxis);
+        $this->ygrid = new Grid($this->yaxis);
+        $this->ygrid->Show();
+
+
+        if (!$this->isRunningClear) {
+            $this->inputValues['aAxisType'] = $aAxisType;
+            $this->inputValues['aYMin'] = $aYMin;
+            $this->inputValues['aYMax'] = $aYMax;
+            $this->inputValues['aXMin'] = $aXMin;
+            $this->inputValues['aXMax'] = $aXMax;
+
+            if ($this->graph_theme) {
+                $this->graph_theme->ApplyGraph($this);
+            }
+        }
+
+        $this->isAfterSetScale = true;
+    }
+
+    // Specify secondary Y scale
+    function SetY2Scale($aAxisType='lin',$aY2Min=1,$aY2Max=1) {
+        if( $aAxisType == 'lin' ) {
+            $this->y2scale = new LinearScale($aY2Min,$aY2Max);
+        }
+        elseif( $aAxisType == 'int' ) {
+            $this->y2scale = new LinearScale($aY2Min,$aY2Max);
+            $this->y2scale->SetIntScale();
+        }
+        elseif( $aAxisType == 'log' ) {
+            $this->y2scale = new LogScale($aY2Min,$aY2Max);
+        }
+        else {
+            JpGraphError::RaiseL(25023,$aAxisType);//("JpGraph: Unsupported Y2 axis type: $aAxisType\nMust be one of (lin,log,int)");
+        }
+
+        $this->y2axis = new Axis($this->img,$this->y2scale);
+        $this->y2axis->scale->ticks->SetDirection(SIDE_LEFT);
+        $this->y2axis->SetLabelSide(SIDE_RIGHT);
+        $this->y2axis->SetPos('max');
+        $this->y2axis->SetTitleSide(SIDE_RIGHT);
+
+        // Deafult position is the max x-value
+        $this->y2grid = new Grid($this->y2axis);
+
+        if ($this->graph_theme) {
+          $this->graph_theme->ApplyGraph($this);
+        }
+    }
+
+    // Set the delta position (in pixels) between the multiple Y-axis
+    function SetYDeltaDist($aDist) {
+        $this->iYAxisDeltaPos = $aDist;
+    }
+
+    // Specify secondary Y scale
+    function SetYScale($aN,$aAxisType="lin",$aYMin=1,$aYMax=1) {
+
+        if( $aAxisType == 'lin' ) {
+            $this->ynscale[$aN] = new LinearScale($aYMin,$aYMax);
+        }
+        elseif( $aAxisType == 'int' ) {
+            $this->ynscale[$aN] = new LinearScale($aYMin,$aYMax);
+            $this->ynscale[$aN]->SetIntScale();
+        }
+        elseif( $aAxisType == 'log' ) {
+            $this->ynscale[$aN] = new LogScale($aYMin,$aYMax);
+        }
+        else {
+            JpGraphError::RaiseL(25024,$aAxisType);//("JpGraph: Unsupported Y axis type: $aAxisType\nMust be one of (lin,log,int)");
+        }
+
+        $this->ynaxis[$aN] = new Axis($this->img,$this->ynscale[$aN]);
+        $this->ynaxis[$aN]->scale->ticks->SetDirection(SIDE_LEFT);
+        $this->ynaxis[$aN]->SetLabelSide(SIDE_RIGHT);
+
+        if ($this->graph_theme) {
+            $this->graph_theme->ApplyGraph($this);
+        }
     }
 
     // Specify density of ticks when autoscaling 'normal', 'dense', 'sparse', 'verysparse'
     // The dividing factor have been determined heuristically according to my aesthetic
     // sense (or lack off) y.m.m.v !
-    public function SetTickDensity($aYDensity=TICKD_NORMAL,$aXDensity=TICKD_NORMAL)
-    {
-    $this->xtick_factor=30;
-    $this->ytick_factor=25;
-    switch ($aYDensity) {
-        case TICKD_DENSE:
-        $this->ytick_factor=12;
-        break;
-        case TICKD_NORMAL:
-        $this->ytick_factor=25;
-        break;
-        case TICKD_SPARSE:
-        $this->ytick_factor=40;
-        break;
-        case TICKD_VERYSPARSE:
-        $this->ytick_factor=100;
-        break;
-        default:
-        JpGraphError::Raise("JpGraph: Unsupported Tick density: $densy");
-    }
-    switch ($aXDensity) {
-        case TICKD_DENSE:
-        $this->xtick_factor=15;
-        break;
-        case TICKD_NORMAL:
+    function SetTickDensity($aYDensity=TICKD_NORMAL,$aXDensity=TICKD_NORMAL) {
         $this->xtick_factor=30;
-        break;
-        case TICKD_SPARSE:
-        $this->xtick_factor=45;
-        break;
-        case TICKD_VERYSPARSE:
-        $this->xtick_factor=60;
-        break;
-        default:
-        JpGraphError::Raise("JpGraph: Unsupported Tick density: $densx");
-    }
+        $this->ytick_factor=25;
+        switch( $aYDensity ) {
+            case TICKD_DENSE:
+                $this->ytick_factor=12;
+                break;
+            case TICKD_NORMAL:
+                $this->ytick_factor=25;
+                break;
+            case TICKD_SPARSE:
+                $this->ytick_factor=40;
+                break;
+            case TICKD_VERYSPARSE:
+                $this->ytick_factor=100;
+                break;
+            default:
+                JpGraphError::RaiseL(25025,$densy);//("JpGraph: Unsupported Tick density: $densy");
+        }
+        switch( $aXDensity ) {
+            case TICKD_DENSE:
+                $this->xtick_factor=15;
+                break;
+            case TICKD_NORMAL:
+                $this->xtick_factor=30;
+                break;
+            case TICKD_SPARSE:
+                $this->xtick_factor=45;
+                break;
+            case TICKD_VERYSPARSE:
+                $this->xtick_factor=60;
+                break;
+            default:
+                JpGraphError::RaiseL(25025,$densx);//("JpGraph: Unsupported Tick density: $densx");
+        }
     }
 
 
     // Get a string of all image map areas
-    public function GetCSIMareas()
-    {
-    if( !$this->iHasStroked )
-        $this->Stroke(_CSIM_SPECIALFILE);
-
-    $csim = $this->title->GetCSIMAreas();
-    $csim .= $this->subtitle->GetCSIMAreas();
-    $csim .= $this->subsubtitle->GetCSIMAreas();
-    $csim .= $this->legend->GetCSIMAreas();
+    function GetCSIMareas() {
+        if( !$this->iHasStroked ) {
+            $this->Stroke(_CSIM_SPECIALFILE);
+        }
 
-    if ($this->y2axis != NULL) {
-        $csim .= $this->y2axis->title->GetCSIMAreas();
-    }
+        $csim = $this->title->GetCSIMAreas();
+        $csim .= $this->subtitle->GetCSIMAreas();
+        $csim .= $this->subsubtitle->GetCSIMAreas();
+        $csim .= $this->legend->GetCSIMAreas();
 
-    if ($this->texts != null) {
-        $n = count($this->texts);
-        for ($i=0; $i < $n; ++$i) {
-        $csim .= $this->texts[$i]->GetCSIMAreas();
+        if( $this->y2axis != NULL ) {
+            $csim .= $this->y2axis->title->GetCSIMAreas();
         }
-    }
 
-    if ($this->y2texts != null && $this->y2scale != null) {
-        $n = count($this->y2texts);
-        for ($i=0; $i < $n; ++$i) {
-        $csim .= $this->y2texts[$i]->GetCSIMAreas();
+        if( $this->texts != null ) {
+            $n = count($this->texts);
+            for($i=0; $i < $n; ++$i ) {
+                $csim .= $this->texts[$i]->GetCSIMAreas();
+            }
         }
-    }
 
-    if ($this->yaxis != null && $this->xaxis != null) {
-        $csim .= $this->yaxis->title->GetCSIMAreas();
-        $csim .= $this->xaxis->title->GetCSIMAreas();
-    }
+        if( $this->y2texts != null && $this->y2scale != null ) {
+            $n = count($this->y2texts);
+            for($i=0; $i < $n; ++$i ) {
+                $csim .= $this->y2texts[$i]->GetCSIMAreas();
+            }
+        }
 
-    $n = count($this->plots);
-    for( $i=0; $i < $n; ++$i )
-        $csim .= $this->plots[$i]->GetCSIMareas();
+        if( $this->yaxis != null && $this->xaxis != null ) {
+            $csim .= $this->yaxis->title->GetCSIMAreas();
+            $csim .= $this->xaxis->title->GetCSIMAreas();
+        }
 
-    $n = count($this->y2plots);
-    for( $i=0; $i < $n; ++$i )
-        $csim .= $this->y2plots[$i]->GetCSIMareas();
+        $n = count($this->plots);
+        for( $i=0; $i < $n; ++$i ) {
+            $csim .= $this->plots[$i]->GetCSIMareas();
+        }
 
-    return $csim;
-    }
+        $n = count($this->y2plots);
+        for( $i=0; $i < $n; ++$i ) {
+            $csim .= $this->y2plots[$i]->GetCSIMareas();
+        }
 
-    // Get a complete <MAP>..</MAP> tag for the final image map
-    public function GetHTMLImageMap($aMapName)
-    {
-    $im = "<MAP NAME=\"$aMapName\">\n";
-    $im .= $this->GetCSIMareas();
-    $im .= "</MAP>";
-
-    return $im;
-    }
-
-    public function CheckCSIMCache($aCacheName,$aTimeOut=60)
-    {
-    global $_SERVER;
-
-    if( $aCacheName=='auto' )
-        $aCacheName=basename($_SERVER['PHP_SELF']);
-
-    $this->csimcachename = CSIMCACHE_DIR.$aCacheName;
-    $this->csimcachetimeout = $aTimeOut;
-
-    // First determine if we need to check for a cached version
-    // This differs from the standard cache in the sense that the
-    // image and CSIM map HTML file is written relative to the directory
-    // the script executes in and not the specified cache directory.
-    // The reason for this is that the cache directory is not necessarily
-    // accessible from the HTTP server.
-    if ($this->csimcachename != '') {
-        $dir = dirname($this->csimcachename);
-        $base = basename($this->csimcachename);
-        $base = strtok($base,'.');
-        $suffix = strtok('.');
-        $basecsim = $dir.'/'.$base.'_csim_.html';
-        $baseimg = $dir.'/'.$base.'.'.$this->img->img_format;
-
-        $timedout=false;
-
-        // Does it exist at all ?
-
-        if ( file_exists($basecsim) && file_exists($baseimg) ) {
-        // Check that it hasn't timed out
-        $diff=time()-filemtime($basecsim);
-        if ( $this->csimcachetimeout>0 && ($diff > $this->csimcachetimeout*60) ) {
-            $timedout=true;
-            @unlink($basecsim);
-            @unlink($baseimg);
-        } else {
-            if ($fh = @fopen($basecsim, "r")) {
-            fpassthru($fh);
-            exit();
-            } else
-            JpGraphError::Raise(" Can't open cached CSIM \"$basecsim\" for reading.");
+        $n = count($this->ynaxis);
+        for( $i=0; $i < $n; ++$i ) {
+            $m = count($this->ynplots[$i]);
+            for($j=0; $j < $m; ++$j ) {
+                $csim .= $this->ynplots[$i][$j]->GetCSIMareas();
+            }
         }
+
+        $n = count($this->iTables);
+        for( $i=0; $i < $n; ++$i ) {
+            $csim .= $this->iTables[$i]->GetCSIMareas();
         }
-    }
 
-    return false;
+        return $csim;
     }
 
-    public function StrokeCSIM($aScriptName='',$aCSIMName='',$aBorder=0)
-    {
-    if ($aCSIMName=='') {
-        // create a random map name
-        srand ((double) microtime() * 1000000);
-        $r = rand(0,100000);
-        $aCSIMName='__mapname'.$r.'__';
+    // Get a complete <MAP>..</MAP> tag for the final image map
+    function GetHTMLImageMap($aMapName) {
+        $im = "<map name=\"$aMapName\" id=\"$aMapName\" >\n";
+        $im .= $this->GetCSIMareas();
+        $im .= "</map>";
+        return $im;
     }
-    if ( empty($_GET[_CSIM_DISPLAY]) ) {
+
+    function CheckCSIMCache($aCacheName,$aTimeOut=60) {
+        global $_SERVER;
+
+        if( $aCacheName=='auto' ) {
+            $aCacheName=basename($_SERVER['PHP_SELF']);
+        }
+
+        $urlarg = $this->GetURLArguments();
+        $this->csimcachename = CSIMCACHE_DIR.$aCacheName.$urlarg;
+        $this->csimcachetimeout = $aTimeOut;
+
         // First determine if we need to check for a cached version
         // This differs from the standard cache in the sense that the
         // image and CSIM map HTML file is written relative to the directory
         // the script executes in and not the specified cache directory.
         // The reason for this is that the cache directory is not necessarily
         // accessible from the HTTP server.
-        if ($this->csimcachename != '') {
-        $dir = dirname($this->csimcachename);
-        $base = basename($this->csimcachename);
-        $base = strtok($base,'.');
-        $suffix = strtok('.');
-        $basecsim = $dir.'/'.$base.'_csim_.html';
-        $baseimg = $base.'.'.$this->img->img_format;
-
-        // Check that apache can write to directory specified
-
-        if ( file_exists($dir) && !is_writeable($dir) ) {
-            JpgraphError::Raise('Apache/PHP does not have permission to write to the CSIM cache directory ('.$dir.'). Check permissions.');
-        }
-
-        // Make sure directory exists
-        $this->cache->MakeDirs($dir);
-
-        // Write the image file
-        $this->Stroke(CSIMCACHE_DIR.$baseimg);
-
-        // Construct wrapper HTML and write to file and send it back to browser
-        $htmlwrap = $this->GetHTMLImageMap($aCSIMName)."\n".
-            '<img src="'.CSIMCACHE_HTTP_DIR.$baseimg.'" ISMAP USEMAP="#'.$aCSIMName.'" border='.$aBorder.'>'."\n";
-        if ($fh =  @fopen($basecsim,'w') ) {
-            fwrite($fh,$htmlwrap);
-            fclose($fh);
-            echo $htmlwrap;
-        } else
-            JpGraphError::Raise(" Can't write CSIM \"$basecsim\" for writing. Check free space and permissions.");
-        } else {
-
-        if ($aScriptName=='') {
-            JpGraphError::Raise('Missing script name in call to StrokeCSIM(). You must specify the name of the actual image script as the first parameter to StrokeCSIM().');
-            exit();
+        if( $this->csimcachename != '' ) {
+            $dir = dirname($this->csimcachename);
+            $base = basename($this->csimcachename);
+            $base = strtok($base,'.');
+            $suffix = strtok('.');
+            $basecsim = $dir.'/'.$base.'?'.$urlarg.'_csim_.html';
+            $baseimg = $dir.'/'.$base.'?'.$urlarg.'.'.$this->img->img_format;
+
+            $timedout=false;
+            // Does it exist at all ?
+
+            if( file_exists($basecsim) && file_exists($baseimg) ) {
+                // Check that it hasn't timed out
+                $diff=time()-filemtime($basecsim);
+                if( $this->csimcachetimeout>0 && ($diff > $this->csimcachetimeout*60) ) {
+                    $timedout=true;
+                    @unlink($basecsim);
+                    @unlink($baseimg);
+                }
+                else {
+                    if ($fh = @fopen($basecsim, "r")) {
+                        fpassthru($fh);
+                        return true;
+                    }
+                    else {
+                        JpGraphError::RaiseL(25027,$basecsim);//(" Can't open cached CSIM \"$basecsim\" for reading.");
+                    }
+                }
+            }
         }
+        return false;
+    }
 
-        // This is a JPGRAPH internal defined that prevents
-        // us from recursively coming here again
-        $urlarg='?'._CSIM_DISPLAY.'=1';
+    // Build the argument string to be used with the csim images
+    static function GetURLArguments($aAddRecursiveBlocker=false) {
+
+        if( $aAddRecursiveBlocker ) {
+            // This is a JPGRAPH internal defined that prevents
+            // us from recursively coming here again
+            $urlarg = _CSIM_DISPLAY.'=1';
+        }
 
         // Now reconstruct any user URL argument
         reset($_GET);
-        while ( list($key,$value) = each($_GET) ) {
-            if ( is_array($value) ) {
-            $n = count($value);
-            for ($i=0; $i < $n; ++$i) {
-                $urlarg .= '&'.$key.'%5B%5D='.urlencode($value[$i]);
+        while( list($key,$value) = each($_GET) ) {
+            if( is_array($value) ) {
+                foreach ( $value as $k => $v ) {
+                    $urlarg .= '&amp;'.$key.'%5B'.$k.'%5D='.urlencode($v);
+                }
             }
-            } else {
-            $urlarg .= '&'.$key.'='.urlencode($value);
+            else {
+                $urlarg .= '&amp;'.$key.'='.urlencode($value);
             }
         }
 
@@ -1486,2080 +1379,2278 @@ public function StrokeCSIM($aScriptName='',$aCSIMName='',$aBorder=0)
         // but there is little else we can do. One idea for the
         // future might be recreate the POST header in case.
         reset($_POST);
-        while ( list($key,$value) = each($_POST) ) {
-            if ( is_array($value) ) {
-            $n = count($value);
-            for ($i=0; $i < $n; ++$i) {
-                $urlarg .= '&'.$key.'%5B%5D='.urlencode($value[$i]);
+        while( list($key,$value) = each($_POST) ) {
+            if( is_array($value) ) {
+                foreach ( $value as $k => $v ) {
+                    $urlarg .= '&amp;'.$key.'%5B'.$k.'%5D='.urlencode($v);
+                }
             }
-            } else {
-            $urlarg .= '&'.$key.'='.urlencode($value);
+            else {
+                $urlarg .= '&amp;'.$key.'='.urlencode($value);
             }
         }
 
-        echo $this->GetHTMLImageMap($aCSIMName);
+        return $urlarg;
+    }
 
-        echo "<img src='".$aScriptName.$urlarg."' ISMAP USEMAP='#".$aCSIMName."' border=$aBorder>";
-        }
-    } else {
-        $this->Stroke();
-    }
-    }
-
-    public function GetTextsYMinMax($aY2=false)
-    {
-    if( $aY2 )
-        $txts = $this->y2texts;
-    else
-        $txts = $this->texts;
-    $n = count($txts);
-    $min=null;
-    $max=null;
-    for ($i=0; $i < $n; ++$i) {
-        if ($txts[$i]->iScalePosY !== null &&
-        $txts[$i]->iScalePosX !== null) {
-        if ($min === null) {
-            $min = $max = $txts[$i]->iScalePosY ;
-        } else {
-            $min = min($min,$txts[$i]->iScalePosY);
-            $max = max($max,$txts[$i]->iScalePosY);
-        }
-        }
+    function SetCSIMImgAlt($aAlt) {
+        $this->iCSIMImgAlt = $aAlt;
     }
-    if ($min !== null) {
-        return array($min,$max);
-    } else
-
-        return null;
-    }
-
-    public function GetTextsXMinMax($aY2=false)
-    {
-    if( $aY2 )
-        $txts = $this->y2texts;
-    else
-        $txts = $this->texts;
-    $n = count($txts);
-    $min=null;
-    $max=null;
-    for ($i=0; $i < $n; ++$i) {
-        if ($txts[$i]->iScalePosY !== null &&
-        $txts[$i]->iScalePosX !== null) {
-        if ($min === null) {
-            $min = $max = $txts[$i]->iScalePosX ;
-        } else {
-            $min = min($min,$txts[$i]->iScalePosX);
-            $max = max($max,$txts[$i]->iScalePosX);
+
+    function StrokeCSIM($aScriptName='auto',$aCSIMName='',$aBorder=0) {
+        if( $aCSIMName=='' ) {
+            // create a random map name
+            srand ((double) microtime() * 1000000);
+            $r = rand(0,100000);
+            $aCSIMName='__mapname'.$r.'__';
         }
+
+        if( $aScriptName=='auto' ) {
+            $aScriptName=basename($_SERVER['PHP_SELF']);
         }
-    }
-    if ($min !== null) {
-        return array($min,$max);
-    } else
 
-        return null;
-    }
+        $urlarg = $this->GetURLArguments(true);
 
-    public function GetXMinMax()
-    {
-    list($min,$ymin) = $this->plots[0]->Min();
-    list($max,$ymax) = $this->plots[0]->Max();
-    foreach ($this->plots as $p) {
-        list($xmin,$ymin) = $p->Min();
-        list($xmax,$ymax) = $p->Max();
-        $min = Min($xmin,$min);
-        $max = Max($xmax,$max);
-    }
-    if ($this->y2axis != null) {
-        foreach ($this->y2plots as $p) {
-        list($xmin,$ymin) = $p->Min();
-            list($xmax,$ymax) = $p->Max();
-            $min = Min($xmin,$min);
-            $max = Max($xmax,$max);
-        }
-    }
+        if( empty($_GET[_CSIM_DISPLAY]) ) {
+            // First determine if we need to check for a cached version
+            // This differs from the standard cache in the sense that the
+            // image and CSIM map HTML file is written relative to the directory
+            // the script executes in and not the specified cache directory.
+            // The reason for this is that the cache directory is not necessarily
+            // accessible from the HTTP server.
+            if( $this->csimcachename != '' ) {
+                $dir = dirname($this->csimcachename);
+                $base = basename($this->csimcachename);
+                $base = strtok($base,'.');
+                $suffix = strtok('.');
+                $basecsim = $dir.'/'.$base.'?'.$urlarg.'_csim_.html';
+                $baseimg = $base.'?'.$urlarg.'.'.$this->img->img_format;
 
-    return array($min,$max);
-    }
+                // Check that apache can write to directory specified
 
-    public function AdjustMarginsForTitles()
-    {
-    $totrequired =
-        ($this->title->t != '' ?
-         $this->title->GetTextHeight($this->img) + $this->title->margin + 5 : 0 ) +
-        ($this->subtitle->t != '' ?
-         $this->subtitle->GetTextHeight($this->img) + $this->subtitle->margin + 5 : 0 ) +
-        ($this->subsubtitle->t != '' ?
-         $this->subsubtitle->GetTextHeight($this->img) + $this->subsubtitle->margin + 5 : 0 ) ;
+                if( file_exists($dir) && !is_writeable($dir) ) {
+                    JpgraphError::RaiseL(25028,$dir);//('Apache/PHP does not have permission to write to the CSIM cache directory ('.$dir.'). Check permissions.');
+                }
 
+                // Make sure directory exists
+                $this->cache->MakeDirs($dir);
 
-    $btotrequired = 0;
-    if ($this->xaxis != null &&  !$this->xaxis->hide && !$this->xaxis->hide_labels) {
-        // Minimum bottom margin
-        if ($this->xaxis->title->t != '') {
-        if( $this->img->a == 90 )
-            $btotrequired = $this->yaxis->title->GetTextHeight($this->img) + 5 ;
-        else
-            $btotrequired = $this->xaxis->title->GetTextHeight($this->img) + 5 ;
-        } else
-        $btotrequired = 0;
+                // Write the image file
+                $this->Stroke(CSIMCACHE_DIR.$baseimg);
 
-        if ($this->img->a == 90) {
-        $this->img->SetFont($this->yaxis->font_family,$this->yaxis->font_style,
-                    $this->yaxis->font_size);
-        $lh = $this->img->GetTextHeight('Mg',$this->yaxis->label_angle);
-        } else {
-        $this->img->SetFont($this->xaxis->font_family,$this->xaxis->font_style,
-                    $this->xaxis->font_size);
-        $lh = $this->img->GetTextHeight('Mg',$this->xaxis->label_angle);
-        }
+                // Construct wrapper HTML and write to file and send it back to browser
 
-        $btotrequired += $lh + 5;
-    }
+                // In the src URL we must replace the '?' with its encoding to prevent the arguments
+                // to be converted to real arguments.
+                $tmp = str_replace('?','%3f',$baseimg);
+                $htmlwrap = $this->GetHTMLImageMap($aCSIMName)."\n".
+                            '<img src="'.CSIMCACHE_HTTP_DIR.$tmp.'" ismap="ismap" usemap="#'.$aCSIMName.' width="'.$this->img->width.'" height="'.$this->img->height."\" alt=\"".$this->iCSIMImgAlt."\" />\n";
 
-    if ($this->img->a == 90) {
-        // DO Nothing. It gets too messy to do this properly for 90 deg...
-    } else {
-        if ($this->img->top_margin < $totrequired) {
-        $this->SetMargin($this->img->left_margin,$this->img->right_margin,
-                 $totrequired,$this->img->bottom_margin);
+                if($fh =  @fopen($basecsim,'w') ) {
+                    fwrite($fh,$htmlwrap);
+                    fclose($fh);
+                    echo $htmlwrap;
+                }
+                else {
+                    JpGraphError::RaiseL(25029,$basecsim);//(" Can't write CSIM \"$basecsim\" for writing. Check free space and permissions.");
+                }
+            }
+            else {
+
+                if( $aScriptName=='' ) {
+                    JpGraphError::RaiseL(25030);//('Missing script name in call to StrokeCSIM(). You must specify the name of the actual image script as the first parameter to StrokeCSIM().');
+                }
+                echo $this->GetHTMLImageMap($aCSIMName) . $this->GetCSIMImgHTML($aCSIMName, $aScriptName, $aBorder);
+            }
         }
-        if ($this->img->bottom_margin < $btotrequired) {
-        $this->SetMargin($this->img->left_margin,$this->img->right_margin,
-                 $this->img->top_margin,$btotrequired);
+        else {
+            $this->Stroke();
         }
     }
+
+    function StrokeCSIMImage() {
+        if( @$_GET[_CSIM_DISPLAY] == 1 ) {
+            $this->Stroke();
+        }
     }
 
-    // Stroke the graph
-    // $aStrokeFileName	If != "" the image will be written to this file and NOT
-    // streamed back to the browser
-    public function Stroke($aStrokeFileName="")
-    {
-    // Fist make a sanity check that user has specified a scale
-    if ( empty($this->yscale) ) {
-        JpGraphError::Raise('You must specify what scale to use with a call to Graph::SetScale().');
-    }
-
-    // Start by adjusting the margin so that potential titles will fit.
-    $this->AdjustMarginsForTitles();
-
-    // Setup scale constants
-    if( $this->yscale ) $this->yscale->InitConstants($this->img);
-    if( $this->xscale ) $this->xscale->InitConstants($this->img);
-    if( $this->y2scale ) $this->y2scale->InitConstants($this->img);
-
-    // If the filename is the predefined value = '_csim_special_'
-    // we assume that the call to stroke only needs to do enough
-    // to correctly generate the CSIM maps.
-    // We use this variable to skip things we don't strictly need
-    // to do to generate the image map to improve performance
-    // a best we can. Therefor you will see a lot of tests !$_csim in the
-    // code below.
-    $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
-
-    // We need to know if we have stroked the plot in the
-    // GetCSIMareas. Otherwise the CSIM hasn't been generated
-    // and in the case of GetCSIM called before stroke to generate
-    // CSIM without storing an image to disk GetCSIM must call Stroke.
-    $this->iHasStroked = true;
-
-    // Do any pre-stroke adjustment that is needed by the different plot types
-    // (i.e bar plots want's to add an offset to the x-labels etc)
-    for ($i=0; $i < count($this->plots) ; ++$i ) {
-        $this->plots[$i]->PreStrokeAdjust($this);
-        $this->plots[$i]->DoLegend($this);
-    }
-
-    // Any plots on the second Y scale?
-    if ($this->y2scale != null) {
-        for ($i=0; $i<count($this->y2plots)	; ++$i ) {
-        $this->y2plots[$i]->PreStrokeAdjust($this);
-        $this->y2plots[$i]->DoLegend($this);
-        }
-    }
-
-    // Bail out if any of the Y-axis not been specified and
-    // has no plots. (This means it is impossible to do autoscaling and
-    // no other scale was given so we can't possible draw anything). If you use manual
-    // scaling you also have to supply the tick steps as well.
-    if( (!$this->yscale->IsSpecified() && count($this->plots)==0) ||
-        ($this->y2scale!=null && !$this->y2scale->IsSpecified() && count($this->y2plots)==0) ) {
-        //$e = "n=".count($this->y2plots)."\n";
-        $e = "Can't draw unspecified Y-scale.<br>\nYou have either:<br>\n";
-        $e .= "1. Specified an Y axis for autoscaling but have not supplied any plots<br>\n";
-        $e .= "2. Specified a scale manually but have forgot to specify the tick steps";
-        JpGraphError::Raise($e);
-    }
-
-    // Bail out if no plots and no specified X-scale
-    if( (!$this->xscale->IsSpecified() && count($this->plots)==0 && count($this->y2plots)==0) )
-        JpGraphError::Raise("<strong>JpGraph: Can't draw unspecified X-scale.</strong><br>No plots.<br>");
-
-    //Check if we should autoscale y-axis
-    if ( !$this->yscale->IsSpecified() && count($this->plots)>0 ) {
-        list($min,$max) = $this->GetPlotsYMinMax($this->plots);
-         $lres = $this->GetLinesYMinMax($this->lines);
-        if ( is_array($lres) ) {
-        list($linmin,$linmax) = $lres ;
-        $min = min($min,$linmin);
-        $max = max($max,$linmax);
-        }
-        $tres = $this->GetTextsYMinMax();
-        if ( is_array($tres) ) {
-        list($tmin,$tmax) = $tres ;
-        $min = min($min,$tmin);
-        $max = max($max,$tmax);
-        }
-        $this->yscale->AutoScale($this->img,$min,$max,
-                     $this->img->plotheight/$this->ytick_factor);
-    } elseif( $this->yscale->IsSpecified() &&
-        ( $this->yscale->auto_ticks || !$this->yscale->ticks->IsSpecified()) ) {
-        // The tick calculation will use the user suplied min/max values to determine
-        // the ticks. If auto_ticks is false the exact user specifed min and max
-        // values will be used for the scale.
-        // If auto_ticks is true then the scale might be slightly adjusted
-        // so that the min and max values falls on an even major step.
-        $min = $this->yscale->scale[0];
-        $max = $this->yscale->scale[1];
-        $this->yscale->AutoScale($this->img,$min,$max,
-                     $this->img->plotheight/$this->ytick_factor,
-                     $this->yscale->auto_ticks);
-    }
-
-    if ($this->y2scale != null) {
-        if ( !$this->y2scale->IsSpecified() && count($this->y2plots)>0 ) {
-        list($min,$max) = $this->GetPlotsYMinMax($this->y2plots);
-
-        $lres = $this->GetLinesYMinMax($this->y2lines);
-        if ( is_array($lres) ) {
-            list($linmin,$linmax) = $lres ;
-            $min = min($min,$linmin);
-            $max = max($max,$linmax);
-        }
-        $tres = $this->GetTextsYMinMax(true);
-        if ( is_array($tres) ) {
-            list($tmin,$tmax) = $tres ;
-            $min = min($min,$tmin);
-            $max = max($max,$tmax);
-        }
-        $this->y2scale->AutoScale($this->img,$min,$max,$this->img->plotheight/$this->ytick_factor);
-        } elseif( $this->y2scale->IsSpecified() &&
-            ( $this->y2scale->auto_ticks || !$this->y2scale->ticks->IsSpecified()) ) {
-        // The tick calculation will use the user suplied min/max values to determine
-        // the ticks. If auto_ticks is false the exact user specifed min and max
-        // values will be used for the scale.
-        // If auto_ticks is true then the scale might be slightly adjusted
-        // so that the min and max values falls on an even major step.
-        $min = $this->y2scale->scale[0];
-        $max = $this->y2scale->scale[1];
-        $this->y2scale->AutoScale($this->img,$min,$max,
-                      $this->img->plotheight/$this->ytick_factor,
-                      $this->y2scale->auto_ticks);
+    function GetCSIMImgHTML($aCSIMName, $aScriptName='auto', $aBorder=0 ) {
+        if( $aScriptName=='auto' ) {
+            $aScriptName=basename($_SERVER['PHP_SELF']);
         }
+        $urlarg = $this->GetURLArguments(true);
+        return "<img src=\"".$aScriptName.'?'.$urlarg."\" ismap=\"ismap\" usemap=\"#".$aCSIMName.'" height="'.$this->img->height."\" alt=\"".$this->iCSIMImgAlt."\" />\n";
     }
 
-    //Check if we should autoscale x-axis
-    if ( !$this->xscale->IsSpecified() ) {
-        if ( substr($this->axtype,0,4) == "text" ) {
-        $max=0;
-        foreach ($this->plots as $p) {
-            $max=max($max,$p->numpoints-1);
+    function GetTextsYMinMax($aY2=false) {
+        if( $aY2 ) {
+            $txts = $this->y2texts;
         }
-        $min=0;
-        if ($this->y2axis != null) {
-            foreach ($this->y2plots as $p) {
-            $max=max($max,$p->numpoints-1);
+        else {
+            $txts = $this->texts;
+        }
+        $n = count($txts);
+        $min=null;
+        $max=null;
+        for( $i=0; $i < $n; ++$i ) {
+            if( $txts[$i]->iScalePosY !== null && $txts[$i]->iScalePosX !== null  ) {
+                if( $min === null  ) {
+                    $min = $max = $txts[$i]->iScalePosY ;
+                }
+                else {
+                    $min = min($min,$txts[$i]->iScalePosY);
+                    $max = max($max,$txts[$i]->iScalePosY);
+                }
             }
         }
-        $this->xscale->Update($this->img,$min,$max);
-        $this->xscale->ticks->Set($this->xaxis->tick_step,1);
-        $this->xscale->ticks->SupressMinorTickMarks();
-        } else {
-        list($min,$max) = $this->GetXMinMax();
-        $lres = $this->GetLinesXMinMax($this->lines);
-        if ($lres) {
-            list($linmin,$linmax) = $lres ;
-            $min = min($min,$linmin);
-            $max = max($max,$linmax);
-        }
-
-        $lres = $this->GetLinesXMinMax($this->y2lines);
-        if ($lres) {
-            list($linmin,$linmax) = $lres ;
-            $min = min($min,$linmin);
-            $max = max($max,$linmax);
+        if( $min !== null ) {
+            return array($min,$max);
         }
-
-        $tres = $this->GetTextsXMinMax();
-        if ($tres) {
-            list($tmin,$tmax) = $tres ;
-            $min = min($min,$tmin);
-            $max = max($max,$tmax);
+        else {
+            return null;
         }
+    }
 
-        $tres = $this->GetTextsXMinMax(true);
-        if ($tres) {
-            list($tmin,$tmax) = $tres ;
-            $min = min($min,$tmin);
-            $max = max($max,$tmax);
+    function GetTextsXMinMax($aY2=false) {
+        if( $aY2 ) {
+            $txts = $this->y2texts;
         }
-
-        $this->xscale->AutoScale($this->img,$min,$max,$this->img->plotwidth/$this->xtick_factor);
+        else {
+            $txts = $this->texts;
+        }
+        $n = count($txts);
+        $min=null;
+        $max=null;
+        for( $i=0; $i < $n; ++$i ) {
+            if( $txts[$i]->iScalePosY !== null && $txts[$i]->iScalePosX !== null  ) {
+                if( $min === null  ) {
+                    $min = $max = $txts[$i]->iScalePosX ;
+                }
+                else {
+                    $min = min($min,$txts[$i]->iScalePosX);
+                    $max = max($max,$txts[$i]->iScalePosX);
+                }
+            }
         }
-
-        //Adjust position of y-axis and y2-axis to minimum/maximum of x-scale
-        if( !is_numeric($this->yaxis->pos) && !is_string($this->yaxis->pos) )
-            $this->yaxis->SetPos($this->xscale->GetMinVal());
-        if ($this->y2axis != null) {
-        if( !is_numeric($this->y2axis->pos) && !is_string($this->y2axis->pos) )
-            $this->y2axis->SetPos($this->xscale->GetMaxVal());
-        $this->y2axis->SetTitleSide(SIDE_RIGHT);
+        if( $min !== null ) {
+            return array($min,$max);
         }
-    } elseif( $this->xscale->IsSpecified() &&
-        ( $this->xscale->auto_ticks || !$this->xscale->ticks->IsSpecified()) ) {
-        // The tick calculation will use the user suplied min/max values to determine
-        // the ticks. If auto_ticks is false the exact user specifed min and max
-        // values will be used for the scale.
-        // If auto_ticks is true then the scale might be slightly adjusted
-        // so that the min and max values falls on an even major step.
-        $min = $this->xscale->scale[0];
-        $max = $this->xscale->scale[1];
-        $this->xscale->AutoScale($this->img,$min,$max,
-                     $this->img->plotwidth/$this->xtick_factor,
-                     false);
-
-        if ($this->y2axis != null) {
-        if( !is_numeric($this->y2axis->pos) && !is_string($this->y2axis->pos) )
-            $this->y2axis->SetPos($this->xscale->GetMaxVal());
-        $this->y2axis->SetTitleSide(SIDE_RIGHT);
+        else {
+            return null;
         }
-
     }
 
-    // If we have a negative values and x-axis position is at 0
-    // we need to supress the first and possible the last tick since
-    // they will be drawn on top of the y-axis (and possible y2 axis)
-    // The test below might seem strange the reasone being that if
-    // the user hasn't specified a value for position this will not
-    // be set until we do the stroke for the axis so as of now it
-    // is undefined.
-    // For X-text scale we ignore all this since the tick are usually
-    // much further in and not close to the Y-axis. Hence the test
-    // for 'text'
+    function GetXMinMax() {
 
-    if( ($this->yaxis->pos==$this->xscale->GetMinVal() ||
-         (is_string($this->yaxis->pos) && $this->yaxis->pos=='min')) &&
-        !is_numeric($this->xaxis->pos) && $this->yscale->GetMinVal() < 0 &&
-        substr($this->axtype,0,4) != 'text' && $this->xaxis->pos!="min" ) {
+        list($min,$ymin) = $this->plots[0]->Min();
+        list($max,$ymax) = $this->plots[0]->Max();
 
-        //$this->yscale->ticks->SupressZeroLabel(false);
-        $this->xscale->ticks->SupressFirst();
-        if ($this->y2axis != null) {
-        $this->xscale->ticks->SupressLast();
+        $i=0;
+        // Some plots, e.g. PlotLine should not affect the scale
+        // and will return (null,null). We should ignore those
+        // values.
+        while( ($min===null || $max === null) && ($i < count($this->plots)-1) ) {
+            ++$i;
+            list($min,$ymin) = $this->plots[$i]->Min();
+            list($max,$ymax) = $this->plots[$i]->Max();
         }
-    } elseif ( !is_numeric($this->yaxis->pos) && $this->yaxis->pos=='max' ) {
-        $this->xscale->ticks->SupressLast();
-    }
 
-    if (!$_csim) {
-        $this->StrokePlotArea();
-    }
-    $this->StrokeAxis();
+        foreach( $this->plots as $p ) {
+            list($xmin,$ymin) = $p->Min();
+            list($xmax,$ymax) = $p->Max();
 
-    // Stroke bands
-    if( $this->bands != null && !$_csim)
-        for ($i=0; $i < count($this->bands); ++$i) {
-        // Stroke all bands that asks to be in the background
-        if( $this->bands[$i]->depth == DEPTH_BACK )
-            $this->bands[$i]->Stroke($this->img,$this->xscale,$this->yscale);
+            if( $xmin !== null && $xmax !== null ) {
+                $min = Min($xmin,$min);
+                $max = Max($xmax,$max);
+            }
         }
 
-    if( $this->y2bands != null && $this->y2scale != null && !$_csim )
-        for ($i=0; $i < count($this->y2bands); ++$i) {
-        // Stroke all bands that asks to be in the foreground
-        if( $this->y2bands[$i]->depth == DEPTH_BACK )
-            $this->y2bands[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
+        if( $this->y2axis != null ) {
+            foreach( $this->y2plots as $p ) {
+                list($xmin,$ymin) = $p->Min();
+                list($xmax,$ymax) = $p->Max();
+                $min = Min($xmin,$min);
+                $max = Max($xmax,$max);
+            }
         }
 
-    if ($this->grid_depth == DEPTH_BACK && !$_csim) {
-        $this->ygrid->Stroke();
-        $this->xgrid->Stroke();
+        $n = count($this->ynaxis);
+        for( $i=0; $i < $n; ++$i ) {
+            if( $this->ynaxis[$i] != null) {
+                foreach( $this->ynplots[$i] as $p ) {
+                    list($xmin,$ymin) = $p->Min();
+                    list($xmax,$ymax) = $p->Max();
+                    $min = Min($xmin,$min);
+                    $max = Max($xmax,$max);
+                }
+            }
+        }
+        return array($min,$max);
     }
 
-    // Stroke Y2-axis
-    if ($this->y2axis != null && !$_csim) {
-        $this->y2axis->Stroke($this->xscale);
-        $this->y2grid->Stroke();
-    }
+    function AdjustMarginsForTitles() {
+        $totrequired = 
+            ($this->title->t != '' 
+                ? $this->title->GetTextHeight($this->img) + $this->title->margin + 5 * SUPERSAMPLING_SCALE
+                : 0 ) +
+            ($this->subtitle->t != '' 
+                ? $this->subtitle->GetTextHeight($this->img) + $this->subtitle->margin + 5 * SUPERSAMPLING_SCALE
+                : 0 ) +
+            ($this->subsubtitle->t != '' 
+                ? $this->subsubtitle->GetTextHeight($this->img) + $this->subsubtitle->margin + 5 * SUPERSAMPLING_SCALE
+                : 0 ) ;
 
-    $oldoff=$this->xscale->off;
-    if (substr($this->axtype,0,4)=="text") {
-        $this->xscale->off +=
-        ceil($this->xscale->scale_factor*$this->text_scale_off*$this->xscale->ticks->minor_step);
-    }
+        $btotrequired = 0;
+        if($this->xaxis != null &&  !$this->xaxis->hide && !$this->xaxis->hide_labels ) {
+            // Minimum bottom margin
+            if( $this->xaxis->title->t != '' ) {
+                if( $this->img->a == 90 ) {
+                    $btotrequired = $this->yaxis->title->GetTextHeight($this->img) + 7 ;
+                }
+                else {
+                    $btotrequired = $this->xaxis->title->GetTextHeight($this->img) + 7 ;
+                }
+            }
+            else {
+                $btotrequired = 0;
+            }
 
-    if ($this->iDoClipping) {
-        $oldimage = $this->img->CloneCanvasH();
-    }
+            if( $this->img->a == 90 ) {
+                $this->img->SetFont($this->yaxis->font_family,$this->yaxis->font_style,
+                $this->yaxis->font_size);
+                $lh = $this->img->GetTextHeight('Mg',$this->yaxis->label_angle);
+            }
+            else {
+                $this->img->SetFont($this->xaxis->font_family,$this->xaxis->font_style,
+                $this->xaxis->font_size);
+                $lh = $this->img->GetTextHeight('Mg',$this->xaxis->label_angle);
+            }
 
-    if (! $this->y2orderback) {
-        // Stroke all plots for Y1 axis
-        for ($i=0; $i < count($this->plots); ++$i) {
-        $this->plots[$i]->Stroke($this->img,$this->xscale,$this->yscale);
-        $this->plots[$i]->StrokeMargin($this->img);
+            $btotrequired += $lh + 6;
         }
-    }
 
-    // Stroke all plots for Y2 axis
-    if( $this->y2scale != null )
-        for ($i=0; $i< count($this->y2plots); ++$i ) {
-        $this->y2plots[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
+        if( $this->img->a == 90 ) {
+            // DO Nothing. It gets too messy to do this properly for 90 deg...
         }
+        else{
+            // need more top margin
+            if( $this->img->top_margin < $totrequired ) {
+                $this->SetMargin(
+                    $this->img->raw_left_margin,
+                    $this->img->raw_right_margin,
+                    $totrequired / SUPERSAMPLING_SCALE, 
+                    $this->img->raw_bottom_margin
+                );
+            }
 
-    if ($this->y2orderback) {
-        // Stroke all plots for Y1 axis
-        for ($i=0; $i < count($this->plots); ++$i) {
-        $this->plots[$i]->Stroke($this->img,$this->xscale,$this->yscale);
-        $this->plots[$i]->StrokeMargin($this->img);
+            // need more bottom margin
+            if( $this->img->bottom_margin < $btotrequired ) {
+                $this->SetMargin(
+                    $this->img->raw_left_margin,
+                    $this->img->raw_right_margin,
+                    $this->img->raw_top_margin,
+                    $btotrequired / SUPERSAMPLING_SCALE
+                );
+            }
         }
     }
 
-    if ($this->iDoClipping) {
-        // Clipping only supports graphs at 0 and 90 degrees
-        if ($this->img->a == 0) {
-        $this->img->CopyCanvasH($oldimage,$this->img->img,
-                    $this->img->left_margin,$this->img->top_margin,
-                    $this->img->left_margin,$this->img->top_margin,
-                    $this->img->plotwidth+1,$this->img->plotheight);
-        } elseif ($this->img->a == 90) {
-        $adj = ($this->img->height - $this->img->width)/2;
-        $this->img->CopyCanvasH($oldimage,$this->img->img,
-                    $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
-                    $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
-                    $this->img->plotheight+1,$this->img->plotwidth);
-        } else {
-        JpGraphError::Raise('You have enabled clipping. Cliping is only supported for graphs at 0 or 90 degrees rotation. Please adjust you current angle (='.$this->img->a.' degrees) or disable clipping.');
-        }
-        $this->img->Destroy();
-        $this->img->SetCanvasH($oldimage);
-    }
+    function StrokeStore($aStrokeFileName) {
+        // Get the handler to prevent the library from sending the
+        // image to the browser
+        $ih = $this->Stroke(_IMG_HANDLER);
 
-    $this->xscale->off=$oldoff;
+        // Stroke it to a file
+        $this->img->Stream($aStrokeFileName);
 
-    if ($this->grid_depth == DEPTH_FRONT && !$_csim) {
-        $this->ygrid->Stroke();
-        $this->xgrid->Stroke();
+        // Send it back to browser
+        $this->img->Headers();
+        $this->img->Stream();
     }
 
-    // Stroke bands
-    if( $this->bands!= null )
-        for ($i=0; $i < count($this->bands); ++$i) {
-        // Stroke all bands that asks to be in the foreground
-        if( $this->bands[$i]->depth == DEPTH_FRONT )
-            $this->bands[$i]->Stroke($this->img,$this->xscale,$this->yscale);
-        }
+    function doAutoscaleXAxis() {
+    //Check if we should autoscale x-axis
+        if( !$this->xscale->IsSpecified() ) {
+            if( substr($this->axtype,0,4) == "text" ) {
+                $max=0;
+                $n = count($this->plots);
+                for($i=0; $i < $n; ++$i ) {
+                    $p = $this->plots[$i];
+                    // We need some unfortunate sub class knowledge here in order
+                    // to increase number of data points in case it is a line plot
+                    // which has the barcenter set. If not it could mean that the
+                    // last point of the data is outside the scale since the barcenter
+                    // settings means that we will shift the entire plot half a tick step
+                    // to the right in oder to align with the center of the bars.
+                    if( class_exists('BarPlot',false) ) {
+                        $cl = strtolower(get_class($p));
+                        if( (class_exists('BarPlot',false) && ($p instanceof BarPlot)) || empty($p->barcenter) ) {
+                            $max=max($max,$p->numpoints-1);
+                        }
+                        else {
+                            $max=max($max,$p->numpoints);
+                        }
+                    }
+                    else {
+                        if( empty($p->barcenter) ) {
+                            $max=max($max,$p->numpoints-1);
+                        }
+                        else {
+                            $max=max($max,$p->numpoints);
+                        }
+                    }
+                }
+                $min=0;
+                if( $this->y2axis != null ) {
+                    foreach( $this->y2plots as $p ) {
+                        $max=max($max,$p->numpoints-1);
+                    }
+                }
+                $n = count($this->ynaxis);
+                for( $i=0; $i < $n; ++$i ) {
+                    if( $this->ynaxis[$i] != null) {
+                        foreach( $this->ynplots[$i] as $p ) {
+                            $max=max($max,$p->numpoints-1);
+                        }
+                    }
+                }
+
+                $this->xscale->Update($this->img,$min,$max);
+                $this->xscale->ticks->Set($this->xaxis->tick_step,1);
+                $this->xscale->ticks->SupressMinorTickMarks();
+            }
+            else {
+                list($min,$max) = $this->GetXMinMax();
+
+                $lres = $this->GetLinesXMinMax($this->lines);
+                if( $lres ) {
+                    list($linmin,$linmax) = $lres ;
+                    $min = min($min,$linmin);
+                    $max = max($max,$linmax);
+                }
+
+                $lres = $this->GetLinesXMinMax($this->y2lines);
+                if( $lres ) {
+                    list($linmin,$linmax) = $lres ;
+                    $min = min($min,$linmin);
+                    $max = max($max,$linmax);
+                }
+
+                $tres = $this->GetTextsXMinMax();
+                if( $tres ) {
+                    list($tmin,$tmax) = $tres ;
+                    $min = min($min,$tmin);
+                    $max = max($max,$tmax);
+                }
+
+                $tres = $this->GetTextsXMinMax(true);
+                if( $tres ) {
+                    list($tmin,$tmax) = $tres ;
+                    $min = min($min,$tmin);
+                    $max = max($max,$tmax);
+                }
+
+                $this->xscale->AutoScale($this->img,$min,$max,round($this->img->plotwidth/$this->xtick_factor));
+            }
 
-    if( $this->y2bands!= null && $this->y2scale != null )
-        for ($i=0; $i < count($this->y2bands); ++$i) {
-        // Stroke all bands that asks to be in the foreground
-        if( $this->y2bands[$i]->depth == DEPTH_FRONT )
-            $this->y2bands[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
+            //Adjust position of y-axis and y2-axis to minimum/maximum of x-scale
+            if( !is_numeric($this->yaxis->pos) && !is_string($this->yaxis->pos) ) {
+                $this->yaxis->SetPos($this->xscale->GetMinVal());
+            }
         }
-
-    // Stroke any lines added
-    if ($this->lines != null) {
-        for ($i=0; $i < count($this->lines); ++$i) {
-        $this->lines[$i]->Stroke($this->img,$this->xscale,$this->yscale);
+        elseif( $this->xscale->IsSpecified() &&
+                ( $this->xscale->auto_ticks || !$this->xscale->ticks->IsSpecified()) ) {
+            // The tick calculation will use the user suplied min/max values to determine
+            // the ticks. If auto_ticks is false the exact user specifed min and max
+            // values will be used for the scale.
+            // If auto_ticks is true then the scale might be slightly adjusted
+            // so that the min and max values falls on an even major step.
+            $min = $this->xscale->scale[0];
+            $max = $this->xscale->scale[1];
+            $this->xscale->AutoScale($this->img,$min,$max,round($this->img->plotwidth/$this->xtick_factor),false);
+
+            // Now make sure we show enough precision to accurate display the
+            // labels. If this is not done then the user might end up with
+            // a scale that might actually start with, say 13.5, butdue to rounding
+            // the scale label will ony show 14.
+            if( abs(floor($min)-$min) > 0 ) {
+
+                // If the user has set a format then we bail out
+                if( $this->xscale->ticks->label_formatstr == '' && $this->xscale->ticks->label_dateformatstr == '' ) {
+                    $this->xscale->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
+                }
+            }
         }
-    }
 
-    if ($this->y2lines != null && $this->y2scale != null) {
-        for ($i=0; $i < count($this->y2lines); ++$i) {
-        $this->y2lines[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
+        // Position the optional Y2 and Yn axis to the rightmost position of the x-axis
+        if( $this->y2axis != null ) {
+            if( !is_numeric($this->y2axis->pos) && !is_string($this->y2axis->pos) ) {
+                $this->y2axis->SetPos($this->xscale->GetMaxVal());
+            }
+            $this->y2axis->SetTitleSide(SIDE_RIGHT);
+        }
+
+        $n = count($this->ynaxis);
+        $nY2adj = $this->y2axis != null ? $this->iYAxisDeltaPos : 0;
+        for( $i=0; $i < $n; ++$i ) {
+            if( $this->ynaxis[$i] != null ) {
+                if( !is_numeric($this->ynaxis[$i]->pos) && !is_string($this->ynaxis[$i]->pos) ) {
+                    $this->ynaxis[$i]->SetPos($this->xscale->GetMaxVal());
+                    $this->ynaxis[$i]->SetPosAbsDelta($i*$this->iYAxisDeltaPos + $nY2adj);
+                }
+                $this->ynaxis[$i]->SetTitleSide(SIDE_RIGHT);
+            }
         }
     }
 
-    // Finally draw the axis again since some plots may have nagged
-    // the axis in the edges.
-    if( !$_csim )
-        $this->StrokeAxis();
-
-    if( $this->y2scale != null && !$_csim )
-        $this->y2axis->Stroke($this->xscale);
-
-    if (!$_csim) {
-        $this->StrokePlotBox();
-    }
-
-    // The titles and legends never gets rotated so make sure
-    // that the angle is 0 before stroking them
-    $aa = $this->img->SetAngle(0);
-    $this->StrokeTitles();
-    $this->footer->Stroke($this->img);
-    $this->legend->Stroke($this->img);
-    $this->StrokeTexts();
-    $this->img->SetAngle($aa);
-
-    if (!$_csim) {
 
-        $this->img->SetAngle($aa);
+    function doAutoScaleYnAxis() {
 
-        // Draw an outline around the image map
-        if (_JPG_DEBUG) {
-        $this->DisplayClientSideaImageMapAreas();
-        }
+        if( $this->y2scale != null) {
+            if( !$this->y2scale->IsSpecified() && count($this->y2plots)>0 ) {
+                list($min,$max) = $this->GetPlotsYMinMax($this->y2plots);
 
-        // Adjust the appearance of the image
-        $this->AdjustSaturationBrightnessContrast();
+                $lres = $this->GetLinesYMinMax($this->y2lines);
+                if( is_array($lres) ) {
+                    list($linmin,$linmax) = $lres ;
+                    $min = min($min,$linmin);
+                    $max = max($max,$linmax);
+                }
+                $tres = $this->GetTextsYMinMax(true);
+                if( is_array($tres) ) {
+                    list($tmin,$tmax) = $tres ;
+                    $min = min($min,$tmin);
+                    $max = max($max,$tmax);
+                }
+                $this->y2scale->AutoScale($this->img,$min,$max,$this->img->plotheight/$this->ytick_factor);
+            }
+            elseif( $this->y2scale->IsSpecified() && ( $this->y2scale->auto_ticks || !$this->y2scale->ticks->IsSpecified()) ) {
+                // The tick calculation will use the user suplied min/max values to determine
+                // the ticks. If auto_ticks is false the exact user specifed min and max
+                // values will be used for the scale.
+                // If auto_ticks is true then the scale might be slightly adjusted
+                // so that the min and max values falls on an even major step.
+                $min = $this->y2scale->scale[0];
+                $max = $this->y2scale->scale[1];
+                $this->y2scale->AutoScale($this->img,$min,$max,
+                $this->img->plotheight/$this->ytick_factor,
+                $this->y2scale->auto_ticks);
+
+                // Now make sure we show enough precision to accurate display the
+                // labels. If this is not done then the user might end up with
+                // a scale that might actually start with, say 13.5, butdue to rounding
+                // the scale label will ony show 14.
+                if( abs(floor($min)-$min) > 0 ) {
+                    // If the user has set a format then we bail out
+                    if( $this->y2scale->ticks->label_formatstr == '' && $this->y2scale->ticks->label_dateformatstr == '' ) {
+                        $this->y2scale->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
+                    }
+                }
 
-        // Should we do any final image transformation
-        if ($this->iImgTrans) {
-        if ( !class_exists('ImgTrans') ) {
-            require_once 'jpgraph_imgtrans.php';
-            //JpGraphError::Raise('In order to use image transformation you must include the file jpgraph_imgtrans.php in your script.');
+            }
         }
 
-        $tform = new ImgTrans($this->img->img);
-        $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
-                         $this->iImgTransDirection,$this->iImgTransHighQ,
-                         $this->iImgTransMinSize,$this->iImgTransFillColor,
-                         $this->iImgTransBorder);
-        }
 
-        // If the filename is given as the special "__handle"
-        // then the image handler is returned and the image is NOT
-        // streamed back
-        if ($aStrokeFileName == _IMG_HANDLER) {
-        return $this->img->img;
-        } else {
-        // Finally stream the generated picture
-        $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,$aStrokeFileName);
+        //
+        // Autoscale the extra Y-axises
+        //
+        $n = count($this->ynaxis);
+        for( $i=0; $i < $n; ++$i ) {
+            if( $this->ynscale[$i] != null) {
+                if( !$this->ynscale[$i]->IsSpecified() && count($this->ynplots[$i])>0 ) {
+                    list($min,$max) = $this->GetPlotsYMinMax($this->ynplots[$i]);
+                    $this->ynscale[$i]->AutoScale($this->img,$min,$max,$this->img->plotheight/$this->ytick_factor);
+                }
+                elseif( $this->ynscale[$i]->IsSpecified() && ( $this->ynscale[$i]->auto_ticks || !$this->ynscale[$i]->ticks->IsSpecified()) ) {
+                    // The tick calculation will use the user suplied min/max values to determine
+                    // the ticks. If auto_ticks is false the exact user specifed min and max
+                    // values will be used for the scale.
+                    // If auto_ticks is true then the scale might be slightly adjusted
+                    // so that the min and max values falls on an even major step.
+                    $min = $this->ynscale[$i]->scale[0];
+                    $max = $this->ynscale[$i]->scale[1];
+                    $this->ynscale[$i]->AutoScale($this->img,$min,$max,
+                    $this->img->plotheight/$this->ytick_factor,
+                    $this->ynscale[$i]->auto_ticks);
+
+                    // Now make sure we show enough precision to accurate display the
+                    // labels. If this is not done then the user might end up with
+                    // a scale that might actually start with, say 13.5, butdue to rounding
+                    // the scale label will ony show 14.
+                    if( abs(floor($min)-$min) > 0 ) {
+                        // If the user has set a format then we bail out
+                        if( $this->ynscale[$i]->ticks->label_formatstr == '' && $this->ynscale[$i]->ticks->label_dateformatstr == '' ) {
+                            $this->ynscale[$i]->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
+                        }
+                    }
+                }
+            }
         }
     }
-    }
 
-//---------------
-// PRIVATE METHODS
-    public function StrokeAxis()
-    {
-    // Stroke axis
-    if ($this->iAxisStyle != AXSTYLE_SIMPLE) {
-        switch ($this->iAxisStyle) {
-            case AXSTYLE_BOXIN :
-                $toppos = SIDE_DOWN;
-            $bottompos = SIDE_UP;
-                $leftpos = SIDE_RIGHT;
-                $rightpos = SIDE_LEFT;
-                break;
-        case AXSTYLE_BOXOUT :
-            $toppos = SIDE_UP;
-                $bottompos = SIDE_DOWN;
-                $leftpos = SIDE_LEFT;
-            $rightpos = SIDE_RIGHT;
-                break;
-        case AXSTYLE_YBOXIN:
-                $toppos = -100;
-            $bottompos = SIDE_UP;
-                $leftpos = SIDE_RIGHT;
-                $rightpos = SIDE_LEFT;
-            break;
-        case AXSTYLE_YBOXOUT:
-            $toppos = -100;
-                $bottompos = SIDE_DOWN;
-                $leftpos = SIDE_LEFT;
-            $rightpos = SIDE_RIGHT;
-            break;
-        default:
-                JpGRaphError::Raise('Unknown AxisStyle() : '.$this->iAxisStyle);
-                break;
+    function doAutoScaleYAxis() {
+
+        //Check if we should autoscale y-axis
+        if( !$this->yscale->IsSpecified() && count($this->plots)>0 ) {
+            list($min,$max) = $this->GetPlotsYMinMax($this->plots);
+            $lres = $this->GetLinesYMinMax($this->lines);
+            if( is_array($lres) ) {
+                list($linmin,$linmax) = $lres ;
+                $min = min($min,$linmin);
+                $max = max($max,$linmax);
+            }
+            $tres = $this->GetTextsYMinMax();
+            if( is_array($tres) ) {
+                list($tmin,$tmax) = $tres ;
+                $min = min($min,$tmin);
+                $max = max($max,$tmax);
+            }
+            $this->yscale->AutoScale($this->img,$min,$max,
+            $this->img->plotheight/$this->ytick_factor);
+        }
+        elseif( $this->yscale->IsSpecified() && ( $this->yscale->auto_ticks || !$this->yscale->ticks->IsSpecified()) ) {
+            // The tick calculation will use the user suplied min/max values to determine
+            // the ticks. If auto_ticks is false the exact user specifed min and max
+            // values will be used for the scale.
+            // If auto_ticks is true then the scale might be slightly adjusted
+            // so that the min and max values falls on an even major step.
+            $min = $this->yscale->scale[0];
+            $max = $this->yscale->scale[1];
+            $this->yscale->AutoScale($this->img,$min,$max,
+            $this->img->plotheight/$this->ytick_factor,
+            $this->yscale->auto_ticks);
+
+            // Now make sure we show enough precision to accurate display the
+            // labels. If this is not done then the user might end up with
+            // a scale that might actually start with, say 13.5, butdue to rounding
+            // the scale label will ony show 14.
+            if( abs(floor($min)-$min) > 0 ) {
+
+                // If the user has set a format then we bail out
+                if( $this->yscale->ticks->label_formatstr == '' && $this->yscale->ticks->label_dateformatstr == '' ) {
+                    $this->yscale->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
+                }
+            }
         }
-        $this->xaxis->SetPos('min');
-
-        // By default we hide the first label so it doesn't cross the
-        // Y-axis in case the positon hasn't been set by the user.
-        // However, if we use a box we always want the first value
-        // displayed so we make sure it will be displayed.
-        $this->xscale->ticks->SupressFirst(false);
-
-        $this->xaxis->SetLabelSide(SIDE_DOWN);
-        $this->xaxis->scale->ticks->SetSide($bottompos);
-        $this->xaxis->Stroke($this->yscale);
-
-        if ($toppos != -100) {
-        // To avoid side effects we work on a new copy
-        $maxis = $this->xaxis;
-        $maxis->SetPos('max');
-        $maxis->SetLabelSide(SIDE_UP);
-        $maxis->SetLabelMargin(7);
-        $this->xaxis->scale->ticks->SetSide($toppos);
-        $maxis->Stroke($this->yscale);
-        }
-
-        $this->yaxis->SetPos('min');
-        $this->yaxis->SetLabelMargin(10);
-        $this->yaxis->SetLabelSide(SIDE_LEFT);
-        $this->yaxis->scale->ticks->SetSide($leftpos);
-        $this->yaxis->Stroke($this->xscale);
-
-        $myaxis = $this->yaxis;
-        $myaxis->SetPos('max');
-        $myaxis->SetLabelMargin(10);
-        $myaxis->SetLabelSide(SIDE_RIGHT);
-        $myaxis->title->Set('');
-        $myaxis->scale->ticks->SetSide($rightpos);
-        $myaxis->Stroke($this->xscale);
 
-    } else {
-        $this->xaxis->Stroke($this->yscale);
-        $this->yaxis->Stroke($this->xscale);
-    }
     }
 
-    // Private helper function for backgound image
-    public function LoadBkgImage($aImgFormat='',$aFile='')
-    {
-    if( $aFile == '' )
-        $aFile = $this->background_image;
-    // Remove case sensitivity and setup appropriate function to create image
-    // Get file extension. This should be the LAST '.' separated part of the filename
-    $e = explode('.',$aFile);
-    $ext = strtolower($e[count($e)-1]);
-    if ($ext == "jpeg") {
-        $ext = "jpg";
-    }
-
-    if( trim($ext) == '' )
-        $ext = 'png';  // Assume PNG if no extension specified
-
-    if( $aImgFormat == '' )
-        $imgtag = $ext;
-    else
-        $imgtag = $aImgFormat;
+    function InitScaleConstants() {
+        // Setup scale constants
+        if( $this->yscale ) $this->yscale->InitConstants($this->img);
+        if( $this->xscale ) $this->xscale->InitConstants($this->img);
+        if( $this->y2scale ) $this->y2scale->InitConstants($this->img);
 
-    $supported = imagetypes();
-    if( ( $ext == 'jpg' && !($supported & IMG_JPG) ) ||
-        ( $ext == 'gif' && !($supported & IMG_GIF) ) ||
-        ( $ext == 'png' && !($supported & IMG_PNG) ) ) {
-        JpGraphError::Raise('The image format of your background image ('.$aFile.') is not supported in your system configuration. ');
+        $n=count($this->ynscale);
+        for($i=0; $i < $n; ++$i) {
+            if( $this->ynscale[$i] ) {
+                $this->ynscale[$i]->InitConstants($this->img);
+            }
+        }
     }
 
-    if ($imgtag == "jpg" || $imgtag == "jpeg") {
-        $f = "imagecreatefromjpeg";
-        $imgtag = "jpg";
-    } else {
-        $f = "imagecreatefrom".$imgtag;
-    }
+    function doPrestrokeAdjustments() {
 
-    // Compare specified image type and file extension
-    if ($imgtag != $ext) {
-        $t = " Background image seems to be of different type (has different file extension)".
-         " than specified imagetype. Specified: '".
-        $aImgFormat."'File: '".$aFile."'";
-        JpGraphError::Raise($t);
-    }
+        // Do any pre-stroke adjustment that is needed by the different plot types
+        // (i.e bar plots want's to add an offset to the x-labels etc)
+        for($i=0; $i < count($this->plots) ; ++$i ) {
+            $this->plots[$i]->PreStrokeAdjust($this);
+            $this->plots[$i]->DoLegend($this);
+        }
 
-    $img = @$f($aFile);
-    if (!$img) {
-        JpGraphError::Raise(" Can't read background image: '".$aFile."'");
-    }
+        // Any plots on the second Y scale?
+        if( $this->y2scale != null ) {
+            for($i=0; $i<count($this->y2plots) ; ++$i ) {
+                $this->y2plots[$i]->PreStrokeAdjust($this);
+                $this->y2plots[$i]->DoLegend($this);
+            }
+        }
 
-    return $img;
+        // Any plots on the extra Y axises?
+        $n = count($this->ynaxis);
+        for($i=0; $i<$n ; ++$i ) {
+            if( $this->ynplots == null || $this->ynplots[$i] == null) {
+                JpGraphError::RaiseL(25032,$i);//("No plots for Y-axis nbr:$i");
+            }
+            $m = count($this->ynplots[$i]);
+            for($j=0; $j < $m; ++$j ) {
+                $this->ynplots[$i][$j]->PreStrokeAdjust($this);
+                $this->ynplots[$i][$j]->DoLegend($this);
+            }
+        }
     }
 
-    public function StrokeBackgroundGrad()
-    {
-    if( $this->bkg_gradtype < 0  )
+    function StrokeBands($aDepth,$aCSIM) {
+    // Stroke bands
+        if( $this->bands != null && !$aCSIM) {
+            for($i=0; $i < count($this->bands); ++$i) {
+            // Stroke all bands that asks to be in the background
+                if( $this->bands[$i]->depth == $aDepth ) {
+                    $this->bands[$i]->Stroke($this->img,$this->xscale,$this->yscale);
+                }
+            }
+        }
 
-        return;
-    $grad = new Gradient($this->img);
-    if ($this->bkg_gradstyle == BGRAD_PLOT) {
-        $xl = $this->img->left_margin;
-        $yt = $this->img->top_margin;
-        $xr = $xl + $this->img->plotwidth+1 ;
-        $yb = $yt + $this->img->plotheight ;
-    } else {
-        $xl = 0;
-        $yt = 0;
-        $xr = $xl + $this->img->width - 1;
-        $yb = $yt + $this->img->height - 1;
-        if ($this->doshadow) {
-        $xr -= $this->shadow_width;
-        $yb -= $this->shadow_width;
-        }
-    }
-    if ($this->doframe) {
-
-        $xl += $this->frame_weight;
-        $xr -= $this->frame_weight;
-    }
-    $grad->FilledRectangle($xl,$yt,$xr,$yb,
-                   $this->bkg_gradfrom,$this->bkg_gradto,
-                   $this->bkg_gradtype);
-    }
-
-    public function StrokeFrameBackground()
-    {
-    if ($this->background_image != "" && $this->background_cflag != "") {
-        JpGraphError::Raise('It is not possible to specify both a background image and a background country flag.');
-    }
-    if ($this->background_image != "") {
-        $bkgimg = $this->LoadBkgImage($this->background_image_format);
-        $this->img->_AdjBrightContrast($bkgimg,$this->background_image_bright,
-                       $this->background_image_contr);
-        $this->img->_AdjSat($bkgimg,$this->background_image_sat);
-    } elseif ($this->background_cflag != "") {
-        if ( ! class_exists('FlagImages') ) {
-        JpGraphError::Raise('In order to use Country flags as
-    backgrounds you must include the "jpgraph_flags.php" file.');
-        }
-        $fobj = new FlagImages(FLAGSIZE4);
-        $dummy='';
-        $bkgimg = $fobj->GetImgByName($this->background_cflag,$dummy);
-        $this->background_image_mix = $this->background_cflag_mix;
-        $this->background_image_type = $this->background_cflag_type;
-    } else {
-        return ;
-    }
-
-    $bw = ImageSX($bkgimg);
-    $bh = ImageSY($bkgimg);
-
-    // No matter what the angle is we always stroke the image and frame
-    // assuming it is 0 degree
-    $aa = $this->img->SetAngle(0);
-
-    switch ($this->background_image_type) {
-        case BGIMG_FILLPLOT: // Resize to just fill the plotarea
-        $this->FillMarginArea();
-        $this->StrokeFrame();
-        $this->FillPlotArea();
-        $this->img->CopyMerge($bkgimg,
-                 $this->img->left_margin,$this->img->top_margin,
-                 0,0,$this->img->plotwidth+1,$this->img->plotheight,
-                 $bw,$bh,$this->background_image_mix);
-        break;
-        case BGIMG_FILLFRAME: // Fill the whole area from upper left corner, resize to just fit
-        $hadj=0; $vadj=0;
-        if ($this->doshadow) {
-            $hadj = $this->shadow_width;
-            $vadj = $this->shadow_width;
+        if( $this->y2bands != null && $this->y2scale != null && !$aCSIM ) {
+            for($i=0; $i < count($this->y2bands); ++$i) {
+            // Stroke all bands that asks to be in the foreground
+                if( $this->y2bands[$i]->depth == $aDepth ) {
+                    $this->y2bands[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
+                }
+            }
         }
-        $this->FillMarginArea();
-        $this->FillPlotArea();
-        $this->img->CopyMerge($bkgimg,0,0,0,0,$this->img->width-$hadj,$this->img->height-$vadj,
-                      $bw,$bh,$this->background_image_mix);
-        $this->StrokeFrame();
-        break;
-        case BGIMG_COPY: // Just copy the image from left corner, no resizing
-        $this->FillMarginArea();
-        $this->FillPlotArea();
-        $this->img->CopyMerge($bkgimg,0,0,0,0,$bw,$bh,
-                      $bw,$bh,$this->background_image_mix);
-        $this->StrokeFrame();
-        break;
-        case BGIMG_CENTER: // Center original image in the plot area
-        $this->FillMarginArea();
-        $this->FillPlotArea();
-        $centerx = round($this->img->plotwidth/2+$this->img->left_margin-$bw/2);
-        $centery = round($this->img->plotheight/2+$this->img->top_margin-$bh/2);
-        $this->img->CopyMerge($bkgimg,$centerx,$centery,0,0,$bw,$bh,
-                      $bw,$bh,$this->background_image_mix);
-        $this->StrokeFrame();
-        break;
-        default:
-        JpGraphError::Raise(" Unknown background image layout");
-    }
-    $this->img->SetAngle($aa);
     }
 
-    // Private
-    // Draw a frame around the image
-    public function StrokeFrame()
-    {
-    if( !$this->doframe ) return;
-
-    if( $this->background_image_type <= 1 &&
-        ($this->bkg_gradtype < 0 || ($this->bkg_gradtype > 0 && $this->bkg_gradstyle==BGRAD_PLOT)) ) {
-        $c = $this->margin_color;
-    } else {
-        $c = false;
-    }
 
-    if ($this->doshadow) {
-        $this->img->SetColor($this->frame_color);
-        $this->img->ShadowRectangle(0,0,$this->img->width,$this->img->height,
-                    $c,$this->shadow_width,$this->shadow_color);
-    } elseif ($this->framebevel) {
-        if ($c) {
-        $this->img->SetColor($this->margin_color);
-        $this->img->FilledRectangle(0,0,$this->img->width-1,$this->img->height-1);
+    // Stroke the graph
+    // $aStrokeFileName If != "" the image will be written to this file and NOT
+    // streamed back to the browser
+    function Stroke($aStrokeFileName='') {
+        // Fist make a sanity check that user has specified a scale
+        if( empty($this->yscale) ) {
+            JpGraphError::RaiseL(25031);//('You must specify what scale to use with a call to Graph::SetScale().');
+        }
+
+        // Start by adjusting the margin so that potential titles will fit.
+        $this->AdjustMarginsForTitles();
+
+        // Give the plot a chance to do any scale adjuments the individual plots
+        // wants to do. Right now this is only used by the contour plot to set scale
+        // limits
+        for($i=0; $i < count($this->plots) ; ++$i ) {
+            $this->plots[$i]->PreScaleSetup($this);
+        }
+
+        // Init scale constants that are used to calculate the transformation from
+        // world to pixel coordinates
+        $this->InitScaleConstants();
+
+        // If the filename is the predefined value = '_csim_special_'
+        // we assume that the call to stroke only needs to do enough
+        // to correctly generate the CSIM maps.
+        // We use this variable to skip things we don't strictly need
+        // to do to generate the image map to improve performance
+        // a best we can. Therefor you will see a lot of tests !$_csim in the
+        // code below.
+        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
+
+        // If we are called the second time (perhaps the user has called GetHTMLImageMap()
+        // himself then the legends have alsready been populated once in order to get the
+        // CSIM coordinats. Since we do not want the legends to be populated a second time
+        // we clear the legends
+        $this->legend->Clear();
+
+        // We need to know if we have stroked the plot in the
+        // GetCSIMareas. Otherwise the CSIM hasn't been generated
+        // and in the case of GetCSIM called before stroke to generate
+        // CSIM without storing an image to disk GetCSIM must call Stroke.
+        $this->iHasStroked = true;
+
+        // Setup pre-stroked adjustments and Legends
+        $this->doPrestrokeAdjustments();
+
+        if ($this->graph_theme) {
+            $this->graph_theme->PreStrokeApply($this);
+        }
+
+        // Bail out if any of the Y-axis not been specified and
+        // has no plots. (This means it is impossible to do autoscaling and
+        // no other scale was given so we can't possible draw anything). If you use manual
+        // scaling you also have to supply the tick steps as well.
+        if( (!$this->yscale->IsSpecified() && count($this->plots)==0) ||
+            ($this->y2scale!=null && !$this->y2scale->IsSpecified() && count($this->y2plots)==0) ) {
+            //$e = "n=".count($this->y2plots)."\n";
+            // $e = "Can't draw unspecified Y-scale.<br>\nYou have either:<br>\n";
+            // $e .= "1. Specified an Y axis for autoscaling but have not supplied any plots<br>\n";
+            // $e .= "2. Specified a scale manually but have forgot to specify the tick steps";
+            JpGraphError::RaiseL(25026);
+        }
+
+        // Bail out if no plots and no specified X-scale
+        if( (!$this->xscale->IsSpecified() && count($this->plots)==0 && count($this->y2plots)==0) ) {
+            JpGraphError::RaiseL(25034);//("<strong>JpGraph: Can't draw unspecified X-scale.</strong><br>No plots.<br>");
+        }
+
+        // Autoscale the normal Y-axis
+        $this->doAutoScaleYAxis();
+
+        // Autoscale all additiopnal y-axis
+        $this->doAutoScaleYnAxis();
+
+        // Autoscale the regular x-axis and position the y-axis properly
+        $this->doAutoScaleXAxis();
+
+        // If we have a negative values and x-axis position is at 0
+        // we need to supress the first and possible the last tick since
+        // they will be drawn on top of the y-axis (and possible y2 axis)
+        // The test below might seem strange the reasone being that if
+        // the user hasn't specified a value for position this will not
+        // be set until we do the stroke for the axis so as of now it
+        // is undefined.
+        // For X-text scale we ignore all this since the tick are usually
+        // much further in and not close to the Y-axis. Hence the test
+        // for 'text'
+        if( ($this->yaxis->pos==$this->xscale->GetMinVal() || (is_string($this->yaxis->pos) && $this->yaxis->pos=='min')) &&
+            !is_numeric($this->xaxis->pos) && $this->yscale->GetMinVal() < 0 &&
+            substr($this->axtype,0,4) != 'text' && $this->xaxis->pos != 'min' ) {
+
+            //$this->yscale->ticks->SupressZeroLabel(false);
+            $this->xscale->ticks->SupressFirst();
+            if( $this->y2axis != null ) {
+                $this->xscale->ticks->SupressLast();
+            }
         }
-        $this->img->Bevel(1,1,$this->img->width-2,$this->img->height-2,
-                  $this->framebeveldepth,
-                  $this->framebevelcolor1,$this->framebevelcolor2);
-        if ($this->framebevelborder) {
-        $this->img->SetColor($this->framebevelbordercolor);
-        $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
+        elseif( !is_numeric($this->yaxis->pos) && $this->yaxis->pos=='max' ) {
+            $this->xscale->ticks->SupressLast();
         }
-    } else {
-        $this->img->SetLineWeight($this->frame_weight);
-        if ($c) {
-        $this->img->SetColor($this->margin_color);
-        $this->img->FilledRectangle(0,0,$this->img->width-1,$this->img->height-1);
+
+        if( !$_csim ) {
+            $this->StrokePlotArea();
+            if( $this->iIconDepth == DEPTH_BACK ) {
+                $this->StrokeIcons();
+            }
         }
-        $this->img->SetColor($this->frame_color);
-        $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
-    }
-    }
+        $this->StrokeAxis(false);
 
-    public function FillMarginArea()
-    {
-    $hadj=0; $vadj=0;
-    if ($this->doshadow) {
-        $hadj = $this->shadow_width;
-        $vadj = $this->shadow_width;
-    }
+        // Stroke colored bands
+        $this->StrokeBands(DEPTH_BACK,$_csim);
 
-    $this->img->SetColor($this->margin_color);
-//	$this->img->FilledRectangle(0,0,$this->img->width-1-$hadj,$this->img->height-1-$vadj);
+        if( $this->grid_depth == DEPTH_BACK && !$_csim) {
+            $this->ygrid->Stroke();
+            $this->xgrid->Stroke();
+        }
 
-    $this->img->FilledRectangle(0,0,$this->img->width-1-$hadj,$this->img->top_margin);
-    $this->img->FilledRectangle(0,$this->img->top_margin,$this->img->left_margin,$this->img->height-1-$hadj);
-    $this->img->FilledRectangle($this->img->left_margin+1,
-                    $this->img->height-$this->img->bottom_margin,
-                    $this->img->width-1-$hadj,
-                    $this->img->height-1-$hadj);
-    $this->img->FilledRectangle($this->img->width-$this->img->right_margin,
-                    $this->img->top_margin+1,
-                    $this->img->width-1-$hadj,
-                    $this->img->height-$this->img->bottom_margin-1);
-    }
+        // Stroke Y2-axis
+        if( $this->y2axis != null && !$_csim) {
+            $this->y2axis->Stroke($this->xscale);
+            $this->y2grid->Stroke();
+        }
 
-    public function FillPlotArea()
-    {
-    $this->img->PushColor($this->plotarea_color);
-    $this->img->FilledRectangle($this->img->left_margin,
-                    $this->img->top_margin,
-                    $this->img->width-$this->img->right_margin,
-                    $this->img->height-$this->img->bottom_margin);
-    $this->img->PopColor();
-    }
+        // Stroke yn-axis
+        $n = count($this->ynaxis);
+        for( $i=0; $i < $n; ++$i ) {
+            $this->ynaxis[$i]->Stroke($this->xscale);
+        }
 
-    // Stroke the plot area with either a solid color or a background image
-    public function StrokePlotArea()
-    {
-    // Note: To be consistent we really should take a possible shadow
-    // into account. However, that causes some problem for the LinearScale class
-    // since in the current design it does not have any links to class Graph which
-    // means it has no way of compensating for the adjusted plotarea in case of a
-    // shadow. So, until I redesign LinearScale we can't compensate for this.
-    // So just set the two adjustment parameters to zero for now.
-    $boxadj = 0; //$this->doframe ? $this->frame_weight : 0 ;
-    $adj = 0; //$this->doshadow ? $this->shadow_width : 0 ;
-
-    if ($this->background_image != "" || $this->background_cflag != "") {
-        $this->StrokeFrameBackground();
-    } else {
-        $aa = $this->img->SetAngle(0);
-        $this->StrokeFrame();
-        $aa = $this->img->SetAngle($aa);
-        $this->StrokeBackgroundGrad();
-        if( $this->bkg_gradtype < 0 ||
-        ($this->bkg_gradtype > 0 && $this->bkg_gradstyle==BGRAD_MARGIN) ) {
-        $this->FillPlotArea();
+        $oldoff=$this->xscale->off;
+        if( substr($this->axtype,0,4) == 'text' ) {
+            if( $this->text_scale_abscenteroff > -1 ) {
+                // For a text scale the scale factor is the number of pixel per step.
+                // Hence we can use the scale factor as a substitute for number of pixels
+                // per major scale step and use that in order to adjust the offset so that
+                // an object of width "abscenteroff" becomes centered.
+                $this->xscale->off += round($this->xscale->scale_factor/2)-round($this->text_scale_abscenteroff/2);
+            }
+            else {
+                $this->xscale->off += ceil($this->xscale->scale_factor*$this->text_scale_off*$this->xscale->ticks->minor_step);
+            }
         }
-    }
-    $this->StrokeIcons();
-    }
 
-    public function StrokeIcons()
-    {
-    $n = count($this->iIcons);
-    for ($i=0; $i < $n; ++$i) {
-        $this->iIcons[$i]->Stroke($this->img);
-    }
-    }
+        if( $this->iDoClipping ) {
+            $oldimage = $this->img->CloneCanvasH();
+        }
 
-    public function StrokePlotBox()
-    {
-    // Should we draw a box around the plot area?
-    if ($this->boxed) {
-        $this->img->SetLineWeight(1);
-        $this->img->SetLineStyle('solid');
-        $this->img->SetColor($this->box_color);
-        for ($i=0; $i < $this->box_weight; ++$i) {
-        $this->img->Rectangle(
-            $this->img->left_margin-$i,$this->img->top_margin-$i,
-            $this->img->width-$this->img->right_margin+$i,
-            $this->img->height-$this->img->bottom_margin+$i);
+        if( ! $this->y2orderback ) {
+            // Stroke all plots for Y1 axis
+            for($i=0; $i < count($this->plots); ++$i) {
+                $this->plots[$i]->Stroke($this->img,$this->xscale,$this->yscale);
+                $this->plots[$i]->StrokeMargin($this->img);
+            }
         }
-    }
-    }
 
-    public function SetTitleBackgroundFillStyle($aStyle,$aColor1='black',$aColor2='white')
-    {
-    $this->titlebkg_fillstyle = $aStyle;
-    $this->titlebkg_scolor1 = $aColor1;
-    $this->titlebkg_scolor2 = $aColor2;
-    }
+        // Stroke all plots for Y2 axis
+        if( $this->y2scale != null ) {
+            for($i=0; $i< count($this->y2plots); ++$i ) {
+                $this->y2plots[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
+            }
+        }
 
-    public function SetTitleBackground($aBackColor='gray', $aStyle=TITLEBKG_STYLE1, $aFrameStyle=TITLEBKG_FRAME_NONE, $aFrameColor='black', $aFrameWeight=1, $aBevelHeight=3, $aEnable=true)
-    {
-    $this->titlebackground = $aEnable;
-    $this->titlebackground_color = $aBackColor;
-    $this->titlebackground_style = $aStyle;
-    $this->titlebackground_framecolor = $aFrameColor;
-    $this->titlebackground_framestyle = $aFrameStyle;
-    $this->titlebackground_frameweight = $aFrameWeight;
-    $this->titlebackground_bevelheight = $aBevelHeight ;
-    }
-
-
-    public function StrokeTitles()
-    {
-    $margin=3;
-
-    if ($this->titlebackground) {
-
-        // Find out height
-        $this->title->margin += 2 ;
-        $h = $this->title->GetTextHeight($this->img)+$this->title->margin+$margin;
-        if ($this->subtitle->t != "" && !$this->subtitle->hide) {
-        $h += $this->subtitle->GetTextHeight($this->img)+$margin+
-            $this->subtitle->margin;
-        $h += 2;
-        }
-        if ($this->subsubtitle->t != "" && !$this->subsubtitle->hide) {
-        $h += $this->subsubtitle->GetTextHeight($this->img)+$margin+
-            $this->subsubtitle->margin;
-        $h += 2;
-        }
-        $this->img->PushColor($this->titlebackground_color);
-        if ($this->titlebackground_style === TITLEBKG_STYLE1) {
-        // Inside the frame
-        if ($this->framebevel) {
-            $x1 = $y1 = $this->framebeveldepth + 1 ;
-            $x2 = $this->img->width - $this->framebeveldepth - 2 ;
-            $this->title->margin += $this->framebeveldepth + 1 ;
-            $h += $y1 ;
-            $h += 2;
-        } else {
-            $x1 = $y1 = $this->frame_weight;
-            $x2 = $this->img->width - 2*$x1;
-        }
-        } elseif ($this->titlebackground_style === TITLEBKG_STYLE2) {
-        // Cover the frame as well
-        $x1 = $y1 = 0;
-        $x2 = $this->img->width - 1 ;
-        } elseif ($this->titlebackground_style === TITLEBKG_STYLE3) {
-        // Cover the frame as well (the difference is that
-        // for style==3 a bevel frame border is on top
-        // of the title background)
-        $x1 = $y1 = 0;
-        $x2 = $this->img->width - 1 ;
-        $h += $this->framebeveldepth ;
-        $this->title->margin += $this->framebeveldepth ;
-        } else {
-        JpGraphError::Raise('Unknown title background style.');
+        if( $this->y2orderback ) {
+            // Stroke all plots for Y1 axis
+            for($i=0; $i < count($this->plots); ++$i) {
+                $this->plots[$i]->Stroke($this->img,$this->xscale,$this->yscale);
+                $this->plots[$i]->StrokeMargin($this->img);
+            }
         }
 
-        if ($this->titlebackground_framestyle === 3) {
-        $h += $this->titlebackground_bevelheight*2 + 1  ;
-        $this->title->margin += $this->titlebackground_bevelheight ;
+        $n = count($this->ynaxis);
+        for( $i=0; $i < $n; ++$i ) {
+            $m = count($this->ynplots[$i]);
+            for( $j=0; $j < $m; ++$j ) {
+                $this->ynplots[$i][$j]->Stroke($this->img,$this->xscale,$this->ynscale[$i]);
+                $this->ynplots[$i][$j]->StrokeMargin($this->img);
+            }
         }
 
-        if ($this->doshadow) {
-        $x2 -= $this->shadow_width ;
+        if( $this->iIconDepth == DEPTH_FRONT) {
+            $this->StrokeIcons();
         }
 
-        $indent=0;
-        if ($this->titlebackground_framestyle == TITLEBKG_FRAME_BEVEL) {
-        $ind = $this->titlebackground_bevelheight;
+        if( $this->iDoClipping ) {
+            // Clipping only supports graphs at 0 and 90 degrees
+            if( $this->img->a == 0 ) {
+                $this->img->CopyCanvasH($oldimage,$this->img->img,
+                $this->img->left_margin,$this->img->top_margin,
+                $this->img->left_margin,$this->img->top_margin,
+                $this->img->plotwidth+1,$this->img->plotheight);
+            }
+            elseif( $this->img->a == 90 ) {
+                $adj = ($this->img->height - $this->img->width)/2;
+                $this->img->CopyCanvasH($oldimage,$this->img->img,
+                $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
+                $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
+                $this->img->plotheight+1,$this->img->plotwidth);
+            }
+            else {
+                JpGraphError::RaiseL(25035,$this->img->a);//('You have enabled clipping. Cliping is only supported for graphs at 0 or 90 degrees rotation. Please adjust you current angle (='.$this->img->a.' degrees) or disable clipping.');
+            }
+            $this->img->Destroy();
+            $this->img->SetCanvasH($oldimage);
         }
 
-        if ($this->titlebkg_fillstyle==TITLEBKG_FILLSTYLE_HSTRIPED) {
-        $this->img->FilledRectangle2($x1+$ind,$y1+$ind,$x2-$ind,$h-$ind,
-                         $this->titlebkg_scolor1,
-                         $this->titlebkg_scolor2);
-        } elseif ($this->titlebkg_fillstyle==TITLEBKG_FILLSTYLE_VSTRIPED) {
-        $this->img->FilledRectangle2($x1+$ind,$y1+$ind,$x2-$ind,$h-$ind,
-                         $this->titlebkg_scolor1,
-                         $this->titlebkg_scolor2,2);
-        } else {
-        // Solid fill
-        $this->img->FilledRectangle($x1,$y1,$x2,$h);
+        $this->xscale->off=$oldoff;
+
+        if( $this->grid_depth == DEPTH_FRONT && !$_csim ) {
+            $this->ygrid->Stroke();
+            $this->xgrid->Stroke();
         }
-        $this->img->PopColor();
 
-        $this->img->PushColor($this->titlebackground_framecolor);
-        $this->img->SetLineWeight($this->titlebackground_frameweight);
-        if ($this->titlebackground_framestyle == TITLEBKG_FRAME_FULL) {
-        // Frame background
-        $this->img->Rectangle($x1,$y1,$x2,$h);
-        } elseif ($this->titlebackground_framestyle == TITLEBKG_FRAME_BOTTOM) {
-        // Bottom line only
-        $this->img->Line($x1,$h,$x2,$h);
-        } elseif ($this->titlebackground_framestyle == TITLEBKG_FRAME_BEVEL) {
-        $this->img->Bevel($x1,$y1,$x2,$h,$this->titlebackground_bevelheight);
+        // Stroke colored bands
+        $this->StrokeBands(DEPTH_FRONT,$_csim);
+
+        // Finally draw the axis again since some plots may have nagged
+        // the axis in the edges.
+        if( !$_csim ) {
+            $this->StrokeAxis();
         }
-        $this->img->PopColor();
 
-        // This is clumsy. But we neeed to stroke the whole graph frame if it is
-        // set to bevel to get the bevel shading on top of the text background
-        if ($this->framebevel && $this->doframe &&
-        $this->titlebackground_style === 3) {
-        $this->img->Bevel(1,1,$this->img->width-2,$this->img->height-2,
-                  $this->framebeveldepth,
-                  $this->framebevelcolor1,$this->framebevelcolor2);
-        if ($this->framebevelborder) {
-            $this->img->SetColor($this->framebevelbordercolor);
-            $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
+        if( $this->y2scale != null && !$_csim ) {
+            $this->y2axis->Stroke($this->xscale,false);
         }
+
+        if( !$_csim ) {
+            $this->StrokePlotBox();
         }
-    }
 
-    // Stroke title
-    $y = $this->title->margin;
-    if( $this->title->halign == 'center' )
-        $this->title->Center(0,$this->img->width,$y);
-    elseif ($this->title->halign == 'left') {
-        $this->title->SetPos($this->title->margin+2,$y);
-    } elseif ($this->title->halign == 'right') {
-        $indent = 0;
-        if( $this->doshadow )
-        $indent = $this->shadow_width+2;
-        $this->title->SetPos($this->img->width-$this->title->margin-$indent,$y,'right');
-    }
-    $this->title->Stroke($this->img);
+        // The titles and legends never gets rotated so make sure
+        // that the angle is 0 before stroking them
+        $aa = $this->img->SetAngle(0);
+        $this->StrokeTitles();
+        $this->footer->Stroke($this->img);
+        $this->legend->Stroke($this->img);
+        $this->img->SetAngle($aa);
+        $this->StrokeTexts();
+        $this->StrokeTables();
 
-    // ... and subtitle
-    $y += $this->title->GetTextHeight($this->img) + $margin + $this->subtitle->margin;
-    if( $this->subtitle->halign == 'center' )
-        $this->subtitle->Center(0,$this->img->width,$y);
-    elseif ($this->subtitle->halign == 'left') {
-        $this->subtitle->SetPos($this->subtitle->margin+2,$y);
-    } elseif ($this->subtitle->halign == 'right') {
-        $indent = 0;
-        if( $this->doshadow )
-        $indent = $this->shadow_width+2;
-        $this->subtitle->SetPos($this->img->width-$this->subtitle->margin-$indent,$y,'right');
-    }
-    $this->subtitle->Stroke($this->img);
+        if( !$_csim ) {
 
-    // ... and subsubtitle
-    $y += $this->subtitle->GetTextHeight($this->img) + $margin + $this->subsubtitle->margin;
-    if( $this->subsubtitle->halign == 'center' )
-        $this->subsubtitle->Center(0,$this->img->width,$y);
-    elseif ($this->subsubtitle->halign == 'left') {
-        $this->subsubtitle->SetPos($this->subsubtitle->margin+2,$y);
-    } elseif ($this->subsubtitle->halign == 'right') {
-        $indent = 0;
-        if( $this->doshadow )
-        $indent = $this->shadow_width+2;
-        $this->subsubtitle->SetPos($this->img->width-$this->subsubtitle->margin-$indent,$y,'right');
-    }
-    $this->subsubtitle->Stroke($this->img);
+            $this->img->SetAngle($aa);
 
-    // ... and fancy title
-    $this->tabtitle->Stroke($this->img);
+            // Draw an outline around the image map
+            if(_JPG_DEBUG) {
+                $this->DisplayClientSideaImageMapAreas();
+            }
 
-    }
+            // Should we do any final image transformation
+            if( $this->iImgTrans ) {
+                if( !class_exists('ImgTrans',false) ) {
+                    require_once('jpgraph_imgtrans.php');
+                    //JpGraphError::Raise('In order to use image transformation you must include the file jpgraph_imgtrans.php in your script.');
+                }
+
+                $tform = new ImgTrans($this->img->img);
+                $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
+                $this->iImgTransDirection,$this->iImgTransHighQ,
+                $this->iImgTransMinSize,$this->iImgTransFillColor,
+                $this->iImgTransBorder);
+            }
 
-    public function StrokeTexts()
-    {
-    // Stroke any user added text objects
-    if ($this->texts != null) {
-        for ($i=0; $i < count($this->texts); ++$i) {
-        $this->texts[$i]->StrokeWithScale($this->img,$this->xscale,$this->yscale);
+            // If the filename is given as the special "__handle"
+            // then the image handler is returned and the image is NOT
+            // streamed back
+            if( $aStrokeFileName == _IMG_HANDLER ) {
+                return $this->img->img;
+            }
+            else {
+                // Finally stream the generated picture
+                $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,$aStrokeFileName);
+            }
         }
     }
 
-    if ($this->y2texts != null && $this->y2scale != null) {
-        for ($i=0; $i < count($this->y2texts); ++$i) {
-        $this->y2texts[$i]->StrokeWithScale($this->img,$this->xscale,$this->y2scale);
+    function SetAxisLabelBackground($aType,$aXFColor='lightgray',$aXColor='black',$aYFColor='lightgray',$aYColor='black') {
+        $this->iAxisLblBgType = $aType;
+        $this->iXAxisLblBgFillColor = $aXFColor;
+        $this->iXAxisLblBgColor = $aXColor;
+        $this->iYAxisLblBgFillColor = $aYFColor;
+        $this->iYAxisLblBgColor = $aYColor;
+    }
+
+    function StrokeAxisLabelBackground() {
+        // Types
+        // 0 = No background
+        // 1 = Only X-labels, length of axis
+        // 2 = Only Y-labels, length of axis
+        // 3 = As 1 but extends to width of graph
+        // 4 = As 2 but extends to height of graph
+        // 5 = Combination of 3 & 4
+        // 6 = Combination of 1 & 2
+
+        $t = $this->iAxisLblBgType ;
+        if( $t < 1 ) return;
+
+        // Stroke optional X-axis label background color
+        if( $t == 1 || $t == 3 || $t == 5 || $t == 6 ) {
+            $this->img->PushColor($this->iXAxisLblBgFillColor);
+            if( $t == 1 || $t == 6 ) {
+                $xl = $this->img->left_margin;
+                $yu = $this->img->height - $this->img->bottom_margin + 1;
+                $xr = $this->img->width - $this->img->right_margin ;
+                $yl = $this->img->height-1-$this->frame_weight;
+            }
+            else { // t==3 || t==5
+                $xl = $this->frame_weight;
+                $yu = $this->img->height - $this->img->bottom_margin + 1;
+                $xr = $this->img->width - 1 - $this->frame_weight;
+                $yl = $this->img->height-1-$this->frame_weight;
+            }
+
+            $this->img->FilledRectangle($xl,$yu,$xr,$yl);
+            $this->img->PopColor();
+
+            // Check if we should add the vertical lines at left and right edge
+            if( $this->iXAxisLblBgColor !== '' ) {
+                // Hardcode to one pixel wide
+                $this->img->SetLineWeight(1);
+                $this->img->PushColor($this->iXAxisLblBgColor);
+                if( $t == 1 || $t == 6 ) {
+                    $this->img->Line($xl,$yu,$xl,$yl);
+                    $this->img->Line($xr,$yu,$xr,$yl);
+                }
+                else {
+                    $xl = $this->img->width - $this->img->right_margin ;
+                    $this->img->Line($xl,$yu-1,$xr,$yu-1);
+                }
+                $this->img->PopColor();
+            }
         }
-    }
 
-    }
+        if( $t == 2 || $t == 4 || $t == 5 || $t == 6 ) {
+            $this->img->PushColor($this->iYAxisLblBgFillColor);
+            if( $t == 2 || $t == 6 ) {
+                $xl = $this->frame_weight;
+                $yu = $this->frame_weight+$this->img->top_margin;
+                $xr = $this->img->left_margin - 1;
+                $yl = $this->img->height - $this->img->bottom_margin + 1;
+            }
+            else {
+                $xl = $this->frame_weight;
+                $yu = $this->frame_weight;
+                $xr = $this->img->left_margin - 1;
+                $yl = $this->img->height-1-$this->frame_weight;
+            }
 
-    public function DisplayClientSideaImageMapAreas()
-    {
-    // Debug stuff - display the outline of the image map areas
-    $csim='';
-    foreach ($this->plots as $p) {
-        $csim.= $p->GetCSIMareas();
+            $this->img->FilledRectangle($xl,$yu,$xr,$yl);
+            $this->img->PopColor();
+
+            // Check if we should add the vertical lines at left and right edge
+            if( $this->iXAxisLblBgColor !== '' ) {
+                $this->img->PushColor($this->iXAxisLblBgColor);
+                if( $t == 2 || $t == 6 ) {
+                    $this->img->Line($xl,$yu-1,$xr,$yu-1);
+                    $this->img->Line($xl,$yl-1,$xr,$yl-1);
+                }
+                else {
+                    $this->img->Line($xr+1,$yu,$xr+1,$this->img->top_margin);
+                }
+                $this->img->PopColor();
+            }
+
+        }
     }
-    $csim .= $this->legend->GetCSIMareas();
-    if (preg_match_all("/area shape=\"(\w+)\" coords=\"([0-9\, ]+)\"/", $csim, $coords)) {
-        $this->img->SetColor($this->csimcolor);
-        for ($i=0; $i<count($coords[0]); $i++) {
-        if ($coords[1][$i]=="poly") {
-            preg_match_all('/\s*([0-9]+)\s*,\s*([0-9]+)\s*,*/',$coords[2][$i],$pts);
-            $this->img->SetStartPoint($pts[1][count($pts[0])-1],$pts[2][count($pts[0])-1]);
-            for ($j=0; $j<count($pts[0]); $j++) {
-            $this->img->LineTo($pts[1][$j],$pts[2][$j]);
+
+    function StrokeAxis($aStrokeLabels=true) {
+
+        if( $aStrokeLabels ) {
+            $this->StrokeAxisLabelBackground();
+        }
+
+        // Stroke axis
+        if( $this->iAxisStyle != AXSTYLE_SIMPLE ) {
+            switch( $this->iAxisStyle ) {
+                case AXSTYLE_BOXIN :
+                    $toppos = SIDE_DOWN;
+                    $bottompos = SIDE_UP;
+                    $leftpos = SIDE_RIGHT;
+                    $rightpos = SIDE_LEFT;
+                    break;
+                case AXSTYLE_BOXOUT :
+                    $toppos = SIDE_UP;
+                    $bottompos = SIDE_DOWN;
+                    $leftpos = SIDE_LEFT;
+                    $rightpos = SIDE_RIGHT;
+                    break;
+                case AXSTYLE_YBOXIN:
+                    $toppos = FALSE;
+                    $bottompos = SIDE_UP;
+                    $leftpos = SIDE_RIGHT;
+                    $rightpos = SIDE_LEFT;
+                    break;
+                case AXSTYLE_YBOXOUT:
+                    $toppos = FALSE;
+                    $bottompos = SIDE_DOWN;
+                    $leftpos = SIDE_LEFT;
+                    $rightpos = SIDE_RIGHT;
+                    break;
+                default:
+                    JpGRaphError::RaiseL(25036,$this->iAxisStyle); //('Unknown AxisStyle() : '.$this->iAxisStyle);
+                    break;
+            }
+
+            // By default we hide the first label so it doesn't cross the
+            // Y-axis in case the positon hasn't been set by the user.
+            // However, if we use a box we always want the first value
+            // displayed so we make sure it will be displayed.
+            $this->xscale->ticks->SupressFirst(false);
+
+            // Now draw the bottom X-axis
+            $this->xaxis->SetPos('min');
+            $this->xaxis->SetLabelSide(SIDE_DOWN);
+            $this->xaxis->scale->ticks->SetSide($bottompos);
+            $this->xaxis->Stroke($this->yscale,$aStrokeLabels);
+
+            if( $toppos !== FALSE ) {
+                // We also want a top X-axis
+                $this->xaxis = $this->xaxis;
+                $this->xaxis->SetPos('max');
+                $this->xaxis->SetLabelSide(SIDE_UP);
+                // No title for the top X-axis
+                if( $aStrokeLabels ) {
+                    $this->xaxis->title->Set('');
+                }
+                $this->xaxis->scale->ticks->SetSide($toppos);
+                $this->xaxis->Stroke($this->yscale,$aStrokeLabels);
+            }
+
+            // Stroke the left Y-axis
+            $this->yaxis->SetPos('min');
+            $this->yaxis->SetLabelSide(SIDE_LEFT);
+            $this->yaxis->scale->ticks->SetSide($leftpos);
+            $this->yaxis->Stroke($this->xscale,$aStrokeLabels);
+
+            // Stroke the  right Y-axis
+            $this->yaxis->SetPos('max');
+            // No title for the right side
+            if( $aStrokeLabels ) {
+                $this->yaxis->title->Set('');
             }
-        } elseif ($coords[1][$i]=="rect") {
-            $pts = preg_split('/,/', $coords[2][$i]);
-            $this->img->SetStartPoint($pts[0],$pts[1]);
-            $this->img->LineTo($pts[2],$pts[1]);
-            $this->img->LineTo($pts[2],$pts[3]);
-            $this->img->LineTo($pts[0],$pts[3]);
-            $this->img->LineTo($pts[0],$pts[1]);
+            $this->yaxis->SetLabelSide(SIDE_RIGHT);
+            $this->yaxis->scale->ticks->SetSide($rightpos);
+            $this->yaxis->Stroke($this->xscale,$aStrokeLabels);
         }
+        else {
+            $this->xaxis->Stroke($this->yscale,$aStrokeLabels);
+            $this->yaxis->Stroke($this->xscale,$aStrokeLabels);
         }
     }
-    }
 
-    public function AdjustSaturationBrightnessContrast()
-    {
-    // Adjust the brightness and contrast of the image
-    if( $this->image_contr || $this->image_bright )
-        $this->img->AdjBrightContrast($this->image_bright,$this->image_contr);
-    if( $this->image_sat )
-        $this->img->AdjSat($this->image_sat);
-    }
 
-    // Text scale offset in world coordinates
-    public function SetTextScaleOff($aOff)
-    {
-    $this->text_scale_off = $aOff;
-    $this->xscale->text_scale_off = $aOff;
-    }
+    // Private helper function for backgound image
+    static function LoadBkgImage($aImgFormat='',$aFile='',$aImgStr='') {
+        if( $aImgStr != '' ) {
+            return Image::CreateFromString($aImgStr);
+        }
 
-    // Get Y min and max values for added lines
-    public function GetLinesYMinMax( $aLines )
-    {
-    $n = count($aLines);
-    if( $n == 0 ) return false;
-    $min = $aLines[0]->scaleposition ;
-    $max = $min ;
-    $flg = false;
-    for ($i=0; $i < $n; ++$i) {
-        if ($aLines[$i]->direction == HORIZONTAL) {
-        $flg = true ;
-        $v = $aLines[$i]->scaleposition ;
-        if( $min > $v ) $min = $v ;
-        if( $max < $v ) $max = $v ;
+        // Remove case sensitivity and setup appropriate function to create image
+        // Get file extension. This should be the LAST '.' separated part of the filename
+        $e = explode('.',$aFile);
+        $ext = strtolower($e[count($e)-1]);
+        if ($ext == "jpeg")  {
+            $ext = "jpg";
         }
-    }
 
-    return $flg ? array($min,$max) : false ;
-    }
+        if( trim($ext) == '' ) {
+            $ext = 'png';  // Assume PNG if no extension specified
+        }
 
-    // Get X min and max values for added lines
-    public function GetLinesXMinMax( $aLines )
-    {
-    $n = count($aLines);
-    if( $n == 0 ) return false ;
-    $min = $aLines[0]->scaleposition ;
-    $max = $min ;
-    $flg = false;
-    for ($i=0; $i < $n; ++$i) {
-        if ($aLines[$i]->direction == VERTICAL) {
-        $flg = true ;
-        $v = $aLines[$i]->scaleposition ;
-        if( $min > $v ) $min = $v ;
-        if( $max < $v ) $max = $v ;
+        if( $aImgFormat == '' ) {
+            $imgtag = $ext;
+        }
+        else {
+            $imgtag = $aImgFormat;
         }
-    }
 
-    return $flg ? array($min,$max) : false ;
-    }
+        $supported = imagetypes();
+        if( ( $ext == 'jpg' && !($supported & IMG_JPG) ) ||
+            ( $ext == 'gif' && !($supported & IMG_GIF) ) ||
+            ( $ext == 'png' && !($supported & IMG_PNG) ) ||
+            ( $ext == 'bmp' && !($supported & IMG_WBMP) ) ||
+            ( $ext == 'xpm' && !($supported & IMG_XPM) ) ) {
 
-    // Get min and max values for all included plots
-    public function GetPlotsYMinMax(&$aPlots)
-    {
-    list($xmax,$max) = $aPlots[0]->Max();
-    list($xmin,$min) = $aPlots[0]->Min();
-    for ($i=0; $i < count($aPlots); ++$i ) {
-        list($xmax,$ymax)=$aPlots[$i]->Max();
-        list($xmin,$ymin)=$aPlots[$i]->Min();
-        if (is_numeric($ymax)) $max=max($max,$ymax);
-        if (is_numeric($ymin)) $min=min($min,$ymin);
-    }
-    if( $min == '' ) $min = 0;
-    if( $max == '' ) $max = 0;
-    if ($min == 0 && $max == 0) {
-        // Special case if all values are 0
-        $min=0;$max=1;
-    }
+            JpGraphError::RaiseL(25037,$aFile);//('The image format of your background image ('.$aFile.') is not supported in your system configuration. ');
+        }
 
-    return array($min,$max);
-    }
 
-} // Class
+        if( $imgtag == "jpg" || $imgtag == "jpeg") {
+            $f = "imagecreatefromjpeg";
+            $imgtag = "jpg";
+        }
+        else {
+            $f = "imagecreatefrom".$imgtag;
+        }
 
+        // Compare specified image type and file extension
+        if( $imgtag != $ext ) {
+            //$t = "Background image seems to be of different type (has different file extension) than specified imagetype. Specified: '".$aImgFormat."'File: '".$aFile."'";
+            JpGraphError::RaiseL(25038, $aImgFormat, $aFile);
+        }
 
-//===================================================
-// CLASS TTF
-// Description: Handle TTF font names
-//===================================================
-class TTF
-{
-    public $font_files,$style_names;
-//---------------
-// CONSTRUCTOR
-    public function TTF()
-    {
-    $this->style_names=array(FS_NORMAL=>'normal',FS_BOLD=>'bold',FS_ITALIC=>'italic',FS_BOLDITALIC=>'bolditalic');
-    // File names for available fonts
-    $this->font_files=array(
-        FF_COURIER => array(FS_NORMAL=>'cour.ttf', FS_BOLD=>'courbd.ttf', FS_ITALIC=>'couri.ttf', FS_BOLDITALIC=>'courbi.ttf' ),
-        FF_GEORGIA => array(FS_NORMAL=>'georgia.ttf', FS_BOLD=>'georgiab.ttf', FS_ITALIC=>'georgiai.ttf', FS_BOLDITALIC=>'' ),
-        FF_TREBUCHE =>array(FS_NORMAL=>'trebuc.ttf', FS_BOLD=>'trebucbd.ttf',   FS_ITALIC=>'trebucit.ttf', FS_BOLDITALIC=>'trebucbi.ttf' ),
-        FF_VERDANA => array(FS_NORMAL=>'verdana.ttf', FS_BOLD=>'verdanab.ttf',  FS_ITALIC=>'verdanai.ttf', FS_BOLDITALIC=>'' ),
-        FF_TIMES =>   array(FS_NORMAL=>'times.ttf',   FS_BOLD=>'timesbd.ttf',   FS_ITALIC=>'timesi.ttf',   FS_BOLDITALIC=>'timesbi.ttf' ),
-        FF_COMIC =>   array(FS_NORMAL=>'comic.ttf',   FS_BOLD=>'comicbd.ttf',   FS_ITALIC=>'',         FS_BOLDITALIC=>'' ),
-        FF_ARIAL =>   array(FS_NORMAL=>'arial.ttf',   FS_BOLD=>'arialbd.ttf',   FS_ITALIC=>'ariali.ttf',   FS_BOLDITALIC=>'arialbi.ttf' ) ,
-        FF_VERA =>    array(FS_NORMAL=>'Vera.ttf',   FS_BOLD=>'VeraBd.ttf',   FS_ITALIC=>'VeraIt.ttf',   FS_BOLDITALIC=>'VeraBI.ttf' ),
-        FF_VERAMONO => array(FS_NORMAL=>'VeraMono.ttf', FS_BOLD=>'VeraMoBd.ttf', FS_ITALIC=>'VeraMoIt.ttf', FS_BOLDITALIC=>'VeraMoBI.ttf' ),
-        FF_VERASERIF => array(FS_NORMAL=>'VeraSe.ttf', FS_BOLD=>'VeraSeBd.ttf', FS_ITALIC=>'', FS_BOLDITALIC=>'' ) ,
-        FF_SIMSUN =>  array(FS_NORMAL=>'simsun.ttc',  FS_BOLD=>'simhei.ttf',   FS_ITALIC=>'',   FS_BOLDITALIC=>'' ),
-        FF_CHINESE => array(FS_NORMAL=>CHINESE_TTF_FONT, FS_BOLD=>'', FS_ITALIC=>'', FS_BOLDITALIC=>'' ),
-         FF_MINCHO =>  array(FS_NORMAL=>MINCHO_TTF_FONT,  FS_BOLD=>'',   FS_ITALIC=>'',   FS_BOLDITALIC=>'' ),
-         FF_PMINCHO => array(FS_NORMAL=>PMINCHO_TTF_FONT,  FS_BOLD=>'',   FS_ITALIC=>'',   FS_BOLDITALIC=>'' ),
-         FF_GOTHIC  => array(FS_NORMAL=>GOTHIC_TTF_FONT,  FS_BOLD=>'',   FS_ITALIC=>'',   FS_BOLDITALIC=>'' ),
-         FF_PGOTHIC => array(FS_NORMAL=>PGOTHIC_TTF_FONT,  FS_BOLD=>'',   FS_ITALIC=>'',   FS_BOLDITALIC=>'' ),
-         FF_MINCHO =>  array(FS_NORMAL=>PMINCHO_TTF_FONT,  FS_BOLD=>'',   FS_ITALIC=>'',   FS_BOLDITALIC=>'' )
-);
-    }
-
-//---------------
-// PUBLIC METHODS
-    // Create the TTF file from the font specification
-    public function File($family,$style=FS_NORMAL)
-    {
-    if ($family == FF_HANDWRT || $family==FF_BOOK) {
-        JpGraphError::Raise('Font families FF_HANDWRT and FF_BOOK are no longer available due to copyright problem with these fonts. Fonts can no longer be distributed with JpGraph. Please download fonts from http://corefonts.sourceforge.net/');
-    }
-
-    $fam = @$this->font_files[$family];
-    if (!$fam) {
-        JpGraphError::Raise(
-        "Specified TTF font family (id=$family) is unknown or does not exist. ".
-        "Please note that TTF fonts are not distributed with JpGraph for copyright reasons.".
-        " You can find the MS TTF WEB-fonts (arial, courier etc) for download at ".
-        " http://corefonts.sourceforge.net/");
-    }
-    $f = @$fam[$style];
-
-    if( $f==='' )
-        JpGraphError::Raise('Style "'.$this->style_names[$style].'" is not available for font family '.$this->font_files[$family][FS_NORMAL].'.');
-    if (!$f) {
-        JpGraphError::Raise("Unknown font style specification [$fam].");
-    }
-
-    if ($family >= FF_MINCHO && $family <= FF_PGOTHIC) {
-        $f = MBTTF_DIR.$f;
-    } else {
-        $f = TTF_DIR.$f;
+        $img = @$f($aFile);
+        if( !$img ) {
+            JpGraphError::RaiseL(25039,$aFile);//(" Can't read background image: '".$aFile."'");
+        }
+        return $img;
     }
 
-    if ( file_exists($f) === false || is_readable($f) === false ) {
-        JpGraphError::Raise("Font file \"$f\" is not readable or does not exist.");
-    }
+    function StrokePlotGrad() {
+        if( $this->plot_gradtype < 0  )
+            return;
+            
+        $grad = new Gradient($this->img);
+        $xl = $this->img->left_margin;
+        $yt = $this->img->top_margin;
+        $xr = $xl + $this->img->plotwidth+1 ;
+        $yb = $yt + $this->img->plotheight ;
+        $grad->FilledRectangle($xl,$yt,$xr,$yb,$this->plot_gradfrom,$this->plot_gradto,$this->plot_gradtype);
 
-    return $f;
     }
-} // Class
 
-//===================================================
-// CLASS LineProperty
-// Description: Holds properties for a line
-//===================================================
-class LineProperty
-{
-    public $iWeight=1, $iColor="black",$iStyle="solid";
-    public $iShow=true;
+    function StrokeBackgroundGrad() {
+        if( $this->bkg_gradtype < 0  )
+            return;
 
-//---------------
-// PUBLIC METHODS
-    public function SetColor($aColor)
-    {
-    $this->iColor = $aColor;
+        $grad = new Gradient($this->img);
+        if( $this->bkg_gradstyle == BGRAD_PLOT ) {
+            $xl = $this->img->left_margin;
+            $yt = $this->img->top_margin;
+            $xr = $xl + $this->img->plotwidth+1 ;
+            $yb = $yt + $this->img->plotheight ;
+            $grad->FilledRectangle($xl,$yt,$xr,$yb,$this->bkg_gradfrom,$this->bkg_gradto,$this->bkg_gradtype);
+        }
+        else {
+            $xl = 0;
+            $yt = 0;
+            $xr = $xl + $this->img->width - 1;
+            $yb = $yt + $this->img->height - 1 ;
+            if( $this->doshadow  ) {
+                $xr -= $this->shadow_width;
+                $yb -= $this->shadow_width;
+            }
+            if( $this->doframe ) {
+                $yt += $this->frame_weight;
+                $yb -= $this->frame_weight;
+                $xl += $this->frame_weight;
+                $xr -= $this->frame_weight;
+            }
+            $aa = $this->img->SetAngle(0);
+            $grad->FilledRectangle($xl,$yt,$xr,$yb,$this->bkg_gradfrom,$this->bkg_gradto,$this->bkg_gradtype);
+            $aa = $this->img->SetAngle($aa);
+        }
     }
 
-    public function SetWeight($aWeight)
-    {
-    $this->iWeight = $aWeight;
-    }
+    function StrokeFrameBackground() {
+        if( $this->background_image != '' && $this->background_cflag != '' ) {
+            JpGraphError::RaiseL(25040);//('It is not possible to specify both a background image and a background country flag.');
+        }
+        if( $this->background_image != '' ) {
+            $bkgimg = $this->LoadBkgImage($this->background_image_format,$this->background_image);
+        }
+        elseif( $this->background_cflag != '' ) {
+            if( ! class_exists('FlagImages',false) ) {
+                JpGraphError::RaiseL(25041);//('In order to use Country flags as backgrounds you must include the "jpgraph_flags.php" file.');
+            }
+            $fobj = new FlagImages(FLAGSIZE4);
+            $dummy='';
+            $bkgimg = $fobj->GetImgByName($this->background_cflag,$dummy);
+            $this->background_image_mix = $this->background_cflag_mix;
+            $this->background_image_type = $this->background_cflag_type;
+        }
+        else {
+            return ;
+        }
 
-    public function SetStyle($aStyle)
-    {
-    $this->iStyle = $aStyle;
-    }
+        $bw = ImageSX($bkgimg);
+        $bh = ImageSY($bkgimg);
 
-    public function Show($aShow=true)
-    {
-    $this->iShow=$aShow;
+        // No matter what the angle is we always stroke the image and frame
+        // assuming it is 0 degree
+        $aa = $this->img->SetAngle(0);
+
+        switch( $this->background_image_type ) {
+            case BGIMG_FILLPLOT: // Resize to just fill the plotarea
+                $this->FillMarginArea();
+                $this->StrokeFrame();
+                // Special case to hande 90 degree rotated graph corectly
+                if( $aa == 90 ) {
+                    $this->img->SetAngle(90);
+                    $this->FillPlotArea();
+                    $aa = $this->img->SetAngle(0);
+                    $adj = ($this->img->height - $this->img->width)/2;
+                    $this->img->CopyMerge($bkgimg,
+                        $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
+                        0,0,
+                        $this->img->plotheight+1,$this->img->plotwidth,
+                        $bw,$bh,$this->background_image_mix);
+                }
+                else {
+                    $this->FillPlotArea();
+                    $this->img->CopyMerge($bkgimg,
+                        $this->img->left_margin,$this->img->top_margin+1,
+                        0,0,$this->img->plotwidth+1,$this->img->plotheight,
+                        $bw,$bh,$this->background_image_mix);
+                }
+                break;
+            case BGIMG_FILLFRAME: // Fill the whole area from upper left corner, resize to just fit
+                $hadj=0; $vadj=0;
+                if( $this->doshadow ) {
+                    $hadj = $this->shadow_width;
+                    $vadj = $this->shadow_width;
+                }
+                $this->FillMarginArea();
+                $this->FillPlotArea();
+                $this->img->CopyMerge($bkgimg,0,0,0,0,$this->img->width-$hadj,$this->img->height-$vadj,
+                $bw,$bh,$this->background_image_mix);
+                $this->StrokeFrame();
+                break;
+            case BGIMG_COPY: // Just copy the image from left corner, no resizing
+                $this->FillMarginArea();
+                $this->FillPlotArea();
+                $this->img->CopyMerge($bkgimg,0,0,0,0,$bw,$bh,
+                $bw,$bh,$this->background_image_mix);
+                $this->StrokeFrame();
+                break;
+            case BGIMG_CENTER: // Center original image in the plot area
+                $this->FillMarginArea();
+                $this->FillPlotArea();
+                $centerx = round($this->img->plotwidth/2+$this->img->left_margin-$bw/2);
+                $centery = round($this->img->plotheight/2+$this->img->top_margin-$bh/2);
+                $this->img->CopyMerge($bkgimg,$centerx,$centery,0,0,$bw,$bh,
+                $bw,$bh,$this->background_image_mix);
+                $this->StrokeFrame();
+                break;
+            case BGIMG_FREE: // Just copy the image to the specified location
+                $this->img->CopyMerge($bkgimg,
+                $this->background_image_xpos,$this->background_image_ypos,
+                0,0,$bw,$bh,$bw,$bh,$this->background_image_mix);
+                $this->StrokeFrame(); // New
+                break;
+            default:
+                JpGraphError::RaiseL(25042);//(" Unknown background image layout");
+        }
+        $this->img->SetAngle($aa);
     }
 
-    public function Stroke($aImg,$aX1,$aY1,$aX2,$aY2)
-    {
-    if ($this->iShow) {
-        $aImg->PushColor($this->iColor);
-        $oldls = $aImg->line_style;
-        $oldlw = $aImg->line_weight;
-        $aImg->SetLineWeight($this->iWeight);
-        $aImg->SetLineStyle($this->iStyle);
-        $aImg->StyleLine($aX1,$aY1,$aX2,$aY2);
-        $aImg->PopColor($this->iColor);
-        $aImg->line_style = $oldls;
-        $aImg->line_weight = $oldlw;
+    // Private
+    // Draw a frame around the image
+    function StrokeFrame() {
+        if( !$this->doframe ) return;
 
+        if( $this->background_image_type <= 1 && ($this->bkg_gradtype < 0 || ($this->bkg_gradtype > 0 && $this->bkg_gradstyle==BGRAD_PLOT)) ) {
+            $c = $this->margin_color;
+        }
+        else {
+            $c = false;
+        }
+
+        if( $this->doshadow ) {
+            $this->img->SetColor($this->frame_color);
+            $this->img->ShadowRectangle(0,0,$this->img->width,$this->img->height,
+            $c,$this->shadow_width,$this->shadow_color);
+        }
+        elseif( $this->framebevel ) {
+            if( $c ) {
+                $this->img->SetColor($this->margin_color);
+                $this->img->FilledRectangle(0,0,$this->img->width-1,$this->img->height-1);
+            }
+            $this->img->Bevel(1,1,$this->img->width-2,$this->img->height-2,
+            $this->framebeveldepth,
+            $this->framebevelcolor1,$this->framebevelcolor2);
+            if( $this->framebevelborder ) {
+                $this->img->SetColor($this->framebevelbordercolor);
+                $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
+            }
+        }
+        else {
+            $this->img->SetLineWeight($this->frame_weight);
+            if( $c ) {
+                $this->img->SetColor($this->margin_color);
+                $this->img->FilledRectangle(0,0,$this->img->width-1,$this->img->height-1);
+            }
+            $this->img->SetColor($this->frame_color);
+            $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
+        }
     }
-    }
-}
 
+    function FillMarginArea() {
+        $hadj=0; $vadj=0;
+        if( $this->doshadow ) {
+            $hadj = $this->shadow_width;
+            $vadj = $this->shadow_width;
+        }
 
-//===================================================
-// CLASS Text
-// Description: Arbitrary text object that can be added to the graph
-//===================================================
-class Text
-{
-    public $t,$x=0,$y=0,$halign="left",$valign="top",$color=array(0,0,0);
-    public $font_family=FF_FONT1,$font_style=FS_NORMAL,$font_size=12;
-    public $hide=false, $dir=0;
-    public $boxed=false;	// Should the text be boxed
-    public $paragraph_align="left";
-    public $margin=0;
-    public $icornerradius=0,$ishadowwidth=3;
-    public $iScalePosY=null,$iScalePosX=null;
-    public $iWordwrap=0;
-    public $fcolor='white',$bcolor='black',$shadow=false;
-    public $iCSIMarea='',$iCSIMalt='',$iCSIMtarget='';
-
-//---------------
-// CONSTRUCTOR
-
-    // Create new text at absolute pixel coordinates
-    public function Text($aTxt="",$aXAbsPos=0,$aYAbsPos=0)
-    {
-    if ( ! is_string($aTxt) ) {
-        JpGraphError::Raise('First argument to Text::Text() must be s atring.');
-    }
-    $this->t = $aTxt;
-    $this->x = round($aXAbsPos);
-    $this->y = round($aYAbsPos);
-    $this->margin = 0;
-    }
-//---------------
-// PUBLIC METHODS
-    // Set the string in the text object
-    public function Set($aTxt)
-    {
-    $this->t = $aTxt;
-    }
-
-    // Alias for Pos()
-    public function SetPos($aXAbsPos=0,$aYAbsPos=0,$aHAlign="left",$aVAlign="top")
-    {
-    $this->Pos($aXAbsPos,$aYAbsPos,$aHAlign,$aVAlign);
-    }
-
-    // Specify the position and alignment for the text object
-    public function Pos($aXAbsPos=0,$aYAbsPos=0,$aHAlign="left",$aVAlign="top")
-    {
-    $this->x = $aXAbsPos;
-    $this->y = $aYAbsPos;
-    $this->halign = $aHAlign;
-    $this->valign = $aVAlign;
-    }
-
-    public function SetScalePos($aX,$aY)
-    {
-    $this->iScalePosX = $aX;
-    $this->iScalePosY = $aY;
-    }
-
-    // Specify alignment for the text
-    public function Align($aHAlign,$aVAlign="top",$aParagraphAlign="")
-    {
-    $this->halign = $aHAlign;
-    $this->valign = $aVAlign;
-    if( $aParagraphAlign != "" )
-        $this->paragraph_align = $aParagraphAlign;
-    }
-
-    // Alias
-    public function SetAlign($aHAlign,$aVAlign="top",$aParagraphAlign="")
-    {
-    $this->Align($aHAlign,$aVAlign,$aParagraphAlign);
-    }
-
-    // Specifies the alignment for a multi line text
-    public function ParagraphAlign($aAlign)
-    {
-    $this->paragraph_align = $aAlign;
-    }
-
-    // Specifies the alignment for a multi line text
-    public function SetParagraphAlign($aAlign)
-    {
-    $this->paragraph_align = $aAlign;
-    }
-
-    public function SetShadow($aShadowColor='gray',$aShadowWidth=3)
-    {
-    $this->ishadowwidth=$aShadowWidth;
-    $this->shadow=$aShadowColor;
-    $this->boxed=true;
-    }
-
-    public function SetWordWrap($aCol)
-    {
-    $this->iWordwrap = $aCol ;
-    }
-
-    // Specify that the text should be boxed. fcolor=frame color, bcolor=border color,
-    // $shadow=drop shadow should be added around the text.
-    public function SetBox($aFrameColor=array(255,255,255),$aBorderColor=array(0,0,0),$aShadowColor=false,$aCornerRadius=4,$aShadowWidth=3)
-    {
-    if( $aFrameColor==false )
-        $this->boxed=false;
-    else
-        $this->boxed=true;
-    $this->fcolor=$aFrameColor;
-    $this->bcolor=$aBorderColor;
-    // For backwards compatibility when shadow was just true or false
-    if( $aShadowColor === true )
-        $aShadowColor = 'gray';
-    $this->shadow=$aShadowColor;
-    $this->icornerradius=$aCornerRadius;
-    $this->ishadowwidth=$aShadowWidth;
+        $this->img->SetColor($this->margin_color);
+        $this->img->FilledRectangle(0,0,$this->img->width-1-$hadj,$this->img->height-1-$vadj);
+
+        $this->img->FilledRectangle(0,0,$this->img->width-1-$hadj,$this->img->top_margin);
+        $this->img->FilledRectangle(0,$this->img->top_margin,$this->img->left_margin,$this->img->height-1-$hadj);
+        $this->img->FilledRectangle($this->img->left_margin+1,
+        $this->img->height-$this->img->bottom_margin,
+        $this->img->width-1-$hadj,
+        $this->img->height-1-$hadj);
+        $this->img->FilledRectangle($this->img->width-$this->img->right_margin,
+        $this->img->top_margin+1,
+        $this->img->width-1-$hadj,
+        $this->img->height-$this->img->bottom_margin-1);
+    }
+
+    function FillPlotArea() {
+        $this->img->PushColor($this->plotarea_color);
+        $this->img->FilledRectangle($this->img->left_margin,
+        $this->img->top_margin,
+        $this->img->width-$this->img->right_margin,
+        $this->img->height-$this->img->bottom_margin);
+        $this->img->PopColor();
     }
 
-    // Hide the text
-    public function Hide($aHide=true)
-    {
-    $this->hide=$aHide;
+    // Stroke the plot area with either a solid color or a background image
+    function StrokePlotArea() {
+        // Note: To be consistent we really should take a possible shadow
+        // into account. However, that causes some problem for the LinearScale class
+        // since in the current design it does not have any links to class Graph which
+        // means it has no way of compensating for the adjusted plotarea in case of a
+        // shadow. So, until I redesign LinearScale we can't compensate for this.
+        // So just set the two adjustment parameters to zero for now.
+        $boxadj = 0; //$this->doframe ? $this->frame_weight : 0 ;
+        $adj = 0; //$this->doshadow ? $this->shadow_width : 0 ;
+
+        if( $this->background_image != '' || $this->background_cflag != '' ) {
+            $this->StrokeFrameBackground();
+        }
+        else {
+            $aa = $this->img->SetAngle(0);
+            $this->StrokeFrame();
+            $aa = $this->img->SetAngle($aa);
+            $this->StrokeBackgroundGrad(); 
+            if( $this->bkg_gradtype < 0 || ($this->bkg_gradtype > 0 && $this->bkg_gradstyle==BGRAD_MARGIN) ) {
+                $this->FillPlotArea();
+            }
+            $this->StrokePlotGrad();
+        }
     }
 
-    // This looks ugly since it's not a very orthogonal design
-    // but I added this "inverse" of Hide() to harmonize
-    // with some classes which I designed more recently (especially)
-    // jpgraph_gantt
-    public function Show($aShow=true)
-    {
-    $this->hide=!$aShow;
+    function StrokeIcons() {
+        $n = count($this->iIcons);
+        for( $i=0; $i < $n; ++$i ) {
+            $this->iIcons[$i]->StrokeWithScale($this->img,$this->xscale,$this->yscale);
+        }
     }
 
-    // Specify font
-    public function SetFont($aFamily,$aStyle=FS_NORMAL,$aSize=10)
-    {
-    $this->font_family=$aFamily;
-    $this->font_style=$aStyle;
-    $this->font_size=$aSize;
+    function StrokePlotBox() {
+        // Should we draw a box around the plot area?
+        if( $this->boxed ) {
+            $this->img->SetLineWeight(1);
+            $this->img->SetLineStyle('solid');
+            $this->img->SetColor($this->box_color);
+            for($i=0; $i < $this->box_weight; ++$i ) {
+                $this->img->Rectangle(
+                $this->img->left_margin-$i,$this->img->top_margin-$i,
+                $this->img->width-$this->img->right_margin+$i,
+                $this->img->height-$this->img->bottom_margin+$i);
+            }
+        }
     }
 
-    // Center the text between $left and $right coordinates
-    public function Center($aLeft,$aRight,$aYAbsPos=false)
-    {
-    $this->x = $aLeft + ($aRight-$aLeft	)/2;
-    $this->halign = "center";
-    if( is_numeric($aYAbsPos) )
-        $this->y = $aYAbsPos;
+    function SetTitleBackgroundFillStyle($aStyle,$aColor1='black',$aColor2='white') {
+        $this->titlebkg_fillstyle = $aStyle;
+        $this->titlebkg_scolor1 = $aColor1;
+        $this->titlebkg_scolor2 = $aColor2;
     }
 
-    // Set text color
-    public function SetColor($aColor)
-    {
-    $this->color = $aColor;
+    function SetTitleBackground($aBackColor='gray', $aStyle=TITLEBKG_STYLE1, $aFrameStyle=TITLEBKG_FRAME_NONE, $aFrameColor='black', $aFrameWeight=1, $aBevelHeight=3, $aEnable=true) {
+        $this->titlebackground = $aEnable;
+        $this->titlebackground_color = $aBackColor;
+        $this->titlebackground_style = $aStyle;
+        $this->titlebackground_framecolor = $aFrameColor;
+        $this->titlebackground_framestyle = $aFrameStyle;
+        $this->titlebackground_frameweight = $aFrameWeight;
+        $this->titlebackground_bevelheight = $aBevelHeight ;
     }
 
-    public function SetAngle($aAngle)
-    {
-    $this->SetOrientation($aAngle);
-    }
 
-    // Orientation of text. Note only TTF fonts can have an arbitrary angle
-    public function SetOrientation($aDirection=0)
-    {
-    if( is_numeric($aDirection) )
-        $this->dir=$aDirection;
-    elseif( $aDirection=="h" )
-        $this->dir = 0;
-    elseif( $aDirection=="v" )
-        $this->dir = 90;
-    else JpGraphError::Raise(" Invalid direction specified for text.");
-    }
+    function StrokeTitles() {
 
-    // Total width of text
-    public function GetWidth($aImg)
-    {
-    $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-    $w = $aImg->GetTextWidth($this->t,$this->dir);
+        $margin=3;
 
-    return $w;
-    }
+        if( $this->titlebackground ) {
+            // Find out height
+            $this->title->margin += 2 ;
+            $h = $this->title->GetTextHeight($this->img)+$this->title->margin+$margin;
+            if( $this->subtitle->t != '' && !$this->subtitle->hide ) {
+                $h += $this->subtitle->GetTextHeight($this->img)+$margin+
+                $this->subtitle->margin;
+                $h += 2;
+            }
+            if( $this->subsubtitle->t != '' && !$this->subsubtitle->hide ) {
+                $h += $this->subsubtitle->GetTextHeight($this->img)+$margin+
+                $this->subsubtitle->margin;
+                $h += 2;
+            }
+            $this->img->PushColor($this->titlebackground_color);
+            if( $this->titlebackground_style === TITLEBKG_STYLE1 ) {
+                // Inside the frame
+                if( $this->framebevel ) {
+                    $x1 = $y1 = $this->framebeveldepth + 1 ;
+                    $x2 = $this->img->width - $this->framebeveldepth - 2 ;
+                    $this->title->margin += $this->framebeveldepth + 1 ;
+                    $h += $y1 ;
+                    $h += 2;
+                }
+                else {
+                    $x1 = $y1 = $this->frame_weight;
+                    $x2 = $this->img->width - $this->frame_weight-1;
+                }
+            }
+            elseif( $this->titlebackground_style === TITLEBKG_STYLE2 ) {
+                // Cover the frame as well
+                $x1 = $y1 = 0;
+                $x2 = $this->img->width - 1 ;
+            }
+            elseif( $this->titlebackground_style === TITLEBKG_STYLE3 ) {
+                // Cover the frame as well (the difference is that
+                // for style==3 a bevel frame border is on top
+                // of the title background)
+                $x1 = $y1 = 0;
+                $x2 = $this->img->width - 1 ;
+                $h += $this->framebeveldepth ;
+                $this->title->margin += $this->framebeveldepth ;
+            }
+            else {
+                JpGraphError::RaiseL(25043);//('Unknown title background style.');
+            }
+
+            if( $this->titlebackground_framestyle === 3 ) {
+                $h += $this->titlebackground_bevelheight*2 + 1  ;
+                $this->title->margin += $this->titlebackground_bevelheight ;
+            }
 
-    // Hight of font
-    public function GetFontHeight($aImg)
-    {
-    $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-    $h = $aImg->GetFontHeight();
+            if( $this->doshadow ) {
+                $x2 -= $this->shadow_width ;
+            }
 
-    return $h;
+            $indent=0;
+            if( $this->titlebackground_framestyle == TITLEBKG_FRAME_BEVEL ) {
+                $indent = $this->titlebackground_bevelheight;
+            }
 
-    }
+            if( $this->titlebkg_fillstyle==TITLEBKG_FILLSTYLE_HSTRIPED ) {
+                $this->img->FilledRectangle2($x1+$indent,$y1+$indent,$x2-$indent,$h-$indent,
+                $this->titlebkg_scolor1,
+                $this->titlebkg_scolor2);
+            }
+            elseif( $this->titlebkg_fillstyle==TITLEBKG_FILLSTYLE_VSTRIPED ) {
+                $this->img->FilledRectangle2($x1+$indent,$y1+$indent,$x2-$indent,$h-$indent,
+                $this->titlebkg_scolor1,
+                $this->titlebkg_scolor2,2);
+            }
+            else {
+                // Solid fill
+                $this->img->FilledRectangle($x1,$y1,$x2,$h);
+            }
+            $this->img->PopColor();
+
+            $this->img->PushColor($this->titlebackground_framecolor);
+            $this->img->SetLineWeight($this->titlebackground_frameweight);
+            if( $this->titlebackground_framestyle == TITLEBKG_FRAME_FULL ) {
+                // Frame background
+                $this->img->Rectangle($x1,$y1,$x2,$h);
+            }
+            elseif( $this->titlebackground_framestyle == TITLEBKG_FRAME_BOTTOM ) {
+                // Bottom line only
+                $this->img->Line($x1,$h,$x2,$h);
+            }
+            elseif( $this->titlebackground_framestyle == TITLEBKG_FRAME_BEVEL ) {
+                $this->img->Bevel($x1,$y1,$x2,$h,$this->titlebackground_bevelheight);
+            }
+            $this->img->PopColor();
+
+            // This is clumsy. But we neeed to stroke the whole graph frame if it is
+            // set to bevel to get the bevel shading on top of the text background
+            if( $this->framebevel && $this->doframe && $this->titlebackground_style === 3 ) {
+                $this->img->Bevel(1,1,$this->img->width-2,$this->img->height-2,
+                $this->framebeveldepth,
+                $this->framebevelcolor1,$this->framebevelcolor2);
+                if( $this->framebevelborder ) {
+                    $this->img->SetColor($this->framebevelbordercolor);
+                    $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
+                }
+            }
+        }
 
-    public function GetTextHeight($aImg)
-    {
-    $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-    $h = $aImg->GetTextHeight($this->t,$this->dir);
+        // Stroke title
+        $y = $this->title->margin;
+        if( $this->title->halign == 'center' ) {
+            $this->title->Center(0,$this->img->width,$y);
+        }
+        elseif( $this->title->halign == 'left' ) {
+            $this->title->SetPos($this->title->margin+2,$y);
+        }
+        elseif( $this->title->halign == 'right' ) {
+            $indent = 0;
+            if( $this->doshadow ) {
+                $indent = $this->shadow_width+2;
+            }
+            $this->title->SetPos($this->img->width-$this->title->margin-$indent,$y,'right');
+        }
+        $this->title->Stroke($this->img);
 
-    return $h;
-    }
+        // ... and subtitle
+        $y += $this->title->GetTextHeight($this->img) + $margin + $this->subtitle->margin;
+        if( $this->subtitle->halign == 'center' ) {
+            $this->subtitle->Center(0,$this->img->width,$y);
+        }
+        elseif( $this->subtitle->halign == 'left' ) {
+            $this->subtitle->SetPos($this->subtitle->margin+2,$y);
+        }
+        elseif( $this->subtitle->halign == 'right' ) {
+            $indent = 0;
+            if( $this->doshadow )
+            $indent = $this->shadow_width+2;
+            $this->subtitle->SetPos($this->img->width-$this->subtitle->margin-$indent,$y,'right');
+        }
+        $this->subtitle->Stroke($this->img);
 
-    public function GetHeight($aImg)
-    {
-    // Synonym for GetTextHeight()
-    $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-    $h = $aImg->GetTextHeight($this->t,$this->dir);
+        // ... and subsubtitle
+        $y += $this->subtitle->GetTextHeight($this->img) + $margin + $this->subsubtitle->margin;
+        if( $this->subsubtitle->halign == 'center' ) {
+            $this->subsubtitle->Center(0,$this->img->width,$y);
+        }
+        elseif( $this->subsubtitle->halign == 'left' ) {
+            $this->subsubtitle->SetPos($this->subsubtitle->margin+2,$y);
+        }
+        elseif( $this->subsubtitle->halign == 'right' ) {
+            $indent = 0;
+            if( $this->doshadow )
+            $indent = $this->shadow_width+2;
+            $this->subsubtitle->SetPos($this->img->width-$this->subsubtitle->margin-$indent,$y,'right');
+        }
+        $this->subsubtitle->Stroke($this->img);
 
-    return $h;
-    }
+        // ... and fancy title
+        $this->tabtitle->Stroke($this->img);
 
-    // Set the margin which will be interpretated differently depending
-    // on the context.
-    public function SetMargin($aMarg)
-    {
-    $this->margin = $aMarg;
     }
 
-    public function StrokeWithScale($aImg,$axscale,$ayscale)
-    {
-    if ($this->iScalePosX === null ||
-        $this->iScalePosY === null) {
-        $this->Stroke($aImg);
-    } else {
-        $this->Stroke($aImg,
-              round($axscale->Translate($this->iScalePosX)),
-              round($ayscale->Translate($this->iScalePosY)));
-    }
-    }
+    function StrokeTexts() {
+        // Stroke any user added text objects
+        if( $this->texts != null ) {
+            for($i=0; $i < count($this->texts); ++$i) {
+                $this->texts[$i]->StrokeWithScale($this->img,$this->xscale,$this->yscale);
+            }
+        }
+
+        if( $this->y2texts != null && $this->y2scale != null ) {
+            for($i=0; $i < count($this->y2texts); ++$i) {
+                $this->y2texts[$i]->StrokeWithScale($this->img,$this->xscale,$this->y2scale);
+            }
+        }
 
-    public function SetCSIMTarget($aTarget,$aAlt=null)
-    {
-    $this->iCSIMtarget = $aTarget;
-    $this->iCSIMalt = $aAlt;
     }
 
-    public function GetCSIMareas()
-    {
-    if( $this->iCSIMtarget !== '' )
+    function StrokeTables() {
+        if( $this->iTables != null ) {
+            $n = count($this->iTables);
+            for( $i=0; $i < $n; ++$i ) {
+                $this->iTables[$i]->StrokeWithScale($this->img,$this->xscale,$this->yscale);
+            }
+        }
+    }
 
-        return $this->iCSIMarea;
-    else
-        return '';
+    function DisplayClientSideaImageMapAreas() {
+        // Debug stuff - display the outline of the image map areas
+        $csim='';
+        foreach ($this->plots as $p) {
+            $csim.= $p->GetCSIMareas();
+        }
+        $csim .= $this->legend->GetCSIMareas();
+        if (preg_match_all("/area shape=\"(\w+)\" coords=\"([0-9\, ]+)\"/", $csim, $coords)) {
+            $this->img->SetColor($this->csimcolor);
+            $n = count($coords[0]);
+            for ($i=0; $i < $n; $i++) {
+                if ( $coords[1][$i] == 'poly' ) {
+                    preg_match_all('/\s*([0-9]+)\s*,\s*([0-9]+)\s*,*/',$coords[2][$i],$pts);
+                    $this->img->SetStartPoint($pts[1][count($pts[0])-1],$pts[2][count($pts[0])-1]);
+                    $m = count($pts[0]);
+                    for ($j=0; $j < $m; $j++) {
+                        $this->img->LineTo($pts[1][$j],$pts[2][$j]);
+                    }
+                } elseif ( $coords[1][$i] == 'rect' ) {
+                    $pts = preg_split('/,/', $coords[2][$i]);
+                    $this->img->SetStartPoint($pts[0],$pts[1]);
+                    $this->img->LineTo($pts[2],$pts[1]);
+                    $this->img->LineTo($pts[2],$pts[3]);
+                    $this->img->LineTo($pts[0],$pts[3]);
+                    $this->img->LineTo($pts[0],$pts[1]);
+                }
+            }
+        }
     }
 
-    // Display text in image
-    public function Stroke($aImg,$x=null,$y=null)
-    {
-    if( !empty($x) ) $this->x = round($x);
-    if( !empty($y) ) $this->y = round($y);
+    // Text scale offset in world coordinates
+    function SetTextScaleOff($aOff) {
+        $this->text_scale_off = $aOff;
+        $this->xscale->text_scale_off = $aOff;
+    }
 
-    // Insert newlines
-    if ($this->iWordwrap > 0) {
-        $this->t = wordwrap($this->t,$this->iWordwrap,"\n");
+    // Text width of bar to be centered in absolute pixels
+    function SetTextScaleAbsCenterOff($aOff) {
+        $this->text_scale_abscenteroff = $aOff;
     }
 
-    // If position been given as a fraction of the image size
-    // calculate the absolute position
-    if( $this->x < 1 && $this->x > 0 ) $this->x *= $aImg->width;
-    if( $this->y < 1 && $this->y > 0 ) $this->y *= $aImg->height;
+    // Get Y min and max values for added lines
+    function GetLinesYMinMax( $aLines ) {
+        $n = count($aLines);
+        if( $n == 0 ) return false;
+        $min = $aLines[0]->scaleposition ;
+        $max = $min ;
+        $flg = false;
+        for( $i=0; $i < $n; ++$i ) {
+            if( $aLines[$i]->direction == HORIZONTAL ) {
+                $flg = true ;
+                $v = $aLines[$i]->scaleposition ;
+                if( $min > $v ) $min = $v ;
+                if( $max < $v ) $max = $v ;
+            }
+        }
+        return $flg ? array($min,$max) : false ;
+    }
 
-    $aImg->PushColor($this->color);
-    $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-    $aImg->SetTextAlign($this->halign,$this->valign);
-    if ($this->boxed) {
-        if( $this->fcolor=="nofill" )
-        $this->fcolor=false;
-        $aImg->SetLineWeight(1);
-        $bbox = $aImg->StrokeBoxedText($this->x,$this->y,$this->t,
-                   $this->dir,$this->fcolor,$this->bcolor,$this->shadow,
-                   $this->paragraph_align,5,5,$this->icornerradius,
-                   $this->ishadowwidth);
-    } else {
-        $bbox = $aImg->StrokeText($this->x,$this->y,$this->t,$this->dir,$this->paragraph_align);
+    // Get X min and max values for added lines
+    function GetLinesXMinMax( $aLines ) {
+        $n = count($aLines);
+        if( $n == 0 ) return false ;
+        $min = $aLines[0]->scaleposition ;
+        $max = $min ;
+        $flg = false;
+        for( $i=0; $i < $n; ++$i ) {
+            if( $aLines[$i]->direction == VERTICAL ) {
+                $flg = true ;
+                $v = $aLines[$i]->scaleposition ;
+                if( $min > $v ) $min = $v ;
+                if( $max < $v ) $max = $v ;
+            }
+        }
+        return $flg ? array($min,$max) : false ;
     }
 
-    // Create CSIM targets
-    $coords = $bbox[0].','.$bbox[1].','.$bbox[2].','.$bbox[3].','.$bbox[4].','.$bbox[5].','.$bbox[6].','.$bbox[7];
-    $this->iCSIMarea = "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->iCSIMtarget."\"";
-    $this->iCSIMarea .= " alt=\"".$this->iCSIMalt."\" title=\"".$this->iCSIMalt."\" >\n";
+    // Get min and max values for all included plots
+    function GetPlotsYMinMax($aPlots) {
+        $n = count($aPlots);
+        $i=0;
+        do {
+            list($xmax,$max) = $aPlots[$i]->Max();
+        } while( ++$i < $n && !is_numeric($max) );
 
-    $aImg->PopColor($this->color);
+        $i=0;
+        do {
+            list($xmin,$min) = $aPlots[$i]->Min();
+        } while( ++$i < $n && !is_numeric($min) );
 
-    }
-} // Class
+        if( !is_numeric($min) || !is_numeric($max) ) {
+            JpGraphError::RaiseL(25044);//('Cannot use autoscaling since it is impossible to determine a valid min/max value  of the Y-axis (only null values).');
+        }
 
-class GraphTabTitle extends Text
-{
-    public $corner = 6 , $posx = 7, $posy = 4;
-    public $color='darkred',$fillcolor='lightyellow',$bordercolor='black';
-    public $align = 'left', $width=TABTITLE_WIDTHFIT;
-    public function GraphTabTitle()
-    {
-    $this->t = '';
-    $this->font_style = FS_BOLD;
-    $this->hide = true;
+        for($i=0; $i < $n; ++$i ) {
+            list($xmax,$ymax)=$aPlots[$i]->Max();
+            list($xmin,$ymin)=$aPlots[$i]->Min();
+            if (is_numeric($ymax)) $max=max($max,$ymax);
+            if (is_numeric($ymin)) $min=min($min,$ymin);
+        }
+        if( $min == '' ) $min = 0;
+        if( $max == '' ) $max = 0;
+        if( $min == 0 && $max == 0 ) {
+            // Special case if all values are 0
+            $min=0;$max=1;
+        }
+        return array($min,$max);
     }
 
-    public function SetColor($aTxtColor,$aFillColor='lightyellow',$aBorderColor='black')
-    {
-    $this->color = $aTxtColor;
-    $this->fillcolor = $aFillColor;
-    $this->bordercolor = $aBorderColor;
-    }
+    function hasLinePlotAndBarPlot() {
+        $has_line = false;
+        $has_bar  = false;
 
-    public function SetFillColor($aFillColor)
-    {
-    $this->fillcolor = $aFillColor;
-    }
+        foreach ($this->plots as $plot) {
+            if ($plot instanceof LinePlot) {
+                $has_line = true;
+            }
+            if ($plot instanceof BarPlot) {
+                $has_bar = true;
+            }
+        }
 
-    public function SetTabAlign($aAlign)
-    {
-    // Synonym for SetPos
-    $this->align = $aAlign;
-    }
+        if ($has_line && $has_bar) {
+            return true;
+        }
 
-    public function SetPos($aAlign)
-    {
-    $this->align = $aAlign;
+        return false;
     }
 
-    public function SetWidth($aWidth)
-    {
-    $this->width = $aWidth ;
-    }
+    function SetTheme($graph_theme) {
 
-    public function Set($t)
-    {
-    $this->t = $t;
-    $this->hide = false;
-    }
+        if (!($this instanceof PieGraph)) {
+            if (!$this->isAfterSetScale) {
+                JpGraphError::RaiseL(25133);//('Use Graph::SetTheme() after Graph::SetScale().');
+            }
+        }
 
-    public function SetCorner($aD)
-    {
-    $this->corner = $aD ;
+        if ($this->graph_theme) {
+            $this->ClearTheme();
+        }
+        $this->graph_theme = $graph_theme;
+        $this->graph_theme->ApplyGraph($this);
     }
 
-    public function Stroke($aImg)
-    {
-    if( $this->hide )
+    function ClearTheme() {
+        $this->graph_theme = null;
 
-        return;
-    $this->boxed = false;
-    $w = $this->GetWidth($aImg) + 2*$this->posx;
-    $h = $this->GetTextHeight($aImg) + 2*$this->posy;
+        $this->isRunningClear = true;
 
-    $x = $aImg->left_margin;
-    $y = $aImg->top_margin;
+        $this->__construct(
+                $this->inputValues['aWidth'],
+                $this->inputValues['aHeight'],
+                $this->inputValues['aCachedName'],
+                $this->inputValues['aTimeout'],
+                $this->inputValues['aInline']
+            );
+ 
+        if (!($this instanceof PieGraph)) {
+            if ($this->isAfterSetScale) {
+                $this->SetScale(
+                        $this->inputValues['aAxisType'],
+                        $this->inputValues['aYMin'],
+                        $this->inputValues['aYMax'],
+                        $this->inputValues['aXMin'],
+                        $this->inputValues['aXMax']
+                    );       
+            }
+        }
+
+        $this->isRunningClear = false;
+    }
 
-    if ($this->width === TABTITLE_WIDTHFIT) {
-        if ($this->align == 'left') {
-        $p = array($x,                $y,
-               $x,                $y-$h+$this->corner,
-               $x + $this->corner,$y-$h,
-               $x + $w - $this->corner, $y-$h,
-               $x + $w, $y-$h+$this->corner,
-               $x + $w, $y);
-        } elseif ($this->align == 'center') {
-        $x += round($aImg->plotwidth/2) - round($w/2);
-        $p = array($x, $y,
-               $x, $y-$h+$this->corner,
-               $x + $this->corner, $y-$h,
-               $x + $w - $this->corner, $y-$h,
-               $x + $w, $y-$h+$this->corner,
-               $x + $w, $y);
+    function SetSupersampling($do = false, $scale = 2) {
+        if ($do) {
+            define('SUPERSAMPLING_SCALE', $scale);
+           // $this->img->scale = $scale;
         } else {
-        $x += $aImg->plotwidth -$w;
-        $p = array($x, $y,
-               $x, $y-$h+$this->corner,
-               $x + $this->corner,$y-$h,
-               $x + $w - $this->corner, $y-$h,
-               $x + $w, $y-$h+$this->corner,
-               $x + $w, $y);
+            define('SUPERSAMPLING_SCALE', 1);
+            //$this->img->scale = 0;
         }
-    } else {
-        if( $this->width === TABTITLE_WIDTHFULL )
-        $w = $aImg->plotwidth ;
-        else
-        $w = $this->width ;
+    }
+
+} // Class
 
-        // Make the tab fit the width of the plot area
-        $p = array($x,                $y,
-               $x,                $y-$h+$this->corner,
-               $x + $this->corner,$y-$h,
-               $x + $w - $this->corner, $y-$h,
-               $x + $w, $y-$h+$this->corner,
-               $x + $w, $y);
+//===================================================
+// CLASS LineProperty
+// Description: Holds properties for a line
+//===================================================
+class LineProperty {
+    public $iWeight=1, $iColor='black', $iStyle='solid', $iShow=false;
 
+    function __construct($aWeight=1,$aColor='black',$aStyle='solid') {
+        $this->iWeight = $aWeight;
+        $this->iColor = $aColor;
+        $this->iStyle = $aStyle;
     }
-    if ($this->halign == 'left') {
-        $aImg->SetTextAlign('left','bottom');
-        $x += $this->posx;
-        $y -= $this->posy;
-    } elseif ($this->halign == 'center') {
-        $aImg->SetTextAlign('center','bottom');
-        $x += $w/2;
-        $y -= $this->posy;
-    } else {
-        $aImg->SetTextAlign('right','bottom');
-        $x += $w - $this->posx;
-        $y -= $this->posy;
+
+    function SetColor($aColor) {
+        $this->iColor = $aColor;
     }
 
-    $aImg->SetColor($this->fillcolor);
-    $aImg->FilledPolygon($p);
+    function SetWeight($aWeight) {
+        $this->iWeight = $aWeight;
+    }
 
-    $aImg->SetColor($this->bordercolor);
-    $aImg->Polygon($p,true);
+    function SetStyle($aStyle) {
+        $this->iStyle = $aStyle;
+    }
 
-    $aImg->SetColor($this->color);
-    $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-    $aImg->StrokeText($x,$y,$this->t,0,'center');
+    function Show($aShow=true) {
+        $this->iShow=$aShow;
     }
 
+    function Stroke($aImg,$aX1,$aY1,$aX2,$aY2) {
+        if( $this->iShow ) {
+            $aImg->PushColor($this->iColor);
+            $oldls = $aImg->line_style;
+            $oldlw = $aImg->line_weight;
+            $aImg->SetLineWeight($this->iWeight);
+            $aImg->SetLineStyle($this->iStyle);
+            $aImg->StyleLine($aX1,$aY1,$aX2,$aY2);
+            $aImg->PopColor($this->iColor);
+            $aImg->line_style = $oldls;
+            $aImg->line_weight = $oldlw;
+
+        }
+    }
 }
 
 //===================================================
-// CLASS SuperScriptText
-// Description: Format a superscript text
+// CLASS GraphTabTitle
+// Description: Draw "tab" titles on top of graphs
 //===================================================
-class SuperScriptText extends Text
-{
-    public $iSuper="";
-    public $sfont_family="",$sfont_style="",$sfont_size=8;
-    public $iSuperMargin=2,$iVertOverlap=4,$iSuperScale=0.65;
-    public $iSDir=0;
-    public $iSimple=false;
-
-    public function SuperScriptText($aTxt="",$aSuper="",$aXAbsPos=0,$aYAbsPos=0)
-    {
-    parent::Text($aTxt,$aXAbsPos,$aYAbsPos);
-    $this->iSuper = $aSuper;
-    }
-
-    public function FromReal($aVal,$aPrecision=2)
-    {
-    // Convert a floating point number to scientific notation
-    $neg=1.0;
-    if ($aVal < 0) {
-        $neg = -1.0;
-        $aVal = -$aVal;
-    }
-
-    $l = floor(log10($aVal));
-    $a = sprintf("%0.".$aPrecision."f",round($aVal / pow(10,$l),$aPrecision));
-    $a *= $neg;
-    if( $this->iSimple && ($a == 1 || $a==-1) ) $a = '';
-
-    if( $a != '' )
-        $this->t = $a.' * 10';
-    else {
-        if( $neg == 1 )
-        $this->t = '10';
-        else
-        $this->t = '-10';
-    }
-    $this->iSuper = $l;
+class GraphTabTitle extends Text{
+    private $corner = 6 , $posx = 7, $posy = 4;
+    private $fillcolor='lightyellow',$bordercolor='black';
+    private $align = 'left', $width=TABTITLE_WIDTHFIT;
+    function __construct() {
+        $this->t = '';
+        $this->font_style = FS_BOLD;
+        $this->hide = true;
+        $this->color = 'darkred';
     }
 
-    public function Set($aTxt,$aSuper="")
-    {
-    $this->t = $aTxt;
-    $this->iSuper = $aSuper;
+    function SetColor($aTxtColor,$aFillColor='lightyellow',$aBorderColor='black') {
+        $this->color = $aTxtColor;
+        $this->fillcolor = $aFillColor;
+        $this->bordercolor = $aBorderColor;
     }
 
-    public function SetSuperFont($aFontFam,$aFontStyle=FS_NORMAL,$aFontSize=8)
-    {
-    $this->sfont_family = $aFontFam;
-    $this->sfont_style = $aFontStyle;
-    $this->sfont_size = $aFontSize;
+    function SetFillColor($aFillColor) {
+        $this->fillcolor = $aFillColor;
     }
 
-    // Total width of text
-    public function GetWidth(&$aImg)
-    {
-    $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-    $w = $aImg->GetTextWidth($this->t);
-    $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
-    $w += $aImg->GetTextWidth($this->iSuper);
-    $w += $this->iSuperMargin;
+    function SetTabAlign($aAlign) {
+        $this->align = $aAlign;
+    }
 
-    return $w;
+    function SetWidth($aWidth) {
+        $this->width = $aWidth ;
     }
 
-    // Hight of font (approximate the height of the text)
-    public function GetFontHeight(&$aImg)
-    {
-    $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-    $h = $aImg->GetFontHeight();
-    $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
-    $h += $aImg->GetFontHeight();
+    function Set($t) {
+        $this->t = $t;
+        $this->hide = false;
+    }
 
-    return $h;
+    function SetCorner($aD) {
+        $this->corner = $aD ;
     }
 
-    // Hight of text
-    public function GetTextHeight(&$aImg)
-    {
-    $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-    $h = $aImg->GetTextHeight($this->t);
-    $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
-    $h += $aImg->GetTextHeight($this->iSuper);
+    function Stroke($aImg,$aDummy1=null,$aDummy2=null) {
+        if( $this->hide )
+            return;
+        $this->boxed = false;
+        $w = $this->GetWidth($aImg) + 2*$this->posx;
+        $h = $this->GetTextHeight($aImg) + 2*$this->posy;
+
+        $x = $aImg->left_margin;
+        $y = $aImg->top_margin;
+
+        if( $this->width === TABTITLE_WIDTHFIT ) {
+            if( $this->align == 'left' ) {
+                $p = array($x,                $y,
+                $x,                $y-$h+$this->corner,
+                $x + $this->corner,$y-$h,
+                $x + $w - $this->corner, $y-$h,
+                $x + $w, $y-$h+$this->corner,
+                $x + $w, $y);
+            }
+            elseif( $this->align == 'center' ) {
+                $x += round($aImg->plotwidth/2) - round($w/2);
+                $p = array($x, $y,
+                $x, $y-$h+$this->corner,
+                $x + $this->corner, $y-$h,
+                $x + $w - $this->corner, $y-$h,
+                $x + $w, $y-$h+$this->corner,
+                $x + $w, $y);
+            }
+            else {
+                $x += $aImg->plotwidth -$w;
+                $p = array($x, $y,
+                $x, $y-$h+$this->corner,
+                $x + $this->corner,$y-$h,
+                $x + $w - $this->corner, $y-$h,
+                $x + $w, $y-$h+$this->corner,
+                $x + $w, $y);
+            }
+        }
+        else {
+            if( $this->width === TABTITLE_WIDTHFULL ) {
+                $w = $aImg->plotwidth ;
+            }
+            else {
+                $w = $this->width ;
+            }
+
+            // Make the tab fit the width of the plot area
+            $p = array($x, $y,
+            $x, $y-$h+$this->corner,
+            $x + $this->corner,$y-$h,
+            $x + $w - $this->corner, $y-$h,
+            $x + $w, $y-$h+$this->corner,
+            $x + $w, $y);
+
+        }
+        if( $this->halign == 'left' ) {
+            $aImg->SetTextAlign('left','bottom');
+            $x += $this->posx;
+            $y -= $this->posy;
+        }
+        elseif( $this->halign == 'center' ) {
+            $aImg->SetTextAlign('center','bottom');
+            $x += $w/2;
+            $y -= $this->posy;
+        }
+        else {
+            $aImg->SetTextAlign('right','bottom');
+            $x += $w - $this->posx;
+            $y -= $this->posy;
+        }
 
-    return $h;
+        $aImg->SetColor($this->fillcolor);
+        $aImg->FilledPolygon($p);
+
+        $aImg->SetColor($this->bordercolor);
+        $aImg->Polygon($p,true);
+
+        $aImg->SetColor($this->color);
+        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
+        $aImg->StrokeText($x,$y,$this->t,0,'center');
     }
 
-    public function Stroke($aImg,$ax=-1,$ay=-1)
-    {
-        // To position the super script correctly we need different
-    // cases to handle the alignmewnt specified since that will
-    // determine how we can interpret the x,y coordinates
-
-    $w = parent::GetWidth($aImg);
-    $h = parent::GetTextHeight($aImg);
-    switch ($this->valign) {
-        case 'top':
-        $sy = $this->y;
-        break;
-        case 'center':
-        $sy = $this->y - $h/2;
-        break;
-        case 'bottom':
-        $sy = $this->y - $h;
-        break;
-        default:
-        JpGraphError::Raise('PANIC: Internal error in SuperScript::Stroke(). Unknown vertical alignment for text');
-        exit();
-    }
-
-    switch ($this->halign) {
-        case 'left':
-        $sx = $this->x + $w;
-        break;
-        case 'center':
-        $sx = $this->x + $w/2;
-        break;
-        case 'right':
-        $sx = $this->x;
-        break;
-        default:
-        JpGraphError::Raise('PANIC: Internal error in SuperScript::Stroke(). Unknown horizontal alignment for text');
-        exit();
-    }
-
-    $sx += $this->iSuperMargin;
-    $sy += $this->iVertOverlap;
-
-    // Should we automatically determine the font or
-    // has the user specified it explicetly?
-    if ($this->sfont_family == "") {
-        if ($this->font_family <= FF_FONT2) {
-        if ($this->font_family == FF_FONT0) {
-            $sff = FF_FONT0;
-        } elseif ($this->font_family == FF_FONT1) {
-            if( $this->font_style == FS_NORMAL )
-            $sff = FF_FONT0;
-            else
-            $sff = FF_FONT1;
-        } else {
-            $sff = FF_FONT1;
+}
+
+//===================================================
+// CLASS SuperScriptText
+// Description: Format a superscript text
+//===================================================
+class SuperScriptText extends Text {
+    private $iSuper='';
+    private $sfont_family='',$sfont_style='',$sfont_size=8;
+    private $iSuperMargin=2,$iVertOverlap=4,$iSuperScale=0.65;
+    private $iSDir=0;
+    private $iSimple=false;
+
+    function __construct($aTxt='',$aSuper='',$aXAbsPos=0,$aYAbsPos=0) {
+        parent::__construct($aTxt,$aXAbsPos,$aYAbsPos);
+        $this->iSuper = $aSuper;
+    }
+
+    function FromReal($aVal,$aPrecision=2) {
+        // Convert a floating point number to scientific notation
+        $neg=1.0;
+        if( $aVal < 0 ) {
+            $neg = -1.0;
+            $aVal = -$aVal;
         }
-        $sfs = $this->font_style;
-        $sfz = $this->font_size;
-        } else {
-        // TTF fonts
-        $sff = $this->font_family;
-        $sfs = $this->font_style;
-        $sfz = floor($this->font_size*$this->iSuperScale);
-        if( $sfz < 8 ) $sfz = 8;
-        }
-        $this->sfont_family = $sff;
-        $this->sfont_style = $sfs;
-        $this->sfont_size = $sfz;
-    } else {
-        $sff = $this->sfont_family;
-        $sfs = $this->sfont_style;
-        $sfz = $this->sfont_size;
+
+        $l = floor(log10($aVal));
+        $a = sprintf("%0.".$aPrecision."f",round($aVal / pow(10,$l),$aPrecision));
+        $a *= $neg;
+        if( $this->iSimple && ($a == 1 || $a==-1) ) $a = '';
+
+        if( $a != '' ) {
+            $this->t = $a.' * 10';
+        }
+        else {
+            if( $neg == 1 ) {
+                $this->t = '10';
+            }
+            else {
+                $this->t = '-10';
+            }
+        }
+        $this->iSuper = $l;
+    }
+
+    function Set($aTxt,$aSuper='') {
+        $this->t = $aTxt;
+        $this->iSuper = $aSuper;
+    }
+
+    function SetSuperFont($aFontFam,$aFontStyle=FS_NORMAL,$aFontSize=8) {
+        $this->sfont_family = $aFontFam;
+        $this->sfont_style = $aFontStyle;
+        $this->sfont_size = $aFontSize;
+    }
+
+    // Total width of text
+    function GetWidth($aImg) {
+        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
+        $w = $aImg->GetTextWidth($this->t);
+        $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
+        $w += $aImg->GetTextWidth($this->iSuper);
+        $w += $this->iSuperMargin;
+        return $w;
     }
 
-    parent::Stroke($aImg,$ax,$ay);
+    // Hight of font (approximate the height of the text)
+    function GetFontHeight($aImg) {
+        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
+        $h = $aImg->GetFontHeight();
+        $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
+        $h += $aImg->GetFontHeight();
+        return $h;
+    }
 
-    // For the builtin fonts we need to reduce the margins
-    // since the bounding bx reported for the builtin fonts
-    // are much larger than for the TTF fonts.
-    if ($sff <= FF_FONT2) {
-        $sx -= 2;
-        $sy += 3;
+    // Hight of text
+    function GetTextHeight($aImg) {
+        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
+        $h = $aImg->GetTextHeight($this->t);
+        $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
+        $h += $aImg->GetTextHeight($this->iSuper);
+        return $h;
     }
 
-    $aImg->SetTextAlign('left','bottom');
-    $aImg->SetFont($sff,$sfs,$sfz);
-    $aImg->PushColor($this->color);
-    $aImg->StrokeText($sx,$sy,$this->iSuper,$this->iSDir,'left');
-    $aImg->PopColor();
+    function Stroke($aImg,$ax=-1,$ay=-1) {
+
+        // To position the super script correctly we need different
+        // cases to handle the alignmewnt specified since that will
+        // determine how we can interpret the x,y coordinates
+
+        $w = parent::GetWidth($aImg);
+        $h = parent::GetTextHeight($aImg);
+        switch( $this->valign ) {
+            case 'top':
+                $sy = $this->y;
+                break;
+            case 'center':
+                $sy = $this->y - $h/2;
+                break;
+            case 'bottom':
+                $sy = $this->y - $h;
+                break;
+            default:
+                JpGraphError::RaiseL(25052);//('PANIC: Internal error in SuperScript::Stroke(). Unknown vertical alignment for text');
+                break;
+        }
+
+        switch( $this->halign ) {
+            case 'left':
+                $sx = $this->x + $w;
+                break;
+            case 'center':
+                $sx = $this->x + $w/2;
+                break;
+            case 'right':
+                $sx = $this->x;
+                break;
+            default:
+                JpGraphError::RaiseL(25053);//('PANIC: Internal error in SuperScript::Stroke(). Unknown horizontal alignment for text');
+                break;
+        }
+
+        $sx += $this->iSuperMargin;
+        $sy += $this->iVertOverlap;
+
+        // Should we automatically determine the font or
+        // has the user specified it explicetly?
+        if( $this->sfont_family == '' ) {
+            if( $this->font_family <= FF_FONT2 ) {
+                if( $this->font_family == FF_FONT0 ) {
+                    $sff = FF_FONT0;
+                }
+                elseif( $this->font_family == FF_FONT1 ) {
+                    if( $this->font_style == FS_NORMAL ) {
+                        $sff = FF_FONT0;
+                    }
+                    else {
+                        $sff = FF_FONT1;
+                    }
+                }
+                else {
+                    $sff = FF_FONT1;
+                }
+                $sfs = $this->font_style;
+                $sfz = $this->font_size;
+            }
+            else {
+                // TTF fonts
+                $sff = $this->font_family;
+                $sfs = $this->font_style;
+                $sfz = floor($this->font_size*$this->iSuperScale);
+                if( $sfz < 8 ) $sfz = 8;
+            }
+            $this->sfont_family = $sff;
+            $this->sfont_style = $sfs;
+            $this->sfont_size = $sfz;
+        }
+        else {
+            $sff = $this->sfont_family;
+            $sfs = $this->sfont_style;
+            $sfz = $this->sfont_size;
+        }
+
+        parent::Stroke($aImg,$ax,$ay);
+
+        // For the builtin fonts we need to reduce the margins
+        // since the bounding bx reported for the builtin fonts
+        // are much larger than for the TTF fonts.
+        if( $sff <= FF_FONT2 ) {
+            $sx -= 2;
+            $sy += 3;
+        }
+
+        $aImg->SetTextAlign('left','bottom');
+        $aImg->SetFont($sff,$sfs,$sfz);
+        $aImg->PushColor($this->color);
+        $aImg->StrokeText($sx,$sy,$this->iSuper,$this->iSDir,'left');
+        $aImg->PopColor();
     }
 }
 
+
 //===================================================
 // CLASS Grid
 // Description: responsible for drawing grid lines in graph
 //===================================================
-class Grid
-{
-    public $img;
-    public $scale;
-    public $grid_color='#DDDDDD',$grid_mincolor='#DDDDDD';
-    public $type="solid";
-    public $show=false, $showMinor=false,$weight=1;
-    public $fill=false,$fillcolor=array('#EFEFEF','#BBCCFF');
-//---------------
-// CONSTRUCTOR
-    public function Grid(&$aAxis)
-    {
-    $this->scale = &$aAxis->scale;
-    $this->img = &$aAxis->img;
-    }
-//---------------
-// PUBLIC METHODS
-    public function SetColor($aMajColor,$aMinColor=false)
-    {
-    $this->grid_color=$aMajColor;
-    if( $aMinColor === false )
-        $aMinColor = $aMajColor ;
-    $this->grid_mincolor = $aMinColor;
-    }
-
-    public function SetWeight($aWeight)
-    {
-    $this->weight=$aWeight;
-    }
+class Grid {
+    protected $img;
+    protected $scale;
+    protected $majorcolor='#CCCCCC',$minorcolor='#DDDDDD';
+    protected $majortype='solid',$minortype='solid';
+    protected $show=false, $showMinor=false,$majorweight=1,$minorweight=1;
+    protected $fill=false,$fillcolor=array('#EFEFEF','#BBCCFF');
 
-    // Specify if grid should be dashed, dotted or solid
-    public function SetLineStyle($aType)
-    {
-    $this->type = $aType;
+    function __construct($aAxis) {
+        $this->scale = $aAxis->scale;
+        $this->img = $aAxis->img;
     }
 
-    // Decide if both major and minor grid should be displayed
-    public function Show($aShowMajor=true,$aShowMinor=false)
-    {
-    $this->show=$aShowMajor;
-    $this->showMinor=$aShowMinor;
+    function SetColor($aMajColor,$aMinColor=false) {
+        $this->majorcolor=$aMajColor;
+        if( $aMinColor === false ) {
+            $aMinColor = $aMajColor ;
+        }
+        $this->minorcolor = $aMinColor;
     }
 
-    public function SetFill($aFlg=true,$aColor1='lightgray',$aColor2='lightblue')
-    {
-    $this->fill = $aFlg;
-    $this->fillcolor = array( $aColor1, $aColor2 );
+    function SetWeight($aMajorWeight,$aMinorWeight=1) {
+        $this->majorweight=$aMajorWeight;
+        $this->minorweight=$aMinorWeight;
     }
 
-    // Display the grid
-    public function Stroke()
-    {
-    if ($this->showMinor) {
-        $tmp = $this->grid_color;
-        $this->grid_color = $this->grid_mincolor;
-        $this->DoStroke($this->scale->ticks->ticks_pos);
-
-        $this->grid_color = $tmp;
-        $this->DoStroke($this->scale->ticks->maj_ticks_pos);
-    } else {
-        $this->DoStroke($this->scale->ticks->maj_ticks_pos);
-    }
+    // Specify if grid should be dashed, dotted or solid
+    function SetLineStyle($aMajorType,$aMinorType='solid') {
+        $this->majortype = $aMajorType;
+        $this->minortype = $aMinorType;
     }
 
-//--------------
-// Private methods
-    // Draw the grid
-    public function DoStroke(&$aTicksPos)
-    {
-    if( !$this->show )
+    function SetStyle($aMajorType,$aMinorType='solid') {
+        $this->SetLineStyle($aMajorType,$aMinorType);
+    }
 
-        return;
-    $nbrgrids = count($aTicksPos);
+    // Decide if both major and minor grid should be displayed
+    function Show($aShowMajor=true,$aShowMinor=false) {
+        $this->show=$aShowMajor;
+        $this->showMinor=$aShowMinor;
+    }
 
-    if ($this->scale->type=="y") {
-        $xl=$this->img->left_margin;
-        $xr=$this->img->width-$this->img->right_margin;
+    function SetFill($aFlg=true,$aColor1='lightgray',$aColor2='lightblue') {
+        $this->fill = $aFlg;
+        $this->fillcolor = array( $aColor1, $aColor2 );
+    }
 
-        if ($this->fill) {
-        // Draw filled areas
-        $y2 = $aTicksPos[0];
-        $i=1;
-        while ($i < $nbrgrids) {
-            $y1 = $y2;
-            $y2 = $aTicksPos[$i++];
-            $this->img->SetColor($this->fillcolor[$i & 1]);
-            $this->img->FilledRectangle($xl,$y1,$xr,$y2);
+    // Display the grid
+    function Stroke() {
+        if( $this->showMinor && !$this->scale->textscale ) {
+            $this->DoStroke($this->scale->ticks->ticks_pos,$this->minortype,$this->minorcolor,$this->minorweight);
+            $this->DoStroke($this->scale->ticks->maj_ticks_pos,$this->majortype,$this->majorcolor,$this->majorweight);
         }
+        else {
+            $this->DoStroke($this->scale->ticks->maj_ticks_pos,$this->majortype,$this->majorcolor,$this->majorweight);
         }
+    }
 
-        $this->img->SetColor($this->grid_color);
-        $this->img->SetLineWeight($this->weight);
+    //--------------
+    // Private methods
+    // Draw the grid
+    function DoStroke($aTicksPos,$aType,$aColor,$aWeight) {
+        if( !$this->show ) return;
+        $nbrgrids = count($aTicksPos);
+
+        if( $this->scale->type == 'y' ) {
+            $xl=$this->img->left_margin;
+            $xr=$this->img->width-$this->img->right_margin;
+
+            if( $this->fill ) {
+                // Draw filled areas
+                $y2 = $aTicksPos[0];
+                $i=1;
+                while( $i < $nbrgrids ) {
+                    $y1 = $y2;
+                    $y2 = $aTicksPos[$i++];
+                    $this->img->SetColor($this->fillcolor[$i & 1]);
+                    $this->img->FilledRectangle($xl,$y1,$xr,$y2);
+                }
+            }
 
-        // Draw grid lines
-        for ($i=0; $i<$nbrgrids; ++$i) {
-        $y=$aTicksPos[$i];
-        if( $this->type == "solid" )
-            $this->img->Line($xl,$y,$xr,$y);
-        elseif( $this->type == "dotted" )
-            $this->img->DashedLine($xl,$y,$xr,$y,1,6);
-        elseif( $this->type == "dashed" )
-            $this->img->DashedLine($xl,$y,$xr,$y,2,4);
-        elseif( $this->type == "longdashed" )
-            $this->img->DashedLine($xl,$y,$xr,$y,8,6);
-        }
-    } elseif ($this->scale->type=="x") {
-        $yu=$this->img->top_margin;
-        $yl=$this->img->height-$this->img->bottom_margin;
-        $limit=$this->img->width-$this->img->right_margin;
-
-        if ($this->fill) {
-        // Draw filled areas
-        $x2 = $aTicksPos[0];
-        $i=1;
-        while ($i < $nbrgrids) {
-            $x1 = $x2;
-            $x2 = min($aTicksPos[$i++],$limit) ;
-            $this->img->SetColor($this->fillcolor[$i & 1]);
-            $this->img->FilledRectangle($x1,$yu,$x2,$yl);
-        }
-        }
-
-        $this->img->SetColor($this->grid_color);
-        $this->img->SetLineWeight($this->weight);
+            $this->img->SetColor($aColor);
+            $this->img->SetLineWeight($aWeight);
+
+            // Draw grid lines
+            switch( $aType ) {
+                case 'solid':  $style = LINESTYLE_SOLID; break;
+                case 'dotted': $style = LINESTYLE_DOTTED; break;
+                case 'dashed': $style = LINESTYLE_DASHED; break;
+                case 'longdashed': $style = LINESTYLE_LONGDASH; break;
+                default:
+                    $style = LINESTYLE_SOLID; break;
+            }
 
-        // We must also test for limit since we might have
-        // an offset and the number of ticks is calculated with
-        // assumption offset==0 so we might end up drawing one
-        // to many gridlines
-        $i=0;
-        $x=$aTicksPos[$i];
-        while ( $i<count($aTicksPos) && ($x=$aTicksPos[$i]) <= $limit ) {
-        if( $this->type == "solid" )
-            $this->img->Line($x,$yl,$x,$yu);
-        elseif( $this->type == "dotted" )
-            $this->img->DashedLine($x,$yl,$x,$yu,1,6);
-        elseif( $this->type == "dashed" )
-            $this->img->DashedLine($x,$yl,$x,$yu,2,4);
-        elseif( $this->type == "longdashed" )
-            $this->img->DashedLine($x,$yl,$x,$yu,8,6);
-        ++$i;
+            for($i=0; $i < $nbrgrids; ++$i) {
+                $y=$aTicksPos[$i];
+                $this->img->StyleLine($xl,$y,$xr,$y,$style,true);
+            }
         }
-    } else {
-        JpGraphError::Raise('Internal error: Unknown grid axis ['.$this->scale->type.']');
-    }
+        elseif( $this->scale->type == 'x' ) {
+            $yu=$this->img->top_margin;
+            $yl=$this->img->height-$this->img->bottom_margin;
+            $limit=$this->img->width-$this->img->right_margin;
+
+            if( $this->fill ) {
+                // Draw filled areas
+                $x2 = $aTicksPos[0];
+                $i=1;
+                while( $i < $nbrgrids ) {
+                    $x1 = $x2;
+                    $x2 = min($aTicksPos[$i++],$limit) ;
+                    $this->img->SetColor($this->fillcolor[$i & 1]);
+                    $this->img->FilledRectangle($x1,$yu,$x2,$yl);
+                }
+            }
 
-    return true;
+            $this->img->SetColor($aColor);
+            $this->img->SetLineWeight($aWeight);
+
+            // We must also test for limit since we might have
+            // an offset and the number of ticks is calculated with
+            // assumption offset==0 so we might end up drawing one
+            // to many gridlines
+            $i=0;
+            $x=$aTicksPos[$i];
+            while( $i<count($aTicksPos) && ($x=$aTicksPos[$i]) <= $limit ) {
+                if    ( $aType == 'solid' )      $this->img->Line($x,$yl,$x,$yu);
+                elseif( $aType == 'dotted' )     $this->img->DashedLineForGrid($x,$yl,$x,$yu,1,6);
+                elseif( $aType == 'dashed' )     $this->img->DashedLineForGrid($x,$yl,$x,$yu,2,4);
+                elseif( $aType == 'longdashed' ) $this->img->DashedLineForGrid($x,$yl,$x,$yu,8,6);
+                ++$i;
+            }
+        }
+        else {
+            JpGraphError::RaiseL(25054,$this->scale->type);//('Internal error: Unknown grid axis ['.$this->scale->type.']');
+        }
+        return true;
     }
 } // Class
 
@@ -3571,593 +3662,610 @@ public function DoStroke(&$aTicksPos)
 // This was a design decision to make the code easier to
 // follow.
 //===================================================
-class Axis
-{
+class AxisPrototype {
+    public $scale=null;
+    public $img=null;
+    public $hide=false,$hide_labels=false;
+    public $title=null;
+    public $font_family=FF_DEFAULT,$font_style=FS_NORMAL,$font_size=8,$label_angle=0;
+    public $tick_step=1;
     public $pos = false;
-    public $weight=1;
-    public $color=array(0,0,0),$label_color=array(0,0,0);
-    public $img=null,$scale=null;
-    public $hide=false;
-    public $ticks_label=false, $ticks_label_colors=null;
-    public $show_first_label=true,$show_last_label=true;
-    public $label_step=1; // Used by a text axis to specify what multiple of major steps
+    public $ticks_label = array();
+
+    protected $weight=1;
+    protected $color=array(0,0,0),$label_color=array(0,0,0);
+    protected $ticks_label_colors=null;
+    protected $show_first_label=true,$show_last_label=true;
+    protected $label_step=1; // Used by a text axis to specify what multiple of major steps
     // should be labeled.
-    public $tick_step=1;
-    public $labelPos=0;   // Which side of the axis should the labels be?
-    public $title=null,$title_adjust,$title_margin,$title_side=SIDE_LEFT;
-    public $font_family=FF_FONT1,$font_style=FS_NORMAL,$font_size=12,$label_angle=0;
-    public $tick_label_margin=5;
-    public $label_halign = '',$label_valign = '', $label_para_align='left';
-    public $hide_line=false,$hide_labels=false;
-    //var $hide_zero_label=false;
-
-//---------------
-// CONSTRUCTOR
-    public function Axis(&$img,&$aScale,$color=array(0,0,0))
-    {
-    $this->img = &$img;
-    $this->scale = &$aScale;
-    $this->color = $color;
-    $this->title=new Text("");
-
-    if ($aScale->type=="y") {
-        $this->title_margin = 25;
-        $this->title_adjust="middle";
-        $this->title->SetOrientation(90);
-        $this->tick_label_margin=7;
-        $this->labelPos=SIDE_LEFT;
-        //$this->SetLabelFormat('%.1f');
-    } else {
-        $this->title_margin = 5;
-        $this->title_adjust="high";
-        $this->title->SetOrientation(0);
-        $this->tick_label_margin=3;
-        $this->labelPos=SIDE_DOWN;
-        //$this->SetLabelFormat('%.0f');
-    }
+    protected $labelPos=0;   // Which side of the axis should the labels be?
+    protected $title_adjust,$title_margin,$title_side=SIDE_LEFT;
+    protected $tick_label_margin=5;
+    protected $label_halign = '',$label_valign = '', $label_para_align='left';
+    protected $hide_line=false;
+    protected $iDeltaAbsPos=0;
+
+    function __construct($img,$aScale,$color = array(0,0,0)) {
+        $this->img = $img;
+        $this->scale = $aScale;
+        $this->color = $color;
+        $this->title=new Text('');
+
+        if( $aScale->type == 'y' ) {
+            $this->title_margin = 25;
+            $this->title_adjust = 'middle';
+            $this->title->SetOrientation(90);
+            $this->tick_label_margin=7;
+            $this->labelPos=SIDE_LEFT;
+        }
+        else {
+            $this->title_margin = 5;
+            $this->title_adjust = 'high';
+            $this->title->SetOrientation(0);
+            $this->tick_label_margin=5;
+            $this->labelPos=SIDE_DOWN;
+            $this->title_side=SIDE_DOWN;
+        }
     }
-//---------------
-// PUBLIC METHODS
 
-    public function SetLabelFormat($aFormStr)
-    {
-    $this->scale->ticks->SetLabelFormat($aFormStr);
+    function SetLabelFormat($aFormStr) {
+        $this->scale->ticks->SetLabelFormat($aFormStr);
     }
 
-    public function SetLabelFormatString($aFormStr)
-    {
-    $this->scale->ticks->SetLabelFormat($aFormStr);
+    function SetLabelFormatString($aFormStr,$aDate=false) {
+        $this->scale->ticks->SetLabelFormat($aFormStr,$aDate);
     }
 
-    public function SetLabelFormatCallback($aFuncName)
-    {
-    $this->scale->ticks->SetFormatCallback($aFuncName);
+    function SetLabelFormatCallback($aFuncName) {
+        $this->scale->ticks->SetFormatCallback($aFuncName);
     }
 
-    public function SetLabelAlign($aHAlign,$aVAlign="top",$aParagraphAlign='left')
-    {
-    $this->label_halign = $aHAlign;
-    $this->label_valign = $aVAlign;
-    $this->label_para_align = $aParagraphAlign;
+    function SetLabelAlign($aHAlign,$aVAlign='top',$aParagraphAlign='left') {
+        $this->label_halign = $aHAlign;
+        $this->label_valign = $aVAlign;
+        $this->label_para_align = $aParagraphAlign;
     }
 
     // Don't display the first label
-    public function HideFirstTickLabel($aShow=false)
-    {
-    $this->show_first_label=$aShow;
+    function HideFirstTickLabel($aShow=false) {
+        $this->show_first_label=$aShow;
+    }
+
+    function HideLastTickLabel($aShow=false) {
+        $this->show_last_label=$aShow;
+    }
+
+    // Manually specify the major and (optional) minor tick position and labels
+    function SetTickPositions($aMajPos,$aMinPos=NULL,$aLabels=NULL) {
+        $this->scale->ticks->SetTickPositions($aMajPos,$aMinPos,$aLabels);
     }
 
-    public function HideLastTickLabel($aShow=false)
-    {
-    $this->show_last_label=$aShow;
+    // Manually specify major tick positions and optional labels
+    function SetMajTickPositions($aMajPos,$aLabels=NULL) {
+        $this->scale->ticks->SetTickPositions($aMajPos,NULL,$aLabels);
     }
 
-    public function HideTicks($aHideMinor=true,$aHideMajor=true)
-    {
-    $this->scale->ticks->SupressMinorTickMarks($aHideMinor);
-    $this->scale->ticks->SupressTickMarks($aHideMajor);
+    // Hide minor or major tick marks
+    function HideTicks($aHideMinor=true,$aHideMajor=true) {
+        $this->scale->ticks->SupressMinorTickMarks($aHideMinor);
+        $this->scale->ticks->SupressTickMarks($aHideMajor);
     }
 
     // Hide zero label
-    public function HideZeroLabel($aFlag=true)
-    {
-    $this->scale->ticks->SupressZeroLabel();
-    //$this->hide_zero_label = $aFlag;
+    function HideZeroLabel($aFlag=true) {
+        $this->scale->ticks->SupressZeroLabel();
     }
 
-    public function HideFirstLastLabel()
-    {
-    // The two first calls to ticks method will supress
-    // automatically generated scale values. However, that
-    // will not affect manually specified value, e.g text-scales.
-    // therefor we also make a kludge here to supress manually
-    // specified scale labels.
-    $this->scale->ticks->SupressLast();
-    $this->scale->ticks->SupressFirst();
-    $this->show_first_label	= false;
-    $this->show_last_label = false;
+    function HideFirstLastLabel() {
+        // The two first calls to ticks method will supress
+        // automatically generated scale values. However, that
+        // will not affect manually specified value, e.g text-scales.
+        // therefor we also make a kludge here to supress manually
+        // specified scale labels.
+        $this->scale->ticks->SupressLast();
+        $this->scale->ticks->SupressFirst();
+        $this->show_first_label = false;
+        $this->show_last_label = false;
     }
 
     // Hide the axis
-    public function Hide($aHide=true)
-    {
-    $this->hide=$aHide;
+    function Hide($aHide=true) {
+        $this->hide=$aHide;
     }
 
     // Hide the actual axis-line, but still print the labels
-    public function HideLine($aHide=true)
-    {
-    $this->hide_line = $aHide;
+    function HideLine($aHide=true) {
+        $this->hide_line = $aHide;
     }
 
-    public function HideLabels($aHide=true)
-    {
-    $this->hide_labels = $aHide;
+    function HideLabels($aHide=true) {
+        $this->hide_labels = $aHide;
     }
 
     // Weight of axis
-    public function SetWeight($aWeight)
-    {
-    $this->weight = $aWeight;
+    function SetWeight($aWeight) {
+        $this->weight = $aWeight;
     }
 
     // Axis color
-    public function SetColor($aColor,$aLabelColor=false)
-    {
-    $this->color = $aColor;
-    if( !$aLabelColor ) $this->label_color = $aColor;
-    else $this->label_color = $aLabelColor;
+    function SetColor($aColor,$aLabelColor=false) {
+        $this->color = $aColor;
+        if( !$aLabelColor ) $this->label_color = $aColor;
+        else $this->label_color = $aLabelColor;
     }
 
     // Title on axis
-    public function SetTitle($aTitle,$aAdjustAlign="high")
-    {
-    $this->title->Set($aTitle);
-    $this->title_adjust=$aAdjustAlign;
+    function SetTitle($aTitle,$aAdjustAlign='high') {
+        $this->title->Set($aTitle);
+        $this->title_adjust=$aAdjustAlign;
     }
 
     // Specify distance from the axis
-    public function SetTitleMargin($aMargin)
-    {
-    $this->title_margin=$aMargin;
+    function SetTitleMargin($aMargin) {
+        $this->title_margin=$aMargin;
     }
 
     // Which side of the axis should the axis title be?
-    public function SetTitleSide($aSideOfAxis)
-    {
-    $this->title_side = $aSideOfAxis;
+    function SetTitleSide($aSideOfAxis) {
+        $this->title_side = $aSideOfAxis;
     }
 
-    // Utility function to set the direction for tick marks
-    public function SetTickDirection($aDir)
-    {
-        // Will be deprecated from 1.7
-        if( ERR_DEPRECATED )
-        JpGraphError::Raise('Axis::SetTickDirection() is deprecated. Use Axis::SetTickSide() instead');
-    $this->scale->ticks->SetSide($aDir);
+    function SetTickSide($aDir) {
+        $this->scale->ticks->SetSide($aDir);
     }
 
-    public function SetTickSide($aDir)
-    {
-    $this->scale->ticks->SetSide($aDir);
+    function SetTickSize($aMajSize,$aMinSize=3) {
+        $this->scale->ticks->SetSize($aMajSize,$aMinSize=3);
     }
 
     // Specify text labels for the ticks. One label for each data point
-    public function SetTickLabels($aLabelArray,$aLabelColorArray=null)
-    {
-    $this->ticks_label = $aLabelArray;
-    $this->ticks_label_colors = $aLabelColorArray;
-    }
-
-    // How far from the axis should the labels be drawn
-    public function SetTickLabelMargin($aMargin)
-    {
-    if( ERR_DEPRECATED )
-        JpGraphError::Raise('SetTickLabelMargin() is deprecated. Use Axis::SetLabelMargin() instead.');
-          $this->tick_label_margin=$aMargin;
-    }
-
-    public function SetLabelMargin($aMargin)
-    {
-    $this->tick_label_margin=$aMargin;
+    function SetTickLabels($aLabelArray,$aLabelColorArray=null) {
+        $this->ticks_label = $aLabelArray;
+        $this->ticks_label_colors = $aLabelColorArray;
     }
 
-    // Specify that every $step of the ticks should be displayed starting
-    // at $start
-    // DEPRECATED FUNCTION: USE SetTextTickInterval() INSTEAD
-    public function SetTextTicks($step,$start=0)
-    {
-    JpGraphError::Raise(" SetTextTicks() is deprecated. Use SetTextTickInterval() instead.");
+    function SetLabelMargin($aMargin) {
+        $this->tick_label_margin=$aMargin;
     }
 
     // Specify that every $step of the ticks should be displayed starting
     // at $start
-    public function SetTextTickInterval($aStep,$aStart=0)
-    {
-    $this->scale->ticks->SetTextLabelStart($aStart);
-    $this->tick_step=$aStep;
+    function SetTextTickInterval($aStep,$aStart=0) {
+        $this->scale->ticks->SetTextLabelStart($aStart);
+        $this->tick_step=$aStep;
     }
 
     // Specify that every $step tick mark should have a label
     // should be displayed starting
-    public function SetTextLabelInterval($aStep)
-    {
-    if( $aStep < 1 )
-        JpGraphError::Raise(" Text label interval must be specified >= 1.");
-    $this->label_step=$aStep;
-    }
-
-    // Which side of the axis should the labels be on?
-    public function SetLabelPos($aSidePos)
-    {
-        // This will be deprecated from 1.7
-    if( ERR_DEPRECATED )
-        JpGraphError::Raise('SetLabelPos() is deprecated. Use Axis::SetLabelSide() instead.');
-    $this->labelPos=$aSidePos;
+    function SetTextLabelInterval($aStep) {
+        if( $aStep < 1 ) {
+            JpGraphError::RaiseL(25058);//(" Text label interval must be specified >= 1.");
+        }
+        $this->label_step=$aStep;
     }
 
-    public function SetLabelSide($aSidePos)
-    {
-    $this->labelPos=$aSidePos;
+    function SetLabelSide($aSidePos) {
+        $this->labelPos=$aSidePos;
     }
 
     // Set the font
-    public function SetFont($aFamily,$aStyle=FS_NORMAL,$aSize=10)
-    {
-    $this->font_family = $aFamily;
-    $this->font_style = $aStyle;
-    $this->font_size = $aSize;
+    function SetFont($aFamily,$aStyle=FS_NORMAL,$aSize=10) {
+        $this->font_family = $aFamily;
+        $this->font_style = $aStyle;
+        $this->font_size = $aSize;
     }
 
     // Position for axis line on the "other" scale
-    public function SetPos($aPosOnOtherScale)
-    {
-    $this->pos=$aPosOnOtherScale;
+    function SetPos($aPosOnOtherScale) {
+        $this->pos=$aPosOnOtherScale;
+    }
+
+    // Set the position of the axis to be X-pixels delta to the right
+    // of the max X-position (used to position the multiple Y-axis)
+    function SetPosAbsDelta($aDelta) {
+        $this->iDeltaAbsPos=$aDelta;
     }
 
     // Specify the angle for the tick labels
-    public function SetLabelAngle($aAngle)
-    {
-    $this->label_angle = $aAngle;
+    function SetLabelAngle($aAngle) {
+        $this->label_angle = $aAngle;
+    }
+
+} // Class
+
+
+//===================================================
+// CLASS Axis
+// Description: Defines X and Y axis. Notes that at the
+// moment the code is not really good since the axis on
+// several occasion must know wheter it's an X or Y axis.
+// This was a design decision to make the code easier to
+// follow.
+//===================================================
+class Axis extends AxisPrototype {
+
+    function __construct($img,$aScale,$color='black') {
+        parent::__construct($img,$aScale,$color);
     }
 
     // Stroke the axis.
-    public function Stroke($aOtherAxisScale)
-    {
-    if( $this->hide ) return;
-    if ( is_numeric($this->pos) ) {
-        $pos=$aOtherAxisScale->Translate($this->pos);
-    } else {	// Default to minimum of other scale if pos not set
-        if ( ($aOtherAxisScale->GetMinVal() >= 0 && $this->pos==false) || $this->pos=="min" ) {
-        $pos = $aOtherAxisScale->scale_abs[0];
-        } elseif ($this->pos == "max") {
-        $pos = $aOtherAxisScale->scale_abs[1];
-        } else { // If negative set x-axis at 0
-        $this->pos=0;
-        $pos=$aOtherAxisScale->Translate(0);
-        }
-    }
-    $this->img->SetLineWeight($this->weight);
-    $this->img->SetColor($this->color);
-    $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
-    if ($this->scale->type == "x") {
-        if( !$this->hide_line )
-        $this->img->FilledRectangle($this->img->left_margin,$pos,
-                        $this->img->width-$this->img->right_margin,$pos+$this->weight-1);
-        $y=$pos+$this->img->GetFontHeight()+$this->title_margin+$this->title->margin;
-        if( $this->title_adjust=="high" )
-        $this->title->Pos($this->img->width-$this->img->right_margin,$y,"right","top");
-        elseif( $this->title_adjust=="middle" || $this->title_adjust=="center" )
-        $this->title->Pos(($this->img->width-$this->img->left_margin-$this->img->right_margin)/2+$this->img->left_margin,$y,"center","top");
-        elseif($this->title_adjust=="low")
-        $this->title->Pos($this->img->left_margin,$y,"left","top");
-        else {
-        JpGraphError::Raise('Unknown alignment specified for X-axis title. ('.$this->title_adjust.')');
-        }
-    } elseif ($this->scale->type == "y") {
-        // Add line weight to the height of the axis since
-        // the x-axis could have a width>1 and we want the axis to fit nicely together.
-        if( !$this->hide_line )
-        $this->img->FilledRectangle($pos-$this->weight+1,$this->img->top_margin,
-                        $pos,$this->img->height-$this->img->bottom_margin+$this->weight-1);
-        $x=$pos ;
-        if ($this->title_side == SIDE_LEFT) {
-        $x -= $this->title_margin;
-        $x -= $this->title->margin;
-        $halign="right";
-        } else {
-        $x += $this->title_margin;
-        $x += $this->title->margin;
-        $halign="left";
-        }
-        // If the user has manually specified an hor. align
-        // then we override the automatic settings with this
-        // specifed setting. Since default is 'left' we compare
-        // with that. (This means a manually set 'left' align
-        // will have no effect.)
-        if( $this->title->halign != 'left' )
-        $halign = $this->title->halign;
-        if( $this->title_adjust=="high" )
-        $this->title->Pos($x,$this->img->top_margin,$halign,"top");
-        elseif($this->title_adjust=="middle" || $this->title_adjust=="center")
-        $this->title->Pos($x,($this->img->height-$this->img->top_margin-$this->img->bottom_margin)/2+$this->img->top_margin,$halign,"center");
-        elseif($this->title_adjust=="low")
-        $this->title->Pos($x,$this->img->height-$this->img->bottom_margin,$halign,"bottom");
-        else
-        JpGraphError::Raise('Unknown alignment specified for Y-axis title. ('.$this->title_adjust.')');
-
-    }
-    $this->scale->ticks->Stroke($this->img,$this->scale,$pos);
-    if (!$this->hide_labels) {
-        $this->StrokeLabels($pos);
-    }
-    $this->title->Stroke($this->img);
-    }
-
-//---------------
-// PRIVATE METHODS
-    // Draw all the tick labels on major tick marks
-    public function StrokeLabels($aPos,$aMinor=false,$aAbsLabel=false)
-    {
-    $this->img->SetColor($this->label_color);
-    $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
-    $yoff=$this->img->GetFontHeight()/2;
-
-    // Only draw labels at major tick marks
-    $nbr = count($this->scale->ticks->maj_ticks_label);
-
-    // We have the option to not-display the very first mark
-    // (Usefull when the first label might interfere with another
-    // axis.)
-    $i = $this->show_first_label ? 0 : 1 ;
-    if( !$this->show_last_label ) --$nbr;
-    // Now run through all labels making sure we don't overshoot the end
-    // of the scale.
-    $ncolor=0;
-    if( isset($this->ticks_label_colors) )
-        $ncolor=count($this->ticks_label_colors);
-
-    while ($i<$nbr) {
-        // $tpos holds the absolute text position for the label
-        $tpos=$this->scale->ticks->maj_ticklabels_pos[$i];
-
-        // Note. the $limit is only used for the x axis since we
-        // might otherwise overshoot if the scale has been centered
-        // This is due to us "loosing" the last tick mark if we center.
-        if ($this->scale->type=="x" && $tpos > $this->img->width-$this->img->right_margin+1) {
+    function Stroke($aOtherAxisScale,$aStrokeLabels=true) {
+        if( $this->hide )
             return;
+        if( is_numeric($this->pos) ) {
+            $pos=$aOtherAxisScale->Translate($this->pos);
+        }
+        else { // Default to minimum of other scale if pos not set
+            if( ($aOtherAxisScale->GetMinVal() >= 0 && $this->pos==false) || $this->pos == 'min' ) {
+                $pos = $aOtherAxisScale->scale_abs[0];
+            }
+            elseif($this->pos == "max") {
+                $pos = $aOtherAxisScale->scale_abs[1];
+            }
+            else { // If negative set x-axis at 0
+                $this->pos=0;
+                $pos=$aOtherAxisScale->Translate(0);
+            }
         }
-        // we only draw every $label_step label
-        if ( ($i % $this->label_step)==0 ) {
 
-        // Set specific label color if specified
-        if( $ncolor > 0 )
-            $this->img->SetColor($this->ticks_label_colors[$i % $ncolor]);
+        $pos += $this->iDeltaAbsPos;
+        $this->img->SetLineWeight($this->weight);
+        $this->img->SetColor($this->color);
+        $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
+
+        if( $this->scale->type == "x" ) {
+            if( !$this->hide_line ) {
+                // Stroke X-axis
+                $this->img->FilledRectangle(
+                    $this->img->left_margin,
+                    $pos,
+                    $this->img->width - $this->img->right_margin,
+                    $pos + $this->weight-1
+                );
+            }
+            if( $this->title_side == SIDE_DOWN ) {
+                $y = $pos + $this->img->GetFontHeight() + $this->title_margin + $this->title->margin;
+                $yalign = 'top';
+            }
+            else {
+                $y = $pos - $this->img->GetFontHeight() - $this->title_margin - $this->title->margin;
+                $yalign = 'bottom';
+            }
 
-        // If the label has been specified use that and in other case
-        // just label the mark with the actual scale value
-        $m=$this->scale->ticks->GetMajor();
+            if( $this->title_adjust=='high' ) {
+                $this->title->SetPos($this->img->width-$this->img->right_margin,$y,'right',$yalign);
+            }
+            elseif( $this->title_adjust=='middle' || $this->title_adjust=='center' ) {
+                $this->title->SetPos(($this->img->width-$this->img->left_margin-$this->img->right_margin)/2+$this->img->left_margin,$y,'center',$yalign);
+            }
+            elseif($this->title_adjust=='low') {
+                $this->title->SetPos($this->img->left_margin,$y,'left',$yalign);
+            }
+            else {
+                JpGraphError::RaiseL(25060,$this->title_adjust);//('Unknown alignment specified for X-axis title. ('.$this->title_adjust.')');
+            }
+        }
+        elseif( $this->scale->type == "y" ) {
+            // Add line weight to the height of the axis since
+            // the x-axis could have a width>1 and we want the axis to fit nicely together.
+            if( !$this->hide_line ) {
+                // Stroke Y-axis
+                $this->img->FilledRectangle(
+                    $pos - $this->weight + 1, 
+                    $this->img->top_margin,
+                    $pos,
+                    $this->img->height - $this->img->bottom_margin + $this->weight - 1
+                );
+            }
 
-        // ticks_label has an entry for each data point and is the array
-        // that holds the labels set by the user. If the user hasn't
-        // specified any values we use whats in the automatically asigned
-        // labels in the maj_ticks_label
-        if( isset($this->ticks_label[$i*$m]) )
-            $label=$this->ticks_label[$i*$m];
-        else {
-            if( $aAbsLabel )
-            $label=abs($this->scale->ticks->maj_ticks_label[$i]);
-            else
-            $label=$this->scale->ticks->maj_ticks_label[$i];
-            if ($this->scale->textscale && $this->scale->ticks->label_formfunc == '') {
-            ++$label;
-            }
-        }
-
-        //if ($this->hide_zero_label && $label==0.0) {
-        //	++$i;
-        //	continue;
-        //}
-
-        if ($this->scale->type == "x") {
-            if ($this->labelPos == SIDE_DOWN) {
-            if ($this->label_angle==0 || $this->label_angle==90) {
-                if( $this->label_halign=='' && $this->label_valign=='')
-                $this->img->SetTextAlign('center','top');
-                else
-                    $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-
-            } else {
-                if( $this->label_halign=='' && $this->label_valign=='')
-                $this->img->SetTextAlign("right","top");
-                else
-                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-            }
-
-            $this->img->StrokeText($tpos,$aPos+$this->tick_label_margin,$label,
-                           $this->label_angle,$this->label_para_align);
-            } else {
-            if ($this->label_angle==0 || $this->label_angle==90) {
-                if( $this->label_halign=='' && $this->label_valign=='')
-                $this->img->SetTextAlign("center","bottom");
-                else
-                    $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-            } else {
-                if( $this->label_halign=='' && $this->label_valign=='')
-                $this->img->SetTextAlign("right","bottom");
-                else
-                    $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-            }
-            $this->img->StrokeText($tpos,$aPos-$this->tick_label_margin,$label,
-                           $this->label_angle,$this->label_para_align);
+            $x=$pos ;
+            if( $this->title_side == SIDE_LEFT ) {
+                $x -= $this->title_margin;
+                $x -= $this->title->margin;
+                $halign = 'right';
             }
-        } else {
-            // scale->type == "y"
-            //if( $this->label_angle!=0 )
-            //JpGraphError::Raise(" Labels at an angle are not supported on Y-axis");
-            if ($this->labelPos == SIDE_LEFT) { // To the left of y-axis
-            if( $this->label_halign=='' && $this->label_valign=='')
-                $this->img->SetTextAlign("right","center");
-            else
-                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-            $this->img->StrokeText($aPos-$this->tick_label_margin,$tpos,$label,$this->label_angle,$this->label_para_align);
-            } else { // To the right of the y-axis
-            if( $this->label_halign=='' && $this->label_valign=='')
-                $this->img->SetTextAlign("left","center");
-            else
-                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-            $this->img->StrokeText($aPos+$this->tick_label_margin,$tpos,$label,$this->label_angle,$this->label_para_align);
+            else {
+                $x += $this->title_margin;
+                $x += $this->title->margin;
+                $halign = 'left';
+            }
+            // If the user has manually specified an hor. align
+            // then we override the automatic settings with this
+            // specifed setting. Since default is 'left' we compare
+            // with that. (This means a manually set 'left' align
+            // will have no effect.)
+            if( $this->title->halign != 'left' ) {
+                $halign = $this->title->halign;
+            }
+            if( $this->title_adjust == 'high' ) {
+                $this->title->SetPos($x,$this->img->top_margin,$halign,'top');
+            }
+            elseif($this->title_adjust=='middle' || $this->title_adjust=='center') {
+                $this->title->SetPos($x,($this->img->height-$this->img->top_margin-$this->img->bottom_margin)/2+$this->img->top_margin,$halign,"center");
+            }
+            elseif($this->title_adjust=='low') {
+                $this->title->SetPos($x,$this->img->height-$this->img->bottom_margin,$halign,'bottom');
+            }
+            else {
+                JpGraphError::RaiseL(25061,$this->title_adjust);//('Unknown alignment specified for Y-axis title. ('.$this->title_adjust.')');
             }
         }
+        $this->scale->ticks->Stroke($this->img,$this->scale,$pos);
+        if( $aStrokeLabels ) {
+            if( !$this->hide_labels ) {
+                $this->StrokeLabels($pos);
+            }
+            $this->title->Stroke($this->img);
         }
-        ++$i;
     }
+
+    //---------------
+    // PRIVATE METHODS
+    // Draw all the tick labels on major tick marks
+    function StrokeLabels($aPos,$aMinor=false,$aAbsLabel=false) {
+
+        if( is_array($this->label_color) && count($this->label_color) > 3 ) {
+            $this->ticks_label_colors = $this->label_color;
+            $this->img->SetColor($this->label_color[0]);
+        }
+        else {
+            $this->img->SetColor($this->label_color);
+        }
+        $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
+        $yoff=$this->img->GetFontHeight()/2;
+
+        // Only draw labels at major tick marks
+        $nbr = count($this->scale->ticks->maj_ticks_label);
+
+        // We have the option to not-display the very first mark
+        // (Usefull when the first label might interfere with another
+        // axis.)
+        $i = $this->show_first_label ? 0 : 1 ;
+        if( !$this->show_last_label ) {
+            --$nbr;
+        }
+        // Now run through all labels making sure we don't overshoot the end
+        // of the scale.
+        $ncolor=0;
+        if( isset($this->ticks_label_colors) ) {
+            $ncolor=count($this->ticks_label_colors);
+        }
+        while( $i < $nbr ) {
+            // $tpos holds the absolute text position for the label
+            $tpos=$this->scale->ticks->maj_ticklabels_pos[$i];
+
+            // Note. the $limit is only used for the x axis since we
+            // might otherwise overshoot if the scale has been centered
+            // This is due to us "loosing" the last tick mark if we center.
+            if( $this->scale->type == 'x' && $tpos > $this->img->width-$this->img->right_margin+1 ) {
+                return;
+            }
+            // we only draw every $label_step label
+            if( ($i % $this->label_step)==0 ) {
+
+                // Set specific label color if specified
+                if( $ncolor > 0 ) {
+                    $this->img->SetColor($this->ticks_label_colors[$i % $ncolor]);
+                }
+
+                // If the label has been specified use that and in other case
+                // just label the mark with the actual scale value
+                $m=$this->scale->ticks->GetMajor();
+
+                // ticks_label has an entry for each data point and is the array
+                // that holds the labels set by the user. If the user hasn't
+                // specified any values we use whats in the automatically asigned
+                // labels in the maj_ticks_label
+                if( isset($this->ticks_label[$i*$m]) ) {
+                    $label=$this->ticks_label[$i*$m];
+                }
+                else {
+                    if( $aAbsLabel ) {
+                        $label=abs($this->scale->ticks->maj_ticks_label[$i]);
+                    }
+                    else {
+                        $label=$this->scale->ticks->maj_ticks_label[$i];
+                    }
+
+                    // We number the scale from 1 and not from 0 so increase by one
+                    if( $this->scale->textscale && 
+                        $this->scale->ticks->label_formfunc == '' &&
+                        ! $this->scale->ticks->HaveManualLabels() ) {
+
+                        ++$label;
+                        
+                    }
+                }
+
+                if( $this->scale->type == "x" ) {
+                    if( $this->labelPos == SIDE_DOWN ) {
+                        if( $this->label_angle==0 || $this->label_angle==90 ) {
+                            if( $this->label_halign=='' && $this->label_valign=='') {
+                                $this->img->SetTextAlign('center','top');
+                            }
+                            else {
+                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
+                            }
+
+                        }
+                        else {
+                            if( $this->label_halign=='' && $this->label_valign=='') {
+                                $this->img->SetTextAlign("right","top");
+                            }
+                            else {
+                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
+                            }
+                        }
+                        $this->img->StrokeText($tpos,$aPos+$this->tick_label_margin,$label,
+                        $this->label_angle,$this->label_para_align);
+                    }
+                    else {
+                        if( $this->label_angle==0 || $this->label_angle==90 ) {
+                            if( $this->label_halign=='' && $this->label_valign=='') {
+                                $this->img->SetTextAlign("center","bottom");
+                            }
+                            else {
+                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
+                            }
+                        }
+                        else {
+                            if( $this->label_halign=='' && $this->label_valign=='') {
+                                $this->img->SetTextAlign("right","bottom");
+                            }
+                            else {
+                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
+                            }
+                        }
+                        $this->img->StrokeText($tpos,$aPos-$this->tick_label_margin-1,$label,
+                        $this->label_angle,$this->label_para_align);
+                    }
+                }
+                else {
+                    // scale->type == "y"
+                    //if( $this->label_angle!=0 )
+                    //JpGraphError::Raise(" Labels at an angle are not supported on Y-axis");
+                    if( $this->labelPos == SIDE_LEFT ) { // To the left of y-axis
+                        if( $this->label_halign=='' && $this->label_valign=='') {
+                            $this->img->SetTextAlign("right","center");
+                        }
+                        else {
+                            $this->img->SetTextAlign($this->label_halign,$this->label_valign);
+                        }
+                        $this->img->StrokeText($aPos-$this->tick_label_margin,$tpos,$label,$this->label_angle,$this->label_para_align);
+                    }
+                    else { // To the right of the y-axis
+                        if( $this->label_halign=='' && $this->label_valign=='') {
+                            $this->img->SetTextAlign("left","center");
+                        }
+                        else {
+                            $this->img->SetTextAlign($this->label_halign,$this->label_valign);
+                        }
+                        $this->img->StrokeText($aPos+$this->tick_label_margin,$tpos,$label,$this->label_angle,$this->label_para_align);
+                    }
+                }
+            }
+            ++$i;
+        }
     }
 
-} // Class
+}
+
 
 //===================================================
 // CLASS Ticks
 // Description: Abstract base class for drawing linear and logarithmic
 // tick marks on axis
 //===================================================
-class Ticks
-{
-    public $minor_abs_size=3, $major_abs_size=5;
-    public $direction=1; // Should ticks be in(=1) the plot area or outside (=-1)?
-    public $scale;
-    public $is_set=false;
-    public $precision;
-    public $supress_zerolabel=false,$supress_first=false;
-    public $supress_last=false,$supress_tickmarks=false,$supress_minor_tickmarks=false;
-    public $mincolor="",$majcolor="";
-    public $weight=1;
+class Ticks {
     public $label_formatstr='';   // C-style format string to use for labels
     public $label_formfunc='';
+    public $label_dateformatstr='';
+    public $direction=1; // Should ticks be in(=1) the plot area or outside (=-1)
+    public $supress_last=false,$supress_tickmarks=false,$supress_minor_tickmarks=false;
+    public $maj_ticks_pos = array(), $maj_ticklabels_pos = array(),
+           $ticks_pos = array(), $maj_ticks_label = array();
+    public $precision;
+
+    protected $minor_abs_size=3, $major_abs_size=5;
+    protected $scale;
+    protected $is_set=false;
+    protected $supress_zerolabel=false,$supress_first=false;
+    protected $mincolor='',$majcolor='';
+    protected $weight=1;
+    protected $label_usedateformat=FALSE;
 
-//---------------
-// CONSTRUCTOR
-    public function Ticks(&$aScale)
-    {
-    $this->scale=&$aScale;
-    $this->precision = -1;
+    function __construct($aScale) {
+        $this->scale=$aScale;
+        $this->precision = -1;
     }
 
-//---------------
-// PUBLIC METHODS
     // Set format string for automatic labels
-    public function SetLabelFormat($aFormatString)
-    {
-    $this->label_formatstr=$aFormatString;
+    function SetLabelFormat($aFormatString,$aDate=FALSE) {
+        $this->label_formatstr=$aFormatString;
+        $this->label_usedateformat=$aDate;
     }
 
-    public function SetFormatCallback($aCallbackFuncName)
-    {
-    $this->label_formfunc = $aCallbackFuncName;
+    function SetLabelDateFormat($aFormatString) {
+        $this->label_dateformatstr=$aFormatString;
+    }
+
+    function SetFormatCallback($aCallbackFuncName) {
+        $this->label_formfunc = $aCallbackFuncName;
     }
 
     // Don't display the first zero label
-    public function SupressZeroLabel($aFlag=true)
-    {
-    $this->supress_zerolabel=$aFlag;
+    function SupressZeroLabel($aFlag=true) {
+        $this->supress_zerolabel=$aFlag;
     }
 
     // Don't display minor tick marks
-    public function SupressMinorTickMarks($aHide=true)
-    {
-    $this->supress_minor_tickmarks=$aHide;
+    function SupressMinorTickMarks($aHide=true) {
+        $this->supress_minor_tickmarks=$aHide;
     }
 
     // Don't display major tick marks
-    public function SupressTickMarks($aHide=true)
-    {
-    $this->supress_tickmarks=$aHide;
+    function SupressTickMarks($aHide=true) {
+        $this->supress_tickmarks=$aHide;
     }
 
     // Hide the first tick mark
-    public function SupressFirst($aHide=true)
-    {
-    $this->supress_first=$aHide;
+    function SupressFirst($aHide=true) {
+        $this->supress_first=$aHide;
     }
 
     // Hide the last tick mark
-    public function SupressLast($aHide=true)
-    {
-    $this->supress_last=$aHide;
+    function SupressLast($aHide=true) {
+        $this->supress_last=$aHide;
     }
 
     // Size (in pixels) of minor tick marks
-    public function GetMinTickAbsSize()
-    {
-    return $this->minor_abs_size;
+    function GetMinTickAbsSize() {
+        return $this->minor_abs_size;
     }
 
     // Size (in pixels) of major tick marks
-    public function GetMajTickAbsSize()
-    {
-    return $this->major_abs_size;
+    function GetMajTickAbsSize() {
+        return $this->major_abs_size;
     }
 
-    public function SetSize($aMajSize,$aMinSize=3)
-    {
-    $this->major_abs_size = $aMajSize;
-    $this->minor_abs_size = $aMinSize;
+    function SetSize($aMajSize,$aMinSize=3) {
+        $this->major_abs_size = $aMajSize;
+        $this->minor_abs_size = $aMinSize;
     }
 
     // Have the ticks been specified
-    public function IsSpecified()
-    {
-    return $this->is_set;
-    }
-
-    // Set the distance between major and minor tick marks
-    public function Set($aMaj,$aMin)
-    {
-    // "Virtual method"
-    // Should be implemented by the concrete subclass
-    // if any action is wanted.
+    function IsSpecified() {
+        return $this->is_set;
     }
 
-    // Specify number of decimals in automatic labels
-    // Deprecated from 1.4. Use SetFormatString() instead
-    public function SetPrecision($aPrecision)
-    {
-        if( ERR_DEPRECATED )
-        JpGraphError::Raise('Ticks::SetPrecision() is deprecated. Use Ticks::SetLabelFormat() (or Ticks::SetFormatCallback()) instead');
-    $this->precision=$aPrecision;
-    }
-
-    public function SetSide($aSide)
-    {
-    $this->direction=$aSide;
+    function SetSide($aSide) {
+        $this->direction=$aSide;
     }
 
     // Which side of the axis should the ticks be on
-    public function SetDirection($aSide=SIDE_RIGHT)
-    {
-    $this->direction=$aSide;
+    function SetDirection($aSide=SIDE_RIGHT) {
+        $this->direction=$aSide;
     }
 
     // Set colors for major and minor tick marks
-    public function SetMarkColor($aMajorColor,$aMinorColor="")
-    {
-    $this->SetColor($aMajorColor,$aMinorColor);
+    function SetMarkColor($aMajorColor,$aMinorColor='') {
+        $this->SetColor($aMajorColor,$aMinorColor);
     }
 
-    public function SetColor($aMajorColor,$aMinorColor="")
-    {
-    $this->majcolor=$aMajorColor;
+    function SetColor($aMajorColor,$aMinorColor='') {
+        $this->majcolor=$aMajorColor;
 
-    // If not specified use same as major
-    if( $aMinorColor=="" )
-        $this->mincolor=$aMajorColor;
-    else
-        $this->mincolor=$aMinorColor;
+        // If not specified use same as major
+        if( $aMinorColor == '' ) {
+            $this->mincolor=$aMajorColor;
+        }
+        else {
+            $this->mincolor=$aMinorColor;
+        }
     }
 
-    public function SetWeight($aWeight)
-    {
-    $this->weight=$aWeight;
+    function SetWeight($aWeight) {
+        $this->weight=$aWeight;
     }
 
 } // Class
@@ -4166,253 +4274,376 @@ public function SetWeight($aWeight)
 // CLASS LinearTicks
 // Description: Draw linear ticks on axis
 //===================================================
-class LinearTicks extends Ticks
-{
+class LinearTicks extends Ticks {
     public $minor_step=1, $major_step=2;
     public $xlabel_offset=0,$xtick_offset=0;
-    public $label_offset=0; // What offset should the displayed label have
+    private $label_offset=0; // What offset should the displayed label have
     // i.e should we display 0,1,2 or 1,2,3,4 or 2,3,4 etc
-    public $text_label_start=0;
-//---------------
-// CONSTRUCTOR
-    public function LinearTicks()
-    {
-    $this->precision = -1;
-    }
-
-//---------------
-// PUBLIC METHODS
+    private $text_label_start=0;
+    private $iManualTickPos = NULL, $iManualMinTickPos = NULL, $iManualTickLabels = NULL;
+    private $iAdjustForDST = false; // If a date falls within the DST period add one hour to the diaplyed time
 
+    function __construct() {
+        $this->precision = -1;
+    }
 
     // Return major step size in world coordinates
-    public function GetMajor()
-    {
-    return $this->major_step;
+    function GetMajor() {
+        return $this->major_step;
     }
 
     // Return minor step size in world coordinates
-    public function GetMinor()
-    {
-    return $this->minor_step;
+    function GetMinor() {
+        return $this->minor_step;
     }
 
     // Set Minor and Major ticks (in world coordinates)
-    public function Set($aMajStep,$aMinStep=false)
-    {
-    if( $aMinStep==false )
-        $aMinStep=$aMajStep;
+    function Set($aMajStep,$aMinStep=false) {
+        if( $aMinStep==false ) {
+            $aMinStep=$aMajStep;
+        }
+
+        if( $aMajStep <= 0 || $aMinStep <= 0 ) {
+            JpGraphError::RaiseL(25064);
+            //(" Minor or major step size is 0. Check that you haven't got an accidental SetTextTicks(0) in your code. If this is not the case you might have stumbled upon a bug in JpGraph. Please report this and if possible include the data that caused the problem.");
+        }
 
-    if ($aMajStep <= 0 || $aMinStep <= 0) {
-        JpGraphError::Raise(" Minor or major step size is 0. Check that you haven't
-                got an accidental SetTextTicks(0) in your code.<p>
-                If this is not the case you might have stumbled upon a bug in JpGraph.
-                Please report this and if possible include the data that caused the
-                problem.");
+        $this->major_step=$aMajStep;
+        $this->minor_step=$aMinStep;
+        $this->is_set = true;
     }
 
-    $this->major_step=$aMajStep;
-    $this->minor_step=$aMinStep;
-    $this->is_set = true;
+    function SetMajTickPositions($aMajPos,$aLabels=NULL) {
+        $this->SetTickPositions($aMajPos,NULL,$aLabels);
     }
 
-    // Draw linear ticks
-    public function Stroke(&$img,&$scale,$pos)
-    {
-    $maj_step_abs = $scale->scale_factor*$this->major_step;
-    $min_step_abs = $scale->scale_factor*$this->minor_step;
-
-    if( $min_step_abs==0 || $maj_step_abs==0 )
-        JpGraphError::Raise("A plot has an illegal scale. This could for example be that you are trying to use text autoscaling to draw a line plot with only one point or that the plot area is too small. It could also be that no input data value is numeric (perhaps only '-' or 'x')");
-    $limit = $scale->scale_abs[1];
-    $nbrmajticks=floor(1.000001*(($scale->GetMaxVal()-$scale->GetMinVal())/$this->major_step))+1;
-    $first=0;
-
-    // If precision hasn't been specified set it to a sensible value
-    if ($this->precision==-1) {
-        $t = log10($this->minor_step);
-        if( $t > 0 )
-        $precision = 0;
-        else
-        $precision = -floor($t);
-    } else
-        $precision = $this->precision;
-
-    $img->SetLineWeight($this->weight);
-
-    // Handle ticks on X-axis
-    if ($scale->type == "x") {
-
-        // Draw the minor tick marks
-
-        $yu = $pos - $this->direction*$this->GetMinTickAbsSize();
-        $label = $scale->GetMinVal();
-        $x=$scale->scale_abs[0];
-        $i=0;
-        $j=0;
-        $step = round($maj_step_abs/$min_step_abs);
-        while ($x < $limit) {
-        $this->ticks_pos[]=$x;
-        $this->ticks_label[]=$label;
-        $label+=$this->minor_step;
-         if (!$this->supress_tickmarks && !$this->supress_minor_tickmarks) {
-            if( $this->mincolor!="" ) $img->PushColor($this->mincolor);
-            $img->Line($x,$pos,$x,$yu);
-            if( $this->mincolor!="" ) $img->PopColor();
-        }
-
-        if ($i % $step == 0) {
-            $this->maj_ticks_pos[$j]=round($x);//$xtick;
-            ++$j;
+    function SetTickPositions($aMajPos,$aMinPos=NULL,$aLabels=NULL) {
+        if( !is_array($aMajPos) || ($aMinPos!==NULL && !is_array($aMinPos)) ) {
+            JpGraphError::RaiseL(25065);//('Tick positions must be specifued as an array()');
+            return;
         }
-
-        ++$i;
-        $x += $min_step_abs;
-
+        $n=count($aMajPos);
+        if( is_array($aLabels) && (count($aLabels) != $n) ) {
+            JpGraphError::RaiseL(25066);//('When manually specifying tick positions and labels the number of labels must be the same as the number of specified ticks.');
         }
-        $this->maj_ticks_pos[$j]=$x;
-
-        // Draw the major tick marks
-
-        $yu = $pos - $this->direction*$this->GetMajTickAbsSize();
+        $this->iManualTickPos = $aMajPos;
+        $this->iManualMinTickPos = $aMinPos;
+        $this->iManualTickLabels = $aLabels;
+    }
 
-        // TODO: Add logic to set label_offset for text labels
-        $label = (float) $scale->GetMinVal()+$this->text_label_start+$this->label_offset;
+    function HaveManualLabels() {
+        return count($this->iManualTickLabels) > 0;
+    }
 
-        $start_abs=$scale->scale_factor*$this->text_label_start;
+    // Specify all the tick positions manually and possible also the exact labels
+    function _doManualTickPos($aScale) {
+        $n=count($this->iManualTickPos);
+        $m=count($this->iManualMinTickPos);
+        $doLbl=count($this->iManualTickLabels) > 0;
 
-        $nbrmajticks=ceil(($scale->GetMaxVal()-$scale->GetMinVal()-$this->text_label_start )/$this->major_step)+1;
+        $this->maj_ticks_pos = array();
+        $this->maj_ticklabels_pos = array();
+        $this->ticks_pos = array();
 
+        // Now loop through the supplied positions and translate them to screen coordinates
+        // and store them in the maj_label_positions
+        $minScale = $aScale->scale[0];
+        $maxScale = $aScale->scale[1];
+        $j=0;
+        for($i=0; $i < $n ; ++$i ) {
+            // First make sure that the first tick is not lower than the lower scale value
+            if( !isset($this->iManualTickPos[$i]) || $this->iManualTickPos[$i] < $minScale  || $this->iManualTickPos[$i] > $maxScale) {
+                continue;
+            }
 
-        $x = $scale->scale_abs[0]+$start_abs+$this->xlabel_offset*$min_step_abs;
-        for ( $i=0; $label <= $scale->GetMaxVal()+$this->label_offset; ++$i ) {
+            $this->maj_ticks_pos[$j] = $aScale->Translate($this->iManualTickPos[$i]);
+            $this->maj_ticklabels_pos[$j] = $this->maj_ticks_pos[$j];
 
-        // Apply format
-        if ($this->label_formfunc != "") {
-            $f=$this->label_formfunc;
-            $l = call_user_func($f,$label);
-        } elseif( $this->label_formatstr != '' )
-            $l = sprintf($this->label_formatstr,$label);
-        else {
-            $v = round($label,$precision);
-            $l = sprintf("%01.".$precision."f",$v);
+            // Set the minor tick marks the same as major if not specified
+            if( $m <= 0 ) {
+                $this->ticks_pos[$j] = $this->maj_ticks_pos[$j];
+            }
+            if( $doLbl ) {
+                $this->maj_ticks_label[$j] = $this->iManualTickLabels[$i];
+            }
+            else {
+                $this->maj_ticks_label[$j]=$this->_doLabelFormat($this->iManualTickPos[$i],$i,$n);
+            }
+            ++$j;
         }
 
-        if( ($this->supress_zerolabel && $l==0) ||
-            ($this->supress_first && $i==0) ||
-            ($this->supress_last  && $i==$nbrmajticks-1) ) {
-            $l="";
+        // Some sanity check
+        if( count($this->maj_ticks_pos) < 2 ) {
+            JpGraphError::RaiseL(25067);//('Your manually specified scale and ticks is not correct. The scale seems to be too small to hold any of the specified tickl marks.');
         }
 
-        $this->maj_ticks_label[$i]=$l;
-        $label+=$this->major_step;
-        $this->maj_ticklabels_pos[$i] = $x;
-//		$this->maj_ticklabels_pos[$i] = $this->maj_ticks_pos[$i];
-
-        // The x-position of the tick marks can be different from the labels.
-        // Note that we record the tick position (not the label) so that the grid
-        // happen upon tick marks and not labels.
-        $xtick=$scale->scale_abs[0]+$start_abs+$this->xtick_offset*$min_step_abs+$i*$maj_step_abs;
-        $this->maj_ticks_pos[$i]=$xtick;
-        if(!($this->xtick_offset > 0 && $i==$nbrmajticks-1) &&
-           !$this->supress_tickmarks) {
-            if( $this->majcolor!="" ) $img->PushColor($this->majcolor);
-            $img->Line($this->maj_ticks_pos[$i],$pos,$this->maj_ticks_pos[$i],$yu);
-            if( $this->majcolor!="" ) $img->PopColor();
+        // Setup the minor tick marks
+        $j=0;
+        for($i=0; $i < $m; ++$i ) {
+            if(  empty($this->iManualMinTickPos[$i]) || $this->iManualMinTickPos[$i] < $minScale  || $this->iManualMinTickPos[$i] > $maxScale) {
+                continue;
+            }
+            $this->ticks_pos[$j] = $aScale->Translate($this->iManualMinTickPos[$i]);
+            ++$j;
         }
+    }
 
-        $x += $maj_step_abs;
+    function _doAutoTickPos($aScale) {
+        $maj_step_abs = $aScale->scale_factor*$this->major_step;
+        $min_step_abs = $aScale->scale_factor*$this->minor_step;
+
+        if( $min_step_abs==0 || $maj_step_abs==0 ) {
+            JpGraphError::RaiseL(25068);//("A plot has an illegal scale. This could for example be that you are trying to use text autoscaling to draw a line plot with only one point or that the plot area is too small. It could also be that no input data value is numeric (perhaps only '-' or 'x')");
+        }
+        // We need to make this an int since comparing it below
+        // with the result from round() can give wrong result, such that
+        // (40 < 40) == TRUE !!!
+        $limit = (int)$aScale->scale_abs[1];
+
+        if( $aScale->textscale ) {
+            // This can only be true for a X-scale (horizontal)
+            // Define ticks for a text scale. This is slightly different from a
+            // normal linear type of scale since the position might be adjusted
+            // and the labels start at on
+            $label = (float)$aScale->GetMinVal()+$this->text_label_start+$this->label_offset;
+            $start_abs=$aScale->scale_factor*$this->text_label_start;
+            $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal()-$this->text_label_start )/$this->major_step)+1;
+
+            $x = $aScale->scale_abs[0]+$start_abs+$this->xlabel_offset*$min_step_abs;
+            for( $i=0; $label <= $aScale->GetMaxVal()+$this->label_offset; ++$i ) {
+                // Apply format to label
+                $this->maj_ticks_label[$i]=$this->_doLabelFormat($label,$i,$nbrmajticks);
+                $label+=$this->major_step;
+
+                // The x-position of the tick marks can be different from the labels.
+                // Note that we record the tick position (not the label) so that the grid
+                // happen upon tick marks and not labels.
+                $xtick=$aScale->scale_abs[0]+$start_abs+$this->xtick_offset*$min_step_abs+$i*$maj_step_abs;
+                $this->maj_ticks_pos[$i]=$xtick;
+                $this->maj_ticklabels_pos[$i] = round($x);
+                $x += $maj_step_abs;
+            }
         }
+        else {
+            $label = $aScale->GetMinVal();
+            $abs_pos = $aScale->scale_abs[0];
+            $j=0; $i=0;
+            $step = round($maj_step_abs/$min_step_abs);
+            if( $aScale->type == "x" ) {
+                // For a normal linear type of scale the major ticks will always be multiples
+                // of the minor ticks. In order to avoid any rounding issues the major ticks are
+                // defined as every "step" minor ticks and not calculated separately
+                $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal()-$this->text_label_start )/$this->major_step)+1;
+                while( round($abs_pos) <= $limit ) {
+                    $this->ticks_pos[] = round($abs_pos);
+                    $this->ticks_label[] = $label;
+                    if( $step== 0 || $i % $step == 0 && $j < $nbrmajticks ) {
+                        $this->maj_ticks_pos[$j] = round($abs_pos);
+                        $this->maj_ticklabels_pos[$j] = round($abs_pos);
+                        $this->maj_ticks_label[$j]=$this->_doLabelFormat($label,$j,$nbrmajticks);
+                        ++$j;
+                    }
+                    ++$i;
+                    $abs_pos += $min_step_abs;
+                    $label+=$this->minor_step;
+                }
+            }
+            elseif( $aScale->type == "y" ) {
+                //@todo  s=2:20,12  s=1:50,6  $this->major_step:$nbr
+                // abs_point,limit s=1:270,80 s=2:540,160
+             // $this->major_step = 50;
+                $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal())/$this->major_step)+1;
+//                $step = 5;
+                while( round($abs_pos) >= $limit ) {
+                    $this->ticks_pos[$i] = round($abs_pos);
+                    $this->ticks_label[$i]=$label;
+                    if( $step== 0 || $i % $step == 0 && $j < $nbrmajticks) {
+                        $this->maj_ticks_pos[$j] = round($abs_pos);
+                        $this->maj_ticklabels_pos[$j] = round($abs_pos);
+                        $this->maj_ticks_label[$j]=$this->_doLabelFormat($label,$j,$nbrmajticks);
+                        ++$j;
+                    }
+                    ++$i;
+                    $abs_pos += $min_step_abs;
+                    $label += $this->minor_step;
+                }
+            }
+        }
+    }
 
+    function AdjustForDST($aFlg=true) {
+        $this->iAdjustForDST = $aFlg;
+    }
 
-    } elseif ($scale->type == "y") {
-
-        // Draw the major tick marks
-        $xr = $pos + $this->direction*$this->GetMajTickAbsSize();
-        $label = $scale->GetMinVal();
-
-        $tmpmaj=array();
-        $tmpmin=array();
-
-        for ($i=0; $i<$nbrmajticks; ++$i) {
-        $y=$scale->scale_abs[0]+$i*$maj_step_abs;
-
-        $tmpmaj[]=$y;
 
+    function _doLabelFormat($aVal,$aIdx,$aNbrTicks) {
 
-        // THe following two lines might seem to be unecessary but they are not!
-        // The reason being that for X-axis we separate the position of the labels
-        // and the tick marks which we don't do for the Y-axis.
-        // We therefore need to make sure both arrays are corcectly filled
-        // since Axis::StrokeLabels() uses the label positions and Grid::Stroke() uses
-        // the tick positions.
-        $this->maj_ticklabels_pos[$i]=$y;
-        $this->maj_ticks_pos[$i]=$y;
+        // If precision hasn't been specified set it to a sensible value
+        if( $this->precision==-1 ) {
+            $t = log10($this->minor_step);
+            if( $t > 0 ) {
+                $precision = 0;
+            }
+            else {
+                $precision = -floor($t);
+            }
+        }
+        else {
+            $precision = $this->precision;
+        }
 
-        if ($this->label_formfunc != "") {
+        if( $this->label_formfunc != '' ) {
             $f=$this->label_formfunc;
-            $l = call_user_func($f,$label);
-        } elseif( $this->label_formatstr != "" )
-            $l = sprintf($this->label_formatstr,$label);
-        else
-            $l = sprintf("%01.".$precision."f",round($label,$precision));
-
-        if( ($this->supress_zerolabel && ($l + 0)==0) ||  ($this->supress_first && $i==0) ||
-            ($this->supress_last  && $i==$nbrmajticks-1) ) {
-            $l="";
+            if( $this->label_formatstr == '' ) {
+                $l = call_user_func($f,$aVal);
+            }
+            else {
+                $l = sprintf($this->label_formatstr, call_user_func($f,$aVal));
+            }
         }
-
-        $this->maj_ticks_label[$i]=$l;
-        $label+=$this->major_step;
-        if (!$this->supress_tickmarks) {
-            if( $this->majcolor!="" ) $img->PushColor($this->majcolor);
-            $img->Line($pos,$y,$xr,$y);
-            if( $this->majcolor!="" ) $img->PopColor();
+        elseif( $this->label_formatstr != '' || $this->label_dateformatstr != '' ) {
+            if( $this->label_usedateformat ) {
+                // Adjust the value to take daylight savings into account
+                if (date("I",$aVal)==1 && $this->iAdjustForDST ) {
+                    // DST
+                    $aVal+=3600;
+                }
+
+                $l = date($this->label_formatstr,$aVal);
+                if( $this->label_formatstr == 'W' ) {
+                    // If we use week formatting then add a single 'w' in front of the
+                    // week number to differentiate it from dates
+                    $l = 'w'.$l;
+                }
+            }
+            else {
+                if( $this->label_dateformatstr !== '' ) {
+                    // Adjust the value to take daylight savings into account
+                    if (date("I",$aVal)==1 && $this->iAdjustForDST ) {
+                        // DST
+                        $aVal+=3600;
+                    }
+
+                    $l = date($this->label_dateformatstr,$aVal);
+                    if( $this->label_formatstr == 'W' ) {
+                        // If we use week formatting then add a single 'w' in front of the
+                        // week number to differentiate it from dates
+                        $l = 'w'.$l;
+                    }
+                }
+                else {
+                    $l = sprintf($this->label_formatstr,$aVal);
+                }
+            }
         }
+        else {
+            $l = sprintf('%01.'.$precision.'f',round($aVal,$precision));
         }
 
-        // Draw the minor tick marks
-        $xr = $pos + $this->direction*$this->GetMinTickAbsSize();
-        $label = $scale->GetMinVal();
-        for ($i=0,$y=$scale->scale_abs[0]; $y>=$limit;) {
-
-        $tmpmin[]=$y;
-
-        $this->ticks_pos[$i]=$y;
-        $this->ticks_label[$i]=$label;
-        $label+=$this->minor_step;
-        if (!$this->supress_tickmarks && !$this->supress_minor_tickmarks) {
-            if( $this->mincolor!="" ) $img->PushColor($this->mincolor);
-            $img->Line($pos,$y,$xr,$y);
-            if( $this->mincolor!="" ) $img->PopColor();
+        if( ($this->supress_zerolabel && $l==0) ||  ($this->supress_first && $aIdx==0) || ($this->supress_last  && $aIdx==$aNbrTicks-1) ) {
+            $l='';
         }
-        ++$i;
-        $y=$scale->scale_abs[0]+$i*$min_step_abs;
+        return $l;
+    }
+
+    // Stroke ticks on either X or Y axis
+    function _StrokeTicks($aImg,$aScale,$aPos) {
+        $hor = $aScale->type == 'x';
+        $aImg->SetLineWeight($this->weight);
+
+        // We need to make this an int since comparing it below
+        // with the result from round() can give wrong result, such that
+        // (40 < 40) == TRUE !!!
+        $limit = (int)$aScale->scale_abs[1];
+
+        // A text scale doesn't have any minor ticks
+        if( !$aScale->textscale ) {
+            // Stroke minor ticks
+            $yu = $aPos - $this->direction*$this->GetMinTickAbsSize();
+            $xr = $aPos + $this->direction*$this->GetMinTickAbsSize();
+            $n = count($this->ticks_pos);
+            for($i=0; $i < $n; ++$i ) {
+                if( !$this->supress_tickmarks && !$this->supress_minor_tickmarks) {
+                    if( $this->mincolor != '') {
+                        $aImg->PushColor($this->mincolor);
+                    }
+                    if( $hor ) {
+                        //if( $this->ticks_pos[$i] <= $limit )
+                        $aImg->Line($this->ticks_pos[$i],$aPos,$this->ticks_pos[$i],$yu);
+                    }
+                    else {
+                        //if( $this->ticks_pos[$i] >= $limit )
+                        $aImg->Line($aPos,$this->ticks_pos[$i],$xr,$this->ticks_pos[$i]);
+                    }
+                    if( $this->mincolor != '' ) {
+                        $aImg->PopColor();
+                    }
+                }
+            }
+        }
+
+        // Stroke major ticks
+        $yu = $aPos - $this->direction*$this->GetMajTickAbsSize();
+        $xr = $aPos + $this->direction*$this->GetMajTickAbsSize();
+        $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal()-$this->text_label_start )/$this->major_step)+1;
+        $n = count($this->maj_ticks_pos);
+        for($i=0; $i < $n ; ++$i ) {
+            if(!($this->xtick_offset > 0 && $i==$nbrmajticks-1) && !$this->supress_tickmarks) {
+                if( $this->majcolor != '') {
+                    $aImg->PushColor($this->majcolor);
+                }
+                if( $hor ) {
+                    //if( $this->maj_ticks_pos[$i] <= $limit )
+                    $aImg->Line($this->maj_ticks_pos[$i],$aPos,$this->maj_ticks_pos[$i],$yu);
+                }
+                else {
+                    //if( $this->maj_ticks_pos[$i] >= $limit )
+                    $aImg->Line($aPos,$this->maj_ticks_pos[$i],$xr,$this->maj_ticks_pos[$i]);
+                }
+                if( $this->majcolor != '') {
+                    $aImg->PopColor();
+                }
+            }
         }
+
     }
+
+    // Draw linear ticks
+    function Stroke($aImg,$aScale,$aPos) {
+        if( $this->iManualTickPos != NULL ) {
+            $this->_doManualTickPos($aScale);
+        }
+        else {
+            $this->_doAutoTickPos($aScale);
+        }
+        $this->_StrokeTicks($aImg,$aScale,$aPos, $aScale->type == 'x' );
     }
-//---------------
-// PRIVATE METHODS
+
+    //---------------
+    // PRIVATE METHODS
     // Spoecify the offset of the displayed tick mark with the tick "space"
     // Legal values for $o is [0,1] used to adjust where the tick marks and label
     // should be positioned within the major tick-size
     // $lo specifies the label offset and $to specifies the tick offset
     // this comes in handy for example in bar graphs where we wont no offset for the
     // tick but have the labels displayed halfway under the bars.
-    public function SetXLabelOffset($aLabelOff,$aTickOff=-1)
-    {
-    $this->xlabel_offset=$aLabelOff;
-    if( $aTickOff==-1 )	// Same as label offset
-        $this->xtick_offset=$aLabelOff;
-    else
-        $this->xtick_offset=$aTickOff;
-    if( $aLabelOff>0 )
-        $this->SupressLast();	// The last tick wont fit
+    function SetXLabelOffset($aLabelOff,$aTickOff=-1) {
+        $this->xlabel_offset=$aLabelOff;
+        if( $aTickOff==-1 ) {
+            // Same as label offset
+            $this->xtick_offset=$aLabelOff;
+        }
+        else {
+            $this->xtick_offset=$aTickOff;
+        }
+        if( $aLabelOff>0 ) {
+            $this->SupressLast(); // The last tick wont fit
+        }
     }
 
     // Which tick label should we start with?
-    public function SetTextLabelStart($aTextLabelOff)
-    {
-    $this->text_label_start=$aTextLabelOff;
+    function SetTextLabelStart($aTextLabelOff) {
+        $this->text_label_start=$aTextLabelOff;
     }
 
 } // Class
@@ -4421,3487 +4652,580 @@ public function SetTextLabelStart($aTextLabelOff)
 // CLASS LinearScale
 // Description: Handle linear scaling between screen and world
 //===================================================
-class LinearScale
-{
-    public $scale=array(0,0);
-    public $scale_abs=array(0,0);
-    public $scale_factor; // Scale factor between world and screen
-    public $world_size;	// Plot area size in world coordinates
-    public $world_abs_size; // Plot area size in pixels
-    public $off; // Offset between image edge and plot area
-    public $type; // is this x or y scale ?
-    public $ticks=null; // Store ticks
-    public $autoscale_min=false; // Forced minimum value, auto determine max
-    public $autoscale_max=false; // Forced maximum value, auto determine min
-    public $gracetop=0,$gracebottom=0;
-    public $intscale=false; // Restrict autoscale to integers
+class LinearScale {
     public $textscale=false; // Just a flag to let the Plot class find out if
     // we are a textscale or not. This is a cludge since
-    // this ionformatyion is availabale in Graph::axtype but
+    // this information is available in Graph::axtype but
     // we don't have access to the graph object in the Plots
     // stroke method. So we let graph store the status here
     // when the linear scale is created. A real cludge...
+    public $type; // is this x or y scale ?
+    public $ticks=null; // Store ticks
     public $text_scale_off = 0;
-    public $auto_ticks=false; // When using manual scale should the ticks be automatically set?
+    public $scale_abs=array(0,0);
+    public $scale_factor; // Scale factor between world and screen
+    public $off; // Offset between image edge and plot area
+    public $scale=array(0,0);
     public $name = 'lin';
-//---------------
-// CONSTRUCTOR
-    public function LinearScale($aMin=0,$aMax=0,$aType="y")
-    {
-    assert($aType=="x" || $aType=="y" );
-    assert($aMin<=$aMax);
+    public $auto_ticks=false; // When using manual scale should the ticks be automatically set?
+    public $world_abs_size; // Plot area size in pixels (Needed public in jpgraph_radar.php)
+    public $intscale=false; // Restrict autoscale to integers
+    protected $autoscale_min=false; // Forced minimum value, auto determine max
+    protected $autoscale_max=false; // Forced maximum value, auto determine min
+    private $gracetop=0,$gracebottom=0;
 
-    $this->type=$aType;
-    $this->scale=array($aMin,$aMax);
-    $this->world_size=$aMax-$aMin;
-    $this->ticks = new LinearTicks();
-    }
+    private $_world_size; // Plot area size in world coordinates
 
-//---------------
-// PUBLIC METHODS
-    // Check if scale is set or if we should autoscale
-    // We should do this is either scale or ticks has not been set
-    public function IsSpecified()
-    {
-    if ( $this->GetMinVal()==$this->GetMaxVal() ) {		// Scale not set
+    function __construct($aMin=0,$aMax=0,$aType='y') {
+        assert($aType=='x' || $aType=='y' );
+        assert($aMin<=$aMax);
 
-        return false;
+        $this->type=$aType;
+        $this->scale=array($aMin,$aMax);
+        $this->world_size=$aMax-$aMin;
+        $this->ticks = new LinearTicks();
     }
 
-    return true;
+    // Check if scale is set or if we should autoscale
+    // We should do this is either scale or ticks has not been set
+    function IsSpecified() {
+        if( $this->GetMinVal()==$this->GetMaxVal() ) {  // Scale not set
+            return false;
+        }
+        return true;
     }
 
     // Set the minimum data value when the autoscaling is used.
     // Usefull if you want a fix minimum (like 0) but have an
     // automatic maximum
-    public function SetAutoMin($aMin)
-    {
-    $this->autoscale_min=$aMin;
+    function SetAutoMin($aMin) {
+        $this->autoscale_min=$aMin;
     }
 
     // Set the minimum data value when the autoscaling is used.
     // Usefull if you want a fix minimum (like 0) but have an
     // automatic maximum
-    public function SetAutoMax($aMax)
-    {
-    $this->autoscale_max=$aMax;
+    function SetAutoMax($aMax) {
+        $this->autoscale_max=$aMax;
     }
 
     // If the user manually specifies a scale should the ticks
     // still be set automatically?
-    public function SetAutoTicks($aFlag=true)
-    {
-    $this->auto_ticks = $aFlag;
+    function SetAutoTicks($aFlag=true) {
+        $this->auto_ticks = $aFlag;
     }
 
     // Specify scale "grace" value (top and bottom)
-    public function SetGrace($aGraceTop,$aGraceBottom=0)
-    {
-    if( $aGraceTop<0 || $aGraceBottom < 0  )
-        JpGraphError::Raise(" Grace must be larger then 0");
-    $this->gracetop=$aGraceTop;
-    $this->gracebottom=$aGraceBottom;
+    function SetGrace($aGraceTop,$aGraceBottom=0) {
+        if( $aGraceTop<0 || $aGraceBottom < 0  ) {
+            JpGraphError::RaiseL(25069);//(" Grace must be larger then 0");
+        }
+        $this->gracetop=$aGraceTop;
+        $this->gracebottom=$aGraceBottom;
     }
 
     // Get the minimum value in the scale
-    public function GetMinVal()
-    {
-    return $this->scale[0];
+    function GetMinVal() {
+        return $this->scale[0];
     }
 
     // get maximum value for scale
-    public function GetMaxVal()
-    {
-    return $this->scale[1];
+    function GetMaxVal() {
+        return $this->scale[1];
     }
 
     // Specify a new min/max value for sclae
-    public function Update(&$aImg,$aMin,$aMax)
-    {
-    $this->scale=array($aMin,$aMax);
-    $this->world_size=$aMax-$aMin;
-    $this->InitConstants($aImg);
+    function Update($aImg,$aMin,$aMax) {
+        $this->scale=array($aMin,$aMax);
+        $this->world_size=$aMax-$aMin;
+        $this->InitConstants($aImg);
     }
 
     // Translate between world and screen
-    public function Translate($aCoord)
-    {
-    if ( !is_numeric($aCoord) ) {
-        if( $aCoord != '' && $aCoord != '-' && $aCoord != 'x' )
-        JpGraphError::Raise('Your data contains non-numeric values.');
-
-        return 0;
-    } else {
-        return $this->off + ($aCoord - $this->scale[0])*$this->scale_factor;
-    }
-    }
-
-    // Relative translate (don't include offset) usefull when we just want
-    // to know the relative position (in pixels) on the axis
-    public function RelTranslate($aCoord)
-    {
-    if ( !is_numeric($aCoord) ) {
-        if( $aCoord != '' && $aCoord != '-' && $aCoord != 'x'  )
-        JpGraphError::Raise('Your data contains non-numeric values.');
-
-        return 0;
-    } else {
-        return ($aCoord - $this->scale[0]) * $this->scale_factor;
-    }
-    }
-
-    // Restrict autoscaling to only use integers
-    public function SetIntScale($aIntScale=true)
-    {
-    $this->intscale=$aIntScale;
-    }
-
-    // Calculate an integer autoscale
-    public function IntAutoScale(&$img,$min,$max,$maxsteps,$majend=true)
-    {
-    // Make sure limits are integers
-    $min=floor($min);
-    $max=ceil($max);
-    if ( abs($min-$max)==0 ) {
-        --$min; ++$max;
-    }
-    $maxsteps = floor($maxsteps);
-
-    $gracetop=round(($this->gracetop/100.0)*abs($max-$min));
-    $gracebottom=round(($this->gracebottom/100.0)*abs($max-$min));
-    if ( is_numeric($this->autoscale_min) ) {
-        $min = ceil($this->autoscale_min);
-        if ($min >= $max) {
-        JpGraphError::Raise('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.');
-        die();
-        }
-    }
-
-    if ( is_numeric($this->autoscale_max) ) {
-        $max = ceil($this->autoscale_max);
-        if ($min >= $max) {
-        JpGraphError::Raise('You have specified a max value with SetAutoMax() which is smaller than the miminum value used for the scale. This is not possible.');
-        die();
-        }
-    }
-
-    if ( abs($min-$max ) == 0 ) {
-        ++$max;
-        --$min;
-    }
-
-    $min -= $gracebottom;
-    $max += $gracetop;
-
-    // First get tickmarks as multiples of 1, 10, ...
-    if ($majend) {
-        list($num1steps,$adj1min,$adj1max,$maj1step) =
-        $this->IntCalcTicks($maxsteps,$min,$max,1);
-    } else {
-        $adj1min = $min;
-        $adj1max = $max;
-        list($num1steps,$maj1step) =
-        $this->IntCalcTicksFreeze($maxsteps,$min,$max,1);
-    }
-
-    if ( abs($min-$max) > 2 ) {
-        // Then get tick marks as 2:s 2, 20, ...
-        if ($majend) {
-        list($num2steps,$adj2min,$adj2max,$maj2step) =
-            $this->IntCalcTicks($maxsteps,$min,$max,5);
-        } else {
-        $adj2min = $min;
-        $adj2max = $max;
-        list($num2steps,$maj2step) =
-            $this->IntCalcTicksFreeze($maxsteps,$min,$max,5);
-        }
-    } else {
-        $num2steps = 10000;	// Dummy high value so we don't choose this
-    }
-
-    if ( abs($min-$max) > 5 ) {
-        // Then get tickmarks as 5:s 5, 50, 500, ...
-        if ($majend) {
-        list($num5steps,$adj5min,$adj5max,$maj5step) =
-            $this->IntCalcTicks($maxsteps,$min,$max,2);
-        } else {
-        $adj5min = $min;
-        $adj5max = $max;
-        list($num5steps,$maj5step) =
-            $this->IntCalcTicksFreeze($maxsteps,$min,$max,2);
-        }
-    } else {
-        $num5steps = 10000;	// Dummy high value so we don't choose this
-    }
-
-    // Check to see whichof 1:s, 2:s or 5:s fit better with
-    // the requested number of major ticks
-    $match1=abs($num1steps-$maxsteps);
-    $match2=abs($num2steps-$maxsteps);
-    if( !empty($maj5step) && $maj5step > 1 )
-        $match5=abs($num5steps-$maxsteps);
-    else
-        $match5=10000; 	// Dummy high value
-
-    // Compare these three values and see which is the closest match
-    // We use a 0.6 weight to gravitate towards multiple of 5:s
-    if ($match1 < $match2) {
-        if( $match1 < $match5 )
-        $r=1;
-        else
-        $r=3;
-    } else {
-        if( $match2 < $match5 )
-        $r=2;
-        else
-        $r=3;
-    }
-    // Minsteps are always the same as maxsteps for integer scale
-    switch ($r) {
-        case 1:
-        $this->Update($img,$adj1min,$adj1max);
-        $this->ticks->Set($maj1step,$maj1step);
-        break;
-        case 2:
-        $this->Update($img,$adj2min,$adj2max);
-        $this->ticks->Set($maj2step,$maj2step);
-        break;
-        case 3:
-        $this->Update($img,$adj5min,$adj5max);
-        $this->ticks->Set($maj5step,$maj2step);
-        break;
-    }
-    }
-
-
-    // Calculate autoscale. Used if user hasn't given a scale and ticks
-    // $maxsteps is the maximum number of major tickmarks allowed.
-    public function AutoScale(&$img,$min,$max,$maxsteps,$majend=true)
-    {
-    if ($this->intscale) {
-        $this->IntAutoScale($img,$min,$max,$maxsteps,$majend);
-
-        return;
-    }
-    if ( abs($min-$max) < 0.00001 ) {
-        // We need some difference to be able to autoscale
-        // make it 5% above and 5% below value
-        if ($min==0 && $max==0) {		// Special case
-        $min=-1; $max=1;
-        } else {
-        $delta = (abs($max)+abs($min))*0.005;
-        $min -= $delta;
-        $max += $delta;
-        }
-    }
-
-    $gracetop=($this->gracetop/100.0)*abs($max-$min);
-    $gracebottom=($this->gracebottom/100.0)*abs($max-$min);
-    if ( is_numeric($this->autoscale_min) ) {
-        $min = $this->autoscale_min;
-        if ($min >= $max) {
-        JpGraphError::Raise('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.');
-        die();
-        }
-        if( abs($min-$max ) < 0.00001 )
-        $max *= 1.2;
-    }
-
-    if ( is_numeric($this->autoscale_max) ) {
-        $max = $this->autoscale_max;
-        if ($min >= $max) {
-        JpGraphError::Raise('You have specified a max value with SetAutoMax() which is smaller than the miminum value used for the scale. This is not possible.');
-        die();
-        }
-        if( abs($min-$max ) < 0.00001 )
-        $min *= 0.8;
-    }
-
-
-    $min -= $gracebottom;
-    $max += $gracetop;
-
-    // First get tickmarks as multiples of 0.1, 1, 10, ...
-    if ($majend) {
-        list($num1steps,$adj1min,$adj1max,$min1step,$maj1step) =
-        $this->CalcTicks($maxsteps,$min,$max,1,2);
-    } else {
-        $adj1min=$min;
-        $adj1max=$max;
-        list($num1steps,$min1step,$maj1step) =
-        $this->CalcTicksFreeze($maxsteps,$min,$max,1,2,false);
-    }
-
-    // Then get tick marks as 2:s 0.2, 2, 20, ...
-    if ($majend) {
-        list($num2steps,$adj2min,$adj2max,$min2step,$maj2step) =
-        $this->CalcTicks($maxsteps,$min,$max,5,2);
-    } else {
-        $adj2min=$min;
-        $adj2max=$max;
-        list($num2steps,$min2step,$maj2step) =
-        $this->CalcTicksFreeze($maxsteps,$min,$max,5,2,false);
-    }
-
-    // Then get tickmarks as 5:s 0.05, 0.5, 5, 50, ...
-    if ($majend) {
-        list($num5steps,$adj5min,$adj5max,$min5step,$maj5step) =
-        $this->CalcTicks($maxsteps,$min,$max,2,5);
-    } else {
-        $adj5min=$min;
-        $adj5max=$max;
-        list($num5steps,$min5step,$maj5step) =
-        $this->CalcTicksFreeze($maxsteps,$min,$max,2,5,false);
-    }
-
-    // Check to see whichof 1:s, 2:s or 5:s fit better with
-    // the requested number of major ticks
-    $match1=abs($num1steps-$maxsteps);
-    $match2=abs($num2steps-$maxsteps);
-    $match5=abs($num5steps-$maxsteps);
-    // Compare these three values and see which is the closest match
-    // We use a 0.8 weight to gravitate towards multiple of 5:s
-    $r=$this->MatchMin3($match1,$match2,$match5,0.8);
-    switch ($r) {
-        case 1:
-        $this->Update($img,$adj1min,$adj1max);
-        $this->ticks->Set($maj1step,$min1step);
-        break;
-        case 2:
-        $this->Update($img,$adj2min,$adj2max);
-        $this->ticks->Set($maj2step,$min2step);
-        break;
-        case 3:
-        $this->Update($img,$adj5min,$adj5max);
-        $this->ticks->Set($maj5step,$min5step);
-        break;
-    }
-    }
-
-//---------------
-// PRIVATE METHODS
-
-    // This method recalculates all constants that are depending on the
-    // margins in the image. If the margins in the image are changed
-    // this method should be called for every scale that is registred with
-    // that image. Should really be installed as an observer of that image.
-    public function InitConstants(&$img)
-    {
-    if ($this->type=="x") {
-        $this->world_abs_size=$img->width - $img->left_margin - $img->right_margin;
-        $this->off=$img->left_margin;
-        $this->scale_factor = 0;
-        if( $this->world_size > 0 )
-        $this->scale_factor=$this->world_abs_size/($this->world_size*1.0);
-    } else { // y scale
-        $this->world_abs_size=$img->height - $img->top_margin - $img->bottom_margin;
-        $this->off=$img->top_margin+$this->world_abs_size;
-        $this->scale_factor = 0;
-        if ($this->world_size > 0) {
-        $this->scale_factor=-$this->world_abs_size/($this->world_size*1.0);
-        }
-    }
-    $size = $this->world_size * $this->scale_factor;
-    $this->scale_abs=array($this->off,$this->off + $size);
-    }
-
-    // Initialize the conversion constants for this scale
-    // This tries to pre-calculate as much as possible to speed up the
-    // actual conversion (with Translate()) later on
-    // $start	=scale start in absolute pixels (for x-scale this is an y-position
-    //				 and for an y-scale this is an x-position
-    // $len 		=absolute length in pixels of scale
-    public function SetConstants($aStart,$aLen)
-    {
-    $this->world_abs_size=$aLen;
-    $this->off=$aStart;
-
-    if ($this->world_size<=0) {
-        // This should never ever happen !!
-        JpGraphError::Raise("JpGraph Fatal Error:<br>
-         You have unfortunately stumbled upon a bug in JpGraph. <br>
-         It seems like the scale range is ".$this->world_size." [for ".
-                $this->type." scale] <br>
-             Please report Bug #01 to jpgraph@aditus.nu and include the script
-         that gave this error. <br>
-         This problem could potentially be caused by trying to use \"illegal\"
-         values in the input data arrays (like trying to send in strings or
-         only NULL values) which causes the autoscaling to fail.");
-    }
-
-    // scale_factor = number of pixels per world unit
-    $this->scale_factor=$this->world_abs_size/($this->world_size*1.0);
-
-    // scale_abs = start and end points of scale in absolute pixels
-    $this->scale_abs=array($this->off,$this->off+$this->world_size*$this->scale_factor);
-    }
-
-    // Calculate number of ticks steps with a specific division
-    // $a is the divisor of 10**x to generate the first maj tick intervall
-    // $a=1, $b=2 give major ticks with multiple of 10, ...,0.1,1,10,...
-    // $a=5, $b=2 give major ticks with multiple of 2:s ...,0.2,2,20,...
-    // $a=2, $b=5 give major ticks with multiple of 5:s ...,0.5,5,50,...
-    // We return a vector of
-    // 	[$numsteps,$adjmin,$adjmax,$minstep,$majstep]
-    // If $majend==true then the first and last marks on the axis will be major
-    // labeled tick marks otherwise it will be adjusted to the closest min tick mark
-    public function CalcTicks($maxsteps,$min,$max,$a,$b,$majend=true)
-    {
-    $diff=$max-$min;
-    if( $diff==0 )
-        $ld=0;
-    else
-        $ld=floor(log10($diff));
-
-    // Gravitate min towards zero if we are close
-    if( $min>0 && $min < pow(10,$ld) ) $min=0;
-
-    //$majstep=pow(10,$ld-1)/$a;
-    $majstep=pow(10,$ld)/$a;
-    $minstep=$majstep/$b;
-
-    $adjmax=ceil($max/$minstep)*$minstep;
-    $adjmin=floor($min/$minstep)*$minstep;
-    $adjdiff = $adjmax-$adjmin;
-    $numsteps=$adjdiff/$majstep;
-
-    while ($numsteps>$maxsteps) {
-        $majstep=pow(10,$ld)/$a;
-        $numsteps=$adjdiff/$majstep;
-        ++$ld;
-    }
-
-    $minstep=$majstep/$b;
-    $adjmin=floor($min/$minstep)*$minstep;
-    $adjdiff = $adjmax-$adjmin;
-    if ($majend) {
-        $adjmin = floor($min/$majstep)*$majstep;
-        $adjdiff = $adjmax-$adjmin;
-        $adjmax = ceil($adjdiff/$majstep)*$majstep+$adjmin;
-    } else
-        $adjmax=ceil($max/$minstep)*$minstep;
-
-    return array($numsteps,$adjmin,$adjmax,$minstep,$majstep);
-    }
-
-    public function CalcTicksFreeze($maxsteps,$min,$max,$a,$b)
-    {
-    // Same as CalcTicks but don't adjust min/max values
-    $diff=$max-$min;
-    if( $diff==0 )
-        $ld=0;
-    else
-        $ld=floor(log10($diff));
-
-    //$majstep=pow(10,$ld-1)/$a;
-    $majstep=pow(10,$ld)/$a;
-    $minstep=$majstep/$b;
-    $numsteps=floor($diff/$majstep);
-
-    while ($numsteps > $maxsteps) {
-        $majstep=pow(10,$ld)/$a;
-        $numsteps=floor($diff/$majstep);
-        ++$ld;
-    }
-    $minstep=$majstep/$b;
-
-    return array($numsteps,$minstep,$majstep);
-    }
-
-
-    public function IntCalcTicks($maxsteps,$min,$max,$a,$majend=true)
-    {
-    $diff=$max-$min;
-    if( $diff==0 )
-        JpGraphError::Raise('Can\'t automatically determine ticks since min==max.');
-    else
-        $ld=floor(log10($diff));
-
-    // Gravitate min towards zero if we are close
-    if( $min>0 && $min < pow(10,$ld) ) $min=0;
-
-    if( $ld == 0 ) $ld=1;
-
-    if( $a == 1 )
-        $majstep = 1;
-    else
-        $majstep=pow(10,$ld)/$a;
-    $adjmax=ceil($max/$majstep)*$majstep;
-
-    $adjmin=floor($min/$majstep)*$majstep;
-    $adjdiff = $adjmax-$adjmin;
-    $numsteps=$adjdiff/$majstep;
-    while ($numsteps>$maxsteps) {
-        $majstep=pow(10,$ld)/$a;
-        $numsteps=$adjdiff/$majstep;
-        ++$ld;
-    }
-
-    $adjmin=floor($min/$majstep)*$majstep;
-    $adjdiff = $adjmax-$adjmin;
-    if ($majend) {
-        $adjmin = floor($min/$majstep)*$majstep;
-        $adjdiff = $adjmax-$adjmin;
-        $adjmax = ceil($adjdiff/$majstep)*$majstep+$adjmin;
-    } else
-        $adjmax=ceil($max/$majstep)*$majstep;
-
-    return array($numsteps,$adjmin,$adjmax,$majstep);
-    }
-
-    public function IntCalcTicksFreeze($maxsteps,$min,$max,$a)
-    {
-    // Same as IntCalcTick but don't change min/max values
-    $diff=$max-$min;
-    if( $diff==0 )
-        JpGraphError::Raise('Can\'t automatically determine ticks since min==max.');
-    else
-        $ld=floor(log10($diff));
-
-    if( $ld == 0 ) $ld=1;
-
-    if( $a == 1 )
-        $majstep = 1;
-    else
-        $majstep=pow(10,$ld)/$a;
-
-    $numsteps=floor($diff/$majstep);
-    while ($numsteps > $maxsteps) {
-        $majstep=pow(10,$ld)/$a;
-        $numsteps=floor($diff/$majstep);
-        ++$ld;
-    }
-
-    return array($numsteps,$majstep);
-    }
-
-    // Determine the minimum of three values witha  weight for last value
-    public function MatchMin3($a,$b,$c,$weight)
-    {
-    if ($a < $b) {
-        if( $a < ($c*$weight) )
-
-        return 1; // $a smallest
-        else
-        return 3; // $c smallest
-    } elseif( $b < ($c*$weight) )
-
-        return 2; // $b smallest
-    return 3; // $c smallest
-    }
-} // Class
-
-//===================================================
-// CLASS RGB
-// Description: Color definitions as RGB triples
-//===================================================
-class RGB
-{
-    public $rgb_table;
-    public $img;
-    public function RGB($aImg=null)
-    {
-    $this->img = $aImg;
-
-    // Conversion array between color names and RGB
-    $this->rgb_table = array(
-        "aqua"=> array(0,255,255),
-        "lime"=> array(0,255,0),
-        "teal"=> array(0,128,128),
-        "whitesmoke"=>array(245,245,245),
-        "gainsboro"=>array(220,220,220),
-        "oldlace"=>array(253,245,230),
-        "linen"=>array(250,240,230),
-        "antiquewhite"=>array(250,235,215),
-        "papayawhip"=>array(255,239,213),
-        "blanchedalmond"=>array(255,235,205),
-        "bisque"=>array(255,228,196),
-        "peachpuff"=>array(255,218,185),
-        "navajowhite"=>array(255,222,173),
-        "moccasin"=>array(255,228,181),
-        "cornsilk"=>array(255,248,220),
-        "ivory"=>array(255,255,240),
-        "lemonchiffon"=>array(255,250,205),
-        "seashell"=>array(255,245,238),
-        "mintcream"=>array(245,255,250),
-        "azure"=>array(240,255,255),
-        "aliceblue"=>array(240,248,255),
-        "lavender"=>array(230,230,250),
-        "lavenderblush"=>array(255,240,245),
-        "mistyrose"=>array(255,228,225),
-        "white"=>array(255,255,255),
-        "black"=>array(0,0,0),
-        "darkslategray"=>array(47,79,79),
-        "dimgray"=>array(105,105,105),
-        "slategray"=>array(112,128,144),
-        "lightslategray"=>array(119,136,153),
-        "gray"=>array(190,190,190),
-        "lightgray"=>array(211,211,211),
-        "midnightblue"=>array(25,25,112),
-        "navy"=>array(0,0,128),
-        "cornflowerblue"=>array(100,149,237),
-        "darkslateblue"=>array(72,61,139),
-        "slateblue"=>array(106,90,205),
-        "mediumslateblue"=>array(123,104,238),
-        "lightslateblue"=>array(132,112,255),
-        "mediumblue"=>array(0,0,205),
-        "royalblue"=>array(65,105,225),
-        "blue"=>array(0,0,255),
-        "dodgerblue"=>array(30,144,255),
-        "deepskyblue"=>array(0,191,255),
-        "skyblue"=>array(135,206,235),
-        "lightskyblue"=>array(135,206,250),
-        "steelblue"=>array(70,130,180),
-        "lightred"=>array(211,167,168),
-        "lightsteelblue"=>array(176,196,222),
-        "lightblue"=>array(173,216,230),
-        "powderblue"=>array(176,224,230),
-        "paleturquoise"=>array(175,238,238),
-        "darkturquoise"=>array(0,206,209),
-        "mediumturquoise"=>array(72,209,204),
-        "turquoise"=>array(64,224,208),
-        "cyan"=>array(0,255,255),
-        "lightcyan"=>array(224,255,255),
-        "cadetblue"=>array(95,158,160),
-        "mediumaquamarine"=>array(102,205,170),
-        "aquamarine"=>array(127,255,212),
-        "darkgreen"=>array(0,100,0),
-        "darkolivegreen"=>array(85,107,47),
-        "darkseagreen"=>array(143,188,143),
-        "seagreen"=>array(46,139,87),
-        "mediumseagreen"=>array(60,179,113),
-        "lightseagreen"=>array(32,178,170),
-        "palegreen"=>array(152,251,152),
-        "springgreen"=>array(0,255,127),
-        "lawngreen"=>array(124,252,0),
-        "green"=>array(0,255,0),
-        "chartreuse"=>array(127,255,0),
-        "mediumspringgreen"=>array(0,250,154),
-        "greenyellow"=>array(173,255,47),
-        "limegreen"=>array(50,205,50),
-        "yellowgreen"=>array(154,205,50),
-        "forestgreen"=>array(34,139,34),
-        "olivedrab"=>array(107,142,35),
-        "darkkhaki"=>array(189,183,107),
-        "khaki"=>array(240,230,140),
-        "palegoldenrod"=>array(238,232,170),
-        "lightgoldenrodyellow"=>array(250,250,210),
-        "lightyellow"=>array(255,255,200),
-        "yellow"=>array(255,255,0),
-        "gold"=>array(255,215,0),
-        "lightgoldenrod"=>array(238,221,130),
-        "goldenrod"=>array(218,165,32),
-        "darkgoldenrod"=>array(184,134,11),
-        "rosybrown"=>array(188,143,143),
-        "indianred"=>array(205,92,92),
-        "saddlebrown"=>array(139,69,19),
-        "sienna"=>array(160,82,45),
-        "peru"=>array(205,133,63),
-        "burlywood"=>array(222,184,135),
-        "beige"=>array(245,245,220),
-        "wheat"=>array(245,222,179),
-        "sandybrown"=>array(244,164,96),
-        "tan"=>array(210,180,140),
-        "chocolate"=>array(210,105,30),
-        "firebrick"=>array(178,34,34),
-        "brown"=>array(165,42,42),
-        "darksalmon"=>array(233,150,122),
-        "salmon"=>array(250,128,114),
-        "lightsalmon"=>array(255,160,122),
-        "orange"=>array(255,165,0),
-        "darkorange"=>array(255,140,0),
-        "coral"=>array(255,127,80),
-        "lightcoral"=>array(240,128,128),
-        "tomato"=>array(255,99,71),
-        "orangered"=>array(255,69,0),
-        "red"=>array(255,0,0),
-        "hotpink"=>array(255,105,180),
-        "deeppink"=>array(255,20,147),
-        "pink"=>array(255,192,203),
-        "lightpink"=>array(255,182,193),
-        "palevioletred"=>array(219,112,147),
-        "maroon"=>array(176,48,96),
-        "mediumvioletred"=>array(199,21,133),
-        "violetred"=>array(208,32,144),
-        "magenta"=>array(255,0,255),
-        "violet"=>array(238,130,238),
-        "plum"=>array(221,160,221),
-        "orchid"=>array(218,112,214),
-        "mediumorchid"=>array(186,85,211),
-        "darkorchid"=>array(153,50,204),
-        "darkviolet"=>array(148,0,211),
-        "blueviolet"=>array(138,43,226),
-        "purple"=>array(160,32,240),
-        "mediumpurple"=>array(147,112,219),
-        "thistle"=>array(216,191,216),
-        "snow1"=>array(255,250,250),
-        "snow2"=>array(238,233,233),
-        "snow3"=>array(205,201,201),
-        "snow4"=>array(139,137,137),
-        "seashell1"=>array(255,245,238),
-        "seashell2"=>array(238,229,222),
-        "seashell3"=>array(205,197,191),
-        "seashell4"=>array(139,134,130),
-        "AntiqueWhite1"=>array(255,239,219),
-        "AntiqueWhite2"=>array(238,223,204),
-        "AntiqueWhite3"=>array(205,192,176),
-        "AntiqueWhite4"=>array(139,131,120),
-        "bisque1"=>array(255,228,196),
-        "bisque2"=>array(238,213,183),
-        "bisque3"=>array(205,183,158),
-        "bisque4"=>array(139,125,107),
-        "peachPuff1"=>array(255,218,185),
-        "peachpuff2"=>array(238,203,173),
-        "peachpuff3"=>array(205,175,149),
-        "peachpuff4"=>array(139,119,101),
-        "navajowhite1"=>array(255,222,173),
-        "navajowhite2"=>array(238,207,161),
-        "navajowhite3"=>array(205,179,139),
-        "navajowhite4"=>array(139,121,94),
-        "lemonchiffon1"=>array(255,250,205),
-        "lemonchiffon2"=>array(238,233,191),
-        "lemonchiffon3"=>array(205,201,165),
-        "lemonchiffon4"=>array(139,137,112),
-        "ivory1"=>array(255,255,240),
-        "ivory2"=>array(238,238,224),
-        "ivory3"=>array(205,205,193),
-        "ivory4"=>array(139,139,131),
-        "honeydew"=>array(193,205,193),
-        "lavenderblush1"=>array(255,240,245),
-        "lavenderblush2"=>array(238,224,229),
-        "lavenderblush3"=>array(205,193,197),
-        "lavenderblush4"=>array(139,131,134),
-        "mistyrose1"=>array(255,228,225),
-        "mistyrose2"=>array(238,213,210),
-        "mistyrose3"=>array(205,183,181),
-        "mistyrose4"=>array(139,125,123),
-        "azure1"=>array(240,255,255),
-        "azure2"=>array(224,238,238),
-        "azure3"=>array(193,205,205),
-        "azure4"=>array(131,139,139),
-        "slateblue1"=>array(131,111,255),
-        "slateblue2"=>array(122,103,238),
-        "slateblue3"=>array(105,89,205),
-        "slateblue4"=>array(71,60,139),
-        "royalblue1"=>array(72,118,255),
-        "royalblue2"=>array(67,110,238),
-        "royalblue3"=>array(58,95,205),
-        "royalblue4"=>array(39,64,139),
-        "dodgerblue1"=>array(30,144,255),
-        "dodgerblue2"=>array(28,134,238),
-        "dodgerblue3"=>array(24,116,205),
-        "dodgerblue4"=>array(16,78,139),
-        "steelblue1"=>array(99,184,255),
-        "steelblue2"=>array(92,172,238),
-        "steelblue3"=>array(79,148,205),
-        "steelblue4"=>array(54,100,139),
-        "deepskyblue1"=>array(0,191,255),
-        "deepskyblue2"=>array(0,178,238),
-        "deepskyblue3"=>array(0,154,205),
-        "deepskyblue4"=>array(0,104,139),
-        "skyblue1"=>array(135,206,255),
-        "skyblue2"=>array(126,192,238),
-        "skyblue3"=>array(108,166,205),
-        "skyblue4"=>array(74,112,139),
-        "lightskyblue1"=>array(176,226,255),
-        "lightskyblue2"=>array(164,211,238),
-        "lightskyblue3"=>array(141,182,205),
-        "lightskyblue4"=>array(96,123,139),
-        "slategray1"=>array(198,226,255),
-        "slategray2"=>array(185,211,238),
-        "slategray3"=>array(159,182,205),
-        "slategray4"=>array(108,123,139),
-        "lightsteelblue1"=>array(202,225,255),
-        "lightsteelblue2"=>array(188,210,238),
-        "lightsteelblue3"=>array(162,181,205),
-        "lightsteelblue4"=>array(110,123,139),
-        "lightblue1"=>array(191,239,255),
-        "lightblue2"=>array(178,223,238),
-        "lightblue3"=>array(154,192,205),
-        "lightblue4"=>array(104,131,139),
-        "lightcyan1"=>array(224,255,255),
-        "lightcyan2"=>array(209,238,238),
-        "lightcyan3"=>array(180,205,205),
-        "lightcyan4"=>array(122,139,139),
-        "paleturquoise1"=>array(187,255,255),
-        "paleturquoise2"=>array(174,238,238),
-        "paleturquoise3"=>array(150,205,205),
-        "paleturquoise4"=>array(102,139,139),
-        "cadetblue1"=>array(152,245,255),
-        "cadetblue2"=>array(142,229,238),
-        "cadetblue3"=>array(122,197,205),
-        "cadetblue4"=>array(83,134,139),
-        "turquoise1"=>array(0,245,255),
-        "turquoise2"=>array(0,229,238),
-        "turquoise3"=>array(0,197,205),
-        "turquoise4"=>array(0,134,139),
-        "cyan1"=>array(0,255,255),
-        "cyan2"=>array(0,238,238),
-        "cyan3"=>array(0,205,205),
-        "cyan4"=>array(0,139,139),
-        "darkslategray1"=>array(151,255,255),
-        "darkslategray2"=>array(141,238,238),
-        "darkslategray3"=>array(121,205,205),
-        "darkslategray4"=>array(82,139,139),
-        "aquamarine1"=>array(127,255,212),
-        "aquamarine2"=>array(118,238,198),
-        "aquamarine3"=>array(102,205,170),
-        "aquamarine4"=>array(69,139,116),
-        "darkseagreen1"=>array(193,255,193),
-        "darkseagreen2"=>array(180,238,180),
-        "darkseagreen3"=>array(155,205,155),
-        "darkseagreen4"=>array(105,139,105),
-        "seagreen1"=>array(84,255,159),
-        "seagreen2"=>array(78,238,148),
-        "seagreen3"=>array(67,205,128),
-        "seagreen4"=>array(46,139,87),
-        "palegreen1"=>array(154,255,154),
-        "palegreen2"=>array(144,238,144),
-        "palegreen3"=>array(124,205,124),
-        "palegreen4"=>array(84,139,84),
-        "springgreen1"=>array(0,255,127),
-        "springgreen2"=>array(0,238,118),
-        "springgreen3"=>array(0,205,102),
-        "springgreen4"=>array(0,139,69),
-        "chartreuse1"=>array(127,255,0),
-        "chartreuse2"=>array(118,238,0),
-        "chartreuse3"=>array(102,205,0),
-        "chartreuse4"=>array(69,139,0),
-        "olivedrab1"=>array(192,255,62),
-        "olivedrab2"=>array(179,238,58),
-        "olivedrab3"=>array(154,205,50),
-        "olivedrab4"=>array(105,139,34),
-        "darkolivegreen1"=>array(202,255,112),
-        "darkolivegreen2"=>array(188,238,104),
-        "darkolivegreen3"=>array(162,205,90),
-        "darkolivegreen4"=>array(110,139,61),
-        "khaki1"=>array(255,246,143),
-        "khaki2"=>array(238,230,133),
-        "khaki3"=>array(205,198,115),
-        "khaki4"=>array(139,134,78),
-        "lightgoldenrod1"=>array(255,236,139),
-        "lightgoldenrod2"=>array(238,220,130),
-        "lightgoldenrod3"=>array(205,190,112),
-        "lightgoldenrod4"=>array(139,129,76),
-        "yellow1"=>array(255,255,0),
-        "yellow2"=>array(238,238,0),
-        "yellow3"=>array(205,205,0),
-        "yellow4"=>array(139,139,0),
-        "gold1"=>array(255,215,0),
-        "gold2"=>array(238,201,0),
-        "gold3"=>array(205,173,0),
-        "gold4"=>array(139,117,0),
-        "goldenrod1"=>array(255,193,37),
-        "goldenrod2"=>array(238,180,34),
-        "goldenrod3"=>array(205,155,29),
-        "goldenrod4"=>array(139,105,20),
-        "darkgoldenrod1"=>array(255,185,15),
-        "darkgoldenrod2"=>array(238,173,14),
-        "darkgoldenrod3"=>array(205,149,12),
-        "darkgoldenrod4"=>array(139,101,8),
-        "rosybrown1"=>array(255,193,193),
-        "rosybrown2"=>array(238,180,180),
-        "rosybrown3"=>array(205,155,155),
-        "rosybrown4"=>array(139,105,105),
-        "indianred1"=>array(255,106,106),
-        "indianred2"=>array(238,99,99),
-        "indianred3"=>array(205,85,85),
-        "indianred4"=>array(139,58,58),
-        "sienna1"=>array(255,130,71),
-        "sienna2"=>array(238,121,66),
-        "sienna3"=>array(205,104,57),
-        "sienna4"=>array(139,71,38),
-        "burlywood1"=>array(255,211,155),
-        "burlywood2"=>array(238,197,145),
-        "burlywood3"=>array(205,170,125),
-        "burlywood4"=>array(139,115,85),
-        "wheat1"=>array(255,231,186),
-        "wheat2"=>array(238,216,174),
-        "wheat3"=>array(205,186,150),
-        "wheat4"=>array(139,126,102),
-        "tan1"=>array(255,165,79),
-        "tan2"=>array(238,154,73),
-        "tan3"=>array(205,133,63),
-        "tan4"=>array(139,90,43),
-        "chocolate1"=>array(255,127,36),
-        "chocolate2"=>array(238,118,33),
-        "chocolate3"=>array(205,102,29),
-        "chocolate4"=>array(139,69,19),
-        "firebrick1"=>array(255,48,48),
-        "firebrick2"=>array(238,44,44),
-        "firebrick3"=>array(205,38,38),
-        "firebrick4"=>array(139,26,26),
-        "brown1"=>array(255,64,64),
-        "brown2"=>array(238,59,59),
-        "brown3"=>array(205,51,51),
-        "brown4"=>array(139,35,35),
-        "salmon1"=>array(255,140,105),
-        "salmon2"=>array(238,130,98),
-        "salmon3"=>array(205,112,84),
-        "salmon4"=>array(139,76,57),
-        "lightsalmon1"=>array(255,160,122),
-        "lightsalmon2"=>array(238,149,114),
-        "lightsalmon3"=>array(205,129,98),
-        "lightsalmon4"=>array(139,87,66),
-        "orange1"=>array(255,165,0),
-        "orange2"=>array(238,154,0),
-        "orange3"=>array(205,133,0),
-        "orange4"=>array(139,90,0),
-        "darkorange1"=>array(255,127,0),
-        "darkorange2"=>array(238,118,0),
-        "darkorange3"=>array(205,102,0),
-        "darkorange4"=>array(139,69,0),
-        "coral1"=>array(255,114,86),
-        "coral2"=>array(238,106,80),
-        "coral3"=>array(205,91,69),
-        "coral4"=>array(139,62,47),
-        "tomato1"=>array(255,99,71),
-        "tomato2"=>array(238,92,66),
-        "tomato3"=>array(205,79,57),
-        "tomato4"=>array(139,54,38),
-        "orangered1"=>array(255,69,0),
-        "orangered2"=>array(238,64,0),
-        "orangered3"=>array(205,55,0),
-        "orangered4"=>array(139,37,0),
-        "deeppink1"=>array(255,20,147),
-        "deeppink2"=>array(238,18,137),
-        "deeppink3"=>array(205,16,118),
-        "deeppink4"=>array(139,10,80),
-        "hotpink1"=>array(255,110,180),
-        "hotpink2"=>array(238,106,167),
-        "hotpink3"=>array(205,96,144),
-        "hotpink4"=>array(139,58,98),
-        "pink1"=>array(255,181,197),
-        "pink2"=>array(238,169,184),
-        "pink3"=>array(205,145,158),
-        "pink4"=>array(139,99,108),
-        "lightpink1"=>array(255,174,185),
-        "lightpink2"=>array(238,162,173),
-        "lightpink3"=>array(205,140,149),
-        "lightpink4"=>array(139,95,101),
-        "palevioletred1"=>array(255,130,171),
-        "palevioletred2"=>array(238,121,159),
-        "palevioletred3"=>array(205,104,137),
-        "palevioletred4"=>array(139,71,93),
-        "maroon1"=>array(255,52,179),
-        "maroon2"=>array(238,48,167),
-        "maroon3"=>array(205,41,144),
-        "maroon4"=>array(139,28,98),
-        "violetred1"=>array(255,62,150),
-        "violetred2"=>array(238,58,140),
-        "violetred3"=>array(205,50,120),
-        "violetred4"=>array(139,34,82),
-        "magenta1"=>array(255,0,255),
-        "magenta2"=>array(238,0,238),
-        "magenta3"=>array(205,0,205),
-        "magenta4"=>array(139,0,139),
-        "mediumred"=>array(140,34,34),
-        "orchid1"=>array(255,131,250),
-        "orchid2"=>array(238,122,233),
-        "orchid3"=>array(205,105,201),
-        "orchid4"=>array(139,71,137),
-        "plum1"=>array(255,187,255),
-        "plum2"=>array(238,174,238),
-        "plum3"=>array(205,150,205),
-        "plum4"=>array(139,102,139),
-        "mediumorchid1"=>array(224,102,255),
-        "mediumorchid2"=>array(209,95,238),
-        "mediumorchid3"=>array(180,82,205),
-        "mediumorchid4"=>array(122,55,139),
-        "darkorchid1"=>array(191,62,255),
-        "darkorchid2"=>array(178,58,238),
-        "darkorchid3"=>array(154,50,205),
-        "darkorchid4"=>array(104,34,139),
-        "purple1"=>array(155,48,255),
-        "purple2"=>array(145,44,238),
-        "purple3"=>array(125,38,205),
-        "purple4"=>array(85,26,139),
-        "mediumpurple1"=>array(171,130,255),
-        "mediumpurple2"=>array(159,121,238),
-        "mediumpurple3"=>array(137,104,205),
-        "mediumpurple4"=>array(93,71,139),
-        "thistle1"=>array(255,225,255),
-        "thistle2"=>array(238,210,238),
-        "thistle3"=>array(205,181,205),
-        "thistle4"=>array(139,123,139),
-        "gray1"=>array(10,10,10),
-        "gray2"=>array(40,40,30),
-        "gray3"=>array(70,70,70),
-        "gray4"=>array(100,100,100),
-        "gray5"=>array(130,130,130),
-        "gray6"=>array(160,160,160),
-        "gray7"=>array(190,190,190),
-        "gray8"=>array(210,210,210),
-        "gray9"=>array(240,240,240),
-        "darkgray"=>array(100,100,100),
-        "darkblue"=>array(0,0,139),
-        "darkcyan"=>array(0,139,139),
-        "darkmagenta"=>array(139,0,139),
-        "darkred"=>array(139,0,0),
-        "silver"=>array(192, 192, 192),
-        "eggplant"=>array(144,176,168),
-        "lightgreen"=>array(144,238,144));
-    }
-//----------------
-// PUBLIC METHODS
-    // Colors can be specified as either
-    // 1. #xxxxxx			HTML style
-    // 2. "colorname" 	as a named color
-    // 3. array(r,g,b)	RGB triple
-    // This function translates this to a native RGB format and returns an
-    // RGB triple.
-    public function Color($aColor)
-    {
-    if (is_string($aColor)) {
-        // Strip of any alpha factor
-        $pos = strpos($aColor,'@');
-        if ($pos === false) {
-        $alpha = 0;
-        } else {
-        $pos2 = strpos($aColor,':');
-        if( $pos2===false )
-            $pos2 = $pos-1; // Sentinel
-        if ($pos > $pos2) {
-            $alpha = substr($aColor,$pos+1);
-            $aColor = substr($aColor,0,$pos);
-        } else {
-            $alpha = substr($aColor,$pos+1,$pos2-$pos-1);
-            $aColor = substr($aColor,0,$pos).substr($aColor,$pos2);
-        }
-        }
-
-        // Extract potential adjustment figure at end of color
-        // specification
-        $pos = strpos($aColor,":");
-        if ($pos === false) {
-        $adj = 1.0;
-        } else {
-        $adj = 0.0 + substr($aColor,$pos+1);
-        $aColor = substr($aColor,0,$pos);
-        }
-        if( $adj < 0 )
-        JpGraphError::Raise('Adjustment factor for color must be > 0');
-
-        if (substr($aColor, 0, 1) == "#") {
-        $r = hexdec(substr($aColor, 1, 2));
-        $g = hexdec(substr($aColor, 3, 2));
-        $b = hexdec(substr($aColor, 5, 2));
-        } else {
-              if(!isset($this->rgb_table[$aColor]) )
-            JpGraphError::Raise(" Unknown color: $aColor");
-        $tmp=$this->rgb_table[$aColor];
-        $r = $tmp[0];
-        $g = $tmp[1];
-        $b = $tmp[2];
-        }
-        // Scale adj so that an adj=2 always
-        // makes the color 100% white (i.e. 255,255,255.
-        // and adj=1 neutral and adj=0 black.
-        if ($adj > 1) {
-        $m = ($adj-1.0)*(255-min(255,min($r,min($g,$b))));
-
-        return array(min(255,$r+$m), min(255,$g+$m), min(255,$b+$m),$alpha);
-        } elseif ($adj < 1) {
-        $m = ($adj-1.0)*max(255,max($r,max($g,$b)));
-
-        return array(max(0,$r+$m), max(0,$g+$m), max(0,$b+$m),$alpha);
-        } else {
-        return array($r,$g,$b,$alpha);
-        }
-
-    } elseif ( is_array($aColor) ) {
-        if ( count($aColor)==3 ) {
-        $aColor[3]=0;
-
-        return $aColor;
-        } else
-
-        return $aColor;
-    } else
-        JpGraphError::Raise(" Unknown color specification: $aColor , size=".count($aColor));
-    }
-
-    // Compare two colors
-    // return true if equal
-    public function Equal($aCol1,$aCol2)
-    {
-    $c1 = $this->Color($aCol1);
-    $c2 = $this->Color($aCol2);
-    if( $c1[0]==$c2[0] && $c1[1]==$c2[1] && $c1[2]==$c2[2] )
-
-        return true;
-    else
-        return false;
-    }
-
-    // Allocate a new color in the current image
-    // Return new color index, -1 if no more colors could be allocated
-    public function Allocate($aColor,$aAlpha=0.0)
-    {
-    list ($r, $g, $b, $a) = $this->color($aColor);
-    // If alpha is specified in the color string then this
-    // takes precedence over the second argument
-    if( $a > 0 )
-        $aAlpha = $a;
-    if ($GLOBALS['gd2']) {
-        if ($aAlpha < 0 || $aAlpha > 1) {
-        JpGraphError::Raise('Alpha parameter for color must be between 0.0 and 1.0');
-        exit(1);
-        }
-
-        return imagecolorresolvealpha($this->img, $r, $g, $b, round($aAlpha * 127));
-    } else {
-        $index = imagecolorexact($this->img, $r, $g, $b);
-        if ($index == -1) {
-              $index = imagecolorallocate($this->img, $r, $g, $b);
-              if( USE_APPROX_COLORS && $index == -1 )
-            $index = imagecolorresolve($this->img, $r, $g, $b);
-        }
-
-        return $index;
-    }
-    }
-} // Class
-
-//===================================================
-// CLASS Image
-// Description: Wrapper class with some goodies to form the
-// Interface to low level image drawing routines.
-//===================================================
-class Image
-{
-    public $img_format;
-    public $expired=true;
-    public $img=null;
-    public $left_margin=30,$right_margin=30,$top_margin=20,$bottom_margin=30;
-    public $plotwidth=0,$plotheight=0;
-    public $rgb=null;
-    public $current_color,$current_color_name;
-    public $lastx=0, $lasty=0;
-    public $width=0, $height=0;
-    public $line_weight=1;
-    public $line_style=1;	// Default line style is solid
-    public $obs_list=array();
-    public $font_size=12,$font_family=FF_FONT1, $font_style=FS_NORMAL;
-    public $font_file='';
-    public $text_halign="left",$text_valign="bottom";
-    public $ttf=null;
-    public $use_anti_aliasing=false;
-    public $quality=null;
-    public $colorstack=array(),$colorstackidx=0;
-    public $canvascolor = 'white' ;
-    public $langconv = null ;
-
-    //---------------
-    // CONSTRUCTOR
-    public function Image($aWidth,$aHeight,$aFormat=DEFAULT_GFORMAT)
-    {
-    $this->CreateImgCanvas($aWidth,$aHeight);
-    $this->SetAutoMargin();
-
-    if ( !$this->SetImgFormat($aFormat) ) {
-        JpGraphError::Raise("JpGraph: Selected graphic format is either not supported or unknown [$aFormat]");
-    }
-    $this->ttf = new TTF();
-    $this->langconv = new LanguageConv();
-    }
-
-    // Should we use anti-aliasing. Note: This really slows down graphics!
-    public function SetAntiAliasing()
-    {
-    $this->use_anti_aliasing=true;
-    }
-
-    public function CreateRawCanvas($aWidth=0,$aHeight=0)
-    {
-    if ($aWidth <= 1 || $aHeight <= 1) {
-        JpGraphError::Raise("Illegal sizes specified for width or height when creating an image, (width=$aWidth, height=$aHeight)");
-    }
-    if (@$GLOBALS['gd2']==true && USE_TRUECOLOR) {
-        $this->img = @imagecreatetruecolor($aWidth, $aHeight);
-        if ($this->img < 1) {
-        die("<b>JpGraph Error:</b> Can't create truecolor image. Check that you really have GD2 library installed.");
-        }
-        $this->SetAlphaBlending();
-    } else {
-        $this->img = @imagecreate($aWidth, $aHeight);
-        if ($this->img < 1) {
-        die("<b>JpGraph Error:</b> Can't create image. Check that you really have the GD library installed.");
+    function Translate($aCoord) {
+        if( !is_numeric($aCoord) ) {
+            if( $aCoord != '' && $aCoord != '-' && $aCoord != 'x' ) {
+                JpGraphError::RaiseL(25070);//('Your data contains non-numeric values.');
+            }
+            return 0;
+        }
+        else {
+            return round($this->off+($aCoord - $this->scale[0]) * $this->scale_factor);
         }
-    }
-    if( $this->rgb != null )
-        $this->rgb->img = $this->img ;
-    else
-        $this->rgb = new RGB($this->img);
-    }
-
-    public function CloneCanvasH()
-    {
-    $oldimage = $this->img;
-    $this->CreateRawCanvas($this->width,$this->height);
-    imagecopy($this->img,$oldimage,0,0,0,0,$this->width,$this->height);
-
-    return $oldimage;
-    }
-
-    public function CreateImgCanvas($aWidth=0,$aHeight=0)
-    {
-    $old = array($this->img,$this->width,$this->height);
-
-    $aWidth = round($aWidth);
-    $aHeight = round($aHeight);
-
-    $this->width=$aWidth;
-    $this->height=$aHeight;
-
-    if ($aWidth==0 || $aHeight==0) {
-        // We will set the final size later.
-        // Note: The size must be specified before any other
-        // img routines that stroke anything are called.
-        $this->img = null;
-        $this->rgb = null;
-
-        return $old;
-    }
-
-    $this->CreateRawCanvas($aWidth,$aHeight);
-
-    // Set canvas color (will also be the background color for a
-    // a pallett image
-    $this->SetColor($this->canvascolor);
-    $this->FilledRectangle(0,0,$aWidth,$aHeight);
-
-    return $old ;
-    }
-
-    public function CopyCanvasH($aToHdl,$aFromHdl,$aToX,$aToY,$aFromX,$aFromY,$aWidth,$aHeight,$aw=-1,$ah=-1)
-    {
-    if ($aw === -1) {
-        $aw = $aWidth;
-        $ah = $aHeight;
-        $f = 'imagecopyresized';
-    } else {
-        $f = $GLOBALS['copyfunc'] ;
-    }
-    $f($aToHdl,$aFromHdl,
-       $aToX,$aToY,$aFromX,$aFromY, $aWidth,$aHeight,$aw,$ah);
-    }
-
-    public function Copy($fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth=-1,$fromHeight=-1)
-    {
-    $this->CopyCanvasH($this->img,$fromImg,$toX,$toY,$fromX,$fromY,
-               $toWidth,$toHeight,$fromWidth,$fromHeight);
-    }
-
-    public function CopyMerge($fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth=-1,$fromHeight=-1,$aMix=100)
-    {
-    if ($aMix == 100) {
-        $this->CopyCanvasH($this->img,$fromImg,
-                   $toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$fromWidth,$fromHeight);
-    } else {
-        if( ($fromWidth  != -1 && ($fromWidth != $toWidth))  ||
-        ($fromHeight != -1 && ($fromHeight != $fromHeight)) ) {
-        // Create a new canvas that will hold the re-scaled original from image
-        if ($toWidth <= 1 || $toHeight <= 1) {
-            JpGraphError::Raise('Illegal image size when copying image. Size for copied to image is 1 pixel or less.');
-        }
-        if (@$GLOBALS['gd2']==true && USE_TRUECOLOR) {
-            $tmpimg = @imagecreatetruecolor($toWidth, $toHeight);
-        } else {
-            $tmpimg = @imagecreate($toWidth, $toHeight);
-        }
-        if ($tmpimg < 1) {
-            JpGraphError::Raise('Failed to create temporary GD canvas. Out of memory ?');
-        }
-        $this->CopyCanvasH($tmpimg,$fromImg,0,0,0,0,
-                   $toWidth,$toHeight,$fromWidth,$fromHeight);
-        $fromImg = $tmpimg;
-        }
-        imagecopymerge($this->img,$fromImg,$toX,$toY,$fromX,$fromY,$toWidth,$toHeight,$aMix);
-    }
-    }
-
-    public function GetWidth($aImg=null)
-    {
-    if( $aImg === null )
-        $aImg = $this->img;
-
-    return imagesx($aImg);
-    }
-
-    public function GetHeight($aImg=null)
-    {
-    if( $aImg === null )
-        $aImg = $this->img;
-
-    return imagesy($aImg);
-    }
-
-    public function CreateFromString($aStr)
-    {
-    return imagecreatefromstring($aStr);
-    }
-
-    public function SetCanvasH($aHdl)
-    {
-    $this->img = $aHdl;
-    $this->rgb->img = $aHdl;
-    }
-
-    public function SetCanvasColor($aColor)
-    {
-    $this->canvascolor = $aColor ;
-    }
-
-    public function SetAlphaBlending($aFlg=true)
-    {
-    if( $GLOBALS['gd2'] )
-        ImageAlphaBlending($this->img,$aFlg);
-    else
-        JpGraphError::Raise('You only seem to have GD 1.x installed. To enable Alphablending requires GD 2.x or higher. Please install GD or make sure the constant USE_GD2 is specified correctly to reflect your installation. By default it tries to autodetect what version of GD you have installed. On some very rare occasions it may falsely detect GD2 where only GD1 is installed. You must then set USE_GD2 to false.');
-    }
-
-    public function SetAutoMargin()
-    {
-    GLOBAL $gJpgBrandTiming;
-    $min_bm=0;
-    /*
-    if( $gJpgBrandTiming )
-        $min_bm=15;
-    */
-    $lm = max(0,$this->width/7);
-    $rm = max(0,$this->width/10);
-    $tm = max(0,$this->height/7);
-    $bm = max($min_bm,$this->height/7);
-    $this->SetMargin($lm,$rm,$tm,$bm);
-    }
-
-    //---------------
-    // PUBLIC METHODS
-
-    public function SetFont($family,$style=FS_NORMAL,$size=10)
-    {
-    $this->font_family=$family;
-    $this->font_style=$style;
-    $this->font_size=$size;
-    $this->font_file='';
-    if ( ($this->font_family==FF_FONT1 || $this->font_family==FF_FONT2) && $this->font_style==FS_BOLD ) {
-        ++$this->font_family;
-    }
-    if ($this->font_family > FF_FONT2+1) { // A TTF font so get the font file
-
-        // Check that this PHP has support for TTF fonts
-        if ( !function_exists('imagettfbbox') ) {
-        JpGraphError::Raise('This PHP build has not been configured with TTF support. You need to recompile your PHP installation with FreeType support.');
-        exit();
-        }
-        $this->font_file = $this->ttf->File($this->font_family,$this->font_style);
-    }
-    }
-
-    // Get the specific height for a text string
-    public function GetTextHeight($txt="",$angle=0)
-    {
-    $tmp = preg_split("/\n/",$txt);
-    $n = count($tmp);
-    $m=0;
-    for($i=0; $i< $n; ++$i)
-        $m = max($m,strlen($tmp[$i]));
-
-    if ($this->font_family <= FF_FONT2+1) {
-        if ($angle==0) {
-        $h = imagefontheight($this->font_family);
-        if ($h === false) {
-            JpGraphError::Raise('You have a misconfigured GD font support. The call to imagefontwidth() fails.');
-        }
-
-        return $n*$h;
-        } else {
-        $w = @imagefontwidth($this->font_family);
-        if ($w === false) {
-            JpGraphError::Raise('You have a misconfigured GD font support. The call to imagefontwidth() fails.');
-        }
-
-        return $m*$w;
-        }
-    } else {
-        $bbox = $this->GetTTFBBox($txt,$angle);
-
-        return $bbox[1]-$bbox[5];
-    }
-    }
-
-    // Estimate font height
-    public function GetFontHeight($angle=0)
-    {
-    $txt = "XOMg";
-
-    return $this->GetTextHeight($txt,$angle);
-    }
-
-    // Approximate font width with width of letter "O"
-    public function GetFontWidth($angle=0)
-    {
-    $txt = 'O';
-
-    return $this->GetTextWidth($txt,$angle);
-    }
-
-    // Get actual width of text in absolute pixels
-    public function GetTextWidth($txt,$angle=0)
-    {
-    $tmp = preg_split("/\n/",$txt);
-    $n = count($tmp);
-    if ($this->font_family <= FF_FONT2+1) {
-
-        $m=0;
-        for ($i=0; $i < $n; ++$i) {
-        $l=strlen($tmp[$i]);
-        if ($l > $m) {
-            $m = $l;
-        }
-        }
-
-        if ($angle==0) {
-        $w = @imagefontwidth($this->font_family);
-        if ($w === false) {
-            JpGraphError::Raise('You have a misconfigured GD font support. The call to imagefontwidth() fails.');
-        }
-
-        return $m*$w;
-        } else {
-        // 90 degrees internal so height becomes width
-        $h = @imagefontheight($this->font_family);
-        if ($h === false) {
-            JpGraphError::Raise('You have a misconfigured GD font support. The call to imagefontheight() fails.');
-        }
-
-        return $n*$h;
-        }
-    } else {
-        // For TTF fonts we must walk through a lines and find the
-        // widest one which we use as the width of the multi-line
-        // paragraph
-        $m=0;
-        for ($i=0; $i < $n; ++$i) {
-        $bbox = $this->GetTTFBBox($tmp[$i],$angle);
-        $mm =  $bbox[2] - $bbox[0];
-        if( $mm > $m )
-            $m = $mm;
-        }
-
-        return $m;
-    }
-    }
-
-    // Draw text with a box around it
-    public function StrokeBoxedText($x,$y,$txt,$dir=0,$fcolor="white",$bcolor="black",
-                 $shadowcolor=false,$paragraph_align="left",
-                 $xmarg=6,$ymarg=4,$cornerradius=0,$dropwidth=3) {
-
-    if ( !is_numeric($dir) ) {
-        if( $dir=="h" ) $dir=0;
-        elseif( $dir=="v" ) $dir=90;
-        else JpGraphError::Raise(" Unknown direction specified in call to StrokeBoxedText() [$dir]");
-    }
-
-    if ($this->font_family >= FF_FONT0 && $this->font_family <= FF_FONT2+1) {
-        $width=$this->GetTextWidth($txt,$dir) ;
-        $height=$this->GetTextHeight($txt,$dir) ;
-    } else {
-        $width=$this->GetBBoxWidth($txt,$dir) ;
-        $height=$this->GetBBoxHeight($txt,$dir) ;
-    }
-
-    $height += 2*$ymarg;
-    $width  += 2*$xmarg;
-
-    if( $this->text_halign=="right" ) $x -= $width;
-    elseif( $this->text_halign=="center" ) $x -= $width/2;
-    if( $this->text_valign=="bottom" ) $y -= $height;
-    elseif( $this->text_valign=="center" ) $y -= $height/2;
-
-    if ($shadowcolor) {
-        $this->PushColor($shadowcolor);
-        $this->FilledRoundedRectangle($x-$xmarg+$dropwidth,$y-$ymarg+$dropwidth,
-                      $x+$width+$dropwidth,$y+$height-$ymarg+$dropwidth,
-                      $cornerradius);
-        $this->PopColor();
-        $this->PushColor($fcolor);
-        $this->FilledRoundedRectangle($x-$xmarg,$y-$ymarg,
-                      $x+$width,$y+$height-$ymarg,
-                      $cornerradius);
-        $this->PopColor();
-        $this->PushColor($bcolor);
-        $this->RoundedRectangle($x-$xmarg,$y-$ymarg,
-                    $x+$width,$y+$height-$ymarg,$cornerradius);
-        $this->PopColor();
-    } else {
-        if ($fcolor) {
-        $oc=$this->current_color;
-        $this->SetColor($fcolor);
-        $this->FilledRoundedRectangle($x-$xmarg,$y-$ymarg,$x+$width,$y+$height-$ymarg,$cornerradius);
-        $this->current_color=$oc;
-        }
-        if ($bcolor) {
-        $oc=$this->current_color;
-        $this->SetColor($bcolor);
-        $this->RoundedRectangle($x-$xmarg,$y-$ymarg,$x+$width,$y+$height-$ymarg,$cornerradius);
-        $this->current_color=$oc;
-        }
-    }
-
-    $h=$this->text_halign;
-    $v=$this->text_valign;
-    $this->SetTextAlign("left","top");
-    $this->StrokeText($x, $y, $txt, $dir, $paragraph_align);
-    $bb = array($x-$xmarg,$y+$height-$ymarg,$x+$width,$y+$height-$ymarg,
-            $x+$width,$y-$ymarg,$x-$xmarg,$y-$ymarg);
-    $this->SetTextAlign($h,$v);
-
-    return $bb;
-    }
-
-    // Set text alignment
-    public function SetTextAlign($halign,$valign="bottom")
-    {
-    $this->text_halign=$halign;
-    $this->text_valign=$valign;
-    }
-
-    public function _StrokeBuiltinFont($x,$y,$txt,$dir=0,$paragraph_align="left",&$aBoundingBox,$aDebug=false)
-    {
-    if( is_numeric($dir) && $dir!=90 && $dir!=0)
-        JpGraphError::Raise(" Internal font does not support drawing text at arbitrary angle. Use TTF fonts instead.");
-
-    $h=$this->GetTextHeight($txt);
-    $fh=$this->GetFontHeight();
-    $w=$this->GetTextWidth($txt);
-
-    if( $this->text_halign=="right")
-        $x -= $dir==0 ? $w : $h;
-    elseif ($this->text_halign=="center") {
-        // For center we subtract 1 pixel since this makes the middle
-        // be prefectly in the middle
-        $x -= $dir==0 ? $w/2-1 : $h/2;
-    }
-    if( $this->text_valign=="top" )
-        $y += $dir==0 ? $h : $w;
-    elseif( $this->text_valign=="center" )
-        $y += $dir==0 ? $h/2 : $w/2;
-
-    if ($dir==90) {
-        imagestringup($this->img,$this->font_family,$x,$y,$txt,$this->current_color);
-        $aBoundingBox = array(round($x),round($y),round($x),round($y-$w),round($x+$h),round($y-$w),round($x+$h),round($y));
-            if ($aDebug) {
-        // Draw bounding box
-        $this->PushColor('green');
-        $this->Polygon($aBoundingBox,true);
-        $this->PopColor();
-        }
-    } else {
-        if ( preg_match("/\n/",$txt) ) {
-        $tmp = preg_split("/\n/",$txt);
-        for ($i=0; $i < count($tmp); ++$i) {
-            $w1 = $this->GetTextWidth($tmp[$i]);
-            if ($paragraph_align=="left") {
-            imagestring($this->img,$this->font_family,$x,$y-$h+1+$i*$fh,$tmp[$i],$this->current_color);
-            } elseif ($paragraph_align=="right") {
-            imagestring($this->img,$this->font_family,$x+($w-$w1),
-                    $y-$h+1+$i*$fh,$tmp[$i],$this->current_color);
-            } else {
-            imagestring($this->img,$this->font_family,$x+$w/2-$w1/2,
-                    $y-$h+1+$i*$fh,$tmp[$i],$this->current_color);
-            }
-        }
-        } else {
-        //Put the text
-        imagestring($this->img,$this->font_family,$x,$y-$h+1,$txt,$this->current_color);
-        }
-            if ($aDebug) {
-        // Draw the bounding rectangle and the bounding box
-        $p1 = array(round($x),round($y),round($x),round($y-$h),round($x+$w),round($y-$h),round($x+$w),round($y));
-
-        // Draw bounding box
-        $this->PushColor('green');
-        $this->Polygon($p1,true);
-        $this->PopColor();
-
-            }
-        $aBoundingBox=array(round($x),round($y),round($x),round($y-$h),round($x+$w),round($y-$h),round($x+$w),round($y));
-    }
-    }
-
-    public function AddTxtCR($aTxt)
-    {
-    // If the user has just specified a '\n'
-    // instead of '\n\t' we have to add '\r' since
-    // the width will be too muchy otherwise since when
-    // we print we stroke the individually lines by hand.
-    $e = explode("\n",$aTxt);
-    $n = count($e);
-    for ($i=0; $i<$n; ++$i) {
-        $e[$i]=str_replace("\r","",$e[$i]);
-    }
-
-    return implode("\n\r",$e);
-    }
-
-    public function GetTTFBBox($aTxt,$aAngle=0)
-    {
-    $bbox = @ImageTTFBBox($this->font_size,$aAngle,$this->font_file,$aTxt);
-    if ($bbox === false) {
-        JpGraphError::Raise("There is either a configuration problem with TrueType or a problem reading font file (".$this->font_file."). Make sure file exists and is in a readable place for the HTTP process. (If 'basedir' restriction is enabled in PHP then the font file must be located in the document root.). It might also be a wrongly installed FreeType library. Try uppgrading to at least FreeType 2.1.13 and recompile GD with the correct setup so it can find the new FT library.");
-    }
-
-    return $bbox;
-    }
-
-    public function GetBBoxTTF($aTxt,$aAngle=0)
-    {
-    // Normalize the bounding box to become a minimum
-    // enscribing rectangle
-
-    $aTxt = $this->AddTxtCR($aTxt);
-
-    if ( !is_readable($this->font_file) ) {
-        JpGraphError::Raise('Can not read font file ('.$this->font_file.') in call to Image::GetBBoxTTF. Please make sure that you have set a font before calling this method and that the font is installed in the TTF directory.');
-    }
-    $bbox = $this->GetTTFBBox($aTxt,$aAngle);
-
-    if( $aAngle==0 )
-
-        return $bbox;
-    if ($aAngle >= 0) {
-        if ($aAngle <= 90) { //<=0
-        $bbox = array($bbox[6],$bbox[1],$bbox[2],$bbox[1],
-                  $bbox[2],$bbox[5],$bbox[6],$bbox[5]);
-        } elseif ($aAngle <= 180) { //<= 2
-        $bbox = array($bbox[4],$bbox[7],$bbox[0],$bbox[7],
-                  $bbox[0],$bbox[3],$bbox[4],$bbox[3]);
-        } elseif ($aAngle <= 270) { //<= 3
-        $bbox = array($bbox[2],$bbox[5],$bbox[6],$bbox[5],
-                  $bbox[6],$bbox[1],$bbox[2],$bbox[1]);
-        } else {
-        $bbox = array($bbox[0],$bbox[3],$bbox[4],$bbox[3],
-                  $bbox[4],$bbox[7],$bbox[0],$bbox[7]);
-        }
-    } elseif ($aAngle < 0) {
-        if ($aAngle <= -270) { // <= -3
-        $bbox = array($bbox[6],$bbox[1],$bbox[2],$bbox[1],
-                  $bbox[2],$bbox[5],$bbox[6],$bbox[5]);
-        } elseif ($aAngle <= -180) { // <= -2
-        $bbox = array($bbox[0],$bbox[3],$bbox[4],$bbox[3],
-                  $bbox[4],$bbox[7],$bbox[0],$bbox[7]);
-        } elseif ($aAngle <= -90) { // <= -1
-        $bbox = array($bbox[2],$bbox[5],$bbox[6],$bbox[5],
-                  $bbox[6],$bbox[1],$bbox[2],$bbox[1]);
-        } else {
-        $bbox = array($bbox[0],$bbox[3],$bbox[4],$bbox[3],
-                  $bbox[4],$bbox[7],$bbox[0],$bbox[7]);
-        }
-    }
-
-    return $bbox;
-    }
-
-    public function GetBBoxHeight($aTxt,$aAngle=0)
-    {
-    $box = $this->GetBBoxTTF($aTxt,$aAngle);
-
-    return $box[1]-$box[7]+1;
-    }
-
-    public function GetBBoxWidth($aTxt,$aAngle=0)
-    {
-    $box = $this->GetBBoxTTF($aTxt,$aAngle);
-
-    return $box[2]-$box[0]+1;
-    }
-
-    public function _StrokeTTF($x,$y,$txt,$dir=0,$paragraph_align="left",&$aBoundingBox,$debug=false)
-    {
-    // Setupo default inter line margin for paragraphs to
-    // 25% of the font height.
-    $ConstLineSpacing = 0.25 ;
-
-    // Remember the anchor point before adjustment
-    if ($debug) {
-        $ox=$x;
-        $oy=$y;
-    }
-
-    if ( !preg_match("/\n/",$txt) || ($dir>0 && preg_match("/\n/",$txt)) ) {
-        // Format a single line
-
-        $txt = $this->AddTxtCR($txt);
-
-        $bbox=$this->GetBBoxTTF($txt,$dir);
-
-        // Align x,y ot lower left corner of bbox
-        $x -= $bbox[0];
-        $y -= $bbox[1];
-
-        // Note to self: "topanchor" is deprecated after we changed the
-        // bopunding box stuff.
-        if( $this->text_halign=="right" || $this->text_halign=="topanchor" )
-        $x -= $bbox[2]-$bbox[0];
-        elseif( $this->text_halign=="center" ) $x -= ($bbox[2]-$bbox[0])/2;
-
-        if( $this->text_valign=="top" ) $y += abs($bbox[5])+$bbox[1];
-        elseif( $this->text_valign=="center" ) $y -= ($bbox[5]-$bbox[1])/2;
-
-        ImageTTFText ($this->img, $this->font_size, $dir, $x, $y,
-              $this->current_color,$this->font_file,$txt);
-
-        // Calculate and return the co-ordinates for the bounding box
-        $box=@ImageTTFBBox($this->font_size,$dir,$this->font_file,$txt);
-        $p1 = array();
-
-        for ($i=0; $i < 4; ++$i) {
-        $p1[] = round($box[$i*2]+$x);
-        $p1[] = round($box[$i*2+1]+$y);
-        }
-        $aBoundingBox = $p1;
-
-        // Debugging code to highlight the bonding box and bounding rectangle
-        // For text at 0 degrees the bounding box and bounding rectangle are the
-        // same
-            if ($debug) {
-        // Draw the bounding rectangle and the bounding box
-        $box=@ImageTTFBBox($this->font_size,$dir,$this->font_file,$txt);
-        $p = array();
-        $p1 = array();
-        for ($i=0; $i < 4; ++$i) {
-            $p[] = $bbox[$i*2]+$x;
-            $p[] = $bbox[$i*2+1]+$y;
-            $p1[] = $box[$i*2]+$x;
-            $p1[] = $box[$i*2+1]+$y;
-        }
-
-        // Draw bounding box
-        $this->PushColor('green');
-        $this->Polygon($p1,true);
-        $this->PopColor();
-
-        // Draw bounding rectangle
-        $this->PushColor('darkgreen');
-        $this->Polygon($p,true);
-        $this->PopColor();
-
-        // Draw a cross at the anchor point
-        $this->PushColor('red');
-        $this->Line($ox-15,$oy,$ox+15,$oy);
-        $this->Line($ox,$oy-15,$ox,$oy+15);
-        $this->PopColor();
-            }
-    } else {
-        // Format a text paragraph
-        $fh=$this->GetFontHeight();
-
-        // Line margin is 25% of font height
-        $linemargin=round($fh*$ConstLineSpacing);
-        $fh += $linemargin;
-        $w=$this->GetTextWidth($txt);
-
-        $y -= $linemargin/2;
-        $tmp = preg_split("/\n/",$txt);
-        $nl = count($tmp);
-        $h = $nl * $fh;
-
-        if( $this->text_halign=="right")
-        $x -= $dir==0 ? $w : $h;
-        elseif ($this->text_halign=="center") {
-        $x -= $dir==0 ? $w/2 : $h/2;
-        }
-
-        if( $this->text_valign=="top" )
-        $y +=	$dir==0 ? $h : $w;
-        elseif( $this->text_valign=="center" )
-        $y +=	$dir==0 ? $h/2 : $w/2;
-
-        // Here comes a tricky bit.
-        // Since we have to give the position for the string at the
-        // baseline this means thaht text will move slightly up
-        // and down depending on any of it's character descend below
-        // the baseline, for example a 'g'. To adjust the Y-position
-        // we therefore adjust the text with the baseline Y-offset
-        // as used for the current font and size. This will keep the
-        // baseline at a fixed positoned disregarding the actual
-        // characters in the string.
-        $standardbox = $this->GetTTFBBox('Gg',$dir);
-        $yadj = $standardbox[1];
-        $xadj = $standardbox[0];
-        $aBoundingBox = array();
-        for ($i=0; $i < $nl; ++$i) {
-        $wl = $this->GetTextWidth($tmp[$i]);
-        $bbox = $this->GetTTFBBox($tmp[$i],$dir);
-        if ($paragraph_align=="left") {
-            $xl = $x;
-        } elseif ($paragraph_align=="right") {
-            $xl = $x + ($w-$wl);
-        } else {
-            // Center
-            $xl = $x + $w/2 - $wl/2 ;
-        }
-
-        $xl -= $bbox[0];
-        $yl = $y - $yadj;
-        $xl = $xl - $xadj;
-        ImageTTFText ($this->img, $this->font_size, $dir,
-                  $xl, $yl-($h-$fh)+$fh*$i,
-                  $this->current_color,$this->font_file,$tmp[$i]);
-
-        if ($debug) {
-            // Draw the bounding rectangle around each line
-            $box=@ImageTTFBBox($this->font_size,$dir,$this->font_file,$tmp[$i]);
-            $p = array();
-            for ($j=0; $j < 4; ++$j) {
-            $p[] = $bbox[$j*2]+$xl;
-            $p[] = $bbox[$j*2+1]+$yl-($h-$fh)+$fh*$i;
-            }
-
-            // Draw bounding rectangle
-            $this->PushColor('darkgreen');
-            $this->Polygon($p,true);
-            $this->PopColor();
-        }
-        }
-
-        // Get the bounding box
-        $bbox = $this->GetBBoxTTF($txt,$dir);
-        for ($j=0; $j < 4; ++$j) {
-        $bbox[$j*2]+= round($x);
-        $bbox[$j*2+1]+= round($y - ($h-$fh) - $yadj);
-        }
-        $aBoundingBox = $bbox;
-
-        if ($debug) {
-        // Draw a cross at the anchor point
-        $this->PushColor('red');
-        $this->Line($ox-25,$oy,$ox+25,$oy);
-        $this->Line($ox,$oy-25,$ox,$oy+25);
-        $this->PopColor();
-        }
-
-    }
-    }
-
-    public function StrokeText($x,$y,$txt,$dir=0,$paragraph_align="left",$debug=false)
-    {
-    $x = round($x);
-    $y = round($y);
-
-    // Do special language encoding
-    $txt = $this->langconv->Convert($txt,$this->font_family);
-
-    if( !is_numeric($dir) )
-        JpGraphError::Raise(" Direction for text most be given as an angle between 0 and 90.");
-
-    if ($this->font_family >= FF_FONT0 && $this->font_family <= FF_FONT2+1) {
-        $this->_StrokeBuiltinFont($x,$y,$txt,$dir,$paragraph_align,$boundingbox,$debug);
-    } elseif ($this->font_family >= _FF_FIRST && $this->font_family <= _FF_LAST) {
-        $this->_StrokeTTF($x,$y,$txt,$dir,$paragraph_align,$boundingbox,$debug);
-    } else
-        JpGraphError::Raise(" Unknown font font family specification. ");
-
-    return $boundingbox;
-    }
-
-    public function SetMargin($lm,$rm,$tm,$bm)
-    {
-    $this->left_margin=$lm;
-    $this->right_margin=$rm;
-    $this->top_margin=$tm;
-    $this->bottom_margin=$bm;
-    $this->plotwidth=$this->width - $this->left_margin-$this->right_margin ;
-    $this->plotheight=$this->height - $this->top_margin-$this->bottom_margin ;
-    if ($this->width  > 0 && $this->height > 0) {
-        if( $this->plotwidth < 0  || $this->plotheight < 0 )
-        JpGraphError::raise("To small plot area. ($lm,$rm,$tm,$bm : $this->plotwidth x $this->plotheight). With the given image size and margins there is to little space left for the plot. Increase the plot size or reduce the margins.");
-    }
-    }
-
-    public function SetTransparent($color)
-    {
-    imagecolortransparent ($this->img,$this->rgb->allocate($color));
-    }
-
-    public function SetColor($color,$aAlpha=0)
-    {
-    $this->current_color_name = $color;
-    $this->current_color=$this->rgb->allocate($color,$aAlpha);
-    if ($this->current_color == -1) {
-        $tc=imagecolorstotal($this->img);
-        JpGraphError::Raise("Can't allocate any more colors.
-                Image has already allocated maximum of <b>$tc colors</b>.
-                This might happen if you have anti-aliasing turned on
-                together with a background image or perhaps gradient fill
-                since this requires many, many colors. Try to turn off
-                anti-aliasing.<p>
-                If there is still a problem try downgrading the quality of
-                the background image to use a smaller pallete to leave some
-                entries for your graphs. You should try to limit the number
-                of colors in your background image to 64.<p>
-                If there is still problem set the constant
-<pre>
-DEFINE(\"USE_APPROX_COLORS\",true);
-</pre>
-                in jpgraph.php This will use approximative colors
-                when the palette is full.
-                <p>
-                Unfortunately there is not much JpGraph can do about this
-                since the palette size is a limitation of current graphic format and
-                what the underlying GD library suppports.");
-    }
-
-    return $this->current_color;
-    }
-
-    public function PushColor($color)
-    {
-    if ($color != "") {
-        $this->colorstack[$this->colorstackidx]=$this->current_color_name;
-        $this->colorstack[$this->colorstackidx+1]=$this->current_color;
-        $this->colorstackidx+=2;
-        $this->SetColor($color);
-    } else {
-        JpGraphError::Raise("Color specified as empty string in PushColor().");
-    }
-    }
-
-    public function PopColor()
-    {
-    if($this->colorstackidx<1)
-        JpGraphError::Raise(" Negative Color stack index. Unmatched call to PopColor()");
-    $this->current_color=$this->colorstack[--$this->colorstackidx];
-    $this->current_color_name=$this->colorstack[--$this->colorstackidx];
-    }
-
-    // Why this duplication? Because this way we can call this method
-    // for any image and not only the current objsct
-    public function AdjSat($sat)
-    {
-    if( $GLOBALS['gd2'] && USE_TRUECOLOR )
-
-        return;
-    $this->_AdjSat($this->img,$sat);
-    }
-
-    public function _AdjSat($img,$sat)
-    {
-    $nbr = imagecolorstotal ($img);
-    for ($i=0; $i<$nbr; ++$i) {
-        $colarr = imagecolorsforindex ($img,$i);
-        $rgb[0]=$colarr["red"];
-        $rgb[1]=$colarr["green"];
-        $rgb[2]=$colarr["blue"];
-        $rgb = $this->AdjRGBSat($rgb,$sat);
-        imagecolorset ($img, $i, $rgb[0], $rgb[1], $rgb[2]);
-    }
-    }
-
-    public function AdjBrightContrast($bright,$contr=0)
-    {
-    if( $GLOBALS['gd2'] && USE_TRUECOLOR )
-
-        return;
-    $this->_AdjBrightContrast($this->img,$bright,$contr);
-    }
-
-    public function _AdjBrightContrast($img,$bright,$contr=0)
-    {
-    if( $bright < -1 || $bright > 1 || $contr < -1 || $contr > 1 )
-        JpGraphError::Raise(" Parameters for brightness and Contrast out of range [-1,1]");
-    $nbr = imagecolorstotal ($img);
-    for ($i=0; $i<$nbr; ++$i) {
-        $colarr = imagecolorsforindex ($img,$i);
-        $r = $this->AdjRGBBrightContrast($colarr["red"],$bright,$contr);
-        $g = $this->AdjRGBBrightContrast($colarr["green"],$bright,$contr);
-        $b = $this->AdjRGBBrightContrast($colarr["blue"],$bright,$contr);
-        imagecolorset ($img, $i, $r, $g, $b);
-    }
-    }
-
-    // Private helper function for adj sat
-    // Adjust saturation for RGB array $u. $sat is a value between -1 and 1
-    // Note: Due to GD inability to handle true color the RGB values are only between
-    // 8 bit. This makes saturation quite sensitive for small increases in parameter sat.
-    //
-    // Tip: To get a grayscale picture set sat=-100, values <-100 changes the colors
-    // to it's complement.
-    //
-    // Implementation note: The saturation is implemented directly in the RGB space
-    // by adjusting the perpendicular distance between the RGB point and the "grey"
-    // line (1,1,1). Setting $sat>0 moves the point away from the line along the perp.
-    // distance and a negative value moves the point closer to the line.
-    // The values are truncated when the color point hits the bounding box along the
-    // RGB axis.
-    // DISCLAIMER: I'm not 100% sure this is he correct way to implement a color
-    // saturation function in RGB space. However, it looks ok and has the expected effect.
-    public function AdjRGBSat($rgb,$sat)
-    {
-    // TODO: Should be moved to the RGB class
-    // Grey vector
-    $v=array(1,1,1);
-
-    // Dot product
-    $dot = $rgb[0]*$v[0]+$rgb[1]*$v[1]+$rgb[2]*$v[2];
-
-    // Normalize dot product
-    $normdot = $dot/3;	// dot/|v|^2
-
-    // Direction vector between $u and its projection onto $v
-    for($i=0; $i<3; ++$i)
-        $r[$i] = $rgb[$i] - $normdot*$v[$i];
-
-    // Adjustment factor so that sat==1 sets the highest RGB value to 255
-    if ($sat > 0) {
-        $m=0;
-        for ($i=0; $i<3; ++$i) {
-        if( sign($r[$i]) == 1 && $r[$i]>0)
-            $m=max($m,(255-$rgb[$i])/$r[$i]);
-        }
-        $tadj=$m;
-    } else
-        $tadj=1;
-
-    $tadj = $tadj*$sat;
-    for ($i=0; $i<3; ++$i) {
-        $un[$i] = round($rgb[$i] + $tadj*$r[$i]);
-        if( $un[$i]<0 ) $un[$i]=0;		// Truncate color when they reach 0
-        if( $un[$i]>255 ) $un[$i]=255;// Avoid potential rounding error
-    }
-
-    return $un;
-    }
-
-    // Private helper function for AdjBrightContrast
-    public function AdjRGBBrightContrast($rgb,$bright,$contr)
-    {
-    // TODO: Should be moved to the RGB class
-    // First handle contrast, i.e change the dynamic range around grey
-    if ($contr <= 0) {
-        // Decrease contrast
-        $adj = abs($rgb-128) * (-$contr);
-        if( $rgb < 128 ) $rgb += $adj;
-        else $rgb -= $adj;
-    } else { // $contr > 0
-        // Increase contrast
-        if( $rgb < 128 ) $rgb = $rgb - ($rgb * $contr);
-        else $rgb = $rgb + ((255-$rgb) * $contr);
-    }
-
-    // Add (or remove) various amount of white
-    $rgb += $bright*255;
-    $rgb=min($rgb,255);
-    $rgb=max($rgb,0);
-
-    return $rgb;
-    }
-
-    public function SetLineWeight($weight)
-    {
-    $this->line_weight = $weight;
-    }
-
-    public function SetStartPoint($x,$y)
-    {
-    $this->lastx=round($x);
-    $this->lasty=round($y);
-    }
-
-    public function Arc($cx,$cy,$w,$h,$s,$e)
-    {
-    // GD Arc doesn't like negative angles
-    while( $s < 0) $s += 360;
-    while( $e < 0) $e += 360;
-
-    imagearc($this->img,round($cx),round($cy),round($w),round($h),
-         $s,$e,$this->current_color);
-    }
-
-    public function FilledArc($xc,$yc,$w,$h,$s,$e,$style="")
-    {
-    if ($GLOBALS['gd2']) {
-        while( $s < 0 ) $s += 360;
-        while( $e < 0 ) $e += 360;
-        if( $style=="" )
-        $style=IMG_ARC_PIE;
-        imagefilledarc($this->img,round($xc),round($yc),round($w),round($h),
-               round($s),round($e),$this->current_color,$style);
-
-        return;
-    }
-
-
-    // In GD 1.x we have to do it ourself interesting enough there is surprisingly
-    // little difference in time between doing it PHP and using the optimised GD
-    // library (roughly ~20%) I had expected it to be at least 100% slower doing it
-    // manually with a polygon approximation in PHP.....
-    $fillcolor = $this->current_color_name;
-
-    $w /= 2; // We use radius in our calculations instead
-    $h /= 2;
-
-    // Setup the angles so we have the same conventions as the builtin
-    // FilledArc() which is a little bit strange if you ask me....
-
-    $s = 360-$s;
-    $e = 360-$e;
-
-    if ($e > $s) {
-        $e = $e - 360;
-        $da = $s - $e;
-    }
-    $da = $s-$e;
-
-    // We use radians
-    $s *= M_PI/180;
-    $e *= M_PI/180;
-    $da *= M_PI/180;
-
-    // Calculate a polygon approximation
-    $p[0] = $xc;
-    $p[1] = $yc;
-
-    // Heuristic on how many polygons we need to make the
-    // arc look good
-    $numsteps = round(8 * abs($da) * ($w+$h)*($w+$h)/1500);
-
-    if( $numsteps == 0 ) return;
-    if( $numsteps < 7 ) $numsteps=7;
-    $delta = abs($da)/$numsteps;
-
-    $pa=array();
-    $a = $s;
-    for ($i=1; $i<=$numsteps; ++$i) {
-        $p[2*$i] = round($xc + $w*cos($a));
-        $p[2*$i+1] = round($yc - $h*sin($a));
-        //$a = $s + $i*$delta;
-        $a -= $delta;
-        $pa[2*($i-1)] = $p[2*$i];
-        $pa[2*($i-1)+1] = $p[2*$i+1];
-    }
-
-    // Get the last point at the exact ending angle to avoid
-    // any rounding errors.
-    $p[2*$i] = round($xc + $w*cos($e));
-    $p[2*$i+1] = round($yc - $h*sin($e));
-    $pa[2*($i-1)] = $p[2*$i];
-    $pa[2*($i-1)+1] = $p[2*$i+1];
-    $i++;
-
-    $p[2*$i] = $xc;
-        $p[2*$i+1] = $yc;
-    if ($fillcolor != "") {
-        $this->PushColor($fillcolor);
-        imagefilledpolygon($this->img,$p,count($p)/2,$this->current_color);
-        $this->PopColor();
-    }
-    }
-
-    public function FilledCakeSlice($cx,$cy,$w,$h,$s,$e)
-    {
-    $this->CakeSlice($cx,$cy,$w,$h,$s,$e,$this->current_color_name);
-    }
-
-    public function CakeSlice($xc,$yc,$w,$h,$s,$e,$fillcolor="",$arccolor="")
-    {
-    $s = round($s); $e = round($e);
-    $w = round($w); $h = round($h);
-    $xc = round($xc); $yc = round($yc);
-    $this->PushColor($fillcolor);
-    $this->FilledArc($xc,$yc,2*$w,2*$h,$s,$e);
-    $this->PopColor();
-    if ($arccolor != "") {
-        $this->PushColor($arccolor);
-        // We add 2 pixels to make the Arc() better aligned with
-        // the filled arc.
-        if ($GLOBALS['gd2']) {
-        imagefilledarc($this->img,$xc,$yc,2*$w,2*$h,$s,$e,$this->current_color_name,
-                   IMG_ARC_NOFILL | IMG_ARC_EDGED ) ;
-        } else {
-        $this->Arc($xc,$yc,2*$w+2,2*$h+2,$s,$e);
-        $xx = $w * cos(2*M_PI - $s*M_PI/180) + $xc;
-        $yy = $yc - $h * sin(2*M_PI - $s*M_PI/180);
-        $this->Line($xc,$yc,$xx,$yy);
-        $xx = $w * cos(2*M_PI - $e*M_PI/180) + $xc;
-        $yy = $yc - $h * sin(2*M_PI - $e*M_PI/180);
-        $this->Line($xc,$yc,$xx,$yy);
-        }
-        $this->PopColor();
-    }
-    }
-
-    public function Ellipse($xc,$yc,$w,$h)
-    {
-    $this->Arc($xc,$yc,$w,$h,0,360);
-    }
-
-    // Breseham circle gives visually better result then using GD
-    // built in arc(). It takes some more time but gives better
-    // accuracy.
-    public function BresenhamCircle($xc,$yc,$r)
-    {
-    $d = 3-2*$r;
-    $x = 0;
-    $y = $r;
-    while ($x<=$y) {
-        $this->Point($xc+$x,$yc+$y);
-        $this->Point($xc+$x,$yc-$y);
-        $this->Point($xc-$x,$yc+$y);
-        $this->Point($xc-$x,$yc-$y);
-
-        $this->Point($xc+$y,$yc+$x);
-        $this->Point($xc+$y,$yc-$x);
-        $this->Point($xc-$y,$yc+$x);
-        $this->Point($xc-$y,$yc-$x);
-
-        if( $d<0 ) $d += 4*$x+6;
-        else {
-        $d += 4*($x-$y)+10;
-        --$y;
-        }
-        ++$x;
-    }
-    }
-
-    public function Circle($xc,$yc,$r)
-    {
-    if( USE_BRESENHAM )
-        $this->BresenhamCircle($xc,$yc,$r);
-    else {
-
-        /*
-            // Some experimental code snippet to see if we can get a decent
-        // result doing a trig-circle
-        // Create an approximated circle with 0.05 rad resolution
-        $end = 2*M_PI;
-        $l = $r/10;
-        if( $l < 3 ) $l=3;
-        $step_size = 2*M_PI/(2*$r*M_PI/$l);
-        $pts = array();
-        $pts[] = $r + $xc;
-        $pts[] = $yc;
-        for ($a=$step_size; $a <= $end; $a += $step_size) {
-        $pts[] = round($xc + $r*cos($a));
-        $pts[] = round($yc - $r*sin($a));
-        }
-        imagepolygon($this->img,$pts,count($pts)/2,$this->current_color);
-        */
-
-        $this->Arc($xc,$yc,$r*2,$r*2,0,360);
-
-        // For some reason imageellipse() isn't in GD 2.0.1, PHP 4.1.1
-        //imageellipse($this->img,$xc,$yc,$r,$r,$this->current_color);
-    }
-    }
-
-    public function FilledCircle($xc,$yc,$r)
-    {
-    if ($GLOBALS['gd2']) {
-        imagefilledellipse($this->img,round($xc),round($yc),
-                       2*$r,2*$r,$this->current_color);
-    } else {
-        for ($i=1; $i < 2*$r; $i += 2) {
-        // To avoid moire patterns we have to draw some
-        // 1 extra "skewed" filled circles
-        $this->Arc($xc,$yc,$i,$i,0,360);
-        $this->Arc($xc,$yc,$i+1,$i,0,360);
-        $this->Arc($xc,$yc,$i+1,$i+1,0,360);
-        }
-    }
-    }
-
-    // Linear Color InterPolation
-    public function lip($f,$t,$p)
-    {
-    $p = round($p,1);
-    $r = $f[0] + ($t[0]-$f[0])*$p;
-    $g = $f[1] + ($t[1]-$f[1])*$p;
-    $b = $f[2] + ($t[2]-$f[2])*$p;
-
-    return array($r,$g,$b);
-    }
-
-    // Anti-aliased line.
-    // Note that this is roughly 8 times slower then a normal line!
-    public function WuLine($x1,$y1,$x2,$y2)
-    {
-    // Get foreground line color
-    $lc = imagecolorsforindex($this->img,$this->current_color);
-    $lc = array($lc["red"],$lc["green"],$lc["blue"]);
-
-    $dx = $x2-$x1;
-    $dy = $y2-$y1;
-
-    if ( abs($dx) > abs($dy) ) {
-        if ($dx<0) {
-        $dx = -$dx;$dy = -$dy;
-        $tmp=$x2;$x2=$x1;$x1=$tmp;
-        $tmp=$y2;$y2=$y1;$y1=$tmp;
-        }
-        $x=$x1<<16; $y=$y1<<16;
-        $yinc = ($dy*65535)/$dx;
-        while ( ($x >> 16) < $x2 ) {
-
-        $bc = @imagecolorsforindex($this->img,imagecolorat($this->img,$x>>16,$y>>16));
-        if ($bc <= 0) {
-            JpGraphError::Raise('Problem with color palette and your GD setup. Please disable anti-aliasing or use GD2 with true-color. If you have GD2 library installed please make sure that you have set the USE_GD2 constant to true and that truecolor is enabled.');
-        }
-        $bc=array($bc["red"],$bc["green"],$bc["blue"]);
-
-        $this->SetColor($this->lip($lc,$bc,($y & 0xFFFF)/65535));
-        imagesetpixel($this->img,$x>>16,$y>>16,$this->current_color);
-        $this->SetColor($this->lip($lc,$bc,(~$y & 0xFFFF)/65535));
-        imagesetpixel($this->img,$x>>16,($y>>16)+1,$this->current_color);
-        $x += 65536; $y += $yinc;
-        }
-    } else {
-        if ($dy<0) {
-        $dx = -$dx;$dy = -$dy;
-        $tmp=$x2;$x2=$x1;$x1=$tmp;
-        $tmp=$y2;$y2=$y1;$y1=$tmp;
-        }
-        $x=$x1<<16; $y=$y1<<16;
-        $xinc = ($dx*65535)/$dy;
-        while ( ($y >> 16) < $y2 ) {
-
-        $bc = @imagecolorsforindex($this->img,imagecolorat($this->img,$x>>16,$y>>16));
-        if ($bc <= 0) {
-            JpGraphError::Raise('Problem with color palette and your GD setup. Please disable anti-aliasing or use GD2 with true-color. If you have GD2 library installed please make sure that you have set the USE_GD2 constant to true and truecolor is enabled.');
-
-        }
-
-        $bc=array($bc["red"],$bc["green"],$bc["blue"]);
-
-        $this->SetColor($this->lip($lc,$bc,($x & 0xFFFF)/65535));
-        imagesetpixel($this->img,$x>>16,$y>>16,$this->current_color);
-        $this->SetColor($this->lip($lc,$bc,(~$x & 0xFFFF)/65535));
-        imagesetpixel($this->img,($x>>16)+1,$y>>16,$this->current_color);
-        $y += 65536; $x += $xinc;
-        }
-    }
-    $this->SetColor($lc);
-    imagesetpixel($this->img,$x2,$y2,$this->current_color);
-    imagesetpixel($this->img,$x1,$y1,$this->current_color);
-    }
-
-    // Set line style dashed, dotted etc
-    public function SetLineStyle($s)
-    {
-    if ( is_numeric($s) ) {
-        if( $s<1 || $s>4 )
-        JpGraphError::Raise(" Illegal numeric argument to SetLineStyle(): ($s)");
-    } elseif ( is_string($s) ) {
-        if( $s == "solid" ) $s=1;
-        elseif( $s == "dotted" ) $s=2;
-        elseif( $s == "dashed" ) $s=3;
-        elseif( $s == "longdashed" ) $s=4;
-        else JpGraphError::Raise(" Illegal string argument to SetLineStyle(): $s");
-    } else JpGraphError::Raise(" Illegal argument to SetLineStyle $s");
-    $this->line_style=$s;
-    }
-
-    // Same as Line but take the line_style into account
-    public function StyleLine($x1,$y1,$x2,$y2)
-    {
-    switch ($this->line_style) {
-        case 1:// Solid
-        $this->Line($x1,$y1,$x2,$y2);
-        break;
-        case 2: // Dotted
-        $this->DashedLine($x1,$y1,$x2,$y2,1,6);
-        break;
-        case 3: // Dashed
-        $this->DashedLine($x1,$y1,$x2,$y2,2,4);
-        break;
-        case 4: // Longdashes
-        $this->DashedLine($x1,$y1,$x2,$y2,8,6);
-        break;
-        default:
-        JpGraphError::Raise(" Unknown line style: $this->line_style ");
-        break;
-    }
-    }
-
-    public function Line($x1,$y1,$x2,$y2)
-    {
-    $x1 = round($x1);
-    $x2 = round($x2);
-    $y1 = round($y1);
-    $y2 = round($y2);
-
-    if( $this->line_weight==0 ) return;
-    if ($this->use_anti_aliasing) {
-        $dx = $x2-$x1;
-        $dy = $y2-$y1;
-        // Vertical, Horizontal or 45 lines don't need anti-aliasing
-        if ($dx!=0 && $dy!=0 && $dx!=$dy) {
-        $this->WuLine($x1,$y1,$x2,$y2);
-
-        return;
-        }
-    }
-    if ($this->line_weight==1) {
-        imageline($this->img,$x1,$y1,$x2,$y2,$this->current_color);
-    } elseif ($x1==$x2) {		// Special case for vertical lines
-        imageline($this->img,$x1,$y1,$x2,$y2,$this->current_color);
-        $w1=floor($this->line_weight/2);
-        $w2=floor(($this->line_weight-1)/2);
-        for($i=1; $i<=$w1; ++$i)
-        imageline($this->img,$x1+$i,$y1,$x2+$i,$y2,$this->current_color);
-        for($i=1; $i<=$w2; ++$i)
-        imageline($this->img,$x1-$i,$y1,$x2-$i,$y2,$this->current_color);
-    } elseif ($y1==$y2) {		// Special case for horizontal lines
-        imageline($this->img,$x1,$y1,$x2,$y2,$this->current_color);
-        $w1=floor($this->line_weight/2);
-        $w2=floor(($this->line_weight-1)/2);
-        for($i=1; $i<=$w1; ++$i)
-        imageline($this->img,$x1,$y1+$i,$x2,$y2+$i,$this->current_color);
-        for($i=1; $i<=$w2; ++$i)
-        imageline($this->img,$x1,$y1-$i,$x2,$y2-$i,$this->current_color);
-    } else {	// General case with a line at an angle
-        $a = atan2($y1-$y2,$x2-$x1);
-        // Now establish some offsets from the center. This gets a little
-        // bit involved since we are dealing with integer functions and we
-        // want the apperance to be as smooth as possible and never be thicker
-        // then the specified width.
-
-        // We do the trig stuff to make sure that the endpoints of the line
-        // are perpendicular to the line itself.
-        $dx=(sin($a)*$this->line_weight/2);
-        $dy=(cos($a)*$this->line_weight/2);
-
-        $pnts = array($x2+$dx,$y2+$dy,$x2-$dx,$y2-$dy,$x1-$dx,$y1-$dy,$x1+$dx,$y1+$dy);
-        imagefilledpolygon($this->img,$pnts,count($pnts)/2,$this->current_color);
-    }
-    $this->lastx=$x2; $this->lasty=$y2;
-    }
-
-    public function Polygon($p,$closed=FALSE,$fast=FALSE)
-    {
-    if( $this->line_weight==0 ) return;
-    $n=count($p);
-    $oldx = $p[0];
-    $oldy = $p[1];
-    if ($fast) {
-        for ($i=2; $i < $n; $i+=2) {
-        imageline($this->img,$oldx,$oldy,$p[$i],$p[$i+1],$this->current_color);
-        $oldx = $p[$i];
-        $oldy = $p[$i+1];
-        }
-        if ($closed) {
-        imageline($this->img,$p[$n*2-2],$p[$n*2-1],$p[0],$p[1],$this->current_color);
-        }
-    } else {
-        for ($i=2; $i < $n; $i+=2) {
-        $this->StyleLine($oldx,$oldy,$p[$i],$p[$i+1]);
-        $oldx = $p[$i];
-        $oldy = $p[$i+1];
-        }
-    }
-    if( $closed )
-        $this->Line($oldx,$oldy,$p[0],$p[1]);
-    }
-
-    public function FilledPolygon($pts)
-    {
-    $n=count($pts);
-    if ($n == 0) {
-        JpGraphError::Raise('NULL data specified for a filled polygon. Check that your data is not NULL.');
-    }
-    for($i=0; $i < $n; ++$i)
-        $pts[$i] = round($pts[$i]);
-    imagefilledpolygon($this->img,$pts,count($pts)/2,$this->current_color);
-    }
-
-    public function Rectangle($xl,$yu,$xr,$yl)
-    {
-    $this->Polygon(array($xl,$yu,$xr,$yu,$xr,$yl,$xl,$yl,$xl,$yu));
-    }
-
-    public function FilledRectangle($xl,$yu,$xr,$yl)
-    {
-    $this->FilledPolygon(array($xl,$yu,$xr,$yu,$xr,$yl,$xl,$yl));
-    }
-
-    public function FilledRectangle2($xl,$yu,$xr,$yl,$color1,$color2,$style=1)
-    {
-    // Fill a rectangle with lines of two colors
-    if ($style===1) {
-        // Horizontal stripe
-        if ($yl < $yu) {
-        $t = $yl; $yl=$yu; $yu=$t;
-        }
-        for ($y=$yu; $y <= $yl; ++$y) {
-        $this->SetColor($color1);
-        $this->Line($xl,$y,$xr,$y);
-        ++$y;
-        $this->SetColor($color2);
-        $this->Line($xl,$y,$xr,$y);
-        }
-    } else {
-        if ($xl < $xl) {
-        $t = $xl; $xl=$xr; $xr=$t;
-        }
-        for ($x=$xl; $x <= $xr; ++$x) {
-        $this->SetColor($color1);
-        $this->Line($x,$yu,$x,$yl);
-        ++$x;
-        $this->SetColor($color2);
-        $this->Line($x,$yu,$x,$yl);
-        }
-    }
-    }
-
-    public function ShadowRectangle($xl,$yu,$xr,$yl,$fcolor=false,$shadow_width=3,$shadow_color=array(102,102,102))
-    {
-    // This is complicated by the fact that we must also handle the case where
-        // the reactangle has no fill color
-    $this->PushColor($shadow_color);
-    $this->FilledRectangle($xr-$shadow_width,$yu+$shadow_width,$xr,$yl-$shadow_width-1);
-    $this->FilledRectangle($xl+$shadow_width,$yl-$shadow_width,$xr,$yl);
-    //$this->FilledRectangle($xl+$shadow_width,$yu+$shadow_width,$xr,$yl);
-    $this->PopColor();
-    if( $fcolor==false )
-        $this->Rectangle($xl,$yu,$xr-$shadow_width-1,$yl-$shadow_width-1);
-    else {
-        $this->PushColor($fcolor);
-        $this->FilledRectangle($xl,$yu,$xr-$shadow_width-1,$yl-$shadow_width-1);
-        $this->PopColor();
-        $this->Rectangle($xl,$yu,$xr-$shadow_width-1,$yl-$shadow_width-1);
-    }
-    }
-
-    public function FilledRoundedRectangle($xt,$yt,$xr,$yl,$r=5)
-    {
-    if ($r==0) {
-        $this->FilledRectangle($xt,$yt,$xr,$yl);
-
-        return;
-    }
-
-    // To avoid overlapping fillings (which will look strange
-    // when alphablending is enabled) we have no choice but
-    // to fill the five distinct areas one by one.
-
-    // Center square
-    $this->FilledRectangle($xt+$r,$yt+$r,$xr-$r,$yl-$r);
-    // Top band
-    $this->FilledRectangle($xt+$r,$yt,$xr-$r,$yt+$r-1);
-    // Bottom band
-    $this->FilledRectangle($xt+$r,$yl-$r+1,$xr-$r,$yl);
-    // Left band
-    $this->FilledRectangle($xt,$yt+$r+1,$xt+$r-1,$yl-$r);
-    // Right band
-    $this->FilledRectangle($xr-$r+1,$yt+$r,$xr,$yl-$r);
-
-    // Topleft & Topright arc
-    $this->FilledArc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
-    $this->FilledArc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
-
-    // Bottomleft & Bottom right arc
-    $this->FilledArc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
-    $this->FilledArc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
-
-    }
-
-    public function RoundedRectangle($xt,$yt,$xr,$yl,$r=5)
-    {
-    if ($r==0) {
-        $this->Rectangle($xt,$yt,$xr,$yl);
-
-        return;
-    }
-
-    // Top & Bottom line
-    $this->Line($xt+$r,$yt,$xr-$r,$yt);
-    $this->Line($xt+$r,$yl,$xr-$r,$yl);
-
-    // Left & Right line
-    $this->Line($xt,$yt+$r,$xt,$yl-$r);
-    $this->Line($xr,$yt+$r,$xr,$yl-$r);
-
-    // Topleft & Topright arc
-    $this->Arc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
-    $this->Arc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
-
-    // Bottomleft & Bottomright arc
-    $this->Arc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
-    $this->Arc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
-    }
-
-    public function FilledBevel($x1,$y1,$x2,$y2,$depth=2,$color1='white@0.4',$color2='darkgray@0.4')
-    {
-    $this->FilledRectangle($x1,$y1,$x2,$y2);
-    $this->Bevel($x1,$y1,$x2,$y2,$depth,$color1,$color2);
-    }
-
-    public function Bevel($x1,$y1,$x2,$y2,$depth=2,$color1='white@0.4',$color2='black@0.5')
-    {
-    $this->PushColor($color1);
-    for ($i=0; $i < $depth; ++$i) {
-        $this->Line($x1+$i,$y1+$i,$x1+$i,$y2-$i);
-        $this->Line($x1+$i,$y1+$i,$x2-$i,$y1+$i);
-    }
-    $this->PopColor();
-
-    $this->PushColor($color2);
-    for ($i=0; $i < $depth; ++$i) {
-        $this->Line($x1+$i,$y2-$i,$x2-$i,$y2-$i);
-        $this->Line($x2-$i,$y1+$i,$x2-$i,$y2-$i-1);
-    }
-    $this->PopColor();
-    }
-
-    public function StyleLineTo($x,$y)
-    {
-    $this->StyleLine($this->lastx,$this->lasty,$x,$y);
-    $this->lastx=$x;
-    $this->lasty=$y;
-    }
-
-    public function LineTo($x,$y)
-    {
-    $this->Line($this->lastx,$this->lasty,$x,$y);
-    $this->lastx=$x;
-    $this->lasty=$y;
-    }
-
-    public function Point($x,$y)
-    {
-    imagesetpixel($this->img,round($x),round($y),$this->current_color);
-    }
-
-    public function Fill($x,$y)
-    {
-    imagefill($this->img,round($x),round($y),$this->current_color);
-    }
-
-    public function FillToBorder($x,$y,$aBordColor)
-    {
-    $bc = $this->rgb->allocate($aBordColor);
-    if ($bc == -1) {
-        JpGraphError::Raise('Image::FillToBorder : Can not allocate more colors');
-        exit();
-    }
-    imagefilltoborder($this->img,round($x),round($y),$bc,$this->current_color);
-    }
-
-    public function DashedLine($x1,$y1,$x2,$y2,$dash_length=1,$dash_space=4)
-    {
-    // Code based on, but not identical to, work by Ariel Garza and James Pine
-    $line_length = ceil (sqrt(pow(($x2 - $x1),2) + pow(($y2 - $y1),2)) );
-    $dx = ($line_length) ? ($x2 - $x1) / $line_length : 0;
-    $dy = ($line_length) ? ($y2 - $y1) / $line_length : 0;
-    $lastx = $x1; $lasty = $y1;
-    $xmax = max($x1,$x2);
-    $xmin = min($x1,$x2);
-    $ymax = max($y1,$y2);
-    $ymin = min($y1,$y2);
-    for ($i = 0; $i < $line_length; $i += ($dash_length + $dash_space)) {
-        $x = ($dash_length * $dx) + $lastx;
-        $y = ($dash_length * $dy) + $lasty;
-
-        // The last section might overshoot so we must take a computational hit
-        // and check this.
-        if( $x>$xmax ) $x=$xmax;
-        if( $y>$ymax ) $y=$ymax;
-
-        if( $x<$xmin ) $x=$xmin;
-        if( $y<$ymin ) $y=$ymin;
-
-        $this->Line($lastx,$lasty,$x,$y);
-        $lastx = $x + ($dash_space * $dx);
-        $lasty = $y + ($dash_space * $dy);
-    }
-    }
-
-    public function SetExpired($aFlg=true)
-    {
-    $this->expired = $aFlg;
-    }
-
-    // Generate image header
-    public function Headers()
-    {
-    // In case we are running from the command line with the client version of
-    // PHP we can't send any headers.
-    $sapi = php_sapi_name();
-    if( $sapi == 'cli' )
-
-        return;
-
-    if ( headers_sent() ) {
-
-        echo "<table border=1><tr><td><font color=darkred size=4><b>JpGraph Error:</b>
-HTTP headers have already been sent.</font></td></tr><tr><td><b>Explanation:</b><br>HTTP headers have already been sent back to the browser indicating the data as text before the library got a chance to send it's image HTTP header to this browser. This makes it impossible for the library to send back image data to the browser (since that would be interpretated as text by the browser and show up as junk text).<p>Most likely you have some text in your script before the call to <i>Graph::Stroke()</i>. If this texts gets sent back to the browser the browser will assume that all data is plain text. Look for any text, even spaces and newlines, that might have been sent back to the browser. <p>For example it is a common mistake to leave a blank line before the opening \"<b>&lt;?php</b>\".</td></tr></table>";
-
-    die();
-
-    }
-
-    if ($this->expired) {
-        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . "GMT");
-        header("Cache-Control: no-cache, must-revalidate");
-        header("Pragma: no-cache");
-    }
-    header("Content-type: image/$this->img_format");
-    }
-
-    // Adjust image quality for formats that allow this
-    public function SetQuality($q)
-    {
-    $this->quality = $q;
-    }
-
-    // Stream image to browser or to file
-    public function Stream($aFile="")
-    {
-    $func="image".$this->img_format;
-    if ($this->img_format=="jpeg" && $this->quality != null) {
-        $res = @$func($this->img,$aFile,$this->quality);
-    } else {
-        if ($aFile != "") {
-        $res = @$func($this->img,$aFile);
-        } else
-        $res = @$func($this->img);
-    }
-    if( !$res )
-        JpGraphError::Raise("Can't create or stream image to file $aFile Check that PHP has enough permission to write a file to the current directory.");
-    }
-
-    // Clear resource tide up by image
-    public function Destroy()
-    {
-    imagedestroy($this->img);
-    }
-
-    // Specify image format. Note depending on your installation
-    // of PHP not all formats may be supported.
-    public function SetImgFormat($aFormat)
-    {
-    $aFormat = strtolower($aFormat);
-    $tst = true;
-    $supported = imagetypes();
-    if ($aFormat=="auto") {
-        if( $supported & IMG_PNG )
-        $this->img_format="png";
-        elseif( $supported & IMG_JPG )
-        $this->img_format="jpeg";
-        elseif( $supported & IMG_GIF )
-        $this->img_format="gif";
-        else
-        JpGraphError::Raise(" Your PHP (and GD-lib) installation does not appear to support any known graphic formats.".
-                    "You need to first make sure GD is compiled as a module to PHP. If you also want to use JPEG images".
-                    "you must get the JPEG library. Please see the PHP docs for details.");
-
-        return true;
-    } else {
-        if ($aFormat=="jpeg" || $aFormat=="png" || $aFormat=="gif") {
-        if( $aFormat=="jpeg" && !($supported & IMG_JPG) )
-            $tst=false;
-        elseif( $aFormat=="png" && !($supported & IMG_PNG) )
-            $tst=false;
-        elseif( $aFormat=="gif" && !($supported & IMG_GIF) )
-            $tst=false;
-        else {
-            $this->img_format=$aFormat;
-
-            return true;
-        }
-        } else
-        $tst=false;
-        if( !$tst )
-        JpGraphError::Raise(" Your PHP installation does not support the chosen graphic format: $aFormat");
-    }
-    }
-} // CLASS
-
-//===================================================
-// CLASS RotImage
-// Description: Exactly as Image but draws the image at
-// a specified angle around a specified rotation point.
-//===================================================
-class RotImage extends Image
-{
-    public $m=array();
-    public $a=0;
-    public $dx=0,$dy=0,$transx=0,$transy=0;
-
-    public function RotImage($aWidth,$aHeight,$a=0,$aFormat=DEFAULT_GFORMAT)
-    {
-    $this->Image($aWidth,$aHeight,$aFormat);
-    $this->dx=$this->left_margin+$this->plotwidth/2;
-    $this->dy=$this->top_margin+$this->plotheight/2;
-    $this->SetAngle($a);
-    }
-
-    public function SetCenter($dx,$dy)
-    {
-    $old_dx = $this->dx;
-    $old_dy = $this->dy;
-    $this->dx=$dx;
-    $this->dy=$dy;
-    $this->SetAngle($this->a);
-
-    return array($old_dx,$old_dy);
-    }
-
-    public function SetTranslation($dx,$dy)
-    {
-    $old = array($this->transx,$this->transy);
-    $this->transx = $dx;
-    $this->transy = $dy;
-
-    return $old;
-    }
-
-    public function UpdateRotMatrice()
-    {
-    $a = $this->a;
-    $a *= M_PI/180;
-    $sa=sin($a); $ca=cos($a);
-    // Create the rotation matrix
-    $this->m[0][0] = $ca;
-    $this->m[0][1] = -$sa;
-    $this->m[0][2] = $this->dx*(1-$ca) + $sa*$this->dy ;
-    $this->m[1][0] = $sa;
-    $this->m[1][1] = $ca;
-    $this->m[1][2] = $this->dy*(1-$ca) - $sa*$this->dx ;
-    }
-
-    public function SetAngle($a)
-    {
-    $tmp = $this->a;
-    $this->a = $a;
-    $this->UpdateRotMatrice();
-
-    return $tmp;
-    }
-
-    public function Circle($xc,$yc,$r)
-    {
-    // Circle get's rotated through the Arc() call
-    // made in the parent class
-    parent::Circle($xc,$yc,$r);
-    }
-
-    public function FilledCircle($xc,$yc,$r)
-    {
-    // If we use GD1 then Image::FilledCircle will use a
-    // call to Arc so it will get rotated through the Arc
-    // call.
-    if ($GLOBALS['gd2']) {
-        list($xc,$yc) = $this->Rotate($xc,$yc);
-    }
-    parent::FilledCircle($xc,$yc,$r);
-    }
-
-
-    public function Arc($xc,$yc,$w,$h,$s,$e)
-    {
-    list($xc,$yc) = $this->Rotate($xc,$yc);
-    $s += $this->a;
-    $e += $this->a;
-    parent::Arc($xc,$yc,$w,$h,$s,$e);
-    }
-
-    public function FilledArc($xc,$yc,$w,$h,$s,$e)
-    {
-    list($xc,$yc) = $this->Rotate($xc,$yc);
-    $s += $this->a;
-    $e += $this->a;
-    parent::FilledArc($xc,$yc,$w,$h,$s,$e);
-    }
-
-    public function SetMargin($lm,$rm,$tm,$bm)
-    {
-    parent::SetMargin($lm,$rm,$tm,$bm);
-    $this->dx=$this->left_margin+$this->plotwidth/2;
-    $this->dy=$this->top_margin+$this->plotheight/2;
-    $this->UpdateRotMatrice();
-    }
-
-    public function Rotate($x,$y)
-    {
-    // Optimization. Ignore rotation if Angle==0 || ANgle==360
-    if ($this->a == 0 || $this->a == 360) {
-        return array($x + $this->transx, $y + $this->transy );
-    } else {
-        $x1=round($this->m[0][0]*$x + $this->m[0][1]*$y,1) + $this->m[0][2] + $this->transx;
-        $y1=round($this->m[1][0]*$x + $this->m[1][1]*$y,1) + $this->m[1][2] + $this->transy;
-
-        return array($x1,$y1);
-    }
-    }
-
-    public function ArrRotate($pnts)
-    {
-    for($i=0; $i < count($pnts)-1; $i+=2)
-        list($pnts[$i],$pnts[$i+1]) = $this->Rotate($pnts[$i],$pnts[$i+1]);
-
-    return $pnts;
-    }
-
-    public function Line($x1,$y1,$x2,$y2)
-    {
-    list($x1,$y1) = $this->Rotate($x1,$y1);
-    list($x2,$y2) = $this->Rotate($x2,$y2);
-    parent::Line($x1,$y1,$x2,$y2);
-    }
-
-    public function Rectangle($x1,$y1,$x2,$y2)
-    {
-    // Rectangle uses Line() so it will be rotated through that call
-    parent::Rectangle($x1,$y1,$x2,$y2);
-    }
-
-    public function FilledRectangle($x1,$y1,$x2,$y2)
-    {
-    if( $y1==$y2 || $x1==$x2 )
-        $this->Line($x1,$y1,$x2,$y2);
-    else
-        $this->FilledPolygon(array($x1,$y1,$x2,$y1,$x2,$y2,$x1,$y2));
-    }
-
-    public function Polygon($pnts,$closed=FALSE,$fast=false)
-    {
-    //Polygon uses Line() so it will be rotated through that call
-    parent::Polygon($pnts,$closed,$fast);
-    }
-
-    public function FilledPolygon($pnts)
-    {
-    parent::FilledPolygon($this->ArrRotate($pnts));
-    }
-
-    public function Point($x,$y)
-    {
-    list($xp,$yp) = $this->Rotate($x,$y);
-    parent::Point($xp,$yp);
-    }
-
-    public function StrokeText($x,$y,$txt,$dir=0,$paragraph_align="left",$debug=false)
-    {
-    list($xp,$yp) = $this->Rotate($x,$y);
-
-    return parent::StrokeText($xp,$yp,$txt,$dir,$paragraph_align,$debug);
-    }
-}
-
-//===================================================
-// CLASS ImgStreamCache
-// Description: Handle caching of graphs to files
-//===================================================
-class ImgStreamCache
-{
-    public $cache_dir;
-    public $img=null;
-    public $timeout=0; 	// Infinite timeout
-    //---------------
-    // CONSTRUCTOR
-    public function ImgStreamCache(&$aImg, $aCacheDir=CACHE_DIR)
-    {
-    $this->img = &$aImg;
-    $this->cache_dir = $aCacheDir;
-    }
-
-//---------------
-// PUBLIC METHODS
-
-    // Specify a timeout (in minutes) for the file. If the file is older then the
-    // timeout value it will be overwritten with a newer version.
-    // If timeout is set to 0 this is the same as infinite large timeout and if
-    // timeout is set to -1 this is the same as infinite small timeout
-    public function SetTimeout($aTimeout)
-    {
-    $this->timeout=$aTimeout;
     }
 
-    // Output image to browser and also write it to the cache
-    public function PutAndStream(&$aImage,$aCacheFileName,$aInline,$aStrokeFileName)
-    {
-    // Some debugging code to brand the image with numbe of colors
-    // used
-    GLOBAL $gJpgBrandTiming;
-
-    if ($gJpgBrandTiming) {
-        global $tim;
-        $t=$tim->Pop()/1000.0;
-        $c=$aImage->SetColor("black");
-        $t=sprintf(BRAND_TIME_FORMAT,round($t,3));
-        imagestring($this->img->img,2,5,$this->img->height-20,$t,$c);
+    // Relative translate (don't include offset) usefull when we just want
+    // to know the relative position (in pixels) on the axis
+    function RelTranslate($aCoord) {
+        if( !is_numeric($aCoord) ) {
+            if( $aCoord != '' && $aCoord != '-' && $aCoord != 'x'  ) {
+                JpGraphError::RaiseL(25070);//('Your data contains non-numeric values.');
+            }
+            return 0;
+        }
+        else {
+            return ($aCoord - $this->scale[0]) * $this->scale_factor;
+        }
     }
 
-    // Check if we should stroke the image to an arbitrary file
-    if (_FORCE_IMGTOFILE) {
-        $aStrokeFileName = _FORCE_IMGDIR.GenImgName();
+    // Restrict autoscaling to only use integers
+    function SetIntScale($aIntScale=true) {
+        $this->intscale=$aIntScale;
     }
 
-    if ($aStrokeFileName!="") {
-        if( $aStrokeFileName == "auto" )
-        $aStrokeFileName = GenImgName();
-        if ( file_exists($aStrokeFileName) ) {
-        // Delete the old file
-        if( !@unlink($aStrokeFileName) )
-            JpGraphError::Raise(" Can't delete cached image $aStrokeFileName. Permission problem?");
+    // Calculate an integer autoscale
+    function IntAutoScale($img,$min,$max,$maxsteps,$majend=true) {
+        // Make sure limits are integers
+        $min=floor($min);
+        $max=ceil($max);
+        if( abs($min-$max)==0 ) {
+            --$min; ++$max;
+        }
+        $maxsteps = floor($maxsteps);
+
+        $gracetop=round(($this->gracetop/100.0)*abs($max-$min));
+        $gracebottom=round(($this->gracebottom/100.0)*abs($max-$min));
+        if( is_numeric($this->autoscale_min) ) {
+            $min = ceil($this->autoscale_min);
+            if( $min >= $max ) {
+                JpGraphError::RaiseL(25071);//('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.');
+            }
         }
-        $aImage->Stream($aStrokeFileName);
 
-        return;
-    }
+        if( is_numeric($this->autoscale_max) ) {
+            $max = ceil($this->autoscale_max);
+            if( $min >= $max ) {
+                JpGraphError::RaiseL(25072);//('You have specified a max value with SetAutoMax() which is smaller than the miminum value used for the scale. This is not possible.');
+            }
+        }
 
-    if ($aCacheFileName != "" && USE_CACHE) {
+        if( abs($min-$max ) == 0 ) {
+            ++$max;
+            --$min;
+        }
 
-        $aCacheFileName = $this->cache_dir . $aCacheFileName;
-        if ( file_exists($aCacheFileName) ) {
-        if (!$aInline) {
-            // If we are generating image off-line (just writing to the cache)
-            // and the file exists and is still valid (no timeout)
-            // then do nothing, just return.
-            $diff=time()-filemtime($aCacheFileName);
-            if( $diff < 0 )
-            JpGraphError::Raise(" Cached imagefile ($aCacheFileName) has file date in the future!!");
-            if( $this->timeout>0 && ($diff <= $this->timeout*60) )
+        $min -= $gracebottom;
+        $max += $gracetop;
 
-            return;
-        }
-        if( !@unlink($aCacheFileName) )
-            JpGraphError::Raise(" Can't delete cached image $aStrokeFileName. Permission problem?");
-        $aImage->Stream($aCacheFileName);
-        } else {
-        $this->MakeDirs(dirname($aCacheFileName));
-        if ( !is_writeable(dirname($aCacheFileName)) ) {
-            JpGraphError::Raise('PHP has not enough permissions to write to the cache file '.$aCacheFileName.'. Please make sure that the user running PHP has write permission for this file if you wan to use the cache system with JpGraph.');
+        // First get tickmarks as multiples of 1, 10, ...
+        if( $majend ) {
+            list($num1steps,$adj1min,$adj1max,$maj1step) = $this->IntCalcTicks($maxsteps,$min,$max,1);
         }
-        $aImage->Stream($aCacheFileName);
+        else {
+            $adj1min = $min;
+            $adj1max = $max;
+            list($num1steps,$maj1step) = $this->IntCalcTicksFreeze($maxsteps,$min,$max,1);
         }
 
-        $res=true;
-        // Set group to specified
-        if( CACHE_FILE_GROUP != "" )
-        $res = @chgrp($aCacheFileName,CACHE_FILE_GROUP);
-        if( CACHE_FILE_MOD != "" )
-        $res = @chmod($aCacheFileName,CACHE_FILE_MOD);
-        if( !$res )
-        JpGraphError::Raise(" Can't set permission for cached image $aStrokeFileName. Permission problem?");
-
-        $aImage->Destroy();
-        if ($aInline) {
-        if ($fh = @fopen($aCacheFileName, "rb") ) {
-            $this->img->Headers();
-            fpassthru($fh);
-
-            return;
-        } else
-            JpGraphError::Raise(" Cant open file from cache [$aFile]");
+        if( abs($min-$max) > 2 ) {
+            // Then get tick marks as 2:s 2, 20, ...
+            if( $majend ) {
+                list($num2steps,$adj2min,$adj2max,$maj2step) = $this->IntCalcTicks($maxsteps,$min,$max,5);
+            }
+            else {
+                $adj2min = $min;
+                $adj2max = $max;
+                list($num2steps,$maj2step) = $this->IntCalcTicksFreeze($maxsteps,$min,$max,5);
+            }
+        }
+        else {
+            $num2steps = 10000; // Dummy high value so we don't choose this
         }
-    } elseif ($aInline) {
-        $this->img->Headers();
-        $aImage->Stream();
-
-        return;
-    }
-    }
-
-    // Check if a given image is in cache and in that case
-    // pass it directly on to web browser. Return false if the
-    // image file doesn't exist or exists but is to old
-    public function GetAndStream($aCacheFileName)
-    {
-    $aCacheFileName = $this->cache_dir.$aCacheFileName;
-    if ( USE_CACHE && file_exists($aCacheFileName) && $this->timeout>=0 ) {
-        $diff=time()-filemtime($aCacheFileName);
-        if ( $this->timeout>0 && ($diff > $this->timeout*60) ) {
-        return false;
-        } else {
-        if ($fh = @fopen($aCacheFileName, "rb")) {
-            $this->img->Headers();
-            fpassthru($fh);
 
-            return true;
-        } else
-            JpGraphError::Raise(" Can't open cached image \"$aCacheFileName\" for reading.");
+        if( abs($min-$max) > 5 ) {
+            // Then get tickmarks as 5:s 5, 50, 500, ...
+            if( $majend ) {
+                list($num5steps,$adj5min,$adj5max,$maj5step) = $this->IntCalcTicks($maxsteps,$min,$max,2);
+            }
+            else {
+                $adj5min = $min;
+                $adj5max = $max;
+                list($num5steps,$maj5step) = $this->IntCalcTicksFreeze($maxsteps,$min,$max,2);
+            }
+        }
+        else {
+            $num5steps = 10000; // Dummy high value so we don't choose this
         }
-    }
 
-    return false;
-    }
+        // Check to see whichof 1:s, 2:s or 5:s fit better with
+        // the requested number of major ticks
+        $match1=abs($num1steps-$maxsteps);
+        $match2=abs($num2steps-$maxsteps);
+        if( !empty($maj5step) && $maj5step > 1 ) {
+            $match5=abs($num5steps-$maxsteps);
+        }
+        else {
+            $match5=10000;  // Dummy high value
+        }
 
-    //---------------
-    // PRIVATE METHODS
-    // Create all necessary directories in a path
-    public function MakeDirs($aFile)
-    {
-    $dirs = array();
-    while ( !(file_exists($aFile)) ) {
-        $dirs[] = $aFile;
-        $aFile = dirname($aFile);
-    }
-    for ($i = sizeof($dirs)-1; $i>=0; $i--) {
-        if(! @mkdir($dirs[$i],0777) )
-        JpGraphError::Raise(" Can't create directory $aFile. Make sure PHP has write permission to this directory.");
-        // We also specify mode here after we have changed group.
-        // This is necessary if Apache user doesn't belong the
-        // default group and hence can't specify group permission
-        // in the previous mkdir() call
-        if (CACHE_FILE_GROUP != "") {
-        $res=true;
-        $res =@chgrp($dirs[$i],CACHE_FILE_GROUP);
-        $res &= @chmod($dirs[$i],0777);
-        if( !$res )
-            JpGraphError::Raise(" Can't set permissions for $aFile. Permission problems?");
+        // Compare these three values and see which is the closest match
+        // We use a 0.6 weight to gravitate towards multiple of 5:s
+        if( $match1 < $match2 ) {
+            if( $match1 < $match5 ) $r=1;
+            else  $r=3;
+        }
+        else {
+            if( $match2 < $match5 ) $r=2;
+            else $r=3;
+        }
+        // Minsteps are always the same as maxsteps for integer scale
+        switch( $r ) {
+            case 1:
+                $this->ticks->Set($maj1step,$maj1step);
+                $this->Update($img,$adj1min,$adj1max);
+                break;
+            case 2:
+                $this->ticks->Set($maj2step,$maj2step);
+                $this->Update($img,$adj2min,$adj2max);
+                break;
+            case 3:
+                $this->ticks->Set($maj5step,$maj5step);
+                $this->Update($img,$adj5min,$adj5max);
+                break;
+            default:
+                JpGraphError::RaiseL(25073,$r);//('Internal error. Integer scale algorithm comparison out of bound (r=$r)');
         }
     }
 
-    return true;
-    }
-} // CLASS Cache
 
-//===================================================
-// CLASS Legend
-// Description: Responsible for drawing the box containing
-// all the legend text for the graph
-//===================================================
-DEFINE('_DEFAULT_LPM_SIZE',8);
-class Legend
-{
-    public $color=array(0,0,0); // Default fram color
-    public $fill_color=array(235,235,235); // Default fill color
-    public $shadow=true; // Shadow around legend "box"
-    public $shadow_color='gray';
-    public $txtcol=array();
-    public $mark_abs_size=_DEFAULT_LPM_SIZE;
-    public $xmargin=5,$ymargin=3,$shadow_width=2;
-    public $xlmargin=2, $ylmargin='';
-    public $xpos=0.05, $ypos=0.15, $xabspos=-1, $yabspos=-1;
-    public $halign="right", $valign="top";
-    public $font_family=FF_FONT1,$font_style=FS_NORMAL,$font_size=12;
-    public $font_color='black';
-    public $hide=false,$layout_n=1;
-    public $weight=1,$frameweight=1;
-    public $csimareas='';
-    public $reverse = false ;
-//---------------
-// CONSTRUCTOR
-    public function Legend()
-    {
-    // Empty
-    }
-//---------------
-// PUBLIC METHODS
-    public function Hide($aHide=true)
-    {
-    $this->hide=$aHide;
-    }
+    // Calculate autoscale. Used if user hasn't given a scale and ticks
+    // $maxsteps is the maximum number of major tickmarks allowed.
+    function AutoScale($img,$min,$max,$maxsteps,$majend=true) {
 
-    public function SetHColMargin($aXMarg)
-    {
-    $this->xmargin = $aXMarg;
-    }
+        if( !is_numeric($min) || !is_numeric($max) ) {
+            JpGraphError::Raise(25044);
+        }
 
-    public function SetVColMargin($aSpacing)
-    {
-    $this->ymargin = $aSpacing ;
-    }
+        if( $this->intscale ) {
+            $this->IntAutoScale($img,$min,$max,$maxsteps,$majend);
+            return;
+        }
+        if( abs($min-$max) < 0.00001 ) {
+            // We need some difference to be able to autoscale
+            // make it 5% above and 5% below value
+            if( $min==0 && $max==0 ) {  // Special case
+                $min=-1; $max=1;
+            }
+            else {
+                $delta = (abs($max)+abs($min))*0.005;
+                $min -= $delta;
+                $max += $delta;
+            }
+        }
 
-    public function SetLeftMargin($aXMarg)
-    {
-    $this->xlmargin = $aXMarg;
-    }
+        $gracetop=($this->gracetop/100.0)*abs($max-$min);
+        $gracebottom=($this->gracebottom/100.0)*abs($max-$min);
+        if( is_numeric($this->autoscale_min) ) {
+            $min = $this->autoscale_min;
+            if( $min >= $max ) {
+                JpGraphError::RaiseL(25071);//('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.');
+            }
+            if( abs($min-$max ) < 0.001 ) {
+                $max *= 1.2;
+            }
+        }
 
+        if( is_numeric($this->autoscale_max) ) {
+            $max = $this->autoscale_max;
+            if( $min >= $max ) {
+                JpGraphError::RaiseL(25072);//('You have specified a max value with SetAutoMax() which is smaller than the miminum value used for the scale. This is not possible.');
+            }
+            if( abs($min-$max ) < 0.001 ) {
+                $min *= 0.8;
+            }
+        }
 
-    // Synonym
-    public function SetLineSpacing($aSpacing)
-    {
-    $this->ymargin = $aSpacing ;
-    }
+        $min -= $gracebottom;
+        $max += $gracetop;
 
-    public function SetShadow($aShow='gray',$aWidth=2)
-    {
-    if ( is_string($aShow) ) {
-        $this->shadow_color = $aShow;
-        $this->shadow=true;
-    } else
-        $this->shadow=$aShow;
-    $this->shadow_width=$aWidth;
-    }
+        // First get tickmarks as multiples of 0.1, 1, 10, ...
+        if( $majend ) {
+            list($num1steps,$adj1min,$adj1max,$min1step,$maj1step) = $this->CalcTicks($maxsteps,$min,$max,1,2);
+        }
+        else {
+            $adj1min=$min;
+            $adj1max=$max;
+            list($num1steps,$min1step,$maj1step) = $this->CalcTicksFreeze($maxsteps,$min,$max,1,2,false);
+        }
 
-    public function SetMarkAbsSize($aSize)
-    {
-    $this->mark_abs_size = $aSize ;
-    }
+        // Then get tick marks as 2:s 0.2, 2, 20, ...
+        if( $majend ) {
+            list($num2steps,$adj2min,$adj2max,$min2step,$maj2step) = $this->CalcTicks($maxsteps,$min,$max,5,2);
+        }
+        else {
+            $adj2min=$min;
+            $adj2max=$max;
+            list($num2steps,$min2step,$maj2step) = $this->CalcTicksFreeze($maxsteps,$min,$max,5,2,false);
+        }
 
-    public function SetLineWeight($aWeight)
-    {
-    $this->weight = $aWeight;
-    }
+        // Then get tickmarks as 5:s 0.05, 0.5, 5, 50, ...
+        if( $majend ) {
+            list($num5steps,$adj5min,$adj5max,$min5step,$maj5step) = $this->CalcTicks($maxsteps,$min,$max,2,5);
+        }
+        else {
+            $adj5min=$min;
+            $adj5max=$max;
+            list($num5steps,$min5step,$maj5step) = $this->CalcTicksFreeze($maxsteps,$min,$max,2,5,false);
+        }
 
-    public function SetFrameWeight($aWeight)
-    {
-    $this->frameweight = $aWeight;
-    }
+        // Check to see whichof 1:s, 2:s or 5:s fit better with
+        // the requested number of major ticks
+        $match1=abs($num1steps-$maxsteps);
+        $match2=abs($num2steps-$maxsteps);
+        $match5=abs($num5steps-$maxsteps);
 
-    public function SetLayout($aDirection=LEGEND_VERT)
-    {
-    $this->layout_n = $aDirection==LEGEND_VERT ? 1 : 99 ;
+        // Compare these three values and see which is the closest match
+        // We use a 0.8 weight to gravitate towards multiple of 5:s
+        $r=$this->MatchMin3($match1,$match2,$match5,0.8);
+        switch( $r ) {
+            case 1:
+                $this->Update($img,$adj1min,$adj1max);
+                $this->ticks->Set($maj1step,$min1step);
+                break;
+            case 2:
+                $this->Update($img,$adj2min,$adj2max);
+                $this->ticks->Set($maj2step,$min2step);
+                break;
+            case 3:
+                $this->Update($img,$adj5min,$adj5max);
+                $this->ticks->Set($maj5step,$min5step);
+                break;
+        }
     }
 
-    public function SetColumns($aCols)
-    {
-    $this->layout_n = $aCols ;
-    }
+    //---------------
+    // PRIVATE METHODS
 
-    public function SetReverse($f=true)
-    {
-    $this->reverse = $f ;
+    // This method recalculates all constants that are depending on the
+    // margins in the image. If the margins in the image are changed
+    // this method should be called for every scale that is registred with
+    // that image. Should really be installed as an observer of that image.
+    function InitConstants($img) {
+        if( $this->type=='x' ) {
+            $this->world_abs_size=$img->width - $img->left_margin - $img->right_margin;
+            $this->off=$img->left_margin;
+            $this->scale_factor = 0;
+            if( $this->world_size > 0 ) {
+                $this->scale_factor=$this->world_abs_size/($this->world_size*1.0);
+            }
+        }
+        else { // y scale
+            $this->world_abs_size=$img->height - $img->top_margin - $img->bottom_margin;
+            $this->off=$img->top_margin+$this->world_abs_size;
+            $this->scale_factor = 0;
+            if( $this->world_size > 0 ) {
+                $this->scale_factor=-$this->world_abs_size/($this->world_size*1.0);
+            }
+        }
+        $size = $this->world_size * $this->scale_factor;
+        $this->scale_abs=array($this->off,$this->off + $size);
     }
 
-    // Set color on frame around box
-    public function SetColor($aFontColor,$aColor='black')
-    {
-    $this->font_color=$aFontColor;
-    $this->color=$aColor;
-    }
+    // Initialize the conversion constants for this scale
+    // This tries to pre-calculate as much as possible to speed up the
+    // actual conversion (with Translate()) later on
+    // $start =scale start in absolute pixels (for x-scale this is an y-position
+    //     and for an y-scale this is an x-position
+    // $len   =absolute length in pixels of scale
+    function SetConstants($aStart,$aLen) {
+        $this->world_abs_size=$aLen;
+        $this->off=$aStart;
 
-    public function SetFont($aFamily,$aStyle=FS_NORMAL,$aSize=10)
-    {
-    $this->font_family = $aFamily;
-    $this->font_style = $aStyle;
-    $this->font_size = $aSize;
-    }
+        if( $this->world_size<=0 ) {
+            // This should never ever happen !!
+            JpGraphError::RaiseL(25074);
+            //("You have unfortunately stumbled upon a bug in JpGraph. It seems like the scale range is ".$this->world_size." [for ".$this->type." scale] <br> Please report Bug #01 to info@jpgraph.net and include the script that gave this error. This problem could potentially be caused by trying to use \"illegal\" values in the input data arrays (like trying to send in strings or only NULL values) which causes the autoscaling to fail.");
+        }
 
-    public function SetPos($aX,$aY,$aHAlign="right",$aVAlign="top")
-    {
-    $this->Pos($aX,$aY,$aHAlign,$aVAlign);
-    }
+        // scale_factor = number of pixels per world unit
+        $this->scale_factor=$this->world_abs_size/($this->world_size*1.0);
 
-    public function SetAbsPos($aX,$aY,$aHAlign="right",$aVAlign="top")
-    {
-    $this->xabspos=$aX;
-    $this->yabspos=$aY;
-    $this->halign=$aHAlign;
-    $this->valign=$aVAlign;
+        // scale_abs = start and end points of scale in absolute pixels
+        $this->scale_abs=array($this->off,$this->off+$this->world_size*$this->scale_factor);
     }
 
 
-    public function Pos($aX,$aY,$aHAlign="right",$aVAlign="top")
-    {
-    if( !($aX<1 && $aY<1) )
-        JpGraphError::Raise(" Position for legend must be given as percentage in range 0-1");
-    $this->xpos=$aX;
-    $this->ypos=$aY;
-    $this->halign=$aHAlign;
-    $this->valign=$aVAlign;
-    }
+    // Calculate number of ticks steps with a specific division
+    // $a is the divisor of 10**x to generate the first maj tick intervall
+    // $a=1, $b=2 give major ticks with multiple of 10, ...,0.1,1,10,...
+    // $a=5, $b=2 give major ticks with multiple of 2:s ...,0.2,2,20,...
+    // $a=2, $b=5 give major ticks with multiple of 5:s ...,0.5,5,50,...
+    // We return a vector of
+    //  [$numsteps,$adjmin,$adjmax,$minstep,$majstep]
+    // If $majend==true then the first and last marks on the axis will be major
+    // labeled tick marks otherwise it will be adjusted to the closest min tick mark
+    function CalcTicks($maxsteps,$min,$max,$a,$b,$majend=true) {
+        $diff=$max-$min;
+        if( $diff==0 ) {
+            $ld=0;
+        }
+        else {
+            $ld=floor(log10($diff));
+        }
 
-    public function SetFillColor($aColor)
-    {
-    $this->fill_color=$aColor;
-    }
+        // Gravitate min towards zero if we are close
+        if( $min>0 && $min < pow(10,$ld) ) $min=0;
 
-    public function Add($aTxt,$aColor,$aPlotmark="",$aLinestyle=0,$csimtarget="",$csimalt="")
-    {
-    $this->txtcol[]=array($aTxt,$aColor,$aPlotmark,$aLinestyle,$csimtarget,$csimalt);
-    }
+        //$majstep=pow(10,$ld-1)/$a;
+        $majstep=pow(10,$ld)/$a;
+        $minstep=$majstep/$b;
 
-    public function GetCSIMAreas()
-    {
-    return $this->csimareas;
-    }
+        $adjmax=ceil($max/$minstep)*$minstep;
+        $adjmin=floor($min/$minstep)*$minstep;
+        $adjdiff = $adjmax-$adjmin;
+        $numsteps=$adjdiff/$majstep;
 
-    public function Stroke(&$aImg)
-    {
-    if( $this->hide ) return;
+        while( $numsteps>$maxsteps ) {
+            $majstep=pow(10,$ld)/$a;
+            $numsteps=$adjdiff/$majstep;
+            ++$ld;
+        }
 
-    $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
+        $minstep=$majstep/$b;
+        $adjmin=floor($min/$minstep)*$minstep;
+        $adjdiff = $adjmax-$adjmin;
+        if( $majend ) {
+            $adjmin = floor($min/$majstep)*$majstep;
+            $adjdiff = $adjmax-$adjmin;
+            $adjmax = ceil($adjdiff/$majstep)*$majstep+$adjmin;
+        }
+        else {
+            $adjmax=ceil($max/$minstep)*$minstep;
+        }
 
-    if ($this->reverse) {
-        $this->txtcol = array_reverse($this->txtcol);
+        return array($numsteps,$adjmin,$adjmax,$minstep,$majstep);
     }
 
-    $n=count($this->txtcol);
-    if( $n == 0 ) return;
+    function CalcTicksFreeze($maxsteps,$min,$max,$a,$b) {
+        // Same as CalcTicks but don't adjust min/max values
+        $diff=$max-$min;
+        if( $diff==0 ) {
+            $ld=0;
+        }
+        else {
+            $ld=floor(log10($diff));
+        }
 
-    // Find out the max width and height of each column to be able
-        // to size the legend box.
-    $numcolumns = ($n > $this->layout_n ? $this->layout_n : $n);
-    for ($i=0; $i < $numcolumns; ++$i) {
-        $colwidth[$i] = $aImg->GetTextWidth($this->txtcol[$i][0]) +
-                    2*$this->xmargin + 2*$this->mark_abs_size;
-        $colheight[$i] = 0;
-    }
+        //$majstep=pow(10,$ld-1)/$a;
+        $majstep=pow(10,$ld)/$a;
+        $minstep=$majstep/$b;
+        $numsteps=floor($diff/$majstep);
 
-    // Find our maximum height in each row
-    $rows = -1 ;
-    for ($i=0; $i < $n; ++$i) {
-        $h = max($this->mark_abs_size,$aImg->GetTextHeight($this->txtcol[$i][0]))+$this->ymargin;
-        if ($i % $numcolumns == 0) {
-        $rows++;
-        $rowheight[$rows] = 0;
+        while( $numsteps > $maxsteps ) {
+            $majstep=pow(10,$ld)/$a;
+            $numsteps=floor($diff/$majstep);
+            ++$ld;
         }
-        $rowheight[$rows] = max($rowheight[$rows],$h);
+        $minstep=$majstep/$b;
+        return array($numsteps,$minstep,$majstep);
     }
 
-    $abs_height = 0;
-    for ($i=0; $i <= $rows; ++$i) {
-        $abs_height += $rowheight[$i] ;
-    }
 
-    // Make sure that the height is at least as high as mark size + ymargin
-    $abs_height = max($abs_height,$this->mark_abs_size+$this->ymargin);
-    $abs_height += 2*$this->ymargin +  $this->mark_abs_size/2;
+    function IntCalcTicks($maxsteps,$min,$max,$a,$majend=true) {
+        $diff=$max-$min;
+        if( $diff==0 ) {
+            JpGraphError::RaiseL(25075);//('Can\'t automatically determine ticks since min==max.');
+        }
+        else {
+            $ld=floor(log10($diff));
+        }
 
-    // Find out the maximum width in each column
-    for ($i=$numcolumns; $i < $n; ++$i) {
-        $colwidth[$i % $numcolumns] = max(
-        $aImg->GetTextWidth($this->txtcol[$i][0])+2*$this->xmargin+2*$this->mark_abs_size,
-        $colwidth[$i % $numcolumns]);
-    }
+        // Gravitate min towards zero if we are close
+        if( $min>0 && $min < pow(10,$ld) ) {
+            $min=0;
+        }
+        if( $ld == 0 ) {
+            $ld=1;
+        }
+        if( $a == 1 ) {
+            $majstep = 1;
+        }
+        else {
+            $majstep=pow(10,$ld)/$a;
+        }
+        $adjmax=ceil($max/$majstep)*$majstep;
 
-    // Get the total width
-    $mtw = 0;
-    for ($i=0; $i < $numcolumns; ++$i) {
-        $mtw += $colwidth[$i] ;
-    }
+        $adjmin=floor($min/$majstep)*$majstep;
+        $adjdiff = $adjmax-$adjmin;
+        $numsteps=$adjdiff/$majstep;
+        while( $numsteps>$maxsteps ) {
+            $majstep=pow(10,$ld)/$a;
+            $numsteps=$adjdiff/$majstep;
+            ++$ld;
+        }
 
-    // Find out maximum width we need for legend box
-    $abs_width = $mtw+$this->xlmargin;
+        $adjmin=floor($min/$majstep)*$majstep;
+        $adjdiff = $adjmax-$adjmin;
+        if( $majend ) {
+            $adjmin = floor($min/$majstep)*$majstep;
+            $adjdiff = $adjmax-$adjmin;
+            $adjmax = ceil($adjdiff/$majstep)*$majstep+$adjmin;
+        }
+        else {
+            $adjmax=ceil($max/$majstep)*$majstep;
+        }
 
-    if ($this->xabspos === -1  && $this->yabspos === -1) {
-        $this->xabspos = $this->xpos*$aImg->width ;
-        $this->yabspos = $this->ypos*$aImg->height ;
+        return array($numsteps,$adjmin,$adjmax,$majstep);
     }
 
-    // Positioning of the legend box
-    if( $this->halign=="left" )
-        $xp = $this->xabspos;
-    elseif( $this->halign=="center" )
-        $xp = $this->xabspos - $abs_width/2;
-    else
-        $xp = $aImg->width - $this->xabspos - $abs_width;
 
-    $yp=$this->yabspos;
-    if( $this->valign=="center" )
-        $yp-=$abs_height/2;
-    elseif( $this->valign=="bottom" )
-        $yp-=$abs_height;
+    function IntCalcTicksFreeze($maxsteps,$min,$max,$a) {
+        // Same as IntCalcTick but don't change min/max values
+        $diff=$max-$min;
+        if( $diff==0 ) {
+            JpGraphError::RaiseL(25075);//('Can\'t automatically determine ticks since min==max.');
+        }
+        else {
+            $ld=floor(log10($diff));
+        }
+        if( $ld == 0 ) {
+            $ld=1;
+        }
+        if( $a == 1 ) {
+            $majstep = 1;
+        }
+        else {
+            $majstep=pow(10,$ld)/$a;
+        }
+
+        $numsteps=floor($diff/$majstep);
+        while( $numsteps > $maxsteps ) {
+            $majstep=pow(10,$ld)/$a;
+            $numsteps=floor($diff/$majstep);
+            ++$ld;
+        }
 
-    // Stroke legend box
-    $aImg->SetColor($this->color);
-    $aImg->SetLineWeight($this->frameweight);
-    $aImg->SetLineStyle('solid');
+        return array($numsteps,$majstep);
+    }
 
-    if( $this->shadow )
-        $aImg->ShadowRectangle($xp,$yp,$xp+$abs_width+$this->shadow_width,
-                   $yp+$abs_height+$this->shadow_width,
-                   $this->fill_color,$this->shadow_width,$this->shadow_color);
-    else {
-        $aImg->SetColor($this->fill_color);
-        $aImg->FilledRectangle($xp,$yp,$xp+$abs_width,$yp+$abs_height);
-        $aImg->SetColor($this->color);
-        $aImg->Rectangle($xp,$yp,$xp+$abs_width,$yp+$abs_height);
-    }
-
-    // x1,y1 is the position for the legend mark
-    $aImg->SetLineWeight($this->weight);
-    $x1=$xp+$this->mark_abs_size+$this->xlmargin;
-    $y1=$yp + $this->mark_abs_size/2 + $this->ymargin/3;
-
-    $f2 =  round($aImg->GetTextHeight('X')/2);
-
-    $grad = new Gradient($aImg);
-
-    // Now stroke each legend in turn
-    // Each plot has added the following information to  the legend
-    // p[0] = Legend text
-    // p[1] = Color,
-    // p[2] = For markers a reference to the PlotMark object
-    // p[3] = For lines the line style, for gradient the negative gradient style
-    // p[4] = CSIM target
-    // p[5] = CSIM Alt text
-    $i = 1 ; $row = 0;
-    foreach ($this->txtcol as $p) {
-        $x1 = round($x1); $y1=round($y1);
-        if ( $p[2] != "" && $p[2]->GetType() > -1 ) {
-        // Make a plot mark legend
-        $aImg->SetColor($p[1]);
-        if ( is_string($p[3]) || $p[3]>0 ) {
-            $aImg->SetLineStyle($p[3]);
-            $aImg->StyleLine($x1-$this->mark_abs_size,$y1+$f2,$x1+$this->mark_abs_size,$y1+$f2);
-        }
-        // Stroke a mark with the standard size
-        // (As long as it is not an image mark )
-        if ( $p[2]->GetType() != MARK_IMG ) {
-            $p[2]->iFormatCallback = '';
-
-            // Since size for circles is specified as the radius
-            // this means that we must half the size to make the total
-            // width behave as the other marks
-            if ( $p[2]->GetType() == MARK_FILLEDCIRCLE || $p[2]->GetType() == MARK_CIRCLE ) {
-                $p[2]->SetSize($this->mark_abs_size/2);
-            $p[2]->Stroke($aImg,$x1,$y1+$f2);
-            } else {
-                $p[2]->SetSize($this->mark_abs_size);
-            $p[2]->Stroke($aImg,$x1,$y1+$f2);
-            }
-        }
-        } elseif ( $p[2] != "" && (is_string($p[3]) || $p[3]>0 ) ) {
-        // Draw a styled line
-        $aImg->SetColor($p[1]);
-        $aImg->SetLineStyle($p[3]);
-        $aImg->StyleLine($x1-1,$y1+$f2,$x1+$this->mark_abs_size,$y1+$f2);
-        $aImg->StyleLine($x1-1,$y1+$f2+1,$x1+$this->mark_abs_size,$y1+$f2+1);
-        } else {
-        // Draw a colored box
-        $color = $p[1] ;
-        $ym =  round($y1 + $f2 - $this->mark_abs_size/2);
-        if ( is_array($color) && count($color)==2 ) {
-            // The client want a gradient color
-            $grad->FilledRectangle($x1,$ym,
-                       $x1+$this->mark_abs_size,$ym+$this->mark_abs_size,
-                       $color[0],$color[1],-$p[3]);
-        } else {
-            $aImg->SetColor($p[1]);
-            $aImg->FilledRectangle($x1,$ym,$x1+$this->mark_abs_size,$ym+$this->mark_abs_size);
+    // Determine the minimum of three values witha  weight for last value
+    function MatchMin3($a,$b,$c,$weight) {
+        if( $a < $b ) {
+            if( $a < ($c*$weight) ) {
+                return 1; // $a smallest
+            }
+            else {
+                return 3; // $c smallest
+            }
         }
-        $aImg->SetColor($this->color);
-        $aImg->SetLineWeight($this->weight);
-        $aImg->Rectangle($x1,$ym,$x1+$this->mark_abs_size,$ym+$this->mark_abs_size);
+        elseif( $b < ($c*$weight) ) {
+            return 2; // $b smallest
         }
-        $aImg->SetColor($this->font_color);
-        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-        $aImg->SetTextAlign("left","top");
-        $aImg->StrokeText(round($x1+$this->mark_abs_size+$this->xmargin),$y1,$p[0]);
-
-        // Add CSIM for Legend if defined
-        if ($p[4] != "") {
-        $xe = $x1 + $this->xmargin+$this->mark_abs_size+$aImg->GetTextWidth($p[0]);
-        $ye = $y1 + max($this->mark_abs_size,$aImg->GetTextHeight($p[0]));
-        $coords = "$x1,$y1,$xe,$y1,$xe,$ye,$x1,$ye";
-        if ( ! empty($p[4]) ) {
-            $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$p[4]."\"";
-            if ( !empty($p[5]) ) {
-            $tmp=sprintf($p[5],$p[0]);
-            $this->csimareas .= " alt=\"$tmp\" title=\"$tmp\"";
-            }
-            $this->csimareas .= ">\n";
-        }
-        }
-        if ($i >= $this->layout_n) {
-        $x1 = $xp+$this->mark_abs_size+$this->xlmargin;
-        //$y1 += max($aImg->GetTextHeight($p[0]),$this->mark_abs_size)+$this->ymargin;
-        $y1 += $rowheight[$row++];
-        $i = 1;
+        return 3; // $c smallest
+    }
+
+    function __get($name) {
+        $variable_name = '_' . $name; 
+
+        if (isset($this->$variable_name)) {
+            return $this->$variable_name * SUPERSAMPLING_SCALE;
         } else {
-        $x1 += $colwidth[($i-1) % $numcolumns] ;
-        ++$i;
-        }
+            JpGraphError::RaiseL('25132', $name);
+        } 
     }
+
+    function __set($name, $value) {
+        $this->{'_'.$name} = $value;
     }
 } // Class
 
@@ -7910,115 +5234,133 @@ public function Stroke(&$aImg)
 // CLASS DisplayValue
 // Description: Used to print data values at data points
 //===================================================
-class DisplayValue
-{
-    public $show=false,$format="%.1f",$negformat="";
-    public $iFormCallback='';
-    public $angle=0;
-    public $ff=FF_FONT1,$fs=FS_NORMAL,$fsize=10;
-    public $color="navy",$negcolor="";
-    public $margin=5,$valign="",$halign="center";
-    public $iHideZero=false;
+class DisplayValue {
+    public $margin=5;
+    public $show=false;
+    public $valign='',$halign='center';
+    public $format='%.1f',$negformat='';
+    private $ff=FF_DEFAULT,$fs=FS_NORMAL,$fsize=8;
+    private $iFormCallback='';
+    private $angle=0;
+    private $color='navy',$negcolor='';
+    private $iHideZero=false;
+    public $txt=null;
 
-    public function Show($aFlag=true)
-    {
-    $this->show=$aFlag;
+    function __construct() {
+                $this->txt = new Text();
     }
 
-    public function SetColor($aColor,$aNegcolor="")
-    {
-    $this->color = $aColor;
-    $this->negcolor = $aNegcolor;
+    function Show($aFlag=true) {
+        $this->show=$aFlag;
     }
 
-    public function SetFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10)
-    {
-    $this->ff=$aFontFamily;
-    $this->fs=$aFontStyle;
-    $this->fsize=$aFontSize;
+    function SetColor($aColor,$aNegcolor='') {
+        $this->color = $aColor;
+        $this->negcolor = $aNegcolor;
     }
 
-    public function SetMargin($aMargin)
-    {
-    $this->margin = $aMargin;
+    function SetFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=8) {
+        $this->ff=$aFontFamily;
+        $this->fs=$aFontStyle;
+        $this->fsize=$aFontSize;
     }
 
-    public function SetAngle($aAngle)
-    {
-    $this->angle = $aAngle;
+    function ApplyFont($aImg) {
+        $aImg->SetFont($this->ff,$this->fs,$this->fsize);
     }
 
-    public function SetAlign($aHAlign,$aVAlign='')
-    {
-    $this->halign = $aHAlign;
-    $this->valign = $aVAlign;
+    function SetMargin($aMargin) {
+        $this->margin = $aMargin;
     }
 
-    public function SetFormat($aFormat,$aNegFormat="")
-    {
-    $this->format= $aFormat;
-    $this->negformat= $aNegFormat;
+    function SetAngle($aAngle) {
+        $this->angle = $aAngle;
     }
 
-    public function SetFormatCallback($aFunc)
-    {
-    $this->iFormCallback = $aFunc;
+    function SetAlign($aHAlign,$aVAlign='') {
+        $this->halign = $aHAlign;
+        $this->valign = $aVAlign;
     }
 
-    public function HideZero($aFlag=true)
-    {
-    $this->iHideZero=$aFlag;
+    function SetFormat($aFormat,$aNegFormat='') {
+        $this->format= $aFormat;
+        $this->negformat= $aNegFormat;
     }
 
-    public function Stroke($img,$aVal,$x,$y)
-    {
-    if ($this->show) {
-        if( $this->negformat=="" ) $this->negformat=$this->format;
-        if( $this->negcolor=="" ) $this->negcolor=$this->color;
+    function SetFormatCallback($aFunc) {
+        $this->iFormCallback = $aFunc;
+    }
 
-        if( $aVal===NULL || (is_string($aVal) && ($aVal=="" || $aVal=="-" || $aVal=="x" ) ) )
+    function HideZero($aFlag=true) {
+        $this->iHideZero=$aFlag;
+    }
 
-        return;
+    function Stroke($img,$aVal,$x,$y) {
 
-        if ( is_numeric($aVal) && $aVal==0 && $this->iHideZero ) {
-        return;
-        }
+        if( $this->show )
+        {
+            if( $this->negformat=='' ) {
+                $this->negformat=$this->format;
+            }
+            if( $this->negcolor=='' ) {
+                $this->negcolor=$this->color;
+            }
 
-        // Since the value is used in different cirumstances we need to check what
-        // kind of formatting we shall use. For example, to display values in a line
-        // graph we simply display the formatted value, but in the case where the user
-        // has already specified a text string we don't fo anything.
-        if ($this->iFormCallback != '') {
-        $f = $this->iFormCallback;
-        $sval = call_user_func($f,$aVal);
-        } elseif ( is_numeric($aVal) ) {
-        if( $aVal >= 0 )
-            $sval=sprintf($this->format,$aVal);
-        else
-            $sval=sprintf($this->negformat,$aVal);
-        } else
-        $sval=$aVal;
+            if( $aVal===NULL || (is_string($aVal) && ($aVal=='' || $aVal=='-' || $aVal=='x' ) ) ) {
+                return;
+            }
 
-        $y = $y-sign($aVal)*$this->margin;
+            if( is_numeric($aVal) && $aVal==0 && $this->iHideZero ) {
+                return;
+            }
 
-        $txt = new Text($sval,$x,$y);
-        $txt->SetFont($this->ff,$this->fs,$this->fsize);
-        if ($this->valign == "") {
-        if( $aVal >= 0 )
-            $valign = "bottom";
-        else
-            $valign = "top";
-        } else
-        $valign = $this->valign;
-        $txt->Align($this->halign,$valign);
+            // Since the value is used in different cirumstances we need to check what
+            // kind of formatting we shall use. For example, to display values in a line
+            // graph we simply display the formatted value, but in the case where the user
+            // has already specified a text string we don't fo anything.
+            if( $this->iFormCallback != '' ) {
+                $f = $this->iFormCallback;
+                $sval = call_user_func($f,$aVal);
+            }
+            elseif( is_numeric($aVal) ) {
+                if( $aVal >= 0 ) {
+                    $sval=sprintf($this->format,$aVal);
+                }
+                else {
+                    $sval=sprintf($this->negformat,$aVal);
+                }
+            }
+            else {
+                $sval=$aVal;
+            }
 
-        $txt->SetOrientation($this->angle);
-        if( $aVal > 0 )
-        $txt->SetColor($this->color);
-        else
-        $txt->SetColor($this->negcolor);
-        $txt->Stroke($img);
-    }
+            $y = $y-sign($aVal)*$this->margin;
+
+            $this->txt->Set($sval);
+            $this->txt->SetPos($x,$y);
+            $this->txt->SetFont($this->ff,$this->fs,$this->fsize);
+            if( $this->valign == '' ) {
+                if( $aVal >= 0 ) {
+                    $valign = "bottom";
+                }
+                else {
+                    $valign = "top";
+                }
+            }
+            else {
+                $valign = $this->valign;
+            }
+            $this->txt->Align($this->halign,$valign);
+
+            $this->txt->SetOrientation($this->angle);
+            if( $aVal > 0 ) {
+                $this->txt->SetColor($this->color);
+            }
+            else {
+                $this->txt->SetColor($this->negcolor);
+            }
+            $this->txt->Stroke($img);
+        }
     }
 }
 
@@ -8026,263 +5368,259 @@ public function Stroke($img,$aVal,$x,$y)
 // CLASS Plot
 // Description: Abstract base class for all concrete plot classes
 //===================================================
-class Plot
-{
-    public $line_weight=1;
-    public $coords=array();
-    public $legend='',$hidelegend=false;
-    public $csimtargets=array();	// Array of targets for CSIM
-    public $csimareas="";			// Resultant CSIM area tags
-    public $csimalts=null;			// ALT:s for corresponding target
-    public $color="black";
+class Plot {
     public $numpoints=0;
-    public $weight=1;
     public $value;
-    public $center=false;
-    public $legendcsimtarget='';
+    public $legend='';
+    public $coords=array();
+    public $color='black';
+    public $hidelegend=false;
+    public $line_weight=1;
+    public $csimtargets=array(),$csimwintargets=array(); // Array of targets for CSIM
+    public $csimareas='';   // Resultant CSIM area tags
+    public $csimalts=null;   // ALT:s for corresponding target
+    public $legendcsimtarget='',$legendcsimwintarget='';
     public $legendcsimalt='';
-//---------------
-// CONSTRUCTOR
-    public function Plot(&$aDatay,$aDatax=false)
-    {
-    $this->numpoints = count($aDatay);
-    if( $this->numpoints==0 )
-        JpGraphError::Raise("Empty input data array specified for plot. Must have at least one data point.");
-    $this->coords[0]=$aDatay;
-    if( is_array($aDatax) )
-        $this->coords[1]=$aDatax;
-    $this->value = new DisplayValue();
-    }
-
-//---------------
-// PUBLIC METHODS
+    protected $weight=1;
+    protected $center=false;
+
+    protected $inputValues;
+    protected $isRunningClear = false;
+
+    function __construct($aDatay,$aDatax=false) {
+        $this->numpoints = count($aDatay);
+        if( $this->numpoints==0 ) {
+            JpGraphError::RaiseL(25121);//("Empty input data array specified for plot. Must have at least one data point.");
+        }
+
+        if (!$this->isRunningClear) {
+            $this->inputValues = array();
+            $this->inputValues['aDatay'] = $aDatay;
+            $this->inputValues['aDatax'] = $aDatax;
+        }
+
+        $this->coords[0]=$aDatay;
+        if( is_array($aDatax) ) {
+            $this->coords[1]=$aDatax;
+            $n = count($aDatax);
+            for( $i=0; $i < $n; ++$i ) {
+                if( !is_numeric($aDatax[$i]) ) {
+                    JpGraphError::RaiseL(25070);
+                }
+            }
+        }
+        $this->value = new DisplayValue();
+    }
 
     // Stroke the plot
     // "virtual" function which must be implemented by
     // the subclasses
-    public function Stroke(&$aImg,&$aXScale,&$aYScale)
-    {
-    JpGraphError::Raise("JpGraph: Stroke() must be implemented by concrete subclass to class Plot");
+    function Stroke($aImg,$aXScale,$aYScale) {
+        JpGraphError::RaiseL(25122);//("JpGraph: Stroke() must be implemented by concrete subclass to class Plot");
     }
 
-    public function HideLegend($f=true)
-    {
-    $this->hidelegend = $f;
+    function HideLegend($f=true) {
+        $this->hidelegend = $f;
     }
 
-    public function DoLegend(&$graph)
-    {
-    if( !$this->hidelegend )
+    function DoLegend($graph) {
+        if( !$this->hidelegend )
         $this->Legend($graph);
     }
 
-    public function StrokeDataValue($img,$aVal,$x,$y)
-    {
-    $this->value->Stroke($img,$aVal,$x,$y);
+    function StrokeDataValue($img,$aVal,$x,$y) {
+        $this->value->Stroke($img,$aVal,$x,$y);
     }
 
     // Set href targets for CSIM
-    public function SetCSIMTargets($aTargets,$aAlts=null)
-    {
-    $this->csimtargets=$aTargets;
-    $this->csimalts=$aAlts;
+    function SetCSIMTargets($aTargets,$aAlts='',$aWinTargets='') {
+        $this->csimtargets=$aTargets;
+        $this->csimwintargets=$aWinTargets;
+        $this->csimalts=$aAlts;
     }
 
     // Get all created areas
-    public function GetCSIMareas()
-    {
-    return $this->csimareas;
+    function GetCSIMareas() {
+        return $this->csimareas;
     }
 
     // "Virtual" function which gets called before any scale
     // or axis are stroked used to do any plot specific adjustment
-    public function PreStrokeAdjust(&$aGraph)
-    {
-    if( substr($aGraph->axtype,0,4) == "text" && (isset($this->coords[1])) )
-        JpGraphError::Raise("JpGraph: You can't use a text X-scale with specified X-coords. Use a \"int\" or \"lin\" scale instead.");
+    function PreStrokeAdjust($aGraph) {
+        if( substr($aGraph->axtype,0,4) == "text" && (isset($this->coords[1])) ) {
+            JpGraphError::RaiseL(25123);//("JpGraph: You can't use a text X-scale with specified X-coords. Use a \"int\" or \"lin\" scale instead.");
+        }
+        return true;
+    }
 
-    return true;
+    // Virtual function to the the concrete plot class to make any changes to the graph
+    // and scale before the stroke process begins
+    function PreScaleSetup($aGraph) {
+        // Empty
     }
 
     // Get minimum values in plot
-    public function Min()
-    {
-    if( isset($this->coords[1]) )
-        $x=$this->coords[1];
-    else
-        $x="";
-    if( $x != "" && count($x) > 0 )
-        $xm=min($x);
-    else
-        $xm=0;
-    $y=$this->coords[0];
-    $cnt = count($y);
-    if ($cnt > 0) {
-        if ( ! isset($y[0]) ) {
-        JpGraphError('The input data array must have consecutive values from position 0 and forward. The given y-array starts with empty values (NULL)');
-        }
-        $ym = $y[0];
-        $i=0;
-        while( $i<$cnt && !is_numeric($ym=$y[$i]) )
-        $i++;
-        while ($i < $cnt) {
-        if( is_numeric($y[$i]) )
-            $ym=min($ym,$y[$i]);
-        ++$i;
+    function Min() {
+        if( isset($this->coords[1]) ) {
+            $x=$this->coords[1];
         }
-    } else
-        $ym="";
-
-    return array($xm,$ym);
+        else {
+            $x='';
+        }
+        if( $x != '' && count($x) > 0 ) {
+            $xm=min($x);
+        }
+        else {
+            $xm=0;
+        }
+        $y=$this->coords[0];
+        $cnt = count($y);
+        if( $cnt > 0 ) {
+            $i=0;
+            while( $i<$cnt && !is_numeric($ym=$y[$i]) ) {
+                $i++;
+            }
+            while( $i < $cnt) {
+                if( is_numeric($y[$i]) ) {
+                    $ym=min($ym,$y[$i]);
+                }
+                ++$i;
+            }
+        }
+        else {
+            $ym='';
+        }
+        return array($xm,$ym);
     }
 
     // Get maximum value in plot
-    public function Max()
-    {
-    if( isset($this->coords[1]) )
-        $x=$this->coords[1];
-    else
-        $x="";
-
-    if( $x!="" && count($x) > 0 )
-        $xm=max($x);
-    else {
-        $xm = $this->numpoints-1;
-    }
-    $y=$this->coords[0];
-    if ( count($y) > 0 ) {
-        if ( !isset($y[0]) ) {
-        JpGraphError::Raise('The input data array must have consecutive values from position 0 and forward. The given y-array starts with empty values (NULL)');
-//		$y[0] = 0;
-// Change in 1.5.1 Don't treat this as an error any more. Just silently convert to 0
-// Change in 1.17 Treat his as an error again !! This is the right way to do !!
+    function Max() {
+        if( isset($this->coords[1]) ) {
+            $x=$this->coords[1];
         }
-        $cnt = count($y);
-        $i=0;
-        while( $i<$cnt && !is_numeric($ym=$y[$i]) )
-        $i++;
-        while ($i < $cnt) {
-        if( is_numeric($y[$i]) ) $ym=max($ym,$y[$i]);
-        ++$i;
+        else {
+            $x='';
         }
-    } else
-        $ym="";
 
-    return array($xm,$ym);
+        if( $x!='' && count($x) > 0 ) {
+            $xm=max($x);
+        }
+        else {
+            $xm = $this->numpoints-1;
+        }
+        $y=$this->coords[0];
+        if( count($y) > 0 ) {
+            $cnt = count($y);
+            $i=0;
+            while( $i<$cnt && !is_numeric($ym=$y[$i]) ) {
+                $i++;
+            }
+            while( $i < $cnt ) {
+                if( is_numeric($y[$i]) ) {
+                    $ym=max($ym,$y[$i]);
+                }
+                ++$i;
+            }
+        }
+        else {
+            $ym='';
+        }
+        return array($xm,$ym);
     }
 
-    public function SetColor($aColor)
-    {
-    $this->color=$aColor;
+    function SetColor($aColor) {
+        $this->color=$aColor;
     }
 
-    public function SetLegend($aLegend,$aCSIM="",$aCSIMAlt="")
-    {
-    $this->legend = $aLegend;
-    $this->legendcsimtarget = $aCSIM;
-    $this->legendcsimalt = $aCSIMAlt;
+    function SetLegend($aLegend,$aCSIM='',$aCSIMAlt='',$aCSIMWinTarget='') {
+        $this->legend = $aLegend;
+        $this->legendcsimtarget = $aCSIM;
+        $this->legendcsimwintarget = $aCSIMWinTarget;
+        $this->legendcsimalt = $aCSIMAlt;
     }
 
-    public function SetWeight($aWeight)
-    {
-    $this->weight=$aWeight;
+    function SetWeight($aWeight) {
+        $this->weight=$aWeight;
     }
 
-    public function SetLineWeight($aWeight=1)
-    {
-    $this->line_weight=$aWeight;
+    function SetLineWeight($aWeight=1) {
+        $this->line_weight=$aWeight;
     }
 
-    public function SetCenter($aCenter=true)
-    {
-    $this->center = $aCenter;
+    function SetCenter($aCenter=true) {
+        $this->center = $aCenter;
     }
 
     // This method gets called by Graph class to plot anything that should go
     // into the margin after the margin color has been set.
-    public function StrokeMargin(&$aImg)
-    {
-    return true;
+    function StrokeMargin($aImg) {
+        return true;
     }
 
     // Framework function the chance for each plot class to set a legend
-    public function Legend(&$aGraph)
-    {
-    if( $this->legend != "" )
-        $aGraph->legend->Add($this->legend,$this->color,"",0,$this->legendcsimtarget,$this->legendcsimalt);
+    function Legend($aGraph) {
+        if( $this->legend != '' ) {
+            $aGraph->legend->Add($this->legend,$this->color,'',0,$this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
+        }
+    }
+
+    function Clear() {
+        $this->isRunningClear = true;
+        $this->__construct($this->inputValues['aDatay'], $this->inputValues['aDatax']);
+        $this->isRunningClear = false;
     }
 
 } // Class
 
-//===================================================
-// CLASS PlotLine
-// Description:
-// Data container class to hold properties for a static
-// line that is drawn directly in the plot area.
-// Usefull to add static borders inside a plot to show
-// for example set-values
-//===================================================
-class PlotLine
-{
-    public $weight=1;
-    public $color="black";
-    public $direction=-1;
-    public $scaleposition;
-
-//---------------
-// CONSTRUCTOR
-    public function PlotLine($aDir=HORIZONTAL,$aPos=0,$aColor="black",$aWeight=1)
-    {
-    $this->direction = $aDir;
-    $this->color=$aColor;
-    $this->weight=$aWeight;
-    $this->scaleposition=$aPos;
-    }
-
-//---------------
-// PUBLIC METHODS
-    public function SetPosition($aScalePosition)
-    {
-    $this->scaleposition=$aScalePosition;
-    }
-
-    public function SetDirection($aDir)
-    {
-    $this->direction = $aDir;
-    }
-
-    public function SetColor($aColor)
-    {
-    $this->color=$aColor;
-    }
-
-    public function SetWeight($aWeight)
-    {
-    $this->weight=$aWeight;
-    }
-
-    public function PreStrokeAdjust($aGraph)
-    {
-    // Nothing to do
-    }
-
-    public function Stroke(&$aImg,&$aXScale,&$aYScale)
-    {
-    $aImg->SetColor($this->color);
-    $aImg->SetLineWeight($this->weight);
-    if ($this->direction == VERTICAL) {
-        $ymin_abs=$aYScale->Translate($aYScale->GetMinVal());
-        $ymax_abs=$aYScale->Translate($aYScale->GetMaxVal());
-        $xpos_abs=$aXScale->Translate($this->scaleposition);
-        $aImg->Line($xpos_abs, $ymin_abs, $xpos_abs, $ymax_abs);
-    } elseif ($this->direction == HORIZONTAL) {
-        $xmin_abs=$aXScale->Translate($aXScale->GetMinVal());
-        $xmax_abs=$aXScale->Translate($aXScale->GetMaxVal());
-        $ypos_abs=$aYScale->Translate($this->scaleposition);
-        $aImg->Line($xmin_abs, $ypos_abs, $xmax_abs, $ypos_abs);
-    } else
-        JpGraphError::Raise(" Illegal direction for static line");
+
+// Provide a deterministic list of new colors whenever the getColor() method
+// is called. Used to automatically set colors of plots.
+class ColorFactory {
+
+    static private $iIdx = 0;
+    static private $iColorList = array(
+        'black',
+        'blue',
+        'orange',
+        'darkgreen',
+        'red',
+        'AntiqueWhite3',
+        'aquamarine3',
+        'azure4',
+        'brown',
+        'cadetblue3',
+        'chartreuse4',
+        'chocolate',
+        'darkblue',
+        'darkgoldenrod3',
+        'darkorchid3',
+        'darksalmon',
+        'darkseagreen4',
+        'deepskyblue2',
+        'dodgerblue4',
+        'gold3',
+        'hotpink',
+        'lawngreen',
+        'lightcoral',
+        'lightpink3',
+        'lightseagreen',
+        'lightslateblue',
+        'mediumpurple',
+        'olivedrab',
+        'orangered1',
+        'peru',
+        'slategray',
+        'yellow4',
+        'springgreen2');
+    static private $iNum = 33;
+
+    static function getColor() {
+        if( ColorFactory::$iIdx >= ColorFactory::$iNum )
+            ColorFactory::$iIdx = 0;
+        return ColorFactory::$iColorList[ColorFactory::$iIdx++];
     }
+
 }
 
 // <EOF>
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_antispam-digits.php b/common/lib/jpgraph_lib/jpgraph_antispam-digits.php
old mode 100644
new mode 100755
index d45c379e5..d9d350ca4
--- a/common/lib/jpgraph_lib/jpgraph_antispam-digits.php
+++ b/common/lib/jpgraph_lib/jpgraph_antispam-digits.php
@@ -1,210 +1,205 @@
 <?php
 //=======================================================================
-// File:	JPGRAPH_ANTISPAM.PHP
-// Description:	Genarate anti-spam challenge
-// Created: 	2004-10-07
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id$
+// File:        JPGRAPH_ANTISPAM.PHP
+// Description: Genarate anti-spam challenge
+// Created:     2004-10-07
+// Ver:         $Id: jpgraph_antispam-digits.php 1930 2010-01-22 20:19:27Z ljp $
 //
-// License:	This code is released under QPL 1.0
-// Copyright (C) 2004 Johan Persson
+// Copyright (c) Asial Corporation. All rights reserved.
 //========================================================================
 
-class HandDigits
-{
-    public $digits_thumb30x30 = array();
+class HandDigits {
+    public $digits = array();
     public $iHeight=30, $iWidth=30;
-    public function HandDigits()
-    {
-//==========================================================
-// d6-small.jpg
-//==========================================================
-    $this->digits['6'][0]= 645 ;
-    $this->digits['6'][1]=
-        '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-        'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-        'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAEBAAMBAAAAAAAAAAAAAAAABgMEBwX/xAAvEAABAwMC'.
-        'BAQEBwAAAAAAAAABAgMEAAURBiESIjFRBxMUQRUWMmFTYnGRkrHC/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAEC/8QAFhEBAQEAAAAA'.
-        'AAAAAAAAAAAAAAER/9oADAMBAAIRAxEAPwDslwiR3oDku8ONttsAvDiVyMcO/ET7ke5/aoOz6k1Vr5htNjW7a7M1yO3NTQU9JUDu'.
-        'GgrlSn8xyf6p4gXaHJvNps9/mKZtSkGdMjRwpfqAFBLLACRlZUrJONsI2717No1lbZ10kx7XGnRpKWQ/6GVGMfzEJ5VFIVtsOH6e'.
-        'wyKVhYsia0y22pLThSkJK1uniVgdThOM0ol+StIUhpopIyCFq3H8aUVCwnG3PGe4Rp6fLXJtMdyM0ojcIWvIz3HFnAPfrWTXb6GN'.
-        'WaLXDwZjVz8pKEfhuIUFg/bAz9sVJ61nt61mxJFslLtq7e5yPqiBT4UDklKw4MDpt+u+9bFiu9riXNu83R+fcr6tohuQ5HQhmK37'.
-        'paaC8DruScmg6X8KkjZEhbaB9KEyFYSOw26Uqd+e7Qerl5z74DY/1SomP//Z' ;
-
-//==========================================================
-// d2-small.jpg
-//==========================================================
-    $this->digits['2'][0]= 606 ;
-    $this->digits['2'][1]=
-        '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-        'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-        'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEQMBIgACEQEDEQH/xAAYAAEBAQEBAAAAAAAAAAAAAAAFAAQHAv/EACsQAAEDBAEC'.
-        'BAYDAAAAAAAAAAIBAwQABQYRIRIxQVFhcQcTFSJSU5GU0f/EABcBAAMBAAAAAAAAAAAAAAAAAAECAwT/xAAZEQACAwEAAAAAAAAA'.
-        'AAAAAAAAARESUUH/2gAMAwEAAhEDEQA/AOqXm/Q8dxmOL4PPSnCSNFixx6nXnkXgRT3Te17JWbGsveueSyLZdbPItNxOKLzTLjou'.
-        'gYCSoSoY8ISKSbFeUrzkdlnTL1YshskiErkQnFEZaF8kkdBBVdjyi6RNL5+9F486eS/ECVkcBtDt1vZcho5viS8ZCp9C9tAIAm/F'.
-        'VoPRU+HRtJ5JVRP1kP0PfwP+1VKrHBMliXG4Nw8VgE4xGkuqk2S1wTUNEVdIvgpL9iL6KtNxY7WOwo9tt0RCitj0sR2uCbFPPzH1'.
-        '7+6rRuSRcljMBMsUy2tky045KOawZk5xtEFBJEROO3hx61kh2rPCIX3MhsyC4QmfTbC6lH8dq5212qwkiG5H6Y/9R2qm+ofxqqsL'.
-        'DLZ6f//Z' ;
-
-//==========================================================
-// d9-small.jpg
-//==========================================================
-    $this->digits['9'][0]= 680 ;
-    $this->digits['9'][1]=
-        '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-        'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-        'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABAUGBwP/xAArEAABAwMD'.
-        'AgYBBQAAAAAAAAABAgMEBQYRABIhE1EUIjEzQUIHMlJhcdH/xAAWAQEBAQAAAAAAAAAAAAAAAAACAQD/xAAYEQEAAwEAAAAAAAAA'.
-        'AAAAAAAAAREhQf/aAAwDAQACEQMRAD8AkK7brF6X7XpMeGoKhFMLEeT4ZUheEhanF4OcZ2pTgDykk92bZpdCsi7aezLjxkIPUZiV'.
-        'RSCy8hah7EkZ27yM7V+iscal5bE22Lon1qNDmSKROd8Sl+Ix1lMOlIS4HGgQpbStoUCnlJz8HmsXtW3Lst2rmBAelLMRRekOwnYz'.
-        'Edls9QKKnOVLyk7UgcbzzrdBthqEJJwZbAI4x1U/7o1TaFa9lG36aXaZTy54VrcXUgrzsGdx+T30aNydweqVw1GS87T6Lb86Q4ha'.
-        'my/IAYjZBx+snKk99oOQMf1AViE65SY348hzFy6hPKnqtKz7DC1lbqyPrvJKUJ7H+M6Wrt3InP7o1brFNp4bCDGhxGAsqz69VSiQ'.
-        'ORwBxrrQ7itm1ac7Hp0WoGTIc3PSn0pccdcP2WorycfA1RaRHjxosZqOyhtDTSAhCf2gDAGjVHTd9sKSCumynFEZK1tIJUe58/ro'.
-        '1V1//9k=' ;
-
-//==========================================================
-// d5-small.jpg
-//==========================================================
-    $this->digits['5'][0]= 632 ;
-    $this->digits['5'][1]=
-        '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-        'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-        'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABgIFBwT/xAAoEAABAwME'.
-        'AQQCAwAAAAAAAAABAgMEBQYRABIhIkEUMVFhBxNCgaH/xAAVAQEBAAAAAAAAAAAAAAAAAAAAAv/EABcRAQEBAQAAAAAAAAAAAAAA'.
-        'AAABEUH/2gAMAwEAAhEDEQA/ANGvW4YVOeiRX5b4mv5Sin05IdlupPKdo/j2SO3+6TbPNQvOsTVz33KRT4csR3YUF7Dsh5OSFvug'.
-        'kqG4FPBxnjxpvvi4KZb1pTpU+QwxUi2Y7ZIAefUk5ATxnB9/gbtL/wCH1UpuhPUlZlMVaQ0mS8zJjqZOPfc2TwpIUonI9tw40R1r'.
-        'WNGq/wBdJR1XT3lqHBUnGCfkfWjRWs1ve249erQqQYjOtN1FqPUpCXQ4WIzQSsJwT0UpRwQPG0nzqyuNHobjsl9kBuWqoOoXtT1/'.
-        'WppZcA8lKRj64HxqU+3KpAr6plElRVKef3S4E0K9O8pLXVzKcqSsJAB9wSAca6bSoNXeuA1+5pEV+SGFNU1iKVFqI0Vdx2AJUeoz'.
-        '8DGlTDwG3CAf3q/pI0ah6MDhLz6U+EpXwPoaNMU//9k=' ;
-
-//==========================================================
-// d1-small.jpg
-//==========================================================
-    $this->digits['1'][0]= 646 ;
-    $this->digits['1'][1]=
-        '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-        'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-        'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEwMBIgACEQEDEQH/xAAZAAADAAMAAAAAAAAAAAAAAAAABQYCBAf/xAApEAACAQMD'.
-        'AwQBBQAAAAAAAAABAgMEBREABiESMUEHEyJRkSNCYXGB/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAEC/8QAFxEBAQEBAAAAAAAAAAAA'.
-        'AAAAAAEREv/aAAwDAQACEQMRAD8A6jdd4WLbstILnc4Uq0VoWpkJknb6IjXLHJUePOlez923fcW4r1SxWlqC2UbdKirQif3Xw3yA'.
-        'OFAGT09/kO3OmV3a20MFRf6lIYPcpy7yRRAzgxjIy2M8YwcdiBzpX6d22VNvUlTXsFkuwkrKqNSfnK7F8OTzwrAY+l5zoxKskudN'.
-        'EgQPUT9PBkWF3DH+1GPxo1mLnRoAqF2VRgGOFmX/AAgY/GjRUP6hVMFv2FuFqUvUGrpDFJMBnpdyF5bsAQew7Hxzp6LZNT0yQ1DI'.
-        'wp0QCFBhD0jCsfLZHxbx5xxpTuvb1+v9PV7Ztk9roLPLCjmSSN3mX5ZwqjCgZX7PfWxDQb2in96pv9qq46aTE0bW4x9ceAWAYPwS'.
-        'PsYzoixgmheBGjIVcYCnjp/jHjHbRpe1JLn9OnopE/a0ykvjwDx47aNMXqP/2Q==' ;
-
-//==========================================================
-// d8-small.jpg
-//==========================================================
-    $this->digits['8'][0]= 694 ;
-    $this->digits['8'][1]=
-        '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-        'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-        'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AFQMBIgACEQEDEQH/xAAYAAADAQEAAAAAAAAAAAAAAAAABgcEBf/EACsQAAEDAwMD'.
-        'AwMFAAAAAAAAAAECAwQFBhEAEiEUMVEHE0EVYYEiIzJCsf/EABYBAQEBAAAAAAAAAAAAAAAAAAIAAf/EABcRAQEBAQAAAAAAAAAA'.
-        'AAAAAAABERL/2gAMAwEAAhEDEQA/AKL6gVVUa0i1T5QjvTprUJMlxW4R9zgQXe/AH+kaWrntqlWjaq7gpcmotXAw82ht9yY4tch8'.
-        'uAFC0k7VBXPGMY51ruiaue+bThIj+7NbWqS+7HDxajFf6AlB/k44o8ZOABk4xkL0X0tZiojKrlRuGRJjugqldSlKGf6t7BuUQe3J'.
-        '44xxxrA1a4KVJipLidri8uLHgqOcfjOPxo0o2hdDvS1CmV2Yl6fS5ioipIQR1CAlKkLKR2UUqAI8g6NRSwuuyHab6s1ufLI/Zai7'.
-        'UBJOxhTS0+6B32pWSFH4CidOdWU0ukLiN1BLr0zG5Sdm3GRvcPhIT858DvjXNrVsSLnm/VIdTXS6tTnFsxZTSN3jchaTwps+O/z9'.
-        'tcBVq3hIX0tYqlIiQHdy5CqRHKHXEjAOMgBKjnvyRk4xrQa7OiGt1K5biYZL8SoVEpjOqkFsONtJCNwASeCQrn7aNUKnQYtLp7EC'.
-        'EylmLHQltptPZKQOBo1FzH//2Q==' ;
-
-//==========================================================
-// d4-small.jpg
-//==========================================================
-    $this->digits['4'][0]= 643 ;
-    $this->digits['4'][1]=
-        '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-        'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-        'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAYAAADAQEAAAAAAAAAAAAAAAAABAYHAv/EAC0QAAIBAwQA'.
-        'BAMJAAAAAAAAAAECAwQFEQAGEiETFDFBUmGBByIjUVNxobHR/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAIB/8QAGBEBAAMBAAAAAAAA'.
-        'AAAAAAAAAAERIVH/2gAMAwEAAhEDEQA/ANjM00Nxmt1xiWW31CZp5uJwoAAaOQ/n7qfcZHqO5my3q5XX7R6ijiqnNut9u4NyJ4yv'.
-        'JJyjYr8Xhrn5g599J7x3ulBNU7Zo7dXXXcLQ8kURYi4epYtkALjOePv1nUvbLvV7P3BZm3DR3eh88Kp7pVzBZI6iUhGWRRGWwE44'.
-        'HX3V+uiL1uHgt+vL/H+aNJQ3CSeCOaFqSaJ1DJKs/TqRkMOvQjvRorHE4pRDLNWLGlRHGUeYIORXs9e5B7OP31E0fmdyb/t0DJ4Q'.
-        '27bfx3YZzPUIoAAz7IpOD6cuxq0uNumqLfVNDOqXBoZEjnZcqhIPXH4c46+WkdoWOltu3IDDLLLVVR83UVcuPEmmcZZ2/rHoAANG'.
-        'GI7KIY1ijoLeEQBVCwIoAHpgY6Hy0aZe7mJ2jeHLKcEhusj6aNKgzr//2Q==' ;
-
-//==========================================================
-// d7-small.jpg
-//==========================================================
-    $this->digits['7'][0]= 658 ;
-    $this->digits['7'][1]=
-        '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-        'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-        'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABgEFBwT/xAAuEAABAwIE'.
-        'BAQGAwAAAAAAAAABAgMEBREABiExEhMiQSMyUXEHFBclVJFhk9L/xAAXAQADAQAAAAAAAAAAAAAAAAAAAQID/8QAGREBAQEAAwAA'.
-        'AAAAAAAAAAAAAAEREiFR/9oADAMBAAIRAxEAPwDXq9mCjZeQ05VZ5ZST4bfEpa3VdglCbqUe+g9MZ5Uq7V8415WXoMSdQ6etgSps'.
-        '19wpkCMDZKUpv0FZvbi1NzpYasMDLDUbMVXrtQdbeeU23xLWkj5RlLYK0J7anW9gbAjCzkOtsVSUJUdtc6dVZK51UeaFm4LKbhpC'.
-        'l7EhIFkDW974GbRI2XorUVls1OTdKAOqUpR0Hc3198GITQ6k+hLwrEpoODiDenRfW23bBicg78JXxPpD0mgVOW5PAivNNpahsPW5'.
-        '8xxQaSVkboQnhsnYm5OHqDGp1IpsalMKjMsMIC3+XZKbJFth62/QOEfMOZqZXp9JcKZTcGmTky3meSi7xQklI81vMR+sXIz/AEgp'.
-        'Q0qPNu6ea8Q2jqtbp8+2w9h/OKORc/cpHjt1dDSHOtLZ4ekHW23bBjj+o9H/AB539aP94MG0+L//2Q==' ;
-
-//==========================================================
-// d3-small.jpg
-//==========================================================
-    $this->digits['3'][0]= 662 ;
-    $this->digits['3'][1]=
-        '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
-        'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
-        'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABAUGBwL/xAArEAABBAED'.
-        'AwMDBQEAAAAAAAABAgMEBREABhIhMUEiMmETFZEHFkJDUdH/xAAWAQEBAQAAAAAAAAAAAAAAAAABAAL/xAAYEQEBAQEBAAAAAAAA'.
-        'AAAAAAAAEQExQf/aAAwDAQACEQMRAD8A0vclruBdk3VVLLUNssGRJsZSCtqOjlgJAHvcOD6c4HnOdIbcttw1W5P29cFEhuawqTXS'.
-        'VsJjnCMBxKkJJx7goAde+ceJfdNxU0UNlyymyXHi6kxWUNl1S3EnkAEIHX2nv86qtTuZr9Q9+1VhRsOoYpYcgSVyAE/TdewkJxnK'.
-        'sBCjkdPGpnOtFMd3PqsXgfOAgD8Y0aX+11H9rDDjn8lr9yj5J+dGqsqxaw6Cc9cQZU4Sp7zTJsIrKlcUEKwhSin1JABI45GUjqOu'.
-        'lbOvjbc3Ts9ynjGCy445UuFLYRzbWgrT6fhSCQSMDke+pew2zYVly/d7YchNqkMJZnQpgV9J8IzwWFJyUrAJHYgjvpLbu37G5nR7'.
-        'vck5C3YRKYEOEVJZj8kjKypXqWvirjk9h+dB9i4faa89TDZUfKlIyT8k+To10a6KTkpcJ/0vL/7o0TS//9k=' ;
+
+    function __construct() {
+        //==========================================================
+        // d6-small.jpg
+        //==========================================================
+        $this->digits['6'][0]= 645 ;
+        $this->digits['6'][1]=
+     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
+     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
+     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAEBAAMBAAAAAAAAAAAAAAAABgMEBwX/xAAvEAABAwMC'.
+     'BAQEBwAAAAAAAAABAgMEAAURBiESIjFRBxMUQRUWMmFTYnGRkrHC/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAEC/8QAFhEBAQEAAAAA'.
+     'AAAAAAAAAAAAAAER/9oADAMBAAIRAxEAPwDslwiR3oDku8ONttsAvDiVyMcO/ET7ke5/aoOz6k1Vr5htNjW7a7M1yO3NTQU9JUDu'.
+     'GgrlSn8xyf6p4gXaHJvNps9/mKZtSkGdMjRwpfqAFBLLACRlZUrJONsI2717No1lbZ10kx7XGnRpKWQ/6GVGMfzEJ5VFIVtsOH6e'.
+     'wyKVhYsia0y22pLThSkJK1uniVgdThOM0ol+StIUhpopIyCFq3H8aUVCwnG3PGe4Rp6fLXJtMdyM0ojcIWvIz3HFnAPfrWTXb6GN'.
+     'WaLXDwZjVz8pKEfhuIUFg/bAz9sVJ61nt61mxJFslLtq7e5yPqiBT4UDklKw4MDpt+u+9bFiu9riXNu83R+fcr6tohuQ5HQhmK37'.
+     'paaC8DruScmg6X8KkjZEhbaB9KEyFYSOw26Uqd+e7Qerl5z74DY/1SomP//Z' ; 
+
+        //==========================================================
+        // d2-small.jpg
+        //==========================================================
+        $this->digits['2'][0]= 606 ;
+        $this->digits['2'][1]=
+     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
+     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
+     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEQMBIgACEQEDEQH/xAAYAAEBAQEBAAAAAAAAAAAAAAAFAAQHAv/EACsQAAEDBAEC'.
+     'BAYDAAAAAAAAAAIBAwQABQYRIRIxQVFhcQcTFSJSU5GU0f/EABcBAAMBAAAAAAAAAAAAAAAAAAECAwT/xAAZEQACAwEAAAAAAAAA'.
+     'AAAAAAAAARESUUH/2gAMAwEAAhEDEQA/AOqXm/Q8dxmOL4PPSnCSNFixx6nXnkXgRT3Te17JWbGsveueSyLZdbPItNxOKLzTLjou'.
+     'gYCSoSoY8ISKSbFeUrzkdlnTL1YshskiErkQnFEZaF8kkdBBVdjyi6RNL5+9F486eS/ECVkcBtDt1vZcho5viS8ZCp9C9tAIAm/F'.
+     'VoPRU+HRtJ5JVRP1kP0PfwP+1VKrHBMliXG4Nw8VgE4xGkuqk2S1wTUNEVdIvgpL9iL6KtNxY7WOwo9tt0RCitj0sR2uCbFPPzH1'.
+     '7+6rRuSRcljMBMsUy2tky045KOawZk5xtEFBJEROO3hx61kh2rPCIX3MhsyC4QmfTbC6lH8dq5212qwkiG5H6Y/9R2qm+ofxqqsL'.
+     'DLZ6f//Z' ; 
+
+        //==========================================================
+        // d9-small.jpg
+        //==========================================================
+        $this->digits['9'][0]= 680 ;
+        $this->digits['9'][1]=
+     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
+     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
+     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABAUGBwP/xAArEAABAwMD'.
+     'AgYBBQAAAAAAAAABAgMEBQYRABIhE1EUIjEzQUIHMlJhcdH/xAAWAQEBAQAAAAAAAAAAAAAAAAACAQD/xAAYEQEAAwEAAAAAAAAA'.
+     'AAAAAAAAAREhQf/aAAwDAQACEQMRAD8AkK7brF6X7XpMeGoKhFMLEeT4ZUheEhanF4OcZ2pTgDykk92bZpdCsi7aezLjxkIPUZiV'.
+     'RSCy8hah7EkZ27yM7V+iscal5bE22Lon1qNDmSKROd8Sl+Ix1lMOlIS4HGgQpbStoUCnlJz8HmsXtW3Lst2rmBAelLMRRekOwnYz'.
+     'Edls9QKKnOVLyk7UgcbzzrdBthqEJJwZbAI4x1U/7o1TaFa9lG36aXaZTy54VrcXUgrzsGdx+T30aNydweqVw1GS87T6Lb86Q4ha'.
+     'my/IAYjZBx+snKk99oOQMf1AViE65SY348hzFy6hPKnqtKz7DC1lbqyPrvJKUJ7H+M6Wrt3InP7o1brFNp4bCDGhxGAsqz69VSiQ'.
+     'ORwBxrrQ7itm1ac7Hp0WoGTIc3PSn0pccdcP2WorycfA1RaRHjxosZqOyhtDTSAhCf2gDAGjVHTd9sKSCumynFEZK1tIJUe58/ro'.
+     '1V1//9k=' ; 
+
+        //==========================================================
+        // d5-small.jpg
+        //==========================================================
+        $this->digits['5'][0]= 632 ;
+        $this->digits['5'][1]=
+     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
+     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
+     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABgIFBwT/xAAoEAABAwME'.
+     'AQQCAwAAAAAAAAABAgMEBQYRABIhIkEUMVFhBxNCgaH/xAAVAQEBAAAAAAAAAAAAAAAAAAAAAv/EABcRAQEBAQAAAAAAAAAAAAAA'.
+     'AAABEUH/2gAMAwEAAhEDEQA/ANGvW4YVOeiRX5b4mv5Sin05IdlupPKdo/j2SO3+6TbPNQvOsTVz33KRT4csR3YUF7Dsh5OSFvug'.
+     'kqG4FPBxnjxpvvi4KZb1pTpU+QwxUi2Y7ZIAefUk5ATxnB9/gbtL/wCH1UpuhPUlZlMVaQ0mS8zJjqZOPfc2TwpIUonI9tw40R1r'.
+     'WNGq/wBdJR1XT3lqHBUnGCfkfWjRWs1ve249erQqQYjOtN1FqPUpCXQ4WIzQSsJwT0UpRwQPG0nzqyuNHobjsl9kBuWqoOoXtT1/'.
+     'WppZcA8lKRj64HxqU+3KpAr6plElRVKef3S4E0K9O8pLXVzKcqSsJAB9wSAca6bSoNXeuA1+5pEV+SGFNU1iKVFqI0Vdx2AJUeoz'.
+     '8DGlTDwG3CAf3q/pI0ah6MDhLz6U+EpXwPoaNMU//9k=' ; 
+
+        //==========================================================
+        // d1-small.jpg
+        //==========================================================
+        $this->digits['1'][0]= 646 ;
+        $this->digits['1'][1]=
+     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
+     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
+     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEwMBIgACEQEDEQH/xAAZAAADAAMAAAAAAAAAAAAAAAAABQYCBAf/xAApEAACAQMD'.
+     'AwQBBQAAAAAAAAABAgMEBREABiESMUEHEyJRkSNCYXGB/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAEC/8QAFxEBAQEBAAAAAAAAAAAA'.
+     'AAAAAAEREv/aAAwDAQACEQMRAD8A6jdd4WLbstILnc4Uq0VoWpkJknb6IjXLHJUePOlez923fcW4r1SxWlqC2UbdKirQif3Xw3yA'.
+     'OFAGT09/kO3OmV3a20MFRf6lIYPcpy7yRRAzgxjIy2M8YwcdiBzpX6d22VNvUlTXsFkuwkrKqNSfnK7F8OTzwrAY+l5zoxKskudN'.
+     'EgQPUT9PBkWF3DH+1GPxo1mLnRoAqF2VRgGOFmX/AAgY/GjRUP6hVMFv2FuFqUvUGrpDFJMBnpdyF5bsAQew7Hxzp6LZNT0yQ1DI'.
+     'wp0QCFBhD0jCsfLZHxbx5xxpTuvb1+v9PV7Ztk9roLPLCjmSSN3mX5ZwqjCgZX7PfWxDQb2in96pv9qq46aTE0bW4x9ceAWAYPwS'.
+     'PsYzoixgmheBGjIVcYCnjp/jHjHbRpe1JLn9OnopE/a0ykvjwDx47aNMXqP/2Q==' ; 
+
+        //==========================================================
+        // d8-small.jpg
+        //==========================================================
+        $this->digits['8'][0]= 694 ;
+        $this->digits['8'][1]=
+     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
+     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
+     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AFQMBIgACEQEDEQH/xAAYAAADAQEAAAAAAAAAAAAAAAAABgcEBf/EACsQAAEDAwMD'.
+     'AwMFAAAAAAAAAAECAwQFBhEAEiEUMVEHE0EVYYEiIzJCsf/EABYBAQEBAAAAAAAAAAAAAAAAAAIAAf/EABcRAQEBAQAAAAAAAAAA'.
+     'AAAAAAABERL/2gAMAwEAAhEDEQA/AKL6gVVUa0i1T5QjvTprUJMlxW4R9zgQXe/AH+kaWrntqlWjaq7gpcmotXAw82ht9yY4tch8'.
+     'uAFC0k7VBXPGMY51ruiaue+bThIj+7NbWqS+7HDxajFf6AlB/k44o8ZOABk4xkL0X0tZiojKrlRuGRJjugqldSlKGf6t7BuUQe3J'.
+     '44xxxrA1a4KVJipLidri8uLHgqOcfjOPxo0o2hdDvS1CmV2Yl6fS5ioipIQR1CAlKkLKR2UUqAI8g6NRSwuuyHab6s1ufLI/Zai7'.
+     'UBJOxhTS0+6B32pWSFH4CidOdWU0ukLiN1BLr0zG5Sdm3GRvcPhIT858DvjXNrVsSLnm/VIdTXS6tTnFsxZTSN3jchaTwps+O/z9'.
+     'tcBVq3hIX0tYqlIiQHdy5CqRHKHXEjAOMgBKjnvyRk4xrQa7OiGt1K5biYZL8SoVEpjOqkFsONtJCNwASeCQrn7aNUKnQYtLp7EC'.
+     'EylmLHQltptPZKQOBo1FzH//2Q==' ; 
+
+        //==========================================================
+        // d4-small.jpg
+        //==========================================================
+        $this->digits['4'][0]= 643 ;
+        $this->digits['4'][1]=
+     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
+     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
+     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAYAAADAQEAAAAAAAAAAAAAAAAABAYHAv/EAC0QAAIBAwQA'.
+     'BAMJAAAAAAAAAAECAwQFEQAGEiETFDFBUmGBByIjUVNxobHR/8QAFgEBAQEAAAAAAAAAAAAAAAAAAAIB/8QAGBEBAAMBAAAAAAAA'.
+     'AAAAAAAAAAERIVH/2gAMAwEAAhEDEQA/ANjM00Nxmt1xiWW31CZp5uJwoAAaOQ/n7qfcZHqO5my3q5XX7R6ijiqnNut9u4NyJ4yv'.
+     'JJyjYr8Xhrn5g599J7x3ulBNU7Zo7dXXXcLQ8kURYi4epYtkALjOePv1nUvbLvV7P3BZm3DR3eh88Kp7pVzBZI6iUhGWRRGWwE44'.
+     'HX3V+uiL1uHgt+vL/H+aNJQ3CSeCOaFqSaJ1DJKs/TqRkMOvQjvRorHE4pRDLNWLGlRHGUeYIORXs9e5B7OP31E0fmdyb/t0DJ4Q'.
+     '27bfx3YZzPUIoAAz7IpOD6cuxq0uNumqLfVNDOqXBoZEjnZcqhIPXH4c46+WkdoWOltu3IDDLLLVVR83UVcuPEmmcZZ2/rHoAANG'.
+     'GI7KIY1ijoLeEQBVCwIoAHpgY6Hy0aZe7mJ2jeHLKcEhusj6aNKgzr//2Q==' ; 
+
+        //==========================================================
+        // d7-small.jpg
+        //==========================================================
+        $this->digits['7'][0]= 658 ;
+        $this->digits['7'][1]=
+     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
+     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
+     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABgEFBwT/xAAuEAABAwIE'.
+     'BAQGAwAAAAAAAAABAgMEBREABiExEhMiQSMyUXEHFBclVJFhk9L/xAAXAQADAQAAAAAAAAAAAAAAAAAAAQID/8QAGREBAQEAAwAA'.
+     'AAAAAAAAAAAAAAEREiFR/9oADAMBAAIRAxEAPwDXq9mCjZeQ05VZ5ZST4bfEpa3VdglCbqUe+g9MZ5Uq7V8415WXoMSdQ6etgSps'.
+     '19wpkCMDZKUpv0FZvbi1NzpYasMDLDUbMVXrtQdbeeU23xLWkj5RlLYK0J7anW9gbAjCzkOtsVSUJUdtc6dVZK51UeaFm4LKbhpC'.
+     'l7EhIFkDW974GbRI2XorUVls1OTdKAOqUpR0Hc3198GITQ6k+hLwrEpoODiDenRfW23bBicg78JXxPpD0mgVOW5PAivNNpahsPW5'.
+     '8xxQaSVkboQnhsnYm5OHqDGp1IpsalMKjMsMIC3+XZKbJFth62/QOEfMOZqZXp9JcKZTcGmTky3meSi7xQklI81vMR+sXIz/AEgp'.
+     'Q0qPNu6ea8Q2jqtbp8+2w9h/OKORc/cpHjt1dDSHOtLZ4ekHW23bBjj+o9H/AB539aP94MG0+L//2Q==' ; 
+
+        //==========================================================
+        // d3-small.jpg
+        //==========================================================
+        $this->digits['3'][0]= 662 ;
+        $this->digits['3'][1]=
+     '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
+     'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
+     'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABAUGBwL/xAArEAABBAED'.
+     'AwMDBQEAAAAAAAABAgMEBREABhIhMUEiMmETFZEHFkJDUdH/xAAWAQEBAQAAAAAAAAAAAAAAAAABAAL/xAAYEQEBAQEBAAAAAAAA'.
+     'AAAAAAAAEQExQf/aAAwDAQACEQMRAD8A0vclruBdk3VVLLUNssGRJsZSCtqOjlgJAHvcOD6c4HnOdIbcttw1W5P29cFEhuawqTXS'.
+     'VsJjnCMBxKkJJx7goAde+ceJfdNxU0UNlyymyXHi6kxWUNl1S3EnkAEIHX2nv86qtTuZr9Q9+1VhRsOoYpYcgSVyAE/TdewkJxnK'.
+     'sBCjkdPGpnOtFMd3PqsXgfOAgD8Y0aX+11H9rDDjn8lr9yj5J+dGqsqxaw6Cc9cQZU4Sp7zTJsIrKlcUEKwhSin1JABI45GUjqOu'.
+     'lbOvjbc3Ts9ynjGCy445UuFLYRzbWgrT6fhSCQSMDke+pew2zYVly/d7YchNqkMJZnQpgV9J8IzwWFJyUrAJHYgjvpLbu37G5nR7'.
+     'vck5C3YRKYEOEVJZj8kjKypXqWvirjk9h+dB9i4faa89TDZUfKlIyT8k+To10a6KTkpcJ/0vL/7o0TS//9k=' ; 
     }
 }
 
-class AntiSpam
-{
-    public $iNumber='';
-
-    public function AntiSpam($aNumber='')
-    {
-    $this->iNumber = $aNumber;
-    }
+class AntiSpam {
 
-    public function Rand($aLen)
-    {
-    $d='';
-    for ($i=0; $i < $aLen; ++$i) {
-        $d .= rand(1,9);
-    }
-    $this->iNumber = $d;
+    private $iNumber='';
 
-    return $d;
+    function __construct($aNumber='') {
+        $this->iNumber = $aNumber;
     }
 
-    public function Stroke()
-    {
-    $n=strlen($this->iNumber);
-    for ($i=0; $i < $n; ++$i) {
-        if ( !is_numeric($this->iNumber[$i]) || $this->iNumber[$i]==0 ) {
-        return false;
+    function Rand($aLen) {
+        $d='';
+        for($i=0; $i < $aLen; ++$i) {
+            $d .= rand(1,9);
         }
+        $this->iNumber = $d;
+        return $d;
     }
 
-    $dd = new HandDigits();
-    $n = strlen($this->iNumber);
-    $img = @imagecreatetruecolor($n*$dd->iWidth, $dd->iHeight);
-    if ($img < 1) {
-        return false;
-    }
-    $start=0;
-    for ($i=0; $i < $n; ++$i) {
-        $size = $dd->digits[$this->iNumber[$i]][0];
-        $dimg = imagecreatefromstring(base64_decode($dd->digits[$this->iNumber[$i]][1]));
-        imagecopy($img,$dimg,$start,0,0,0,imagesx($dimg), $dd->iHeight);
-        $start += imagesx($dimg);
-    }
-    $resimg = @imagecreatetruecolor($start+4, $dd->iHeight+4);
-    if ($resimg < 1) {
-        return false;
-    }
-    imagecopy($resimg,$img,2,2,0,0,$start, $dd->iHeight);
-    header("Content-type: image/jpeg");
-    imagejpeg($resimg);
+    function Stroke() {
 
-    return true;
+        $n=strlen($this->iNumber);
+        for($i=0; $i < $n; ++$i ) {
+            if( !is_numeric($this->iNumber[$i]) || $this->iNumber[$i]==0 ) {
+                return false;
+            }
+        }
+
+        $dd = new HandDigits();
+        $n = strlen($this->iNumber);
+        $img = @imagecreatetruecolor($n*$dd->iWidth, $dd->iHeight);
+        if( $img < 1 ) {
+            return false;
+        }
+        $start=0;
+        for($i=0; $i < $n; ++$i ) {
+            $size = $dd->digits[$this->iNumber[$i]][0];
+            $dimg = imagecreatefromstring(base64_decode($dd->digits[$this->iNumber[$i]][1]));
+            imagecopy($img,$dimg,$start,0,0,0,imagesx($dimg), $dd->iHeight);
+            $start += imagesx($dimg);
+        }
+        $resimg = @imagecreatetruecolor($start+4, $dd->iHeight+4);
+        if( $resimg < 1 ) {
+            return false;
+        }
+        imagecopy($resimg,$img,2,2,0,0,$start, $dd->iHeight);
+        header("Content-type: image/jpeg");
+        imagejpeg($resimg);
+        return true;
     }
 }
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_antispam.php b/common/lib/jpgraph_lib/jpgraph_antispam.php
old mode 100644
new mode 100755
index 77c23755e..7998df28f
--- a/common/lib/jpgraph_lib/jpgraph_antispam.php
+++ b/common/lib/jpgraph_lib/jpgraph_antispam.php
@@ -1,26 +1,24 @@
 <?php
 //=======================================================================
-// File:	JPGRAPH_ANTISPAM.PHP
-// Description:	Genarate anti-spam challenge
-// Created: 	2004-10-07
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id$
+// File:        JPGRAPH_ANTISPAM.PHP
+// Description: Genarate anti-spam challenge
+// Created:     2004-10-07
+// Ver:         $Id: jpgraph_antispam.php 1106 2009-02-22 20:16:35Z ljp $
 //
-// License:	This code is released under QPL 1.0
-// Copyright (C) 2004 Johan Persson
+// Copyright (c) Asial Corporation. All rights reserved.
 //========================================================================
 
-class HandDigits
-{
+class HandDigits {
     public $chars = array();
     public $iHeight=30, $iWidth=30;
-    public function HandDigits()
-    {
-//==========================================================
-// lj-small.jpg
-//==========================================================
-$this->chars['j'][0]= 658 ;
-$this->chars['j'][1]=
+
+    function __construct() {
+
+        //==========================================================
+        // lj-small.jpg
+        //==========================================================
+        $this->chars['j'][0]= 658 ;
+        $this->chars['j'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABUDASIAAhEBAxEB/8QAGAAAAwEBAAAAAAAAAAAAAAAAAAUGBAf/xAAsEAACAQMDAwMBCQAAAAAAAAAB'.
@@ -29,13 +27,13 @@ public function HandDigits()
 'SOeD441TKRTyingUBG4/ah8j684+dSFzh/BvtaslejMUu9DPQTDnLx4lQ/ONw1TGBm0jdRWqguEMghEisWilgDmNs4Ze+MEEEH40'.
 'aUVFTa7JeLjRXu4GjhmnNbSfqFQVlA3rkckOjH/Q99Glmkl0C/Q06pvsvT9vttXHDF6T1KrWbs5gRgQJM+FDlQxPhjpF1XcVq+qe'.
 'jEoKiOecXBqh2TDDYIXLKuP6549xk8auI6aJqV45oknWdNswkAIkGMYIxjGO2NR1F0LZY5qkWqkS1xrM0M8lMSJpY+TGrnJiQ577'.
-'cEgeNHhi7D3qC3UN69M8tIakRhgrh9o748+eNGtcCiKjjpkQKlMTEg3ZwoxtHHtgfTRpYXArvp//2Q==' ;
+'cEgeNHhi7D3qC3UN69M8tIakRhgrh9o748+eNGtcCiKjjpkQKlMTEg3ZwoxtHHtgfTRpYXArvp//2Q==' ; 
 
-//==========================================================
-// lf-small.jpg
-//==========================================================
-$this->chars['f'][0]= 633 ;
-$this->chars['f'][1]=
+        //==========================================================
+        // lf-small.jpg
+        //==========================================================
+        $this->chars['f'][0]= 633 ;
+        $this->chars['f'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAQFBgcC/8QAKxAAAgEDAwMCBQUAAAAAAAAA'.
@@ -44,13 +42,13 @@ public function HandDigits()
 'akUuz8x5DwdN5peS1jV1dSipSiVUigIcdQjQ26lIB/c6r3F86SZpE/zCFJaqsihQNhRgdj3Jyfxo0jDSbXHt9Oph9RAoV3qJGltY'.
 'HDOxyb/nRpV0D3RXle21m48XraOk3IUSemUaV4g4Zc9ShcDtgff+tQfwvjq34Dtku7buamFqeJKemCCMxKFsEJU+/FrX8d76sEHG'.
 'aNItzr4usVNdG3S0rmRYAVwEUmyjyQLZ11x7aF4zs9DQOyzml29I2cLa/pixIHi99DFCtU9dFuLIaijo9qiYPmR2mZmB9thgAHOD'.
-'4+mjUrURyrUNMZFEkkIOFuFAbsP9d/OjVIQ6Vh4tP//Z' ;
+'4+mjUrURyrUNMZFEkkIOFuFAbsP9d/OjVIQ6Vh4tP//Z' ; 
 
-//==========================================================
-// lb-small.jpg
-//==========================================================
-$this->chars['b'][0]= 645 ;
-$this->chars['b'][1]=
+        //==========================================================
+        // lb-small.jpg
+        //==========================================================
+        $this->chars['b'][0]= 645 ;
+        $this->chars['b'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABUDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAYCAwUH/8QAKxAAAQMDAwMDAwUAAAAAAAAA'.
@@ -59,13 +57,13 @@ public function HandDigits()
 'Q1CvMNQWTjCt+HFD+PB/Y1fI1PL1HFFt0zaGblFdJQ9cJjpZiqPJUlBAKnPcEpGB5NNRKdrOl1NlgiQol4R2w4Sc5VtGf7opZteo'.
 'LhdorjUSM5FnQnlR50NeHQysYxtVxlJHIPgjtRRD3xkaghs6juumdHz4+Y7RVPnt59K2mk7W+fcKWsZ7djTXMkW+xMP3GRJjwIEN'.
 'HTG/CWx5wPY8AADx2NYk3SL9wukvUjGobnBkORksIbjdMANozgEqSo8qJPGO/wAVO36IsjUmBIfZfuM7epZk3F9UhSSk5O0K9Kcq'.
-'8AcU3UzFuhUSBFud6nRXoz96mqmJZWg7m2dqUNhWBwdqQSP1UU5c/FFCn//Z' ;
+'8AcU3UzFuhUSBFud6nRXoz96mqmJZWg7m2dqUNhWBwdqQSP1UU5c/FFCn//Z' ; 
 
-//==========================================================
-// d6-small.jpg
-//==========================================================
-$this->chars['6'][0]= 645 ;
-$this->chars['6'][1]=
+        //==========================================================
+        // d6-small.jpg
+        //==========================================================
+        $this->chars['6'][0]= 645 ;
+        $this->chars['6'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
 'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAEBAAMBAAAAAAAAAAAAAAAABgMEBwX/xAAvEAABAwMC'.
@@ -74,13 +72,13 @@ public function HandDigits()
 'GgrlSn8xyf6p4gXaHJvNps9/mKZtSkGdMjRwpfqAFBLLACRlZUrJONsI2717No1lbZ10kx7XGnRpKWQ/6GVGMfzEJ5VFIVtsOH6e'.
 'wyKVhYsia0y22pLThSkJK1uniVgdThOM0ol+StIUhpopIyCFq3H8aUVCwnG3PGe4Rp6fLXJtMdyM0ojcIWvIz3HFnAPfrWTXb6GN'.
 'WaLXDwZjVz8pKEfhuIUFg/bAz9sVJ61nt61mxJFslLtq7e5yPqiBT4UDklKw4MDpt+u+9bFiu9riXNu83R+fcr6tohuQ5HQhmK37'.
-'paaC8DruScmg6X8KkjZEhbaB9KEyFYSOw26Uqd+e7Qerl5z74DY/1SomP//Z' ;
+'paaC8DruScmg6X8KkjZEhbaB9KEyFYSOw26Uqd+e7Qerl5z74DY/1SomP//Z' ; 
 
-//==========================================================
-// lx-small.jpg
-//==========================================================
-$this->chars['x'][0]= 650 ;
-$this->chars['x'][1]=
+        //==========================================================
+        // lx-small.jpg
+        //==========================================================
+        $this->chars['x'][0]= 650 ;
+        $this->chars['x'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABMDASIAAhEBAxEB/8QAGAAAAwEBAAAAAAAAAAAAAAAAAAUHBgj/xAApEAABAwMDAwQCAwAAAAAAAAAB'.
@@ -89,13 +87,13 @@ public function HandDigits()
 'p9I0lSX2kgqCSklK+5PKCMAng6zV2XRO6u3lSIURtbDRShltlZHa0tW7q/0MeTwnjxq1Jiw2xc9xTLbhSVU5iaXUFfqFFILgJOCd'.
 '9Gt3SXabR6REpkL8yo0RpLCFNx1qBCRjOQMHxo0pEr6o3um2LVYpMEpTVqg25lHn08dfcB9kEgfZ1LIFDuawqZRb7aQlLTzqglsg'.
 '9wQdveOEqBIB425xqhQuk8qo9UKlPrlRblw2ZBeCSVKW6CcoSrI2AGOT41SKzT4dYtmdS5bIXDZhNoWgbZJ94x8AYT/GkM03oNUc'.
-'uKgwqtTZDTMOU0FttqRkoHggnPkEEHRrkJ6t1SlSHYUOc6zHaWrsbQrATk5/vRqK/9k=' ;
+'uKgwqtTZDTMOU0FttqRkoHggnPkEEHRrkJ6t1SlSHYUOc6zHaWrsbQrATk5/vRqK/9k=' ; 
 
-//==========================================================
-// d2-small.jpg
-//==========================================================
-$this->chars['2'][0]= 606 ;
-$this->chars['2'][1]=
+        //==========================================================
+        // d2-small.jpg
+        //==========================================================
+        $this->chars['2'][0]= 606 ;
+        $this->chars['2'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
 'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEQMBIgACEQEDEQH/xAAYAAEBAQEBAAAAAAAAAAAAAAAFAAQHAv/EACsQAAEDBAEC'.
@@ -104,13 +102,13 @@ public function HandDigits()
 'gYCSoSoY8ISKSbFeUrzkdlnTL1YshskiErkQnFEZaF8kkdBBVdjyi6RNL5+9F486eS/ECVkcBtDt1vZcho5viS8ZCp9C9tAIAm/F'.
 'VoPRU+HRtJ5JVRP1kP0PfwP+1VKrHBMliXG4Nw8VgE4xGkuqk2S1wTUNEVdIvgpL9iL6KtNxY7WOwo9tt0RCitj0sR2uCbFPPzH1'.
 '7+6rRuSRcljMBMsUy2tky045KOawZk5xtEFBJEROO3hx61kh2rPCIX3MhsyC4QmfTbC6lH8dq5212qwkiG5H6Y/9R2qm+ofxqqsL'.
-'DLZ6f//Z' ;
+'DLZ6f//Z' ; 
 
-//==========================================================
-// lm-small.jpg
-//==========================================================
-$this->chars['m'][0]= 649 ;
-$this->chars['m'][1]=
+        //==========================================================
+        // lm-small.jpg
+        //==========================================================
+        $this->chars['m'][0]= 649 ;
+        $this->chars['m'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGgAAAgMBAQAAAAAAAAAAAAAAAAcDBAUCBv/EAC0QAAICAQMCBAMJAAAAAAAA'.
@@ -119,13 +117,13 @@ public function HandDigits()
 'iywyBhjDKTkeXfSr+GRfYtq2KAO32b1BGxAZu0dyJ2DKPTxY1wPddVszycUq2Golq8jRWbcnJWwCVGMjz+VQP50atxMtm2ZUOY4l'.
 '4qfUnBP0x/Z0amy4jJm10Tt2yddWasFmfaRfdrlG3UcgArnxKzJ+Fu4DqCMkcgNem2DoWav8PLfTm+FPEkuSNTnqueS5bnHIv6CG'.
 'LNjJwM99bm67NB1Ht89KSxNXnr2hNDbiUc47K4KyD2GQMfmMjUnS+7vuIktTqPCaaWCqAMMojPFyw8hyYMQBnAwNJHYGXPTsW9VN'.
-'jg2zf50W9zk524GAEihuz+xbIOD82jW5TkjtRPZkTkJ+4VgDhQfuj/f3OjUxl1f/2Q==' ;
+'jg2zf50W9zk524GAEihuz+xbIOD82jW5TkjtRPZkTkJ+4VgDhQfuj/f3OjUxl1f/2Q==' ; 
 
-//==========================================================
-// lt-small.jpg
-//==========================================================
-$this->chars['t'][0]= 648 ;
-$this->chars['t'][1]=
+        //==========================================================
+        // lt-small.jpg
+        //==========================================================
+        $this->chars['t'][0]= 648 ;
+        $this->chars['t'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAQDBQYH/8QAJxAAAQMDAgYDAQEAAAAAAAAA'.
@@ -134,13 +132,13 @@ public function HandDigits()
 'Hk7AHVkbkLI+RQc7uRxgkfr1tx2rGu6VbToLVKkhU+kbugGf9WfaknCk5ycaX0zmaa+3JkqvW/CmzojsB9xoF6OoFK0r6HOcEDI0'.
 'aefTuKX5ScMdC14HYq8n12zo1DEUcKTGg1Z+hyBwoPBVIiA/VQyOIgedhUCB4WMfXSV3UufVLcTUIqVf26K6mXDbPVRRzKT54iMg'.
 '+zjtq6mtsyJjclxpKlUhSXEbkgkqWnBx4+J5e/zU0pZemPvJJQzEPDfQOrwwFY9AZ5eeYPLV6FwhoFYZuigxpkJeIjqAeIoAk9wA'.
-'D46EnuD+6Nc1smDNrTlRkxqtMo1vzKhIdYgU9YDqVpISrLhHxSSd21I0aYyqP//Z' ;
+'D46EnuD+6Nc1smDNrTlRkxqtMo1vzKhIdYgU9YDqVpISrLhHxSSd21I0aYyqP//Z' ; 
 
-//==========================================================
-// li-small.jpg
-//==========================================================
-$this->chars['i'][0]= 639 ;
-$this->chars['i'][1]=
+        //==========================================================
+        // li-small.jpg
+        //==========================================================
+        $this->chars['i'][0]= 639 ;
+        $this->chars['i'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABYDASIAAhEBAxEB/8QAFwABAQEBAAAAAAAAAAAAAAAABwAGBP/EACcQAAEEAQMEAgIDAAAAAAAAAAEC'.
@@ -151,11 +149,12 @@ public function HandDigits()
 'Yf8AOl7JTdw5eOCz0jw3+LbYCfA9nz71msb8KMxoTGTw+5srjsipAdDqFBQBIuiOl6KrdYyJMyTCshlw2G3Fr/HiNqNNAqJJUoGl'.
 'KND+h47km1bZwsvCbYYjycxIyK1qDv2yEi0hQviK8atKDcy9j//Z' ;
 
-//==========================================================
-// lp-small.jpg
-//==========================================================
-$this->chars['p'][0]= 700 ;
-$this->chars['p'][1]=
+
+        //==========================================================
+        // lp-small.jpg
+        //==========================================================
+        $this->chars['p'][0]= 700 ;
+        $this->chars['p'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGgAAAQUBAAAAAAAAAAAAAAAAAAECBAUGB//EAC8QAAEDAwMCBAMJAAAAAAAA'.
@@ -165,13 +164,13 @@ public function HandDigits()
 'Y0qmLZSrwJJcQoOJ5XKlJFu4HbJOjVbt+V5nu7eopNRivqcdhK+bFnWwA1Y2AOcgjvj9dGlxy0g5y0xd+hNXoG24C4obizq3HZUh'.
 'YHqtRHD06bG/8a0MbbG1mqekxaBSGmgkrcdcitlLfrckZIz7DUatbeFak0tyRLUwzT5vmiGm0cufEkFBJItfkD+59tKmiO12atFa'.
 'eQukO3ejUxgENqTcfnE5WbkHiOnJ76N2IqI1DibabptS+zkZhtp90F2Y0S026EkAFK/qL46cXv65NVZDfxHmVCK4DE2/RX/lRFbA'.
-'C5LwAyq2EtpHZI7mxPYDRqoctdESimz/2Q==' ;
+'C5LwAyq2EtpHZI7mxPYDRqoctdESimz/2Q==' ; 
 
-//==========================================================
-// le-small.jpg
-//==========================================================
-$this->chars['e'][0]= 700 ;
-$this->chars['e'][1]=
+        //==========================================================
+        // le-small.jpg
+        //==========================================================
+        $this->chars['e'][0]= 700 ;
+        $this->chars['e'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABgDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAYEBQcB/8QAKhAAAQMCBAUEAwEAAAAAAAAA'.
@@ -181,13 +180,13 @@ public function HandDigits()
 'UiqjkynzAVtwV23Ud+X4Ibpa2DCPkjhfUaRO/p8yzpb+YHhUmhbev6ZEll1lvqK3jt2XrbBgp6HVwsK3THpfEubGSoOUyFMpbJmL'.
 'Deh6SgOGKti57EuY6l62JMWdJy7k3hg1LkOozEbVm7suQSkTiKtkEfP1pH664Za/QItccgI4bseTHdNxiXHLQ8yVl7V32XyioqL5'.
 'TGc1ng6eYs0idczXUZscBBABWgEhEtfKNuUezwPnBhEuj8X2M21z9BR6NUX211Kk/UKKAjuhkPhL7XVf8vtgw7UPJlEyrDWFSYLb'.
-'LBNF6qrzG6t0spEu6+fpL7YMXhUndp//2Q==' ;
+'LBNF6qrzG6t0spEu6+fpL7YMXhUndp//2Q==' ; 
 
-//==========================================================
-// la-small.jpg
-//==========================================================
-$this->chars['a'][0]= 730 ;
-$this->chars['a'][1]=
+        //==========================================================
+        // la-small.jpg
+        //==========================================================
+        $this->chars['a'][0]= 730 ;
+        $this->chars['a'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABoDASIAAhEBAxEB/8QAGAABAAMBAAAAAAAAAAAAAAAABgMEBwX/xAAvEAABAwIFAQcCBwAAAAAAAAAB'.
@@ -199,11 +198,11 @@ public function HandDigits()
 'UGaD1c9HSR1HFUh9tJU45EBcAtcC9+P9wqbg8IAto9o81yputrVGpiUkgHKkqUTZI32+cKm1z1tIUgPBBAKQ4UBQH3uL3xmXSXep'.
 'HVDtXStE5K5jlPU7PF3Q41+okJFkjgC+3OuNSYiSzHaLtRcW4UDMpLYSCbakDW3thhum5p//2Q==' ;
 
-//==========================================================
-// d9-small.jpg
-//==========================================================
-$this->chars['9'][0]= 680 ;
-$this->chars['9'][1]=
+        //==========================================================
+        // d9-small.jpg
+        //==========================================================
+        $this->chars['9'][0]= 680 ;
+        $this->chars['9'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
 'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABAUGBwP/xAArEAABAwMD'.
@@ -213,13 +212,13 @@ public function HandDigits()
 'Edls9QKKnOVLyk7UgcbzzrdBthqEJJwZbAI4x1U/7o1TaFa9lG36aXaZTy54VrcXUgrzsGdx+T30aNydweqVw1GS87T6Lb86Q4ha'.
 'my/IAYjZBx+snKk99oOQMf1AViE65SY348hzFy6hPKnqtKz7DC1lbqyPrvJKUJ7H+M6Wrt3InP7o1brFNp4bCDGhxGAsqz69VSiQ'.
 'ORwBxrrQ7itm1ac7Hp0WoGTIc3PSn0pccdcP2WorycfA1RaRHjxosZqOyhtDTSAhCf2gDAGjVHTd9sKSCumynFEZK1tIJUe58/ro'.
-'1V1//9k=' ;
+'1V1//9k=' ; 
 
-//==========================================================
-// d5-small.jpg
-//==========================================================
-$this->chars['5'][0]= 632 ;
-$this->chars['5'][1]=
+        //==========================================================
+        // d5-small.jpg
+        //==========================================================
+        $this->chars['5'][0]= 632 ;
+        $this->chars['5'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
 'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABgIFBwT/xAAoEAABAwME'.
@@ -228,13 +227,13 @@ public function HandDigits()
 'kqG4FPBxnjxpvvi4KZb1pTpU+QwxUi2Y7ZIAefUk5ATxnB9/gbtL/wCH1UpuhPUlZlMVaQ0mS8zJjqZOPfc2TwpIUonI9tw40R1r'.
 'WNGq/wBdJR1XT3lqHBUnGCfkfWjRWs1ve249erQqQYjOtN1FqPUpCXQ4WIzQSsJwT0UpRwQPG0nzqyuNHobjsl9kBuWqoOoXtT1/'.
 'WppZcA8lKRj64HxqU+3KpAr6plElRVKef3S4E0K9O8pLXVzKcqSsJAB9wSAca6bSoNXeuA1+5pEV+SGFNU1iKVFqI0Vdx2AJUeoz'.
-'8DGlTDwG3CAf3q/pI0ah6MDhLz6U+EpXwPoaNMU//9k=' ;
+'8DGlTDwG3CAf3q/pI0ah6MDhLz6U+EpXwPoaNMU//9k=' ; 
 
-//==========================================================
-// d1-small.jpg
-//==========================================================
-$this->chars['1'][0]= 646 ;
-$this->chars['1'][1]=
+        //==========================================================
+        // d1-small.jpg
+        //==========================================================
+        $this->chars['1'][0]= 646 ;
+        $this->chars['1'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
 'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEwMBIgACEQEDEQH/xAAZAAADAAMAAAAAAAAAAAAAAAAABQYCBAf/xAApEAACAQMD'.
@@ -243,13 +242,13 @@ public function HandDigits()
 'OFAGT09/kO3OmV3a20MFRf6lIYPcpy7yRRAzgxjIy2M8YwcdiBzpX6d22VNvUlTXsFkuwkrKqNSfnK7F8OTzwrAY+l5zoxKskudN'.
 'EgQPUT9PBkWF3DH+1GPxo1mLnRoAqF2VRgGOFmX/AAgY/GjRUP6hVMFv2FuFqUvUGrpDFJMBnpdyF5bsAQew7Hxzp6LZNT0yQ1DI'.
 'wp0QCFBhD0jCsfLZHxbx5xxpTuvb1+v9PV7Ztk9roLPLCjmSSN3mX5ZwqjCgZX7PfWxDQb2in96pv9qq46aTE0bW4x9ceAWAYPwS'.
-'PsYzoixgmheBGjIVcYCnjp/jHjHbRpe1JLn9OnopE/a0ykvjwDx47aNMXqP/2Q==' ;
+'PsYzoixgmheBGjIVcYCnjp/jHjHbRpe1JLn9OnopE/a0ykvjwDx47aNMXqP/2Q==' ; 
 
-//==========================================================
-// ll-small.jpg
-//==========================================================
-$this->chars['l'][0]= 626 ;
-$this->chars['l'][1]=
+        //==========================================================
+        // ll-small.jpg
+        //==========================================================
+        $this->chars['l'][0]= 626 ;
+        $this->chars['l'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGAAAAgMAAAAAAAAAAAAAAAAAAAYEBQf/xAArEAACAQIFAwIGAwAAAAAAAAAB'.
@@ -260,11 +259,12 @@ public function HandDigits()
 'q3+fnDZDlqRZzQGaOGcpTOaeR1u8R+ncN3gj94so2jNWHeMNNKzorEX2qp9v3imNPoRE1zpjUtZ09HJmYq5lury0benZeTww23t3'.
 'Ivgw+T0yRRyyxIqNfkLcA8jt7YMKcBWn/9k=' ;
 
-//==========================================================
-// ls-small.jpg
-//==========================================================
-$this->chars['s'][0]= 701 ;
-$this->chars['s'][1]=
+
+        //==========================================================
+        // ls-small.jpg
+        //==========================================================
+        $this->chars['s'][0]= 701 ;
+        $this->chars['s'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABQDASIAAhEBAxEB/8QAGgAAAgMBAQAAAAAAAAAAAAAAAAMCBAUGB//EACwQAAEEAQIFAgUFAAAAAAAA'.
@@ -274,13 +274,13 @@ public function HandDigits()
 'LGU+whZZK+Rw+oYJAyj3GjS4dZFpZVkqPLktdfMXNcaU2kBC1BIITkdx6c599GlnvPAa3TL2vNvU76n0063acr3YSLCEjpUpUQtW'.
 'Dhf14SMEnOc57aZ8Tegm7dbrEQGZt1PeTDgc1PEW3FeXAvyAkZVkeMDOm2G3f3O7Cl/qEuqkQg4lp6CRxraWfUlRUD24kZA741Ko'.
 '2k1HvlT3ri2sLOCgtsyJz6XEtBwZPAgJAGQMHUNPWKqWItsqh0UCFVyLeKhyLHQ2TMdHNVj+RKlAnJyfto1FW2ahgjrq6LYTFjjf'.
-'lymUOLdWfJyoHA+gA7AAAaNPE3ysJdLT/9k=' ;
+'lymUOLdWfJyoHA+gA7AAAaNPE3ysJdLT/9k=' ; 
 
-//==========================================================
-// lh-small.jpg
-//==========================================================
-$this->chars['h'][0]= 677 ;
-$this->chars['h'][1]=
+        //==========================================================
+        // lh-small.jpg
+        //==========================================================
+        $this->chars['h'][0]= 677 ;
+        $this->chars['h'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABUDASIAAhEBAxEB/8QAGgAAAQUBAAAAAAAAAAAAAAAAAAIDBAUGB//EACwQAAIBAwMCBQIHAAAAAAAA'.
@@ -290,13 +290,14 @@ public function HandDigits()
 'tTwwJ9WjhILDrTKnIdMEDl2+P80aVdJZb1QW+vgqENLPH4sBCDLIwUgnOf4GjVvDnLgUk79T81voqjb8NnuUx8pVRCiEaYUSuynl'.
 'jHU9mOfnOoOx6hqz8PrbNdfEkMUXg1LSM3rKOUywJ7YAJ1ZTWmSpvdvlaVTDSUzJAhH5ZJBgv0x2RSAPlz21WXqoet3ba9nuW8n4'.
 'Jr6qTPqnUNxSM/f6mPvxA9zqJnExTbR+h0nkhVu1uE8j0UBRQ9PGxBKFjnkAScdsDp10a0lc7z0tI7Y5YYN+5GAf7GjVXF4Icj3f'.
-'/9k=' ;
+'/9k=' ; 
+
 
-//==========================================================
-// ld-small.jpg
-//==========================================================
-$this->chars['d'][0]= 681 ;
-$this->chars['d'][1]=
+        //==========================================================
+        // ld-small.jpg
+        //==========================================================
+        $this->chars['d'][0]= 681 ;
+        $this->chars['d'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGAAAAwEBAAAAAAAAAAAAAAAAAAQFBgH/xAAsEAABAwMEAAQFBQAAAAAAAAAB'.
@@ -308,11 +309,11 @@ public function HandDigits()
 'slsRKo0HwlODkBRzxj2AGoXTtpzIdQ8MbffUChz4NCPRaClAo9Mn6c7T3o13wytmo0K05VIqkiPJbizFiMWs4CTgnIIHOST796NL'.
 'Ia1JX//Z' ;
 
-//==========================================================
-// d8-small.jpg
-//==========================================================
-$this->chars['8'][0]= 694 ;
-$this->chars['8'][1]=
+        //==========================================================
+        // d8-small.jpg
+        //==========================================================
+        $this->chars['8'][0]= 694 ;
+        $this->chars['8'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
 'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AFQMBIgACEQEDEQH/xAAYAAADAQEAAAAAAAAAAAAAAAAABgcEBf/EACsQAAEDAwMD'.
@@ -322,13 +323,13 @@ public function HandDigits()
 '44xxxrA1a4KVJipLidri8uLHgqOcfjOPxo0o2hdDvS1CmV2Yl6fS5ioipIQR1CAlKkLKR2UUqAI8g6NRSwuuyHab6s1ufLI/Zai7'.
 'UBJOxhTS0+6B32pWSFH4CidOdWU0ukLiN1BLr0zG5Sdm3GRvcPhIT858DvjXNrVsSLnm/VIdTXS6tTnFsxZTSN3jchaTwps+O/z9'.
 'tcBVq3hIX0tYqlIiQHdy5CqRHKHXEjAOMgBKjnvyRk4xrQa7OiGt1K5biYZL8SoVEpjOqkFsONtJCNwASeCQrn7aNUKnQYtLp7EC'.
-'EylmLHQltptPZKQOBo1FzH//2Q==' ;
+'EylmLHQltptPZKQOBo1FzH//2Q==' ; 
 
-//==========================================================
-// lz-small.jpg
-//==========================================================
-$this->chars['z'][0]= 690 ;
-$this->chars['z'][1]=
+        //==========================================================
+        // lz-small.jpg
+        //==========================================================
+        $this->chars['z'][0]= 690 ;
+        $this->chars['z'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABYDASIAAhEBAxEB/8QAFwABAQEBAAAAAAAAAAAAAAAABgAHA//EACsQAAEDAwQBAwIHAAAAAAAAAAEC'.
@@ -340,11 +341,11 @@ public function HandDigits()
 '4lLlyJk2cEqW+6V+m0AE9ISLnsj5+O9UhsFK92bZZqb9SRu9p2c4A0OCEqDbYAJSlJwAVZv3fBvbFrg/462btlhuS1RG5nL8pYkq'.
 'KrnsKH06I/rVrQKkf//Z' ;
 
-//==========================================================
-// d4-small.jpg
-//==========================================================
-$this->chars['4'][0]= 643 ;
-$this->chars['4'][1]=
+        //==========================================================
+        // d4-small.jpg
+        //==========================================================
+        $this->chars['4'][0]= 643 ;
+        $this->chars['4'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
 'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAYAAADAQEAAAAAAAAAAAAAAAAABAYHAv/EAC0QAAIBAwQA'.
@@ -353,13 +354,13 @@ public function HandDigits()
 'JJyjYr8Xhrn5g599J7x3ulBNU7Zo7dXXXcLQ8kURYi4epYtkALjOePv1nUvbLvV7P3BZm3DR3eh88Kp7pVzBZI6iUhGWRRGWwE44'.
 'HX3V+uiL1uHgt+vL/H+aNJQ3CSeCOaFqSaJ1DJKs/TqRkMOvQjvRorHE4pRDLNWLGlRHGUeYIORXs9e5B7OP31E0fmdyb/t0DJ4Q'.
 '27bfx3YZzPUIoAAz7IpOD6cuxq0uNumqLfVNDOqXBoZEjnZcqhIPXH4c46+WkdoWOltu3IDDLLLVVR83UVcuPEmmcZZ2/rHoAANG'.
-'GI7KIY1ijoLeEQBVCwIoAHpgY6Hy0aZe7mJ2jeHLKcEhusj6aNKgzr//2Q==' ;
+'GI7KIY1ijoLeEQBVCwIoAHpgY6Hy0aZe7mJ2jeHLKcEhusj6aNKgzr//2Q==' ; 
 
-//==========================================================
-// lv-small.jpg
-//==========================================================
-$this->chars['v'][0]= 648 ;
-$this->chars['v'][1]=
+        //==========================================================
+        // lv-small.jpg
+        //==========================================================
+        $this->chars['v'][0]= 648 ;
+        $this->chars['v'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABQDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAQDBQYH/8QAKBAAAQQBAwMEAgMAAAAAAAAA'.
@@ -370,11 +371,11 @@ public function HandDigits()
 'shyW6AocpHNIrv8AvWzk9BUSdPdYS4BcRlomkhIV6KP0VE39V+tU2wdlRMHtZUB8NuTQ+51X27+Kr46ZPIAFV540D8zeLsJ5LMHa'.
 'ubmMBCVJdjx0pRyLoWR4I8aNIQ8BvZMNtMTeUcsptKfc4tC1gAkCyFC+K0aJtf/Z' ;
 
-//==========================================================
-// lk-small.jpg
-//==========================================================
-$this->chars['k'][0]= 680 ;
-$this->chars['k'][1]=
+        //==========================================================
+        // lk-small.jpg
+        //==========================================================
+        $this->chars['k'][0]= 680 ;
+        $this->chars['k'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABUDASIAAhEBAxEB/8QAGQAAAwEBAQAAAAAAAAAAAAAAAAUGBAMH/8QALhAAAQMDAwIEBAcAAAAAAAAA'.
@@ -384,13 +385,13 @@ public function HandDigits()
 'PEp18JTIfeW3kq3ly4H26aNZqvTWZsjFcZTsVtSg0G8Rio+vr2vb7g6NLPRnuXy8F+8kl+obUh4KXJdqSJJQnohlkZqJPYBXh3P+'.
 'a4b5Hyp6k1bO7sOotPyXkj9NlwFl0ewstJA9ifrqkVSmET4csoS7UTHXFQ+6SQlskKUMb/tH9ddLVUmS7DqdBqD7U6OsqfS46jzl'.
 'hQ5bXb1K9Scuybdxo2OTu92dwSZkWn0Sb8viQWyn8Qq5D6ifSLd0BIv7q0arTBRSKPToMZbi2GWylsvLK148Wue/XRrRjxOpT2R2'.
-'k9aP/9k=' ;
+'k9aP/9k=' ; 
 
-//==========================================================
-// lr-small.jpg
-//==========================================================
-$this->chars['r'][0]= 681 ;
-$this->chars['r'][1]=
+        //==========================================================
+        // lr-small.jpg
+        //==========================================================
+        $this->chars['r'][0]= 681 ;
+        $this->chars['r'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABYDASIAAhEBAxEB/8QAGgAAAgIDAAAAAAAAAAAAAAAAAAYCBQMEB//EAC4QAAICAQIFAgMJAQAAAAAA'.
@@ -400,13 +401,13 @@ public function HandDigits()
 'r3IBAth5OYxozKsgc8y4GTgnJB9uncdTi6tXq2140rRVM13JMEMAVAg7sMdBjJB/18uDgRO9R2Oo6FX2vShkFzURFUq1whIj+8DI'.
 '7EdAFjXv7MeNb0kuStsFEmIaajZaos2fy2Q4VGH7SGxn+Rzw9yMLOm/FzRhZazmOTkP4grYyD3B8j2PTyeFfZ+z7G3BeSS8lmprl'.
 '2K2qcnK0Z5S8gPjrgAY8cNEWmq7u23pEos6/Zji+Kd0rLLGWwseA3joeZj/w4OET1g0vlmrWV+ydFnkUxSgsvM4V+YYIwfHz6cHB'.
-'ZeKZ1//Z' ;
+'ZeKZ1//Z' ; 
 
-//==========================================================
-// lg-small.jpg
-//==========================================================
-$this->chars['g'][0]= 655 ;
-$this->chars['g'][1]=
+        //==========================================================
+        // lg-small.jpg
+        //==========================================================
+        $this->chars['g'][0]= 655 ;
+        $this->chars['g'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABQDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAQCBQYH/8QAJxAAAQQBAwQCAgMAAAAAAAAA'.
@@ -417,11 +418,11 @@ public function HandDigits()
 'KvtaSkW4tYNVSqKiTwB+fw5n9sY/cuOXCzDDcluyW3Ckd7V+0n0eNZTH9DdouFalHIOJBUhtDki0pNV3UALo81ehG6IdKjPZ6d47'.
 '4ywltanVJvuJI+RQs/sHRqy2r003JhsImEc/CUyhxRZBjKV2oJ8eRXNmufPnRo1WIz3DdNn/2Q==' ;
 
-//==========================================================
-// lc-small.jpg
-//==========================================================
-$this->chars['c'][0]= 629 ;
-$this->chars['c'][1]=
+        //==========================================================
+        // lc-small.jpg
+        //==========================================================
+        $this->chars['c'][0]= 629 ;
+        $this->chars['c'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGQAAAwEBAQAAAAAAAAAAAAAAAAUGBwID/8QALRAAAgICAQIEBAYDAAAAAAAA'.
@@ -430,13 +431,13 @@ public function HandDigits()
 'IB1IVQT5frrv24twPgunk6a288crbklUSJNNdnSTZ2STHHqOP/Eb17njdZtAoqwEvrEiGVyG117/AG6HhyV8H1sljMldoxXTksGC'.
 'zV7M0oaWGQOVeGQ92I6EMR22D11w4LmEPjaOL51iL8ssc9Z69zHtZkYCGGeQK0ez2UEoU39wCeX1S/LLiEt+mPSbMLxsGVv2kEjR'.
 '305xkaEV/GTULMUT1LD/AAGh8gIZS2jv+vpybb8NMIb0dVLWYWgiiU0vmMphOj6V0TvQI3rfsON1E6dYjGtisa0F1mAWR2NhG0WZ'.
-'3Ls3TqNs5Hc9h23w49NWL9K+Q/VD5T/zhwPH/9k=' ;
+'3Ls3TqNs5Hc9h23w49NWL9K+Q/VD5T/zhwPH/9k=' ; 
 
-//==========================================================
-// d7-small.jpg
-//==========================================================
-$this->chars['7'][0]= 658 ;
-$this->chars['7'][1]=
+        //==========================================================
+        // d7-small.jpg
+        //==========================================================
+        $this->chars['7'][0]= 658 ;
+        $this->chars['7'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
 'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABgEFBwT/xAAuEAABAwIE'.
@@ -445,13 +446,13 @@ public function HandDigits()
 '19wpkCMDZKUpv0FZvbi1NzpYasMDLDUbMVXrtQdbeeU23xLWkj5RlLYK0J7anW9gbAjCzkOtsVSUJUdtc6dVZK51UeaFm4LKbhpC'.
 'l7EhIFkDW974GbRI2XorUVls1OTdKAOqUpR0Hc3198GITQ6k+hLwrEpoODiDenRfW23bBicg78JXxPpD0mgVOW5PAivNNpahsPW5'.
 '8xxQaSVkboQnhsnYm5OHqDGp1IpsalMKjMsMIC3+XZKbJFth62/QOEfMOZqZXp9JcKZTcGmTky3meSi7xQklI81vMR+sXIz/AEgp'.
-'Q0qPNu6ea8Q2jqtbp8+2w9h/OKORc/cpHjt1dDSHOtLZ4ekHW23bBjj+o9H/AB539aP94MG0+L//2Q==' ;
+'Q0qPNu6ea8Q2jqtbp8+2w9h/OKORc/cpHjt1dDSHOtLZ4ekHW23bBjj+o9H/AB539aP94MG0+L//2Q==' ; 
 
-//==========================================================
-// ly-small.jpg
-//==========================================================
-$this->chars['y'][0]= 672 ;
-$this->chars['y'][1]=
+        //==========================================================
+        // ly-small.jpg
+        //==========================================================
+        $this->chars['y'][0]= 672 ;
+        $this->chars['y'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABQDASIAAhEBAxEB/8QAGAAAAwEBAAAAAAAAAAAAAAAAAAQGBQf/xAArEAABAwMEAQIFBQAAAAAAAAAB'.
@@ -460,13 +461,13 @@ public function HandDigits()
 '76xtz0ioVvbcJ6msx2JtOfZmw1PKI5LQcJNh7UqBKcn6+NRfqPu6s1fYc6GxSJsRfWDUVSGA22ygEckJWSexRNgOP0udXzDKOJ0I'.
 'yo62mHm25Sy80l1Z4lSgpQvZRGLgWwPGjTjbchyLH+Ejx22EtJSgO8kki3kADA/nOjWjGzv73CyQZjUWNVp7bNSrj7qJDqflqUlQ'.
 'DMds24l3HvcNr3Pi9gME6T9WWVsemdYWswwC2lPta4m5WMA3OdUExCmozUJD6g84ntMjrHIFBTdQz5yLDx/WDNytpwW6nAkViqVe'.
-'uvmXdlme6n4dCwlRBKEgA2tj99QG7Ilncp5QqpU31PMsJ6x7A32f6SPxo0hPVCD45oVyKf0MtgeT97/nRrO7UOCFla3tn//Z' ;
+'uvmXdlme6n4dCwlRBKEgA2tj99QG7Ilncp5QqpU31PMsJ6x7A32f6SPxo0hPVCD45oVyKf0MtgeT97/nRrO7UOCFla3tn//Z' ; 
 
-//==========================================================
-// d3-small.jpg
-//==========================================================
-$this->chars['3'][0]= 662 ;
-$this->chars['3'][1]=
+        //==========================================================
+        // d3-small.jpg
+        //==========================================================
+        $this->chars['3'][0]= 662 ;
+        $this->chars['3'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD//gAJSnBHcmFwaP/bAEMACAYGBwYFCAcHBwkJCAoMFA0MCwsMGRITDxQdGh8eHRocHCAkLicg'.
 'IiwjHBwoNyksMDE0NDQfJzk9ODI8LjM0Mv/bAEMBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIAB4AEgMBIgACEQEDEQH/xAAZAAACAwEAAAAAAAAAAAAAAAAABAUGBwL/xAArEAABBAED'.
@@ -475,13 +476,13 @@ public function HandDigits()
 'VsJjnCMBxKkJJx7goAde+ceJfdNxU0UNlyymyXHi6kxWUNl1S3EnkAEIHX2nv86qtTuZr9Q9+1VhRsOoYpYcgSVyAE/TdewkJxnK'.
 'sBCjkdPGpnOtFMd3PqsXgfOAgD8Y0aX+11H9rDDjn8lr9yj5J+dGqsqxaw6Cc9cQZU4Sp7zTJsIrKlcUEKwhSin1JABI45GUjqOu'.
 'lbOvjbc3Ts9ynjGCy445UuFLYRzbWgrT6fhSCQSMDke+pew2zYVly/d7YchNqkMJZnQpgV9J8IzwWFJyUrAJHYgjvpLbu37G5nR7'.
-'vck5C3YRKYEOEVJZj8kjKypXqWvirjk9h+dB9i4faa89TDZUfKlIyT8k+To10a6KTkpcJ/0vL/7o0TS//9k=' ;
+'vck5C3YRKYEOEVJZj8kjKypXqWvirjk9h+dB9i4faa89TDZUfKlIyT8k+To10a6KTkpcJ/0vL/7o0TS//9k=' ; 
 
-//==========================================================
-// ln-small.jpg
-//==========================================================
-$this->chars['n'][0]= 643 ;
-$this->chars['n'][1]=
+        //==========================================================
+        // ln-small.jpg
+        //==========================================================
+        $this->chars['n'][0]= 643 ;
+        $this->chars['n'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABQDASIAAhEBAxEB/8QAGwAAAgEFAAAAAAAAAAAAAAAAAAYCAQMEBQf/xAAtEAACAQMCBAUCBwAAAAAA'.
@@ -490,13 +491,13 @@ public function HandDigits()
 'LVGS1+K16vCzfiR3GmoqqXGyxz06hWPsFlVMfOmq1iNvE69KjBYo3oJMZ3GKeYYPxg/fW+xzZX1FLQyxwSTcpWNceu4G3+aNSmpY'.
 'qmQzzwh2k8yhv2r2H23/AJ0aoy+EWh7I1ntacR3PxDtEzhjWy0wkkIwYmanU5GO6sNh7rrU8AVdTceNbhDXxNHUQvS0tZ3DzwxVA'.
 'fB7hj59/XJ08cPWaKj4gvlwSQiG7dCboqvLy9NOmQT9SM7ayJrBa6K5V91hjlWorp4JGUOAglRSiMMDb82/vgaBGTpVvtNUVtyJg'.
-'5+WNAh5ZCu/r2+dGrgq0pi0DhmlRsSSAfqMd+b6ZyNu3po1Rk1yNBe3/2Q==' ;
+'5+WNAh5ZCu/r2+dGrgq0pi0DhmlRsSSAfqMd+b6ZyNu3po1Rk1yNBe3/2Q==' ; 
 
-//==========================================================
-// lu-small.jpg
-//==========================================================
-$this->chars['u'][0]= 671 ;
-$this->chars['u'][1]=
+        //==========================================================
+        // lu-small.jpg
+        //==========================================================
+        $this->chars['u'][0]= 671 ;
+        $this->chars['u'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAYDBAUH/8QAJRAAAQQBAwQDAQEAAAAAAAAA'.
@@ -505,13 +506,13 @@ public function HandDigits()
 'wTiW0ukkrS28nn5fV2SPPFfurHUKQhzYG7pLYKEfyBhaSOS7dG/YCki/uvWn3LPDOJrwa4kyEzOYeakqkpC3Hk0bNePQHgDRpchY'.
 'leIZwzUWauKtuPctTSUlCAUmrBHIKuAPV/ujQsmHdm7hya43UbbD3ZVElOQJsdTS6IQaQUqBHCk8E2Pocgam6oYwObHy0Zm0oi45'.
 'T1KBPdpV2f0pom/1Ws7cmPazu98Ltvcq3VzRHfehz8a4pirFEKRZo8eQT+eCdWYfS/b+WYnxpbuVcDRMdHcyTqg2fiAfiLoi+Rf+'.
-'jT7Xc74HtOYnHyUOh8yWUvKeHhy0CiPVUAPoDRrm+OeznTva6lzsyMjCYbbaiNJjJSWElagD5tRpNUSALFeNGoOCH7Bv/9k=' ;
+'jT7Xc74HtOYnHyUOh8yWUvKeHhy0CiPVUAPoDRrm+OeznTva6lzsyMjCYbbaiNJjJSWElagD5tRpNUSALFeNGoOCH7Bv/9k=' ; 
 
-//==========================================================
-// lw-small.jpg
-//==========================================================
-$this->chars['w'][0]= 673 ;
-$this->chars['w'][1]=
+        //==========================================================
+        // lw-small.jpg
+        //==========================================================
+        $this->chars['w'][0]= 673 ;
+        $this->chars['w'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABcDASIAAhEBAxEB/8QAGAAAAgMAAAAAAAAAAAAAAAAAAAYDBAX/xAAtEAACAQMDAgMHBQAAAAAAAAAB'.
@@ -522,11 +523,11 @@ public function HandDigits()
 '7oz/ALqitJulYJKuqvFsppHALLFb3cp9FBaXr+O51bq0q6i38KK5PDVAAxSzU6SIpz3Kjjn8jUFoS7uFmut1gq17xLFQ+DxOccj8'.
 'Rsn+tVpiyJnqv09YfOXu5AycgZZQEhBZjgDBOOgwO/po0sttWHdNzqLruioa4UwmdaC3kYp4IwSvJlBHKQ4OSe3po0qxM6P/2Q==' ;
 
-//==========================================================
-// lq-small.jpg
-//==========================================================
-$this->chars['q'][0]= 671 ;
-$this->chars['q'][1]=
+        //==========================================================
+        // lq-small.jpg
+        //==========================================================
+        $this->chars['q'][0]= 671 ;
+        $this->chars['q'][1]=
 '/9j/4AAQSkZJRgABAQEASgBKAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAx'.
 'NDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy'.
 'MjIyMjIyMjL/wAARCAAeABQDASIAAhEBAxEB/8QAGQAAAgMBAAAAAAAAAAAAAAAAAAcDBAUG/8QAKRAAAQQBBAICAQQDAAAAAAAA'.
@@ -537,73 +538,78 @@ public function HandDigits()
 'AORpO04cIpmxH23FSEIRwKuNnsdk0o31702XhFMKbuRUZJWP8LTQ6HBCuIB+iVWSR2BXuqK93/hDlvGzEphmG3Ml5JpDi1I7TzNA'.
 'BYFlPafY+/7LBiv1CYDH4iFDOGySlMR22lFP4wCUpANfL11o1r4bxXlWMNEaE/bqlIbCFl/ANPK5Do/M0VDr2Rf3o0TX/9k=' ;
 
+
+
     }
 }
 
-class AntiSpam
-{
-    public $iData='';
-    public $iDD=null;
+class AntiSpam {
 
-    public function AntiSpam($aData='')
-    {
-    $this->iData = $aData;
-    $this->iDD = new HandDigits();
-    }
+    private $iData='';
+    private $iDD=null;
 
-    public function Rand($aLen)
-    {
-    $d='';
-    for ($i=0; $i < $aLen; ++$i) {
-        if ( rand(0,9) < 6 ) {
-        // Digits
-        $d .= chr( ord('1') + rand(0,8) );
-        } else {
-        // Letters
-        do {
-            $offset = rand(0,25);
-        } while ( $offset==14 );
-        $d .= chr( ord('a') + $offset );
-        }
+    function __construct($aData='') {
+        $this->iData = $aData;
+        $this->iDD = new HandDigits();
     }
-    $this->iData = $d;
 
-    return $d;
+    function Set($aData) {
+        $this->iData = $aData;
     }
 
-    public function Stroke()
-    {
-    $n=strlen($this->iData);
-    if ($n==0) {
-        return false;
+    function Rand($aLen) {
+        $d='';
+        for($i=0; $i < $aLen; ++$i) {
+            if( rand(0,9) < 6 ) {
+                // Digits
+                $d .= chr( ord('1') + rand(0,8) );
+            }
+            else {
+                // Letters
+                do {
+                    $offset = rand(0,25);
+                } while ( $offset==14 );
+                $d .= chr( ord('a') + $offset );
+            }
+        }
+        $this->iData = $d;
+        return $d;
     }
 
-    for ($i=0; $i < $n; ++$i) {
-        if ( $this->iData[$i]==='0' || strtolower($this->iData[$i])==='o') {
-        return false;
+    function Stroke() {
+
+        $n=strlen($this->iData);
+        if( $n==0 ) {
+            return false;
         }
-    }
 
-    $img = @imagecreatetruecolor($n*$this->iDD->iWidth, $this->iDD->iHeight);
-    if ($img < 1) {
-        return false;
-    }
+        for($i=0; $i < $n; ++$i ) {
+            if( $this->iData[$i]==='0' || strtolower($this->iData[$i])==='o') {
+                return false;
+            }
+        }
 
-    $start=0;
-    for ($i=0; $i < $n; ++$i) {
-        $dimg = imagecreatefromstring(base64_decode($this->iDD->chars[strtolower($this->iData[$i])][1]));
-        imagecopy($img,$dimg,$start,0,0,0,imagesx($dimg), $this->iDD->iHeight);
-        $start += imagesx($dimg);
-    }
-    $resimg = @imagecreatetruecolor($start+4, $this->iDD->iHeight+4);
-    if ($resimg < 1) {
-        return false;
-    }
+        $img = @imagecreatetruecolor($n*$this->iDD->iWidth, $this->iDD->iHeight);
+        if( $img < 1 ) {
+            return false;
+        }
 
-    imagecopy($resimg,$img,2,2,0,0,$start, $this->iDD->iHeight);
-    header("Content-type: image/jpeg");
-    imagejpeg($resimg);
+        $start=0;
+        for($i=0; $i < $n; ++$i ) {
+            $dimg = imagecreatefromstring(base64_decode($this->iDD->chars[strtolower($this->iData[$i])][1]));
+            imagecopy($img,$dimg,$start,0,0,0,imagesx($dimg), $this->iDD->iHeight);
+            $start += imagesx($dimg);
+        }
+        $resimg = @imagecreatetruecolor($start+4, $this->iDD->iHeight+4);
+        if( $resimg < 1 ) {
+            return false;
+        }
 
-    return true;
+        imagecopy($resimg,$img,2,2,0,0,$start, $this->iDD->iHeight);
+        header("Content-type: image/jpeg");
+        imagejpeg($resimg);
+        return true;
     }
 }
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_bar.php b/common/lib/jpgraph_lib/jpgraph_bar.php
old mode 100644
new mode 100755
index dcbab351d..ee016695a
--- a/common/lib/jpgraph_lib/jpgraph_bar.php
+++ b/common/lib/jpgraph_lib/jpgraph_bar.php
@@ -1,17 +1,15 @@
 <?php
 /*=======================================================================
-// File:	JPGRAPH_BAR.PHP
-// Description:	Bar plot extension for JpGraph
-// Created: 	2001-01-08
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_bar.php,v 1.54.2.22 2004/10/20 20:52:17 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2001,2002,2003 Johan Persson
-//========================================================================
-*/
-
-require_once 'jpgraph_plotband.php';
+ // File:        JPGRAPH_BAR.PHP
+ // Description: Bar plot extension for JpGraph
+ // Created:     2001-01-08
+ // Ver:         $Id: jpgraph_bar.php 1905 2009-10-06 18:00:21Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+
+require_once('jpgraph_plotband.php');
 
 // Pattern for Bars
 DEFINE('PATTERN_DIAG1',1);
@@ -29,473 +27,648 @@
 // CLASS BarPlot
 // Description: Main code to produce a bar plot
 //===================================================
-class BarPlot extends Plot
-{
-    public $width=0.4; // in percent of major ticks
-    public $abswidth=-1; // Width in absolute pixels
+class BarPlot extends Plot {
     public $fill=false,$fill_color="lightblue"; // Default is to fill with light blue
-    public $ybase=0; // Bars start at 0
-    public $align="center";
+    public $iPattern=-1,$iPatternDensity=80,$iPatternColor='black';
+    public $valuepos='top';
     public $grad=false,$grad_style=1;
     public $grad_fromcolor=array(50,50,200),$grad_tocolor=array(255,255,255);
-    public $bar_shadow=false;
-    public $bar_shadow_color="black";
-    public $bar_shadow_hsize=3,$bar_shadow_vsize=3;
-    public $valuepos='top';
-    public $iPattern=-1,$iPatternDensity=80,$iPatternColor='black';
-
-//---------------
-// CONSTRUCTOR
-    public function BarPlot(&$datay,$datax=false)
-    {
-    $this->Plot($datay,$datax);
-    ++$this->numpoints;
+    public $ymin=0;
+    protected $width=0.4; // in percent of major ticks
+    protected $abswidth=-1; // Width in absolute pixels
+    protected $ybase=0; // Bars start at 0
+    protected $align="center";
+    protected $bar_shadow=false;
+    protected $bar_shadow_color="black";
+    protected $bar_shadow_hsize=3,$bar_shadow_vsize=3;
+    protected $bar_3d=false;
+    protected $bar_3d_hsize=3,$bar_3d_vsize=3;
+
+    //---------------
+    // CONSTRUCTOR
+    function __construct($datay,$datax=false) {
+        parent::__construct($datay,$datax);
+        ++$this->numpoints;
     }
 
-//---------------
-// PUBLIC METHODS
+    //---------------
+    // PUBLIC METHODS
 
     // Set a drop shadow for the bar (or rather an "up-right" shadow)
-    public function SetShadow($color="black",$hsize=3,$vsize=3,$show=true)
-    {
-    $this->bar_shadow=$show;
-    $this->bar_shadow_color=$color;
-    $this->bar_shadow_vsize=$vsize;
-    $this->bar_shadow_hsize=$hsize;
-
-    // Adjust the value margin to compensate for shadow
-    $this->value->margin += $vsize;
+    function SetShadow($aColor="black",$aHSize=3,$aVSize=3,$aShow=true) {
+        $this->bar_shadow=$aShow;
+        $this->bar_shadow_color=$aColor;
+        $this->bar_shadow_vsize=$aVSize;
+        $this->bar_shadow_hsize=$aHSize;
+
+        // Adjust the value margin to compensate for shadow
+        $this->value->margin += $aVSize;
+    }
+
+    function Set3D($aHSize=3,$aVSize=3,$aShow=true) {
+        $this->bar_3d=$aShow;
+        $this->bar_3d_vsize=$aVSize;
+        $this->bar_3d_hsize=$aHSize;
+
+        $this->value->margin += $aVSize;
     }
 
     // DEPRECATED use SetYBase instead
-    public function SetYMin($aYStartValue)
-    {
-    //die("JpGraph Error: Deprecated function SetYMin. Use SetYBase() instead.");
-    $this->ybase=$aYStartValue;
+    function SetYMin($aYStartValue) {
+        //die("JpGraph Error: Deprecated function SetYMin. Use SetYBase() instead.");
+        $this->ybase=$aYStartValue;
     }
 
     // Specify the base value for the bars
-    public function SetYBase($aYStartValue)
-    {
-    $this->ybase=$aYStartValue;
+    function SetYBase($aYStartValue) {
+        $this->ybase=$aYStartValue;
     }
 
-    public function Legend(&$graph)
-    {
-    if ($this->grad && $this->legend!="" && !$this->fill) {
-        $color=array($this->grad_fromcolor,$this->grad_tocolor);
-        // In order to differentiate between gradients and cooors specified as an RGB triple
-        $graph->legend->Add($this->legend,$color,"",-$this->grad_style,
-                $this->legendcsimtarget,$this->legendcsimalt);
-    } elseif ($this->fill_color && $this->legend!="") {
-        if ( is_array($this->fill_color) ) {
-        $graph->legend->Add($this->legend,$this->fill_color[0],"",0,
-                    $this->legendcsimtarget,$this->legendcsimalt);
-        } else {
-        $graph->legend->Add($this->legend,$this->fill_color,"",0,
-                    $this->legendcsimtarget,$this->legendcsimalt);
+    // The method will take the specified pattern anre
+    // return a pattern index that corresponds to the original
+    // patterm being rotated 90 degreees. This is needed when plottin
+    // Horizontal bars
+    function RotatePattern($aPat,$aRotate=true) {
+        $rotate = array(1 => 2, 2 => 1, 3 => 3, 4 => 5, 5 => 4, 6 => 6, 7 => 7, 8 => 8);
+        if( $aRotate ) {
+            return $rotate[$aPat];
+        }
+        else {
+            return $aPat;
         }
     }
+
+    function Legend($graph) {
+        if( $this->grad && $this->legend!="" && !$this->fill ) {
+            $color=array($this->grad_fromcolor,$this->grad_tocolor);
+            // In order to differentiate between gradients and cooors specified as an RGB triple
+            $graph->legend->Add($this->legend,$color,"",-$this->grad_style,
+            $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
+        }
+        elseif( $this->legend!="" && ($this->iPattern > -1 || is_array($this->iPattern)) ) {
+            if( is_array($this->iPattern) ) {
+                $p1 = $this->RotatePattern( $this->iPattern[0], $graph->img->a == 90 );
+                $p2 = $this->iPatternColor[0];
+                $p3 = $this->iPatternDensity[0];
+            }
+            else {
+                $p1 = $this->RotatePattern( $this->iPattern, $graph->img->a == 90 );
+                $p2 = $this->iPatternColor;
+                $p3 = $this->iPatternDensity;
+            }
+            if( $p3 < 90 ) $p3 += 5;
+            $color = array($p1,$p2,$p3,$this->fill_color);
+            // A kludge: Too mark that we add a pattern we use a type value of < 100
+            $graph->legend->Add($this->legend,$color,"",-101,
+                                $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
+        }
+        elseif( $this->fill_color && $this->legend!="" ) {
+            if( is_array($this->fill_color) ) {
+                $graph->legend->Add($this->legend,$this->fill_color[0],"",0,
+                $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
+            }
+            else {
+                $graph->legend->Add($this->legend,$this->fill_color,"",0,
+                $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
+            }
+        }
     }
 
     // Gets called before any axis are stroked
-    public function PreStrokeAdjust(&$graph)
-    {
-    parent::PreStrokeAdjust($graph);
-
-    // If we are using a log Y-scale we want the base to be at the
-    // minimum Y-value unless the user have specifically set some other
-    // value than the default.
-    if( substr($graph->axtype,-3,3)=="log" && $this->ybase==0 )
+    function PreStrokeAdjust($graph) {
+        parent::PreStrokeAdjust($graph);
+
+        // If we are using a log Y-scale we want the base to be at the
+        // minimum Y-value unless the user have specifically set some other
+        // value than the default.
+        if( substr($graph->axtype,-3,3)=="log" && $this->ybase==0 )
         $this->ybase = $graph->yaxis->scale->GetMinVal();
 
-    // For a "text" X-axis scale we will adjust the
-    // display of the bars a little bit.
-    if ( substr($graph->axtype,0,3)=="tex" ) {
-        // Position the ticks between the bars
-        $graph->xaxis->scale->ticks->SetXLabelOffset(0.5,0);
-
-        // Center the bars
-        if( $this->align == "center" )
-            $graph->SetTextScaleOff(0.5-$this->width/2);
-        elseif( $this->align == "right" )
-            $graph->SetTextScaleOff(1-$this->width);
-
-    } else {
-        // We only set an absolute width for linear and int scale
-        // for text scale the width will be set to a fraction of
-        // the majstep width.
-        if ($this->abswidth == -1) {
+        // For a "text" X-axis scale we will adjust the
+        // display of the bars a little bit.
+        if( substr($graph->axtype,0,3)=="tex" ) {
+            // Position the ticks between the bars
+            $graph->xaxis->scale->ticks->SetXLabelOffset(0.5,0);
+
+            // Center the bars
+            if( $this->abswidth > -1 ) {
+                $graph->SetTextScaleAbsCenterOff($this->abswidth);
+            }
+            else {
+                if( $this->align == "center" )
+                $graph->SetTextScaleOff(0.5-$this->width/2);
+                elseif( $this->align == "right" )
+                $graph->SetTextScaleOff(1-$this->width);
+            }
+        }
+        elseif( ($this instanceof AccBarPlot) || ($this instanceof GroupBarPlot) ) {
+            // We only set an absolute width for linear and int scale
+            // for text scale the width will be set to a fraction of
+            // the majstep width.
+            if( $this->abswidth == -1 ) {
                 // Not set
-        // set width to a visuable sensible default
-        $this->abswidth = $graph->img->plotwidth/(2*count($this->coords[0]));
+                // set width to a visuable sensible default
+                $this->abswidth = $graph->img->plotwidth/(2*$this->numpoints);
+            }
         }
     }
-    }
-
-    public function Min()
-    {
-    $m = parent::Min();
-    if( $m[1] >= $this->ybase )
-        $m[1] = $this->ybase;
 
-    return $m;
+    function Min() {
+        $m = parent::Min();
+        if( $m[1] >= $this->ybase ) $m[1] = $this->ybase;
+        return $m;
     }
 
-    public function Max()
-    {
-    $m = parent::Max();
-    if( $m[1] <= $this->ybase )
-        $m[1] = $this->ybase;
-
-    return $m;
+    function Max() {
+        $m = parent::Max();
+        if( $m[1] <= $this->ybase ) $m[1] = $this->ybase;
+        return $m;
     }
 
     // Specify width as fractions of the major stepo size
-    public function SetWidth($aFractionWidth)
-    {
-    $this->width=$aFractionWidth;
+    function SetWidth($aWidth) {
+        if( $aWidth > 1 ) {
+            // Interpret this as absolute width
+            $this->abswidth=$aWidth;
+        }
+        else {
+            $this->width=$aWidth;
+        }
     }
 
     // Specify width in absolute pixels. If specified this
     // overrides SetWidth()
-    public function SetAbsWidth($aWidth)
-    {
-    $this->abswidth=$aWidth;
+    function SetAbsWidth($aWidth) {
+        $this->abswidth=$aWidth;
     }
 
-    public function SetAlign($aAlign)
-    {
-    $this->align=$aAlign;
+    function SetAlign($aAlign) {
+        $this->align=$aAlign;
     }
 
-    public function SetNoFill()
-    {
-    $this->grad = false;
-    $this->fill_color=false;
-    $this->fill=false;
+    function SetNoFill() {
+        $this->grad = false;
+        $this->fill_color=false;
+        $this->fill=false;
     }
 
-    public function SetFillColor($aColor)
-    {
-    $this->fill = true ;
-    $this->fill_color=$aColor;
-    }
+    function SetFillColor($aColor) {
+        // Do an extra error check if the color is specified as an RGB array triple
+        // In that case convert it to a hex string since it will otherwise be
+        // interpretated as an array of colors for each individual bar.
 
-    public function SetFillGradient($from_color,$to_color,$style)
-    {
-    $this->grad=true;
-    $this->grad_fromcolor=$from_color;
-    $this->grad_tocolor=$to_color;
-    $this->grad_style=$style;
-    }
+        $aColor = RGB::tryHexConversion($aColor);
+        $this->fill = true ;
+        $this->fill_color=$aColor;
 
-    public function SetValuePos($aPos)
-    {
-    $this->valuepos = $aPos;
     }
 
-    public function SetPattern($aPattern, $aColor='black')
-    {
-    if ( is_array($aPattern) ) {
-        $n = count($aPattern);
-        $this->iPattern = array();
-        $this->iPatternDensity = array();
-        if ( is_array($aColor) ) {
-        $this->iPatternColor = array();
-        if ( count($aColor) != $n ) {
-            JpGraphError::Raise('NUmber of colors is not the same as the number of patterns in BarPlot::SetPattern()');
-        }
-        } else
-        $this->iPatternColor = $aColor;
-        for ($i=0; $i < $n; ++$i) {
-        $this->_SetPatternHelper($aPattern[$i], $this->iPattern[$i], $this->iPatternDensity[$i]);
-        if ( is_array($aColor) ) {
-            $this->iPatternColor[$i] = $aColor[$i];
-        }
-        }
-    } else {
-        $this->_SetPatternHelper($aPattern, $this->iPattern, $this->iPatternDensity);
-        $this->iPatternColor = $aColor;
+    function SetFillGradient($aFromColor,$aToColor=null,$aStyle=null) {
+        $this->grad = true;
+        $this->grad_fromcolor = $aFromColor;
+        $this->grad_tocolor   = $aToColor;
+        $this->grad_style     = $aStyle;
     }
+
+    function SetValuePos($aPos) {
+        $this->valuepos = $aPos;
     }
 
-    public function _SetPatternHelper($aPattern, &$aPatternValue, &$aDensity)
-    {
-    switch ($aPattern) {
-        case PATTERN_DIAG1:
-        $aPatternValue= 1;
-        $aDensity = 90;
-        break;
-        case PATTERN_DIAG2:
-        $aPatternValue= 1;
-        $aDensity = 75;
-        break;
-        case PATTERN_DIAG3:
-        $aPatternValue= 2;
-        $aDensity = 90;
-        break;
-        case PATTERN_DIAG4:
-        $aPatternValue= 2;
-        $aDensity = 75;
-        break;
-        case PATTERN_CROSS1:
-        $aPatternValue= 8;
-        $aDensity = 90;
-        break;
-        case PATTERN_CROSS2:
-        $aPatternValue= 8;
-        $aDensity = 78;
-        break;
-        case PATTERN_CROSS3:
-        $aPatternValue= 8;
-        $aDensity = 65;
-        break;
-        case PATTERN_CROSS4:
-        $aPatternValue= 7;
-        $aDensity = 90;
-        break;
-        case PATTERN_STRIPE1:
-        $aPatternValue= 5;
-        $aDensity = 90;
-        break;
-        case PATTERN_STRIPE2:
-        $aPatternValue= 5;
-        $aDensity = 75;
-        break;
-        default:
-        JpGraphError::Raise('Unknown pattern specified in call to BarPlot::SetPattern()');
+    function SetPattern($aPattern, $aColor='black'){
+        if( is_array($aPattern) ) {
+            $n = count($aPattern);
+            $this->iPattern = array();
+            $this->iPatternDensity = array();
+            if( is_array($aColor) ) {
+                $this->iPatternColor = array();
+                if( count($aColor) != $n ) {
+                    JpGraphError::RaiseL(2001);//('NUmber of colors is not the same as the number of patterns in BarPlot::SetPattern()');
+                }
+            }
+            else {
+                $this->iPatternColor = $aColor;
+            }
+            for( $i=0; $i < $n; ++$i ) {
+                $this->_SetPatternHelper($aPattern[$i], $this->iPattern[$i], $this->iPatternDensity[$i]);
+                if( is_array($aColor) ) {
+                    $this->iPatternColor[$i] = $aColor[$i];
+                }
+            }
+        }
+        else {
+            $this->_SetPatternHelper($aPattern, $this->iPattern, $this->iPatternDensity);
+            $this->iPatternColor = $aColor;
+        }
     }
+
+    function _SetPatternHelper($aPattern, &$aPatternValue, &$aDensity){
+        switch( $aPattern ) {
+            case PATTERN_DIAG1:
+                $aPatternValue= 1;
+                $aDensity = 92;
+                break;
+            case PATTERN_DIAG2:
+                $aPatternValue= 1;
+                $aDensity = 78;
+                break;
+            case PATTERN_DIAG3:
+                $aPatternValue= 2;
+                $aDensity = 92;
+                break;
+            case PATTERN_DIAG4:
+                $aPatternValue= 2;
+                $aDensity = 78;
+                break;
+            case PATTERN_CROSS1:
+                $aPatternValue= 8;
+                $aDensity = 90;
+                break;
+            case PATTERN_CROSS2:
+                $aPatternValue= 8;
+                $aDensity = 78;
+                break;
+            case PATTERN_CROSS3:
+                $aPatternValue= 8;
+                $aDensity = 65;
+                break;
+            case PATTERN_CROSS4:
+                $aPatternValue= 7;
+                $aDensity = 90;
+                break;
+            case PATTERN_STRIPE1:
+                $aPatternValue= 5;
+                $aDensity = 94;
+                break;
+            case PATTERN_STRIPE2:
+                $aPatternValue= 5;
+                $aDensity = 85;
+                break;
+            default:
+                JpGraphError::RaiseL(2002);
+                //('Unknown pattern specified in call to BarPlot::SetPattern()');
+        }
     }
 
-    public function Stroke(&$img,&$xscale,&$yscale)
-    {
-    $numpoints = count($this->coords[0]);
-    if ( isset($this->coords[1]) ) {
-        if( count($this->coords[1])!=$numpoints )
-        JpGraphError::Raise("Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])."Number of Y-points:$numpoints");
-        else
-        $exist_x = true;
-    } else
-        $exist_x = false;
-
-    $numbars=count($this->coords[0]);
-
-    // Use GetMinVal() instead of scale[0] directly since in the case
-    // of log scale we get a correct value. Log scales will have negative
-    // values for values < 1 while still not representing negative numbers.
-    if( $yscale->GetMinVal() >= 0 )
+    function Stroke($img,$xscale,$yscale) {
+
+        $numpoints = count($this->coords[0]);
+        if( isset($this->coords[1]) ) {
+            if( count($this->coords[1])!=$numpoints ) {
+                JpGraphError::RaiseL(2003,count($this->coords[1]),$numpoints);
+            //"Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])."Number of Y-points:$numpoints");
+            }
+            else {
+                $exist_x = true;
+            }
+        }
+        else {
+            $exist_x = false;
+        }
+
+
+        $numbars=count($this->coords[0]);
+
+        // Use GetMinVal() instead of scale[0] directly since in the case
+        // of log scale we get a correct value. Log scales will have negative
+        // values for values < 1 while still not representing negative numbers.
+        if( $yscale->GetMinVal() >= 0 )
         $zp=$yscale->scale_abs[0];
-    else {
-        $zp=$yscale->Translate(0);
-    }
+        else {
+            $zp=$yscale->Translate(0);
+        }
 
-    if ($this->abswidth > -1) {
-        $abswidth=$this->abswidth;
-    } else
-        $abswidth=round($this->width*$xscale->scale_factor,0);
+        if( $this->abswidth > -1 ) {
+            $abswidth=$this->abswidth;
+        }
+        else {
+            $abswidth=round($this->width*$xscale->scale_factor,0);
+        }
 
-    // Count potential pattern array to avoid doing the count for each iteration
-    if ( is_array($this->iPattern) ) {
-        $np = count($this->iPattern);
-    }
+        // Count pontetial pattern array to avoid doing the count for each iteration
+        if( is_array($this->iPattern) ) {
+            $np = count($this->iPattern);
+        }
 
-    for ($i=0; $i < $numbars; ++$i) {
+        $grad = null;
+        for($i=0; $i < $numbars; ++$i) {
 
-         // If value is NULL, or 0 then don't draw a bar at all
-         if ($this->coords[0][$i] === null ||
-        $this->coords[0][$i] === '' ||
-        $this->coords[0][$i] === 0 ) continue;
+            // If value is NULL, or 0 then don't draw a bar at all
+            if ($this->coords[0][$i] === null || $this->coords[0][$i] === '' )
+            continue;
 
-        if( $exist_x ) $x=$this->coords[1][$i];
-        else $x=$i;
+            if( $exist_x ) {
+                $x=$this->coords[1][$i];
+            }
+            else {
+                $x=$i;
+            }
 
-        $x=$xscale->Translate($x);
+            $x=$xscale->Translate($x);
 
-        if (!$xscale->textscale) {
+            // Comment Note: This confuses the positioning when using acc together with
+            // grouped bars. Workaround for fixing #191
+            /*
+            if( !$xscale->textscale ) {
             if($this->align=="center")
             $x -= $abswidth/2;
-        elseif($this->align=="right")
+            elseif($this->align=="right")
             $x -= $abswidth;
-        }
+            }
+            */
+            // Stroke fill color and fill gradient
+            $pts=array(
+            $x,$zp,
+            $x,$yscale->Translate($this->coords[0][$i]),
+            $x+$abswidth,$yscale->Translate($this->coords[0][$i]),
+            $x+$abswidth,$zp);
+            if( $this->grad ) {
+                if( $grad === null ) {
+                    $grad = new Gradient($img);
+                }
+                if( is_array($this->grad_fromcolor) ) {
+                    // The first argument (grad_fromcolor) can be either an array or a single color. If it is an array
+                    // then we have two choices. It can either a) be a single color specified as an RGB triple or it can be
+                    // an array to specify both (from, to style) for each individual bar. The way to know the difference is
+                    // to investgate the first element. If this element is an integer [0,255] then we assume it is an RGB
+                    // triple.
+                    $ng = count($this->grad_fromcolor);
+                    if( $ng === 3 ) {
+                        if( is_numeric($this->grad_fromcolor[0]) && $this->grad_fromcolor[0] > 0 && $this->grad_fromcolor[0] < 256 ) {
+                            // RGB Triple
+                            $fromcolor = $this->grad_fromcolor;
+                            $tocolor = $this->grad_tocolor;
+                            $style = $this->grad_style;
+                        }
+                        else {
+                            $fromcolor = $this->grad_fromcolor[$i % $ng][0];
+                            $tocolor = $this->grad_fromcolor[$i % $ng][1];
+                            $style = $this->grad_fromcolor[$i % $ng][2];
+                        }
+                    }
+                    else {
+                        $fromcolor = $this->grad_fromcolor[$i % $ng][0];
+                        $tocolor = $this->grad_fromcolor[$i % $ng][1];
+                        $style = $this->grad_fromcolor[$i % $ng][2];
+                    }
+                    $grad->FilledRectangle($pts[2],$pts[3],
+                                           $pts[6],$pts[7],
+                                           $fromcolor,$tocolor,$style);
+                }
+                else {
+                    $grad->FilledRectangle($pts[2],$pts[3],
+                    $pts[6],$pts[7],
+                    $this->grad_fromcolor,$this->grad_tocolor,$this->grad_style);
+                }
+            }
+            elseif( !empty($this->fill_color) ) {
+                if(is_array($this->fill_color)) {
+                    $img->PushColor($this->fill_color[$i % count($this->fill_color)]);
+                } else {
+                    $img->PushColor($this->fill_color);
+                }
+                $img->FilledPolygon($pts);
+                $img->PopColor();
+            }
 
+/////////////////////////kokorahen rectangle polygon//////////////////////
 
-        // Stroke fill color and fill gradient
-        $pts=array(
-        $x,$zp,
-        $x,$yscale->Translate($this->coords[0][$i]),
-        $x+$abswidth,$yscale->Translate($this->coords[0][$i]),
-        $x+$abswidth,$zp);
-        if ($this->grad) {
-        $grad = new Gradient($img);
-        $grad->FilledRectangle($pts[2],$pts[3],
-                       $pts[6],$pts[7],
-                       $this->grad_fromcolor,$this->grad_tocolor,$this->grad_style);
-        } elseif ( !empty($this->fill_color) ) {
-        if (is_array($this->fill_color)) {
-            $img->PushColor($this->fill_color[$i % count($this->fill_color)]);
-        } else {
-            $img->PushColor($this->fill_color);
-        }
-        $img->FilledPolygon($pts);
-        $img->PopColor();
-        }
-
-
-        // Remember value of this bar
-        $val=$this->coords[0][$i];
-
-        if ( !empty($val) && !is_numeric($val) ) {
-        JpGraphError::Raise('All values for a barplot must be numeric. You have specified value['.$i.'] == \''.$val.'\'');
-        }
-
-        // Determine the shadow
-        if ($this->bar_shadow && $val != 0) {
-
-        $ssh = $this->bar_shadow_hsize;
-        $ssv = $this->bar_shadow_vsize;
-        // Create points to create a "upper-right" shadow
-        if ($val > 0) {
-            $sp[0]=$pts[6];		$sp[1]=$pts[7];
-            $sp[2]=$pts[4];		$sp[3]=$pts[5];
-            $sp[4]=$pts[2];		$sp[5]=$pts[3];
-            $sp[6]=$pts[2]+$ssh;	$sp[7]=$pts[3]-$ssv;
-            $sp[8]=$pts[4]+$ssh;	$sp[9]=$pts[5]-$ssv;
-            $sp[10]=$pts[6]+$ssh;	$sp[11]=$pts[7]-$ssv;
-        } elseif ($val < 0) {
-            $sp[0]=$pts[4];		$sp[1]=$pts[5];
-            $sp[2]=$pts[6];		$sp[3]=$pts[7];
-            $sp[4]=$pts[0];		$sp[5]=$pts[1];
-            $sp[6]=$pts[0]+$ssh;	$sp[7]=$pts[1]-$ssv;
-            $sp[8]=$pts[6]+$ssh;	$sp[9]=$pts[7]-$ssv;
-            $sp[10]=$pts[4]+$ssh;	$sp[11]=$pts[5]-$ssv;
-        }
-        if ( is_array($this->bar_shadow_color) ) {
-            $numcolors = count($this->bar_shadow_color);
-            if ($numcolors == 0) {
-            JpGraphError::Raise('You have specified an empty array for shadow colors in the bar plot.');
-            }
-            $img->PushColor($this->bar_shadow_color[$i % $numcolors]);
-        } else {
-            $img->PushColor($this->bar_shadow_color);
-        }
-        $img->FilledPolygon($sp);
-        $img->PopColor();
-        }
-
-        // Stroke the pattern
-        if ( is_array($this->iPattern) ) {
-        $f = new RectPatternFactory();
-        if ( is_array($this->iPatternColor) ) {
-            $pcolor = $this->iPatternColor[$i % $np];
-        } else
-            $pcolor = $this->iPatternColor;
-        $prect = $f->Create($this->iPattern[$i % $np],$pcolor,1);
-        $prect->SetDensity($this->iPatternDensity[$i % $np]);
-
-        if ($val < 0) {
-            $rx = $pts[0];
-            $ry = $pts[1];
-        } else {
-            $rx = $pts[2];
-            $ry = $pts[3];
-        }
-        $width = abs($pts[4]-$pts[0])+1;
-        $height = abs($pts[1]-$pts[3])+1;
-        $prect->SetPos(new Rectangle($rx,$ry,$width,$height));
-        $prect->Stroke($img);
-        } else {
-        if ($this->iPattern > -1) {
-            $f = new RectPatternFactory();
-            $prect = $f->Create($this->iPattern,$this->iPatternColor,1);
-            $prect->SetDensity($this->iPatternDensity);
-            if ($val < 0) {
-            $rx = $pts[0];
-            $ry = $pts[1];
-            } else {
-            $rx = $pts[2];
-            $ry = $pts[3];
-            }
-            $width = abs($pts[4]-$pts[0])+1;
-            $height = abs($pts[1]-$pts[3])+1;
-            $prect->SetPos(new Rectangle($rx,$ry,$width,$height));
-            $prect->Stroke($img);
-        }
-        }
-        // Stroke the outline of the bar
-        if( is_array($this->color) )
-        $img->SetColor($this->color[$i % count($this->color)]);
-        else
-        $img->SetColor($this->color);
-
-        $pts[] = $pts[0];
-        $pts[] = $pts[1];
-
-        if ($this->weight > 0) {
-        $img->SetLineWeight($this->weight);
-        $img->Polygon($pts);
-        }
-
-        // Determine how to best position the values of the individual bars
-        $x=$pts[2]+($pts[4]-$pts[2])/2;
-        if ($this->valuepos=='top') {
-        $y=$pts[3];
-        if ($img->a === 90) {
-            if( $val < 0 )
-            $this->value->SetAlign('right','center');
-            else
-            $this->value->SetAlign('left','center');
-
-        }
-        $this->value->Stroke($img,$val,$x,$y);
-        } elseif ($this->valuepos=='max') {
-        $y=$pts[3];
-        if ($img->a === 90) {
-            if( $val < 0 )
-            $this->value->SetAlign('left','center');
-            else
-            $this->value->SetAlign('right','center');
-        } else {
-            $this->value->SetAlign('center','top');
-        }
-        $this->value->SetMargin(-3);
-        $this->value->Stroke($img,$val,$x,$y);
-        } elseif ($this->valuepos=='center') {
-        $y = ($pts[3] + $pts[1])/2;
-        $this->value->SetAlign('center','center');
-        $this->value->SetMargin(0);
-        $this->value->Stroke($img,$val,$x,$y);
-        } elseif ($this->valuepos=='bottom' || $this->valuepos=='min') {
-        $y=$pts[1];
-        if ($img->a === 90) {
-            if( $val < 0 )
-            $this->value->SetAlign('right','center');
-            else
-            $this->value->SetAlign('left','center');
-        }
-        $this->value->SetMargin(3);
-        $this->value->Stroke($img,$val,$x,$y);
-        } else {
-        JpGraphError::Raise('Unknown position for values on bars :'.$this->valuepos);
-        }
-        // Create the client side image map
-        $rpts = $img->ArrRotate($pts);
-        $csimcoord=round($rpts[0]).", ".round($rpts[1]);
-        for ($j=1; $j < 4; ++$j) {
-        $csimcoord .= ", ".round($rpts[2*$j]).", ".round($rpts[2*$j+1]);
-        }
-        if ( !empty($this->csimtargets[$i]) ) {
-        $this->csimareas .= '<area shape="poly" coords="'.$csimcoord.'" ';
-        $this->csimareas .= " href=\"".$this->csimtargets[$i]."\"";
-        if ( !empty($this->csimalts[$i]) ) {
-            $sval=sprintf($this->csimalts[$i],$this->coords[0][$i]);
-            $this->csimareas .= " alt=\"$sval\" title=\"$sval\" ";
-        }
-        $this->csimareas .= ">\n";
-        }
-    }
+            // Remember value of this bar
+            $val=$this->coords[0][$i];
+
+            if( !empty($val) && !is_numeric($val) ) {
+                JpGraphError::RaiseL(2004,$i,$val);
+                //'All values for a barplot must be numeric. You have specified value['.$i.'] == \''.$val.'\'');
+            }
+
+            // Determine the shadow
+            if( $this->bar_shadow && $val != 0) {
+
+                $ssh = $this->bar_shadow_hsize;
+                $ssv = $this->bar_shadow_vsize;
+                // Create points to create a "upper-right" shadow
+                if( $val > 0 ) {
+                    $sp[0]=$pts[6];  $sp[1]=$pts[7];
+                    $sp[2]=$pts[4];  $sp[3]=$pts[5];
+                    $sp[4]=$pts[2];  $sp[5]=$pts[3];
+                    $sp[6]=$pts[2]+$ssh; $sp[7]=$pts[3]-$ssv;
+                    $sp[8]=$pts[4]+$ssh; $sp[9]=$pts[5]-$ssv;
+                    $sp[10]=$pts[6]+$ssh; $sp[11]=$pts[7]-$ssv;
+                }
+                elseif( $val < 0 ) {
+                    $sp[0]=$pts[4];  $sp[1]=$pts[5];
+                    $sp[2]=$pts[6];  $sp[3]=$pts[7];
+                    $sp[4]=$pts[0];  $sp[5]=$pts[1];
+                    $sp[6]=$pts[0]+$ssh; $sp[7]=$pts[1]-$ssv;
+                    $sp[8]=$pts[6]+$ssh; $sp[9]=$pts[7]-$ssv;
+                    $sp[10]=$pts[4]+$ssh; $sp[11]=$pts[5]-$ssv;
+                }
+                if( is_array($this->bar_shadow_color) ) {
+                    $numcolors = count($this->bar_shadow_color);
+                    if( $numcolors == 0 ) {
+                        JpGraphError::RaiseL(2005);//('You have specified an empty array for shadow colors in the bar plot.');
+                    }
+                    $img->PushColor($this->bar_shadow_color[$i % $numcolors]);
+                }
+                else {
+                    $img->PushColor($this->bar_shadow_color);
+                }
+                $img->FilledPolygon($sp);
+                $img->PopColor();
+
+            } elseif( $this->bar_3d && $val != 0) {
+              // Determine the 3D
+
+                $ssh = $this->bar_3d_hsize;
+                $ssv = $this->bar_3d_vsize;
+
+                // Create points to create a "upper-right" shadow
+                if( $val > 0 ) {
+                    $sp1[0]=$pts[6];  $sp1[1]=$pts[7];
+                    $sp1[2]=$pts[4];  $sp1[3]=$pts[5];
+                    $sp1[4]=$pts[4]+$ssh; $sp1[5]=$pts[5]-$ssv;
+                    $sp1[6]=$pts[6]+$ssh; $sp1[7]=$pts[7]-$ssv;
+
+                    $sp2[0]=$pts[4];  $sp2[1]=$pts[5];
+                    $sp2[2]=$pts[2];  $sp2[3]=$pts[3];
+                    $sp2[4]=$pts[2]+$ssh; $sp2[5]=$pts[3]-$ssv;
+                    $sp2[6]=$pts[4]+$ssh; $sp2[7]=$pts[5]-$ssv;
+
+                }
+                elseif( $val < 0 ) {
+                    $sp1[0]=$pts[4];  $sp1[1]=$pts[5];
+                    $sp1[2]=$pts[6];  $sp1[3]=$pts[7];
+                    $sp1[4]=$pts[6]+$ssh; $sp1[5]=$pts[7]-$ssv;
+                    $sp1[6]=$pts[4]+$ssh; $sp1[7]=$pts[5]-$ssv;
+
+                    $sp2[0]=$pts[6];  $sp2[1]=$pts[7];
+                    $sp2[2]=$pts[0];  $sp2[3]=$pts[1];
+                    $sp2[4]=$pts[0]+$ssh; $sp2[5]=$pts[1]-$ssv;
+                    $sp2[6]=$pts[6]+$ssh; $sp2[7]=$pts[7]-$ssv;
+                }
+
+                $base_color = $this->fill_color;
+
+                $img->PushColor($base_color . ':0.7');
+                $img->FilledPolygon($sp1);
+                $img->PopColor();
+
+                $img->PushColor($base_color . ':1.1');
+                $img->FilledPolygon($sp2);
+                $img->PopColor();
+            }
+
+            // Stroke the pattern
+            if( is_array($this->iPattern) ) {
+                $f = new RectPatternFactory();
+                if( is_array($this->iPatternColor) ) {
+                    $pcolor = $this->iPatternColor[$i % $np];
+                }
+                else {
+                    $pcolor = $this->iPatternColor;
+                }
+                $prect = $f->Create($this->iPattern[$i % $np],$pcolor,1);
+                $prect->SetDensity($this->iPatternDensity[$i % $np]);
+
+                if( $val < 0 ) {
+                    $rx = $pts[0];
+                    $ry = $pts[1];
+                }
+                else {
+                    $rx = $pts[2];
+                    $ry = $pts[3];
+                }
+                $width = abs($pts[4]-$pts[0])+1;
+                $height = abs($pts[1]-$pts[3])+1;
+                $prect->SetPos(new Rectangle($rx,$ry,$width,$height));
+                $prect->Stroke($img);
+            }
+            else {
+                if( $this->iPattern > -1 ) {
+                    $f = new RectPatternFactory();
+                    $prect = $f->Create($this->iPattern,$this->iPatternColor,1);
+                    $prect->SetDensity($this->iPatternDensity);
+                    if( $val < 0 ) {
+                        $rx = $pts[0];
+                        $ry = $pts[1];
+                    }
+                    else {
+                        $rx = $pts[2];
+                        $ry = $pts[3];
+                    }
+                    $width = abs($pts[4]-$pts[0])+1;
+                    $height = abs($pts[1]-$pts[3])+1;
+                    $prect->SetPos(new Rectangle($rx,$ry,$width,$height));
+                    $prect->Stroke($img);
+                }
+            }
+
+            // Stroke the outline of the bar
+            if( is_array($this->color) ) {
+                $img->SetColor($this->color[$i % count($this->color)]);
+            }
+            else {
+                $img->SetColor($this->color);
+            }
+
+            $pts[] = $pts[0];
+            $pts[] = $pts[1];
+
+            if( $this->weight > 0 ) {
+                $img->SetLineWeight($this->weight);
+                $img->Polygon($pts);
+            }
+
+            // Determine how to best position the values of the individual bars
+            $x=$pts[2]+($pts[4]-$pts[2])/2;
+            $this->value->SetMargin(5);
+
+            if( $this->valuepos=='top' ) {
+                $y=$pts[3];
+                if( $img->a === 90 ) {
+                    if( $val < 0 ) {
+                        $this->value->SetAlign('right','center');
+                    }
+                    else {
+                        $this->value->SetAlign('left','center');
+                    }
+
+                }
+                else {
+                    if( $val < 0 ) {
+                        $this->value->SetMargin(-5);
+                        $y=$pts[1];
+                        $this->value->SetAlign('center','bottom');
+                    }
+                    else {
+                        $this->value->SetAlign('center','bottom');
+                    }
+
+                }
+                $this->value->Stroke($img,$val,$x,$y);
+            }
+            elseif( $this->valuepos=='max' ) {
+                $y=$pts[3];
+                if( $img->a === 90 ) {
+                    if( $val < 0 )
+                    $this->value->SetAlign('left','center');
+                    else
+                    $this->value->SetAlign('right','center');
+                }
+                else {
+                    if( $val < 0 ) {
+                        $this->value->SetAlign('center','bottom');
+                    }
+                    else {
+                        $this->value->SetAlign('center','top');
+                    }
+                }
+                $this->value->SetMargin(-5);
+                $this->value->Stroke($img,$val,$x,$y);
+            }
+            elseif( $this->valuepos=='center' ) {
+                $y = ($pts[3] + $pts[1])/2;
+                $this->value->SetAlign('center','center');
+                $this->value->SetMargin(0);
+                $this->value->Stroke($img,$val,$x,$y);
+            }
+            elseif( $this->valuepos=='bottom' || $this->valuepos=='min' ) {
+                $y=$pts[1];
+                if( $img->a === 90 ) {
+                    if( $val < 0 )
+                    $this->value->SetAlign('right','center');
+                    else
+                    $this->value->SetAlign('left','center');
+                }
+                $this->value->SetMargin(3);
+                $this->value->Stroke($img,$val,$x,$y);
+            }
+            else {
+                JpGraphError::RaiseL(2006,$this->valuepos);
+                //'Unknown position for values on bars :'.$this->valuepos);
+            }
+            // Create the client side image map
+            $rpts = $img->ArrRotate($pts);
+            $csimcoord=round($rpts[0]).", ".round($rpts[1]);
+            for( $j=1; $j < 4; ++$j){
+                $csimcoord .= ", ".round($rpts[2*$j]).", ".round($rpts[2*$j+1]);
+            }
+            if( !empty($this->csimtargets[$i]) ) {
+                $this->csimareas .= '<area shape="poly" coords="'.$csimcoord.'" ';
+                $this->csimareas .= " href=\"".htmlentities($this->csimtargets[$i])."\"";
 
-    return true;
+                if( !empty($this->csimwintargets[$i]) ) {
+                    $this->csimareas .= " target=\"".$this->csimwintargets[$i]."\" ";
+                }
+
+                $sval='';
+                if( !empty($this->csimalts[$i]) ) {
+                    $sval=sprintf($this->csimalts[$i],$this->coords[0][$i]);
+                    $this->csimareas .= " title=\"$sval\" alt=\"$sval\" ";
+                }
+                $this->csimareas .= " />\n";
+            }
+        }
+        return true;
     }
 } // Class
 
@@ -503,96 +676,91 @@ public function Stroke(&$img,&$xscale,&$yscale)
 // CLASS GroupBarPlot
 // Description: Produce grouped bar plots
 //===================================================
-class GroupBarPlot extends BarPlot
-{
-    public $plots;
-    public $width=0.7;
-    public $nbrplots=0;
-    public $numpoints;
-//---------------
-// CONSTRUCTOR
-    public function GroupBarPlot($plots)
-    {
-    $this->plots = $plots;
-    $this->nbrplots = count($plots);
-    if ($this->nbrplots < 1) {
-        JpGraphError::Raise('You must have at least one barplot in the array to be able to create a Grouped Bar Plot.');
-    }
-    $this->numpoints = $plots[0]->numpoints;
-    }
-
-//---------------
-// PUBLIC METHODS
-    public function Legend(&$graph)
-    {
-    $n = count($this->plots);
-    for ($i=0; $i < $n; ++$i) {
-        $c = strtolower(get_class($this->plots[$i]));
-        $sc = is_subclass_of($this->plots[$i],'BarPlot') || is_subclass_of($this->plots[$i],'barplot');
-        if ($c !== 'barplot' && !$sc) {
-        JpGraphError::Raise('One of the objects submitted to GroupBar is not a BarPlot. Make sure that you create the Group Bar plot from an array of BarPlot or AccBarPlot objects. (Class = '.$c.')');
-        }
-        $this->plots[$i]->DoLegend($graph);
-    }
-    }
-
-    public function Min()
-    {
-    list($xmin,$ymin) = $this->plots[0]->Min();
-    $n = count($this->plots);
-    for ($i=0; $i < $n; ++$i) {
-        list($xm,$ym) = $this->plots[$i]->Min();
-        $xmin = max($xmin,$xm);
-        $ymin = min($ymin,$ym);
-    }
-
-    return array($xmin,$ymin);
+class GroupBarPlot extends BarPlot {
+    public $plots; 
+    private $nbrplots=0;
+    //---------------
+    // CONSTRUCTOR
+    function GroupBarPlot($plots) {
+        $this->width=0.7;
+        $this->plots = $plots;
+        $this->nbrplots = count($plots);
+        if( $this->nbrplots < 1 ) {
+            JpGraphError::RaiseL(2007);//('Cannot create GroupBarPlot from empty plot array.');
+        }
+        for($i=0; $i < $this->nbrplots; ++$i ) {
+            if( empty($this->plots[$i]) || !isset($this->plots[$i]) ) {
+                JpGraphError::RaiseL(2008,$i);//("Group bar plot element nbr $i is undefined or empty.");
+            }
+        }
+        $this->numpoints = $plots[0]->numpoints;
+        $this->width=0.7;
     }
 
-    public function Max()
-    {
-    list($xmax,$ymax) = $this->plots[0]->Max();
-    $n = count($this->plots);
-    for ($i=0; $i < $n; ++$i) {
-        list($xm,$ym) = $this->plots[$i]->Max();
-        $xmax = max($xmax,$xm);
-        $ymax = max($ymax,$ym);
+    //---------------
+    // PUBLIC METHODS
+    function Legend($graph) {
+        $n = count($this->plots);
+        for($i=0; $i < $n; ++$i) {
+            $c = get_class($this->plots[$i]);
+            if( !($this->plots[$i] instanceof BarPlot) ) {
+                JpGraphError::RaiseL(2009,$c);
+                //('One of the objects submitted to GroupBar is not a BarPlot. Make sure that you create the Group Bar plot from an array of BarPlot or AccBarPlot objects. (Class = '.$c.')');
+            }
+            $this->plots[$i]->DoLegend($graph);
+        }
     }
 
-    return array($xmax,$ymax);
+    function Min() {
+        list($xmin,$ymin) = $this->plots[0]->Min();
+        $n = count($this->plots);
+        for($i=0; $i < $n; ++$i) {
+            list($xm,$ym) = $this->plots[$i]->Min();
+            $xmin = max($xmin,$xm);
+            $ymin = min($ymin,$ym);
+        }
+        return array($xmin,$ymin);
     }
 
-    public function GetCSIMareas()
-    {
-    $n = count($this->plots);
-    $csimareas='';
-    for ($i=0; $i < $n; ++$i) {
-        $csimareas .= $this->plots[$i]->csimareas;
+    function Max() {
+        list($xmax,$ymax) = $this->plots[0]->Max();
+        $n = count($this->plots);
+        for($i=0; $i < $n; ++$i) {
+            list($xm,$ym) = $this->plots[$i]->Max();
+            $xmax = max($xmax,$xm);
+            $ymax = max($ymax,$ym);
+        }
+        return array($xmax,$ymax);
     }
 
-    return $csimareas;
+    function GetCSIMareas() {
+        $n = count($this->plots);
+        $csimareas='';
+        for($i=0; $i < $n; ++$i) {
+            $csimareas .= $this->plots[$i]->csimareas;
+        }
+        return $csimareas;
     }
 
     // Stroke all the bars next to each other
-    public function Stroke(&$img,&$xscale,&$yscale)
-    {
-    $tmp=$xscale->off;
-    $n = count($this->plots);
-    $subwidth = $this->width/$this->nbrplots ;
-    for ($i=0; $i < $n; ++$i) {
-        $this->plots[$i]->ymin=$this->ybase;
-        $this->plots[$i]->SetWidth($subwidth);
-
-        // If the client have used SetTextTickInterval() then
-        // major_step will be > 1 and the positioning will fail.
-        // If we assume it is always one the positioning will work
-        // fine with a text scale but this will not work with
-        // arbitrary linear scale
-        $xscale->off = $tmp+$i*round(/*$xscale->ticks->major_step* */
-                     $xscale->scale_factor*$subwidth);
-        $this->plots[$i]->Stroke($img,$xscale,$yscale);
-    }
-    $xscale->off=$tmp;
+    function Stroke($img,$xscale,$yscale) {
+        $tmp=$xscale->off;
+        $n = count($this->plots);
+        $subwidth = $this->width/$this->nbrplots ;
+
+        for( $i=0; $i < $n; ++$i ) {
+            $this->plots[$i]->ymin=$this->ybase;
+            $this->plots[$i]->SetWidth($subwidth);
+
+            // If the client have used SetTextTickInterval() then
+            // major_step will be > 1 and the positioning will fail.
+            // If we assume it is always one the positioning will work
+            // fine with a text scale but this will not work with
+            // arbitrary linear scale
+            $xscale->off = $tmp+$i*round($xscale->scale_factor* $subwidth);
+            $this->plots[$i]->Stroke($img,$xscale,$yscale);
+        }
+        $xscale->off=$tmp;
     }
 } // Class
 
@@ -600,322 +768,423 @@ public function Stroke(&$img,&$xscale,&$yscale)
 // CLASS AccBarPlot
 // Description: Produce accumulated bar plots
 //===================================================
-class AccBarPlot extends BarPlot
-{
-    public $plots=null,$nbrplots=0,$numpoints=0;
-//---------------
-// CONSTRUCTOR
-    public function AccBarPlot($plots)
-    {
-    $this->plots = $plots;
-    $this->nbrplots = count($plots);
-    $this->numpoints = $plots[0]->numpoints;
-    $this->value = new DisplayValue();
-    }
+class AccBarPlot extends BarPlot {
+    public $plots=null;
+    private $nbrplots=0;
+    //---------------
+    // CONSTRUCTOR
+    function __construct($plots) {
+        $this->plots = $plots;
+        $this->nbrplots = count($plots);
+        if( $this->nbrplots < 1 ) {
+            JpGraphError::RaiseL(2010);//('Cannot create AccBarPlot from empty plot array.');
+        }
+        for($i=0; $i < $this->nbrplots; ++$i ) {
+            if( empty($this->plots[$i]) || !isset($this->plots[$i]) ) {
+                JpGraphError::RaiseL(2011,$i);//("Acc bar plot element nbr $i is undefined or empty.");
+            }
+        }
 
-//---------------
-// PUBLIC METHODS
-    public function Legend(&$graph)
-    {
-    $n = count($this->plots);
-    for ($i=$n-1; $i >= 0; --$i) {
-        $c = strtolower(get_class($this->plots[$i]));
-        if ($c !== 'barplot') {
-        JpGraphError::Raise('One of the objects submitted to AccBar is not a BarPlot. Make sure that you create the AccBar plot from an array of BarPlot objects.(Class='.$c.')');
-        }
-        $this->plots[$i]->DoLegend($graph);
-    }
-    }
+        // We can only allow individual plost which do not have specified X-positions
+        for($i=0; $i < $this->nbrplots; ++$i ) {
+            if( !empty($this->plots[$i]->coords[1]) ) {
+                JpGraphError::RaiseL(2015);
+                //'Individual bar plots in an AccBarPlot or GroupBarPlot can not have specified X-positions.');
+            }
+        }
+
+        // Use 0 weight by default which means that the individual bar
+        // weights will be used per part n the accumulated bar
+        $this->SetWeight(0);
 
-    public function Max()
-    {
-    list($xmax) = $this->plots[0]->Max();
-    $nmax=0;
-    for ($i=0; $i<count($this->plots); ++$i) {
-        $n = count($this->plots[$i]->coords[0]);
-        $nmax = max($nmax,$n);
-        list($x) = $this->plots[$i]->Max();
-        $xmax = max($xmax,$x);
+        $this->numpoints = $plots[0]->numpoints;
+        $this->value = new DisplayValue();
     }
-    for ($i = 0; $i < $nmax; $i++) {
-        // Get y-value for bar $i by adding the
-        // individual bars from all the plots added.
-        // It would be wrong to just add the
-        // individual plots max y-value since that
-        // would in most cases give to large y-value.
-        $y=0;
-        if( $this->plots[0]->coords[0][$i] > 0 )
-        $y=$this->plots[0]->coords[0][$i];
-        for ($j = 1; $j < $this->nbrplots; $j++) {
-        if( $this->plots[$j]->coords[0][$i] > 0 )
-            $y += $this->plots[$j]->coords[0][$i];
-        }
-        $ymax[$i] = $y;
+
+    //---------------
+    // PUBLIC METHODS
+    function Legend($graph) {
+        $n = count($this->plots);
+        for( $i=$n-1; $i >= 0; --$i ) {
+            $c = get_class($this->plots[$i]);
+            if( !($this->plots[$i] instanceof BarPlot) ) {
+                JpGraphError::RaiseL(2012,$c);
+                //('One of the objects submitted to AccBar is not a BarPlot. Make sure that you create the AccBar plot from an array of BarPlot objects.(Class='.$c.')');
+            }
+            $this->plots[$i]->DoLegend($graph);
+        }
     }
-    $ymax = max($ymax);
 
-    // Bar always start at baseline
-    if( $ymax <= $this->ybase )
-        $ymax = $this->ybase;
+    function Max() {
+        list($xmax) = $this->plots[0]->Max();
+        $nmax=0;
+        for($i=0; $i < count($this->plots); ++$i) {
+            $n = count($this->plots[$i]->coords[0]);
+            $nmax = max($nmax,$n);
+            list($x) = $this->plots[$i]->Max();
+            $xmax = max($xmax,$x);
+        }
+        for( $i = 0; $i < $nmax; $i++ ) {
+            // Get y-value for bar $i by adding the
+            // individual bars from all the plots added.
+            // It would be wrong to just add the
+            // individual plots max y-value since that
+            // would in most cases give to large y-value.
+            $y=0;
+            if( !isset($this->plots[0]->coords[0][$i]) ) {
+                JpGraphError::RaiseL(2014);
+            }
+            if( $this->plots[0]->coords[0][$i] > 0 )
+            $y=$this->plots[0]->coords[0][$i];
+            for( $j = 1; $j < $this->nbrplots; $j++ ) {
+                if( !isset($this->plots[$j]->coords[0][$i]) ) {
+                    JpGraphError::RaiseL(2014);
+                }
+                if( $this->plots[$j]->coords[0][$i] > 0 )
+                $y += $this->plots[$j]->coords[0][$i];
+            }
+            $ymax[$i] = $y;
+        }
+        $ymax = max($ymax);
 
-    return array($xmax,$ymax);
+        // Bar always start at baseline
+        if( $ymax <= $this->ybase )
+        $ymax = $this->ybase;
+        return array($xmax,$ymax);
     }
 
-    public function Min()
-    {
-    $nmax=0;
-    list($xmin,$ysetmin) = $this->plots[0]->Min();
-    for ($i=0; $i<count($this->plots); ++$i) {
-        $n = count($this->plots[$i]->coords[0]);
-        $nmax = max($nmax,$n);
-        list($x,$y) = $this->plots[$i]->Min();
-        $xmin = Min($xmin,$x);
-        $ysetmin = Min($y,$ysetmin);
-    }
-    for ($i = 0; $i < $nmax; $i++) {
-        // Get y-value for bar $i by adding the
-        // individual bars from all the plots added.
-        // It would be wrong to just add the
-        // individual plots max y-value since that
-        // would in most cases give to large y-value.
-        $y=$this->plots[0]->coords[0][$i];
-        for ($j = 1; $j < $this->nbrplots; $j++) {
-        $y += $this->plots[ $j ]->coords[0][$i];
-        }
-        $ymin[$i] = $y;
-    }
-    $ymin = Min($ysetmin,Min($ymin));
-    // Bar always start at baseline
-    if( $ymin >= $this->ybase )
+    function Min() {
+        $nmax=0;
+        list($xmin,$ysetmin) = $this->plots[0]->Min();
+        for($i=0; $i < count($this->plots); ++$i) {
+            $n = count($this->plots[$i]->coords[0]);
+            $nmax = max($nmax,$n);
+            list($x,$y) = $this->plots[$i]->Min();
+            $xmin = Min($xmin,$x);
+            $ysetmin = Min($y,$ysetmin);
+        }
+        for( $i = 0; $i < $nmax; $i++ ) {
+            // Get y-value for bar $i by adding the
+            // individual bars from all the plots added.
+            // It would be wrong to just add the
+            // individual plots max y-value since that
+            // would in most cases give to large y-value.
+            $y=0;
+            if( $this->plots[0]->coords[0][$i] < 0 )
+            $y=$this->plots[0]->coords[0][$i];
+            for( $j = 1; $j < $this->nbrplots; $j++ ) {
+                if( $this->plots[$j]->coords[0][$i] < 0 )
+                $y += $this->plots[ $j ]->coords[0][$i];
+            }
+            $ymin[$i] = $y;
+        }
+        $ymin = Min($ysetmin,Min($ymin));
+        // Bar always start at baseline
+        if( $ymin >= $this->ybase )
         $ymin = $this->ybase;
-
-    return array($xmin,$ymin);
+        return array($xmin,$ymin);
     }
 
     // Stroke acc bar plot
-    public function Stroke(&$img,&$xscale,&$yscale)
-    {
-    $pattern=NULL;
-    $img->SetLineWeight($this->weight);
-    for ($i=0; $i < $this->numpoints-1; $i++) {
-        $accy = 0;
-        $accy_neg = 0;
-        for ($j=0; $j < $this->nbrplots; ++$j) {
-
-        $img->SetColor($this->plots[$j]->color);
-
-        if ($this->plots[$j]->coords[0][$i] >= 0) {
-            $yt=$yscale->Translate($this->plots[$j]->coords[0][$i]+$accy);
-            $accyt=$yscale->Translate($accy);
-            $accy+=$this->plots[$j]->coords[0][$i];
-        } else {
-            //if ($this->plots[$j]->coords[0][$i] < 0 || $accy_neg < 0) {
-            $yt=$yscale->Translate($this->plots[$j]->coords[0][$i]+$accy_neg);
-            $accyt=$yscale->Translate($accy_neg);
-            $accy_neg+=$this->plots[$j]->coords[0][$i];
-        }
-
-        $xt=$xscale->Translate($i);
-
-        if( $this->abswidth > -1 )
-            $abswidth=$this->abswidth;
-        else
-            $abswidth=round($this->width*$xscale->scale_factor,0);
+    function Stroke($img,$xscale,$yscale) {
+        $pattern=NULL;
+        $img->SetLineWeight($this->weight);
+        $grad=null;
+        for($i=0; $i < $this->numpoints-1; $i++) {
+            $accy = 0;
+            $accy_neg = 0;
+            for($j=0; $j < $this->nbrplots; ++$j ) {
+                $img->SetColor($this->plots[$j]->color);
+
+                if ( $this->plots[$j]->coords[0][$i] >= 0) {
+                    $yt=$yscale->Translate($this->plots[$j]->coords[0][$i]+$accy);
+                    $accyt=$yscale->Translate($accy);
+                    $accy+=$this->plots[$j]->coords[0][$i];
+                }
+                else {
+                    //if ( $this->plots[$j]->coords[0][$i] < 0 || $accy_neg < 0 ) {
+                    $yt=$yscale->Translate($this->plots[$j]->coords[0][$i]+$accy_neg);
+                    $accyt=$yscale->Translate($accy_neg);
+                    $accy_neg+=$this->plots[$j]->coords[0][$i];
+                }
 
-        $pts=array($xt,$accyt,$xt,$yt,$xt+$abswidth,$yt,$xt+$abswidth,$accyt);
-
-        if ($this->bar_shadow) {
-            $ssh = $this->bar_shadow_hsize;
-            $ssv = $this->bar_shadow_vsize;
-
-            // We must also differ if we are a positive or negative bar.
-            if ($j === 0) {
-            // This gets extra complicated since we have to
-            // see all plots to see if we are negative. It could
-            // for example be that all plots are 0 until the very
-            // last one. We therefore need to save the initial setup
-            // for both the negative and positive case
-
-            // In case the final bar is positive
-            $sp[0]=$pts[6]+1; $sp[1]=$pts[7];
-            $sp[2]=$pts[6]+$ssh; $sp[3]=$pts[7]-$ssv;
-
-            // In case the final bar is negative
-            $nsp[0]=$pts[0]; $nsp[1]=$pts[1];
-            $nsp[2]=$pts[0]+$ssh; $nsp[3]=$pts[1]-$ssv;
-            $nsp[4]=$pts[6]+$ssh; $nsp[5]=$pts[7]-$ssv;
-            $nsp[10]=$pts[6]+1; $nsp[11]=$pts[7];
-            }
-
-            if ($j === $this->nbrplots-1) {
-            // If this is the last plot of the bar and
-            // the total value is larger than 0 then we
-            // add the shadow.
-            if ( is_array($this->bar_shadow_color) ) {
-                $numcolors = count($this->bar_shadow_color);
-                if ($numcolors == 0) {
-                JpGraphError::Raise('You have specified an empty array for shadow colors in the bar plot.');
-                }
-                $img->PushColor($this->bar_shadow_color[$i % $numcolors]);
-            } else {
-                $img->PushColor($this->bar_shadow_color);
-            }
-
-            if ($accy > 0) {
-                $sp[4]=$pts[4]+$ssh; $sp[5]=$pts[5]-$ssv;
-                $sp[6]=$pts[2]+$ssh; $sp[7]=$pts[3]-$ssv;
-                $sp[8]=$pts[2]; $sp[9]=$pts[3]-1;
-                $sp[10]=$pts[4]+1; $sp[11]=$pts[5];
-                $img->FilledPolygon($sp,4);
-            } elseif ($accy_neg < 0) {
-                $nsp[6]=$pts[4]+$ssh; $nsp[7]=$pts[5]-$ssv;
-                $nsp[8]=$pts[4]+1; $nsp[9]=$pts[5];
-                $img->FilledPolygon($nsp,4);
-            }
-            $img->PopColor();
-            }
-        }
-
-        // If value is NULL or 0, then don't draw a bar at all
-        if ($this->plots[$j]->coords[0][$i] == 0 ) continue;
-
-        if ($this->plots[$j]->grad) {
-            $grad = new Gradient($img);
-            $grad->FilledRectangle(
-            $pts[2],$pts[3],
-            $pts[6],$pts[7],
-            $this->plots[$j]->grad_fromcolor,
-            $this->plots[$j]->grad_tocolor,
-            $this->plots[$j]->grad_style);
-        } else {
-            if (is_array($this->plots[$j]->fill_color) ) {
-            $numcolors = count($this->plots[$j]->fill_color);
-            $img->SetColor($this->plots[$j]->fill_color[$i % $numcolors]);
-            } else {
-            $img->SetColor($this->plots[$j]->fill_color);
-            }
-            $img->FilledPolygon($pts);
-            $img->SetColor($this->plots[$j]->color);
-        }
-
-        // Stroke the pattern
-        if ($this->plots[$j]->iPattern > -1) {
-            if( $pattern===NULL )
-            $pattern = new RectPatternFactory();
-
-            $prect = $pattern->Create($this->plots[$j]->iPattern,$this->plots[$j]->iPatternColor,1);
-            $prect->SetDensity($this->plots[$j]->iPatternDensity);
-            if ($this->plots[$j]->coords[0][$i] < 0) {
-            $rx = $pts[0];
-            $ry = $pts[1];
-            } else {
-            $rx = $pts[2];
-            $ry = $pts[3];
-            }
-            $width = abs($pts[4]-$pts[0])+1;
-            $height = abs($pts[1]-$pts[3])+1;
-            $prect->SetPos(new Rectangle($rx,$ry,$width,$height));
-            $prect->Stroke($img);
-        }
-
-
-        // CSIM array
-
-        if ( $i < count($this->plots[$j]->csimtargets) ) {
-            // Create the client side image map
-            $rpts = $img->ArrRotate($pts);
-            $csimcoord=round($rpts[0]).", ".round($rpts[1]);
-            for ($k=1; $k < 4; ++$k) {
-            $csimcoord .= ", ".round($rpts[2*$k]).", ".round($rpts[2*$k+1]);
-            }
-            if ( ! empty($this->plots[$j]->csimtargets[$i]) ) {
-            $this->csimareas.= '<area shape="poly" coords="'.$csimcoord.'" ';
-            $this->csimareas.= " href=\"".$this->plots[$j]->csimtargets[$i]."\"";
-            if ( !empty($this->plots[$j]->csimalts[$i]) ) {
-                $sval=sprintf($this->plots[$j]->csimalts[$i],$this->plots[$j]->coords[0][$i]);
-                $this->csimareas .= " alt=\"$sval\" title=\"$sval\" ";
-            }
-            $this->csimareas .= ">\n";
-            }
-        }
-
-        $pts[] = $pts[0];
-        $pts[] = $pts[1];
-        $img->Polygon($pts);
-        }
-
-        // Draw labels for each acc.bar
-
-        $x=$pts[2]+($pts[4]-$pts[2])/2;
-        if($this->bar_shadow) $x += $ssh;
-
-        // First stroke the accumulated value for the entire bar
-        // This value is always placed at the top/bottom of the bars
-        if ($accy_neg < 0) {
-        $y=$yscale->Translate($accy_neg);
-        $this->value->Stroke($img,$accy_neg,$x,$y);
-        } else {
-        $y=$yscale->Translate($accy);
-        $this->value->Stroke($img,$accy,$x,$y);
-        }
-
-        $accy = 0;
-        $accy_neg = 0;
-        for ($j=0; $j < $this->nbrplots; ++$j) {
-
-        // We don't print 0 values in an accumulated bar plot
-        if( $this->plots[$j]->coords[0][$i] == 0 ) continue;
-
-        if ($this->plots[$j]->coords[0][$i] > 0) {
-            $yt=$yscale->Translate($this->plots[$j]->coords[0][$i]+$accy);
-            $accyt=$yscale->Translate($accy);
-            if ($this->plots[$j]->valuepos=='center') {
-            $y = $accyt-($accyt-$yt)/2;
-            } elseif ($this->plots[$j]->valuepos=='bottom') {
-            $y = $accyt;
-            } else { // top or max
-            $y = $accyt-($accyt-$yt);
-            }
-            $accy+=$this->plots[$j]->coords[0][$i];
-            if ($this->plots[$j]->valuepos=='center') {
-            $this->plots[$j]->value->SetAlign("center","center");
-            $this->plots[$j]->value->SetMargin(0);
-            } elseif ($this->plots[$j]->valuepos=='bottom') {
-            $this->plots[$j]->value->SetAlign('center','bottom');
-            $this->plots[$j]->value->SetMargin(2);
-            } else {
-            $this->plots[$j]->value->SetAlign('center','top');
-            $this->plots[$j]->value->SetMargin(1);
-            }
-        } else {
-            $yt=$yscale->Translate($this->plots[$j]->coords[0][$i]+$accy_neg);
-            $accyt=$yscale->Translate($accy_neg);
-            $accy_neg+=$this->plots[$j]->coords[0][$i];
-            if ($this->plots[$j]->valuepos=='center') {
-            $y = $accyt-($accyt-$yt)/2;
-            } elseif ($this->plots[$j]->valuepos=='bottom') {
-            $y = $accyt;
-            } else {
-            $y = $accyt-($accyt-$yt);
-            }
-            if ($this->plots[$j]->valuepos=='center') {
-            $this->plots[$j]->value->SetAlign("center","center");
-            $this->plots[$j]->value->SetMargin(0);
-            } elseif ($this->plots[$j]->valuepos=='bottom') {
-            $this->plots[$j]->value->SetAlign('center',$j==0 ? 'bottom':'top');
-            $this->plots[$j]->value->SetMargin(-2);
-            } else {
-            $this->plots[$j]->value->SetAlign('center','bottom');
-            $this->plots[$j]->value->SetMargin(-1);
-            }
-        }
-        $this->plots[$j]->value->Stroke($img,$this->plots[$j]->coords[0][$i],$x,$y);
-        }
+                $xt=$xscale->Translate($i);
 
-    }
+                if( $this->abswidth > -1 ) {
+                    $abswidth=$this->abswidth;
+                }
+                else {
+                    $abswidth=round($this->width*$xscale->scale_factor,0);
+                }
+
+                $pts=array($xt,$accyt,$xt,$yt,$xt+$abswidth,$yt,$xt+$abswidth,$accyt);
+
+                if( $this->bar_shadow ) {
+                    $ssh = $this->bar_shadow_hsize;
+                    $ssv = $this->bar_shadow_vsize;
+
+                    // We must also differ if we are a positive or negative bar.
+                    if( $j === 0 ) {
+                        // This gets extra complicated since we have to
+                        // see all plots to see if we are negative. It could
+                        // for example be that all plots are 0 until the very
+                        // last one. We therefore need to save the initial setup
+                        // for both the negative and positive case
+
+                        // In case the final bar is positive
+                        $sp[0]=$pts[6]+1; $sp[1]=$pts[7];
+                        $sp[2]=$pts[6]+$ssh; $sp[3]=$pts[7]-$ssv;
+
+                        // In case the final bar is negative
+                        $nsp[0]=$pts[0]; $nsp[1]=$pts[1];
+                        $nsp[2]=$pts[0]+$ssh; $nsp[3]=$pts[1]-$ssv;
+                        $nsp[4]=$pts[6]+$ssh; $nsp[5]=$pts[7]-$ssv;
+                        $nsp[10]=$pts[6]+1; $nsp[11]=$pts[7];
+                    }
+
+                    if( $j === $this->nbrplots-1 ) {
+                        // If this is the last plot of the bar and
+                        // the total value is larger than 0 then we
+                        // add the shadow.
+                        if( is_array($this->bar_shadow_color) ) {
+                            $numcolors = count($this->bar_shadow_color);
+                            if( $numcolors == 0 ) {
+                                JpGraphError::RaiseL(2013);//('You have specified an empty array for shadow colors in the bar plot.');
+                            }
+                            $img->PushColor($this->bar_shadow_color[$i % $numcolors]);
+                        }
+                        else {
+                            $img->PushColor($this->bar_shadow_color);
+                        }
+
+                        if( $accy > 0 ) {
+                            $sp[4]=$pts[4]+$ssh; $sp[5]=$pts[5]-$ssv;
+                            $sp[6]=$pts[2]+$ssh; $sp[7]=$pts[3]-$ssv;
+                            $sp[8]=$pts[2]; $sp[9]=$pts[3]-1;
+                            $sp[10]=$pts[4]+1; $sp[11]=$pts[5];
+                            $img->FilledPolygon($sp,4);
+                        }
+                        elseif( $accy_neg < 0 ) {
+                            $nsp[6]=$pts[4]+$ssh; $nsp[7]=$pts[5]-$ssv;
+                            $nsp[8]=$pts[4]+1; $nsp[9]=$pts[5];
+                            $img->FilledPolygon($nsp,4);
+                        }
+                        $img->PopColor();
+                    }
+                }
+
+
+                // If value is NULL or 0, then don't draw a bar at all
+                if ($this->plots[$j]->coords[0][$i] == 0 ) continue;
+
+                if( $this->plots[$j]->grad ) {
+                    if( $grad === null ) {
+                        $grad = new Gradient($img);
+                    }
+                    if( is_array($this->plots[$j]->grad_fromcolor) ) {
+                        // The first argument (grad_fromcolor) can be either an array or a single color. If it is an array
+                        // then we have two choices. It can either a) be a single color specified as an RGB triple or it can be
+                        // an array to specify both (from, to style) for each individual bar. The way to know the difference is
+                        // to investgate the first element. If this element is an integer [0,255] then we assume it is an RGB
+                        // triple.
+                        $ng = count($this->plots[$j]->grad_fromcolor);
+                        if( $ng === 3 ) {
+                            if( is_numeric($this->plots[$j]->grad_fromcolor[0]) && $this->plots[$j]->grad_fromcolor[0] > 0 &&
+                                 $this->plots[$j]->grad_fromcolor[0] < 256 ) {
+                                // RGB Triple
+                                $fromcolor = $this->plots[$j]->grad_fromcolor;
+                                $tocolor = $this->plots[$j]->grad_tocolor;
+                                $style = $this->plots[$j]->grad_style;
+                            }
+                            else {
+                                $fromcolor = $this->plots[$j]->grad_fromcolor[$i % $ng][0];
+                                $tocolor = $this->plots[$j]->grad_fromcolor[$i % $ng][1];
+                                $style = $this->plots[$j]->grad_fromcolor[$i % $ng][2];
+                            }
+                        }
+                        else {
+                            $fromcolor = $this->plots[$j]->grad_fromcolor[$i % $ng][0];
+                            $tocolor = $this->plots[$j]->grad_fromcolor[$i % $ng][1];
+                            $style = $this->plots[$j]->grad_fromcolor[$i % $ng][2];
+                        }
+                        $grad->FilledRectangle($pts[2],$pts[3],
+                                               $pts[6],$pts[7],
+                                               $fromcolor,$tocolor,$style);
+                    }
+                    else {
+                        $grad->FilledRectangle($pts[2],$pts[3],
+                                               $pts[6],$pts[7],
+                                               $this->plots[$j]->grad_fromcolor,
+                                               $this->plots[$j]->grad_tocolor,
+                                               $this->plots[$j]->grad_style);
+                    }
+                } else {
+                    if (is_array($this->plots[$j]->fill_color) ) {
+                        $numcolors = count($this->plots[$j]->fill_color);
+                        $fillcolor = $this->plots[$j]->fill_color[$i % $numcolors];
+                        // If the bar is specified to be non filled then the fill color is false
+                        if( $fillcolor !== false ) {
+                            $img->SetColor($this->plots[$j]->fill_color[$i % $numcolors]);
+                        }
+                    }
+                    else {
+                        $fillcolor = $this->plots[$j]->fill_color;
+                        if( $fillcolor !== false ) {
+                            $img->SetColor($this->plots[$j]->fill_color);
+                        }
+                    }
+                    if( $fillcolor !== false ) {
+                        $img->FilledPolygon($pts);
+                    }
+                }
 
-    return true;
+                $img->SetColor($this->plots[$j]->color);
+
+                // Stroke the pattern
+                if( $this->plots[$j]->iPattern > -1 ) {
+                    if( $pattern===NULL ) {
+                        $pattern = new RectPatternFactory();
+                    }
+
+                    $prect = $pattern->Create($this->plots[$j]->iPattern,$this->plots[$j]->iPatternColor,1);
+                    $prect->SetDensity($this->plots[$j]->iPatternDensity);
+                    if( $this->plots[$j]->coords[0][$i] < 0 ) {
+                        $rx = $pts[0];
+                        $ry = $pts[1];
+                    }
+                    else {
+                        $rx = $pts[2];
+                        $ry = $pts[3];
+                    }
+                    $width = abs($pts[4]-$pts[0])+1;
+                    $height = abs($pts[1]-$pts[3])+1;
+                    $prect->SetPos(new Rectangle($rx,$ry,$width,$height));
+                    $prect->Stroke($img);
+                }
+
+
+                // CSIM array
+
+                if( $i < count($this->plots[$j]->csimtargets) ) {
+                    // Create the client side image map
+                    $rpts = $img->ArrRotate($pts);
+                    $csimcoord=round($rpts[0]).", ".round($rpts[1]);
+                    for( $k=1; $k < 4; ++$k){
+                        $csimcoord .= ", ".round($rpts[2*$k]).", ".round($rpts[2*$k+1]);
+                    }
+                    if( ! empty($this->plots[$j]->csimtargets[$i]) ) {
+                        $this->csimareas.= '<area shape="poly" coords="'.$csimcoord.'" ';
+                        $this->csimareas.= " href=\"".$this->plots[$j]->csimtargets[$i]."\" ";
+
+                        if( ! empty($this->plots[$j]->csimwintargets[$i]) ) {
+                            $this->csimareas.= " target=\"".$this->plots[$j]->csimwintargets[$i]."\" ";
+                        }
+
+                        $sval='';
+                        if( !empty($this->plots[$j]->csimalts[$i]) ) {
+                            $sval=sprintf($this->plots[$j]->csimalts[$i],$this->plots[$j]->coords[0][$i]);
+                            $this->csimareas .= " title=\"$sval\" ";
+                        }
+                        $this->csimareas .= " alt=\"$sval\" />\n";
+                    }
+                }
+
+                $pts[] = $pts[0];
+                $pts[] = $pts[1];
+                $img->SetLineWeight($this->plots[$j]->weight);
+                $img->Polygon($pts);
+                $img->SetLineWeight(1);
+            }
+
+            // Daw potential bar around the entire accbar bar
+            if( $this->weight > 0 ) {
+                $y=$yscale->Translate(0);
+                $img->SetColor($this->color);
+                $img->SetLineWeight($this->weight);
+                $img->Rectangle($pts[0],$y,$pts[6],$pts[5]);
+            }
+
+            // Draw labels for each acc.bar
+
+            $x=$pts[2]+($pts[4]-$pts[2])/2;
+            if($this->bar_shadow) $x += $ssh;
+
+            // First stroke the accumulated value for the entire bar
+            // This value is always placed at the top/bottom of the bars
+            if( $accy_neg < 0 ) {
+                $y=$yscale->Translate($accy_neg);
+                $this->value->Stroke($img,$accy_neg,$x,$y);
+            }
+            else {
+                $y=$yscale->Translate($accy);
+                $this->value->Stroke($img,$accy,$x,$y);
+            }
+
+            $accy = 0;
+            $accy_neg = 0;
+            for($j=0; $j < $this->nbrplots; ++$j ) {
+
+                // We don't print 0 values in an accumulated bar plot
+                if( $this->plots[$j]->coords[0][$i] == 0 ) continue;
+
+                if ($this->plots[$j]->coords[0][$i] > 0) {
+                    $yt=$yscale->Translate($this->plots[$j]->coords[0][$i]+$accy);
+                    $accyt=$yscale->Translate($accy);
+                    if(  $this->plots[$j]->valuepos=='center' ) {
+                        $y = $accyt-($accyt-$yt)/2;
+                    }
+                    elseif( $this->plots[$j]->valuepos=='bottom' ) {
+                        $y = $accyt;
+                    }
+                    else { // top or max
+                        $y = $accyt-($accyt-$yt);
+                    }
+                    $accy+=$this->plots[$j]->coords[0][$i];
+                    if(  $this->plots[$j]->valuepos=='center' ) {
+                        $this->plots[$j]->value->SetAlign("center","center");
+                        $this->plots[$j]->value->SetMargin(0);
+                    }
+                    elseif( $this->plots[$j]->valuepos=='bottom' ) {
+                        $this->plots[$j]->value->SetAlign('center','bottom');
+                        $this->plots[$j]->value->SetMargin(2);
+                    }
+                    else {
+                        $this->plots[$j]->value->SetAlign('center','top');
+                        $this->plots[$j]->value->SetMargin(1);
+                    }
+                } else {
+                    $yt=$yscale->Translate($this->plots[$j]->coords[0][$i]+$accy_neg);
+                    $accyt=$yscale->Translate($accy_neg);
+                    $accy_neg+=$this->plots[$j]->coords[0][$i];
+                    if(  $this->plots[$j]->valuepos=='center' ) {
+                        $y = $accyt-($accyt-$yt)/2;
+                    }
+                    elseif( $this->plots[$j]->valuepos=='bottom' ) {
+                        $y = $accyt;
+                    }
+                    else {
+                        $y = $accyt-($accyt-$yt);
+                    }
+                    if(  $this->plots[$j]->valuepos=='center' ) {
+                        $this->plots[$j]->value->SetAlign("center","center");
+                        $this->plots[$j]->value->SetMargin(0);
+                    }
+                    elseif( $this->plots[$j]->valuepos=='bottom' ) {
+                        $this->plots[$j]->value->SetAlign('center',$j==0 ? 'bottom':'top');
+                        $this->plots[$j]->value->SetMargin(-2);
+                    }
+                    else {
+                        $this->plots[$j]->value->SetAlign('center','bottom');
+                        $this->plots[$j]->value->SetMargin(-1);
+                    }
+                }
+                $this->plots[$j]->value->Stroke($img,$this->plots[$j]->coords[0][$i],$x,$y);
+            }
+
+        }
+        return true;
     }
 } // Class
 
 /* EOF */
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_canvas.php b/common/lib/jpgraph_lib/jpgraph_canvas.php
old mode 100644
new mode 100755
index be4c555d1..f94295132
--- a/common/lib/jpgraph_lib/jpgraph_canvas.php
+++ b/common/lib/jpgraph_lib/jpgraph_canvas.php
@@ -1,15 +1,13 @@
 <?php
 /*=======================================================================
-// File: 	JPGRAPH_CANVAS.PHP
-// Description:	Canvas drawing extension for JpGraph
-// Created: 	2001-01-08
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_canvas.php,v 1.12.2.2 2004/12/11 14:41:11 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2001,2002 Johan Persson
-//========================================================================
-*/
+ // File:        JPGRAPH_CANVAS.PHP
+ // Description: Canvas drawing extension for JpGraph
+ // Created:     2001-01-08
+ // Ver:         $Id: jpgraph_canvas.php 1923 2010-01-11 13:48:49Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
 
 //===================================================
 // CLASS CanvasGraph
@@ -19,57 +17,79 @@
 // graphic which benefits from all the functionality in the
 // graph liek caching for example.
 //===================================================
-class CanvasGraph extends Graph
-{
-//---------------
-// CONSTRUCTOR
-    public function CanvasGraph($aWidth=300,$aHeight=200,$aCachedName="",$timeout=0,$inline=1)
-    {
-    $this->Graph($aWidth,$aHeight,$aCachedName,$timeout,$inline);
+class CanvasGraph extends Graph {
+    //---------------
+    // CONSTRUCTOR
+    function __construct($aWidth=300,$aHeight=200,$aCachedName="",$timeout=0,$inline=1) {
+        parent::__construct($aWidth,$aHeight,$aCachedName,$timeout,$inline);
     }
 
-//---------------
-// PUBLIC METHODS
+    //---------------
+    // PUBLIC METHODS
 
-    public function InitFrame()
-    {
-    $this->StrokePlotArea();
+    function InitFrame() {
+        $this->StrokePlotArea();
     }
 
     // Method description
-    public function Stroke($aStrokeFileName="")
-    {
-    if ($this->texts != null) {
-        for ($i=0; $i<count($this->texts); ++$i) {
-        $this->texts[$i]->Stroke($this->img);
+    function Stroke($aStrokeFileName="") {
+        if( $this->texts != null ) {
+            for($i=0; $i < count($this->texts); ++$i) {
+                $this->texts[$i]->Stroke($this->img);
+            }
         }
-    }
-    $this->StrokeTitles();
-
-    // Should we do any final image transformation
-    if ($this->iImgTrans) {
-        if ( !class_exists('ImgTrans') ) {
-        require_once 'jpgraph_imgtrans.php';
+        if( $this->iTables !== null ) {
+            for($i=0; $i < count($this->iTables); ++$i) {
+                $this->iTables[$i]->Stroke($this->img);
+            }
         }
+        $this->StrokeTitles();
 
-        $tform = new ImgTrans($this->img->img);
-        $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
-                         $this->iImgTransDirection,$this->iImgTransHighQ,
-                         $this->iImgTransMinSize,$this->iImgTransFillColor,
-                         $this->iImgTransBorder);
-    }
+        // If the filename is the predefined value = '_csim_special_'
+        // we assume that the call to stroke only needs to do enough
+        // to correctly generate the CSIM maps.
+        // We use this variable to skip things we don't strictly need
+        // to do to generate the image map to improve performance
+        // a best we can. Therefor you will see a lot of tests !$_csim in the
+        // code below.
+        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
 
-    // If the filename is given as the special _IMG_HANDLER
-    // then the image handler is returned and the image is NOT
-    // streamed back
-    if ($aStrokeFileName == _IMG_HANDLER) {
-        return $this->img->img;
-    } else {
-        // Finally stream the generated picture
-        $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,$aStrokeFileName);
+        // We need to know if we have stroked the plot in the
+        // GetCSIMareas. Otherwise the CSIM hasn't been generated
+        // and in the case of GetCSIM called before stroke to generate
+        // CSIM without storing an image to disk GetCSIM must call Stroke.
+        $this->iHasStroked = true;
 
-        return true;
-    }
+        if( !$_csim ) {
+
+            // Should we do any final image transformation
+            if( $this->iImgTrans ) {
+                if( !class_exists('ImgTrans',false) ) {
+                    require_once('jpgraph_imgtrans.php');
+                }
+
+                $tform = new ImgTrans($this->img->img);
+                $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
+                $this->iImgTransDirection,$this->iImgTransHighQ,
+                $this->iImgTransMinSize,$this->iImgTransFillColor,
+                $this->iImgTransBorder);
+            }
+
+
+            // If the filename is given as the special _IMG_HANDLER
+            // then the image handler is returned and the image is NOT
+            // streamed back
+            if( $aStrokeFileName == _IMG_HANDLER ) {
+                return $this->img->img;
+            }
+            else {
+                // Finally stream the generated picture
+                $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,$aStrokeFileName);
+                return true;
+            }
+        }
     }
 } // Class
+
 /* EOF */
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_canvtools.php b/common/lib/jpgraph_lib/jpgraph_canvtools.php
old mode 100644
new mode 100755
index d6d1c8318..2290a5bcd
--- a/common/lib/jpgraph_lib/jpgraph_canvtools.php
+++ b/common/lib/jpgraph_lib/jpgraph_canvtools.php
@@ -1,20 +1,19 @@
 <?php
 /*=======================================================================
-// File: 	JPGRAPH_CANVTOOLS.PHP
-// Description:	Some utilities for text and shape drawing on a canvas
-// Created: 	2002-08-23
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_canvtools.php,v 1.9 2002/12/01 10:00:40 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2001,2002 Johan Persson
-//========================================================================
-*/
-
-DEFINE('CORNER_TOPLEFT',0);
-DEFINE('CORNER_TOPRIGHT',1);
-DEFINE('CORNER_BOTTOMRIGHT',2);
-DEFINE('CORNER_BOTTOMLEFT',3);
+ // File:        JPGRAPH_CANVTOOLS.PHP
+ // Description: Some utilities for text and shape drawing on a canvas
+ // Created:     2002-08-23
+ // Ver:         $Id: jpgraph_canvtools.php 1857 2009-09-28 14:38:14Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+
+define('CORNER_TOPLEFT',0);
+define('CORNER_TOPRIGHT',1);
+define('CORNER_BOTTOMRIGHT',2);
+define('CORNER_BOTTOMLEFT',3);
+
 
 //===================================================
 // CLASS CanvasScale
@@ -22,526 +21,503 @@
 // can abstract away with absolute pixels
 //===================================================
 
-class CanvasScale
-{
-    public $g;
-    public $w,$h;
-    public $ixmin=0,$ixmax=10,$iymin=0,$iymax=10;
+class CanvasScale {
+    private $g;
+    private $w,$h;
+    private $ixmin=0,$ixmax=10,$iymin=0,$iymax=10;
 
-    public function CanvasScale(&$graph,$xmin=0,$xmax=10,$ymin=0,$ymax=10)
-    {
-    $this->g = &$graph;
-    $this->w = $graph->img->width;
-    $this->h = $graph->img->height;
-    $this->ixmin = $xmin;
-    $this->ixmax = $xmax;
-    $this->iymin = $ymin;
-    $this->iymax = $ymax;
+    function __construct($graph,$xmin=0,$xmax=10,$ymin=0,$ymax=10) {
+        $this->g = $graph;
+        $this->w = $graph->img->width;
+        $this->h = $graph->img->height;
+        $this->ixmin = $xmin;
+        $this->ixmax = $xmax;
+        $this->iymin = $ymin;
+        $this->iymax = $ymax;
     }
 
-    public function Set($xmin=0,$xmax=10,$ymin=0,$ymax=10)
-    {
-    $this->ixmin = $xmin;
-    $this->ixmax = $xmax;
-    $this->iymin = $ymin;
-    $this->iymax = $ymax;
+    function Set($xmin=0,$xmax=10,$ymin=0,$ymax=10) {
+        $this->ixmin = $xmin;
+        $this->ixmax = $xmax;
+        $this->iymin = $ymin;
+        $this->iymax = $ymax;
     }
 
-    public function Translate($x,$y)
-    {
-    $xp = round(($x-$this->ixmin)/($this->ixmax - $this->ixmin) * $this->w);
-    $yp = round(($y-$this->iymin)/($this->iymax - $this->iymin) * $this->h);
-
-    return array($xp,$yp);
+    function Get() {
+        return array($this->ixmin,$this->ixmax,$this->iymin,$this->iymax);
     }
 
-    public function TranslateX($x)
-    {
-    $xp = round(($x-$this->ixmin)/($this->ixmax - $this->ixmin) * $this->w);
-
-    return $xp;
+    function Translate($x,$y) {
+        $xp = round(($x-$this->ixmin)/($this->ixmax - $this->ixmin) * $this->w);
+        $yp = round(($y-$this->iymin)/($this->iymax - $this->iymin) * $this->h);
+        return array($xp,$yp);
     }
 
-    public function TranslateY($y)
-    {
-    $yp = round(($y-$this->iymin)/($this->iymax - $this->iymin) * $this->h);
+    function TranslateX($x) {
+        $xp = round(($x-$this->ixmin)/($this->ixmax - $this->ixmin) * $this->w);
+        return $xp;
+    }
 
-    return $yp;
+    function TranslateY($y) {
+        $yp = round(($y-$this->iymin)/($this->iymax - $this->iymin) * $this->h);
+        return $yp;
     }
 
 }
 
+
 //===================================================
 // CLASS Shape
 // Description: Methods to draw shapes on canvas
 //===================================================
-class Shape
-{
-    public $img,$scale;
+class Shape {
+    private $img,$scale;
 
-    public function Shape(&$aGraph,&$scale)
-    {
-    $this->img = &$aGraph->img;
-    $this->img->SetColor('black');
-    $this->scale = &$scale;
+    function __construct($aGraph,$scale) {
+        $this->img = $aGraph->img;
+        $this->img->SetColor('black');
+        $this->scale = $scale;
     }
 
-    public function SetColor($aColor)
-    {
-    $this->img->SetColor($aColor);
+    function SetColor($aColor) {
+        $this->img->SetColor($aColor);
     }
 
-    public function Line($x1,$y1,$x2,$y2)
-    {
-    list($x1,$y1) = $this->scale->Translate($x1,$y1);
-    list($x2,$y2) = $this->scale->Translate($x2,$y2);
-    $this->img->Line($x1,$y1,$x2,$y2);
+    function Line($x1,$y1,$x2,$y2) {
+        list($x1,$y1) = $this->scale->Translate($x1,$y1);
+        list($x2,$y2) = $this->scale->Translate($x2,$y2);
+        $this->img->Line($x1,$y1,$x2,$y2);
     }
 
-    public function Polygon($p,$aClosed=false)
-    {
-    $n=count($p);
-    for ($i=0; $i < $n; $i+=2) {
-       $p[$i]   = $this->scale->TranslateX($p[$i]);
-       $p[$i+1] = $this->scale->TranslateY($p[$i+1]);
-    }
-    $this->img->Polygon($p,$aClosed);
+    function SetLineWeight($aWeight) {
+        $this->img->SetLineWeight($aWeight);
     }
 
-    public function FilledPolygon($p)
-    {
-    $n=count($p);
-    for ($i=0; $i < $n; $i+=2) {
-       $p[$i]   = $this->scale->TranslateX($p[$i]);
-       $p[$i+1] = $this->scale->TranslateY($p[$i+1]);
+    function Polygon($p,$aClosed=false) {
+        $n=count($p);
+        for($i=0; $i < $n; $i+=2 ) {
+            $p[$i]   = $this->scale->TranslateX($p[$i]);
+            $p[$i+1] = $this->scale->TranslateY($p[$i+1]);
+        }
+        $this->img->Polygon($p,$aClosed);
     }
-    $this->img->FilledPolygon($p);
+
+    function FilledPolygon($p) {
+        $n=count($p);
+        for($i=0; $i < $n; $i+=2 ) {
+            $p[$i]   = $this->scale->TranslateX($p[$i]);
+            $p[$i+1] = $this->scale->TranslateY($p[$i+1]);
+        }
+        $this->img->FilledPolygon($p);
     }
 
+
     // Draw a bezier curve with defining points in the $aPnts array
     // using $aSteps steps.
     // 0=x0, 1=y0
     // 2=x1, 3=y1
     // 4=x2, 5=y2
     // 6=x3, 7=y3
-    public function Bezier($p,$aSteps=40)
-    {
-    $x0 = $p[0];
-    $y0 = $p[1];
-    // Calculate coefficients
-    $cx = 3*($p[2]-$p[0]);
-    $bx = 3*($p[4]-$p[2])-$cx;
-    $ax = $p[6]-$p[0]-$cx-$bx;
-    $cy = 3*($p[3]-$p[1]);
-    $by = 3*($p[5]-$p[3])-$cy;
-    $ay = $p[7]-$p[1]-$cy-$by;
-
-    // Step size
-    $delta = 1.0/$aSteps;
-
-    $x_old = $x0;
-    $y_old = $y0;
-    for ($t=$delta; $t<=1.0; $t+=$delta) {
-        $tt = $t*$t; $ttt=$tt*$t;
-        $x  = $ax*$ttt + $bx*$tt + $cx*$t + $x0;
-        $y = $ay*$ttt + $by*$tt + $cy*$t + $y0;
-        $this->Line($x_old,$y_old,$x,$y);
-        $x_old = $x;
-        $y_old = $y;
-    }
-    $this->Line($x_old,$y_old,$p[6],$p[7]);
-    }
-
-    public function Rectangle($x1,$y1,$x2,$y2)
-    {
-    list($x1,$y1) = $this->scale->Translate($x1,$y1);
-    list($x2,$y2)   = $this->scale->Translate($x2,$y2);
-    $this->img->Rectangle($x1,$y1,$x2,$y2);
-    }
-
-    public function FilledRectangle($x1,$y1,$x2,$y2)
-    {
-    list($x1,$y1) = $this->scale->Translate($x1,$y1);
-    list($x2,$y2)   = $this->scale->Translate($x2,$y2);
-    $this->img->FilledRectangle($x1,$y1,$x2,$y2);
-    }
-
-    public function Circle($x1,$y1,$r)
-    {
-    list($x1,$y1) = $this->scale->Translate($x1,$y1);
-    if( $r >= 0 )
+    function Bezier($p,$aSteps=40) {
+        $x0 = $p[0];
+        $y0 = $p[1];
+        // Calculate coefficients
+        $cx = 3*($p[2]-$p[0]);
+        $bx = 3*($p[4]-$p[2])-$cx;
+        $ax = $p[6]-$p[0]-$cx-$bx;
+        $cy = 3*($p[3]-$p[1]);
+        $by = 3*($p[5]-$p[3])-$cy;
+        $ay = $p[7]-$p[1]-$cy-$by;
+
+        // Step size
+        $delta = 1.0/$aSteps;
+
+        $x_old = $x0;
+        $y_old = $y0;
+        for($t=$delta; $t<=1.0; $t+=$delta) {
+            $tt = $t*$t; $ttt=$tt*$t;
+            $x  = $ax*$ttt + $bx*$tt + $cx*$t + $x0;
+            $y = $ay*$ttt + $by*$tt + $cy*$t + $y0;
+            $this->Line($x_old,$y_old,$x,$y);
+            $x_old = $x;
+            $y_old = $y;
+        }
+        $this->Line($x_old,$y_old,$p[6],$p[7]);
+    }
+
+    function Rectangle($x1,$y1,$x2,$y2) {
+        list($x1,$y1) = $this->scale->Translate($x1,$y1);
+        list($x2,$y2)   = $this->scale->Translate($x2,$y2);
+        $this->img->Rectangle($x1,$y1,$x2,$y2);
+    }
+
+    function FilledRectangle($x1,$y1,$x2,$y2) {
+        list($x1,$y1) = $this->scale->Translate($x1,$y1);
+        list($x2,$y2)   = $this->scale->Translate($x2,$y2);
+        $this->img->FilledRectangle($x1,$y1,$x2,$y2);
+    }
+
+    function Circle($x1,$y1,$r) {
+        list($x1,$y1) = $this->scale->Translate($x1,$y1);
+        if( $r >= 0 )
         $r   = $this->scale->TranslateX($r);
-    else
+        else
         $r = -$r;
-    $this->img->Circle($x1,$y1,$r);
+        $this->img->Circle($x1,$y1,$r);
     }
 
-    public function FilledCircle($x1,$y1,$r)
-    {
-    list($x1,$y1) = $this->scale->Translate($x1,$y1);
-    if( $r >= 0 )
+    function FilledCircle($x1,$y1,$r) {
+        list($x1,$y1) = $this->scale->Translate($x1,$y1);
+        if( $r >= 0 )
         $r   = $this->scale->TranslateX($r);
-    else
+        else
         $r = -$r;
-    $this->img->FilledCircle($x1,$y1,$r);
+        $this->img->FilledCircle($x1,$y1,$r);
     }
 
-    public function RoundedRectangle($x1,$y1,$x2,$y2,$r=null)
-    {
-    list($x1,$y1) = $this->scale->Translate($x1,$y1);
-    list($x2,$y2)   = $this->scale->Translate($x2,$y2);
+    function RoundedRectangle($x1,$y1,$x2,$y2,$r=null) {
+        list($x1,$y1) = $this->scale->Translate($x1,$y1);
+        list($x2,$y2)   = $this->scale->Translate($x2,$y2);
 
-    if( $r == null )
+        if( $r == null )
         $r = 5;
-    elseif( $r >= 0 )
+        elseif( $r >= 0 )
         $r = $this->scale->TranslateX($r);
-    else
+        else
         $r = -$r;
-    $this->img->RoundedRectangle($x1,$y1,$x2,$y2,$r);
+        $this->img->RoundedRectangle($x1,$y1,$x2,$y2,$r);
     }
 
-    public function FilledRoundedRectangle($x1,$y1,$x2,$y2,$r=null)
-    {
-    list($x1,$y1) = $this->scale->Translate($x1,$y1);
-    list($x2,$y2)   = $this->scale->Translate($x2,$y2);
+    function FilledRoundedRectangle($x1,$y1,$x2,$y2,$r=null) {
+        list($x1,$y1) = $this->scale->Translate($x1,$y1);
+        list($x2,$y2)   = $this->scale->Translate($x2,$y2);
 
-    if( $r == null )
+        if( $r == null )
         $r = 5;
-    elseif( $r > 0 )
+        elseif( $r > 0 )
         $r = $this->scale->TranslateX($r);
-    else
+        else
         $r = -$r;
-    $this->img->FilledRoundedRectangle($x1,$y1,$x2,$y2,$r);
+        $this->img->FilledRoundedRectangle($x1,$y1,$x2,$y2,$r);
     }
 
-    public function ShadowRectangle($x1,$y1,$x2,$y2,$fcolor=false,$shadow_width=null,$shadow_color=array(102,102,102))
-    {
-    list($x1,$y1) = $this->scale->Translate($x1,$y1);
-    list($x2,$y2) = $this->scale->Translate($x2,$y2);
-    if( $shadow_width == null )
+    function ShadowRectangle($x1,$y1,$x2,$y2,$fcolor=false,$shadow_width=null,$shadow_color=array(102,102,102)) {
+        list($x1,$y1) = $this->scale->Translate($x1,$y1);
+        list($x2,$y2) = $this->scale->Translate($x2,$y2);
+        if( $shadow_width == null )
         $shadow_width=4;
-    else
+        else
         $shadow_width=$this->scale->TranslateX($shadow_width);
-    $this->img->ShadowRectangle($x1,$y1,$x2,$y2,$fcolor,$shadow_width,$shadow_color);
+        $this->img->ShadowRectangle($x1,$y1,$x2,$y2,$fcolor,$shadow_width,$shadow_color);
     }
 
-    public function SetTextAlign($halign,$valign="bottom")
-    {
-    $this->img->SetTextAlign($halign,$valign="bottom");
+    function SetTextAlign($halign,$valign="bottom") {
+        $this->img->SetTextAlign($halign,$valign="bottom");
     }
 
-    public function StrokeText($x1,$y1,$txt,$dir=0,$paragraph_align="left")
-    {
-    list($x1,$y1) = $this->scale->Translate($x1,$y1);
-    $this->img->StrokeText($x1,$y1,$txt,$dir,$paragraph_align);
+    function StrokeText($x1,$y1,$txt,$dir=0,$paragraph_align="left") {
+        list($x1,$y1) = $this->scale->Translate($x1,$y1);
+        $this->img->StrokeText($x1,$y1,$txt,$dir,$paragraph_align);
     }
 
     // A rounded rectangle where one of the corner has been moved "into" the
     // rectangle 'iw' width and 'ih' height. Corners:
     // 0=Top left, 1=top right, 2=bottom right, 3=bottom left
-    public function IndentedRectangle($xt,$yt,$w,$h,$iw=0,$ih=0,$aCorner=3,$aFillColor="",$r=4)
-    {
-    list($xt,$yt) = $this->scale->Translate($xt,$yt);
-    list($w,$h)   = $this->scale->Translate($w,$h);
-    list($iw,$ih) = $this->scale->Translate($iw,$ih);
-
-    $xr = $xt + $w - 0;
-    $yl = $yt + $h - 0;
-
-    switch ($aCorner) {
-        case 0: // Upper left
-
-        // Bottom line, left &  right arc
-        $this->img->Line($xt+$r,$yl,$xr-$r,$yl);
-        $this->img->Arc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
-        $this->img->Arc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
-
-        // Right line, Top right arc
-        $this->img->Line($xr,$yt+$r,$xr,$yl-$r);
-        $this->img->Arc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
-
-        // Top line, Top left arc
-        $this->img->Line($xt+$iw+$r,$yt,$xr-$r,$yt);
-        $this->img->Arc($xt+$iw+$r,$yt+$r,$r*2,$r*2,180,270);
-
-        // Left line
-        $this->img->Line($xt,$yt+$ih+$r,$xt,$yl-$r);
-
-        // Indent horizontal, Lower left arc
-        $this->img->Line($xt+$r,$yt+$ih,$xt+$iw-$r,$yt+$ih);
-        $this->img->Arc($xt+$r,$yt+$ih+$r,$r*2,$r*2,180,270);
-
-        // Indent vertical, Indent arc
-        $this->img->Line($xt+$iw,$yt+$r,$xt+$iw,$yt+$ih-$r);
-        $this->img->Arc($xt+$iw-$r,$yt+$ih-$r,$r*2,$r*2,0,90);
-
-        if ($aFillColor != '') {
-            $bc = $this->img->current_color_name;
-            $this->img->PushColor($aFillColor);
-            $this->img->FillToBorder($xr-$r,$yl-$r,$bc);
-            $this->img->PopColor();
-        }
-
-        break;
-
-        case 1: // Upper right
-
-        // Bottom line, left &  right arc
-        $this->img->Line($xt+$r,$yl,$xr-$r,$yl);
-        $this->img->Arc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
-        $this->img->Arc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
-
-        // Left line, Top left arc
-        $this->img->Line($xt,$yt+$r,$xt,$yl-$r);
-        $this->img->Arc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
-
-        // Top line, Top right arc
-        $this->img->Line($xt+$r,$yt,$xr-$iw-$r,$yt);
-        $this->img->Arc($xr-$iw-$r,$yt+$r,$r*2,$r*2,270,360);
-
-        // Right line
-        $this->img->Line($xr,$yt+$ih+$r,$xr,$yl-$r);
-
-        // Indent horizontal, Lower right arc
-        $this->img->Line($xr-$iw+$r,$yt+$ih,$xr-$r,$yt+$ih);
-        $this->img->Arc($xr-$r,$yt+$ih+$r,$r*2,$r*2,270,360);
-
-        // Indent vertical, Indent arc
-        $this->img->Line($xr-$iw,$yt+$r,$xr-$iw,$yt+$ih-$r);
-        $this->img->Arc($xr-$iw+$r,$yt+$ih-$r,$r*2,$r*2,90,180);
-
-        if ($aFillColor != '') {
-            $bc = $this->img->current_color_name;
-            $this->img->PushColor($aFillColor);
-            $this->img->FillToBorder($xt+$r,$yl-$r,$bc);
-            $this->img->PopColor();
+    function IndentedRectangle($xt,$yt,$w,$h,$iw=0,$ih=0,$aCorner=3,$aFillColor="",$r=4) {
+
+        list($xt,$yt) = $this->scale->Translate($xt,$yt);
+        list($w,$h)   = $this->scale->Translate($w,$h);
+        list($iw,$ih) = $this->scale->Translate($iw,$ih);
+
+        $xr = $xt + $w - 0;
+        $yl = $yt + $h - 0;
+
+        switch( $aCorner ) {
+            case 0: // Upper left
+                 
+                // Bottom line, left &  right arc
+                $this->img->Line($xt+$r,$yl,$xr-$r,$yl);
+                $this->img->Arc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
+                $this->img->Arc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
+
+                // Right line, Top right arc
+                $this->img->Line($xr,$yt+$r,$xr,$yl-$r);
+                $this->img->Arc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
+
+                // Top line, Top left arc
+                $this->img->Line($xt+$iw+$r,$yt,$xr-$r,$yt);
+                $this->img->Arc($xt+$iw+$r,$yt+$r,$r*2,$r*2,180,270);
+
+                // Left line
+                $this->img->Line($xt,$yt+$ih+$r,$xt,$yl-$r);
+
+                // Indent horizontal, Lower left arc
+                $this->img->Line($xt+$r,$yt+$ih,$xt+$iw-$r,$yt+$ih);
+                $this->img->Arc($xt+$r,$yt+$ih+$r,$r*2,$r*2,180,270);
+
+                // Indent vertical, Indent arc
+                $this->img->Line($xt+$iw,$yt+$r,$xt+$iw,$yt+$ih-$r);
+                $this->img->Arc($xt+$iw-$r,$yt+$ih-$r,$r*2,$r*2,0,90);
+
+                if( $aFillColor != '' ) {
+                    $bc = $this->img->current_color_name;
+                    $this->img->PushColor($aFillColor);
+                    $this->img->FillToBorder($xr-$r,$yl-$r,$bc);
+                    $this->img->PopColor();
+                }
+
+                break;
+
+            case 1: // Upper right
+
+                // Bottom line, left &  right arc
+                $this->img->Line($xt+$r,$yl,$xr-$r,$yl);
+                $this->img->Arc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
+                $this->img->Arc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
+
+                // Left line, Top left arc
+                $this->img->Line($xt,$yt+$r,$xt,$yl-$r);
+                $this->img->Arc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
+
+                // Top line, Top right arc
+                $this->img->Line($xt+$r,$yt,$xr-$iw-$r,$yt);
+                $this->img->Arc($xr-$iw-$r,$yt+$r,$r*2,$r*2,270,360);
+
+                // Right line
+                $this->img->Line($xr,$yt+$ih+$r,$xr,$yl-$r);
+
+                // Indent horizontal, Lower right arc
+                $this->img->Line($xr-$iw+$r,$yt+$ih,$xr-$r,$yt+$ih);
+                $this->img->Arc($xr-$r,$yt+$ih+$r,$r*2,$r*2,270,360);
+
+                // Indent vertical, Indent arc
+                $this->img->Line($xr-$iw,$yt+$r,$xr-$iw,$yt+$ih-$r);
+                $this->img->Arc($xr-$iw+$r,$yt+$ih-$r,$r*2,$r*2,90,180);
+
+                if( $aFillColor != '' ) {
+                    $bc = $this->img->current_color_name;
+                    $this->img->PushColor($aFillColor);
+                    $this->img->FillToBorder($xt+$r,$yl-$r,$bc);
+                    $this->img->PopColor();
+                }
+
+                break;
+
+            case 2: // Lower right
+                // Top line, Top left & Top right arc
+                $this->img->Line($xt+$r,$yt,$xr-$r,$yt);
+                $this->img->Arc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
+                $this->img->Arc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
+
+                // Left line, Bottom left arc
+                $this->img->Line($xt,$yt+$r,$xt,$yl-$r);
+                $this->img->Arc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
+
+                // Bottom line, Bottom right arc
+                $this->img->Line($xt+$r,$yl,$xr-$iw-$r,$yl);
+                $this->img->Arc($xr-$iw-$r,$yl-$r,$r*2,$r*2,0,90);
+
+                // Right line
+                $this->img->Line($xr,$yt+$r,$xr,$yl-$ih-$r);
+                 
+                // Indent horizontal, Lower right arc
+                $this->img->Line($xr-$r,$yl-$ih,$xr-$iw+$r,$yl-$ih);
+                $this->img->Arc($xr-$r,$yl-$ih-$r,$r*2,$r*2,0,90);
+
+                // Indent vertical, Indent arc
+                $this->img->Line($xr-$iw,$yl-$r,$xr-$iw,$yl-$ih+$r);
+                $this->img->Arc($xr-$iw+$r,$yl-$ih+$r,$r*2,$r*2,180,270);
+
+                if( $aFillColor != '' ) {
+                    $bc = $this->img->current_color_name;
+                    $this->img->PushColor($aFillColor);
+                    $this->img->FillToBorder($xt+$r,$yt+$r,$bc);
+                    $this->img->PopColor();
+                }
+
+                break;
+
+            case 3: // Lower left
+                // Top line, Top left & Top right arc
+                $this->img->Line($xt+$r,$yt,$xr-$r,$yt);
+                $this->img->Arc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
+                $this->img->Arc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
+
+                // Right line, Bottom right arc
+                $this->img->Line($xr,$yt+$r,$xr,$yl-$r);
+                $this->img->Arc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
+
+                // Bottom line, Bottom left arc
+                $this->img->Line($xt+$iw+$r,$yl,$xr-$r,$yl);
+                $this->img->Arc($xt+$iw+$r,$yl-$r,$r*2,$r*2,90,180);
+
+                // Left line
+                $this->img->Line($xt,$yt+$r,$xt,$yl-$ih-$r);
+                 
+                // Indent horizontal, Lower left arc
+                $this->img->Line($xt+$r,$yl-$ih,$xt+$iw-$r,$yl-$ih);
+                $this->img->Arc($xt+$r,$yl-$ih-$r,$r*2,$r*2,90,180);
+
+                // Indent vertical, Indent arc
+                $this->img->Line($xt+$iw,$yl-$ih+$r,$xt+$iw,$yl-$r);
+                $this->img->Arc($xt+$iw-$r,$yl-$ih+$r,$r*2,$r*2,270,360);
+
+                if( $aFillColor != '' ) {
+                    $bc = $this->img->current_color_name;
+                    $this->img->PushColor($aFillColor);
+                    $this->img->FillToBorder($xr-$r,$yt+$r,$bc);
+                    $this->img->PopColor();
+                }
+
+                break;
         }
-
-        break;
-
-        case 2: // Lower right
-        // Top line, Top left & Top right arc
-        $this->img->Line($xt+$r,$yt,$xr-$r,$yt);
-        $this->img->Arc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
-        $this->img->Arc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
-
-        // Left line, Bottom left arc
-        $this->img->Line($xt,$yt+$r,$xt,$yl-$r);
-        $this->img->Arc($xt+$r,$yl-$r,$r*2,$r*2,90,180);
-
-        // Bottom line, Bottom right arc
-        $this->img->Line($xt+$r,$yl,$xr-$iw-$r,$yl);
-        $this->img->Arc($xr-$iw-$r,$yl-$r,$r*2,$r*2,0,90);
-
-        // Right line
-        $this->img->Line($xr,$yt+$r,$xr,$yl-$ih-$r);
-
-        // Indent horizontal, Lower right arc
-        $this->img->Line($xr-$r,$yl-$ih,$xr-$iw+$r,$yl-$ih);
-        $this->img->Arc($xr-$r,$yl-$ih-$r,$r*2,$r*2,0,90);
-
-        // Indent vertical, Indent arc
-        $this->img->Line($xr-$iw,$yl-$r,$xr-$iw,$yl-$ih+$r);
-        $this->img->Arc($xr-$iw+$r,$yl-$ih+$r,$r*2,$r*2,180,270);
-
-        if ($aFillColor != '') {
-            $bc = $this->img->current_color_name;
-            $this->img->PushColor($aFillColor);
-            $this->img->FillToBorder($xt+$r,$yt+$r,$bc);
-            $this->img->PopColor();
-        }
-
-        break;
-
-        case 3: // Lower left
-        // Top line, Top left & Top right arc
-        $this->img->Line($xt+$r,$yt,$xr-$r,$yt);
-        $this->img->Arc($xt+$r,$yt+$r,$r*2,$r*2,180,270);
-        $this->img->Arc($xr-$r,$yt+$r,$r*2,$r*2,270,360);
-
-        // Right line, Bottom right arc
-        $this->img->Line($xr,$yt+$r,$xr,$yl-$r);
-        $this->img->Arc($xr-$r,$yl-$r,$r*2,$r*2,0,90);
-
-        // Bottom line, Bottom left arc
-        $this->img->Line($xt+$iw+$r,$yl,$xr-$r,$yl);
-        $this->img->Arc($xt+$iw+$r,$yl-$r,$r*2,$r*2,90,180);
-
-        // Left line
-        $this->img->Line($xt,$yt+$r,$xt,$yl-$ih-$r);
-
-        // Indent horizontal, Lower left arc
-        $this->img->Line($xt+$r,$yl-$ih,$xt+$iw-$r,$yl-$ih);
-        $this->img->Arc($xt+$r,$yl-$ih-$r,$r*2,$r*2,90,180);
-
-        // Indent vertical, Indent arc
-        $this->img->Line($xt+$iw,$yl-$ih+$r,$xt+$iw,$yl-$r);
-        $this->img->Arc($xt+$iw-$r,$yl-$ih+$r,$r*2,$r*2,270,360);
-
-        if ($aFillColor != '') {
-            $bc = $this->img->current_color_name;
-            $this->img->PushColor($aFillColor);
-            $this->img->FillToBorder($xr-$r,$yt+$r,$bc);
-            $this->img->PopColor();
-        }
-
-        break;
-    }
     }
 }
 
+
 //===================================================
 // CLASS RectangleText
 // Description: Draws a text paragraph inside a
 // rounded, possible filled, rectangle.
 //===================================================
-class CanvasRectangleText
-{
-    public $ix,$iy,$iw,$ih,$ir=4;
-    public $iTxt,$iColor='black',$iFillColor='',$iFontColor='black';
-    public $iParaAlign='center';
-    public $iAutoBoxMargin=5;
-    public $iShadowWidth=3,$iShadowColor='';
+class CanvasRectangleText {
+    private $ix,$iy,$iw,$ih,$ir=4;
+    private $iTxt,$iColor='black',$iFillColor='',$iFontColor='black';
+    private $iParaAlign='center';
+    private $iAutoBoxMargin=5;
+    private $iShadowWidth=3,$iShadowColor='';
 
-    public function CanvasRectangleText($aTxt='',$xl=0,$yt=0,$w=0,$h=0)
-    {
-    $this->iTxt = new Text($aTxt);
-    $this->ix = $xl;
-    $this->iy = $yt;
-    $this->iw = $w;
-    $this->ih = $h;
+    function __construct($aTxt='',$xl=0,$yt=0,$w=0,$h=0) {
+        $this->iTxt = new Text($aTxt);
+        $this->ix = $xl;
+        $this->iy = $yt;
+        $this->iw = $w;
+        $this->ih = $h;
     }
 
-    public function SetShadow($aColor='gray',$aWidth=3)
-    {
-    $this->iShadowColor = $aColor;
-    $this->iShadowWidth = $aWidth;
+    function SetShadow($aColor='gray',$aWidth=3) {
+        $this->iShadowColor = $aColor;
+        $this->iShadowWidth = $aWidth;
     }
 
-    public function SetFont($FontFam,$aFontStyle,$aFontSize=12)
-    {
-    $this->iTxt->SetFont($FontFam,$aFontStyle,$aFontSize);
+    function SetFont($FontFam,$aFontStyle,$aFontSize=12) {
+        $this->iTxt->SetFont($FontFam,$aFontStyle,$aFontSize);
     }
 
-    public function SetTxt($aTxt)
-    {
-    $this->iTxt->Set($aTxt);
+    function SetTxt($aTxt) {
+        $this->iTxt->Set($aTxt);
     }
 
-    public function ParagraphAlign($aParaAlign)
-    {
-    $this->iParaAlign = $aParaAlign;
+    function ParagraphAlign($aParaAlign) {
+        $this->iParaAlign = $aParaAlign;
     }
 
-    public function SetFillColor($aFillColor)
-    {
-    $this->iFillColor = $aFillColor;
+    function SetFillColor($aFillColor) {
+        $this->iFillColor = $aFillColor;
     }
 
-    public function SetAutoMargin($aMargin)
-    {
-    $this->iAutoBoxMargin=$aMargin;
+    function SetAutoMargin($aMargin) {
+        $this->iAutoBoxMargin=$aMargin;
     }
 
-    public function SetColor($aColor)
-    {
-    $this->iColor = $aColor;
+    function SetColor($aColor) {
+        $this->iColor = $aColor;
     }
 
-    public function SetFontColor($aColor)
-    {
-    $this->iFontColor = $aColor;
+    function SetFontColor($aColor) {
+        $this->iFontColor = $aColor;
     }
 
-    public function SetPos($xl=0,$yt=0,$w=0,$h=0)
-    {
-    $this->ix = $xl;
-    $this->iy = $yt;
-    $this->iw = $w;
-    $this->ih = $h;
+    function SetPos($xl=0,$yt=0,$w=0,$h=0) {
+        $this->ix = $xl;
+        $this->iy = $yt;
+        $this->iw = $w;
+        $this->ih = $h;
     }
 
-    public function Pos($xl=0,$yt=0,$w=0,$h=0)
-    {
-    $this->ix = $xl;
-    $this->iy = $yt;
-    $this->iw = $w;
-    $this->ih = $h;
+    function Pos($xl=0,$yt=0,$w=0,$h=0) {
+        $this->ix = $xl;
+        $this->iy = $yt;
+        $this->iw = $w;
+        $this->ih = $h;
     }
 
-    public function Set($aTxt,$xl,$yt,$w=0,$h=0)
-    {
-    $this->iTxt->Set($aTxt);
-    $this->ix = $xl;
-    $this->iy = $yt;
-    $this->iw = $w;
-    $this->ih = $h;
+    function Set($aTxt,$xl,$yt,$w=0,$h=0) {
+        $this->iTxt->Set($aTxt);
+        $this->ix = $xl;
+        $this->iy = $yt;
+        $this->iw = $w;
+        $this->ih = $h;
     }
 
-    public function SetCornerRadius($aRad=5)
-    {
-    $this->ir = $aRad;
+    function SetCornerRadius($aRad=5) {
+        $this->ir = $aRad;
     }
 
-    public function Stroke($aImg,$scale)
-    {
-    // If coordinates are specifed as negative this means we should
-    // treat them as abolsute (pixels) coordinates
-    if ($this->ix > 0) {
-        $this->ix = $scale->TranslateX($this->ix) ;
-    } else {
-        $this->ix = -$this->ix;
-    }
+    function Stroke($aImg,$scale) {
 
-    if ($this->iy > 0) {
-        $this->iy = $scale->TranslateY($this->iy) ;
-    } else {
-        $this->iy = -$this->iy;
-    }
+        // If coordinates are specifed as negative this means we should
+        // treat them as abolsute (pixels) coordinates
+        if( $this->ix > 0 ) {
+            $this->ix = $scale->TranslateX($this->ix) ;
+        }
+        else {
+            $this->ix = -$this->ix;
+        }
 
-    list($this->iw,$this->ih) = $scale->Translate($this->iw,$this->ih) ;
+        if( $this->iy > 0 ) {
+            $this->iy = $scale->TranslateY($this->iy) ;
+        }
+        else {
+            $this->iy = -$this->iy;
+        }
+         
+        list($this->iw,$this->ih) = $scale->Translate($this->iw,$this->ih) ;
 
-    if( $this->iw == 0 )
+        if( $this->iw == 0 )
         $this->iw = round($this->iTxt->GetWidth($aImg) + $this->iAutoBoxMargin);
-    if ($this->ih == 0) {
-        $this->ih = round($this->iTxt->GetTextHeight($aImg) + $this->iAutoBoxMargin);
-    }
+        if( $this->ih == 0 ) {
+            $this->ih = round($this->iTxt->GetTextHeight($aImg) + $this->iAutoBoxMargin);
+        }
 
-    if ($this->iShadowColor != '') {
-        $aImg->PushColor($this->iShadowColor);
-        $aImg->FilledRoundedRectangle($this->ix+$this->iShadowWidth,
-                      $this->iy+$this->iShadowWidth,
-                      $this->ix+$this->iw-1+$this->iShadowWidth,
-                      $this->iy+$this->ih-1+$this->iShadowWidth,
-                      $this->ir);
-        $aImg->PopColor();
-    }
+        if( $this->iShadowColor != '' ) {
+            $aImg->PushColor($this->iShadowColor);
+            $aImg->FilledRoundedRectangle($this->ix+$this->iShadowWidth,
+            $this->iy+$this->iShadowWidth,
+            $this->ix+$this->iw-1+$this->iShadowWidth,
+            $this->iy+$this->ih-1+$this->iShadowWidth,
+            $this->ir);
+            $aImg->PopColor();
+        }
 
-    if ($this->iFillColor != '') {
-        $aImg->PushColor($this->iFillColor);
-        $aImg->FilledRoundedRectangle($this->ix,$this->iy,
-                      $this->ix+$this->iw-1,
-                      $this->iy+$this->ih-1,
-                      $this->ir);
-        $aImg->PopColor();
-    }
+        if( $this->iFillColor != '' ) {
+            $aImg->PushColor($this->iFillColor);
+            $aImg->FilledRoundedRectangle($this->ix,$this->iy,
+            $this->ix+$this->iw-1,
+            $this->iy+$this->ih-1,
+            $this->ir);
+            $aImg->PopColor();
+        }
 
-    if ($this->iColor != '') {
-        $aImg->PushColor($this->iColor);
-        $aImg->RoundedRectangle($this->ix,$this->iy,
-                    $this->ix+$this->iw-1,
-                    $this->iy+$this->ih-1,
-                    $this->ir);
-        $aImg->PopColor();
-    }
+        if( $this->iColor != '' ) {
+            $aImg->PushColor($this->iColor);
+            $aImg->RoundedRectangle($this->ix,$this->iy,
+            $this->ix+$this->iw-1,
+            $this->iy+$this->ih-1,
+            $this->ir);
+            $aImg->PopColor();
+        }
 
-    $this->iTxt->Align('center','center');
-    $this->iTxt->ParagraphAlign($this->iParaAlign);
-    $this->iTxt->SetColor($this->iFontColor);
-    $this->iTxt->Stroke($aImg, $this->ix+$this->iw/2, $this->iy+$this->ih/2);
+        $this->iTxt->Align('center','center');
+        $this->iTxt->ParagraphAlign($this->iParaAlign);
+        $this->iTxt->SetColor($this->iFontColor);
+        $this->iTxt->Stroke($aImg, $this->ix+$this->iw/2, $this->iy+$this->ih/2);
 
-    return array($this->iw, $this->ih);
+        return array($this->iw, $this->ih);
 
     }
 
 }
+
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_contour.php b/common/lib/jpgraph_lib/jpgraph_contour.php
new file mode 100644
index 000000000..760989e5f
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_contour.php
@@ -0,0 +1,587 @@
+<?php
+/*=======================================================================
+// File:        JPGRAPH_CONTOUR.PHP
+// Description: Contour plot
+// Created:     2009-03-08
+// Ver:         $Id: jpgraph_contour.php 1870 2009-09-29 04:24:18Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+*/
+require_once('jpgraph_meshinterpolate.inc.php');
+define('HORIZ_EDGE',0);
+define('VERT_EDGE',1);
+
+/**
+ * This class encapsulates the core contour plot algorithm. It will find the path
+ * of the specified isobars in the data matrix specified. It is assumed that the
+ * data matrix models an equspaced X-Y mesh of datavalues corresponding to the Z
+ * values.
+ *
+ */
+class Contour {
+
+    private $dataPoints = array();
+    private $nbrCols=0,$nbrRows=0;
+    private $horizEdges = array(), $vertEdges=array();
+    private $isobarValues = array();
+    private $stack = null;
+    private $isobarCoord = array();
+    private $nbrIsobars = 10, $isobarColors = array();
+    private $invert = true;
+    private $highcontrast = false, $highcontrastbw = false;
+
+    /**
+     * Create a new contour level "algorithm machine".
+     * @param $aMatrix    The values to find the contour from
+     * @param $aIsobars Mixed. If integer it determines the number of isobars to be used. The levels are determined
+     * automatically as equdistance between the min and max value of the matrice.
+     * If $aIsobars is an array then this is interpretated as an array of values to be used as isobars in the
+     * contour plot.
+     * @return an instance of the contour algorithm
+     */
+    function __construct($aMatrix,$aIsobars=10, $aColors=null) {
+
+        $this->nbrRows = count($aMatrix);
+        $this->nbrCols = count($aMatrix[0]);
+        $this->dataPoints = $aMatrix;
+
+        if( is_array($aIsobars) ) {
+            // use the isobar values supplied
+            $this->nbrIsobars = count($aIsobars);
+            $this->isobarValues = $aIsobars;
+        }
+        else {
+            // Determine the isobar values automatically
+            $this->nbrIsobars = $aIsobars;
+            list($min,$max) = $this->getMinMaxVal();
+            $stepSize = ($max-$min) / $aIsobars ;
+            $isobar = $min+$stepSize/2;
+            for ($i = 0; $i < $aIsobars; $i++) {
+                $this->isobarValues[$i] = $isobar;
+                $isobar += $stepSize;
+            }
+        }
+
+        if( $aColors !== null && count($aColors) > 0 ) {
+
+            if( !is_array($aColors) ) {
+                JpGraphError::RaiseL(28001);
+                //'Third argument to Contour must be an array of colors.'
+            }
+
+            if( count($aColors) != count($this->isobarValues) ) {
+                JpGraphError::RaiseL(28002);
+                //'Number of colors must equal the number of isobar lines specified';
+            }
+
+            $this->isobarColors = $aColors;
+        }
+    }
+
+    /**
+     * Flip the plot around the Y-coordinate. This has the same affect as flipping the input
+     * data matrice
+     *
+     * @param $aFlg If true the the vertice in input data matrice position (0,0) corresponds to the top left
+     * corner of teh plot otherwise it will correspond to the bottom left corner (a horizontal flip)
+     */
+    function SetInvert($aFlg=true) {
+        $this->invert = $aFlg;
+    }
+
+    /**
+     * Find the min and max values in the data matrice
+     *
+     * @return array(min_value,max_value)
+     */
+    function getMinMaxVal() {
+        $min = $this->dataPoints[0][0];
+        $max = $this->dataPoints[0][0];
+        for ($i = 0; $i < $this->nbrRows; $i++) {
+            if( ($mi=min($this->dataPoints[$i])) < $min )  $min = $mi;
+            if( ($ma=max($this->dataPoints[$i])) > $max )  $max = $ma;
+        }
+        return array($min,$max);
+    }
+
+    /**
+     * Reset the two matrices that keeps track on where the isobars crosses the
+     * horizontal and vertical edges
+     */
+    function resetEdgeMatrices() {
+        for ($k = 0; $k < 2; $k++) {
+            for ($i = 0; $i <= $this->nbrRows; $i++) {
+                for ($j = 0; $j <= $this->nbrCols; $j++) {
+                    $this->edges[$k][$i][$j] = false;
+                }
+            }
+        }
+    }
+
+    /**
+     * Determine if the specified isobar crosses the horizontal edge specified by its row and column
+     *
+     * @param $aRow Row index of edge to be checked
+     * @param $aCol Col index of edge to be checked
+     * @param $aIsobar Isobar value
+     * @return true if the isobar is crossing this edge
+     */
+    function isobarHCrossing($aRow,$aCol,$aIsobar) {
+
+        if( $aCol >= $this->nbrCols-1 ) {
+            JpGraphError::RaiseL(28003,$aCol);
+            //'ContourPlot Internal Error: isobarHCrossing: Coloumn index too large (%d)'
+        }
+        if( $aRow >= $this->nbrRows ) {
+            JpGraphError::RaiseL(28004,$aRow);
+            //'ContourPlot Internal Error: isobarHCrossing: Row index too large (%d)'
+        }
+
+        $v1 = $this->dataPoints[$aRow][$aCol];
+        $v2 = $this->dataPoints[$aRow][$aCol+1];
+
+        return ($aIsobar-$v1)*($aIsobar-$v2) < 0 ;
+
+    }
+
+    /**
+     * Determine if the specified isobar crosses the vertical edge specified by its row and column
+     *
+     * @param $aRow Row index of edge to be checked
+     * @param $aCol Col index of edge to be checked
+     * @param $aIsobar Isobar value
+     * @return true if the isobar is crossing this edge
+     */
+    function isobarVCrossing($aRow,$aCol,$aIsobar) {
+
+        if( $aRow >= $this->nbrRows-1) {
+            JpGraphError::RaiseL(28005,$aRow);
+            //'isobarVCrossing: Row index too large
+        }
+        if( $aCol >= $this->nbrCols ) {
+            JpGraphError::RaiseL(28006,$aCol);
+            //'isobarVCrossing: Col index too large
+        }
+
+        $v1 = $this->dataPoints[$aRow][$aCol];
+        $v2 = $this->dataPoints[$aRow+1][$aCol];
+
+        return ($aIsobar-$v1)*($aIsobar-$v2) < 0 ;
+
+    }
+
+    /**
+     * Determine all edges, horizontal and vertical that the specified isobar crosses. The crossings
+     * are recorded in the two edge matrices.
+     *
+     * @param $aIsobar The value of the isobar to be checked
+     */
+    function determineIsobarEdgeCrossings($aIsobar) {
+
+        $ib = $this->isobarValues[$aIsobar];
+
+        for ($i = 0; $i < $this->nbrRows-1; $i++) {
+            for ($j = 0; $j < $this->nbrCols-1; $j++) {
+                $this->edges[HORIZ_EDGE][$i][$j] = $this->isobarHCrossing($i,$j,$ib);
+                $this->edges[VERT_EDGE][$i][$j] = $this->isobarVCrossing($i,$j,$ib);
+            }
+        }
+
+        // We now have the bottom and rightmost edges unsearched
+        for ($i = 0; $i < $this->nbrRows-1; $i++) {
+            $this->edges[VERT_EDGE][$i][$j] = $this->isobarVCrossing($i,$this->nbrCols-1,$ib);
+        }
+        for ($j = 0; $j < $this->nbrCols-1; $j++) {
+            $this->edges[HORIZ_EDGE][$i][$j] = $this->isobarHCrossing($this->nbrRows-1,$j,$ib);
+        }
+
+    }
+
+    /**
+     * Return the normalized coordinates for the crossing of the specified edge with the specified
+     * isobar- The crossing is simpy detrmined with a linear interpolation between the two vertices
+     * on each side of the edge and the value of the isobar
+     *
+     * @param $aRow Row of edge
+     * @param $aCol Column of edge
+     * @param $aEdgeDir Determine if this is a horizontal or vertical edge
+     * @param $ib The isobar value
+     * @return unknown_type
+     */
+    function getCrossingCoord($aRow,$aCol,$aEdgeDir,$aIsobarVal) {
+
+        // In order to avoid numerical problem when two vertices are very close
+        // we have to check and avoid dividing by close to zero denumerator.
+        if( $aEdgeDir == HORIZ_EDGE ) {
+            $d = abs($this->dataPoints[$aRow][$aCol] - $this->dataPoints[$aRow][$aCol+1]);
+            if( $d > 0.001 ) {
+                $xcoord = $aCol + abs($aIsobarVal - $this->dataPoints[$aRow][$aCol]) / $d;
+            }
+            else {
+                $xcoord = $aCol;
+            }
+            $ycoord = $aRow;
+        }
+        else {
+            $d = abs($this->dataPoints[$aRow][$aCol] - $this->dataPoints[$aRow+1][$aCol]);
+            if( $d > 0.001 ) {
+                $ycoord = $aRow + abs($aIsobarVal - $this->dataPoints[$aRow][$aCol]) / $d;
+            }
+            else {
+                $ycoord = $aRow;
+            }
+            $xcoord = $aCol;
+        }
+        if( $this->invert ) {
+            $ycoord = $this->nbrRows-1 - $ycoord;
+        }
+        return array($xcoord,$ycoord);
+
+    }
+
+    /**
+     * In order to avoid all kinds of unpleasent extra checks and complex boundary
+     * controls for the degenerated case where the contour levels exactly crosses
+     * one of the vertices we add a very small delta (0.1%) to the data point value.
+     * This has no visible affect but it makes the code sooooo much cleaner.
+     *
+     */
+    function adjustDataPointValues() {
+
+        $ni = count($this->isobarValues);
+        for ($k = 0; $k < $ni; $k++) {
+            $ib = $this->isobarValues[$k];
+            for ($row = 0 ; $row < $this->nbrRows-1; ++$row) {
+                for ($col = 0 ; $col < $this->nbrCols-1; ++$col ) {
+                    if( abs($this->dataPoints[$row][$col] - $ib) < 0.0001 ) {
+                        $this->dataPoints[$row][$col] += $this->dataPoints[$row][$col]*0.001;
+                    }
+                }
+            }
+        }
+
+    }
+
+    /**
+     * @param $aFlg
+     * @param $aBW
+     * @return unknown_type
+     */
+    function UseHighContrastColor($aFlg=true,$aBW=false) {
+        $this->highcontrast = $aFlg;
+        $this->highcontrastbw = $aBW;
+    }
+
+    /**
+     * Calculate suitable colors for each defined isobar
+     *
+     */
+    function CalculateColors() {
+        if ( $this->highcontrast ) {
+            if ( $this->highcontrastbw ) {
+                for ($ib = 0; $ib < $this->nbrIsobars; $ib++) {
+                    $this->isobarColors[$ib] = 'black';
+                }
+            }
+            else {
+                // Use only blue/red scale
+                $step = round(255/($this->nbrIsobars-1));
+                for ($ib = 0; $ib < $this->nbrIsobars; $ib++) {
+                    $this->isobarColors[$ib] = array($ib*$step, 50, 255-$ib*$step);
+                }
+            }
+        }
+        else {
+            $n = $this->nbrIsobars;
+            $v = 0; $step = 1 / ($this->nbrIsobars-1);
+            for ($ib = 0; $ib < $this->nbrIsobars; $ib++) {
+                $this->isobarColors[$ib] = RGB::GetSpectrum($v);
+                $v += $step;
+            }
+        }
+    }
+
+    /**
+     * This is where the main work is done. For each isobar the crossing of the edges are determined
+     * and then each cell is analyzed to find the 0, 2 or 4 crossings. Then the normalized coordinate
+     * for the crossings are determined and pushed on to the isobar stack. When the method is finished
+     * the $isobarCoord will hold one arrayfor each isobar where all the line segments that makes
+     * up the contour plot are stored.
+     *
+     * @return array( $isobarCoord, $isobarValues, $isobarColors )
+     */
+    function getIsobars() {
+
+        $this->adjustDataPointValues();
+
+        for ($isobar = 0; $isobar < $this->nbrIsobars; $isobar++) {
+
+            $ib = $this->isobarValues[$isobar];
+            $this->resetEdgeMatrices();
+            $this->determineIsobarEdgeCrossings($isobar);
+            $this->isobarCoord[$isobar] = array();
+
+            $ncoord = 0;
+
+            for ($row = 0 ; $row < $this->nbrRows-1; ++$row) {
+                for ($col = 0 ; $col < $this->nbrCols-1; ++$col ) {
+
+                    // Find out how many crossings around the edges
+                    $n = 0;
+                    if ( $this->edges[HORIZ_EDGE][$row][$col] )   $neigh[$n++] = array($row,  $col,  HORIZ_EDGE);
+                    if ( $this->edges[HORIZ_EDGE][$row+1][$col] ) $neigh[$n++] = array($row+1,$col,  HORIZ_EDGE);
+                    if ( $this->edges[VERT_EDGE][$row][$col] )    $neigh[$n++] = array($row,  $col,  VERT_EDGE);
+                    if ( $this->edges[VERT_EDGE][$row][$col+1] )  $neigh[$n++] = array($row,  $col+1,VERT_EDGE);
+
+                    if ( $n == 2 ) {
+                        $n1=0; $n2=1;
+                        $this->isobarCoord[$isobar][$ncoord++] = array(
+                        $this->getCrossingCoord($neigh[$n1][0],$neigh[$n1][1],$neigh[$n1][2],$ib),
+                        $this->getCrossingCoord($neigh[$n2][0],$neigh[$n2][1],$neigh[$n2][2],$ib) );
+                    }
+                    elseif ( $n == 4 ) {
+                        // We must determine how to connect the edges either northwest->southeast or
+                        // northeast->southwest. We do that by calculating the imaginary middle value of
+                        // the cell by averaging the for corners. This will compared with the value of the
+                        // top left corner will help determine the orientation of the ridge/creek
+                        $midval = ($this->dataPoints[$row][$col]+$this->dataPoints[$row][$col+1]+$this->dataPoints[$row+1][$col]+$this->dataPoints[$row+1][$col+1])/4;
+                        $v = $this->dataPoints[$row][$col];
+                        if( $midval == $ib ) {
+                            // Orientation "+"
+                            $n1=0; $n2=1; $n3=2; $n4=3;
+                        } elseif ( ($midval > $ib && $v > $ib) ||  ($midval < $ib && $v < $ib) ) {
+                            // Orientation of ridge/valley = "\"
+                            $n1=0; $n2=3; $n3=2; $n4=1;
+                        } elseif ( ($midval > $ib && $v < $ib) ||  ($midval < $ib && $v > $ib) ) {
+                            // Orientation of ridge/valley = "/"
+                            $n1=0; $n2=2; $n3=3; $n4=1;
+                        }
+
+                        $this->isobarCoord[$isobar][$ncoord++] = array(
+                        $this->getCrossingCoord($neigh[$n1][0],$neigh[$n1][1],$neigh[$n1][2],$ib),
+                        $this->getCrossingCoord($neigh[$n2][0],$neigh[$n2][1],$neigh[$n2][2],$ib) );
+
+                        $this->isobarCoord[$isobar][$ncoord++] = array(
+                        $this->getCrossingCoord($neigh[$n3][0],$neigh[$n3][1],$neigh[$n3][2],$ib),
+                        $this->getCrossingCoord($neigh[$n4][0],$neigh[$n4][1],$neigh[$n4][2],$ib) );
+
+                    }
+                }
+            }
+        }
+
+        if( count($this->isobarColors) == 0 ) {
+            // No manually specified colors. Calculate them automatically.
+            $this->CalculateColors();
+        }
+        return array( $this->isobarCoord, $this->isobarValues, $this->isobarColors );
+    }
+}
+
+
+/**
+ * This class represent a plotting of a contour outline of data given as a X-Y matrice
+ *
+ */
+class ContourPlot extends Plot {
+
+    private $contour, $contourCoord, $contourVal, $contourColor;
+    private $nbrCountours = 0 ;
+    private $dataMatrix = array();
+    private $invertLegend = false;
+    private $interpFactor = 1;
+    private $flipData = false;
+    private $isobar = 10;
+    private $showLegend = false;
+    private $highcontrast = false, $highcontrastbw = false;
+    private $manualIsobarColors = array();
+
+    /**
+     * Construct a contour plotting algorithm. The end result of the algorithm is a sequence of
+     * line segments for each isobar given as two vertices.
+     *
+     * @param $aDataMatrix    The Z-data to be used
+     * @param $aIsobar A mixed variable, if it is an integer then this specified the number of isobars to use.
+     * The values of the isobars are automatically detrmined to be equ-spaced between the min/max value of the
+     * data. If it is an array then it explicetely gives the isobar values
+     * @param $aInvert By default the matrice with row index 0 corresponds to Y-value 0, i.e. in the bottom of
+     * the plot. If this argument is true then the row with the highest index in the matrice corresponds  to
+     * Y-value 0. In affect flipping the matrice around an imaginary horizontal axis.
+     * @param $aHighContrast Use high contrast colors (blue/red:ish)
+     * @param $aHighContrastBW Use only black colors for contours
+     * @return an instance of the contour plot algorithm
+     */
+    function __construct($aDataMatrix, $aIsobar=10, $aFactor=1, $aInvert=false, $aIsobarColors=array()) {
+
+        $this->dataMatrix = $aDataMatrix;
+        $this->flipData = $aInvert;
+        $this->isobar = $aIsobar;
+        $this->interpFactor = $aFactor;
+
+        if ( $this->interpFactor > 1 ) {
+
+            if( $this->interpFactor > 5 ) {
+                JpGraphError::RaiseL(28007);// ContourPlot interpolation factor is too large (>5)
+            }
+
+            $ip = new MeshInterpolate();
+            $this->dataMatrix = $ip->Linear($this->dataMatrix, $this->interpFactor);
+        }
+
+        $this->contour = new Contour($this->dataMatrix,$this->isobar,$aIsobarColors);
+
+        if( is_array($aIsobar) )
+            $this->nbrContours = count($aIsobar);
+        else
+            $this->nbrContours = $aIsobar;
+    }
+
+
+    /**
+     * Flipe the data around the center
+     *
+     * @param $aFlg
+     *
+     */
+    function SetInvert($aFlg=true) {
+        $this->flipData = $aFlg;
+    }
+
+    /**
+     * Set the colors for the isobar lines
+     *
+     * @param $aColorArray
+     *
+     */
+    function SetIsobarColors($aColorArray) {
+        $this->manualIsobarColors = $aColorArray;
+    }
+
+    /**
+     * Show the legend
+     *
+     * @param $aFlg true if the legend should be shown
+     *
+     */
+    function ShowLegend($aFlg=true) {
+        $this->showLegend = $aFlg;
+    }
+
+
+    /**
+     * @param $aFlg true if the legend should start with the lowest isobar on top
+     * @return unknown_type
+     */
+    function Invertlegend($aFlg=true) {
+        $this->invertLegend = $aFlg;
+    }
+
+    /* Internal method. Give the min value to be used for the scaling
+     *
+     */
+    function Min() {
+        return array(0,0);
+    }
+
+    /* Internal method. Give the max value to be used for the scaling
+     *
+     */
+    function Max() {
+        return array(count($this->dataMatrix[0])-1,count($this->dataMatrix)-1);
+    }
+
+    /**
+     * Internal ramewrok method to setup the legend to be used for this plot.
+     * @param $aGraph The parent graph class
+     */
+    function Legend($aGraph) {
+
+        if( ! $this->showLegend )
+            return;
+
+        if( $this->invertLegend ) {
+            for ($i = 0; $i < $this->nbrContours; $i++) {
+                $aGraph->legend->Add(sprintf('%.1f',$this->contourVal[$i]), $this->contourColor[$i]);
+            }
+        }
+        else {
+            for ($i = $this->nbrContours-1; $i >= 0 ; $i--) {
+                $aGraph->legend->Add(sprintf('%.1f',$this->contourVal[$i]), $this->contourColor[$i]);
+            }
+        }
+    }
+
+
+    /**
+     *  Framework function which gets called before the Stroke() method is called
+     *
+     *  @see Plot#PreScaleSetup($aGraph)
+     *
+     */
+    function PreScaleSetup($aGraph) {
+        $xn = count($this->dataMatrix[0])-1;
+        $yn = count($this->dataMatrix)-1;
+
+        $aGraph->xaxis->scale->Update($aGraph->img,0,$xn);
+        $aGraph->yaxis->scale->Update($aGraph->img,0,$yn);
+
+        $this->contour->SetInvert($this->flipData);
+        list($this->contourCoord,$this->contourVal,$this->contourColor) = $this->contour->getIsobars();
+    }
+
+    /**
+     * Use high contrast color schema
+     *
+     * @param $aFlg True, to use high contrast color
+     * @param $aBW True, Use only black and white color schema
+     */
+    function UseHighContrastColor($aFlg=true,$aBW=false) {
+        $this->highcontrast = $aFlg;
+        $this->highcontrastbw = $aBW;
+        $this->contour->UseHighContrastColor($this->highcontrast,$this->highcontrastbw);
+    }
+
+    /**
+     * Internal method. Stroke the contour plot to the graph
+     *
+     * @param $img Image handler
+     * @param $xscale Instance of the xscale to use
+     * @param $yscale Instance of the yscale to use
+     */
+    function Stroke($img,$xscale,$yscale) {
+
+        if( count($this->manualIsobarColors) > 0 ) {
+            $this->contourColor = $this->manualIsobarColors;
+            if( count($this->manualIsobarColors) != $this->nbrContours ) {
+                JpGraphError::RaiseL(28002);
+            }
+        }
+
+        $img->SetLineWeight($this->line_weight);
+
+        for ($c = 0; $c < $this->nbrContours; $c++) {
+
+            $img->SetColor( $this->contourColor[$c] );
+
+            $n = count($this->contourCoord[$c]);
+            $i = 0;
+            while ( $i < $n ) {
+                list($x1,$y1) = $this->contourCoord[$c][$i][0];
+                $x1t = $xscale->Translate($x1);
+                $y1t = $yscale->Translate($y1);
+
+                list($x2,$y2) = $this->contourCoord[$c][$i++][1];
+                $x2t = $xscale->Translate($x2);
+                $y2t = $yscale->Translate($y2);
+
+                $img->Line($x1t,$y1t,$x2t,$y2t);
+            }
+
+        }
+    }
+
+}
+
+// EOF
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_date.php b/common/lib/jpgraph_lib/jpgraph_date.php
new file mode 100644
index 000000000..db4c441c2
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_date.php
@@ -0,0 +1,499 @@
+<?php
+/*=======================================================================
+ // File:        JPGRAPH_DATE.PHP
+ // Description: Classes to handle Date scaling
+ // Created:     2005-05-02
+ // Ver:         $Id: jpgraph_date.php 1106 2009-02-22 20:16:35Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+
+define('HOURADJ_1',0+30);
+define('HOURADJ_2',1+30);
+define('HOURADJ_3',2+30);
+define('HOURADJ_4',3+30);
+define('HOURADJ_6',4+30);
+define('HOURADJ_12',5+30);
+
+define('MINADJ_1',0+20);
+define('MINADJ_5',1+20);
+define('MINADJ_10',2+20);
+define('MINADJ_15',3+20);
+define('MINADJ_30',4+20);
+
+define('SECADJ_1',0);
+define('SECADJ_5',1);
+define('SECADJ_10',2);
+define('SECADJ_15',3);
+define('SECADJ_30',4);
+
+
+define('YEARADJ_1',0+30);
+define('YEARADJ_2',1+30);
+define('YEARADJ_5',2+30);
+
+define('MONTHADJ_1',0+20);
+define('MONTHADJ_6',1+20);
+
+define('DAYADJ_1',0);
+define('DAYADJ_WEEK',1);
+define('DAYADJ_7',1);
+
+define('SECPERYEAR',31536000);
+define('SECPERDAY',86400);
+define('SECPERHOUR',3600);
+define('SECPERMIN',60);
+
+
+class DateScale extends LinearScale {
+    private $date_format = '';
+    private $iStartAlign = false, $iEndAlign = false;
+    private $iStartTimeAlign = false, $iEndTimeAlign = false;
+
+    //---------------
+    // CONSTRUCTOR
+    function __construct($aMin=0,$aMax=0,$aType='x') {
+        assert($aType=="x");
+        assert($aMin<=$aMax);
+
+        $this->type=$aType;
+        $this->scale=array($aMin,$aMax);
+        $this->world_size=$aMax-$aMin;
+        $this->ticks = new LinearTicks();
+        $this->intscale=true;
+    }
+
+
+    //------------------------------------------------------------------------------------------
+    // Utility Function AdjDate()
+    // Description: Will round a given time stamp to an even year, month or day
+    // argument.
+    //------------------------------------------------------------------------------------------
+
+    function AdjDate($aTime,$aRound=0,$aYearType=false,$aMonthType=false,$aDayType=false) {
+        $y = (int)date('Y',$aTime); $m = (int)date('m',$aTime); $d = (int)date('d',$aTime);
+        $h=0;$i=0;$s=0;
+        if( $aYearType !== false ) {
+            $yearAdj = array(0=>1, 1=>2, 2=>5);
+            if( $aRound == 0 ) {
+                $y = floor($y/$yearAdj[$aYearType])*$yearAdj[$aYearType];
+            }
+            else {
+                ++$y;
+                $y = ceil($y/$yearAdj[$aYearType])*$yearAdj[$aYearType];
+            }
+            $m=1;$d=1;
+        }
+        elseif( $aMonthType !== false ) {
+            $monthAdj = array(0=>1, 1=>6);
+            if( $aRound == 0 ) {
+                $m = floor($m/$monthAdj[$aMonthType])*$monthAdj[$aMonthType];
+                $d=1;
+            }
+            else {
+                ++$m;
+                $m = ceil($m/$monthAdj[$aMonthType])*$monthAdj[$aMonthType];
+                $d=1;
+            }
+        }
+        elseif( $aDayType !== false ) {
+            if( $aDayType == 0 ) {
+                if( $aRound == 1 ) {
+                    //++$d;
+                    $h=23;$i=59;$s=59;
+                }
+            }
+            else {
+                // Adjust to an even week boundary.
+                $w = (int)date('w',$aTime); // Day of week 0=Sun, 6=Sat
+                if( true ) { // Adjust to start on Mon
+                    if( $w==0 ) $w=6;
+                    else --$w;
+                }
+                if( $aRound == 0 ) {
+                    $d -= $w;
+                }
+                else {
+                    $d += (7-$w);
+                    $h=23;$i=59;$s=59;
+                }
+            }
+        }
+        return mktime($h,$i,$s,$m,$d,$y);
+
+    }
+
+    //------------------------------------------------------------------------------------------
+    // Wrapper for AdjDate that will round a timestamp to an even date rounding
+    // it downwards.
+    //------------------------------------------------------------------------------------------
+    function AdjStartDate($aTime,$aYearType=false,$aMonthType=false,$aDayType=false) {
+        return $this->AdjDate($aTime,0,$aYearType,$aMonthType,$aDayType);
+    }
+
+    //------------------------------------------------------------------------------------------
+    // Wrapper for AdjDate that will round a timestamp to an even date rounding
+    // it upwards
+    //------------------------------------------------------------------------------------------
+    function AdjEndDate($aTime,$aYearType=false,$aMonthType=false,$aDayType=false) {
+        return $this->AdjDate($aTime,1,$aYearType,$aMonthType,$aDayType);
+    }
+
+    //------------------------------------------------------------------------------------------
+    // Utility Function AdjTime()
+    // Description: Will round a given time stamp to an even time according to
+    // argument.
+    //------------------------------------------------------------------------------------------
+
+    function AdjTime($aTime,$aRound=0,$aHourType=false,$aMinType=false,$aSecType=false) {
+        $y = (int)date('Y',$aTime); $m = (int)date('m',$aTime); $d = (int)date('d',$aTime);
+        $h = (int)date('H',$aTime); $i = (int)date('i',$aTime); $s = (int)date('s',$aTime);
+        if( $aHourType !== false ) {
+            $aHourType %= 6;
+            $hourAdj = array(0=>1, 1=>2, 2=>3, 3=>4, 4=>6, 5=>12);
+            if( $aRound == 0 )
+            $h = floor($h/$hourAdj[$aHourType])*$hourAdj[$aHourType];
+            else {
+                if( ($h % $hourAdj[$aHourType]==0) && ($i > 0 || $s > 0) ) {
+                    $h++;
+                }
+                $h = ceil($h/$hourAdj[$aHourType])*$hourAdj[$aHourType];
+                if( $h >= 24 ) {
+                    $aTime += 86400;
+                    $y = (int)date('Y',$aTime); $m = (int)date('m',$aTime); $d = (int)date('d',$aTime);
+                    $h -= 24;
+                }
+            }
+            $i=0;$s=0;
+        }
+        elseif( $aMinType !== false ) {
+            $aMinType %= 5;
+            $minAdj = array(0=>1, 1=>5, 2=>10, 3=>15, 4=>30);
+            if( $aRound == 0 ) {
+                $i = floor($i/$minAdj[$aMinType])*$minAdj[$aMinType];
+            }
+            else {
+                if( ($i % $minAdj[$aMinType]==0) && $s > 0 ) {
+                    $i++;
+                }
+                $i = ceil($i/$minAdj[$aMinType])*$minAdj[$aMinType];
+                if( $i >= 60) {
+                    $aTime += 3600;
+                    $y = (int)date('Y',$aTime); $m = (int)date('m',$aTime); $d = (int)date('d',$aTime);
+                    $h = (int)date('H',$aTime); $i = 0;
+                }
+            }
+            $s=0;
+        }
+        elseif( $aSecType !== false ) {
+            $aSecType %= 5;
+            $secAdj = array(0=>1, 1=>5, 2=>10, 3=>15, 4=>30);
+            if( $aRound == 0 ) {
+                $s = floor($s/$secAdj[$aSecType])*$secAdj[$aSecType];
+            }
+            else {
+                $s = ceil($s/$secAdj[$aSecType]*1.0)*$secAdj[$aSecType];
+                if( $s >= 60) {
+                    $s=0;
+                    $aTime += 60;
+                    $y = (int)date('Y',$aTime); $m = (int)date('m',$aTime); $d = (int)date('d',$aTime);
+                    $h = (int)date('H',$aTime); $i = (int)date('i',$aTime);
+                }
+            }
+        }
+        return mktime($h,$i,$s,$m,$d,$y);
+    }
+
+    //------------------------------------------------------------------------------------------
+    // Wrapper for AdjTime that will round a timestamp to an even time rounding
+    // it downwards.
+    // Example: AdjStartTime(mktime(18,27,13,2,22,2005),false,2) => 18:20
+    //------------------------------------------------------------------------------------------
+    function AdjStartTime($aTime,$aHourType=false,$aMinType=false,$aSecType=false) {
+        return $this->AdjTime($aTime,0,$aHourType,$aMinType,$aSecType);
+    }
+
+    //------------------------------------------------------------------------------------------
+    // Wrapper for AdjTime that will round a timestamp to an even time rounding
+    // it upwards
+    // Example: AdjEndTime(mktime(18,27,13,2,22,2005),false,2) => 18:30
+    //------------------------------------------------------------------------------------------
+    function AdjEndTime($aTime,$aHourType=false,$aMinType=false,$aSecType=false) {
+        return $this->AdjTime($aTime,1,$aHourType,$aMinType,$aSecType);
+    }
+
+    //------------------------------------------------------------------------------------------
+    // DateAutoScale
+    // Autoscale a date axis given start and end time
+    // Returns an array ($start,$end,$major,$minor,$format)
+    //------------------------------------------------------------------------------------------
+    function DoDateAutoScale($aStartTime,$aEndTime,$aDensity=0,$aAdjust=true) {
+        // Format of array
+        // array ( Decision point,  array( array( Major-scale-step-array ),
+        //       array( Minor-scale-step-array ),
+        //       array( 0=date-adjust, 1=time-adjust, adjustment-alignment) )
+        //
+        $scalePoints =
+        array(
+        /* Intervall larger than 10 years */
+        SECPERYEAR*10,array(array(SECPERYEAR*5,SECPERYEAR*2),
+        array(SECPERYEAR),
+        array(0,YEARADJ_1, 0,YEARADJ_1) ),
+
+        /* Intervall larger than 2 years */
+        SECPERYEAR*2,array(array(SECPERYEAR),array(SECPERYEAR),
+        array(0,YEARADJ_1) ),
+
+        /* Intervall larger than 90 days (approx 3 month) */
+        SECPERDAY*90,array(array(SECPERDAY*30,SECPERDAY*14,SECPERDAY*7,SECPERDAY),
+        array(SECPERDAY*5,SECPERDAY*7,SECPERDAY,SECPERDAY),
+        array(0,MONTHADJ_1, 0,DAYADJ_WEEK, 0,DAYADJ_1, 0,DAYADJ_1)),
+
+        /* Intervall larger than 30 days (approx 1 month) */
+        SECPERDAY*30,array(array(SECPERDAY*14,SECPERDAY*7,SECPERDAY*2, SECPERDAY),
+        array(SECPERDAY,SECPERDAY,SECPERDAY,SECPERDAY),
+        array(0,DAYADJ_WEEK, 0,DAYADJ_1, 0,DAYADJ_1, 0,DAYADJ_1)),
+
+        /* Intervall larger than 7 days */
+        SECPERDAY*7,array(array(SECPERDAY,SECPERHOUR*12,SECPERHOUR*6,SECPERHOUR*2),
+        array(SECPERHOUR*6,SECPERHOUR*3,SECPERHOUR,SECPERHOUR),
+        array(0,DAYADJ_1, 1,HOURADJ_12, 1,HOURADJ_6, 1,HOURADJ_1)),
+
+        /* Intervall larger than 1 day */
+        SECPERDAY,array(array(SECPERDAY,SECPERHOUR*12,SECPERHOUR*6,SECPERHOUR*2,SECPERHOUR),
+        array(SECPERHOUR*6,SECPERHOUR*2,SECPERHOUR,SECPERHOUR,SECPERHOUR),
+        array(1,HOURADJ_12, 1,HOURADJ_6, 1,HOURADJ_1, 1,HOURADJ_1)),
+
+        /* Intervall larger than 12 hours */
+        SECPERHOUR*12,array(array(SECPERHOUR*2,SECPERHOUR,SECPERMIN*30,900,600),
+        array(1800,1800,900,300,300),
+        array(1,HOURADJ_1, 1,MINADJ_30, 1,MINADJ_15, 1,MINADJ_10, 1,MINADJ_5) ),
+
+        /* Intervall larger than 2 hours */
+        SECPERHOUR*2,array(array(SECPERHOUR,SECPERMIN*30,900,600,300),
+        array(1800,900,300,120,60),
+        array(1,HOURADJ_1, 1,MINADJ_30, 1,MINADJ_15, 1,MINADJ_10, 1,MINADJ_5) ),
+
+        /* Intervall larger than 1 hours */
+        SECPERHOUR,array(array(SECPERMIN*30,900,600,300),array(900,300,120,60),
+        array(1,MINADJ_30, 1,MINADJ_15, 1,MINADJ_10, 1,MINADJ_5) ),
+
+        /* Intervall larger than 30 min */
+        SECPERMIN*30,array(array(SECPERMIN*15,SECPERMIN*10,SECPERMIN*5,SECPERMIN),
+        array(300,300,60,10),
+        array(1,MINADJ_15, 1,MINADJ_10, 1,MINADJ_5, 1,MINADJ_1)),
+
+        /* Intervall larger than 1 min */
+        SECPERMIN,array(array(SECPERMIN,15,10,5),
+        array(15,5,2,1),
+        array(1,MINADJ_1, 1,SECADJ_15, 1,SECADJ_10, 1,SECADJ_5)),
+
+        /* Intervall larger than 10 sec */
+        10,array(array(5,2),
+        array(1,1),
+        array(1,SECADJ_5, 1,SECADJ_1)),
+
+        /* Intervall larger than 1 sec */
+        1,array(array(1),
+        array(1),
+        array(1,SECADJ_1)),
+        );
+
+        $ns = count($scalePoints);
+        // Establish major and minor scale units for the date scale
+        $diff = $aEndTime - $aStartTime;
+        if( $diff < 1 ) return false;
+        $done=false;
+        $i=0;
+        while( ! $done ) {
+            if( $diff > $scalePoints[2*$i] ) {
+                // Get major and minor scale for this intervall
+                $scaleSteps = $scalePoints[2*$i+1];
+                $major = $scaleSteps[0][min($aDensity,count($scaleSteps[0])-1)];
+                // Try to find out which minor step looks best
+                $minor = $scaleSteps[1][min($aDensity,count($scaleSteps[1])-1)];
+                if( $aAdjust ) {
+                    // Find out how we should align the start and end timestamps
+                    $idx = 2*min($aDensity,floor(count($scaleSteps[2])/2)-1);
+                    if( $scaleSteps[2][$idx] === 0 ) {
+                        // Use date adjustment
+                        $adj = $scaleSteps[2][$idx+1];
+                        if( $adj >= 30 ) {
+                            $start = $this->AdjStartDate($aStartTime,$adj-30);
+                            $end   = $this->AdjEndDate($aEndTime,$adj-30);
+                        }
+                        elseif( $adj >= 20 ) {
+                            $start = $this->AdjStartDate($aStartTime,false,$adj-20);
+                            $end   = $this->AdjEndDate($aEndTime,false,$adj-20);
+                        }
+                        else {
+                            $start = $this->AdjStartDate($aStartTime,false,false,$adj);
+                            $end   = $this->AdjEndDate($aEndTime,false,false,$adj);
+                            // We add 1 second for date adjustment to make sure we end on 00:00 the following day
+                            // This makes the final major tick be srawn when we step day-by-day instead of ending
+                            // on xx:59:59 which would not draw the final major tick
+                            $end++;
+                        }
+                    }
+                    else {
+                        // Use time adjustment
+                        $adj = $scaleSteps[2][$idx+1];
+                        if( $adj >= 30 ) {
+                            $start = $this->AdjStartTime($aStartTime,$adj-30);
+                            $end   = $this->AdjEndTime($aEndTime,$adj-30);
+                        }
+                        elseif( $adj >= 20 ) {
+                            $start = $this->AdjStartTime($aStartTime,false,$adj-20);
+                            $end   = $this->AdjEndTime($aEndTime,false,$adj-20);
+                        }
+                        else {
+                            $start = $this->AdjStartTime($aStartTime,false,false,$adj);
+                            $end   = $this->AdjEndTime($aEndTime,false,false,$adj);
+                        }
+                    }
+                }
+                // If the overall date span is larger than 1 day ten we show date
+                $format = '';
+                if( ($end-$start) > SECPERDAY ) {
+                    $format = 'Y-m-d ';
+                }
+                // If the major step is less than 1 day we need to whow hours + min
+                if( $major < SECPERDAY ) {
+                    $format .= 'H:i';
+                }
+                // If the major step is less than 1 min we need to show sec
+                if( $major < 60 ) {
+                    $format .= ':s';
+                }
+                $done=true;
+            }
+            ++$i;
+        }
+        return array($start,$end,$major,$minor,$format);
+    }
+
+    // Overrides the automatic determined date format. Must be a valid date() format string
+    function SetDateFormat($aFormat) {
+        $this->date_format = $aFormat;
+        $this->ticks->SetLabelDateFormat($this->date_format);
+    }
+
+    function AdjustForDST($aFlg=true) {
+        $this->ticks->AdjustForDST($aFlg);
+    }
+
+
+    function SetDateAlign($aStartAlign,$aEndAlign=false) {
+        if( $aEndAlign === false ) {
+            $aEndAlign=$aStartAlign;
+        }
+        $this->iStartAlign = $aStartAlign;
+        $this->iEndAlign = $aEndAlign;
+    }
+
+    function SetTimeAlign($aStartAlign,$aEndAlign=false) {
+        if( $aEndAlign === false ) {
+            $aEndAlign=$aStartAlign;
+        }
+        $this->iStartTimeAlign = $aStartAlign;
+        $this->iEndTimeAlign = $aEndAlign;
+    }
+
+
+    function AutoScale($img,$aStartTime,$aEndTime,$aNumSteps,$_adummy=false) {
+        // We need to have one dummy argument to make the signature of AutoScale()
+        // identical to LinearScale::AutoScale
+        if( $aStartTime == $aEndTime ) {
+            // Special case when we only have one data point.
+            // Create a small artifical intervall to do the autoscaling
+            $aStartTime -= 10;
+            $aEndTime += 10;
+        }
+        $done=false;
+        $i=0;
+        while( ! $done && $i < 5) {
+            list($adjstart,$adjend,$maj,$min,$format) = $this->DoDateAutoScale($aStartTime,$aEndTime,$i);
+            $n = floor(($adjend-$adjstart)/$maj);
+            if( $n * 1.7 > $aNumSteps ) {
+                $done=true;
+            }
+            $i++;
+        }
+
+        /*
+         if( 0 ) { // DEBUG
+         echo "    Start =".date("Y-m-d H:i:s",$aStartTime)."<br>";
+         echo "    End   =".date("Y-m-d H:i:s",$aEndTime)."<br>";
+         echo "Adj Start =".date("Y-m-d H:i:s",$adjstart)."<br>";
+         echo "Adj End   =".date("Y-m-d H:i:s",$adjend)."<p>";
+         echo "Major = $maj s, ".floor($maj/60)."min, ".floor($maj/3600)."h, ".floor($maj/86400)."day<br>";
+         echo "Min = $min s, ".floor($min/60)."min, ".floor($min/3600)."h, ".floor($min/86400)."day<br>";
+         echo "Format=$format<p>";
+         }
+         */
+
+        if( $this->iStartTimeAlign !== false && $this->iStartAlign !== false ) {
+            JpGraphError::RaiseL(3001);
+            //('It is only possible to use either SetDateAlign() or SetTimeAlign() but not both');
+        }
+
+        if( $this->iStartTimeAlign !== false ) {
+            if( $this->iStartTimeAlign >= 30 ) {
+                $adjstart = $this->AdjStartTime($aStartTime,$this->iStartTimeAlign-30);
+            }
+            elseif(  $this->iStartTimeAlign >= 20 ) {
+                $adjstart = $this->AdjStartTime($aStartTime,false,$this->iStartTimeAlign-20);
+            }
+            else {
+                $adjstart = $this->AdjStartTime($aStartTime,false,false,$this->iStartTimeAlign);
+            }
+        }
+        if( $this->iEndTimeAlign !== false ) {
+            if( $this->iEndTimeAlign >= 30 ) {
+                $adjend = $this->AdjEndTime($aEndTime,$this->iEndTimeAlign-30);
+            }
+            elseif(  $this->iEndTimeAlign >= 20 ) {
+                $adjend = $this->AdjEndTime($aEndTime,false,$this->iEndTimeAlign-20);
+            }
+            else {
+                $adjend = $this->AdjEndTime($aEndTime,false,false,$this->iEndTimeAlign);
+            }
+        }
+
+
+
+        if( $this->iStartAlign !== false ) {
+            if( $this->iStartAlign >= 30 ) {
+                $adjstart = $this->AdjStartDate($aStartTime,$this->iStartAlign-30);
+            }
+            elseif(  $this->iStartAlign >= 20 ) {
+                $adjstart = $this->AdjStartDate($aStartTime,false,$this->iStartAlign-20);
+            }
+            else {
+                $adjstart = $this->AdjStartDate($aStartTime,false,false,$this->iStartAlign);
+            }
+        }
+        if( $this->iEndAlign !== false ) {
+            if( $this->iEndAlign >= 30 ) {
+                $adjend = $this->AdjEndDate($aEndTime,$this->iEndAlign-30);
+            }
+            elseif(  $this->iEndAlign >= 20 ) {
+                $adjend = $this->AdjEndDate($aEndTime,false,$this->iEndAlign-20);
+            }
+            else {
+                $adjend = $this->AdjEndDate($aEndTime,false,false,$this->iEndAlign);
+            }
+        }
+        $this->Update($img,$adjstart,$adjend);
+        if( ! $this->ticks->IsSpecified() )
+        $this->ticks->Set($maj,$min);
+        if( $this->date_format == '' )
+        $this->ticks->SetLabelDateFormat($format);
+        else
+        $this->ticks->SetLabelDateFormat($this->date_format);
+    }
+}
+
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_errhandler.inc.php b/common/lib/jpgraph_lib/jpgraph_errhandler.inc.php
new file mode 100644
index 000000000..c15361e3f
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_errhandler.inc.php
@@ -0,0 +1,369 @@
+<?php
+//=======================================================================
+// File:        JPGRAPH_ERRHANDLER.PHP
+// Description: Error handler class together with handling of localized
+//              error messages. All localized error messages are stored
+//              in a separate file under the "lang/" subdirectory.
+// Created:     2006-09-24
+// Ver:         $Id: jpgraph_errhandler.inc.php 1920 2009-12-08 10:02:26Z ljp $
+//
+// Copyright 2006 (c) Aditus Consulting. All rights reserved.
+//========================================================================
+
+if( !defined('DEFAULT_ERR_LOCALE') ) {
+    define('DEFAULT_ERR_LOCALE','en');
+}
+
+if( !defined('USE_IMAGE_ERROR_HANDLER') ) {
+    define('USE_IMAGE_ERROR_HANDLER',true);
+}
+
+GLOBAL $__jpg_err_locale ;
+$__jpg_err_locale = DEFAULT_ERR_LOCALE;
+
+class ErrMsgText {
+    private $lt=NULL;
+    function __construct() {
+        GLOBAL $__jpg_err_locale;
+        $file = 'lang/'.$__jpg_err_locale.'.inc.php';
+
+        // If the chosen locale doesn't exist try english
+        if( !file_exists(dirname(__FILE__).'/'.$file) ) {
+            $__jpg_err_locale = 'en';
+        }
+
+        $file = 'lang/'.$__jpg_err_locale.'.inc.php';
+        if( !file_exists(dirname(__FILE__).'/'.$file) ) {
+            die('Chosen locale file ("'.$file.'") for error messages does not exist or is not readable for the PHP process. Please make sure that the file exists and that the file permissions are such that the PHP process is allowed to read this file.');
+        }
+        require($file);
+        $this->lt = $_jpg_messages;
+    }
+
+    function Get($errnbr,$a1=null,$a2=null,$a3=null,$a4=null,$a5=null) {
+        GLOBAL $__jpg_err_locale;
+        if( !isset($this->lt[$errnbr]) ) {
+            return 'Internal error: The specified error message ('.$errnbr.') does not exist in the chosen locale ('.$__jpg_err_locale.')';
+        }
+        $ea = $this->lt[$errnbr];
+        $j=0;
+        if( $a1 !== null ) {
+            $argv[$j++] = $a1;
+            if( $a2 !== null ) {
+                $argv[$j++] = $a2;
+                if( $a3 !== null ) {
+                    $argv[$j++] = $a3;
+                    if( $a4 !== null ) {
+                        $argv[$j++] = $a4;
+                        if( $a5 !== null ) {
+                            $argv[$j++] = $a5;
+                        }
+                    }
+                }
+            }
+        }
+        $numargs = $j;
+        if( $ea[1] != $numargs ) {
+            // Error message argument count do not match.
+            // Just return the error message without arguments.
+            return $ea[0];
+        }
+        switch( $numargs ) {
+            case 1:
+                $msg = sprintf($ea[0],$argv[0]);
+                break;
+            case 2:
+                $msg = sprintf($ea[0],$argv[0],$argv[1]);
+                break;
+            case 3:
+                $msg = sprintf($ea[0],$argv[0],$argv[1],$argv[2]);
+                break;
+            case 4:
+                $msg = sprintf($ea[0],$argv[0],$argv[1],$argv[2],$argv[3]);
+                break;
+            case 5:
+                $msg = sprintf($ea[0],$argv[0],$argv[1],$argv[2],$argv[3],$argv[4]);
+                break;
+            case 0:
+            default:
+                $msg = sprintf($ea[0]);
+                break;
+        }
+        return $msg;
+    }
+}
+     
+//
+// A wrapper class that is used to access the specified error object
+// (to hide the global error parameter and avoid having a GLOBAL directive
+// in all methods.
+//
+class JpGraphError {
+    private static $__iImgFlg = true;
+    private static $__iLogFile = '';
+    private static $__iTitle = 'JpGraph Error: ';
+    public static function Raise($aMsg,$aHalt=true){
+        throw new JpGraphException($aMsg);
+    }
+    public static function SetErrLocale($aLoc) {
+        GLOBAL $__jpg_err_locale ;
+        $__jpg_err_locale = $aLoc;
+    }
+    public static function RaiseL($errnbr,$a1=null,$a2=null,$a3=null,$a4=null,$a5=null) {
+        throw new JpGraphExceptionL($errnbr,$a1,$a2,$a3,$a4,$a5);
+    }
+    public static function SetImageFlag($aFlg=true) {
+    	self::$__iImgFlg = $aFlg;
+    }
+    public static function GetImageFlag() {
+    	return self::$__iImgFlg;
+    }
+    public static function SetLogFile($aFile) {
+    	self::$__iLogFile = $aFile;
+    }
+    public static function GetLogFile() {
+    	return self::$__iLogFile;
+    }
+    public static function SetTitle($aTitle) {
+    	self::$__iTitle = $aTitle;
+    }
+    public static function GetTitle() {
+    	return self::$__iTitle;
+    }    
+}
+
+class JpGraphException extends Exception {
+    // Redefine the exception so message isn't optional
+    public function __construct($message, $code = 0) {
+        // make sure everything is assigned properly
+        parent::__construct($message, $code);
+    }
+    // custom string representation of object
+    public function _toString() {
+        return __CLASS__ . ": [{$this->code}]: {$this->message} at " . basename($this->getFile()) . ":" . $this->getLine() . "\n" . $this->getTraceAsString() . "\n";
+    }
+    // custom representation of error as an image
+    public function Stroke() {
+    	if( JpGraphError::GetImageFlag() ) {
+        	$errobj = new JpGraphErrObjectImg();
+        	$errobj->SetTitle(JpGraphError::GetTitle());
+    	}
+    	else {    		
+    		$errobj = new JpGraphErrObject();
+        	$errobj->SetTitle(JpGraphError::GetTitle());    		
+    		$errobj->SetStrokeDest(JpGraphError::GetLogFile());
+    	}
+        $errobj->Raise($this->getMessage());
+    }
+    static public function defaultHandler(Exception $exception) {
+        global $__jpg_OldHandler;
+        if( $exception instanceof JpGraphException ) {
+            $exception->Stroke();
+        }
+        else {
+            // Restore old handler
+            if( $__jpg_OldHandler !== NULL ) {
+                set_exception_handler($__jpg_OldHandler);
+            }
+            throw $exception;
+        }
+    }
+}
+
+class JpGraphExceptionL extends JpGraphException {
+   // Redefine the exception so message isn't optional
+    public function __construct($errcode,$a1=null,$a2=null,$a3=null,$a4=null,$a5=null) {
+        // make sure everything is assigned properly
+        $errtxt = new ErrMsgText();
+        JpGraphError::SetTitle('JpGraph Error: '.$errcode);
+        parent::__construct($errtxt->Get($errcode,$a1,$a2,$a3,$a4,$a5), 0);
+    }
+}
+
+// Setup the default handler
+global $__jpg_OldHandler;
+$__jpg_OldHandler = set_exception_handler(array('JpGraphException','defaultHandler'));
+
+//
+// First of all set up a default error handler
+//
+
+//=============================================================
+// The default trivial text error handler.
+//=============================================================
+class JpGraphErrObject {
+
+    protected $iTitle = "JpGraph error: ";
+    protected $iDest = false;
+
+
+    function __construct() {
+        // Empty. Reserved for future use
+    }
+
+    function SetTitle($aTitle) {
+        $this->iTitle = $aTitle;
+    }
+
+    function SetStrokeDest($aDest) {
+        $this->iDest = $aDest;
+    }
+
+    // If aHalt is true then execution can't continue. Typical used for fatal errors
+    function Raise($aMsg,$aHalt=false) {
+        if( $this->iDest != '' ) {
+        	if( $this->iDest == 'syslog' ) {
+        		error_log($this->iTitle.$aMsg);	
+        	} 
+        	else {
+        		$str = '['.date('r').'] '.$this->iTitle.$aMsg."\n";
+        		$f = @fopen($this->iDest,'a');
+    	        if( $f ) {            	
+        	        @fwrite($f,$str);
+            	    @fclose($f);
+            	}
+        	}
+        }
+        else {
+        	$aMsg = $this->iTitle.$aMsg;        	
+        	// Check SAPI and if we are called from the command line
+        	// send the error to STDERR instead
+        	if( PHP_SAPI == 'cli' ) {
+        		fwrite(STDERR,$aMsg);
+        	}
+        	else {
+            	echo $aMsg;
+        	}
+        }
+        if( $aHalt )
+        	exit(1);
+    }
+}
+
+//==============================================================
+// An image based error handler
+//==============================================================
+class JpGraphErrObjectImg extends JpGraphErrObject {
+    
+    function __construct() {
+        parent::__construct();
+        // Empty. Reserved for future use
+    }
+
+    function Raise($aMsg,$aHalt=true) {
+        $img_iconerror =
+     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAAaV'.
+     'BMVEX//////2Xy8mLl5V/Z2VvMzFi/v1WyslKlpU+ZmUyMjEh/'.
+     'f0VyckJlZT9YWDxMTDjAwMDy8sLl5bnY2K/MzKW/v5yyspKlpY'.
+     'iYmH+MjHY/PzV/f2xycmJlZVlZWU9MTEXY2Ms/PzwyMjLFTjea'.
+     'AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACx'.
+     'IAAAsSAdLdfvwAAAAHdElNRQfTBgISOCqusfs5AAABLUlEQVR4'.
+     '2tWV3XKCMBBGWfkranCIVClKLd/7P2Q3QsgCxjDTq+6FE2cPH+'.
+     'xJ0Ogn2lQbsT+Wrs+buAZAV4W5T6Bs0YXBBwpKgEuIu+JERAX6'.
+     'wM2rHjmDdEITmsQEEmWADgZm6rAjhXsoMGY9B/NZBwJzBvn+e3'.
+     'wHntCAJdGu9SviwIwoZVDxPB9+Rc0TSEbQr0j3SA1gwdSn6Db0'.
+     '6Tm1KfV6yzWGQO7zdpvyKLKBDmRFjzeB3LYgK7r6A/noDAfjtS'.
+     'IXaIzbJSv6WgUebTMV4EoRB8a2mQiQjgtF91HdKDKZ1gtFtQjk'.
+     'YcWaR5OKOhkYt+ZsTFdJRfPAApOpQYJTNHvCRSJR6SJngQadfc'.
+     'vd69OLMddVOPCGVnmrFD8bVYd3JXfxXPtLR/+mtv59/ALWiiMx'.
+     'qL72fwAAAABJRU5ErkJggg==' ;
+
+        
+        if( function_exists("imagetypes") ) {
+            $supported = imagetypes();
+        } else {
+            $supported = 0;
+        }
+
+        if( !function_exists('imagecreatefromstring') ) {
+            $supported = 0;
+        }
+        
+        if( ob_get_length() || headers_sent() || !($supported & IMG_PNG) ) {
+            // Special case for headers already sent or that the installation doesn't support
+            // the PNG format (which the error icon is encoded in).
+            // Dont return an image since it can't be displayed
+            die($this->iTitle.' '.$aMsg);
+        }
+
+        $aMsg = wordwrap($aMsg,55);
+        $lines = substr_count($aMsg,"\n");
+
+        // Create the error icon GD
+        $erricon = Image::CreateFromString(base64_decode($img_iconerror));
+
+        // Create an image that contains the error text.
+        $w=400;
+        $h=100 + 15*max(0,$lines-3);
+
+        $img = new Image($w,$h);
+
+
+        // Drop shadow
+        $img->SetColor("gray");
+        $img->FilledRectangle(5,5,$w-1,$h-1,10);
+        $img->SetColor("gray:0.7");
+        $img->FilledRectangle(5,5,$w-3,$h-3,10);
+
+        // Window background
+        $img->SetColor("lightblue");
+        $img->FilledRectangle(1,1,$w-5,$h-5);
+        $img->CopyCanvasH($img->img,$erricon,5,30,0,0,40,40);
+
+        // Window border
+        $img->SetColor("black");
+        $img->Rectangle(1,1,$w-5,$h-5);
+        $img->Rectangle(0,0,$w-4,$h-4);
+
+        // Window top row
+        $img->SetColor("darkred");
+        for($y=3; $y < 18; $y += 2 )
+        $img->Line(1,$y,$w-6,$y);
+
+        // "White shadow"
+        $img->SetColor("white");
+
+        // Left window edge
+        $img->Line(2,2,2,$h-5);
+        $img->Line(2,2,$w-6,2);
+
+        // "Gray button shadow"
+        $img->SetColor("darkgray");
+
+        // Gray window shadow
+        $img->Line(2,$h-6,$w-5,$h-6);
+        $img->Line(3,$h-7,$w-5,$h-7);
+
+        // Window title
+        $m = floor($w/2-5);
+        $l = 110;
+        $img->SetColor("lightgray:1.3");
+        $img->FilledRectangle($m-$l,2,$m+$l,16);
+
+        // Stroke text
+        $img->SetColor("darkred");
+        $img->SetFont(FF_FONT2,FS_BOLD);
+        $img->StrokeText($m-90,15,$this->iTitle);
+        $img->SetColor("black");
+        $img->SetFont(FF_FONT1,FS_NORMAL);
+        $txt = new Text($aMsg,52,25);
+        $txt->SetFont(FF_FONT1);
+        $txt->Align("left","top");
+        $txt->Stroke($img);
+        if ($this->iDest) {
+            $img->Stream($this->iDest);
+        } else {
+            $img->Headers();
+            $img->Stream();
+        }
+        if( $aHalt )
+            die();
+    }
+}
+
+
+
+if( ! USE_IMAGE_ERROR_HANDLER ) {
+	JpGraphError::SetImageFlag(false);
+}
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_error.php b/common/lib/jpgraph_lib/jpgraph_error.php
old mode 100644
new mode 100755
index 3cc1a24dc..3ef3ca5b7
--- a/common/lib/jpgraph_lib/jpgraph_error.php
+++ b/common/lib/jpgraph_lib/jpgraph_error.php
@@ -1,164 +1,157 @@
 <?php
 /*=======================================================================
-// File: 	JPGRAPH_ERROR.PHP
-// Description:	Error plot extension for JpGraph
-// Created: 	2001-01-08
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_error.php,v 1.16.2.2 2004/12/13 00:49:30 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2001,2002 Johan Persson
-//========================================================================
-*/
-
+ // File:        JPGRAPH_ERROR.PHP
+ // Description: Error plot extension for JpGraph
+ // Created:     2001-01-08
+ // Ver:         $Id: jpgraph_error.php 1106 2009-02-22 20:16:35Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+   
 //===================================================
 // CLASS ErrorPlot
 // Description: Error plot with min/max value for
 // each datapoint
 //===================================================
-class ErrorPlot extends Plot
-{
-    public $errwidth=2;
-//---------------
-// CONSTRUCTOR
-    public function ErrorPlot(&$datay,$datax=false)
-    {
-    $this->Plot($datay,$datax);
-    $this->numpoints /= 2;
+class ErrorPlot extends Plot {
+    private $errwidth=2;
+    
+    //---------------
+    // CONSTRUCTOR
+    function __construct($datay,$datax=false) {
+        parent::__construct($datay,$datax);
+        $this->numpoints /= 2;
     }
-//---------------
-// PUBLIC METHODS
+    //---------------
+    // PUBLIC METHODS
 
     // Gets called before any axis are stroked
-    public function PreStrokeAdjust(&$graph)
-    {
-    if ($this->center) {
-        $a=0.5; $b=0.5;
-        ++$this->numpoints;
-    } else {
-        $a=0; $b=0;
-    }
-    $graph->xaxis->scale->ticks->SetXLabelOffset($a);
-    $graph->SetTextScaleOff($b);
-    //$graph->xaxis->scale->ticks->SupressMinorTickMarks();
+    function PreStrokeAdjust($graph) {
+        if( $this->center ) {
+            $a=0.5; $b=0.5;
+            ++$this->numpoints;
+        } else {
+            $a=0; $b=0;
+        }
+        $graph->xaxis->scale->ticks->SetXLabelOffset($a);
+        $graph->SetTextScaleOff($b);
+        //$graph->xaxis->scale->ticks->SupressMinorTickMarks();
     }
 
     // Method description
-    public function Stroke(&$img,&$xscale,&$yscale)
-    {
-    $numpoints=count($this->coords[0])/2;
-    $img->SetColor($this->color);
-    $img->SetLineWeight($this->weight);
+    function Stroke($img,$xscale,$yscale) {
+        $numpoints=count($this->coords[0])/2;
+        $img->SetColor($this->color);
+        $img->SetLineWeight($this->weight);
 
-    if ( isset($this->coords[1]) ) {
-        if( count($this->coords[1])!=$numpoints )
-        JpGraphError::Raise("Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])." Number of Y-points:$numpoints");
+        if( isset($this->coords[1]) ) {
+            if( count($this->coords[1])!=$numpoints )
+            JpGraphError::RaiseL(2003,count($this->coords[1]),$numpoints);
+            //("Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])." Number of Y-points:$numpoints");
+            else
+            $exist_x = true;
+        }
         else
-        $exist_x = true;
-    } else
         $exist_x = false;
 
-    for ($i=0; $i<$numpoints; ++$i) {
-        if( $exist_x )
-        $x=$this->coords[1][$i];
-        else
-        $x=$i;
-
-        if( !is_numeric($x) ||
-        !is_numeric($this->coords[0][$i*2]) || !is_numeric($this->coords[0][$i*2+1]) ) {
-        continue;
-        }
+        for( $i=0; $i<$numpoints; ++$i) {
+            if( $exist_x )
+            $x=$this->coords[1][$i];
+            else
+            $x=$i;
 
-        $xt = $xscale->Translate($x);
-        $yt1 = $yscale->Translate($this->coords[0][$i*2]);
-        $yt2 = $yscale->Translate($this->coords[0][$i*2+1]);
-        $img->Line($xt,$yt1,$xt,$yt2);
-        $img->Line($xt-$this->errwidth,$yt1,$xt+$this->errwidth,$yt1);
-        $img->Line($xt-$this->errwidth,$yt2,$xt+$this->errwidth,$yt2);
-    }
+            if( !is_numeric($x) ||
+            !is_numeric($this->coords[0][$i*2]) || !is_numeric($this->coords[0][$i*2+1]) ) {
+                continue;
+            }
 
-    return true;
+            $xt = $xscale->Translate($x);
+            $yt1 = $yscale->Translate($this->coords[0][$i*2]);
+            $yt2 = $yscale->Translate($this->coords[0][$i*2+1]);
+            $img->Line($xt,$yt1,$xt,$yt2);
+            $img->Line($xt-$this->errwidth,$yt1,$xt+$this->errwidth,$yt1);
+            $img->Line($xt-$this->errwidth,$yt2,$xt+$this->errwidth,$yt2);
+        }
+        return true;
     }
 } // Class
 
+
 //===================================================
 // CLASS ErrorLinePlot
 // Description: Combine a line and error plot
 // THIS IS A DEPRECATED PLOT TYPE JUST KEPT FOR
 // BACKWARD COMPATIBILITY
 //===================================================
-class ErrorLinePlot extends ErrorPlot
-{
+class ErrorLinePlot extends ErrorPlot {
     public $line=null;
-//---------------
-// CONSTRUCTOR
-    public function ErrorLinePlot(&$datay,$datax=false)
-    {
-    $this->ErrorPlot($datay,$datax);
-    // Calculate line coordinates as the average of the error limits
-    for ($i=0; $i < count($datay); $i+=2 ) {
-        $ly[]=($datay[$i]+$datay[$i+1])/2;
-    }
-    $this->line=new LinePlot($ly,$datax);
+    //---------------
+    // CONSTRUCTOR
+    function __construct($datay,$datax=false) {
+        parent::__construct($datay,$datax);
+        // Calculate line coordinates as the average of the error limits
+        $n = count($datay);
+        for($i=0; $i < $n; $i+=2 ) {
+            $ly[]=($datay[$i]+$datay[$i+1])/2;
+        }
+        $this->line=new LinePlot($ly,$datax);
     }
 
-//---------------
-// PUBLIC METHODS
-    public function Legend(&$graph)
-    {
-    if( $this->legend != "" )
+    //---------------
+    // PUBLIC METHODS
+    function Legend($graph) {
+        if( $this->legend != "" )
         $graph->legend->Add($this->legend,$this->color);
-    $this->line->Legend($graph);
+        $this->line->Legend($graph);
     }
-
-    public function Stroke(&$img,&$xscale,&$yscale)
-    {
-    parent::Stroke($img,$xscale,$yscale);
-    $this->line->Stroke($img,$xscale,$yscale);
+     
+    function Stroke($img,$xscale,$yscale) {
+        parent::Stroke($img,$xscale,$yscale);
+        $this->line->Stroke($img,$xscale,$yscale);
     }
 } // Class
 
+
 //===================================================
 // CLASS LineErrorPlot
 // Description: Combine a line and error plot
 //===================================================
-class LineErrorPlot extends ErrorPlot
-{
+class LineErrorPlot extends ErrorPlot {
     public $line=null;
-//---------------
-// CONSTRUCTOR
+    //---------------
+    // CONSTRUCTOR
     // Data is (val, errdeltamin, errdeltamax)
-    public function LineErrorPlot(&$datay,$datax=false)
-    {
-    $ly=array(); $ey=array();
-    $n = count($datay);
-    if ($n % 3 != 0) {
-        JpGraphError::Raise('Error in input data to LineErrorPlot.'.
-        'Number of data points must be a multiple of 3');
-    }
-    for ($i=0; $i < count($datay); $i+=3 ) {
-        $ly[]=$datay[$i];
-        $ey[]=$datay[$i]+$datay[$i+1];
-        $ey[]=$datay[$i]+$datay[$i+2];
-    }
-    $this->ErrorPlot($ey,$datax);
-    $this->line=new LinePlot($ly,$datax);
+    function __construct($datay,$datax=false) {
+        $ly=array(); $ey=array();
+        $n = count($datay);
+        if( $n % 3 != 0 ) {
+            JpGraphError::RaiseL(4002);
+            //('Error in input data to LineErrorPlot. Number of data points must be a multiple of 3');
+        }
+        for($i=0; $i < $n; $i+=3 ) {
+            $ly[]=$datay[$i];
+            $ey[]=$datay[$i]+$datay[$i+1];
+            $ey[]=$datay[$i]+$datay[$i+2];
+        }
+        parent::__construct($ey,$datax);
+        $this->line=new LinePlot($ly,$datax);
     }
 
-//---------------
-// PUBLIC METHODS
-    public function Legend(&$graph)
-    {
-    if( $this->legend != "" )
+    //---------------
+    // PUBLIC METHODS
+    function Legend($graph) {
+        if( $this->legend != "" )
         $graph->legend->Add($this->legend,$this->color);
-    $this->line->Legend($graph);
+        $this->line->Legend($graph);
     }
-
-    public function Stroke(&$img,&$xscale,&$yscale)
-    {
-    parent::Stroke($img,$xscale,$yscale);
-    $this->line->Stroke($img,$xscale,$yscale);
+     
+    function Stroke($img,$xscale,$yscale) {
+        parent::Stroke($img,$xscale,$yscale);
+        $this->line->Stroke($img,$xscale,$yscale);
     }
 } // Class
 
+
 /* EOF */
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_flags.php b/common/lib/jpgraph_lib/jpgraph_flags.php
old mode 100644
new mode 100755
index a8d2cb4c3..a7e218779
--- a/common/lib/jpgraph_lib/jpgraph_flags.php
+++ b/common/lib/jpgraph_lib/jpgraph_flags.php
@@ -1,13 +1,11 @@
 <?php
 //=======================================================================
-// File:	JPGRAPH_FLAGS.PHP
-// Description:	Class Jpfile. Handles plotmarks
-// Created: 	2003-06-28
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_flags.php,v 1.2.2.6 2003/08/26 20:33:56 aditus Exp $
+// File:        JPGRAPH_FLAGS.PHP
+// Description: Class Jpfile. Handles plotmarks
+// Created:     2003-06-28
+// Ver:         $Id: jpgraph_flags.php 1106 2009-02-22 20:16:35Z ljp $
 //
-// License:	This code is released under QPL 1.0
-// Copyright (C) 2003 Johan Persson
+// Copyright (c) Asial Corporation. All rights reserved.
 //========================================================================
 
 //------------------------------------------------------------
@@ -18,8 +16,8 @@
 DEFINE('FLAGSIZE3',3);
 DEFINE('FLAGSIZE4',4);
 
-class FlagImages
-{
+class FlagImages {
+
     public $iCountryNameMap = array(
     'Afghanistan' => 'afgh',
     'Republic of Angola' => 'agla',
@@ -37,6 +35,7 @@ class FlagImages
     'Commonwealth of Australia' => 'astl',
     'Republic of Austria' => 'aust',
     'Azerbaijani Republic' => 'azer',
+    'Bangladesh' => 'bngl',
     'British Antarctic Territory' => 'bant',
     'Kingdom of Belgium' => 'belg',
     'British Overseas Territory of Bermuda' => 'berm',
@@ -63,6 +62,7 @@ class FlagImages
     'Republic of Cape Verde' => 'cave',
     'Republic of Chad' => 'chad',
     'Republic of Chile' => 'chil',
+    'Peoples Republic of China' => 'chin',
     'Territory of Christmas Island' => 'chms',
     'Commonwealth of Independent States' => 'cins',
     'Cook Islands' => 'ckis',
@@ -188,6 +188,7 @@ class FlagImages
     'Republic of Palau' => 'pala',
     'Independent State of Papua New Guinea' => 'pang',
     'Republic of Paraguay' => 'para',
+    'Republic of Peru' => 'peru',
     'Republic of the Philippines' => 'phil',
     'British Overseas Territory of the Pitcairn Islands' => 'piis',
     'Republic of Poland' => 'pola',
@@ -195,6 +196,7 @@ class FlagImages
     'Commonwealth of Puerto Rico' => 'purc',
     'State of Qatar' => 'qata',
     'Russian Federation' => 'russ',
+    'Romania' => 'rmna',
     'Republic of Rwanda' => 'rwan',
     'Kingdom of Saudi Arabia' => 'saar',
     'Republic of San Marino' => 'sama',
@@ -202,6 +204,7 @@ class FlagImages
     'Sark' => 'sark',
     'Scotland' => 'scot',
     'Principality of Seborga' => 'sebo',
+    'Republic of Serbia' => 'serb',
     'Republic of Sierra Leone' => 'sile',
     'Republic of Singapore' => 'sing',
     'Republic of Korea' => 'skor',
@@ -222,6 +225,7 @@ class FlagImages
     'Syrian Arab Republic' => 'syra',
     'Kingdom of Swaziland' => 'szld',
     'Republic of China' => 'taiw',
+    'Taiwan' => 'taiw',
     'Republic of Tajikistan' => 'tajk',
     'United Republic of Tanzania' => 'tanz',
     'Kingdom of Thailand' => 'thal',
@@ -251,111 +255,122 @@ class FlagImages
     'Democratic Republic of Congo' => 'zare',
     'Republic of Zimbabwe' => 'zbwe' ) ;
 
-    public $iFlagCount = -1;
-    public $iFlagSetMap = array(
+
+    private $iFlagCount = -1;
+    private $iFlagSetMap = array(
     FLAGSIZE1 => 'flags_thumb35x35',
     FLAGSIZE2 => 'flags_thumb60x60',
     FLAGSIZE3 => 'flags_thumb100x100',
     FLAGSIZE4 => 'flags'
     );
 
-    public $iFlagData ;
-    public $iOrdIdx=array();
+    private $iFlagData ;
+    private $iOrdIdx=array();
 
-    public function FlagImages($aSize=FLAGSIZE1)
-    {
-    switch ($aSize) {
-        case FLAGSIZE1 :
-        case FLAGSIZE2 :
-        case FLAGSIZE3 :
-        case FLAGSIZE4 :
-        $file = dirname(__FILE__).'/'.$this->iFlagSetMap[$aSize].'.dat';
-        $fp = fopen($file,'rb');
-        $rawdata = fread($fp,filesize($file));
-        $this->iFlagData = unserialize($rawdata);
-        break;
-        default:
-        JpGraphError::Raise('Unknown flag size. ('.$aSize.')');
-        die();
-    }
-    $this->iFlagCount = count($this->iCountryNameMap);
+    function FlagImages($aSize=FLAGSIZE1) {
+        switch($aSize) {
+            case FLAGSIZE1 :
+            case FLAGSIZE2 :
+            case FLAGSIZE3 :
+            case FLAGSIZE4 :
+                $file = dirname(__FILE__).'/'.$this->iFlagSetMap[$aSize].'.dat';
+                $fp = fopen($file,'rb');
+                $rawdata = fread($fp,filesize($file));
+                $this->iFlagData = unserialize($rawdata);
+                break;
+            default:
+                JpGraphError::RaiseL(5001,$aSize);
+                //('Unknown flag size. ('.$aSize.')');
+        }
+        $this->iFlagCount = count($this->iCountryNameMap);
     }
 
-    public function GetNum()
-    {
-    return $this->iFlagCount;
+    function GetNum() {
+        return $this->iFlagCount;
     }
 
-    public function GetImgByName($aName,&$outFullName)
-    {
-    $idx = $this->GetIdxByName($aName,$outFullName);
-
-    return $this->GetImgByIdx($idx);
+    function GetImgByName($aName,&$outFullName) {
+        $idx = $this->GetIdxByName($aName,$outFullName);
+        return $this->GetImgByIdx($idx);
     }
 
-    public function GetImgByIdx($aIdx)
-    {
-    if ( array_key_exists($aIdx,$this->iFlagData) ) {
-        $d = $this->iFlagData[$aIdx][1];
-
-        return Image::CreateFromString($d);
-    } else {
-        JpGraphError::Raise("Flag index \"�$aIdx\" does not exist.");
-    }
+    function GetImgByIdx($aIdx) {
+        if( array_key_exists($aIdx,$this->iFlagData) ) {
+            $d = $this->iFlagData[$aIdx][1];
+            return Image::CreateFromString($d);
+        }
+        else {
+            JpGraphError::RaiseL(5002,$aIdx);
+            //("Flag index \"�$aIdx\" does not exist.");
+        }
     }
 
-    public function GetIdxByOrdinal($aOrd,&$outFullName)
-    {
-    $aOrd--;
-    $n = count($this->iOrdIdx);
-    if ($n == 0) {
-        reset($this->iCountryNameMap);
-        $this->iOrdIdx=array();
-        $i=0;
-        while ( list($key,$val) = each($this->iCountryNameMap) ) {
-        $this->iOrdIdx[$i++] = array($val,$key);
+    function GetIdxByOrdinal($aOrd,&$outFullName) {
+        $aOrd--;
+        $n = count($this->iOrdIdx);
+        if( $n == 0 ) {
+            reset($this->iCountryNameMap);
+            $this->iOrdIdx=array();
+            $i=0;
+            while( list($key,$val) = each($this->iCountryNameMap) ) {
+                $this->iOrdIdx[$i++] = array($val,$key);
+            }
+            $tmp=$this->iOrdIdx[$aOrd];
+            $outFullName = $tmp[1];
+            return $tmp[0];
+             
+        }
+        elseif( $aOrd >= 0 && $aOrd < $n ) {
+            $tmp=$this->iOrdIdx[$aOrd];
+            $outFullName = $tmp[1];
+            return $tmp[0];
         }
-        $tmp=$this->iOrdIdx[$aOrd];
-        $outFullName = $tmp[1];
+        else {
+            JpGraphError::RaiseL(5003,$aOrd);
+            //('Invalid ordinal number specified for flag index.');
+        }
+    }
 
-        return $tmp[0];
+    function GetIdxByName($aName,&$outFullName) {
 
-    } elseif ($aOrd >= 0 && $aOrd < $n) {
-        $tmp=$this->iOrdIdx[$aOrd];
-        $outFullName = $tmp[1];
+        if( is_integer($aName) ) {
+            $idx = $this->GetIdxByOrdinal($aName,$outFullName);
+            return $idx;
+        }
 
-        return $tmp[0];
-    } else {
-        JpGraphError::Raise('Invalid ordinal number specified for flag index.');
-    }
+        $found=false;
+        $aName = strtolower($aName);
+        $nlen = strlen($aName);
+        reset($this->iCountryNameMap);
+        // Start by trying to match exact index name
+        while( list($key,$val) = each($this->iCountryNameMap) ) {
+            if( $nlen == strlen($val) && $val == $aName )  {
+                $found=true;
+                break;
+            }
+        }
+        if( !$found ) {
+            reset($this->iCountryNameMap);
+            // If the exact index doesn't work try a (partial) full name
+            while( list($key,$val) = each($this->iCountryNameMap) ) {
+                if( strpos(strtolower($key), $aName) !== false ) {
+                    $found=true;
+                    break;
+                }
+            }
+        }
+        if( $found ) {
+            $outFullName = $key;
+            return $val;
+        }
+        else {
+            JpGraphError::RaiseL(5004,$aName);
+            //("The (partial) country name \"$aName\" does not have a cooresponding flag image. The flag may still exist but under another name, e.g. insted of \"usa\" try \"united states\".");
+        }
     }
+}
 
-    public function GetIdxByName($aName,&$outFullName)
-    {
-    if ( is_integer($aName) ) {
-        $idx = $this->GetIdxByOrdinal($aName,$outFullName);
 
-        return $idx;
-    }
 
-    $found=false;
-    $aName = strtolower($aName);
-    $nlen = strlen($aName);
-    reset($this->iCountryNameMap);
-    // Match partial full country name or exact idx name
-    while ( list($key,$val) = each($this->iCountryNameMap) ) {
-        if( strpos(strtolower($key), $aName) !== false ||
-                ($nlen == strlen($val) && $val == $aName) ) {
-        $found=true;
-        break;
-        }
-    }
-    if ($found) {
-        $outFullName = $key;
 
-        return $val;
-    } else {
-        JpGraphError::Raise("The (partial) country name \"$aName\" does not have a cooresponding flag image. The flag may still exist but under another name, e.g. insted of \"usa\" try \"united states\".");
-    }
-    }
-}
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_gantt.php b/common/lib/jpgraph_lib/jpgraph_gantt.php
old mode 100644
new mode 100755
index d7414c360..d5afa6548
--- a/common/lib/jpgraph_lib/jpgraph_gantt.php
+++ b/common/lib/jpgraph_lib/jpgraph_gantt.php
@@ -1,322 +1,324 @@
 <?php
 /*=======================================================================
-// File:	JPGRAPH_GANTT.PHP
-// Description:	JpGraph Gantt plot extension
-// Created: 	2001-11-12
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_gantt.php,v 1.46.2.55 2005/01/10 19:56:58 aditus Exp $
-//
-// License:	This code is released under QPL 
-// Copyright (c) 2002 Johan Persson
-//========================================================================
-*/
-
-require_once('jpgraph_plotband.php'); 
-require_once('jpgraph_iconplot.php'); 
-require_once('jpgraph_plotmark.inc');
+ // File:        JPGRAPH_GANTT.PHP
+ // Description: JpGraph Gantt plot extension
+ // Created:     2001-11-12
+ // Ver:         $Id: jpgraph_gantt.php 1809 2009-09-09 13:07:33Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+
+require_once('jpgraph_plotband.php');
+require_once('jpgraph_iconplot.php');
+require_once('jpgraph_plotmark.inc.php');
+
+// Maximum size for Automatic Gantt chart
+define('MAX_GANTTIMG_SIZE_W',8000);
+define('MAX_GANTTIMG_SIZE_H',5000);
 
 // Scale Header types
-DEFINE("GANTT_HDAY",1);
-DEFINE("GANTT_HWEEK",2);
-DEFINE("GANTT_HMONTH",4);
-DEFINE("GANTT_HYEAR",8);
-DEFINE("GANTT_HHOUR",16);
-DEFINE("GANTT_HMIN",32);
+define("GANTT_HDAY",1);
+define("GANTT_HWEEK",2);
+define("GANTT_HMONTH",4);
+define("GANTT_HYEAR",8);
+define("GANTT_HHOUR",16);
+define("GANTT_HMIN",32);
 
 // Bar patterns
-DEFINE("GANTT_RDIAG",BAND_RDIAG);	// Right diagonal lines
-DEFINE("GANTT_LDIAG",BAND_LDIAG); // Left diagonal lines
-DEFINE("GANTT_SOLID",BAND_SOLID); // Solid one color
-DEFINE("GANTT_VLINE",BAND_VLINE); // Vertical lines
-DEFINE("GANTT_HLINE",BAND_HLINE);  // Horizontal lines
-DEFINE("GANTT_3DPLANE",BAND_3DPLANE);  // "3D" Plane
-DEFINE("GANTT_HVCROSS",BAND_HVCROSS);  // Vertical/Hor crosses
-DEFINE("GANTT_DIAGCROSS",BAND_DIAGCROSS); // Diagonal crosses
+define("GANTT_RDIAG",BAND_RDIAG); // Right diagonal lines
+define("GANTT_LDIAG",BAND_LDIAG); // Left diagonal lines
+define("GANTT_SOLID",BAND_SOLID); // Solid one color
+define("GANTT_VLINE",BAND_VLINE); // Vertical lines
+define("GANTT_HLINE",BAND_HLINE);  // Horizontal lines
+define("GANTT_3DPLANE",BAND_3DPLANE);  // "3D" Plane
+define("GANTT_HVCROSS",BAND_HVCROSS);  // Vertical/Hor crosses
+define("GANTT_DIAGCROSS",BAND_DIAGCROSS); // Diagonal crosses
 
 // Conversion constant
-DEFINE("SECPERDAY",3600*24);
+define("SECPERDAY",3600*24);
 
 // Locales. ONLY KEPT FOR BACKWARDS COMPATIBILITY
-// You should use the proper locale strings directly 
-// from now on. 
-DEFINE("LOCALE_EN","en_UK");
-DEFINE("LOCALE_SV","sv_SE");
+// You should use the proper locale strings directly
+// from now on.
+define("LOCALE_EN","en_UK");
+define("LOCALE_SV","sv_SE");
 
 // Layout of bars
-DEFINE("GANTT_EVEN",1);
-DEFINE("GANTT_FROMTOP",2);
+define("GANTT_EVEN",1);
+define("GANTT_FROMTOP",2);
 
 // Style for minute header
-DEFINE("MINUTESTYLE_MM",0);		// 15
-DEFINE("MINUTESTYLE_CUSTOM",2);		// Custom format
+define("MINUTESTYLE_MM",0);  // 15
+define("MINUTESTYLE_CUSTOM",2);  // Custom format
 
 
 // Style for hour header
-DEFINE("HOURSTYLE_HM24",0);		// 13:10
-DEFINE("HOURSTYLE_HMAMPM",1);		// 1:10pm
-DEFINE("HOURSTYLE_H24",2);		// 13
-DEFINE("HOURSTYLE_HAMPM",3);		// 1pm
-DEFINE("HOURSTYLE_CUSTOM",4);		// User defined
+define("HOURSTYLE_HM24",0);  // 13:10
+define("HOURSTYLE_HMAMPM",1);  // 1:10pm
+define("HOURSTYLE_H24",2);  // 13
+define("HOURSTYLE_HAMPM",3);  // 1pm
+define("HOURSTYLE_CUSTOM",4);  // User defined
 
 // Style for day header
-DEFINE("DAYSTYLE_ONELETTER",0);		// "M"
-DEFINE("DAYSTYLE_LONG",1);		// "Monday"
-DEFINE("DAYSTYLE_LONGDAYDATE1",2);	// "Monday 23 Jun"
-DEFINE("DAYSTYLE_LONGDAYDATE2",3);	// "Monday 23 Jun 2003"
-DEFINE("DAYSTYLE_SHORT",4);		// "Mon"
-DEFINE("DAYSTYLE_SHORTDAYDATE1",5);	// "Mon 23/6"
-DEFINE("DAYSTYLE_SHORTDAYDATE2",6);	// "Mon 23 Jun"
-DEFINE("DAYSTYLE_SHORTDAYDATE3",7);	// "Mon 23"
-DEFINE("DAYSTYLE_SHORTDATE1",8);	// "23/6"
-DEFINE("DAYSTYLE_SHORTDATE2",9);	// "23 Jun"
-DEFINE("DAYSTYLE_SHORTDATE3",10);	// "Mon 23"
-DEFINE("DAYSTYLE_SHORTDATE4",11);	// "23"
-DEFINE("DAYSTYLE_CUSTOM",12);		// "M"
+define("DAYSTYLE_ONELETTER",0);  // "M"
+define("DAYSTYLE_LONG",1);  // "Monday"
+define("DAYSTYLE_LONGDAYDATE1",2); // "Monday 23 Jun"
+define("DAYSTYLE_LONGDAYDATE2",3); // "Monday 23 Jun 2003"
+define("DAYSTYLE_SHORT",4);  // "Mon"
+define("DAYSTYLE_SHORTDAYDATE1",5); // "Mon 23/6"
+define("DAYSTYLE_SHORTDAYDATE2",6); // "Mon 23 Jun"
+define("DAYSTYLE_SHORTDAYDATE3",7); // "Mon 23"
+define("DAYSTYLE_SHORTDATE1",8); // "23/6"
+define("DAYSTYLE_SHORTDATE2",9); // "23 Jun"
+define("DAYSTYLE_SHORTDATE3",10); // "Mon 23"
+define("DAYSTYLE_SHORTDATE4",11); // "23"
+define("DAYSTYLE_CUSTOM",12);  // "M"
 
 // Styles for week header
-DEFINE("WEEKSTYLE_WNBR",0);
-DEFINE("WEEKSTYLE_FIRSTDAY",1);
-DEFINE("WEEKSTYLE_FIRSTDAY2",2);
-DEFINE("WEEKSTYLE_FIRSTDAYWNBR",3);
-DEFINE("WEEKSTYLE_FIRSTDAY2WNBR",4);
+define("WEEKSTYLE_WNBR",0);
+define("WEEKSTYLE_FIRSTDAY",1);
+define("WEEKSTYLE_FIRSTDAY2",2);
+define("WEEKSTYLE_FIRSTDAYWNBR",3);
+define("WEEKSTYLE_FIRSTDAY2WNBR",4);
 
 // Styles for month header
-DEFINE("MONTHSTYLE_SHORTNAME",0);
-DEFINE("MONTHSTYLE_LONGNAME",1);
-DEFINE("MONTHSTYLE_LONGNAMEYEAR2",2);
-DEFINE("MONTHSTYLE_SHORTNAMEYEAR2",3);
-DEFINE("MONTHSTYLE_LONGNAMEYEAR4",4);
-DEFINE("MONTHSTYLE_SHORTNAMEYEAR4",5);
-DEFINE("MONTHSTYLE_FIRSTLETTER",6);
+define("MONTHSTYLE_SHORTNAME",0);
+define("MONTHSTYLE_LONGNAME",1);
+define("MONTHSTYLE_LONGNAMEYEAR2",2);
+define("MONTHSTYLE_SHORTNAMEYEAR2",3);
+define("MONTHSTYLE_LONGNAMEYEAR4",4);
+define("MONTHSTYLE_SHORTNAMEYEAR4",5);
+define("MONTHSTYLE_FIRSTLETTER",6);
 
 
 // Types of constrain links
-DEFINE('CONSTRAIN_STARTSTART',0);
-DEFINE('CONSTRAIN_STARTEND',1);
-DEFINE('CONSTRAIN_ENDSTART',2);
-DEFINE('CONSTRAIN_ENDEND',3);
+define('CONSTRAIN_STARTSTART',0);
+define('CONSTRAIN_STARTEND',1);
+define('CONSTRAIN_ENDSTART',2);
+define('CONSTRAIN_ENDEND',3);
 
 // Arrow direction for constrain links
-DEFINE('ARROW_DOWN',0);
-DEFINE('ARROW_UP',1);
-DEFINE('ARROW_LEFT',2);
-DEFINE('ARROW_RIGHT',3);
+define('ARROW_DOWN',0);
+define('ARROW_UP',1);
+define('ARROW_LEFT',2);
+define('ARROW_RIGHT',3);
 
 // Arrow type for constrain type
-DEFINE('ARROWT_SOLID',0);
-DEFINE('ARROWT_OPEN',1);
+define('ARROWT_SOLID',0);
+define('ARROWT_OPEN',1);
 
 // Arrow size for constrain lines
-DEFINE('ARROW_S1',0);
-DEFINE('ARROW_S2',1);
-DEFINE('ARROW_S3',2);
-DEFINE('ARROW_S4',3);
-DEFINE('ARROW_S5',4);
+define('ARROW_S1',0);
+define('ARROW_S2',1);
+define('ARROW_S3',2);
+define('ARROW_S4',3);
+define('ARROW_S5',4);
 
 // Activity types for use with utility method CreateSimple()
-DEFINE('ACTYPE_NORMAL',0);
-DEFINE('ACTYPE_GROUP',1);
-DEFINE('ACTYPE_MILESTONE',2);
+define('ACTYPE_NORMAL',0);
+define('ACTYPE_GROUP',1);
+define('ACTYPE_MILESTONE',2);
 
-DEFINE('ACTINFO_3D',1);
-DEFINE('ACTINFO_2D',0);
+define('ACTINFO_3D',1);
+define('ACTINFO_2D',0);
 
 
 // Check if array_fill() exists
 if (!function_exists('array_fill')) {
     function array_fill($iStart, $iLen, $vValue) {
-	$aResult = array();
-	for ($iCount = $iStart; $iCount < $iLen + $iStart; $iCount++) {
-	    $aResult[$iCount] = $vValue;
-	}
-	return $aResult;
+        $aResult = array();
+        for ($iCount = $iStart; $iCount < $iLen + $iStart; $iCount++) {
+            $aResult[$iCount] = $vValue;
+        }
+        return $aResult;
     }
 }
 
 //===================================================
 // CLASS GanttActivityInfo
-// Description: 
+// Description:
 //===================================================
 class GanttActivityInfo {
-    var $iColor='black';
-    var $iBackgroundColor='lightgray';
-    var $iFFamily=FF_FONT1,$iFStyle=FS_NORMAL,$iFSize=10,$iFontColor='black';
-    var $iTitles=array();
-    var $iWidth=array(),$iHeight=-1;
-    var $iLeftColMargin=4,$iRightColMargin=1,$iTopColMargin=1,$iBottomColMargin=3;
-    var $iTopHeaderMargin = 4;
-    var $vgrid = null;
-    var $iStyle=1;
-    var $iShow=true;
-    var $iHeaderAlign='center';
-
-    function GanttActivityInfo() {
-	$this->vgrid = new LineProperty();
+    public $iShow=true;
+    public $iLeftColMargin=4,$iRightColMargin=1,$iTopColMargin=1,$iBottomColMargin=3;
+    public $vgrid = null;
+    private $iColor='black';
+    private $iBackgroundColor='lightgray';
+    private $iFFamily=FF_FONT1,$iFStyle=FS_NORMAL,$iFSize=10,$iFontColor='black';
+    private $iTitles=array();
+    private $iWidth=array(),$iHeight=-1;
+    private $iTopHeaderMargin = 4;
+    private $iStyle=1;
+    private $iHeaderAlign='center';
+
+    function __construct() {
+        $this->vgrid = new LineProperty();
     }
 
     function Hide($aF=true) {
-	$this->iShow=!$aF;
+        $this->iShow=!$aF;
     }
 
     function Show($aF=true) {
-	$this->iShow=$aF;
+        $this->iShow=$aF;
     }
 
     // Specify font
     function SetFont($aFFamily,$aFStyle=FS_NORMAL,$aFSize=10) {
-	$this->iFFamily = $aFFamily;
-	$this->iFStyle	 = $aFStyle;
-	$this->iFSize	 = $aFSize;
+        $this->iFFamily = $aFFamily;
+        $this->iFStyle  = $aFStyle;
+        $this->iFSize  = $aFSize;
     }
 
     function SetStyle($aStyle) {
-	$this->iStyle = $aStyle;
+        $this->iStyle = $aStyle;
     }
 
     function SetColumnMargin($aLeft,$aRight) {
-	$this->iLeftColMargin = $aLeft;
-	$this->iRightColMargin = $aRight;
+        $this->iLeftColMargin = $aLeft;
+        $this->iRightColMargin = $aRight;
     }
 
     function SetFontColor($aFontColor) {
-	$this->iFontColor = $aFontColor;
+        $this->iFontColor = $aFontColor;
     }
 
     function SetColor($aColor) {
-	$this->iColor = $aColor;
+        $this->iColor = $aColor;
     }
 
     function SetBackgroundColor($aColor) {
-	$this->iBackgroundColor = $aColor;
+        $this->iBackgroundColor = $aColor;
     }
 
     function SetColTitles($aTitles,$aWidth=null) {
-	$this->iTitles = $aTitles;
-	$this->iWidth = $aWidth;
+        $this->iTitles = $aTitles;
+        $this->iWidth = $aWidth;
     }
 
     function SetMinColWidth($aWidths) {
-	$n = min(count($this->iTitles),count($aWidths));
-	for($i=0; $i < $n; ++$i ) {
-	    if( !empty($aWidths[$i]) ) {
-		if( empty($this->iWidth[$i]) ) {
-		    $this->iWidth[$i] = $aWidths[$i];
-		}
-		else {
-		    $this->iWidth[$i] = max($this->iWidth[$i],$aWidths[$i]);
-		}
-	    }
-	}
+        $n = min(count($this->iTitles),count($aWidths));
+        for($i=0; $i < $n; ++$i ) {
+            if( !empty($aWidths[$i]) ) {
+                if( empty($this->iWidth[$i]) ) {
+                    $this->iWidth[$i] = $aWidths[$i];
+                }
+                else {
+                    $this->iWidth[$i] = max($this->iWidth[$i],$aWidths[$i]);
+                }
+            }
+        }
     }
 
     function GetWidth($aImg) {
-	$txt = new TextProperty();
-	$txt->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-	$n = count($this->iTitles) ;
-	$rm=$this->iRightColMargin;
-	$w = 0;
-	for($h=0, $i=0; $i < $n; ++$i ) {
-	    $w += $this->iLeftColMargin;
-	    $txt->Set($this->iTitles[$i]);
-	    if( !empty($this->iWidth[$i]) ) {
-		$w1 = max($txt->GetWidth($aImg)+$rm,$this->iWidth[$i]);
-	    }
-	    else {
-		$w1 = $txt->GetWidth($aImg)+$rm;
-	    }
-	    $this->iWidth[$i] = $w1;
-	    $w += $w1;
-	    $h = max($h,$txt->GetHeight($aImg));
-	}
-	$this->iHeight = $h+$this->iTopHeaderMargin;
+        $txt = new TextProperty();
+        $txt->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
+        $n = count($this->iTitles) ;
+        $rm=$this->iRightColMargin;
+        $w = 0;
+        for($h=0, $i=0; $i < $n; ++$i ) {
+            $w += $this->iLeftColMargin;
+            $txt->Set($this->iTitles[$i]);
+            if( !empty($this->iWidth[$i]) ) {
+                $w1 = max($txt->GetWidth($aImg)+$rm,$this->iWidth[$i]);
+            }
+            else {
+                $w1 = $txt->GetWidth($aImg)+$rm;
+            }
+            $this->iWidth[$i] = $w1;
+            $w += $w1;
+            $h = max($h,$txt->GetHeight($aImg));
+        }
+        $this->iHeight = $h+$this->iTopHeaderMargin;
         $txt='';
-	return $w;
-    }
-    
-    function GetColStart($aImg,&$ioStart,$aAddLeftMargin=false) {
-	$n = count($this->iTitles) ;
-	$adj = $aAddLeftMargin ? $this->iLeftColMargin : 0;
-	$ioStart=array($aImg->left_margin+$adj);
-	for( $i=1; $i < $n; ++$i ) {
-	    $ioStart[$i] = $ioStart[$i-1]+$this->iLeftColMargin+$this->iWidth[$i-1];
-	}
+        return $w;
     }
-    
+
+    function GetColStart($aImg,&$aStart,$aAddLeftMargin=false) {
+        $n = count($this->iTitles) ;
+        $adj = $aAddLeftMargin ? $this->iLeftColMargin : 0;
+        $aStart=array($aImg->left_margin+$adj);
+        for( $i=1; $i < $n; ++$i ) {
+            $aStart[$i] = $aStart[$i-1]+$this->iLeftColMargin+$this->iWidth[$i-1];
+        }
+    }
+
     // Adjust headers left, right or centered
     function SetHeaderAlign($aAlign) {
-	$this->iHeaderAlign=$aAlign;
+        $this->iHeaderAlign=$aAlign;
     }
 
     function Stroke($aImg,$aXLeft,$aYTop,$aXRight,$aYBottom,$aUseTextHeight=false) {
 
-	if( !$this->iShow ) return;
-
-	$txt = new TextProperty();
-	$txt->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-	$txt->SetColor($this->iFontColor);
-	$txt->SetAlign($this->iHeaderAlign,'top');
-	$n=count($this->iTitles);
-
-	if( $n == 0 ) 
-	    return;
-	
-	$x = $aXLeft;
-	$h = $this->iHeight;
-	$yTop = $aUseTextHeight ? $aYBottom-$h-$this->iTopColMargin-$this->iBottomColMargin : $aYTop ;
-
-	if( $h < 0 ) {
-	    JpGraphError::Raise('Internal error. Height for ActivityTitles is < 0');
-	}
-
-	$aImg->SetLineWeight(1);
-	// Set background color
-	$aImg->SetColor($this->iBackgroundColor);
-	$aImg->FilledRectangle($aXLeft,$yTop,$aXRight,$aYBottom-1);
-
-	if( $this->iStyle == 1 ) {
-	    // Make a 3D effect
-	    $aImg->SetColor('white');
-	    $aImg->Line($aXLeft,$yTop+1,
-			$aXRight,$yTop+1);
-	}
-	
-	for($i=0; $i < $n; ++$i ) {
-	    if( $this->iStyle == 1 ) {
-		// Make a 3D effect
-		$aImg->SetColor('white');
-		$aImg->Line($x+1,$yTop,$x+1,$aYBottom);
-	    }
-	    $x += $this->iLeftColMargin;
-	    $txt->Set($this->iTitles[$i]);
-	    
-	    // Adjust the text anchor position according to the choosen alignment
-	    $xp = $x;
-	    if( $this->iHeaderAlign == 'center' ) {
-		$xp = (($x-$this->iLeftColMargin)+($x+$this->iWidth[$i]))/2;
-	    }
-	    elseif( $this->iHeaderAlign == 'right' ) {
-		$xp = $x +$this->iWidth[$i]-$this->iRightColMargin;
-	    }
-		    
-	    $txt->Stroke($aImg,$xp,$yTop+$this->iTopHeaderMargin);
-	    $x += $this->iWidth[$i];
-	    if( $i < $n-1 ) {
-		$aImg->SetColor($this->iColor);
-		$aImg->Line($x,$yTop,$x,$aYBottom);
-	    }
-	}
-
-	$aImg->SetColor($this->iColor);
-	$aImg->Line($aXLeft,$yTop, $aXRight,$yTop);
-
-	// Stroke vertical column dividers
-	$cols=array();
-	$this->GetColStart($aImg,$cols);
-	$n=count($cols);
-	for( $i=1; $i < $n; ++$i ) {
-	    $this->vgrid->Stroke($aImg,$cols[$i],$aYBottom,$cols[$i],
-				    $aImg->height - $aImg->bottom_margin);
-	}
+        if( !$this->iShow ) return;
+
+        $txt = new TextProperty();
+        $txt->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
+        $txt->SetColor($this->iFontColor);
+        $txt->SetAlign($this->iHeaderAlign,'top');
+        $n=count($this->iTitles);
+
+        if( $n == 0 )
+        return;
+
+        $x = $aXLeft;
+        $h = $this->iHeight;
+        $yTop = $aUseTextHeight ? $aYBottom-$h-$this->iTopColMargin-$this->iBottomColMargin : $aYTop ;
+
+        if( $h < 0 ) {
+            JpGraphError::RaiseL(6001);
+            //('Internal error. Height for ActivityTitles is < 0');
+        }
+
+        $aImg->SetLineWeight(1);
+        // Set background color
+        $aImg->SetColor($this->iBackgroundColor);
+        $aImg->FilledRectangle($aXLeft,$yTop,$aXRight,$aYBottom-1);
+
+        if( $this->iStyle == 1 ) {
+            // Make a 3D effect
+            $aImg->SetColor('white');
+            $aImg->Line($aXLeft,$yTop+1,$aXRight,$yTop+1);
+        }
+
+        for($i=0; $i < $n; ++$i ) {
+            if( $this->iStyle == 1 ) {
+                // Make a 3D effect
+                $aImg->SetColor('white');
+                $aImg->Line($x+1,$yTop,$x+1,$aYBottom);
+            }
+            $x += $this->iLeftColMargin;
+            $txt->Set($this->iTitles[$i]);
+
+            // Adjust the text anchor position according to the choosen alignment
+            $xp = $x;
+            if( $this->iHeaderAlign == 'center' ) {
+                $xp = (($x-$this->iLeftColMargin)+($x+$this->iWidth[$i]))/2;
+            }
+            elseif( $this->iHeaderAlign == 'right' ) {
+                $xp = $x +$this->iWidth[$i]-$this->iRightColMargin;
+            }
+
+            $txt->Stroke($aImg,$xp,$yTop+$this->iTopHeaderMargin);
+            $x += $this->iWidth[$i];
+            if( $i < $n-1 ) {
+                $aImg->SetColor($this->iColor);
+                $aImg->Line($x,$yTop,$x,$aYBottom);
+            }
+        }
+
+        $aImg->SetColor($this->iColor);
+        $aImg->Line($aXLeft,$yTop, $aXRight,$yTop);
+
+        // Stroke vertical column dividers
+        $cols=array();
+        $this->GetColStart($aImg,$cols);
+        $n=count($cols);
+        for( $i=1; $i < $n; ++$i ) {
+            $this->vgrid->Stroke($aImg,$cols[$i],$aYBottom,$cols[$i],
+            $aImg->height - $aImg->bottom_margin);
+        }
     }
 }
 
@@ -326,289 +328,328 @@ function Stroke($aImg,$aXLeft,$aYTop,$aXRight,$aYBottom,$aUseTextHeight=false) {
 // Description: Main class to handle gantt graphs
 //===================================================
 class GanttGraph extends Graph {
-    var $scale;							// Public accessible
-    var $iObj=array();				// Gantt objects
-    var $iLabelHMarginFactor=0.2;	// 10% margin on each side of the labels
-    var $iLabelVMarginFactor=0.4;	// 40% margin on top and bottom of label
-    var $iLayout=GANTT_FROMTOP;	// Could also be GANTT_EVEN
-    var $iSimpleFont = FF_FONT1,$iSimpleFontSize=11;
-    var $iSimpleStyle=GANTT_RDIAG,$iSimpleColor='yellow',$iSimpleBkgColor='red';
-    var $iSimpleProgressBkgColor='gray',$iSimpleProgressColor='darkgreen';
-    var $iSimpleProgressStyle=GANTT_SOLID;
-    var $hgrid=null;
-//---------------
-// CONSTRUCTOR	
+    public $scale;  // Public accessible
+    public $hgrid=null;
+    private $iObj=array();    // Gantt objects
+    private $iLabelHMarginFactor=0.2; // 10% margin on each side of the labels
+    private $iLabelVMarginFactor=0.4; // 40% margin on top and bottom of label
+    private $iLayout=GANTT_FROMTOP; // Could also be GANTT_EVEN
+    private $iSimpleFont = FF_FONT1,$iSimpleFontSize=11;
+    private $iSimpleStyle=GANTT_RDIAG,$iSimpleColor='yellow',$iSimpleBkgColor='red';
+    private $iSimpleProgressBkgColor='gray',$iSimpleProgressColor='darkgreen';
+    private $iSimpleProgressStyle=GANTT_SOLID;
+    private $iZoomFactor = 1.0;
+    //---------------
+    // CONSTRUCTOR
     // Create a new gantt graph
-    function GanttGraph($aWidth=0,$aHeight=0,$aCachedName="",$aTimeOut=0,$aInline=true) {
+    function __construct($aWidth=0,$aHeight=0,$aCachedName="",$aTimeOut=0,$aInline=true) {
 
-	// Backward compatibility
-	if( $aWidth == -1 ) $aWidth=0;
-	if( $aHeight == -1 ) $aHeight=0;
+        // Backward compatibility
+        if( $aWidth == -1 ) $aWidth=0;
+        if( $aHeight == -1 ) $aHeight=0;
 
-	if( $aWidth<  0 || $aHeight < 0 ) {
-	    JpgraphError::Raise("You can't specify negative sizes for Gantt graph dimensions. Use 0 to indicate that you want the library to automatically determine a dimension.");
-	}
-	Graph::Graph($aWidth,$aHeight,$aCachedName,$aTimeOut,$aInline);		
-	$this->scale = new GanttScale($this->img);
+        if( $aWidth<  0 || $aHeight < 0 ) {
+            JpgraphError::RaiseL(6002);
+            //("You can't specify negative sizes for Gantt graph dimensions. Use 0 to indicate that you want the library to automatically determine a dimension.");
+        }
+        parent::__construct($aWidth,$aHeight,$aCachedName,$aTimeOut,$aInline);
+        $this->scale = new GanttScale($this->img);
+
+        // Default margins
+        $this->img->SetMargin(15,17,25,15);
 
-	// Default margins
-	$this->img->SetMargin(15,17,25,15);
+        $this->hgrid = new HorizontalGridLine();
 
-	$this->hgrid = new HorizontalGridLine();
-		
-	$this->scale->ShowHeaders(GANTT_HWEEK|GANTT_HDAY);
-	$this->SetBox();
+        $this->scale->ShowHeaders(GANTT_HWEEK|GANTT_HDAY);
+        $this->SetBox();
     }
-	
-//---------------
-// PUBLIC METHODS
 
-    // 
+    //---------------
+    // PUBLIC METHODS
+
+    //
 
     function SetSimpleFont($aFont,$aSize) {
-	$this->iSimpleFont = $aFont;
-	$this->iSimpleFontSize = $aSize;
+        $this->iSimpleFont = $aFont;
+        $this->iSimpleFontSize = $aSize;
     }
 
     function SetSimpleStyle($aBand,$aColor,$aBkgColor) {
-	$this->iSimpleStyle = $aBand;
-	$this->iSimpleColor = $aColor;
-	$this->iSimpleBkgColor = $aBkgColor;
+        $this->iSimpleStyle = $aBand;
+        $this->iSimpleColor = $aColor;
+        $this->iSimpleBkgColor = $aBkgColor;
     }
 
     // A utility function to help create basic Gantt charts
     function CreateSimple($data,$constrains=array(),$progress=array()) {
-	
-	for( $i=0; $i < count($data); ++$i) {
-	    switch( $data[$i][1] ) {
-		case ACTYPE_GROUP:
-		    // Create a slightly smaller height bar since the
-		    // "wings" at the end will make it look taller
-		    $a = new GanttBar($data[$i][0],$data[$i][2],$data[$i][3],$data[$i][4],'',8);
-		    $a->title->SetFont($this->iSimpleFont,FS_BOLD,$this->iSimpleFontSize);		
-		    $a->rightMark->Show();
-		    $a->rightMark->SetType(MARK_RIGHTTRIANGLE);
-		    $a->rightMark->SetWidth(8);
-		    $a->rightMark->SetColor('black');
-		    $a->rightMark->SetFillColor('black');
-	    
-		    $a->leftMark->Show();
-		    $a->leftMark->SetType(MARK_LEFTTRIANGLE);
-		    $a->leftMark->SetWidth(8);
-		    $a->leftMark->SetColor('black');
-		    $a->leftMark->SetFillColor('black');
-	    
-		    $a->SetPattern(BAND_SOLID,'black');
-		    $csimpos = 6;
-		    break;
-		
-		case ACTYPE_NORMAL:
-		    $a = new GanttBar($data[$i][0],$data[$i][2],$data[$i][3],$data[$i][4],'',10);
-		    $a->title->SetFont($this->iSimpleFont,FS_NORMAL,$this->iSimpleFontSize);
-		    $a->SetPattern($this->iSimpleStyle,$this->iSimpleColor);
-		    $a->SetFillColor($this->iSimpleBkgColor);
-		    // Check if this activity should have a constrain line
-		    $n = count($constrains);
-		    for( $j=0; $j < $n; ++$j ) {
-			if( empty($constrains[$j]) || (count($constrains[$j]) != 3) ) {
-			    JpGraphError::Raise("Invalid format for Constrain parameter at index=$j in CreateSimple(). Parameter must start with index 0 and contain arrays of (Row,Constrain-To,Constrain-Type)");	 
-			}
-			if( $constrains[$j][0]==$data[$i][0] ) {
-			    $a->SetConstrain($constrains[$j][1],$constrains[$j][2],'black',ARROW_S2,ARROWT_SOLID);    
-			    break;
-			}
-		    }
-
-		    // Check if this activity have a progress bar
-		    $n = count($progress);
-		    for( $j=0; $j < $n; ++$j ) {
-			
-			if( empty($progress[$j]) || (count($progress[$j]) != 2) ) {
-			    JpGraphError::Raise("Invalid format for Progress parameter at index=$j in CreateSimple(). Parameter must start with index 0 and contain arrays of (Row,Progress)");	
-			}
-			if( $progress[$j][0]==$data[$i][0] ) {
-			    $a->progress->Set($progress[$j][1]);
-			    $a->progress->SetPattern($this->iSimpleProgressStyle,
-						     $this->iSimpleProgressColor);
-			    $a->progress->SetFillColor($this->iSimpleProgressBkgColor);
-			    //$a->progress->SetPattern($progress[$j][2],$progress[$j][3]);
-			    break;
-			}
-		    }
-		    $csimpos = 6;
-		    break;
-
-		case ACTYPE_MILESTONE:
-		    $a = new MileStone($data[$i][0],$data[$i][2],$data[$i][3]);
-		    $a->title->SetFont($this->iSimpleFont,FS_NORMAL,$this->iSimpleFontSize);
-		    $a->caption->SetFont($this->iSimpleFont,FS_NORMAL,$this->iSimpleFontSize);
-		    $csimpos = 5;
-		    break;
-		default:
-		    die('Unknown activity type');
-		    break;
-	    }
-
-	    // Setup caption
-	    $a->caption->Set($data[$i][$csimpos-1]);
-
-	    // Check if this activity should have a CSIM target�?
-	    if( !empty($data[$i][$csimpos]) ) {
-		$a->SetCSIMTarget($data[$i][$csimpos]);
-		$a->SetCSIMAlt($data[$i][$csimpos+1]);
-	    }
-	    if( !empty($data[$i][$csimpos+2]) ) {
-		$a->title->SetCSIMTarget($data[$i][$csimpos+2]);
-		$a->title->SetCSIMAlt($data[$i][$csimpos+3]);
-	    }
-
-	    $this->Add($a);
-	}
+        $num = count($data);
+        for( $i=0; $i < $num; ++$i) {
+            switch( $data[$i][1] ) {
+                case ACTYPE_GROUP:
+                    // Create a slightly smaller height bar since the
+                    // "wings" at the end will make it look taller
+                    $a = new GanttBar($data[$i][0],$data[$i][2],$data[$i][3],$data[$i][4],'',8);
+                    $a->title->SetFont($this->iSimpleFont,FS_BOLD,$this->iSimpleFontSize);
+                    $a->rightMark->Show();
+                    $a->rightMark->SetType(MARK_RIGHTTRIANGLE);
+                    $a->rightMark->SetWidth(8);
+                    $a->rightMark->SetColor('black');
+                    $a->rightMark->SetFillColor('black');
+
+                    $a->leftMark->Show();
+                    $a->leftMark->SetType(MARK_LEFTTRIANGLE);
+                    $a->leftMark->SetWidth(8);
+                    $a->leftMark->SetColor('black');
+                    $a->leftMark->SetFillColor('black');
+
+                    $a->SetPattern(BAND_SOLID,'black');
+                    $csimpos = 6;
+                    break;
+
+                case ACTYPE_NORMAL:
+                    $a = new GanttBar($data[$i][0],$data[$i][2],$data[$i][3],$data[$i][4],'',10);
+                    $a->title->SetFont($this->iSimpleFont,FS_NORMAL,$this->iSimpleFontSize);
+                    $a->SetPattern($this->iSimpleStyle,$this->iSimpleColor);
+                    $a->SetFillColor($this->iSimpleBkgColor);
+                    // Check if this activity should have a constrain line
+                    $n = count($constrains);
+                    for( $j=0; $j < $n; ++$j ) {
+                        if( empty($constrains[$j]) || (count($constrains[$j]) != 3) ) {
+                            JpGraphError::RaiseL(6003,$j);
+                            //("Invalid format for Constrain parameter at index=$j in CreateSimple(). Parameter must start with index 0 and contain arrays of (Row,Constrain-To,Constrain-Type)");
+                        }
+                        if( $constrains[$j][0]==$data[$i][0] ) {
+                            $a->SetConstrain($constrains[$j][1],$constrains[$j][2],'black',ARROW_S2,ARROWT_SOLID);
+                        }
+                    }
+
+                    // Check if this activity have a progress bar
+                    $n = count($progress);
+                    for( $j=0; $j < $n; ++$j ) {
+
+                        if( empty($progress[$j]) || (count($progress[$j]) != 2) ) {
+                            JpGraphError::RaiseL(6004,$j);
+                            //("Invalid format for Progress parameter at index=$j in CreateSimple(). Parameter must start with index 0 and contain arrays of (Row,Progress)");
+                        }
+                        if( $progress[$j][0]==$data[$i][0] ) {
+                            $a->progress->Set($progress[$j][1]);
+                            $a->progress->SetPattern($this->iSimpleProgressStyle,
+                            $this->iSimpleProgressColor);
+                            $a->progress->SetFillColor($this->iSimpleProgressBkgColor);
+                            //$a->progress->SetPattern($progress[$j][2],$progress[$j][3]);
+                            break;
+                        }
+                    }
+                    $csimpos = 6;
+                    break;
+
+                case ACTYPE_MILESTONE:
+                    $a = new MileStone($data[$i][0],$data[$i][2],$data[$i][3]);
+                    $a->title->SetFont($this->iSimpleFont,FS_NORMAL,$this->iSimpleFontSize);
+                    $a->caption->SetFont($this->iSimpleFont,FS_NORMAL,$this->iSimpleFontSize);
+                    $csimpos = 5;
+                    break;
+                default:
+                    die('Unknown activity type');
+                    break;
+            }
+
+            // Setup caption
+            $a->caption->Set($data[$i][$csimpos-1]);
+
+            // Check if this activity should have a CSIM target�?
+            if( !empty($data[$i][$csimpos]) ) {
+                $a->SetCSIMTarget($data[$i][$csimpos]);
+                $a->SetCSIMAlt($data[$i][$csimpos+1]);
+            }
+            if( !empty($data[$i][$csimpos+2]) ) {
+                $a->title->SetCSIMTarget($data[$i][$csimpos+2]);
+                $a->title->SetCSIMAlt($data[$i][$csimpos+3]);
+            }
+
+            $this->Add($a);
+        }
+    }
+
+    // Set user specified scale zoom factor when auto sizing is used
+    function SetZoomFactor($aZoom) {
+    	$this->iZoomFactor = $aZoom;
     }
 
-	
+
     // Set what headers should be shown
     function ShowHeaders($aFlg) {
-	$this->scale->ShowHeaders($aFlg);
+        $this->scale->ShowHeaders($aFlg);
     }
-	
-    // Specify the fraction of the font height that should be added 
+
+    // Specify the fraction of the font height that should be added
     // as vertical margin
     function SetLabelVMarginFactor($aVal) {
-	$this->iLabelVMarginFactor = $aVal;
+        $this->iLabelVMarginFactor = $aVal;
     }
 
     // Synonym to the method above
     function SetVMarginFactor($aVal) {
-	$this->iLabelVMarginFactor = $aVal;
+        $this->iLabelVMarginFactor = $aVal;
     }
-	
-	
+
+
     // Add a new Gantt object
     function Add($aObject) {
-	if( is_array($aObject) && count($aObject) > 0 ) {
-	    $cl = get_class($aObject[0]);
-	    if( $cl == 'iconplot' ) {
-		$this->AddIcon($aObject);
-	    }
-	    else {
-		for($i=0; $i < count($aObject); ++$i)
-		    $this->iObj[] = $aObject[$i];
-	    }
+        if( is_array($aObject) && count($aObject) > 0 ) {
+            $cl = $aObject[0];
+            if( class_exists('IconPlot',false) && ($cl instanceof IconPlot) ) {
+                $this->AddIcon($aObject);
+            }
+            elseif( class_exists('Text',false) && ($cl instanceof Text) ) {
+            	$this->AddText($aObject);
+            }
+            else {
+                $n = count($aObject);
+                for($i=0; $i < $n; ++$i)
+                $this->iObj[] = $aObject[$i];
+            }
+        }
+        else {
+            if( class_exists('IconPlot',false) && ($aObject instanceof IconPlot) ) {
+                $this->AddIcon($aObject);
+            }
+            elseif( class_exists('Text',false) && ($aObject instanceof Text) ) {
+            	$this->AddText($aObject);
+            }
+            else {
+                $this->iObj[] = $aObject;
+            }
+        }
+    }
+
+	function StrokeTexts() {
+        // Stroke any user added text objects
+        if( $this->texts != null ) {
+        	$n = count($this->texts);
+            for($i=0; $i < $n; ++$i) {
+            	if( $this->texts[$i]->iScalePosX !== null && $this->texts[$i]->iScalePosY !== null ) {
+            		$x = $this->scale->TranslateDate($this->texts[$i]->iScalePosX);
+            		$y = $this->scale->TranslateVertPos($this->texts[$i]->iScalePosY);
+            		$y -= $this->scale->GetVertSpacing()/2;
+            	}
+            	else {
+            		$x = $y = null;
+            	}
+                $this->texts[$i]->Stroke($this->img,$x,$y);
+            }
+        }
 	}
-	else {
-	    $cl = get_class($aObject);
-	    if( $cl == 'iconplot' ) {
-		$this->AddIcon($aObject);
-	    }
-	    else {	    
-		$this->iObj[] = $aObject;
-	    }
-	}
-    }
 
     // Override inherit method from Graph and give a warning message
-    function SetScale() {
-	JpGraphError::Raise("SetScale() is not meaningfull with Gantt charts.");
+    function SetScale($aAxisType,$aYMin=1,$aYMax=1,$aXMin=1,$aXMax=1) {
+        JpGraphError::RaiseL(6005);
+        //("SetScale() is not meaningfull with Gantt charts.");
     }
 
     // Specify the date range for Gantt graphs (if this is not set it will be
     // automtically determined from the input data)
     function SetDateRange($aStart,$aEnd) {
-	// Adjust the start and end so that the indicate the
-	// begining and end of respective start and end days
-	if( strpos($aStart,':') === false )
-	    $aStart = date('Y-m-d 00:00',strtotime($aStart));
-	if( strpos($aEnd,':') === false )
-	    $aEnd = date('Y-m-d 23:59',strtotime($aEnd));
-	$this->scale->SetRange($aStart,$aEnd);
-    }
-	
+        // Adjust the start and end so that the indicate the
+        // begining and end of respective start and end days
+        if( strpos($aStart,':') === false )
+        $aStart = date('Y-m-d 00:00',strtotime($aStart));
+        if( strpos($aEnd,':') === false )
+        $aEnd = date('Y-m-d 23:59',strtotime($aEnd));
+        $this->scale->SetRange($aStart,$aEnd);
+    }
+
     // Get the maximum width of the activity titles columns for the bars
     // The name is lightly misleading since we from now on can have
     // multiple columns in the label section. When this was first written
     // it only supported a single label, hence the name.
     function GetMaxLabelWidth() {
-	$m=50;
-	if( $this->iObj != null ) {
-	    $marg = $this->scale->actinfo->iLeftColMargin+$this->scale->actinfo->iRightColMargin;
-	    $m = $this->iObj[0]->title->GetWidth($this->img)+$marg;
-	    for($i=1; $i < count($this->iObj); ++$i) {
-		if( !empty($this->iObj[$i]->title) ) {
-		    if( $this->iObj[$i]->title->HasTabs() ) {
-			list($tot,$w) = $this->iObj[$i]->title->GetWidth($this->img,true);
-			$m=max($m,$tot);
-		    }
-		    else 
-			$m=max($m,$this->iObj[$i]->title->GetWidth($this->img));
-		}
-	    }
-	}
-	return $m;
+        $m=10;
+        if( $this->iObj != null ) {
+            $marg = $this->scale->actinfo->iLeftColMargin+$this->scale->actinfo->iRightColMargin;
+            $n = count($this->iObj);
+            for($i=0; $i < $n; ++$i) {
+                if( !empty($this->iObj[$i]->title) ) {
+                    if( $this->iObj[$i]->title->HasTabs() ) {
+                        list($tot,$w) = $this->iObj[$i]->title->GetWidth($this->img,true);
+                        $m=max($m,$tot);
+                    }
+                    else
+                    $m=max($m,$this->iObj[$i]->title->GetWidth($this->img));
+                }
+            }
+        }
+        return $m;
     }
-	
+
     // Get the maximum height of the titles for the bars
     function GetMaxLabelHeight() {
-	$m=0;
-	if( $this->iObj != null ) {
-	    $m = $this->iObj[0]->title->GetHeight($this->img);
-	    for($i=1; $i<count($this->iObj); ++$i) {
-		if( !empty($this->iObj[$i]->title) ) {
-		    $m=max($m,$this->iObj[$i]->title->GetHeight($this->img));
-		}
-	    }
-	}
-	return $m;
+        $m=10;
+        if( $this->iObj != null ) {
+            $n = count($this->iObj);
+            // We can not include the title of GnttVLine since that title is stroked at the bottom
+            // of the Gantt bar and not in the activity title columns
+            for($i=0; $i < $n; ++$i) {
+                if( !empty($this->iObj[$i]->title) && !($this->iObj[$i] instanceof GanttVLine) ) {
+                    $m=max($m,$this->iObj[$i]->title->GetHeight($this->img));
+                }
+            }
+        }
+        return $m;
     }
 
     function GetMaxBarAbsHeight() {
-	$m=0;
-	if( $this->iObj != null ) {
-	    $m = $this->iObj[0]->GetAbsHeight($this->img);
-	    for($i=1; $i<count($this->iObj); ++$i) {
-		$m=max($m,$this->iObj[$i]->GetAbsHeight($this->img));
-	    }
-	}
-	return $m;		
+        $m=0;
+        if( $this->iObj != null ) {
+            $m = $this->iObj[0]->GetAbsHeight($this->img);
+            $n = count($this->iObj);
+            for($i=1; $i < $n; ++$i) {
+                $m=max($m,$this->iObj[$i]->GetAbsHeight($this->img));
+            }
+        }
+        return $m;
     }
-	
+
     // Get the maximum used line number (vertical position) for bars
     function GetBarMaxLineNumber() {
-	$m=0;
-	if( $this->iObj != null ) {
-	    $m = $this->iObj[0]->GetLineNbr();
-	    for($i=1; $i < count($this->iObj); ++$i) {
-		$m=max($m,$this->iObj[$i]->GetLineNbr());
-	    }
-	}
-	return $m;
+        $m=1;
+        if( $this->iObj != null ) {
+            $m = $this->iObj[0]->GetLineNbr();
+            $n = count($this->iObj);
+            for($i=1; $i < $n; ++$i) {
+                $m=max($m,$this->iObj[$i]->GetLineNbr());
+            }
+        }
+        return $m;
     }
-	
+
     // Get the minumum and maximum used dates for all bars
     function GetBarMinMax() {
-	$start = 0 ;
-	$n = count($this->iObj);
-	while( $this->iObj[$start]->GetMaxDate() === false && $start < $n )
-	    ++$start;
-	if( $start >= $n ) {
-	    JpgraphError::Raise('Cannot autoscale Gantt chart. No dated activities exist. [GetBarMinMax() start >= n]');
-	}
-
-	$max=$this->scale->NormalizeDate($this->iObj[$start]->GetMaxDate());
-	$min=$this->scale->NormalizeDate($this->iObj[$start]->GetMinDate());
-	for($i=$start+1; $i < $n; ++$i) {
-	    $rmax = $this->scale->NormalizeDate($this->iObj[$i]->GetMaxDate());
-	    if( $rmax != false ) 
-		$max=Max($max,$rmax);
-	    $rmin = $this->scale->NormalizeDate($this->iObj[$i]->GetMinDate());
-	    if( $rmin != false ) 
-		$min=Min($min,$rmin);
-	}
-	$minDate = date("Y-m-d",$min);
-	$min = strtotime($minDate);
-	$maxDate = date("Y-m-d 23:59",$max);
-	$max = strtotime($maxDate);	
-	return array($min,$max);
+        $start = 0 ;
+        $n = count($this->iObj);
+        while( $start < $n && $this->iObj[$start]->GetMaxDate() === false )
+        ++$start;
+        if( $start >= $n ) {
+            JpgraphError::RaiseL(6006);
+            //('Cannot autoscale Gantt chart. No dated activities exist. [GetBarMinMax() start >= n]');
+        }
+
+        $max=$this->scale->NormalizeDate($this->iObj[$start]->GetMaxDate());
+        $min=$this->scale->NormalizeDate($this->iObj[$start]->GetMinDate());
+
+        for($i=$start+1; $i < $n; ++$i) {
+            $rmax = $this->scale->NormalizeDate($this->iObj[$i]->GetMaxDate());
+            if( $rmax != false )
+            $max=Max($max,$rmax);
+            $rmin = $this->scale->NormalizeDate($this->iObj[$i]->GetMinDate());
+            if( $rmin != false )
+            $min=Min($min,$rmin);
+        }
+        $minDate = date("Y-m-d",$min);
+        $min = strtotime($minDate);
+        $maxDate = date("Y-m-d 23:59",$max);
+        $max = strtotime($maxDate);
+        return array($min,$max);
     }
 
     // Create a new auto sized canvas if the user hasn't specified a size
@@ -616,247 +657,271 @@ function GetBarMinMax() {
     // the minimum width needed to display the headers. Some margins are
     // also added to make it better looking.
     function AutoSize() {
-	if( $this->img->img == null ) {
-	    // The predefined left, right, top, bottom margins.
-	    // Note that the top margin might incease depending on
-	    // the title.
-	    $lm = $this->img->left_margin; 
-	    $rm = $this->img->right_margin; 
-	    $rm += 2 ;
-	    $tm = $this->img->top_margin; 
-	    $bm = $this->img->bottom_margin; 
-	    $bm += 1; 
-	    if( BRAND_TIMING ) $bm += 10;
-			
-	    // First find out the height			
-	    $n=$this->GetBarMaxLineNumber()+1;
-	    $m=max($this->GetMaxLabelHeight(),$this->GetMaxBarAbsHeight());
-	    $height=$n*((1+$this->iLabelVMarginFactor)*$m);			
-			
-	    // Add the height of the scale titles			
-	    $h=$this->scale->GetHeaderHeight();
-	    $height += $h;
-
-	    // Calculate the top margin needed for title and subtitle
-	    if( $this->title->t != "" ) {
-		$tm += $this->title->GetFontHeight($this->img);
-	    }
-	    if( $this->subtitle->t != "" ) {
-		$tm += $this->subtitle->GetFontHeight($this->img);
-	    }
-
-	    // ...and then take the bottom and top plot margins into account
-	    $height += $tm + $bm + $this->scale->iTopPlotMargin + $this->scale->iBottomPlotMargin;
-	    // Now find the minimum width for the chart required
-
-	    // If day scale or smaller is shown then we use the day font width
-	    // as the base size unit.
-	    // If only weeks or above is displayed we use a modified unit to
-	    // get a smaller image.
-
-	    if( $this->scale->IsDisplayDay() || $this->scale->IsDisplayHour() || 
-		$this->scale->IsDisplayMinute() ) {
-		// Add 2 pixel margin on each side
-		$fw=$this->scale->day->GetFontWidth($this->img)+4; 
-	    }
-	    elseif( $this->scale->IsDisplayWeek() ) {
-		$fw = 8;
-	    }
-	    elseif( $this->scale->IsDisplayMonth() ) {
-		$fw = 4;
-	    }
-	    else {
-		$fw = 2;
-	    }
-	    $nd=$this->scale->GetNumberOfDays();
-
-	    if( $this->scale->IsDisplayDay() ) {
-		// If the days are displayed we also need to figure out
-		// how much space each day's title will require.
-		switch( $this->scale->day->iStyle ) {
-		    case DAYSTYLE_LONG :
-			$txt = "Monday";
-			break;
-		    case DAYSTYLE_LONGDAYDATE1 :
-			$txt =  "Monday 23 Jun";
-			break;
-		    case DAYSTYLE_LONGDAYDATE2 :
-			$txt =  "Monday 23 Jun 2003";
-			break;
-		    case DAYSTYLE_SHORT : 
-			$txt =  "Mon";
-			break;
-		    case DAYSTYLE_SHORTDAYDATE1 : 
+
+        if( $this->img->img == null ) {
+            // The predefined left, right, top, bottom margins.
+            // Note that the top margin might incease depending on
+            // the title.
+           $hadj = $vadj = 0;
+           if( $this->doshadow ) {
+           		$hadj = $this->shadow_width;
+                $vadj = $this->shadow_width+5;
+            }
+
+            $lm = $this->img->left_margin;
+            $rm = $this->img->right_margin +$hadj;
+            $rm += 2 ;
+            $tm = $this->img->top_margin;
+            $bm = $this->img->bottom_margin + $vadj;
+            $bm += 2;
+
+            // If there are any added GanttVLine we must make sure that the
+            // bottom margin is wide enough to hold a title.
+            $n = count($this->iObj);
+        	for($i=0; $i < $n; ++$i) {
+            	if( $this->iObj[$i] instanceof GanttVLine ) {
+					$bm = max($bm,$this->iObj[$i]->title->GetHeight($this->img)+10);
+            	}
+        	}
+
+            // First find out the height
+            $n=$this->GetBarMaxLineNumber()+1;
+            $m=max($this->GetMaxLabelHeight(),$this->GetMaxBarAbsHeight());
+            $height=$n*((1+$this->iLabelVMarginFactor)*$m);
+
+            // Add the height of the scale titles
+            $h=$this->scale->GetHeaderHeight();
+            $height += $h;
+
+            // Calculate the top margin needed for title and subtitle
+            if( $this->title->t != "" ) {
+                $tm += $this->title->GetFontHeight($this->img);
+            }
+            if( $this->subtitle->t != "" ) {
+                $tm += $this->subtitle->GetFontHeight($this->img);
+            }
+
+            // ...and then take the bottom and top plot margins into account
+            $height += $tm + $bm + $this->scale->iTopPlotMargin + $this->scale->iBottomPlotMargin;
+            // Now find the minimum width for the chart required
+
+            // If day scale or smaller is shown then we use the day font width
+            // as the base size unit.
+            // If only weeks or above is displayed we use a modified unit to
+            // get a smaller image.
+            if( $this->scale->IsDisplayHour() || $this->scale->IsDisplayMinute() ) {
+                // Add 2 pixel margin on each side
+                $fw=$this->scale->day->GetFontWidth($this->img)+4;
+            }
+            elseif( $this->scale->IsDisplayWeek() ) {
+                $fw = 8;
+            }
+            elseif( $this->scale->IsDisplayMonth() ) {
+                $fw = 4;
+            }
+            else {
+                $fw = 2;
+            }
+
+            $nd=$this->scale->GetNumberOfDays();
+
+            if( $this->scale->IsDisplayDay() ) {
+                // If the days are displayed we also need to figure out
+                // how much space each day's title will require.
+                switch( $this->scale->day->iStyle ) {
+                    case DAYSTYLE_LONG :
+                        $txt = "Monday";
+                        break;
+                    case DAYSTYLE_LONGDAYDATE1 :
+                        $txt =  "Monday 23 Jun";
+                        break;
+                    case DAYSTYLE_LONGDAYDATE2 :
+                        $txt =  "Monday 23 Jun 2003";
+                        break;
+                    case DAYSTYLE_SHORT :
+                        $txt =  "Mon";
+                        break;
+                    case DAYSTYLE_SHORTDAYDATE1 :
                         $txt =  "Mon 23/6";
-			break;
-		    case DAYSTYLE_SHORTDAYDATE2 :
-			$txt =  "Mon 23 Jun";
-			break;
-		    case DAYSTYLE_SHORTDAYDATE3 :
-			$txt =  "Mon 23";
-			break;
-		    case DAYSTYLE_SHORTDATE1 :
+                        break;
+                    case DAYSTYLE_SHORTDAYDATE2 :
+                        $txt =  "Mon 23 Jun";
+                        break;
+                    case DAYSTYLE_SHORTDAYDATE3 :
+                        $txt =  "Mon 23";
+                        break;
+                    case DAYSTYLE_SHORTDATE1 :
                         $txt =  "23/6";
-			break;
-		    case DAYSTYLE_SHORTDATE2 :
-			$txt =  "23 Jun";
-			break;
-		    case DAYSTYLE_SHORTDATE3 :
-			$txt =  "Mon 23";
-			break;
-		    case DAYSTYLE_CUSTOM :
-			$txt = date($this->scale->day->iLabelFormStr,
-				    strtotime('2003-12-20 18:00'));
-			break;
-		    case DAYSTYLE_ONELETTER :
-		    default:
-			$txt = "M";
-			break;
-		}
-		$fw = $this->scale->day->GetStrWidth($this->img,$txt)+6;
-	    }
-
-	    // If we have hours enabled we must make sure that each day has enough
-	    // space to fit the number of hours to be displayed.
-	    if( $this->scale->IsDisplayHour() ) {
-		// Depending on what format the user has choose we need different amount
-		// of space. We therefore create a typical string for the choosen format
-		// and determine the length of that string.
-		switch( $this->scale->hour->iStyle ) {
-		    case HOURSTYLE_HMAMPM:
-			$txt = '12:00pm';
-			break;
-		    case HOURSTYLE_H24:
-			// 13
-			$txt = '24';
-			break;
-		    case HOURSTYLE_HAMPM:
-			$txt = '12pm';
-			break;
-		    case HOURSTYLE_CUSTOM:
-			$txt = date($this->scale->hour->iLabelFormStr,strtotime('2003-12-20 18:00'));
-			break;
-		    case HOURSTYLE_HM24:
-		    default:
-			$txt = '24:00';
-			break;
-		}
-
-		$hfw = $this->scale->hour->GetStrWidth($this->img,$txt)+6;
-		$mw = $hfw;
-		if( $this->scale->IsDisplayMinute() ) {
-		    // Depending on what format the user has choose we need different amount
-		    // of space. We therefore create a typical string for the choosen format
-		    // and determine the length of that string.
-		    switch( $this->scale->minute->iStyle ) {
-			case HOURSTYLE_CUSTOM:
-			    $txt2 = date($this->scale->minute->iLabelFormStr,strtotime('2005-05-15 18:55'));
-			    break;
-			case MINUTESTYLE_MM:
-			default:
-			    $txt2 = '15';
-			    break;
-		    }
-		    
-		    $mfw = $this->scale->minute->GetStrWidth($this->img,$txt2)+6;
-		    $n2 = ceil(60 / $this->scale->minute->GetIntervall() );
-		    $mw = $n2 * $mfw;
-		}
-		$hfw = $hfw < $mw ? $mw : $hfw ;   
-		$n = ceil(24*60 / $this->scale->TimeToMinutes($this->scale->hour->GetIntervall()) );
-		$hw = $n * $hfw;
-		$fw = $fw < $hw ? $hw : $fw ;
-	    }
-
-	    // We need to repeat this code block here as well. 
-	    // THIS iS NOT A MISTAKE !
-	    // We really need it since we need to adjust for minutes both in the case
-	    // where hour scale is shown and when it is not shown.
-
-	    if( $this->scale->IsDisplayMinute() ) {
-		// Depending on what format the user has choose we need different amount
-		// of space. We therefore create a typical string for the choosen format
-		// and determine the length of that string.
-		switch( $this->scale->minute->iStyle ) {
-		    case HOURSTYLE_CUSTOM:
-			$txt = date($this->scale->minute->iLabelFormStr,strtotime('2005-05-15 18:55'));
-			break;
-		    case MINUTESTYLE_MM:
-		    default:
-			$txt = '15';
-			break;
-		}
-		
-		$mfw = $this->scale->minute->GetStrWidth($this->img,$txt)+6;
-		$n = ceil(60 / $this->scale->TimeToMinutes($this->scale->minute->GetIntervall()) );
-		$mw = $n * $mfw;
-		$fw = $fw < $mw ? $mw : $fw ;
-	    }
-
-	    // If we display week we must make sure that 7*$fw is enough
-	    // to fit up to 10 characters of the week font (if the week is enabled)
-	    if( $this->scale->IsDisplayWeek() ) {
-		// Depending on what format the user has choose we need different amount
-		// of space
-		$fsw = strlen($this->scale->week->iLabelFormStr);
-		if( $this->scale->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR ) {
-		    $fsw += 8;
-		}
-		elseif( $this->scale->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR ) {
-		    $fsw += 7;
-		}
-		else {
-		    $fsw += 4;
-		}
-		    
-		$ww = $fsw*$this->scale->week->GetFontWidth($this->img);
-		if( 7*$fw < $ww ) {
-		    $fw = ceil($ww/7);
-		}
-	    }
-
-	    if( !$this->scale->IsDisplayDay() && !$this->scale->IsDisplayHour() &&
-		!( ($this->scale->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR || 
-		    $this->scale->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR) && $this->scale->IsDisplayWeek() ) ) {
-		// If we don't display the individual days we can shrink the
-		// scale a little bit. This is a little bit pragmatic at the 
-		// moment and should be re-written to take into account
-		// a) What scales exactly are shown and 
-		// b) what format do they use so we know how wide we need to
-		// make each scale text space at minimum.
-		$fw /= 2;
-		if( !$this->scale->IsDisplayWeek() ) {
-		    $fw /= 1.8;
-		}
-	    }
-
-	    // Has the user specified a width or do we need to
-	    // determine it?
-	    if( $this->img->width <= 0 ) {
-		// Now determine the width for the activity titles column
-
-		// Firdst find out the maximum width of each object column
-		$cw = $this->GetMaxActInfoColWidth() ;
-		$this->scale->actinfo->SetMinColWidth($cw); 
-		$titlewidth = max(max($this->GetMaxLabelWidth(),
-				      $this->scale->tableTitle->GetWidth($this->img)), 
-				  $this->scale->actinfo->GetWidth($this->img));
-
-		// Add the width of the vertivcal divider line
-		$titlewidth += $this->scale->divider->iWeight*2;
-
-
-		// Now get the total width taking 
-		// titlewidth, left and rigt margin, dayfont size 
-		// into account
-		$width = $titlewidth + $nd*$fw + $lm+$rm;
-	    }
-	    else
-		$width = $this->img->width;
-						
-	    $this->img->CreateImgCanvas($width,$height);			
-	    $this->img->SetMargin($lm,$rm,$tm,$bm);
-	}
+                        break;
+                    case DAYSTYLE_SHORTDATE2 :
+                        $txt =  "23 Jun";
+                        break;
+                    case DAYSTYLE_SHORTDATE3 :
+                        $txt =  "Mon 23";
+                        break;
+                    case DAYSTYLE_SHORTDATE4 :
+                        $txt =  "88";
+                        break;
+                    case DAYSTYLE_CUSTOM :
+                        $txt = date($this->scale->day->iLabelFormStr,strtotime('2003-12-20 18:00'));
+                        break;
+                    case DAYSTYLE_ONELETTER :
+                    default:
+                        $txt = "M";
+                        break;
+                }
+                $fw = $this->scale->day->GetStrWidth($this->img,$txt)+6;
+            }
+
+            // If we have hours enabled we must make sure that each day has enough
+            // space to fit the number of hours to be displayed.
+            if( $this->scale->IsDisplayHour() ) {
+                // Depending on what format the user has choose we need different amount
+                // of space. We therefore create a typical string for the choosen format
+                // and determine the length of that string.
+                switch( $this->scale->hour->iStyle ) {
+                    case HOURSTYLE_HMAMPM:
+                        $txt = '12:00pm';
+                        break;
+                    case HOURSTYLE_H24:
+                        // 13
+                        $txt = '24';
+                        break;
+                    case HOURSTYLE_HAMPM:
+                        $txt = '12pm';
+                        break;
+                    case HOURSTYLE_CUSTOM:
+                        $txt = date($this->scale->hour->iLabelFormStr,strtotime('2003-12-20 18:00'));
+                        break;
+                    case HOURSTYLE_HM24:
+                    default:
+                        $txt = '24:00';
+                        break;
+                }
+
+                $hfw = $this->scale->hour->GetStrWidth($this->img,$txt)+6;
+                $mw = $hfw;
+                if( $this->scale->IsDisplayMinute() ) {
+                    // Depending on what format the user has choose we need different amount
+                    // of space. We therefore create a typical string for the choosen format
+                    // and determine the length of that string.
+                    switch( $this->scale->minute->iStyle ) {
+                        case HOURSTYLE_CUSTOM:
+                            $txt2 = date($this->scale->minute->iLabelFormStr,strtotime('2005-05-15 18:55'));
+                            break;
+                        case MINUTESTYLE_MM:
+                        default:
+                            $txt2 = '15';
+                            break;
+                    }
+
+                    $mfw = $this->scale->minute->GetStrWidth($this->img,$txt2)+6;
+                    $n2 = ceil(60 / $this->scale->minute->GetIntervall() );
+                    $mw = $n2 * $mfw;
+                }
+                $hfw = $hfw < $mw ? $mw : $hfw ;
+                $n = ceil(24*60 / $this->scale->TimeToMinutes($this->scale->hour->GetIntervall()) );
+                $hw = $n * $hfw;
+                $fw = $fw < $hw ? $hw : $fw ;
+            }
+
+            // We need to repeat this code block here as well.
+            // THIS iS NOT A MISTAKE !
+            // We really need it since we need to adjust for minutes both in the case
+            // where hour scale is shown and when it is not shown.
+
+            if( $this->scale->IsDisplayMinute() ) {
+                // Depending on what format the user has choose we need different amount
+                // of space. We therefore create a typical string for the choosen format
+                // and determine the length of that string.
+                switch( $this->scale->minute->iStyle ) {
+                    case HOURSTYLE_CUSTOM:
+                        $txt = date($this->scale->minute->iLabelFormStr,strtotime('2005-05-15 18:55'));
+                        break;
+                    case MINUTESTYLE_MM:
+                    default:
+                        $txt = '15';
+                        break;
+                }
+
+                $mfw = $this->scale->minute->GetStrWidth($this->img,$txt)+6;
+                $n = ceil(60 / $this->scale->TimeToMinutes($this->scale->minute->GetIntervall()) );
+                $mw = $n * $mfw;
+                $fw = $fw < $mw ? $mw : $fw ;
+            }
+
+            // If we display week we must make sure that 7*$fw is enough
+            // to fit up to 10 characters of the week font (if the week is enabled)
+            if( $this->scale->IsDisplayWeek() ) {
+                // Depending on what format the user has choose we need different amount
+                // of space
+                $fsw = strlen($this->scale->week->iLabelFormStr);
+                if( $this->scale->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR ) {
+                    $fsw += 8;
+                }
+                elseif( $this->scale->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR ) {
+                    $fsw += 7;
+                }
+                else {
+                    $fsw += 4;
+                }
+
+                $ww = $fsw*$this->scale->week->GetFontWidth($this->img);
+                if( 7*$fw < $ww ) {
+                    $fw = ceil($ww/7);
+                }
+            }
+
+            if( !$this->scale->IsDisplayDay() && !$this->scale->IsDisplayHour() &&
+            	!( ($this->scale->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR ||
+            		$this->scale->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR) && $this->scale->IsDisplayWeek() ) ) {
+                // If we don't display the individual days we can shrink the
+                // scale a little bit. This is a little bit pragmatic at the
+                // moment and should be re-written to take into account
+                // a) What scales exactly are shown and
+                // b) what format do they use so we know how wide we need to
+                // make each scale text space at minimum.
+                $fw /= 2;
+                if( !$this->scale->IsDisplayWeek() ) {
+                    $fw /= 1.8;
+                }
+            }
+
+            $cw = $this->GetMaxActInfoColWidth() ;
+            $this->scale->actinfo->SetMinColWidth($cw);
+            if( $this->img->width <= 0 ) {
+                // Now determine the width for the activity titles column
+
+                // Firdst find out the maximum width of each object column
+                $titlewidth = max(max($this->GetMaxLabelWidth(),
+                $this->scale->tableTitle->GetWidth($this->img)),
+                $this->scale->actinfo->GetWidth($this->img));
+
+                // Add the width of the vertivcal divider line
+                $titlewidth += $this->scale->divider->iWeight*2;
+
+				// Adjust the width by the user specified zoom factor
+				$fw *= $this->iZoomFactor;
+
+                // Now get the total width taking
+                // titlewidth, left and rigt margin, dayfont size
+                // into account
+                $width = $titlewidth + $nd*$fw + $lm+$rm;
+            }
+            else {
+                $width = $this->img->width;
+            }
+
+            $width = round($width);
+            $height = round($height);
+            // Make a sanity check on image size
+            if( $width > MAX_GANTTIMG_SIZE_W || $height > MAX_GANTTIMG_SIZE_H ) {
+                JpgraphError::RaiseL(6007,$width,$height);
+                //("Sanity check for automatic Gantt chart size failed. Either the width (=$width) or height (=$height) is larger than MAX_GANTTIMG_SIZE. This could potentially be caused by a wrong date in one of the activities.");
+            }
+            $this->img->CreateImgCanvas($width,$height);
+            $this->img->SetMargin($lm,$rm,$tm,$bm);
+        }
     }
 
     // Return an array width the maximum width for each activity
@@ -864,219 +929,228 @@ function AutoSize() {
     // to find out the maximum width of each column. In order to do that we
     // must walk through all the objects, sigh...
     function GetMaxActInfoColWidth() {
-	$n = count($this->iObj);
-	if( $n == 0 ) return;
-	$w = array();
-	$m = $this->scale->actinfo->iLeftColMargin + $this->scale->actinfo->iRightColMargin;
-	
-	for( $i=0; $i < $n; ++$i ) {
-	    $tmp = $this->iObj[$i]->title->GetColWidth($this->img,$m);
-	    $nn = count($tmp);
-	    for( $j=0; $j < $nn; ++$j ) {
-		if( empty($w[$j]) ) 
-		    $w[$j] = $tmp[$j];
-		else 
-		    $w[$j] = max($w[$j],$tmp[$j]);
-	    }
-	}
-	return $w;
+        $n = count($this->iObj);
+        if( $n == 0 ) return;
+        $w = array();
+        $m = $this->scale->actinfo->iLeftColMargin + $this->scale->actinfo->iRightColMargin;
+
+        for( $i=0; $i < $n; ++$i ) {
+            $tmp = $this->iObj[$i]->title->GetColWidth($this->img,$m);
+            $nn = count($tmp);
+            for( $j=0; $j < $nn; ++$j ) {
+                if( empty($w[$j]) )
+                $w[$j] = $tmp[$j];
+                else
+                $w[$j] = max($w[$j],$tmp[$j]);
+            }
+        }
+        return $w;
     }
 
     // Stroke the gantt chart
-    function Stroke($aStrokeFileName="") {	
-
-
-	// If the filename is the predefined value = '_csim_special_'
-	// we assume that the call to stroke only needs to do enough
-	// to correctly generate the CSIM maps.
-	// We use this variable to skip things we don't strictly need
-	// to do to generate the image map to improve performance
-	// a best we can. Therefor you will see a lot of tests !$_csim in the
-	// code below.
-	$_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
-
-	// Should we autoscale dates?
-	if( !$this->scale->IsRangeSet() ) {
-	    list($min,$max) = $this->GetBarMinMax();
-	    $this->scale->SetRange($min,$max);
-	}
-
-	$this->scale->AdjustStartEndDay();
-
-	// Check if we should autoscale the image
-	$this->AutoSize();
-		
-	// Should we start from the top or just spread the bars out even over the
-	// available height
-	$this->scale->SetVertLayout($this->iLayout);			
-	if( $this->iLayout == GANTT_FROMTOP ) {
-	    $maxheight=max($this->GetMaxLabelHeight(),$this->GetMaxBarAbsHeight());
-	    $this->scale->SetVertSpacing($maxheight*(1+$this->iLabelVMarginFactor));
-	}
-	// If it hasn't been set find out the maximum line number
-	if( $this->scale->iVertLines == -1 ) 
-	    $this->scale->iVertLines = $this->GetBarMaxLineNumber()+1; 	
-		
-	$maxwidth=max($this->scale->actinfo->GetWidth($this->img),
-		      max($this->GetMaxLabelWidth(),
-		      $this->scale->tableTitle->GetWidth($this->img)));
-
-	$this->scale->SetLabelWidth($maxwidth+$this->scale->divider->iWeight);//*(1+$this->iLabelHMarginFactor));
-
-	if( !$_csim ) 
-	    $this->StrokePlotArea();
-
-	$this->scale->Stroke();
-
-	if( !$_csim ) {
-	    // Due to a minor off by 1 bug we need to temporarily adjust the margin
-	    $this->img->right_margin--;
-	    $this->StrokePlotBox();
-	    $this->img->right_margin++;
-	}
-
-	// Stroke Grid line
-	$this->hgrid->Stroke($this->img,$this->scale);
-
-	$n = count($this->iObj);
-	for($i=0; $i < $n; ++$i) {
-	    //$this->iObj[$i]->SetLabelLeftMargin(round($maxwidth*$this->iLabelHMarginFactor/2));
-	    $this->iObj[$i]->Stroke($this->img,$this->scale);
-	}
-
-	$this->StrokeTitles();
-
-	if( !$_csim ) {
-	    $this->StrokeConstrains();
-	    $this->footer->Stroke($this->img);
-
-	    // Should we do any final image transformation
-	    if( $this->iImgTrans ) {
-		if( !class_exists('ImgTrans') ) {
-		    require_once('jpgraph_imgtrans.php');
-		}
-	    
-		$tform = new ImgTrans($this->img->img);
-		$this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
-						 $this->iImgTransDirection,$this->iImgTransHighQ,
-						 $this->iImgTransMinSize,$this->iImgTransFillColor,
-						 $this->iImgTransBorder);
-	    }
-	    
-	    
-	    // If the filename is given as the special "__handle"
-	    // then the image handler is returned and the image is NOT
-	    // streamed back
-	    if( $aStrokeFileName == _IMG_HANDLER ) {
-		return $this->img->img;
-	    }
-	    else {
-		// Finally stream the generated picture					
-		$this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,
-					   $aStrokeFileName);		
-	    }
-	}
+    function Stroke($aStrokeFileName="") {
+
+        // If the filename is the predefined value = '_csim_special_'
+        // we assume that the call to stroke only needs to do enough
+        // to correctly generate the CSIM maps.
+        // We use this variable to skip things we don't strictly need
+        // to do to generate the image map to improve performance
+        // a best we can. Therefor you will see a lot of tests !$_csim in the
+        // code below.
+        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
+
+        // Should we autoscale dates?
+
+        if( !$this->scale->IsRangeSet() ) {
+            list($min,$max) = $this->GetBarMinMax();
+            $this->scale->SetRange($min,$max);
+        }
+
+        $this->scale->AdjustStartEndDay();
+
+        // Check if we should autoscale the image
+        $this->AutoSize();
+
+        // Should we start from the top or just spread the bars out even over the
+        // available height
+        $this->scale->SetVertLayout($this->iLayout);
+        if( $this->iLayout == GANTT_FROMTOP ) {
+            $maxheight=max($this->GetMaxLabelHeight(),$this->GetMaxBarAbsHeight());
+            $this->scale->SetVertSpacing($maxheight*(1+$this->iLabelVMarginFactor));
+        }
+        // If it hasn't been set find out the maximum line number
+        if( $this->scale->iVertLines == -1 )
+        	$this->scale->iVertLines = $this->GetBarMaxLineNumber()+1;
+
+        $maxwidth=max($this->scale->actinfo->GetWidth($this->img),
+        max($this->GetMaxLabelWidth(),
+        $this->scale->tableTitle->GetWidth($this->img)));
+
+        $this->scale->SetLabelWidth($maxwidth+$this->scale->divider->iWeight);//*(1+$this->iLabelHMarginFactor));
+
+        if( !$_csim ) {
+            $this->StrokePlotArea();
+            if( $this->iIconDepth == DEPTH_BACK ) {
+                $this->StrokeIcons();
+            }
+        }
+
+        $this->scale->Stroke();
+
+        if( !$_csim ) {
+            // Due to a minor off by 1 bug we need to temporarily adjust the margin
+            $this->img->right_margin--;
+            $this->StrokePlotBox();
+            $this->img->right_margin++;
+        }
+
+        // Stroke Grid line
+        $this->hgrid->Stroke($this->img,$this->scale);
+
+        $n = count($this->iObj);
+        for($i=0; $i < $n; ++$i) {
+            //$this->iObj[$i]->SetLabelLeftMargin(round($maxwidth*$this->iLabelHMarginFactor/2));
+            $this->iObj[$i]->Stroke($this->img,$this->scale);
+        }
+
+        $this->StrokeTitles();
+
+        if( !$_csim ) {
+            $this->StrokeConstrains();
+            $this->footer->Stroke($this->img);
+
+
+            if( $this->iIconDepth == DEPTH_FRONT) {
+                $this->StrokeIcons();
+            }
+
+            // Stroke all added user texts
+            $this->StrokeTexts();
+
+            // Should we do any final image transformation
+            if( $this->iImgTrans ) {
+                if( !class_exists('ImgTrans',false) ) {
+                    require_once('jpgraph_imgtrans.php');
+                }
+
+                $tform = new ImgTrans($this->img->img);
+                $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
+                $this->iImgTransDirection,$this->iImgTransHighQ,
+                $this->iImgTransMinSize,$this->iImgTransFillColor,
+                $this->iImgTransBorder);
+            }
+
+
+            // If the filename is given as the special "__handle"
+            // then the image handler is returned and the image is NOT
+            // streamed back
+            if( $aStrokeFileName == _IMG_HANDLER ) {
+                return $this->img->img;
+            }
+            else {
+                // Finally stream the generated picture
+                $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,
+                $aStrokeFileName);
+            }
+        }
     }
 
     function StrokeConstrains() {
-	$n = count($this->iObj);
-
-	// Stroke all constrains
-	for($i=0; $i < $n; ++$i) {
-
-	    // Some gantt objects may not have constraints associated with them
-	    // for example we can add IconPlots which doesn't have this property.
-	    if( empty($this->iObj[$i]->constraints) ) continue;
-
-	    $numConstrains = count($this->iObj[$i]->constraints);
-
-	    for( $k = 0; $k < $numConstrains; $k++ ) {
-		$vpos = $this->iObj[$i]->constraints[$k]->iConstrainRow;
-		if( $vpos >= 0 ) {
-		    $c1 = $this->iObj[$i]->iConstrainPos;
-
-		    // Find out which object is on the target row
-		    $targetobj = -1;
-		    for( $j=0; $j < $n && $targetobj == -1; ++$j ) {
-			if( $this->iObj[$j]->iVPos == $vpos ) {
-			    $targetobj = $j;
-			}
-		    }
-		    if( $targetobj == -1 ) {
-			JpGraphError::Raise('You have specifed a constrain from row='.
-					    $this->iObj[$i]->iVPos.
-					    ' to row='.$vpos.' which does not have any activity.');
-			exit();
-		    }
-		    $c2 = $this->iObj[$targetobj]->iConstrainPos;
-		    if( count($c1) == 4 && count($c2 ) == 4) {
-			switch( $this->iObj[$i]->constraints[$k]->iConstrainType ) {
-			    case CONSTRAIN_ENDSTART:
-				if( $c1[1] < $c2[1] ) {
-				    $link = new GanttLink($c1[2],$c1[3],$c2[0],$c2[1]);
-				}
-				else {
-				    $link = new GanttLink($c1[2],$c1[1],$c2[0],$c2[3]);
-				}
-				$link->SetPath(3);
-				break;
-			    case CONSTRAIN_STARTEND:
-				if( $c1[1] < $c2[1] ) {
-				    $link = new GanttLink($c1[0],$c1[3],$c2[2],$c2[1]);
-				}
-				else {
-				    $link = new GanttLink($c1[0],$c1[1],$c2[2],$c2[3]);
-				}
-				$link->SetPath(0);
-				break;
-			    case CONSTRAIN_ENDEND:
-				if( $c1[1] < $c2[1] ) {
-				    $link = new GanttLink($c1[2],$c1[3],$c2[2],$c2[1]);
-				}
-				else {
-				    $link = new GanttLink($c1[2],$c1[1],$c2[2],$c2[3]);
-				}
-				$link->SetPath(1);
-				break;
-			    case CONSTRAIN_STARTSTART:
-				if( $c1[1] < $c2[1] ) {
-				    $link = new GanttLink($c1[0],$c1[3],$c2[0],$c2[1]);
-				}
-				else {
-				    $link = new GanttLink($c1[0],$c1[1],$c2[0],$c2[3]);
-				}
-				$link->SetPath(3);
-				break;
-			    default:
-				JpGraphError::Raise('Unknown constrain type specified from row='.
-						    $this->iObj[$i]->iVPos.
-						    ' to row='.$vpos);
-				break;
-			}
-
-			$link->SetColor($this->iObj[$i]->constraints[$k]->iConstrainColor);
-			$link->SetArrow($this->iObj[$i]->constraints[$k]->iConstrainArrowSize,
-					$this->iObj[$i]->constraints[$k]->iConstrainArrowType);
- 
-			$link->Stroke($this->img);
-		    }
-		}
-	    }
-	}
+        $n = count($this->iObj);
+
+        // Stroke all constrains
+        for($i=0; $i < $n; ++$i) {
+
+            // Some gantt objects may not have constraints associated with them
+            // for example we can add IconPlots which doesn't have this property.
+            if( empty($this->iObj[$i]->constraints) ) continue;
+
+            $numConstrains = count($this->iObj[$i]->constraints);
+
+            for( $k = 0; $k < $numConstrains; $k++ ) {
+                $vpos = $this->iObj[$i]->constraints[$k]->iConstrainRow;
+                if( $vpos >= 0 ) {
+                    $c1 = $this->iObj[$i]->iConstrainPos;
+
+                    // Find out which object is on the target row
+                    $targetobj = -1;
+                    for( $j=0; $j < $n && $targetobj == -1; ++$j ) {
+                        if( $this->iObj[$j]->iVPos == $vpos ) {
+                            $targetobj = $j;
+                        }
+                    }
+                    if( $targetobj == -1 ) {
+                        JpGraphError::RaiseL(6008,$this->iObj[$i]->iVPos,$vpos);
+                        //('You have specifed a constrain from row='.$this->iObj[$i]->iVPos.' to row='.$vpos.' which does not have any activity.');
+                    }
+                    $c2 = $this->iObj[$targetobj]->iConstrainPos;
+                    if( count($c1) == 4 && count($c2 ) == 4) {
+                        switch( $this->iObj[$i]->constraints[$k]->iConstrainType ) {
+                            case CONSTRAIN_ENDSTART:
+                                if( $c1[1] < $c2[1] ) {
+                                    $link = new GanttLink($c1[2],$c1[3],$c2[0],$c2[1]);
+                                }
+                                else {
+                                    $link = new GanttLink($c1[2],$c1[1],$c2[0],$c2[3]);
+                                }
+                                $link->SetPath(3);
+                                break;
+                            case CONSTRAIN_STARTEND:
+                                if( $c1[1] < $c2[1] ) {
+                                    $link = new GanttLink($c1[0],$c1[3],$c2[2],$c2[1]);
+                                }
+                                else {
+                                    $link = new GanttLink($c1[0],$c1[1],$c2[2],$c2[3]);
+                                }
+                                $link->SetPath(0);
+                                break;
+                            case CONSTRAIN_ENDEND:
+                                if( $c1[1] < $c2[1] ) {
+                                    $link = new GanttLink($c1[2],$c1[3],$c2[2],$c2[1]);
+                                }
+                                else {
+                                    $link = new GanttLink($c1[2],$c1[1],$c2[2],$c2[3]);
+                                }
+                                $link->SetPath(1);
+                                break;
+                            case CONSTRAIN_STARTSTART:
+                                if( $c1[1] < $c2[1] ) {
+                                    $link = new GanttLink($c1[0],$c1[3],$c2[0],$c2[1]);
+                                }
+                                else {
+                                    $link = new GanttLink($c1[0],$c1[1],$c2[0],$c2[3]);
+                                }
+                                $link->SetPath(3);
+                                break;
+                            default:
+                                JpGraphError::RaiseL(6009,$this->iObj[$i]->iVPos,$vpos);
+                                //('Unknown constrain type specified from row='.$this->iObj[$i]->iVPos.' to row='.$vpos);
+                                break;
+                        }
+
+                        $link->SetColor($this->iObj[$i]->constraints[$k]->iConstrainColor);
+                        $link->SetArrow($this->iObj[$i]->constraints[$k]->iConstrainArrowSize,
+                        $this->iObj[$i]->constraints[$k]->iConstrainArrowType);
+
+                        $link->Stroke($this->img);
+                    }
+                }
+            }
+        }
     }
 
     function GetCSIMAreas() {
-	if( !$this->iHasStroked )
-	    $this->Stroke(_CSIM_SPECIALFILE);
+        if( !$this->iHasStroked )
+        $this->Stroke(_CSIM_SPECIALFILE);
 
-	$csim = $this->title->GetCSIMAreas();
-	$csim .= $this->subtitle->GetCSIMAreas();
-	$csim .= $this->subsubtitle->GetCSIMAreas();
+        $csim = $this->title->GetCSIMAreas();
+        $csim .= $this->subtitle->GetCSIMAreas();
+        $csim .= $this->subsubtitle->GetCSIMAreas();
 
-	$n = count($this->iObj);
-	for( $i=$n-1; $i >= 0; --$i ) 
-	    $csim .= $this->iObj[$i]->GetCSIMArea();
-	return $csim;
+        $n = count($this->iObj);
+        for( $i=$n-1; $i >= 0; --$i )
+        $csim .= $this->iObj[$i]->GetCSIMArea();
+        return $csim;
     }
 }
 
@@ -1084,313 +1158,313 @@ function GetCSIMAreas() {
 // CLASS PredefIcons
 // Description: Predefined icons for use with Gantt charts
 //===================================================
-DEFINE('GICON_WARNINGRED',0);
-DEFINE('GICON_TEXT',1);
-DEFINE('GICON_ENDCONS',2);
-DEFINE('GICON_MAIL',3);
-DEFINE('GICON_STARTCONS',4);
-DEFINE('GICON_CALC',5);
-DEFINE('GICON_MAGNIFIER',6);
-DEFINE('GICON_LOCK',7);
-DEFINE('GICON_STOP',8);
-DEFINE('GICON_WARNINGYELLOW',9);
-DEFINE('GICON_FOLDEROPEN',10);
-DEFINE('GICON_FOLDER',11);
-DEFINE('GICON_TEXTIMPORTANT',12);
+define('GICON_WARNINGRED',0);
+define('GICON_TEXT',1);
+define('GICON_ENDCONS',2);
+define('GICON_MAIL',3);
+define('GICON_STARTCONS',4);
+define('GICON_CALC',5);
+define('GICON_MAGNIFIER',6);
+define('GICON_LOCK',7);
+define('GICON_STOP',8);
+define('GICON_WARNINGYELLOW',9);
+define('GICON_FOLDEROPEN',10);
+define('GICON_FOLDER',11);
+define('GICON_TEXTIMPORTANT',12);
 
 class PredefIcons {
-    var $iBuiltinIcon = null;
-    var $iLen = -1 ;
+    private $iBuiltinIcon = null, $iLen = -1 ;
 
     function GetLen() {
-	return $this->iLen ; 
+        return $this->iLen ;
     }
 
     function GetImg($aIdx) {
-	if( $aIdx < 0 || $aIdx >= $this->iLen ) {
-	    JpGraphError::Raise('Illegal icon index for Gantt builtin icon ['.$aIdx.']');
-	}
-	return Image::CreateFromString(base64_decode($this->iBuiltinIcon[$aIdx][1]));   
-    }
-
-    function PredefIcons() {
-	//==========================================================
-	// warning.png
-	//==========================================================
-	$this->iBuiltinIcon[0][0]= 1043 ;
-	$this->iBuiltinIcon[0][1]= 
-	    'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsSAAALEgHS3X78AAAA'.
-	    'B3RJTUUH0wgKFSgilWPhUQAAA6BJREFUeNrtl91rHFUYh5/3zMx+Z5JNUoOamCZNaqTZ6IWIkqRiQWmi1IDetHfeiCiltgXBP8AL'.
-	    '0SIUxf/AvfRSBS9EKILFFqyIH9CEmFZtPqrBJLs7c+b1YneT3WTTbNsUFPLCcAbmzPt73o9zzgzs2Z793231UOdv3w9k9Z2uzOdA'.
-	    '5+2+79yNeL7Hl7hw7oeixRMZ6PJM26W18DNAm/Vh7lR8fqh97NmMF11es1iFpMATqdirwMNA/J4DpIzkr5YsAF1PO6gIMYHRdPwl'.
-	    'oO2elmB+qH3sm7XozbkgYvy8SzYnZPtcblyM6I+5z3jQ+0vJfgpEu56BfI9vUkbyi2HZd1QJoeWRiAjBd4SDCW8SSAOy6wBHMzF7'.
-	    'YdV2A+ROuvRPLfHoiSU0EMY/cDAIhxJeGngKaN1VgHyPL7NBxI1K9P4QxBzw3K1zJ/zkG8B9uwaQ7/HNsRZv9kohBGD0o7JqMYS/'.
-	    '/ynPidQw/LrBiPBcS/yFCT95DvB2BWAy4575PaQbQKW+tPd3GCItu2odKI++YxiKu0d26oWmAD7paZU/rLz37VqIijD2YbnzNBBE'.
-	    'IBHf8K8qjL7vYhCGErEU8CTg3xXAeMp96GrJEqkyXkm9Bhui1xfsunjdGhcYLq+IzjsGmBt5YH/cmJkFq6gIqlon3u4LxdKGuCIo'.
-	    'Qu41g0E41po+2R33Xt5uz9kRIB2UTle7PnfKrROP1HD4sRjZlq0lzhwoZ6rDNeTi3nEg1si/7FT7kYQbXS6E5E65tA5uRF9tutq0'.
-	    'K/VwAF+/FbIYWt6+tjQM/AqUms7A4Wy6d7YSfSNxgMmzi0ycWWworio4QJvj4LpuL5BqugTnXzzqJsJwurrlNhJXFaavW67NRw3F'.
-	    'q+aJcCQVe9fzvJGmAY7/dPH0gi0f64OveGxa+usCuQMeZ0+kt8BVrX+qPO9Bzx0MgqBvs+a2PfDdYIf+WAjXU1ub4tqNaPPzRs8A'.
-	    'blrli+WVn79cXn0cWKl+tGx7HLc7pu3CSmnfitL+l1UihAhwjFkPQev4K/fSABjBM8JCaFuurJU+rgW41SroA8aNMVNAFtgHJCsn'.
-	    'XGy/58QVxAC9MccJtZ5kIzNlW440WrJ2ea4YPA9cAooA7i0A/gS+iqLoOpB1HOegqrYB3UBmJrAtQAJwpwPr1Ry92wVlgZsiYlW1'.
-	    'uX1gU36dymgqYxJIJJNJT1W9QqHgNwFQBGYqo94OwHZQUuPD7ACglSvc+5n5T9m/wfJJX4U9qzEAAAAASUVORK5CYII=' ; 
-
-	//==========================================================
-	// edit.png
-	//==========================================================
-	$this->iBuiltinIcon[1][0]= 959 ;
-	$this->iBuiltinIcon[1][1]= 
-	    'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAFgAWABY9j+ZuwAAAAlwSFlz'.
-	    'AAALEAAACxABrSO9dQAAAAd0SU1FB9AKDAwbIEXOA6AAAAM8SURBVHicpdRPaBxlHMbx76ZvsmOTmm1dsEqQSIIsEmGVBAQjivEQ'.
-	    'PAUJngpWsAWlBw8egpQepKwplN4ULEG9CjkEyUFKlSJrWTG0IU51pCsdYW2ncUPjdtp9Z+f3vuNhu8nKbmhaf5cZeGc+PO8zf1Lc'.
-	    'm0KhkACICCKCMeaBjiLC0tLSnjNvPmuOHRpH0TZTU1M8zBi9wakzn7OFTs5sw8YYACYmJrre7HkeuVyu69qPF77hlT1XmZ0eQ03O'.
-	    'wOLJTvhBx1rLz18VmJ0eY+jVd2FxDkKXnvYLHgb97OgLzE4ON9Hzc1B1QaQzsed5O0Lta3Ec89OnR5h5McfQ+Mw2qgQUnfBOPbZ3'.
-	    'bK3l+xOvMT0+3ERLp5FNF6UEjcL32+DdVmGt5WLhDYYPZrbRqreFumXwql0S3w9tnDvLWD5PZigPpdOwuYpSCo3C8wU3UHxQdHbf'.
-	    'cZIkNM6dxcnlUM4k1eUFMlUPpUADbpkttFarHe6oYqeOr6yt4RzMQHYUcUsQVtGicHDwKprViuLDkkOtVnsHCHZVRVy/zcj1i5Af'.
-	    'h8AjdIts+hUcGcYPK3iBtKM3gD/uAzf/AdY2mmmVgy6X8YNNKmGIvyloPcB8SUin07RQ4EZHFdsdG0wkJEnEaHAJxvKEpSLeaokV'.
-	    'r4zWmhUZYLlY4b1D03y5eIEWCtS7vsciAgiIxkQRabWOrlQor66y4pUphoJb1jiO4uO5o0S3q6RSqVbiOmC7VCEgAhLSaDQ48dH7'.
-	    'vD46REY0iysegSjKQciRt99ib7qXwX0O+pG4teM6YKHLB9JMq4mTmF9/+AKA4wvLZByH7OgYL7+UY2qvw/7Bfg5kHiXjJFyv3CGO'.
-	    'Y1rof+BW4t/XLiPG0DCGr79d4XzRxRnIMn98huXSTYyJ6et1UNYQhRvcinpJq86H3wGPPPM0iBDd+QffD1g4eZjLvuG7S1Wef26E'.
-	    'J7L7eSx7gAHVg7V3MSbi6m/r93baBd6qQjerAJg/9Ql/XrvG0ON1+vv7GH3qSfY5fahUnSTpwZgIEQesaVXRPbHRG/xyJSAxMYlp'.
-	    'EOm71HUINiY7mGb95l/8jZCyQmJjMDGJjUmsdCROtZ0n/P/Z8v4Fs2MTUUf7vYoAAAAASUVORK5CYII=' ; 
-
-	//==========================================================
-	// endconstrain.png
-	//==========================================================
-	$this->iBuiltinIcon[2][0]= 666 ;
-	$this->iBuiltinIcon[2][1]= 
-	    'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlz'.
-	    'AAALDwAACw8BkvkDpQAAAAd0SU1FB9ALEREILkh0+eQAAAIXSURBVHictZU9aFNRFMd/N81HX77aptJUWmp1LHRpIcWhg5sIDlUQ'.
-	    'LAXB4t7RRUpwEhy7iQ46CCIoSHcl0CFaoVARU2MFMYktadLXJNok7x2HtCExvuYFmnO4w/3gx+Gc/z1HKRTdMEdXqHbB/sgc/sic'.
-	    'nDoYAI8XwDa8o1RMLT+2hAsigtTvbIGVqhX46szUifBGswUeCPgAGB7QeLk0X4Ork+HOxo1VgSqGASjMqkn8W4r4vVtEgI/RRQEL'.
-	    'vaoGD85cl5V3nySR/S1mxWxab7f35PnntNyMJeRr9kCMqiHTy09EoeToLwggx6ymiMOD/VwcD7Oa/MHkcIiQx026WGYto5P/U+ZZ'.
-	    '7gD0QwDuT5z9N3LrVPi0Xs543eQPKkRzaS54eviJIp4tMFQFMllAWN2qcRZHBnixNM8NYD162xq8u7ePSQ+GX2Pjwxc2dB2cLtB8'.
-	    '7GgamCb0anBYBeChMtl8855CarclxU1gvViiUK4w2OMkNDnGeJ8bt9fH90yOnOkCwLFTwhzykhvtYzOWoBBbY//R3dbaNTYhf2RO'.
-	    'QpeuUMzv188MlwuHy0H13HnE48UzMcL0WAtUHX8OxZHoG1URiFw7rnLLCswuSPD1ulze/iWjT2PSf+dBXRFtVVGIvzqph0pQL7VE'.
-	    'avXYaXXxPwsnt0imdttCocMmZBdK7YU9D8wuNOW0nXc6QWzPsSa5naZ1beb9BbGB6dxGtMnXAAAAAElFTkSuQmCC' ; 
-
-	//==========================================================
-	// mail.png
-	//==========================================================
-	$this->iBuiltinIcon[3][0]= 1122 ;
-	$this->iBuiltinIcon[3][1]= 
-	    'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlz'.
-	    'AAALEAAACxABrSO9dQAAAAd0SU1FB9AJHAMfFvL9OU8AAAPfSURBVHictZRdaBRXFMd/987H7tbNx8aYtGCrEexDsOBDaKHFxirb'.
-	    'h0qhsiY0ykppKq1osI99C4H2WSiFFMHWUhXBrjRi0uCmtSEUGgP1QWqhWjGkoW7M1kTX3WRn5p4+TJJNGolQ6IXDnDtz+N0z/3PP'.
-	    'UWBIpdpYa23b9g09PZ2kUrOrvmUyGVKp1Ao/mUyi56YnVgWfO/P1CihAd/dJMpmaNROIRq8BkM1m0bH6TasC3j6QXgFdXI+DR6PR'.
-	    'JX/Pno8B+KLnMKqlpUU8z8MYs2RBEDzWf9J+0RcRbMdxGBsbw/fmCXwPMUEYID4iAVp8wIRmDIHMo4yHSIBSASKC+CWE0C/PF9jU'.
-	    '3B6Cp+4M07C5FUtKGNvGwQJctPgIsgD2wRhEIqAMGB+UQYkHJgYYZD7P1HwVlmWhHcfhyk83KeRGUW4t6CgoG5SNUS4KBWgQDUov'.
-	    '7AGlwYASBVqH0Bk49dXpCviVV3dw/tI1Bvr7kMIIlh0NYUpjlF0BAYvcxSXmEVLKceHSCJm+PnbueBHbtkNwTXUNBzo6aGpq4sSZ'.
-	    'GwT5H7BsF6Wdf1GWHQAoM0upeI9PT1yioS7B7tdaSdSuw7KsUGMAy7HYsmUztTW1nMwM0txssX1rlHjjS5jy/Uq2YkK/eJuLl6/z'.
-	    'x+1xkslW6mrixGIODx8EFSlEBC0+tmXT0NhA2763iEUjnLv4C8XpUbSbAB1mKkGJ3J83Od77HW5EszvZSqK2iljMIeJaRGNuJePF'.
-	    '6mspY7BJ1DXwQnCd2fxGRq5OUCz8xt72dyhMZcn++Cu3xu9SKhdp2b4ZHWnAtTSxmIWlhcIjlksR3lNBYzlxZsb7+f7ne+xtSzOd'.
-	    'u83szH1OnThOPp/n+a0beeP1l4mvq+PU2Qyd+5PY1RuwlAqLYFaBfbTbyPSdfgaH77A//QF4f1O/vpr6RJyq+C5Kc/M8FbFxXItY'.
-	    'xOHDrvfo/fxLDnbsJBp5BowBReVWYAzabeTh5ABDw7cWoNNL3YYYNtSv57lnn6Z+Qx01VeuIuBa2DV1HD3H63BAPZu4u1WGpeLHq'.
-	    'Rh7+NcjA0O+0p4+CNwXigwnbWlQQdpuEpli+n+PIkcOc//YKuckJJFh2K2anrjFw+QZt6S6kPImIF/b+cqAJD1LihWAxC61twBTo'.
-	    'fPcQF/oGsVW5ovHQlavs2/8+uYnRVSOUgHAmmAClBIOBwKC0gPjhIRgEIX2wg7NnwpZW3d3d4vs+vu8TBMGK51rvPM9b8hdteZxd'.
-	    'LBbVR8feJDs0Rlv6GFKeXJ21rNRXESxMPR+CBUl0nN7PjtO+dye7Up/8v1I88bf/ixT/AO1/hZsqW+C6AAAAAElFTkSuQmCC' ; 
-
-	//==========================================================
-	// startconstrain.png
-	//==========================================================
-	$this->iBuiltinIcon[4][0]= 725 ;
-	$this->iBuiltinIcon[4][1]= 
-	    'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlz'.
-	    'AAALDgAACw4BQL7hQQAAAAd0SU1FB9ALEREICJp5fBkAAAJSSURBVHic3dS9a1NRGMfx77kxtS+xqS9FG6p1ER3qVJpBQUUc3CRU'.
-	    'BwURVLB1EAuKIP0THJQiiNRJBK3iJl18AyeltRZa0bbaJMbUNmlNSm5e7s25j0NqpSSmyag/OMM9POdzDuflwn8djz8gClVRrVEV'.
-	    'ur4Bl1FTNSzLrSS6vbml0jUUwSXj8Qfk3PkLtLW2AeBIybmrgz3+gFzpucjlE4f4btuFTuWuCF5XDr3a3UPf6cM8GQvxzbsRAJdh'.
-	    'ScfxSywml5j7mVypN0eGEJ0tebIre+zxB6Tv7jPReS2hREpOvpmUXU+H5eC913JnNCSRVE60pUVbWoZjprR39Yq70bdqj4pW7PEH'.
-	    '5FpvL9e79jOTTHM7ssDL6CJZ08LbvAGnrpZg2mI2Z/MlZfN8IkxuSwu4V9+WIrj7zFlOHfXzKrLIi2SGh5ECKjnNVNxkQEc55vOw'.
-	    'rb6O8JLFdHyJ+ayFElUeHvjwkfteL/V7fKTSkFvIQE4DoLI2Mz/muTkTApcBKIwaN8pwIUrKw+ajWwDknAO0d/r4zFaMuRS63sWm'.
-	    'RoOdm+vRIriUYjKexrQV+t1o0YEVwfZSVJmD/dIABJuO0LG3lRFx0GOfiAELE9OgCrfU0XnIp5FwGLEy5WEAOxlR5uN+ARhP7GN3'.
-	    '5w7Gv4bQI2+xpt4jjv2nWBmIlcExE2vDAHYioszBZXw6CPE4ADoWVHmd/tuwlZR9eXYyoszBfpiNQqaAOU5+TXRN+DeeenADPT9b'.
-	    'EVgKVsutKPl0TGWGhwofoquaoKK4apsq/tH/e/kFwBMXLgAEKK4AAAAASUVORK5CYII=' ; 
-
-	//==========================================================
-	// calc.png
-	//==========================================================
-	$this->iBuiltinIcon[5][0]= 589 ;
-	$this->iBuiltinIcon[5][1]= 
-	    'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAA4AIwBbgMF12wAAAAlwSFlz'.
-	    'AAALEQAACxEBf2RfkQAAAAd0SU1FB9AHBxQeFsqn0wQAAAHKSURBVHicnZWff+RAGIef3U/gcOEgUAgUCgcLhYXCwsHBQeGgUDgs'.
-	    'FgMHB4VA/4Bg4XChWFgIFIqBwkJhsRAYeOGF+TQHmWSTTbKd9pU37/x45jvfTDITXEynAbdWKVQB0NazcVm0alcL4rJaRVzm+w/e'.
-	    '3iwAkzbYRcnnYgI04GCvsxxSPabYaEdt2Ra6D0atcvvvDmyrMWBX1zPq2ircP/Tk98DiJtjV/fim6ziOCL6dDHZNhxQ3arIMsox4'.
-	    'vejleL2Ay9+jaw6A+4OSICG2cacGKhsGxg+CxeqAQS0Y7BYJvowq7iGMOhXHEfzpvpQkA9bLKgOgWKt+4Lo1mM9hs9m17QNsJ70P'.
-	    'Fjc/O52joogoX8MZKiBiAFxd9Z1vcj9wfSpUlDRNMcYQxzFpmnJ0FPH8nDe1MQaWSz9woQpWSZKEojDkeaWoKAyr1tlu+s48wfVx'.
-	    'u7n5i7jthmGIiEGcT+36PP+gFeJrxWLhb0UA/lb4ggGs1T0rZs0zwM/ZjNfilcIY5tutPxgOW3F6dUX464LrKILLiw+A7WErrl+2'.
-	    'rABG1EL/BilZP8DjU2uR4U+2E49P1Z8QJmNXUzl24A9GBT0IruCfi86d9x+D12RGzt+pNAAAAABJRU5ErkJggg==' ; 
-
-	//==========================================================
-	// mag.png
-	//==========================================================
-	$this->iBuiltinIcon[6][0]= 1415 ;
-	$this->iBuiltinIcon[6][1]= 
-	    'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlz'.
-	    'AAALDAAACwwBP0AiyAAAAAd0SU1FB9ALDxEWDY6Ul+UAAAUESURBVHicdZVrbFRFGIafsyyF0nalV1R6WiggaAptlzsr1OgEogmC'.
-	    '0IgoBAsBgkIrBAPEhBj/AP6xRTCUFEwRI4jcgsitXMrFCJptJWvBNpXYbbXtbtttt6e7e86ec/yxadlCfZPJZDIz73zzzjfvR2VL'.
-	    'F7U+hf0HD2JduIzTFy6SlJRkPtkcDgdCCE65OxFC8NPV6wghyM7OptankJ2dzbSC5QghEEIgCSHog9PpNAF27dlN6miZuPgElB4/'.
-	    'nmY3O7ZtByA1NVUCkGWZweD1eklJScESTbqxuIjrd+/x6uIl5M19hSy7nfGOeUxf+g7VjU1sKi7C4/GYsiyz7tAJAD4/cRaA1tZW'.
-	    'AHIPnECUVGD1+/3U19ebG4uLeHf1akamjsIwoVnVCOvQEdLoVILYYmMo3PIxSBJflpSaDX5FAmju1QAYv/8k/s8+wLVxOU0jR2LZ'.
-	    '8sMFAApWrCApbRRDrRZirBYSLBKaoRPQw3SFernf2sav7T0Ubt4KwL4FMwF4Vu8FoHBCKgCzDhwHwLIhZ7y5a89u4m2JhA0wTdDC'.
-	    'OrphEjJMNElCHxKDEjaobmvlfo/Krj27CQQCJsCGJW8C0KXqAMxMiosQA8hZWcTFx9OsaniDKh1qmG7VoFsL0x0K06kbeAMhWpRe'.
-	    '/KpG+gwHAKUnz7Dz3BUMw6DK18nuw99wt0Nh6VdHI8RJicmETQgFg7SFwjSrGv+oKp6ghldV6dZ0ugJBlF6FmCESQ2w2AIqXLsan'.
-	    'BrFYLJTnTCBrdBqveeopWZiPFaBHUegJhegMqGgxEkHDwB/UaQ9rdIV06v0+TD2EEQjQFtAY0dsNgNvt5sialQAIIXh7wQKuVf6J'.
-	    'gTsSccPDWlQstClBGjr9eHpVWvUQncEwdYEedF8noQ4vmYmpZMTH0nTvDn25vLbrNmu7bvfnsYEbAMnhcPDgwQPzUo2LJusw/mhp'.
-	    'QwlHNO0KBAnoIfxtrcQMT2De1Mm891wyUzNlUlJSpIyMDBobGzlzr5rFM/Koq6vrP8ASGxsLwPmKcvIShjPGZiPOakE3VFB8hHwd'.
-	    'vJAxhrk5L7Ly+RQuH/sWgPdXrwFg/6HDFBUsIj09nehfbAWwPWOT9n5RYhqGwarNWxkRM5TRCfF4U1PQsDDJFk9uYhwXvzvKjm3b'.
-	    'KSsro3DJInNW5RXp7u2bAKSlpeH1esnPz6eqqgqLpmmcr3Fht9ulfaV7mZk1Bs+lM6T1djM9fhg5egDPpTNMy5TZsW07kydPYdWM'.
-	    'aXx96ixOp9O8cfUa80srmDpjOgAulytiQqZpMnvObLbt/JTtHxXj9/tRVdU0DGOAufRpevPDTeac0hJyc3NxOOawfv161lVWS6eX'.
-	    'z+9/UOCxu1VWVvaTRGv16NFfjB2bNeAQp9NpTpmSM4DcbrdL0WsGDKLRR+52uwe1yP8jb2lpYfikyY9t80n03UCWZeaXVjw1f+zs'.
-	    'Oen+/d+pqanhzp2fKSsrw+l0mi6XiyPl5ZGITdN8fAVJwjRNJEmi1qfw1kw7siyTnJxMe3s71dXV3GpoZO64DG41NPJylvxU5D/e'.
-	    'qJKsfWQD9IkaZ2RmUvr9aV4aGYcQgjfO3aWoYBF5eXm4ewIsu/CbdPz1aWb0/p1bNoOrQxlUiuiaFo3c3FyEEOx9+C9CCD6paaTW'.
-	    'p/TXyYkTJ0Xe59jf7QOyAKDWp/QXxcFQ61P4pT3ShBBcvnUHIQTjxmX19/8BCeVg+/GPpskAAAAASUVORK5CYII=' ; 
-
-	//==========================================================
-	// lock.png
-	//==========================================================
-	$this->iBuiltinIcon[7][0]= 963 ;
-	$this->iBuiltinIcon[7][1]= 
-	    'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlz'.
-	    'AAALCwAACwsBbQSEtwAAAAd0SU1FB9AKAw0XDmwMOwIAAANASURBVHic7ZXfS1t3GMY/3+PprI7aisvo2YU6h6ATA8JW4rrlsF4U'.
-	    'qiAsF9mhl0N2cYTRy9G/wptAYWPD9iJtRy5asDe7cYFmyjaXOLaMImOrmkRrjL9yTmIS3120JybWQgfb3R74wuc8Lzw858vLOUpE'.
-	    'OK6pqSm2trbY39+nu7tbPHYch7m5OcLhMIA67kWj0aMQEWk6tm17rNm2LSIie3t7ksvlJJ1OSyqVkls3Z8SyLMnlcqTTaVKpFLdu'.
-	    'zmBZVj1HeY2VUti2TSQSQSml2bZdi0QirK2tMT09zerqKtlslqGhISYnJ4nHv2N+foFsNquOe9FotLlxOBwmk8lgWRbhcFgymYxY'.
-	    'liUi0mqaJoAuIi2macrdO7fFsizx3to0Te7euV1vrXtXEgqFmJmZYWVlhXK5LB4/U9kwDL784kYV0A3DYHd3m4sXRymXywKoRi8U'.
-	    'Ch01DgQCJBIJLMsiEAhIIpHw2uLz+eqtYrEYIqKZpimxWEyCwaCMjY01zYPBIJpXqVQqsby8TLVabWKA/v5+RkZGMAyDrq4ulFKH'.
-	    'HsfjcWZnZ+ns7KTRqwcnk0mKxSKFQqGJlVKtruuSTCYB6O3trW9UI/v9/iZPB/j8s2HOnX0FgHfeXpeffnzK+fWf+fijvhLs0PtG'.
-	    'D/n1OJ9+MsrlSwb3733DwMCAt1EyPj6uACYmJp56168NU6nUqFSE9nZdPE7+WqC/r4NKTagcCJVqDaUUB5VDAA4Pa9x7sMLlSwan'.
-	    'WjRmv13D7/erpaWlo604qOp88OF7LC48rPNosMq5Th+Dgxd4/XyA1rbzADi7j8jnf2P++wdcvSr8MJ/i8eomAKlUqn41OsDAQDeD'.
-	    'g++yuPCwzm/2vU8+n2a7sMFfj79mp7BBuVzioFSiXHJx3SKuW2Rzy0Up9dxnQVvODALQerqNRn4ZKe0Mvtc6TpzpmqbxalcY9Ato'.
-	    '2v06t515C73YQftZB9GLnDrt4LoujuPgOA4Ui+C6yOpXJwZrJ7r/gv4P/u+D9W7fLxTz+1ScQxrZ3atRLaVxdjbY2d184R6/sLHe'.
-	    'opHP7/Do90Ua+WWUyezzZHObP/7cfX54/dowE1d66s8TV3oE+Mfn+L/zb4XmHPjRG9YjAAAAAElFTkSuQmCC' ; 
-
-	//==========================================================
-	// stop.png
-	//==========================================================
-	$this->iBuiltinIcon[8][0]= 889 ;
-	$this->iBuiltinIcon[8][1]= 
-	    'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlz'.
-	    'AAALDwAACw8BkvkDpQAAAAd0SU1FB9AJDwEvNyD6M/0AAAL2SURBVHic1ZTLaxVnGIefb2bO5OScHJN4oWrFNqcUJYoUEgU3/Qf6'.
-	    'F7gwCkIrvdBLUtqqiLhSg9bgBduFSHZdiG5ctkJ3xRDbUFwUmghNzBDanPGMkzOX79LFJGPMOSd204U/+Bbzvd/78F4H/ieJdoad'.
-	    'pZKxRFszAI/DcP0HazXY22v+HB01kee1PA/v3zfnjx4xgGnHcNZe7OvuNj+cOEF1ZATv5nUA4jhBSgmADCVWo8Ge2Of9wb18P/G7'.
-	    'oUXmYi30zqlTVEdGWLh1g2D6MYlKkXGE0Vl8aa2GEB149+4xXSzyoOIw/mimiZV/DPb25pFOj13A9gOMEChhUEqhVYqWKUk9QAUp'.
-	    'sT/P4s8PmKlUmNhQaIJbkDVqBbpw6wZ2zUc4Nm+ePku5p4eOrgpueQOFUoVCVxcD4+N07dpF9+5tVJeWGPBjhvr7WF1zC8ASgtcP'.
-	    'H8a7eZ1odh4sh50nzwCw9ZNh3M4Stutiu0X2nB/LyjZ6lcIbVTpdQU/jWVPzLADM8+ZGBRdtC7wrF/O7bR99iu26VL86iU4SAH4b'.
-	    'Po5d6AQhstMSvGyI4wS5FJBKSRwnzF8byx/u+PjzzMF1mfryQ1K/jnCahqp1xEopjFLoNEFJSRJHzF799gWHqa+/QKcSUXBI609f'.
-	    'Al5W4teQSiHDOipNUKnMI13RvnOXAIEKQixvGWya98SC560MFwPiqEG86JM8q79Q06lvhnOndy5/B6GPCUOMUu3BQgg8z0M3GmBZ'.
-	    'iGJn3v2VmsqnfzNx7FDueODuj8ROCFpjtG5TCmOYv32bJ09msP0ISydMfnAUgF8/O45RAA6WTPjlvXcB+Gn7FuRf/zAnNX6x3ARe'.
-	    'PSdmqL+P/YHkwMGDOGWDZTlQcNBRhPEComgB/YeHfq2InF1kLlXUOkpMbio1bd7aATRD/X0M1lPeSlM2vt2X1XBZjZnpLG2tmZO6'.
-	    'LbQVOIcP+HG2UauH3xgwBqOz9Cc3l1tC24Fz+MvUDroeGNb5if9H/1dM/wLPCYMw9fryKgAAAABJRU5ErkJggg==' ; 
-
-	//==========================================================
-	// error.png
-	//==========================================================
-	$this->iBuiltinIcon[9][0]= 541 ;
-	$this->iBuiltinIcon[9][1]= 
-	    'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAAaVBMVEX//////2Xy8mLl5V/Z2VvMzFi/v1WyslKlpU+ZmUyMjEh/'.
-	    'f0VyckJlZT9YWDxMTDjAwMDy8sLl5bnY2K/MzKW/v5yyspKlpYiYmH+MjHY/PzV/f2xycmJlZVlZWU9MTEXY2Ms/PzwyMjLFTjea'.
-	    'AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTCAkUMSj9wWSOAAABLUlEQVR4'.
-	    '2s2U3ZKCMAxGjfzJanFAXFkUle/9H9JUKA1gKTN7Yy6YMjl+kNPK5rlZVSuxf1ZRnlZxFYAm93NnIKvR+MEHUgqBXx93wZGIUrSe'.
-	    'h+ctEgbpiMo3iQ4kioHCGxir/ZYUbr7AgPXs9bX0BCYM8vN/cPe8oQYzom3tVsSBMVHEoOJ5dm5F1RsIe9CtqGgRacCAkUvRtevT'.
-	    'e2pd6vOWF+gCuc/brcuhyARakBU9FgK5bUBWdHEH8tHpDsZnRTZQGzdLVvQ3CzyYZiTAmSIODEwzFCAdJopuvbpeZDisJ4pKEcjD'.
-	    'ijWPJhU1MjCo9dkYfiUVjQNTDKY6CVbR6A0niUSZjRwFanR0l9i/TyvGnFdqwStq5axMfDbyBksld/FUumvxS/Bd9VyJvQDWiiMx'.
-	    'iOsCHgAAAABJRU5ErkJggg==' ; 
-
-	//==========================================================
-	// openfolder.png
-	//==========================================================
-	$this->iBuiltinIcon[10][0]= 2040 ;
-	$this->iBuiltinIcon[10][1]=
-	    'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEANAAtwClFht71AAAAAlwSFlz'.
-	    'AAALEAAACxABrSO9dQAAAAd0SU1FB9AKDQ4RIXMeaLcAAAd1SURBVHicxZd7jBXVHcc/58zcvTNzH8vusqw8FsTsKiCUUh5WBZXG'.
-	    'GkOptmqwNWsWLKXFGlEpzZI0AWNKSy0WhDS22gJKtWlTsSRqzYIuLGB2WVvDIwQMZQMsy2OFfdzde+/OnHP6x907vJaFpjb9JZM5'.
-	    'c85Mfp/f9/s7Jxn4P4e41gtSyp78WGvtfdEAcqDFYUOH9HS0NhGk9tPb/ilSyp789UUB2AMuqhQy3Uzm7HGkE6W3dTNZMRI3EcWO'.
-	    'jf9ClLmWBT3dzW8jUsevWHCG3UpWl+IkHSxnbDh/Mcz12NevBcuWXTmf6TjnXvJ88gDmVB3pw3+nt3UzHa1NqMzBS2zqPLGFjtMN'.
-	    'ZNr3XdW+qyqwZcFk76HX/tHWfuQvyO4W7qhaHwL8efkMRlRUpPv7rqD0RrJ+FgAjLy1a20OIxZJEEuNCRfIApj+om4bGM3u2/sYU'.
-	    '9J41d8973f3Dhg1pISTV1dXXBRNJxPGFCzhou+DCQrScZOkktNaeDZjamgeZ9MgiYmVDccvHhjAzJw0NTh8/alyZMaVJicp0iTHj'.
-	    'JpgNv38tjWUhhGROdbUL9W5/MH5XCkjlcibi+KIop5LVHLKEu8A/f4r286doa9pGrGwYAAsfqbbH3b8MgO/Nqgy6WvdbbXHMkEFJ'.
-	    '4xUOMVEvaTZu3BgmvF4Yk4hz9rO/Ulr5cE9owae/rcGxohSOuiWkC2IjcIqKyPZm+OmCH7GhoZEF077EEzVVweAbJ+riEeO0Ey8y'.
-	    'UubqOHn0AOgMwvf59txnBrSp9dgxKmf/+kIP1NY8SFk0jh5ajmNHAWg5b2E5EexojGHjbiVRMoRMNs0LC+Yz46vTuH3enN7BI8fr'.
-	    'qFdo0BoVZNC9aVSQ4fNjBzEmQJiARxb+/AqYPMAVB5FsPU5v37g9OxgLhe14ZM5/ju052E6MNZvf5pmHHuLmmWOkEysxUtpGAtme'.
-	    'dtHTflJkezqQto3jFRnLssyf1jydxiiM7zNnye/c3ZsqLu2BN5fcMfzrv/hby1tPzmRUoihcTJ87CwQI2yLtDcIqsIjYUf51qBlf'.
-	    'OnScOSrdQUOMURkiXsLUzJnvbGhoBGDHH5cGyZLhOpYoNl5hqYnYEXOu5fDl9eYAHntx98n8hFHZcPHUuTSxSASAeK/CGIOxJJ0f'.
-	    'bOGNPU280dgkq6Y2yu8vfjCIlwwzr+/ZQ/PHO0gOLuO5qsftDQ2NbN+4OCgqG6WTxWVaq6zpF+DiSHWnicdylp3r6aZTWthIOrNp'.
-	    'ktHcvBu0sHX1Sm6ozB3B42d90zZA9bQp7PvgPSzXZfnqX/HS4DKKK2+x69Y/HURs26iBAN5ccsfw7774UcumF37C6f07KSt2OHji'.
-	    'DEUJD0tISjyPrrSPlAKvN0JP/U4O1NfjuhG2rvklN1SOpfXwftpbTqAyKRrff5fb7rs9V1R7m4wlz2ihA3HpmXflUWyOH2umpLiY'.
-	    'ui3v8M+6bWzfsRNbSgqkxaCkiy0simMuEWEhpcRzIhQWOIAh6tiAwS4owInFiTou5dOnMnl2NR++ujBwXEc9terD6M43nrj6LgAB'.
-	    'QnDPA9/irtkP8JRS7Hr/3T6YekDQ1pEiEXOwpUVJzCVlZZFS4mZtkpEo9ChAkDp/jtLMBACy6S4RiQghLyv5cgBRPnKUOX6smUGF'.
-	    'hSil0MYw9d77mPy1e5mnFE3batm3czvb6nYgEJztSFGU9LCRlMRdUjIH0+lnEMIwPNXD3NumoVJnrMCJaiciMUZfvQnz4QcBSvV1'.
-	    'vjE5GK358t0zmXDnDB79saLpo20c+aSRD+t25JTp7GZQwsEWFiVxl6hlUf/WO9z32CxmL1rOe6u/I2KuwGhzLQCB7/sYY9Bah3el'.
-	    'FKbvrrVm4vS7GH/7ncx+chEHGz7myCeNbPtoO0JI2jq78WIRLGkzsqs7V5SfFV5EovXACoiqqsfNpk2vo5VCWtYFBfoU0VoTBAFa'.
-	    'a7TRaK2p+MoURk+cxMzq+Rzbv49DDbuo27UTW9h0dedssPxuK+kIfN8XxhgDYPVXf2Fh4XKtFIl4AiklAlBKAYRKKK36wHIweTCt'.
-	    'NfHiEkaOn8j0+7/BmDFjaT30GbHywSxcuZkpFfFg+m1jjZ/NmnVvNfRvwd69e8WBA/uNFAIh4JVXXmHsmDHE4vEQQgjQ2lxQIm9N'.
-	    'nz35q3BEOZOHzaG2thaA4mRU+L29It+IV21CpbRQfeMFC35gRB/M2rVrubnyZmLxWJhECBEmz/eHyo/7lMlH3LFFujsthNFCCGOu'.
-	    '+WNyeUgpjSVzMKtWraKyshLPdcPEeYWCIEBdpIxSivr6eta8vI7d6+cGnhdV06pe1QP+F/QXWmuRL+jZZ58LlVmxYgUVFRV4rhtu'.
-	    '4TzMxXAA6XRaRAtsYUkx8I/JtSJQOlSwpmZpCLN8+fPcdNNoHMfB9/0QJgRoP295TlR7UVv8xxZcHMuWIZ9/Hn35vG3JEGZpzVJG'.
-	    'jx5N1IlitKahsZE1L69j69qHgx+urFX/lQL9JYdLlfnZihUhzOLFi8N3Ml1dthOxVH/f/8/CtqSJ2JaJ2JZ59J7RPsC/AViJsQS/'.
-	    'dBntAAAAAElFTkSuQmCC' ;
-
-	//==========================================================
-	// folder.png
-	//==========================================================
+        if( $aIdx < 0 || $aIdx >= $this->iLen ) {
+            JpGraphError::RaiseL(6010,$aIdx);
+            //('Illegal icon index for Gantt builtin icon ['.$aIdx.']');
+        }
+        return Image::CreateFromString(base64_decode($this->iBuiltinIcon[$aIdx][1]));
+    }
+
+    function __construct() {
+        //==========================================================
+        // warning.png
+        //==========================================================
+        $this->iBuiltinIcon[0][0]= 1043 ;
+        $this->iBuiltinIcon[0][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsSAAALEgHS3X78AAAA'.
+     'B3RJTUUH0wgKFSgilWPhUQAAA6BJREFUeNrtl91rHFUYh5/3zMx+Z5JNUoOamCZNaqTZ6IWIkqRiQWmi1IDetHfeiCiltgXBP8AL'.
+     '0SIUxf/AvfRSBS9EKILFFqyIH9CEmFZtPqrBJLs7c+b1YneT3WTTbNsUFPLCcAbmzPt73o9zzgzs2Z793231UOdv3w9k9Z2uzOdA'.
+     '5+2+79yNeL7Hl7hw7oeixRMZ6PJM26W18DNAm/Vh7lR8fqh97NmMF11es1iFpMATqdirwMNA/J4DpIzkr5YsAF1PO6gIMYHRdPwl'.
+     'oO2elmB+qH3sm7XozbkgYvy8SzYnZPtcblyM6I+5z3jQ+0vJfgpEu56BfI9vUkbyi2HZd1QJoeWRiAjBd4SDCW8SSAOy6wBHMzF7'.
+     'YdV2A+ROuvRPLfHoiSU0EMY/cDAIhxJeGngKaN1VgHyPL7NBxI1K9P4QxBzw3K1zJ/zkG8B9uwaQ7/HNsRZv9kohBGD0o7JqMYS/'.
+     '/ynPidQw/LrBiPBcS/yFCT95DvB2BWAy4575PaQbQKW+tPd3GCItu2odKI++YxiKu0d26oWmAD7paZU/rLz37VqIijD2YbnzNBBE'.
+     'IBHf8K8qjL7vYhCGErEU8CTg3xXAeMp96GrJEqkyXkm9Bhui1xfsunjdGhcYLq+IzjsGmBt5YH/cmJkFq6gIqlon3u4LxdKGuCIo'.
+     'Qu41g0E41po+2R33Xt5uz9kRIB2UTle7PnfKrROP1HD4sRjZlq0lzhwoZ6rDNeTi3nEg1si/7FT7kYQbXS6E5E65tA5uRF9tutq0'.
+     'K/VwAF+/FbIYWt6+tjQM/AqUms7A4Wy6d7YSfSNxgMmzi0ycWWworio4QJvj4LpuL5BqugTnXzzqJsJwurrlNhJXFaavW67NRw3F'.
+     'q+aJcCQVe9fzvJGmAY7/dPH0gi0f64OveGxa+usCuQMeZ0+kt8BVrX+qPO9Bzx0MgqBvs+a2PfDdYIf+WAjXU1ub4tqNaPPzRs8A'.
+     'blrli+WVn79cXn0cWKl+tGx7HLc7pu3CSmnfitL+l1UihAhwjFkPQev4K/fSABjBM8JCaFuurJU+rgW41SroA8aNMVNAFtgHJCsn'.
+     'XGy/58QVxAC9MccJtZ5kIzNlW440WrJ2ea4YPA9cAooA7i0A/gS+iqLoOpB1HOegqrYB3UBmJrAtQAJwpwPr1Ry92wVlgZsiYlW1'.
+     'uX1gU36dymgqYxJIJJNJT1W9QqHgNwFQBGYqo94OwHZQUuPD7ACglSvc+5n5T9m/wfJJX4U9qzEAAAAASUVORK5CYII=' ;
+
+        //==========================================================
+        // edit.png
+        //==========================================================
+        $this->iBuiltinIcon[1][0]= 959 ;
+        $this->iBuiltinIcon[1][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAFgAWABY9j+ZuwAAAAlwSFlz'.
+     'AAALEAAACxABrSO9dQAAAAd0SU1FB9AKDAwbIEXOA6AAAAM8SURBVHicpdRPaBxlHMbx76ZvsmOTmm1dsEqQSIIsEmGVBAQjivEQ'.
+     'PAUJngpWsAWlBw8egpQepKwplN4ULEG9CjkEyUFKlSJrWTG0IU51pCsdYW2ncUPjdtp9Z+f3vuNhu8nKbmhaf5cZeGc+PO8zf1Lc'.
+     'm0KhkACICCKCMeaBjiLC0tLSnjNvPmuOHRpH0TZTU1M8zBi9wakzn7OFTs5sw8YYACYmJrre7HkeuVyu69qPF77hlT1XmZ0eQ03O'.
+     'wOLJTvhBx1rLz18VmJ0eY+jVd2FxDkKXnvYLHgb97OgLzE4ON9Hzc1B1QaQzsed5O0Lta3Ec89OnR5h5McfQ+Mw2qgQUnfBOPbZ3'.
+     'bK3l+xOvMT0+3ERLp5FNF6UEjcL32+DdVmGt5WLhDYYPZrbRqreFumXwql0S3w9tnDvLWD5PZigPpdOwuYpSCo3C8wU3UHxQdHbf'.
+     'cZIkNM6dxcnlUM4k1eUFMlUPpUADbpkttFarHe6oYqeOr6yt4RzMQHYUcUsQVtGicHDwKprViuLDkkOtVnsHCHZVRVy/zcj1i5Af'.
+     'h8AjdIts+hUcGcYPK3iBtKM3gD/uAzf/AdY2mmmVgy6X8YNNKmGIvyloPcB8SUin07RQ4EZHFdsdG0wkJEnEaHAJxvKEpSLeaokV'.
+     'r4zWmhUZYLlY4b1D03y5eIEWCtS7vsciAgiIxkQRabWOrlQor66y4pUphoJb1jiO4uO5o0S3q6RSqVbiOmC7VCEgAhLSaDQ48dH7'.
+     'vD46REY0iysegSjKQciRt99ib7qXwX0O+pG4teM6YKHLB9JMq4mTmF9/+AKA4wvLZByH7OgYL7+UY2qvw/7Bfg5kHiXjJFyv3CGO'.
+     'Y1rof+BW4t/XLiPG0DCGr79d4XzRxRnIMn98huXSTYyJ6et1UNYQhRvcinpJq86H3wGPPPM0iBDd+QffD1g4eZjLvuG7S1Wef26E'.
+     'J7L7eSx7gAHVg7V3MSbi6m/r93baBd6qQjerAJg/9Ql/XrvG0ON1+vv7GH3qSfY5fahUnSTpwZgIEQesaVXRPbHRG/xyJSAxMYlp'.
+     'EOm71HUINiY7mGb95l/8jZCyQmJjMDGJjUmsdCROtZ0n/P/Z8v4Fs2MTUUf7vYoAAAAASUVORK5CYII=' ;
+
+        //==========================================================
+        // endconstrain.png
+        //==========================================================
+        $this->iBuiltinIcon[2][0]= 666 ;
+        $this->iBuiltinIcon[2][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlz'.
+     'AAALDwAACw8BkvkDpQAAAAd0SU1FB9ALEREILkh0+eQAAAIXSURBVHictZU9aFNRFMd/N81HX77aptJUWmp1LHRpIcWhg5sIDlUQ'.
+     'LAXB4t7RRUpwEhy7iQ46CCIoSHcl0CFaoVARU2MFMYktadLXJNok7x2HtCExvuYFmnO4w/3gx+Gc/z1HKRTdMEdXqHbB/sgc/sic'.
+     'nDoYAI8XwDa8o1RMLT+2hAsigtTvbIGVqhX46szUifBGswUeCPgAGB7QeLk0X4Ork+HOxo1VgSqGASjMqkn8W4r4vVtEgI/RRQEL'.
+     'vaoGD85cl5V3nySR/S1mxWxab7f35PnntNyMJeRr9kCMqiHTy09EoeToLwggx6ymiMOD/VwcD7Oa/MHkcIiQx026WGYto5P/U+ZZ'.
+     '7gD0QwDuT5z9N3LrVPi0Xs543eQPKkRzaS54eviJIp4tMFQFMllAWN2qcRZHBnixNM8NYD162xq8u7ePSQ+GX2Pjwxc2dB2cLtB8'.
+     '7GgamCb0anBYBeChMtl8855CarclxU1gvViiUK4w2OMkNDnGeJ8bt9fH90yOnOkCwLFTwhzykhvtYzOWoBBbY//R3dbaNTYhf2RO'.
+     'QpeuUMzv188MlwuHy0H13HnE48UzMcL0WAtUHX8OxZHoG1URiFw7rnLLCswuSPD1ulze/iWjT2PSf+dBXRFtVVGIvzqph0pQL7VE'.
+     'avXYaXXxPwsnt0imdttCocMmZBdK7YU9D8wuNOW0nXc6QWzPsSa5naZ1beb9BbGB6dxGtMnXAAAAAElFTkSuQmCC' ;
+
+        //==========================================================
+        // mail.png
+        //==========================================================
+        $this->iBuiltinIcon[3][0]= 1122 ;
+        $this->iBuiltinIcon[3][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlz'.
+     'AAALEAAACxABrSO9dQAAAAd0SU1FB9AJHAMfFvL9OU8AAAPfSURBVHictZRdaBRXFMd/987H7tbNx8aYtGCrEexDsOBDaKHFxirb'.
+     'h0qhsiY0ykppKq1osI99C4H2WSiFFMHWUhXBrjRi0uCmtSEUGgP1QWqhWjGkoW7M1kTX3WRn5p4+TJJNGolQ6IXDnDtz+N0z/3PP'.
+     'UWBIpdpYa23b9g09PZ2kUrOrvmUyGVKp1Ao/mUyi56YnVgWfO/P1CihAd/dJMpmaNROIRq8BkM1m0bH6TasC3j6QXgFdXI+DR6PR'.
+     'JX/Pno8B+KLnMKqlpUU8z8MYs2RBEDzWf9J+0RcRbMdxGBsbw/fmCXwPMUEYID4iAVp8wIRmDIHMo4yHSIBSASKC+CWE0C/PF9jU'.
+     '3B6Cp+4M07C5FUtKGNvGwQJctPgIsgD2wRhEIqAMGB+UQYkHJgYYZD7P1HwVlmWhHcfhyk83KeRGUW4t6CgoG5SNUS4KBWgQDUov'.
+     '7AGlwYASBVqH0Bk49dXpCviVV3dw/tI1Bvr7kMIIlh0NYUpjlF0BAYvcxSXmEVLKceHSCJm+PnbueBHbtkNwTXUNBzo6aGpq4sSZ'.
+     'GwT5H7BsF6Wdf1GWHQAoM0upeI9PT1yioS7B7tdaSdSuw7KsUGMAy7HYsmUztTW1nMwM0txssX1rlHjjS5jy/Uq2YkK/eJuLl6/z'.
+     'x+1xkslW6mrixGIODx8EFSlEBC0+tmXT0NhA2763iEUjnLv4C8XpUbSbAB1mKkGJ3J83Od77HW5EszvZSqK2iljMIeJaRGNuJePF'.
+     '6mspY7BJ1DXwQnCd2fxGRq5OUCz8xt72dyhMZcn++Cu3xu9SKhdp2b4ZHWnAtTSxmIWlhcIjlksR3lNBYzlxZsb7+f7ne+xtSzOd'.
+     'u83szH1OnThOPp/n+a0beeP1l4mvq+PU2Qyd+5PY1RuwlAqLYFaBfbTbyPSdfgaH77A//QF4f1O/vpr6RJyq+C5Kc/M8FbFxXItY'.
+     'xOHDrvfo/fxLDnbsJBp5BowBReVWYAzabeTh5ABDw7cWoNNL3YYYNtSv57lnn6Z+Qx01VeuIuBa2DV1HD3H63BAPZu4u1WGpeLHq'.
+     'Rh7+NcjA0O+0p4+CNwXigwnbWlQQdpuEpli+n+PIkcOc//YKuckJJFh2K2anrjFw+QZt6S6kPImIF/b+cqAJD1LihWAxC61twBTo'.
+     'fPcQF/oGsVW5ovHQlavs2/8+uYnRVSOUgHAmmAClBIOBwKC0gPjhIRgEIX2wg7NnwpZW3d3d4vs+vu8TBMGK51rvPM9b8hdteZxd'.
+     'LBbVR8feJDs0Rlv6GFKeXJ21rNRXESxMPR+CBUl0nN7PjtO+dye7Up/8v1I88bf/ixT/AO1/hZsqW+C6AAAAAElFTkSuQmCC' ;
+
+        //==========================================================
+        // startconstrain.png
+        //==========================================================
+        $this->iBuiltinIcon[4][0]= 725 ;
+        $this->iBuiltinIcon[4][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlz'.
+     'AAALDgAACw4BQL7hQQAAAAd0SU1FB9ALEREICJp5fBkAAAJSSURBVHic3dS9a1NRGMfx77kxtS+xqS9FG6p1ER3qVJpBQUUc3CRU'.
+     'BwURVLB1EAuKIP0THJQiiNRJBK3iJl18AyeltRZa0bbaJMbUNmlNSm5e7s25j0NqpSSmyag/OMM9POdzDuflwn8djz8gClVRrVEV'.
+     'ur4Bl1FTNSzLrSS6vbml0jUUwSXj8Qfk3PkLtLW2AeBIybmrgz3+gFzpucjlE4f4btuFTuWuCF5XDr3a3UPf6cM8GQvxzbsRAJdh'.
+     'ScfxSywml5j7mVypN0eGEJ0tebIre+zxB6Tv7jPReS2hREpOvpmUXU+H5eC913JnNCSRVE60pUVbWoZjprR39Yq70bdqj4pW7PEH'.
+     '5FpvL9e79jOTTHM7ssDL6CJZ08LbvAGnrpZg2mI2Z/MlZfN8IkxuSwu4V9+WIrj7zFlOHfXzKrLIi2SGh5ECKjnNVNxkQEc55vOw'.
+     'rb6O8JLFdHyJ+ayFElUeHvjwkfteL/V7fKTSkFvIQE4DoLI2Mz/muTkTApcBKIwaN8pwIUrKw+ajWwDknAO0d/r4zFaMuRS63sWm'.
+     'RoOdm+vRIriUYjKexrQV+t1o0YEVwfZSVJmD/dIABJuO0LG3lRFx0GOfiAELE9OgCrfU0XnIp5FwGLEy5WEAOxlR5uN+ARhP7GN3'.
+     '5w7Gv4bQI2+xpt4jjv2nWBmIlcExE2vDAHYioszBZXw6CPE4ADoWVHmd/tuwlZR9eXYyoszBfpiNQqaAOU5+TXRN+DeeenADPT9b'.
+     'EVgKVsutKPl0TGWGhwofoquaoKK4apsq/tH/e/kFwBMXLgAEKK4AAAAASUVORK5CYII=' ;
+
+        //==========================================================
+        // calc.png
+        //==========================================================
+        $this->iBuiltinIcon[5][0]= 589 ;
+        $this->iBuiltinIcon[5][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAA4AIwBbgMF12wAAAAlwSFlz'.
+     'AAALEQAACxEBf2RfkQAAAAd0SU1FB9AHBxQeFsqn0wQAAAHKSURBVHicnZWff+RAGIef3U/gcOEgUAgUCgcLhYXCwsHBQeGgUDgs'.
+     'FgMHB4VA/4Bg4XChWFgIFIqBwkJhsRAYeOGF+TQHmWSTTbKd9pU37/x45jvfTDITXEynAbdWKVQB0NazcVm0alcL4rJaRVzm+w/e'.
+     '3iwAkzbYRcnnYgI04GCvsxxSPabYaEdt2Ra6D0atcvvvDmyrMWBX1zPq2ircP/Tk98DiJtjV/fim6ziOCL6dDHZNhxQ3arIMsox4'.
+     'vejleL2Ay9+jaw6A+4OSICG2cacGKhsGxg+CxeqAQS0Y7BYJvowq7iGMOhXHEfzpvpQkA9bLKgOgWKt+4Lo1mM9hs9m17QNsJ70P'.
+     'Fjc/O52joogoX8MZKiBiAFxd9Z1vcj9wfSpUlDRNMcYQxzFpmnJ0FPH8nDe1MQaWSz9woQpWSZKEojDkeaWoKAyr1tlu+s48wfVx'.
+     'u7n5i7jthmGIiEGcT+36PP+gFeJrxWLhb0UA/lb4ggGs1T0rZs0zwM/ZjNfilcIY5tutPxgOW3F6dUX464LrKILLiw+A7WErrl+2'.
+     'rABG1EL/BilZP8DjU2uR4U+2E49P1Z8QJmNXUzl24A9GBT0IruCfi86d9x+D12RGzt+pNAAAAABJRU5ErkJggg==' ;
+
+        //==========================================================
+        // mag.png
+        //==========================================================
+        $this->iBuiltinIcon[6][0]= 1415 ;
+        $this->iBuiltinIcon[6][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlz'.
+     'AAALDAAACwwBP0AiyAAAAAd0SU1FB9ALDxEWDY6Ul+UAAAUESURBVHicdZVrbFRFGIafsyyF0nalV1R6WiggaAptlzsr1OgEogmC'.
+     '0IgoBAsBgkIrBAPEhBj/AP6xRTCUFEwRI4jcgsitXMrFCJptJWvBNpXYbbXtbtttt6e7e86ec/yxadlCfZPJZDIz73zzzjfvR2VL'.
+     'F7U+hf0HD2JduIzTFy6SlJRkPtkcDgdCCE65OxFC8NPV6wghyM7OptankJ2dzbSC5QghEEIgCSHog9PpNAF27dlN6miZuPgElB4/'.
+     'nmY3O7ZtByA1NVUCkGWZweD1eklJScESTbqxuIjrd+/x6uIl5M19hSy7nfGOeUxf+g7VjU1sKi7C4/GYsiyz7tAJAD4/cRaA1tZW'.
+     'AHIPnECUVGD1+/3U19ebG4uLeHf1akamjsIwoVnVCOvQEdLoVILYYmMo3PIxSBJflpSaDX5FAmju1QAYv/8k/s8+wLVxOU0jR2LZ'.
+     '8sMFAApWrCApbRRDrRZirBYSLBKaoRPQw3SFernf2sav7T0Ubt4KwL4FMwF4Vu8FoHBCKgCzDhwHwLIhZ7y5a89u4m2JhA0wTdDC'.
+     'OrphEjJMNElCHxKDEjaobmvlfo/Krj27CQQCJsCGJW8C0KXqAMxMiosQA8hZWcTFx9OsaniDKh1qmG7VoFsL0x0K06kbeAMhWpRe'.
+     '/KpG+gwHAKUnz7Dz3BUMw6DK18nuw99wt0Nh6VdHI8RJicmETQgFg7SFwjSrGv+oKp6ghldV6dZ0ugJBlF6FmCESQ2w2AIqXLsan'.
+     'BrFYLJTnTCBrdBqveeopWZiPFaBHUegJhegMqGgxEkHDwB/UaQ9rdIV06v0+TD2EEQjQFtAY0dsNgNvt5sialQAIIXh7wQKuVf6J'.
+     'gTsSccPDWlQstClBGjr9eHpVWvUQncEwdYEedF8noQ4vmYmpZMTH0nTvDn25vLbrNmu7bvfnsYEbAMnhcPDgwQPzUo2LJusw/mhp'.
+     'QwlHNO0KBAnoIfxtrcQMT2De1Mm891wyUzNlUlJSpIyMDBobGzlzr5rFM/Koq6vrP8ASGxsLwPmKcvIShjPGZiPOakE3VFB8hHwd'.
+     'vJAxhrk5L7Ly+RQuH/sWgPdXrwFg/6HDFBUsIj09nehfbAWwPWOT9n5RYhqGwarNWxkRM5TRCfF4U1PQsDDJFk9uYhwXvzvKjm3b'.
+     'KSsro3DJInNW5RXp7u2bAKSlpeH1esnPz6eqqgqLpmmcr3Fht9ulfaV7mZk1Bs+lM6T1djM9fhg5egDPpTNMy5TZsW07kydPYdWM'.
+     'aXx96ixOp9O8cfUa80srmDpjOgAulytiQqZpMnvObLbt/JTtHxXj9/tRVdU0DGOAufRpevPDTeac0hJyc3NxOOawfv161lVWS6eX'.
+     'z+9/UOCxu1VWVvaTRGv16NFfjB2bNeAQp9NpTpmSM4DcbrdL0WsGDKLRR+52uwe1yP8jb2lpYfikyY9t80n03UCWZeaXVjw1f+zs'.
+     'Oen+/d+pqanhzp2fKSsrw+l0mi6XiyPl5ZGITdN8fAVJwjRNJEmi1qfw1kw7siyTnJxMe3s71dXV3GpoZO64DG41NPJylvxU5D/e'.
+     'qJKsfWQD9IkaZ2RmUvr9aV4aGYcQgjfO3aWoYBF5eXm4ewIsu/CbdPz1aWb0/p1bNoOrQxlUiuiaFo3c3FyEEOx9+C9CCD6paaTW'.
+     'p/TXyYkTJ0Xe59jf7QOyAKDWp/QXxcFQ61P4pT3ShBBcvnUHIQTjxmX19/8BCeVg+/GPpskAAAAASUVORK5CYII=' ;
+
+        //==========================================================
+        // lock.png
+        //==========================================================
+        $this->iBuiltinIcon[7][0]= 963 ;
+        $this->iBuiltinIcon[7][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlz'.
+     'AAALCwAACwsBbQSEtwAAAAd0SU1FB9AKAw0XDmwMOwIAAANASURBVHic7ZXfS1t3GMY/3+PprI7aisvo2YU6h6ATA8JW4rrlsF4U'.
+     'qiAsF9mhl0N2cYTRy9G/wptAYWPD9iJtRy5asDe7cYFmyjaXOLaMImOrmkRrjL9yTmIS3120JybWQgfb3R74wuc8Lzw858vLOUpE'.
+     'OK6pqSm2trbY39+nu7tbPHYch7m5OcLhMIA67kWj0aMQEWk6tm17rNm2LSIie3t7ksvlJJ1OSyqVkls3Z8SyLMnlcqTTaVKpFLdu'.
+     'zmBZVj1HeY2VUti2TSQSQSml2bZdi0QirK2tMT09zerqKtlslqGhISYnJ4nHv2N+foFsNquOe9FotLlxOBwmk8lgWRbhcFgymYxY'.
+     'liUi0mqaJoAuIi2macrdO7fFsizx3to0Te7euV1vrXtXEgqFmJmZYWVlhXK5LB4/U9kwDL784kYV0A3DYHd3m4sXRymXywKoRi8U'.
+     'Ch01DgQCJBIJLMsiEAhIIpHw2uLz+eqtYrEYIqKZpimxWEyCwaCMjY01zYPBIJpXqVQqsby8TLVabWKA/v5+RkZGMAyDrq4ulFKH'.
+     'HsfjcWZnZ+ns7KTRqwcnk0mKxSKFQqGJlVKtruuSTCYB6O3trW9UI/v9/iZPB/j8s2HOnX0FgHfeXpeffnzK+fWf+fijvhLs0PtG'.
+     'D/n1OJ9+MsrlSwb3733DwMCAt1EyPj6uACYmJp56168NU6nUqFSE9nZdPE7+WqC/r4NKTagcCJVqDaUUB5VDAA4Pa9x7sMLlSwan'.
+     'WjRmv13D7/erpaWlo604qOp88OF7LC48rPNosMq5Th+Dgxd4/XyA1rbzADi7j8jnf2P++wdcvSr8MJ/i8eomAKlUqn41OsDAQDeD'.
+     'g++yuPCwzm/2vU8+n2a7sMFfj79mp7BBuVzioFSiXHJx3SKuW2Rzy0Up9dxnQVvODALQerqNRn4ZKe0Mvtc6TpzpmqbxalcY9Ato'.
+     '2v06t515C73YQftZB9GLnDrt4LoujuPgOA4Ui+C6yOpXJwZrJ7r/gv4P/u+D9W7fLxTz+1ScQxrZ3atRLaVxdjbY2d184R6/sLHe'.
+     'opHP7/Do90Ua+WWUyezzZHObP/7cfX54/dowE1d66s8TV3oE+Mfn+L/zb4XmHPjRG9YjAAAAAElFTkSuQmCC' ;
+
+        //==========================================================
+        // stop.png
+        //==========================================================
+        $this->iBuiltinIcon[8][0]= 889 ;
+        $this->iBuiltinIcon[8][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlz'.
+     'AAALDwAACw8BkvkDpQAAAAd0SU1FB9AJDwEvNyD6M/0AAAL2SURBVHic1ZTLaxVnGIefb2bO5OScHJN4oWrFNqcUJYoUEgU3/Qf6'.
+     'F7gwCkIrvdBLUtqqiLhSg9bgBduFSHZdiG5ctkJ3xRDbUFwUmghNzBDanPGMkzOX79LFJGPMOSd204U/+Bbzvd/78F4H/ieJdoad'.
+     'pZKxRFszAI/DcP0HazXY22v+HB01kee1PA/v3zfnjx4xgGnHcNZe7OvuNj+cOEF1ZATv5nUA4jhBSgmADCVWo8Ge2Of9wb18P/G7'.
+     'oUXmYi30zqlTVEdGWLh1g2D6MYlKkXGE0Vl8aa2GEB149+4xXSzyoOIw/mimiZV/DPb25pFOj13A9gOMEChhUEqhVYqWKUk9QAUp'.
+     'sT/P4s8PmKlUmNhQaIJbkDVqBbpw6wZ2zUc4Nm+ePku5p4eOrgpueQOFUoVCVxcD4+N07dpF9+5tVJeWGPBjhvr7WF1zC8ASgtcP'.
+     'H8a7eZ1odh4sh50nzwCw9ZNh3M4Stutiu0X2nB/LyjZ6lcIbVTpdQU/jWVPzLADM8+ZGBRdtC7wrF/O7bR99iu26VL86iU4SAH4b'.
+     'Po5d6AQhstMSvGyI4wS5FJBKSRwnzF8byx/u+PjzzMF1mfryQ1K/jnCahqp1xEopjFLoNEFJSRJHzF799gWHqa+/QKcSUXBI609f'.
+     'Al5W4teQSiHDOipNUKnMI13RvnOXAIEKQixvGWya98SC560MFwPiqEG86JM8q79Q06lvhnOndy5/B6GPCUOMUu3BQgg8z0M3GmBZ'.
+     'iGJn3v2VmsqnfzNx7FDueODuj8ROCFpjtG5TCmOYv32bJ09msP0ISydMfnAUgF8/O45RAA6WTPjlvXcB+Gn7FuRf/zAnNX6x3ARe'.
+     'PSdmqL+P/YHkwMGDOGWDZTlQcNBRhPEComgB/YeHfq2InF1kLlXUOkpMbio1bd7aATRD/X0M1lPeSlM2vt2X1XBZjZnpLG2tmZO6'.
+     'LbQVOIcP+HG2UauH3xgwBqOz9Cc3l1tC24Fz+MvUDroeGNb5if9H/1dM/wLPCYMw9fryKgAAAABJRU5ErkJggg==' ;
+
+        //==========================================================
+        // error.png
+        //==========================================================
+        $this->iBuiltinIcon[9][0]= 541 ;
+        $this->iBuiltinIcon[9][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAAaVBMVEX//////2Xy8mLl5V/Z2VvMzFi/v1WyslKlpU+ZmUyMjEh/'.
+     'f0VyckJlZT9YWDxMTDjAwMDy8sLl5bnY2K/MzKW/v5yyspKlpYiYmH+MjHY/PzV/f2xycmJlZVlZWU9MTEXY2Ms/PzwyMjLFTjea'.
+     'AAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAACxIAAAsSAdLdfvwAAAAHdElNRQfTCAkUMSj9wWSOAAABLUlEQVR4'.
+     '2s2U3ZKCMAxGjfzJanFAXFkUle/9H9JUKA1gKTN7Yy6YMjl+kNPK5rlZVSuxf1ZRnlZxFYAm93NnIKvR+MEHUgqBXx93wZGIUrSe'.
+     'h+ctEgbpiMo3iQ4kioHCGxir/ZYUbr7AgPXs9bX0BCYM8vN/cPe8oQYzom3tVsSBMVHEoOJ5dm5F1RsIe9CtqGgRacCAkUvRtevT'.
+     'e2pd6vOWF+gCuc/brcuhyARakBU9FgK5bUBWdHEH8tHpDsZnRTZQGzdLVvQ3CzyYZiTAmSIODEwzFCAdJopuvbpeZDisJ4pKEcjD'.
+     'ijWPJhU1MjCo9dkYfiUVjQNTDKY6CVbR6A0niUSZjRwFanR0l9i/TyvGnFdqwStq5axMfDbyBksld/FUumvxS/Bd9VyJvQDWiiMx'.
+     'iOsCHgAAAABJRU5ErkJggg==' ;
+
+        //==========================================================
+        // openfolder.png
+        //==========================================================
+        $this->iBuiltinIcon[10][0]= 2040 ;
+        $this->iBuiltinIcon[10][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAZiS0dEANAAtwClFht71AAAAAlwSFlz'.
+     'AAALEAAACxABrSO9dQAAAAd0SU1FB9AKDQ4RIXMeaLcAAAd1SURBVHicxZd7jBXVHcc/58zcvTNzH8vusqw8FsTsKiCUUh5WBZXG'.
+     'GkOptmqwNWsWLKXFGlEpzZI0AWNKSy0WhDS22gJKtWlTsSRqzYIuLGB2WVvDIwQMZQMsy2OFfdzde+/OnHP6x907vJaFpjb9JZM5'.
+     'c85Mfp/f9/s7Jxn4P4e41gtSyp78WGvtfdEAcqDFYUOH9HS0NhGk9tPb/ilSyp789UUB2AMuqhQy3Uzm7HGkE6W3dTNZMRI3EcWO'.
+     'jf9ClLmWBT3dzW8jUsevWHCG3UpWl+IkHSxnbDh/Mcz12NevBcuWXTmf6TjnXvJ88gDmVB3pw3+nt3UzHa1NqMzBS2zqPLGFjtMN'.
+     'ZNr3XdW+qyqwZcFk76HX/tHWfuQvyO4W7qhaHwL8efkMRlRUpPv7rqD0RrJ+FgAjLy1a20OIxZJEEuNCRfIApj+om4bGM3u2/sYU'.
+     '9J41d8973f3Dhg1pISTV1dXXBRNJxPGFCzhou+DCQrScZOkktNaeDZjamgeZ9MgiYmVDccvHhjAzJw0NTh8/alyZMaVJicp0iTHj'.
+     'JpgNv38tjWUhhGROdbUL9W5/MH5XCkjlcibi+KIop5LVHLKEu8A/f4r286doa9pGrGwYAAsfqbbH3b8MgO/Nqgy6WvdbbXHMkEFJ'.
+     '4xUOMVEvaTZu3BgmvF4Yk4hz9rO/Ulr5cE9owae/rcGxohSOuiWkC2IjcIqKyPZm+OmCH7GhoZEF077EEzVVweAbJ+riEeO0Ey8y'.
+     'UubqOHn0AOgMwvf59txnBrSp9dgxKmf/+kIP1NY8SFk0jh5ajmNHAWg5b2E5EexojGHjbiVRMoRMNs0LC+Yz46vTuH3enN7BI8fr'.
+     'qFdo0BoVZNC9aVSQ4fNjBzEmQJiARxb+/AqYPMAVB5FsPU5v37g9OxgLhe14ZM5/ju052E6MNZvf5pmHHuLmmWOkEysxUtpGAtme'.
+     'dtHTflJkezqQto3jFRnLssyf1jydxiiM7zNnye/c3ZsqLu2BN5fcMfzrv/hby1tPzmRUoihcTJ87CwQI2yLtDcIqsIjYUf51qBlf'.
+     'OnScOSrdQUOMURkiXsLUzJnvbGhoBGDHH5cGyZLhOpYoNl5hqYnYEXOu5fDl9eYAHntx98n8hFHZcPHUuTSxSASAeK/CGIOxJJ0f'.
+     'bOGNPU280dgkq6Y2yu8vfjCIlwwzr+/ZQ/PHO0gOLuO5qsftDQ2NbN+4OCgqG6WTxWVaq6zpF+DiSHWnicdylp3r6aZTWthIOrNp'.
+     'ktHcvBu0sHX1Sm6ozB3B42d90zZA9bQp7PvgPSzXZfnqX/HS4DKKK2+x69Y/HURs26iBAN5ccsfw7774UcumF37C6f07KSt2OHji'.
+     'DEUJD0tISjyPrrSPlAKvN0JP/U4O1NfjuhG2rvklN1SOpfXwftpbTqAyKRrff5fb7rs9V1R7m4wlz2ihA3HpmXflUWyOH2umpLiY'.
+     'ui3v8M+6bWzfsRNbSgqkxaCkiy0simMuEWEhpcRzIhQWOIAh6tiAwS4owInFiTou5dOnMnl2NR++ujBwXEc9terD6M43nrj6LgAB'.
+     'QnDPA9/irtkP8JRS7Hr/3T6YekDQ1pEiEXOwpUVJzCVlZZFS4mZtkpEo9ChAkDp/jtLMBACy6S4RiQghLyv5cgBRPnKUOX6smUGF'.
+     'hSil0MYw9d77mPy1e5mnFE3batm3czvb6nYgEJztSFGU9LCRlMRdUjIH0+lnEMIwPNXD3NumoVJnrMCJaiciMUZfvQnz4QcBSvV1'.
+     'vjE5GK358t0zmXDnDB79saLpo20c+aSRD+t25JTp7GZQwsEWFiVxl6hlUf/WO9z32CxmL1rOe6u/I2KuwGhzLQCB7/sYY9Bah3el'.
+     'FKbvrrVm4vS7GH/7ncx+chEHGz7myCeNbPtoO0JI2jq78WIRLGkzsqs7V5SfFV5EovXACoiqqsfNpk2vo5VCWtYFBfoU0VoTBAFa'.
+     'a7TRaK2p+MoURk+cxMzq+Rzbv49DDbuo27UTW9h0dedssPxuK+kIfN8XxhgDYPVXf2Fh4XKtFIl4AiklAlBKAYRKKK36wHIweTCt'.
+     'NfHiEkaOn8j0+7/BmDFjaT30GbHywSxcuZkpFfFg+m1jjZ/NmnVvNfRvwd69e8WBA/uNFAIh4JVXXmHsmDHE4vEQQgjQ2lxQIm9N'.
+     'nz35q3BEOZOHzaG2thaA4mRU+L29It+IV21CpbRQfeMFC35gRB/M2rVrubnyZmLxWJhECBEmz/eHyo/7lMlH3LFFujsthNFCCGOu'.
+     '+WNyeUgpjSVzMKtWraKyshLPdcPEeYWCIEBdpIxSivr6eta8vI7d6+cGnhdV06pe1QP+F/QXWmuRL+jZZ58LlVmxYgUVFRV4rhtu'.
+     '4TzMxXAA6XRaRAtsYUkx8I/JtSJQOlSwpmZpCLN8+fPcdNNoHMfB9/0QJgRoP295TlR7UVv8xxZcHMuWIZ9/Hn35vG3JEGZpzVJG'.
+     'jx5N1IlitKahsZE1L69j69qHgx+urFX/lQL9JYdLlfnZihUhzOLFi8N3Ml1dthOxVH/f/8/CtqSJ2JaJ2JZ59J7RPsC/AViJsQS/'.
+     'dBntAAAAAElFTkSuQmCC' ;
+
+        //==========================================================
+        // folder.png
+        //==========================================================
         $this->iBuiltinIcon[11][0]= 1824 ;
-	$this->iBuiltinIcon[11][1]=
-	    'iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlz'.
-	    'AAALEAAACxABrSO9dQAAAAd0SU1FB9ECAQgFFyd9cRUAAAadSURBVHiczdhvbBP3Hcfx9/2xfefEOA5JoCNNnIT8AdtZmYBETJsI'.
-	    '6+jQOlQihT1AYgytqzZpD1atfyYqlT1h0lRpT7aRJ4NQpRvZGELVuo5Ua9jEJDIETQsNQyPBsUJMWGPnj//e+e72wNg4xElMR6ed'.
-	    'ZNln3933dZ/f93f6yfB/sgmrHdDV1WXlPg8NDZUDScD8LFFFEZZlWYZhWMFg0Orq6sq/gDJAfFy1iiZy9OjrVnj4JzQ1rMWqfxm/'.
-	    '309jYyNtbW0kEgnu3bvH4cOH88c/jqSKQl4/XGkd+eVtAN46up1LH92ktqYS++ZX8Pv9NDQ0sGnTJlKpFOFwmO7u7vy5IyMjeVRd'.
-	    'XV1+WEOh0IrY4pDnq6wXX/sTiCJaMkFZdRNqxefoe7VtCSqXVDqdZnZ2ltraWkzTpKqqijt3JpFlG7dvj7NzZ1f++qFQyA3EClHL'.
-	    'Ql743nFkhxPDtJAd5eTaYSVUfX09lZWVlJWVIUnSg7sVQMBCUcu4ceMGe/bsIRQK1QAzOcyykIM9P0KyudAyCWyqG8nhwqa4SkLt'.
-	    '3r0bVVVxu924XC40TUOWZUQxe97CwgIdHR2LMHIxSCaVInVvFElxE0vMY1Pd2NUKJMWNTXHlUfF//4vETJCelwbpFm3MjP2dt37x'.
-	    'AlN+PzU1NViWRSwW4+7du3g8HjweD4qi5EFAJzAExIpCANbooxhplfB0FJvTg6xWIqsVRVF6MopkU3FXPcnkJxGU0VEAdF2noqKC'.
-	    'W3/8DpnqLjzep2lubsblcjE8PExHR8fboVDID9xYFpLBDpJF0jDQIncQpWlkm31FlFLtp9PfyuW/vYQj1kPSuRW/38+lj27S2Q7v'.
-	    '/aWXUBVUffVNtm3blivVCEwsC5Eyc5iiApEpDEAXMqQdldhSiWVQHjJagud+8Fuexck/zv+K82dfoSbSCsDe75/km+4GVPd6+l5t'.
-	    '4zJHcqVUYN2yEEtZQDCSJCueRAYsPY49HsFIZVG6p25JUumFafT4DKJN4amtT7Nz38sk5+5A70HMtEYyMkFiZhxzjQ/poXrLQrRU'.
-	    'DFGEeFpAlkQkm4pRiCpIKodKzk0T/2QMh+piPjxKZPwiSkUtu/b9mNnJEWS7E8nhAmvpM60oJDkXJxqNozxRRUxPIesispBBlsXV'.
-	    'UaKEFo8gzoaJhz8s2lOmrpUG+WBhJ9/60g+Z+fDXTAXfxllRjl1VkO0OFATsYhYliiK21ZKKhhHnFveUqSdKgwAEOp7F2v51vvw8'.
-	    'XH7/N1wd/BlTweuUV65BdtgfoLTSkipsdD3tRi0VYpommUwGwzDwdT5HYEc3giAwcvH3jLz3BlPB67jWeZBEKYsSBWwpHZtNKo4q'.
-	    'aHTDsJeeiGEYWJaFZVmYpommaRiGQdPnv0bb1m8gSRL/vPIOV979aR4lmAJ2p4qCgCxksNuKJ6VNpx4NYhgGpmkuQhmGQTqdxjAM'.
-	    'qr2d7HtxEEEQuH1tkKvvvkF44tqDnrIcKJKAPf1g+LAUElq8dIiu60sApmnm93Pfzc7OYhgGrie+wFe++ztcLhcT1wf54PzPCU9c'.
-	    'w7XWjWS3IdsdOAUBWZAxrRJnTQ6SG5bce2FCpmkughmGQSqVYm5uDtnj44sH38TtdhP6+Dwf//V4ttHXrkGURZJaic8RgHQ6jWma'.
-	    'SJKUL5RLKNfIOczDKF3XSSaTRCIRhLJWntp3nGfWrSMxc5OLf3iNP4+68T9Ub9nF76lTpxgfHycajZJKpdA0LZ9GbjYV7hcDWZaF'.
-	    'pmnMz88Ti8UYunSLmu1HFi2aVkxkaGjINTY2ttDb24vX6+XQoUNs3ryZ8vJyIDu1BUFYkkxhgxeiWlpaOHPmDE1NTdTX1xe98eWG'.
-	    'JnF/9dQZCoXUYDA4AOD1ejlw4ACtra2Ul5fniwmCkEcUJiUIAoFAgL6+Pnw+H21tbfT39z8SxCS7hHsfWH9/8dL4MKqnp4eWlhac'.
-	    'TmcekEvMNE2am5s5ceIEgUCA9vZ2Tp48ic/nY3j4UsmQHCYOjJHtpeBKqL1799Lc3IzT6UTXdRobGxkYGKC9vZ3W1tZ8Ko86NJ8a'.
-	    'tXHjRo4dO8bp06fZsmULGzZsoL+/n0AggNfr5ezZs/8VpGTU5OSkc//+/acBfD4f1dXV7Nq1i4aGBs6dO4fP5+Pq1SuPBbIiyjTN'.
-	    'RUnV1dUNXLhwAa/Xy44dO4jFYgBEo9FFF1r134BPuYlk16LrAYXsAlmtq6sbKDwoFAp9m+ykuP5ZQVZF3f8tCdwCov8LyHIoAANI'.
-	    'AXf/A1TI0XCDh7OWAAAAAElFTkSuQmCC' ;
-
-	//==========================================================
-	// file_important.png
-	//==========================================================
-	$this->iBuiltinIcon[12][0]= 1785 ;
-	$this->iBuiltinIcon[12][1]=
-	    'iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlz'.
-	    'AAALDwAACw8BkvkDpQAAAAd0SU1FB9ECDAcjDeD3lKsAAAZ2SURBVHicrZhPaFzHHcc/897s7lutJCsr2VHsOHWMk0MPbsBUrcnF'.
-	    'OFRdSo6FNhdB6SGHlpDmYtJCDyoxyKe6EBxKQkt7KKL0T6ABo0NbciqigtC6PhWKI2NFqqxdSd7V2/dmftPDvPd212t55dCBYfbN'.
-	    'zpvfZ77z+/1mdhUjytWrV93Hf/24eD5z9gwiMlDjOKbb7dLtdhER2u02u7u73Lp1CxEZBw4AeZwdNQqkMd9wbziFGINJUt6rRbz5'.
-	    '1ptUq1XK5TJBEAAUMHt7e+zu7gKwvLzMysoKwAng/uNg9CgQgFKlgg1DUJ67Vqtx6tQpZmdniaIIpRTOOZRSdDoddnZ2aLfbLC8v'.
-	    's7S0xJUrV7ZGwQSj1PhhfRodVdDlMrpc5vup5Z2fvMPdu3fZ29vDWjvwztjYGPV6nVqtRqVS4dKlSywtLQFsAdOH2XwsCEApg3jl'.
-	    'w98Rak2gvYjNZpNms0mSJDjnHgkDMDc3dySYQ0Ea8w139YUX0OUKulzyg7UmCEO+l1huvHuDra0t9vf3h1TJYSqVypFhHquIrlQI'.
-	    'S5qv/uIDAC7/4bcEQYAKvK+0Wq1DVQGIoog7d+4cCeaRII35hrt+8SsEOkRlUaEyR0UpFIrXHxyMVKVUKnHv3r0jwRwaNelBjBjL'.
-	    'Sz/7KYuLiwAsLi7y4z/9kY9e+TpkCuSqjI+Po7XuAWeKXLt2DWNMUZMkwRjDhQsXWFtbK6JpCCT3jfQgxomPtPX19YHWicM5x3c2'.
-	    '73Pj3Ru8/aO3mZqaolKpoHVvyuvXr/Ppnf/Q7uzz380NPtu4y/qnG+ztd1hfX2dtbQ3gIvDnRyqSxl1UoPjyz98D4PTp0wPtq39Z'.
-	    '4fdzLxegrVaLVqvF5OQkYRgWqpRKJZ77wvNsbW1RG5tgfKLOTH2G7Z1twqBQrgrMDvhInjfSOCY5iIv+hYWFgRZArEWsZWF941Bf'.
-	    'SdMUgMnJCWpjVU4cn+HUyePM1Gc4+fRUPkzBI5w1jbukcczLv/5l0XfmzJmBFuCba38r/CRXpT+CrDUoZ0jjB4RYonJAOYRobJKT'.
-	    'z5zgqfqxAbsFSH6mpHFM2qdGXh4VnoViD6mSJF2cTQeqDqBaKVHWmonJCWpZjhkC6anR5WsffTgwaHV1FaUUq6urA/2v3f5k4LnV'.
-	    'arG9tUn3oI2YBCcWHYAxMVYs1qZEZY2SFB2aYZDGfMN9d7uJiWPSeFiNo5Rclc3NTXZbO6RpF7EJVixYA9agwwDnUiqlEPdQ3imi'.
-	    'Jo27BGHIt/7x9yEjc3Nzh27Na7c/4TdffKl4bja3ae5MUIu0T/HOEIaOpJt4gwoSsVTK4SBIY77hFtY3ABBjBiZ90rKwvsH77/+K'.
-	    't37wOhO1iPpTk4SBw1mLsz6CnKQ4l3qV+kE+t9XHlNZOk+bUJLVIE1VCcIJWQmJ6qjj30NbcXLkZMt8YPig+Z3n1G5fZ39/j/vY2'.
-	    '9ckqZT2Ochbn0p4qNkU/dDfUADdXbh4HXgRO4zNdEU0XL1784PLly5w9e7Z4SazFOfGrEotDcOKrcoJPmrYIXf/Zop3QNd1skuGt'.
-	    'cUAb2MgAxvHZTgFUq1Wmp6eZnZ0F8JlTjDduDThBnDeECEoJtbGIp6enqEblzCcEZ1PECU4yVRiOGgd0gc+AB0CZvkv1sWPHOHfu'.
-	    'HOfPn8da41cpkkltEBEPJhYnBkTQJcdYVKGkgRxCfBsq5xXNgAa2Bn+hjTOgHEKBP8pzRUxykIH4ifLJRTJAl+UMBJzPHQ6bfe/f'.
-	    'cWIzPxlUpD+zugzIZtVk1d8znBAqRxgoQuVQgSJQ3h9C5QhDRYgjUILCAzlnEdsHYTKfMTEBcP7F54YUGVmc2GLlIn6ve6v0ahSt'.
-	    '8X25TzjJ+rIx1grKpQPWR4LkGVVsMgghvS0qjPdvm5OeceOTWA5Evo2mFzkjQfL7hZPUy5yvvF/uPFQL3+nbDmsLCEmT3sTmCTNr'.
-	    'rogT6yFsOix3ftw7OwQhkvSU6CuinhCk0+kAkFoBazEEICHaHHiPVmU0gnUp4EAc1mYrF0EBVpwPi34VrBkwPxKk3W5ju/e5/c+d'.
-	    'bGUHIAIuydTIE5zfc5Wr4lJcahHnHTP3CVGm78DrgY38N+DEibp7dmYKdAQmBh1hjEFjis+9CTWYGK21H6PxPyOI0DobYwzZF/z7'.
-	    '7jadTvJtYG0kCD7lfwl49ijgT1gc0AH+dZSJA/xB+Mz/GSIvFoj/B7H1mAd8CO/zAAAAAElFTkSuQmCC' ;
-
-	$this->iLen = count($this->iBuiltinIcon);
+        $this->iBuiltinIcon[11][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlz'.
+     'AAALEAAACxABrSO9dQAAAAd0SU1FB9ECAQgFFyd9cRUAAAadSURBVHiczdhvbBP3Hcfx9/2xfefEOA5JoCNNnIT8AdtZmYBETJsI'.
+     '6+jQOlQihT1AYgytqzZpD1atfyYqlT1h0lRpT7aRJ4NQpRvZGELVuo5Ua9jEJDIETQsNQyPBsUJMWGPnj//e+e72wNg4xElMR6ed'.
+     'ZNln3933dZ/f93f6yfB/sgmrHdDV1WXlPg8NDZUDScD8LFFFEZZlWYZhWMFg0Orq6sq/gDJAfFy1iiZy9OjrVnj4JzQ1rMWqfxm/'.
+     '309jYyNtbW0kEgnu3bvH4cOH88c/jqSKQl4/XGkd+eVtAN46up1LH92ktqYS++ZX8Pv9NDQ0sGnTJlKpFOFwmO7u7vy5IyMjeVRd'.
+     'XV1+WEOh0IrY4pDnq6wXX/sTiCJaMkFZdRNqxefoe7VtCSqXVDqdZnZ2ltraWkzTpKqqijt3JpFlG7dvj7NzZ1f++qFQyA3EClHL'.
+     'Ql743nFkhxPDtJAd5eTaYSVUfX09lZWVlJWVIUnSg7sVQMBCUcu4ceMGe/bsIRQK1QAzOcyykIM9P0KyudAyCWyqG8nhwqa4SkLt'.
+     '3r0bVVVxu924XC40TUOWZUQxe97CwgIdHR2LMHIxSCaVInVvFElxE0vMY1Pd2NUKJMWNTXHlUfF//4vETJCelwbpFm3MjP2dt37x'.
+     'AlN+PzU1NViWRSwW4+7du3g8HjweD4qi5EFAJzAExIpCANbooxhplfB0FJvTg6xWIqsVRVF6MopkU3FXPcnkJxGU0VEAdF2noqKC'.
+     'W3/8DpnqLjzep2lubsblcjE8PExHR8fboVDID9xYFpLBDpJF0jDQIncQpWlkm31FlFLtp9PfyuW/vYQj1kPSuRW/38+lj27S2Q7v'.
+     '/aWXUBVUffVNtm3blivVCEwsC5Eyc5iiApEpDEAXMqQdldhSiWVQHjJagud+8Fuexck/zv+K82dfoSbSCsDe75/km+4GVPd6+l5t'.
+     '4zJHcqVUYN2yEEtZQDCSJCueRAYsPY49HsFIZVG6p25JUumFafT4DKJN4amtT7Nz38sk5+5A70HMtEYyMkFiZhxzjQ/poXrLQrRU'.
+     'DFGEeFpAlkQkm4pRiCpIKodKzk0T/2QMh+piPjxKZPwiSkUtu/b9mNnJEWS7E8nhAmvpM60oJDkXJxqNozxRRUxPIesispBBlsXV'.
+     'UaKEFo8gzoaJhz8s2lOmrpUG+WBhJ9/60g+Z+fDXTAXfxllRjl1VkO0OFATsYhYliiK21ZKKhhHnFveUqSdKgwAEOp7F2v51vvw8'.
+     'XH7/N1wd/BlTweuUV65BdtgfoLTSkipsdD3tRi0VYpommUwGwzDwdT5HYEc3giAwcvH3jLz3BlPB67jWeZBEKYsSBWwpHZtNKo4q'.
+     'aHTDsJeeiGEYWJaFZVmYpommaRiGQdPnv0bb1m8gSRL/vPIOV979aR4lmAJ2p4qCgCxksNuKJ6VNpx4NYhgGpmkuQhmGQTqdxjAM'.
+     'qr2d7HtxEEEQuH1tkKvvvkF44tqDnrIcKJKAPf1g+LAUElq8dIiu60sApmnm93Pfzc7OYhgGrie+wFe++ztcLhcT1wf54PzPCU9c'.
+     'w7XWjWS3IdsdOAUBWZAxrRJnTQ6SG5bce2FCpmkughmGQSqVYm5uDtnj44sH38TtdhP6+Dwf//V4ttHXrkGURZJaic8RgHQ6jWma'.
+     'SJKUL5RLKNfIOczDKF3XSSaTRCIRhLJWntp3nGfWrSMxc5OLf3iNP4+68T9Ub9nF76lTpxgfHycajZJKpdA0LZ9GbjYV7hcDWZaF'.
+     'pmnMz88Ti8UYunSLmu1HFi2aVkxkaGjINTY2ttDb24vX6+XQoUNs3ryZ8vJyIDu1BUFYkkxhgxeiWlpaOHPmDE1NTdTX1xe98eWG'.
+     'JnF/9dQZCoXUYDA4AOD1ejlw4ACtra2Ul5fniwmCkEcUJiUIAoFAgL6+Pnw+H21tbfT39z8SxCS7hHsfWH9/8dL4MKqnp4eWlhac'.
+     'TmcekEvMNE2am5s5ceIEgUCA9vZ2Tp48ic/nY3j4UsmQHCYOjJHtpeBKqL1799Lc3IzT6UTXdRobGxkYGKC9vZ3W1tZ8Ko86NJ8a'.
+     'tXHjRo4dO8bp06fZsmULGzZsoL+/n0AggNfr5ezZs/8VpGTU5OSkc//+/acBfD4f1dXV7Nq1i4aGBs6dO4fP5+Pq1SuPBbIiyjTN'.
+     'RUnV1dUNXLhwAa/Xy44dO4jFYgBEo9FFF1r134BPuYlk16LrAYXsAlmtq6sbKDwoFAp9m+ykuP5ZQVZF3f8tCdwCov8LyHIoAANI'.
+     'AXf/A1TI0XCDh7OWAAAAAElFTkSuQmCC' ;
+
+        //==========================================================
+        // file_important.png
+        //==========================================================
+        $this->iBuiltinIcon[12][0]= 1785 ;
+        $this->iBuiltinIcon[12][1]=
+     'iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAYAAAA6RwvCAAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlz'.
+     'AAALDwAACw8BkvkDpQAAAAd0SU1FB9ECDAcjDeD3lKsAAAZ2SURBVHicrZhPaFzHHcc/897s7lutJCsr2VHsOHWMk0MPbsBUrcnF'.
+     'OFRdSo6FNhdB6SGHlpDmYtJCDyoxyKe6EBxKQkt7KKL0T6ABo0NbciqigtC6PhWKI2NFqqxdSd7V2/dmftPDvPd212t55dCBYfbN'.
+     'zpvfZ77z+/1mdhUjytWrV93Hf/24eD5z9gwiMlDjOKbb7dLtdhER2u02u7u73Lp1CxEZBw4AeZwdNQqkMd9wbziFGINJUt6rRbz5'.
+     '1ptUq1XK5TJBEAAUMHt7e+zu7gKwvLzMysoKwAng/uNg9CgQgFKlgg1DUJ67Vqtx6tQpZmdniaIIpRTOOZRSdDoddnZ2aLfbLC8v'.
+     's7S0xJUrV7ZGwQSj1PhhfRodVdDlMrpc5vup5Z2fvMPdu3fZ29vDWjvwztjYGPV6nVqtRqVS4dKlSywtLQFsAdOH2XwsCEApg3jl'.
+     'w98Rak2gvYjNZpNms0mSJDjnHgkDMDc3dySYQ0Ea8w139YUX0OUKulzyg7UmCEO+l1huvHuDra0t9vf3h1TJYSqVypFhHquIrlQI'.
+     'S5qv/uIDAC7/4bcEQYAKvK+0Wq1DVQGIoog7d+4cCeaRII35hrt+8SsEOkRlUaEyR0UpFIrXHxyMVKVUKnHv3r0jwRwaNelBjBjL'.
+     'Sz/7KYuLiwAsLi7y4z/9kY9e+TpkCuSqjI+Po7XuAWeKXLt2DWNMUZMkwRjDhQsXWFtbK6JpCCT3jfQgxomPtPX19YHWicM5x3c2'.
+     '73Pj3Ru8/aO3mZqaolKpoHVvyuvXr/Ppnf/Q7uzz380NPtu4y/qnG+ztd1hfX2dtbQ3gIvDnRyqSxl1UoPjyz98D4PTp0wPtq39Z'.
+     '4fdzLxegrVaLVqvF5OQkYRgWqpRKJZ77wvNsbW1RG5tgfKLOTH2G7Z1twqBQrgrMDvhInjfSOCY5iIv+hYWFgRZArEWsZWF941Bf'.
+     'SdMUgMnJCWpjVU4cn+HUyePM1Gc4+fRUPkzBI5w1jbukcczLv/5l0XfmzJmBFuCba38r/CRXpT+CrDUoZ0jjB4RYonJAOYRobJKT'.
+     'z5zgqfqxAbsFSH6mpHFM2qdGXh4VnoViD6mSJF2cTQeqDqBaKVHWmonJCWpZjhkC6anR5WsffTgwaHV1FaUUq6urA/2v3f5k4LnV'.
+     'arG9tUn3oI2YBCcWHYAxMVYs1qZEZY2SFB2aYZDGfMN9d7uJiWPSeFiNo5Rclc3NTXZbO6RpF7EJVixYA9agwwDnUiqlEPdQ3imi'.
+     'Jo27BGHIt/7x9yEjc3Nzh27Na7c/4TdffKl4bja3ae5MUIu0T/HOEIaOpJt4gwoSsVTK4SBIY77hFtY3ABBjBiZ90rKwvsH77/+K'.
+     't37wOhO1iPpTk4SBw1mLsz6CnKQ4l3qV+kE+t9XHlNZOk+bUJLVIE1VCcIJWQmJ6qjj30NbcXLkZMt8YPig+Z3n1G5fZ39/j/vY2'.
+     '9ckqZT2Ochbn0p4qNkU/dDfUADdXbh4HXgRO4zNdEU0XL1784PLly5w9e7Z4SazFOfGrEotDcOKrcoJPmrYIXf/Zop3QNd1skuGt'.
+     'cUAb2MgAxvHZTgFUq1Wmp6eZnZ0F8JlTjDduDThBnDeECEoJtbGIp6enqEblzCcEZ1PECU4yVRiOGgd0gc+AB0CZvkv1sWPHOHfu'.
+     'HOfPn8da41cpkkltEBEPJhYnBkTQJcdYVKGkgRxCfBsq5xXNgAa2Bn+hjTOgHEKBP8pzRUxykIH4ifLJRTJAl+UMBJzPHQ6bfe/f'.
+     'cWIzPxlUpD+zugzIZtVk1d8znBAqRxgoQuVQgSJQ3h9C5QhDRYgjUILCAzlnEdsHYTKfMTEBcP7F54YUGVmc2GLlIn6ve6v0ahSt'.
+     '8X25TzjJ+rIx1grKpQPWR4LkGVVsMgghvS0qjPdvm5OeceOTWA5Evo2mFzkjQfL7hZPUy5yvvF/uPFQL3+nbDmsLCEmT3sTmCTNr'.
+     'rogT6yFsOix3ftw7OwQhkvSU6CuinhCk0+kAkFoBazEEICHaHHiPVmU0gnUp4EAc1mYrF0EBVpwPi34VrBkwPxKk3W5ju/e5/c+d'.
+     'bGUHIAIuydTIE5zfc5Wr4lJcahHnHTP3CVGm78DrgY38N+DEibp7dmYKdAQmBh1hjEFjis+9CTWYGK21H6PxPyOI0DobYwzZF/z7'.
+     '7jadTvJtYG0kCD7lfwl49ijgT1gc0AH+dZSJA/xB+Mz/GSIvFoj/B7H1mAd8CO/zAAAAAElFTkSuQmCC' ;
+
+        $this->iLen = count($this->iBuiltinIcon);
     }
 }
 
@@ -1401,66 +1475,65 @@ function PredefIcons() {
 
 //===================================================
 // CLASS IconImage
-// Description: Holds properties for an icon image 
+// Description: Holds properties for an icon image
 //===================================================
 class IconImage {
-    var $iGDImage=null;
-    var $iWidth,$iHeight;
-    var $ixalign='left',$iyalign='center';
-    var $iScale=1.0;
-
-    function IconImage($aIcon,$aScale=1) {
-	GLOBAL $_gPredefIcons ; 
-	if( is_string($aIcon) ) {
-	    $this->iGDImage = Graph::LoadBkgImage('',$aIcon);
-	}
-	elseif( is_integer($aIcon) ) {
-	    // Builtin image
-	    $this->iGDImage = $_gPredefIcons->GetImg($aIcon);
-	}
-	else {
-	    JpGraphError::Raise('Argument to IconImage must be string or integer');
-	}
-	$this->iScale = $aScale;
-	$this->iWidth = Image::GetWidth($this->iGDImage);
-	$this->iHeight = Image::GetHeight($this->iGDImage);
+    private $iGDImage=null;
+    private $iWidth,$iHeight;
+    private $ixalign='left',$iyalign='center';
+    private $iScale=1.0;
+
+    function __construct($aIcon,$aScale=1) {
+        GLOBAL $_gPredefIcons ;
+        if( is_string($aIcon) ) {
+            $this->iGDImage = Graph::LoadBkgImage('',$aIcon);
+        }
+        elseif( is_integer($aIcon) ) {
+            // Builtin image
+            $this->iGDImage = $_gPredefIcons->GetImg($aIcon);
+        }
+        else {
+            JpGraphError::RaiseL(6011);
+            //('Argument to IconImage must be string or integer');
+        }
+        $this->iScale = $aScale;
+        $this->iWidth = Image::GetWidth($this->iGDImage);
+        $this->iHeight = Image::GetHeight($this->iGDImage);
     }
 
     function GetWidth() {
-	return round($this->iScale*$this->iWidth);
+        return round($this->iScale*$this->iWidth);
     }
 
     function GetHeight() {
-	return round($this->iScale*$this->iHeight);
+        return round($this->iScale*$this->iHeight);
     }
 
     function SetAlign($aX='left',$aY='center') {
-
-	$this->ixalign = $aX;
-	$this->iyalign = $aY;
-
+        $this->ixalign = $aX;
+        $this->iyalign = $aY;
     }
 
     function Stroke($aImg,$x,$y) {
 
-	if( $this->ixalign == 'right' ) {
-	    $x -= $this->iWidth;
-	}
-	elseif( $this->ixalign == 'center' ) {
-	    $x -= round($this->iWidth/2*$this->iScale);
-	}
-
-	if( $this->iyalign == 'bottom' ) {
-	    $y -= $this->iHeight;
-	}
-	elseif( $this->iyalign == 'center' ) {
-	    $y -= round($this->iHeight/2*$this->iScale);
-	}
-
-	$aImg->Copy($this->iGDImage,
-		    $x,$y,0,0,
-		    round($this->iWidth*$this->iScale),round($this->iHeight*$this->iScale),
-		    $this->iWidth,$this->iHeight);
+        if( $this->ixalign == 'right' ) {
+            $x -= $this->iWidth;
+        }
+        elseif( $this->ixalign == 'center' ) {
+            $x -= round($this->iWidth/2*$this->iScale);
+        }
+
+        if( $this->iyalign == 'bottom' ) {
+            $y -= $this->iHeight;
+        }
+        elseif( $this->iyalign == 'center' ) {
+            $y -= round($this->iHeight/2*$this->iScale);
+        }
+
+        $aImg->Copy($this->iGDImage,
+        			$x,$y,0,0,
+        			round($this->iWidth*$this->iScale),round($this->iHeight*$this->iScale),
+        			$this->iWidth,$this->iHeight);
     }
 }
 
@@ -1470,326 +1543,389 @@ function Stroke($aImg,$x,$y) {
 // Description: Holds properties for a text
 //===================================================
 class TextProperty {
-    var $iFFamily=FF_FONT1,$iFStyle=FS_NORMAL,$iFSize=10;
-    var $iColor="black";
-    var $iShow=true;
-    var $iText="";
-    var $iHAlign="left",$iVAlign="bottom";
-    var $csimtarget='',$csimalt='';
-	
-//---------------
-// CONSTRUCTOR	
-    function TextProperty($aTxt='') {
-	$this->iText = $aTxt;
-    }		
-	
-//---------------
-// PUBLIC METHODS	
+    public $iShow=true;
+    public $csimtarget='',$csimwintarget='',$csimalt='';
+    private $iFFamily=FF_FONT1,$iFStyle=FS_NORMAL,$iFSize=10;
+    private $iFontArray=array();
+    private $iColor="black";
+    private $iText="";
+    private $iHAlign="left",$iVAlign="bottom";
+
+    //---------------
+    // CONSTRUCTOR
+    function __construct($aTxt='') {
+        $this->iText = $aTxt;
+    }
+
+    //---------------
+    // PUBLIC METHODS
     function Set($aTxt) {
-	$this->iText = $aTxt;
+        $this->iText = $aTxt;
     }
 
-    function SetCSIMTarget($aTarget,$aAltText='') {
-	if( is_string($aTarget) )
-	    $aTarget = array($aTarget);
-	$this->csimtarget=$aTarget;
-	if( is_string($aAltText) )
-	    $aAltText = array($aAltText);
+    function SetCSIMTarget($aTarget,$aAltText='',$aWinTarget='') {
+        if( is_string($aTarget) )
+        $aTarget = array($aTarget);
+        $this->csimtarget=$aTarget;
+
+        if( is_string($aWinTarget) )
+        $aWinTarget = array($aWinTarget);
+        $this->csimwintarget=$aWinTarget;
+
+        if( is_string($aAltText) )
+        $aAltText = array($aAltText);
         $this->csimalt=$aAltText;
+
     }
-    
+
     function SetCSIMAlt($aAltText) {
-	if( is_string($aAltText) )
-	    $aAltText = array($aAltText);
+        if( is_string($aAltText) )
+        $aAltText = array($aAltText);
         $this->csimalt=$aAltText;
     }
 
     // Set text color
     function SetColor($aColor) {
-	$this->iColor = $aColor;
+        $this->iColor = $aColor;
     }
-	
+
     function HasTabs() {
-	if( is_string($this->iText) ) {
-	    return substr_count($this->iText,"\t") > 0;
-	}
-	elseif( is_array($this->iText) ) {
-	    return false;
-	}
+        if( is_string($this->iText) ) {
+            return substr_count($this->iText,"\t") > 0;
+        }
+        elseif( is_array($this->iText) ) {
+            return false;
+        }
     }
-	
+
     // Get number of tabs in string
     function GetNbrTabs() {
-	if( is_string($this->iText) ) {
-	    return substr_count($this->iText,"\t") ;
-	}
-	else{
-	    return 0;
-	}
+        if( is_string($this->iText) ) {
+            return substr_count($this->iText,"\t") ;
+        }
+        else{
+            return 0;
+        }
     }
-	
+
     // Set alignment
     function Align($aHAlign,$aVAlign="bottom") {
-	$this->iHAlign=$aHAlign;
-	$this->iVAlign=$aVAlign;
+        $this->iHAlign=$aHAlign;
+        $this->iVAlign=$aVAlign;
     }
-	
+
     // Synonym
     function SetAlign($aHAlign,$aVAlign="bottom") {
-	$this->iHAlign=$aHAlign;
-	$this->iVAlign=$aVAlign;
+        $this->iHAlign=$aHAlign;
+        $this->iVAlign=$aVAlign;
     }
-	
+
     // Specify font
     function SetFont($aFFamily,$aFStyle=FS_NORMAL,$aFSize=10) {
-	$this->iFFamily = $aFFamily;
-	$this->iFStyle	 = $aFStyle;
-	$this->iFSize	 = $aFSize;
+        $this->iFFamily = $aFFamily;
+        $this->iFStyle  = $aFStyle;
+        $this->iFSize  = $aFSize;
     }
 
+    function SetColumnFonts($aFontArray) {
+        if( !is_array($aFontArray) || count($aFontArray[0]) != 3 ) {
+            JpGraphError::RaiseL(6033);
+            // 'Array of fonts must contain arrays with 3 elements, i.e. (Family, Style, Size)'
+        }
+        $this->iFontArray = $aFontArray;
+    }
+
+
     function IsColumns() {
-	return is_array($this->iText) ; 
+        return is_array($this->iText) ;
     }
-	
+
     // Get width of text. If text contains several columns separated by
-    // tabs then return both the total width as well as an array with a 
+    // tabs then return both the total width as well as an array with a
     // width for each column.
     function GetWidth($aImg,$aUseTabs=false,$aTabExtraMargin=1.1) {
-	$errmsg = 'Unknown type in Gantt object title specification';
-	$extra_margin=4;
-	$aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-	if( is_string($this->iText) ) {
-	    if( strlen($this->iText) == 0 ) return 0;
-	    $tmp = preg_split("/\t/",$this->iText);
-	    if( count($tmp) <= 1 || !$aUseTabs ) {
-		return $aImg->GetTextWidth($this->iText)+2*$extra_margin;
-	    }
-	    else {
-		$tot=0;
-		for($i=0; $i < count($tmp); ++$i) {
-		    $res[$i] = $aImg->GetTextWidth($tmp[$i]);
-		    $tot += $res[$i]*$aTabExtraMargin;
-		}
-		return array(round($tot),$res);
-	    }
-	}
-	elseif( is_object($this->iText) ) {
-	    // A single icon
-	    return $this->iText->GetWidth()+2*$extra_margin;
-	}
-	elseif( is_array($this->iText) ) {
-	    // Must be an array of texts. In this case we return the sum of the
-	    // length + a fixed margin of 4 pixels on each text string
-	    $n = count($this->iText);
-	    for( $i=0, $w=0; $i < $n; ++$i ) {
-		$tmp = $this->iText[$i];
-		if( is_string($tmp) ) {
-		    $w += $aImg->GetTextWidth($tmp)+$extra_margin;
-		}
-		else {
-		    if( is_object($tmp) === false ) {
-			JpGraphError::Raise($errmsg);
-		    }
-		    $w += $tmp->GetWidth()+$extra_margin;
-		}
-	    }
-	    return $w;
-	}
-	else {
-	    JpGraphError::Raise($errmsg);
-	}
+        $extra_margin=4;
+        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
+        if( is_string($this->iText) ) {
+            if( strlen($this->iText) == 0 ) return 0;
+            $tmp = preg_split('/\t/',$this->iText);
+            if( count($tmp) <= 1 || !$aUseTabs ) {
+                $w = $aImg->GetTextWidth($this->iText);
+                return $w + 2*$extra_margin;
+            }
+            else {
+                $tot=0;
+                $n = count($tmp);
+                for($i=0; $i < $n; ++$i) {
+                    $res[$i] = $aImg->GetTextWidth($tmp[$i]);
+                    $tot += $res[$i]*$aTabExtraMargin;
+                }
+                return array(round($tot),$res);
+            }
+        }
+        elseif( is_object($this->iText) ) {
+            // A single icon
+            return $this->iText->GetWidth()+2*$extra_margin;
+        }
+        elseif( is_array($this->iText) ) {
+            // Must be an array of texts. In this case we return the sum of the
+            // length + a fixed margin of 4 pixels on each text string
+            $n = count($this->iText);
+            $nf = count($this->iFontArray);
+            for( $i=0, $w=0; $i < $n; ++$i ) {
+                if( $i < $nf ) {
+                    $aImg->SetFont($this->iFontArray[$i][0],$this->iFontArray[$i][1],$this->iFontArray[$i][2]);
+                }
+                else {
+                    $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
+                }
+                $tmp = $this->iText[$i];
+                if( is_string($tmp) ) {
+                    $w += $aImg->GetTextWidth($tmp)+$extra_margin;
+                }
+                else {
+                    if( is_object($tmp) === false ) {
+                        JpGraphError::RaiseL(6012);
+                    }
+                    $w += $tmp->GetWidth()+$extra_margin;
+                }
+            }
+            return $w;
+        }
+        else {
+            JpGraphError::RaiseL(6012);
+        }
     }
 
     // for the case where we have multiple columns this function returns the width of each
     // column individually. If there is no columns just return the width of the single
     // column as an array of one
     function GetColWidth($aImg,$aMargin=0) {
-	$errmsg = 'Unknown type in Gantt object title specification';
-	$aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-	if( is_array($this->iText) ) {
-	    $n = count($this->iText);
-	    for( $i=0, $w=array(); $i < $n; ++$i ) {
-		$tmp = $this->iText[$i];
-		if( is_string($tmp) ) {
-		    $w[$i] = $aImg->GetTextWidth($this->iText[$i])+$aMargin;
-		}
-		else {
-		    if( is_object($tmp) === false ) {
-			JpGraphError::Raise($errmsg);
-		    }
-		    $w[$i] = $tmp->GetWidth()+$aMargin;
-		}
-	    }
-	    return $w;	
-	}
-	else {
-	    return array($this->GetWidth($aImg));
-	}
+        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
+        if( is_array($this->iText) ) {
+            $n = count($this->iText);
+            $nf = count($this->iFontArray);
+            for( $i=0, $w=array(); $i < $n; ++$i ) {
+                $tmp = $this->iText[$i];
+                if( is_string($tmp) ) {
+                    if( $i < $nf ) {
+                        $aImg->SetFont($this->iFontArray[$i][0],$this->iFontArray[$i][1],$this->iFontArray[$i][2]);
+                    }
+                    else {
+                        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
+                    }
+                    $w[$i] = $aImg->GetTextWidth($tmp)+$aMargin;
+                }
+                else {
+                    if( is_object($tmp) === false ) {
+                        JpGraphError::RaiseL(6012);
+                    }
+                    $w[$i] = $tmp->GetWidth()+$aMargin;
+                }
+            }
+            return $w;
+        }
+        else {
+            return array($this->GetWidth($aImg));
+        }
     }
-	
+
     // Get total height of text
     function GetHeight($aImg) {
-	$aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-	return $aImg->GetFontHeight();
-    }
-	
-    // Unhide/hide the text	
+        $nf = count($this->iFontArray);
+        $maxheight = -1;
+
+        if( $nf > 0 ) {
+            // We have to find out the largest font and take that one as the
+            // height of the row
+            for($i=0; $i < $nf; ++$i ) {
+                $aImg->SetFont($this->iFontArray[$i][0],$this->iFontArray[$i][1],$this->iFontArray[$i][2]);
+                $height = $aImg->GetFontHeight();
+                $maxheight = max($height,$maxheight);
+            }
+        }
+
+        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
+        $height = $aImg->GetFontHeight();
+        $maxheight = max($height,$maxheight);
+        return $maxheight;
+    }
+
+    // Unhide/hide the text
     function Show($aShow=true) {
-	$this->iShow=$aShow;
+        $this->iShow=$aShow;
     }
-	
+
     // Stroke text at (x,y) coordinates. If the text contains tabs then the
     // x parameter should be an array of positions to be used for each successive
     // tab mark. If no array is supplied then the tabs will be ignored.
     function Stroke($aImg,$aX,$aY) {
-	if( $this->iShow ) {
-	    $aImg->SetColor($this->iColor);
-	    $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-	    $aImg->SetTextAlign($this->iHAlign,$this->iVAlign);			
-	    if( $this->GetNbrTabs() <= 1 ) {
-		if( is_string($this->iText) ) {
-		    // Get rid of any "\t" characters and stroke string
-		    if( is_array($aX) ) $aX=$aX[0];
-		    if( is_array($aY) ) $aY=$aY[0];
-		    $aImg->StrokeText($aX,$aY,str_replace("\t"," ",$this->iText));
-		}
-		else {
-		    $n = count($this->iText);
-		    $ax = is_array($aX) ;
-		    $ay = is_array($aY) ;
-		    if( $ax && $ay ) {
-			// Nothing; both are already arrays
-		    }
-		    elseif( $ax ) {
-			$aY = array_fill(0,$n,$aY);
-		    }
-		    elseif( $ay ) {
-			$aX = array_fill(0,$n,$aX);
-		    }
-		    else {
-			$aX = array_fill(0,$n,$aX);
-			$aY = array_fill(0,$n,$aY);
-		    }
-		    $n = min($n, count($aX) ) ;
-		    $n = min($n, count($aY) ) ;
-		    for($i=0; $i < $n; ++$i ) {
-			$tmp = $this->iText[$i];
-			if( is_object($tmp) ) {
-			    $tmp->Stroke($aImg,$aX[$i],$aY[$i]);
-			}
-			else
-			    $aImg->StrokeText($aX[$i],$aY[$i],str_replace("\t"," ",$tmp));
-		    }
-		}
-	    }
-	    else {
-		$tmp = preg_split("/\t/",$this->iText);
-		$n = min(count($tmp),count($aX));
-		for($i=0; $i < $n; ++$i) {
-		    $aImg->StrokeText($aX[$i],$aY,$tmp[$i]);
-		}	
-	    }
-	}
+        if( $this->iShow ) {
+            $aImg->SetColor($this->iColor);
+            $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
+            $aImg->SetTextAlign($this->iHAlign,$this->iVAlign);
+            if( $this->GetNbrTabs() < 1 ) {
+                if( is_string($this->iText) ) {
+                    if( is_array($aX) ) $aX=$aX[0];
+                    if( is_array($aY) ) $aY=$aY[0];
+                    $aImg->StrokeText($aX,$aY,$this->iText);
+                }
+                elseif( is_array($this->iText) && ($n = count($this->iText)) > 0 ) {
+                    $ax = is_array($aX) ;
+                    $ay = is_array($aY) ;
+                    if( $ax && $ay ) {
+                        // Nothing; both are already arrays
+                    }
+                    elseif( $ax ) {
+                        $aY = array_fill(0,$n,$aY);
+                    }
+                    elseif( $ay ) {
+                        $aX = array_fill(0,$n,$aX);
+                    }
+                    else {
+                        $aX = array_fill(0,$n,$aX);
+                        $aY = array_fill(0,$n,$aY);
+                    }
+                    $n = min($n, count($aX) ) ;
+                    $n = min($n, count($aY) ) ;
+                    for($i=0; $i < $n; ++$i ) {
+                        $tmp = $this->iText[$i];
+                        if( is_object($tmp) ) {
+                            $tmp->Stroke($aImg,$aX[$i],$aY[$i]);
+                        }
+                        else {
+                            if( $i < count($this->iFontArray) ) {
+                                $font = $this->iFontArray[$i];
+                                $aImg->SetFont($font[0],$font[1],$font[2]);
+                            }
+                            else {
+                                $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
+                            }
+                        	$aImg->StrokeText($aX[$i],$aY[$i],str_replace("\t"," ",$tmp));
+                        }
+                    }
+                }
+            }
+            else {
+                $tmp = preg_split('/\t/',$this->iText);
+                $n = min(count($tmp),count($aX));
+                for($i=0; $i < $n; ++$i) {
+                    if( $i < count($this->iFontArray) ) {
+                        $font = $this->iFontArray[$i];
+                        $aImg->SetFont($font[0],$font[1],$font[2]);
+                    }
+                    else {
+                        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
+                    }
+                    $aImg->StrokeText($aX[$i],$aY,$tmp[$i]);
+                }
+            }
+        }
     }
 }
 
 //===================================================
 // CLASS HeaderProperty
-// Description: Data encapsulating class to hold property 
+// Description: Data encapsulating class to hold property
 // for each type of the scale headers
 //===================================================
 class HeaderProperty {
-    var $iTitleVertMargin=3,$iFFamily=FF_FONT0,$iFStyle=FS_NORMAL,$iFSize=8;
-    var $iFrameColor="black",$iFrameWeight=1;
-    var $iShowLabels=true,$iShowGrid=true;
-    var $iBackgroundColor="white";
-    var $iWeekendBackgroundColor="lightgray",$iSundayTextColor="red"; // these are only used with day scale
-    var $iTextColor="black";
-    var $iLabelFormStr="%d";
-    var $grid,$iStyle=0;
-    var $iIntervall = 1;
-
-//---------------
-// CONSTRUCTOR	
-    function HeaderProperty() {
-	$this->grid = new LineProperty();
-    }
-
-//---------------
-// PUBLIC METHODS		
+    public $grid;
+    public $iShowLabels=true,$iShowGrid=true;
+    public $iTitleVertMargin=3,$iFFamily=FF_FONT0,$iFStyle=FS_NORMAL,$iFSize=8;
+    public $iStyle=0;
+    public $iFrameColor="black",$iFrameWeight=1;
+    public $iBackgroundColor="white";
+    public $iWeekendBackgroundColor="lightgray",$iSundayTextColor="red"; // these are only used with day scale
+    public $iTextColor="black";
+    public $iLabelFormStr="%d";
+    public $iIntervall = 1;
+
+    //---------------
+    // CONSTRUCTOR
+    function __construct() {
+        $this->grid = new LineProperty();
+    }
+
+    //---------------
+    // PUBLIC METHODS
     function Show($aShow=true) {
-	$this->iShowLabels = $aShow;
+        $this->iShowLabels = $aShow;
     }
 
     function SetIntervall($aInt) {
-	$this->iIntervall = $aInt;
+    	$this->iIntervall = $aInt;
+    }
+
+    function SetInterval($aInt) {
+        $this->iIntervall = $aInt;
     }
 
     function GetIntervall() {
-	return $this->iIntervall ;
+        return $this->iIntervall ;
     }
-	
+
     function SetFont($aFFamily,$aFStyle=FS_NORMAL,$aFSize=10) {
-	$this->iFFamily = $aFFamily;
-	$this->iFStyle	 = $aFStyle;
-	$this->iFSize	 = $aFSize;
+        $this->iFFamily = $aFFamily;
+        $this->iFStyle  = $aFStyle;
+        $this->iFSize  = $aFSize;
     }
 
     function SetFontColor($aColor) {
-	$this->iTextColor = $aColor;
+        $this->iTextColor = $aColor;
     }
-	
+
     function GetFontHeight($aImg) {
-	$aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-	return $aImg->GetFontHeight();
+        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
+        return $aImg->GetFontHeight();
     }
 
     function GetFontWidth($aImg) {
-	$aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-	return $aImg->GetFontWidth();
+        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
+        return $aImg->GetFontWidth();
     }
 
     function GetStrWidth($aImg,$aStr) {
-	$aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
-	return $aImg->GetTextWidth($aStr);
+        $aImg->SetFont($this->iFFamily,$this->iFStyle,$this->iFSize);
+        return $aImg->GetTextWidth($aStr);
     }
-	
+
     function SetStyle($aStyle) {
-	$this->iStyle = $aStyle;
+        $this->iStyle = $aStyle;
     }
-	
+
     function SetBackgroundColor($aColor) {
-	$this->iBackgroundColor=$aColor;
+        $this->iBackgroundColor=$aColor;
     }
 
     function SetFrameWeight($aWeight) {
-	$this->iFrameWeight=$aWeight;
+        $this->iFrameWeight=$aWeight;
     }
 
     function SetFrameColor($aColor) {
-	$this->iFrameColor=$aColor;
+        $this->iFrameColor=$aColor;
     }
-	
+
     // Only used by day scale
     function SetWeekendColor($aColor) {
-	$this->iWeekendBackgroundColor=$aColor;
+        $this->iWeekendBackgroundColor=$aColor;
     }
-	
+
     // Only used by day scale
     function SetSundayFontColor($aColor) {
-	$this->iSundayTextColor=$aColor;
+        $this->iSundayTextColor=$aColor;
     }
-	
+
     function SetTitleVertMargin($aMargin) {
-	$this->iTitleVertMargin=$aMargin;
+        $this->iTitleVertMargin=$aMargin;
     }
-	
+
     function SetLabelFormatString($aStr) {
-	$this->iLabelFormStr=$aStr;
+        $this->iLabelFormStr=$aStr;
     }
 
     function SetFormatString($aStr) {
-	$this->SetLabelFormatString($aStr);
+        $this->SetLabelFormatString($aStr);
     }
 
 
@@ -1803,181 +1939,182 @@ function SetFormatString($aStr) {
 // date headers (days, week, etc).
 //===================================================
 class GanttScale {
-    var $minute,$hour,$day,$week,$month,$year;
-    var $divider,$dividerh,$tableTitle;
-    var $iStartDate=-1,$iEndDate=-1;
+    public $minute,$hour,$day,$week,$month,$year;
+    public $divider,$dividerh,$tableTitle;
+    public $iStartDate=-1,$iEndDate=-1;
     // Number of gantt bar position (n.b not necessariliy the same as the number of bars)
     // we could have on bar in position 1, and one bar in position 5 then there are two
     // bars but the number of bar positions is 5
-    var $iVertLines=-1;	
+    public $actinfo;
+    public $iTopPlotMargin=10,$iBottomPlotMargin=15;
+    public $iVertLines=-1;
+    public $iVertHeaderSize=-1;
     // The width of the labels (defaults to the widest of all labels)
-    var $iLabelWidth;	
+    private $iLabelWidth;
     // Out image to stroke the scale to
-    var $iImg;	
-    var $iTableHeaderBackgroundColor="white",$iTableHeaderFrameColor="black";
-    var $iTableHeaderFrameWeight=1;
-    var $iAvailableHeight=-1,$iVertSpacing=-1,$iVertHeaderSize=-1;
-    var $iDateLocale;
-    var $iVertLayout=GANTT_EVEN;
-    var $iTopPlotMargin=10,$iBottomPlotMargin=15;
-    var $iUsePlotWeekendBackground=true;
-    var $iWeekStart = 1;	// Default to have weekends start on Monday
-    var $actinfo;
-	
-//---------------
-// CONSTRUCTOR	
-    function GanttScale(&$aImg) {
-	$this->iImg = &$aImg;		
-	$this->iDateLocale = new DateLocale();
-
-	$this->minute = new HeaderProperty();
-	$this->minute->SetIntervall(15);
-	$this->minute->SetLabelFormatString('i');
-	$this->minute->SetFont(FF_FONT0);
-	$this->minute->grid->SetColor("gray");
-
-	$this->hour = new HeaderProperty();
-	$this->hour->SetFont(FF_FONT0);
-	$this->hour->SetIntervall(6);
-	$this->hour->SetStyle(HOURSTYLE_HM24);
-	$this->hour->SetLabelFormatString('H:i');
-	$this->hour->grid->SetColor("gray");
-
-	$this->day = new HeaderProperty();
-	$this->day->grid->SetColor("gray");
-	$this->day->SetLabelFormatString('l');
-
-	$this->week = new HeaderProperty();
-	$this->week->SetLabelFormatString("w%d");
-	$this->week->SetFont(FF_FONT1);
-
-	$this->month = new HeaderProperty();
-	$this->month->SetFont(FF_FONT1,FS_BOLD);
-
-	$this->year = new HeaderProperty();
-	$this->year->SetFont(FF_FONT1,FS_BOLD);		
-		
-	$this->divider=new LineProperty();
-	$this->dividerh=new LineProperty();		
-	$this->dividerh->SetWeight(2);
-	$this->divider->SetWeight(6);
-	$this->divider->SetColor('gray');
-	$this->divider->SetStyle('fancy');
-
-	$this->tableTitle=new TextProperty();
-	$this->tableTitle->Show(false);
-	$this->actinfo = new GanttActivityInfo();
-    }
-	
-//---------------
-// PUBLIC METHODS	
+    private $iImg;
+    private $iTableHeaderBackgroundColor="white",$iTableHeaderFrameColor="black";
+    private $iTableHeaderFrameWeight=1;
+    private $iAvailableHeight=-1,$iVertSpacing=-1;
+    private $iDateLocale;
+    private $iVertLayout=GANTT_EVEN;
+    private $iUsePlotWeekendBackground=true;
+    private $iWeekStart = 1; // Default to have weekends start on Monday
+
+    //---------------
+    // CONSTRUCTOR
+    function __construct($aImg) {
+        $this->iImg = $aImg;
+        $this->iDateLocale = new DateLocale();
+
+        $this->minute = new HeaderProperty();
+        $this->minute->SetIntervall(15);
+        $this->minute->SetLabelFormatString('i');
+        $this->minute->SetFont(FF_FONT0);
+        $this->minute->grid->SetColor("gray");
+
+        $this->hour = new HeaderProperty();
+        $this->hour->SetFont(FF_FONT0);
+        $this->hour->SetIntervall(6);
+        $this->hour->SetStyle(HOURSTYLE_HM24);
+        $this->hour->SetLabelFormatString('H:i');
+        $this->hour->grid->SetColor("gray");
+
+        $this->day = new HeaderProperty();
+        $this->day->grid->SetColor("gray");
+        $this->day->SetLabelFormatString('l');
+
+        $this->week = new HeaderProperty();
+        $this->week->SetLabelFormatString("w%d");
+        $this->week->SetFont(FF_FONT1);
+
+        $this->month = new HeaderProperty();
+        $this->month->SetFont(FF_FONT1,FS_BOLD);
+
+        $this->year = new HeaderProperty();
+        $this->year->SetFont(FF_FONT1,FS_BOLD);
+
+        $this->divider=new LineProperty();
+        $this->dividerh=new LineProperty();
+        $this->dividerh->SetWeight(2);
+        $this->divider->SetWeight(6);
+        $this->divider->SetColor('gray');
+        $this->divider->SetStyle('fancy');
+
+        $this->tableTitle=new TextProperty();
+        $this->tableTitle->Show(false);
+        $this->actinfo = new GanttActivityInfo();
+    }
+
+    //---------------
+    // PUBLIC METHODS
     // Specify what headers should be visible
     function ShowHeaders($aFlg) {
-	$this->day->Show($aFlg & GANTT_HDAY);
-	$this->week->Show($aFlg & GANTT_HWEEK);
-	$this->month->Show($aFlg & GANTT_HMONTH);
-	$this->year->Show($aFlg & GANTT_HYEAR);
-	$this->hour->Show($aFlg & GANTT_HHOUR);
-	$this->minute->Show($aFlg & GANTT_HMIN);
-
-	// Make some default settings of gridlines whihc makes sense
-	if( $aFlg & GANTT_HWEEK ) {
-	    $this->month->grid->Show(false);
-	    $this->year->grid->Show(false);
-	}
-	if( $aFlg & GANTT_HHOUR ) {
-	    $this->day->grid->SetColor("black");
-	}
+        $this->day->Show($aFlg & GANTT_HDAY);
+        $this->week->Show($aFlg & GANTT_HWEEK);
+        $this->month->Show($aFlg & GANTT_HMONTH);
+        $this->year->Show($aFlg & GANTT_HYEAR);
+        $this->hour->Show($aFlg & GANTT_HHOUR);
+        $this->minute->Show($aFlg & GANTT_HMIN);
+
+        // Make some default settings of gridlines whihc makes sense
+        if( $aFlg & GANTT_HWEEK ) {
+            $this->month->grid->Show(false);
+            $this->year->grid->Show(false);
+        }
+        if( $aFlg & GANTT_HHOUR ) {
+            $this->day->grid->SetColor("black");
+        }
     }
-	
+
     // Should the weekend background stretch all the way down in the plotarea
     function UseWeekendBackground($aShow) {
-	$this->iUsePlotWeekendBackground = $aShow;
+        $this->iUsePlotWeekendBackground = $aShow;
     }
-	
+
     // Have a range been specified?
     function IsRangeSet() {
-	return $this->iStartDate!=-1 && $this->iEndDate!=-1;
+        return $this->iStartDate!=-1 && $this->iEndDate!=-1;
     }
-	
+
     // Should the layout be from top or even?
     function SetVertLayout($aLayout) {
-	$this->iVertLayout = $aLayout;
+        $this->iVertLayout = $aLayout;
     }
-	
+
     // Which locale should be used?
     function SetDateLocale($aLocale) {
-	$this->iDateLocale->Set($aLocale);
+        $this->iDateLocale->Set($aLocale);
     }
-	
+
     // Number of days we are showing
     function GetNumberOfDays() {
-	return round(($this->iEndDate-$this->iStartDate)/SECPERDAY);
+        return round(($this->iEndDate-$this->iStartDate)/SECPERDAY);
     }
-	
+
     // The width of the actual plot area
     function GetPlotWidth() {
-	$img=$this->iImg;
-	return $img->width - $img->left_margin - $img->right_margin;
+        $img=$this->iImg;
+        return $img->width - $img->left_margin - $img->right_margin;
     }
 
     // Specify the width of the titles(labels) for the activities
     // (This is by default set to the minimum width enought for the
     // widest title)
     function SetLabelWidth($aLabelWidth) {
-	$this->iLabelWidth=$aLabelWidth;
+        $this->iLabelWidth=$aLabelWidth;
     }
 
-	// Which day should the week start?
-	// 0==Sun, 1==Monday, 2==Tuesday etc
+    // Which day should the week start?
+    // 0==Sun, 1==Monday, 2==Tuesday etc
     function SetWeekStart($aStartDay) {
-	$this->iWeekStart = $aStartDay % 7;
-	
-	//Recalculate the startday since this will change the week start
-	$this->SetRange($this->iStartDate,$this->iEndDate);
+        $this->iWeekStart = $aStartDay % 7;
+
+        //Recalculate the startday since this will change the week start
+        $this->SetRange($this->iStartDate,$this->iEndDate);
     }
 
     // Do we show min scale?
     function IsDisplayMinute() {
-	return $this->minute->iShowLabels;
+        return $this->minute->iShowLabels;
     }
 
     // Do we show day scale?
     function IsDisplayHour() {
-	return $this->hour->iShowLabels;
+        return $this->hour->iShowLabels;
     }
 
-	
+
     // Do we show day scale?
     function IsDisplayDay() {
-	return $this->day->iShowLabels;
+        return $this->day->iShowLabels;
     }
-	
+
     // Do we show week scale?
     function IsDisplayWeek() {
-	return $this->week->iShowLabels;
+        return $this->week->iShowLabels;
     }
-	
+
     // Do we show month scale?
     function IsDisplayMonth() {
-	return $this->month->iShowLabels;
+        return $this->month->iShowLabels;
     }
-	
+
     // Do we show year scale?
     function IsDisplayYear() {
-	return $this->year->iShowLabels;
+        return $this->year->iShowLabels;
     }
 
     // Specify spacing (in percent of bar height) between activity bars
     function SetVertSpacing($aSpacing) {
-	$this->iVertSpacing = $aSpacing;
+        $this->iVertSpacing = $aSpacing;
     }
 
     // Specify scale min and max date either as timestamp or as date strings
     // Always round to the nearest week boundary
     function SetRange($aMin,$aMax) {
-	$this->iStartDate = $this->NormalizeDate($aMin);
-	$this->iEndDate = $this->NormalizeDate($aMax);	
+        $this->iStartDate = $this->NormalizeDate($aMin);
+        $this->iEndDate = $this->NormalizeDate($aMax);
     }
 
 
@@ -1985,878 +2122,895 @@ function SetRange($aMin,$aMax) {
     // of the week taking the specified week start day into account.
     function AdjustStartEndDay() {
 
-	if( !($this->IsDisplayYear() ||$this->IsDisplayMonth() || $this->IsDisplayWeek()) ) {
-	    // Don't adjust
-	    return;
-	}
-
-	// Get day in week for start and ending date (Sun==0)
-	$ds=strftime("%w",$this->iStartDate);
-	$de=strftime("%w",$this->iEndDate);	
-	
-	// We want to start on iWeekStart day. But first we subtract a week
-	// if the startdate is "behind" the day the week start at. 
-	// This way we ensure that the given start date is always included 
-	// in the range. If we don't do this the nearest correct weekday in the week 
-	// to start at might be later than the start date.
-	if( $ds < $this->iWeekStart )
-	    $d = strtotime('-7 day',$this->iStartDate);
-	else
-	    $d = $this->iStartDate;
-	$adjdate = strtotime(($this->iWeekStart-$ds).' day',$d /*$this->iStartDate*/ );
-	$this->iStartDate = $adjdate;
-	
-	// We want to end on the last day of the week
-	$preferredEndDay = ($this->iWeekStart+6)%7;
-	if( $preferredEndDay != $de ) { 
-	    // Solve equivalence eq:    $de + x ~ $preferredDay (mod 7)
-	    $adj = (7+($preferredEndDay - $de)) % 7;
-	    $adjdate = strtotime("+$adj day",$this->iEndDate);
-	    $this->iEndDate = $adjdate;	
-	}	
-    }
-
-    // Specify background for the table title area (upper left corner of the table)	
+        if( !($this->IsDisplayYear() ||$this->IsDisplayMonth() || $this->IsDisplayWeek()) ) {
+            // Don't adjust
+            return;
+        }
+
+        // Get day in week for start and ending date (Sun==0)
+        $ds=strftime("%w",$this->iStartDate);
+        $de=strftime("%w",$this->iEndDate);
+
+        // We want to start on iWeekStart day. But first we subtract a week
+        // if the startdate is "behind" the day the week start at.
+        // This way we ensure that the given start date is always included
+        // in the range. If we don't do this the nearest correct weekday in the week
+        // to start at might be later than the start date.
+        if( $ds < $this->iWeekStart )
+        $d = strtotime('-7 day',$this->iStartDate);
+        else
+        $d = $this->iStartDate;
+        $adjdate = strtotime(($this->iWeekStart-$ds).' day',$d /*$this->iStartDate*/ );
+        $this->iStartDate = $adjdate;
+
+        // We want to end on the last day of the week
+        $preferredEndDay = ($this->iWeekStart+6)%7;
+        if( $preferredEndDay != $de ) {
+            // Solve equivalence eq:    $de + x ~ $preferredDay (mod 7)
+            $adj = (7+($preferredEndDay - $de)) % 7;
+            $adjdate = strtotime("+$adj day",$this->iEndDate);
+            $this->iEndDate = $adjdate;
+        }
+    }
+
+    // Specify background for the table title area (upper left corner of the table)
     function SetTableTitleBackground($aColor) {
-	$this->iTableHeaderBackgroundColor = $aColor;
+        $this->iTableHeaderBackgroundColor = $aColor;
     }
 
-///////////////////////////////////////
-// PRIVATE Methods
-	
+    ///////////////////////////////////////
+    // PRIVATE Methods
+
     // Determine the height of all the scale headers combined
     function GetHeaderHeight() {
-	$img=$this->iImg;
-	$height=1;
-	if( $this->minute->iShowLabels ) {
-	    $height += $this->minute->GetFontHeight($img);
-	    $height += $this->minute->iTitleVertMargin;
-	}
-	if( $this->hour->iShowLabels ) {
-	    $height += $this->hour->GetFontHeight($img);
-	    $height += $this->hour->iTitleVertMargin;
-	}
-	if( $this->day->iShowLabels ) {
-	    $height += $this->day->GetFontHeight($img);
-	    $height += $this->day->iTitleVertMargin;
-	}
-	if( $this->week->iShowLabels ) {
-	    $height += $this->week->GetFontHeight($img);
-	    $height += $this->week->iTitleVertMargin;
-	}
-	if( $this->month->iShowLabels ) {
-	    $height += $this->month->GetFontHeight($img);
-	    $height += $this->month->iTitleVertMargin;
-	}
-	if( $this->year->iShowLabels ) {
-	    $height += $this->year->GetFontHeight($img);
-	    $height += $this->year->iTitleVertMargin;
-	}
-	return $height;
+        $img=$this->iImg;
+        $height=1;
+        if( $this->minute->iShowLabels ) {
+            $height += $this->minute->GetFontHeight($img);
+            $height += $this->minute->iTitleVertMargin;
+        }
+        if( $this->hour->iShowLabels ) {
+            $height += $this->hour->GetFontHeight($img);
+            $height += $this->hour->iTitleVertMargin;
+        }
+        if( $this->day->iShowLabels ) {
+            $height += $this->day->GetFontHeight($img);
+            $height += $this->day->iTitleVertMargin;
+        }
+        if( $this->week->iShowLabels ) {
+            $height += $this->week->GetFontHeight($img);
+            $height += $this->week->iTitleVertMargin;
+        }
+        if( $this->month->iShowLabels ) {
+            $height += $this->month->GetFontHeight($img);
+            $height += $this->month->iTitleVertMargin;
+        }
+        if( $this->year->iShowLabels ) {
+            $height += $this->year->GetFontHeight($img);
+            $height += $this->year->iTitleVertMargin;
+        }
+        return $height;
     }
-	
+
     // Get width (in pixels) for a single day
     function GetDayWidth() {
-	return ($this->GetPlotWidth()-$this->iLabelWidth+1)/$this->GetNumberOfDays();	
+        return ($this->GetPlotWidth()-$this->iLabelWidth+1)/$this->GetNumberOfDays();
     }
 
     // Get width (in pixels) for a single hour
     function GetHourWidth() {
-	return $this->GetDayWidth() / 24 ;
+        return $this->GetDayWidth() / 24 ;
     }
 
     function GetMinuteWidth() {
-	return $this->GetHourWidth() / 60 ;
+        return $this->GetHourWidth() / 60 ;
     }
 
     // Nuber of days in a year
     function GetNumDaysInYear($aYear) {
-	if( $this->IsLeap($aYear) )
-	    return 366;
-	else
-	    return 365;
-    }
-	
-    // Get week number 
-    function GetWeekNbr($aDate) {
-	// We can't use the internal strftime() since it gets the weeknumber
-	// wrong since it doesn't follow ISO on all systems since this is
-	// system linrary dependent.
-	// Even worse is that this works differently if we are on a Windows
-	// or UNIX box (it even differs between UNIX boxes how strftime()
-	// is natively implemented)
-	//
-	// Credit to Nicolas Hoizey <nhoizey@phpheaven.net> for this elegant
-	// version of Week Nbr calculation. 
-
-	$day = $this->NormalizeDate($aDate);
-		
-	/*-------------------------------------------------------------------------
-	  According to ISO-8601 :
-	  "Week 01 of a year is per definition the first week that has the Thursday in this year,
-	  which is equivalent to the week that contains the fourth day of January.
-	  In other words, the first week of a new year is the week that has the majority of its
-	  days in the new year."
-		  
-	  Be carefull, with PHP, -3 % 7 = -3, instead of 4 !!!
-		  
-	  day of year             = date("z", $day) + 1
-	  offset to thursday      = 3 - (date("w", $day) + 6) % 7
-	  first thursday of year  = 1 + (11 - date("w", mktime(0, 0, 0, 1, 1, date("Y", $day)))) % 7
-	  week number             = (thursday's day of year - first thursday's day of year) / 7 + 1
-	  ---------------------------------------------------------------------------*/
-		 
-	$thursday = $day + 60 * 60 * 24 * (3 - (date("w", $day) + 6) % 7);              // take week's thursday
-	$week = 1 + (date("z", $thursday) - (11 - date("w", mktime(0, 0, 0, 1, 1, date("Y", $thursday)))) % 7) / 7;
-		  
-	return $week;
-    }
-	
+        if( $this->IsLeap($aYear) )
+        return 366;
+        else
+        return 365;
+    }
+
+    // Get week number
+    function GetWeekNbr($aDate,$aSunStart=true) {
+        // We can't use the internal strftime() since it gets the weeknumber
+        // wrong since it doesn't follow ISO on all systems since this is
+        // system linrary dependent.
+        // Even worse is that this works differently if we are on a Windows
+        // or UNIX box (it even differs between UNIX boxes how strftime()
+        // is natively implemented)
+        //
+        // Credit to Nicolas Hoizey <nhoizey@phpheaven.net> for this elegant
+        // version of Week Nbr calculation.
+
+        $day = $this->NormalizeDate($aDate);
+        if( $aSunStart )
+        $day += 60*60*24;
+
+        /*-------------------------------------------------------------------------
+         According to ISO-8601 :
+         "Week 01 of a year is per definition the first week that has the Thursday in this year,
+         which is equivalent to the week that contains the fourth day of January.
+         In other words, the first week of a new year is the week that has the majority of its
+         days in the new year."
+
+         Be carefull, with PHP, -3 % 7 = -3, instead of 4 !!!
+
+         day of year             = date("z", $day) + 1
+         offset to thursday      = 3 - (date("w", $day) + 6) % 7
+         first thursday of year  = 1 + (11 - date("w", mktime(0, 0, 0, 1, 1, date("Y", $day)))) % 7
+         week number             = (thursday's day of year - first thursday's day of year) / 7 + 1
+         ---------------------------------------------------------------------------*/
+
+        $thursday = $day + 60 * 60 * 24 * (3 - (date("w", $day) + 6) % 7);              // take week's thursday
+        $week = 1 + (date("z", $thursday) - (11 - date("w", mktime(0, 0, 0, 1, 1, date("Y", $thursday)))) % 7) / 7;
+
+        return $week;
+    }
+
     // Is year a leap year?
     function IsLeap($aYear) {
-	// Is the year a leap year?
-	//$year = 0+date("Y",$aDate);
-	if( $aYear % 4 == 0)
-	    if( !($aYear % 100 == 0) || ($aYear % 400 == 0) )
-		return true;
-	return false;
+        // Is the year a leap year?
+        //$year = 0+date("Y",$aDate);
+        if( $aYear % 4 == 0)
+        if( !($aYear % 100 == 0) || ($aYear % 400 == 0) )
+        return true;
+        return false;
     }
 
     // Get current year
     function GetYear($aDate) {
-	return 0+Date("Y",$aDate);
+        return 0+Date("Y",$aDate);
     }
-	
+
     // Return number of days in a year
     function GetNumDaysInMonth($aMonth,$aYear) {
-	$days=array(31,28,31,30,31,30,31,31,30,31,30,31);
-	$daysl=array(31,29,31,30,31,30,31,31,30,31,30,31);
-	if( $this->IsLeap($aYear))
-	    return $daysl[$aMonth];
-	else
-	    return $days[$aMonth];
-    }
-	
+        $days=array(31,28,31,30,31,30,31,31,30,31,30,31);
+        $daysl=array(31,29,31,30,31,30,31,31,30,31,30,31);
+        if( $this->IsLeap($aYear))
+        return $daysl[$aMonth];
+        else
+        return $days[$aMonth];
+    }
+
     // Get day in month
     function GetMonthDayNbr($aDate) {
-	return 0+strftime("%d",$aDate);
+        return 0+strftime("%d",$aDate);
     }
 
     // Get day in year
     function GetYearDayNbr($aDate) {
-	return 0+strftime("%j",$aDate);
+        return 0+strftime("%j",$aDate);
     }
-	
+
     // Get month number
     function GetMonthNbr($aDate) {
-	return 0+strftime("%m",$aDate);
+        return 0+strftime("%m",$aDate);
     }
-	
-    // Translate a date to screen coordinates	(horizontal scale)
+
+    // Translate a date to screen coordinates (horizontal scale)
     function TranslateDate($aDate) {
-	//
-	// In order to handle the problem with Daylight savings time
-	// the scale written with equal number of seconds per day beginning
-	// with the start date. This means that we "cement" the state of
-	// DST as it is in the start date. If later the scale includes the
-	// switchover date (depends on the locale) we need to adjust back
-	// if the date we try to translate has a different DST status since
-	// we would otherwise be off by one hour.
-	$aDate = $this->NormalizeDate($aDate);
-	$tmp = localtime($aDate);
-	$cloc = $tmp[8];
-	$tmp = localtime($this->iStartDate);
-	$sloc = $tmp[8];
-	$offset = 0;
-	if( $sloc != $cloc) {
-	    if( $sloc ) 
-		$offset = 3600;
-	    else
-		$offset = -3600;
-	}
-	$img=$this->iImg;		
-	return ($aDate-$this->iStartDate-$offset)/SECPERDAY*$this->GetDayWidth()+$img->left_margin+$this->iLabelWidth;;
-    }
-
-    // Get screen coordinatesz for the vertical position for a bar		
-    function TranslateVertPos($aPos) {
-	$img=$this->iImg;
-	$ph=$this->iAvailableHeight;
-	if( $aPos > $this->iVertLines ) 
-	    JpGraphError::Raise("Illegal vertical position $aPos");
-	if( $this->iVertLayout == GANTT_EVEN ) {
-	    // Position the top bar at 1 vert spacing from the scale
-	    return round($img->top_margin + $this->iVertHeaderSize +  ($aPos+1)*$this->iVertSpacing);
-	}
-	else {
-	    // position the top bar at 1/2 a vert spacing from the scale
-	    return round($img->top_margin + $this->iVertHeaderSize  + $this->iTopPlotMargin + ($aPos+1)*$this->iVertSpacing);		
-	}
+        //
+        // In order to handle the problem with Daylight savings time
+        // the scale written with equal number of seconds per day beginning
+        // with the start date. This means that we "cement" the state of
+        // DST as it is in the start date. If later the scale includes the
+        // switchover date (depends on the locale) we need to adjust back
+        // if the date we try to translate has a different DST status since
+        // we would otherwise be off by one hour.
+        $aDate = $this->NormalizeDate($aDate);
+        $tmp = localtime($aDate);
+        $cloc = $tmp[8];
+        $tmp = localtime($this->iStartDate);
+        $sloc = $tmp[8];
+        $offset = 0;
+        if( $sloc != $cloc) {
+            if( $sloc )
+            $offset = 3600;
+            else
+            $offset = -3600;
+        }
+        $img=$this->iImg;
+        return ($aDate-$this->iStartDate-$offset)/SECPERDAY*$this->GetDayWidth()+$img->left_margin+$this->iLabelWidth;;
+    }
+
+    // Get screen coordinatesz for the vertical position for a bar
+    function TranslateVertPos($aPos,$atTop=false) {
+        $img=$this->iImg;
+        if( $aPos > $this->iVertLines )
+        	JpGraphError::RaiseL(6015,$aPos);
+        // 'Illegal vertical position %d'
+        if( $this->iVertLayout == GANTT_EVEN ) {
+            // Position the top bar at 1 vert spacing from the scale
+            $pos =  round($img->top_margin + $this->iVertHeaderSize +  ($aPos+1)*$this->iVertSpacing);
+        }
+        else {
+            // position the top bar at 1/2 a vert spacing from the scale
+            $pos = round($img->top_margin + $this->iVertHeaderSize  + $this->iTopPlotMargin + ($aPos+1)*$this->iVertSpacing);
+        }
+
+        if( $atTop )
+            $pos -= $this->iVertSpacing;
+
+        return $pos;
     }
-	
+
     // What is the vertical spacing?
     function GetVertSpacing() {
-	return $this->iVertSpacing;
+        return $this->iVertSpacing;
     }
-					
+
     // Convert a date to timestamp
     function NormalizeDate($aDate) {
-	if( $aDate === false ) return false; 
-	if( is_string($aDate) )
-	    return strtotime($aDate);
-	elseif( is_int($aDate) || is_float($aDate) )
-	    return $aDate;
-	else
-	    JpGraphError::Raise("Unknown date format in GanttScale ($aDate).");
+        if( $aDate === false ) return false;
+        if( is_string($aDate) ) {
+            $t = strtotime($aDate);
+            if( $t === FALSE || $t === -1 ) {
+                JpGraphError::RaiseL(6016,$aDate);
+                //("Date string ($aDate) specified for Gantt activity can not be interpretated. Please make sure it is a valid time string, e.g. 2005-04-23 13:30");
+            }
+            return $t;
+        }
+        elseif( is_int($aDate) || is_float($aDate) )
+            return $aDate;
+        else
+            JpGraphError::RaiseL(6017,$aDate);
+        //Unknown date format in GanttScale ($aDate).");
     }
 
-    
+
     // Convert a time string to minutes
 
     function TimeToMinutes($aTimeString) {
-	// Split in hours and minutes
-	$pos=strpos($aTimeString,':');
-	$minint=60;
-	if( $pos === false ) {
-	    $hourint = $aTimeString;
-	    $minint = 0;
-	}
-	else {
-	    $hourint = floor(substr($aTimeString,0,$pos));
-	    $minint = floor(substr($aTimeString,$pos+1));
-	}
-	$minint += 60 * $hourint;
-	return $minint;
-    }
-
-    // Stroke the day scale (including gridlines)			
+        // Split in hours and minutes
+        $pos=strpos($aTimeString,':');
+        $minint=60;
+        if( $pos === false ) {
+            $hourint = $aTimeString;
+            $minint = 0;
+        }
+        else {
+            $hourint = floor(substr($aTimeString,0,$pos));
+            $minint = floor(substr($aTimeString,$pos+1));
+        }
+        $minint += 60 * $hourint;
+        return $minint;
+    }
+
+    // Stroke the day scale (including gridlines)
     function StrokeMinutes($aYCoord,$getHeight=false) {
-	$img=$this->iImg;	
-	$xt=$img->left_margin+$this->iLabelWidth;
-	$yt=$aYCoord+$img->top_margin;		
-	if( $this->minute->iShowLabels ) {
-	    $img->SetFont($this->minute->iFFamily,$this->minute->iFStyle,$this->minute->iFSize);
-	    $yb = $yt + $img->GetFontHeight() + 
-		  $this->minute->iTitleVertMargin + $this->minute->iFrameWeight;
-	    if( $getHeight ) {
-		return $yb - $img->top_margin;
-	    }
-	    $xb = $img->width-$img->right_margin+1;
-	    $img->SetColor($this->minute->iBackgroundColor);
-	    $img->FilledRectangle($xt,$yt,$xb,$yb);
-
-	    $x = $xt;   
-	    $img->SetTextAlign("center");
-	    $day = date('w',$this->iStartDate);
-	    $minint = $this->minute->GetIntervall() ;
-	    
-	    if( 60 % $minint !== 0 ) { 
-                JpGraphError::Raise('Intervall for minutes must divide the hour evenly, e.g. 1,5,10,12,15,20,30 etc You have specified an intervall of '.$minint.' minutes.');
-            } 
-
-
-	    $n = 60 / $minint;
-	    $datestamp = $this->iStartDate;
-		/*echo "GetPlotWidth: ".$this->GetPlotWidth()."<br>";
-		
-		echo ($this->GetPlotWidth()-$this->iLabelWidth+1)/$this->GetNumberOfDays()." $$ ".$this->GetNumberOfDays()."<br>";	
-		//--  function GetHourWidth() {
-		echo $this->GetDayWidth()." ##<br>";
-		
-		echo $this->GetHourWidth()."--$n--$minint-$datestamp ---";
-		*/
-	    $width = $this->GetHourWidth() / $n ;
-	    if( $width < 8 ) {
-		// TO small width to draw minute scale
-		JpGraphError::Raise('The available width ('.$width.') for minutes are to small for this scale to be displayed. Please use auto-sizing or increase the width of the graph.');
-	    }
-
-	    $nh = ceil(24*60 / $this->TimeToMinutes($this->hour->GetIntervall()) );
-	    $nd = $this->GetNumberOfDays();
-	    // Convert to intervall to seconds
-	    $minint *= 60;
-	    for($j=0; $j < $nd; ++$j, $day += 1, $day %= 7) {
-		for( $k=0; $k < $nh; ++$k ) {
-		    for($i=0; $i < $n ;++$i, $x+=$width, $datestamp += $minint ) {   
-			if( $day==6 || $day==0 ) {
-			
-			    $img->PushColor($this->day->iWeekendBackgroundColor);
-			    if( $this->iUsePlotWeekendBackground )
-				$img->FilledRectangle($x,$yt+$this->day->iFrameWeight,$x+$width,$img->height-$img->bottom_margin);						
-			    else
-				$img->FilledRectangle($x,$yt+$this->day->iFrameWeight,$x+$width,$yb-$this->day->iFrameWeight);
-			    $img->PopColor();
-
-			}
-
-			if( $day==0 ) 
-			    $img->SetColor($this->day->iSundayTextColor);
-			else
-			    $img->SetColor($this->day->iTextColor);
-
-			switch( $this->minute->iStyle ) {
-			    case MINUTESTYLE_CUSTOM:
-				$txt = date($this->minute->iLabelFormStr,$datestamp);
-				break;
-			    case MINUTESTYLE_MM:
-			    default:
-				// 15
-				$txt = date('i',$datestamp);
-				break;
-			}
-			$img->StrokeText(round($x+$width/2),round($yb-$this->minute->iTitleVertMargin),$txt);
-
-			// FIXME: The rounding problem needs to be solved properly ...
-			//
-			// Fix a rounding problem the wrong way ..
-			// If we also have hour scale then don't draw the firsta or last
-			// gridline since that will be overwritten by the hour scale gridline if such exists.
-			// However, due to the propagation of rounding of the 'x+=width' term in the loop
-			// this might sometimes be one pixel of so we fix this by not drawing it.
-			// The proper way to fix it would be to re-calculate the scale for each step and
-			// not using the additive term.
-			if( !(($i == $n || $i==0) && $this->hour->iShowLabels && $this->hour->grid->iShow) ) {
-			    $img->SetColor($this->minute->grid->iColor);
-			    $img->Line($x,$yt,$x,$yb);
-			    $this->minute->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
-			}
-		    }		
-		}	
-	    }
-	    $img->SetColor($this->minute->iFrameColor);
-	    $img->SetLineWeight($this->minute->iFrameWeight);
-	    $img->Rectangle($xt,$yt,$xb,$yb);
-	    return $yb - $img->top_margin;
-	}
-	return $aYCoord;
-    }
-
-    // Stroke the day scale (including gridlines)			
+        $img=$this->iImg;
+        $xt=$img->left_margin+$this->iLabelWidth;
+        $yt=$aYCoord+$img->top_margin;
+        if( $this->minute->iShowLabels ) {
+            $img->SetFont($this->minute->iFFamily,$this->minute->iFStyle,$this->minute->iFSize);
+            $yb = $yt + $img->GetFontHeight() +
+            $this->minute->iTitleVertMargin + $this->minute->iFrameWeight;
+            if( $getHeight ) {
+                return $yb - $img->top_margin;
+            }
+            $xb = $img->width-$img->right_margin+1;
+            $img->SetColor($this->minute->iBackgroundColor);
+            $img->FilledRectangle($xt,$yt,$xb,$yb);
+
+            $x = $xt;
+            $img->SetTextAlign("center");
+            $day = date('w',$this->iStartDate);
+            $minint = $this->minute->GetIntervall() ;
+
+            if( 60 % $minint !== 0 ) {
+                JpGraphError::RaiseL(6018,$minint);
+                //'Intervall for minutes must divide the hour evenly, e.g. 1,5,10,12,15,20,30 etc You have specified an intervall of '.$minint.' minutes.');
+            }
+
+
+            $n = 60 / $minint;
+            $datestamp = $this->iStartDate;
+            $width = $this->GetHourWidth() / $n ;
+            if( $width < 8 ) {
+                // TO small width to draw minute scale
+                JpGraphError::RaiseL(6019,$width);
+                //('The available width ('.$width.') for minutes are to small for this scale to be displayed. Please use auto-sizing or increase the width of the graph.');
+            }
+
+            $nh = ceil(24*60 / $this->TimeToMinutes($this->hour->GetIntervall()) );
+            $nd = $this->GetNumberOfDays();
+            // Convert to intervall to seconds
+            $minint *= 60;
+            for($j=0; $j < $nd; ++$j, $day += 1, $day %= 7) {
+                for( $k=0; $k < $nh; ++$k ) {
+                    for($i=0; $i < $n ;++$i, $x+=$width, $datestamp += $minint ) {
+                        if( $day==6 || $day==0 ) {
+
+                            $img->PushColor($this->day->iWeekendBackgroundColor);
+                            if( $this->iUsePlotWeekendBackground )
+                            $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,$x+$width,$img->height-$img->bottom_margin);
+                            else
+                            $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,$x+$width,$yb-$this->day->iFrameWeight);
+                            $img->PopColor();
+
+                        }
+
+                        if( $day==0 )
+                        $img->SetColor($this->day->iSundayTextColor);
+                        else
+                        $img->SetColor($this->day->iTextColor);
+
+                        switch( $this->minute->iStyle ) {
+                            case MINUTESTYLE_CUSTOM:
+                                $txt = date($this->minute->iLabelFormStr,$datestamp);
+                                break;
+                            case MINUTESTYLE_MM:
+                            default:
+                                // 15
+                                $txt = date('i',$datestamp);
+                                break;
+                        }
+                        $img->StrokeText(round($x+$width/2),round($yb-$this->minute->iTitleVertMargin),$txt);
+
+                        // Fix a rounding problem the wrong way ..
+                        // If we also have hour scale then don't draw the firsta or last
+                        // gridline since that will be overwritten by the hour scale gridline if such exists.
+                        // However, due to the propagation of rounding of the 'x+=width' term in the loop
+                        // this might sometimes be one pixel of so we fix this by not drawing it.
+                        // The proper way to fix it would be to re-calculate the scale for each step and
+                        // not using the additive term.
+                        if( !(($i == $n || $i==0) && $this->hour->iShowLabels && $this->hour->grid->iShow) ) {
+                            $img->SetColor($this->minute->grid->iColor);
+                            $img->SetLineWeight($this->minute->grid->iWeight);
+                            $img->Line($x,$yt,$x,$yb);
+                            $this->minute->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
+                        }
+                    }
+                }
+            }
+            $img->SetColor($this->minute->iFrameColor);
+            $img->SetLineWeight($this->minute->iFrameWeight);
+            $img->Rectangle($xt,$yt,$xb,$yb);
+            return $yb - $img->top_margin;
+        }
+        return $aYCoord;
+    }
+
+    // Stroke the day scale (including gridlines)
     function StrokeHours($aYCoord,$getHeight=false) {
-	$img=$this->iImg;	
-	$xt=$img->left_margin+$this->iLabelWidth;
-	$yt=$aYCoord+$img->top_margin;		
-	if( $this->hour->iShowLabels ) {
-	    $img->SetFont($this->hour->iFFamily,$this->hour->iFStyle,$this->hour->iFSize);
-	    $yb = $yt + $img->GetFontHeight() + 
-		  $this->hour->iTitleVertMargin + $this->hour->iFrameWeight;
-	    if( $getHeight ) {
-		return $yb - $img->top_margin;
-	    }
-	    $xb = $img->width-$img->right_margin+1;
-	    $img->SetColor($this->hour->iBackgroundColor);
-	    $img->FilledRectangle($xt,$yt,$xb,$yb);
-
-	    $x = $xt;   
-	    $img->SetTextAlign("center");
-	    $tmp = $this->hour->GetIntervall() ;
-	    $minint = $this->TimeToMinutes($tmp);
-	    if( 1440 % $minint !== 0 ) { 
-                JpGraphError::Raise('Intervall for hours must divide the day evenly, e.g. 0:30, 1:00, 1:30, 4:00 etc. You have specified an intervall of '.$tmp);
-            } 
-
-	    $n = ceil(24*60 / $minint );
-	    $datestamp = $this->iStartDate;
-	    $day = date('w',$this->iStartDate);
-	    $doback = !$this->minute->iShowLabels;
-	    $width = $this->GetDayWidth() / $n ;
-	    for($j=0; $j < $this->GetNumberOfDays(); ++$j, $day += 1,$day %= 7) {
-		for($i=0; $i < $n ;++$i, $x+=$width) {   
-		    if( $day==6 || $day==0 ) {
-			
-			$img->PushColor($this->day->iWeekendBackgroundColor);
-			if( $this->iUsePlotWeekendBackground && $doback )
-			    $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,$x+$width,$img->height-$img->bottom_margin);						
-			else
-			    $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,$x+$width,$yb-$this->day->iFrameWeight);
-			$img->PopColor();
-
-		    }
-
-		    if( $day==0 ) 
-			$img->SetColor($this->day->iSundayTextColor);
-		    else
-			$img->SetColor($this->day->iTextColor);
-
-		    switch( $this->hour->iStyle ) {
-			case HOURSTYLE_HMAMPM:
-			    // 1:35pm
-			    $txt = date('g:ia',$datestamp);
-			    break;
-			case HOURSTYLE_H24:
-			    // 13
-			    $txt = date('H',$datestamp);
-			    break;
-			case HOURSTYLE_HAMPM:
-			    $txt = date('ga',$datestamp);
-			    break;
-			case HOURSTYLE_CUSTOM:
-			    $txt = date($this->hour->iLabelFormStr,$datestamp);
-			    break;
-			case HOURSTYLE_HM24:
-			default:
-			    $txt = date('H:i',$datestamp);
-			    break;
-		    }
-		    $img->StrokeText(round($x+$width/2),round($yb-$this->hour->iTitleVertMargin),$txt);
-		    $img->SetColor($this->hour->grid->iColor);
-		    $img->Line($x,$yt,$x,$yb);
-		    $this->hour->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
-		    //$datestamp += $minint*60
-		    $datestamp = mktime(date('H',$datestamp),date('i',$datestamp)+$minint,0,
-					date("m",$datestamp),date("d",$datestamp)+1,date("Y",$datestamp));
-		    
-		}			
-	    }
-	    $img->SetColor($this->hour->iFrameColor);
-	    $img->SetLineWeight($this->hour->iFrameWeight);
-	    $img->Rectangle($xt,$yt,$xb,$yb);
-	    return $yb - $img->top_margin;
-	}
-	return $aYCoord;
-    }
-
-
-    // Stroke the day scale (including gridlines)			
+        $img=$this->iImg;
+        $xt=$img->left_margin+$this->iLabelWidth;
+        $yt=$aYCoord+$img->top_margin;
+        if( $this->hour->iShowLabels ) {
+            $img->SetFont($this->hour->iFFamily,$this->hour->iFStyle,$this->hour->iFSize);
+            $yb = $yt + $img->GetFontHeight() +
+            $this->hour->iTitleVertMargin + $this->hour->iFrameWeight;
+            if( $getHeight ) {
+                return $yb - $img->top_margin;
+            }
+            $xb = $img->width-$img->right_margin+1;
+            $img->SetColor($this->hour->iBackgroundColor);
+            $img->FilledRectangle($xt,$yt,$xb,$yb);
+
+            $x = $xt;
+            $img->SetTextAlign("center");
+            $tmp = $this->hour->GetIntervall() ;
+            $minint = $this->TimeToMinutes($tmp);
+            if( 1440 % $minint !== 0 ) {
+                JpGraphError::RaiseL(6020,$tmp);
+                //('Intervall for hours must divide the day evenly, e.g. 0:30, 1:00, 1:30, 4:00 etc. You have specified an intervall of '.$tmp);
+            }
+
+            $n = ceil(24*60 / $minint );
+            $datestamp = $this->iStartDate;
+            $day = date('w',$this->iStartDate);
+            $doback = !$this->minute->iShowLabels;
+            $width = $this->GetDayWidth() / $n ;
+            for($j=0; $j < $this->GetNumberOfDays(); ++$j, $day += 1,$day %= 7) {
+                for($i=0; $i < $n ;++$i, $x+=$width) {
+                    if( $day==6 || $day==0 ) {
+
+                        $img->PushColor($this->day->iWeekendBackgroundColor);
+                        if( $this->iUsePlotWeekendBackground && $doback )
+                        $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,$x+$width,$img->height-$img->bottom_margin);
+                        else
+                        $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,$x+$width,$yb-$this->day->iFrameWeight);
+                        $img->PopColor();
+
+                    }
+
+                    if( $day==0 )
+                    $img->SetColor($this->day->iSundayTextColor);
+                    else
+                    $img->SetColor($this->day->iTextColor);
+
+                    switch( $this->hour->iStyle ) {
+                        case HOURSTYLE_HMAMPM:
+                            // 1:35pm
+                            $txt = date('g:ia',$datestamp);
+                            break;
+                        case HOURSTYLE_H24:
+                            // 13
+                            $txt = date('H',$datestamp);
+                            break;
+                        case HOURSTYLE_HAMPM:
+                            $txt = date('ga',$datestamp);
+                            break;
+                        case HOURSTYLE_CUSTOM:
+                            $txt = date($this->hour->iLabelFormStr,$datestamp);
+                            break;
+                        case HOURSTYLE_HM24:
+                        default:
+                            $txt = date('H:i',$datestamp);
+                            break;
+                    }
+                    $img->StrokeText(round($x+$width/2),round($yb-$this->hour->iTitleVertMargin),$txt);
+                    $img->SetColor($this->hour->grid->iColor);
+                    $img->SetLineWeight($this->hour->grid->iWeight);
+                    $img->Line($x,$yt,$x,$yb);
+                    $this->hour->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
+                    //$datestamp += $minint*60
+                    $datestamp = mktime(date('H',$datestamp),date('i',$datestamp)+$minint,0,
+                    date("m",$datestamp),date("d",$datestamp)+1,date("Y",$datestamp));
+
+                }
+            }
+            $img->SetColor($this->hour->iFrameColor);
+            $img->SetLineWeight($this->hour->iFrameWeight);
+            $img->Rectangle($xt,$yt,$xb,$yb);
+            return $yb - $img->top_margin;
+        }
+        return $aYCoord;
+    }
+
+
+    // Stroke the day scale (including gridlines)
     function StrokeDays($aYCoord,$getHeight=false) {
-	$img=$this->iImg;	
-	$daywidth=$this->GetDayWidth();
-	$xt=$img->left_margin+$this->iLabelWidth;
-	$yt=$aYCoord+$img->top_margin;		
-	if( $this->day->iShowLabels ) {
-	    $img->SetFont($this->day->iFFamily,$this->day->iFStyle,$this->day->iFSize);
-	    $yb=$yt + $img->GetFontHeight() + $this->day->iTitleVertMargin + $this->day->iFrameWeight;
-	    if( $getHeight ) {
-		return $yb - $img->top_margin;
-	    }
-	    $xb=$img->width-$img->right_margin+1;
-	    $img->SetColor($this->day->iBackgroundColor);
-	    $img->FilledRectangle($xt,$yt,$xb,$yb);
-
-	    $x = $xt;   
-	    $img->SetTextAlign("center");
-	    $day = date('w',$this->iStartDate);
-	    $datestamp = $this->iStartDate;
-	    
-	    $doback = !($this->hour->iShowLabels || $this->minute->iShowLabels);
-
-	    setlocale(LC_TIME,$this->iDateLocale->iLocale);
-	    
-	    for($i=0; $i < $this->GetNumberOfDays(); ++$i, $x+=$daywidth, $day += 1,$day %= 7) {
-		if( $day==6 || $day==0 ) {
-		    $img->SetColor($this->day->iWeekendBackgroundColor);
-		    if( $this->iUsePlotWeekendBackground && $doback)
-			$img->FilledRectangle($x,$yt+$this->day->iFrameWeight,
-					      $x+$daywidth,$img->height-$img->bottom_margin);	
-		    else
-			$img->FilledRectangle($x,$yt+$this->day->iFrameWeight,
-					      $x+$daywidth,$yb-$this->day->iFrameWeight);
-		}
-
-		$mn = strftime('%m',$datestamp);
-		if( $mn[0]=='0' ) 
-		    $mn = $mn[1];
-
-		switch( $this->day->iStyle ) {
-		    case DAYSTYLE_LONG:
-			// "Monday"
-			$txt = strftime('%A',$datestamp);
-			break;
-		    case DAYSTYLE_SHORT:
-			// "Mon"
-			$txt = strftime('%a',$datestamp);
-			break;
-		    case DAYSTYLE_SHORTDAYDATE1:
-			// "Mon 23/6"
-			$txt = strftime('%a %d/'.$mn,$datestamp);
-			break;
-		    case DAYSTYLE_SHORTDAYDATE2:
-			// "Mon 23 Jun"
-			$txt = strftime('%a %d %b',$datestamp);
-			break;
-		    case DAYSTYLE_SHORTDAYDATE3:
-			// "Mon 23 Jun 2003"
-			$txt = strftime('%a %d %b %Y',$datestamp);
-			break;
-		    case DAYSTYLE_LONGDAYDATE1:
-			// "Monday 23 Jun"
-			$txt = strftime('%A %d %b',$datestamp);
-			break;
-		    case DAYSTYLE_LONGDAYDATE2:
-			// "Monday 23 Jun 2003"
-			$txt = strftime('%A %d %b %Y',$datestamp);
-			break;
-		    case DAYSTYLE_SHORTDATE1:
-			// "23/6"
-			$txt = strftime('%d/'.$mn,$datestamp);
-			break;			
-		    case DAYSTYLE_SHORTDATE2:
-			// "23 Jun"
-			$txt = strftime('%d %b',$datestamp);
-			break;			
-		    case DAYSTYLE_SHORTDATE3:
-			// "Mon 23"
-			$txt = strftime('%a %d',$datestamp);
-			break;	
-		    case DAYSTYLE_SHORTDATE4:
-			// "23"
-			$txt = strftime('%d',$datestamp);
-			break;	
-		    case DAYSTYLE_CUSTOM:
-			// Custom format
-			$txt = strftime($this->day->iLabelFormStr,$datestamp);
-			break;	
-		    case DAYSTYLE_ONELETTER:
-		    default:
-			// "M"
-			$txt = strftime('%A',$datestamp);
-			$txt = strtoupper($txt[0]);
-			break;
-		}
-
-		if( $day==0 ) 
-		    $img->SetColor($this->day->iSundayTextColor);
-		else
-		    $img->SetColor($this->day->iTextColor);
-		$img->StrokeText(round($x+$daywidth/2+1),
-				 round($yb-$this->day->iTitleVertMargin),$txt);
-		$img->SetColor($this->day->grid->iColor);
-		$img->Line($x,$yt,$x,$yb);
-		$this->day->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
-		$datestamp = mktime(0,0,0,date("m",$datestamp),date("d",$datestamp)+1,date("Y",$datestamp));
-		//$datestamp += SECPERDAY;
-		
-	    }			
-	    $img->SetColor($this->day->iFrameColor);
-	    $img->SetLineWeight($this->day->iFrameWeight);
-	    $img->Rectangle($xt,$yt,$xb,$yb);
-	    return $yb - $img->top_margin;
-	}
-	return $aYCoord;
+        $img=$this->iImg;
+        $daywidth=$this->GetDayWidth();
+        $xt=$img->left_margin+$this->iLabelWidth;
+        $yt=$aYCoord+$img->top_margin;
+        if( $this->day->iShowLabels ) {
+            $img->SetFont($this->day->iFFamily,$this->day->iFStyle,$this->day->iFSize);
+            $yb=$yt + $img->GetFontHeight() + $this->day->iTitleVertMargin + $this->day->iFrameWeight;
+            if( $getHeight ) {
+                return $yb - $img->top_margin;
+            }
+            $xb=$img->width-$img->right_margin+1;
+            $img->SetColor($this->day->iBackgroundColor);
+            $img->FilledRectangle($xt,$yt,$xb,$yb);
+
+            $x = $xt;
+            $img->SetTextAlign("center");
+            $day = date('w',$this->iStartDate);
+            $datestamp = $this->iStartDate;
+
+            $doback = !($this->hour->iShowLabels || $this->minute->iShowLabels);
+
+            setlocale(LC_TIME,$this->iDateLocale->iLocale);
+
+            for($i=0; $i < $this->GetNumberOfDays(); ++$i, $x+=$daywidth, $day += 1,$day %= 7) {
+                if( $day==6 || $day==0 ) {
+                    $img->SetColor($this->day->iWeekendBackgroundColor);
+                    if( $this->iUsePlotWeekendBackground && $doback)
+                        $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,
+                                              $x+$daywidth,$img->height-$img->bottom_margin);
+                    else
+                        $img->FilledRectangle($x,$yt+$this->day->iFrameWeight,
+                    $x+$daywidth,$yb-$this->day->iFrameWeight);
+                }
+
+                $mn = strftime('%m',$datestamp);
+                if( $mn[0]=='0' )
+                    $mn = $mn[1];
+
+                switch( $this->day->iStyle ) {
+                    case DAYSTYLE_LONG:
+                        // "Monday"
+                        $txt = strftime('%A',$datestamp);
+                        break;
+                    case DAYSTYLE_SHORT:
+                        // "Mon"
+                        $txt = strftime('%a',$datestamp);
+                        break;
+                    case DAYSTYLE_SHORTDAYDATE1:
+                        // "Mon 23/6"
+                        $txt = strftime('%a %d/'.$mn,$datestamp);
+                        break;
+                    case DAYSTYLE_SHORTDAYDATE2:
+                        // "Mon 23 Jun"
+                        $txt = strftime('%a %d %b',$datestamp);
+                        break;
+                    case DAYSTYLE_SHORTDAYDATE3:
+                        // "Mon 23 Jun 2003"
+                        $txt = strftime('%a %d %b %Y',$datestamp);
+                        break;
+                    case DAYSTYLE_LONGDAYDATE1:
+                        // "Monday 23 Jun"
+                        $txt = strftime('%A %d %b',$datestamp);
+                        break;
+                    case DAYSTYLE_LONGDAYDATE2:
+                        // "Monday 23 Jun 2003"
+                        $txt = strftime('%A %d %b %Y',$datestamp);
+                        break;
+                    case DAYSTYLE_SHORTDATE1:
+                        // "23/6"
+                        $txt = strftime('%d/'.$mn,$datestamp);
+                        break;
+                    case DAYSTYLE_SHORTDATE2:
+                        // "23 Jun"
+                        $txt = strftime('%d %b',$datestamp);
+                        break;
+                    case DAYSTYLE_SHORTDATE3:
+                        // "Mon 23"
+                        $txt = strftime('%a %d',$datestamp);
+                        break;
+                    case DAYSTYLE_SHORTDATE4:
+                        // "23"
+                        $txt = strftime('%d',$datestamp);
+                        break;
+                    case DAYSTYLE_CUSTOM:
+                        // Custom format
+                        $txt = strftime($this->day->iLabelFormStr,$datestamp);
+                        break;
+                    case DAYSTYLE_ONELETTER:
+                    default:
+                        // "M"
+                        $txt = strftime('%A',$datestamp);
+                        $txt = strtoupper($txt[0]);
+                        break;
+                }
+
+                if( $day==0 )
+                    $img->SetColor($this->day->iSundayTextColor);
+                else
+                    $img->SetColor($this->day->iTextColor);
+                $img->StrokeText(round($x+$daywidth/2+1),
+                round($yb-$this->day->iTitleVertMargin),$txt);
+                $img->SetColor($this->day->grid->iColor);
+                $img->SetLineWeight($this->day->grid->iWeight);
+                $img->Line($x,$yt,$x,$yb);
+                $this->day->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
+                $datestamp = mktime(0,0,0,date("m",$datestamp),date("d",$datestamp)+1,date("Y",$datestamp));
+                //$datestamp += SECPERDAY;
+
+            }
+            $img->SetColor($this->day->iFrameColor);
+            $img->SetLineWeight($this->day->iFrameWeight);
+            $img->Rectangle($xt,$yt,$xb,$yb);
+            return $yb - $img->top_margin;
+        }
+        return $aYCoord;
     }
-	
+
     // Stroke week header and grid
     function StrokeWeeks($aYCoord,$getHeight=false) {
-	if( $this->week->iShowLabels ) {
-	    $img=$this->iImg;	
-	    $yt=$aYCoord+$img->top_margin;		
-	    $img->SetFont($this->week->iFFamily,$this->week->iFStyle,$this->week->iFSize);
-	    $yb=$yt + $img->GetFontHeight() + $this->week->iTitleVertMargin + $this->week->iFrameWeight;
-
-	    if( $getHeight ) {
-		return $yb - $img->top_margin;  
-	    }
-
-	    $xt=$img->left_margin+$this->iLabelWidth;
-	    $weekwidth=$this->GetDayWidth()*7;
-	    $wdays=$this->iDateLocale->GetDayAbb();	
-	    $xb=$img->width-$img->right_margin+1;
-	    $week = $this->iStartDate;
-	    $weeknbr=$this->GetWeekNbr($week);
-	    $img->SetColor($this->week->iBackgroundColor);
-	    $img->FilledRectangle($xt,$yt,$xb,$yb);
-	    $img->SetColor($this->week->grid->iColor);
-	    $x = $xt;
-	    if( $this->week->iStyle==WEEKSTYLE_WNBR ) {
-		$img->SetTextAlign("center");
-		$txtOffset = $weekwidth/2+1;
-	    }
-	    elseif( $this->week->iStyle==WEEKSTYLE_FIRSTDAY  || 
-		    $this->week->iStyle==WEEKSTYLE_FIRSTDAY2 ||
-		    $this->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR ||
-		    $this->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR ) {
-		$img->SetTextAlign("left");
-		$txtOffset = 3;
-	    }
-	    else
-		JpGraphError::Raise("Unknown formatting style for week.");
-				
-	    for($i=0; $i<$this->GetNumberOfDays()/7; ++$i, $x+=$weekwidth) {
-		$img->PushColor($this->week->iTextColor);
-				
-		if( $this->week->iStyle==WEEKSTYLE_WNBR )
-		    $txt = sprintf($this->week->iLabelFormStr,$weeknbr);
-		elseif( $this->week->iStyle==WEEKSTYLE_FIRSTDAY || 
-			$this->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR ) 
-		    $txt = date("j/n",$week);
-		elseif( $this->week->iStyle==WEEKSTYLE_FIRSTDAY2 || 
-			$this->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR ) {
-		    $monthnbr = date("n",$week)-1;
-		    $shortmonth = $this->iDateLocale->GetShortMonthName($monthnbr);
-		    $txt = Date("j",$week)." ".$shortmonth;
-		}
-
-		if( $this->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR ||
-		    $this->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR ) {
-		    $w = sprintf($this->week->iLabelFormStr,$weeknbr);
-		    $txt .= ' '.$w;
-		}
-				
-		$img->StrokeText(round($x+$txtOffset),
-				 round($yb-$this->week->iTitleVertMargin),$txt);
-				
-		$week = strtotime('+7 day',$week); 
-		$weeknbr = $this->GetWeekNbr($week);
-		$img->PopColor();						
-		$img->Line($x,$yt,$x,$yb);
-		$this->week->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
-	    }			
-	    $img->SetColor($this->week->iFrameColor);
-	    $img->SetLineWeight($this->week->iFrameWeight);
-	    $img->Rectangle($xt,$yt,$xb,$yb);
-	    return $yb-$img->top_margin;
-	}
-	return $aYCoord;
-    }	
-	
+        if( $this->week->iShowLabels ) {
+            $img=$this->iImg;
+            $yt=$aYCoord+$img->top_margin;
+            $img->SetFont($this->week->iFFamily,$this->week->iFStyle,$this->week->iFSize);
+            $yb=$yt + $img->GetFontHeight() + $this->week->iTitleVertMargin + $this->week->iFrameWeight;
+
+            if( $getHeight ) {
+                return $yb - $img->top_margin;
+            }
+
+            $xt=$img->left_margin+$this->iLabelWidth;
+            $weekwidth=$this->GetDayWidth()*7;
+            $wdays=$this->iDateLocale->GetDayAbb();
+            $xb=$img->width-$img->right_margin+1;
+            $week = $this->iStartDate;
+            $weeknbr=$this->GetWeekNbr($week);
+            $img->SetColor($this->week->iBackgroundColor);
+            $img->FilledRectangle($xt,$yt,$xb,$yb);
+            $img->SetColor($this->week->grid->iColor);
+            $x = $xt;
+            if( $this->week->iStyle==WEEKSTYLE_WNBR ) {
+                $img->SetTextAlign("center");
+                $txtOffset = $weekwidth/2+1;
+            }
+            elseif( $this->week->iStyle==WEEKSTYLE_FIRSTDAY  ||
+                    $this->week->iStyle==WEEKSTYLE_FIRSTDAY2 ||
+                    $this->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR ||
+                    $this->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR ) {
+                $img->SetTextAlign("left");
+                $txtOffset = 3;
+            }
+            else {
+                JpGraphError::RaiseL(6021);
+                //("Unknown formatting style for week.");
+            }
+
+            for($i=0; $i<$this->GetNumberOfDays()/7; ++$i, $x+=$weekwidth) {
+                $img->PushColor($this->week->iTextColor);
+
+                if( $this->week->iStyle==WEEKSTYLE_WNBR )
+                    $txt = sprintf($this->week->iLabelFormStr,$weeknbr);
+                elseif( $this->week->iStyle==WEEKSTYLE_FIRSTDAY ||
+                        $this->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR )
+                    $txt = date("j/n",$week);
+                elseif( $this->week->iStyle==WEEKSTYLE_FIRSTDAY2 ||
+                        $this->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR ) {
+                    $monthnbr = date("n",$week)-1;
+                    $shortmonth = $this->iDateLocale->GetShortMonthName($monthnbr);
+                    $txt = Date("j",$week)." ".$shortmonth;
+                }
+
+                if( $this->week->iStyle==WEEKSTYLE_FIRSTDAYWNBR ||
+                $this->week->iStyle==WEEKSTYLE_FIRSTDAY2WNBR ) {
+                    $w = sprintf($this->week->iLabelFormStr,$weeknbr);
+                    $txt .= ' '.$w;
+                }
+
+                $img->StrokeText(round($x+$txtOffset),
+                round($yb-$this->week->iTitleVertMargin),$txt);
+
+                $week = strtotime('+7 day',$week);
+                $weeknbr = $this->GetWeekNbr($week);
+                $img->PopColor();
+                $img->SetLineWeight($this->week->grid->iWeight);
+                $img->Line($x,$yt,$x,$yb);
+                $this->week->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
+            }
+            $img->SetColor($this->week->iFrameColor);
+            $img->SetLineWeight($this->week->iFrameWeight);
+            $img->Rectangle($xt,$yt,$xb,$yb);
+            return $yb-$img->top_margin;
+        }
+        return $aYCoord;
+    }
+
     // Format the mont scale header string
     function GetMonthLabel($aMonthNbr,$year) {
-	$sn = $this->iDateLocale->GetShortMonthName($aMonthNbr);
-	$ln = $this->iDateLocale->GetLongMonthName($aMonthNbr);
-	switch($this->month->iStyle) {
-	    case MONTHSTYLE_SHORTNAME:
-		$m=$sn;
-		break;
-	    case MONTHSTYLE_LONGNAME:
-		$m=$ln;
-		break;
-	    case MONTHSTYLE_SHORTNAMEYEAR2:
-		$m=$sn." '".substr("".$year,2);
-		break;
-	    case MONTHSTYLE_SHORTNAMEYEAR4:
-		$m=$sn." ".$year;
-		break;
-	    case MONTHSTYLE_LONGNAMEYEAR2:
-		$m=$ln." '".substr("".$year,2);
-		break;
-	    case MONTHSTYLE_LONGNAMEYEAR4:
-		$m=$ln." ".$year;
-		break;
-	    case MONTHSTYLE_FIRSTLETTER:
-		$m=$sn[0];
-		break;
-	}
-	return $m;
+        $sn = $this->iDateLocale->GetShortMonthName($aMonthNbr);
+        $ln = $this->iDateLocale->GetLongMonthName($aMonthNbr);
+        switch($this->month->iStyle) {
+            case MONTHSTYLE_SHORTNAME:
+                $m=$sn;
+                break;
+            case MONTHSTYLE_LONGNAME:
+                $m=$ln;
+                break;
+            case MONTHSTYLE_SHORTNAMEYEAR2:
+                $m=$sn." '".substr("".$year,2);
+                break;
+            case MONTHSTYLE_SHORTNAMEYEAR4:
+                $m=$sn." ".$year;
+                break;
+            case MONTHSTYLE_LONGNAMEYEAR2:
+                $m=$ln." '".substr("".$year,2);
+                break;
+            case MONTHSTYLE_LONGNAMEYEAR4:
+                $m=$ln." ".$year;
+                break;
+            case MONTHSTYLE_FIRSTLETTER:
+                $m=$sn[0];
+                break;
+        }
+        return $m;
     }
-	
+
     // Stroke month scale and gridlines
     function StrokeMonths($aYCoord,$getHeight=false) {
-	if( $this->month->iShowLabels ) {
-	    $img=$this->iImg;		
-	    $img->SetFont($this->month->iFFamily,$this->month->iFStyle,$this->month->iFSize);
-	    $yt=$aYCoord+$img->top_margin;		
-	    $yb=$yt + $img->GetFontHeight() + $this->month->iTitleVertMargin + $this->month->iFrameWeight;
-	    if( $getHeight ) {
-		return $yb - $img->top_margin;  
-	    }
-	    $monthnbr = $this->GetMonthNbr($this->iStartDate)-1; 
-	    $xt=$img->left_margin+$this->iLabelWidth;
-	    $xb=$img->width-$img->right_margin+1;
-			
-	    $img->SetColor($this->month->iBackgroundColor);
-	    $img->FilledRectangle($xt,$yt,$xb,$yb);
-
-	    $img->SetLineWeight($this->month->grid->iWeight);
-	    $img->SetColor($this->month->iTextColor);
-	    $year = 0+strftime("%Y",$this->iStartDate);
-	    $img->SetTextAlign("center");
-	    if( $this->GetMonthNbr($this->iStartDate) == $this->GetMonthNbr($this->iEndDate)  
-		&& $this->GetYear($this->iStartDate)==$this->GetYear($this->iEndDate) ) {
-	    	$monthwidth=$this->GetDayWidth()*($this->GetMonthDayNbr($this->iEndDate) - $this->GetMonthDayNbr($this->iStartDate) + 1);
-	    } 
-	    else {
-	    	$monthwidth=$this->GetDayWidth()*($this->GetNumDaysInMonth($monthnbr,$year)-$this->GetMonthDayNbr($this->iStartDate)+1);
-	    }
-	    // Is it enough space to stroke the first month?
-	    $monthName = $this->GetMonthLabel($monthnbr,$year);
-	    if( $monthwidth >= 1.2*$img->GetTextWidth($monthName) ) {
-		$img->SetColor($this->month->iTextColor);				
-		$img->StrokeText(round($xt+$monthwidth/2+1),
-				 round($yb-$this->month->iTitleVertMargin),
-				 $monthName);
-	    }
-	    $x = $xt + $monthwidth;
-	    while( $x < $xb ) {
-		$img->SetColor($this->month->grid->iColor);				
-		$img->Line($x,$yt,$x,$yb);
-		$this->month->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
-		$monthnbr++;
-		if( $monthnbr==12 ) {
-		    $monthnbr=0;
-		    $year++;
-		}
-		$monthName = $this->GetMonthLabel($monthnbr,$year);
-		$monthwidth=$this->GetDayWidth()*$this->GetNumDaysInMonth($monthnbr,$year);				
-		if( $x + $monthwidth < $xb )
-		    $w = $monthwidth;
-		else
-		    $w = $xb-$x;
-		if( $w >= 1.2*$img->GetTextWidth($monthName) ) {
-		    $img->SetColor($this->month->iTextColor);				
-		    $img->StrokeText(round($x+$w/2+1),
-				     round($yb-$this->month->iTitleVertMargin),$monthName);
-		}
-		$x += $monthwidth;
-	    }	
-	    $img->SetColor($this->month->iFrameColor);
-	    $img->SetLineWeight($this->month->iFrameWeight);
-	    $img->Rectangle($xt,$yt,$xb,$yb);			
-	    return $yb-$img->top_margin;
-	}
-	return $aYCoord;
+        if( $this->month->iShowLabels ) {
+            $img=$this->iImg;
+            $img->SetFont($this->month->iFFamily,$this->month->iFStyle,$this->month->iFSize);
+            $yt=$aYCoord+$img->top_margin;
+            $yb=$yt + $img->GetFontHeight() + $this->month->iTitleVertMargin + $this->month->iFrameWeight;
+            if( $getHeight ) {
+                return $yb - $img->top_margin;
+            }
+            $monthnbr = $this->GetMonthNbr($this->iStartDate)-1;
+            $xt=$img->left_margin+$this->iLabelWidth;
+            $xb=$img->width-$img->right_margin+1;
+
+            $img->SetColor($this->month->iBackgroundColor);
+            $img->FilledRectangle($xt,$yt,$xb,$yb);
+
+            $img->SetLineWeight($this->month->grid->iWeight);
+            $img->SetColor($this->month->iTextColor);
+            $year = 0+strftime("%Y",$this->iStartDate);
+            $img->SetTextAlign("center");
+            if( $this->GetMonthNbr($this->iStartDate) == $this->GetMonthNbr($this->iEndDate)
+                && $this->GetYear($this->iStartDate)==$this->GetYear($this->iEndDate) ) {
+                $monthwidth=$this->GetDayWidth()*($this->GetMonthDayNbr($this->iEndDate) - $this->GetMonthDayNbr($this->iStartDate) + 1);
+            }
+            else {
+                $monthwidth=$this->GetDayWidth()*($this->GetNumDaysInMonth($monthnbr,$year)-$this->GetMonthDayNbr($this->iStartDate)+1);
+            }
+            // Is it enough space to stroke the first month?
+            $monthName = $this->GetMonthLabel($monthnbr,$year);
+            if( $monthwidth >= 1.2*$img->GetTextWidth($monthName) ) {
+                $img->SetColor($this->month->iTextColor);
+                $img->StrokeText(round($xt+$monthwidth/2+1),
+                round($yb-$this->month->iTitleVertMargin),
+                $monthName);
+            }
+            $x = $xt + $monthwidth;
+            while( $x < $xb ) {
+                $img->SetColor($this->month->grid->iColor);
+                $img->Line($x,$yt,$x,$yb);
+                $this->month->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
+                $monthnbr++;
+                if( $monthnbr==12 ) {
+                    $monthnbr=0;
+                    $year++;
+                }
+                $monthName = $this->GetMonthLabel($monthnbr,$year);
+                $monthwidth=$this->GetDayWidth()*$this->GetNumDaysInMonth($monthnbr,$year);
+                if( $x + $monthwidth < $xb )
+                    $w = $monthwidth;
+                else
+                    $w = $xb-$x;
+                if( $w >= 1.2*$img->GetTextWidth($monthName) ) {
+                    $img->SetColor($this->month->iTextColor);
+                    $img->StrokeText(round($x+$w/2+1),
+                    round($yb-$this->month->iTitleVertMargin),$monthName);
+                }
+                $x += $monthwidth;
+            }
+            $img->SetColor($this->month->iFrameColor);
+            $img->SetLineWeight($this->month->iFrameWeight);
+            $img->Rectangle($xt,$yt,$xb,$yb);
+            return $yb-$img->top_margin;
+        }
+        return $aYCoord;
     }
 
     // Stroke year scale and gridlines
     function StrokeYears($aYCoord,$getHeight=false) {
-	if( $this->year->iShowLabels ) {
-	    $img=$this->iImg;	
-	    $yt=$aYCoord+$img->top_margin;		
-	    $img->SetFont($this->year->iFFamily,$this->year->iFStyle,$this->year->iFSize);
-	    $yb=$yt + $img->GetFontHeight() + $this->year->iTitleVertMargin + $this->year->iFrameWeight;
-
-	    if( $getHeight ) {
-		return $yb - $img->top_margin;  
-	    }
-
-	    $xb=$img->width-$img->right_margin+1;
-	    $xt=$img->left_margin+$this->iLabelWidth;
-	    $year = $this->GetYear($this->iStartDate); 			
-	    $img->SetColor($this->year->iBackgroundColor);
-	    $img->FilledRectangle($xt,$yt,$xb,$yb);
-	    $img->SetLineWeight($this->year->grid->iWeight);
-	    $img->SetTextAlign("center");
-	    if( $year == $this->GetYear($this->iEndDate) )
-		$yearwidth=$this->GetDayWidth()*($this->GetYearDayNbr($this->iEndDate)-$this->GetYearDayNbr($this->iStartDate)+1);
-	    else
-		$yearwidth=$this->GetDayWidth()*($this->GetNumDaysInYear($year)-$this->GetYearDayNbr($this->iStartDate)+1);
-			
-	    // The space for a year must be at least 20% bigger than the actual text 
-	    // so we allow 10% margin on each side
-	    if( $yearwidth >= 1.20*$img->GetTextWidth("".$year) ) {
-		$img->SetColor($this->year->iTextColor);				
-		$img->StrokeText(round($xt+$yearwidth/2+1),
-				 round($yb-$this->year->iTitleVertMargin),
-				 $year);
-	    }
-	    $x = $xt + $yearwidth;
-	    while( $x < $xb ) {
-		$img->SetColor($this->year->grid->iColor);				
-		$img->Line($x,$yt,$x,$yb);
-		$this->year->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
-		$year += 1;
-		$yearwidth=$this->GetDayWidth()*$this->GetNumDaysInYear($year);				
-		if( $x + $yearwidth < $xb )
-		    $w = $yearwidth;
-		else
-		    $w = $xb-$x;
-		if( $w >= 1.2*$img->GetTextWidth("".$year) ) {
-		    $img->SetColor($this->year->iTextColor);
-		    $img->StrokeText(round($x+$w/2+1),
-				     round($yb-$this->year->iTitleVertMargin),
-				     $year);
-		}
-		$x += $yearwidth;
-	    }
-	    $img->SetColor($this->year->iFrameColor);
-	    $img->SetLineWeight($this->year->iFrameWeight);
-	    $img->Rectangle($xt,$yt,$xb,$yb);			
-	    return $yb-$img->top_margin;
-	}
-	return $aYCoord;
+        if( $this->year->iShowLabels ) {
+            $img=$this->iImg;
+            $yt=$aYCoord+$img->top_margin;
+            $img->SetFont($this->year->iFFamily,$this->year->iFStyle,$this->year->iFSize);
+            $yb=$yt + $img->GetFontHeight() + $this->year->iTitleVertMargin + $this->year->iFrameWeight;
+
+            if( $getHeight ) {
+                return $yb - $img->top_margin;
+            }
+
+            $xb=$img->width-$img->right_margin+1;
+            $xt=$img->left_margin+$this->iLabelWidth;
+            $year = $this->GetYear($this->iStartDate);
+            $img->SetColor($this->year->iBackgroundColor);
+            $img->FilledRectangle($xt,$yt,$xb,$yb);
+            $img->SetLineWeight($this->year->grid->iWeight);
+            $img->SetTextAlign("center");
+            if( $year == $this->GetYear($this->iEndDate) )
+                $yearwidth=$this->GetDayWidth()*($this->GetYearDayNbr($this->iEndDate)-$this->GetYearDayNbr($this->iStartDate)+1);
+            else
+                $yearwidth=$this->GetDayWidth()*($this->GetNumDaysInYear($year)-$this->GetYearDayNbr($this->iStartDate)+1);
+
+            // The space for a year must be at least 20% bigger than the actual text
+            // so we allow 10% margin on each side
+            if( $yearwidth >= 1.20*$img->GetTextWidth("".$year) ) {
+                $img->SetColor($this->year->iTextColor);
+                $img->StrokeText(round($xt+$yearwidth/2+1),
+                                 round($yb-$this->year->iTitleVertMargin),
+                                 $year);
+            }
+            $x = $xt + $yearwidth;
+            while( $x < $xb ) {
+                $img->SetColor($this->year->grid->iColor);
+                $img->Line($x,$yt,$x,$yb);
+                $this->year->grid->Stroke($img,$x,$yb,$x,$img->height-$img->bottom_margin);
+                $year += 1;
+                $yearwidth=$this->GetDayWidth()*$this->GetNumDaysInYear($year);
+                if( $x + $yearwidth < $xb )
+                    $w = $yearwidth;
+                else
+                    $w = $xb-$x;
+                if( $w >= 1.2*$img->GetTextWidth("".$year) ) {
+                    $img->SetColor($this->year->iTextColor);
+                    $img->StrokeText(round($x+$w/2+1),
+                                     round($yb-$this->year->iTitleVertMargin),
+                                     $year);
+                }
+                $x += $yearwidth;
+            }
+            $img->SetColor($this->year->iFrameColor);
+            $img->SetLineWeight($this->year->iFrameWeight);
+            $img->Rectangle($xt,$yt,$xb,$yb);
+            return $yb-$img->top_margin;
+        }
+        return $aYCoord;
     }
-	
+
     // Stroke table title (upper left corner)
     function StrokeTableHeaders($aYBottom) {
-	$img=$this->iImg;
-	$xt=$img->left_margin;
-	$yt=$img->top_margin;
-	$xb=$xt+$this->iLabelWidth;
-	$yb=$aYBottom+$img->top_margin;
-
-	if( $this->tableTitle->iShow ) {
-	    $img->SetColor($this->iTableHeaderBackgroundColor);
-	    $img->FilledRectangle($xt,$yt,$xb,$yb);
-	    $this->tableTitle->Align("center","top");
-	    $this->tableTitle->Stroke($img,$xt+($xb-$xt)/2+1,$yt+2);		
-	    $img->SetColor($this->iTableHeaderFrameColor);
-	    $img->SetLineWeight($this->iTableHeaderFrameWeight);
-	    $img->Rectangle($xt,$yt,$xb,$yb);
-	}
-
-	$this->actinfo->Stroke($img,$xt,$yt,$xb,$yb,$this->tableTitle->iShow);
-
-
-	// Draw the horizontal dividing line		
-	$this->dividerh->Stroke($img,$xt,$yb,$img->width-$img->right_margin,$yb);		
-		
-	// Draw the vertical dividing line
-	// We do the width "manually" since we want the line only to grow
-	// to the left
-	$fancy = $this->divider->iStyle == 'fancy' ;
-	if( $fancy ) {
-	    $this->divider->iStyle = 'solid';
-	}
-
-	$tmp = $this->divider->iWeight;	
-	$this->divider->iWeight=1;
-	$y = $img->height-$img->bottom_margin;
-	for($i=0; $i < $tmp; ++$i ) {
-	    $this->divider->Stroke($img,$xb-$i,$yt,$xb-$i,$y);
-	}
-
-	// Should we draw "fancy" divider
-	if( $fancy ) {
-	    $img->SetLineWeight(1);
-	    $img->SetColor($this->iTableHeaderFrameColor);
-	    $img->Line($xb,$yt,$xb,$y);
-	    $img->Line($xb-$tmp+1,$yt,$xb-$tmp+1,$y);
-	    $img->SetColor('white');
-	    $img->Line($xb-$tmp+2,$yt,$xb-$tmp+2,$y);
-	}
+        $img=$this->iImg;
+        $xt=$img->left_margin;
+        $yt=$img->top_margin;
+        $xb=$xt+$this->iLabelWidth;
+        $yb=$aYBottom+$img->top_margin;
+
+        if( $this->tableTitle->iShow ) {
+            $img->SetColor($this->iTableHeaderBackgroundColor);
+            $img->FilledRectangle($xt,$yt,$xb,$yb);
+            $this->tableTitle->Align("center","top");
+            $this->tableTitle->Stroke($img,$xt+($xb-$xt)/2+1,$yt+2);
+            $img->SetColor($this->iTableHeaderFrameColor);
+            $img->SetLineWeight($this->iTableHeaderFrameWeight);
+            $img->Rectangle($xt,$yt,$xb,$yb);
+        }
+
+        $this->actinfo->Stroke($img,$xt,$yt,$xb,$yb,$this->tableTitle->iShow);
+
+
+        // Draw the horizontal dividing line
+        $this->dividerh->Stroke($img,$xt,$yb,$img->width-$img->right_margin,$yb);
+
+        // Draw the vertical dividing line
+        // We do the width "manually" since we want the line only to grow
+        // to the left
+        $fancy = $this->divider->iStyle == 'fancy' ;
+        if( $fancy ) {
+            $this->divider->iStyle = 'solid';
+        }
+
+        $tmp = $this->divider->iWeight;
+        $this->divider->iWeight=1;
+        $y = $img->height-$img->bottom_margin;
+        for($i=0; $i < $tmp; ++$i ) {
+            $this->divider->Stroke($img,$xb-$i,$yt,$xb-$i,$y);
+        }
+
+        // Should we draw "fancy" divider
+        if( $fancy ) {
+            $img->SetLineWeight(1);
+            $img->SetColor($this->iTableHeaderFrameColor);
+            $img->Line($xb,$yt,$xb,$y);
+            $img->Line($xb-$tmp+1,$yt,$xb-$tmp+1,$y);
+            $img->SetColor('white');
+            $img->Line($xb-$tmp+2,$yt,$xb-$tmp+2,$y);
+        }
     }
 
     // Main entry point to stroke scale
     function Stroke() {
-	if( !$this->IsRangeSet() )
-	    JpGraphError::Raise("Gantt scale has not been specified.");
-	$img=$this->iImg;
-
-	// If minutes are displayed then hour interval must be 1	
-	if( $this->IsDisplayMinute() && $this->hour->GetIntervall() > 1 ) {
-	    JpGraphError::Raise('If you display both hour and minutes the hour intervall must be 1 (Otherwise it doesn\' make sense to display minutes).');
-	}
-		
-	// Stroke all headers. As argument we supply the offset from the
-	// top which depends on any previous headers
-	
-	// First find out the height of each header
-	$offy=$this->StrokeYears(0,true);
-	$offm=$this->StrokeMonths($offy,true);
-	$offw=$this->StrokeWeeks($offm,true);
-	$offd=$this->StrokeDays($offw,true);
-	$offh=$this->StrokeHours($offd,true);
-	$offmin=$this->StrokeMinutes($offh,true);
-
-
-	// ... then we can stroke them in the "backwards order to ensure that
-	// the larger scale gridlines is stroked over the smaller scale gridline
-	$this->StrokeMinutes($offh);
-	$this->StrokeHours($offd);
-	$this->StrokeDays($offw);
-	$this->StrokeWeeks($offm);		
-	$this->StrokeMonths($offy);		
-	$this->StrokeYears(0);
-
-	// Now when we now the oaverall size of the scale headers
-	// we can stroke the overall table headers
-	$this->StrokeTableHeaders($offmin);
-		
-	// Now we can calculate the correct scaling factor for each vertical position
-	$this->iAvailableHeight = $img->height - $img->top_margin - $img->bottom_margin - $offd;		
-	$this->iVertHeaderSize = $offmin;
-	if( $this->iVertSpacing == -1 )
-	    $this->iVertSpacing = $this->iAvailableHeight / $this->iVertLines;
-    }	
+        if( !$this->IsRangeSet() ) {
+        	JpGraphError::RaiseL(6022);
+        	//("Gantt scale has not been specified.");
+        }
+        $img=$this->iImg;
+
+        // If minutes are displayed then hour interval must be 1
+        if( $this->IsDisplayMinute() && $this->hour->GetIntervall() > 1 ) {
+            JpGraphError::RaiseL(6023);
+            //('If you display both hour and minutes the hour intervall must be 1 (Otherwise it doesn\' make sense to display minutes).');
+        }
+
+        // Stroke all headers. As argument we supply the offset from the
+        // top which depends on any previous headers
+
+        // First find out the height of each header
+        $offy=$this->StrokeYears(0,true);
+        $offm=$this->StrokeMonths($offy,true);
+        $offw=$this->StrokeWeeks($offm,true);
+        $offd=$this->StrokeDays($offw,true);
+        $offh=$this->StrokeHours($offd,true);
+        $offmin=$this->StrokeMinutes($offh,true);
+
+
+        // ... then we can stroke them in the "backwards order to ensure that
+        // the larger scale gridlines is stroked over the smaller scale gridline
+        $this->StrokeMinutes($offh);
+        $this->StrokeHours($offd);
+        $this->StrokeDays($offw);
+        $this->StrokeWeeks($offm);
+        $this->StrokeMonths($offy);
+        $this->StrokeYears(0);
+
+        // Now when we now the oaverall size of the scale headers
+        // we can stroke the overall table headers
+        $this->StrokeTableHeaders($offmin);
+
+        // Now we can calculate the correct scaling factor for each vertical position
+        $this->iAvailableHeight = $img->height - $img->top_margin - $img->bottom_margin - $offd;
+
+        $this->iVertHeaderSize = $offmin;
+        if( $this->iVertSpacing == -1 )
+        	$this->iVertSpacing = $this->iAvailableHeight / $this->iVertLines;
+    }
 }
 
 
@@ -2865,20 +3019,20 @@ function Stroke() {
 // Just a structure to store all the values for a constraint
 //===================================================
 class GanttConstraint {
-    var $iConstrainType;
-    var $iConstrainRow;
-    var $iConstrainColor;
-    var $iConstrainArrowSize;
-    var $iConstrainArrowType;
-
-//---------------
-// CONSTRUCTOR
-    function GanttConstraint($aRow,$aType,$aColor,$aArrowSize,$aArrowType){
-	$this->iConstrainType = $aType;
-	$this->iConstrainRow = $aRow;
-	$this->iConstrainColor=$aColor;
-	$this->iConstrainArrowSize=$aArrowSize;
-	$this->iConstrainArrowType=$aArrowType;
+    public $iConstrainRow;
+    public $iConstrainType;
+    public $iConstrainColor;
+    public $iConstrainArrowSize;
+    public $iConstrainArrowType;
+
+    //---------------
+    // CONSTRUCTOR
+    function __construct($aRow,$aType,$aColor,$aArrowSize,$aArrowType){
+        $this->iConstrainType = $aType;
+        $this->iConstrainRow = $aRow;
+        $this->iConstrainColor=$aColor;
+        $this->iConstrainArrowSize=$aArrowSize;
+        $this->iConstrainArrowType=$aArrowType;
     }
 }
 
@@ -2888,202 +3042,202 @@ function GanttConstraint($aRow,$aType,$aColor,$aArrowSize,$aArrowType){
 // The common signature for a Gantt object
 //===================================================
 class GanttPlotObject {
-    var $iVPos=0;					// Vertical position
-    var $iLabelLeftMargin=2;	// Title margin
-    var $iStart="";				// Start date
-    var $title,$caption;
-    var $iCaptionMargin=5;
-    var $csimarea='',$csimtarget='',$csimalt='';
-
-    var $constraints = array();    
-    var $iConstrainPos=array();
-		
-    function GanttPlotObject() {
- 	$this->title = new TextProperty();
-	$this->title->Align("left","center");
-	$this->caption = new TextProperty();
+    public $title,$caption;
+    public $csimarea='',$csimtarget='',$csimwintarget='',$csimalt='';
+    public $constraints = array();
+    public $iCaptionMargin=5;
+    public $iConstrainPos=array();
+    protected $iStart="";    // Start date
+    public $iVPos=0;     // Vertical position
+    protected $iLabelLeftMargin=2; // Title margin
+
+    function __construct() {
+        $this->title = new TextProperty();
+        $this->title->Align('left','center');
+        $this->caption = new TextProperty();
     }
 
     function GetCSIMArea() {
-	return $this->csimarea;
+        return $this->csimarea;
     }
 
-    function SetCSIMTarget($aTarget,$aAlt='') {
-	if( !is_string($aTarget) ) {
-	    $tv = substr(var_export($aTarget,true),0,40);
-	    JpGraphError::Raise('CSIM Target must be specified as a string.'."\nStart of target is:\n$tv");
-	}
-	if( !is_string($aAlt) ) {
-	    $tv = substr(var_export($aAlt,true),0,40);
-	    JpGraphError::Raise('CSIM Alt text must be specified as a string.'."\nStart of alt text is:\n$tv");
-	}
+    function SetCSIMTarget($aTarget,$aAlt='',$aWinTarget='') {
+        if( !is_string($aTarget) ) {
+            $tv = substr(var_export($aTarget,true),0,40);
+            JpGraphError::RaiseL(6024,$tv);
+            //('CSIM Target must be specified as a string.'."\nStart of target is:\n$tv");
+        }
+        if( !is_string($aAlt) ) {
+            $tv = substr(var_export($aAlt,true),0,40);
+            JpGraphError::RaiseL(6025,$tv);
+            //('CSIM Alt text must be specified as a string.'."\nStart of alt text is:\n$tv");
+        }
 
         $this->csimtarget=$aTarget;
+        $this->csimwintarget=$aWinTarget;
         $this->csimalt=$aAlt;
     }
-    
+
     function SetCSIMAlt($aAlt) {
-	if( !is_string($aAlt) ) {
-	    $tv = substr(var_export($aAlt,true),0,40);
-	    JpGraphError::Raise('CSIM Alt text must be specified as a string.'."\nStart of alt text is:\n$tv");
-	}
+        if( !is_string($aAlt) ) {
+            $tv = substr(var_export($aAlt,true),0,40);
+            JpGraphError::RaiseL(6025,$tv);
+            //('CSIM Alt text must be specified as a string.'."\nStart of alt text is:\n$tv");
+        }
         $this->csimalt=$aAlt;
     }
 
     function SetConstrain($aRow,$aType,$aColor='black',$aArrowSize=ARROW_S2,$aArrowType=ARROWT_SOLID) {
-	$this->constraints[] = new GanttConstraint($aRow, $aType, $aColor, $aArrowSize, $aArrowType);
+        $this->constraints[] = new GanttConstraint($aRow, $aType, $aColor, $aArrowSize, $aArrowType);
     }
 
     function SetConstrainPos($xt,$yt,$xb,$yb) {
-	$this->iConstrainPos = array($xt,$yt,$xb,$yb);
+        $this->iConstrainPos = array($xt,$yt,$xb,$yb);
     }
 
-    /*
-    function GetConstrain() {
-	return array($this->iConstrainRow,$this->iConstrainType);
-    }
-    */
-	
     function GetMinDate() {
-	return $this->iStart;
+        return $this->iStart;
     }
 
     function GetMaxDate() {
-	return $this->iStart;
+        return $this->iStart;
     }
-	
+
     function SetCaptionMargin($aMarg) {
-	$this->iCaptionMargin=$aMarg;
+        $this->iCaptionMargin=$aMarg;
     }
 
     function GetAbsHeight($aImg) {
-	return 0; 
+        return 0;
     }
-	
+
     function GetLineNbr() {
-	return $this->iVPos;
+        return $this->iVPos;
     }
 
     function SetLabelLeftMargin($aOff) {
-	$this->iLabelLeftMargin=$aOff;
-    }		
+        $this->iLabelLeftMargin=$aOff;
+    }
 
     function StrokeActInfo($aImg,$aScale,$aYPos) {
-	$cols=array();
-	$aScale->actinfo->GetColStart($aImg,$cols,true);
-	$this->title->Stroke($aImg,$cols,$aYPos);		
+        $cols=array();
+        $aScale->actinfo->GetColStart($aImg,$cols,true);
+        $this->title->Stroke($aImg,$cols,$aYPos);
     }
 }
 
 //===================================================
 // CLASS Progress
-// Holds parameters for the progress indicator 
+// Holds parameters for the progress indicator
 // displyed within a bar
 //===================================================
 class Progress {
-    var $iProgress=-1, $iColor="black", $iFillColor='black';
-    var $iPattern=GANTT_SOLID;
-    var $iDensity=98, $iHeight=0.65; 
-	
+    public $iProgress=-1;
+    public $iPattern=GANTT_SOLID;
+    public $iColor="black", $iFillColor='black';
+    public $iDensity=98, $iHeight=0.65;
+
     function Set($aProg) {
-	if( $aProg < 0.0 || $aProg > 1.0 )
-	    JpGraphError::Raise("Progress value must in range [0, 1]");
-	$this->iProgress = $aProg;
+        if( $aProg < 0.0 || $aProg > 1.0 ) {
+        	JpGraphError::RaiseL(6027);
+        	//("Progress value must in range [0, 1]");
+        }
+        $this->iProgress = $aProg;
     }
 
-    function SetPattern($aPattern,$aColor="blue",$aDensity=98) {		
-	$this->iPattern = $aPattern;
-	$this->iColor = $aColor;
-	$this->iDensity = $aDensity;
+    function SetPattern($aPattern,$aColor="blue",$aDensity=98) {
+        $this->iPattern = $aPattern;
+        $this->iColor = $aColor;
+        $this->iDensity = $aDensity;
     }
 
     function SetFillColor($aColor) {
-	$this->iFillColor = $aColor;
+        $this->iFillColor = $aColor;
     }
-	
+
     function SetHeight($aHeight) {
-	$this->iHeight = $aHeight;
+        $this->iHeight = $aHeight;
     }
 }
 
-DEFINE('GANTT_HGRID1',0);
-DEFINE('GANTT_HGRID2',1);
+define('GANTT_HGRID1',0);
+define('GANTT_HGRID2',1);
 
 //===================================================
 // CLASS HorizontalGridLine
 // Responsible for drawinf horizontal gridlines and filled alternatibg rows
 //===================================================
 class HorizontalGridLine {
-    var $iGraph=NULL;
-    var $iRowColor1 = '', $iRowColor2 = '';
-    var $iShow=false;
-    var $line=null;
-    var $iStart=0; // 0=from left margin, 1=just along header
-
-    function HorizontalGridLine() {
-	$this->line = new LineProperty();
-	$this->line->SetColor('gray@0.4');
-	$this->line->SetStyle('dashed');
-    }
-    
+    private $iGraph=NULL;
+    private $iRowColor1 = '', $iRowColor2 = '';
+    private $iShow=false;
+    private $line=null;
+    private $iStart=0; // 0=from left margin, 1=just along header
+
+    function __construct() {
+        $this->line = new LineProperty();
+        $this->line->SetColor('gray@0.4');
+        $this->line->SetStyle('dashed');
+    }
+
     function Show($aShow=true) {
-	$this->iShow = $aShow;
+        $this->iShow = $aShow;
     }
 
     function SetRowFillColor($aColor1,$aColor2='') {
-	$this->iRowColor1 = $aColor1;
-	$this->iRowColor2 = $aColor2;
+        $this->iRowColor1 = $aColor1;
+        $this->iRowColor2 = $aColor2;
     }
 
     function SetStart($aStart) {
-	$this->iStart = $aStart;
+        $this->iStart = $aStart;
     }
 
     function Stroke($aImg,$aScale) {
-	
-	if( ! $this->iShow ) return;
-
-	// Get horizontal width of line
-	/*
-	$limst = $aScale->iStartDate;
-	$limen = $aScale->iEndDate;
-	$xt = round($aScale->TranslateDate($aScale->iStartDate));
-	$xb = round($aScale->TranslateDate($limen)); 
-	*/
-
-	if( $this->iStart === 0 ) {
-	    $xt = $aImg->left_margin-1;
-	}
-	else {
-	    $xt = round($aScale->TranslateDate($aScale->iStartDate))+1;
-	}
 
-	$xb = $aImg->width-$aImg->right_margin;
-
-	$yt = round($aScale->TranslateVertPos(0));
-	$yb = round($aScale->TranslateVertPos(1));	    
-	$height = $yb - $yt;
-
-	// Loop around for all lines in the chart
-	for($i=0; $i < $aScale->iVertLines; ++$i ) {
-	    $yb = $yt - $height;
-	    $this->line->Stroke($aImg,$xt,$yb,$xb,$yb);
-	    if( $this->iRowColor1 !== '' ) {
-		if( $i % 2 == 0 ) {
-		    $aImg->PushColor($this->iRowColor1);
-		    $aImg->FilledRectangle($xt,$yt,$xb,$yb);
-		    $aImg->PopColor();
-		}
-		elseif( $this->iRowColor2 !== '' ) {
-		    $aImg->PushColor($this->iRowColor2);
-		    $aImg->FilledRectangle($xt,$yt,$xb,$yb);
-		    $aImg->PopColor();
-		}
-	    }
-	    $yt = round($aScale->TranslateVertPos($i+1));
-	}
-	$yb = $yt - $height;
-	$this->line->Stroke($aImg,$xt,$yb,$xb,$yb);
+        if( ! $this->iShow ) return;
+
+        // Get horizontal width of line
+        /*
+        $limst = $aScale->iStartDate;
+        $limen = $aScale->iEndDate;
+        $xt = round($aScale->TranslateDate($aScale->iStartDate));
+        $xb = round($aScale->TranslateDate($limen));
+        */
+
+        if( $this->iStart === 0 ) {
+            $xt = $aImg->left_margin-1;
+        }
+        else {
+            $xt = round($aScale->TranslateDate($aScale->iStartDate))+1;
+        }
+
+        $xb = $aImg->width-$aImg->right_margin;
+
+        $yt = round($aScale->TranslateVertPos(0));
+        $yb = round($aScale->TranslateVertPos(1));
+        $height = $yb - $yt;
+
+        // Loop around for all lines in the chart
+        for($i=0; $i < $aScale->iVertLines; ++$i ) {
+            $yb = $yt - $height;
+            $this->line->Stroke($aImg,$xt,$yb,$xb,$yb);
+            if( $this->iRowColor1 !== '' ) {
+                if( $i % 2 == 0 ) {
+                    $aImg->PushColor($this->iRowColor1);
+                    $aImg->FilledRectangle($xt,$yt,$xb,$yb);
+                    $aImg->PopColor();
+                }
+                elseif( $this->iRowColor2 !== '' ) {
+                    $aImg->PushColor($this->iRowColor2);
+                    $aImg->FilledRectangle($xt,$yt,$xb,$yb);
+                    $aImg->PopColor();
+                }
+            }
+            $yt = round($aScale->TranslateVertPos($i+1));
+        }
+        $yb = $yt - $height;
+        $this->line->Stroke($aImg,$xt,$yb,$xb,$yb);
     }
 }
 
@@ -3093,228 +3247,266 @@ function Stroke($aImg,$aScale) {
 // Responsible for formatting individual gantt bars
 //===================================================
 class GanttBar extends GanttPlotObject {
-    var $iEnd;
-    var $iHeightFactor=0.5;
-    var $iFillColor="white",$iFrameColor="black";
-    var $iShadow=false,$iShadowColor="darkgray",$iShadowWidth=1,$iShadowFrame="black";
-    var $iPattern=GANTT_RDIAG,$iPatternColor="blue",$iPatternDensity=95;
-    var $leftMark,$rightMark;
-    var $progress;
-//---------------
-// CONSTRUCTOR	
-    function GanttBar($aPos,$aLabel,$aStart,$aEnd,$aCaption="",$aHeightFactor=0.6) {
-	parent::GanttPlotObject();	
-	$this->iStart = $aStart;	
-	// Is the end date given as a date or as number of days added to start date?
-	if( is_string($aEnd) ) {
-	    // If end date has been specified without a time we will asssume
-	    // end date is at the end of that date
-	    if( strpos($aEnd,':') === false )
-		$this->iEnd = strtotime($aEnd)+SECPERDAY-1;
-	    else 
-		$this->iEnd = $aEnd;
-	}
-	elseif(is_int($aEnd) || is_float($aEnd) ) 
-	    $this->iEnd = strtotime($aStart)+round($aEnd*SECPERDAY);
-	$this->iVPos = $aPos;
-	$this->iHeightFactor = $aHeightFactor;
-	$this->title->Set($aLabel);
-	$this->caption = new TextProperty($aCaption);
-	$this->caption->Align("left","center");
-	$this->leftMark =new PlotMark();
-	$this->leftMark->Hide();
-	$this->rightMark=new PlotMark();
-	$this->rightMark->Hide();
-	$this->progress = new Progress();
-    }
-	
-//---------------
-// PUBLIC METHODS	
+    public $progress;
+    public $leftMark,$rightMark;
+    private $iEnd;
+    private $iHeightFactor=0.5;
+    private $iFillColor="white",$iFrameColor="black";
+    private $iShadow=false,$iShadowColor="darkgray",$iShadowWidth=1,$iShadowFrame="black";
+    private $iPattern=GANTT_RDIAG,$iPatternColor="blue",$iPatternDensity=95;
+    private $iBreakStyle=false, $iBreakLineStyle='dotted',$iBreakLineWeight=1;
+    //---------------
+    // CONSTRUCTOR
+    function __construct($aPos,$aLabel,$aStart,$aEnd,$aCaption="",$aHeightFactor=0.6) {
+        parent::__construct();
+        $this->iStart = $aStart;
+        // Is the end date given as a date or as number of days added to start date?
+        if( is_string($aEnd) ) {
+            // If end date has been specified without a time we will asssume
+            // end date is at the end of that date
+            if( strpos($aEnd,':') === false ) {
+            	$this->iEnd = strtotime($aEnd)+SECPERDAY-1;
+            }
+            else {
+            	$this->iEnd = $aEnd;
+            }
+        }
+        elseif(is_int($aEnd) || is_float($aEnd) ) {
+        	$this->iEnd = strtotime($aStart)+round($aEnd*SECPERDAY);
+        }
+        $this->iVPos = $aPos;
+        $this->iHeightFactor = $aHeightFactor;
+        $this->title->Set($aLabel);
+        $this->caption = new TextProperty($aCaption);
+        $this->caption->Align("left","center");
+        $this->leftMark =new PlotMark();
+        $this->leftMark->Hide();
+        $this->rightMark=new PlotMark();
+        $this->rightMark->Hide();
+        $this->progress = new Progress();
+    }
+
+    //---------------
+    // PUBLIC METHODS
     function SetShadow($aShadow=true,$aColor="gray") {
-	$this->iShadow=$aShadow;
-	$this->iShadowColor=$aColor;
+        $this->iShadow=$aShadow;
+        $this->iShadowColor=$aColor;
+    }
+
+    function SetBreakStyle($aFlg=true,$aLineStyle='dotted',$aLineWeight=1) {
+    	$this->iBreakStyle = $aFlg;
+    	$this->iBreakLineStyle = $aLineStyle;
+    	$this->iBreakLineWeight = $aLineWeight;
     }
-    
+
     function GetMaxDate() {
-	return $this->iEnd;
+        return $this->iEnd;
     }
-	
+
     function SetHeight($aHeight) {
-	$this->iHeightFactor = $aHeight;
+        $this->iHeightFactor = $aHeight;
     }
 
     function SetColor($aColor) {
-	$this->iFrameColor = $aColor;
+        $this->iFrameColor = $aColor;
     }
 
     function SetFillColor($aColor) {
-	$this->iFillColor = $aColor;
+        $this->iFillColor = $aColor;
     }
 
     function GetAbsHeight($aImg) {
-	if( is_int($this->iHeightFactor) || $this->leftMark->show || $this->rightMark->show ) {
-	    $m=-1;
-	    if( is_int($this->iHeightFactor) )
-		$m = $this->iHeightFactor;
-	    if( $this->leftMark->show ) 
-		$m = max($m,$this->leftMark->width*2);
-	    if( $this->rightMark->show ) 
-		$m = max($m,$this->rightMark->width*2);
-	    return $m;
-	}
-	else
-	    return -1;
-    }
-	
-    function SetPattern($aPattern,$aColor="blue",$aDensity=95) {		
-	$this->iPattern = $aPattern;
-	$this->iPatternColor = $aColor;
-	$this->iPatternDensity = $aDensity;
+        if( is_int($this->iHeightFactor) || $this->leftMark->show || $this->rightMark->show ) {
+            $m=-1;
+            if( is_int($this->iHeightFactor) )
+            	$m = $this->iHeightFactor;
+            if( $this->leftMark->show )
+            	$m = max($m,$this->leftMark->width*2);
+            if( $this->rightMark->show )
+            	$m = max($m,$this->rightMark->width*2);
+            return $m;
+        }
+        else
+        	return -1;
+    }
+
+    function SetPattern($aPattern,$aColor="blue",$aDensity=95) {
+        $this->iPattern = $aPattern;
+        $this->iPatternColor = $aColor;
+        $this->iPatternDensity = $aDensity;
     }
 
     function Stroke($aImg,$aScale) {
-	$factory = new RectPatternFactory();
-	$prect = $factory->Create($this->iPattern,$this->iPatternColor);
-	$prect->SetDensity($this->iPatternDensity);
-
-	// If height factor is specified as a float between 0,1 then we take it as meaning
-	// percetage of the scale width between horizontal line.
-	// If it is an integer > 1 we take it to mean the absolute height in pixels
-	if( $this->iHeightFactor > -0.0 && $this->iHeightFactor <= 1.1)
-	    $vs = $aScale->GetVertSpacing()*$this->iHeightFactor;
-	elseif(is_int($this->iHeightFactor) && $this->iHeightFactor>2 && $this->iHeightFactor < 200 )
-	    $vs = $this->iHeightFactor;
-	else
-	    JpGraphError::Raise("Specified height (".$this->iHeightFactor.") for gantt bar is out of range.");
-	
-	// Clip date to min max dates to show
-	$st = $aScale->NormalizeDate($this->iStart);
-	$en = $aScale->NormalizeDate($this->iEnd);
-	
-
-	$limst = max($st,$aScale->iStartDate);
-	$limen = min($en,$aScale->iEndDate);
-			
-	$xt = round($aScale->TranslateDate($limst));
-	$xb = round($aScale->TranslateDate($limen)); 
-	$yt = round($aScale->TranslateVertPos($this->iVPos)-$vs-($aScale->GetVertSpacing()/2-$vs/2));
-	$yb = round($aScale->TranslateVertPos($this->iVPos)-($aScale->GetVertSpacing()/2-$vs/2));
-	$middle = round($yt+($yb-$yt)/2);
-	$this->StrokeActInfo($aImg,$aScale,$middle);
-
-	// CSIM for title
-	if( ! empty($this->title->csimtarget) ) {
-	    $colwidth = $this->title->GetColWidth($aImg);
-	    $colstarts=array();
-	    $aScale->actinfo->GetColStart($aImg,$colstarts,true);
-	    $n = min(count($colwidth),count($this->title->csimtarget));
-	    for( $i=0; $i < $n; ++$i ) {
-		$title_xt = $colstarts[$i];
-		$title_xb = $title_xt + $colwidth[$i];
-		$coords = "$title_xt,$yt,$title_xb,$yt,$title_xb,$yb,$title_xt,$yb";
-		$this->csimarea .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->title->csimtarget[$i]."\"";
-		if( ! empty($this->title->csimalt[$i]) ) {
-		    $tmp = $this->title->csimalt[$i];
-		    $this->csimarea .= " alt=\"$tmp\" title=\"$tmp\"";
-		}
-		$this->csimarea .= ">\n";
-	    }
-	}
-
-	// Check if the bar is totally outside the current scale range
-	if( $en <  $aScale->iStartDate || $st > $aScale->iEndDate )
-		return;
-			
-
-	// Remember the positions for the bar
-	$this->SetConstrainPos($xt,$yt,$xb,$yb);
-		
-	$prect->ShowFrame(false);
-	$prect->SetBackground($this->iFillColor);
-	if( $this->iShadow ) {
-	    $aImg->SetColor($this->iFrameColor);
-	    $aImg->ShadowRectangle($xt,$yt,$xb,$yb,$this->iFillColor,$this->iShadowWidth,$this->iShadowColor);				
-	    $prect->SetPos(new Rectangle($xt+1,$yt+1,$xb-$xt-$this->iShadowWidth-2,$yb-$yt-$this->iShadowWidth-2));				
-	    $prect->Stroke($aImg);
-	}
-	else {	
-	    $prect->SetPos(new Rectangle($xt,$yt,$xb-$xt+1,$yb-$yt+1));				
-	    $prect->Stroke($aImg);
-	    $aImg->SetColor($this->iFrameColor);
-	    $aImg->Rectangle($xt,$yt,$xb,$yb);
-	}
-
-	// CSIM for bar
-	if( $this->csimtarget != '' ) {
-
-	    $coords = "$xt,$yt,$xb,$yt,$xb,$yb,$xt,$yb";
-	    $this->csimarea .= "<area shape=\"poly\" coords=\"$coords\" href=\"".
-		              $this->csimtarget."\"";
-	    if( $this->csimalt != '' ) {
-		$tmp = $this->csimalt;
-		$this->csimarea .= " alt=\"$tmp\" title=\"$tmp\"";
-	    }
-	    $this->csimarea .= ">\n";
-	}
-
-	// Draw progress bar inside activity bar
-	if( $this->progress->iProgress > 0 ) {
-		
-	    $xtp = $aScale->TranslateDate($st);
-	    $xbp = $aScale->TranslateDate($en);
-	    $len = ($xbp-$xtp)*$this->progress->iProgress;
-
-	    $endpos = $xtp+$len;
-	    if( $endpos > $xt ) {
-		$len -= ($xt-$xtp); 
-
-		// Make sure that the progess bar doesn't extend over the end date
-		if( $xtp+$len-1 > $xb )
-		    $len = $xb - $xtp + 1;
-		
-		if( $xtp < $xt ) 
-		    $xtp = $xt;
-		
-		$prog = $factory->Create($this->progress->iPattern,$this->progress->iColor);
-		$prog->SetDensity($this->progress->iDensity);
-		$prog->SetBackground($this->progress->iFillColor);
-	    	$barheight = ($yb-$yt+1);
-		if( $this->iShadow ) 
-		    $barheight -= $this->iShadowWidth;
-		$progressheight = floor($barheight*$this->progress->iHeight);
-		$marg = ceil(($barheight-$progressheight)/2);
-	    	$pos = new Rectangle($xtp,$yt + $marg, $len,$barheight-2*$marg);
-		$prog->SetPos($pos);
-		$prog->Stroke($aImg);
-	    }
-	}
-	
-	// We don't plot the end mark if the bar has been capped
-	if( $limst == $st ) {
-	    $y = $middle;
-	    // We treat the RIGHT and LEFT triangle mark a little bi
-	    // special so that these marks are placed right under the
-	    // bar.
-	    if( $this->leftMark->GetType() == MARK_LEFTTRIANGLE ) {
-		$y = $yb ; 
-	    }
-	    $this->leftMark->Stroke($aImg,$xt,$y);
-	}
-	if( $limen == $en ) {
-	    $y = $middle;
-	    // We treat the RIGHT and LEFT triangle mark a little bi
-	    // special so that these marks are placed right under the
-	    // bar.
-	    if( $this->rightMark->GetType() == MARK_RIGHTTRIANGLE ) {
-		$y = $yb ; 
-	    }
-	    $this->rightMark->Stroke($aImg,$xb,$y);
-	    
-	    $margin = $this->iCaptionMargin;
-	    if( $this->rightMark->show ) 
-	    	$margin += $this->rightMark->GetWidth();
-	    $this->caption->Stroke($aImg,$xb+$margin,$middle);		
-	}
+        $factory = new RectPatternFactory();
+        $prect = $factory->Create($this->iPattern,$this->iPatternColor);
+        $prect->SetDensity($this->iPatternDensity);
+
+        // If height factor is specified as a float between 0,1 then we take it as meaning
+        // percetage of the scale width between horizontal line.
+        // If it is an integer > 1 we take it to mean the absolute height in pixels
+        if( $this->iHeightFactor > -0.0 && $this->iHeightFactor <= 1.1)
+        	$vs = $aScale->GetVertSpacing()*$this->iHeightFactor;
+        elseif(is_int($this->iHeightFactor) && $this->iHeightFactor>2 && $this->iHeightFactor < 200 )
+        	$vs = $this->iHeightFactor;
+        else {
+        	JpGraphError::RaiseL(6028,$this->iHeightFactor);
+        	//	("Specified height (".$this->iHeightFactor.") for gantt bar is out of range.");
+        }
+
+        // Clip date to min max dates to show
+        $st = $aScale->NormalizeDate($this->iStart);
+        $en = $aScale->NormalizeDate($this->iEnd);
+
+        $limst = max($st,$aScale->iStartDate);
+        $limen = min($en,$aScale->iEndDate);
+
+        $xt = round($aScale->TranslateDate($limst));
+        $xb = round($aScale->TranslateDate($limen));
+        $yt = round($aScale->TranslateVertPos($this->iVPos)-$vs-($aScale->GetVertSpacing()/2-$vs/2));
+        $yb = round($aScale->TranslateVertPos($this->iVPos)-($aScale->GetVertSpacing()/2-$vs/2));
+        $middle = round($yt+($yb-$yt)/2);
+        $this->StrokeActInfo($aImg,$aScale,$middle);
+
+        // CSIM for title
+        if( ! empty($this->title->csimtarget) ) {
+            $colwidth = $this->title->GetColWidth($aImg);
+            $colstarts=array();
+            $aScale->actinfo->GetColStart($aImg,$colstarts,true);
+            $n = min(count($colwidth),count($this->title->csimtarget));
+            for( $i=0; $i < $n; ++$i ) {
+                $title_xt = $colstarts[$i];
+                $title_xb = $title_xt + $colwidth[$i];
+                $coords = "$title_xt,$yt,$title_xb,$yt,$title_xb,$yb,$title_xt,$yb";
+
+                if( ! empty($this->title->csimtarget[$i]) ) {
+                    $this->csimarea .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->title->csimtarget[$i]."\"";
+
+                    if( ! empty($this->title->csimwintarget[$i]) ) {
+                        $this->csimarea .= "target=\"".$this->title->csimwintarget[$i]."\" ";
+                    }
+
+                    if( ! empty($this->title->csimalt[$i]) ) {
+                        $tmp = $this->title->csimalt[$i];
+                        $this->csimarea .= " title=\"$tmp\" alt=\"$tmp\" ";
+                    }
+                    $this->csimarea .= " />\n";
+                }
+            }
+        }
+
+        // Check if the bar is totally outside the current scale range
+        if( $en <  $aScale->iStartDate || $st > $aScale->iEndDate )
+        	return;
+
+
+        // Remember the positions for the bar
+        $this->SetConstrainPos($xt,$yt,$xb,$yb);
+
+
+
+        $prect->ShowFrame(false);
+        $prect->SetBackground($this->iFillColor);
+        if( $this->iBreakStyle ) {
+        	$aImg->SetColor($this->iFrameColor);
+        	$olds = $aImg->SetLineStyle($this->iBreakLineStyle);
+        	$oldw = $aImg->SetLineWeight($this->iBreakLineWeight);
+        	$aImg->StyleLine($xt,$yt,$xb,$yt);
+        	$aImg->StyleLine($xt,$yb,$xb,$yb);
+        	$aImg->SetLineStyle($olds);
+        	$aImg->SetLineWeight($oldw);
+        }
+        else {
+	        if( $this->iShadow ) {
+	            $aImg->SetColor($this->iFrameColor);
+	            $aImg->ShadowRectangle($xt,$yt,$xb,$yb,$this->iFillColor,$this->iShadowWidth,$this->iShadowColor);
+	            $prect->SetPos(new Rectangle($xt+1,$yt+1,$xb-$xt-$this->iShadowWidth-2,$yb-$yt-$this->iShadowWidth-2));
+	            $prect->Stroke($aImg);
+	        }
+	        else {
+	            $prect->SetPos(new Rectangle($xt,$yt,$xb-$xt+1,$yb-$yt+1));
+	            $prect->Stroke($aImg);
+	            $aImg->SetColor($this->iFrameColor);
+	            $aImg->Rectangle($xt,$yt,$xb,$yb);
+	        }
+        }
+        // CSIM for bar
+        if( ! empty($this->csimtarget) ) {
+
+            $coords = "$xt,$yt,$xb,$yt,$xb,$yb,$xt,$yb";
+            $this->csimarea .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->csimtarget."\"";
+
+            if( !empty($this->csimwintarget) ) {
+                $this->csimarea .= " target=\"".$this->csimwintarget."\" ";
+            }
+
+            if( $this->csimalt != '' ) {
+                $tmp = $this->csimalt;
+                $this->csimarea .= " title=\"$tmp\" alt=\"$tmp\" ";
+            }
+            $this->csimarea .= " />\n";
+        }
+
+        // Draw progress bar inside activity bar
+        if( $this->progress->iProgress > 0 ) {
+
+            $xtp = $aScale->TranslateDate($st);
+            $xbp = $aScale->TranslateDate($en);
+            $len = ($xbp-$xtp)*$this->progress->iProgress;
+
+            $endpos = $xtp+$len;
+            if( $endpos > $xt ) {
+
+                // Take away the length of the progress that is not visible (before the start date)
+                $len -= ($xt-$xtp);
+
+                // Is the the progress bar visible after the start date?
+                if( $xtp < $xt )
+                $xtp = $xt;
+
+                // Make sure that the progess bar doesn't extend over the end date
+                if( $xtp+$len-1 > $xb )
+                $len = $xb - $xtp ;
+
+                $prog = $factory->Create($this->progress->iPattern,$this->progress->iColor);
+                $prog->SetDensity($this->progress->iDensity);
+                $prog->SetBackground($this->progress->iFillColor);
+                $barheight = ($yb-$yt+1);
+                if( $this->iShadow )
+                	$barheight -= $this->iShadowWidth;
+                $progressheight = floor($barheight*$this->progress->iHeight);
+                $marg = ceil(($barheight-$progressheight)/2);
+                $pos = new Rectangle($xtp,$yt + $marg, $len,$barheight-2*$marg);
+                $prog->SetPos($pos);
+                $prog->Stroke($aImg);
+            }
+        }
+
+        // We don't plot the end mark if the bar has been capped
+        if( $limst == $st ) {
+            $y = $middle;
+            // We treat the RIGHT and LEFT triangle mark a little bi
+            // special so that these marks are placed right under the
+            // bar.
+            if( $this->leftMark->GetType() == MARK_LEFTTRIANGLE ) {
+                $y = $yb ;
+            }
+            $this->leftMark->Stroke($aImg,$xt,$y);
+        }
+        if( $limen == $en ) {
+            $y = $middle;
+            // We treat the RIGHT and LEFT triangle mark a little bi
+            // special so that these marks are placed right under the
+            // bar.
+            if( $this->rightMark->GetType() == MARK_RIGHTTRIANGLE ) {
+                $y = $yb ;
+            }
+            $this->rightMark->Stroke($aImg,$xb,$y);
+
+            $margin = $this->iCaptionMargin;
+            if( $this->rightMark->show )
+            	$margin += $this->rightMark->GetWidth();
+            $this->caption->Stroke($aImg,$xb+$margin,$middle);
+        }
     }
 }
 
@@ -3323,82 +3515,91 @@ function Stroke($aImg,$aScale) {
 // Responsible for formatting individual milestones
 //===================================================
 class MileStone extends GanttPlotObject {
-    var $mark;
-	
-//---------------
-// CONSTRUCTOR	
-    function MileStone($aVPos,$aLabel,$aDate,$aCaption="") {
-	GanttPlotObject::GanttPlotObject();
-	$this->caption->Set($aCaption);
-	$this->caption->Align("left","center");
-	$this->caption->SetFont(FF_FONT1,FS_BOLD);
-	$this->title->Set($aLabel);
-	$this->title->SetColor("darkred");
-	$this->mark = new PlotMark();
-	$this->mark->SetWidth(10);
-	$this->mark->SetType(MARK_DIAMOND);
-	$this->mark->SetColor("darkred");
-	$this->mark->SetFillColor("darkred");
-	$this->iVPos = $aVPos;
-	$this->iStart = $aDate;
-    }
-	
-//---------------
-// PUBLIC METHODS	
-	
+    public $mark;
+
+    //---------------
+    // CONSTRUCTOR
+    function __construct($aVPos,$aLabel,$aDate,$aCaption="") {
+        GanttPlotObject::__construct();
+        $this->caption->Set($aCaption);
+        $this->caption->Align("left","center");
+        $this->caption->SetFont(FF_FONT1,FS_BOLD);
+        $this->title->Set($aLabel);
+        $this->title->SetColor("darkred");
+        $this->mark = new PlotMark();
+        $this->mark->SetWidth(10);
+        $this->mark->SetType(MARK_DIAMOND);
+        $this->mark->SetColor("darkred");
+        $this->mark->SetFillColor("darkred");
+        $this->iVPos = $aVPos;
+        $this->iStart = $aDate;
+    }
+
+    //---------------
+    // PUBLIC METHODS
+
     function GetAbsHeight($aImg) {
-	return max($this->title->GetHeight($aImg),$this->mark->GetWidth());
+        return max($this->title->GetHeight($aImg),$this->mark->GetWidth());
     }
-		
+
     function Stroke($aImg,$aScale) {
-	// Put the mark in the middle at the middle of the day
-	$d = $aScale->NormalizeDate($this->iStart)+SECPERDAY/2;
-	$x = $aScale->TranslateDate($d);
-	$y = $aScale->TranslateVertPos($this->iVPos)-($aScale->GetVertSpacing()/2);
-
-	$this->StrokeActInfo($aImg,$aScale,$y);
-
-	// CSIM for title
-	if( ! empty($this->title->csimtarget) ) {
-	    
-	    $yt = round($y - $this->title->GetHeight($aImg)/2);
-	    $yb = round($y + $this->title->GetHeight($aImg)/2);
-
-	    $colwidth = $this->title->GetColWidth($aImg);
-	    $colstarts=array();
-	    $aScale->actinfo->GetColStart($aImg,$colstarts,true);
-	    $n = min(count($colwidth),count($this->title->csimtarget));
-	    for( $i=0; $i < $n; ++$i ) {
-		$title_xt = $colstarts[$i];
-		$title_xb = $title_xt + $colwidth[$i];
-		$coords = "$title_xt,$yt,$title_xb,$yt,$title_xb,$yb,$title_xt,$yb";
-		$this->csimarea .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->title->csimtarget[$i]."\"";
-		if( ! empty($this->title->csimalt[$i]) ) {
-		    $tmp = $this->title->csimalt[$i];
-		    $this->csimarea .= " alt=\"$tmp\" title=\"$tmp\"";
-		}
-		$this->csimarea .= ">\n";
-	    }
-	}
+        // Put the mark in the middle at the middle of the day
+        $d = $aScale->NormalizeDate($this->iStart)+SECPERDAY/2;
+        $x = $aScale->TranslateDate($d);
+        $y = $aScale->TranslateVertPos($this->iVPos)-($aScale->GetVertSpacing()/2);
 
-	if( $d <  $aScale->iStartDate || $d > $aScale->iEndDate )
-		return;
-
-	// Remember the coordinates for any constrains linking to
-	// this milestone
-	$w = $this->mark->GetWidth()/2;
-	$this->SetConstrainPos($x,round($y-$w),$x,round($y+$w));
-	
-	// Setup CSIM
-	if( $this->csimtarget != '' ) {
-	    $this->mark->SetCSIMTarget( $this->csimtarget );
-	    $this->mark->SetCSIMAlt( $this->csimalt );
-	}
-		
-	$this->mark->Stroke($aImg,$x,$y);		
-	$this->caption->Stroke($aImg,$x+$this->mark->width/2+$this->iCaptionMargin,$y);
+        $this->StrokeActInfo($aImg,$aScale,$y);
 
-	$this->csimarea .= $this->mark->GetCSIMAreas();
+        // CSIM for title
+        if( ! empty($this->title->csimtarget) ) {
+
+            $yt = round($y - $this->title->GetHeight($aImg)/2);
+            $yb = round($y + $this->title->GetHeight($aImg)/2);
+
+            $colwidth = $this->title->GetColWidth($aImg);
+            $colstarts=array();
+            $aScale->actinfo->GetColStart($aImg,$colstarts,true);
+            $n = min(count($colwidth),count($this->title->csimtarget));
+            for( $i=0; $i < $n; ++$i ) {
+                $title_xt = $colstarts[$i];
+                $title_xb = $title_xt + $colwidth[$i];
+                $coords = "$title_xt,$yt,$title_xb,$yt,$title_xb,$yb,$title_xt,$yb";
+
+                if( !empty($this->title->csimtarget[$i]) ) {
+
+                    $this->csimarea .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->title->csimtarget[$i]."\"";
+
+                    if( !empty($this->title->csimwintarget[$i]) ) {
+                        $this->csimarea .= "target=\"".$this->title->csimwintarget[$i]."\"";
+                    }
+
+                    if( ! empty($this->title->csimalt[$i]) ) {
+                        $tmp = $this->title->csimalt[$i];
+                        $this->csimarea .= " title=\"$tmp\" alt=\"$tmp\" ";
+                    }
+                    $this->csimarea .= " />\n";
+                }
+            }
+        }
+
+        if( $d <  $aScale->iStartDate || $d > $aScale->iEndDate )
+        	return;
+
+        // Remember the coordinates for any constrains linking to
+        // this milestone
+        $w = $this->mark->GetWidth()/2;
+        $this->SetConstrainPos($x,round($y-$w),$x,round($y+$w));
+
+        // Setup CSIM
+        if( $this->csimtarget != '' ) {
+            $this->mark->SetCSIMTarget( $this->csimtarget );
+            $this->mark->SetCSIMAlt( $this->csimalt );
+        }
+
+        $this->mark->Stroke($aImg,$x,$y);
+        $this->caption->Stroke($aImg,$x+$this->mark->width/2+$this->iCaptionMargin,$y);
+
+        $this->csimarea .= $this->mark->GetCSIMAreas();
     }
 }
 
@@ -3409,129 +3610,157 @@ function Stroke($aImg,$aScale) {
 //===================================================
 
 class TextPropertyBelow extends TextProperty {
-    function TextPropertyBelow($aTxt='') {
-	parent::TextProperty($aTxt);
+    function __construct($aTxt='') {
+        parent::__construct($aTxt);
     }
 
-    function GetColWidth($aImg,$margin) {
-	// Since we are not stroking the title in the columns
-	// but rather under the graph we want this to return 0.
-	return array(0);
+    function GetColWidth($aImg,$aMargin=0) {
+        // Since we are not stroking the title in the columns
+        // but rather under the graph we want this to return 0.
+        return array(0);
     }
 }
 
 class GanttVLine extends GanttPlotObject {
 
-    var $iLine,$title_margin=3;
-    var $iDayOffset=1;	// Defult to right edge of day
-	
-//---------------
-// CONSTRUCTOR	
-    function GanttVLine($aDate,$aTitle="",$aColor="black",$aWeight=3,$aStyle="dashed") {
-	GanttPlotObject::GanttPlotObject();
-	$this->iLine = new LineProperty();
-	$this->iLine->SetColor($aColor);
-	$this->iLine->SetWeight($aWeight);
-	$this->iLine->SetStyle($aStyle);
-	$this->iStart = $aDate;
-	$this->title = new TextPropertyBelow();
-	$this->title->Set($aTitle);
-    }
-
-//---------------
-// PUBLIC METHODS	
+    private $iLine,$title_margin=3, $iDayOffset=0.5;
+    private $iStartRow = -1, $iEndRow = -1;
+
+    //---------------
+    // CONSTRUCTOR
+    function __construct($aDate,$aTitle="",$aColor="darkred",$aWeight=2,$aStyle="solid") {
+        GanttPlotObject::__construct();
+        $this->iLine = new LineProperty();
+        $this->iLine->SetColor($aColor);
+        $this->iLine->SetWeight($aWeight);
+        $this->iLine->SetStyle($aStyle);
+        $this->iStart = $aDate;
+        $this->title = new TextPropertyBelow();
+        $this->title->Set($aTitle);
+    }
+
+    //---------------
+    // PUBLIC METHODS
+
+    // Set start and end rows for the VLine. By default the entire heigh of the
+    // Gantt chart is used
+    function SetRowSpan($aStart, $aEnd=-1) {
+        $this->iStartRow = $aStart;
+        $this->iEndRow = $aEnd;
+    }
 
     function SetDayOffset($aOff=0.5) {
-	if( $aOff < 0.0 || $aOff > 1.0 )
-	    JpGraphError::Raise("Offset for vertical line must be in range [0,1]");
-	$this->iDayOffset = $aOff;
+        if( $aOff < 0.0 || $aOff > 1.0 ) {
+        	JpGraphError::RaiseL(6029);
+        	//("Offset for vertical line must be in range [0,1]");
+        }
+        $this->iDayOffset = $aOff;
     }
-	
+
     function SetTitleMargin($aMarg) {
-	$this->title_margin = $aMarg;
+        $this->title_margin = $aMarg;
+    }
+
+    function SetWeight($aWeight) {
+        $this->iLine->SetWeight($aWeight);
     }
-	
+
     function Stroke($aImg,$aScale) {
-	$d = $aScale->NormalizeDate($this->iStart);
-	if( $d <  $aScale->iStartDate || $d > $aScale->iEndDate )
-	    return;	
-	if($this->iDayOffset != 0.0)
-	    $d += 24*60*60*$this->iDayOffset;	
-	$x = $aScale->TranslateDate($d);	
-	$y1 = $aScale->iVertHeaderSize+$aImg->top_margin;
-	$y2 = $aImg->height - $aImg->bottom_margin;	
-	$this->iLine->Stroke($aImg,$x,$y1,$x,$y2);
-	$this->title->Align("center","top");
-	$this->title->Stroke($aImg,$x,$y2+$this->title_margin);
-    }	
+        $d = $aScale->NormalizeDate($this->iStart);
+        if( $d <  $aScale->iStartDate || $d > $aScale->iEndDate )
+            return;
+        if($this->iDayOffset != 0.0)
+            $d += 24*60*60*$this->iDayOffset;
+        $x = $aScale->TranslateDate($d);//d=1006858800,
+
+        if( $this->iStartRow > -1 ) {
+            $y1 = $aScale->TranslateVertPos($this->iStartRow,true) ;
+        }
+        else {
+            $y1 = $aScale->iVertHeaderSize+$aImg->top_margin;
+        }
+
+        if( $this->iEndRow > -1 ) {
+            $y2 = $aScale->TranslateVertPos($this->iEndRow);
+        }
+        else {
+            $y2 = $aImg->height - $aImg->bottom_margin;
+        }
+
+        $this->iLine->Stroke($aImg,$x,$y1,$x,$y2);
+        $this->title->Align("center","top");
+        $this->title->Stroke($aImg,$x,$y2+$this->title_margin);
+    }
 }
 
 //===================================================
 // CLASS LinkArrow
-// Handles the drawing of a an arrow 
+// Handles the drawing of a an arrow
 //===================================================
 class LinkArrow {
-    var $ix,$iy;
-    var $isizespec = array(
-	array(2,3),array(3,5),array(3,8),array(6,15),array(8,22));
-    var $iDirection=ARROW_DOWN,$iType=ARROWT_SOLID,$iSize=ARROW_S2;
-    var $iColor='black';
-
-    function LinkArrow($x,$y,$aDirection,$aType=ARROWT_SOLID,$aSize=ARROW_S2) {
-	$this->iDirection = $aDirection;
-	$this->iType = $aType;
-	$this->iSize = $aSize;
-	$this->ix = $x;
-	$this->iy = $y;
-    }
-    
+    private $ix,$iy;
+    private $isizespec = array(
+    array(2,3),array(3,5),array(3,8),array(6,15),array(8,22));
+    private $iDirection=ARROW_DOWN,$iType=ARROWT_SOLID,$iSize=ARROW_S2;
+    private $iColor='black';
+
+    function __construct($x,$y,$aDirection,$aType=ARROWT_SOLID,$aSize=ARROW_S2) {
+        $this->iDirection = $aDirection;
+        $this->iType = $aType;
+        $this->iSize = $aSize;
+        $this->ix = $x;
+        $this->iy = $y;
+    }
+
     function SetColor($aColor) {
-	$this->iColor = $aColor;
+        $this->iColor = $aColor;
     }
 
     function SetSize($aSize) {
-	$this->iSize = $aSize;
+        $this->iSize = $aSize;
     }
 
     function SetType($aType) {
-	$this->iType = $aType;
+        $this->iType = $aType;
     }
 
     function Stroke($aImg) {
-	list($dx,$dy) = $this->isizespec[$this->iSize];
-	$x = $this->ix;
-	$y = $this->iy;
-	switch ( $this->iDirection ) {
-	    case ARROW_DOWN:
-		$c = array($x,$y,$x-$dx,$y-$dy,$x+$dx,$y-$dy,$x,$y);
-		break;
-	    case ARROW_UP:
-		$c = array($x,$y,$x-$dx,$y+$dy,$x+$dx,$y+$dy,$x,$y);
-		break;
-	    case ARROW_LEFT:
-		$c = array($x,$y,$x+$dy,$y-$dx,$x+$dy,$y+$dx,$x,$y);
-		break;
-	    case ARROW_RIGHT:
-		$c = array($x,$y,$x-$dy,$y-$dx,$x-$dy,$y+$dx,$x,$y);
-		break;
-	    default:
-		JpGraphError::Raise('Unknown arrow direction for link.');
-		die();
-		break;
-	}
-	$aImg->SetColor($this->iColor);
-	switch( $this->iType ) {
-	    case ARROWT_SOLID:
-		$aImg->FilledPolygon($c);
-		break;
-	    case ARROWT_OPEN:
-		$aImg->Polygon($c);
-		break;
-	    default:
-		JpGraphError::Raise('Unknown arrow type for link.');
-		die();
-		break;		
-	}
+        list($dx,$dy) = $this->isizespec[$this->iSize];
+        $x = $this->ix;
+        $y = $this->iy;
+        switch ( $this->iDirection ) {
+            case ARROW_DOWN:
+                $c = array($x,$y,$x-$dx,$y-$dy,$x+$dx,$y-$dy,$x,$y);
+                break;
+            case ARROW_UP:
+                $c = array($x,$y,$x-$dx,$y+$dy,$x+$dx,$y+$dy,$x,$y);
+                break;
+            case ARROW_LEFT:
+                $c = array($x,$y,$x+$dy,$y-$dx,$x+$dy,$y+$dx,$x,$y);
+                break;
+            case ARROW_RIGHT:
+                $c = array($x,$y,$x-$dy,$y-$dx,$x-$dy,$y+$dx,$x,$y);
+                break;
+            default:
+                JpGraphError::RaiseL(6030);
+                //('Unknown arrow direction for link.');
+                die();
+                break;
+        }
+        $aImg->SetColor($this->iColor);
+        switch( $this->iType ) {
+            case ARROWT_SOLID:
+                $aImg->FilledPolygon($c);
+                break;
+            case ARROWT_OPEN:
+                $aImg->Polygon($c);
+                break;
+            default:
+                JpGraphError::RaiseL(6031);
+                //('Unknown arrow type for link.');
+                die();
+                break;
+        }
     }
 }
 
@@ -3541,181 +3770,184 @@ function Stroke($aImg) {
 //===================================================
 
 class GanttLink {
-    var $ix1,$ix2,$iy1,$iy2;
-    var $iPathType=2,$iPathExtend=15;
-    var $iColor='black',$iWeight=1;
-    var $iArrowSize=ARROW_S2,$iArrowType=ARROWT_SOLID;
+    private $ix1,$ix2,$iy1,$iy2;
+    private $iPathType=2,$iPathExtend=15;
+    private $iColor='black',$iWeight=1;
+    private $iArrowSize=ARROW_S2,$iArrowType=ARROWT_SOLID;
 
-    function GanttLink($x1=0,$y1=0,$x2=0,$y2=0) {
-	$this->ix1 = $x1;
-	$this->ix2 = $x2;
-	$this->iy1 = $y1;
-	$this->iy2 = $y2;
+    function __construct($x1=0,$y1=0,$x2=0,$y2=0) {
+        $this->ix1 = $x1;
+        $this->ix2 = $x2;
+        $this->iy1 = $y1;
+        $this->iy2 = $y2;
     }
 
     function SetPos($x1,$y1,$x2,$y2) {
-	$this->ix1 = $x1;
-	$this->ix2 = $x2;
-	$this->iy1 = $y1;
-	$this->iy2 = $y2;
+        $this->ix1 = $x1;
+        $this->ix2 = $x2;
+        $this->iy1 = $y1;
+        $this->iy2 = $y2;
     }
 
     function SetPath($aPath) {
-	$this->iPathType = $aPath;
+        $this->iPathType = $aPath;
     }
 
     function SetColor($aColor) {
-	$this->iColor = $aColor;
+        $this->iColor = $aColor;
     }
 
     function SetArrow($aSize,$aType=ARROWT_SOLID) {
-	$this->iArrowSize = $aSize;
-	$this->iArrowType = $aType;
+        $this->iArrowSize = $aSize;
+        $this->iArrowType = $aType;
     }
-    
+
     function SetWeight($aWeight) {
-	$this->iWeight = $aWeight;
+        $this->iWeight = $aWeight;
     }
 
     function Stroke($aImg) {
-	// The way the path for the arrow is constructed is partly based
-	// on some heuristics. This is not an exact science but draws the
-	// path in a way that, for me, makes esthetic sence. For example
-	// if the start and end activities are very close we make a small
-	// detour to endter the target horixontally. If there are more
-	// space between axctivities then no suh detour is made and the 
-	// target is "hit" directly vertical. I have tried to keep this
-	// simple. no doubt this could become almost infinitive complex
-	// and have some real AI. Feel free to modify this.
-	// This will no-doubt be tweaked as times go by. One design aim
-	// is to avoid having the user choose what types of arrow
-	// he wants.
-
-	// The arrow is drawn between (x1,y1) to (x2,y2)
-	$x1 = $this->ix1 ;
-	$x2 = $this->ix2 ;
-	$y1 = $this->iy1 ;
-	$y2 = $this->iy2 ;
-
-	// Depending on if the target is below or above we have to
-	// handle thi different.
-	if( $y2 > $y1 ) {
-	    $arrowtype = ARROW_DOWN;
-	    $midy = round(($y2-$y1)/2+$y1);
-	    if( $x2 > $x1 ) {
-		switch ( $this->iPathType  ) {
-		    case 0:
-			$c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-			break;
-		    case 1:
-		    case 2:
-		    case 3:
-			$c = array($x1,$y1,$x2,$y1,$x2,$y2);
-			break;
-		    default:
-			JpGraphError::Raise('Internal error: Unknown path type (='.$this->iPathType .') specified for link.');
-			exit(1);
-			break;
-		}
-	    }
-	    else {
-		switch ( $this->iPathType  ) {
-		    case 0:
-		    case 1:
-			$c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-			break;
-		    case 2:
-			// Always extend out horizontally a bit from the first point
-			// If we draw a link back in time (end to start) and the bars 
-			// are very close we also change the path so it comes in from 
-			// the left on the activity
-			$c = array($x1,$y1,$x1+$this->iPathExtend,$y1,
-				   $x1+$this->iPathExtend,$midy,
-				   $x2,$midy,$x2,$y2);
-			break;
-		    case 3:
-			if( $y2-$midy < 6 ) {
-			    $c = array($x1,$y1,$x1,$midy,
-				       $x2-$this->iPathExtend,$midy,
-				       $x2-$this->iPathExtend,$y2,
-				       $x2,$y2);
-			    $arrowtype = ARROW_RIGHT;
-			}
-			else {
-			    $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-			}
-			break;
-		    default:
-			JpGraphError::Raise('Internal error: Unknown path type specified for link.');
-			exit(1);
-			break;
-		}
-	    }
-	    $arrow = new LinkArrow($x2,$y2,$arrowtype);
-	}
-	else {
-	    // Y2 < Y1
-	    $arrowtype = ARROW_UP;
-	    $midy = round(($y1-$y2)/2+$y2);
-	    if( $x2 > $x1 ) {
-		switch ( $this->iPathType  ) {
-		    case 0:
-		    case 1:
-			$c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-			break;
-		    case 3:
-			if( $midy-$y2 < 8 ) {
-			    $arrowtype = ARROW_RIGHT;
-			    $c = array($x1,$y1,$x1,$y2,$x2,$y2);
-			}
-			else {
-			    $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-			}
-			break;
-		    default:
-			JpGraphError::Raise('Internal error: Unknown path type specified for link.');
-			break;
-		}
-	    }
-	    else {
-		switch ( $this->iPathType  ) {
-		    case 0:
-		    case 1:
-			$c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-			break;
-		    case 2:
-			// Always extend out horizontally a bit from the first point
-			$c = array($x1,$y1,$x1+$this->iPathExtend,$y1,
-				   $x1+$this->iPathExtend,$midy,
-				   $x2,$midy,$x2,$y2);
-			break;
-		    case 3:
-			if( $midy-$y2 < 16 ) {
-			    $arrowtype = ARROW_RIGHT;
-			    $c = array($x1,$y1,$x1,$midy,$x2-$this->iPathExtend,$midy,
-				       $x2-$this->iPathExtend,$y2,
-				       $x2,$y2);
-			}
-			else {
-			    $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
-			}
-			break;
-		    default:
-			JpGraphError::Raise('Internal error: Unknown path type specified for link.');
-			exit(1);
-			break;
-		}
-	    }
-	    $arrow = new LinkArrow($x2,$y2,$arrowtype);
-	}
-	$aImg->SetColor($this->iColor);
-	$aImg->SetLineWeight($this->iWeight);
-	$aImg->Polygon($c);
-	$aImg->SetLineWeight(1);
-	$arrow->SetColor($this->iColor);
-	$arrow->SetSize($this->iArrowSize);
-	$arrow->SetType($this->iArrowType);
-	$arrow->Stroke($aImg);
+        // The way the path for the arrow is constructed is partly based
+        // on some heuristics. This is not an exact science but draws the
+        // path in a way that, for me, makes esthetic sence. For example
+        // if the start and end activities are very close we make a small
+        // detour to endter the target horixontally. If there are more
+        // space between axctivities then no suh detour is made and the
+        // target is "hit" directly vertical. I have tried to keep this
+        // simple. no doubt this could become almost infinitive complex
+        // and have some real AI. Feel free to modify this.
+        // This will no-doubt be tweaked as times go by. One design aim
+        // is to avoid having the user choose what types of arrow
+        // he wants.
+
+        // The arrow is drawn between (x1,y1) to (x2,y2)
+        $x1 = $this->ix1 ;
+        $x2 = $this->ix2 ;
+        $y1 = $this->iy1 ;
+        $y2 = $this->iy2 ;
+
+        // Depending on if the target is below or above we have to
+        // handle thi different.
+        if( $y2 > $y1 ) {
+            $arrowtype = ARROW_DOWN;
+            $midy = round(($y2-$y1)/2+$y1);
+            if( $x2 > $x1 ) {
+                switch ( $this->iPathType  ) {
+                    case 0:
+                        $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
+                        break;
+                    case 1:
+                    case 2:
+                    case 3:
+                        $c = array($x1,$y1,$x2,$y1,$x2,$y2);
+                        break;
+                    default:
+                        JpGraphError::RaiseL(6032,$this->iPathType);
+                        //('Internal error: Unknown path type (='.$this->iPathType .') specified for link.');
+                        exit(1);
+                        break;
+                }
+            }
+            else {
+                switch ( $this->iPathType  ) {
+                    case 0:
+                    case 1:
+                        $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
+                        break;
+                    case 2:
+                        // Always extend out horizontally a bit from the first point
+                        // If we draw a link back in time (end to start) and the bars
+                        // are very close we also change the path so it comes in from
+                        // the left on the activity
+                        $c = array($x1,$y1,$x1+$this->iPathExtend,$y1,
+                        $x1+$this->iPathExtend,$midy,
+                        $x2,$midy,$x2,$y2);
+                        break;
+                    case 3:
+                        if( $y2-$midy < 6 ) {
+                            $c = array($x1,$y1,$x1,$midy,
+                            $x2-$this->iPathExtend,$midy,
+                            $x2-$this->iPathExtend,$y2,
+                            $x2,$y2);
+                            $arrowtype = ARROW_RIGHT;
+                        }
+                        else {
+                            $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
+                        }
+                        break;
+                    default:
+                        JpGraphError::RaiseL(6032,$this->iPathType);
+                        //('Internal error: Unknown path type specified for link.');
+                        exit(1);
+                        break;
+                }
+            }
+            $arrow = new LinkArrow($x2,$y2,$arrowtype);
+        }
+        else {
+            // Y2 < Y1
+            $arrowtype = ARROW_UP;
+            $midy = round(($y1-$y2)/2+$y2);
+            if( $x2 > $x1 ) {
+                switch ( $this->iPathType  ) {
+                    case 0:
+                    case 1:
+                        $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
+                        break;
+                    case 3:
+                        if( $midy-$y2 < 8 ) {
+                            $arrowtype = ARROW_RIGHT;
+                            $c = array($x1,$y1,$x1,$y2,$x2,$y2);
+                        }
+                        else {
+                            $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
+                        }
+                        break;
+                    default:
+                        JpGraphError::RaiseL(6032,$this->iPathType);
+                        //('Internal error: Unknown path type specified for link.');
+                        break;
+                }
+            }
+            else {
+                switch ( $this->iPathType  ) {
+                    case 0:
+                    case 1:
+                        $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
+                        break;
+                    case 2:
+                        // Always extend out horizontally a bit from the first point
+                        $c = array($x1,$y1,$x1+$this->iPathExtend,$y1,
+                        $x1+$this->iPathExtend,$midy,
+                        $x2,$midy,$x2,$y2);
+                        break;
+                    case 3:
+                        if( $midy-$y2 < 16 ) {
+                            $arrowtype = ARROW_RIGHT;
+                            $c = array($x1,$y1,$x1,$midy,$x2-$this->iPathExtend,$midy,
+                            $x2-$this->iPathExtend,$y2,
+                            $x2,$y2);
+                        }
+                        else {
+                            $c = array($x1,$y1,$x1,$midy,$x2,$midy,$x2,$y2);
+                        }
+                        break;
+                    default:
+                        JpGraphError::RaiseL(6032,$this->iPathType);
+                        //('Internal error: Unknown path type specified for link.');
+                        break;
+                }
+            }
+            $arrow = new LinkArrow($x2,$y2,$arrowtype);
+        }
+        $aImg->SetColor($this->iColor);
+        $aImg->SetLineWeight($this->iWeight);
+        $aImg->Polygon($c);
+        $aImg->SetLineWeight(1);
+        $arrow->SetColor($this->iColor);
+        $arrow->SetSize($this->iArrowSize);
+        $arrow->SetType($this->iArrowType);
+        $arrow->Stroke($aImg);
     }
 }
 
diff --git a/common/lib/jpgraph_lib/jpgraph_gb2312.php b/common/lib/jpgraph_lib/jpgraph_gb2312.php
old mode 100644
new mode 100755
index e7b7a2324..eff07cbc5
--- a/common/lib/jpgraph_lib/jpgraph_gb2312.php
+++ b/common/lib/jpgraph_lib/jpgraph_gb2312.php
@@ -1,22 +1,20 @@
 <?php
 //=======================================================================
-// File:	JPGRAPH_GB2312.PHP
-// Description:	PHP4 Graph Plotting library. Chinese font conversions
-// Created: 	2003-05-30
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_gb2312.php,v 1.1 2003/05/29 15:59:18 aditus Exp $
+// File:        JPGRAPH_GB2312.PHP
+// Description: Chinese font conversions
+// Created:     2003-05-30
+// Ver:         $Id: jpgraph_gb2312.php 1106 2009-02-22 20:16:35Z ljp $
 //
-// License:	This code is released under QPL 1.0
-// Copyright (C) 2001,2002,2003 Johan Persson
+// Copyright (c) Asial Corporation. All rights reserved.
 //========================================================================
 
-class GB2312toUTF8
-{
-// --------------------------------------------------------------------
-// This code table is used to translate GB2312 code (key) to
-// it's corresponding Unicode value (data)
-// --------------------------------------------------------------------
-    public $codetable = array(
+
+class GB2312toUTF8 {
+    // --------------------------------------------------------------------
+    // This code table is used to translate GB2312 code (key) to
+    // it's corresponding Unicode value (data)
+    // --------------------------------------------------------------------
+    private $codetable = array(
     8481 => 12288, 8482 => 12289, 8483 => 12290, 8484 => 12539, 8485 => 713,
     8486 => 711, 8487 => 168, 8488 => 12291, 8489 => 12293, 8490 => 8213,
     8491 => 65374, 8492 => 8214, 8493 => 8230, 8494 => 8216, 8495 => 8217,
@@ -220,1333 +218,1335 @@ class GB2312toUTF8
     13125 => 25745, 13126 => 31216, 13127 => 22478, 13128 => 27225, 13129 => 25104,
     13130 => 21576, 13131 => 20056, 13132 => 31243, 13133 => 24809, 13134 => 28548,
     13135 => 35802, 13136 => 25215, 13137 => 36894, 13138 => 39563, 13139 => 31204,
-13140 => 21507, 13141 => 30196, 13142 => 25345, 13143 => 21273, 13144 => 27744,
-13145 => 36831, 13146 => 24347, 13147 => 39536, 13148 => 32827, 13149 => 40831,
-13150 => 20360, 13151 => 23610, 13152 => 36196, 13153 => 32709, 13154 => 26021,
-13155 => 28861, 13156 => 20805, 13157 => 20914, 13158 => 34411, 13159 => 23815,
-13160 => 23456, 13161 => 25277, 13162 => 37228, 13163 => 30068, 13164 => 36364,
-13165 => 31264, 13166 => 24833, 13167 => 31609, 13168 => 20167, 13169 => 32504,
-13170 => 30597, 13171 => 19985, 13172 => 33261, 13173 => 21021, 13174 => 20986,
-13175 => 27249, 13176 => 21416, 13177 => 36487, 13178 => 38148, 13179 => 38607,
-13180 => 28353, 13181 => 38500, 13182 => 26970, 13345 => 30784, 13346 => 20648,
-13347 => 30679, 13348 => 25616, 13349 => 35302, 13350 => 22788, 13351 => 25571,
-13352 => 24029, 13353 => 31359, 13354 => 26941, 13355 => 20256, 13356 => 33337,
-13357 => 21912, 13358 => 20018, 13359 => 30126, 13360 => 31383, 13361 => 24162,
-13362 => 24202, 13363 => 38383, 13364 => 21019, 13365 => 21561, 13366 => 28810,
-13367 => 25462, 13368 => 38180, 13369 => 22402, 13370 => 26149, 13371 => 26943,
-13372 => 37255, 13373 => 21767, 13374 => 28147, 13375 => 32431, 13376 => 34850,
-13377 => 25139, 13378 => 32496, 13379 => 30133, 13380 => 33576, 13381 => 30913,
-13382 => 38604, 13383 => 36766, 13384 => 24904, 13385 => 29943, 13386 => 35789,
-13387 => 27492, 13388 => 21050, 13389 => 36176, 13390 => 27425, 13391 => 32874,
-13392 => 33905, 13393 => 22257, 13394 => 21254, 13395 => 20174, 13396 => 19995,
-13397 => 20945, 13398 => 31895, 13399 => 37259, 13400 => 31751, 13401 => 20419,
-13402 => 36479, 13403 => 31713, 13404 => 31388, 13405 => 25703, 13406 => 23828,
-13407 => 20652, 13408 => 33030, 13409 => 30209, 13410 => 31929, 13411 => 28140,
-13412 => 32736, 13413 => 26449, 13414 => 23384, 13415 => 23544, 13416 => 30923,
-13417 => 25774, 13418 => 25619, 13419 => 25514, 13420 => 25387, 13421 => 38169,
-13422 => 25645, 13423 => 36798, 13424 => 31572, 13425 => 30249, 13426 => 25171,
-13427 => 22823, 13428 => 21574, 13429 => 27513, 13430 => 20643, 13431 => 25140,
-13432 => 24102, 13433 => 27526, 13434 => 20195, 13435 => 36151, 13436 => 34955,
-13437 => 24453, 13438 => 36910, 13601 => 24608, 13602 => 32829, 13603 => 25285,
-13604 => 20025, 13605 => 21333, 13606 => 37112, 13607 => 25528, 13608 => 32966,
-13609 => 26086, 13610 => 27694, 13611 => 20294, 13612 => 24814, 13613 => 28129,
-13614 => 35806, 13615 => 24377, 13616 => 34507, 13617 => 24403, 13618 => 25377,
-13619 => 20826, 13620 => 33633, 13621 => 26723, 13622 => 20992, 13623 => 25443,
-13624 => 36424, 13625 => 20498, 13626 => 23707, 13627 => 31095, 13628 => 23548,
-13629 => 21040, 13630 => 31291, 13631 => 24764, 13632 => 36947, 13633 => 30423,
-13634 => 24503, 13635 => 24471, 13636 => 30340, 13637 => 36460, 13638 => 28783,
-13639 => 30331, 13640 => 31561, 13641 => 30634, 13642 => 20979, 13643 => 37011,
-13644 => 22564, 13645 => 20302, 13646 => 28404, 13647 => 36842, 13648 => 25932,
-13649 => 31515, 13650 => 29380, 13651 => 28068, 13652 => 32735, 13653 => 23265,
-13654 => 25269, 13655 => 24213, 13656 => 22320, 13657 => 33922, 13658 => 31532,
-13659 => 24093, 13660 => 24351, 13661 => 36882, 13662 => 32532, 13663 => 39072,
-13664 => 25474, 13665 => 28359, 13666 => 30872, 13667 => 28857, 13668 => 20856,
-13669 => 38747, 13670 => 22443, 13671 => 30005, 13672 => 20291, 13673 => 30008,
-13674 => 24215, 13675 => 24806, 13676 => 22880, 13677 => 28096, 13678 => 27583,
-13679 => 30857, 13680 => 21500, 13681 => 38613, 13682 => 20939, 13683 => 20993,
-13684 => 25481, 13685 => 21514, 13686 => 38035, 13687 => 35843, 13688 => 36300,
-13689 => 29241, 13690 => 30879, 13691 => 34678, 13692 => 36845, 13693 => 35853,
-13694 => 21472, 13857 => 19969, 13858 => 30447, 13859 => 21486, 13860 => 38025,
-13861 => 39030, 13862 => 40718, 13863 => 38189, 13864 => 23450, 13865 => 35746,
-13866 => 20002, 13867 => 19996, 13868 => 20908, 13869 => 33891, 13870 => 25026,
-13871 => 21160, 13872 => 26635, 13873 => 20375, 13874 => 24683, 13875 => 20923,
-13876 => 27934, 13877 => 20828, 13878 => 25238, 13879 => 26007, 13880 => 38497,
-13881 => 35910, 13882 => 36887, 13883 => 30168, 13884 => 37117, 13885 => 30563,
-13886 => 27602, 13887 => 29322, 13888 => 29420, 13889 => 35835, 13890 => 22581,
-13891 => 30585, 13892 => 36172, 13893 => 26460, 13894 => 38208, 13895 => 32922,
-13896 => 24230, 13897 => 28193, 13898 => 22930, 13899 => 31471, 13900 => 30701,
-13901 => 38203, 13902 => 27573, 13903 => 26029, 13904 => 32526, 13905 => 22534,
-13906 => 20817, 13907 => 38431, 13908 => 23545, 13909 => 22697, 13910 => 21544,
-13911 => 36466, 13912 => 25958, 13913 => 39039, 13914 => 22244, 13915 => 38045,
-13916 => 30462, 13917 => 36929, 13918 => 25479, 13919 => 21702, 13920 => 22810,
-13921 => 22842, 13922 => 22427, 13923 => 36530, 13924 => 26421, 13925 => 36346,
-13926 => 33333, 13927 => 21057, 13928 => 24816, 13929 => 22549, 13930 => 34558,
-13931 => 23784, 13932 => 40517, 13933 => 20420, 13934 => 39069, 13935 => 35769,
-13936 => 23077, 13937 => 24694, 13938 => 21380, 13939 => 25212, 13940 => 36943,
-13941 => 37122, 13942 => 39295, 13943 => 24681, 13944 => 32780, 13945 => 20799,
-13946 => 32819, 13947 => 23572, 13948 => 39285, 13949 => 27953, 13950 => 20108,
-14113 => 36144, 14114 => 21457, 14115 => 32602, 14116 => 31567, 14117 => 20240,
-14118 => 20047, 14119 => 38400, 14120 => 27861, 14121 => 29648, 14122 => 34281,
-14123 => 24070, 14124 => 30058, 14125 => 32763, 14126 => 27146, 14127 => 30718,
-14128 => 38034, 14129 => 32321, 14130 => 20961, 14131 => 28902, 14132 => 21453,
-14133 => 36820, 14134 => 33539, 14135 => 36137, 14136 => 29359, 14137 => 39277,
-14138 => 27867, 14139 => 22346, 14140 => 33459, 14141 => 26041, 14142 => 32938,
-14143 => 25151, 14144 => 38450, 14145 => 22952, 14146 => 20223, 14147 => 35775,
-14148 => 32442, 14149 => 25918, 14150 => 33778, 14151 => 38750, 14152 => 21857,
-14153 => 39134, 14154 => 32933, 14155 => 21290, 14156 => 35837, 14157 => 21536,
-14158 => 32954, 14159 => 24223, 14160 => 27832, 14161 => 36153, 14162 => 33452,
-14163 => 37210, 14164 => 21545, 14165 => 27675, 14166 => 20998, 14167 => 32439,
-14168 => 22367, 14169 => 28954, 14170 => 27774, 14171 => 31881, 14172 => 22859,
-14173 => 20221, 14174 => 24575, 14175 => 24868, 14176 => 31914, 14177 => 20016,
-14178 => 23553, 14179 => 26539, 14180 => 34562, 14181 => 23792, 14182 => 38155,
-14183 => 39118, 14184 => 30127, 14185 => 28925, 14186 => 36898, 14187 => 20911,
-14188 => 32541, 14189 => 35773, 14190 => 22857, 14191 => 20964, 14192 => 20315,
-14193 => 21542, 14194 => 22827, 14195 => 25975, 14196 => 32932, 14197 => 23413,
-14198 => 25206, 14199 => 25282, 14200 => 36752, 14201 => 24133, 14202 => 27679,
-14203 => 31526, 14204 => 20239, 14205 => 20440, 14206 => 26381, 14369 => 28014,
-14370 => 28074, 14371 => 31119, 14372 => 34993, 14373 => 24343, 14374 => 29995,
-14375 => 25242, 14376 => 36741, 14377 => 20463, 14378 => 37340, 14379 => 26023,
-14380 => 33071, 14381 => 33105, 14382 => 24220, 14383 => 33104, 14384 => 36212,
-14385 => 21103, 14386 => 35206, 14387 => 36171, 14388 => 22797, 14389 => 20613,
-14390 => 20184, 14391 => 38428, 14392 => 29238, 14393 => 33145, 14394 => 36127,
-14395 => 23500, 14396 => 35747, 14397 => 38468, 14398 => 22919, 14399 => 32538,
-14400 => 21648, 14401 => 22134, 14402 => 22030, 14403 => 35813, 14404 => 25913,
-14405 => 27010, 14406 => 38041, 14407 => 30422, 14408 => 28297, 14409 => 24178,
-14410 => 29976, 14411 => 26438, 14412 => 26577, 14413 => 31487, 14414 => 32925,
-14415 => 36214, 14416 => 24863, 14417 => 31174, 14418 => 25954, 14419 => 36195,
-14420 => 20872, 14421 => 21018, 14422 => 38050, 14423 => 32568, 14424 => 32923,
-14425 => 32434, 14426 => 23703, 14427 => 28207, 14428 => 26464, 14429 => 31705,
-14430 => 30347, 14431 => 39640, 14432 => 33167, 14433 => 32660, 14434 => 31957,
-14435 => 25630, 14436 => 38224, 14437 => 31295, 14438 => 21578, 14439 => 21733,
-14440 => 27468, 14441 => 25601, 14442 => 25096, 14443 => 40509, 14444 => 33011,
-14445 => 30105, 14446 => 21106, 14447 => 38761, 14448 => 33883, 14449 => 26684,
-14450 => 34532, 14451 => 38401, 14452 => 38548, 14453 => 38124, 14454 => 20010,
-14455 => 21508, 14456 => 32473, 14457 => 26681, 14458 => 36319, 14459 => 32789,
-14460 => 26356, 14461 => 24218, 14462 => 32697, 14625 => 22466, 14626 => 32831,
-14627 => 26775, 14628 => 24037, 14629 => 25915, 14630 => 21151, 14631 => 24685,
-14632 => 40858, 14633 => 20379, 14634 => 36524, 14635 => 20844, 14636 => 23467,
-14637 => 24339, 14638 => 24041, 14639 => 27742, 14640 => 25329, 14641 => 36129,
-14642 => 20849, 14643 => 38057, 14644 => 21246, 14645 => 27807, 14646 => 33503,
-14647 => 29399, 14648 => 22434, 14649 => 26500, 14650 => 36141, 14651 => 22815,
-14652 => 36764, 14653 => 33735, 14654 => 21653, 14655 => 31629, 14656 => 20272,
-14657 => 27837, 14658 => 23396, 14659 => 22993, 14660 => 40723, 14661 => 21476,
-14662 => 34506, 14663 => 39592, 14664 => 35895, 14665 => 32929, 14666 => 25925,
-14667 => 39038, 14668 => 22266, 14669 => 38599, 14670 => 21038, 14671 => 29916,
-14672 => 21072, 14673 => 23521, 14674 => 25346, 14675 => 35074, 14676 => 20054,
-14677 => 25296, 14678 => 24618, 14679 => 26874, 14680 => 20851, 14681 => 23448,
-14682 => 20896, 14683 => 35266, 14684 => 31649, 14685 => 39302, 14686 => 32592,
-14687 => 24815, 14688 => 28748, 14689 => 36143, 14690 => 20809, 14691 => 24191,
-14692 => 36891, 14693 => 29808, 14694 => 35268, 14695 => 22317, 14696 => 30789,
-14697 => 24402, 14698 => 40863, 14699 => 38394, 14700 => 36712, 14701 => 39740,
-14702 => 35809, 14703 => 30328, 14704 => 26690, 14705 => 26588, 14706 => 36330,
-14707 => 36149, 14708 => 21053, 14709 => 36746, 14710 => 28378, 14711 => 26829,
-14712 => 38149, 14713 => 37101, 14714 => 22269, 14715 => 26524, 14716 => 35065,
-14717 => 36807, 14718 => 21704, 14881 => 39608, 14882 => 23401, 14883 => 28023,
-14884 => 27686, 14885 => 20133, 14886 => 23475, 14887 => 39559, 14888 => 37219,
-14889 => 25000, 14890 => 37039, 14891 => 38889, 14892 => 21547, 14893 => 28085,
-14894 => 23506, 14895 => 20989, 14896 => 21898, 14897 => 32597, 14898 => 32752,
-14899 => 25788, 14900 => 25421, 14901 => 26097, 14902 => 25022, 14903 => 24717,
-14904 => 28938, 14905 => 27735, 14906 => 27721, 14907 => 22831, 14908 => 26477,
-14909 => 33322, 14910 => 22741, 14911 => 22158, 14912 => 35946, 14913 => 27627,
-14914 => 37085, 14915 => 22909, 14916 => 32791, 14917 => 21495, 14918 => 28009,
-14919 => 21621, 14920 => 21917, 14921 => 33655, 14922 => 33743, 14923 => 26680,
-14924 => 31166, 14925 => 21644, 14926 => 20309, 14927 => 21512, 14928 => 30418,
-14929 => 35977, 14930 => 38402, 14931 => 27827, 14932 => 28088, 14933 => 36203,
-14934 => 35088, 14935 => 40548, 14936 => 36154, 14937 => 22079, 14938 => 40657,
-14939 => 30165, 14940 => 24456, 14941 => 29408, 14942 => 24680, 14943 => 21756,
-14944 => 20136, 14945 => 27178, 14946 => 34913, 14947 => 24658, 14948 => 36720,
-14949 => 21700, 14950 => 28888, 14951 => 34425, 14952 => 40511, 14953 => 27946,
-14954 => 23439, 14955 => 24344, 14956 => 32418, 14957 => 21897, 14958 => 20399,
-14959 => 29492, 14960 => 21564, 14961 => 21402, 14962 => 20505, 14963 => 21518,
-14964 => 21628, 14965 => 20046, 14966 => 24573, 14967 => 29786, 14968 => 22774,
-14969 => 33899, 14970 => 32993, 14971 => 34676, 14972 => 29392, 14973 => 31946,
-14974 => 28246, 15137 => 24359, 15138 => 34382, 15139 => 21804, 15140 => 25252,
-15141 => 20114, 15142 => 27818, 15143 => 25143, 15144 => 33457, 15145 => 21719,
-15146 => 21326, 15147 => 29502, 15148 => 28369, 15149 => 30011, 15150 => 21010,
-15151 => 21270, 15152 => 35805, 15153 => 27088, 15154 => 24458, 15155 => 24576,
-15156 => 28142, 15157 => 22351, 15158 => 27426, 15159 => 29615, 15160 => 26707,
-15161 => 36824, 15162 => 32531, 15163 => 25442, 15164 => 24739, 15165 => 21796,
-15166 => 30186, 15167 => 35938, 15168 => 28949, 15169 => 28067, 15170 => 23462,
-15171 => 24187, 15172 => 33618, 15173 => 24908, 15174 => 40644, 15175 => 30970,
-15176 => 34647, 15177 => 31783, 15178 => 30343, 15179 => 20976, 15180 => 24822,
-15181 => 29004, 15182 => 26179, 15183 => 24140, 15184 => 24653, 15185 => 35854,
-15186 => 28784, 15187 => 25381, 15188 => 36745, 15189 => 24509, 15190 => 24674,
-15191 => 34516, 15192 => 22238, 15193 => 27585, 15194 => 24724, 15195 => 24935,
-15196 => 21321, 15197 => 24800, 15198 => 26214, 15199 => 36159, 15200 => 31229,
-15201 => 20250, 15202 => 28905, 15203 => 27719, 15204 => 35763, 15205 => 35826,
-15206 => 32472, 15207 => 33636, 15208 => 26127, 15209 => 23130, 15210 => 39746,
-15211 => 27985, 15212 => 28151, 15213 => 35905, 15214 => 27963, 15215 => 20249,
-15216 => 28779, 15217 => 33719, 15218 => 25110, 15219 => 24785, 15220 => 38669,
-15221 => 36135, 15222 => 31096, 15223 => 20987, 15224 => 22334, 15225 => 22522,
-15226 => 26426, 15227 => 30072, 15228 => 31293, 15229 => 31215, 15230 => 31637,
-15393 => 32908, 15394 => 39269, 15395 => 36857, 15396 => 28608, 15397 => 35749,
-15398 => 40481, 15399 => 23020, 15400 => 32489, 15401 => 32521, 15402 => 21513,
-15403 => 26497, 15404 => 26840, 15405 => 36753, 15406 => 31821, 15407 => 38598,
-15408 => 21450, 15409 => 24613, 15410 => 30142, 15411 => 27762, 15412 => 21363,
-15413 => 23241, 15414 => 32423, 15415 => 25380, 15416 => 20960, 15417 => 33034,
-15418 => 24049, 15419 => 34015, 15420 => 25216, 15421 => 20864, 15422 => 23395,
-15423 => 20238, 15424 => 31085, 15425 => 21058, 15426 => 24760, 15427 => 27982,
-15428 => 23492, 15429 => 23490, 15430 => 35745, 15431 => 35760, 15432 => 26082,
-15433 => 24524, 15434 => 38469, 15435 => 22931, 15436 => 32487, 15437 => 32426,
-15438 => 22025, 15439 => 26551, 15440 => 22841, 15441 => 20339, 15442 => 23478,
-15443 => 21152, 15444 => 33626, 15445 => 39050, 15446 => 36158, 15447 => 30002,
-15448 => 38078, 15449 => 20551, 15450 => 31292, 15451 => 20215, 15452 => 26550,
-15453 => 39550, 15454 => 23233, 15455 => 27516, 15456 => 30417, 15457 => 22362,
-15458 => 23574, 15459 => 31546, 15460 => 38388, 15461 => 29006, 15462 => 20860,
-15463 => 32937, 15464 => 33392, 15465 => 22904, 15466 => 32516, 15467 => 33575,
-15468 => 26816, 15469 => 26604, 15470 => 30897, 15471 => 30839, 15472 => 25315,
-15473 => 25441, 15474 => 31616, 15475 => 20461, 15476 => 21098, 15477 => 20943,
-15478 => 33616, 15479 => 27099, 15480 => 37492, 15481 => 36341, 15482 => 36145,
-15483 => 35265, 15484 => 38190, 15485 => 31661, 15486 => 20214, 15649 => 20581,
-15650 => 33328, 15651 => 21073, 15652 => 39279, 15653 => 28176, 15654 => 28293,
-15655 => 28071, 15656 => 24314, 15657 => 20725, 15658 => 23004, 15659 => 23558,
-15660 => 27974, 15661 => 27743, 15662 => 30086, 15663 => 33931, 15664 => 26728,
-15665 => 22870, 15666 => 35762, 15667 => 21280, 15668 => 37233, 15669 => 38477,
-15670 => 34121, 15671 => 26898, 15672 => 30977, 15673 => 28966, 15674 => 33014,
-15675 => 20132, 15676 => 37066, 15677 => 27975, 15678 => 39556, 15679 => 23047,
-15680 => 22204, 15681 => 25605, 15682 => 38128, 15683 => 30699, 15684 => 20389,
-15685 => 33050, 15686 => 29409, 15687 => 35282, 15688 => 39290, 15689 => 32564,
-15690 => 32478, 15691 => 21119, 15692 => 25945, 15693 => 37237, 15694 => 36735,
-15695 => 36739, 15696 => 21483, 15697 => 31382, 15698 => 25581, 15699 => 25509,
-15700 => 30342, 15701 => 31224, 15702 => 34903, 15703 => 38454, 15704 => 25130,
-15705 => 21163, 15706 => 33410, 15707 => 26708, 15708 => 26480, 15709 => 25463,
-15710 => 30571, 15711 => 31469, 15712 => 27905, 15713 => 32467, 15714 => 35299,
-15715 => 22992, 15716 => 25106, 15717 => 34249, 15718 => 33445, 15719 => 30028,
-15720 => 20511, 15721 => 20171, 15722 => 30117, 15723 => 35819, 15724 => 23626,
-15725 => 24062, 15726 => 31563, 15727 => 26020, 15728 => 37329, 15729 => 20170,
-15730 => 27941, 15731 => 35167, 15732 => 32039, 15733 => 38182, 15734 => 20165,
-15735 => 35880, 15736 => 36827, 15737 => 38771, 15738 => 26187, 15739 => 31105,
-15740 => 36817, 15741 => 28908, 15742 => 28024, 15905 => 23613, 15906 => 21170,
-15907 => 33606, 15908 => 20834, 15909 => 33550, 15910 => 30555, 15911 => 26230,
-15912 => 40120, 15913 => 20140, 15914 => 24778, 15915 => 31934, 15916 => 31923,
-15917 => 32463, 15918 => 20117, 15919 => 35686, 15920 => 26223, 15921 => 39048,
-15922 => 38745, 15923 => 22659, 15924 => 25964, 15925 => 38236, 15926 => 24452,
-15927 => 30153, 15928 => 38742, 15929 => 31455, 15930 => 31454, 15931 => 20928,
-15932 => 28847, 15933 => 31384, 15934 => 25578, 15935 => 31350, 15936 => 32416,
-15937 => 29590, 15938 => 38893, 15939 => 20037, 15940 => 28792, 15941 => 20061,
-15942 => 37202, 15943 => 21417, 15944 => 25937, 15945 => 26087, 15946 => 33276,
-15947 => 33285, 15948 => 21646, 15949 => 23601, 15950 => 30106, 15951 => 38816,
-15952 => 25304, 15953 => 29401, 15954 => 30141, 15955 => 23621, 15956 => 39545,
-15957 => 33738, 15958 => 23616, 15959 => 21632, 15960 => 30697, 15961 => 20030,
-15962 => 27822, 15963 => 32858, 15964 => 25298, 15965 => 25454, 15966 => 24040,
-15967 => 20855, 15968 => 36317, 15969 => 36382, 15970 => 38191, 15971 => 20465,
-15972 => 21477, 15973 => 24807, 15974 => 28844, 15975 => 21095, 15976 => 25424,
-15977 => 40515, 15978 => 23071, 15979 => 20518, 15980 => 30519, 15981 => 21367,
-15982 => 32482, 15983 => 25733, 15984 => 25899, 15985 => 25225, 15986 => 25496,
-15987 => 20500, 15988 => 29237, 15989 => 35273, 15990 => 20915, 15991 => 35776,
-15992 => 32477, 15993 => 22343, 15994 => 33740, 15995 => 38055, 15996 => 20891,
-15997 => 21531, 15998 => 23803, 16161 => 20426, 16162 => 31459, 16163 => 27994,
-16164 => 37089, 16165 => 39567, 16166 => 21888, 16167 => 21654, 16168 => 21345,
-16169 => 21679, 16170 => 24320, 16171 => 25577, 16172 => 26999, 16173 => 20975,
-16174 => 24936, 16175 => 21002, 16176 => 22570, 16177 => 21208, 16178 => 22350,
-16179 => 30733, 16180 => 30475, 16181 => 24247, 16182 => 24951, 16183 => 31968,
-16184 => 25179, 16185 => 25239, 16186 => 20130, 16187 => 28821, 16188 => 32771,
-16189 => 25335, 16190 => 28900, 16191 => 38752, 16192 => 22391, 16193 => 33499,
-16194 => 26607, 16195 => 26869, 16196 => 30933, 16197 => 39063, 16198 => 31185,
-16199 => 22771, 16200 => 21683, 16201 => 21487, 16202 => 28212, 16203 => 20811,
-16204 => 21051, 16205 => 23458, 16206 => 35838, 16207 => 32943, 16208 => 21827,
-16209 => 22438, 16210 => 24691, 16211 => 22353, 16212 => 21549, 16213 => 31354,
-16214 => 24656, 16215 => 23380, 16216 => 25511, 16217 => 25248, 16218 => 21475,
-16219 => 25187, 16220 => 23495, 16221 => 26543, 16222 => 21741, 16223 => 31391,
-16224 => 33510, 16225 => 37239, 16226 => 24211, 16227 => 35044, 16228 => 22840,
-16229 => 22446, 16230 => 25358, 16231 => 36328, 16232 => 33007, 16233 => 22359,
-16234 => 31607, 16235 => 20393, 16236 => 24555, 16237 => 23485, 16238 => 27454,
-16239 => 21281, 16240 => 31568, 16241 => 29378, 16242 => 26694, 16243 => 30719,
-16244 => 30518, 16245 => 26103, 16246 => 20917, 16247 => 20111, 16248 => 30420,
-16249 => 23743, 16250 => 31397, 16251 => 33909, 16252 => 22862, 16253 => 39745,
-16254 => 20608, 16417 => 39304, 16418 => 24871, 16419 => 28291, 16420 => 22372,
-16421 => 26118, 16422 => 25414, 16423 => 22256, 16424 => 25324, 16425 => 25193,
-16426 => 24275, 16427 => 38420, 16428 => 22403, 16429 => 25289, 16430 => 21895,
-16431 => 34593, 16432 => 33098, 16433 => 36771, 16434 => 21862, 16435 => 33713,
-16436 => 26469, 16437 => 36182, 16438 => 34013, 16439 => 23146, 16440 => 26639,
-16441 => 25318, 16442 => 31726, 16443 => 38417, 16444 => 20848, 16445 => 28572,
-16446 => 35888, 16447 => 25597, 16448 => 35272, 16449 => 25042, 16450 => 32518,
-16451 => 28866, 16452 => 28389, 16453 => 29701, 16454 => 27028, 16455 => 29436,
-16456 => 24266, 16457 => 37070, 16458 => 26391, 16459 => 28010, 16460 => 25438,
-16461 => 21171, 16462 => 29282, 16463 => 32769, 16464 => 20332, 16465 => 23013,
-16466 => 37226, 16467 => 28889, 16468 => 28061, 16469 => 21202, 16470 => 20048,
-16471 => 38647, 16472 => 38253, 16473 => 34174, 16474 => 30922, 16475 => 32047,
-16476 => 20769, 16477 => 22418, 16478 => 25794, 16479 => 32907, 16480 => 31867,
-16481 => 27882, 16482 => 26865, 16483 => 26974, 16484 => 20919, 16485 => 21400,
-16486 => 26792, 16487 => 29313, 16488 => 40654, 16489 => 31729, 16490 => 29432,
-16491 => 31163, 16492 => 28435, 16493 => 29702, 16494 => 26446, 16495 => 37324,
-16496 => 40100, 16497 => 31036, 16498 => 33673, 16499 => 33620, 16500 => 21519,
-16501 => 26647, 16502 => 20029, 16503 => 21385, 16504 => 21169, 16505 => 30782,
-16506 => 21382, 16507 => 21033, 16508 => 20616, 16509 => 20363, 16510 => 20432,
-16673 => 30178, 16674 => 31435, 16675 => 31890, 16676 => 27813, 16677 => 38582,
-16678 => 21147, 16679 => 29827, 16680 => 21737, 16681 => 20457, 16682 => 32852,
-16683 => 33714, 16684 => 36830, 16685 => 38256, 16686 => 24265, 16687 => 24604,
-16688 => 28063, 16689 => 24088, 16690 => 25947, 16691 => 33080, 16692 => 38142,
-16693 => 24651, 16694 => 28860, 16695 => 32451, 16696 => 31918, 16697 => 20937,
-16698 => 26753, 16699 => 31921, 16700 => 33391, 16701 => 20004, 16702 => 36742,
-16703 => 37327, 16704 => 26238, 16705 => 20142, 16706 => 35845, 16707 => 25769,
-16708 => 32842, 16709 => 20698, 16710 => 30103, 16711 => 29134, 16712 => 23525,
-16713 => 36797, 16714 => 28518, 16715 => 20102, 16716 => 25730, 16717 => 38243,
-16718 => 24278, 16719 => 26009, 16720 => 21015, 16721 => 35010, 16722 => 28872,
-16723 => 21155, 16724 => 29454, 16725 => 29747, 16726 => 26519, 16727 => 30967,
-16728 => 38678, 16729 => 20020, 16730 => 37051, 16731 => 40158, 16732 => 28107,
-16733 => 20955, 16734 => 36161, 16735 => 21533, 16736 => 25294, 16737 => 29618,
-16738 => 33777, 16739 => 38646, 16740 => 40836, 16741 => 38083, 16742 => 20278,
-16743 => 32666, 16744 => 20940, 16745 => 28789, 16746 => 38517, 16747 => 23725,
-16748 => 39046, 16749 => 21478, 16750 => 20196, 16751 => 28316, 16752 => 29705,
-16753 => 27060, 16754 => 30827, 16755 => 39311, 16756 => 30041, 16757 => 21016,
-16758 => 30244, 16759 => 27969, 16760 => 26611, 16761 => 20845, 16762 => 40857,
-16763 => 32843, 16764 => 21657, 16765 => 31548, 16766 => 31423, 16929 => 38534,
-16930 => 22404, 16931 => 25314, 16932 => 38471, 16933 => 27004, 16934 => 23044,
-16935 => 25602, 16936 => 31699, 16937 => 28431, 16938 => 38475, 16939 => 33446,
-16940 => 21346, 16941 => 39045, 16942 => 24208, 16943 => 28809, 16944 => 25523,
-16945 => 21348, 16946 => 34383, 16947 => 40065, 16948 => 40595, 16949 => 30860,
-16950 => 38706, 16951 => 36335, 16952 => 36162, 16953 => 40575, 16954 => 28510,
-16955 => 31108, 16956 => 24405, 16957 => 38470, 16958 => 25134, 16959 => 39540,
-16960 => 21525, 16961 => 38109, 16962 => 20387, 16963 => 26053, 16964 => 23653,
-16965 => 23649, 16966 => 32533, 16967 => 34385, 16968 => 27695, 16969 => 24459,
-16970 => 29575, 16971 => 28388, 16972 => 32511, 16973 => 23782, 16974 => 25371,
-16975 => 23402, 16976 => 28390, 16977 => 21365, 16978 => 20081, 16979 => 25504,
-16980 => 30053, 16981 => 25249, 16982 => 36718, 16983 => 20262, 16984 => 20177,
-16985 => 27814, 16986 => 32438, 16987 => 35770, 16988 => 33821, 16989 => 34746,
-16990 => 32599, 16991 => 36923, 16992 => 38179, 16993 => 31657, 16994 => 39585,
-16995 => 35064, 16996 => 33853, 16997 => 27931, 16998 => 39558, 16999 => 32476,
-17000 => 22920, 17001 => 40635, 17002 => 29595, 17003 => 30721, 17004 => 34434,
-17005 => 39532, 17006 => 39554, 17007 => 22043, 17008 => 21527, 17009 => 22475,
-17010 => 20080, 17011 => 40614, 17012 => 21334, 17013 => 36808, 17014 => 33033,
-17015 => 30610, 17016 => 39314, 17017 => 34542, 17018 => 28385, 17019 => 34067,
-17020 => 26364, 17021 => 24930, 17022 => 28459, 17185 => 35881, 17186 => 33426,
-17187 => 33579, 17188 => 30450, 17189 => 27667, 17190 => 24537, 17191 => 33725,
-17192 => 29483, 17193 => 33541, 17194 => 38170, 17195 => 27611, 17196 => 30683,
-17197 => 38086, 17198 => 21359, 17199 => 33538, 17200 => 20882, 17201 => 24125,
-17202 => 35980, 17203 => 36152, 17204 => 20040, 17205 => 29611, 17206 => 26522,
-17207 => 26757, 17208 => 37238, 17209 => 38665, 17210 => 29028, 17211 => 27809,
-17212 => 30473, 17213 => 23186, 17214 => 38209, 17215 => 27599, 17216 => 32654,
-17217 => 26151, 17218 => 23504, 17219 => 22969, 17220 => 23194, 17221 => 38376,
-17222 => 38391, 17223 => 20204, 17224 => 33804, 17225 => 33945, 17226 => 27308,
-17227 => 30431, 17228 => 38192, 17229 => 29467, 17230 => 26790, 17231 => 23391,
-17232 => 30511, 17233 => 37274, 17234 => 38753, 17235 => 31964, 17236 => 36855,
-17237 => 35868, 17238 => 24357, 17239 => 31859, 17240 => 31192, 17241 => 35269,
-17242 => 27852, 17243 => 34588, 17244 => 23494, 17245 => 24130, 17246 => 26825,
-17247 => 30496, 17248 => 32501, 17249 => 20885, 17250 => 20813, 17251 => 21193,
-17252 => 23081, 17253 => 32517, 17254 => 38754, 17255 => 33495, 17256 => 25551,
-17257 => 30596, 17258 => 34256, 17259 => 31186, 17260 => 28218, 17261 => 24217,
-17262 => 22937, 17263 => 34065, 17264 => 28781, 17265 => 27665, 17266 => 25279,
-17267 => 30399, 17268 => 25935, 17269 => 24751, 17270 => 38397, 17271 => 26126,
-17272 => 34719, 17273 => 40483, 17274 => 38125, 17275 => 21517, 17276 => 21629,
-17277 => 35884, 17278 => 25720, 17441 => 25721, 17442 => 34321, 17443 => 27169,
-17444 => 33180, 17445 => 30952, 17446 => 25705, 17447 => 39764, 17448 => 25273,
-17449 => 26411, 17450 => 33707, 17451 => 22696, 17452 => 40664, 17453 => 27819,
-17454 => 28448, 17455 => 23518, 17456 => 38476, 17457 => 35851, 17458 => 29279,
-17459 => 26576, 17460 => 25287, 17461 => 29281, 17462 => 20137, 17463 => 22982,
-17464 => 27597, 17465 => 22675, 17466 => 26286, 17467 => 24149, 17468 => 21215,
-17469 => 24917, 17470 => 26408, 17471 => 30446, 17472 => 30566, 17473 => 29287,
-17474 => 31302, 17475 => 25343, 17476 => 21738, 17477 => 21584, 17478 => 38048,
-17479 => 37027, 17480 => 23068, 17481 => 32435, 17482 => 27670, 17483 => 20035,
-17484 => 22902, 17485 => 32784, 17486 => 22856, 17487 => 21335, 17488 => 30007,
-17489 => 38590, 17490 => 22218, 17491 => 25376, 17492 => 33041, 17493 => 24700,
-17494 => 38393, 17495 => 28118, 17496 => 21602, 17497 => 39297, 17498 => 20869,
-17499 => 23273, 17500 => 33021, 17501 => 22958, 17502 => 38675, 17503 => 20522,
-17504 => 27877, 17505 => 23612, 17506 => 25311, 17507 => 20320, 17508 => 21311,
-17509 => 33147, 17510 => 36870, 17511 => 28346, 17512 => 34091, 17513 => 25288,
-17514 => 24180, 17515 => 30910, 17516 => 25781, 17517 => 25467, 17518 => 24565,
-17519 => 23064, 17520 => 37247, 17521 => 40479, 17522 => 23615, 17523 => 25423,
-17524 => 32834, 17525 => 23421, 17526 => 21870, 17527 => 38218, 17528 => 38221,
-17529 => 28037, 17530 => 24744, 17531 => 26592, 17532 => 29406, 17533 => 20957,
-17534 => 23425, 17697 => 25319, 17698 => 27870, 17699 => 29275, 17700 => 25197,
-17701 => 38062, 17702 => 32445, 17703 => 33043, 17704 => 27987, 17705 => 20892,
-17706 => 24324, 17707 => 22900, 17708 => 21162, 17709 => 24594, 17710 => 22899,
-17711 => 26262, 17712 => 34384, 17713 => 30111, 17714 => 25386, 17715 => 25062,
-17716 => 31983, 17717 => 35834, 17718 => 21734, 17719 => 27431, 17720 => 40485,
-17721 => 27572, 17722 => 34261, 17723 => 21589, 17724 => 20598, 17725 => 27812,
-17726 => 21866, 17727 => 36276, 17728 => 29228, 17729 => 24085, 17730 => 24597,
-17731 => 29750, 17732 => 25293, 17733 => 25490, 17734 => 29260, 17735 => 24472,
-17736 => 28227, 17737 => 27966, 17738 => 25856, 17739 => 28504, 17740 => 30424,
-17741 => 30928, 17742 => 30460, 17743 => 30036, 17744 => 21028, 17745 => 21467,
-17746 => 20051, 17747 => 24222, 17748 => 26049, 17749 => 32810, 17750 => 32982,
-17751 => 25243, 17752 => 21638, 17753 => 21032, 17754 => 28846, 17755 => 34957,
-17756 => 36305, 17757 => 27873, 17758 => 21624, 17759 => 32986, 17760 => 22521,
-17761 => 35060, 17762 => 36180, 17763 => 38506, 17764 => 37197, 17765 => 20329,
-17766 => 27803, 17767 => 21943, 17768 => 30406, 17769 => 30768, 17770 => 25256,
-17771 => 28921, 17772 => 28558, 17773 => 24429, 17774 => 34028, 17775 => 26842,
-17776 => 30844, 17777 => 31735, 17778 => 33192, 17779 => 26379, 17780 => 40527,
-17781 => 25447, 17782 => 30896, 17783 => 22383, 17784 => 30738, 17785 => 38713,
-17786 => 25209, 17787 => 25259, 17788 => 21128, 17789 => 29749, 17790 => 27607,
-17953 => 21860, 17954 => 33086, 17955 => 30130, 17956 => 30382, 17957 => 21305,
-17958 => 30174, 17959 => 20731, 17960 => 23617, 17961 => 35692, 17962 => 31687,
-17963 => 20559, 17964 => 29255, 17965 => 39575, 17966 => 39128, 17967 => 28418,
-17968 => 29922, 17969 => 31080, 17970 => 25735, 17971 => 30629, 17972 => 25340,
-17973 => 39057, 17974 => 36139, 17975 => 21697, 17976 => 32856, 17977 => 20050,
-17978 => 22378, 17979 => 33529, 17980 => 33805, 17981 => 24179, 17982 => 20973,
-17983 => 29942, 17984 => 35780, 17985 => 23631, 17986 => 22369, 17987 => 27900,
-17988 => 39047, 17989 => 23110, 17990 => 30772, 17991 => 39748, 17992 => 36843,
-17993 => 31893, 17994 => 21078, 17995 => 25169, 17996 => 38138, 17997 => 20166,
-17998 => 33670, 17999 => 33889, 18000 => 33769, 18001 => 33970, 18002 => 22484,
-18003 => 26420, 18004 => 22275, 18005 => 26222, 18006 => 28006, 18007 => 35889,
-18008 => 26333, 18009 => 28689, 18010 => 26399, 18011 => 27450, 18012 => 26646,
-18013 => 25114, 18014 => 22971, 18015 => 19971, 18016 => 20932, 18017 => 28422,
-18018 => 26578, 18019 => 27791, 18020 => 20854, 18021 => 26827, 18022 => 22855,
-18023 => 27495, 18024 => 30054, 18025 => 23822, 18026 => 33040, 18027 => 40784,
-18028 => 26071, 18029 => 31048, 18030 => 31041, 18031 => 39569, 18032 => 36215,
-18033 => 23682, 18034 => 20062, 18035 => 20225, 18036 => 21551, 18037 => 22865,
-18038 => 30732, 18039 => 22120, 18040 => 27668, 18041 => 36804, 18042 => 24323,
-18043 => 27773, 18044 => 27875, 18045 => 35755, 18046 => 25488, 18209 => 24688,
-18210 => 27965, 18211 => 29301, 18212 => 25190, 18213 => 38030, 18214 => 38085,
-18215 => 21315, 18216 => 36801, 18217 => 31614, 18218 => 20191, 18219 => 35878,
-18220 => 20094, 18221 => 40660, 18222 => 38065, 18223 => 38067, 18224 => 21069,
-18225 => 28508, 18226 => 36963, 18227 => 27973, 18228 => 35892, 18229 => 22545,
-18230 => 23884, 18231 => 27424, 18232 => 27465, 18233 => 26538, 18234 => 21595,
-18235 => 33108, 18236 => 32652, 18237 => 22681, 18238 => 34103, 18239 => 24378,
-18240 => 25250, 18241 => 27207, 18242 => 38201, 18243 => 25970, 18244 => 24708,
-18245 => 26725, 18246 => 30631, 18247 => 20052, 18248 => 20392, 18249 => 24039,
-18250 => 38808, 18251 => 25772, 18252 => 32728, 18253 => 23789, 18254 => 20431,
-18255 => 31373, 18256 => 20999, 18257 => 33540, 18258 => 19988, 18259 => 24623,
-18260 => 31363, 18261 => 38054, 18262 => 20405, 18263 => 20146, 18264 => 31206,
-18265 => 29748, 18266 => 21220, 18267 => 33465, 18268 => 25810, 18269 => 31165,
-18270 => 23517, 18271 => 27777, 18272 => 38738, 18273 => 36731, 18274 => 27682,
-18275 => 20542, 18276 => 21375, 18277 => 28165, 18278 => 25806, 18279 => 26228,
-18280 => 27696, 18281 => 24773, 18282 => 39031, 18283 => 35831, 18284 => 24198,
-18285 => 29756, 18286 => 31351, 18287 => 31179, 18288 => 19992, 18289 => 37041,
-18290 => 29699, 18291 => 27714, 18292 => 22234, 18293 => 37195, 18294 => 27845,
-18295 => 36235, 18296 => 21306, 18297 => 34502, 18298 => 26354, 18299 => 36527,
-18300 => 23624, 18301 => 39537, 18302 => 28192, 18465 => 21462, 18466 => 23094,
-18467 => 40843, 18468 => 36259, 18469 => 21435, 18470 => 22280, 18471 => 39079,
-18472 => 26435, 18473 => 37275, 18474 => 27849, 18475 => 20840, 18476 => 30154,
-18477 => 25331, 18478 => 29356, 18479 => 21048, 18480 => 21149, 18481 => 32570,
-18482 => 28820, 18483 => 30264, 18484 => 21364, 18485 => 40522, 18486 => 27063,
-18487 => 30830, 18488 => 38592, 18489 => 35033, 18490 => 32676, 18491 => 28982,
-18492 => 29123, 18493 => 20873, 18494 => 26579, 18495 => 29924, 18496 => 22756,
-18497 => 25880, 18498 => 22199, 18499 => 35753, 18500 => 39286, 18501 => 25200,
-18502 => 32469, 18503 => 24825, 18504 => 28909, 18505 => 22764, 18506 => 20161,
-18507 => 20154, 18508 => 24525, 18509 => 38887, 18510 => 20219, 18511 => 35748,
-18512 => 20995, 18513 => 22922, 18514 => 32427, 18515 => 25172, 18516 => 20173,
-18517 => 26085, 18518 => 25102, 18519 => 33592, 18520 => 33993, 18521 => 33635,
-18522 => 34701, 18523 => 29076, 18524 => 28342, 18525 => 23481, 18526 => 32466,
-18527 => 20887, 18528 => 25545, 18529 => 26580, 18530 => 32905, 18531 => 33593,
-18532 => 34837, 18533 => 20754, 18534 => 23418, 18535 => 22914, 18536 => 36785,
-18537 => 20083, 18538 => 27741, 18539 => 20837, 18540 => 35109, 18541 => 36719,
-18542 => 38446, 18543 => 34122, 18544 => 29790, 18545 => 38160, 18546 => 38384,
-18547 => 28070, 18548 => 33509, 18549 => 24369, 18550 => 25746, 18551 => 27922,
-18552 => 33832, 18553 => 33134, 18554 => 40131, 18555 => 22622, 18556 => 36187,
-18557 => 19977, 18558 => 21441, 18721 => 20254, 18722 => 25955, 18723 => 26705,
-18724 => 21971, 18725 => 20007, 18726 => 25620, 18727 => 39578, 18728 => 25195,
-18729 => 23234, 18730 => 29791, 18731 => 33394, 18732 => 28073, 18733 => 26862,
-18734 => 20711, 18735 => 33678, 18736 => 30722, 18737 => 26432, 18738 => 21049,
-18739 => 27801, 18740 => 32433, 18741 => 20667, 18742 => 21861, 18743 => 29022,
-18744 => 31579, 18745 => 26194, 18746 => 29642, 18747 => 33515, 18748 => 26441,
-18749 => 23665, 18750 => 21024, 18751 => 29053, 18752 => 34923, 18753 => 38378,
-18754 => 38485, 18755 => 25797, 18756 => 36193, 18757 => 33203, 18758 => 21892,
-18759 => 27733, 18760 => 25159, 18761 => 32558, 18762 => 22674, 18763 => 20260,
-18764 => 21830, 18765 => 36175, 18766 => 26188, 18767 => 19978, 18768 => 23578,
-18769 => 35059, 18770 => 26786, 18771 => 25422, 18772 => 31245, 18773 => 28903,
-18774 => 33421, 18775 => 21242, 18776 => 38902, 18777 => 23569, 18778 => 21736,
-18779 => 37045, 18780 => 32461, 18781 => 22882, 18782 => 36170, 18783 => 34503,
-18784 => 33292, 18785 => 33293, 18786 => 36198, 18787 => 25668, 18788 => 23556,
-18789 => 24913, 18790 => 28041, 18791 => 31038, 18792 => 35774, 18793 => 30775,
-18794 => 30003, 18795 => 21627, 18796 => 20280, 18797 => 36523, 18798 => 28145,
-18799 => 23072, 18800 => 32453, 18801 => 31070, 18802 => 27784, 18803 => 23457,
-18804 => 23158, 18805 => 29978, 18806 => 32958, 18807 => 24910, 18808 => 28183,
-18809 => 22768, 18810 => 29983, 18811 => 29989, 18812 => 29298, 18813 => 21319,
-18814 => 32499, 18977 => 30465, 18978 => 30427, 18979 => 21097, 18980 => 32988,
-18981 => 22307, 18982 => 24072, 18983 => 22833, 18984 => 29422, 18985 => 26045,
-18986 => 28287, 18987 => 35799, 18988 => 23608, 18989 => 34417, 18990 => 21313,
-18991 => 30707, 18992 => 25342, 18993 => 26102, 18994 => 20160, 18995 => 39135,
-18996 => 34432, 18997 => 23454, 18998 => 35782, 18999 => 21490, 19000 => 30690,
-19001 => 20351, 19002 => 23630, 19003 => 39542, 19004 => 22987, 19005 => 24335,
-19006 => 31034, 19007 => 22763, 19008 => 19990, 19009 => 26623, 19010 => 20107,
-19011 => 25325, 19012 => 35475, 19013 => 36893, 19014 => 21183, 19015 => 26159,
-19016 => 21980, 19017 => 22124, 19018 => 36866, 19019 => 20181, 19020 => 20365,
-19021 => 37322, 19022 => 39280, 19023 => 27663, 19024 => 24066, 19025 => 24643,
-19026 => 23460, 19027 => 35270, 19028 => 35797, 19029 => 25910, 19030 => 25163,
-19031 => 39318, 19032 => 23432, 19033 => 23551, 19034 => 25480, 19035 => 21806,
-19036 => 21463, 19037 => 30246, 19038 => 20861, 19039 => 34092, 19040 => 26530,
-19041 => 26803, 19042 => 27530, 19043 => 25234, 19044 => 36755, 19045 => 21460,
-19046 => 33298, 19047 => 28113, 19048 => 30095, 19049 => 20070, 19050 => 36174,
-19051 => 23408, 19052 => 29087, 19053 => 34223, 19054 => 26257, 19055 => 26329,
-19056 => 32626, 19057 => 34560, 19058 => 40653, 19059 => 40736, 19060 => 23646,
-19061 => 26415, 19062 => 36848, 19063 => 26641, 19064 => 26463, 19065 => 25101,
-19066 => 31446, 19067 => 22661, 19068 => 24246, 19069 => 25968, 19070 => 28465,
-19233 => 24661, 19234 => 21047, 19235 => 32781, 19236 => 25684, 19237 => 34928,
-19238 => 29993, 19239 => 24069, 19240 => 26643, 19241 => 25332, 19242 => 38684,
-19243 => 21452, 19244 => 29245, 19245 => 35841, 19246 => 27700, 19247 => 30561,
-19248 => 31246, 19249 => 21550, 19250 => 30636, 19251 => 39034, 19252 => 33308,
-19253 => 35828, 19254 => 30805, 19255 => 26388, 19256 => 28865, 19257 => 26031,
-19258 => 25749, 19259 => 22070, 19260 => 24605, 19261 => 31169, 19262 => 21496,
-19263 => 19997, 19264 => 27515, 19265 => 32902, 19266 => 23546, 19267 => 21987,
-19268 => 22235, 19269 => 20282, 19270 => 20284, 19271 => 39282, 19272 => 24051,
-19273 => 26494, 19274 => 32824, 19275 => 24578, 19276 => 39042, 19277 => 36865,
-19278 => 23435, 19279 => 35772, 19280 => 35829, 19281 => 25628, 19282 => 33368,
-19283 => 25822, 19284 => 22013, 19285 => 33487, 19286 => 37221, 19287 => 20439,
-19288 => 32032, 19289 => 36895, 19290 => 31903, 19291 => 20723, 19292 => 22609,
-19293 => 28335, 19294 => 23487, 19295 => 35785, 19296 => 32899, 19297 => 37240,
-19298 => 33948, 19299 => 31639, 19300 => 34429, 19301 => 38539, 19302 => 38543,
-19303 => 32485, 19304 => 39635, 19305 => 30862, 19306 => 23681, 19307 => 31319,
-19308 => 36930, 19309 => 38567, 19310 => 31071, 19311 => 23385, 19312 => 25439,
-19313 => 31499, 19314 => 34001, 19315 => 26797, 19316 => 21766, 19317 => 32553,
-19318 => 29712, 19319 => 32034, 19320 => 38145, 19321 => 25152, 19322 => 22604,
-19323 => 20182, 19324 => 23427, 19325 => 22905, 19326 => 22612, 19489 => 29549,
-19490 => 25374, 19491 => 36427, 19492 => 36367, 19493 => 32974, 19494 => 33492,
-19495 => 25260, 19496 => 21488, 19497 => 27888, 19498 => 37214, 19499 => 22826,
-19500 => 24577, 19501 => 27760, 19502 => 22349, 19503 => 25674, 19504 => 36138,
-19505 => 30251, 19506 => 28393, 19507 => 22363, 19508 => 27264, 19509 => 30192,
-19510 => 28525, 19511 => 35885, 19512 => 35848, 19513 => 22374, 19514 => 27631,
-19515 => 34962, 19516 => 30899, 19517 => 25506, 19518 => 21497, 19519 => 28845,
-19520 => 27748, 19521 => 22616, 19522 => 25642, 19523 => 22530, 19524 => 26848,
-19525 => 33179, 19526 => 21776, 19527 => 31958, 19528 => 20504, 19529 => 36538,
-19530 => 28108, 19531 => 36255, 19532 => 28907, 19533 => 25487, 19534 => 28059,
-19535 => 28372, 19536 => 32486, 19537 => 33796, 19538 => 26691, 19539 => 36867,
-19540 => 28120, 19541 => 38518, 19542 => 35752, 19543 => 22871, 19544 => 29305,
-19545 => 34276, 19546 => 33150, 19547 => 30140, 19548 => 35466, 19549 => 26799,
-19550 => 21076, 19551 => 36386, 19552 => 38161, 19553 => 25552, 19554 => 39064,
-19555 => 36420, 19556 => 21884, 19557 => 20307, 19558 => 26367, 19559 => 22159,
-19560 => 24789, 19561 => 28053, 19562 => 21059, 19563 => 23625, 19564 => 22825,
-19565 => 28155, 19566 => 22635, 19567 => 30000, 19568 => 29980, 19569 => 24684,
-19570 => 33300, 19571 => 33094, 19572 => 25361, 19573 => 26465, 19574 => 36834,
-19575 => 30522, 19576 => 36339, 19577 => 36148, 19578 => 38081, 19579 => 24086,
-19580 => 21381, 19581 => 21548, 19582 => 28867, 19745 => 27712, 19746 => 24311,
-19747 => 20572, 19748 => 20141, 19749 => 24237, 19750 => 25402, 19751 => 33351,
-19752 => 36890, 19753 => 26704, 19754 => 37230, 19755 => 30643, 19756 => 21516,
-19757 => 38108, 19758 => 24420, 19759 => 31461, 19760 => 26742, 19761 => 25413,
-19762 => 31570, 19763 => 32479, 19764 => 30171, 19765 => 20599, 19766 => 25237,
-19767 => 22836, 19768 => 36879, 19769 => 20984, 19770 => 31171, 19771 => 31361,
-19772 => 22270, 19773 => 24466, 19774 => 36884, 19775 => 28034, 19776 => 23648,
-19777 => 22303, 19778 => 21520, 19779 => 20820, 19780 => 28237, 19781 => 22242,
-19782 => 25512, 19783 => 39059, 19784 => 33151, 19785 => 34581, 19786 => 35114,
-19787 => 36864, 19788 => 21534, 19789 => 23663, 19790 => 33216, 19791 => 25302,
-19792 => 25176, 19793 => 33073, 19794 => 40501, 19795 => 38464, 19796 => 39534,
-19797 => 39548, 19798 => 26925, 19799 => 22949, 19800 => 25299, 19801 => 21822,
-19802 => 25366, 19803 => 21703, 19804 => 34521, 19805 => 27964, 19806 => 23043,
-19807 => 29926, 19808 => 34972, 19809 => 27498, 19810 => 22806, 19811 => 35916,
-19812 => 24367, 19813 => 28286, 19814 => 29609, 19815 => 39037, 19816 => 20024,
-19817 => 28919, 19818 => 23436, 19819 => 30871, 19820 => 25405, 19821 => 26202,
-19822 => 30358, 19823 => 24779, 19824 => 23451, 19825 => 23113, 19826 => 19975,
-19827 => 33109, 19828 => 27754, 19829 => 29579, 19830 => 20129, 19831 => 26505,
-19832 => 32593, 19833 => 24448, 19834 => 26106, 19835 => 26395, 19836 => 24536,
-19837 => 22916, 19838 => 23041, 20001 => 24013, 20002 => 24494, 20003 => 21361,
-20004 => 38886, 20005 => 36829, 20006 => 26693, 20007 => 22260, 20008 => 21807,
-20009 => 24799, 20010 => 20026, 20011 => 28493, 20012 => 32500, 20013 => 33479,
-20014 => 33806, 20015 => 22996, 20016 => 20255, 20017 => 20266, 20018 => 23614,
-20019 => 32428, 20020 => 26410, 20021 => 34074, 20022 => 21619, 20023 => 30031,
-20024 => 32963, 20025 => 21890, 20026 => 39759, 20027 => 20301, 20028 => 28205,
-20029 => 35859, 20030 => 23561, 20031 => 24944, 20032 => 21355, 20033 => 30239,
-20034 => 28201, 20035 => 34442, 20036 => 25991, 20037 => 38395, 20038 => 32441,
-20039 => 21563, 20040 => 31283, 20041 => 32010, 20042 => 38382, 20043 => 21985,
-20044 => 32705, 20045 => 29934, 20046 => 25373, 20047 => 34583, 20048 => 28065,
-20049 => 31389, 20050 => 25105, 20051 => 26017, 20052 => 21351, 20053 => 25569,
-20054 => 27779, 20055 => 24043, 20056 => 21596, 20057 => 38056, 20058 => 20044,
-20059 => 27745, 20060 => 35820, 20061 => 23627, 20062 => 26080, 20063 => 33436,
-20064 => 26791, 20065 => 21566, 20066 => 21556, 20067 => 27595, 20068 => 27494,
-20069 => 20116, 20070 => 25410, 20071 => 21320, 20072 => 33310, 20073 => 20237,
-20074 => 20398, 20075 => 22366, 20076 => 25098, 20077 => 38654, 20078 => 26212,
-20079 => 29289, 20080 => 21247, 20081 => 21153, 20082 => 24735, 20083 => 35823,
-20084 => 26132, 20085 => 29081, 20086 => 26512, 20087 => 35199, 20088 => 30802,
-20089 => 30717, 20090 => 26224, 20091 => 22075, 20092 => 21560, 20093 => 38177,
-20094 => 29306, 20257 => 31232, 20258 => 24687, 20259 => 24076, 20260 => 24713,
-20261 => 33181, 20262 => 22805, 20263 => 24796, 20264 => 29060, 20265 => 28911,
-20266 => 28330, 20267 => 27728, 20268 => 29312, 20269 => 27268, 20270 => 34989,
-20271 => 24109, 20272 => 20064, 20273 => 23219, 20274 => 21916, 20275 => 38115,
-20276 => 27927, 20277 => 31995, 20278 => 38553, 20279 => 25103, 20280 => 32454,
-20281 => 30606, 20282 => 34430, 20283 => 21283, 20284 => 38686, 20285 => 36758,
-20286 => 26247, 20287 => 23777, 20288 => 20384, 20289 => 29421, 20290 => 19979,
-20291 => 21414, 20292 => 22799, 20293 => 21523, 20294 => 25472, 20295 => 38184,
-20296 => 20808, 20297 => 20185, 20298 => 40092, 20299 => 32420, 20300 => 21688,
-20301 => 36132, 20302 => 34900, 20303 => 33335, 20304 => 38386, 20305 => 28046,
-20306 => 24358, 20307 => 23244, 20308 => 26174, 20309 => 38505, 20310 => 29616,
-20311 => 29486, 20312 => 21439, 20313 => 33146, 20314 => 39301, 20315 => 32673,
-20316 => 23466, 20317 => 38519, 20318 => 38480, 20319 => 32447, 20320 => 30456,
-20321 => 21410, 20322 => 38262, 20323 => 39321, 20324 => 31665, 20325 => 35140,
-20326 => 28248, 20327 => 20065, 20328 => 32724, 20329 => 31077, 20330 => 35814,
-20331 => 24819, 20332 => 21709, 20333 => 20139, 20334 => 39033, 20335 => 24055,
-20336 => 27233, 20337 => 20687, 20338 => 21521, 20339 => 35937, 20340 => 33831,
-20341 => 30813, 20342 => 38660, 20343 => 21066, 20344 => 21742, 20345 => 22179,
-20346 => 38144, 20347 => 28040, 20348 => 23477, 20349 => 28102, 20350 => 26195,
-20513 => 23567, 20514 => 23389, 20515 => 26657, 20516 => 32918, 20517 => 21880,
-20518 => 31505, 20519 => 25928, 20520 => 26964, 20521 => 20123, 20522 => 27463,
-20523 => 34638, 20524 => 38795, 20525 => 21327, 20526 => 25375, 20527 => 25658,
-20528 => 37034, 20529 => 26012, 20530 => 32961, 20531 => 35856, 20532 => 20889,
-20533 => 26800, 20534 => 21368, 20535 => 34809, 20536 => 25032, 20537 => 27844,
-20538 => 27899, 20539 => 35874, 20540 => 23633, 20541 => 34218, 20542 => 33455,
-20543 => 38156, 20544 => 27427, 20545 => 36763, 20546 => 26032, 20547 => 24571,
-20548 => 24515, 20549 => 20449, 20550 => 34885, 20551 => 26143, 20552 => 33125,
-20553 => 29481, 20554 => 24826, 20555 => 20852, 20556 => 21009, 20557 => 22411,
-20558 => 24418, 20559 => 37026, 20560 => 34892, 20561 => 37266, 20562 => 24184,
-20563 => 26447, 20564 => 24615, 20565 => 22995, 20566 => 20804, 20567 => 20982,
-20568 => 33016, 20569 => 21256, 20570 => 27769, 20571 => 38596, 20572 => 29066,
-20573 => 20241, 20574 => 20462, 20575 => 32670, 20576 => 26429, 20577 => 21957,
-20578 => 38152, 20579 => 31168, 20580 => 34966, 20581 => 32483, 20582 => 22687,
-20583 => 25100, 20584 => 38656, 20585 => 34394, 20586 => 22040, 20587 => 39035,
-20588 => 24464, 20589 => 35768, 20590 => 33988, 20591 => 37207, 20592 => 21465,
-20593 => 26093, 20594 => 24207, 20595 => 30044, 20596 => 24676, 20597 => 32110,
-20598 => 23167, 20599 => 32490, 20600 => 32493, 20601 => 36713, 20602 => 21927,
-20603 => 23459, 20604 => 24748, 20605 => 26059, 20606 => 29572, 20769 => 36873,
-20770 => 30307, 20771 => 30505, 20772 => 32474, 20773 => 38772, 20774 => 34203,
-20775 => 23398, 20776 => 31348, 20777 => 38634, 20778 => 34880, 20779 => 21195,
-20780 => 29071, 20781 => 24490, 20782 => 26092, 20783 => 35810, 20784 => 23547,
-20785 => 39535, 20786 => 24033, 20787 => 27529, 20788 => 27739, 20789 => 35757,
-20790 => 35759, 20791 => 36874, 20792 => 36805, 20793 => 21387, 20794 => 25276,
-20795 => 40486, 20796 => 40493, 20797 => 21568, 20798 => 20011, 20799 => 33469,
-20800 => 29273, 20801 => 34460, 20802 => 23830, 20803 => 34905, 20804 => 28079,
-20805 => 38597, 20806 => 21713, 20807 => 20122, 20808 => 35766, 20809 => 28937,
-20810 => 21693, 20811 => 38409, 20812 => 28895, 20813 => 28153, 20814 => 30416,
-20815 => 20005, 20816 => 30740, 20817 => 34578, 20818 => 23721, 20819 => 24310,
-20820 => 35328, 20821 => 39068, 20822 => 38414, 20823 => 28814, 20824 => 27839,
-20825 => 22852, 20826 => 25513, 20827 => 30524, 20828 => 34893, 20829 => 28436,
-20830 => 33395, 20831 => 22576, 20832 => 29141, 20833 => 21388, 20834 => 30746,
-20835 => 38593, 20836 => 21761, 20837 => 24422, 20838 => 28976, 20839 => 23476,
-20840 => 35866, 20841 => 39564, 20842 => 27523, 20843 => 22830, 20844 => 40495,
-20845 => 31207, 20846 => 26472, 20847 => 25196, 20848 => 20335, 20849 => 30113,
-20850 => 32650, 20851 => 27915, 20852 => 38451, 20853 => 27687, 20854 => 20208,
-20855 => 30162, 20856 => 20859, 20857 => 26679, 20858 => 28478, 20859 => 36992,
-20860 => 33136, 20861 => 22934, 20862 => 29814, 21025 => 25671, 21026 => 23591,
-21027 => 36965, 21028 => 31377, 21029 => 35875, 21030 => 23002, 21031 => 21676,
-21032 => 33280, 21033 => 33647, 21034 => 35201, 21035 => 32768, 21036 => 26928,
-21037 => 22094, 21038 => 32822, 21039 => 29239, 21040 => 37326, 21041 => 20918,
-21042 => 20063, 21043 => 39029, 21044 => 25494, 21045 => 19994, 21046 => 21494,
-21047 => 26355, 21048 => 33099, 21049 => 22812, 21050 => 28082, 21051 => 19968,
-21052 => 22777, 21053 => 21307, 21054 => 25558, 21055 => 38129, 21056 => 20381,
-21057 => 20234, 21058 => 34915, 21059 => 39056, 21060 => 22839, 21061 => 36951,
-21062 => 31227, 21063 => 20202, 21064 => 33008, 21065 => 30097, 21066 => 27778,
-21067 => 23452, 21068 => 23016, 21069 => 24413, 21070 => 26885, 21071 => 34433,
-21072 => 20506, 21073 => 24050, 21074 => 20057, 21075 => 30691, 21076 => 20197,
-21077 => 33402, 21078 => 25233, 21079 => 26131, 21080 => 37009, 21081 => 23673,
-21082 => 20159, 21083 => 24441, 21084 => 33222, 21085 => 36920, 21086 => 32900,
-21087 => 30123, 21088 => 20134, 21089 => 35028, 21090 => 24847, 21091 => 27589,
-21092 => 24518, 21093 => 20041, 21094 => 30410, 21095 => 28322, 21096 => 35811,
-21097 => 35758, 21098 => 35850, 21099 => 35793, 21100 => 24322, 21101 => 32764,
-21102 => 32716, 21103 => 32462, 21104 => 33589, 21105 => 33643, 21106 => 22240,
-21107 => 27575, 21108 => 38899, 21109 => 38452, 21110 => 23035, 21111 => 21535,
-21112 => 38134, 21113 => 28139, 21114 => 23493, 21115 => 39278, 21116 => 23609,
-21117 => 24341, 21118 => 38544, 21281 => 21360, 21282 => 33521, 21283 => 27185,
-21284 => 23156, 21285 => 40560, 21286 => 24212, 21287 => 32552, 21288 => 33721,
-21289 => 33828, 21290 => 33829, 21291 => 33639, 21292 => 34631, 21293 => 36814,
-21294 => 36194, 21295 => 30408, 21296 => 24433, 21297 => 39062, 21298 => 30828,
-21299 => 26144, 21300 => 21727, 21301 => 25317, 21302 => 20323, 21303 => 33219,
-21304 => 30152, 21305 => 24248, 21306 => 38605, 21307 => 36362, 21308 => 34553,
-21309 => 21647, 21310 => 27891, 21311 => 28044, 21312 => 27704, 21313 => 24703,
-21314 => 21191, 21315 => 29992, 21316 => 24189, 21317 => 20248, 21318 => 24736,
-21319 => 24551, 21320 => 23588, 21321 => 30001, 21322 => 37038, 21323 => 38080,
-21324 => 29369, 21325 => 27833, 21326 => 28216, 21327 => 37193, 21328 => 26377,
-21329 => 21451, 21330 => 21491, 21331 => 20305, 21332 => 37321, 21333 => 35825,
-21334 => 21448, 21335 => 24188, 21336 => 36802, 21337 => 28132, 21338 => 20110,
-21339 => 30402, 21340 => 27014, 21341 => 34398, 21342 => 24858, 21343 => 33286,
-21344 => 20313, 21345 => 20446, 21346 => 36926, 21347 => 40060, 21348 => 24841,
-21349 => 28189, 21350 => 28180, 21351 => 38533, 21352 => 20104, 21353 => 23089,
-21354 => 38632, 21355 => 19982, 21356 => 23679, 21357 => 31161, 21358 => 23431,
-21359 => 35821, 21360 => 32701, 21361 => 29577, 21362 => 22495, 21363 => 33419,
-21364 => 37057, 21365 => 21505, 21366 => 36935, 21367 => 21947, 21368 => 23786,
-21369 => 24481, 21370 => 24840, 21371 => 27442, 21372 => 29425, 21373 => 32946,
-21374 => 35465, 21537 => 28020, 21538 => 23507, 21539 => 35029, 21540 => 39044,
-21541 => 35947, 21542 => 39533, 21543 => 40499, 21544 => 28170, 21545 => 20900,
-21546 => 20803, 21547 => 22435, 21548 => 34945, 21549 => 21407, 21550 => 25588,
-21551 => 36757, 21552 => 22253, 21553 => 21592, 21554 => 22278, 21555 => 29503,
-21556 => 28304, 21557 => 32536, 21558 => 36828, 21559 => 33489, 21560 => 24895,
-21561 => 24616, 21562 => 38498, 21563 => 26352, 21564 => 32422, 21565 => 36234,
-21566 => 36291, 21567 => 38053, 21568 => 23731, 21569 => 31908, 21570 => 26376,
-21571 => 24742, 21572 => 38405, 21573 => 32792, 21574 => 20113, 21575 => 37095,
-21576 => 21248, 21577 => 38504, 21578 => 20801, 21579 => 36816, 21580 => 34164,
-21581 => 37213, 21582 => 26197, 21583 => 38901, 21584 => 23381, 21585 => 21277,
-21586 => 30776, 21587 => 26434, 21588 => 26685, 21589 => 21705, 21590 => 28798,
-21591 => 23472, 21592 => 36733, 21593 => 20877, 21594 => 22312, 21595 => 21681,
-21596 => 25874, 21597 => 26242, 21598 => 36190, 21599 => 36163, 21600 => 33039,
-21601 => 33900, 21602 => 36973, 21603 => 31967, 21604 => 20991, 21605 => 34299,
-21606 => 26531, 21607 => 26089, 21608 => 28577, 21609 => 34468, 21610 => 36481,
-21611 => 22122, 21612 => 36896, 21613 => 30338, 21614 => 28790, 21615 => 29157,
-21616 => 36131, 21617 => 25321, 21618 => 21017, 21619 => 27901, 21620 => 36156,
-21621 => 24590, 21622 => 22686, 21623 => 24974, 21624 => 26366, 21625 => 36192,
-21626 => 25166, 21627 => 21939, 21628 => 28195, 21629 => 26413, 21630 => 36711,
-21793 => 38113, 21794 => 38392, 21795 => 30504, 21796 => 26629, 21797 => 27048,
-21798 => 21643, 21799 => 20045, 21800 => 28856, 21801 => 35784, 21802 => 25688,
-21803 => 25995, 21804 => 23429, 21805 => 31364, 21806 => 20538, 21807 => 23528,
-21808 => 30651, 21809 => 27617, 21810 => 35449, 21811 => 31896, 21812 => 27838,
-21813 => 30415, 21814 => 26025, 21815 => 36759, 21816 => 23853, 21817 => 23637,
-21818 => 34360, 21819 => 26632, 21820 => 21344, 21821 => 25112, 21822 => 31449,
-21823 => 28251, 21824 => 32509, 21825 => 27167, 21826 => 31456, 21827 => 24432,
-21828 => 28467, 21829 => 24352, 21830 => 25484, 21831 => 28072, 21832 => 26454,
-21833 => 19976, 21834 => 24080, 21835 => 36134, 21836 => 20183, 21837 => 32960,
-21838 => 30260, 21839 => 38556, 21840 => 25307, 21841 => 26157, 21842 => 25214,
-21843 => 27836, 21844 => 36213, 21845 => 29031, 21846 => 32617, 21847 => 20806,
-21848 => 32903, 21849 => 21484, 21850 => 36974, 21851 => 25240, 21852 => 21746,
-21853 => 34544, 21854 => 36761, 21855 => 32773, 21856 => 38167, 21857 => 34071,
-21858 => 36825, 21859 => 27993, 21860 => 29645, 21861 => 26015, 21862 => 30495,
-21863 => 29956, 21864 => 30759, 21865 => 33275, 21866 => 36126, 21867 => 38024,
-21868 => 20390, 21869 => 26517, 21870 => 30137, 21871 => 35786, 21872 => 38663,
-21873 => 25391, 21874 => 38215, 21875 => 38453, 21876 => 33976, 21877 => 25379,
-21878 => 30529, 21879 => 24449, 21880 => 29424, 21881 => 20105, 21882 => 24596,
-21883 => 25972, 21884 => 25327, 21885 => 27491, 21886 => 25919, 22049 => 24103,
-22050 => 30151, 22051 => 37073, 22052 => 35777, 22053 => 33437, 22054 => 26525,
-22055 => 25903, 22056 => 21553, 22057 => 34584, 22058 => 30693, 22059 => 32930,
-22060 => 33026, 22061 => 27713, 22062 => 20043, 22063 => 32455, 22064 => 32844,
-22065 => 30452, 22066 => 26893, 22067 => 27542, 22068 => 25191, 22069 => 20540,
-22070 => 20356, 22071 => 22336, 22072 => 25351, 22073 => 27490, 22074 => 36286,
-22075 => 21482, 22076 => 26088, 22077 => 32440, 22078 => 24535, 22079 => 25370,
-22080 => 25527, 22081 => 33267, 22082 => 33268, 22083 => 32622, 22084 => 24092,
-22085 => 23769, 22086 => 21046, 22087 => 26234, 22088 => 31209, 22089 => 31258,
-22090 => 36136, 22091 => 28825, 22092 => 30164, 22093 => 28382, 22094 => 27835,
-22095 => 31378, 22096 => 20013, 22097 => 30405, 22098 => 24544, 22099 => 38047,
-22100 => 34935, 22101 => 32456, 22102 => 31181, 22103 => 32959, 22104 => 37325,
-22105 => 20210, 22106 => 20247, 22107 => 33311, 22108 => 21608, 22109 => 24030,
-22110 => 27954, 22111 => 35788, 22112 => 31909, 22113 => 36724, 22114 => 32920,
-22115 => 24090, 22116 => 21650, 22117 => 30385, 22118 => 23449, 22119 => 26172,
-22120 => 39588, 22121 => 29664, 22122 => 26666, 22123 => 34523, 22124 => 26417,
-22125 => 29482, 22126 => 35832, 22127 => 35803, 22128 => 36880, 22129 => 31481,
-22130 => 28891, 22131 => 29038, 22132 => 25284, 22133 => 30633, 22134 => 22065,
-22135 => 20027, 22136 => 33879, 22137 => 26609, 22138 => 21161, 22139 => 34496,
-22140 => 36142, 22141 => 38136, 22142 => 31569, 22305 => 20303, 22306 => 27880,
-22307 => 31069, 22308 => 39547, 22309 => 25235, 22310 => 29226, 22311 => 25341,
-22312 => 19987, 22313 => 30742, 22314 => 36716, 22315 => 25776, 22316 => 36186,
-22317 => 31686, 22318 => 26729, 22319 => 24196, 22320 => 35013, 22321 => 22918,
-22322 => 25758, 22323 => 22766, 22324 => 29366, 22325 => 26894, 22326 => 38181,
-22327 => 36861, 22328 => 36184, 22329 => 22368, 22330 => 32512, 22331 => 35846,
-22332 => 20934, 22333 => 25417, 22334 => 25305, 22335 => 21331, 22336 => 26700,
-22337 => 29730, 22338 => 33537, 22339 => 37196, 22340 => 21828, 22341 => 30528,
-22342 => 28796, 22343 => 27978, 22344 => 20857, 22345 => 21672, 22346 => 36164,
-22347 => 23039, 22348 => 28363, 22349 => 28100, 22350 => 23388, 22351 => 32043,
-22352 => 20180, 22353 => 31869, 22354 => 28371, 22355 => 23376, 22356 => 33258,
-22357 => 28173, 22358 => 23383, 22359 => 39683, 22360 => 26837, 22361 => 36394,
-22362 => 23447, 22363 => 32508, 22364 => 24635, 22365 => 32437, 22366 => 37049,
-22367 => 36208, 22368 => 22863, 22369 => 25549, 22370 => 31199, 22371 => 36275,
-22372 => 21330, 22373 => 26063, 22374 => 31062, 22375 => 35781, 22376 => 38459,
-22377 => 32452, 22378 => 38075, 22379 => 32386, 22380 => 22068, 22381 => 37257,
-22382 => 26368, 22383 => 32618, 22384 => 23562, 22385 => 36981, 22386 => 26152,
-22387 => 24038, 22388 => 20304, 22389 => 26590, 22390 => 20570, 22391 => 20316,
-22392 => 22352, 22393 => 24231, 22561 => 20109, 22562 => 19980, 22563 => 20800,
-22564 => 19984, 22565 => 24319, 22566 => 21317, 22567 => 19989, 22568 => 20120,
-22569 => 19998, 22570 => 39730, 22571 => 23404, 22572 => 22121, 22573 => 20008,
-22574 => 31162, 22575 => 20031, 22576 => 21269, 22577 => 20039, 22578 => 22829,
-22579 => 29243, 22580 => 21358, 22581 => 27664, 22582 => 22239, 22583 => 32996,
-22584 => 39319, 22585 => 27603, 22586 => 30590, 22587 => 40727, 22588 => 20022,
-22589 => 20127, 22590 => 40720, 22591 => 20060, 22592 => 20073, 22593 => 20115,
-22594 => 33416, 22595 => 23387, 22596 => 21868, 22597 => 22031, 22598 => 20164,
-22599 => 21389, 22600 => 21405, 22601 => 21411, 22602 => 21413, 22603 => 21422,
-22604 => 38757, 22605 => 36189, 22606 => 21274, 22607 => 21493, 22608 => 21286,
-22609 => 21294, 22610 => 21310, 22611 => 36188, 22612 => 21350, 22613 => 21347,
-22614 => 20994, 22615 => 21000, 22616 => 21006, 22617 => 21037, 22618 => 21043,
-22619 => 21055, 22620 => 21056, 22621 => 21068, 22622 => 21086, 22623 => 21089,
-22624 => 21084, 22625 => 33967, 22626 => 21117, 22627 => 21122, 22628 => 21121,
-22629 => 21136, 22630 => 21139, 22631 => 20866, 22632 => 32596, 22633 => 20155,
-22634 => 20163, 22635 => 20169, 22636 => 20162, 22637 => 20200, 22638 => 20193,
-22639 => 20203, 22640 => 20190, 22641 => 20251, 22642 => 20211, 22643 => 20258,
-22644 => 20324, 22645 => 20213, 22646 => 20261, 22647 => 20263, 22648 => 20233,
-22649 => 20267, 22650 => 20318, 22651 => 20327, 22652 => 25912, 22653 => 20314,
-22654 => 20317, 22817 => 20319, 22818 => 20311, 22819 => 20274, 22820 => 20285,
-22821 => 20342, 22822 => 20340, 22823 => 20369, 22824 => 20361, 22825 => 20355,
-22826 => 20367, 22827 => 20350, 22828 => 20347, 22829 => 20394, 22830 => 20348,
-22831 => 20396, 22832 => 20372, 22833 => 20454, 22834 => 20456, 22835 => 20458,
-22836 => 20421, 22837 => 20442, 22838 => 20451, 22839 => 20444, 22840 => 20433,
-22841 => 20447, 22842 => 20472, 22843 => 20521, 22844 => 20556, 22845 => 20467,
-22846 => 20524, 22847 => 20495, 22848 => 20526, 22849 => 20525, 22850 => 20478,
-22851 => 20508, 22852 => 20492, 22853 => 20517, 22854 => 20520, 22855 => 20606,
-22856 => 20547, 22857 => 20565, 22858 => 20552, 22859 => 20558, 22860 => 20588,
-22861 => 20603, 22862 => 20645, 22863 => 20647, 22864 => 20649, 22865 => 20666,
-22866 => 20694, 22867 => 20742, 22868 => 20717, 22869 => 20716, 22870 => 20710,
-22871 => 20718, 22872 => 20743, 22873 => 20747, 22874 => 20189, 22875 => 27709,
-22876 => 20312, 22877 => 20325, 22878 => 20430, 22879 => 40864, 22880 => 27718,
-22881 => 31860, 22882 => 20846, 22883 => 24061, 22884 => 40649, 22885 => 39320,
-22886 => 20865, 22887 => 22804, 22888 => 21241, 22889 => 21261, 22890 => 35335,
-22891 => 21264, 22892 => 20971, 22893 => 22809, 22894 => 20821, 22895 => 20128,
-22896 => 20822, 22897 => 20147, 22898 => 34926, 22899 => 34980, 22900 => 20149,
-22901 => 33044, 22902 => 35026, 22903 => 31104, 22904 => 23348, 22905 => 34819,
-22906 => 32696, 22907 => 20907, 22908 => 20913, 22909 => 20925, 22910 => 20924,
-23073 => 20935, 23074 => 20886, 23075 => 20898, 23076 => 20901, 23077 => 35744,
-23078 => 35750, 23079 => 35751, 23080 => 35754, 23081 => 35764, 23082 => 35765,
-23083 => 35767, 23084 => 35778, 23085 => 35779, 23086 => 35787, 23087 => 35791,
-23088 => 35790, 23089 => 35794, 23090 => 35795, 23091 => 35796, 23092 => 35798,
-23093 => 35800, 23094 => 35801, 23095 => 35804, 23096 => 35807, 23097 => 35808,
-23098 => 35812, 23099 => 35816, 23100 => 35817, 23101 => 35822, 23102 => 35824,
-23103 => 35827, 23104 => 35830, 23105 => 35833, 23106 => 35836, 23107 => 35839,
-23108 => 35840, 23109 => 35842, 23110 => 35844, 23111 => 35847, 23112 => 35852,
-23113 => 35855, 23114 => 35857, 23115 => 35858, 23116 => 35860, 23117 => 35861,
-23118 => 35862, 23119 => 35865, 23120 => 35867, 23121 => 35864, 23122 => 35869,
-23123 => 35871, 23124 => 35872, 23125 => 35873, 23126 => 35877, 23127 => 35879,
-23128 => 35882, 23129 => 35883, 23130 => 35886, 23131 => 35887, 23132 => 35890,
-23133 => 35891, 23134 => 35893, 23135 => 35894, 23136 => 21353, 23137 => 21370,
-23138 => 38429, 23139 => 38434, 23140 => 38433, 23141 => 38449, 23142 => 38442,
-23143 => 38461, 23144 => 38460, 23145 => 38466, 23146 => 38473, 23147 => 38484,
-23148 => 38495, 23149 => 38503, 23150 => 38508, 23151 => 38514, 23152 => 38516,
-23153 => 38536, 23154 => 38541, 23155 => 38551, 23156 => 38576, 23157 => 37015,
-23158 => 37019, 23159 => 37021, 23160 => 37017, 23161 => 37036, 23162 => 37025,
-23163 => 37044, 23164 => 37043, 23165 => 37046, 23166 => 37050, 23329 => 37048,
-23330 => 37040, 23331 => 37071, 23332 => 37061, 23333 => 37054, 23334 => 37072,
-23335 => 37060, 23336 => 37063, 23337 => 37075, 23338 => 37094, 23339 => 37090,
-23340 => 37084, 23341 => 37079, 23342 => 37083, 23343 => 37099, 23344 => 37103,
-23345 => 37118, 23346 => 37124, 23347 => 37154, 23348 => 37150, 23349 => 37155,
-23350 => 37169, 23351 => 37167, 23352 => 37177, 23353 => 37187, 23354 => 37190,
-23355 => 21005, 23356 => 22850, 23357 => 21154, 23358 => 21164, 23359 => 21165,
-23360 => 21182, 23361 => 21759, 23362 => 21200, 23363 => 21206, 23364 => 21232,
-23365 => 21471, 23366 => 29166, 23367 => 30669, 23368 => 24308, 23369 => 20981,
-23370 => 20988, 23371 => 39727, 23372 => 21430, 23373 => 24321, 23374 => 30042,
-23375 => 24047, 23376 => 22348, 23377 => 22441, 23378 => 22433, 23379 => 22654,
-23380 => 22716, 23381 => 22725, 23382 => 22737, 23383 => 22313, 23384 => 22316,
-23385 => 22314, 23386 => 22323, 23387 => 22329, 23388 => 22318, 23389 => 22319,
-23390 => 22364, 23391 => 22331, 23392 => 22338, 23393 => 22377, 23394 => 22405,
-23395 => 22379, 23396 => 22406, 23397 => 22396, 23398 => 22395, 23399 => 22376,
-23400 => 22381, 23401 => 22390, 23402 => 22387, 23403 => 22445, 23404 => 22436,
-23405 => 22412, 23406 => 22450, 23407 => 22479, 23408 => 22439, 23409 => 22452,
-23410 => 22419, 23411 => 22432, 23412 => 22485, 23413 => 22488, 23414 => 22490,
-23415 => 22489, 23416 => 22482, 23417 => 22456, 23418 => 22516, 23419 => 22511,
-23420 => 22520, 23421 => 22500, 23422 => 22493, 23585 => 22539, 23586 => 22541,
-23587 => 22525, 23588 => 22509, 23589 => 22528, 23590 => 22558, 23591 => 22553,
-23592 => 22596, 23593 => 22560, 23594 => 22629, 23595 => 22636, 23596 => 22657,
-23597 => 22665, 23598 => 22682, 23599 => 22656, 23600 => 39336, 23601 => 40729,
-23602 => 25087, 23603 => 33401, 23604 => 33405, 23605 => 33407, 23606 => 33423,
-23607 => 33418, 23608 => 33448, 23609 => 33412, 23610 => 33422, 23611 => 33425,
-23612 => 33431, 23613 => 33433, 23614 => 33451, 23615 => 33464, 23616 => 33470,
-23617 => 33456, 23618 => 33480, 23619 => 33482, 23620 => 33507, 23621 => 33432,
-23622 => 33463, 23623 => 33454, 23624 => 33483, 23625 => 33484, 23626 => 33473,
-23627 => 33449, 23628 => 33460, 23629 => 33441, 23630 => 33450, 23631 => 33439,
-23632 => 33476, 23633 => 33486, 23634 => 33444, 23635 => 33505, 23636 => 33545,
-23637 => 33527, 23638 => 33508, 23639 => 33551, 23640 => 33543, 23641 => 33500,
-23642 => 33524, 23643 => 33490, 23644 => 33496, 23645 => 33548, 23646 => 33531,
-23647 => 33491, 23648 => 33553, 23649 => 33562, 23650 => 33542, 23651 => 33556,
-23652 => 33557, 23653 => 33504, 23654 => 33493, 23655 => 33564, 23656 => 33617,
-23657 => 33627, 23658 => 33628, 23659 => 33544, 23660 => 33682, 23661 => 33596,
-23662 => 33588, 23663 => 33585, 23664 => 33691, 23665 => 33630, 23666 => 33583,
-23667 => 33615, 23668 => 33607, 23669 => 33603, 23670 => 33631, 23671 => 33600,
-23672 => 33559, 23673 => 33632, 23674 => 33581, 23675 => 33594, 23676 => 33587,
-23677 => 33638, 23678 => 33637, 23841 => 33640, 23842 => 33563, 23843 => 33641,
-23844 => 33644, 23845 => 33642, 23846 => 33645, 23847 => 33646, 23848 => 33712,
-23849 => 33656, 23850 => 33715, 23851 => 33716, 23852 => 33696, 23853 => 33706,
-23854 => 33683, 23855 => 33692, 23856 => 33669, 23857 => 33660, 23858 => 33718,
-23859 => 33705, 23860 => 33661, 23861 => 33720, 23862 => 33659, 23863 => 33688,
-23864 => 33694, 23865 => 33704, 23866 => 33722, 23867 => 33724, 23868 => 33729,
-23869 => 33793, 23870 => 33765, 23871 => 33752, 23872 => 22535, 23873 => 33816,
-23874 => 33803, 23875 => 33757, 23876 => 33789, 23877 => 33750, 23878 => 33820,
-23879 => 33848, 23880 => 33809, 23881 => 33798, 23882 => 33748, 23883 => 33759,
-23884 => 33807, 23885 => 33795, 23886 => 33784, 23887 => 33785, 23888 => 33770,
-23889 => 33733, 23890 => 33728, 23891 => 33830, 23892 => 33776, 23893 => 33761,
-23894 => 33884, 23895 => 33873, 23896 => 33882, 23897 => 33881, 23898 => 33907,
-23899 => 33927, 23900 => 33928, 23901 => 33914, 23902 => 33929, 23903 => 33912,
-23904 => 33852, 23905 => 33862, 23906 => 33897, 23907 => 33910, 23908 => 33932,
-23909 => 33934, 23910 => 33841, 23911 => 33901, 23912 => 33985, 23913 => 33997,
-23914 => 34000, 23915 => 34022, 23916 => 33981, 23917 => 34003, 23918 => 33994,
-23919 => 33983, 23920 => 33978, 23921 => 34016, 23922 => 33953, 23923 => 33977,
-23924 => 33972, 23925 => 33943, 23926 => 34021, 23927 => 34019, 23928 => 34060,
-23929 => 29965, 23930 => 34104, 23931 => 34032, 23932 => 34105, 23933 => 34079,
-23934 => 34106, 24097 => 34134, 24098 => 34107, 24099 => 34047, 24100 => 34044,
-24101 => 34137, 24102 => 34120, 24103 => 34152, 24104 => 34148, 24105 => 34142,
-24106 => 34170, 24107 => 30626, 24108 => 34115, 24109 => 34162, 24110 => 34171,
-24111 => 34212, 24112 => 34216, 24113 => 34183, 24114 => 34191, 24115 => 34169,
-24116 => 34222, 24117 => 34204, 24118 => 34181, 24119 => 34233, 24120 => 34231,
-24121 => 34224, 24122 => 34259, 24123 => 34241, 24124 => 34268, 24125 => 34303,
-24126 => 34343, 24127 => 34309, 24128 => 34345, 24129 => 34326, 24130 => 34364,
-24131 => 24318, 24132 => 24328, 24133 => 22844, 24134 => 22849, 24135 => 32823,
-24136 => 22869, 24137 => 22874, 24138 => 22872, 24139 => 21263, 24140 => 23586,
-24141 => 23589, 24142 => 23596, 24143 => 23604, 24144 => 25164, 24145 => 25194,
-24146 => 25247, 24147 => 25275, 24148 => 25290, 24149 => 25306, 24150 => 25303,
-24151 => 25326, 24152 => 25378, 24153 => 25334, 24154 => 25401, 24155 => 25419,
-24156 => 25411, 24157 => 25517, 24158 => 25590, 24159 => 25457, 24160 => 25466,
-24161 => 25486, 24162 => 25524, 24163 => 25453, 24164 => 25516, 24165 => 25482,
-24166 => 25449, 24167 => 25518, 24168 => 25532, 24169 => 25586, 24170 => 25592,
-24171 => 25568, 24172 => 25599, 24173 => 25540, 24174 => 25566, 24175 => 25550,
-24176 => 25682, 24177 => 25542, 24178 => 25534, 24179 => 25669, 24180 => 25665,
-24181 => 25611, 24182 => 25627, 24183 => 25632, 24184 => 25612, 24185 => 25638,
-24186 => 25633, 24187 => 25694, 24188 => 25732, 24189 => 25709, 24190 => 25750,
-24353 => 25722, 24354 => 25783, 24355 => 25784, 24356 => 25753, 24357 => 25786,
-24358 => 25792, 24359 => 25808, 24360 => 25815, 24361 => 25828, 24362 => 25826,
-24363 => 25865, 24364 => 25893, 24365 => 25902, 24366 => 24331, 24367 => 24530,
-24368 => 29977, 24369 => 24337, 24370 => 21343, 24371 => 21489, 24372 => 21501,
-24373 => 21481, 24374 => 21480, 24375 => 21499, 24376 => 21522, 24377 => 21526,
-24378 => 21510, 24379 => 21579, 24380 => 21586, 24381 => 21587, 24382 => 21588,
-24383 => 21590, 24384 => 21571, 24385 => 21537, 24386 => 21591, 24387 => 21593,
-24388 => 21539, 24389 => 21554, 24390 => 21634, 24391 => 21652, 24392 => 21623,
-24393 => 21617, 24394 => 21604, 24395 => 21658, 24396 => 21659, 24397 => 21636,
-24398 => 21622, 24399 => 21606, 24400 => 21661, 24401 => 21712, 24402 => 21677,
-24403 => 21698, 24404 => 21684, 24405 => 21714, 24406 => 21671, 24407 => 21670,
-24408 => 21715, 24409 => 21716, 24410 => 21618, 24411 => 21667, 24412 => 21717,
-24413 => 21691, 24414 => 21695, 24415 => 21708, 24416 => 21721, 24417 => 21722,
-24418 => 21724, 24419 => 21673, 24420 => 21674, 24421 => 21668, 24422 => 21725,
-24423 => 21711, 24424 => 21726, 24425 => 21787, 24426 => 21735, 24427 => 21792,
-24428 => 21757, 24429 => 21780, 24430 => 21747, 24431 => 21794, 24432 => 21795,
-24433 => 21775, 24434 => 21777, 24435 => 21799, 24436 => 21802, 24437 => 21863,
-24438 => 21903, 24439 => 21941, 24440 => 21833, 24441 => 21869, 24442 => 21825,
-24443 => 21845, 24444 => 21823, 24445 => 21840, 24446 => 21820, 24609 => 21815,
-24610 => 21846, 24611 => 21877, 24612 => 21878, 24613 => 21879, 24614 => 21811,
-24615 => 21808, 24616 => 21852, 24617 => 21899, 24618 => 21970, 24619 => 21891,
-24620 => 21937, 24621 => 21945, 24622 => 21896, 24623 => 21889, 24624 => 21919,
-24625 => 21886, 24626 => 21974, 24627 => 21905, 24628 => 21883, 24629 => 21983,
-24630 => 21949, 24631 => 21950, 24632 => 21908, 24633 => 21913, 24634 => 21994,
-24635 => 22007, 24636 => 21961, 24637 => 22047, 24638 => 21969, 24639 => 21995,
-24640 => 21996, 24641 => 21972, 24642 => 21990, 24643 => 21981, 24644 => 21956,
-24645 => 21999, 24646 => 21989, 24647 => 22002, 24648 => 22003, 24649 => 21964,
-24650 => 21965, 24651 => 21992, 24652 => 22005, 24653 => 21988, 24654 => 36756,
-24655 => 22046, 24656 => 22024, 24657 => 22028, 24658 => 22017, 24659 => 22052,
-24660 => 22051, 24661 => 22014, 24662 => 22016, 24663 => 22055, 24664 => 22061,
-24665 => 22104, 24666 => 22073, 24667 => 22103, 24668 => 22060, 24669 => 22093,
-24670 => 22114, 24671 => 22105, 24672 => 22108, 24673 => 22092, 24674 => 22100,
-24675 => 22150, 24676 => 22116, 24677 => 22129, 24678 => 22123, 24679 => 22139,
-24680 => 22140, 24681 => 22149, 24682 => 22163, 24683 => 22191, 24684 => 22228,
-24685 => 22231, 24686 => 22237, 24687 => 22241, 24688 => 22261, 24689 => 22251,
-24690 => 22265, 24691 => 22271, 24692 => 22276, 24693 => 22282, 24694 => 22281,
-24695 => 22300, 24696 => 24079, 24697 => 24089, 24698 => 24084, 24699 => 24081,
-24700 => 24113, 24701 => 24123, 24702 => 24124, 24865 => 24119, 24866 => 24132,
-24867 => 24148, 24868 => 24155, 24869 => 24158, 24870 => 24161, 24871 => 23692,
-24872 => 23674, 24873 => 23693, 24874 => 23696, 24875 => 23702, 24876 => 23688,
-24877 => 23704, 24878 => 23705, 24879 => 23697, 24880 => 23706, 24881 => 23708,
-24882 => 23733, 24883 => 23714, 24884 => 23741, 24885 => 23724, 24886 => 23723,
-24887 => 23729, 24888 => 23715, 24889 => 23745, 24890 => 23735, 24891 => 23748,
-24892 => 23762, 24893 => 23780, 24894 => 23755, 24895 => 23781, 24896 => 23810,
-24897 => 23811, 24898 => 23847, 24899 => 23846, 24900 => 23854, 24901 => 23844,
-24902 => 23838, 24903 => 23814, 24904 => 23835, 24905 => 23896, 24906 => 23870,
-24907 => 23860, 24908 => 23869, 24909 => 23916, 24910 => 23899, 24911 => 23919,
-24912 => 23901, 24913 => 23915, 24914 => 23883, 24915 => 23882, 24916 => 23913,
-24917 => 23924, 24918 => 23938, 24919 => 23961, 24920 => 23965, 24921 => 35955,
-24922 => 23991, 24923 => 24005, 24924 => 24435, 24925 => 24439, 24926 => 24450,
-24927 => 24455, 24928 => 24457, 24929 => 24460, 24930 => 24469, 24931 => 24473,
-24932 => 24476, 24933 => 24488, 24934 => 24493, 24935 => 24501, 24936 => 24508,
-24937 => 34914, 24938 => 24417, 24939 => 29357, 24940 => 29360, 24941 => 29364,
-24942 => 29367, 24943 => 29368, 24944 => 29379, 24945 => 29377, 24946 => 29390,
-24947 => 29389, 24948 => 29394, 24949 => 29416, 24950 => 29423, 24951 => 29417,
-24952 => 29426, 24953 => 29428, 24954 => 29431, 24955 => 29441, 24956 => 29427,
-24957 => 29443, 24958 => 29434, 25121 => 29435, 25122 => 29463, 25123 => 29459,
-25124 => 29473, 25125 => 29450, 25126 => 29470, 25127 => 29469, 25128 => 29461,
-25129 => 29474, 25130 => 29497, 25131 => 29477, 25132 => 29484, 25133 => 29496,
-25134 => 29489, 25135 => 29520, 25136 => 29517, 25137 => 29527, 25138 => 29536,
-25139 => 29548, 25140 => 29551, 25141 => 29566, 25142 => 33307, 25143 => 22821,
-25144 => 39143, 25145 => 22820, 25146 => 22786, 25147 => 39267, 25148 => 39271,
-25149 => 39272, 25150 => 39273, 25151 => 39274, 25152 => 39275, 25153 => 39276,
-25154 => 39284, 25155 => 39287, 25156 => 39293, 25157 => 39296, 25158 => 39300,
-25159 => 39303, 25160 => 39306, 25161 => 39309, 25162 => 39312, 25163 => 39313,
-25164 => 39315, 25165 => 39316, 25166 => 39317, 25167 => 24192, 25168 => 24209,
-25169 => 24203, 25170 => 24214, 25171 => 24229, 25172 => 24224, 25173 => 24249,
-25174 => 24245, 25175 => 24254, 25176 => 24243, 25177 => 36179, 25178 => 24274,
-25179 => 24273, 25180 => 24283, 25181 => 24296, 25182 => 24298, 25183 => 33210,
-25184 => 24516, 25185 => 24521, 25186 => 24534, 25187 => 24527, 25188 => 24579,
-25189 => 24558, 25190 => 24580, 25191 => 24545, 25192 => 24548, 25193 => 24574,
-25194 => 24581, 25195 => 24582, 25196 => 24554, 25197 => 24557, 25198 => 24568,
-25199 => 24601, 25200 => 24629, 25201 => 24614, 25202 => 24603, 25203 => 24591,
-25204 => 24589, 25205 => 24617, 25206 => 24619, 25207 => 24586, 25208 => 24639,
-25209 => 24609, 25210 => 24696, 25211 => 24697, 25212 => 24699, 25213 => 24698,
-25214 => 24642, 25377 => 24682, 25378 => 24701, 25379 => 24726, 25380 => 24730,
-25381 => 24749, 25382 => 24733, 25383 => 24707, 25384 => 24722, 25385 => 24716,
-25386 => 24731, 25387 => 24812, 25388 => 24763, 25389 => 24753, 25390 => 24797,
-25391 => 24792, 25392 => 24774, 25393 => 24794, 25394 => 24756, 25395 => 24864,
-25396 => 24870, 25397 => 24853, 25398 => 24867, 25399 => 24820, 25400 => 24832,
-25401 => 24846, 25402 => 24875, 25403 => 24906, 25404 => 24949, 25405 => 25004,
-25406 => 24980, 25407 => 24999, 25408 => 25015, 25409 => 25044, 25410 => 25077,
-25411 => 24541, 25412 => 38579, 25413 => 38377, 25414 => 38379, 25415 => 38385,
-25416 => 38387, 25417 => 38389, 25418 => 38390, 25419 => 38396, 25420 => 38398,
-25421 => 38403, 25422 => 38404, 25423 => 38406, 25424 => 38408, 25425 => 38410,
-25426 => 38411, 25427 => 38412, 25428 => 38413, 25429 => 38415, 25430 => 38418,
-25431 => 38421, 25432 => 38422, 25433 => 38423, 25434 => 38425, 25435 => 38426,
-25436 => 20012, 25437 => 29247, 25438 => 25109, 25439 => 27701, 25440 => 27732,
-25441 => 27740, 25442 => 27722, 25443 => 27811, 25444 => 27781, 25445 => 27792,
-25446 => 27796, 25447 => 27788, 25448 => 27752, 25449 => 27753, 25450 => 27764,
-25451 => 27766, 25452 => 27782, 25453 => 27817, 25454 => 27856, 25455 => 27860,
-25456 => 27821, 25457 => 27895, 25458 => 27896, 25459 => 27889, 25460 => 27863,
-25461 => 27826, 25462 => 27872, 25463 => 27862, 25464 => 27898, 25465 => 27883,
-25466 => 27886, 25467 => 27825, 25468 => 27859, 25469 => 27887, 25470 => 27902,
-25633 => 27961, 25634 => 27943, 25635 => 27916, 25636 => 27971, 25637 => 27976,
-25638 => 27911, 25639 => 27908, 25640 => 27929, 25641 => 27918, 25642 => 27947,
-25643 => 27981, 25644 => 27950, 25645 => 27957, 25646 => 27930, 25647 => 27983,
-25648 => 27986, 25649 => 27988, 25650 => 27955, 25651 => 28049, 25652 => 28015,
-25653 => 28062, 25654 => 28064, 25655 => 27998, 25656 => 28051, 25657 => 28052,
-25658 => 27996, 25659 => 28000, 25660 => 28028, 25661 => 28003, 25662 => 28186,
-25663 => 28103, 25664 => 28101, 25665 => 28126, 25666 => 28174, 25667 => 28095,
-25668 => 28128, 25669 => 28177, 25670 => 28134, 25671 => 28125, 25672 => 28121,
-25673 => 28182, 25674 => 28075, 25675 => 28172, 25676 => 28078, 25677 => 28203,
-25678 => 28270, 25679 => 28238, 25680 => 28267, 25681 => 28338, 25682 => 28255,
-25683 => 28294, 25684 => 28243, 25685 => 28244, 25686 => 28210, 25687 => 28197,
-25688 => 28228, 25689 => 28383, 25690 => 28337, 25691 => 28312, 25692 => 28384,
-25693 => 28461, 25694 => 28386, 25695 => 28325, 25696 => 28327, 25697 => 28349,
-25698 => 28347, 25699 => 28343, 25700 => 28375, 25701 => 28340, 25702 => 28367,
-25703 => 28303, 25704 => 28354, 25705 => 28319, 25706 => 28514, 25707 => 28486,
-25708 => 28487, 25709 => 28452, 25710 => 28437, 25711 => 28409, 25712 => 28463,
-25713 => 28470, 25714 => 28491, 25715 => 28532, 25716 => 28458, 25717 => 28425,
-25718 => 28457, 25719 => 28553, 25720 => 28557, 25721 => 28556, 25722 => 28536,
-25723 => 28530, 25724 => 28540, 25725 => 28538, 25726 => 28625, 25889 => 28617,
-25890 => 28583, 25891 => 28601, 25892 => 28598, 25893 => 28610, 25894 => 28641,
-25895 => 28654, 25896 => 28638, 25897 => 28640, 25898 => 28655, 25899 => 28698,
-25900 => 28707, 25901 => 28699, 25902 => 28729, 25903 => 28725, 25904 => 28751,
-25905 => 28766, 25906 => 23424, 25907 => 23428, 25908 => 23445, 25909 => 23443,
-25910 => 23461, 25911 => 23480, 25912 => 29999, 25913 => 39582, 25914 => 25652,
-25915 => 23524, 25916 => 23534, 25917 => 35120, 25918 => 23536, 25919 => 36423,
-25920 => 35591, 25921 => 36790, 25922 => 36819, 25923 => 36821, 25924 => 36837,
-25925 => 36846, 25926 => 36836, 25927 => 36841, 25928 => 36838, 25929 => 36851,
-25930 => 36840, 25931 => 36869, 25932 => 36868, 25933 => 36875, 25934 => 36902,
-25935 => 36881, 25936 => 36877, 25937 => 36886, 25938 => 36897, 25939 => 36917,
-25940 => 36918, 25941 => 36909, 25942 => 36911, 25943 => 36932, 25944 => 36945,
-25945 => 36946, 25946 => 36944, 25947 => 36968, 25948 => 36952, 25949 => 36962,
-25950 => 36955, 25951 => 26297, 25952 => 36980, 25953 => 36989, 25954 => 36994,
-25955 => 37000, 25956 => 36995, 25957 => 37003, 25958 => 24400, 25959 => 24407,
-25960 => 24406, 25961 => 24408, 25962 => 23611, 25963 => 21675, 25964 => 23632,
-25965 => 23641, 25966 => 23409, 25967 => 23651, 25968 => 23654, 25969 => 32700,
-25970 => 24362, 25971 => 24361, 25972 => 24365, 25973 => 33396, 25974 => 24380,
-25975 => 39739, 25976 => 23662, 25977 => 22913, 25978 => 22915, 25979 => 22925,
-25980 => 22953, 25981 => 22954, 25982 => 22947, 26145 => 22935, 26146 => 22986,
-26147 => 22955, 26148 => 22942, 26149 => 22948, 26150 => 22994, 26151 => 22962,
-26152 => 22959, 26153 => 22999, 26154 => 22974, 26155 => 23045, 26156 => 23046,
-26157 => 23005, 26158 => 23048, 26159 => 23011, 26160 => 23000, 26161 => 23033,
-26162 => 23052, 26163 => 23049, 26164 => 23090, 26165 => 23092, 26166 => 23057,
-26167 => 23075, 26168 => 23059, 26169 => 23104, 26170 => 23143, 26171 => 23114,
-26172 => 23125, 26173 => 23100, 26174 => 23138, 26175 => 23157, 26176 => 33004,
-26177 => 23210, 26178 => 23195, 26179 => 23159, 26180 => 23162, 26181 => 23230,
-26182 => 23275, 26183 => 23218, 26184 => 23250, 26185 => 23252, 26186 => 23224,
-26187 => 23264, 26188 => 23267, 26189 => 23281, 26190 => 23254, 26191 => 23270,
-26192 => 23256, 26193 => 23260, 26194 => 23305, 26195 => 23319, 26196 => 23318,
-26197 => 23346, 26198 => 23351, 26199 => 23360, 26200 => 23573, 26201 => 23580,
-26202 => 23386, 26203 => 23397, 26204 => 23411, 26205 => 23377, 26206 => 23379,
-26207 => 23394, 26208 => 39541, 26209 => 39543, 26210 => 39544, 26211 => 39546,
-26212 => 39551, 26213 => 39549, 26214 => 39552, 26215 => 39553, 26216 => 39557,
-26217 => 39560, 26218 => 39562, 26219 => 39568, 26220 => 39570, 26221 => 39571,
-26222 => 39574, 26223 => 39576, 26224 => 39579, 26225 => 39580, 26226 => 39581,
-26227 => 39583, 26228 => 39584, 26229 => 39586, 26230 => 39587, 26231 => 39589,
-26232 => 39591, 26233 => 32415, 26234 => 32417, 26235 => 32419, 26236 => 32421,
-26237 => 32424, 26238 => 32425, 26401 => 32429, 26402 => 32432, 26403 => 32446,
-26404 => 32448, 26405 => 32449, 26406 => 32450, 26407 => 32457, 26408 => 32459,
-26409 => 32460, 26410 => 32464, 26411 => 32468, 26412 => 32471, 26413 => 32475,
-26414 => 32480, 26415 => 32481, 26416 => 32488, 26417 => 32491, 26418 => 32494,
-26419 => 32495, 26420 => 32497, 26421 => 32498, 26422 => 32525, 26423 => 32502,
-26424 => 32506, 26425 => 32507, 26426 => 32510, 26427 => 32513, 26428 => 32514,
-26429 => 32515, 26430 => 32519, 26431 => 32520, 26432 => 32523, 26433 => 32524,
-26434 => 32527, 26435 => 32529, 26436 => 32530, 26437 => 32535, 26438 => 32537,
-26439 => 32540, 26440 => 32539, 26441 => 32543, 26442 => 32545, 26443 => 32546,
-26444 => 32547, 26445 => 32548, 26446 => 32549, 26447 => 32550, 26448 => 32551,
-26449 => 32554, 26450 => 32555, 26451 => 32556, 26452 => 32557, 26453 => 32559,
-26454 => 32560, 26455 => 32561, 26456 => 32562, 26457 => 32563, 26458 => 32565,
-26459 => 24186, 26460 => 30079, 26461 => 24027, 26462 => 30014, 26463 => 37013,
-26464 => 29582, 26465 => 29585, 26466 => 29614, 26467 => 29602, 26468 => 29599,
-26469 => 29647, 26470 => 29634, 26471 => 29649, 26472 => 29623, 26473 => 29619,
-26474 => 29632, 26475 => 29641, 26476 => 29640, 26477 => 29669, 26478 => 29657,
-26479 => 39036, 26480 => 29706, 26481 => 29673, 26482 => 29671, 26483 => 29662,
-26484 => 29626, 26485 => 29682, 26486 => 29711, 26487 => 29738, 26488 => 29787,
-26489 => 29734, 26490 => 29733, 26491 => 29736, 26492 => 29744, 26493 => 29742,
-26494 => 29740, 26657 => 29723, 26658 => 29722, 26659 => 29761, 26660 => 29788,
-26661 => 29783, 26662 => 29781, 26663 => 29785, 26664 => 29815, 26665 => 29805,
-26666 => 29822, 26667 => 29852, 26668 => 29838, 26669 => 29824, 26670 => 29825,
-26671 => 29831, 26672 => 29835, 26673 => 29854, 26674 => 29864, 26675 => 29865,
-26676 => 29840, 26677 => 29863, 26678 => 29906, 26679 => 29882, 26680 => 38890,
-26681 => 38891, 26682 => 38892, 26683 => 26444, 26684 => 26451, 26685 => 26462,
-26686 => 26440, 26687 => 26473, 26688 => 26533, 26689 => 26503, 26690 => 26474,
-26691 => 26483, 26692 => 26520, 26693 => 26535, 26694 => 26485, 26695 => 26536,
-26696 => 26526, 26697 => 26541, 26698 => 26507, 26699 => 26487, 26700 => 26492,
-26701 => 26608, 26702 => 26633, 26703 => 26584, 26704 => 26634, 26705 => 26601,
-26706 => 26544, 26707 => 26636, 26708 => 26585, 26709 => 26549, 26710 => 26586,
-26711 => 26547, 26712 => 26589, 26713 => 26624, 26714 => 26563, 26715 => 26552,
-26716 => 26594, 26717 => 26638, 26718 => 26561, 26719 => 26621, 26720 => 26674,
-26721 => 26675, 26722 => 26720, 26723 => 26721, 26724 => 26702, 26725 => 26722,
-26726 => 26692, 26727 => 26724, 26728 => 26755, 26729 => 26653, 26730 => 26709,
-26731 => 26726, 26732 => 26689, 26733 => 26727, 26734 => 26688, 26735 => 26686,
-26736 => 26698, 26737 => 26697, 26738 => 26665, 26739 => 26805, 26740 => 26767,
-26741 => 26740, 26742 => 26743, 26743 => 26771, 26744 => 26731, 26745 => 26818,
-26746 => 26990, 26747 => 26876, 26748 => 26911, 26749 => 26912, 26750 => 26873,
-26913 => 26916, 26914 => 26864, 26915 => 26891, 26916 => 26881, 26917 => 26967,
-26918 => 26851, 26919 => 26896, 26920 => 26993, 26921 => 26937, 26922 => 26976,
-26923 => 26946, 26924 => 26973, 26925 => 27012, 26926 => 26987, 26927 => 27008,
-26928 => 27032, 26929 => 27000, 26930 => 26932, 26931 => 27084, 26932 => 27015,
-26933 => 27016, 26934 => 27086, 26935 => 27017, 26936 => 26982, 26937 => 26979,
-26938 => 27001, 26939 => 27035, 26940 => 27047, 26941 => 27067, 26942 => 27051,
-26943 => 27053, 26944 => 27092, 26945 => 27057, 26946 => 27073, 26947 => 27082,
-26948 => 27103, 26949 => 27029, 26950 => 27104, 26951 => 27021, 26952 => 27135,
-26953 => 27183, 26954 => 27117, 26955 => 27159, 26956 => 27160, 26957 => 27237,
-26958 => 27122, 26959 => 27204, 26960 => 27198, 26961 => 27296, 26962 => 27216,
-26963 => 27227, 26964 => 27189, 26965 => 27278, 26966 => 27257, 26967 => 27197,
-26968 => 27176, 26969 => 27224, 26970 => 27260, 26971 => 27281, 26972 => 27280,
-26973 => 27305, 26974 => 27287, 26975 => 27307, 26976 => 29495, 26977 => 29522,
-26978 => 27521, 26979 => 27522, 26980 => 27527, 26981 => 27524, 26982 => 27538,
-26983 => 27539, 26984 => 27533, 26985 => 27546, 26986 => 27547, 26987 => 27553,
-26988 => 27562, 26989 => 36715, 26990 => 36717, 26991 => 36721, 26992 => 36722,
-26993 => 36723, 26994 => 36725, 26995 => 36726, 26996 => 36728, 26997 => 36727,
-26998 => 36729, 26999 => 36730, 27000 => 36732, 27001 => 36734, 27002 => 36737,
-27003 => 36738, 27004 => 36740, 27005 => 36743, 27006 => 36747, 27169 => 36749,
-27170 => 36750, 27171 => 36751, 27172 => 36760, 27173 => 36762, 27174 => 36558,
-27175 => 25099, 27176 => 25111, 27177 => 25115, 27178 => 25119, 27179 => 25122,
-27180 => 25121, 27181 => 25125, 27182 => 25124, 27183 => 25132, 27184 => 33255,
-27185 => 29935, 27186 => 29940, 27187 => 29951, 27188 => 29967, 27189 => 29969,
-27190 => 29971, 27191 => 25908, 27192 => 26094, 27193 => 26095, 27194 => 26096,
-27195 => 26122, 27196 => 26137, 27197 => 26482, 27198 => 26115, 27199 => 26133,
-27200 => 26112, 27201 => 28805, 27202 => 26359, 27203 => 26141, 27204 => 26164,
-27205 => 26161, 27206 => 26166, 27207 => 26165, 27208 => 32774, 27209 => 26207,
-27210 => 26196, 27211 => 26177, 27212 => 26191, 27213 => 26198, 27214 => 26209,
-27215 => 26199, 27216 => 26231, 27217 => 26244, 27218 => 26252, 27219 => 26279,
-27220 => 26269, 27221 => 26302, 27222 => 26331, 27223 => 26332, 27224 => 26342,
-27225 => 26345, 27226 => 36146, 27227 => 36147, 27228 => 36150, 27229 => 36155,
-27230 => 36157, 27231 => 36160, 27232 => 36165, 27233 => 36166, 27234 => 36168,
-27235 => 36169, 27236 => 36167, 27237 => 36173, 27238 => 36181, 27239 => 36185,
-27240 => 35271, 27241 => 35274, 27242 => 35275, 27243 => 35276, 27244 => 35278,
-27245 => 35279, 27246 => 35280, 27247 => 35281, 27248 => 29294, 27249 => 29343,
-27250 => 29277, 27251 => 29286, 27252 => 29295, 27253 => 29310, 27254 => 29311,
-27255 => 29316, 27256 => 29323, 27257 => 29325, 27258 => 29327, 27259 => 29330,
-27260 => 25352, 27261 => 25394, 27262 => 25520, 27425 => 25663, 27426 => 25816,
-27427 => 32772, 27428 => 27626, 27429 => 27635, 27430 => 27645, 27431 => 27637,
-27432 => 27641, 27433 => 27653, 27434 => 27655, 27435 => 27654, 27436 => 27661,
-27437 => 27669, 27438 => 27672, 27439 => 27673, 27440 => 27674, 27441 => 27681,
-27442 => 27689, 27443 => 27684, 27444 => 27690, 27445 => 27698, 27446 => 25909,
-27447 => 25941, 27448 => 25963, 27449 => 29261, 27450 => 29266, 27451 => 29270,
-27452 => 29232, 27453 => 34402, 27454 => 21014, 27455 => 32927, 27456 => 32924,
-27457 => 32915, 27458 => 32956, 27459 => 26378, 27460 => 32957, 27461 => 32945,
-27462 => 32939, 27463 => 32941, 27464 => 32948, 27465 => 32951, 27466 => 32999,
-27467 => 33000, 27468 => 33001, 27469 => 33002, 27470 => 32987, 27471 => 32962,
-27472 => 32964, 27473 => 32985, 27474 => 32973, 27475 => 32983, 27476 => 26384,
-27477 => 32989, 27478 => 33003, 27479 => 33009, 27480 => 33012, 27481 => 33005,
-27482 => 33037, 27483 => 33038, 27484 => 33010, 27485 => 33020, 27486 => 26389,
-27487 => 33042, 27488 => 35930, 27489 => 33078, 27490 => 33054, 27491 => 33068,
-27492 => 33048, 27493 => 33074, 27494 => 33096, 27495 => 33100, 27496 => 33107,
-27497 => 33140, 27498 => 33113, 27499 => 33114, 27500 => 33137, 27501 => 33120,
-27502 => 33129, 27503 => 33148, 27504 => 33149, 27505 => 33133, 27506 => 33127,
-27507 => 22605, 27508 => 23221, 27509 => 33160, 27510 => 33154, 27511 => 33169,
-27512 => 28373, 27513 => 33187, 27514 => 33194, 27515 => 33228, 27516 => 26406,
-27517 => 33226, 27518 => 33211, 27681 => 33217, 27682 => 33190, 27683 => 27428,
-27684 => 27447, 27685 => 27449, 27686 => 27459, 27687 => 27462, 27688 => 27481,
-27689 => 39121, 27690 => 39122, 27691 => 39123, 27692 => 39125, 27693 => 39129,
-27694 => 39130, 27695 => 27571, 27696 => 24384, 27697 => 27586, 27698 => 35315,
-27699 => 26000, 27700 => 40785, 27701 => 26003, 27702 => 26044, 27703 => 26054,
-27704 => 26052, 27705 => 26051, 27706 => 26060, 27707 => 26062, 27708 => 26066,
-27709 => 26070, 27710 => 28800, 27711 => 28828, 27712 => 28822, 27713 => 28829,
-27714 => 28859, 27715 => 28864, 27716 => 28855, 27717 => 28843, 27718 => 28849,
-27719 => 28904, 27720 => 28874, 27721 => 28944, 27722 => 28947, 27723 => 28950,
-27724 => 28975, 27725 => 28977, 27726 => 29043, 27727 => 29020, 27728 => 29032,
-27729 => 28997, 27730 => 29042, 27731 => 29002, 27732 => 29048, 27733 => 29050,
-27734 => 29080, 27735 => 29107, 27736 => 29109, 27737 => 29096, 27738 => 29088,
-27739 => 29152, 27740 => 29140, 27741 => 29159, 27742 => 29177, 27743 => 29213,
-27744 => 29224, 27745 => 28780, 27746 => 28952, 27747 => 29030, 27748 => 29113,
-27749 => 25150, 27750 => 25149, 27751 => 25155, 27752 => 25160, 27753 => 25161,
-27754 => 31035, 27755 => 31040, 27756 => 31046, 27757 => 31049, 27758 => 31067,
-27759 => 31068, 27760 => 31059, 27761 => 31066, 27762 => 31074, 27763 => 31063,
-27764 => 31072, 27765 => 31087, 27766 => 31079, 27767 => 31098, 27768 => 31109,
-27769 => 31114, 27770 => 31130, 27771 => 31143, 27772 => 31155, 27773 => 24529,
-27774 => 24528, 27937 => 24636, 27938 => 24669, 27939 => 24666, 27940 => 24679,
-27941 => 24641, 27942 => 24665, 27943 => 24675, 27944 => 24747, 27945 => 24838,
-27946 => 24845, 27947 => 24925, 27948 => 25001, 27949 => 24989, 27950 => 25035,
-27951 => 25041, 27952 => 25094, 27953 => 32896, 27954 => 32895, 27955 => 27795,
-27956 => 27894, 27957 => 28156, 27958 => 30710, 27959 => 30712, 27960 => 30720,
-27961 => 30729, 27962 => 30743, 27963 => 30744, 27964 => 30737, 27965 => 26027,
-27966 => 30765, 27967 => 30748, 27968 => 30749, 27969 => 30777, 27970 => 30778,
-27971 => 30779, 27972 => 30751, 27973 => 30780, 27974 => 30757, 27975 => 30764,
-27976 => 30755, 27977 => 30761, 27978 => 30798, 27979 => 30829, 27980 => 30806,
-27981 => 30807, 27982 => 30758, 27983 => 30800, 27984 => 30791, 27985 => 30796,
-27986 => 30826, 27987 => 30875, 27988 => 30867, 27989 => 30874, 27990 => 30855,
-27991 => 30876, 27992 => 30881, 27993 => 30883, 27994 => 30898, 27995 => 30905,
-27996 => 30885, 27997 => 30932, 27998 => 30937, 27999 => 30921, 28000 => 30956,
-28001 => 30962, 28002 => 30981, 28003 => 30964, 28004 => 30995, 28005 => 31012,
-28006 => 31006, 28007 => 31028, 28008 => 40859, 28009 => 40697, 28010 => 40699,
-28011 => 40700, 28012 => 30449, 28013 => 30468, 28014 => 30477, 28015 => 30457,
-28016 => 30471, 28017 => 30472, 28018 => 30490, 28019 => 30498, 28020 => 30489,
-28021 => 30509, 28022 => 30502, 28023 => 30517, 28024 => 30520, 28025 => 30544,
-28026 => 30545, 28027 => 30535, 28028 => 30531, 28029 => 30554, 28030 => 30568,
-28193 => 30562, 28194 => 30565, 28195 => 30591, 28196 => 30605, 28197 => 30589,
-28198 => 30592, 28199 => 30604, 28200 => 30609, 28201 => 30623, 28202 => 30624,
-28203 => 30640, 28204 => 30645, 28205 => 30653, 28206 => 30010, 28207 => 30016,
-28208 => 30030, 28209 => 30027, 28210 => 30024, 28211 => 30043, 28212 => 30066,
-28213 => 30073, 28214 => 30083, 28215 => 32600, 28216 => 32609, 28217 => 32607,
-28218 => 35400, 28219 => 32616, 28220 => 32628, 28221 => 32625, 28222 => 32633,
-28223 => 32641, 28224 => 32638, 28225 => 30413, 28226 => 30437, 28227 => 34866,
-28228 => 38021, 28229 => 38022, 28230 => 38023, 28231 => 38027, 28232 => 38026,
-28233 => 38028, 28234 => 38029, 28235 => 38031, 28236 => 38032, 28237 => 38036,
-28238 => 38039, 28239 => 38037, 28240 => 38042, 28241 => 38043, 28242 => 38044,
-28243 => 38051, 28244 => 38052, 28245 => 38059, 28246 => 38058, 28247 => 38061,
-28248 => 38060, 28249 => 38063, 28250 => 38064, 28251 => 38066, 28252 => 38068,
-28253 => 38070, 28254 => 38071, 28255 => 38072, 28256 => 38073, 28257 => 38074,
-28258 => 38076, 28259 => 38077, 28260 => 38079, 28261 => 38084, 28262 => 38088,
-28263 => 38089, 28264 => 38090, 28265 => 38091, 28266 => 38092, 28267 => 38093,
-28268 => 38094, 28269 => 38096, 28270 => 38097, 28271 => 38098, 28272 => 38101,
-28273 => 38102, 28274 => 38103, 28275 => 38105, 28276 => 38104, 28277 => 38107,
-28278 => 38110, 28279 => 38111, 28280 => 38112, 28281 => 38114, 28282 => 38116,
-28283 => 38117, 28284 => 38119, 28285 => 38120, 28286 => 38122, 28449 => 38121,
-28450 => 38123, 28451 => 38126, 28452 => 38127, 28453 => 38131, 28454 => 38132,
-28455 => 38133, 28456 => 38135, 28457 => 38137, 28458 => 38140, 28459 => 38141,
-28460 => 38143, 28461 => 38147, 28462 => 38146, 28463 => 38150, 28464 => 38151,
-28465 => 38153, 28466 => 38154, 28467 => 38157, 28468 => 38158, 28469 => 38159,
-28470 => 38162, 28471 => 38163, 28472 => 38164, 28473 => 38165, 28474 => 38166,
-28475 => 38168, 28476 => 38171, 28477 => 38173, 28478 => 38174, 28479 => 38175,
-28480 => 38178, 28481 => 38186, 28482 => 38187, 28483 => 38185, 28484 => 38188,
-28485 => 38193, 28486 => 38194, 28487 => 38196, 28488 => 38198, 28489 => 38199,
-28490 => 38200, 28491 => 38204, 28492 => 38206, 28493 => 38207, 28494 => 38210,
-28495 => 38197, 28496 => 38212, 28497 => 38213, 28498 => 38214, 28499 => 38217,
-28500 => 38220, 28501 => 38222, 28502 => 38223, 28503 => 38226, 28504 => 38227,
-28505 => 38228, 28506 => 38230, 28507 => 38231, 28508 => 38232, 28509 => 38233,
-28510 => 38235, 28511 => 38238, 28512 => 38239, 28513 => 38237, 28514 => 38241,
-28515 => 38242, 28516 => 38244, 28517 => 38245, 28518 => 38246, 28519 => 38247,
-28520 => 38248, 28521 => 38249, 28522 => 38250, 28523 => 38251, 28524 => 38252,
-28525 => 38255, 28526 => 38257, 28527 => 38258, 28528 => 38259, 28529 => 38202,
-28530 => 30695, 28531 => 30700, 28532 => 38601, 28533 => 31189, 28534 => 31213,
-28535 => 31203, 28536 => 31211, 28537 => 31238, 28538 => 23879, 28539 => 31235,
-28540 => 31234, 28541 => 31262, 28542 => 31252, 28705 => 31289, 28706 => 31287,
-28707 => 31313, 28708 => 40655, 28709 => 39333, 28710 => 31344, 28711 => 30344,
-28712 => 30350, 28713 => 30355, 28714 => 30361, 28715 => 30372, 28716 => 29918,
-28717 => 29920, 28718 => 29996, 28719 => 40480, 28720 => 40482, 28721 => 40488,
-28722 => 40489, 28723 => 40490, 28724 => 40491, 28725 => 40492, 28726 => 40498,
-28727 => 40497, 28728 => 40502, 28729 => 40504, 28730 => 40503, 28731 => 40505,
-28732 => 40506, 28733 => 40510, 28734 => 40513, 28735 => 40514, 28736 => 40516,
-28737 => 40518, 28738 => 40519, 28739 => 40520, 28740 => 40521, 28741 => 40523,
-28742 => 40524, 28743 => 40526, 28744 => 40529, 28745 => 40533, 28746 => 40535,
-28747 => 40538, 28748 => 40539, 28749 => 40540, 28750 => 40542, 28751 => 40547,
-28752 => 40550, 28753 => 40551, 28754 => 40552, 28755 => 40553, 28756 => 40554,
-28757 => 40555, 28758 => 40556, 28759 => 40561, 28760 => 40557, 28761 => 40563,
-28762 => 30098, 28763 => 30100, 28764 => 30102, 28765 => 30112, 28766 => 30109,
-28767 => 30124, 28768 => 30115, 28769 => 30131, 28770 => 30132, 28771 => 30136,
-28772 => 30148, 28773 => 30129, 28774 => 30128, 28775 => 30147, 28776 => 30146,
-28777 => 30166, 28778 => 30157, 28779 => 30179, 28780 => 30184, 28781 => 30182,
-28782 => 30180, 28783 => 30187, 28784 => 30183, 28785 => 30211, 28786 => 30193,
-28787 => 30204, 28788 => 30207, 28789 => 30224, 28790 => 30208, 28791 => 30213,
-28792 => 30220, 28793 => 30231, 28794 => 30218, 28795 => 30245, 28796 => 30232,
-28797 => 30229, 28798 => 30233, 28961 => 30235, 28962 => 30268, 28963 => 30242,
-28964 => 30240, 28965 => 30272, 28966 => 30253, 28967 => 30256, 28968 => 30271,
-28969 => 30261, 28970 => 30275, 28971 => 30270, 28972 => 30259, 28973 => 30285,
-28974 => 30302, 28975 => 30292, 28976 => 30300, 28977 => 30294, 28978 => 30315,
-28979 => 30319, 28980 => 32714, 28981 => 31462, 28982 => 31352, 28983 => 31353,
-28984 => 31360, 28985 => 31366, 28986 => 31368, 28987 => 31381, 28988 => 31398,
-28989 => 31392, 28990 => 31404, 28991 => 31400, 28992 => 31405, 28993 => 31411,
-28994 => 34916, 28995 => 34921, 28996 => 34930, 28997 => 34941, 28998 => 34943,
-28999 => 34946, 29000 => 34978, 29001 => 35014, 29002 => 34999, 29003 => 35004,
-29004 => 35017, 29005 => 35042, 29006 => 35022, 29007 => 35043, 29008 => 35045,
-29009 => 35057, 29010 => 35098, 29011 => 35068, 29012 => 35048, 29013 => 35070,
-29014 => 35056, 29015 => 35105, 29016 => 35097, 29017 => 35091, 29018 => 35099,
-29019 => 35082, 29020 => 35124, 29021 => 35115, 29022 => 35126, 29023 => 35137,
-29024 => 35174, 29025 => 35195, 29026 => 30091, 29027 => 32997, 29028 => 30386,
-29029 => 30388, 29030 => 30684, 29031 => 32786, 29032 => 32788, 29033 => 32790,
-29034 => 32796, 29035 => 32800, 29036 => 32802, 29037 => 32805, 29038 => 32806,
-29039 => 32807, 29040 => 32809, 29041 => 32808, 29042 => 32817, 29043 => 32779,
-29044 => 32821, 29045 => 32835, 29046 => 32838, 29047 => 32845, 29048 => 32850,
-29049 => 32873, 29050 => 32881, 29051 => 35203, 29052 => 39032, 29053 => 39040,
-29054 => 39043, 29217 => 39049, 29218 => 39052, 29219 => 39053, 29220 => 39055,
-29221 => 39060, 29222 => 39066, 29223 => 39067, 29224 => 39070, 29225 => 39071,
-29226 => 39073, 29227 => 39074, 29228 => 39077, 29229 => 39078, 29230 => 34381,
-29231 => 34388, 29232 => 34412, 29233 => 34414, 29234 => 34431, 29235 => 34426,
-29236 => 34428, 29237 => 34427, 29238 => 34472, 29239 => 34445, 29240 => 34443,
-29241 => 34476, 29242 => 34461, 29243 => 34471, 29244 => 34467, 29245 => 34474,
-29246 => 34451, 29247 => 34473, 29248 => 34486, 29249 => 34500, 29250 => 34485,
-29251 => 34510, 29252 => 34480, 29253 => 34490, 29254 => 34481, 29255 => 34479,
-29256 => 34505, 29257 => 34511, 29258 => 34484, 29259 => 34537, 29260 => 34545,
-29261 => 34546, 29262 => 34541, 29263 => 34547, 29264 => 34512, 29265 => 34579,
-29266 => 34526, 29267 => 34548, 29268 => 34527, 29269 => 34520, 29270 => 34513,
-29271 => 34563, 29272 => 34567, 29273 => 34552, 29274 => 34568, 29275 => 34570,
-29276 => 34573, 29277 => 34569, 29278 => 34595, 29279 => 34619, 29280 => 34590,
-29281 => 34597, 29282 => 34606, 29283 => 34586, 29284 => 34622, 29285 => 34632,
-29286 => 34612, 29287 => 34609, 29288 => 34601, 29289 => 34615, 29290 => 34623,
-29291 => 34690, 29292 => 34594, 29293 => 34685, 29294 => 34686, 29295 => 34683,
-29296 => 34656, 29297 => 34672, 29298 => 34636, 29299 => 34670, 29300 => 34699,
-29301 => 34643, 29302 => 34659, 29303 => 34684, 29304 => 34660, 29305 => 34649,
-29306 => 34661, 29307 => 34707, 29308 => 34735, 29309 => 34728, 29310 => 34770,
-29473 => 34758, 29474 => 34696, 29475 => 34693, 29476 => 34733, 29477 => 34711,
-29478 => 34691, 29479 => 34731, 29480 => 34789, 29481 => 34732, 29482 => 34741,
-29483 => 34739, 29484 => 34763, 29485 => 34771, 29486 => 34749, 29487 => 34769,
-29488 => 34752, 29489 => 34762, 29490 => 34779, 29491 => 34794, 29492 => 34784,
-29493 => 34798, 29494 => 34838, 29495 => 34835, 29496 => 34814, 29497 => 34826,
-29498 => 34843, 29499 => 34849, 29500 => 34873, 29501 => 34876, 29502 => 32566,
-29503 => 32578, 29504 => 32580, 29505 => 32581, 29506 => 33296, 29507 => 31482,
-29508 => 31485, 29509 => 31496, 29510 => 31491, 29511 => 31492, 29512 => 31509,
-29513 => 31498, 29514 => 31531, 29515 => 31503, 29516 => 31559, 29517 => 31544,
-29518 => 31530, 29519 => 31513, 29520 => 31534, 29521 => 31537, 29522 => 31520,
-29523 => 31525, 29524 => 31524, 29525 => 31539, 29526 => 31550, 29527 => 31518,
-29528 => 31576, 29529 => 31578, 29530 => 31557, 29531 => 31605, 29532 => 31564,
-29533 => 31581, 29534 => 31584, 29535 => 31598, 29536 => 31611, 29537 => 31586,
-29538 => 31602, 29539 => 31601, 29540 => 31632, 29541 => 31654, 29542 => 31655,
-29543 => 31672, 29544 => 31660, 29545 => 31645, 29546 => 31656, 29547 => 31621,
-29548 => 31658, 29549 => 31644, 29550 => 31650, 29551 => 31659, 29552 => 31668,
-29553 => 31697, 29554 => 31681, 29555 => 31692, 29556 => 31709, 29557 => 31706,
-29558 => 31717, 29559 => 31718, 29560 => 31722, 29561 => 31756, 29562 => 31742,
-29563 => 31740, 29564 => 31759, 29565 => 31766, 29566 => 31755, 29729 => 31775,
-29730 => 31786, 29731 => 31782, 29732 => 31800, 29733 => 31809, 29734 => 31808,
-29735 => 33278, 29736 => 33281, 29737 => 33282, 29738 => 33284, 29739 => 33260,
-29740 => 34884, 29741 => 33313, 29742 => 33314, 29743 => 33315, 29744 => 33325,
-29745 => 33327, 29746 => 33320, 29747 => 33323, 29748 => 33336, 29749 => 33339,
-29750 => 33331, 29751 => 33332, 29752 => 33342, 29753 => 33348, 29754 => 33353,
-29755 => 33355, 29756 => 33359, 29757 => 33370, 29758 => 33375, 29759 => 33384,
-29760 => 34942, 29761 => 34949, 29762 => 34952, 29763 => 35032, 29764 => 35039,
-29765 => 35166, 29766 => 32669, 29767 => 32671, 29768 => 32679, 29769 => 32687,
-29770 => 32688, 29771 => 32690, 29772 => 31868, 29773 => 25929, 29774 => 31889,
-29775 => 31901, 29776 => 31900, 29777 => 31902, 29778 => 31906, 29779 => 31922,
-29780 => 31932, 29781 => 31933, 29782 => 31937, 29783 => 31943, 29784 => 31948,
-29785 => 31949, 29786 => 31944, 29787 => 31941, 29788 => 31959, 29789 => 31976,
-29790 => 33390, 29791 => 26280, 29792 => 32703, 29793 => 32718, 29794 => 32725,
-29795 => 32741, 29796 => 32737, 29797 => 32742, 29798 => 32745, 29799 => 32750,
-29800 => 32755, 29801 => 31992, 29802 => 32119, 29803 => 32166, 29804 => 32174,
-29805 => 32327, 29806 => 32411, 29807 => 40632, 29808 => 40628, 29809 => 36211,
-29810 => 36228, 29811 => 36244, 29812 => 36241, 29813 => 36273, 29814 => 36199,
-29815 => 36205, 29816 => 35911, 29817 => 35913, 29818 => 37194, 29819 => 37200,
-29820 => 37198, 29821 => 37199, 29822 => 37220, 29985 => 37218, 29986 => 37217,
-29987 => 37232, 29988 => 37225, 29989 => 37231, 29990 => 37245, 29991 => 37246,
-29992 => 37234, 29993 => 37236, 29994 => 37241, 29995 => 37260, 29996 => 37253,
-29997 => 37264, 29998 => 37261, 29999 => 37265, 30000 => 37282, 30001 => 37283,
-30002 => 37290, 30003 => 37293, 30004 => 37294, 30005 => 37295, 30006 => 37301,
-30007 => 37300, 30008 => 37306, 30009 => 35925, 30010 => 40574, 30011 => 36280,
-30012 => 36331, 30013 => 36357, 30014 => 36441, 30015 => 36457, 30016 => 36277,
-30017 => 36287, 30018 => 36284, 30019 => 36282, 30020 => 36292, 30021 => 36310,
-30022 => 36311, 30023 => 36314, 30024 => 36318, 30025 => 36302, 30026 => 36303,
-30027 => 36315, 30028 => 36294, 30029 => 36332, 30030 => 36343, 30031 => 36344,
-30032 => 36323, 30033 => 36345, 30034 => 36347, 30035 => 36324, 30036 => 36361,
-30037 => 36349, 30038 => 36372, 30039 => 36381, 30040 => 36383, 30041 => 36396,
-30042 => 36398, 30043 => 36387, 30044 => 36399, 30045 => 36410, 30046 => 36416,
-30047 => 36409, 30048 => 36405, 30049 => 36413, 30050 => 36401, 30051 => 36425,
-30052 => 36417, 30053 => 36418, 30054 => 36433, 30055 => 36434, 30056 => 36426,
-30057 => 36464, 30058 => 36470, 30059 => 36476, 30060 => 36463, 30061 => 36468,
-30062 => 36485, 30063 => 36495, 30064 => 36500, 30065 => 36496, 30066 => 36508,
-30067 => 36510, 30068 => 35960, 30069 => 35970, 30070 => 35978, 30071 => 35973,
-30072 => 35992, 30073 => 35988, 30074 => 26011, 30075 => 35286, 30076 => 35294,
-30077 => 35290, 30078 => 35292, 30241 => 35301, 30242 => 35307, 30243 => 35311,
-30244 => 35390, 30245 => 35622, 30246 => 38739, 30247 => 38633, 30248 => 38643,
-30249 => 38639, 30250 => 38662, 30251 => 38657, 30252 => 38664, 30253 => 38671,
-30254 => 38670, 30255 => 38698, 30256 => 38701, 30257 => 38704, 30258 => 38718,
-30259 => 40832, 30260 => 40835, 30261 => 40837, 30262 => 40838, 30263 => 40839,
-30264 => 40840, 30265 => 40841, 30266 => 40842, 30267 => 40844, 30268 => 40702,
-30269 => 40715, 30270 => 40717, 30271 => 38585, 30272 => 38588, 30273 => 38589,
-30274 => 38606, 30275 => 38610, 30276 => 30655, 30277 => 38624, 30278 => 37518,
-30279 => 37550, 30280 => 37576, 30281 => 37694, 30282 => 37738, 30283 => 37834,
-30284 => 37775, 30285 => 37950, 30286 => 37995, 30287 => 40063, 30288 => 40066,
-30289 => 40069, 30290 => 40070, 30291 => 40071, 30292 => 40072, 30293 => 31267,
-30294 => 40075, 30295 => 40078, 30296 => 40080, 30297 => 40081, 30298 => 40082,
-30299 => 40084, 30300 => 40085, 30301 => 40090, 30302 => 40091, 30303 => 40094,
-30304 => 40095, 30305 => 40096, 30306 => 40097, 30307 => 40098, 30308 => 40099,
-30309 => 40101, 30310 => 40102, 30311 => 40103, 30312 => 40104, 30313 => 40105,
-30314 => 40107, 30315 => 40109, 30316 => 40110, 30317 => 40112, 30318 => 40113,
-30319 => 40114, 30320 => 40115, 30321 => 40116, 30322 => 40117, 30323 => 40118,
-30324 => 40119, 30325 => 40122, 30326 => 40123, 30327 => 40124, 30328 => 40125,
-30329 => 40132, 30330 => 40133, 30331 => 40134, 30332 => 40135, 30333 => 40138,
-30334 => 40139, 30497 => 40140, 30498 => 40141, 30499 => 40142, 30500 => 40143,
-30501 => 40144, 30502 => 40147, 30503 => 40148, 30504 => 40149, 30505 => 40151,
-30506 => 40152, 30507 => 40153, 30508 => 40156, 30509 => 40157, 30510 => 40159,
-30511 => 40162, 30512 => 38780, 30513 => 38789, 30514 => 38801, 30515 => 38802,
-30516 => 38804, 30517 => 38831, 30518 => 38827, 30519 => 38819, 30520 => 38834,
-30521 => 38836, 30522 => 39601, 30523 => 39600, 30524 => 39607, 30525 => 40536,
-30526 => 39606, 30527 => 39610, 30528 => 39612, 30529 => 39617, 30530 => 39616,
-30531 => 39621, 30532 => 39618, 30533 => 39627, 30534 => 39628, 30535 => 39633,
-30536 => 39749, 30537 => 39747, 30538 => 39751, 30539 => 39753, 30540 => 39752,
-30541 => 39757, 30542 => 39761, 30543 => 39144, 30544 => 39181, 30545 => 39214,
-30546 => 39253, 30547 => 39252, 30548 => 39647, 30549 => 39649, 30550 => 39654,
-30551 => 39663, 30552 => 39659, 30553 => 39675, 30554 => 39661, 30555 => 39673,
-30556 => 39688, 30557 => 39695, 30558 => 39699, 30559 => 39711, 30560 => 39715,
-30561 => 40637, 30562 => 40638, 30563 => 32315, 30564 => 40578, 30565 => 40583,
-30566 => 40584, 30567 => 40587, 30568 => 40594, 30569 => 37846, 30570 => 40605,
-30571 => 40607, 30572 => 40667, 30573 => 40668, 30574 => 40669, 30575 => 40672,
-30576 => 40671, 30577 => 40674, 30578 => 40681, 30579 => 40679, 30580 => 40677,
-30581 => 40682, 30582 => 40687, 30583 => 40738, 30584 => 40748, 30585 => 40751,
-30586 => 40761, 30587 => 40759, 30588 => 40765, 30589 => 40766, 30590 => 40772,
-0 => 0 );
+    13140 => 21507, 13141 => 30196, 13142 => 25345, 13143 => 21273, 13144 => 27744,
+    13145 => 36831, 13146 => 24347, 13147 => 39536, 13148 => 32827, 13149 => 40831,
+    13150 => 20360, 13151 => 23610, 13152 => 36196, 13153 => 32709, 13154 => 26021,
+    13155 => 28861, 13156 => 20805, 13157 => 20914, 13158 => 34411, 13159 => 23815,
+    13160 => 23456, 13161 => 25277, 13162 => 37228, 13163 => 30068, 13164 => 36364,
+    13165 => 31264, 13166 => 24833, 13167 => 31609, 13168 => 20167, 13169 => 32504,
+    13170 => 30597, 13171 => 19985, 13172 => 33261, 13173 => 21021, 13174 => 20986,
+    13175 => 27249, 13176 => 21416, 13177 => 36487, 13178 => 38148, 13179 => 38607,
+    13180 => 28353, 13181 => 38500, 13182 => 26970, 13345 => 30784, 13346 => 20648,
+    13347 => 30679, 13348 => 25616, 13349 => 35302, 13350 => 22788, 13351 => 25571,
+    13352 => 24029, 13353 => 31359, 13354 => 26941, 13355 => 20256, 13356 => 33337,
+    13357 => 21912, 13358 => 20018, 13359 => 30126, 13360 => 31383, 13361 => 24162,
+    13362 => 24202, 13363 => 38383, 13364 => 21019, 13365 => 21561, 13366 => 28810,
+    13367 => 25462, 13368 => 38180, 13369 => 22402, 13370 => 26149, 13371 => 26943,
+    13372 => 37255, 13373 => 21767, 13374 => 28147, 13375 => 32431, 13376 => 34850,
+    13377 => 25139, 13378 => 32496, 13379 => 30133, 13380 => 33576, 13381 => 30913,
+    13382 => 38604, 13383 => 36766, 13384 => 24904, 13385 => 29943, 13386 => 35789,
+    13387 => 27492, 13388 => 21050, 13389 => 36176, 13390 => 27425, 13391 => 32874,
+    13392 => 33905, 13393 => 22257, 13394 => 21254, 13395 => 20174, 13396 => 19995,
+    13397 => 20945, 13398 => 31895, 13399 => 37259, 13400 => 31751, 13401 => 20419,
+    13402 => 36479, 13403 => 31713, 13404 => 31388, 13405 => 25703, 13406 => 23828,
+    13407 => 20652, 13408 => 33030, 13409 => 30209, 13410 => 31929, 13411 => 28140,
+    13412 => 32736, 13413 => 26449, 13414 => 23384, 13415 => 23544, 13416 => 30923,
+    13417 => 25774, 13418 => 25619, 13419 => 25514, 13420 => 25387, 13421 => 38169,
+    13422 => 25645, 13423 => 36798, 13424 => 31572, 13425 => 30249, 13426 => 25171,
+    13427 => 22823, 13428 => 21574, 13429 => 27513, 13430 => 20643, 13431 => 25140,
+    13432 => 24102, 13433 => 27526, 13434 => 20195, 13435 => 36151, 13436 => 34955,
+    13437 => 24453, 13438 => 36910, 13601 => 24608, 13602 => 32829, 13603 => 25285,
+    13604 => 20025, 13605 => 21333, 13606 => 37112, 13607 => 25528, 13608 => 32966,
+    13609 => 26086, 13610 => 27694, 13611 => 20294, 13612 => 24814, 13613 => 28129,
+    13614 => 35806, 13615 => 24377, 13616 => 34507, 13617 => 24403, 13618 => 25377,
+    13619 => 20826, 13620 => 33633, 13621 => 26723, 13622 => 20992, 13623 => 25443,
+    13624 => 36424, 13625 => 20498, 13626 => 23707, 13627 => 31095, 13628 => 23548,
+    13629 => 21040, 13630 => 31291, 13631 => 24764, 13632 => 36947, 13633 => 30423,
+    13634 => 24503, 13635 => 24471, 13636 => 30340, 13637 => 36460, 13638 => 28783,
+    13639 => 30331, 13640 => 31561, 13641 => 30634, 13642 => 20979, 13643 => 37011,
+    13644 => 22564, 13645 => 20302, 13646 => 28404, 13647 => 36842, 13648 => 25932,
+    13649 => 31515, 13650 => 29380, 13651 => 28068, 13652 => 32735, 13653 => 23265,
+    13654 => 25269, 13655 => 24213, 13656 => 22320, 13657 => 33922, 13658 => 31532,
+    13659 => 24093, 13660 => 24351, 13661 => 36882, 13662 => 32532, 13663 => 39072,
+    13664 => 25474, 13665 => 28359, 13666 => 30872, 13667 => 28857, 13668 => 20856,
+    13669 => 38747, 13670 => 22443, 13671 => 30005, 13672 => 20291, 13673 => 30008,
+    13674 => 24215, 13675 => 24806, 13676 => 22880, 13677 => 28096, 13678 => 27583,
+    13679 => 30857, 13680 => 21500, 13681 => 38613, 13682 => 20939, 13683 => 20993,
+    13684 => 25481, 13685 => 21514, 13686 => 38035, 13687 => 35843, 13688 => 36300,
+    13689 => 29241, 13690 => 30879, 13691 => 34678, 13692 => 36845, 13693 => 35853,
+    13694 => 21472, 13857 => 19969, 13858 => 30447, 13859 => 21486, 13860 => 38025,
+    13861 => 39030, 13862 => 40718, 13863 => 38189, 13864 => 23450, 13865 => 35746,
+    13866 => 20002, 13867 => 19996, 13868 => 20908, 13869 => 33891, 13870 => 25026,
+    13871 => 21160, 13872 => 26635, 13873 => 20375, 13874 => 24683, 13875 => 20923,
+    13876 => 27934, 13877 => 20828, 13878 => 25238, 13879 => 26007, 13880 => 38497,
+    13881 => 35910, 13882 => 36887, 13883 => 30168, 13884 => 37117, 13885 => 30563,
+    13886 => 27602, 13887 => 29322, 13888 => 29420, 13889 => 35835, 13890 => 22581,
+    13891 => 30585, 13892 => 36172, 13893 => 26460, 13894 => 38208, 13895 => 32922,
+    13896 => 24230, 13897 => 28193, 13898 => 22930, 13899 => 31471, 13900 => 30701,
+    13901 => 38203, 13902 => 27573, 13903 => 26029, 13904 => 32526, 13905 => 22534,
+    13906 => 20817, 13907 => 38431, 13908 => 23545, 13909 => 22697, 13910 => 21544,
+    13911 => 36466, 13912 => 25958, 13913 => 39039, 13914 => 22244, 13915 => 38045,
+    13916 => 30462, 13917 => 36929, 13918 => 25479, 13919 => 21702, 13920 => 22810,
+    13921 => 22842, 13922 => 22427, 13923 => 36530, 13924 => 26421, 13925 => 36346,
+    13926 => 33333, 13927 => 21057, 13928 => 24816, 13929 => 22549, 13930 => 34558,
+    13931 => 23784, 13932 => 40517, 13933 => 20420, 13934 => 39069, 13935 => 35769,
+    13936 => 23077, 13937 => 24694, 13938 => 21380, 13939 => 25212, 13940 => 36943,
+    13941 => 37122, 13942 => 39295, 13943 => 24681, 13944 => 32780, 13945 => 20799,
+    13946 => 32819, 13947 => 23572, 13948 => 39285, 13949 => 27953, 13950 => 20108,
+    14113 => 36144, 14114 => 21457, 14115 => 32602, 14116 => 31567, 14117 => 20240,
+    14118 => 20047, 14119 => 38400, 14120 => 27861, 14121 => 29648, 14122 => 34281,
+    14123 => 24070, 14124 => 30058, 14125 => 32763, 14126 => 27146, 14127 => 30718,
+    14128 => 38034, 14129 => 32321, 14130 => 20961, 14131 => 28902, 14132 => 21453,
+    14133 => 36820, 14134 => 33539, 14135 => 36137, 14136 => 29359, 14137 => 39277,
+    14138 => 27867, 14139 => 22346, 14140 => 33459, 14141 => 26041, 14142 => 32938,
+    14143 => 25151, 14144 => 38450, 14145 => 22952, 14146 => 20223, 14147 => 35775,
+    14148 => 32442, 14149 => 25918, 14150 => 33778, 14151 => 38750, 14152 => 21857,
+    14153 => 39134, 14154 => 32933, 14155 => 21290, 14156 => 35837, 14157 => 21536,
+    14158 => 32954, 14159 => 24223, 14160 => 27832, 14161 => 36153, 14162 => 33452,
+    14163 => 37210, 14164 => 21545, 14165 => 27675, 14166 => 20998, 14167 => 32439,
+    14168 => 22367, 14169 => 28954, 14170 => 27774, 14171 => 31881, 14172 => 22859,
+    14173 => 20221, 14174 => 24575, 14175 => 24868, 14176 => 31914, 14177 => 20016,
+    14178 => 23553, 14179 => 26539, 14180 => 34562, 14181 => 23792, 14182 => 38155,
+    14183 => 39118, 14184 => 30127, 14185 => 28925, 14186 => 36898, 14187 => 20911,
+    14188 => 32541, 14189 => 35773, 14190 => 22857, 14191 => 20964, 14192 => 20315,
+    14193 => 21542, 14194 => 22827, 14195 => 25975, 14196 => 32932, 14197 => 23413,
+    14198 => 25206, 14199 => 25282, 14200 => 36752, 14201 => 24133, 14202 => 27679,
+    14203 => 31526, 14204 => 20239, 14205 => 20440, 14206 => 26381, 14369 => 28014,
+    14370 => 28074, 14371 => 31119, 14372 => 34993, 14373 => 24343, 14374 => 29995,
+    14375 => 25242, 14376 => 36741, 14377 => 20463, 14378 => 37340, 14379 => 26023,
+    14380 => 33071, 14381 => 33105, 14382 => 24220, 14383 => 33104, 14384 => 36212,
+    14385 => 21103, 14386 => 35206, 14387 => 36171, 14388 => 22797, 14389 => 20613,
+    14390 => 20184, 14391 => 38428, 14392 => 29238, 14393 => 33145, 14394 => 36127,
+    14395 => 23500, 14396 => 35747, 14397 => 38468, 14398 => 22919, 14399 => 32538,
+    14400 => 21648, 14401 => 22134, 14402 => 22030, 14403 => 35813, 14404 => 25913,
+    14405 => 27010, 14406 => 38041, 14407 => 30422, 14408 => 28297, 14409 => 24178,
+    14410 => 29976, 14411 => 26438, 14412 => 26577, 14413 => 31487, 14414 => 32925,
+    14415 => 36214, 14416 => 24863, 14417 => 31174, 14418 => 25954, 14419 => 36195,
+    14420 => 20872, 14421 => 21018, 14422 => 38050, 14423 => 32568, 14424 => 32923,
+    14425 => 32434, 14426 => 23703, 14427 => 28207, 14428 => 26464, 14429 => 31705,
+    14430 => 30347, 14431 => 39640, 14432 => 33167, 14433 => 32660, 14434 => 31957,
+    14435 => 25630, 14436 => 38224, 14437 => 31295, 14438 => 21578, 14439 => 21733,
+    14440 => 27468, 14441 => 25601, 14442 => 25096, 14443 => 40509, 14444 => 33011,
+    14445 => 30105, 14446 => 21106, 14447 => 38761, 14448 => 33883, 14449 => 26684,
+    14450 => 34532, 14451 => 38401, 14452 => 38548, 14453 => 38124, 14454 => 20010,
+    14455 => 21508, 14456 => 32473, 14457 => 26681, 14458 => 36319, 14459 => 32789,
+    14460 => 26356, 14461 => 24218, 14462 => 32697, 14625 => 22466, 14626 => 32831,
+    14627 => 26775, 14628 => 24037, 14629 => 25915, 14630 => 21151, 14631 => 24685,
+    14632 => 40858, 14633 => 20379, 14634 => 36524, 14635 => 20844, 14636 => 23467,
+    14637 => 24339, 14638 => 24041, 14639 => 27742, 14640 => 25329, 14641 => 36129,
+    14642 => 20849, 14643 => 38057, 14644 => 21246, 14645 => 27807, 14646 => 33503,
+    14647 => 29399, 14648 => 22434, 14649 => 26500, 14650 => 36141, 14651 => 22815,
+    14652 => 36764, 14653 => 33735, 14654 => 21653, 14655 => 31629, 14656 => 20272,
+    14657 => 27837, 14658 => 23396, 14659 => 22993, 14660 => 40723, 14661 => 21476,
+    14662 => 34506, 14663 => 39592, 14664 => 35895, 14665 => 32929, 14666 => 25925,
+    14667 => 39038, 14668 => 22266, 14669 => 38599, 14670 => 21038, 14671 => 29916,
+    14672 => 21072, 14673 => 23521, 14674 => 25346, 14675 => 35074, 14676 => 20054,
+    14677 => 25296, 14678 => 24618, 14679 => 26874, 14680 => 20851, 14681 => 23448,
+    14682 => 20896, 14683 => 35266, 14684 => 31649, 14685 => 39302, 14686 => 32592,
+    14687 => 24815, 14688 => 28748, 14689 => 36143, 14690 => 20809, 14691 => 24191,
+    14692 => 36891, 14693 => 29808, 14694 => 35268, 14695 => 22317, 14696 => 30789,
+    14697 => 24402, 14698 => 40863, 14699 => 38394, 14700 => 36712, 14701 => 39740,
+    14702 => 35809, 14703 => 30328, 14704 => 26690, 14705 => 26588, 14706 => 36330,
+    14707 => 36149, 14708 => 21053, 14709 => 36746, 14710 => 28378, 14711 => 26829,
+    14712 => 38149, 14713 => 37101, 14714 => 22269, 14715 => 26524, 14716 => 35065,
+    14717 => 36807, 14718 => 21704, 14881 => 39608, 14882 => 23401, 14883 => 28023,
+    14884 => 27686, 14885 => 20133, 14886 => 23475, 14887 => 39559, 14888 => 37219,
+    14889 => 25000, 14890 => 37039, 14891 => 38889, 14892 => 21547, 14893 => 28085,
+    14894 => 23506, 14895 => 20989, 14896 => 21898, 14897 => 32597, 14898 => 32752,
+    14899 => 25788, 14900 => 25421, 14901 => 26097, 14902 => 25022, 14903 => 24717,
+    14904 => 28938, 14905 => 27735, 14906 => 27721, 14907 => 22831, 14908 => 26477,
+    14909 => 33322, 14910 => 22741, 14911 => 22158, 14912 => 35946, 14913 => 27627,
+    14914 => 37085, 14915 => 22909, 14916 => 32791, 14917 => 21495, 14918 => 28009,
+    14919 => 21621, 14920 => 21917, 14921 => 33655, 14922 => 33743, 14923 => 26680,
+    14924 => 31166, 14925 => 21644, 14926 => 20309, 14927 => 21512, 14928 => 30418,
+    14929 => 35977, 14930 => 38402, 14931 => 27827, 14932 => 28088, 14933 => 36203,
+    14934 => 35088, 14935 => 40548, 14936 => 36154, 14937 => 22079, 14938 => 40657,
+    14939 => 30165, 14940 => 24456, 14941 => 29408, 14942 => 24680, 14943 => 21756,
+    14944 => 20136, 14945 => 27178, 14946 => 34913, 14947 => 24658, 14948 => 36720,
+    14949 => 21700, 14950 => 28888, 14951 => 34425, 14952 => 40511, 14953 => 27946,
+    14954 => 23439, 14955 => 24344, 14956 => 32418, 14957 => 21897, 14958 => 20399,
+    14959 => 29492, 14960 => 21564, 14961 => 21402, 14962 => 20505, 14963 => 21518,
+    14964 => 21628, 14965 => 20046, 14966 => 24573, 14967 => 29786, 14968 => 22774,
+    14969 => 33899, 14970 => 32993, 14971 => 34676, 14972 => 29392, 14973 => 31946,
+    14974 => 28246, 15137 => 24359, 15138 => 34382, 15139 => 21804, 15140 => 25252,
+    15141 => 20114, 15142 => 27818, 15143 => 25143, 15144 => 33457, 15145 => 21719,
+    15146 => 21326, 15147 => 29502, 15148 => 28369, 15149 => 30011, 15150 => 21010,
+    15151 => 21270, 15152 => 35805, 15153 => 27088, 15154 => 24458, 15155 => 24576,
+    15156 => 28142, 15157 => 22351, 15158 => 27426, 15159 => 29615, 15160 => 26707,
+    15161 => 36824, 15162 => 32531, 15163 => 25442, 15164 => 24739, 15165 => 21796,
+    15166 => 30186, 15167 => 35938, 15168 => 28949, 15169 => 28067, 15170 => 23462,
+    15171 => 24187, 15172 => 33618, 15173 => 24908, 15174 => 40644, 15175 => 30970,
+    15176 => 34647, 15177 => 31783, 15178 => 30343, 15179 => 20976, 15180 => 24822,
+    15181 => 29004, 15182 => 26179, 15183 => 24140, 15184 => 24653, 15185 => 35854,
+    15186 => 28784, 15187 => 25381, 15188 => 36745, 15189 => 24509, 15190 => 24674,
+    15191 => 34516, 15192 => 22238, 15193 => 27585, 15194 => 24724, 15195 => 24935,
+    15196 => 21321, 15197 => 24800, 15198 => 26214, 15199 => 36159, 15200 => 31229,
+    15201 => 20250, 15202 => 28905, 15203 => 27719, 15204 => 35763, 15205 => 35826,
+    15206 => 32472, 15207 => 33636, 15208 => 26127, 15209 => 23130, 15210 => 39746,
+    15211 => 27985, 15212 => 28151, 15213 => 35905, 15214 => 27963, 15215 => 20249,
+    15216 => 28779, 15217 => 33719, 15218 => 25110, 15219 => 24785, 15220 => 38669,
+    15221 => 36135, 15222 => 31096, 15223 => 20987, 15224 => 22334, 15225 => 22522,
+    15226 => 26426, 15227 => 30072, 15228 => 31293, 15229 => 31215, 15230 => 31637,
+    15393 => 32908, 15394 => 39269, 15395 => 36857, 15396 => 28608, 15397 => 35749,
+    15398 => 40481, 15399 => 23020, 15400 => 32489, 15401 => 32521, 15402 => 21513,
+    15403 => 26497, 15404 => 26840, 15405 => 36753, 15406 => 31821, 15407 => 38598,
+    15408 => 21450, 15409 => 24613, 15410 => 30142, 15411 => 27762, 15412 => 21363,
+    15413 => 23241, 15414 => 32423, 15415 => 25380, 15416 => 20960, 15417 => 33034,
+    15418 => 24049, 15419 => 34015, 15420 => 25216, 15421 => 20864, 15422 => 23395,
+    15423 => 20238, 15424 => 31085, 15425 => 21058, 15426 => 24760, 15427 => 27982,
+    15428 => 23492, 15429 => 23490, 15430 => 35745, 15431 => 35760, 15432 => 26082,
+    15433 => 24524, 15434 => 38469, 15435 => 22931, 15436 => 32487, 15437 => 32426,
+    15438 => 22025, 15439 => 26551, 15440 => 22841, 15441 => 20339, 15442 => 23478,
+    15443 => 21152, 15444 => 33626, 15445 => 39050, 15446 => 36158, 15447 => 30002,
+    15448 => 38078, 15449 => 20551, 15450 => 31292, 15451 => 20215, 15452 => 26550,
+    15453 => 39550, 15454 => 23233, 15455 => 27516, 15456 => 30417, 15457 => 22362,
+    15458 => 23574, 15459 => 31546, 15460 => 38388, 15461 => 29006, 15462 => 20860,
+    15463 => 32937, 15464 => 33392, 15465 => 22904, 15466 => 32516, 15467 => 33575,
+    15468 => 26816, 15469 => 26604, 15470 => 30897, 15471 => 30839, 15472 => 25315,
+    15473 => 25441, 15474 => 31616, 15475 => 20461, 15476 => 21098, 15477 => 20943,
+    15478 => 33616, 15479 => 27099, 15480 => 37492, 15481 => 36341, 15482 => 36145,
+    15483 => 35265, 15484 => 38190, 15485 => 31661, 15486 => 20214, 15649 => 20581,
+    15650 => 33328, 15651 => 21073, 15652 => 39279, 15653 => 28176, 15654 => 28293,
+    15655 => 28071, 15656 => 24314, 15657 => 20725, 15658 => 23004, 15659 => 23558,
+    15660 => 27974, 15661 => 27743, 15662 => 30086, 15663 => 33931, 15664 => 26728,
+    15665 => 22870, 15666 => 35762, 15667 => 21280, 15668 => 37233, 15669 => 38477,
+    15670 => 34121, 15671 => 26898, 15672 => 30977, 15673 => 28966, 15674 => 33014,
+    15675 => 20132, 15676 => 37066, 15677 => 27975, 15678 => 39556, 15679 => 23047,
+    15680 => 22204, 15681 => 25605, 15682 => 38128, 15683 => 30699, 15684 => 20389,
+    15685 => 33050, 15686 => 29409, 15687 => 35282, 15688 => 39290, 15689 => 32564,
+    15690 => 32478, 15691 => 21119, 15692 => 25945, 15693 => 37237, 15694 => 36735,
+    15695 => 36739, 15696 => 21483, 15697 => 31382, 15698 => 25581, 15699 => 25509,
+    15700 => 30342, 15701 => 31224, 15702 => 34903, 15703 => 38454, 15704 => 25130,
+    15705 => 21163, 15706 => 33410, 15707 => 26708, 15708 => 26480, 15709 => 25463,
+    15710 => 30571, 15711 => 31469, 15712 => 27905, 15713 => 32467, 15714 => 35299,
+    15715 => 22992, 15716 => 25106, 15717 => 34249, 15718 => 33445, 15719 => 30028,
+    15720 => 20511, 15721 => 20171, 15722 => 30117, 15723 => 35819, 15724 => 23626,
+    15725 => 24062, 15726 => 31563, 15727 => 26020, 15728 => 37329, 15729 => 20170,
+    15730 => 27941, 15731 => 35167, 15732 => 32039, 15733 => 38182, 15734 => 20165,
+    15735 => 35880, 15736 => 36827, 15737 => 38771, 15738 => 26187, 15739 => 31105,
+    15740 => 36817, 15741 => 28908, 15742 => 28024, 15905 => 23613, 15906 => 21170,
+    15907 => 33606, 15908 => 20834, 15909 => 33550, 15910 => 30555, 15911 => 26230,
+    15912 => 40120, 15913 => 20140, 15914 => 24778, 15915 => 31934, 15916 => 31923,
+    15917 => 32463, 15918 => 20117, 15919 => 35686, 15920 => 26223, 15921 => 39048,
+    15922 => 38745, 15923 => 22659, 15924 => 25964, 15925 => 38236, 15926 => 24452,
+    15927 => 30153, 15928 => 38742, 15929 => 31455, 15930 => 31454, 15931 => 20928,
+    15932 => 28847, 15933 => 31384, 15934 => 25578, 15935 => 31350, 15936 => 32416,
+    15937 => 29590, 15938 => 38893, 15939 => 20037, 15940 => 28792, 15941 => 20061,
+    15942 => 37202, 15943 => 21417, 15944 => 25937, 15945 => 26087, 15946 => 33276,
+    15947 => 33285, 15948 => 21646, 15949 => 23601, 15950 => 30106, 15951 => 38816,
+    15952 => 25304, 15953 => 29401, 15954 => 30141, 15955 => 23621, 15956 => 39545,
+    15957 => 33738, 15958 => 23616, 15959 => 21632, 15960 => 30697, 15961 => 20030,
+    15962 => 27822, 15963 => 32858, 15964 => 25298, 15965 => 25454, 15966 => 24040,
+    15967 => 20855, 15968 => 36317, 15969 => 36382, 15970 => 38191, 15971 => 20465,
+    15972 => 21477, 15973 => 24807, 15974 => 28844, 15975 => 21095, 15976 => 25424,
+    15977 => 40515, 15978 => 23071, 15979 => 20518, 15980 => 30519, 15981 => 21367,
+    15982 => 32482, 15983 => 25733, 15984 => 25899, 15985 => 25225, 15986 => 25496,
+    15987 => 20500, 15988 => 29237, 15989 => 35273, 15990 => 20915, 15991 => 35776,
+    15992 => 32477, 15993 => 22343, 15994 => 33740, 15995 => 38055, 15996 => 20891,
+    15997 => 21531, 15998 => 23803, 16161 => 20426, 16162 => 31459, 16163 => 27994,
+    16164 => 37089, 16165 => 39567, 16166 => 21888, 16167 => 21654, 16168 => 21345,
+    16169 => 21679, 16170 => 24320, 16171 => 25577, 16172 => 26999, 16173 => 20975,
+    16174 => 24936, 16175 => 21002, 16176 => 22570, 16177 => 21208, 16178 => 22350,
+    16179 => 30733, 16180 => 30475, 16181 => 24247, 16182 => 24951, 16183 => 31968,
+    16184 => 25179, 16185 => 25239, 16186 => 20130, 16187 => 28821, 16188 => 32771,
+    16189 => 25335, 16190 => 28900, 16191 => 38752, 16192 => 22391, 16193 => 33499,
+    16194 => 26607, 16195 => 26869, 16196 => 30933, 16197 => 39063, 16198 => 31185,
+    16199 => 22771, 16200 => 21683, 16201 => 21487, 16202 => 28212, 16203 => 20811,
+    16204 => 21051, 16205 => 23458, 16206 => 35838, 16207 => 32943, 16208 => 21827,
+    16209 => 22438, 16210 => 24691, 16211 => 22353, 16212 => 21549, 16213 => 31354,
+    16214 => 24656, 16215 => 23380, 16216 => 25511, 16217 => 25248, 16218 => 21475,
+    16219 => 25187, 16220 => 23495, 16221 => 26543, 16222 => 21741, 16223 => 31391,
+    16224 => 33510, 16225 => 37239, 16226 => 24211, 16227 => 35044, 16228 => 22840,
+    16229 => 22446, 16230 => 25358, 16231 => 36328, 16232 => 33007, 16233 => 22359,
+    16234 => 31607, 16235 => 20393, 16236 => 24555, 16237 => 23485, 16238 => 27454,
+    16239 => 21281, 16240 => 31568, 16241 => 29378, 16242 => 26694, 16243 => 30719,
+    16244 => 30518, 16245 => 26103, 16246 => 20917, 16247 => 20111, 16248 => 30420,
+    16249 => 23743, 16250 => 31397, 16251 => 33909, 16252 => 22862, 16253 => 39745,
+    16254 => 20608, 16417 => 39304, 16418 => 24871, 16419 => 28291, 16420 => 22372,
+    16421 => 26118, 16422 => 25414, 16423 => 22256, 16424 => 25324, 16425 => 25193,
+    16426 => 24275, 16427 => 38420, 16428 => 22403, 16429 => 25289, 16430 => 21895,
+    16431 => 34593, 16432 => 33098, 16433 => 36771, 16434 => 21862, 16435 => 33713,
+    16436 => 26469, 16437 => 36182, 16438 => 34013, 16439 => 23146, 16440 => 26639,
+    16441 => 25318, 16442 => 31726, 16443 => 38417, 16444 => 20848, 16445 => 28572,
+    16446 => 35888, 16447 => 25597, 16448 => 35272, 16449 => 25042, 16450 => 32518,
+    16451 => 28866, 16452 => 28389, 16453 => 29701, 16454 => 27028, 16455 => 29436,
+    16456 => 24266, 16457 => 37070, 16458 => 26391, 16459 => 28010, 16460 => 25438,
+    16461 => 21171, 16462 => 29282, 16463 => 32769, 16464 => 20332, 16465 => 23013,
+    16466 => 37226, 16467 => 28889, 16468 => 28061, 16469 => 21202, 16470 => 20048,
+    16471 => 38647, 16472 => 38253, 16473 => 34174, 16474 => 30922, 16475 => 32047,
+    16476 => 20769, 16477 => 22418, 16478 => 25794, 16479 => 32907, 16480 => 31867,
+    16481 => 27882, 16482 => 26865, 16483 => 26974, 16484 => 20919, 16485 => 21400,
+    16486 => 26792, 16487 => 29313, 16488 => 40654, 16489 => 31729, 16490 => 29432,
+    16491 => 31163, 16492 => 28435, 16493 => 29702, 16494 => 26446, 16495 => 37324,
+    16496 => 40100, 16497 => 31036, 16498 => 33673, 16499 => 33620, 16500 => 21519,
+    16501 => 26647, 16502 => 20029, 16503 => 21385, 16504 => 21169, 16505 => 30782,
+    16506 => 21382, 16507 => 21033, 16508 => 20616, 16509 => 20363, 16510 => 20432,
+    16673 => 30178, 16674 => 31435, 16675 => 31890, 16676 => 27813, 16677 => 38582,
+    16678 => 21147, 16679 => 29827, 16680 => 21737, 16681 => 20457, 16682 => 32852,
+    16683 => 33714, 16684 => 36830, 16685 => 38256, 16686 => 24265, 16687 => 24604,
+    16688 => 28063, 16689 => 24088, 16690 => 25947, 16691 => 33080, 16692 => 38142,
+    16693 => 24651, 16694 => 28860, 16695 => 32451, 16696 => 31918, 16697 => 20937,
+    16698 => 26753, 16699 => 31921, 16700 => 33391, 16701 => 20004, 16702 => 36742,
+    16703 => 37327, 16704 => 26238, 16705 => 20142, 16706 => 35845, 16707 => 25769,
+    16708 => 32842, 16709 => 20698, 16710 => 30103, 16711 => 29134, 16712 => 23525,
+    16713 => 36797, 16714 => 28518, 16715 => 20102, 16716 => 25730, 16717 => 38243,
+    16718 => 24278, 16719 => 26009, 16720 => 21015, 16721 => 35010, 16722 => 28872,
+    16723 => 21155, 16724 => 29454, 16725 => 29747, 16726 => 26519, 16727 => 30967,
+    16728 => 38678, 16729 => 20020, 16730 => 37051, 16731 => 40158, 16732 => 28107,
+    16733 => 20955, 16734 => 36161, 16735 => 21533, 16736 => 25294, 16737 => 29618,
+    16738 => 33777, 16739 => 38646, 16740 => 40836, 16741 => 38083, 16742 => 20278,
+    16743 => 32666, 16744 => 20940, 16745 => 28789, 16746 => 38517, 16747 => 23725,
+    16748 => 39046, 16749 => 21478, 16750 => 20196, 16751 => 28316, 16752 => 29705,
+    16753 => 27060, 16754 => 30827, 16755 => 39311, 16756 => 30041, 16757 => 21016,
+    16758 => 30244, 16759 => 27969, 16760 => 26611, 16761 => 20845, 16762 => 40857,
+    16763 => 32843, 16764 => 21657, 16765 => 31548, 16766 => 31423, 16929 => 38534,
+    16930 => 22404, 16931 => 25314, 16932 => 38471, 16933 => 27004, 16934 => 23044,
+    16935 => 25602, 16936 => 31699, 16937 => 28431, 16938 => 38475, 16939 => 33446,
+    16940 => 21346, 16941 => 39045, 16942 => 24208, 16943 => 28809, 16944 => 25523,
+    16945 => 21348, 16946 => 34383, 16947 => 40065, 16948 => 40595, 16949 => 30860,
+    16950 => 38706, 16951 => 36335, 16952 => 36162, 16953 => 40575, 16954 => 28510,
+    16955 => 31108, 16956 => 24405, 16957 => 38470, 16958 => 25134, 16959 => 39540,
+    16960 => 21525, 16961 => 38109, 16962 => 20387, 16963 => 26053, 16964 => 23653,
+    16965 => 23649, 16966 => 32533, 16967 => 34385, 16968 => 27695, 16969 => 24459,
+    16970 => 29575, 16971 => 28388, 16972 => 32511, 16973 => 23782, 16974 => 25371,
+    16975 => 23402, 16976 => 28390, 16977 => 21365, 16978 => 20081, 16979 => 25504,
+    16980 => 30053, 16981 => 25249, 16982 => 36718, 16983 => 20262, 16984 => 20177,
+    16985 => 27814, 16986 => 32438, 16987 => 35770, 16988 => 33821, 16989 => 34746,
+    16990 => 32599, 16991 => 36923, 16992 => 38179, 16993 => 31657, 16994 => 39585,
+    16995 => 35064, 16996 => 33853, 16997 => 27931, 16998 => 39558, 16999 => 32476,
+    17000 => 22920, 17001 => 40635, 17002 => 29595, 17003 => 30721, 17004 => 34434,
+    17005 => 39532, 17006 => 39554, 17007 => 22043, 17008 => 21527, 17009 => 22475,
+    17010 => 20080, 17011 => 40614, 17012 => 21334, 17013 => 36808, 17014 => 33033,
+    17015 => 30610, 17016 => 39314, 17017 => 34542, 17018 => 28385, 17019 => 34067,
+    17020 => 26364, 17021 => 24930, 17022 => 28459, 17185 => 35881, 17186 => 33426,
+    17187 => 33579, 17188 => 30450, 17189 => 27667, 17190 => 24537, 17191 => 33725,
+    17192 => 29483, 17193 => 33541, 17194 => 38170, 17195 => 27611, 17196 => 30683,
+    17197 => 38086, 17198 => 21359, 17199 => 33538, 17200 => 20882, 17201 => 24125,
+    17202 => 35980, 17203 => 36152, 17204 => 20040, 17205 => 29611, 17206 => 26522,
+    17207 => 26757, 17208 => 37238, 17209 => 38665, 17210 => 29028, 17211 => 27809,
+    17212 => 30473, 17213 => 23186, 17214 => 38209, 17215 => 27599, 17216 => 32654,
+    17217 => 26151, 17218 => 23504, 17219 => 22969, 17220 => 23194, 17221 => 38376,
+    17222 => 38391, 17223 => 20204, 17224 => 33804, 17225 => 33945, 17226 => 27308,
+    17227 => 30431, 17228 => 38192, 17229 => 29467, 17230 => 26790, 17231 => 23391,
+    17232 => 30511, 17233 => 37274, 17234 => 38753, 17235 => 31964, 17236 => 36855,
+    17237 => 35868, 17238 => 24357, 17239 => 31859, 17240 => 31192, 17241 => 35269,
+    17242 => 27852, 17243 => 34588, 17244 => 23494, 17245 => 24130, 17246 => 26825,
+    17247 => 30496, 17248 => 32501, 17249 => 20885, 17250 => 20813, 17251 => 21193,
+    17252 => 23081, 17253 => 32517, 17254 => 38754, 17255 => 33495, 17256 => 25551,
+    17257 => 30596, 17258 => 34256, 17259 => 31186, 17260 => 28218, 17261 => 24217,
+    17262 => 22937, 17263 => 34065, 17264 => 28781, 17265 => 27665, 17266 => 25279,
+    17267 => 30399, 17268 => 25935, 17269 => 24751, 17270 => 38397, 17271 => 26126,
+    17272 => 34719, 17273 => 40483, 17274 => 38125, 17275 => 21517, 17276 => 21629,
+    17277 => 35884, 17278 => 25720, 17441 => 25721, 17442 => 34321, 17443 => 27169,
+    17444 => 33180, 17445 => 30952, 17446 => 25705, 17447 => 39764, 17448 => 25273,
+    17449 => 26411, 17450 => 33707, 17451 => 22696, 17452 => 40664, 17453 => 27819,
+    17454 => 28448, 17455 => 23518, 17456 => 38476, 17457 => 35851, 17458 => 29279,
+    17459 => 26576, 17460 => 25287, 17461 => 29281, 17462 => 20137, 17463 => 22982,
+    17464 => 27597, 17465 => 22675, 17466 => 26286, 17467 => 24149, 17468 => 21215,
+    17469 => 24917, 17470 => 26408, 17471 => 30446, 17472 => 30566, 17473 => 29287,
+    17474 => 31302, 17475 => 25343, 17476 => 21738, 17477 => 21584, 17478 => 38048,
+    17479 => 37027, 17480 => 23068, 17481 => 32435, 17482 => 27670, 17483 => 20035,
+    17484 => 22902, 17485 => 32784, 17486 => 22856, 17487 => 21335, 17488 => 30007,
+    17489 => 38590, 17490 => 22218, 17491 => 25376, 17492 => 33041, 17493 => 24700,
+    17494 => 38393, 17495 => 28118, 17496 => 21602, 17497 => 39297, 17498 => 20869,
+    17499 => 23273, 17500 => 33021, 17501 => 22958, 17502 => 38675, 17503 => 20522,
+    17504 => 27877, 17505 => 23612, 17506 => 25311, 17507 => 20320, 17508 => 21311,
+    17509 => 33147, 17510 => 36870, 17511 => 28346, 17512 => 34091, 17513 => 25288,
+    17514 => 24180, 17515 => 30910, 17516 => 25781, 17517 => 25467, 17518 => 24565,
+    17519 => 23064, 17520 => 37247, 17521 => 40479, 17522 => 23615, 17523 => 25423,
+    17524 => 32834, 17525 => 23421, 17526 => 21870, 17527 => 38218, 17528 => 38221,
+    17529 => 28037, 17530 => 24744, 17531 => 26592, 17532 => 29406, 17533 => 20957,
+    17534 => 23425, 17697 => 25319, 17698 => 27870, 17699 => 29275, 17700 => 25197,
+    17701 => 38062, 17702 => 32445, 17703 => 33043, 17704 => 27987, 17705 => 20892,
+    17706 => 24324, 17707 => 22900, 17708 => 21162, 17709 => 24594, 17710 => 22899,
+    17711 => 26262, 17712 => 34384, 17713 => 30111, 17714 => 25386, 17715 => 25062,
+    17716 => 31983, 17717 => 35834, 17718 => 21734, 17719 => 27431, 17720 => 40485,
+    17721 => 27572, 17722 => 34261, 17723 => 21589, 17724 => 20598, 17725 => 27812,
+    17726 => 21866, 17727 => 36276, 17728 => 29228, 17729 => 24085, 17730 => 24597,
+    17731 => 29750, 17732 => 25293, 17733 => 25490, 17734 => 29260, 17735 => 24472,
+    17736 => 28227, 17737 => 27966, 17738 => 25856, 17739 => 28504, 17740 => 30424,
+    17741 => 30928, 17742 => 30460, 17743 => 30036, 17744 => 21028, 17745 => 21467,
+    17746 => 20051, 17747 => 24222, 17748 => 26049, 17749 => 32810, 17750 => 32982,
+    17751 => 25243, 17752 => 21638, 17753 => 21032, 17754 => 28846, 17755 => 34957,
+    17756 => 36305, 17757 => 27873, 17758 => 21624, 17759 => 32986, 17760 => 22521,
+    17761 => 35060, 17762 => 36180, 17763 => 38506, 17764 => 37197, 17765 => 20329,
+    17766 => 27803, 17767 => 21943, 17768 => 30406, 17769 => 30768, 17770 => 25256,
+    17771 => 28921, 17772 => 28558, 17773 => 24429, 17774 => 34028, 17775 => 26842,
+    17776 => 30844, 17777 => 31735, 17778 => 33192, 17779 => 26379, 17780 => 40527,
+    17781 => 25447, 17782 => 30896, 17783 => 22383, 17784 => 30738, 17785 => 38713,
+    17786 => 25209, 17787 => 25259, 17788 => 21128, 17789 => 29749, 17790 => 27607,
+    17953 => 21860, 17954 => 33086, 17955 => 30130, 17956 => 30382, 17957 => 21305,
+    17958 => 30174, 17959 => 20731, 17960 => 23617, 17961 => 35692, 17962 => 31687,
+    17963 => 20559, 17964 => 29255, 17965 => 39575, 17966 => 39128, 17967 => 28418,
+    17968 => 29922, 17969 => 31080, 17970 => 25735, 17971 => 30629, 17972 => 25340,
+    17973 => 39057, 17974 => 36139, 17975 => 21697, 17976 => 32856, 17977 => 20050,
+    17978 => 22378, 17979 => 33529, 17980 => 33805, 17981 => 24179, 17982 => 20973,
+    17983 => 29942, 17984 => 35780, 17985 => 23631, 17986 => 22369, 17987 => 27900,
+    17988 => 39047, 17989 => 23110, 17990 => 30772, 17991 => 39748, 17992 => 36843,
+    17993 => 31893, 17994 => 21078, 17995 => 25169, 17996 => 38138, 17997 => 20166,
+    17998 => 33670, 17999 => 33889, 18000 => 33769, 18001 => 33970, 18002 => 22484,
+    18003 => 26420, 18004 => 22275, 18005 => 26222, 18006 => 28006, 18007 => 35889,
+    18008 => 26333, 18009 => 28689, 18010 => 26399, 18011 => 27450, 18012 => 26646,
+    18013 => 25114, 18014 => 22971, 18015 => 19971, 18016 => 20932, 18017 => 28422,
+    18018 => 26578, 18019 => 27791, 18020 => 20854, 18021 => 26827, 18022 => 22855,
+    18023 => 27495, 18024 => 30054, 18025 => 23822, 18026 => 33040, 18027 => 40784,
+    18028 => 26071, 18029 => 31048, 18030 => 31041, 18031 => 39569, 18032 => 36215,
+    18033 => 23682, 18034 => 20062, 18035 => 20225, 18036 => 21551, 18037 => 22865,
+    18038 => 30732, 18039 => 22120, 18040 => 27668, 18041 => 36804, 18042 => 24323,
+    18043 => 27773, 18044 => 27875, 18045 => 35755, 18046 => 25488, 18209 => 24688,
+    18210 => 27965, 18211 => 29301, 18212 => 25190, 18213 => 38030, 18214 => 38085,
+    18215 => 21315, 18216 => 36801, 18217 => 31614, 18218 => 20191, 18219 => 35878,
+    18220 => 20094, 18221 => 40660, 18222 => 38065, 18223 => 38067, 18224 => 21069,
+    18225 => 28508, 18226 => 36963, 18227 => 27973, 18228 => 35892, 18229 => 22545,
+    18230 => 23884, 18231 => 27424, 18232 => 27465, 18233 => 26538, 18234 => 21595,
+    18235 => 33108, 18236 => 32652, 18237 => 22681, 18238 => 34103, 18239 => 24378,
+    18240 => 25250, 18241 => 27207, 18242 => 38201, 18243 => 25970, 18244 => 24708,
+    18245 => 26725, 18246 => 30631, 18247 => 20052, 18248 => 20392, 18249 => 24039,
+    18250 => 38808, 18251 => 25772, 18252 => 32728, 18253 => 23789, 18254 => 20431,
+    18255 => 31373, 18256 => 20999, 18257 => 33540, 18258 => 19988, 18259 => 24623,
+    18260 => 31363, 18261 => 38054, 18262 => 20405, 18263 => 20146, 18264 => 31206,
+    18265 => 29748, 18266 => 21220, 18267 => 33465, 18268 => 25810, 18269 => 31165,
+    18270 => 23517, 18271 => 27777, 18272 => 38738, 18273 => 36731, 18274 => 27682,
+    18275 => 20542, 18276 => 21375, 18277 => 28165, 18278 => 25806, 18279 => 26228,
+    18280 => 27696, 18281 => 24773, 18282 => 39031, 18283 => 35831, 18284 => 24198,
+    18285 => 29756, 18286 => 31351, 18287 => 31179, 18288 => 19992, 18289 => 37041,
+    18290 => 29699, 18291 => 27714, 18292 => 22234, 18293 => 37195, 18294 => 27845,
+    18295 => 36235, 18296 => 21306, 18297 => 34502, 18298 => 26354, 18299 => 36527,
+    18300 => 23624, 18301 => 39537, 18302 => 28192, 18465 => 21462, 18466 => 23094,
+    18467 => 40843, 18468 => 36259, 18469 => 21435, 18470 => 22280, 18471 => 39079,
+    18472 => 26435, 18473 => 37275, 18474 => 27849, 18475 => 20840, 18476 => 30154,
+    18477 => 25331, 18478 => 29356, 18479 => 21048, 18480 => 21149, 18481 => 32570,
+    18482 => 28820, 18483 => 30264, 18484 => 21364, 18485 => 40522, 18486 => 27063,
+    18487 => 30830, 18488 => 38592, 18489 => 35033, 18490 => 32676, 18491 => 28982,
+    18492 => 29123, 18493 => 20873, 18494 => 26579, 18495 => 29924, 18496 => 22756,
+    18497 => 25880, 18498 => 22199, 18499 => 35753, 18500 => 39286, 18501 => 25200,
+    18502 => 32469, 18503 => 24825, 18504 => 28909, 18505 => 22764, 18506 => 20161,
+    18507 => 20154, 18508 => 24525, 18509 => 38887, 18510 => 20219, 18511 => 35748,
+    18512 => 20995, 18513 => 22922, 18514 => 32427, 18515 => 25172, 18516 => 20173,
+    18517 => 26085, 18518 => 25102, 18519 => 33592, 18520 => 33993, 18521 => 33635,
+    18522 => 34701, 18523 => 29076, 18524 => 28342, 18525 => 23481, 18526 => 32466,
+    18527 => 20887, 18528 => 25545, 18529 => 26580, 18530 => 32905, 18531 => 33593,
+    18532 => 34837, 18533 => 20754, 18534 => 23418, 18535 => 22914, 18536 => 36785,
+    18537 => 20083, 18538 => 27741, 18539 => 20837, 18540 => 35109, 18541 => 36719,
+    18542 => 38446, 18543 => 34122, 18544 => 29790, 18545 => 38160, 18546 => 38384,
+    18547 => 28070, 18548 => 33509, 18549 => 24369, 18550 => 25746, 18551 => 27922,
+    18552 => 33832, 18553 => 33134, 18554 => 40131, 18555 => 22622, 18556 => 36187,
+    18557 => 19977, 18558 => 21441, 18721 => 20254, 18722 => 25955, 18723 => 26705,
+    18724 => 21971, 18725 => 20007, 18726 => 25620, 18727 => 39578, 18728 => 25195,
+    18729 => 23234, 18730 => 29791, 18731 => 33394, 18732 => 28073, 18733 => 26862,
+    18734 => 20711, 18735 => 33678, 18736 => 30722, 18737 => 26432, 18738 => 21049,
+    18739 => 27801, 18740 => 32433, 18741 => 20667, 18742 => 21861, 18743 => 29022,
+    18744 => 31579, 18745 => 26194, 18746 => 29642, 18747 => 33515, 18748 => 26441,
+    18749 => 23665, 18750 => 21024, 18751 => 29053, 18752 => 34923, 18753 => 38378,
+    18754 => 38485, 18755 => 25797, 18756 => 36193, 18757 => 33203, 18758 => 21892,
+    18759 => 27733, 18760 => 25159, 18761 => 32558, 18762 => 22674, 18763 => 20260,
+    18764 => 21830, 18765 => 36175, 18766 => 26188, 18767 => 19978, 18768 => 23578,
+    18769 => 35059, 18770 => 26786, 18771 => 25422, 18772 => 31245, 18773 => 28903,
+    18774 => 33421, 18775 => 21242, 18776 => 38902, 18777 => 23569, 18778 => 21736,
+    18779 => 37045, 18780 => 32461, 18781 => 22882, 18782 => 36170, 18783 => 34503,
+    18784 => 33292, 18785 => 33293, 18786 => 36198, 18787 => 25668, 18788 => 23556,
+    18789 => 24913, 18790 => 28041, 18791 => 31038, 18792 => 35774, 18793 => 30775,
+    18794 => 30003, 18795 => 21627, 18796 => 20280, 18797 => 36523, 18798 => 28145,
+    18799 => 23072, 18800 => 32453, 18801 => 31070, 18802 => 27784, 18803 => 23457,
+    18804 => 23158, 18805 => 29978, 18806 => 32958, 18807 => 24910, 18808 => 28183,
+    18809 => 22768, 18810 => 29983, 18811 => 29989, 18812 => 29298, 18813 => 21319,
+    18814 => 32499, 18977 => 30465, 18978 => 30427, 18979 => 21097, 18980 => 32988,
+    18981 => 22307, 18982 => 24072, 18983 => 22833, 18984 => 29422, 18985 => 26045,
+    18986 => 28287, 18987 => 35799, 18988 => 23608, 18989 => 34417, 18990 => 21313,
+    18991 => 30707, 18992 => 25342, 18993 => 26102, 18994 => 20160, 18995 => 39135,
+    18996 => 34432, 18997 => 23454, 18998 => 35782, 18999 => 21490, 19000 => 30690,
+    19001 => 20351, 19002 => 23630, 19003 => 39542, 19004 => 22987, 19005 => 24335,
+    19006 => 31034, 19007 => 22763, 19008 => 19990, 19009 => 26623, 19010 => 20107,
+    19011 => 25325, 19012 => 35475, 19013 => 36893, 19014 => 21183, 19015 => 26159,
+    19016 => 21980, 19017 => 22124, 19018 => 36866, 19019 => 20181, 19020 => 20365,
+    19021 => 37322, 19022 => 39280, 19023 => 27663, 19024 => 24066, 19025 => 24643,
+    19026 => 23460, 19027 => 35270, 19028 => 35797, 19029 => 25910, 19030 => 25163,
+    19031 => 39318, 19032 => 23432, 19033 => 23551, 19034 => 25480, 19035 => 21806,
+    19036 => 21463, 19037 => 30246, 19038 => 20861, 19039 => 34092, 19040 => 26530,
+    19041 => 26803, 19042 => 27530, 19043 => 25234, 19044 => 36755, 19045 => 21460,
+    19046 => 33298, 19047 => 28113, 19048 => 30095, 19049 => 20070, 19050 => 36174,
+    19051 => 23408, 19052 => 29087, 19053 => 34223, 19054 => 26257, 19055 => 26329,
+    19056 => 32626, 19057 => 34560, 19058 => 40653, 19059 => 40736, 19060 => 23646,
+    19061 => 26415, 19062 => 36848, 19063 => 26641, 19064 => 26463, 19065 => 25101,
+    19066 => 31446, 19067 => 22661, 19068 => 24246, 19069 => 25968, 19070 => 28465,
+    19233 => 24661, 19234 => 21047, 19235 => 32781, 19236 => 25684, 19237 => 34928,
+    19238 => 29993, 19239 => 24069, 19240 => 26643, 19241 => 25332, 19242 => 38684,
+    19243 => 21452, 19244 => 29245, 19245 => 35841, 19246 => 27700, 19247 => 30561,
+    19248 => 31246, 19249 => 21550, 19250 => 30636, 19251 => 39034, 19252 => 33308,
+    19253 => 35828, 19254 => 30805, 19255 => 26388, 19256 => 28865, 19257 => 26031,
+    19258 => 25749, 19259 => 22070, 19260 => 24605, 19261 => 31169, 19262 => 21496,
+    19263 => 19997, 19264 => 27515, 19265 => 32902, 19266 => 23546, 19267 => 21987,
+    19268 => 22235, 19269 => 20282, 19270 => 20284, 19271 => 39282, 19272 => 24051,
+    19273 => 26494, 19274 => 32824, 19275 => 24578, 19276 => 39042, 19277 => 36865,
+    19278 => 23435, 19279 => 35772, 19280 => 35829, 19281 => 25628, 19282 => 33368,
+    19283 => 25822, 19284 => 22013, 19285 => 33487, 19286 => 37221, 19287 => 20439,
+    19288 => 32032, 19289 => 36895, 19290 => 31903, 19291 => 20723, 19292 => 22609,
+    19293 => 28335, 19294 => 23487, 19295 => 35785, 19296 => 32899, 19297 => 37240,
+    19298 => 33948, 19299 => 31639, 19300 => 34429, 19301 => 38539, 19302 => 38543,
+    19303 => 32485, 19304 => 39635, 19305 => 30862, 19306 => 23681, 19307 => 31319,
+    19308 => 36930, 19309 => 38567, 19310 => 31071, 19311 => 23385, 19312 => 25439,
+    19313 => 31499, 19314 => 34001, 19315 => 26797, 19316 => 21766, 19317 => 32553,
+    19318 => 29712, 19319 => 32034, 19320 => 38145, 19321 => 25152, 19322 => 22604,
+    19323 => 20182, 19324 => 23427, 19325 => 22905, 19326 => 22612, 19489 => 29549,
+    19490 => 25374, 19491 => 36427, 19492 => 36367, 19493 => 32974, 19494 => 33492,
+    19495 => 25260, 19496 => 21488, 19497 => 27888, 19498 => 37214, 19499 => 22826,
+    19500 => 24577, 19501 => 27760, 19502 => 22349, 19503 => 25674, 19504 => 36138,
+    19505 => 30251, 19506 => 28393, 19507 => 22363, 19508 => 27264, 19509 => 30192,
+    19510 => 28525, 19511 => 35885, 19512 => 35848, 19513 => 22374, 19514 => 27631,
+    19515 => 34962, 19516 => 30899, 19517 => 25506, 19518 => 21497, 19519 => 28845,
+    19520 => 27748, 19521 => 22616, 19522 => 25642, 19523 => 22530, 19524 => 26848,
+    19525 => 33179, 19526 => 21776, 19527 => 31958, 19528 => 20504, 19529 => 36538,
+    19530 => 28108, 19531 => 36255, 19532 => 28907, 19533 => 25487, 19534 => 28059,
+    19535 => 28372, 19536 => 32486, 19537 => 33796, 19538 => 26691, 19539 => 36867,
+    19540 => 28120, 19541 => 38518, 19542 => 35752, 19543 => 22871, 19544 => 29305,
+    19545 => 34276, 19546 => 33150, 19547 => 30140, 19548 => 35466, 19549 => 26799,
+    19550 => 21076, 19551 => 36386, 19552 => 38161, 19553 => 25552, 19554 => 39064,
+    19555 => 36420, 19556 => 21884, 19557 => 20307, 19558 => 26367, 19559 => 22159,
+    19560 => 24789, 19561 => 28053, 19562 => 21059, 19563 => 23625, 19564 => 22825,
+    19565 => 28155, 19566 => 22635, 19567 => 30000, 19568 => 29980, 19569 => 24684,
+    19570 => 33300, 19571 => 33094, 19572 => 25361, 19573 => 26465, 19574 => 36834,
+    19575 => 30522, 19576 => 36339, 19577 => 36148, 19578 => 38081, 19579 => 24086,
+    19580 => 21381, 19581 => 21548, 19582 => 28867, 19745 => 27712, 19746 => 24311,
+    19747 => 20572, 19748 => 20141, 19749 => 24237, 19750 => 25402, 19751 => 33351,
+    19752 => 36890, 19753 => 26704, 19754 => 37230, 19755 => 30643, 19756 => 21516,
+    19757 => 38108, 19758 => 24420, 19759 => 31461, 19760 => 26742, 19761 => 25413,
+    19762 => 31570, 19763 => 32479, 19764 => 30171, 19765 => 20599, 19766 => 25237,
+    19767 => 22836, 19768 => 36879, 19769 => 20984, 19770 => 31171, 19771 => 31361,
+    19772 => 22270, 19773 => 24466, 19774 => 36884, 19775 => 28034, 19776 => 23648,
+    19777 => 22303, 19778 => 21520, 19779 => 20820, 19780 => 28237, 19781 => 22242,
+    19782 => 25512, 19783 => 39059, 19784 => 33151, 19785 => 34581, 19786 => 35114,
+    19787 => 36864, 19788 => 21534, 19789 => 23663, 19790 => 33216, 19791 => 25302,
+    19792 => 25176, 19793 => 33073, 19794 => 40501, 19795 => 38464, 19796 => 39534,
+    19797 => 39548, 19798 => 26925, 19799 => 22949, 19800 => 25299, 19801 => 21822,
+    19802 => 25366, 19803 => 21703, 19804 => 34521, 19805 => 27964, 19806 => 23043,
+    19807 => 29926, 19808 => 34972, 19809 => 27498, 19810 => 22806, 19811 => 35916,
+    19812 => 24367, 19813 => 28286, 19814 => 29609, 19815 => 39037, 19816 => 20024,
+    19817 => 28919, 19818 => 23436, 19819 => 30871, 19820 => 25405, 19821 => 26202,
+    19822 => 30358, 19823 => 24779, 19824 => 23451, 19825 => 23113, 19826 => 19975,
+    19827 => 33109, 19828 => 27754, 19829 => 29579, 19830 => 20129, 19831 => 26505,
+    19832 => 32593, 19833 => 24448, 19834 => 26106, 19835 => 26395, 19836 => 24536,
+    19837 => 22916, 19838 => 23041, 20001 => 24013, 20002 => 24494, 20003 => 21361,
+    20004 => 38886, 20005 => 36829, 20006 => 26693, 20007 => 22260, 20008 => 21807,
+    20009 => 24799, 20010 => 20026, 20011 => 28493, 20012 => 32500, 20013 => 33479,
+    20014 => 33806, 20015 => 22996, 20016 => 20255, 20017 => 20266, 20018 => 23614,
+    20019 => 32428, 20020 => 26410, 20021 => 34074, 20022 => 21619, 20023 => 30031,
+    20024 => 32963, 20025 => 21890, 20026 => 39759, 20027 => 20301, 20028 => 28205,
+    20029 => 35859, 20030 => 23561, 20031 => 24944, 20032 => 21355, 20033 => 30239,
+    20034 => 28201, 20035 => 34442, 20036 => 25991, 20037 => 38395, 20038 => 32441,
+    20039 => 21563, 20040 => 31283, 20041 => 32010, 20042 => 38382, 20043 => 21985,
+    20044 => 32705, 20045 => 29934, 20046 => 25373, 20047 => 34583, 20048 => 28065,
+    20049 => 31389, 20050 => 25105, 20051 => 26017, 20052 => 21351, 20053 => 25569,
+    20054 => 27779, 20055 => 24043, 20056 => 21596, 20057 => 38056, 20058 => 20044,
+    20059 => 27745, 20060 => 35820, 20061 => 23627, 20062 => 26080, 20063 => 33436,
+    20064 => 26791, 20065 => 21566, 20066 => 21556, 20067 => 27595, 20068 => 27494,
+    20069 => 20116, 20070 => 25410, 20071 => 21320, 20072 => 33310, 20073 => 20237,
+    20074 => 20398, 20075 => 22366, 20076 => 25098, 20077 => 38654, 20078 => 26212,
+    20079 => 29289, 20080 => 21247, 20081 => 21153, 20082 => 24735, 20083 => 35823,
+    20084 => 26132, 20085 => 29081, 20086 => 26512, 20087 => 35199, 20088 => 30802,
+    20089 => 30717, 20090 => 26224, 20091 => 22075, 20092 => 21560, 20093 => 38177,
+    20094 => 29306, 20257 => 31232, 20258 => 24687, 20259 => 24076, 20260 => 24713,
+    20261 => 33181, 20262 => 22805, 20263 => 24796, 20264 => 29060, 20265 => 28911,
+    20266 => 28330, 20267 => 27728, 20268 => 29312, 20269 => 27268, 20270 => 34989,
+    20271 => 24109, 20272 => 20064, 20273 => 23219, 20274 => 21916, 20275 => 38115,
+    20276 => 27927, 20277 => 31995, 20278 => 38553, 20279 => 25103, 20280 => 32454,
+    20281 => 30606, 20282 => 34430, 20283 => 21283, 20284 => 38686, 20285 => 36758,
+    20286 => 26247, 20287 => 23777, 20288 => 20384, 20289 => 29421, 20290 => 19979,
+    20291 => 21414, 20292 => 22799, 20293 => 21523, 20294 => 25472, 20295 => 38184,
+    20296 => 20808, 20297 => 20185, 20298 => 40092, 20299 => 32420, 20300 => 21688,
+    20301 => 36132, 20302 => 34900, 20303 => 33335, 20304 => 38386, 20305 => 28046,
+    20306 => 24358, 20307 => 23244, 20308 => 26174, 20309 => 38505, 20310 => 29616,
+    20311 => 29486, 20312 => 21439, 20313 => 33146, 20314 => 39301, 20315 => 32673,
+    20316 => 23466, 20317 => 38519, 20318 => 38480, 20319 => 32447, 20320 => 30456,
+    20321 => 21410, 20322 => 38262, 20323 => 39321, 20324 => 31665, 20325 => 35140,
+    20326 => 28248, 20327 => 20065, 20328 => 32724, 20329 => 31077, 20330 => 35814,
+    20331 => 24819, 20332 => 21709, 20333 => 20139, 20334 => 39033, 20335 => 24055,
+    20336 => 27233, 20337 => 20687, 20338 => 21521, 20339 => 35937, 20340 => 33831,
+    20341 => 30813, 20342 => 38660, 20343 => 21066, 20344 => 21742, 20345 => 22179,
+    20346 => 38144, 20347 => 28040, 20348 => 23477, 20349 => 28102, 20350 => 26195,
+    20513 => 23567, 20514 => 23389, 20515 => 26657, 20516 => 32918, 20517 => 21880,
+    20518 => 31505, 20519 => 25928, 20520 => 26964, 20521 => 20123, 20522 => 27463,
+    20523 => 34638, 20524 => 38795, 20525 => 21327, 20526 => 25375, 20527 => 25658,
+    20528 => 37034, 20529 => 26012, 20530 => 32961, 20531 => 35856, 20532 => 20889,
+    20533 => 26800, 20534 => 21368, 20535 => 34809, 20536 => 25032, 20537 => 27844,
+    20538 => 27899, 20539 => 35874, 20540 => 23633, 20541 => 34218, 20542 => 33455,
+    20543 => 38156, 20544 => 27427, 20545 => 36763, 20546 => 26032, 20547 => 24571,
+    20548 => 24515, 20549 => 20449, 20550 => 34885, 20551 => 26143, 20552 => 33125,
+    20553 => 29481, 20554 => 24826, 20555 => 20852, 20556 => 21009, 20557 => 22411,
+    20558 => 24418, 20559 => 37026, 20560 => 34892, 20561 => 37266, 20562 => 24184,
+    20563 => 26447, 20564 => 24615, 20565 => 22995, 20566 => 20804, 20567 => 20982,
+    20568 => 33016, 20569 => 21256, 20570 => 27769, 20571 => 38596, 20572 => 29066,
+    20573 => 20241, 20574 => 20462, 20575 => 32670, 20576 => 26429, 20577 => 21957,
+    20578 => 38152, 20579 => 31168, 20580 => 34966, 20581 => 32483, 20582 => 22687,
+    20583 => 25100, 20584 => 38656, 20585 => 34394, 20586 => 22040, 20587 => 39035,
+    20588 => 24464, 20589 => 35768, 20590 => 33988, 20591 => 37207, 20592 => 21465,
+    20593 => 26093, 20594 => 24207, 20595 => 30044, 20596 => 24676, 20597 => 32110,
+    20598 => 23167, 20599 => 32490, 20600 => 32493, 20601 => 36713, 20602 => 21927,
+    20603 => 23459, 20604 => 24748, 20605 => 26059, 20606 => 29572, 20769 => 36873,
+    20770 => 30307, 20771 => 30505, 20772 => 32474, 20773 => 38772, 20774 => 34203,
+    20775 => 23398, 20776 => 31348, 20777 => 38634, 20778 => 34880, 20779 => 21195,
+    20780 => 29071, 20781 => 24490, 20782 => 26092, 20783 => 35810, 20784 => 23547,
+    20785 => 39535, 20786 => 24033, 20787 => 27529, 20788 => 27739, 20789 => 35757,
+    20790 => 35759, 20791 => 36874, 20792 => 36805, 20793 => 21387, 20794 => 25276,
+    20795 => 40486, 20796 => 40493, 20797 => 21568, 20798 => 20011, 20799 => 33469,
+    20800 => 29273, 20801 => 34460, 20802 => 23830, 20803 => 34905, 20804 => 28079,
+    20805 => 38597, 20806 => 21713, 20807 => 20122, 20808 => 35766, 20809 => 28937,
+    20810 => 21693, 20811 => 38409, 20812 => 28895, 20813 => 28153, 20814 => 30416,
+    20815 => 20005, 20816 => 30740, 20817 => 34578, 20818 => 23721, 20819 => 24310,
+    20820 => 35328, 20821 => 39068, 20822 => 38414, 20823 => 28814, 20824 => 27839,
+    20825 => 22852, 20826 => 25513, 20827 => 30524, 20828 => 34893, 20829 => 28436,
+    20830 => 33395, 20831 => 22576, 20832 => 29141, 20833 => 21388, 20834 => 30746,
+    20835 => 38593, 20836 => 21761, 20837 => 24422, 20838 => 28976, 20839 => 23476,
+    20840 => 35866, 20841 => 39564, 20842 => 27523, 20843 => 22830, 20844 => 40495,
+    20845 => 31207, 20846 => 26472, 20847 => 25196, 20848 => 20335, 20849 => 30113,
+    20850 => 32650, 20851 => 27915, 20852 => 38451, 20853 => 27687, 20854 => 20208,
+    20855 => 30162, 20856 => 20859, 20857 => 26679, 20858 => 28478, 20859 => 36992,
+    20860 => 33136, 20861 => 22934, 20862 => 29814, 21025 => 25671, 21026 => 23591,
+    21027 => 36965, 21028 => 31377, 21029 => 35875, 21030 => 23002, 21031 => 21676,
+    21032 => 33280, 21033 => 33647, 21034 => 35201, 21035 => 32768, 21036 => 26928,
+    21037 => 22094, 21038 => 32822, 21039 => 29239, 21040 => 37326, 21041 => 20918,
+    21042 => 20063, 21043 => 39029, 21044 => 25494, 21045 => 19994, 21046 => 21494,
+    21047 => 26355, 21048 => 33099, 21049 => 22812, 21050 => 28082, 21051 => 19968,
+    21052 => 22777, 21053 => 21307, 21054 => 25558, 21055 => 38129, 21056 => 20381,
+    21057 => 20234, 21058 => 34915, 21059 => 39056, 21060 => 22839, 21061 => 36951,
+    21062 => 31227, 21063 => 20202, 21064 => 33008, 21065 => 30097, 21066 => 27778,
+    21067 => 23452, 21068 => 23016, 21069 => 24413, 21070 => 26885, 21071 => 34433,
+    21072 => 20506, 21073 => 24050, 21074 => 20057, 21075 => 30691, 21076 => 20197,
+    21077 => 33402, 21078 => 25233, 21079 => 26131, 21080 => 37009, 21081 => 23673,
+    21082 => 20159, 21083 => 24441, 21084 => 33222, 21085 => 36920, 21086 => 32900,
+    21087 => 30123, 21088 => 20134, 21089 => 35028, 21090 => 24847, 21091 => 27589,
+    21092 => 24518, 21093 => 20041, 21094 => 30410, 21095 => 28322, 21096 => 35811,
+    21097 => 35758, 21098 => 35850, 21099 => 35793, 21100 => 24322, 21101 => 32764,
+    21102 => 32716, 21103 => 32462, 21104 => 33589, 21105 => 33643, 21106 => 22240,
+    21107 => 27575, 21108 => 38899, 21109 => 38452, 21110 => 23035, 21111 => 21535,
+    21112 => 38134, 21113 => 28139, 21114 => 23493, 21115 => 39278, 21116 => 23609,
+    21117 => 24341, 21118 => 38544, 21281 => 21360, 21282 => 33521, 21283 => 27185,
+    21284 => 23156, 21285 => 40560, 21286 => 24212, 21287 => 32552, 21288 => 33721,
+    21289 => 33828, 21290 => 33829, 21291 => 33639, 21292 => 34631, 21293 => 36814,
+    21294 => 36194, 21295 => 30408, 21296 => 24433, 21297 => 39062, 21298 => 30828,
+    21299 => 26144, 21300 => 21727, 21301 => 25317, 21302 => 20323, 21303 => 33219,
+    21304 => 30152, 21305 => 24248, 21306 => 38605, 21307 => 36362, 21308 => 34553,
+    21309 => 21647, 21310 => 27891, 21311 => 28044, 21312 => 27704, 21313 => 24703,
+    21314 => 21191, 21315 => 29992, 21316 => 24189, 21317 => 20248, 21318 => 24736,
+    21319 => 24551, 21320 => 23588, 21321 => 30001, 21322 => 37038, 21323 => 38080,
+    21324 => 29369, 21325 => 27833, 21326 => 28216, 21327 => 37193, 21328 => 26377,
+    21329 => 21451, 21330 => 21491, 21331 => 20305, 21332 => 37321, 21333 => 35825,
+    21334 => 21448, 21335 => 24188, 21336 => 36802, 21337 => 28132, 21338 => 20110,
+    21339 => 30402, 21340 => 27014, 21341 => 34398, 21342 => 24858, 21343 => 33286,
+    21344 => 20313, 21345 => 20446, 21346 => 36926, 21347 => 40060, 21348 => 24841,
+    21349 => 28189, 21350 => 28180, 21351 => 38533, 21352 => 20104, 21353 => 23089,
+    21354 => 38632, 21355 => 19982, 21356 => 23679, 21357 => 31161, 21358 => 23431,
+    21359 => 35821, 21360 => 32701, 21361 => 29577, 21362 => 22495, 21363 => 33419,
+    21364 => 37057, 21365 => 21505, 21366 => 36935, 21367 => 21947, 21368 => 23786,
+    21369 => 24481, 21370 => 24840, 21371 => 27442, 21372 => 29425, 21373 => 32946,
+    21374 => 35465, 21537 => 28020, 21538 => 23507, 21539 => 35029, 21540 => 39044,
+    21541 => 35947, 21542 => 39533, 21543 => 40499, 21544 => 28170, 21545 => 20900,
+    21546 => 20803, 21547 => 22435, 21548 => 34945, 21549 => 21407, 21550 => 25588,
+    21551 => 36757, 21552 => 22253, 21553 => 21592, 21554 => 22278, 21555 => 29503,
+    21556 => 28304, 21557 => 32536, 21558 => 36828, 21559 => 33489, 21560 => 24895,
+    21561 => 24616, 21562 => 38498, 21563 => 26352, 21564 => 32422, 21565 => 36234,
+    21566 => 36291, 21567 => 38053, 21568 => 23731, 21569 => 31908, 21570 => 26376,
+    21571 => 24742, 21572 => 38405, 21573 => 32792, 21574 => 20113, 21575 => 37095,
+    21576 => 21248, 21577 => 38504, 21578 => 20801, 21579 => 36816, 21580 => 34164,
+    21581 => 37213, 21582 => 26197, 21583 => 38901, 21584 => 23381, 21585 => 21277,
+    21586 => 30776, 21587 => 26434, 21588 => 26685, 21589 => 21705, 21590 => 28798,
+    21591 => 23472, 21592 => 36733, 21593 => 20877, 21594 => 22312, 21595 => 21681,
+    21596 => 25874, 21597 => 26242, 21598 => 36190, 21599 => 36163, 21600 => 33039,
+    21601 => 33900, 21602 => 36973, 21603 => 31967, 21604 => 20991, 21605 => 34299,
+    21606 => 26531, 21607 => 26089, 21608 => 28577, 21609 => 34468, 21610 => 36481,
+    21611 => 22122, 21612 => 36896, 21613 => 30338, 21614 => 28790, 21615 => 29157,
+    21616 => 36131, 21617 => 25321, 21618 => 21017, 21619 => 27901, 21620 => 36156,
+    21621 => 24590, 21622 => 22686, 21623 => 24974, 21624 => 26366, 21625 => 36192,
+    21626 => 25166, 21627 => 21939, 21628 => 28195, 21629 => 26413, 21630 => 36711,
+    21793 => 38113, 21794 => 38392, 21795 => 30504, 21796 => 26629, 21797 => 27048,
+    21798 => 21643, 21799 => 20045, 21800 => 28856, 21801 => 35784, 21802 => 25688,
+    21803 => 25995, 21804 => 23429, 21805 => 31364, 21806 => 20538, 21807 => 23528,
+    21808 => 30651, 21809 => 27617, 21810 => 35449, 21811 => 31896, 21812 => 27838,
+    21813 => 30415, 21814 => 26025, 21815 => 36759, 21816 => 23853, 21817 => 23637,
+    21818 => 34360, 21819 => 26632, 21820 => 21344, 21821 => 25112, 21822 => 31449,
+    21823 => 28251, 21824 => 32509, 21825 => 27167, 21826 => 31456, 21827 => 24432,
+    21828 => 28467, 21829 => 24352, 21830 => 25484, 21831 => 28072, 21832 => 26454,
+    21833 => 19976, 21834 => 24080, 21835 => 36134, 21836 => 20183, 21837 => 32960,
+    21838 => 30260, 21839 => 38556, 21840 => 25307, 21841 => 26157, 21842 => 25214,
+    21843 => 27836, 21844 => 36213, 21845 => 29031, 21846 => 32617, 21847 => 20806,
+    21848 => 32903, 21849 => 21484, 21850 => 36974, 21851 => 25240, 21852 => 21746,
+    21853 => 34544, 21854 => 36761, 21855 => 32773, 21856 => 38167, 21857 => 34071,
+    21858 => 36825, 21859 => 27993, 21860 => 29645, 21861 => 26015, 21862 => 30495,
+    21863 => 29956, 21864 => 30759, 21865 => 33275, 21866 => 36126, 21867 => 38024,
+    21868 => 20390, 21869 => 26517, 21870 => 30137, 21871 => 35786, 21872 => 38663,
+    21873 => 25391, 21874 => 38215, 21875 => 38453, 21876 => 33976, 21877 => 25379,
+    21878 => 30529, 21879 => 24449, 21880 => 29424, 21881 => 20105, 21882 => 24596,
+    21883 => 25972, 21884 => 25327, 21885 => 27491, 21886 => 25919, 22049 => 24103,
+    22050 => 30151, 22051 => 37073, 22052 => 35777, 22053 => 33437, 22054 => 26525,
+    22055 => 25903, 22056 => 21553, 22057 => 34584, 22058 => 30693, 22059 => 32930,
+    22060 => 33026, 22061 => 27713, 22062 => 20043, 22063 => 32455, 22064 => 32844,
+    22065 => 30452, 22066 => 26893, 22067 => 27542, 22068 => 25191, 22069 => 20540,
+    22070 => 20356, 22071 => 22336, 22072 => 25351, 22073 => 27490, 22074 => 36286,
+    22075 => 21482, 22076 => 26088, 22077 => 32440, 22078 => 24535, 22079 => 25370,
+    22080 => 25527, 22081 => 33267, 22082 => 33268, 22083 => 32622, 22084 => 24092,
+    22085 => 23769, 22086 => 21046, 22087 => 26234, 22088 => 31209, 22089 => 31258,
+    22090 => 36136, 22091 => 28825, 22092 => 30164, 22093 => 28382, 22094 => 27835,
+    22095 => 31378, 22096 => 20013, 22097 => 30405, 22098 => 24544, 22099 => 38047,
+    22100 => 34935, 22101 => 32456, 22102 => 31181, 22103 => 32959, 22104 => 37325,
+    22105 => 20210, 22106 => 20247, 22107 => 33311, 22108 => 21608, 22109 => 24030,
+    22110 => 27954, 22111 => 35788, 22112 => 31909, 22113 => 36724, 22114 => 32920,
+    22115 => 24090, 22116 => 21650, 22117 => 30385, 22118 => 23449, 22119 => 26172,
+    22120 => 39588, 22121 => 29664, 22122 => 26666, 22123 => 34523, 22124 => 26417,
+    22125 => 29482, 22126 => 35832, 22127 => 35803, 22128 => 36880, 22129 => 31481,
+    22130 => 28891, 22131 => 29038, 22132 => 25284, 22133 => 30633, 22134 => 22065,
+    22135 => 20027, 22136 => 33879, 22137 => 26609, 22138 => 21161, 22139 => 34496,
+    22140 => 36142, 22141 => 38136, 22142 => 31569, 22305 => 20303, 22306 => 27880,
+    22307 => 31069, 22308 => 39547, 22309 => 25235, 22310 => 29226, 22311 => 25341,
+    22312 => 19987, 22313 => 30742, 22314 => 36716, 22315 => 25776, 22316 => 36186,
+    22317 => 31686, 22318 => 26729, 22319 => 24196, 22320 => 35013, 22321 => 22918,
+    22322 => 25758, 22323 => 22766, 22324 => 29366, 22325 => 26894, 22326 => 38181,
+    22327 => 36861, 22328 => 36184, 22329 => 22368, 22330 => 32512, 22331 => 35846,
+    22332 => 20934, 22333 => 25417, 22334 => 25305, 22335 => 21331, 22336 => 26700,
+    22337 => 29730, 22338 => 33537, 22339 => 37196, 22340 => 21828, 22341 => 30528,
+    22342 => 28796, 22343 => 27978, 22344 => 20857, 22345 => 21672, 22346 => 36164,
+    22347 => 23039, 22348 => 28363, 22349 => 28100, 22350 => 23388, 22351 => 32043,
+    22352 => 20180, 22353 => 31869, 22354 => 28371, 22355 => 23376, 22356 => 33258,
+    22357 => 28173, 22358 => 23383, 22359 => 39683, 22360 => 26837, 22361 => 36394,
+    22362 => 23447, 22363 => 32508, 22364 => 24635, 22365 => 32437, 22366 => 37049,
+    22367 => 36208, 22368 => 22863, 22369 => 25549, 22370 => 31199, 22371 => 36275,
+    22372 => 21330, 22373 => 26063, 22374 => 31062, 22375 => 35781, 22376 => 38459,
+    22377 => 32452, 22378 => 38075, 22379 => 32386, 22380 => 22068, 22381 => 37257,
+    22382 => 26368, 22383 => 32618, 22384 => 23562, 22385 => 36981, 22386 => 26152,
+    22387 => 24038, 22388 => 20304, 22389 => 26590, 22390 => 20570, 22391 => 20316,
+    22392 => 22352, 22393 => 24231, 22561 => 20109, 22562 => 19980, 22563 => 20800,
+    22564 => 19984, 22565 => 24319, 22566 => 21317, 22567 => 19989, 22568 => 20120,
+    22569 => 19998, 22570 => 39730, 22571 => 23404, 22572 => 22121, 22573 => 20008,
+    22574 => 31162, 22575 => 20031, 22576 => 21269, 22577 => 20039, 22578 => 22829,
+    22579 => 29243, 22580 => 21358, 22581 => 27664, 22582 => 22239, 22583 => 32996,
+    22584 => 39319, 22585 => 27603, 22586 => 30590, 22587 => 40727, 22588 => 20022,
+    22589 => 20127, 22590 => 40720, 22591 => 20060, 22592 => 20073, 22593 => 20115,
+    22594 => 33416, 22595 => 23387, 22596 => 21868, 22597 => 22031, 22598 => 20164,
+    22599 => 21389, 22600 => 21405, 22601 => 21411, 22602 => 21413, 22603 => 21422,
+    22604 => 38757, 22605 => 36189, 22606 => 21274, 22607 => 21493, 22608 => 21286,
+    22609 => 21294, 22610 => 21310, 22611 => 36188, 22612 => 21350, 22613 => 21347,
+    22614 => 20994, 22615 => 21000, 22616 => 21006, 22617 => 21037, 22618 => 21043,
+    22619 => 21055, 22620 => 21056, 22621 => 21068, 22622 => 21086, 22623 => 21089,
+    22624 => 21084, 22625 => 33967, 22626 => 21117, 22627 => 21122, 22628 => 21121,
+    22629 => 21136, 22630 => 21139, 22631 => 20866, 22632 => 32596, 22633 => 20155,
+    22634 => 20163, 22635 => 20169, 22636 => 20162, 22637 => 20200, 22638 => 20193,
+    22639 => 20203, 22640 => 20190, 22641 => 20251, 22642 => 20211, 22643 => 20258,
+    22644 => 20324, 22645 => 20213, 22646 => 20261, 22647 => 20263, 22648 => 20233,
+    22649 => 20267, 22650 => 20318, 22651 => 20327, 22652 => 25912, 22653 => 20314,
+    22654 => 20317, 22817 => 20319, 22818 => 20311, 22819 => 20274, 22820 => 20285,
+    22821 => 20342, 22822 => 20340, 22823 => 20369, 22824 => 20361, 22825 => 20355,
+    22826 => 20367, 22827 => 20350, 22828 => 20347, 22829 => 20394, 22830 => 20348,
+    22831 => 20396, 22832 => 20372, 22833 => 20454, 22834 => 20456, 22835 => 20458,
+    22836 => 20421, 22837 => 20442, 22838 => 20451, 22839 => 20444, 22840 => 20433,
+    22841 => 20447, 22842 => 20472, 22843 => 20521, 22844 => 20556, 22845 => 20467,
+    22846 => 20524, 22847 => 20495, 22848 => 20526, 22849 => 20525, 22850 => 20478,
+    22851 => 20508, 22852 => 20492, 22853 => 20517, 22854 => 20520, 22855 => 20606,
+    22856 => 20547, 22857 => 20565, 22858 => 20552, 22859 => 20558, 22860 => 20588,
+    22861 => 20603, 22862 => 20645, 22863 => 20647, 22864 => 20649, 22865 => 20666,
+    22866 => 20694, 22867 => 20742, 22868 => 20717, 22869 => 20716, 22870 => 20710,
+    22871 => 20718, 22872 => 20743, 22873 => 20747, 22874 => 20189, 22875 => 27709,
+    22876 => 20312, 22877 => 20325, 22878 => 20430, 22879 => 40864, 22880 => 27718,
+    22881 => 31860, 22882 => 20846, 22883 => 24061, 22884 => 40649, 22885 => 39320,
+    22886 => 20865, 22887 => 22804, 22888 => 21241, 22889 => 21261, 22890 => 35335,
+    22891 => 21264, 22892 => 20971, 22893 => 22809, 22894 => 20821, 22895 => 20128,
+    22896 => 20822, 22897 => 20147, 22898 => 34926, 22899 => 34980, 22900 => 20149,
+    22901 => 33044, 22902 => 35026, 22903 => 31104, 22904 => 23348, 22905 => 34819,
+    22906 => 32696, 22907 => 20907, 22908 => 20913, 22909 => 20925, 22910 => 20924,
+    23073 => 20935, 23074 => 20886, 23075 => 20898, 23076 => 20901, 23077 => 35744,
+    23078 => 35750, 23079 => 35751, 23080 => 35754, 23081 => 35764, 23082 => 35765,
+    23083 => 35767, 23084 => 35778, 23085 => 35779, 23086 => 35787, 23087 => 35791,
+    23088 => 35790, 23089 => 35794, 23090 => 35795, 23091 => 35796, 23092 => 35798,
+    23093 => 35800, 23094 => 35801, 23095 => 35804, 23096 => 35807, 23097 => 35808,
+    23098 => 35812, 23099 => 35816, 23100 => 35817, 23101 => 35822, 23102 => 35824,
+    23103 => 35827, 23104 => 35830, 23105 => 35833, 23106 => 35836, 23107 => 35839,
+    23108 => 35840, 23109 => 35842, 23110 => 35844, 23111 => 35847, 23112 => 35852,
+    23113 => 35855, 23114 => 35857, 23115 => 35858, 23116 => 35860, 23117 => 35861,
+    23118 => 35862, 23119 => 35865, 23120 => 35867, 23121 => 35864, 23122 => 35869,
+    23123 => 35871, 23124 => 35872, 23125 => 35873, 23126 => 35877, 23127 => 35879,
+    23128 => 35882, 23129 => 35883, 23130 => 35886, 23131 => 35887, 23132 => 35890,
+    23133 => 35891, 23134 => 35893, 23135 => 35894, 23136 => 21353, 23137 => 21370,
+    23138 => 38429, 23139 => 38434, 23140 => 38433, 23141 => 38449, 23142 => 38442,
+    23143 => 38461, 23144 => 38460, 23145 => 38466, 23146 => 38473, 23147 => 38484,
+    23148 => 38495, 23149 => 38503, 23150 => 38508, 23151 => 38514, 23152 => 38516,
+    23153 => 38536, 23154 => 38541, 23155 => 38551, 23156 => 38576, 23157 => 37015,
+    23158 => 37019, 23159 => 37021, 23160 => 37017, 23161 => 37036, 23162 => 37025,
+    23163 => 37044, 23164 => 37043, 23165 => 37046, 23166 => 37050, 23329 => 37048,
+    23330 => 37040, 23331 => 37071, 23332 => 37061, 23333 => 37054, 23334 => 37072,
+    23335 => 37060, 23336 => 37063, 23337 => 37075, 23338 => 37094, 23339 => 37090,
+    23340 => 37084, 23341 => 37079, 23342 => 37083, 23343 => 37099, 23344 => 37103,
+    23345 => 37118, 23346 => 37124, 23347 => 37154, 23348 => 37150, 23349 => 37155,
+    23350 => 37169, 23351 => 37167, 23352 => 37177, 23353 => 37187, 23354 => 37190,
+    23355 => 21005, 23356 => 22850, 23357 => 21154, 23358 => 21164, 23359 => 21165,
+    23360 => 21182, 23361 => 21759, 23362 => 21200, 23363 => 21206, 23364 => 21232,
+    23365 => 21471, 23366 => 29166, 23367 => 30669, 23368 => 24308, 23369 => 20981,
+    23370 => 20988, 23371 => 39727, 23372 => 21430, 23373 => 24321, 23374 => 30042,
+    23375 => 24047, 23376 => 22348, 23377 => 22441, 23378 => 22433, 23379 => 22654,
+    23380 => 22716, 23381 => 22725, 23382 => 22737, 23383 => 22313, 23384 => 22316,
+    23385 => 22314, 23386 => 22323, 23387 => 22329, 23388 => 22318, 23389 => 22319,
+    23390 => 22364, 23391 => 22331, 23392 => 22338, 23393 => 22377, 23394 => 22405,
+    23395 => 22379, 23396 => 22406, 23397 => 22396, 23398 => 22395, 23399 => 22376,
+    23400 => 22381, 23401 => 22390, 23402 => 22387, 23403 => 22445, 23404 => 22436,
+    23405 => 22412, 23406 => 22450, 23407 => 22479, 23408 => 22439, 23409 => 22452,
+    23410 => 22419, 23411 => 22432, 23412 => 22485, 23413 => 22488, 23414 => 22490,
+    23415 => 22489, 23416 => 22482, 23417 => 22456, 23418 => 22516, 23419 => 22511,
+    23420 => 22520, 23421 => 22500, 23422 => 22493, 23585 => 22539, 23586 => 22541,
+    23587 => 22525, 23588 => 22509, 23589 => 22528, 23590 => 22558, 23591 => 22553,
+    23592 => 22596, 23593 => 22560, 23594 => 22629, 23595 => 22636, 23596 => 22657,
+    23597 => 22665, 23598 => 22682, 23599 => 22656, 23600 => 39336, 23601 => 40729,
+    23602 => 25087, 23603 => 33401, 23604 => 33405, 23605 => 33407, 23606 => 33423,
+    23607 => 33418, 23608 => 33448, 23609 => 33412, 23610 => 33422, 23611 => 33425,
+    23612 => 33431, 23613 => 33433, 23614 => 33451, 23615 => 33464, 23616 => 33470,
+    23617 => 33456, 23618 => 33480, 23619 => 33482, 23620 => 33507, 23621 => 33432,
+    23622 => 33463, 23623 => 33454, 23624 => 33483, 23625 => 33484, 23626 => 33473,
+    23627 => 33449, 23628 => 33460, 23629 => 33441, 23630 => 33450, 23631 => 33439,
+    23632 => 33476, 23633 => 33486, 23634 => 33444, 23635 => 33505, 23636 => 33545,
+    23637 => 33527, 23638 => 33508, 23639 => 33551, 23640 => 33543, 23641 => 33500,
+    23642 => 33524, 23643 => 33490, 23644 => 33496, 23645 => 33548, 23646 => 33531,
+    23647 => 33491, 23648 => 33553, 23649 => 33562, 23650 => 33542, 23651 => 33556,
+    23652 => 33557, 23653 => 33504, 23654 => 33493, 23655 => 33564, 23656 => 33617,
+    23657 => 33627, 23658 => 33628, 23659 => 33544, 23660 => 33682, 23661 => 33596,
+    23662 => 33588, 23663 => 33585, 23664 => 33691, 23665 => 33630, 23666 => 33583,
+    23667 => 33615, 23668 => 33607, 23669 => 33603, 23670 => 33631, 23671 => 33600,
+    23672 => 33559, 23673 => 33632, 23674 => 33581, 23675 => 33594, 23676 => 33587,
+    23677 => 33638, 23678 => 33637, 23841 => 33640, 23842 => 33563, 23843 => 33641,
+    23844 => 33644, 23845 => 33642, 23846 => 33645, 23847 => 33646, 23848 => 33712,
+    23849 => 33656, 23850 => 33715, 23851 => 33716, 23852 => 33696, 23853 => 33706,
+    23854 => 33683, 23855 => 33692, 23856 => 33669, 23857 => 33660, 23858 => 33718,
+    23859 => 33705, 23860 => 33661, 23861 => 33720, 23862 => 33659, 23863 => 33688,
+    23864 => 33694, 23865 => 33704, 23866 => 33722, 23867 => 33724, 23868 => 33729,
+    23869 => 33793, 23870 => 33765, 23871 => 33752, 23872 => 22535, 23873 => 33816,
+    23874 => 33803, 23875 => 33757, 23876 => 33789, 23877 => 33750, 23878 => 33820,
+    23879 => 33848, 23880 => 33809, 23881 => 33798, 23882 => 33748, 23883 => 33759,
+    23884 => 33807, 23885 => 33795, 23886 => 33784, 23887 => 33785, 23888 => 33770,
+    23889 => 33733, 23890 => 33728, 23891 => 33830, 23892 => 33776, 23893 => 33761,
+    23894 => 33884, 23895 => 33873, 23896 => 33882, 23897 => 33881, 23898 => 33907,
+    23899 => 33927, 23900 => 33928, 23901 => 33914, 23902 => 33929, 23903 => 33912,
+    23904 => 33852, 23905 => 33862, 23906 => 33897, 23907 => 33910, 23908 => 33932,
+    23909 => 33934, 23910 => 33841, 23911 => 33901, 23912 => 33985, 23913 => 33997,
+    23914 => 34000, 23915 => 34022, 23916 => 33981, 23917 => 34003, 23918 => 33994,
+    23919 => 33983, 23920 => 33978, 23921 => 34016, 23922 => 33953, 23923 => 33977,
+    23924 => 33972, 23925 => 33943, 23926 => 34021, 23927 => 34019, 23928 => 34060,
+    23929 => 29965, 23930 => 34104, 23931 => 34032, 23932 => 34105, 23933 => 34079,
+    23934 => 34106, 24097 => 34134, 24098 => 34107, 24099 => 34047, 24100 => 34044,
+    24101 => 34137, 24102 => 34120, 24103 => 34152, 24104 => 34148, 24105 => 34142,
+    24106 => 34170, 24107 => 30626, 24108 => 34115, 24109 => 34162, 24110 => 34171,
+    24111 => 34212, 24112 => 34216, 24113 => 34183, 24114 => 34191, 24115 => 34169,
+    24116 => 34222, 24117 => 34204, 24118 => 34181, 24119 => 34233, 24120 => 34231,
+    24121 => 34224, 24122 => 34259, 24123 => 34241, 24124 => 34268, 24125 => 34303,
+    24126 => 34343, 24127 => 34309, 24128 => 34345, 24129 => 34326, 24130 => 34364,
+    24131 => 24318, 24132 => 24328, 24133 => 22844, 24134 => 22849, 24135 => 32823,
+    24136 => 22869, 24137 => 22874, 24138 => 22872, 24139 => 21263, 24140 => 23586,
+    24141 => 23589, 24142 => 23596, 24143 => 23604, 24144 => 25164, 24145 => 25194,
+    24146 => 25247, 24147 => 25275, 24148 => 25290, 24149 => 25306, 24150 => 25303,
+    24151 => 25326, 24152 => 25378, 24153 => 25334, 24154 => 25401, 24155 => 25419,
+    24156 => 25411, 24157 => 25517, 24158 => 25590, 24159 => 25457, 24160 => 25466,
+    24161 => 25486, 24162 => 25524, 24163 => 25453, 24164 => 25516, 24165 => 25482,
+    24166 => 25449, 24167 => 25518, 24168 => 25532, 24169 => 25586, 24170 => 25592,
+    24171 => 25568, 24172 => 25599, 24173 => 25540, 24174 => 25566, 24175 => 25550,
+    24176 => 25682, 24177 => 25542, 24178 => 25534, 24179 => 25669, 24180 => 25665,
+    24181 => 25611, 24182 => 25627, 24183 => 25632, 24184 => 25612, 24185 => 25638,
+    24186 => 25633, 24187 => 25694, 24188 => 25732, 24189 => 25709, 24190 => 25750,
+    24353 => 25722, 24354 => 25783, 24355 => 25784, 24356 => 25753, 24357 => 25786,
+    24358 => 25792, 24359 => 25808, 24360 => 25815, 24361 => 25828, 24362 => 25826,
+    24363 => 25865, 24364 => 25893, 24365 => 25902, 24366 => 24331, 24367 => 24530,
+    24368 => 29977, 24369 => 24337, 24370 => 21343, 24371 => 21489, 24372 => 21501,
+    24373 => 21481, 24374 => 21480, 24375 => 21499, 24376 => 21522, 24377 => 21526,
+    24378 => 21510, 24379 => 21579, 24380 => 21586, 24381 => 21587, 24382 => 21588,
+    24383 => 21590, 24384 => 21571, 24385 => 21537, 24386 => 21591, 24387 => 21593,
+    24388 => 21539, 24389 => 21554, 24390 => 21634, 24391 => 21652, 24392 => 21623,
+    24393 => 21617, 24394 => 21604, 24395 => 21658, 24396 => 21659, 24397 => 21636,
+    24398 => 21622, 24399 => 21606, 24400 => 21661, 24401 => 21712, 24402 => 21677,
+    24403 => 21698, 24404 => 21684, 24405 => 21714, 24406 => 21671, 24407 => 21670,
+    24408 => 21715, 24409 => 21716, 24410 => 21618, 24411 => 21667, 24412 => 21717,
+    24413 => 21691, 24414 => 21695, 24415 => 21708, 24416 => 21721, 24417 => 21722,
+    24418 => 21724, 24419 => 21673, 24420 => 21674, 24421 => 21668, 24422 => 21725,
+    24423 => 21711, 24424 => 21726, 24425 => 21787, 24426 => 21735, 24427 => 21792,
+    24428 => 21757, 24429 => 21780, 24430 => 21747, 24431 => 21794, 24432 => 21795,
+    24433 => 21775, 24434 => 21777, 24435 => 21799, 24436 => 21802, 24437 => 21863,
+    24438 => 21903, 24439 => 21941, 24440 => 21833, 24441 => 21869, 24442 => 21825,
+    24443 => 21845, 24444 => 21823, 24445 => 21840, 24446 => 21820, 24609 => 21815,
+    24610 => 21846, 24611 => 21877, 24612 => 21878, 24613 => 21879, 24614 => 21811,
+    24615 => 21808, 24616 => 21852, 24617 => 21899, 24618 => 21970, 24619 => 21891,
+    24620 => 21937, 24621 => 21945, 24622 => 21896, 24623 => 21889, 24624 => 21919,
+    24625 => 21886, 24626 => 21974, 24627 => 21905, 24628 => 21883, 24629 => 21983,
+    24630 => 21949, 24631 => 21950, 24632 => 21908, 24633 => 21913, 24634 => 21994,
+    24635 => 22007, 24636 => 21961, 24637 => 22047, 24638 => 21969, 24639 => 21995,
+    24640 => 21996, 24641 => 21972, 24642 => 21990, 24643 => 21981, 24644 => 21956,
+    24645 => 21999, 24646 => 21989, 24647 => 22002, 24648 => 22003, 24649 => 21964,
+    24650 => 21965, 24651 => 21992, 24652 => 22005, 24653 => 21988, 24654 => 36756,
+    24655 => 22046, 24656 => 22024, 24657 => 22028, 24658 => 22017, 24659 => 22052,
+    24660 => 22051, 24661 => 22014, 24662 => 22016, 24663 => 22055, 24664 => 22061,
+    24665 => 22104, 24666 => 22073, 24667 => 22103, 24668 => 22060, 24669 => 22093,
+    24670 => 22114, 24671 => 22105, 24672 => 22108, 24673 => 22092, 24674 => 22100,
+    24675 => 22150, 24676 => 22116, 24677 => 22129, 24678 => 22123, 24679 => 22139,
+    24680 => 22140, 24681 => 22149, 24682 => 22163, 24683 => 22191, 24684 => 22228,
+    24685 => 22231, 24686 => 22237, 24687 => 22241, 24688 => 22261, 24689 => 22251,
+    24690 => 22265, 24691 => 22271, 24692 => 22276, 24693 => 22282, 24694 => 22281,
+    24695 => 22300, 24696 => 24079, 24697 => 24089, 24698 => 24084, 24699 => 24081,
+    24700 => 24113, 24701 => 24123, 24702 => 24124, 24865 => 24119, 24866 => 24132,
+    24867 => 24148, 24868 => 24155, 24869 => 24158, 24870 => 24161, 24871 => 23692,
+    24872 => 23674, 24873 => 23693, 24874 => 23696, 24875 => 23702, 24876 => 23688,
+    24877 => 23704, 24878 => 23705, 24879 => 23697, 24880 => 23706, 24881 => 23708,
+    24882 => 23733, 24883 => 23714, 24884 => 23741, 24885 => 23724, 24886 => 23723,
+    24887 => 23729, 24888 => 23715, 24889 => 23745, 24890 => 23735, 24891 => 23748,
+    24892 => 23762, 24893 => 23780, 24894 => 23755, 24895 => 23781, 24896 => 23810,
+    24897 => 23811, 24898 => 23847, 24899 => 23846, 24900 => 23854, 24901 => 23844,
+    24902 => 23838, 24903 => 23814, 24904 => 23835, 24905 => 23896, 24906 => 23870,
+    24907 => 23860, 24908 => 23869, 24909 => 23916, 24910 => 23899, 24911 => 23919,
+    24912 => 23901, 24913 => 23915, 24914 => 23883, 24915 => 23882, 24916 => 23913,
+    24917 => 23924, 24918 => 23938, 24919 => 23961, 24920 => 23965, 24921 => 35955,
+    24922 => 23991, 24923 => 24005, 24924 => 24435, 24925 => 24439, 24926 => 24450,
+    24927 => 24455, 24928 => 24457, 24929 => 24460, 24930 => 24469, 24931 => 24473,
+    24932 => 24476, 24933 => 24488, 24934 => 24493, 24935 => 24501, 24936 => 24508,
+    24937 => 34914, 24938 => 24417, 24939 => 29357, 24940 => 29360, 24941 => 29364,
+    24942 => 29367, 24943 => 29368, 24944 => 29379, 24945 => 29377, 24946 => 29390,
+    24947 => 29389, 24948 => 29394, 24949 => 29416, 24950 => 29423, 24951 => 29417,
+    24952 => 29426, 24953 => 29428, 24954 => 29431, 24955 => 29441, 24956 => 29427,
+    24957 => 29443, 24958 => 29434, 25121 => 29435, 25122 => 29463, 25123 => 29459,
+    25124 => 29473, 25125 => 29450, 25126 => 29470, 25127 => 29469, 25128 => 29461,
+    25129 => 29474, 25130 => 29497, 25131 => 29477, 25132 => 29484, 25133 => 29496,
+    25134 => 29489, 25135 => 29520, 25136 => 29517, 25137 => 29527, 25138 => 29536,
+    25139 => 29548, 25140 => 29551, 25141 => 29566, 25142 => 33307, 25143 => 22821,
+    25144 => 39143, 25145 => 22820, 25146 => 22786, 25147 => 39267, 25148 => 39271,
+    25149 => 39272, 25150 => 39273, 25151 => 39274, 25152 => 39275, 25153 => 39276,
+    25154 => 39284, 25155 => 39287, 25156 => 39293, 25157 => 39296, 25158 => 39300,
+    25159 => 39303, 25160 => 39306, 25161 => 39309, 25162 => 39312, 25163 => 39313,
+    25164 => 39315, 25165 => 39316, 25166 => 39317, 25167 => 24192, 25168 => 24209,
+    25169 => 24203, 25170 => 24214, 25171 => 24229, 25172 => 24224, 25173 => 24249,
+    25174 => 24245, 25175 => 24254, 25176 => 24243, 25177 => 36179, 25178 => 24274,
+    25179 => 24273, 25180 => 24283, 25181 => 24296, 25182 => 24298, 25183 => 33210,
+    25184 => 24516, 25185 => 24521, 25186 => 24534, 25187 => 24527, 25188 => 24579,
+    25189 => 24558, 25190 => 24580, 25191 => 24545, 25192 => 24548, 25193 => 24574,
+    25194 => 24581, 25195 => 24582, 25196 => 24554, 25197 => 24557, 25198 => 24568,
+    25199 => 24601, 25200 => 24629, 25201 => 24614, 25202 => 24603, 25203 => 24591,
+    25204 => 24589, 25205 => 24617, 25206 => 24619, 25207 => 24586, 25208 => 24639,
+    25209 => 24609, 25210 => 24696, 25211 => 24697, 25212 => 24699, 25213 => 24698,
+    25214 => 24642, 25377 => 24682, 25378 => 24701, 25379 => 24726, 25380 => 24730,
+    25381 => 24749, 25382 => 24733, 25383 => 24707, 25384 => 24722, 25385 => 24716,
+    25386 => 24731, 25387 => 24812, 25388 => 24763, 25389 => 24753, 25390 => 24797,
+    25391 => 24792, 25392 => 24774, 25393 => 24794, 25394 => 24756, 25395 => 24864,
+    25396 => 24870, 25397 => 24853, 25398 => 24867, 25399 => 24820, 25400 => 24832,
+    25401 => 24846, 25402 => 24875, 25403 => 24906, 25404 => 24949, 25405 => 25004,
+    25406 => 24980, 25407 => 24999, 25408 => 25015, 25409 => 25044, 25410 => 25077,
+    25411 => 24541, 25412 => 38579, 25413 => 38377, 25414 => 38379, 25415 => 38385,
+    25416 => 38387, 25417 => 38389, 25418 => 38390, 25419 => 38396, 25420 => 38398,
+    25421 => 38403, 25422 => 38404, 25423 => 38406, 25424 => 38408, 25425 => 38410,
+    25426 => 38411, 25427 => 38412, 25428 => 38413, 25429 => 38415, 25430 => 38418,
+    25431 => 38421, 25432 => 38422, 25433 => 38423, 25434 => 38425, 25435 => 38426,
+    25436 => 20012, 25437 => 29247, 25438 => 25109, 25439 => 27701, 25440 => 27732,
+    25441 => 27740, 25442 => 27722, 25443 => 27811, 25444 => 27781, 25445 => 27792,
+    25446 => 27796, 25447 => 27788, 25448 => 27752, 25449 => 27753, 25450 => 27764,
+    25451 => 27766, 25452 => 27782, 25453 => 27817, 25454 => 27856, 25455 => 27860,
+    25456 => 27821, 25457 => 27895, 25458 => 27896, 25459 => 27889, 25460 => 27863,
+    25461 => 27826, 25462 => 27872, 25463 => 27862, 25464 => 27898, 25465 => 27883,
+    25466 => 27886, 25467 => 27825, 25468 => 27859, 25469 => 27887, 25470 => 27902,
+    25633 => 27961, 25634 => 27943, 25635 => 27916, 25636 => 27971, 25637 => 27976,
+    25638 => 27911, 25639 => 27908, 25640 => 27929, 25641 => 27918, 25642 => 27947,
+    25643 => 27981, 25644 => 27950, 25645 => 27957, 25646 => 27930, 25647 => 27983,
+    25648 => 27986, 25649 => 27988, 25650 => 27955, 25651 => 28049, 25652 => 28015,
+    25653 => 28062, 25654 => 28064, 25655 => 27998, 25656 => 28051, 25657 => 28052,
+    25658 => 27996, 25659 => 28000, 25660 => 28028, 25661 => 28003, 25662 => 28186,
+    25663 => 28103, 25664 => 28101, 25665 => 28126, 25666 => 28174, 25667 => 28095,
+    25668 => 28128, 25669 => 28177, 25670 => 28134, 25671 => 28125, 25672 => 28121,
+    25673 => 28182, 25674 => 28075, 25675 => 28172, 25676 => 28078, 25677 => 28203,
+    25678 => 28270, 25679 => 28238, 25680 => 28267, 25681 => 28338, 25682 => 28255,
+    25683 => 28294, 25684 => 28243, 25685 => 28244, 25686 => 28210, 25687 => 28197,
+    25688 => 28228, 25689 => 28383, 25690 => 28337, 25691 => 28312, 25692 => 28384,
+    25693 => 28461, 25694 => 28386, 25695 => 28325, 25696 => 28327, 25697 => 28349,
+    25698 => 28347, 25699 => 28343, 25700 => 28375, 25701 => 28340, 25702 => 28367,
+    25703 => 28303, 25704 => 28354, 25705 => 28319, 25706 => 28514, 25707 => 28486,
+    25708 => 28487, 25709 => 28452, 25710 => 28437, 25711 => 28409, 25712 => 28463,
+    25713 => 28470, 25714 => 28491, 25715 => 28532, 25716 => 28458, 25717 => 28425,
+    25718 => 28457, 25719 => 28553, 25720 => 28557, 25721 => 28556, 25722 => 28536,
+    25723 => 28530, 25724 => 28540, 25725 => 28538, 25726 => 28625, 25889 => 28617,
+    25890 => 28583, 25891 => 28601, 25892 => 28598, 25893 => 28610, 25894 => 28641,
+    25895 => 28654, 25896 => 28638, 25897 => 28640, 25898 => 28655, 25899 => 28698,
+    25900 => 28707, 25901 => 28699, 25902 => 28729, 25903 => 28725, 25904 => 28751,
+    25905 => 28766, 25906 => 23424, 25907 => 23428, 25908 => 23445, 25909 => 23443,
+    25910 => 23461, 25911 => 23480, 25912 => 29999, 25913 => 39582, 25914 => 25652,
+    25915 => 23524, 25916 => 23534, 25917 => 35120, 25918 => 23536, 25919 => 36423,
+    25920 => 35591, 25921 => 36790, 25922 => 36819, 25923 => 36821, 25924 => 36837,
+    25925 => 36846, 25926 => 36836, 25927 => 36841, 25928 => 36838, 25929 => 36851,
+    25930 => 36840, 25931 => 36869, 25932 => 36868, 25933 => 36875, 25934 => 36902,
+    25935 => 36881, 25936 => 36877, 25937 => 36886, 25938 => 36897, 25939 => 36917,
+    25940 => 36918, 25941 => 36909, 25942 => 36911, 25943 => 36932, 25944 => 36945,
+    25945 => 36946, 25946 => 36944, 25947 => 36968, 25948 => 36952, 25949 => 36962,
+    25950 => 36955, 25951 => 26297, 25952 => 36980, 25953 => 36989, 25954 => 36994,
+    25955 => 37000, 25956 => 36995, 25957 => 37003, 25958 => 24400, 25959 => 24407,
+    25960 => 24406, 25961 => 24408, 25962 => 23611, 25963 => 21675, 25964 => 23632,
+    25965 => 23641, 25966 => 23409, 25967 => 23651, 25968 => 23654, 25969 => 32700,
+    25970 => 24362, 25971 => 24361, 25972 => 24365, 25973 => 33396, 25974 => 24380,
+    25975 => 39739, 25976 => 23662, 25977 => 22913, 25978 => 22915, 25979 => 22925,
+    25980 => 22953, 25981 => 22954, 25982 => 22947, 26145 => 22935, 26146 => 22986,
+    26147 => 22955, 26148 => 22942, 26149 => 22948, 26150 => 22994, 26151 => 22962,
+    26152 => 22959, 26153 => 22999, 26154 => 22974, 26155 => 23045, 26156 => 23046,
+    26157 => 23005, 26158 => 23048, 26159 => 23011, 26160 => 23000, 26161 => 23033,
+    26162 => 23052, 26163 => 23049, 26164 => 23090, 26165 => 23092, 26166 => 23057,
+    26167 => 23075, 26168 => 23059, 26169 => 23104, 26170 => 23143, 26171 => 23114,
+    26172 => 23125, 26173 => 23100, 26174 => 23138, 26175 => 23157, 26176 => 33004,
+    26177 => 23210, 26178 => 23195, 26179 => 23159, 26180 => 23162, 26181 => 23230,
+    26182 => 23275, 26183 => 23218, 26184 => 23250, 26185 => 23252, 26186 => 23224,
+    26187 => 23264, 26188 => 23267, 26189 => 23281, 26190 => 23254, 26191 => 23270,
+    26192 => 23256, 26193 => 23260, 26194 => 23305, 26195 => 23319, 26196 => 23318,
+    26197 => 23346, 26198 => 23351, 26199 => 23360, 26200 => 23573, 26201 => 23580,
+    26202 => 23386, 26203 => 23397, 26204 => 23411, 26205 => 23377, 26206 => 23379,
+    26207 => 23394, 26208 => 39541, 26209 => 39543, 26210 => 39544, 26211 => 39546,
+    26212 => 39551, 26213 => 39549, 26214 => 39552, 26215 => 39553, 26216 => 39557,
+    26217 => 39560, 26218 => 39562, 26219 => 39568, 26220 => 39570, 26221 => 39571,
+    26222 => 39574, 26223 => 39576, 26224 => 39579, 26225 => 39580, 26226 => 39581,
+    26227 => 39583, 26228 => 39584, 26229 => 39586, 26230 => 39587, 26231 => 39589,
+    26232 => 39591, 26233 => 32415, 26234 => 32417, 26235 => 32419, 26236 => 32421,
+    26237 => 32424, 26238 => 32425, 26401 => 32429, 26402 => 32432, 26403 => 32446,
+    26404 => 32448, 26405 => 32449, 26406 => 32450, 26407 => 32457, 26408 => 32459,
+    26409 => 32460, 26410 => 32464, 26411 => 32468, 26412 => 32471, 26413 => 32475,
+    26414 => 32480, 26415 => 32481, 26416 => 32488, 26417 => 32491, 26418 => 32494,
+    26419 => 32495, 26420 => 32497, 26421 => 32498, 26422 => 32525, 26423 => 32502,
+    26424 => 32506, 26425 => 32507, 26426 => 32510, 26427 => 32513, 26428 => 32514,
+    26429 => 32515, 26430 => 32519, 26431 => 32520, 26432 => 32523, 26433 => 32524,
+    26434 => 32527, 26435 => 32529, 26436 => 32530, 26437 => 32535, 26438 => 32537,
+    26439 => 32540, 26440 => 32539, 26441 => 32543, 26442 => 32545, 26443 => 32546,
+    26444 => 32547, 26445 => 32548, 26446 => 32549, 26447 => 32550, 26448 => 32551,
+    26449 => 32554, 26450 => 32555, 26451 => 32556, 26452 => 32557, 26453 => 32559,
+    26454 => 32560, 26455 => 32561, 26456 => 32562, 26457 => 32563, 26458 => 32565,
+    26459 => 24186, 26460 => 30079, 26461 => 24027, 26462 => 30014, 26463 => 37013,
+    26464 => 29582, 26465 => 29585, 26466 => 29614, 26467 => 29602, 26468 => 29599,
+    26469 => 29647, 26470 => 29634, 26471 => 29649, 26472 => 29623, 26473 => 29619,
+    26474 => 29632, 26475 => 29641, 26476 => 29640, 26477 => 29669, 26478 => 29657,
+    26479 => 39036, 26480 => 29706, 26481 => 29673, 26482 => 29671, 26483 => 29662,
+    26484 => 29626, 26485 => 29682, 26486 => 29711, 26487 => 29738, 26488 => 29787,
+    26489 => 29734, 26490 => 29733, 26491 => 29736, 26492 => 29744, 26493 => 29742,
+    26494 => 29740, 26657 => 29723, 26658 => 29722, 26659 => 29761, 26660 => 29788,
+    26661 => 29783, 26662 => 29781, 26663 => 29785, 26664 => 29815, 26665 => 29805,
+    26666 => 29822, 26667 => 29852, 26668 => 29838, 26669 => 29824, 26670 => 29825,
+    26671 => 29831, 26672 => 29835, 26673 => 29854, 26674 => 29864, 26675 => 29865,
+    26676 => 29840, 26677 => 29863, 26678 => 29906, 26679 => 29882, 26680 => 38890,
+    26681 => 38891, 26682 => 38892, 26683 => 26444, 26684 => 26451, 26685 => 26462,
+    26686 => 26440, 26687 => 26473, 26688 => 26533, 26689 => 26503, 26690 => 26474,
+    26691 => 26483, 26692 => 26520, 26693 => 26535, 26694 => 26485, 26695 => 26536,
+    26696 => 26526, 26697 => 26541, 26698 => 26507, 26699 => 26487, 26700 => 26492,
+    26701 => 26608, 26702 => 26633, 26703 => 26584, 26704 => 26634, 26705 => 26601,
+    26706 => 26544, 26707 => 26636, 26708 => 26585, 26709 => 26549, 26710 => 26586,
+    26711 => 26547, 26712 => 26589, 26713 => 26624, 26714 => 26563, 26715 => 26552,
+    26716 => 26594, 26717 => 26638, 26718 => 26561, 26719 => 26621, 26720 => 26674,
+    26721 => 26675, 26722 => 26720, 26723 => 26721, 26724 => 26702, 26725 => 26722,
+    26726 => 26692, 26727 => 26724, 26728 => 26755, 26729 => 26653, 26730 => 26709,
+    26731 => 26726, 26732 => 26689, 26733 => 26727, 26734 => 26688, 26735 => 26686,
+    26736 => 26698, 26737 => 26697, 26738 => 26665, 26739 => 26805, 26740 => 26767,
+    26741 => 26740, 26742 => 26743, 26743 => 26771, 26744 => 26731, 26745 => 26818,
+    26746 => 26990, 26747 => 26876, 26748 => 26911, 26749 => 26912, 26750 => 26873,
+    26913 => 26916, 26914 => 26864, 26915 => 26891, 26916 => 26881, 26917 => 26967,
+    26918 => 26851, 26919 => 26896, 26920 => 26993, 26921 => 26937, 26922 => 26976,
+    26923 => 26946, 26924 => 26973, 26925 => 27012, 26926 => 26987, 26927 => 27008,
+    26928 => 27032, 26929 => 27000, 26930 => 26932, 26931 => 27084, 26932 => 27015,
+    26933 => 27016, 26934 => 27086, 26935 => 27017, 26936 => 26982, 26937 => 26979,
+    26938 => 27001, 26939 => 27035, 26940 => 27047, 26941 => 27067, 26942 => 27051,
+    26943 => 27053, 26944 => 27092, 26945 => 27057, 26946 => 27073, 26947 => 27082,
+    26948 => 27103, 26949 => 27029, 26950 => 27104, 26951 => 27021, 26952 => 27135,
+    26953 => 27183, 26954 => 27117, 26955 => 27159, 26956 => 27160, 26957 => 27237,
+    26958 => 27122, 26959 => 27204, 26960 => 27198, 26961 => 27296, 26962 => 27216,
+    26963 => 27227, 26964 => 27189, 26965 => 27278, 26966 => 27257, 26967 => 27197,
+    26968 => 27176, 26969 => 27224, 26970 => 27260, 26971 => 27281, 26972 => 27280,
+    26973 => 27305, 26974 => 27287, 26975 => 27307, 26976 => 29495, 26977 => 29522,
+    26978 => 27521, 26979 => 27522, 26980 => 27527, 26981 => 27524, 26982 => 27538,
+    26983 => 27539, 26984 => 27533, 26985 => 27546, 26986 => 27547, 26987 => 27553,
+    26988 => 27562, 26989 => 36715, 26990 => 36717, 26991 => 36721, 26992 => 36722,
+    26993 => 36723, 26994 => 36725, 26995 => 36726, 26996 => 36728, 26997 => 36727,
+    26998 => 36729, 26999 => 36730, 27000 => 36732, 27001 => 36734, 27002 => 36737,
+    27003 => 36738, 27004 => 36740, 27005 => 36743, 27006 => 36747, 27169 => 36749,
+    27170 => 36750, 27171 => 36751, 27172 => 36760, 27173 => 36762, 27174 => 36558,
+    27175 => 25099, 27176 => 25111, 27177 => 25115, 27178 => 25119, 27179 => 25122,
+    27180 => 25121, 27181 => 25125, 27182 => 25124, 27183 => 25132, 27184 => 33255,
+    27185 => 29935, 27186 => 29940, 27187 => 29951, 27188 => 29967, 27189 => 29969,
+    27190 => 29971, 27191 => 25908, 27192 => 26094, 27193 => 26095, 27194 => 26096,
+    27195 => 26122, 27196 => 26137, 27197 => 26482, 27198 => 26115, 27199 => 26133,
+    27200 => 26112, 27201 => 28805, 27202 => 26359, 27203 => 26141, 27204 => 26164,
+    27205 => 26161, 27206 => 26166, 27207 => 26165, 27208 => 32774, 27209 => 26207,
+    27210 => 26196, 27211 => 26177, 27212 => 26191, 27213 => 26198, 27214 => 26209,
+    27215 => 26199, 27216 => 26231, 27217 => 26244, 27218 => 26252, 27219 => 26279,
+    27220 => 26269, 27221 => 26302, 27222 => 26331, 27223 => 26332, 27224 => 26342,
+    27225 => 26345, 27226 => 36146, 27227 => 36147, 27228 => 36150, 27229 => 36155,
+    27230 => 36157, 27231 => 36160, 27232 => 36165, 27233 => 36166, 27234 => 36168,
+    27235 => 36169, 27236 => 36167, 27237 => 36173, 27238 => 36181, 27239 => 36185,
+    27240 => 35271, 27241 => 35274, 27242 => 35275, 27243 => 35276, 27244 => 35278,
+    27245 => 35279, 27246 => 35280, 27247 => 35281, 27248 => 29294, 27249 => 29343,
+    27250 => 29277, 27251 => 29286, 27252 => 29295, 27253 => 29310, 27254 => 29311,
+    27255 => 29316, 27256 => 29323, 27257 => 29325, 27258 => 29327, 27259 => 29330,
+    27260 => 25352, 27261 => 25394, 27262 => 25520, 27425 => 25663, 27426 => 25816,
+    27427 => 32772, 27428 => 27626, 27429 => 27635, 27430 => 27645, 27431 => 27637,
+    27432 => 27641, 27433 => 27653, 27434 => 27655, 27435 => 27654, 27436 => 27661,
+    27437 => 27669, 27438 => 27672, 27439 => 27673, 27440 => 27674, 27441 => 27681,
+    27442 => 27689, 27443 => 27684, 27444 => 27690, 27445 => 27698, 27446 => 25909,
+    27447 => 25941, 27448 => 25963, 27449 => 29261, 27450 => 29266, 27451 => 29270,
+    27452 => 29232, 27453 => 34402, 27454 => 21014, 27455 => 32927, 27456 => 32924,
+    27457 => 32915, 27458 => 32956, 27459 => 26378, 27460 => 32957, 27461 => 32945,
+    27462 => 32939, 27463 => 32941, 27464 => 32948, 27465 => 32951, 27466 => 32999,
+    27467 => 33000, 27468 => 33001, 27469 => 33002, 27470 => 32987, 27471 => 32962,
+    27472 => 32964, 27473 => 32985, 27474 => 32973, 27475 => 32983, 27476 => 26384,
+    27477 => 32989, 27478 => 33003, 27479 => 33009, 27480 => 33012, 27481 => 33005,
+    27482 => 33037, 27483 => 33038, 27484 => 33010, 27485 => 33020, 27486 => 26389,
+    27487 => 33042, 27488 => 35930, 27489 => 33078, 27490 => 33054, 27491 => 33068,
+    27492 => 33048, 27493 => 33074, 27494 => 33096, 27495 => 33100, 27496 => 33107,
+    27497 => 33140, 27498 => 33113, 27499 => 33114, 27500 => 33137, 27501 => 33120,
+    27502 => 33129, 27503 => 33148, 27504 => 33149, 27505 => 33133, 27506 => 33127,
+    27507 => 22605, 27508 => 23221, 27509 => 33160, 27510 => 33154, 27511 => 33169,
+    27512 => 28373, 27513 => 33187, 27514 => 33194, 27515 => 33228, 27516 => 26406,
+    27517 => 33226, 27518 => 33211, 27681 => 33217, 27682 => 33190, 27683 => 27428,
+    27684 => 27447, 27685 => 27449, 27686 => 27459, 27687 => 27462, 27688 => 27481,
+    27689 => 39121, 27690 => 39122, 27691 => 39123, 27692 => 39125, 27693 => 39129,
+    27694 => 39130, 27695 => 27571, 27696 => 24384, 27697 => 27586, 27698 => 35315,
+    27699 => 26000, 27700 => 40785, 27701 => 26003, 27702 => 26044, 27703 => 26054,
+    27704 => 26052, 27705 => 26051, 27706 => 26060, 27707 => 26062, 27708 => 26066,
+    27709 => 26070, 27710 => 28800, 27711 => 28828, 27712 => 28822, 27713 => 28829,
+    27714 => 28859, 27715 => 28864, 27716 => 28855, 27717 => 28843, 27718 => 28849,
+    27719 => 28904, 27720 => 28874, 27721 => 28944, 27722 => 28947, 27723 => 28950,
+    27724 => 28975, 27725 => 28977, 27726 => 29043, 27727 => 29020, 27728 => 29032,
+    27729 => 28997, 27730 => 29042, 27731 => 29002, 27732 => 29048, 27733 => 29050,
+    27734 => 29080, 27735 => 29107, 27736 => 29109, 27737 => 29096, 27738 => 29088,
+    27739 => 29152, 27740 => 29140, 27741 => 29159, 27742 => 29177, 27743 => 29213,
+    27744 => 29224, 27745 => 28780, 27746 => 28952, 27747 => 29030, 27748 => 29113,
+    27749 => 25150, 27750 => 25149, 27751 => 25155, 27752 => 25160, 27753 => 25161,
+    27754 => 31035, 27755 => 31040, 27756 => 31046, 27757 => 31049, 27758 => 31067,
+    27759 => 31068, 27760 => 31059, 27761 => 31066, 27762 => 31074, 27763 => 31063,
+    27764 => 31072, 27765 => 31087, 27766 => 31079, 27767 => 31098, 27768 => 31109,
+    27769 => 31114, 27770 => 31130, 27771 => 31143, 27772 => 31155, 27773 => 24529,
+    27774 => 24528, 27937 => 24636, 27938 => 24669, 27939 => 24666, 27940 => 24679,
+    27941 => 24641, 27942 => 24665, 27943 => 24675, 27944 => 24747, 27945 => 24838,
+    27946 => 24845, 27947 => 24925, 27948 => 25001, 27949 => 24989, 27950 => 25035,
+    27951 => 25041, 27952 => 25094, 27953 => 32896, 27954 => 32895, 27955 => 27795,
+    27956 => 27894, 27957 => 28156, 27958 => 30710, 27959 => 30712, 27960 => 30720,
+    27961 => 30729, 27962 => 30743, 27963 => 30744, 27964 => 30737, 27965 => 26027,
+    27966 => 30765, 27967 => 30748, 27968 => 30749, 27969 => 30777, 27970 => 30778,
+    27971 => 30779, 27972 => 30751, 27973 => 30780, 27974 => 30757, 27975 => 30764,
+    27976 => 30755, 27977 => 30761, 27978 => 30798, 27979 => 30829, 27980 => 30806,
+    27981 => 30807, 27982 => 30758, 27983 => 30800, 27984 => 30791, 27985 => 30796,
+    27986 => 30826, 27987 => 30875, 27988 => 30867, 27989 => 30874, 27990 => 30855,
+    27991 => 30876, 27992 => 30881, 27993 => 30883, 27994 => 30898, 27995 => 30905,
+    27996 => 30885, 27997 => 30932, 27998 => 30937, 27999 => 30921, 28000 => 30956,
+    28001 => 30962, 28002 => 30981, 28003 => 30964, 28004 => 30995, 28005 => 31012,
+    28006 => 31006, 28007 => 31028, 28008 => 40859, 28009 => 40697, 28010 => 40699,
+    28011 => 40700, 28012 => 30449, 28013 => 30468, 28014 => 30477, 28015 => 30457,
+    28016 => 30471, 28017 => 30472, 28018 => 30490, 28019 => 30498, 28020 => 30489,
+    28021 => 30509, 28022 => 30502, 28023 => 30517, 28024 => 30520, 28025 => 30544,
+    28026 => 30545, 28027 => 30535, 28028 => 30531, 28029 => 30554, 28030 => 30568,
+    28193 => 30562, 28194 => 30565, 28195 => 30591, 28196 => 30605, 28197 => 30589,
+    28198 => 30592, 28199 => 30604, 28200 => 30609, 28201 => 30623, 28202 => 30624,
+    28203 => 30640, 28204 => 30645, 28205 => 30653, 28206 => 30010, 28207 => 30016,
+    28208 => 30030, 28209 => 30027, 28210 => 30024, 28211 => 30043, 28212 => 30066,
+    28213 => 30073, 28214 => 30083, 28215 => 32600, 28216 => 32609, 28217 => 32607,
+    28218 => 35400, 28219 => 32616, 28220 => 32628, 28221 => 32625, 28222 => 32633,
+    28223 => 32641, 28224 => 32638, 28225 => 30413, 28226 => 30437, 28227 => 34866,
+    28228 => 38021, 28229 => 38022, 28230 => 38023, 28231 => 38027, 28232 => 38026,
+    28233 => 38028, 28234 => 38029, 28235 => 38031, 28236 => 38032, 28237 => 38036,
+    28238 => 38039, 28239 => 38037, 28240 => 38042, 28241 => 38043, 28242 => 38044,
+    28243 => 38051, 28244 => 38052, 28245 => 38059, 28246 => 38058, 28247 => 38061,
+    28248 => 38060, 28249 => 38063, 28250 => 38064, 28251 => 38066, 28252 => 38068,
+    28253 => 38070, 28254 => 38071, 28255 => 38072, 28256 => 38073, 28257 => 38074,
+    28258 => 38076, 28259 => 38077, 28260 => 38079, 28261 => 38084, 28262 => 38088,
+    28263 => 38089, 28264 => 38090, 28265 => 38091, 28266 => 38092, 28267 => 38093,
+    28268 => 38094, 28269 => 38096, 28270 => 38097, 28271 => 38098, 28272 => 38101,
+    28273 => 38102, 28274 => 38103, 28275 => 38105, 28276 => 38104, 28277 => 38107,
+    28278 => 38110, 28279 => 38111, 28280 => 38112, 28281 => 38114, 28282 => 38116,
+    28283 => 38117, 28284 => 38119, 28285 => 38120, 28286 => 38122, 28449 => 38121,
+    28450 => 38123, 28451 => 38126, 28452 => 38127, 28453 => 38131, 28454 => 38132,
+    28455 => 38133, 28456 => 38135, 28457 => 38137, 28458 => 38140, 28459 => 38141,
+    28460 => 38143, 28461 => 38147, 28462 => 38146, 28463 => 38150, 28464 => 38151,
+    28465 => 38153, 28466 => 38154, 28467 => 38157, 28468 => 38158, 28469 => 38159,
+    28470 => 38162, 28471 => 38163, 28472 => 38164, 28473 => 38165, 28474 => 38166,
+    28475 => 38168, 28476 => 38171, 28477 => 38173, 28478 => 38174, 28479 => 38175,
+    28480 => 38178, 28481 => 38186, 28482 => 38187, 28483 => 38185, 28484 => 38188,
+    28485 => 38193, 28486 => 38194, 28487 => 38196, 28488 => 38198, 28489 => 38199,
+    28490 => 38200, 28491 => 38204, 28492 => 38206, 28493 => 38207, 28494 => 38210,
+    28495 => 38197, 28496 => 38212, 28497 => 38213, 28498 => 38214, 28499 => 38217,
+    28500 => 38220, 28501 => 38222, 28502 => 38223, 28503 => 38226, 28504 => 38227,
+    28505 => 38228, 28506 => 38230, 28507 => 38231, 28508 => 38232, 28509 => 38233,
+    28510 => 38235, 28511 => 38238, 28512 => 38239, 28513 => 38237, 28514 => 38241,
+    28515 => 38242, 28516 => 38244, 28517 => 38245, 28518 => 38246, 28519 => 38247,
+    28520 => 38248, 28521 => 38249, 28522 => 38250, 28523 => 38251, 28524 => 38252,
+    28525 => 38255, 28526 => 38257, 28527 => 38258, 28528 => 38259, 28529 => 38202,
+    28530 => 30695, 28531 => 30700, 28532 => 38601, 28533 => 31189, 28534 => 31213,
+    28535 => 31203, 28536 => 31211, 28537 => 31238, 28538 => 23879, 28539 => 31235,
+    28540 => 31234, 28541 => 31262, 28542 => 31252, 28705 => 31289, 28706 => 31287,
+    28707 => 31313, 28708 => 40655, 28709 => 39333, 28710 => 31344, 28711 => 30344,
+    28712 => 30350, 28713 => 30355, 28714 => 30361, 28715 => 30372, 28716 => 29918,
+    28717 => 29920, 28718 => 29996, 28719 => 40480, 28720 => 40482, 28721 => 40488,
+    28722 => 40489, 28723 => 40490, 28724 => 40491, 28725 => 40492, 28726 => 40498,
+    28727 => 40497, 28728 => 40502, 28729 => 40504, 28730 => 40503, 28731 => 40505,
+    28732 => 40506, 28733 => 40510, 28734 => 40513, 28735 => 40514, 28736 => 40516,
+    28737 => 40518, 28738 => 40519, 28739 => 40520, 28740 => 40521, 28741 => 40523,
+    28742 => 40524, 28743 => 40526, 28744 => 40529, 28745 => 40533, 28746 => 40535,
+    28747 => 40538, 28748 => 40539, 28749 => 40540, 28750 => 40542, 28751 => 40547,
+    28752 => 40550, 28753 => 40551, 28754 => 40552, 28755 => 40553, 28756 => 40554,
+    28757 => 40555, 28758 => 40556, 28759 => 40561, 28760 => 40557, 28761 => 40563,
+    28762 => 30098, 28763 => 30100, 28764 => 30102, 28765 => 30112, 28766 => 30109,
+    28767 => 30124, 28768 => 30115, 28769 => 30131, 28770 => 30132, 28771 => 30136,
+    28772 => 30148, 28773 => 30129, 28774 => 30128, 28775 => 30147, 28776 => 30146,
+    28777 => 30166, 28778 => 30157, 28779 => 30179, 28780 => 30184, 28781 => 30182,
+    28782 => 30180, 28783 => 30187, 28784 => 30183, 28785 => 30211, 28786 => 30193,
+    28787 => 30204, 28788 => 30207, 28789 => 30224, 28790 => 30208, 28791 => 30213,
+    28792 => 30220, 28793 => 30231, 28794 => 30218, 28795 => 30245, 28796 => 30232,
+    28797 => 30229, 28798 => 30233, 28961 => 30235, 28962 => 30268, 28963 => 30242,
+    28964 => 30240, 28965 => 30272, 28966 => 30253, 28967 => 30256, 28968 => 30271,
+    28969 => 30261, 28970 => 30275, 28971 => 30270, 28972 => 30259, 28973 => 30285,
+    28974 => 30302, 28975 => 30292, 28976 => 30300, 28977 => 30294, 28978 => 30315,
+    28979 => 30319, 28980 => 32714, 28981 => 31462, 28982 => 31352, 28983 => 31353,
+    28984 => 31360, 28985 => 31366, 28986 => 31368, 28987 => 31381, 28988 => 31398,
+    28989 => 31392, 28990 => 31404, 28991 => 31400, 28992 => 31405, 28993 => 31411,
+    28994 => 34916, 28995 => 34921, 28996 => 34930, 28997 => 34941, 28998 => 34943,
+    28999 => 34946, 29000 => 34978, 29001 => 35014, 29002 => 34999, 29003 => 35004,
+    29004 => 35017, 29005 => 35042, 29006 => 35022, 29007 => 35043, 29008 => 35045,
+    29009 => 35057, 29010 => 35098, 29011 => 35068, 29012 => 35048, 29013 => 35070,
+    29014 => 35056, 29015 => 35105, 29016 => 35097, 29017 => 35091, 29018 => 35099,
+    29019 => 35082, 29020 => 35124, 29021 => 35115, 29022 => 35126, 29023 => 35137,
+    29024 => 35174, 29025 => 35195, 29026 => 30091, 29027 => 32997, 29028 => 30386,
+    29029 => 30388, 29030 => 30684, 29031 => 32786, 29032 => 32788, 29033 => 32790,
+    29034 => 32796, 29035 => 32800, 29036 => 32802, 29037 => 32805, 29038 => 32806,
+    29039 => 32807, 29040 => 32809, 29041 => 32808, 29042 => 32817, 29043 => 32779,
+    29044 => 32821, 29045 => 32835, 29046 => 32838, 29047 => 32845, 29048 => 32850,
+    29049 => 32873, 29050 => 32881, 29051 => 35203, 29052 => 39032, 29053 => 39040,
+    29054 => 39043, 29217 => 39049, 29218 => 39052, 29219 => 39053, 29220 => 39055,
+    29221 => 39060, 29222 => 39066, 29223 => 39067, 29224 => 39070, 29225 => 39071,
+    29226 => 39073, 29227 => 39074, 29228 => 39077, 29229 => 39078, 29230 => 34381,
+    29231 => 34388, 29232 => 34412, 29233 => 34414, 29234 => 34431, 29235 => 34426,
+    29236 => 34428, 29237 => 34427, 29238 => 34472, 29239 => 34445, 29240 => 34443,
+    29241 => 34476, 29242 => 34461, 29243 => 34471, 29244 => 34467, 29245 => 34474,
+    29246 => 34451, 29247 => 34473, 29248 => 34486, 29249 => 34500, 29250 => 34485,
+    29251 => 34510, 29252 => 34480, 29253 => 34490, 29254 => 34481, 29255 => 34479,
+    29256 => 34505, 29257 => 34511, 29258 => 34484, 29259 => 34537, 29260 => 34545,
+    29261 => 34546, 29262 => 34541, 29263 => 34547, 29264 => 34512, 29265 => 34579,
+    29266 => 34526, 29267 => 34548, 29268 => 34527, 29269 => 34520, 29270 => 34513,
+    29271 => 34563, 29272 => 34567, 29273 => 34552, 29274 => 34568, 29275 => 34570,
+    29276 => 34573, 29277 => 34569, 29278 => 34595, 29279 => 34619, 29280 => 34590,
+    29281 => 34597, 29282 => 34606, 29283 => 34586, 29284 => 34622, 29285 => 34632,
+    29286 => 34612, 29287 => 34609, 29288 => 34601, 29289 => 34615, 29290 => 34623,
+    29291 => 34690, 29292 => 34594, 29293 => 34685, 29294 => 34686, 29295 => 34683,
+    29296 => 34656, 29297 => 34672, 29298 => 34636, 29299 => 34670, 29300 => 34699,
+    29301 => 34643, 29302 => 34659, 29303 => 34684, 29304 => 34660, 29305 => 34649,
+    29306 => 34661, 29307 => 34707, 29308 => 34735, 29309 => 34728, 29310 => 34770,
+    29473 => 34758, 29474 => 34696, 29475 => 34693, 29476 => 34733, 29477 => 34711,
+    29478 => 34691, 29479 => 34731, 29480 => 34789, 29481 => 34732, 29482 => 34741,
+    29483 => 34739, 29484 => 34763, 29485 => 34771, 29486 => 34749, 29487 => 34769,
+    29488 => 34752, 29489 => 34762, 29490 => 34779, 29491 => 34794, 29492 => 34784,
+    29493 => 34798, 29494 => 34838, 29495 => 34835, 29496 => 34814, 29497 => 34826,
+    29498 => 34843, 29499 => 34849, 29500 => 34873, 29501 => 34876, 29502 => 32566,
+    29503 => 32578, 29504 => 32580, 29505 => 32581, 29506 => 33296, 29507 => 31482,
+    29508 => 31485, 29509 => 31496, 29510 => 31491, 29511 => 31492, 29512 => 31509,
+    29513 => 31498, 29514 => 31531, 29515 => 31503, 29516 => 31559, 29517 => 31544,
+    29518 => 31530, 29519 => 31513, 29520 => 31534, 29521 => 31537, 29522 => 31520,
+    29523 => 31525, 29524 => 31524, 29525 => 31539, 29526 => 31550, 29527 => 31518,
+    29528 => 31576, 29529 => 31578, 29530 => 31557, 29531 => 31605, 29532 => 31564,
+    29533 => 31581, 29534 => 31584, 29535 => 31598, 29536 => 31611, 29537 => 31586,
+    29538 => 31602, 29539 => 31601, 29540 => 31632, 29541 => 31654, 29542 => 31655,
+    29543 => 31672, 29544 => 31660, 29545 => 31645, 29546 => 31656, 29547 => 31621,
+    29548 => 31658, 29549 => 31644, 29550 => 31650, 29551 => 31659, 29552 => 31668,
+    29553 => 31697, 29554 => 31681, 29555 => 31692, 29556 => 31709, 29557 => 31706,
+    29558 => 31717, 29559 => 31718, 29560 => 31722, 29561 => 31756, 29562 => 31742,
+    29563 => 31740, 29564 => 31759, 29565 => 31766, 29566 => 31755, 29729 => 31775,
+    29730 => 31786, 29731 => 31782, 29732 => 31800, 29733 => 31809, 29734 => 31808,
+    29735 => 33278, 29736 => 33281, 29737 => 33282, 29738 => 33284, 29739 => 33260,
+    29740 => 34884, 29741 => 33313, 29742 => 33314, 29743 => 33315, 29744 => 33325,
+    29745 => 33327, 29746 => 33320, 29747 => 33323, 29748 => 33336, 29749 => 33339,
+    29750 => 33331, 29751 => 33332, 29752 => 33342, 29753 => 33348, 29754 => 33353,
+    29755 => 33355, 29756 => 33359, 29757 => 33370, 29758 => 33375, 29759 => 33384,
+    29760 => 34942, 29761 => 34949, 29762 => 34952, 29763 => 35032, 29764 => 35039,
+    29765 => 35166, 29766 => 32669, 29767 => 32671, 29768 => 32679, 29769 => 32687,
+    29770 => 32688, 29771 => 32690, 29772 => 31868, 29773 => 25929, 29774 => 31889,
+    29775 => 31901, 29776 => 31900, 29777 => 31902, 29778 => 31906, 29779 => 31922,
+    29780 => 31932, 29781 => 31933, 29782 => 31937, 29783 => 31943, 29784 => 31948,
+    29785 => 31949, 29786 => 31944, 29787 => 31941, 29788 => 31959, 29789 => 31976,
+    29790 => 33390, 29791 => 26280, 29792 => 32703, 29793 => 32718, 29794 => 32725,
+    29795 => 32741, 29796 => 32737, 29797 => 32742, 29798 => 32745, 29799 => 32750,
+    29800 => 32755, 29801 => 31992, 29802 => 32119, 29803 => 32166, 29804 => 32174,
+    29805 => 32327, 29806 => 32411, 29807 => 40632, 29808 => 40628, 29809 => 36211,
+    29810 => 36228, 29811 => 36244, 29812 => 36241, 29813 => 36273, 29814 => 36199,
+    29815 => 36205, 29816 => 35911, 29817 => 35913, 29818 => 37194, 29819 => 37200,
+    29820 => 37198, 29821 => 37199, 29822 => 37220, 29985 => 37218, 29986 => 37217,
+    29987 => 37232, 29988 => 37225, 29989 => 37231, 29990 => 37245, 29991 => 37246,
+    29992 => 37234, 29993 => 37236, 29994 => 37241, 29995 => 37260, 29996 => 37253,
+    29997 => 37264, 29998 => 37261, 29999 => 37265, 30000 => 37282, 30001 => 37283,
+    30002 => 37290, 30003 => 37293, 30004 => 37294, 30005 => 37295, 30006 => 37301,
+    30007 => 37300, 30008 => 37306, 30009 => 35925, 30010 => 40574, 30011 => 36280,
+    30012 => 36331, 30013 => 36357, 30014 => 36441, 30015 => 36457, 30016 => 36277,
+    30017 => 36287, 30018 => 36284, 30019 => 36282, 30020 => 36292, 30021 => 36310,
+    30022 => 36311, 30023 => 36314, 30024 => 36318, 30025 => 36302, 30026 => 36303,
+    30027 => 36315, 30028 => 36294, 30029 => 36332, 30030 => 36343, 30031 => 36344,
+    30032 => 36323, 30033 => 36345, 30034 => 36347, 30035 => 36324, 30036 => 36361,
+    30037 => 36349, 30038 => 36372, 30039 => 36381, 30040 => 36383, 30041 => 36396,
+    30042 => 36398, 30043 => 36387, 30044 => 36399, 30045 => 36410, 30046 => 36416,
+    30047 => 36409, 30048 => 36405, 30049 => 36413, 30050 => 36401, 30051 => 36425,
+    30052 => 36417, 30053 => 36418, 30054 => 36433, 30055 => 36434, 30056 => 36426,
+    30057 => 36464, 30058 => 36470, 30059 => 36476, 30060 => 36463, 30061 => 36468,
+    30062 => 36485, 30063 => 36495, 30064 => 36500, 30065 => 36496, 30066 => 36508,
+    30067 => 36510, 30068 => 35960, 30069 => 35970, 30070 => 35978, 30071 => 35973,
+    30072 => 35992, 30073 => 35988, 30074 => 26011, 30075 => 35286, 30076 => 35294,
+    30077 => 35290, 30078 => 35292, 30241 => 35301, 30242 => 35307, 30243 => 35311,
+    30244 => 35390, 30245 => 35622, 30246 => 38739, 30247 => 38633, 30248 => 38643,
+    30249 => 38639, 30250 => 38662, 30251 => 38657, 30252 => 38664, 30253 => 38671,
+    30254 => 38670, 30255 => 38698, 30256 => 38701, 30257 => 38704, 30258 => 38718,
+    30259 => 40832, 30260 => 40835, 30261 => 40837, 30262 => 40838, 30263 => 40839,
+    30264 => 40840, 30265 => 40841, 30266 => 40842, 30267 => 40844, 30268 => 40702,
+    30269 => 40715, 30270 => 40717, 30271 => 38585, 30272 => 38588, 30273 => 38589,
+    30274 => 38606, 30275 => 38610, 30276 => 30655, 30277 => 38624, 30278 => 37518,
+    30279 => 37550, 30280 => 37576, 30281 => 37694, 30282 => 37738, 30283 => 37834,
+    30284 => 37775, 30285 => 37950, 30286 => 37995, 30287 => 40063, 30288 => 40066,
+    30289 => 40069, 30290 => 40070, 30291 => 40071, 30292 => 40072, 30293 => 31267,
+    30294 => 40075, 30295 => 40078, 30296 => 40080, 30297 => 40081, 30298 => 40082,
+    30299 => 40084, 30300 => 40085, 30301 => 40090, 30302 => 40091, 30303 => 40094,
+    30304 => 40095, 30305 => 40096, 30306 => 40097, 30307 => 40098, 30308 => 40099,
+    30309 => 40101, 30310 => 40102, 30311 => 40103, 30312 => 40104, 30313 => 40105,
+    30314 => 40107, 30315 => 40109, 30316 => 40110, 30317 => 40112, 30318 => 40113,
+    30319 => 40114, 30320 => 40115, 30321 => 40116, 30322 => 40117, 30323 => 40118,
+    30324 => 40119, 30325 => 40122, 30326 => 40123, 30327 => 40124, 30328 => 40125,
+    30329 => 40132, 30330 => 40133, 30331 => 40134, 30332 => 40135, 30333 => 40138,
+    30334 => 40139, 30497 => 40140, 30498 => 40141, 30499 => 40142, 30500 => 40143,
+    30501 => 40144, 30502 => 40147, 30503 => 40148, 30504 => 40149, 30505 => 40151,
+    30506 => 40152, 30507 => 40153, 30508 => 40156, 30509 => 40157, 30510 => 40159,
+    30511 => 40162, 30512 => 38780, 30513 => 38789, 30514 => 38801, 30515 => 38802,
+    30516 => 38804, 30517 => 38831, 30518 => 38827, 30519 => 38819, 30520 => 38834,
+    30521 => 38836, 30522 => 39601, 30523 => 39600, 30524 => 39607, 30525 => 40536,
+    30526 => 39606, 30527 => 39610, 30528 => 39612, 30529 => 39617, 30530 => 39616,
+    30531 => 39621, 30532 => 39618, 30533 => 39627, 30534 => 39628, 30535 => 39633,
+    30536 => 39749, 30537 => 39747, 30538 => 39751, 30539 => 39753, 30540 => 39752,
+    30541 => 39757, 30542 => 39761, 30543 => 39144, 30544 => 39181, 30545 => 39214,
+    30546 => 39253, 30547 => 39252, 30548 => 39647, 30549 => 39649, 30550 => 39654,
+    30551 => 39663, 30552 => 39659, 30553 => 39675, 30554 => 39661, 30555 => 39673,
+    30556 => 39688, 30557 => 39695, 30558 => 39699, 30559 => 39711, 30560 => 39715,
+    30561 => 40637, 30562 => 40638, 30563 => 32315, 30564 => 40578, 30565 => 40583,
+    30566 => 40584, 30567 => 40587, 30568 => 40594, 30569 => 37846, 30570 => 40605,
+    30571 => 40607, 30572 => 40667, 30573 => 40668, 30574 => 40669, 30575 => 40672,
+    30576 => 40671, 30577 => 40674, 30578 => 40681, 30579 => 40679, 30580 => 40677,
+    30581 => 40682, 30582 => 40687, 30583 => 40738, 30584 => 40748, 30585 => 40751,
+    30586 => 40761, 30587 => 40759, 30588 => 40765, 30589 => 40766, 30590 => 40772,
+    0 => 0 );
 
-    public function gb2utf8($gb)
-    {
-    if( !trim($gb) ) return $gb;
-    $utf8='';
-    while ($gb) {
-        if ( ord(substr($gb,0,1)) > 127 ) {
-        $t=substr($gb,0,2);
-        $gb=substr($gb,2);
-        $utf8 .= $this->u2utf8($this->codetable[hexdec(bin2hex($t))-0x8080]);
-        } else {
-        $t=substr($gb,0,1);
-        $gb=substr($gb,1);
-        $utf8 .= $this->u2utf8($t);
+    function gb2utf8($gb) {
+        if( !trim($gb) ) return $gb;
+        $utf8='';
+        while($gb) {
+            if( ord(substr($gb,0,1)) > 127 ) {
+                $t=substr($gb,0,2);
+                $gb=substr($gb,2);
+                $utf8 .= $this->u2utf8($this->codetable[hexdec(bin2hex($t))-0x8080]);
+            }
+            else {
+                $t=substr($gb,0,1);
+                $gb=substr($gb,1);
+                $utf8 .= $this->u2utf8($t);
+            }
         }
+        return $utf8;
     }
 
-    return $utf8;
-    }
-
-    public function u2utf8($c)
-    {
-    $str='';
-    if ($c < 0x80) {
-        $str.=$c;
-        } elseif ($c < 0x800) {
-        $str.=chr(0xC0 | $c>>6);
-        $str.=chr(0x80 | $c & 0x3F);
-        } elseif ($c < 0x10000) {
-        $str.=chr(0xE0 | $c>>12);
-        $str.=chr(0x80 | $c>>6 & 0x3F);
-        $str.=chr(0x80 | $c & 0x3F);
-    } elseif ($c < 0x200000) {
-        $str.=chr(0xF0 | $c>>18);
-        $str.=chr(0x80 | $c>>12 & 0x3F);
-        $str.=chr(0x80 | $c>>6 & 0x3F);
-        $str.=chr(0x80 | $c & 0x3F);
-    }
-
-    return $str;
+    function u2utf8($c) {
+        $str='';
+        if ($c < 0x80) {
+            $str.=$c;
+        }
+        else if ($c < 0x800) {
+            $str.=chr(0xC0 | $c>>6);
+            $str.=chr(0x80 | $c & 0x3F);
+        }
+        else if ($c < 0x10000) {
+            $str.=chr(0xE0 | $c>>12);
+            $str.=chr(0x80 | $c>>6 & 0x3F);
+            $str.=chr(0x80 | $c & 0x3F);
+        }
+        else if ($c < 0x200000) {
+            $str.=chr(0xF0 | $c>>18);
+            $str.=chr(0x80 | $c>>12 & 0x3F);
+            $str.=chr(0x80 | $c>>6 & 0x3F);
+            $str.=chr(0x80 | $c & 0x3F);
+        }
+        return $str;
     }
 
 } // END Class
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_gradient.php b/common/lib/jpgraph_lib/jpgraph_gradient.php
old mode 100644
new mode 100755
index 6dbed505a..225cf60ce
--- a/common/lib/jpgraph_lib/jpgraph_gradient.php
+++ b/common/lib/jpgraph_lib/jpgraph_gradient.php
@@ -1,281 +1,330 @@
 <?php
 /*=======================================================================
-// File:	JPGRAPH_GRADIENT.PHP
-// Description:	Create a color gradient
-// Created: 	2003-02-01
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_gradient.php,v 1.1.2.11 2004/06/12 14:29:18 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2003 Johan Persson
-//========================================================================
-*/
+ // File:        JPGRAPH_GRADIENT.PHP
+ // Description: Create a color gradient
+ // Created:     2003-02-01
+ // Ver:         $Id: jpgraph_gradient.php 1761 2009-08-01 08:31:28Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
 
 // Styles for gradient color fill
-DEFINE("GRAD_VER",1);
-DEFINE("GRAD_VERT",1);
-DEFINE("GRAD_HOR",2);
-DEFINE("GRAD_MIDHOR",3);
-DEFINE("GRAD_MIDVER",4);
-DEFINE("GRAD_CENTER",5);
-DEFINE("GRAD_WIDE_MIDVER",6);
-DEFINE("GRAD_WIDE_MIDHOR",7);
-DEFINE("GRAD_LEFT_REFLECTION",8);
-DEFINE("GRAD_RIGHT_REFLECTION",9);
-DEFINE("GRAD_RAISED_PANEL",10);
+define("GRAD_VER",1);
+define("GRAD_VERT",1);
+define("GRAD_HOR",2);
+define("GRAD_MIDHOR",3);
+define("GRAD_MIDVER",4);
+define("GRAD_CENTER",5);
+define("GRAD_WIDE_MIDVER",6);
+define("GRAD_WIDE_MIDHOR",7);
+define("GRAD_LEFT_REFLECTION",8);
+define("GRAD_RIGHT_REFLECTION",9);
+define("GRAD_RAISED_PANEL",10);
+define("GRAD_DIAGONAL",11);
 
 //===================================================
 // CLASS Gradient
 // Description: Handles gradient fills. This is to be
 // considered a "friend" class of Class Image.
 //===================================================
-class gradient
-{
-    public $img=null;
-    public $numcolors=100;
-//---------------
-// CONSTRUCTOR
-    public function Gradient(&$img)
-    {
-    $this->img = $img;
+class Gradient {
+    private $img=null, $numcolors=100;
+    //---------------
+    // CONSTRUCTOR
+    function __construct(&$img) {
+        $this->img = $img;
     }
 
-    public function SetNumColors($aNum)
-    {
-    $this->numcolors=$aNum;
+
+    function SetNumColors($aNum) {
+        $this->numcolors=$aNum;
     }
-//---------------
-// PUBLIC METHODS
+    //---------------
+    // PUBLIC METHODS
     // Produce a gradient filled rectangle with a smooth transition between
     // two colors.
-    // ($xl,$yt) 	Top left corner
-    // ($xr,$yb)	Bottom right
-    // $from_color	Starting color in gradient
-    // $to_color	End color in the gradient
-    // $style		Which way is the gradient oriented?
-    public function FilledRectangle($xl,$yt,$xr,$yb,$from_color,$to_color,$style=1)
-    {
-    switch ($style) {
-        case GRAD_VER:
-        $steps = round(abs($xr-$xl));
-        $delta = $xr>=$xl ? 1 : -1;
-        $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
-        for ($i=0, $x=$xl; $i < $steps; ++$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($x,$yt,$x,$yb);
-            $x += $delta;
-        }
-        break;
-
-        case GRAD_HOR:
-        $steps = round(abs($yb-$yt));
-        $delta = $yb>=$yt ? 1 : -1;
-        $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
-        for ($i=0,$y=$yt; $i < $steps; ++$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($xl,$y,$xr,$y);
-            $y += $delta;
-        }
-        break;
-
-        case GRAD_MIDHOR:
-        $steps = round(abs($yb-$yt)/2);
-        $delta = $yb >= $yt ? 1 : -1;
-        $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
-        for ($y=$yt, $i=0; $i < $steps;  ++$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($xl,$y,$xr,$y);
-            $y += $delta;
-        }
-        --$i;
-        if( abs($yb-$yt) % 2 == 1 ) --$steps;
-        for ($j=0; $j < $steps; ++$j, --$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($xl,$y,$xr,$y);
-            $y += $delta;
-        }
-        $this->img->Line($xl,$y,$xr,$y);
-        break;
-
-        case GRAD_MIDVER:
-        $steps = round(abs($xr-$xl)/2);
-        $delta = $xr>=$xl ? 1 : -1;
-        $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
-        for ($x=$xl, $i=0; $i < $steps; ++$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($x,$yb,$x,$yt);
-            $x += $delta;
-        }
-        --$i;
-        if( abs($xr-$xl) % 2 == 1 ) --$steps;
-        for ($j=0; $j < $steps; ++$j, --$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($x,$yb,$x,$yt);
-            $x += $delta;
-        }
-        $this->img->Line($x,$yb,$x,$yt);
-        break;
-
-        case GRAD_WIDE_MIDVER:
-        $diff = round(abs($xr-$xl));
-        $steps = floor(abs($diff)/3);
-        $firststep = $diff - 2*$steps ;
-        $delta = $xr >= $xl ? 1 : -1;
-        $this->GetColArray($from_color,$to_color,$firststep,$colors,$this->numcolors);
-        for ($x=$xl, $i=0; $i < $firststep; ++$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($x,$yb,$x,$yt);
-            $x += $delta;
-        }
-        --$i;
-        $this->img->current_color = $colors[$i];
-        for ($j=0; $j< $steps; ++$j) {
-            $this->img->Line($x,$yb,$x,$yt);
-            $x += $delta;
-        }
+    // ($xl,$yt)  Top left corner
+    // ($xr,$yb) Bottom right
+    // $from_color Starting color in gradient
+    // $to_color End color in the gradient
+    // $style  Which way is the gradient oriented?
+    function FilledRectangle($xl,$yt,$xr,$yb,$from_color,$to_color,$style=1) {
+        $this->img->SetLineWeight(1);
+        switch( $style ) {
+            case GRAD_VER:
+                $steps = ceil(abs($xr-$xl)+1);
+                $delta = $xr>=$xl ? 1 : -1;
+                $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
+                for( $i=0, $x=$xl; $i < $steps; ++$i ) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($x,$yt,$x,$yb);
+                    $x += $delta;
+                }
+                break;
 
-        for ($j=0; $j < $steps; ++$j, --$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($x,$yb,$x,$yt);
-            $x += $delta;
-        }
-        break;
-
-        case GRAD_WIDE_MIDHOR:
-        $diff = round(abs($yb-$yt));
-        $steps = floor(abs($diff)/3);
-        $firststep = $diff - 2*$steps ;
-        $delta = $yb >= $yt? 1 : -1;
-        $this->GetColArray($from_color,$to_color,$firststep,$colors,$this->numcolors);
-        for ($y=$yt, $i=0; $i < $firststep;  ++$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($xl,$y,$xr,$y);
-            $y += $delta;
-        }
-        --$i;
-        $this->img->current_color = $colors[$i];
-        for ($j=0; $j < $steps; ++$j) {
-            $this->img->Line($xl,$y,$xr,$y);
-            $y += $delta;
-        }
-        for ($j=0; $j < $steps; ++$j, --$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($xl,$y,$xr,$y);
-            $y += $delta;
-        }
-        break;
+            case GRAD_HOR:
+                $steps = ceil(abs($yb-$yt)+1);
+                $delta = $yb >= $yt ? 1 : -1;
+                $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
+                for($i=0,$y=$yt; $i < $steps; ++$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($xl,$y,$xr,$y);
+                    $y += $delta;
+                }
+                break;
 
-        case GRAD_LEFT_REFLECTION:
-        $steps1 = round(0.3*abs($xr-$xl));
-        $delta = $xr>=$xl ? 1 : -1;
+            case GRAD_MIDHOR:
+                $steps = ceil(abs($yb-$yt)/2);
+                $delta = $yb >= $yt ? 1 : -1;
+                $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
+                for($y=$yt, $i=0; $i < $steps;  ++$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($xl,$y,$xr,$y);
+                    $y += $delta;
+                }
+                --$i;
+                if( abs($yb-$yt) % 2 == 1 ) {
+                    --$steps;
+                }
+                for($j=0; $j < $steps; ++$j, --$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($xl,$y,$xr,$y);
+                    $y += $delta;
+                }
+                $this->img->Line($xl,$y,$xr,$y);
+                break;
 
-        $from_color = $this->img->rgb->Color($from_color);
-        $adj = 1.4;
-        $m = ($adj-1.0)*(255-min(255,min($from_color[0],min($from_color[1],$from_color[2]))));
-        $from_color2 = array(min(255,$from_color[0]+$m),
-                    min(255,$from_color[1]+$m), min(255,$from_color[2]+$m));
-
-        $this->GetColArray($from_color2,$to_color,$steps1,$colors,$this->numcolors);
-        $n = count($colors);
-        for ($x=$xl, $i=0; $i < $steps1 && $i < $n; ++$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($x,$yb,$x,$yt);
-            $x += $delta;
-        }
-        $steps2 = max(1,round(0.08*abs($xr-$xl)));
-        $this->img->SetColor($to_color);
-        for ($j=0; $j< $steps2; ++$j) {
-            $this->img->Line($x,$yb,$x,$yt);
-            $x += $delta;
-        }
-        $steps = abs($xr-$xl)-$steps1-$steps2;
-        $this->GetColArray($to_color,$from_color,$steps,$colors,$this->numcolors);
-        $n = count($colors);
-        for ($i=0; $i < $steps && $i < $n; ++$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($x,$yb,$x,$yt);
-            $x += $delta;
-        }
-        break;
-
-        case GRAD_RIGHT_REFLECTION:
-        $steps1 = round(0.7*abs($xr-$xl));
-        $delta = $xr>=$xl ? 1 : -1;
-
-        $this->GetColArray($from_color,$to_color,$steps1,$colors,$this->numcolors);
-        $n = count($colors);
-        for ($x=$xl, $i=0; $i < $steps1 && $i < $n; ++$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($x,$yb,$x,$yt);
-            $x += $delta;
-        }
-        $steps2 = max(1,round(0.08*abs($xr-$xl)));
-        $this->img->SetColor($to_color);
-        for ($j=0; $j< $steps2; ++$j) {
-            $this->img->Line($x,$yb,$x,$yt);
-            $x += $delta;
-        }
+            case GRAD_MIDVER:
+                $steps = ceil(abs($xr-$xl)/2);
+                $delta = $xr>=$xl ? 1 : -1;
+                $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
+                for($x=$xl, $i=0; $i < $steps; ++$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($x,$yb,$x,$yt);
+                    $x += $delta;
+                }
+                --$i;
+                if( abs($xr-$xl) % 2 == 1 ) {
+                    --$steps;
+                }
+                for($j=0; $j < $steps; ++$j, --$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($x,$yb,$x,$yt);
+                    $x += $delta;
+                }
+                $this->img->Line($x,$yb,$x,$yt);
+                break;
 
-        $from_color = $this->img->rgb->Color($from_color);
-        $adj = 1.4;
-        $m = ($adj-1.0)*(255-min(255,min($from_color[0],min($from_color[1],$from_color[2]))));
-        $from_color = array(min(255,$from_color[0]+$m),
-                    min(255,$from_color[1]+$m), min(255,$from_color[2]+$m));
-
-        $steps = abs($xr-$xl)-$steps1-$steps2;
-        $this->GetColArray($to_color,$from_color,$steps,$colors,$this->numcolors);
-        $n = count($colors);
-        for ($i=0; $i < $steps && $i < $n; ++$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($x,$yb,$x,$yt);
-            $x += $delta;
-        }
-        break;
-
-        case GRAD_CENTER:
-        $steps = ceil(min(($yb-$yt)+1,($xr-$xl)+1)/2);
-        $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
-        $dx = ($xr-$xl)/2;
-        $dy = ($yb-$yt)/2;
-        $x=$xl;$y=$yt;$x2=$xr;$y2=$yb;
-        $n = count($colors);
-        for ($x=$xl, $i=0; $x < $xl+$dx && $y < $yt+$dy && $i < $n; ++$x, ++$y, --$x2, --$y2, ++$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Rectangle($x,$y,$x2,$y2);
-        }
-        $this->img->Line($x,$y,$x2,$y2);
-        break;
-
-        case GRAD_RAISED_PANEL:
-        // right to left
-        $steps1 = $xr-$xl;
-        $delta = $xr>=$xl ? 1 : -1;
-        $this->GetColArray($to_color,$from_color,$steps1,$colors,$this->numcolors);
-        $n = count($colors);
-        for ($x=$xl, $i=0; $i < $steps1 && $i < $n; ++$i) {
-            $this->img->current_color = $colors[$i];
-            $this->img->Line($x,$yb,$x,$yt);
-            $x += $delta;
-        }
+            case GRAD_WIDE_MIDVER:
+                $diff = ceil(abs($xr-$xl));
+                $steps = floor(abs($diff)/3);
+                $firststep = $diff - 2*$steps ;
+                $delta = $xr >= $xl ? 1 : -1;
+                $this->GetColArray($from_color,$to_color,$firststep,$colors,$this->numcolors);
+                for($x=$xl, $i=0; $i < $firststep; ++$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($x,$yb,$x,$yt);
+                    $x += $delta;
+                }
+                --$i;
+                $this->img->current_color = $colors[$i];
+                for($j=0; $j< $steps; ++$j) {
+                    $this->img->Line($x,$yb,$x,$yt);
+                    $x += $delta;
+                }
 
-        // left to right
-        $xr -= 3;
-        $xl += 3;
-        $yb -= 3;
-        $yt += 3;
-        $steps2 = $xr-$xl;
-        $delta = $xr>=$xl ? 1 : -1;
-        for ($x=$xl, $j=$steps2; $j >= 0; --$j) {
-            $this->img->current_color = $colors[$j];
-            $this->img->Line($x,$yb,$x,$yt);
-            $x += $delta;
-        }
-        break;
+                for($j=0; $j < $steps; ++$j, --$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($x,$yb,$x,$yt);
+                    $x += $delta;
+                }
+                break;
 
-        default:
-        JpGraphError::Raise("Unknown gradient style (=$style).");
-        break;
-    }
+            case GRAD_WIDE_MIDHOR:
+                $diff = ceil(abs($yb-$yt));
+                $steps = floor(abs($diff)/3);
+                $firststep = $diff - 2*$steps ;
+                $delta = $yb >= $yt? 1 : -1;
+                $this->GetColArray($from_color,$to_color,$firststep,$colors,$this->numcolors);
+                for($y=$yt, $i=0; $i < $firststep;  ++$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($xl,$y,$xr,$y);
+                    $y += $delta;
+                }
+                --$i;
+                $this->img->current_color = $colors[$i];
+                for($j=0; $j < $steps; ++$j) {
+                    $this->img->Line($xl,$y,$xr,$y);
+                    $y += $delta;
+                }
+                for($j=0; $j < $steps; ++$j, --$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($xl,$y,$xr,$y);
+                    $y += $delta;
+                }
+                break;
+
+            case GRAD_LEFT_REFLECTION:
+                $steps1 = ceil(0.3*abs($xr-$xl));
+                $delta = $xr>=$xl ? 1 : -1;
+
+                $from_color = $this->img->rgb->Color($from_color);
+                $adj = 1.4;
+                $m = ($adj-1.0)*(255-min(255,min($from_color[0],min($from_color[1],$from_color[2]))));
+                $from_color2 = array(min(255,$from_color[0]+$m),
+                min(255,$from_color[1]+$m), min(255,$from_color[2]+$m));
+
+                $this->GetColArray($from_color2,$to_color,$steps1,$colors,$this->numcolors);
+                $n = count($colors);
+                for($x=$xl, $i=0; $i < $steps1 && $i < $n; ++$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($x,$yb,$x,$yt);
+                    $x += $delta;
+                }
+                $steps2 = max(1,ceil(0.08*abs($xr-$xl)));
+                $this->img->SetColor($to_color);
+                for($j=0; $j< $steps2; ++$j) {
+                    $this->img->Line($x,$yb,$x,$yt);
+                    $x += $delta;
+                }
+                $steps = abs($xr-$xl)-$steps1-$steps2;
+                $this->GetColArray($to_color,$from_color,$steps,$colors,$this->numcolors);
+                $n = count($colors);
+                for($i=0; $i < $steps && $i < $n; ++$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($x,$yb,$x,$yt);
+                    $x += $delta;
+                }
+                break;
+
+            case GRAD_RIGHT_REFLECTION:
+                $steps1 = ceil(0.7*abs($xr-$xl));
+                $delta = $xr>=$xl ? 1 : -1;
+
+                $this->GetColArray($from_color,$to_color,$steps1,$colors,$this->numcolors);
+                $n = count($colors);
+                for($x=$xl, $i=0; $i < $steps1 && $i < $n; ++$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($x,$yb,$x,$yt);
+                    $x += $delta;
+                }
+                $steps2 = max(1,ceil(0.08*abs($xr-$xl)));
+                $this->img->SetColor($to_color);
+                for($j=0; $j< $steps2; ++$j) {
+                    $this->img->Line($x,$yb,$x,$yt);
+                    $x += $delta;
+                }
+
+                $from_color = $this->img->rgb->Color($from_color);
+                $adj = 1.4;
+                $m = ($adj-1.0)*(255-min(255,min($from_color[0],min($from_color[1],$from_color[2]))));
+                $from_color = array(min(255,$from_color[0]+$m),
+                min(255,$from_color[1]+$m), min(255,$from_color[2]+$m));
+
+                $steps = abs($xr-$xl)-$steps1-$steps2;
+                $this->GetColArray($to_color,$from_color,$steps,$colors,$this->numcolors);
+                $n = count($colors);
+                for($i=0; $i < $steps && $i < $n; ++$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($x,$yb,$x,$yt);
+                    $x += $delta;
+                }
+                break;
+
+            case GRAD_CENTER:
+                $steps = ceil(min(($yb-$yt)+1,($xr-$xl)+1)/2);
+                $this->GetColArray($from_color,$to_color,$steps,$colors,$this->numcolors);
+                $dx = ($xr-$xl)/2;
+                $dy = ($yb-$yt)/2;
+                $x=$xl;$y=$yt;$x2=$xr;$y2=$yb;
+                $n = count($colors);
+                for($x=$xl, $i=0; $x < $xl+$dx && $y < $yt+$dy && $i < $n; ++$x, ++$y, --$x2, --$y2, ++$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Rectangle($x,$y,$x2,$y2);
+                }
+                $this->img->Line($x,$y,$x2,$y2);
+                break;
+
+            case GRAD_RAISED_PANEL:
+                // right to left
+                $steps1 = $xr-$xl;
+                $delta = $xr>=$xl ? 1 : -1;
+                $this->GetColArray($to_color,$from_color,$steps1,$colors,$this->numcolors);
+                $n = count($colors);
+                for($x=$xl, $i=0; $i < $steps1 && $i < $n; ++$i) {
+                    $this->img->current_color = $colors[$i];
+                    $this->img->Line($x,$yb,$x,$yt);
+                    $x += $delta;
+                }
+
+                // left to right
+                $xr -= 3;
+                $xl += 3;
+                $yb -= 3;
+                $yt += 3;
+                $steps2 = $xr-$xl;
+                $delta = $xr>=$xl ? 1 : -1;
+                for($x=$xl, $j=$steps2; $j >= 0; --$j) {
+                    $this->img->current_color = $colors[$j];
+                    $this->img->Line($x,$yb,$x,$yt);
+                    $x += $delta;
+                }
+                break;
+
+            case GRAD_DIAGONAL:
+                // use the longer dimension to determine the required number of steps.
+                // first loop draws from one corner to the mid-diagonal and the second
+                // loop draws from the mid-diagonal to the opposing corner.
+                if($xr-$xl > $yb - $yt) {
+                    // width is greater than height -> use x-dimension for steps
+                    $steps = $xr-$xl;
+                    $delta = $xr>=$xl ? 1 : -1;
+                    $this->GetColArray($from_color,$to_color,$steps*2,$colors,$this->numcolors);
+                    $n = count($colors);
+
+                    for($x=$xl, $i=0; $i < $steps && $i < $n; ++$i) {
+                        $this->img->current_color = $colors[$i];
+                        $y = $yt+($i/$steps)*($yb-$yt)*$delta;
+                        $this->img->Line($x,$yt,$xl,$y);
+                        $x += $delta;
+                    }
+
+                    for($x=$xl, $i = 0; $i < $steps && $i < $n; ++$i) {
+                        $this->img->current_color = $colors[$steps+$i];
+                        $y = $yt+($i/$steps)*($yb-$yt)*$delta;
+                        $this->img->Line($x,$yb,$xr,$y);
+                        $x += $delta;
+                    }
+                } else {
+                    // height is greater than width -> use y-dimension for steps
+                    $steps = $yb-$yt;
+                    $delta = $yb>=$yt ? 1 : -1;
+                    $this->GetColArray($from_color,$to_color,$steps*2,$colors,$this->numcolors);
+                    $n = count($colors);
+
+                    for($y=$yt, $i=0; $i < $steps && $i < $n; ++$i) {
+                        $this->img->current_color = $colors[$i];
+                        $x = $xl+($i/$steps)*($xr-$xl)*$delta;
+                        $this->img->Line($x,$yt,$xl,$y);
+                        $y += $delta;
+                    }
+
+                    for($y=$yt, $i = 0; $i < $steps && $i < $n; ++$i) {
+                        $this->img->current_color = $colors[$steps+$i];
+                        $x = $xl+($i/$steps)*($xr-$xl)*$delta;
+                        $this->img->Line($x,$yb,$xr,$y);
+                        $x += $delta;
+                    }
+
+                }
+                break;
+
+            default:
+                JpGraphError::RaiseL(7001,$style);
+                //("Unknown gradient style (=$style).");
+                break;
+        }
     }
 
     // Fill a special case of a polygon with a flat bottom
@@ -283,96 +332,103 @@ public function FilledRectangle($xl,$yt,$xr,$yb,$from_color,$to_color,$style=1)
     // Please note that this is NOT a generic gradient polygon fill
     // routine. It assumes that the bottom is flat (like a drawing
     // of a mountain)
-    public function FilledFlatPolygon($pts,$from_color,$to_color)
-    {
-    if( count($pts) == 0 ) return;
-
-    $maxy=$pts[1];
-    $miny=$pts[1];
-    $n = count($pts) ;
-    for ($i=0, $idx=0; $i < $n; $i += 2) {
-        $x = round($pts[$i]);
-        $y = round($pts[$i+1]);
-        $miny = min($miny,$y);
-        $maxy = max($maxy,$y);
-    }
+    function FilledFlatPolygon($pts,$from_color,$to_color) {
+        if( count($pts) == 0 ) return;
 
-    $colors = array();
-    $this->GetColArray($from_color,$to_color,abs($maxy-$miny)+1,$colors,$this->numcolors);
-    for ($i=$miny, $idx=0; $i <= $maxy; ++$i) {
-        $colmap[$i] = $colors[$idx++];
-    }
-
-    $n = count($pts)/2 ;
-    $idx = 0 ;
-    while ($idx < $n-1) {
-        $p1 = array(round($pts[$idx*2]),round($pts[$idx*2+1]));
-        $p2 = array(round($pts[++$idx*2]),round($pts[$idx*2+1]));
-
-        // Find the largest rectangle we can fill
-        $y = max($p1[1],$p2[1]) ;
-        for ($yy=$maxy; $yy > $y; --$yy) {
-        $this->img->current_color = $colmap[$yy];
-        $this->img->Line($p1[0],$yy,$p2[0]-1,$yy);
+        $maxy=$pts[1];
+        $miny=$pts[1];
+        $n = count($pts) ;
+        for( $i=0, $idx=0; $i < $n; $i += 2) {
+            $x = round($pts[$i]);
+            $y = round($pts[$i+1]);
+            $miny = min($miny,$y);
+            $maxy = max($maxy,$y);
         }
 
-        if( $p1[1] == $p2[1] ) continue;
-
-        // Fill the rest using lines (slow...)
-        $slope = ($p2[0]-$p1[0])/($p1[1]-$p2[1]);
-        $x1 = $p1[0];
-        $x2 = $p2[0]; //-1;
-        $start = $y;
-        if ($p1[1] > $p2[1]) {
-        while ($y >= $p2[1]) {
-            $x1=$slope*($start-$y)+$p1[0];
-            $this->img->current_color = $colmap[$y];
-            $this->img->Line($x1,$y,$x2,$y);
-            --$y;
-        }
-        } else {
-        while ($y >= $p1[1]) {
-            $x2=$p2[0]+$slope*($start-$y);
-            $this->img->current_color = $colmap[$y];
-            $this->img->Line($x1,$y,$x2,$y);
-            --$y;
+        $colors = array();
+        $this->GetColArray($from_color,$to_color,abs($maxy-$miny)+1,$colors,$this->numcolors);
+        for($i=$miny, $idx=0; $i <= $maxy; ++$i ) {
+            $colmap[$i] = $colors[$idx++];
         }
+
+        $n = count($pts)/2 ;
+        $idx = 0 ;
+        while( $idx < $n-1 ) {
+            $p1 = array(round($pts[$idx*2]),round($pts[$idx*2+1]));
+            $p2 = array(round($pts[++$idx*2]),round($pts[$idx*2+1]));
+
+            // Find the largest rectangle we can fill
+            $y = max($p1[1],$p2[1]) ;
+            for($yy=$maxy; $yy > $y; --$yy) {
+                $this->img->current_color = $colmap[$yy];
+                $this->img->Line($p1[0],$yy,$p2[0]-1,$yy);
+            }
+
+            if( $p1[1] == $p2[1] ) {
+                continue;
+            }
+
+            // Fill the rest using lines (slow...)
+            $slope = ($p2[0]-$p1[0])/($p1[1]-$p2[1]);
+            $x1 = $p1[0];
+            $x2 = $p2[0]-1;
+            $start = $y;
+            if( $p1[1] > $p2[1] ) {
+                while( $y >= $p2[1] ) {
+                    $x1=$slope*($start-$y)+$p1[0];
+                    $this->img->current_color = $colmap[$y];
+                    $this->img->Line($x1,$y,$x2,$y);
+                    --$y;
+                }
+            }
+            else {
+                while( $y >= $p1[1] ) {
+                    $x2=$p2[0]+$slope*($start-$y);
+                    $this->img->current_color = $colmap[$y];
+                    $this->img->Line($x1,$y,$x2,$y);
+                    --$y;
+                }
+            }
         }
     }
-    }
 
-//---------------
-// PRIVATE METHODS
+    //---------------
+    // PRIVATE METHODS
     // Add to the image color map the necessary colors to do the transition
     // between the two colors using $numcolors intermediate colors
-    public function GetColArray($from_color,$to_color,$arr_size,&$colors,$numcols=100)
-    {
-    if( $arr_size==0 ) return;
-    // If color is given as text get it's corresponding r,g,b values
-    $from_color = $this->img->rgb->Color($from_color);
-    $to_color = $this->img->rgb->Color($to_color);
-
-    $rdelta=($to_color[0]-$from_color[0])/$numcols;
-    $gdelta=($to_color[1]-$from_color[1])/$numcols;
-    $bdelta=($to_color[2]-$from_color[2])/$numcols;
-    $colorsperstep	= $numcols/$arr_size;
-    $prevcolnum	= -1;
-    $from_alpha = $from_color[3];
-    $to_alpha = $to_color[3];
-    $adelta = ( $to_alpha - $from_alpha ) / $numcols ;
-    for ($i=0; $i < $arr_size; ++$i) {
-        $colnum = floor($colorsperstep*$i);
-        if ( $colnum == $prevcolnum )
-        $colors[$i]	= $colidx;
-        else {
-        $r = floor($from_color[0] + $colnum*$rdelta);
-        $g = floor($from_color[1] + $colnum*$gdelta);
-        $b = floor($from_color[2] + $colnum*$bdelta);
-        $alpha = $from_alpha + $colnum*$adelta;
-        $colidx = $this->img->rgb->Allocate(sprintf("#%02x%02x%02x",$r,$g,$b),$alpha);
-        $colors[$i] = $colidx;
+    function GetColArray($from_color,$to_color,$arr_size,&$colors,$numcols=100) {
+        if( $arr_size==0 ) {
+            return;
+        }
+
+        // If color is given as text get it's corresponding r,g,b values
+        $from_color = $this->img->rgb->Color($from_color);
+        $to_color = $this->img->rgb->Color($to_color);
+
+        $rdelta=($to_color[0]-$from_color[0])/$numcols;
+        $gdelta=($to_color[1]-$from_color[1])/$numcols;
+        $bdelta=($to_color[2]-$from_color[2])/$numcols;
+        $colorsperstep = $numcols/$arr_size;
+        $prevcolnum = -1;
+        $from_alpha = $from_color[3];
+        $to_alpha = $to_color[3];
+        $adelta = ( $to_alpha - $from_alpha ) / $numcols ;
+        for ($i=0; $i < $arr_size; ++$i) {
+            $colnum = floor($colorsperstep*$i);
+            if ( $colnum == $prevcolnum ) {
+                $colors[$i] = $colidx;
+            }
+            else {
+                $r = floor($from_color[0] + $colnum*$rdelta);
+                $g = floor($from_color[1] + $colnum*$gdelta);
+                $b = floor($from_color[2] + $colnum*$bdelta);
+                $alpha = $from_alpha + $colnum*$adelta;
+                $colidx = $this->img->rgb->Allocate(sprintf("#%02x%02x%02x",$r,$g,$b),$alpha);
+                $colors[$i] = $colidx;
+            }
+            $prevcolnum = $colnum;
         }
-        $prevcolnum = $colnum;
-    }
     }
 } // Class
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_iconplot.php b/common/lib/jpgraph_lib/jpgraph_iconplot.php
old mode 100644
new mode 100755
index 02d46a801..584f80176
--- a/common/lib/jpgraph_lib/jpgraph_iconplot.php
+++ b/common/lib/jpgraph_lib/jpgraph_iconplot.php
@@ -1,154 +1,190 @@
 <?php
 //=======================================================================
-// File:	JPGRAPH_ICONPLOT.PHP
-// Description:	PHP4 Graph Plotting library. Extension module.
-// Created: 	2004-02-18
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_iconplot.php,v 1.1.2.3 2004/08/31 22:28:09 aditus Exp $
+// File:        JPGRAPH_ICONPLOT.PHP
+// Description: Extension module to add icons to plots
+// Created:     2004-02-18
+// Ver:         $Id: jpgraph_iconplot.php 1404 2009-06-28 15:25:41Z ljp $
 //
-// License:	This code is released under QPL 1.0
-// Copyright (C) 2001,2002,2003,2004 Johan Persson
+// Copyright (c) Asial Corporation. All rights reserved.
 //========================================================================
 
+
 //===================================================
 // CLASS IconPlot
 // Description: Make it possible to add a (small) image
 // to the graph
 //===================================================
-class iconplot
-{
-    public $iHorAnchor='left',$iVertAnchor='top';
-    public $iX=0,$iY=0;
-    public $iFile='';
-    public $iScale=1.0,$iMix=100;
-    public $iAnchors = array('left','right','top','bottom','center');
-    public $iCountryFlag='',$iCountryStdSize=3;
-
-    public function IconPlot($aFile="",$aX=0,$aY=0,$aScale=1.0,$aMix=100)
-    {
-    $this->iFile = $aFile;
-    $this->iX=$aX;
-    $this->iY=$aY;
-    $this->iScale= $aScale;
-    if ($aMix < 0 || $aMix > 100) {
-        JpGraphError::Raise('Mix value for icon must be between 0 and 100.');
-    }
-    $this->iMix = $aMix ;
+class IconPlot {
+    public $iX=0,$iY=0,$iScale=1.0,$iMix=100;
+    private $iHorAnchor='left',$iVertAnchor='top';
+    private $iFile='';
+    private $iAnchors = array('left','right','top','bottom','center');
+    private $iCountryFlag='',$iCountryStdSize=3;
+    private $iScalePosY=null,$iScalePosX=null;
+    private $iImgString='';
+
+
+    function __construct($aFile="",$aX=0,$aY=0,$aScale=1.0,$aMix=100) {
+        $this->iFile = $aFile;
+        $this->iX=$aX;
+        $this->iY=$aY;
+        $this->iScale= $aScale;
+        if( $aMix < 0 || $aMix > 100 ) {
+            JpGraphError::RaiseL(8001); //('Mix value for icon must be between 0 and 100.');
+        }
+        $this->iMix = $aMix ;
     }
 
-    public function SetCountryFlag($aFlag,$aX=0,$aY=0,$aScale=1.0,$aMix=100,$aStdSize=3)
-    {
-    $this->iCountryFlag = $aFlag;
-    $this->iX=$aX;
-    $this->iY=$aY;
-    $this->iScale= $aScale;
-    if ($aMix < 0 || $aMix > 100) {
-        JpGraphError::Raise('Mix value for icon must be between 0 and 100.');
+    function SetCountryFlag($aFlag,$aX=0,$aY=0,$aScale=1.0,$aMix=100,$aStdSize=3) {
+        $this->iCountryFlag = $aFlag;
+        $this->iX=$aX;
+        $this->iY=$aY;
+        $this->iScale= $aScale;
+        if( $aMix < 0 || $aMix > 100 ) {
+            JpGraphError::RaiseL(8001);//'Mix value for icon must be between 0 and 100.');
+        }
+        $this->iMix = $aMix;
+        $this->iCountryStdSize = $aStdSize;
     }
-    $this->iMix = $aMix;
-    $this->iCountryStdSize = $aStdSize;
+
+    function SetPos($aX,$aY) {
+        $this->iX=$aX;
+        $this->iY=$aY;
     }
 
-    public function SetPos($aX,$aY)
-    {
-    $this->iX=$aX;
-    $this->iY=$aY;
+    function CreateFromString($aStr) {
+        $this->iImgString = $aStr;
     }
 
-    public function SetScale($aScale)
-    {
-    $this->iScale = $aScale;
+    function SetScalePos($aX,$aY) {
+        $this->iScalePosX = $aX;
+        $this->iScalePosY = $aY;
     }
 
-    public function SetMix($aMix)
-    {
-    if ($aMix < 0 || $aMix > 100) {
-        JpGraphError::Raise('Mix value for icon must be between 0 and 100.');
+    function SetScale($aScale) {
+        $this->iScale = $aScale;
     }
-    $this->iMix = $aMix ;
+
+    function SetMix($aMix) {
+        if( $aMix < 0 || $aMix > 100 ) {
+            JpGraphError::RaiseL(8001);//('Mix value for icon must be between 0 and 100.');
+        }
+        $this->iMix = $aMix ;
     }
 
-    public function SetAnchor($aXAnchor='left',$aYAnchor='center')
-    {
-    if( !in_array($aXAnchor,$this->iAnchors) ||
+    function SetAnchor($aXAnchor='left',$aYAnchor='center') {
+        if( !in_array($aXAnchor,$this->iAnchors) ||
         !in_array($aYAnchor,$this->iAnchors) ) {
-        JpGraphError::Raise("Anchor position for icons must be one of 'top', 'bottom', 'left', 'right' or 'center'");
-    }
-    $this->iHorAnchor=$aXAnchor;
-    $this->iVertAnchor=$aYAnchor;
+            JpGraphError::RaiseL(8002);//("Anchor position for icons must be one of 'top', 'bottom', 'left', 'right' or 'center'");
+        }
+        $this->iHorAnchor=$aXAnchor;
+        $this->iVertAnchor=$aYAnchor;
     }
 
-    public function PreStrokeAdjust($aGraph)
-    {
-    // Nothing to do ...
+    function PreStrokeAdjust($aGraph) {
+        // Nothing to do ...
     }
 
-    public function DoLegend($aGraph)
-    {
-    // Nothing to do ...
+    function DoLegend($aGraph) {
+        // Nothing to do ...
     }
 
-    public function Max()
-    {
-    return array(false,false);
+    function Max() {
+        return array(false,false);
     }
 
+
     // The next four function are framework function tht gets called
     // from Gantt and is not menaiungfull in the context of Icons but
     // they must be implemented to avoid errors.
-    public function GetMaxDate() { return false;   }
-    public function GetMinDate() { return false;   }
-    public function GetLineNbr() { return 0;   }
-    public function GetAbsHeight() {return 0;  }
+    function GetMaxDate() { return false;   }
+    function GetMinDate() { return false;   }
+    function GetLineNbr() { return 0;   }
+    function GetAbsHeight() {return 0;  }
+
 
-    public function Min()
-    {
-    return array(false,false);
+    function Min() {
+        return array(false,false);
     }
 
-    public function StrokeMargin(&$aImg)
-    {
-    return true;
+    function StrokeMargin(&$aImg) {
+        return true;
     }
 
-    public function Stroke($aImg)
-    {
-    if ($this->iFile != '' && $this->iCountryFlag != '') {
-        JpGraphError::Raise('It is not possible to specify both an image file and a country flag for the same icon.');
+    function Stroke($aImg,$axscale=null,$ayscale=null) {
+        $this->StrokeWithScale($aImg,$axscale,$ayscale);
     }
-    if ($this->iFile != '') {
-        $gdimg = Graph::LoadBkgImage('',$this->iFile);
-    } else {
-        if ( ! class_exists('FlagImages') ) {
-        JpGraphError::Raise('In order to use Country flags as icons you must include the "jpgraph_flags.php" file.');
+
+    function StrokeWithScale($aImg,$axscale,$ayscale) {
+        if( $this->iScalePosX === null || $this->iScalePosY === null ||
+        	$axscale === null || $ayscale === null ) {
+            $this->_Stroke($aImg);
+        }
+        else {
+            $this->_Stroke($aImg,
+            	round($axscale->Translate($this->iScalePosX)),
+            	round($ayscale->Translate($this->iScalePosY)));
         }
-        $fobj = new FlagImages($this->iCountryStdSize);
-        $dummy='';
-        $gdimg = $fobj->GetImgByName($this->iCountryFlag,$dummy);
-    }
-    if ($this->iX >= 0  && $this->iX <= 1.0) {
-        $w = imagesx($aImg->img);
-        $this->iX = round($w*$this->iX);
     }
-    if ($this->iY >= 0  && $this->iY <= 1.0) {
-        $h = imagesy($aImg->img);
-        $this->iY = round($h*$this->iY);
+
+    function GetWidthHeight() {
+        $dummy=0;
+        return $this->_Stroke($dummy,null,null,true);
     }
-    $iconw = imagesx($gdimg);
-    $iconh = imagesy($gdimg);
 
-    if( $this->iHorAnchor == 'center' )
+    function _Stroke($aImg,$x=null,$y=null,$aReturnWidthHeight=false) {
+        if( $this->iFile != '' && $this->iCountryFlag != '' ) {
+            JpGraphError::RaiseL(8003);//('It is not possible to specify both an image file and a country flag for the same icon.');
+        }
+        if( $this->iFile != '' ) {
+            $gdimg = Graph::LoadBkgImage('',$this->iFile);
+        }
+        elseif( $this->iImgString != '') {
+            $gdimg = Image::CreateFromString($this->iImgString);
+        }
+
+        else {
+            if( ! class_exists('FlagImages',false) ) {
+                JpGraphError::RaiseL(8004);//('In order to use Country flags as icons you must include the "jpgraph_flags.php" file.');
+            }
+            $fobj = new FlagImages($this->iCountryStdSize);
+            $dummy='';
+            $gdimg = $fobj->GetImgByName($this->iCountryFlag,$dummy);
+        }
+
+        $iconw = imagesx($gdimg);
+        $iconh = imagesy($gdimg);
+
+        if( $aReturnWidthHeight ) {
+            return array(round($iconw*$this->iScale),round($iconh*$this->iScale));
+        }
+
+        if( $x !== null && $y !== null ) {
+            $this->iX = $x; $this->iY = $y;
+        }
+        if( $this->iX >= 0  && $this->iX <= 1.0 ) {
+            $w = imagesx($aImg->img);
+            $this->iX = round($w*$this->iX);
+        }
+        if( $this->iY >= 0  && $this->iY <= 1.0 ) {
+            $h = imagesy($aImg->img);
+            $this->iY = round($h*$this->iY);
+        }
+
+        if( $this->iHorAnchor == 'center' )
         $this->iX -= round($iconw*$this->iScale/2);
-    if( $this->iHorAnchor == 'right' )
+        if( $this->iHorAnchor == 'right' )
         $this->iX -= round($iconw*$this->iScale);
-    if( $this->iVertAnchor == 'center' )
+        if( $this->iVertAnchor == 'center' )
         $this->iY -= round($iconh*$this->iScale/2);
-    if( $this->iVertAnchor == 'bottom' )
+        if( $this->iVertAnchor == 'bottom' )
         $this->iY -= round($iconh*$this->iScale);
 
-    $aImg->CopyMerge($gdimg,$this->iX,$this->iY,0,0,
-             round($iconw*$this->iScale),round($iconh*$this->iScale),
-             $iconw,$iconh,
-             $this->iMix);
+        $aImg->CopyMerge($gdimg,$this->iX,$this->iY,0,0,
+        round($iconw*$this->iScale),round($iconh*$this->iScale),
+        $iconw,$iconh,
+        $this->iMix);
     }
 }
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_imgtrans.php b/common/lib/jpgraph_lib/jpgraph_imgtrans.php
old mode 100644
new mode 100755
index a993c8a5b..411a7811f
--- a/common/lib/jpgraph_lib/jpgraph_imgtrans.php
+++ b/common/lib/jpgraph_lib/jpgraph_imgtrans.php
@@ -1,38 +1,36 @@
 <?php
 //=======================================================================
-// File:	JPGRAPH_IMGTRANS.PHP
-// Description:	Extension for JpGraph to do some simple img transformations
-// Created: 	2003-09-06
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_imgtrans.php,v 1.1.2.3 2004/03/27 12:20:45 aditus Exp $
+// File:        JPGRAPH_IMGTRANS.PHP
+// Description: Extension for JpGraph to do some simple img transformations
+// Created:     2003-09-06
+// Ver:         $Id: jpgraph_imgtrans.php 1106 2009-02-22 20:16:35Z ljp $
 //
-// License:	This code is released under QPL 1.0
-// Copyright (C) 2003 Johan Persson
+// Copyright (c) Asial Corporation. All rights reserved.
 //========================================================================
 
 //------------------------------------------------------------------------
 // Class ImgTrans
 // Perform some simple image transformations.
 //------------------------------------------------------------------------
-class imgtrans
-{
-    public $gdImg=null;
-
-    public function ImgTrans($aGdImg)
-    {
-    // Constructor
-    $this->gdImg = $aGdImg;
+class ImgTrans {
+    private $gdImg=null;
+
+    function __construct($aGdImg) {
+        // Constructor
+        $this->gdImg = $aGdImg;
     }
 
     // --------------------------------------------------------------------
     // _TransVert3D() and _TransHor3D() are helper methods to
     // Skew3D().
     // --------------------------------------------------------------------
-    public function _TransVert3D($aGdImg,$aHorizon=100,$aSkewDist=120,$aDir=SKEW3D_DOWN,$aMinSize=true,$aFillColor='#FFFFFF',$aQuality=false,$aBorder=false,$aHorizonPos=0.5)
-    {
-    // Parameter check
-    if ($aHorizonPos < 0 || $aHorizonPos > 1.0) {
-        JpGraphError::Raise("Value for image transformation out of bounds.\nVanishing point on horizon must be specified as a value between 0 and 1.");
+    function _TransVert3D($aGdImg,$aHorizon=100,$aSkewDist=120,$aDir=SKEW3D_DOWN,$aMinSize=true,$aFillColor='#FFFFFF',$aQuality=false,$aBorder=false,$aHorizonPos=0.5) {
+
+
+        // Parameter check
+    if( $aHorizonPos < 0 || $aHorizonPos > 1.0 ) {
+        JpGraphError::RaiseL(9001);
+        //("Value for image transformation out of bounds.\nVanishing point on horizon must be specified as a value between 0 and 1.");
     }
 
     $w = imagesx($aGdImg);
@@ -41,16 +39,16 @@ public function _TransVert3D($aGdImg,$aHorizon=100,$aSkewDist=120,$aDir=SKEW3D_D
     // Create new image
     $ww = $w;
     if( $aMinSize )
-        $hh = ceil($h * $aHorizon / ($aSkewDist+$h));
+    $hh = ceil($h * $aHorizon / ($aSkewDist+$h));
     else
-        $hh = $h;
+    $hh = $h;
 
     $newgdh = imagecreatetruecolor($ww,$hh);
     $crgb = new RGB( $newgdh );
     $fillColor = $crgb->Allocate($aFillColor);
     imagefilledrectangle($newgdh,0,0,$ww-1,$hh-1,$fillColor);
 
-    if ($aBorder) {
+    if( $aBorder ) {
         $colidx = $crgb->Allocate($aBorder);
         imagerectangle($newgdh,0,0,$ww-1,$hh-1,$colidx);
     }
@@ -58,43 +56,44 @@ public function _TransVert3D($aGdImg,$aHorizon=100,$aSkewDist=120,$aDir=SKEW3D_D
     $mid = round($w * $aHorizonPos);
 
     $last=$h;
-    for ($y=0; $y < $h; ++$y) {
+    for($y=0; $y < $h; ++$y) {
 
         $yp = $h-$y-1;
         $yt = floor($yp * $aHorizon / ($aSkewDist + $yp));
 
-        if (!$aQuality) {
-        if( $last <= $yt ) continue ;
-        $last = $yt;
+        if( !$aQuality ) {
+            if( $last <= $yt ) continue ;
+            $last = $yt;
         }
 
-        for ($x=0; $x < $w; ++$x) {
-        $xt = ($x-$mid) * $aSkewDist / ($aSkewDist + $yp);
-        if( $aDir == SKEW3D_UP )
+        for($x=0; $x < $w; ++$x) {
+            $xt = ($x-$mid) * $aSkewDist / ($aSkewDist + $yp);
+            if( $aDir == SKEW3D_UP )
             $rgb = imagecolorat($aGdImg,$x,$h-$y-1);
-        else
+            else
             $rgb = imagecolorat($aGdImg,$x,$y);
-        $r = ($rgb >> 16) & 0xFF;
-        $g = ($rgb >> 8) & 0xFF;
-        $b = $rgb & 0xFF;
-        $colidx = imagecolorallocate($newgdh,$r,$g,$b);
-        $xt = round($xt+$mid);
-        if ($aDir == SKEW3D_UP) {
-            $syt = $yt;
-        } else {
-            $syt = $hh-$yt-1;
-        }
-
-        if ( !empty($set[$yt]) ) {
-            $nrgb = imagecolorat($newgdh,$xt,$syt);
-            $nr = ($nrgb >> 16) & 0xFF;
-            $ng = ($nrgb >> 8) & 0xFF;
-            $nb = $nrgb & 0xFF;
-            $colidx = imagecolorallocate($newgdh,floor(($r+$nr)/2),
-                         floor(($g+$ng)/2),floor(($b+$nb)/2));
-        }
-
-        imagesetpixel($newgdh,$xt,$syt,$colidx);
+            $r = ($rgb >> 16) & 0xFF;
+            $g = ($rgb >> 8) & 0xFF;
+            $b = $rgb & 0xFF;
+            $colidx = imagecolorallocate($newgdh,$r,$g,$b);
+            $xt = round($xt+$mid);
+            if( $aDir == SKEW3D_UP ) {
+                $syt = $yt;
+            }
+            else {
+                $syt = $hh-$yt-1;
+            }
+
+            if( !empty($set[$yt]) ) {
+                $nrgb = imagecolorat($newgdh,$xt,$syt);
+                $nr = ($nrgb >> 16) & 0xFF;
+                $ng = ($nrgb >> 8) & 0xFF;
+                $nb = $nrgb & 0xFF;
+                $colidx = imagecolorallocate($newgdh,floor(($r+$nr)/2),
+                floor(($g+$ng)/2),floor(($b+$nb)/2));
+            }
+
+            imagesetpixel($newgdh,$xt,$syt,$colidx);
         }
 
         $set[$yt] = true;
@@ -107,71 +106,72 @@ public function _TransVert3D($aGdImg,$aHorizon=100,$aSkewDist=120,$aDir=SKEW3D_D
     // _TransVert3D() and _TransHor3D() are helper methods to
     // Skew3D().
     // --------------------------------------------------------------------
-    public function _TransHor3D($aGdImg,$aHorizon=100,$aSkewDist=120,$aDir=SKEW3D_LEFT,$aMinSize=true,$aFillColor='#FFFFFF',$aQuality=false,$aBorder=false,$aHorizonPos=0.5)
-    {
-    $w = imagesx($aGdImg);
-    $h = imagesy($aGdImg);
+    function _TransHor3D($aGdImg,$aHorizon=100,$aSkewDist=120,$aDir=SKEW3D_LEFT,$aMinSize=true,$aFillColor='#FFFFFF',$aQuality=false,$aBorder=false,$aHorizonPos=0.5) {
 
-    // Create new image
-    $hh = $h;
-    if( $aMinSize )
+        $w = imagesx($aGdImg);
+        $h = imagesy($aGdImg);
+
+        // Create new image
+        $hh = $h;
+        if( $aMinSize )
         $ww = ceil($w * $aHorizon / ($aSkewDist+$w));
-    else
+        else
         $ww = $w;
 
-    $newgdh = imagecreatetruecolor($ww,$hh);
-    $crgb = new RGB( $newgdh );
-    $fillColor = $crgb->Allocate($aFillColor);
-    imagefilledrectangle($newgdh,0,0,$ww-1,$hh-1,$fillColor);
-
-    if ($aBorder) {
-        $colidx = $crgb->Allocate($aBorder);
-        imagerectangle($newgdh,0,0,$ww-1,$hh-1,$colidx);
-    }
-
-    $mid = round($h * $aHorizonPos);
+        $newgdh = imagecreatetruecolor($ww,$hh);
+        $crgb = new RGB( $newgdh );
+        $fillColor = $crgb->Allocate($aFillColor);
+        imagefilledrectangle($newgdh,0,0,$ww-1,$hh-1,$fillColor);
 
-    $last = -1;
-    for ($x=0; $x < $w-1; ++$x) {
-        $xt = floor($x * $aHorizon / ($aSkewDist + $x));
-        if (!$aQuality) {
-        if( $last >= $xt ) continue ;
-        $last = $xt;
+        if( $aBorder ) {
+            $colidx = $crgb->Allocate($aBorder);
+            imagerectangle($newgdh,0,0,$ww-1,$hh-1,$colidx);
         }
 
-        for ($y=0; $y < $h; ++$y) {
-        $yp = $h-$y-1;
-        $yt = ($yp-$mid) * $aSkewDist / ($aSkewDist + $x);
-
-        if( $aDir == SKEW3D_RIGHT )
-            $rgb = imagecolorat($aGdImg,$w-$x-1,$y);
-        else
-            $rgb = imagecolorat($aGdImg,$x,$y);
-        $r = ($rgb >> 16) & 0xFF;
-        $g = ($rgb >> 8) & 0xFF;
-        $b = $rgb & 0xFF;
-        $colidx = imagecolorallocate($newgdh,$r,$g,$b);
-        $yt = floor($hh-$yt-$mid-1);
-        if ($aDir == SKEW3D_RIGHT) {
-            $sxt = $ww-$xt-1;
-        } else
-            $sxt = $xt ;
-
-        if ( !empty($set[$xt]) ) {
-            $nrgb = imagecolorat($newgdh,$sxt,$yt);
-            $nr = ($nrgb >> 16) & 0xFF;
-            $ng = ($nrgb >> 8) & 0xFF;
-            $nb = $nrgb & 0xFF;
-            $colidx = imagecolorallocate($newgdh,floor(($r+$nr)/2),
-                         floor(($g+$ng)/2),floor(($b+$nb)/2));
-        }
-        imagesetpixel($newgdh,$sxt,$yt,$colidx);
+        $mid = round($h * $aHorizonPos);
+
+        $last = -1;
+        for($x=0; $x < $w-1; ++$x) {
+            $xt = floor($x * $aHorizon / ($aSkewDist + $x));
+            if( !$aQuality ) {
+                if( $last >= $xt ) continue ;
+                $last = $xt;
+            }
+
+            for($y=0; $y < $h; ++$y) {
+                $yp = $h-$y-1;
+                $yt = ($yp-$mid) * $aSkewDist / ($aSkewDist + $x);
+
+                if( $aDir == SKEW3D_RIGHT )
+                $rgb = imagecolorat($aGdImg,$w-$x-1,$y);
+                else
+                $rgb = imagecolorat($aGdImg,$x,$y);
+                $r = ($rgb >> 16) & 0xFF;
+                $g = ($rgb >> 8) & 0xFF;
+                $b = $rgb & 0xFF;
+                $colidx = imagecolorallocate($newgdh,$r,$g,$b);
+                $yt = floor($hh-$yt-$mid-1);
+                if( $aDir == SKEW3D_RIGHT ) {
+                    $sxt = $ww-$xt-1;
+                }
+                else
+                $sxt = $xt ;
+
+                if( !empty($set[$xt]) ) {
+                    $nrgb = imagecolorat($newgdh,$sxt,$yt);
+                    $nr = ($nrgb >> 16) & 0xFF;
+                    $ng = ($nrgb >> 8) & 0xFF;
+                    $nb = $nrgb & 0xFF;
+                    $colidx = imagecolorallocate($newgdh,floor(($r+$nr)/2),
+                    floor(($g+$ng)/2),floor(($b+$nb)/2));
+                }
+                imagesetpixel($newgdh,$sxt,$yt,$colidx);
+            }
+
+            $set[$xt] = true;
         }
 
-        $set[$xt] = true;
-    }
-
-    return $newgdh;
+        return $newgdh;
     }
 
     // --------------------------------------------------------------------
@@ -204,20 +204,20 @@ public function _TransHor3D($aGdImg,$aHorizon=100,$aSkewDist=120,$aDir=SKEW3D_LE
     // * $aBorder, if set to anything besides false this will draw a
     //   a border of the speciied color around the image
     // --------------------------------------------------------------------
-    public function Skew3D($aHorizon=120,$aSkewDist=150,$aDir=SKEW3D_DOWN,$aHiQuality=false,$aMinSize=true,$aFillColor='#FFFFFF',$aBorder=false)
-    {
-    return $this->_Skew3D($this->gdImg,$aHorizon,$aSkewDist,$aDir,$aHiQuality,
-                  $aMinSize,$aFillColor,$aBorder);
+    function Skew3D($aHorizon=120,$aSkewDist=150,$aDir=SKEW3D_DOWN,$aHiQuality=false,$aMinSize=true,$aFillColor='#FFFFFF',$aBorder=false) {
+        return $this->_Skew3D($this->gdImg,$aHorizon,$aSkewDist,$aDir,$aHiQuality,
+        $aMinSize,$aFillColor,$aBorder);
     }
 
-    public function _Skew3D($aGdImg,$aHorizon=120,$aSkewDist=150,$aDir=SKEW3D_DOWN,$aHiQuality=false,$aMinSize=true,$aFillColor='#FFFFFF',$aBorder=false)
-    {
-    if( $aDir == SKEW3D_DOWN || $aDir == SKEW3D_UP )
-
+    function _Skew3D($aGdImg,$aHorizon=120,$aSkewDist=150,$aDir=SKEW3D_DOWN,$aHiQuality=false,$aMinSize=true,$aFillColor='#FFFFFF',$aBorder=false) {
+        if( $aDir == SKEW3D_DOWN || $aDir == SKEW3D_UP )
         return $this->_TransVert3D($aGdImg,$aHorizon,$aSkewDist,$aDir,$aMinSize,$aFillColor,$aHiQuality,$aBorder);
-    else
+        else
         return $this->_TransHor3D($aGdImg,$aHorizon,$aSkewDist,$aDir,$aMinSize,$aFillColor,$aHiQuality,$aBorder);
 
     }
 
 }
+
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_led.php b/common/lib/jpgraph_lib/jpgraph_led.php
new file mode 100644
index 000000000..83bb2692a
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_led.php
@@ -0,0 +1,311 @@
+<?php
+//=======================================================================
+// File:        JPGRAPH_LED.PHP
+// Description: Module to generate Dotted LED-like digits
+// Created:     2006-11-26
+// Ver:         $Id: jpgraph_led.php 1674 2009-07-22 19:42:23Z ljp $
+//
+// Copyright 2006 (c) Asial Corporation. All rights reserved.
+//
+// Changed: 2007-08-06 by Alexander Kurochkin (inspector@list.ru)
+//========================================================================
+
+// Constants for color schema
+DEFINE('LEDC_RED', 0);
+DEFINE('LEDC_GREEN', 1);
+DEFINE('LEDC_BLUE', 2);
+DEFINE('LEDC_YELLOW', 3);
+DEFINE('LEDC_GRAY', 4);
+DEFINE('LEDC_CHOCOLATE', 5);
+DEFINE('LEDC_PERU', 6);
+DEFINE('LEDC_GOLDENROD', 7);
+DEFINE('LEDC_KHAKI', 8);
+DEFINE('LEDC_OLIVE', 9);
+DEFINE('LEDC_LIMEGREEN', 10);
+DEFINE('LEDC_FORESTGREEN', 11);
+DEFINE('LEDC_TEAL', 12);
+DEFINE('LEDC_STEELBLUE', 13);
+DEFINE('LEDC_NAVY', 14);
+DEFINE('LEDC_INVERTGRAY', 15);
+
+// Check that mb_strlen() is available
+if( ! function_exists('mb_strlen') ) {
+    JpGraphError::RaiseL(25500);
+    //'Multibyte strings must be enabled in the PHP installation in order to run the LED module
+    // so that the function mb_strlen() is available. See PHP documentation for more information.'
+}
+
+//========================================================================
+// CLASS DigitalLED74
+// Description:
+// Construct a number as an image that looks like LED numbers in a
+// 7x4 digital matrix
+//========================================================================
+class DigitalLED74
+{
+    private $iLED_X = 4, $iLED_Y=7,
+
+        // fg-up, fg-down, bg
+        $iColorSchema = array(
+            LEDC_RED  => array('red','darkred:0.9','red:0.3'),// 0
+            LEDC_GREEN  => array('green','darkgreen','green:0.3'),// 1
+            LEDC_BLUE  => array('lightblue:0.9','darkblue:0.85','darkblue:0.7'),// 2
+            LEDC_YELLOW  => array('yellow','yellow:0.4','yellow:0.3'),// 3
+            LEDC_GRAY  => array('gray:1.4','darkgray:0.85','darkgray:0.7'),
+            LEDC_CHOCOLATE => array('chocolate','chocolate:0.7','chocolate:0.5'),
+            LEDC_PERU  => array('peru:0.95','peru:0.6','peru:0.5'),
+            LEDC_GOLDENROD => array('goldenrod','goldenrod:0.6','goldenrod:0.5'),
+            LEDC_KHAKI  => array('khaki:0.7','khaki:0.4','khaki:0.3'),
+            LEDC_OLIVE  => array('#808000','#808000:0.7','#808000:0.6'),
+            LEDC_LIMEGREEN => array('limegreen:0.9','limegreen:0.5','limegreen:0.4'),
+            LEDC_FORESTGREEN => array('forestgreen','forestgreen:0.7','forestgreen:0.5'),
+            LEDC_TEAL  => array('teal','teal:0.7','teal:0.5'),
+            LEDC_STEELBLUE => array('steelblue','steelblue:0.65','steelblue:0.5'),
+            LEDC_NAVY  => array('navy:1.3','navy:0.95','navy:0.8'),//14
+            LEDC_INVERTGRAY => array('darkgray','lightgray:1.5','white')//15
+            ),
+
+        /* Each line of the character is encoded as a 4 bit value
+         0      ____
+         1      ___x
+         2      __x_
+         3      __xx
+         4      _x__
+         5      _x_x
+         6      _xx_
+         7      _xxx
+         8      x___
+         9      x__x
+         10     x_x_
+         11     x_xx
+         12     xx__
+         13     xx_x
+         14     xxx_
+         15     xxxx
+        */
+
+        $iLEDSpec = array(
+            0 => array(6,9,11,15,13,9,6),
+            1 => array(2,6,10,2,2,2,2),
+            2 => array(6,9,1,2,4,8,15),
+            3 => array(6,9,1,6,1,9,6),
+            4 => array(1,3,5,9,15,1,1),
+            5 => array(15,8,8,14,1,9,6),
+            6 => array(6,8,8,14,9,9,6),
+            7 => array(15,1,1,2,4,4,4),
+            8 => array(6,9,9,6,9,9,6),
+            9 => array(6,9,9,7,1,1,6),
+            '!' => array(4,4,4,4,4,0,4),
+            '?' => array(6,9,1,2,2,0,2),
+            '#' => array(0,9,15,9,15,9,0),
+            '@' => array(6,9,11,11,10,9,6),
+            '-' => array(0,0,0,15,0,0,0),
+            '_' => array(0,0,0,0,0,0,15),
+            '=' => array(0,0,15,0,15,0,0),
+            '+' => array(0,0,4,14,4,0,0),
+            '|' => array(4,4,4,4,4,4,4), //vertical line, used for simulate rus 'Ы'
+            ',' => array(0,0,0,0,0,12,4),
+            '.' => array(0,0,0,0,0,12,12),
+            ':' => array(12,12,0,0,0,12,12),
+            ';' => array(12,12,0,0,0,12,4),
+            '[' => array(3,2,2,2,2,2,3),
+            ']' => array(12,4,4,4,4,4,12),
+            '(' => array(1,2,2,2,2,2,1),
+            ')' => array(8,4,4,4,4,4,8),
+            '{' => array(3,2,2,6,2,2,3),
+            '}' => array(12,4,4,6,4,4,12),
+            '<' => array(1,2,4,8,4,2,1),
+            '>' => array(8,4,2,1,2,4,8),
+            '*' => array(9,6,15,6,9,0,0),
+            '"' => array(10,10,0,0,0,0,0),
+            '\'' => array(4,4,0,0,0,0,0),
+            '`' => array(4,2,0,0,0,0,0),
+            '~' => array(13,11,0,0,0,0,0),
+            '^' => array(4,10,0,0,0,0,0),
+            '\\' => array(8,8,4,6,2,1,1),
+            '/' => array(1,1,2,6,4,8,8),
+            '%' => array(1,9,2,6,4,9,8),
+            '&' => array(0,4,10,4,11,10,5),
+            '$' => array(2,7,8,6,1,14,4),
+            ' ' => array(0,0,0,0,0,0,0),
+            '•' => array(0,0,6,6,0,0,0), //149
+            '°' => array(14,10,14,0,0,0,0), //176
+            '†' => array(4,4,14,4,4,4,4), //134
+            '‡' => array(4,4,14,4,14,4,4), //135
+            '±' => array(0,4,14,4,0,14,0), //177
+            '‰' => array(0,4,2,15,2,4,0), //137 show right arrow
+            '™' => array(0,2,4,15,4,2,0), //156 show left arrow
+            'Ў' => array(0,0,8,8,0,0,0), //159 show small hi-stick - that need for simulate rus 'Ф'
+            "\t" => array(8,8,8,0,0,0,0), //show hi-stick - that need for simulate rus 'У'
+            "\r" => array(8,8,8,8,8,8,8), //vertical line - that need for simulate 'M', 'W' and rus 'М','Ш' ,'Щ'
+            "\n" => array(15,15,15,15,15,15,15), //fill up - that need for simulate rus 'Ж'
+            "Ґ" => array(10,5,10,5,10,5,10), //chess
+            "µ" => array(15,0,15,0,15,0,15), //4 horizontal lines
+            // latin
+            'A' => array(6,9,9,15,9,9,9),
+            'B' => array(14,9,9,14,9,9,14),
+            'C' => array(6,9,8,8,8,9,6),
+            'D' => array(14,9,9,9,9,9,14),
+            'E' => array(15,8,8,14,8,8,15),
+            'F' => array(15,8,8,14,8,8,8),
+            'G' => array(6,9,8,8,11,9,6),
+            'H' => array(9,9,9,15,9,9,9),
+            'I' => array(14,4,4,4,4,4,14),
+            'J' => array(15,1,1,1,1,9,6),
+            'K' => array(8,9,10,12,12,10,9),
+            'L' => array(8,8,8,8,8,8,15),
+            'M' => array(8,13,10,8,8,8,8),// need to add \r
+            'N' => array(9,9,13,11,9,9,9),
+            'O' => array(6,9,9,9,9,9,6),
+            'P' => array(14,9,9,14,8,8,8),
+            'Q' => array(6,9,9,9,13,11,6),
+            'R' => array(14,9,9,14,12,10,9),
+            'S' => array(6,9,8,6,1,9,6),
+            'T' => array(14,4,4,4,4,4,4),
+            'U' => array(9,9,9,9,9,9,6),
+            'V' => array(0,0,0,10,10,10,4),
+            'W' => array(8,8,8,8,10,13,8),// need to add \r
+            'X' => array(9,9,6,6,6,9,9),
+            'Y' => array(10,10,10,10,4,4,4),
+            'Z' => array(15,1,2,6,4,8,15),
+            // russian utf-8
+            'А' => array(6,9,9,15,9,9,9),
+            'Б' => array(14,8,8,14,9,9,14),
+            'В' => array(14,9,9,14,9,9,14),
+            'Г' => array(15,8,8,8,8,8,8),
+            'Д' => array(14,9,9,9,9,9,14),
+            'Е' => array(15,8,8,14,8,8,15),
+            'Ё' => array(6,15,8,14,8,8,15),
+            //Ж is combine: >\n<
+            'З' => array(6,9,1,2,1,9,6),
+            'И' => array(9,9,9,11,13,9,9),
+            'Й' => array(13,9,9,11,13,9,9),
+            'К' => array(9,10,12,10,9,9,9),
+            'Л' => array(7,9,9,9,9,9,9),
+            'М' => array(8,13,10,8,8,8,8),// need to add \r
+            'Н' => array(9,9,9,15,9,9,9),
+            'О' => array(6,9,9,9,9,9,6),
+            'П' => array(15,9,9,9,9,9,9),
+            'Р' => array(14,9,9,14,8,8,8),
+            'С' => array(6,9,8,8,8,9,6),
+            'Т' => array(14,4,4,4,4,4,4),
+            'У' => array(9,9,9,7,1,9,6),
+            'Ф' => array(2,7,10,10,7,2,2),// need to add Ў
+            'Х' => array(9,9,6,6,6,9,9),
+            'Ц' => array(10,10,10,10,10,15,1),
+            'Ч' => array(9,9,9,7,1,1,1),
+            'Ш' => array(10,10,10,10,10,10,15),// \r
+            'Щ' => array(10,10,10,10,10,15,0),// need to add \r
+            'Ъ' => array(12,4,4,6,5,5,6),
+            'Ы' => array(8,8,8,14,9,9,14),// need to add |
+            'Ь' => array(8,8,8,14,9,9,14),
+            'Э' => array(6,9,1,7,1,9,6),
+            'Ю' => array(2,2,2,3,2,2,2),// need to add O
+            'Я' => array(7,9,9,7,3,5,9)
+            ),
+
+        $iSuperSampling = 3, $iMarg = 1, $iRad = 4;
+
+    function __construct($aRadius = 2, $aMargin= 0.6) {
+        $this->iRad = $aRadius;
+        $this->iMarg = $aMargin;
+    }
+
+    function SetSupersampling($aSuperSampling = 2) {
+        $this->iSuperSampling = $aSuperSampling;
+    }
+
+    function _GetLED($aLedIdx, $aColor = 0) {
+        $width=  $this->iLED_X*$this->iRad*2 +  ($this->iLED_X+1)*$this->iMarg + $this->iRad ;
+        $height= $this->iLED_Y*$this->iRad*2 +  ($this->iLED_Y)*$this->iMarg + $this->iRad * 2;
+
+        // Adjust radious for supersampling
+        $rad = $this->iRad * $this->iSuperSampling;
+
+        // Margin in between "Led" dots
+        $marg = $this->iMarg * $this->iSuperSampling;
+
+        $swidth = $width*$this->iSuperSampling;
+        $sheight = $height*$this->iSuperSampling;
+
+        $simg = new RotImage($swidth, $sheight, 0, DEFAULT_GFORMAT, false);
+        $simg->SetColor($this->iColorSchema[$aColor][2]);
+        $simg->FilledRectangle(0, 0, $swidth-1, $sheight-1);
+
+        if( array_key_exists($aLedIdx, $this->iLEDSpec) ) {
+            $d = $this->iLEDSpec[$aLedIdx];
+        }
+        else {
+            $d = array(0,0,0,0,0,0,0);
+        }
+
+        for($r = 0; $r < 7; ++$r) {
+            $dr = $d[$r];
+            for($c = 0; $c < 4; ++$c) {
+                if( ($dr & pow(2,3-$c)) !== 0 ) {
+                    $color = $this->iColorSchema[$aColor][0];
+                }
+                else {
+                    $color = $this->iColorSchema[$aColor][1];
+                }
+
+                $x = 2*$rad*$c+$rad + ($c+1)*$marg + $rad ;
+                $y = 2*$rad*$r+$rad + ($r+1)*$marg + $rad ;
+
+                $simg->SetColor($color);
+                $simg->FilledCircle($x,$y,$rad);
+            }
+        }
+
+        $img =  new Image($width, $height, DEFAULT_GFORMAT, false);
+        $img->Copy($simg->img, 0, 0, 0, 0, $width, $height, $swidth, $sheight);
+        $simg->Destroy();
+        unset($simg);
+        return $img;
+    }
+
+
+    function Stroke($aValStr, $aColor = 0, $aFileName = '') {
+    	$this->StrokeNumber($aValStr, $aColor, $aFileName);
+    }
+
+
+    function StrokeNumber($aValStr, $aColor = 0, $aFileName = '') {
+        if( $aColor < 0 || $aColor >= sizeof($this->iColorSchema) ) {
+            $aColor = 0;
+        }
+
+        if(($n = mb_strlen($aValStr,'utf8')) == 0) {
+            $aValStr = ' ';
+            $n = 1;
+        }
+
+        for($i = 0; $i < $n; ++$i) {
+            $d = mb_substr($aValStr, $i, 1, 'utf8');
+            if(  ctype_digit($d) ) {
+                $d = (int)$d;
+            }
+            else {
+               $d = strtoupper($d);
+            }
+            $digit_img[$i] = $this->_GetLED($d, $aColor);
+        }
+
+        $w = imagesx($digit_img[0]->img);
+        $h = imagesy($digit_img[0]->img);
+
+        $number_img = new Image($w*$n, $h, DEFAULT_GFORMAT, false);
+
+        for($i = 0; $i < $n; ++$i) {
+            $number_img->Copy($digit_img[$i]->img, $i*$w, 0, 0, 0, $w, $h, $w, $h);
+        }
+
+        if( $aFileName != '' ) {
+            $number_img->Stream($aFileName);
+        } else {
+            $number_img->Headers();
+            $number_img->Stream();
+        }
+    }
+}
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_legend.inc.php b/common/lib/jpgraph_lib/jpgraph_legend.inc.php
new file mode 100644
index 000000000..c7f38b511
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_legend.inc.php
@@ -0,0 +1,494 @@
+<?php
+//=======================================================================
+// File:        JPGRAPH_LEGEND.INC.PHP
+// Description: Class to handle the legend box in the graph that gives
+//              names on the data series. The number of rows and columns
+//              in the legend are user specifyable.
+// Created:     2001-01-08 (Refactored to separate file 2008-08-01)
+// Ver:         $Id: jpgraph_legend.inc.php 1926 2010-01-11 16:33:07Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+DEFINE('_DEFAULT_LPM_SIZE',8); // Default Legend Plot Mark size
+
+
+//===================================================
+// CLASS Legend
+// Description: Responsible for drawing the box containing
+// all the legend text for the graph
+//===================================================
+
+class Legend {
+    public $txtcol=array();
+    public $font_family=FF_DEFAULT,$font_style=FS_NORMAL,$font_size=8; // old. 12
+    private $color=array(120,120,120); // Default frame color
+    private $fill_color=array(245,245,245); // Default fill color
+    private $shadow=false; // Shadow around legend "box"
+    private $shadow_color='darkgray';
+    private $mark_abs_hsize=_DEFAULT_LPM_SIZE,$mark_abs_vsize=_DEFAULT_LPM_SIZE;
+    private $xmargin=10,$ymargin=0,$shadow_width=2;
+    private $xlmargin=4;
+    private $ylinespacing=5;
+    
+     // We need a separate margin since the baseline of the last text would coincide with the bottom otherwise
+    private $ybottom_margin = 8;
+    
+    private $xpos=0.05, $ypos=0.15, $xabspos=-1, $yabspos=-1;
+    private $halign="right", $valign="top";
+    private $font_color='black';
+    private $hide=false,$layout_n=1;
+    private $weight=1,$frameweight=1;
+    private $csimareas='';
+    private $reverse = false ;
+    private $bkg_gradtype=-1, $bkg_gradfrom='lightgray', $bkg_gradto='gray';
+
+    //---------------
+    // CONSTRUCTOR
+    function __construct() {
+        // Empty
+    }
+    //---------------
+    // PUBLIC METHODS
+    function Hide($aHide=true) {
+        $this->hide=$aHide;
+    }
+
+    function SetHColMargin($aXMarg) {
+        $this->xmargin = $aXMarg;
+    }
+
+    function SetVColMargin($aSpacing) {
+        $this->ylinespacing = $aSpacing ;
+    }
+
+    function SetLeftMargin($aXMarg) {
+        $this->xlmargin = $aXMarg;
+    }
+
+    // Synonym
+    function SetLineSpacing($aSpacing) {
+        $this->ylinespacing = $aSpacing ;
+    }
+
+    function SetShadow($aShow='gray',$aWidth=4) {
+        if( is_string($aShow) ) {
+            $this->shadow_color = $aShow;
+            $this->shadow=true;
+        }
+        else {
+            $this->shadow = $aShow;
+        }
+        $this->shadow_width = $aWidth;
+    }
+
+    function SetMarkAbsSize($aSize) {
+        $this->mark_abs_vsize = $aSize ;
+        $this->mark_abs_hsize = $aSize ;
+    }
+
+    function SetMarkAbsVSize($aSize) {
+        $this->mark_abs_vsize = $aSize ;
+    }
+
+    function SetMarkAbsHSize($aSize) {
+        $this->mark_abs_hsize = $aSize ;
+    }
+
+    function SetLineWeight($aWeight) {
+        $this->weight = $aWeight;
+    }
+
+    function SetFrameWeight($aWeight) {
+        $this->frameweight = $aWeight;
+    }
+
+    function SetLayout($aDirection=LEGEND_VERT) {
+        $this->layout_n = $aDirection==LEGEND_VERT ? 1 : 99 ;
+    }
+
+    function SetColumns($aCols) {
+        $this->layout_n = $aCols ;
+    }
+
+    function SetReverse($f=true) {
+        $this->reverse = $f ;
+    }
+
+    // Set color on frame around box
+    function SetColor($aFontColor,$aColor='black') {
+        $this->font_color=$aFontColor;
+        $this->color=$aColor;
+    }
+
+    function SetFont($aFamily,$aStyle=FS_NORMAL,$aSize=10) {
+        $this->font_family = $aFamily;
+        $this->font_style = $aStyle;
+        $this->font_size = $aSize;
+    }
+
+    function SetPos($aX,$aY,$aHAlign='right',$aVAlign='top') {
+        $this->Pos($aX,$aY,$aHAlign,$aVAlign);
+    }
+
+    function SetAbsPos($aX,$aY,$aHAlign='right',$aVAlign='top') {
+        $this->xabspos=$aX;
+        $this->yabspos=$aY;
+        $this->halign=$aHAlign;
+        $this->valign=$aVAlign;
+    }
+
+    function Pos($aX,$aY,$aHAlign='right',$aVAlign='top') {
+        if( !($aX<1 && $aY<1) ) {
+            JpGraphError::RaiseL(25120);//(" Position for legend must be given as percentage in range 0-1");
+        }
+        $this->xpos=$aX;
+        $this->ypos=$aY;
+        $this->halign=$aHAlign;
+        $this->valign=$aVAlign;
+    }
+
+    function SetFillColor($aColor) {
+        $this->fill_color=$aColor;
+    }
+
+    function Clear() {
+        $this->txtcol = array();
+    }
+
+    function Add($aTxt,$aColor,$aPlotmark='',$aLinestyle=0,$csimtarget='',$csimalt='',$csimwintarget='') {
+        $this->txtcol[]=array($aTxt,$aColor,$aPlotmark,$aLinestyle,$csimtarget,$csimalt,$csimwintarget);
+    }
+
+    function GetCSIMAreas() {
+        return $this->csimareas;
+    }
+
+    function SetBackgroundGradient($aFrom='navy',$aTo='silver',$aGradType=2) {
+        $this->bkg_gradtype=$aGradType;
+        $this->bkg_gradfrom = $aFrom;
+        $this->bkg_gradto = $aTo;
+    }
+
+    function HasItems() {
+        return (boolean)(count($this->txtcol));
+    }
+
+    function Stroke($aImg) {
+        // Constant
+        $fillBoxFrameWeight=1;
+
+        if( $this->hide ) return;
+
+        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
+
+        if( $this->reverse ) {
+            $this->txtcol = array_reverse($this->txtcol);
+        }
+
+        $n=count($this->txtcol);
+        if( $n == 0 ) return;
+
+        // Find out the max width and height of each column to be able
+        // to size the legend box.
+        $numcolumns = ($n > $this->layout_n ? $this->layout_n : $n);
+        for( $i=0; $i < $numcolumns; ++$i ) {
+            $colwidth[$i] = $aImg->GetTextWidth($this->txtcol[$i][0]) +
+                            2*$this->xmargin + 2*$this->mark_abs_hsize;
+            $colheight[$i] = 0;
+
+        }
+
+        // Find our maximum height in each row
+        $rows = 0 ; $rowheight[0] = 0;
+        for( $i=0; $i < $n; ++$i ) {
+            $h = max($this->mark_abs_vsize,$aImg->GetTextHeight($this->txtcol[$i][0]))+$this->ylinespacing;
+
+            // Makes sure we always have a minimum of 1/4 (1/2 on each side) of the mark as space
+            // between two vertical legend entries
+            //$h = round(max($h,$this->mark_abs_vsize+$this->ymargin));
+            //echo "Textheight #$i: tetxheight=".$aImg->GetTextHeight($this->txtcol[$i][0]).', ';
+            //echo "h=$h ({$this->mark_abs_vsize},{$this->ymargin})<br>";
+            if( $i % $numcolumns == 0 ) {
+                $rows++;
+                $rowheight[$rows-1] = 0;
+            }
+            $rowheight[$rows-1] = max($rowheight[$rows-1],$h)+1;
+        }
+
+        $abs_height = 0;
+        for( $i=0; $i < $rows; ++$i ) {
+            $abs_height += $rowheight[$i] ;
+        }
+
+        // Make sure that the height is at least as high as mark size + ymargin
+        $abs_height = max($abs_height,$this->mark_abs_vsize);
+        $abs_height += $this->ybottom_margin; 
+
+        // Find out the maximum width in each column
+        for( $i=$numcolumns; $i < $n; ++$i ) {
+            $colwidth[$i % $numcolumns] = max(
+                $aImg->GetTextWidth($this->txtcol[$i][0])+2*$this->xmargin+2*$this->mark_abs_hsize,
+                $colwidth[$i % $numcolumns]);
+        }
+
+        // Get the total width
+        $mtw = 0;
+        for( $i=0; $i < $numcolumns; ++$i ) {
+            $mtw += $colwidth[$i] ;
+        }
+
+        // remove the last rows interpace margin (since there is no next row)
+        $abs_height -= $this->ylinespacing;
+
+
+        // Find out maximum width we need for legend box
+        $abs_width = $mtw+$this->xlmargin+($numcolumns-1)*$this->mark_abs_hsize;
+
+        if( $this->xabspos === -1  && $this->yabspos === -1 ) {
+            $this->xabspos = $this->xpos*$aImg->width ;
+            $this->yabspos = $this->ypos*$aImg->height ;
+        }
+
+        // Positioning of the legend box
+        if( $this->halign == 'left' ) {
+        	$xp = $this->xabspos;
+        }
+        elseif( $this->halign == 'center' ) {
+        	$xp = $this->xabspos - $abs_width/2;
+        }
+        else {
+        	$xp = $aImg->width - $this->xabspos - $abs_width;
+        }
+
+        $yp=$this->yabspos;
+        if( $this->valign == 'center' ) {
+        	$yp-=$abs_height/2;
+        }
+        elseif( $this->valign == 'bottom' ) {
+        	$yp-=$abs_height;
+        }
+
+        // Stroke legend box
+        $aImg->SetColor($this->color);
+        $aImg->SetLineWeight($this->frameweight);
+        $aImg->SetLineStyle('solid');
+
+        if( $this->shadow ) {
+        	$aImg->ShadowRectangle($xp,$yp,
+                                   $xp+$abs_width+$this->shadow_width+2,
+                                   $yp+$abs_height+$this->shadow_width+2,
+                                   $this->fill_color,$this->shadow_width+2,$this->shadow_color);
+        }
+        else {
+            $aImg->SetColor($this->fill_color);
+            $aImg->FilledRectangle($xp,$yp,$xp+$abs_width,$yp+$abs_height);
+            $aImg->SetColor($this->color);
+            $aImg->Rectangle($xp,$yp,$xp+$abs_width,$yp+$abs_height);
+        }
+
+        if( $this->bkg_gradtype >= 0 ) {
+            $grad = new Gradient($aImg);
+            $grad->FilledRectangle($xp+1, $yp+1,
+                                   $xp+$abs_width-3, $yp+$abs_height-3,
+                                   $this->bkg_gradfrom, $this->bkg_gradto,
+                                   $this->bkg_gradtype);
+        }
+
+        // x1,y1 is the position for the legend marker + text
+        // The vertical position is the baseline position for the text
+        // and every marker is adjusted acording to that.
+
+        // For multiline texts this get more complicated.
+
+        $x1 = $xp + $this->xlmargin;
+        $y1 = $yp + $rowheight[0] - $this->ylinespacing + 2 ; // The ymargin is included in rowheight
+
+        // Now, y1 is the bottom vertical position of the first legend, i.e if
+        // the legend has multiple lines it is the bottom line.
+
+        $grad = new Gradient($aImg);
+        $patternFactory = null;
+
+        // Now stroke each legend in turn
+        // Each plot has added the following information to  the legend
+        // p[0] = Legend text
+        // p[1] = Color,
+        // p[2] = For markers a reference to the PlotMark object
+        // p[3] = For lines the line style, for gradient the negative gradient style
+        // p[4] = CSIM target
+        // p[5] = CSIM Alt text
+        $i = 1 ; $row = 0;
+        foreach($this->txtcol as $p) {
+
+            // STROKE DEBUG BOX
+            if( _JPG_DEBUG ) {
+                $aImg->SetLineWeight(1);
+                $aImg->SetColor('red');
+                $aImg->SetLineStyle('solid');
+                $aImg->Rectangle($x1,$y1,$xp+$abs_width-1,$y1-$rowheight[$row]);
+            }
+
+            $aImg->SetLineWeight($this->weight);
+            $x1 = round($x1)+1; // We add one to not collide with the border
+            $y1=round($y1);
+
+            // This is the center offset up from the baseline which is
+            // considered the "center" of the marks. This gets slightly complicated since
+            // we need to consider if the text is a multiline paragraph or if it is only
+            // a single line. The reason is that for single line the y1 corresponds to the baseline
+            // and that is fine. However for a multiline paragraph there is no single baseline
+            // and in that case the y1 corresponds to the lowest y for the bounding box. In that
+            // case we center the mark in the middle of the paragraph
+            if( !preg_match('/\n/',$p[0]) ) {
+                // Single line
+                $marky = ceil($y1-$this->mark_abs_vsize/2)-1;
+            } else {
+                // Paragraph
+                $marky = $y1 - $aImg->GetTextHeight($p[0])/2;
+
+              //  echo "y1=$y1, p[o]={$p[0]}, marky=$marky<br>";
+            }
+
+            //echo "<br>Mark #$i: marky=$marky<br>";
+
+            $x1 += $this->mark_abs_hsize;
+    
+            if ( !empty($p[2]) && $p[2]->GetType() > -1 ) {
+
+
+                // Make a plot mark legend. This is constructed with a mark which
+                // is run through with a line
+
+                // First construct a bit of the line that looks exactly like the
+                // line in the plot
+                $aImg->SetColor($p[1]);
+                if( is_string($p[3]) || $p[3]>0 ) {
+                    $aImg->SetLineStyle($p[3]);
+                    $aImg->StyleLine($x1-$this->mark_abs_hsize,$marky,$x1+$this->mark_abs_hsize,$marky);
+                }
+
+                // Stroke a mark using image
+                if( $p[2]->GetType() == MARK_IMG ) {
+                    $p[2]->Stroke($aImg,$x1,$marky);
+                }
+
+                // Stroke a mark with the standard size
+                // (As long as it is not an image mark )
+                if( $p[2]->GetType() != MARK_IMG ) {
+
+                    // Clear any user callbacks since we ont want them called for
+                    // the legend marks
+                    $p[2]->iFormatCallback = '';
+                    $p[2]->iFormatCallback2 = '';
+
+                    // Since size for circles is specified as the radius
+                    // this means that we must half the size to make the total
+                    // width behave as the other marks
+                    if( $p[2]->GetType() == MARK_FILLEDCIRCLE || $p[2]->GetType() == MARK_CIRCLE ) {
+                        $p[2]->SetSize(min($this->mark_abs_vsize,$this->mark_abs_hsize)/2);
+                        $p[2]->Stroke($aImg,$x1,$marky);
+                    }
+                    else {
+                        $p[2]->SetSize(min($this->mark_abs_vsize,$this->mark_abs_hsize));
+                        $p[2]->Stroke($aImg,$x1,$marky);
+                    }
+                }
+            }
+            elseif ( !empty($p[2]) && (is_string($p[3]) || $p[3]>0 ) ) {
+                // Draw a styled line
+                $aImg->SetColor($p[1]);
+                $aImg->SetLineStyle($p[3]);
+                $aImg->StyleLine($x1-$this->mark_abs_hsize,$marky,$x1+$this->mark_abs_hsize,$marky);
+                $aImg->StyleLine($x1-$this->mark_abs_hsize,$marky+1,$x1+$this->mark_abs_hsize,$marky+1);
+            }
+            else {
+                // Draw a colored box
+                $color = $p[1] ;
+
+                // We make boxes slightly larger to better show
+                $boxsize = max($this->mark_abs_vsize,$this->mark_abs_hsize) + 2 ;
+
+                $ym = $marky-ceil($boxsize/2) ; // Marker y-coordinate
+
+                // We either need to plot a gradient or a
+                // pattern. To differentiate we use a kludge.
+                // Patterns have a p[3] value of < -100
+                if( $p[3] < -100 ) {
+                    // p[1][0] == iPattern, p[1][1] == iPatternColor, p[1][2] == iPatternDensity
+                    if( $patternFactory == null ) {
+                        $patternFactory = new RectPatternFactory();
+                    }
+                    $prect = $patternFactory->Create($p[1][0],$p[1][1],1);
+                    $prect->SetBackground($p[1][3]);
+                    $prect->SetDensity($p[1][2]+1);
+                    $prect->SetPos(new Rectangle($x1,$ym,$boxsize,$boxsize));
+                    $prect->Stroke($aImg);
+                    $prect=null;
+                }
+                else {
+                    if( is_array($color) && count($color)==2 ) {
+                        // The client want a gradient color
+                        $grad->FilledRectangle($x1-$boxsize/2,$ym,
+                                               $x1+$boxsize/2,$ym+$boxsize,
+                                               $color[0],$color[1],-$p[3]);
+                    }
+                    else {
+                        $aImg->SetColor($p[1]);
+                        $aImg->FilledRectangle($x1-$boxsize/2,$ym, $x1+$boxsize/2,$ym+$boxsize);
+                    }
+
+                    // Draw a plot frame line
+                    $aImg->SetColor($this->color);
+                    $aImg->SetLineWeight($fillBoxFrameWeight);
+                    $aImg->Rectangle($x1-$boxsize/2,$ym,
+                                     $x1+$boxsize/2,$ym+$boxsize);
+                }
+            }
+            $aImg->SetColor($this->font_color);
+            $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
+            $aImg->SetTextAlign('left','baseline');
+
+            $debug=false;
+            $aImg->StrokeText($x1+$this->mark_abs_hsize+$this->xmargin,$y1,$p[0],
+                0,'left',$debug);
+
+            // Add CSIM for Legend if defined
+            if( !empty($p[4]) ) {
+
+                $xs = $x1 - $this->mark_abs_hsize ;
+                $ys = $y1 + 1 ;
+                $xe = $x1 + $aImg->GetTextWidth($p[0]) + $this->mark_abs_hsize + $this->xmargin ;
+                $ye = $y1-$rowheight[$row]+1;
+                $coords = "$xs,$ys,$xe,$y1,$xe,$ye,$xs,$ye";
+                if( ! empty($p[4]) ) {
+                    $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".htmlentities($p[4])."\"";
+
+                    if( !empty($p[6]) ) {
+                        $this->csimareas .= " target=\"".$p[6]."\"";
+                    }
+
+                    if( !empty($p[5]) ) {
+                        $tmp=sprintf($p[5],$p[0]);
+                        $this->csimareas .= " title=\"$tmp\" alt=\"$tmp\" ";
+                    }
+                    $this->csimareas .= " />\n";
+                }
+            }
+
+            if( $i >= $this->layout_n ) {
+                $x1 = $xp+$this->xlmargin;
+                $row++;
+                if( !empty($rowheight[$row]) )
+                    $y1 += $rowheight[$row];
+                $i = 1;
+            }
+            else {
+                $x1 += $colwidth[($i-1) % $numcolumns] ;
+                ++$i;
+            }
+        }
+    }
+} // Class
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_line.php b/common/lib/jpgraph_lib/jpgraph_line.php
old mode 100644
new mode 100755
index 715347fa6..21dd82130
--- a/common/lib/jpgraph_lib/jpgraph_line.php
+++ b/common/lib/jpgraph_lib/jpgraph_line.php
@@ -1,17 +1,15 @@
 <?php
 /*=======================================================================
-// File: 	JPGRAPH_LINE.PHP
-// Description:	Line plot extension for JpGraph
-// Created: 	2001-01-08
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_line.php,v 1.48.2.6 2004/12/11 13:40:44 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2001,2002 Johan Persson
-//========================================================================
-*/
-
-require_once 'jpgraph_plotmark.inc';
+ // File:  		 JPGRAPH_LINE.PHP
+ // Description: Line plot extension for JpGraph
+ // Created:  	 2001-01-08
+ // Ver:  		 $Id: jpgraph_line.php 1921 2009-12-11 11:46:39Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+
+require_once ('jpgraph_plotmark.inc.php');
 
 // constants for the (filled) area
 DEFINE("LP_AREA_FILLED", true);
@@ -23,476 +21,626 @@
 // CLASS LinePlot
 // Description:
 //===================================================
-class LinePlot extends Plot
-{
-    public $filled=false;
-    public $fill_color='blue';
+class LinePlot extends Plot{
     public $mark=null;
-    public $step_style=false, $center=false;
-    public $line_style=1;	// Default to solid
-    public $filledAreas = array(); // array of arrays(with min,max,col,filled in them)
+    protected $filled=false;
+    protected $fill_color='blue';
+    protected $step_style=false, $center=false;
+    protected $line_style=1; // Default to solid
+    protected $filledAreas = array(); // array of arrays(with min,max,col,filled in them)
     public $barcenter=false;  // When we mix line and bar. Should we center the line in the bar.
-    public $fillFromMin = false ;
-    public $fillgrad=false,$fillgrad_fromcolor='navy',$fillgrad_tocolor='silver',$fillgrad_numcolors=100;
-    public $iFastStroke=false;
-
-//---------------
-// CONSTRUCTOR
-    public function LinePlot(&$datay,$datax=false)
-    {
-    $this->Plot($datay,$datax);
-    $this->mark = new PlotMark();
-    }
-//---------------
-// PUBLIC METHODS
+    protected $fillFromMin = false, $fillFromMax = false;
+    protected $fillgrad=false,$fillgrad_fromcolor='navy',$fillgrad_tocolor='silver',$fillgrad_numcolors=100;
+    protected $iFastStroke=false;
 
-    // Set style, filled or open
-    public function SetFilled($aFlag=true)
-    {
-        JpGraphError::Raise('LinePlot::SetFilled() is deprecated. Use SetFillColor()');
+    //---------------
+    // CONSTRUCTOR
+    function LinePlot($datay,$datax=false) {
+        parent::__construct($datay,$datax);
+        $this->mark = new PlotMark() ;
+        $this->color = ColorFactory::getColor();
+        $this->fill_color = $this->color;
     }
+    //---------------
+    // PUBLIC METHODS
 
-    public function SetBarCenter($aFlag=true)
-    {
-    $this->barcenter=$aFlag;
+    function SetFilled($aFlg=true) {
+		$this->filled = $aFlg;
     }
 
-    public function SetStyle($aStyle)
-    {
-    $this->line_style=$aStyle;
+    function SetBarCenter($aFlag=true) {
+        $this->barcenter=$aFlag;
     }
 
-    public function SetStepStyle($aFlag=true)
-    {
-    $this->step_style = $aFlag;
+    function SetStyle($aStyle) {
+        $this->line_style=$aStyle;
     }
 
-    public function SetColor($aColor)
-    {
-    parent::SetColor($aColor);
+    function SetStepStyle($aFlag=true) {
+        $this->step_style = $aFlag;
     }
 
-    public function SetFillFromYMin($f=true)
-    {
-    $this->fillFromMin = $f ;
+    function SetColor($aColor) {
+        parent::SetColor($aColor);
     }
 
-    public function SetFillColor($aColor,$aFilled=true)
-    {
-    $this->fill_color=$aColor;
-    $this->filled=$aFilled;
+    function SetFillFromYMin($f=true) {
+        $this->fillFromMin = $f ;
     }
 
-    public function SetFillGradient($aFromColor,$aToColor,$aNumColors=100,$aFilled=true)
-    {
-    $this->fillgrad_fromcolor = $aFromColor;
-    $this->fillgrad_tocolor   = $aToColor;
-    $this->fillgrad_numcolors = $aNumColors;
-    $this->filled = $aFilled;
-    $this->fillgrad = true;
+    function SetFillFromYMax($f=true) {
+        $this->fillFromMax = $f ;
     }
 
-    public function Legend(&$graph)
-    {
-    if ($this->legend!="") {
-        if ($this->filled) {
-        $graph->legend->Add($this->legend,
-                    $this->fill_color,$this->mark,0,
-                    $this->legendcsimtarget,$this->legendcsimalt);
-        } else {
-        $graph->legend->Add($this->legend,
-                    $this->color,$this->mark,$this->line_style,
-                    $this->legendcsimtarget,$this->legendcsimalt);
-        }
+    function SetFillColor($aColor,$aFilled=true) {
+    	//$this->color = $aColor;
+        $this->fill_color=$aColor;
+        $this->filled=$aFilled;
     }
+
+    function SetFillGradient($aFromColor,$aToColor,$aNumColors=100,$aFilled=true) {
+        $this->fillgrad_fromcolor = $aFromColor;
+        $this->fillgrad_tocolor   = $aToColor;
+        $this->fillgrad_numcolors = $aNumColors;
+        $this->filled = $aFilled;
+        $this->fillgrad = true;
     }
 
-    public function AddArea($aMin=0,$aMax=0,$aFilled=LP_AREA_NOT_FILLED,$aColor="gray9",$aBorder=LP_AREA_BORDER)
-    {
-    if ($aMin > $aMax) {
-        // swap
-        $tmp = $aMin;
-        $aMin = $aMax;
-        $aMax = $tmp;
+    function Legend($graph) {
+        if( $this->legend!="" ) {
+            if( $this->filled && !$this->fillgrad ) {
+                $graph->legend->Add($this->legend,
+                $this->fill_color,$this->mark,0,
+                $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
+            }
+            elseif( $this->fillgrad ) {
+                $color=array($this->fillgrad_fromcolor,$this->fillgrad_tocolor);
+                // In order to differentiate between gradients and cooors specified as an RGB triple
+                $graph->legend->Add($this->legend,$color,"",-2 /* -GRAD_HOR */,
+                $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
+            } else {
+                $graph->legend->Add($this->legend,
+                $this->color,$this->mark,$this->line_style,
+                $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
+            }
+        }
     }
-    $this->filledAreas[] = array($aMin,$aMax,$aColor,$aFilled,$aBorder);
+
+    function AddArea($aMin=0,$aMax=0,$aFilled=LP_AREA_NOT_FILLED,$aColor="gray9",$aBorder=LP_AREA_BORDER) {
+        if($aMin > $aMax) {
+            // swap
+            $tmp = $aMin;
+            $aMin = $aMax;
+            $aMax = $tmp;
+        }
+        $this->filledAreas[] = array($aMin,$aMax,$aColor,$aFilled,$aBorder);
     }
 
     // Gets called before any axis are stroked
-    public function PreStrokeAdjust(&$graph)
-    {
-    // If another plot type have already adjusted the
-    // offset we don't touch it.
-    // (We check for empty in case the scale is  a log scale
-    // and hence doesn't contain any xlabel_offset)
-    if( empty($graph->xaxis->scale->ticks->xlabel_offset) ||
-        $graph->xaxis->scale->ticks->xlabel_offset == 0 ) {
-        if ($this->center) {
-        ++$this->numpoints;
-        $a=0.5; $b=0.5;
-        } else {
-        $a=0; $b=0;
+    function PreStrokeAdjust($graph) {
+
+        // If another plot type have already adjusted the
+        // offset we don't touch it.
+        // (We check for empty in case the scale is  a log scale
+        // and hence doesn't contain any xlabel_offset)
+        if( empty($graph->xaxis->scale->ticks->xlabel_offset) || $graph->xaxis->scale->ticks->xlabel_offset == 0 ) {
+            if( $this->center ) {
+                ++$this->numpoints;
+                $a=0.5; $b=0.5;
+            } else {
+                $a=0; $b=0;
+            }
+            $graph->xaxis->scale->ticks->SetXLabelOffset($a);
+            $graph->SetTextScaleOff($b);
+            //$graph->xaxis->scale->ticks->SupressMinorTickMarks();
         }
-        $graph->xaxis->scale->ticks->SetXLabelOffset($a);
-        $graph->SetTextScaleOff($b);
-        //$graph->xaxis->scale->ticks->SupressMinorTickMarks();
-    }
     }
 
-    public function SetFastStroke($aFlg=true)
-    {
-    $this->iFastStroke = $aFlg;
+    function SetFastStroke($aFlg=true) {
+        $this->iFastStroke = $aFlg;
     }
 
-    public function FastStroke(&$img,&$xscale,&$yscale,$aStartPoint=0,$exist_x=true)
-    {
-    // An optimized stroke for many data points with no extra
-    // features but 60% faster. You can't have values or line styles, or null
-    // values in plots.
-    $numpoints=count($this->coords[0]);
-    if( $this->barcenter )
-        $textadj = 0.5-$xscale->text_scale_off;
-    else
-        $textadj = 0;
-
-    $img->SetColor($this->color);
-    $img->SetLineWeight($this->weight);
-    $pnts=$aStartPoint;
-    while ($pnts < $numpoints) {
-        if( $exist_x ) $x=$this->coords[1][$pnts];
-        else $x=$pnts+$textadj;
-        $xt = $xscale->Translate($x);
-        $y=$this->coords[0][$pnts];
-        $yt = $yscale->Translate($y);
-        if ( is_numeric($y) ) {
-        $cord[] = $xt;
-        $cord[] = $yt;
-        } elseif ($y == '-' && $pnts > 0) {
-        // Just ignore
-        } else {
-        JpGraphError::Raise('Plot too complicated for fast line Stroke. Use standard Stroke()');
-
-        return;
+    function FastStroke($img,$xscale,$yscale,$aStartPoint=0,$exist_x=true) {
+        // An optimized stroke for many data points with no extra
+        // features but 60% faster. You can't have values or line styles, or null
+        // values in plots.
+        $numpoints=count($this->coords[0]);
+        if( $this->barcenter ) {
+            $textadj = 0.5-$xscale->text_scale_off;
+        }
+        else {
+            $textadj = 0;
         }
-        ++$pnts;
-    } // WHILE
 
-    $img->Polygon($cord,false,true);
+        $img->SetColor($this->color);
+        $img->SetLineWeight($this->weight);
+        $pnts=$aStartPoint;
+        while( $pnts < $numpoints ) {
+            if( $exist_x ) {
+                $x=$this->coords[1][$pnts];
+            }
+            else {
+                $x=$pnts+$textadj;
+            }
+            $xt = $xscale->Translate($x);
+            $y=$this->coords[0][$pnts];
+            $yt = $yscale->Translate($y);
+            if( is_numeric($y) ) {
+                $cord[] = $xt;
+                $cord[] = $yt;
+            }
+            elseif( $y == '-' && $pnts > 0 ) {
+                // Just ignore
+            }
+            else {
+                JpGraphError::RaiseL(10002);//('Plot too complicated for fast line Stroke. Use standard Stroke()');
+            }
+            ++$pnts;
+        } // WHILE
 
+        $img->Polygon($cord,false,true);
     }
 
-    public function Stroke(&$img,&$xscale,&$yscale)
-    {
-    $numpoints=count($this->coords[0]);
-    if ( isset($this->coords[1]) ) {
-        if( count($this->coords[1])!=$numpoints )
-        JpGraphError::Raise("Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])." Number of Y-points:$numpoints");
-        else
-        $exist_x = true;
-    } else
-        $exist_x = false;
-
-    if( $this->barcenter )
-        $textadj = 0.5-$xscale->text_scale_off;
-    else
-        $textadj = 0;
-
-    // Find the first numeric data point
-    $startpoint=0;
-    while( $startpoint < $numpoints && !is_numeric($this->coords[0][$startpoint]) )
-        ++$startpoint;
-
-    // Bail out if no data points
-    if( $startpoint == $numpoints )
+    function Stroke($img,$xscale,$yscale) {
+        $idx=0;
+        $numpoints=count($this->coords[0]);
+        if( isset($this->coords[1]) ) {
+            if( count($this->coords[1])!=$numpoints ) {
+                JpGraphError::RaiseL(2003,count($this->coords[1]),$numpoints);
+            //("Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])." Number of Y-points:$numpoints");
+            }
+            else {
+                $exist_x = true;
+            }
+        }
+        else {
+            $exist_x = false;
+        }
 
-        return;
+        if( $this->barcenter ) {
+            $textadj = 0.5-$xscale->text_scale_off;
+        }
+        else {
+            $textadj = 0;
+        }
 
-    if ($this->iFastStroke) {
-        $this->FastStroke($img,$xscale,$yscale,$startpoint,$exist_x);
+        // Find the first numeric data point
+        $startpoint=0;
+        while( $startpoint < $numpoints && !is_numeric($this->coords[0][$startpoint]) ) {
+            ++$startpoint;
+        }
 
-        return;
-    }
+        // Bail out if no data points
+        if( $startpoint == $numpoints ) return;
 
-    if( $exist_x )
-        $xs=$this->coords[1][$startpoint];
-    else
-        $xs= $textadj+$startpoint;
-
-    $img->SetStartPoint($xscale->Translate($xs),
-                $yscale->Translate($this->coords[0][$startpoint]));
-
-    if ($this->filled) {
-        $cord[] = $xscale->Translate($xs);
-        $min = $yscale->GetMinVal();
-        if( $min > 0 || $this->fillFromMin )
-        $cord[] = $yscale->Translate($min);
-        else
-        $cord[] = $yscale->Translate(0);
-    }
-    $xt = $xscale->Translate($xs);
-    $yt = $yscale->Translate($this->coords[0][$startpoint]);
-    $cord[] = $xt;
-    $cord[] = $yt;
-    $yt_old = $yt;
-    $xt_old = $xt;
-    $y_old = $this->coords[0][$startpoint];
-
-    $this->value->Stroke($img,$this->coords[0][$startpoint],$xt,$yt);
-
-    $img->SetColor($this->color);
-    $img->SetLineWeight($this->weight);
-    $img->SetLineStyle($this->line_style);
-    $pnts=$startpoint+1;
-    $firstnonumeric = false;
-    while ($pnts < $numpoints) {
-
-        if( $exist_x ) $x=$this->coords[1][$pnts];
-        else $x=$pnts+$textadj;
-        $xt = $xscale->Translate($x);
-        $yt = $yscale->Translate($this->coords[0][$pnts]);
-
-        $y=$this->coords[0][$pnts];
-        if ($this->step_style) {
-        // To handle null values within step style we need to record the
-        // first non numeric value so we know from where to start if the
-        // non value is '-'.
-        if ( is_numeric($y) ) {
-            $firstnonumeric = false;
-            if ( is_numeric($y_old) ) {
-            $img->StyleLine($xt_old,$yt_old,$xt,$yt_old);
-            $img->StyleLine($xt,$yt_old,$xt,$yt);
-            } elseif ($y_old == '-') {
-            $img->StyleLine($xt_first,$yt_first,$xt,$yt_first);
-            $img->StyleLine($xt,$yt_first,$xt,$yt);
-            } else {
-            $yt_old = $yt;
-            $xt_old = $xt;
-            }
-            $cord[] = $xt;
-            $cord[] = $yt_old;
-            $cord[] = $xt;
-            $cord[] = $yt;
-        } elseif ($firstnonumeric==false) {
-            $firstnonumeric = true;
-            $yt_first = $yt_old;
-            $xt_first = $xt_old;
+        if( $this->iFastStroke ) {
+            $this->FastStroke($img,$xscale,$yscale,$startpoint,$exist_x);
+            return;
         }
-        } else {
-        if ( is_numeric($y) || (is_string($y) && $y != "-") ) {
-            $tmp1=$this->coords[0][$pnts];
-            $tmp2=$this->coords[0][$pnts-1];
-            if ( is_numeric($tmp1)  && (is_numeric($tmp2) || $tmp2=="-" ) ) {
-            $img->StyleLineTo($xt,$yt);
-            } else {
-            $img->SetStartPoint($xt,$yt);
+
+        if( $exist_x ) {
+            $xs=$this->coords[1][$startpoint];
+        }
+        else {
+            $xs= $textadj+$startpoint;
+        }
+
+        $img->SetStartPoint($xscale->Translate($xs),
+        $yscale->Translate($this->coords[0][$startpoint]));
+
+        if( $this->filled ) {
+            if( $this->fillFromMax ) {
+                //$max = $yscale->GetMaxVal();
+                $cord[$idx++] = $xscale->Translate($xs);
+                $cord[$idx++] = $yscale->scale_abs[1];
             }
-            if( is_numeric($tmp1)  &&
-            (is_numeric($tmp2) || $tmp2=="-" || ($this->filled && $tmp2=='') ) ) {
-            $cord[] = $xt;
-            $cord[] = $yt;
+            else {
+                $min = $yscale->GetMinVal();
+                if( $min > 0 || $this->fillFromMin ) {
+                    $fillmin = $yscale->scale_abs[0];//Translate($min);
+                }
+                else {
+                    $fillmin = $yscale->Translate(0);
+                }
+
+                $cord[$idx++] = $xscale->Translate($xs);
+                $cord[$idx++] = $fillmin;
             }
         }
-        }
+        $xt = $xscale->Translate($xs);
+        $yt = $yscale->Translate($this->coords[0][$startpoint]);
+        $cord[$idx++] = $xt;
+        $cord[$idx++] = $yt;
         $yt_old = $yt;
         $xt_old = $xt;
-        $y_old = $y;
-
-        $this->StrokeDataValue($img,$this->coords[0][$pnts],$xt,$yt);
+        $y_old = $this->coords[0][$startpoint];
 
-        ++$pnts;
-    }
+        $this->value->Stroke($img,$this->coords[0][$startpoint],$xt,$yt);
 
-    if ($this->filled) {
-        $cord[] = $xt;
-        if( $min > 0 || $this->fillFromMin )
-        $cord[] = $yscale->Translate($min);
-        else
-        $cord[] = $yscale->Translate(0);
-        if ($this->fillgrad) {
-        $img->SetLineWeight(1);
-        $grad = new Gradient($img);
-        $grad->SetNumColors($this->fillgrad_numcolors);
-        $grad->FilledFlatPolygon($cord,$this->fillgrad_fromcolor,$this->fillgrad_tocolor);
+        $img->SetColor($this->color);
         $img->SetLineWeight($this->weight);
-        } else {
-        $img->SetColor($this->fill_color);
-        $img->FilledPolygon($cord);
+        $img->SetLineStyle($this->line_style);
+        $pnts=$startpoint+1;
+        $firstnonumeric = false;
+
+
+        while( $pnts < $numpoints ) {
+
+            if( $exist_x ) {
+                $x=$this->coords[1][$pnts];
+            }
+            else {
+                $x=$pnts+$textadj;
+            }
+            $xt = $xscale->Translate($x);
+            $yt = $yscale->Translate($this->coords[0][$pnts]);
+
+            $y=$this->coords[0][$pnts];
+            if( $this->step_style ) {
+                // To handle null values within step style we need to record the
+                // first non numeric value so we know from where to start if the
+                // non value is '-'.
+                if( is_numeric($y) ) {
+                    $firstnonumeric = false;
+                    if( is_numeric($y_old) ) {
+                        $img->StyleLine($xt_old,$yt_old,$xt,$yt_old);
+                        $img->StyleLine($xt,$yt_old,$xt,$yt);
+                    }
+                    elseif( $y_old == '-' ) {
+                        $img->StyleLine($xt_first,$yt_first,$xt,$yt_first);
+                        $img->StyleLine($xt,$yt_first,$xt,$yt);
+                    }
+                    else {
+                        $yt_old = $yt;
+                        $xt_old = $xt;
+                    }
+                    $cord[$idx++] = $xt;
+                    $cord[$idx++] = $yt_old;
+                    $cord[$idx++] = $xt;
+                    $cord[$idx++] = $yt;
+                }
+                elseif( $firstnonumeric==false ) {
+                    $firstnonumeric = true;
+                    $yt_first = $yt_old;
+                    $xt_first = $xt_old;
+                }
+            }
+            else {
+                $tmp1=$y;
+                $prev=$this->coords[0][$pnts-1];
+                if( $tmp1==='' || $tmp1===NULL || $tmp1==='X' ) $tmp1 = 'x';
+                if( $prev==='' || $prev===null || $prev==='X' ) $prev = 'x';
+
+                if( is_numeric($y) || (is_string($y) && $y != '-') ) {
+                    if( is_numeric($y) && (is_numeric($prev) || $prev === '-' ) ) {
+                        $img->StyleLineTo($xt,$yt);
+                    }
+                    else {
+                        $img->SetStartPoint($xt,$yt);
+                    }
+                }
+                if( $this->filled && $tmp1 !== '-' ) {
+                    if( $tmp1 === 'x' ) {
+                        $cord[$idx++] = $cord[$idx-3];
+                        $cord[$idx++] = $fillmin;
+                    }
+                    elseif( $prev === 'x' ) {
+                        $cord[$idx++] = $xt;
+                        $cord[$idx++] = $fillmin;
+                        $cord[$idx++] = $xt;
+                        $cord[$idx++] = $yt;
+                    }
+                    else {
+                        $cord[$idx++] = $xt;
+                        $cord[$idx++] = $yt;
+                    }
+                }
+                else {
+                    if( is_numeric($tmp1)  && (is_numeric($prev) || $prev === '-' ) ) {
+                        $cord[$idx++] = $xt;
+                        $cord[$idx++] = $yt;
+                    }
+                }
+            }
+            $yt_old = $yt;
+            $xt_old = $xt;
+            $y_old = $y;
+
+            $this->StrokeDataValue($img,$this->coords[0][$pnts],$xt,$yt);
+
+            ++$pnts;
         }
-        if ($this->line_weight > 0) {
-        $img->SetColor($this->color);
-        $img->Polygon($cord);
+
+        if( $this->filled  ) {
+            $cord[$idx++] = $xt;
+            if( $this->fillFromMax ) {
+                $cord[$idx++] = $yscale->scale_abs[1];
+            }
+            else {
+                if( $min > 0 || $this->fillFromMin ) {
+                    $cord[$idx++] = $yscale->Translate($min);
+                }
+                else {
+                    $cord[$idx++] = $yscale->Translate(0);
+                }
+            }
+            if( $this->fillgrad ) {
+                $img->SetLineWeight(1);
+                $grad = new Gradient($img);
+                $grad->SetNumColors($this->fillgrad_numcolors);
+                $grad->FilledFlatPolygon($cord,$this->fillgrad_fromcolor,$this->fillgrad_tocolor);
+                $img->SetLineWeight($this->weight);
+            }
+            else {
+                $img->SetColor($this->fill_color);
+                $img->FilledPolygon($cord);
+            }
+            if( $this->weight > 0 ) { 
+                $img->SetLineWeight($this->weight);
+                $img->SetColor($this->color);
+                // Remove first and last coordinate before drawing the line
+                // sine we otherwise get the vertical start and end lines which
+                // doesn't look appropriate
+                $img->Polygon(array_slice($cord,2,count($cord)-4));
+            }
         }
-    }
 
-    if (!empty($this->filledAreas)) {
+        if(!empty($this->filledAreas)) {
 
-        $minY = $yscale->Translate($yscale->GetMinVal());
-        $factor = ($this->step_style ? 4 : 2);
+            $minY = $yscale->Translate($yscale->GetMinVal());
+            $factor = ($this->step_style ? 4 : 2);
 
-        for ($i = 0; $i < sizeof($this->filledAreas); ++$i) {
-        // go through all filled area elements ordered by insertion
-        // fill polygon array
-        $areaCoords[] = $cord[$this->filledAreas[$i][0] * $factor];
-        $areaCoords[] = $minY;
+            for($i = 0; $i < sizeof($this->filledAreas); ++$i) {
+                // go through all filled area elements ordered by insertion
+                // fill polygon array
+                $areaCoords[] = $cord[$this->filledAreas[$i][0] * $factor];
+                $areaCoords[] = $minY;
 
-        $areaCoords =
-            array_merge($areaCoords,
+                $areaCoords =
+                array_merge($areaCoords,
                 array_slice($cord,
-                        $this->filledAreas[$i][0] * $factor,
-                        ($this->filledAreas[$i][1] - $this->filledAreas[$i][0] + ($this->step_style ? 0 : 1))  * $factor));
-        $areaCoords[] = $areaCoords[sizeof($areaCoords)-2]; // last x
-        $areaCoords[] = $minY; // last y
-
-        if ($this->filledAreas[$i][3]) {
-            $img->SetColor($this->filledAreas[$i][2]);
-            $img->FilledPolygon($areaCoords);
-            $img->SetColor($this->color);
-        }
-        // Check if we should draw the frame.
-        // If not we still re-draw the line since it might have been
-        // partially overwritten by the filled area and it doesn't look
-        // very good.
-        // TODO: The behaviour is undefined if the line does not have
-        // any line at the position of the area.
-        if( $this->filledAreas[$i][4] )
-            $img->Polygon($areaCoords);
-        else
-                $img->Polygon($cord);
-
-        $areaCoords = array();
+                $this->filledAreas[$i][0] * $factor,
+                ($this->filledAreas[$i][1] - $this->filledAreas[$i][0] + ($this->step_style ? 0 : 1))  * $factor));
+                $areaCoords[] = $areaCoords[sizeof($areaCoords)-2]; // last x
+                $areaCoords[] = $minY; // last y
+
+                if($this->filledAreas[$i][3]) {
+                    $img->SetColor($this->filledAreas[$i][2]);
+                    $img->FilledPolygon($areaCoords);
+                    $img->SetColor($this->color);
+                }
+                // Check if we should draw the frame.
+                // If not we still re-draw the line since it might have been
+                // partially overwritten by the filled area and it doesn't look
+                // very good.
+                if( $this->filledAreas[$i][4] ) {
+                    $img->Polygon($areaCoords);
+                }
+                else {
+                    $img->Polygon($cord);
+                }
+
+                $areaCoords = array();
+            }
         }
-    }
-
-    if( $this->mark->type == -1 || $this->mark->show == false )
 
+        if( $this->mark->type == -1 || $this->mark->show == false )
         return;
 
-    for ($pnts=0; $pnts<$numpoints; ++$pnts) {
-
-        if( $exist_x ) $x=$this->coords[1][$pnts];
-        else $x=$pnts+$textadj;
-        $xt = $xscale->Translate($x);
-        $yt = $yscale->Translate($this->coords[0][$pnts]);
+        for( $pnts=0; $pnts<$numpoints; ++$pnts) {
 
-        if ( is_numeric($this->coords[0][$pnts]) ) {
-        if ( !empty($this->csimtargets[$pnts]) ) {
-            $this->mark->SetCSIMTarget($this->csimtargets[$pnts]);
-            $this->mark->SetCSIMAlt($this->csimalts[$pnts]);
-        }
-        if( $exist_x )
-            $x=$this->coords[1][$pnts];
-        else
-            $x=$pnts;
-        $this->mark->SetCSIMAltVal($this->coords[0][$pnts],$x);
-        $this->mark->Stroke($img,$xt,$yt);
-        $this->csimareas .= $this->mark->GetCSIMAreas();
-        $this->StrokeDataValue($img,$this->coords[0][$pnts],$xt,$yt);
+            if( $exist_x ) {
+                $x=$this->coords[1][$pnts];
+            }
+            else {
+                $x=$pnts+$textadj;
+            }
+            $xt = $xscale->Translate($x);
+            $yt = $yscale->Translate($this->coords[0][$pnts]);
+
+            if( is_numeric($this->coords[0][$pnts]) ) {
+                if( !empty($this->csimtargets[$pnts]) ) {
+                    if( !empty($this->csimwintargets[$pnts]) ) {
+                        $this->mark->SetCSIMTarget($this->csimtargets[$pnts],$this->csimwintargets[$pnts]);
+                    }
+                    else {
+                        $this->mark->SetCSIMTarget($this->csimtargets[$pnts]);
+                    }
+                    $this->mark->SetCSIMAlt($this->csimalts[$pnts]);
+                }
+                if( $exist_x ) {
+                    $x=$this->coords[1][$pnts];
+                }
+                else {
+                    $x=$pnts;
+                }
+                $this->mark->SetCSIMAltVal($this->coords[0][$pnts],$x);
+                $this->mark->Stroke($img,$xt,$yt);
+                $this->csimareas .= $this->mark->GetCSIMAreas();
+            }
         }
     }
-
-    }
 } // Class
 
+
 //===================================================
 // CLASS AccLinePlot
 // Description:
 //===================================================
-class AccLinePlot extends Plot
-{
-    public $plots=null,$nbrplots=0,$numpoints=0;
-//---------------
-// CONSTRUCTOR
-    public function AccLinePlot($plots)
-    {
+class AccLinePlot extends Plot {
+    protected $plots=null,$nbrplots=0;
+    private $iStartEndZero=true;
+    //---------------
+    // CONSTRUCTOR
+    function __construct($plots) {
         $this->plots = $plots;
-    $this->nbrplots = count($plots);
-    $this->numpoints = $plots[0]->numpoints;
-    }
+        $this->nbrplots = count($plots);
+        $this->numpoints = $plots[0]->numpoints;
 
-//---------------
-// PUBLIC METHODS
-    public function Legend(&$graph)
-    {
-    foreach( $this->plots as $p )
-        $p->DoLegend($graph);
-    }
-
-    public function Max()
-    {
-    list($xmax) = $this->plots[0]->Max();
-    $nmax=0;
-    for ($i=0; $i<count($this->plots); ++$i) {
-        $n = count($this->plots[$i]->coords[0]);
-        $nmax = max($nmax,$n);
-        list($x) = $this->plots[$i]->Max();
-        $xmax = Max($xmax,$x);
-    }
-    for ($i = 0; $i < $nmax; $i++) {
-        // Get y-value for line $i by adding the
-        // individual bars from all the plots added.
-        // It would be wrong to just add the
-        // individual plots max y-value since that
-        // would in most cases give to large y-value.
-        $y=$this->plots[0]->coords[0][$i];
-        for ($j = 1; $j < $this->nbrplots; $j++) {
-        $y += $this->plots[ $j ]->coords[0][$i];
+        // Verify that all plots have the same number of data points
+        for( $i=1; $i < $this->nbrplots; ++$i ) {
+            if( $plots[$i]->numpoints != $this->numpoints ) {
+                JpGraphError::RaiseL(10003);//('Each plot in an accumulated lineplot must have the same number of data points',0)
+            }
         }
-        $ymax[$i] = $y;
-    }
-    $ymax = max($ymax);
 
-    return array($xmax,$ymax);
+        for($i=0; $i < $this->nbrplots; ++$i ) {
+            $this->LineInterpolate($this->plots[$i]->coords[0]);
+        }
     }
 
-    public function Min()
-    {
-    $nmax=0;
-    list($xmin,$ysetmin) = $this->plots[0]->Min();
-    for ($i=0; $i<count($this->plots); ++$i) {
-        $n = count($this->plots[$i]->coords[0]);
-        $nmax = max($nmax,$n);
-        list($x,$y) = $this->plots[$i]->Min();
-        $xmin = Min($xmin,$x);
-        $ysetmin = Min($y,$ysetmin);
-    }
-    for ($i = 0; $i < $nmax; $i++) {
-        // Get y-value for line $i by adding the
-        // individual bars from all the plots added.
-        // It would be wrong to just add the
-        // individual plots min y-value since that
-        // would in most cases give to small y-value.
-        $y=$this->plots[0]->coords[0][$i];
-        for ($j = 1; $j < $this->nbrplots; $j++) {
-        $y += $this->plots[ $j ]->coords[0][$i];
+    //---------------
+    // PUBLIC METHODS
+    function Legend($graph) {
+        foreach( $this->plots as $p ) {
+            $p->DoLegend($graph);
         }
-        $ymin[$i] = $y;
     }
-    $ymin = Min($ysetmin,Min($ymin));
 
-    return array($xmin,$ymin);
+    function Max() {
+        list($xmax) = $this->plots[0]->Max();
+        $nmax=0;
+        $n = count($this->plots);
+        for($i=0; $i < $n; ++$i) {
+            $nc = count($this->plots[$i]->coords[0]);
+            $nmax = max($nmax,$nc);
+            list($x) = $this->plots[$i]->Max();
+            $xmax = Max($xmax,$x);
+        }
+        for( $i = 0; $i < $nmax; $i++ ) {
+            // Get y-value for line $i by adding the
+            // individual bars from all the plots added.
+            // It would be wrong to just add the
+            // individual plots max y-value since that
+            // would in most cases give to large y-value.
+            $y=$this->plots[0]->coords[0][$i];
+            for( $j = 1; $j < $this->nbrplots; $j++ ) {
+                $y += $this->plots[ $j ]->coords[0][$i];
+            }
+            $ymax[$i] = $y;
+        }
+        $ymax = max($ymax);
+        return array($xmax,$ymax);
+    }
+
+    function Min() {
+        $nmax=0;
+        list($xmin,$ysetmin) = $this->plots[0]->Min();
+        $n = count($this->plots);
+        for($i=0; $i < $n; ++$i) {
+            $nc = count($this->plots[$i]->coords[0]);
+            $nmax = max($nmax,$nc);
+            list($x,$y) = $this->plots[$i]->Min();
+            $xmin = Min($xmin,$x);
+            $ysetmin = Min($y,$ysetmin);
+        }
+        for( $i = 0; $i < $nmax; $i++ ) {
+            // Get y-value for line $i by adding the
+            // individual bars from all the plots added.
+            // It would be wrong to just add the
+            // individual plots min y-value since that
+            // would in most cases give to small y-value.
+            $y=$this->plots[0]->coords[0][$i];
+            for( $j = 1; $j < $this->nbrplots; $j++ ) {
+                $y += $this->plots[ $j ]->coords[0][$i];
+            }
+            $ymin[$i] = $y;
+        }
+        $ymin = Min($ysetmin,Min($ymin));
+        return array($xmin,$ymin);
     }
 
     // Gets called before any axis are stroked
-    public function PreStrokeAdjust(&$graph)
-    {
-    // If another plot type have already adjusted the
-    // offset we don't touch it.
-    // (We check for empty in case the scale is  a log scale
-    // and hence doesn't contain any xlabel_offset)
-
-    if( empty($graph->xaxis->scale->ticks->xlabel_offset) ||
+    function PreStrokeAdjust($graph) {
+
+        // If another plot type have already adjusted the
+        // offset we don't touch it.
+        // (We check for empty in case the scale is  a log scale
+        // and hence doesn't contain any xlabel_offset)
+
+        if( empty($graph->xaxis->scale->ticks->xlabel_offset) ||
         $graph->xaxis->scale->ticks->xlabel_offset == 0 ) {
-        if ($this->center) {
-        ++$this->numpoints;
-        $a=0.5; $b=0.5;
-        } else {
-        $a=0; $b=0;
+            if( $this->center ) {
+                ++$this->numpoints;
+                $a=0.5; $b=0.5;
+            } else {
+                $a=0; $b=0;
+            }
+            $graph->xaxis->scale->ticks->SetXLabelOffset($a);
+            $graph->SetTextScaleOff($b);
+            $graph->xaxis->scale->ticks->SupressMinorTickMarks();
         }
-        $graph->xaxis->scale->ticks->SetXLabelOffset($a);
-        $graph->SetTextScaleOff($b);
-        $graph->xaxis->scale->ticks->SupressMinorTickMarks();
+
     }
 
+    function SetInterpolateMode($aIntMode) {
+        $this->iStartEndZero=$aIntMode;
+    }
+
+    // Replace all '-' with an interpolated value. We use straightforward
+    // linear interpolation. If the data starts with one or several '-' they
+    // will be replaced by the the first valid data point
+    function LineInterpolate(&$aData) {
+
+        $n=count($aData);
+        $i=0;
+
+        // If first point is undefined we will set it to the same as the first
+        // valid data
+        if( $aData[$i]==='-' ) {
+            // Find the first valid data
+            while( $i < $n && $aData[$i]==='-' ) {
+                ++$i;
+            }
+            if( $i < $n ) {
+                for($j=0; $j < $i; ++$j ) {
+                    if( $this->iStartEndZero )
+                    $aData[$i] = 0;
+                    else
+                    $aData[$j] = $aData[$i];
+                }
+            }
+            else {
+                // All '-' => Error
+                return false;
+            }
+        }
+
+        while($i < $n) {
+            while( $i < $n && $aData[$i] !== '-' ) {
+                ++$i;
+            }
+            if( $i < $n ) {
+                $pstart=$i-1;
+
+                // Now see how long this segment of '-' are
+                while( $i < $n && $aData[$i] === '-' ) {
+                    ++$i;
+                }
+                if( $i < $n ) {
+                    $pend=$i;
+                    $size=$pend-$pstart;
+                    $k=($aData[$pend]-$aData[$pstart])/$size;
+                    // Replace the segment of '-' with a linear interpolated value.
+                    for($j=1; $j < $size; ++$j ) {
+                        $aData[$pstart+$j] = $aData[$pstart] + $j*$k ;
+                    }
+                }
+                else {
+                    // There are no valid end point. The '-' goes all the way to the end
+                    // In that case we just set all the remaining values the the same as the
+                    // last valid data point.
+                    for( $j=$pstart+1; $j < $n; ++$j )
+                    if( $this->iStartEndZero ) {
+                        $aData[$j] = 0;
+                    }
+                    else {
+                        $aData[$j] = $aData[$pstart] ;
+                    }
+                }
+            }
+        }
+        return true;
     }
 
     // To avoid duplicate of line drawing code here we just
@@ -501,32 +649,34 @@ public function PreStrokeAdjust(&$graph)
     // it wouldn't be possible to create an acc line plot
     // with the same graphs, i.e AccLinePlot(array($pl,$pl,$pl));
     // since this method would have a side effect.
-    public function Stroke(&$img,&$xscale,&$yscale)
-    {
-    $img->SetLineWeight($this->weight);
-    $this->numpoints = count($this->plots[0]->coords[0]);
-    // Allocate array
-    $coords[$this->nbrplots][$this->numpoints]=0;
-    for ($i=0; $i<$this->numpoints; $i++) {
-        $coords[0][$i]=$this->plots[0]->coords[0][$i];
-        $accy=$coords[0][$i];
-        for ($j=1; $j<$this->nbrplots; ++$j) {
-        $coords[$j][$i] = $this->plots[$j]->coords[0][$i]+$accy;
-        $accy = $coords[$j][$i];
+    function Stroke($img,$xscale,$yscale) {
+        $img->SetLineWeight($this->weight);
+        $this->numpoints = count($this->plots[0]->coords[0]);
+        // Allocate array
+        $coords[$this->nbrplots][$this->numpoints]=0;
+        for($i=0; $i<$this->numpoints; $i++) {
+            $coords[0][$i]=$this->plots[0]->coords[0][$i];
+            $accy=$coords[0][$i];
+            for($j=1; $j<$this->nbrplots; ++$j ) {
+                $coords[$j][$i] = $this->plots[$j]->coords[0][$i]+$accy;
+                $accy = $coords[$j][$i];
+            }
         }
-    }
-    for ($j=$this->nbrplots-1; $j>=0; --$j) {
-        $p=$this->plots[$j];
-        for ($i=0; $i<$this->numpoints; ++$i) {
-        $tmp[$i]=$p->coords[0][$i];
-        $p->coords[0][$i]=$coords[$j][$i];
+        for($j=$this->nbrplots-1; $j>=0; --$j) {
+            $p=$this->plots[$j];
+            for( $i=0; $i<$this->numpoints; ++$i) {
+                $tmp[$i]=$p->coords[0][$i];
+                $p->coords[0][$i]=$coords[$j][$i];
+            }
+            $p->Stroke($img,$xscale,$yscale);
+            for( $i=0; $i<$this->numpoints; ++$i) {
+                $p->coords[0][$i]=$tmp[$i];
+            }
+            $p->coords[0][]=$tmp;
         }
-        $p->Stroke($img,$xscale,$yscale);
-        for( $i=0; $i<$this->numpoints; ++$i)
-        $p->coords[0][$i]=$tmp[$i];
-        $p->coords[0][]=$tmp;
-    }
     }
 } // Class
 
+
 /* EOF */
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_log.php b/common/lib/jpgraph_lib/jpgraph_log.php
old mode 100644
new mode 100755
index b61e031de..d5146ecd8
--- a/common/lib/jpgraph_lib/jpgraph_log.php
+++ b/common/lib/jpgraph_lib/jpgraph_log.php
@@ -1,15 +1,13 @@
 <?php
 /*=======================================================================
-// File: 	JPGRAPH_LOG.PHP
-// Description:	Log scale plot extension for JpGraph
-// Created: 	2001-01-08
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_log.php,v 1.15.2.6 2004/06/12 21:41:37 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2001,2002 Johan Persson
-//========================================================================
-*/
+ // File:        JPGRAPH_LOG.PHP
+ // Description: Log scale plot extension for JpGraph
+ // Created:     2001-01-08
+ // Ver:         $Id: jpgraph_log.php 1106 2009-02-22 20:16:35Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
 
 DEFINE('LOGLABELS_PLAIN',0);
 DEFINE('LOGLABELS_MAGNITUDE',1);
@@ -18,74 +16,73 @@
 // CLASS LogScale
 // Description: Logarithmic scale between world and screen
 //===================================================
-class LogScale extends LinearScale
-{
-//---------------
-// CONSTRUCTOR
+class LogScale extends LinearScale {
+    //---------------
+    // CONSTRUCTOR
 
     // Log scale is specified using the log of min and max
-    public function LogScale($min,$max,$type="y")
-    {
-    $this->LinearScale($min,$max,$type);
-    $this->ticks = new LogTicks();
-    $this->name = 'log';
+    function __construct($min,$max,$type="y") {
+        parent::__construct($min,$max,$type);
+        $this->ticks = new LogTicks();
+        $this->name = 'log';
     }
 
-//----------------
-// PUBLIC METHODS
+    //----------------
+    // PUBLIC METHODS
 
     // Translate between world and screen
-    public function Translate($a)
-    {
-    if ( !is_numeric($a) ) {
-        if( $a != '' && $a != '-' && $a != 'x' )
-        JpGraphError::Raise('Your data contains non-numeric values.');
-
-        return 1;
-    }
-    if ($a < 0) {
-        JpGraphError::Raise("Negative data values can not be used in a log scale.");
-        exit(1);
-    }
-    if( $a==0 ) $a=1;
-    $a=log10($a);
-
-    return ceil($this->off + ($a*1.0 - $this->scale[0]) * $this->scale_factor);
+    function Translate($a) {
+        if( !is_numeric($a) ) {
+            if( $a != '' && $a != '-' && $a != 'x' ) { 
+                JpGraphError::RaiseL(11001);
+                // ('Your data contains non-numeric values.');
+            }
+            return 1;
+        }
+        if( $a < 0 ) {
+            JpGraphError::RaiseL(11002);
+            //("Negative data values can not be used in a log scale.");
+            exit(1);
+        }
+        if( $a==0 ) $a=1;
+        $a=log10($a);
+        return ceil($this->off + ($a*1.0 - $this->scale[0]) * $this->scale_factor);
     }
 
     // Relative translate (don't include offset) usefull when we just want
     // to know the relative position (in pixels) on the axis
-    public function RelTranslate($a)
-    {
-    if ( !is_numeric($a) ) {
-        if( $a != '' && $a != '-' && $a != 'x' )
-        JpGraphError::Raise('Your data contains non-numeric values.');
-
-        return 1;
-    }
-    if( $a==0 ) $a=1;
-    $a=log10($a);
-
-    return round(($a*1.0 - $this->scale[0]) * $this->scale_factor);
+    function RelTranslate($a) {
+        if( !is_numeric($a) ) {
+            if( $a != '' && $a != '-' && $a != 'x' ) {
+                JpGraphError::RaiseL(11001);
+                //('Your data contains non-numeric values.');
+            }
+            return 1;
+        }
+        if( $a==0 ) {
+            $a=1;
+        }
+        $a=log10($a);
+        return round(($a*1.0 - $this->scale[0]) * $this->scale_factor);
     }
 
     // Use bcpow() for increased precision
-    public function GetMinVal()
-    {
-    if( function_exists("bcpow") )
-
-        return round(bcpow(10,$this->scale[0],15),14);
-    else
-        return round(pow(10,$this->scale[0]),14);
+    function GetMinVal() {
+        if( function_exists("bcpow") ) {
+            return round(bcpow(10,$this->scale[0],15),14);
+        }
+        else {
+            return round(pow(10,$this->scale[0]),14);
+        }
     }
 
-    public function GetMaxVal()
-    {
-    if( function_exists("bcpow") )
-
-        return round(bcpow(10,$this->scale[1],15),14);
-    else
-        return round(pow(10,$this->scale[1]),14);
+    function GetMaxVal() {
+        if( function_exists("bcpow") ) {
+            return round(bcpow(10,$this->scale[1],15),14);
+        }
+        else {
+            return round(pow(10,$this->scale[1]),14);
+        }
     }
 
     // Logarithmic autoscaling is much simplier since we just
@@ -93,174 +90,216 @@ public function GetMaxVal()
     // Note that for log autoscale the "maxstep" the fourth argument
     // isn't used. This is just included to give the method the same
     // signature as the linear counterpart.
-    public function AutoScale(&$img,$min,$max,$dummy)
-    {
-    if( $min==0 ) $min=1;
+    function AutoScale($img,$min,$max,$maxsteps,$majend=true) {
+        if( $min==0 ) $min=1;
 
-    if ($max <= 0) {
-        JpGraphError::Raise('Scale error for logarithmic scale. You have a problem with your data values. The max value must be greater than 0. It is mathematically impossible to have 0 in a logarithmic scale.');
-    }
-    $smin = floor(log10($min));
-    $smax = ceil(log10($max));
-    $this->Update($img,$smin,$smax);
+        if( $max <= 0 ) {
+            JpGraphError::RaiseL(11004);
+            //('Scale error for logarithmic scale. You have a problem with your data values. The max value must be greater than 0. It is mathematically impossible to have 0 in a logarithmic scale.');
+        }
+        if( is_numeric($this->autoscale_min) ) {
+            $smin = round($this->autoscale_min);
+            $smax = ceil(log10($max));
+            if( $min >= $max ) {
+                JpGraphError::RaiseL(25071);//('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.');
+            }
+        }
+        else {
+            $smin = floor(log10($min));
+            if( is_numeric($this->autoscale_max) ) {
+                $smax = round($this->autoscale_max);
+                if( $smin >= $smax ) {
+                    JpGraphError::RaiseL(25072);//('You have specified a max value with SetAutoMax() which is smaller than the miminum value used for the scale. This is not possible.');
+                }
+            }
+            else
+            $smax = ceil(log10($max));
+        }
+
+        $this->Update($img,$smin,$smax);
     }
-//---------------
-// PRIVATE METHODS
+    //---------------
+    // PRIVATE METHODS
 } // Class
 
 //===================================================
 // CLASS LogTicks
 // Description:
 //===================================================
-class LogTicks extends Ticks
-{
-    public $label_logtype=LOGLABELS_MAGNITUDE;
-//---------------
-// CONSTRUCTOR
-    public function LogTicks()
-    {
+class LogTicks extends Ticks{
+    private $label_logtype=LOGLABELS_MAGNITUDE;
+    private $ticklabels_pos = array();
+    //---------------
+    // CONSTRUCTOR
+    function LogTicks() {
     }
-//---------------
-// PUBLIC METHODS
-    public function IsSpecified()
-    {
-    return true;
+    //---------------
+    // PUBLIC METHODS
+    function IsSpecified() {
+        return true;
     }
 
-    public function SetLabelLogType($aType)
-    {
-    $this->label_logtype = $aType;
+    function SetLabelLogType($aType) {
+        $this->label_logtype = $aType;
     }
 
     // For log scale it's meaningless to speak about a major step
     // We just return -1 to make the framework happy (specifically
     // StrokeLabels() )
-    public function GetMajor()
-    {
-    return -1;
+    function GetMajor() {
+        return -1;
     }
 
-    public function SetTextLabelStart($aStart)
-    {
-    JpGraphError::Raise('Specifying tick interval for a logarithmic scale is undefined. Remove any calls to SetTextLabelStart() or SetTextTickInterval() on the logarithmic scale.');
+    function SetTextLabelStart($aStart) {
+        JpGraphError::RaiseL(11005);
+        //('Specifying tick interval for a logarithmic scale is undefined. Remove any calls to SetTextLabelStart() or SetTextTickInterval() on the logarithmic scale.');
     }
 
-    public function SetXLabelOffset($dummy)
-    {
-    // For log scales we dont care about XLabel offset
+    function SetXLabelOffset($dummy) {
+        // For log scales we dont care about XLabel offset
     }
 
     // Draw ticks on image "img" using scale "scale". The axis absolute
     // position in the image is specified in pos, i.e. for an x-axis
     // it specifies the absolute y-coord and for Y-ticks it specified the
     // absolute x-position.
-    public function Stroke(&$img,&$scale,$pos)
-    {
-    $start = $scale->GetMinVal();
-    $limit = $scale->GetMaxVal();
-    $nextMajor = 10*$start;
-    $step = $nextMajor / 10.0;
-
+    function Stroke($img,$scale,$pos) {
+        $start = $scale->GetMinVal();
+        $limit = $scale->GetMaxVal();
+        $nextMajor = 10*$start;
+        $step = $nextMajor / 10.0;
 
-    $img->SetLineWeight($this->weight);
 
-    if ($scale->type == "y") {
-        // member direction specified if the ticks should be on
-        // left or right side.
-        $a=$pos + $this->direction*$this->GetMinTickAbsSize();
-        $a2=$pos + $this->direction*$this->GetMajTickAbsSize();
+        $img->SetLineWeight($this->weight);
 
-        $count=1;
-        $this->maj_ticks_pos[0]=$scale->Translate($start);
-        $this->maj_ticklabels_pos[0]=$scale->Translate($start);
-        if( $this->supress_first )
-        $this->maj_ticks_label[0]="";
-        else {
-        if ($this->label_formfunc != '') {
-            $f = $this->label_formfunc;
-            $this->maj_ticks_label[0]=call_user_func($f,$start);
-        } elseif( $this->label_logtype == LOGLABELS_PLAIN )
-            $this->maj_ticks_label[0]=$start;
-        else
-            $this->maj_ticks_label[0]='10^'.round(log10($start));
-        }
-        $i=1;
-        for ($y=$start; $y<=$limit; $y+=$step,++$count) {
-        $ys=$scale->Translate($y);
-        $this->ticks_pos[]=$ys;
-        $this->ticklabels_pos[]=$ys;
-        if ($count % 10 == 0) {
-            if ($this->majcolor!="") {
-            $img->PushColor($this->majcolor);
-            $img->Line($pos,$ys,$a2,$ys);
-            $img->PopColor();
-            } else
-            $img->Line($pos,$ys,$a2,$ys);
+        if( $scale->type == "y" ) {
+            // member direction specified if the ticks should be on
+            // left or right side.
+            $a=$pos + $this->direction*$this->GetMinTickAbsSize();
+            $a2=$pos + $this->direction*$this->GetMajTickAbsSize();
+             
+            $count=1;
+            $this->maj_ticks_pos[0]=$scale->Translate($start);
+            $this->maj_ticklabels_pos[0]=$scale->Translate($start);
+            if( $this->supress_first )
+            $this->maj_ticks_label[0]="";
+            else {
+                if( $this->label_formfunc != '' ) {
+                    $f = $this->label_formfunc;
+                    $this->maj_ticks_label[0]=call_user_func($f,$start);
+                }
+                elseif( $this->label_logtype == LOGLABELS_PLAIN ) {
+                    $this->maj_ticks_label[0]=$start;
+                }
+                else {
+                    $this->maj_ticks_label[0]='10^'.round(log10($start));
+                }
+            }
+            $i=1;
+            for($y=$start; $y<=$limit; $y+=$step,++$count  ) {
+                $ys=$scale->Translate($y);
+                $this->ticks_pos[]=$ys;
+                $this->ticklabels_pos[]=$ys;
+                if( $count % 10 == 0 ) {
+                    if( !$this->supress_tickmarks ) {
+                        if( $this->majcolor!="" ) {
+                            $img->PushColor($this->majcolor);
+                            $img->Line($pos,$ys,$a2,$ys);
+                            $img->PopColor();
+                        }
+                        else {
+                            $img->Line($pos,$ys,$a2,$ys);
+                        }
+                    }
 
-            $this->maj_ticks_pos[$i]=$ys;
-            $this->maj_ticklabels_pos[$i]=$ys;
+                    $this->maj_ticks_pos[$i]=$ys;
+                    $this->maj_ticklabels_pos[$i]=$ys;
 
-            if ($this->label_formfunc != '') {
-            $f = $this->label_formfunc;
-            $this->maj_ticks_label[$i]=call_user_func($f,$nextMajor);
-            } elseif( $this->label_logtype == 0 )
-            $this->maj_ticks_label[$i]=$nextMajor;
-            else
-            $this->maj_ticks_label[$i]='10^'.round(log10($nextMajor));
-            ++$i;
-            $nextMajor *= 10;
-            $step *= 10;
-            $count=1;
-        } else {
-            if( $this->mincolor!="" ) $img->PushColor($this->mincolor);
-            $img->Line($pos,$ys,$a,$ys);
-            if( $this->mincolor!="" ) $img->PopCOlor();
-        }
+                    if( $this->label_formfunc != '' ) {
+                        $f = $this->label_formfunc;
+                        $this->maj_ticks_label[$i]=call_user_func($f,$nextMajor);
+                    }
+                    elseif( $this->label_logtype == 0 ) {
+                        $this->maj_ticks_label[$i]=$nextMajor;
+                    }
+                    else {
+                        $this->maj_ticks_label[$i]='10^'.round(log10($nextMajor));
+                    }
+                    ++$i;
+                    $nextMajor *= 10;
+                    $step *= 10;
+                    $count=1;
+                }
+                else {
+                    if( !$this->supress_tickmarks && !$this->supress_minor_tickmarks) {
+                        if( $this->mincolor!="" ) {
+                            $img->PushColor($this->mincolor);
+                        }
+                        $img->Line($pos,$ys,$a,$ys);
+                        if( $this->mincolor!="" ) {
+                            $img->PopColor();
+                        }
+                    }
+                }
+            }
         }
-    } else {
-        $a=$pos - $this->direction*$this->GetMinTickAbsSize();
-        $a2=$pos - $this->direction*$this->GetMajTickAbsSize();
-        $count=1;
-        $this->maj_ticks_pos[0]=$scale->Translate($start);
-        $this->maj_ticklabels_pos[0]=$scale->Translate($start);
-        if( $this->supress_first )
-        $this->maj_ticks_label[0]="";
         else {
-        if ($this->label_formfunc != '') {
-            $f = $this->label_formfunc;
-            $this->maj_ticks_label[0]=call_user_func($f,$start);
-        } elseif( $this->label_logtype == 0 )
-            $this->maj_ticks_label[0]=$start;
-        else
-            $this->maj_ticks_label[0]='10^'.round(log10($start));
-        }
-        $i=1;
-        for ($x=$start; $x<=$limit; $x+=$step,++$count) {
-        $xs=$scale->Translate($x);
-        $this->ticks_pos[]=$xs;
-        $this->ticklabels_pos[]=$xs;
-        if ($count % 10 == 0) {
-            $img->Line($xs,$pos,$xs,$a2);
-            $this->maj_ticks_pos[$i]=$xs;
-            $this->maj_ticklabels_pos[$i]=$xs;
-
-            if ($this->label_formfunc != '') {
-            $f = $this->label_formfunc;
-            $this->maj_ticks_label[$i]=call_user_func($f,$nextMajor);
-            } elseif( $this->label_logtype == 0 )
-            $this->maj_ticks_label[$i]=$nextMajor;
-            else
-            $this->maj_ticks_label[$i]='10^'.round(log10($nextMajor));
-            ++$i;
-            $nextMajor *= 10;
-            $step *= 10;
+            $a=$pos - $this->direction*$this->GetMinTickAbsSize();
+            $a2=$pos - $this->direction*$this->GetMajTickAbsSize();
             $count=1;
-        } else
-            $img->Line($xs,$pos,$xs,$a);
-        }
-    }
+            $this->maj_ticks_pos[0]=$scale->Translate($start);
+            $this->maj_ticklabels_pos[0]=$scale->Translate($start);
+            if( $this->supress_first ) {
+                $this->maj_ticks_label[0]="";
+            }
+            else {
+                if( $this->label_formfunc != '' ) {
+                    $f = $this->label_formfunc;
+                    $this->maj_ticks_label[0]=call_user_func($f,$start);
+                }
+                elseif( $this->label_logtype == 0 ) {
+                    $this->maj_ticks_label[0]=$start;
+                }
+                else {
+                    $this->maj_ticks_label[0]='10^'.round(log10($start));
+                }
+            }
+            $i=1;
+            for($x=$start; $x<=$limit; $x+=$step,++$count  ) {
+                $xs=$scale->Translate($x);
+                $this->ticks_pos[]=$xs;
+                $this->ticklabels_pos[]=$xs;
+                if( $count % 10 == 0 ) {
+                    if( !$this->supress_tickmarks ) {
+                        $img->Line($xs,$pos,$xs,$a2);
+                    }
+                    $this->maj_ticks_pos[$i]=$xs;
+                    $this->maj_ticklabels_pos[$i]=$xs;
 
-    return true;
+                    if( $this->label_formfunc != '' ) {
+                        $f = $this->label_formfunc;
+                        $this->maj_ticks_label[$i]=call_user_func($f,$nextMajor);
+                    }
+                    elseif( $this->label_logtype == 0 ) {
+                        $this->maj_ticks_label[$i]=$nextMajor;
+                    }
+                    else {
+                        $this->maj_ticks_label[$i]='10^'.round(log10($nextMajor));
+                    }
+                    ++$i;
+                    $nextMajor *= 10;
+                    $step *= 10;
+                    $count=1;
+                }
+                else {
+                    if( !$this->supress_tickmarks && !$this->supress_minor_tickmarks) {
+                        $img->Line($xs,$pos,$xs,$a);
+                    }
+                }
+            }
+        }
+        return true;
     }
 } // Class
 /* EOF */
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_meshinterpolate.inc.php b/common/lib/jpgraph_lib/jpgraph_meshinterpolate.inc.php
new file mode 100644
index 000000000..7e8ae5355
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_meshinterpolate.inc.php
@@ -0,0 +1,105 @@
+<?php
+/*=======================================================================
+// File:        JPGRAPH_MESHINTERPOLATE.INC.PHP
+// Description: Utility class to do mesh linear interpolation of a matrix
+// Created:     2009-03-09
+// Ver:         $Id: jpgraph_meshinterpolate.inc.php 1709 2009-07-30 08:00:08Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+*/
+  
+/**
+* Utility function to do linear mesh interpolation
+* @param $aDat Matrix to interpolate
+* @param $aFactor Interpolation factor  
+*/
+function doMeshInterpolate( &$aData, $aFactor ) {
+    $m = new MeshInterpolate();
+    $aData = $m->Linear($aData,$aFactor);
+}
+
+/**
+ * Utility class to interpolate a given data matrix
+ *
+ */
+class MeshInterpolate {
+    private $data = array();
+
+   /**
+    * Calculate the mid points of the given rectangle which has its top left
+    * corner at $row,$col. The $aFactordecides how many spliots should be done.
+    * i.e. how many more divisions should be done recursively
+    *
+    * @param $row Top left corner of square to work with
+    * @param $col Top left corner of square to work with
+    * $param $aFactor In how many subsquare should we split this square. A value of 1 indicates that no action
+    */
+    function IntSquare( $aRow, $aCol, $aFactor ) {
+        if ( $aFactor <= 1 )
+            return;
+
+        $step = pow( 2, $aFactor-1 );
+
+        $v0 = $this->data[$aRow][$aCol];
+        $v1 = $this->data[$aRow][$aCol + $step];
+        $v2 = $this->data[$aRow + $step][$aCol];
+        $v3 = $this->data[$aRow + $step][$aCol + $step];
+
+        $this->data[$aRow][$aCol + $step / 2] = ( $v0 + $v1 ) / 2;
+        $this->data[$aRow + $step / 2][$aCol] = ( $v0 + $v2 ) / 2;
+        $this->data[$aRow + $step][$aCol + $step / 2] = ( $v2 + $v3 ) / 2;
+        $this->data[$aRow + $step / 2][$aCol + $step] = ( $v1 + $v3 ) / 2;
+        $this->data[$aRow + $step / 2][$aCol + $step / 2] = ( $v0 + $v1 + $v2 + $v3 ) / 4;
+
+        $this->IntSquare( $aRow, $aCol, $aFactor-1 );
+        $this->IntSquare( $aRow, $aCol + $step / 2, $aFactor-1 );
+        $this->IntSquare( $aRow + $step / 2, $aCol, $aFactor-1 );
+        $this->IntSquare( $aRow + $step / 2, $aCol + $step / 2, $aFactor-1 );
+    }
+
+    /**
+     * Interpolate values in a matrice so that the total number of data points
+     * in vert and horizontal axis are $aIntNbr more. For example $aIntNbr=2 will
+     * make the data matrice have tiwce as many vertical and horizontal dta points.
+     *
+     * Note: This will blow up the matrcide in memory size in the order of $aInNbr^2
+     *
+     * @param  $ &$aData The original data matricde
+     * @param  $aInNbr Interpolation factor
+     * @return the interpolated matrice
+     */
+    function Linear( &$aData, $aIntFactor ) {
+        $step = pow( 2, $aIntFactor-1 );
+
+        $orig_cols = count( $aData[0] );
+        $orig_rows = count( $aData );
+        // Number of new columns/rows
+        // N = (a-1) * 2^(f-1) + 1
+        $p = pow( 2, $aIntFactor-1 );
+        $new_cols = $p * ( $orig_cols - 1 ) + 1;
+        $new_rows = $p * ( $orig_rows - 1 ) + 1;
+
+        $this->data = array_fill( 0, $new_rows, array_fill( 0, $new_cols, 0 ) );
+        // Initialize the new matrix with the values that we know
+        for ( $i = 0; $i < $new_rows; $i++ ) {
+            for ( $j = 0; $j < $new_cols; $j++ ) {
+                $v = 0 ;
+                if ( ( $i % $step == 0 ) && ( $j % $step == 0 ) ) {
+                    $v = $aData[$i / $step][$j / $step];
+                }
+                $this->data[$i][$j] = $v;
+            }
+        }
+
+        for ( $i = 0; $i < $new_rows-1; $i += $step ) {
+            for ( $j = 0; $j < $new_cols-1; $j += $step ) {
+                $this->IntSquare( $i, $j, $aIntFactor );
+            }
+        }
+
+        return $this->data;
+    }
+}
+  
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_mgraph.php b/common/lib/jpgraph_lib/jpgraph_mgraph.php
new file mode 100644
index 000000000..80b2b6d71
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_mgraph.php
@@ -0,0 +1,345 @@
+<?php
+/*=======================================================================
+ // File:        JPGRAPH_MGRAPH.PHP
+ // Description: Class to handle multiple graphs in the same image
+ // Created:     2006-01-15
+ // Ver:         $Id: jpgraph_mgraph.php 1770 2009-08-17 06:10:22Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+
+//=============================================================================
+// CLASS MGraph
+// Description: Create a container image that can hold several graph
+//=============================================================================
+class MGraph {
+
+    public $title = null, $subtitle = null, $subsubtitle = null;
+
+    protected $img=NULL;
+    protected $iCnt=0,$iGraphs = array(); // image_handle, x, y, fx, fy, sizex, sizey
+    protected $iFillColor='white', $iCurrentColor=0;
+    protected $lm=4,$rm=4,$tm=4,$bm=4;
+    protected $iDoFrame = FALSE, $iFrameColor = 'black', $iFrameWeight = 1;
+    protected $iLineWeight = 1;
+    protected $expired=false;
+    protected $cache=null,$cache_name = '',$inline=true;
+    protected $image_format='png',$image_quality=75;
+    protected $iWidth=NULL,$iHeight=NULL;
+    protected $background_image='',$background_image_center=true,
+    $backround_image_format='',$background_image_mix=100,
+    $background_image_y=NULL, $background_image_x=NULL;
+    private $doshadow=false, $shadow_width=4, $shadow_color='gray@0.5';
+    public $footer;
+
+
+    // Create a new instane of the combined graph
+    function __construct($aWidth=NULL,$aHeight=NULL,$aCachedName='',$aTimeOut=0,$aInline=true) {
+        $this->iWidth = $aWidth;
+        $this->iHeight = $aHeight;
+
+        // If the cached version exist just read it directly from the
+        // cache, stream it back to browser and exit
+        if( $aCachedName!='' && READ_CACHE && $aInline ) {
+            $this->cache = new ImgStreamCache();
+            $this->cache->SetTimeOut($aTimeOut);
+            $image = new Image();
+            if( $this->cache->GetAndStream($image,$aCachedName) ) {
+                exit();
+            }
+        }
+        $this->inline = $aInline;
+        $this->cache_name = $aCachedName;
+
+        $this->title = new Text();
+        $this->title->ParagraphAlign('center');
+        $this->title->SetFont(FF_FONT2,FS_BOLD);
+        $this->title->SetMargin(3);
+        $this->title->SetAlign('center');
+
+        $this->subtitle = new Text();
+        $this->subtitle->ParagraphAlign('center');
+        $this->subtitle->SetFont(FF_FONT1,FS_BOLD);
+        $this->subtitle->SetMargin(3);
+        $this->subtitle->SetAlign('center');
+
+        $this->subsubtitle = new Text();
+        $this->subsubtitle->ParagraphAlign('center');
+        $this->subsubtitle->SetFont(FF_FONT1,FS_NORMAL);
+        $this->subsubtitle->SetMargin(3);
+        $this->subsubtitle->SetAlign('center');
+
+        $this->footer = new Footer();
+
+    }
+
+    // Specify background fill color for the combined graph
+    function SetFillColor($aColor) {
+        $this->iFillColor = $aColor;
+    }
+
+    // Add a frame around the combined graph
+    function SetFrame($aFlg,$aColor='black',$aWeight=1) {
+        $this->iDoFrame = $aFlg;
+        $this->iFrameColor = $aColor;
+        $this->iFrameWeight = $aWeight;
+    }
+
+    // Specify a background image blend
+    function SetBackgroundImageMix($aMix) {
+        $this->background_image_mix = $aMix ;
+    }
+
+    // Specify a background image
+    function SetBackgroundImage($aFileName,$aCenter_aX=NULL,$aY=NULL) {
+        // Second argument can be either a boolean value or
+        // a numeric
+        $aCenter=TRUE;
+        $aX=NULL;
+
+        if( is_numeric($aCenter_aX) ) {
+            $aX=$aCenter_aX;
+        }
+
+        // Get extension to determine image type
+        $e = explode('.',$aFileName);
+        if( !$e ) {
+            JpGraphError::RaiseL(12002,$aFileName);
+            //('Incorrect file name for MGraph::SetBackgroundImage() : '.$aFileName.' Must have a valid image extension (jpg,gif,png) when using autodetection of image type');
+        }
+
+        $valid_formats = array('png', 'jpg', 'gif');
+        $aImgFormat = strtolower($e[count($e)-1]);
+        if ($aImgFormat == 'jpeg')  {
+            $aImgFormat = 'jpg';
+        }
+        elseif (!in_array($aImgFormat, $valid_formats) )  {
+            JpGraphError::RaiseL(12003,$aImgFormat,$aFileName);
+            //('Unknown file extension ($aImgFormat) in MGraph::SetBackgroundImage() for filename: '.$aFileName);
+        }
+
+        $this->background_image = $aFileName;
+        $this->background_image_center=$aCenter;
+        $this->background_image_format=$aImgFormat;
+        $this->background_image_x = $aX;
+        $this->background_image_y = $aY;
+    }
+
+    function _strokeBackgroundImage() {
+        if( $this->background_image == '' ) return;
+
+        $bkgimg = Graph::LoadBkgImage('',$this->background_image);
+
+        // Background width & Heoght
+        $bw = imagesx($bkgimg);
+        $bh = imagesy($bkgimg);
+
+        // Canvas width and height
+        $cw = imagesx($this->img);
+        $ch = imagesy($this->img);
+
+        if( $this->doshadow ) {
+            $cw -= $this->shadow_width;
+            $ch -= $this->shadow_width;
+        }
+
+        if( $this->background_image_x === NULL || $this->background_image_y === NULL ) {
+            if( $this->background_image_center ) {
+                // Center original image in the plot area
+                $x = round($cw/2-$bw/2); $y = round($ch/2-$bh/2);
+            }
+            else {
+                // Just copy the image from left corner, no resizing
+                $x=0; $y=0;
+            }
+        }
+        else {
+            $x = $this->background_image_x;
+            $y = $this->background_image_y;
+        }
+        imagecopymerge($this->img,$bkgimg,$x,$y,0,0,$bw,$bh,$this->background_image_mix);
+    }
+
+    function AddMix($aGraph,$x=0,$y=0,$mix=100,$fx=0,$fy=0,$w=0,$h=0) {
+        $this->_gdImgHandle($aGraph->Stroke( _IMG_HANDLER),$x,$y,$fx=0,$fy=0,$w,$h,$mix);
+    }
+
+    function Add($aGraph,$x=0,$y=0,$fx=0,$fy=0,$w=0,$h=0) {
+        $this->_gdImgHandle($aGraph->Stroke( _IMG_HANDLER),$x,$y,$fx=0,$fy=0,$w,$h);
+    }
+
+    function _gdImgHandle($agdCanvas,$x,$y,$fx=0,$fy=0,$w=0,$h=0,$mix=100) {
+        if( $w == 0 ) {
+            $w = @imagesx($agdCanvas);
+        }
+        if( $w === NULL ) {
+            JpGraphError::RaiseL(12007);
+            //('Argument to MGraph::Add() is not a valid GD image handle.');
+            return;
+        }
+        if( $h == 0 ) {
+            $h = @imagesy($agdCanvas);
+        }
+        $this->iGraphs[$this->iCnt++] = array($agdCanvas,$x,$y,$fx,$fy,$w,$h,$mix);
+    }
+
+    function SetMargin($lm,$rm,$tm,$bm) {
+        $this->lm = $lm;
+        $this->rm = $rm;
+        $this->tm = $tm;
+        $this->bm = $bm;
+    }
+
+    function SetExpired($aFlg=true) {
+        $this->expired = $aFlg;
+    }
+
+    function SetImgFormat($aFormat,$aQuality=75) {
+        $this->image_format = $aFormat;
+        $this->image_quality = $aQuality;
+    }
+
+    // Set the shadow around the whole image
+    function SetShadow($aShowShadow=true,$aShadowWidth=4,$aShadowColor='gray@0.3') {
+        $this->doshadow = $aShowShadow;
+        $this->shadow_color = $aShadowColor;
+        $this->shadow_width = $aShadowWidth;
+        $this->footer->iBottomMargin += $aShadowWidth;
+        $this->footer->iRightMargin += $aShadowWidth;
+    }
+
+    function StrokeTitle($image,$w,$h) {
+        // Stroke title
+        if( $this->title->t !== '' ) {
+
+            $margin = 3;
+
+            $y = $this->title->margin;
+            if( $this->title->halign == 'center' ) {
+                $this->title->Center(0,$w,$y);
+            }
+            elseif( $this->title->halign == 'left' ) {
+                $this->title->SetPos($this->title->margin+2,$y);
+            }
+            elseif( $this->title->halign == 'right' ) {
+                $indent = 0;
+                if( $this->doshadow ) {
+                    $indent = $this->shadow_width+2;
+                }
+                $this->title->SetPos($w-$this->title->margin-$indent,$y,'right');
+            }
+            $this->title->Stroke($image);
+
+            // ... and subtitle
+            $y += $this->title->GetTextHeight($image) + $margin + $this->subtitle->margin;
+            if( $this->subtitle->halign == 'center' ) {
+                $this->subtitle->Center(0,$w,$y);
+            }
+            elseif( $this->subtitle->halign == 'left' ) {
+                $this->subtitle->SetPos($this->subtitle->margin+2,$y);
+            }
+            elseif( $this->subtitle->halign == 'right' ) {
+                $indent = 0;
+                if( $this->doshadow ) {
+                    $indent = $this->shadow_width+2;
+                }
+                $this->subtitle->SetPos($this->img->width-$this->subtitle->margin-$indent,$y,'right');
+            }
+            $this->subtitle->Stroke($image);
+
+            // ... and subsubtitle
+            $y += $this->subtitle->GetTextHeight($image) + $margin + $this->subsubtitle->margin;
+            if( $this->subsubtitle->halign == 'center' ) {
+                $this->subsubtitle->Center(0,$w,$y);
+            }
+            elseif( $this->subsubtitle->halign == 'left' ) {
+                $this->subsubtitle->SetPos($this->subsubtitle->margin+2,$y);
+            }
+            elseif( $this->subsubtitle->halign == 'right' ) {
+                $indent = 0;
+                if( $this->doshadow ) {
+                    $indent = $this->shadow_width+2;
+                }
+                $this->subsubtitle->SetPos($w-$this->subsubtitle->margin-$indent,$y,'right');
+            }
+            $this->subsubtitle->Stroke($image);
+
+        }
+    }
+
+    function Stroke($aFileName='') {
+        // Find out the necessary size for the container image
+        $w=0; $h=0;
+        for($i=0; $i < $this->iCnt; ++$i ) {
+            $maxw = $this->iGraphs[$i][1]+$this->iGraphs[$i][5];
+            $maxh = $this->iGraphs[$i][2]+$this->iGraphs[$i][6];
+            $w = max( $w, $maxw );
+            $h = max( $h, $maxh );
+        }
+        $w += $this->lm+$this->rm;
+        $h += $this->tm+$this->bm;
+
+        // User specified width,height overrides
+        if( $this->iWidth !== NULL && $this->iWidth !== 0 ) $w = $this->iWidth;
+        if( $this->iHeight!== NULL && $this->iHeight !== 0) $h = $this->iHeight;
+
+        if( $this->doshadow ) {
+            $w += $this->shadow_width;
+            $h += $this->shadow_width;
+        }
+
+        $image = new Image($w,$h);
+        $image->SetImgFormat( $this->image_format,$this->image_quality);
+
+        if( $this->doshadow ) {
+            $image->SetColor($this->iFrameColor);
+            $image->ShadowRectangle(0,0,$w-1,$h-1,$this->iFillColor,$this->shadow_width,$this->shadow_color);
+            $w -= $this->shadow_width;
+            $h -= $this->shadow_width;
+        }
+        else {
+            $image->SetColor($this->iFillColor);
+            $image->FilledRectangle(0,0,$w-1,$h-1);
+        }
+        $image->SetExpired($this->expired);
+
+        $this->img = $image->img;
+        $this->_strokeBackgroundImage();
+
+        if( $this->iDoFrame && ! $this->doshadow ) {
+           $image->SetColor($this->iFrameColor);
+           $image->SetLineWeight($this->iFrameWeight);
+           $image->Rectangle(0,0,$w-1,$h-1);
+        }
+
+        // Copy all sub graphs to the container
+        for($i=0; $i < $this->iCnt; ++$i ) {
+            $image->CopyMerge($this->iGraphs[$i][0],
+                            $this->iGraphs[$i][1]+$this->lm,$this->iGraphs[$i][2]+$this->tm,
+                            $this->iGraphs[$i][3],$this->iGraphs[$i][4],
+                            $this->iGraphs[$i][5],$this->iGraphs[$i][6],
+                            -1,-1, /* Full from width and height */
+                            $this->iGraphs[$i][7]);
+
+
+        }
+
+        $this->StrokeTitle($image,$w,$h);
+        $this->footer->Stroke($image);
+
+        // Output image
+        if( $aFileName == _IMG_HANDLER ) {
+            return $image->img;
+        }
+        else {
+            //Finally stream the generated picture
+            $this->cache = new ImgStreamCache();
+            $this->cache->PutAndStream($image,$this->cache_name,$this->inline,$aFileName);
+        }
+    }
+}
+
+// EOF
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_pie.php b/common/lib/jpgraph_lib/jpgraph_pie.php
old mode 100644
new mode 100755
index 5d62f5c54..c79d30fac
--- a/common/lib/jpgraph_lib/jpgraph_pie.php
+++ b/common/lib/jpgraph_lib/jpgraph_pie.php
@@ -1,606 +1,1037 @@
 <?php
 /*=======================================================================
-// File:	JPGRAPH_PIE.PHP
-// Description:	Pie plot extension for JpGraph
-// Created: 	2001-02-14
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_pie.php,v 1.49.2.19 2004/10/02 06:50:31 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2001,2002,2003 Johan Persson
-//========================================================================
-*/
+ // File:        JPGRAPH_PIE.PHP
+ // Description: Pie plot extension for JpGraph
+ // Created:     2001-02-14
+ // Ver:         $Id: jpgraph_pie.php 1926 2010-01-11 16:33:07Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+
 
 // Defines for PiePlot::SetLabelType()
-DEFINE("PIE_VALUE_ABS",1);
-DEFINE("PIE_VALUE_PER",0);
-DEFINE("PIE_VALUE_PERCENTAGE",0);
-DEFINE("PIE_VALUE_ADJPERCENTAGE",2);
-DEFINE("PIE_VALUE_ADJPER",2);
+define("PIE_VALUE_ABS",1);
+define("PIE_VALUE_PER",0);
+define("PIE_VALUE_PERCENTAGE",0);
+define("PIE_VALUE_ADJPERCENTAGE",2);
+define("PIE_VALUE_ADJPER",2);
 
 //===================================================
 // CLASS PiePlot
 // Description: Draws a pie plot
 //===================================================
-class PiePlot
-{
+class PiePlot {
     public $posx=0.5,$posy=0.5;
-    public $radius=0.3;
-    public $explode_radius=array(),$explode_all=false,$explode_r=20;
-    public $labels=null, $legends=null;
-    public $csimtargets=null;  // Array of targets for CSIM
-    public $csimareas='';		// Generated CSIM text
-    public $csimalts=null;		// ALT tags for corresponding target
-    public $data=null;
-    public $title;
-    public $startangle=0;
-    public $weight=1, $color="black";
-    public $legend_margin=6,$show_labels=true;
-    public $themearr = array(
-    "earth" 	=> array(136,34,40,45,46,62,63,134,74,10,120,136,141,168,180,77,209,218,346,395,89,430),
-    "pastel" => array(27,415,128,59,66,79,105,110,42,147,152,230,236,240,331,337,405,38),
-    "water"  => array(8,370,24,40,335,56,213,237,268,14,326,387,10,388),
-    "sand"   => array(27,168,34,170,19,50,65,72,131,209,46,393));
+    public $is_using_plot_theme = false;
     public $theme="earth";
-    public $setslicecolors=array();
-    public $labeltype=0; // Default to percentage
-    public $pie_border=true,$pie_interior_border=true;
+    protected $use_plot_theme_colors = false;
+    protected $radius=0.3;
+    protected $explode_radius=array(),$explode_all=false,$explode_r=20;
+    protected $labels=null, $legends=null;
+    protected $csimtargets=null,$csimwintargets=null;  // Array of targets for CSIM
+    protected $csimareas='';  // Generated CSIM text
+    protected $csimalts=null;  // ALT tags for corresponding target
+    protected $data=null;
+    public $title;
+    protected $startangle=0;
+    protected $weight=1, $color="black";
+    protected $legend_margin=6,$show_labels=true;
+    protected $themearr = array(
+ "earth"  => array(136,34,40,45,46,62,63,134,74,10,120,136,141,168,180,77,209,218,346,395,89,430),
+ "pastel" => array(27,415,128,59,66,79,105,110,42,147,152,230,236,240,331,337,405,38),
+ "water"  => array(8,370,24,40,335,56,213,237,268,14,326,387,10,388),
+ "sand"   => array(27,168,34,170,19,50,65,72,131,209,46,393));
+    protected $setslicecolors=array();
+    protected $labeltype=0; // Default to percentage
+    protected $pie_border=true,$pie_interior_border=true;
     public $value;
-    public $ishadowcolor='',$ishadowdrop=4;
-    public $ilabelposadj=1;
-    public $legendcsimtargets = array();
-    public $legendcsimalts = array();
-    public $adjusted_data = array();
+    protected $ishadowcolor='',$ishadowdrop=4;
+    protected $ilabelposadj=1;
+    protected $legendcsimtargets = array(),$legendcsimwintargets = array();
+    protected $legendcsimalts = array();
+    protected $adjusted_data = array();
+    public $guideline = null;
+    protected $guidelinemargin=10,$iShowGuideLineForSingle = false;
+    protected $iGuideLineCurve = false,$iGuideVFactor=1.4,$iGuideLineRFactor=0.8;
+    protected $la = array(); // Holds the exact angle for each label
+
+    //---------------
+    // CONSTRUCTOR
+    function __construct($data) {
+        $this->data = array_reverse($data);
+        $this->title = new Text("");
+        $this->title->SetFont(FF_DEFAULT,FS_BOLD);
+        $this->value = new DisplayValue();
+        $this->value->Show();
+        $this->value->SetFormat('%.1f%%');
+        $this->guideline = new LineProperty();
+    }
+
+    //---------------
+    // PUBLIC METHODS
+    function SetCenter($x,$y=0.5) {
+        $this->posx = $x;
+        $this->posy = $y;
+    }
 
-//---------------
-// CONSTRUCTOR
-    public function PiePlot($data)
-    {
-    $this->data = array_reverse($data);
-    $this->title = new Text("");
-    $this->title->SetFont(FF_FONT1,FS_BOLD);
-    $this->value = new DisplayValue();
-    $this->value->Show();
-    $this->value->SetFormat('%.1f%%');
+    // Enable guideline and set drwaing policy
+    function SetGuideLines($aFlg=true,$aCurved=true,$aAlways=false) {
+        $this->guideline->Show($aFlg);
+        $this->iShowGuideLineForSingle = $aAlways;
+        $this->iGuideLineCurve = $aCurved;
     }
 
-//---------------
-// PUBLIC METHODS
-    public function SetCenter($x,$y=0.5)
-    {
-    $this->posx = $x;
-    $this->posy = $y;
+    // Adjuste the distance between labels and labels and pie
+    function SetGuideLinesAdjust($aVFactor,$aRFactor=0.8) {
+        $this->iGuideVFactor=$aVFactor;
+        $this->iGuideLineRFactor=$aRFactor;
     }
 
-    public function SetColor($aColor)
-    {
-    $this->color = $aColor;
+    function SetColor($aColor) {
+        $this->color = $aColor;
     }
 
-    public function SetSliceColors($aColors)
-    {
-    $this->setslicecolors = $aColors;
+    function SetSliceColors($aColors) {
+        $this->setslicecolors = $aColors;
     }
 
-    public function SetShadow($aColor='darkgray',$aDropWidth=4)
-    {
-    $this->ishadowcolor = $aColor;
-    $this->ishadowdrop = $aDropWidth;
+    function SetShadow($aColor='darkgray',$aDropWidth=4) {
+        $this->ishadowcolor = $aColor;
+        $this->ishadowdrop = $aDropWidth;
     }
 
-    public function SetCSIMTargets($targets,$alts=null)
-    {
-    $this->csimtargets=array_reverse($targets);
-    if( is_array($alts) )
-        $this->csimalts=array_reverse($alts);
+    function SetCSIMTargets($aTargets,$aAlts='',$aWinTargets='') {
+        $this->csimtargets=array_reverse($aTargets);
+        if( is_array($aWinTargets) )
+        $this->csimwintargets=array_reverse($aWinTargets);
+        if( is_array($aAlts) )
+        $this->csimalts=array_reverse($aAlts);
     }
 
-    public function GetCSIMareas()
-    {
-    return $this->csimareas;
+    function GetCSIMareas() {
+        return $this->csimareas;
     }
 
-    public function AddSliceToCSIM($i,$xc,$yc,$radius,$sa,$ea)
-    {
+    function AddSliceToCSIM($i,$xc,$yc,$radius,$sa,$ea) {
         //Slice number, ellipse centre (x,y), height, width, start angle, end angle
-    while( $sa > 2*M_PI ) $sa = $sa - 2*M_PI;
-    while( $ea > 2*M_PI ) $ea = $ea - 2*M_PI;
+        while( $sa > 2*M_PI ) $sa = $sa - 2*M_PI;
+        while( $ea > 2*M_PI ) $ea = $ea - 2*M_PI;
 
-    $sa = 2*M_PI - $sa;
-    $ea = 2*M_PI - $ea;
+        $sa = 2*M_PI - $sa;
+        $ea = 2*M_PI - $ea;
 
-    //add coordinates of the centre to the map
-    $coords = "$xc, $yc";
+        // Special case when we have only one slice since then both start and end
+        // angle will be == 0
+        if( abs($sa - $ea) < 0.0001 ) {
+            $sa=2*M_PI; $ea=0;
+        }
 
-    //add coordinates of the first point on the arc to the map
-    $xp = floor(($radius*cos($ea))+$xc);
-    $yp = floor($yc-$radius*sin($ea));
-    $coords.= ", $xp, $yp";
+        //add coordinates of the centre to the map
+        $xc = floor($xc);$yc=floor($yc);
+        $coords = "$xc, $yc";
 
-    //add coordinates every 0.2 radians
-    $a=$ea+0.2;
-    while ($a<$sa) {
-        $xp = floor($radius*cos($a)+$xc);
-        $yp = floor($yc-$radius*sin($a));
+        //add coordinates of the first point on the arc to the map
+        $xp = floor(($radius*cos($ea))+$xc);
+        $yp = floor($yc-$radius*sin($ea));
         $coords.= ", $xp, $yp";
-        $a += 0.2;
-    }
 
-    //Add the last point on the arc
-    $xp = floor($radius*cos($sa)+$xc);
-    $yp = floor($yc-$radius*sin($sa));
-    $coords.= ", $xp, $yp";
-    if ( !empty($this->csimtargets[$i]) ) {
-        $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".
-        $this->csimtargets[$i]."\"";
-        if ( !empty($this->csimalts[$i]) ) {
-        $tmp=sprintf($this->csimalts[$i],$this->data[$i]);
-        $this->csimareas .= " alt=\"$tmp\" title=\"$tmp\"";
+        //add coordinates every 0.2 radians
+        $a=$ea+0.2;
+
+        // If we cross the 360-limit with a slice we need to handle
+        // the fact that end angle is smaller than start
+        if( $sa < $ea ) {
+            while ($a <= 2*M_PI) {
+                $xp = floor($radius*cos($a)+$xc);
+                $yp = floor($yc-$radius*sin($a));
+                $coords.= ", $xp, $yp";
+                $a += 0.2;
+            }
+            $a -= 2*M_PI;
         }
-        $this->csimareas .= ">\n";
-    }
-    }
 
-    public function SetTheme($aTheme)
-    {
-    if( in_array($aTheme,array_keys($this->themearr)) )
-        $this->theme = $aTheme;
-    else
-        JpGraphError::Raise("PiePLot::SetTheme() Unknown theme: $aTheme");
-    }
 
-    public function ExplodeSlice($e,$radius=20)
-    {
-    if( ! is_integer($e) )
-        JpGraphError::Raise('Argument to PiePlot::ExplodeSlice() must be an integer');
-    $this->explode_radius[$e]=$radius;
-    }
+        while ($a < $sa) {
+            $xp = floor($radius*cos($a)+$xc);
+            $yp = floor($yc-$radius*sin($a));
+            $coords.= ", $xp, $yp";
+            $a += 0.2;
+        }
 
-    public function ExplodeAll($radius=20)
-    {
-    $this->explode_all=true;
-    $this->explode_r = $radius;
+        //Add the last point on the arc
+        $xp = floor($radius*cos($sa)+$xc);
+        $yp = floor($yc-$radius*sin($sa));
+        $coords.= ", $xp, $yp";
+        if( !empty($this->csimtargets[$i]) ) {
+            $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->csimtargets[$i]."\"";
+            $tmp="";
+            if( !empty($this->csimwintargets[$i]) ) {
+                $this->csimareas .= " target=\"".$this->csimwintargets[$i]."\" ";
+            }
+            if( !empty($this->csimalts[$i]) ) {
+                $tmp=sprintf($this->csimalts[$i],$this->data[$i]);
+                $this->csimareas .= " title=\"$tmp\" alt=\"$tmp\" ";
+            }
+            $this->csimareas .= " />\n";
+        }
     }
 
-    public function Explode($aExplodeArr)
-    {
-    if ( !is_array($aExplodeArr) ) {
-        JpGraphError::Raise("Argument to PiePlot::Explode() must be an array with integer distances.");
+
+    function SetTheme($aTheme) {
+//        JpGraphError::RaiseL(15012,$aTheme);
+//        return;
+
+        if( in_array($aTheme,array_keys($this->themearr)) ) {
+            $this->theme = $aTheme;
+            $this->is_using_plot_theme = true;
+        } else {
+            JpGraphError::RaiseL(15001,$aTheme);//("PiePLot::SetTheme() Unknown theme: $aTheme");
+        }
     }
-    $this->explode_radius = $aExplodeArr;
+
+    function ExplodeSlice($e,$radius=20) {
+        if( ! is_integer($e) )
+        JpGraphError::RaiseL(15002);//('Argument to PiePlot::ExplodeSlice() must be an integer');
+        $this->explode_radius[$e]=$radius;
     }
 
-    public function SetStartAngle($aStart)
-    {
-    if ($aStart < 0 || $aStart > 360) {
-        JpGraphError::Raise('Slice start angle must be between 0 and 360 degrees.');
+    function ExplodeAll($radius=20) {
+        $this->explode_all=true;
+        $this->explode_r = $radius;
     }
-    $this->startangle = 360-$aStart;
-    $this->startangle *= M_PI/180;
+
+    function Explode($aExplodeArr) {
+        if( !is_array($aExplodeArr) ) {
+            JpGraphError::RaiseL(15003);
+            //("Argument to PiePlot::Explode() must be an array with integer distances.");
+        }
+        $this->explode_radius = $aExplodeArr;
     }
 
-    public function SetFont($family,$style=FS_NORMAL,$size=10)
-    {
-        JpGraphError::Raise('PiePlot::SetFont() is deprecated. Use PiePlot->value->SetFont() instead.');
+    function SetStartAngle($aStart) {
+        if( $aStart < 0 || $aStart > 360 ) {
+            JpGraphError::RaiseL(15004);//('Slice start angle must be between 0 and 360 degrees.');
+        }
+        if( $aStart == 0 ) {
+            $this->startangle = 0;
+        }
+        else {
+            $this->startangle = 360-$aStart;
+            $this->startangle *= M_PI/180;
+        }
     }
 
     // Size in percentage
-    public function SetSize($aSize)
-    {
-    if( ($aSize>0 && $aSize<=0.5) || ($aSize>10 && $aSize<1000) )
+    function SetSize($aSize) {
+        if( ($aSize>0 && $aSize<=0.5) || ($aSize>10 && $aSize<1000) )
         $this->radius = $aSize;
-    else
-        JpGraphError::Raise("PiePlot::SetSize() Radius for pie must either be specified as a fraction
-                                [0, 0.5] of the size of the image or as an absolute size in pixels
-                                in the range [10, 1000]");
-    }
-
-    public function SetFontColor($aColor)
-    {
-    JpGraphError::Raise('PiePlot::SetFontColor() is deprecated. Use PiePlot->value->SetColor() instead.');
+        else
+        JpGraphError::RaiseL(15006);
+        //("PiePlot::SetSize() Radius for pie must either be specified as a fraction [0, 0.5] of the size of the image or as an absolute size in pixels  in the range [10, 1000]");
     }
 
     // Set label arrays
-    public function SetLegends($aLegend)
-    {
-    $this->legends = $aLegend;
+    function SetLegends($aLegend) {
+        $this->legends = $aLegend;
     }
 
     // Set text labels for slices
-    public function SetLabels($aLabels,$aLblPosAdj="auto")
-    {
-    $this->labels = array_reverse($aLabels);
-    $this->ilabelposadj=$aLblPosAdj;
+    function SetLabels($aLabels,$aLblPosAdj="auto") {
+        $this->labels = array_reverse($aLabels);
+        $this->ilabelposadj=$aLblPosAdj;
     }
 
-    public function SetLabelPos($aLblPosAdj)
-    {
-    $this->ilabelposadj=$aLblPosAdj;
+    function SetLabelPos($aLblPosAdj) {
+        $this->ilabelposadj=$aLblPosAdj;
     }
 
     // Should we display actual value or percentage?
-    public function SetLabelType($t)
-    {
-    if( $t < 0 || $t > 2 )
-        JpGraphError::Raise("PiePlot::SetLabelType() Type for pie plots must be 0 or 1 (not $t).");
-    $this->labeltype=$t;
+    function SetLabelType($aType) {
+        if( $aType < 0 || $aType > 2 )
+        	JpGraphError::RaiseL(15008,$aType);
+	        //("PiePlot::SetLabelType() Type for pie plots must be 0 or 1 (not $t).");
+        $this->labeltype = $aType;
     }
 
-    public function SetValueType($aType)
-    {
-    $this->SetLabelType($aType);
+    // Deprecated.
+    function SetValueType($aType) {
+        $this->SetLabelType($aType);
     }
 
     // Should the circle around a pie plot be displayed
-    public function ShowBorder($exterior=true,$interior=true)
-    {
-    $this->pie_border = $exterior;
-    $this->pie_interior_border = $interior;
+    function ShowBorder($exterior=true,$interior=true) {
+        $this->pie_border = $exterior;
+        $this->pie_interior_border = $interior;
     }
 
     // Setup the legends
-    public function Legend(&$graph)
-    {
-    $colors = array_keys($graph->img->rgb->rgb_table);
-       sort($colors);
-       $ta=$this->themearr[$this->theme];
-       $n = count($this->data);
-
-       if ($this->setslicecolors==null) {
-        $numcolors=count($ta);
-        if ( get_class($this)==='pieplot3d' ) {
-        $ta = array_reverse(array_slice($ta,0,$n));
-        }
-    } else {
-        $this->setslicecolors = array_slice($this->setslicecolors,0,$n);
-        $numcolors=count($this->setslicecolors);
-        if ( $graph->pieaa && get_class($this)==='pieplot' ) {
-        $this->setslicecolors = array_reverse($this->setslicecolors);
-        }
-    }
-
-    $sum=0;
-    for($i=0; $i < $n; ++$i)
-        $sum += $this->data[$i];
-
-    // Bail out with error if the sum is 0
-    if( $sum==0 )
-        JpGraphError::Raise("Illegal pie plot. Sum of all data is zero for Pie!");
-
-    // Make sure we don't plot more values than data points
-    // (in case the user added more legends than data points)
-    $n = min(count($this->legends),count($this->data));
-    if ($this->legends != "") {
-        $this->legends = array_reverse(array_slice($this->legends,0,$n));
-    }
-    for ($i=$n-1; $i >= 0; --$i) {
-        $l = $this->legends[$i];
-        // Replace possible format with actual values
-        if ($this->labeltype==0) {
-        $l = sprintf($l,100*$this->data[$i]/$sum);
-        $alt = sprintf($this->csimalts[$i],$this->data[$i]);
-
-        } elseif ($this->labeltype == 1) {
-        $l = sprintf($l,$this->data[$i]);
-        $alt = sprintf($this->csimalts[$i],$this->data[$i]);
+    function Legend($graph) {
+        $colors = array_keys($graph->img->rgb->rgb_table);
+        sort($colors);
+        $ta=$this->themearr[$this->theme];
+        $n = count($this->data);
+
+        if( $this->setslicecolors==null ) {
+            $numcolors=count($ta);
+            if( class_exists('PiePlot3D',false) && ($this instanceof PiePlot3D) ) {
+                $ta = array_reverse(array_slice($ta,0,$n));
+            }
+        }
+        else {
+            $this->setslicecolors = array_slice($this->setslicecolors,0,$n);
+            $numcolors=count($this->setslicecolors);
+            if( $graph->pieaa && !($this instanceof PiePlot3D) ) {
+                $this->setslicecolors = array_reverse($this->setslicecolors);
+            }
+        }
 
-        } else {
-        $l = sprintf($l,$this->adjusted_data[$i]);
-        $alt = sprintf($this->csimalts[$i],$this->adjusted_data[$i]);
+        $sum=0;
+        for($i=0; $i < $n; ++$i)
+            $sum += $this->data[$i];
+
+        // Bail out with error if the sum is 0
+        if( $sum==0 )
+        JpGraphError::RaiseL(15009);//("Illegal pie plot. Sum of all data is zero for Pie!");
+
+        // Make sure we don't plot more values than data points
+        // (in case the user added more legends than data points)
+        $n = min(count($this->legends),count($this->data));
+        if( $this->legends != "" ) {
+            $this->legends = array_reverse(array_slice($this->legends,0,$n));
         }
+        for( $i=$n-1; $i >= 0; --$i ) {
+            $l = $this->legends[$i];
+            // Replace possible format with actual values
+            if( count($this->csimalts) > $i ) {
+                $fmt = $this->csimalts[$i];
+            }
+            else {
+                $fmt = "%d"; // Deafult Alt if no other has been specified
+            }
+            if( $this->labeltype==0 ) {
+                $l = sprintf($l,100*$this->data[$i]/$sum);
+                $alt = sprintf($fmt,$this->data[$i]);
 
+            }
+            elseif( $this->labeltype == 1)  {
+                $l = sprintf($l,$this->data[$i]);
+                $alt = sprintf($fmt,$this->data[$i]);
 
-        if ($this->setslicecolors==null) {
-        $graph->legend->Add($l,$colors[$ta[$i%$numcolors]],"",0,
-                    $this->csimtargets[$i],$alt);
-        } else {
-        $graph->legend->Add($l,$this->setslicecolors[$i%$numcolors],"",0,
-                    $this->csimtargets[$i],$alt);
+            }
+            else {
+                $l = sprintf($l,$this->adjusted_data[$i]);
+                $alt = sprintf($fmt,$this->adjusted_data[$i]);
+            }
+
+            if( empty($this->csimwintargets[$i]) ) {
+                $wintarg = '';
+            }
+            else {
+                $wintarg = $this->csimwintargets[$i];
+            }
+
+            if( $this->setslicecolors==null ) {
+                $graph->legend->Add($l,$colors[$ta[$i%$numcolors]],"",0,$this->csimtargets[$i],$alt,$wintarg);
+            }
+            else {
+                $graph->legend->Add($l,$this->setslicecolors[$i%$numcolors],"",0,$this->csimtargets[$i],$alt,$wintarg);
+            }
         }
     }
-    }
 
     // Adjust the rounded percetage value so that the sum of
     // of the pie slices are always 100%
     // Using the Hare/Niemeyer method
-    public function AdjPercentage($aData,$aPrec=0)
-    {
-    $mul=100;
-    if ($aPrec > 0 && $aPrec < 3) {
-        if( $aPrec == 1 )
-        $mul=1000;
-        else
+    function AdjPercentage($aData,$aPrec=0) {
+        $mul=100;
+        if( $aPrec > 0 && $aPrec < 3 ) {
+            if( $aPrec == 1 )
+            $mul=1000;
+            else
             $mul=10000;
-    }
+        }
 
-    $tmp = array();
-    $result = array();
-    $quote_sum=0;
-    $n = count($aData) ;
-    for( $i=0, $sum=0; $i < $n; ++$i )
+        $tmp = array();
+        $result = array();
+        $quote_sum=0;
+        $n = count($aData) ;
+        for( $i=0, $sum=0; $i < $n; ++$i )
         $sum+=$aData[$i];
-    foreach ($aData as $index => $value) {
-        $tmp_percentage=$value/$sum*$mul;
-        $result[$index]=floor($tmp_percentage);
-        $tmp[$index]=$tmp_percentage-$result[$index];
-        $quote_sum+=$result[$index];
-    }
-    if ($quote_sum == $mul) {
-        if ($mul > 100) {
-        $tmp = $mul / 100;
-        for ($i=0; $i < $n; ++$i) {
-            $result[$i] /= $tmp ;
+        foreach($aData as $index => $value) {
+            $tmp_percentage=$value/$sum*$mul;
+            $result[$index]=floor($tmp_percentage);
+            $tmp[$index]=$tmp_percentage-$result[$index];
+            $quote_sum+=$result[$index];
         }
+        if( $quote_sum == $mul) {
+            if( $mul > 100 ) {
+                $tmp = $mul / 100;
+                for( $i=0; $i < $n; ++$i ) {
+                    $result[$i] /= $tmp ;
+                }
+            }
+            return $result;
         }
-
-        return $result;
-    }
-    arsort($tmp,SORT_NUMERIC);
-    reset($tmp);
-    for ($i=0; $i < $mul-$quote_sum; $i++) {
-        $result[key($tmp)]++;
-        next($tmp);
-    }
-    if ($mul > 100) {
-        $tmp = $mul / 100;
-        for ($i=0; $i < $n; ++$i) {
-        $result[$i] /= $tmp ;
+        arsort($tmp,SORT_NUMERIC);
+        reset($tmp);
+        for($i=0; $i < $mul-$quote_sum; $i++)
+        {
+            $result[key($tmp)]++;
+            next($tmp);
         }
+        if( $mul > 100 ) {
+            $tmp = $mul / 100;
+            for( $i=0; $i < $n; ++$i ) {
+                $result[$i] /= $tmp ;
+            }
+        }
+        return $result;
     }
 
-    return $result;
-    }
 
+    function Stroke($img,$aaoption=0) {
+        // aaoption is used to handle antialias
+        // aaoption == 0 a normal pie
+        // aaoption == 1 just the body
+        // aaoption == 2 just the values
 
-    public function Stroke(&$img,$aaoption=0)
-    {
-    // aaoption is used to handle antialias
-    // aaoption == 0 a normal pie
-    // aaoption == 1 just the body
-    // aaoption == 2 just the values
+        // Explode scaling. If anti alias we scale the image
+        // twice and we also need to scale the exploding distance
+        $expscale = $aaoption === 1 ? 2 : 1;
 
-    // Explode scaling. If anti anti alias we scale the image
-    // twice and we also need to scale the exploding distance
-    $expscale = $aaoption === 1 ? 2 : 1;
+        if( $this->labeltype == 2 ) {
+            // Adjust the data so that it will add up to 100%
+            $this->adjusted_data = $this->AdjPercentage($this->data);
+        }
 
-    if ($this->labeltype == 2) {
-        // Adjust the data so that it will add up to 100%
-        $this->adjusted_data = $this->AdjPercentage($this->data);
-    }
+        if ($this->use_plot_theme_colors) {
+            $this->setslicecolors = null;
+        }
 
-    $colors = array_keys($img->rgb->rgb_table);
-       sort($colors);
-       $ta=$this->themearr[$this->theme];
-    $n = count($this->data);
+        $colors = array_keys($img->rgb->rgb_table);
+        sort($colors);
+        $ta=$this->themearr[$this->theme];
+        $n = count($this->data);
 
-       if ($this->setslicecolors==null) {
-        $numcolors=count($ta);
-    } else {
-        // We need to create an array of colors as long as the data
-        // since we need to reverse it to get the colors in the right order
-        $numcolors=count($this->setslicecolors);
-        if ($n > $numcolors) {
-        $i = 2*$numcolors;
-        while ($n > $i) {
-            $this->setslicecolors = array_merge($this->setslicecolors,$this->setslicecolors);
-            $i += $n;
+        if( $this->setslicecolors==null ) {
+            $numcolors=count($ta);
         }
-        $tt = array_slice($this->setslicecolors,0,$n % $numcolors);
-        $this->setslicecolors = array_merge($this->setslicecolors,$tt);
-        $this->setslicecolors = array_reverse($this->setslicecolors);
+        else {
+            // We need to create an array of colors as long as the data
+            // since we need to reverse it to get the colors in the right order
+            $numcolors=count($this->setslicecolors);
+            $i = 2*$numcolors;
+            while( $n > $i ) {
+                $this->setslicecolors = array_merge($this->setslicecolors,$this->setslicecolors);
+                $i += $n;
+            }
+            $tt = array_slice($this->setslicecolors,0,$n % $numcolors);
+            $this->setslicecolors = array_merge($this->setslicecolors,$tt);
+            $this->setslicecolors = array_reverse($this->setslicecolors);
         }
-    }
 
-    // Draw the slices
-    $sum=0;
-    for($i=0; $i < $n; ++$i)
-        $sum += $this->data[$i];
+        // Draw the slices
+        $sum=0;
+        for($i=0; $i < $n; ++$i)
+            $sum += $this->data[$i];
 
-    // Bail out with error if the sum is 0
-    if( $sum==0 )
-        JpGraphError::Raise("Sum of all data is 0 for Pie.");
+        // Bail out with error if the sum is 0
+        if( $sum==0 ) {
+            JpGraphError::RaiseL(15009);//("Sum of all data is 0 for Pie.");
+        }
 
-    // Set up the pie-circle
-    if( $this->radius <= 1 )
-        $radius = floor($this->radius*min($img->width,$img->height));
-    else {
-        $radius = $aaoption === 1 ? $this->radius*2 : $this->radius;
-    }
+        // Set up the pie-circle
+        if( $this->radius <= 1 ) {
+            $radius = floor($this->radius*min($img->width,$img->height));
+        }
+        else {
+            $radius = $aaoption === 1 ? $this->radius*2 : $this->radius;
+        }
 
-    if( $this->posx <= 1 && $this->posx > 0 )
-        $xc = round($this->posx*$img->width);
-    else
-        $xc = $this->posx ;
+        if( $this->posx <= 1 && $this->posx > 0 ) {
+            $xc = round($this->posx*$img->width);
+        }
+        else {
+            $xc = $this->posx ;
+        }
 
-    if( $this->posy <= 1 && $this->posy > 0 )
-        $yc = round($this->posy*$img->height);
-    else
-        $yc = $this->posy ;
+        if( $this->posy <= 1 && $this->posy > 0 ) {
+            $yc = round($this->posy*$img->height);
+        }
+        else {
+            $yc = $this->posy ;
+        }
 
-    $n = count($this->data);
+        $n = count($this->data);
 
-    if( $this->explode_all )
-        for($i=0; $i < $n; ++$i)
-        $this->explode_radius[$i]=$this->explode_r;
+        if( $this->explode_all ) {
+            for($i=0; $i < $n; ++$i) {
+                $this->explode_radius[$i]=$this->explode_r;
+            }
+        }
 
-    if ($this->ishadowcolor != "" && $aaoption !== 2) {
+        // If we have a shadow and not just drawing the labels
+        if( $this->ishadowcolor != "" && $aaoption !== 2) {
+            $accsum=0;
+            $angle2 = $this->startangle;
+            $img->SetColor($this->ishadowcolor);
+            for($i=0; $sum > 0 && $i < $n; ++$i) {
+                $j = $n-$i-1;
+                $d = $this->data[$i];
+                $angle1 = $angle2;
+                $accsum += $d;
+                $angle2 = $this->startangle+2*M_PI*$accsum/$sum;
+                if( empty($this->explode_radius[$j]) ) {
+                    $this->explode_radius[$j]=0;
+                }
+
+                if( $d < 0.00001 ) continue;
+
+                $la = 2*M_PI - (abs($angle2-$angle1)/2.0+$angle1);
+
+                $xcm = $xc + $this->explode_radius[$j]*cos($la)*$expscale;
+                $ycm = $yc - $this->explode_radius[$j]*sin($la)*$expscale;
+
+                $xcm += $this->ishadowdrop*$expscale;
+                $ycm += $this->ishadowdrop*$expscale;
+
+                $_sa = round($angle1*180/M_PI);
+                $_ea = round($angle2*180/M_PI);
+
+                // The CakeSlice method draws a full circle in case of start angle = end angle
+                // for pie slices we don't want this behaviour unless we only have one
+                // slice in the pie in case it is the wanted behaviour
+                if( $_ea-$_sa > 0.1 || $n==1 ) {
+                    $img->CakeSlice($xcm,$ycm,$radius-1,$radius-1,
+                    $angle1*180/M_PI,$angle2*180/M_PI,$this->ishadowcolor);
+                }
+            }
+        }
+
+        //--------------------------------------------------------------------------------
+        // This is the main loop to draw each cake slice
+        //--------------------------------------------------------------------------------
+
+        // Set up the accumulated sum, start angle for first slice and border color
         $accsum=0;
         $angle2 = $this->startangle;
-        $img->SetColor($this->ishadowcolor);
-        for ($i=0; $sum > 0 && $i < $n; ++$i) {
-        $j = $n-$i-1;
-        $d = $this->data[$i];
-        $angle1 = $angle2;
-        $accsum += $d;
-        $angle2 = $this->startangle+2*M_PI*$accsum/$sum;
-        if( empty($this->explode_radius[$j]) )
-            $this->explode_radius[$j]=0;
+        $img->SetColor($this->color);
 
-        $la = 2*M_PI - (abs($angle2-$angle1)/2.0+$angle1);
+        // Loop though all the slices if there is a pie to draw (sum>0)
+        // There are n slices in total
+        for($i=0; $sum>0 && $i < $n; ++$i) {
 
-        $xcm = $xc + $this->explode_radius[$j]*cos($la)*$expscale;
-        $ycm = $yc - $this->explode_radius[$j]*sin($la)*$expscale;
+            // $j is the actual index used for the slice
+            $j = $n-$i-1;
 
-        $xcm += $this->ishadowdrop*$expscale;
-        $ycm += $this->ishadowdrop*$expscale;
+            // Make sure we havea  valid distance to explode the slice
+            if( empty($this->explode_radius[$j]) ) {
+                $this->explode_radius[$j]=0;
+            }
 
-        $img->CakeSlice($xcm,$ycm,$radius,$radius,
-                $angle1*180/M_PI,$angle2*180/M_PI,$this->ishadowcolor);
+            // The actual numeric value for the slice
+            $d = $this->data[$i];
 
-        }
-    }
+            $angle1 = $angle2;
 
-    $accsum=0;
-    $angle2 = $this->startangle;
-    $img->SetColor($this->color);
-    for ($i=0; $sum>0 && $i < $n; ++$i) {
-        $j = $n-$i-1;
-        if( empty($this->explode_radius[$j]) )
-        $this->explode_radius[$j]=0;
-        $d = $this->data[$i];
-        $angle1 = $angle2;
-        $accsum += $d;
-        $angle2 = $this->startangle+2*M_PI*$accsum/$sum;
-        $this->la[$i] = 2*M_PI - (abs($angle2-$angle1)/2.0+$angle1);
+            // Accumlate the sum
+            $accsum += $d;
 
-        if( $d == 0 ) continue;
+            // The new angle when we add the "size" of this slice
+            // angle1 is then the start and angle2 the end of this slice
+            $angle2 = $this->NormAngle($this->startangle+2*M_PI*$accsum/$sum);
 
-        if( $this->setslicecolors==null )
-        $slicecolor=$colors[$ta[$i%$numcolors]];
-        else
-        $slicecolor=$this->setslicecolors[$i%$numcolors];
+            // We avoid some trouble by not allowing end angle to be 0, in that case
+            // we translate to 360
 
-        if( $this->pie_interior_border && $aaoption===0 )
-        $img->SetColor($this->color);
-        else
-        $img->SetColor($slicecolor);
+            // la is used to hold the label angle, which is centered on the slice
+            if( $angle2 < 0.0001 && $angle1 > 0.0001 ) {
+                $this->la[$i] = 2*M_PI - (abs(2*M_PI-$angle1)/2.0+$angle1);
+            }
+            elseif( $angle1 > $angle2 ) {
+                // The case where the slice crosses the 3 a'clock line
+                // Remember that the slices are counted clockwise and
+                // labels are counted counter clockwise so we need to revert with 2 PI
+                $this->la[$i] = 2*M_PI-$this->NormAngle($angle1 + ((2*M_PI - $angle1)+$angle2)/2);
+            }
+            else {
+                $this->la[$i] = 2*M_PI - (abs($angle2-$angle1)/2.0+$angle1);
+            }
+
+            // Too avoid rounding problems we skip the slice if it is too small
+            if( $d < 0.00001 ) continue;
+
+            // If the user has specified an array of colors for each slice then use
+            // that a color otherwise use the theme array (ta) of colors
+            if( $this->setslicecolors==null ) {
+                $slicecolor=$colors[$ta[$i%$numcolors]];
+            }
+            else {
+                $slicecolor=$this->setslicecolors[$i%$numcolors];
+            }
 
-        $arccolor = $this->pie_border && $aaoption===0 ? $this->color : "";
+//            $_sa = round($angle1*180/M_PI);
+//            $_ea = round($angle2*180/M_PI);
+//            $_la = round($this->la[$i]*180/M_PI);
+//            echo "Slice#$i: ang1=$_sa , ang2=$_ea, la=$_la, color=$slicecolor<br>";
 
-        $xcm = $xc + $this->explode_radius[$j]*cos($this->la[$i])*$expscale;
-        $ycm = $yc - $this->explode_radius[$j]*sin($this->la[$i])*$expscale;
 
-        if ($aaoption !== 2) {
-        $img->CakeSlice($xcm,$ycm,$radius-1,$radius-1,
-                $angle1*180/M_PI,$angle2*180/M_PI,$slicecolor,$arccolor);
+            // If we have enabled antialias then we don't draw any border so
+            // make the bordedr color the same as the slice color
+            if( $this->pie_interior_border && $aaoption===0 ) {
+                $img->SetColor($this->color);
+            }
+            else {
+                $img->SetColor($slicecolor);
+            }
+            $arccolor = $this->pie_border && $aaoption===0 ? $this->color : "";
+
+            // Calculate the x,y coordinates for the base of this slice taking
+            // the exploded distance into account. Here we use the mid angle as the
+            // ray of extension and we have the mid angle handy as it is also the
+            // label angle
+            $xcm = $xc + $this->explode_radius[$j]*cos($this->la[$i])*$expscale;
+            $ycm = $yc - $this->explode_radius[$j]*sin($this->la[$i])*$expscale;
+
+            // If we are not just drawing the labels then draw this cake slice
+            if( $aaoption !== 2 ) {
+
+                $_sa = round($angle1*180/M_PI);
+                $_ea = round($angle2*180/M_PI);
+                $_la = round($this->la[$i]*180/M_PI);
+                //echo "[$i] sa=$_sa, ea=$_ea, la[$i]=$_la, (color=$slicecolor)<br>";
+
+                // The CakeSlice method draws a full circle in case of start angle = end angle
+                // for pie slices we want this in case the slice have a value larger than 99% of the
+                // total sum
+                if( abs($_ea-$_sa) >= 1 || $d == $sum ) {
+                    $img->CakeSlice($xcm,$ycm,$radius-1,$radius-1,$_sa,$_ea,$slicecolor,$arccolor);
+                }
+            }
+
+            // If the CSIM is used then make sure we register a CSIM area for this slice as well
+            if( $this->csimtargets && $aaoption !== 1 ) {
+                $this->AddSliceToCSIM($i,$xcm,$ycm,$radius,$angle1,$angle2);
+            }
         }
 
-        if( $this->csimtargets && $aaoption !== 1 )
-        $this->AddSliceToCSIM($i,$xcm,$ycm,$radius,$angle1,$angle2);
-    }
+        // Format the titles for each slice
+        if( $aaoption !== 2 ) {
+            for( $i=0; $i < $n; ++$i) {
+                if( $this->labeltype==0 ) {
+                    if( $sum != 0 )
+                    $l = 100.0*$this->data[$i]/$sum;
+                    else
+                    $l = 0.0;
+                }
+                elseif( $this->labeltype==1 ) {
+                    $l = $this->data[$i]*1.0;
+                }
+                else {
+                    $l = $this->adjusted_data[$i];
+                }
+                if( isset($this->labels[$i]) && is_string($this->labels[$i]) )
+                $this->labels[$i]=sprintf($this->labels[$i],$l);
+                else
+                $this->labels[$i]=$l;
+            }
+        }
 
-    // Format the titles for each slice
-    for ($i=0; $i < $n; ++$i) {
-        if ($this->labeltype==0) {
-        if( $sum != 0 )
-            $l = 100.0*$this->data[$i]/$sum;
-        else
-            $l = 0.0;
-        } elseif ($this->labeltype==1) {
-        $l = $this->data[$i]*1.0;
-        } else {
-        $l = $this->adjusted_data[$i];
+        if( $this->value->show && $aaoption !== 1 ) {
+            $this->StrokeAllLabels($img,$xc,$yc,$radius);
         }
-        if( isset($this->labels[$i]) && is_string($this->labels[$i]) )
-        $this->labels[$i]=sprintf($this->labels[$i],$l);
-        else
-        $this->labels[$i]=$l;
-    }
 
-    if ($this->value->show && $aaoption !== 1) {
-        $this->StrokeAllLabels($img,$xc,$yc,$radius);
-    }
+        // Adjust title position
+        if( $aaoption !== 1 ) {
+            $this->title->SetPos($xc,
+            $yc-$this->title->GetFontHeight($img)-$radius-$this->title->margin,
+     "center","bottom");
+            $this->title->Stroke($img);
+        }
 
-    // Adjust title position
-    if ($aaoption !== 1) {
-        $this->title->Pos($xc,
-              $yc-$this->title->GetFontHeight($img)-$radius-$this->title->margin,
-              "center","bottom");
-        $this->title->Stroke($img);
     }
 
-    }
+    //---------------
+    // PRIVATE METHODS
 
-//---------------
-// PRIVATE METHODS
+    function NormAngle($a) {
+        while( $a < 0 ) $a += 2*M_PI;
+        while( $a > 2*M_PI ) $a -= 2*M_PI;
+        return $a;
+    }
+
+    function Quadrant($a) {
+        $a=$this->NormAngle($a);
+        if( $a > 0 && $a <= M_PI/2 )
+        return 0;
+        if( $a > M_PI/2 && $a <= M_PI )
+        return 1;
+        if( $a > M_PI && $a <= 1.5*M_PI )
+        return 2;
+        if( $a > 1.5*M_PI )
+        return 3;
+    }
+
+    function StrokeGuideLabels($img,$xc,$yc,$radius) {
+        $n = count($this->labels);
+
+        //-----------------------------------------------------------------------
+        // Step 1 of the algorithm is to construct a number of clusters
+        // a cluster is defined as all slices within the same quadrant (almost)
+        // that has an angular distance less than the treshold
+        //-----------------------------------------------------------------------
+        $tresh_hold=25 * M_PI/180; // 25 degrees difference to be in a cluster
+        $incluster=false; // flag if we are currently in a cluster or not
+        $clusters = array(); // array of clusters
+        $cidx=-1;  // running cluster index
+
+        // Go through all the labels and construct a number of clusters
+        for($i=0; $i < $n-1; ++$i) {
+            // Calc the angle distance between two consecutive slices
+            $a1=$this->la[$i];
+            $a2=$this->la[$i+1];
+            $q1 = $this->Quadrant($a1);
+            $q2 = $this->Quadrant($a2);
+            $diff = abs($a1-$a2);
+            if( $diff < $tresh_hold ) {
+                if( $incluster ) {
+                    $clusters[$cidx][1]++;
+                    // Each cluster can only cover one quadrant
+                    // Do we cross a quadrant ( and must break the cluster)
+                    if( $q1 !=  $q2 ) {
+                        // If we cross a quadrant boundary we normally start a
+                        // new cluster. However we need to take the 12'a clock
+                        // and 6'a clock positions into a special consideration.
+                        // Case 1: WE go from q=1 to q=2 if the last slice on
+                        // the cluster for q=1 is close to 12'a clock and the
+                        // first slice in q=0 is small we extend the previous
+                        // cluster
+                        if( $q1 == 1 && $q2 == 0 && $a2 > (90-15)*M_PI/180 ) {
+                            if( $i < $n-2 ) {
+                                $a3 = $this->la[$i+2];
+                                // If there isn't a cluster coming up with the next-next slice
+                                // we extend the previous cluster to cover this slice as well
+                                if( abs($a3-$a2) >= $tresh_hold ) {
+                                    $clusters[$cidx][1]++;
+                                    $i++;
+                                }
+                            }
+                        }
+                        elseif( $q1 == 3 && $q2 == 2 && $a2 > (270-15)*M_PI/180 ) {
+                            if( $i < $n-2 ) {
+                                $a3 = $this->la[$i+2];
+                                // If there isn't a cluster coming up with the next-next slice
+                                // we extend the previous cluster to cover this slice as well
+                                if( abs($a3-$a2) >= $tresh_hold ) {
+                                    $clusters[$cidx][1]++;
+                                    $i++;
+                                }
+                            }
+                        }
+
+                        if( $q1==2 && $q2==1 && $a2 > (180-15)*M_PI/180 ) {
+                            $clusters[$cidx][1]++;
+                            $i++;
+                        }
+
+                        $incluster = false;
+                    }
+                }
+                elseif( $q1 == $q2)  {
+                    $incluster = true;
+                    // Now we have a special case for quadrant 0. If we previously
+                    // have a cluster of one in quadrant 0 we just extend that
+                    // cluster. If we don't do this then we risk that the label
+                    // for the cluster of one will cross the guide-line
+                    if( $q1 == 0 && $cidx > -1 &&
+                    $clusters[$cidx][1] == 1 &&
+                    $this->Quadrant($this->la[$clusters[$cidx][0]]) == 0 ) {
+                        $clusters[$cidx][1]++;
+                    }
+                    else {
+                        $cidx++;
+                        $clusters[$cidx][0] = $i;
+                        $clusters[$cidx][1] = 1;
+                    }
+                }
+                else {
+                    // Create a "cluster" of one since we are just crossing
+                    // a quadrant
+                    $cidx++;
+                    $clusters[$cidx][0] = $i;
+                    $clusters[$cidx][1] = 1;
+                }
+            }
+            else {
+                if( $incluster ) {
+                    // Add the last slice
+                    $clusters[$cidx][1]++;
+                    $incluster = false;
+                }
+                else { // Create a "cluster" of one
+                    $cidx++;
+                    $clusters[$cidx][0] = $i;
+                    $clusters[$cidx][1] = 1;
+                }
+            }
+        }
+        // Handle the very last slice
+        if( $incluster ) {
+            $clusters[$cidx][1]++;
+        }
+        else { // Create a "cluster" of one
+            $cidx++;
+            $clusters[$cidx][0] = $i;
+            $clusters[$cidx][1] = 1;
+        }
+
+        /*
+         if( true ) {
+         // Debug printout in labels
+         for( $i=0; $i <= $cidx; ++$i ) {
+         for( $j=0; $j < $clusters[$i][1]; ++$j ) {
+         $a = $this->la[$clusters[$i][0]+$j];
+         $aa = round($a*180/M_PI);
+         $q = $this->Quadrant($a);
+         $this->labels[$clusters[$i][0]+$j]="[$q:$aa] $i:$j";
+         }
+         }
+         }
+         */
+
+        //-----------------------------------------------------------------------
+        // Step 2 of the algorithm is use the clusters and draw the labels
+        // and guidelines
+        //-----------------------------------------------------------------------
+
+        // We use the font height as the base factor for how far we need to
+        // spread the labels in the Y-direction.
+        $this->value->ApplyFont($img);
+        $fh = $img->GetFontHeight();
+        $origvstep=$fh*$this->iGuideVFactor;
+        $this->value->SetMargin(0);
+
+        // Number of clusters found
+        $nc = count($clusters);
+
+        // Walk through all the clusters
+        for($i=0; $i < $nc; ++$i) {
+
+            // Start angle and number of slices in this cluster
+            $csize = $clusters[$i][1];
+            $a = $this->la[$clusters[$i][0]];
+            $q = $this->Quadrant($a);
+
+            // Now set up the start and end conditions to make sure that
+            // in each cluster we walk through the all the slices starting with the slice
+            // closest to the equator. Since all slices are numbered clockwise from "3'a clock"
+            // we have different conditions depending on in which quadrant the slice lies within.
+            if( $q == 0 ) {
+                $start = $csize-1; $idx = $start; $step = -1; $vstep = -$origvstep;
+            }
+            elseif( $q == 1 ) {
+                $start = 0; $idx = $start; $step = 1; $vstep = -$origvstep;
+            }
+            elseif( $q == 2 ) {
+                $start = $csize-1; $idx = $start; $step = -1; $vstep = $origvstep;
+            }
+            elseif( $q == 3 ) {
+                $start = 0; $idx = $start; $step = 1; $vstep = $origvstep;
+            }
 
-    public function StrokeAllLabels($img,$xc,$yc,$radius)
-    {
-    $n = count($this->labels);
-    for ($i=0; $i < $n; ++$i) {
-        $this->StrokeLabel($this->labels[$i],$img,$xc,$yc,
-                   $this->la[$i],
-                   $radius + $this->explode_radius[$n-$i-1]);
+            // Walk through all slices within this cluster
+            for($j=0; $j < $csize; ++$j) {
+                // Now adjust the position of the labels in each cluster starting
+                // with the slice that is closest to the equator of the pie
+                $a = $this->la[$clusters[$i][0]+$idx];
+
+                // Guide line start in the center of the arc of the slice
+                $r = $radius+$this->explode_radius[$n-1-($clusters[$i][0]+$idx)];
+                $x = round($r*cos($a)+$xc);
+                $y = round($yc-$r*sin($a));
+
+                // The distance from the arc depends on chosen font and the "R-Factor"
+                $r += $fh*$this->iGuideLineRFactor;
+
+                // Should the labels be placed curved along the pie or in straight columns
+                // outside the pie?
+                if( $this->iGuideLineCurve )
+                $xt=round($r*cos($a)+$xc);
+
+                // If this is the first slice in the cluster we need some first time
+                // proessing
+                if( $idx == $start ) {
+                    if( ! $this->iGuideLineCurve )
+                    $xt=round($r*cos($a)+$xc);
+                    $yt=round($yc-$r*sin($a));
+
+                    // Some special consideration in case this cluster starts
+                    // in quadrant 1 or 3 very close to the "equator" (< 20 degrees)
+                    // and the previous clusters last slice is within the tolerance.
+                    // In that case we add a font height to this labels Y-position
+                    // so it doesn't collide with
+                    // the slice in the previous cluster
+                    $prevcluster = ($i + ($nc-1) ) % $nc;
+                    $previdx=$clusters[$prevcluster][0]+$clusters[$prevcluster][1]-1;
+                    if( $q == 1 && $a > 160*M_PI/180 ) {
+                        // Get the angle for the previous clusters last slice
+                        $diff = abs($a-$this->la[$previdx]);
+                        if( $diff < $tresh_hold ) {
+                            $yt -= $fh;
+                        }
+                    }
+                    elseif( $q == 3 && $a > 340*M_PI/180 ) {
+                        // We need to subtract 360 to compare angle distance between
+                        // q=0 and q=3
+                        $diff = abs($a-$this->la[$previdx]-360*M_PI/180);
+                        if( $diff < $tresh_hold ) {
+                            $yt += $fh;
+                        }
+                    }
+
+                }
+                else {
+                    // The step is at minimum $vstep but if the slices are relatively large
+                    // we make sure that we add at least a step that corresponds to the vertical
+                    // distance between the centers at the arc on the slice
+                    $prev_a = $this->la[$clusters[$i][0]+($idx-$step)];
+                    $dy = abs($radius*(sin($a)-sin($prev_a))*1.2);
+                    if( $vstep > 0 )
+                    $yt += max($vstep,$dy);
+                    else
+                    $yt += min($vstep,-$dy);
+                }
+
+                $label = $this->labels[$clusters[$i][0]+$idx];
+
+                if( $csize == 1 ) {
+                    // A "meta" cluster with only one slice
+                    $r = $radius+$this->explode_radius[$n-1-($clusters[$i][0]+$idx)];
+                    $rr = $r+$img->GetFontHeight()/2;
+                    $xt=round($rr*cos($a)+$xc);
+                    $yt=round($yc-$rr*sin($a));
+                    $this->StrokeLabel($label,$img,$xc,$yc,$a,$r);
+                    if( $this->iShowGuideLineForSingle )
+                    $this->guideline->Stroke($img,$x,$y,$xt,$yt);
+                }
+                else {
+                    $this->guideline->Stroke($img,$x,$y,$xt,$yt);
+                    if( $q==1 || $q==2 ) {
+                        // Left side of Pie
+                        $this->guideline->Stroke($img,$xt,$yt,$xt-$this->guidelinemargin,$yt);
+                        $lbladj = -$this->guidelinemargin-5;
+                        $this->value->halign = "right";
+                        $this->value->valign = "center";
+                    }
+                    else {
+                        // Right side of pie
+                        $this->guideline->Stroke($img,$xt,$yt,$xt+$this->guidelinemargin,$yt);
+                        $lbladj = $this->guidelinemargin+5;
+                        $this->value->halign = "left";
+                        $this->value->valign = "center";
+                    }
+                    $this->value->Stroke($img,$label,$xt+$lbladj,$yt);
+                }
+
+                // Udate idx to point to next slice in the cluster to process
+                $idx += $step;
+            }
+        }
     }
+
+    function StrokeAllLabels($img,$xc,$yc,$radius) {
+        // First normalize all angles for labels
+        $n = count($this->la);
+        for($i=0; $i < $n; ++$i) {
+            $this->la[$i] = $this->NormAngle($this->la[$i]);
+        }
+        if( $this->guideline->iShow ) {
+            $this->StrokeGuideLabels($img,$xc,$yc,$radius);
+        }
+        else {
+            $n = count($this->labels);
+            for($i=0; $i < $n; ++$i) {
+                $this->StrokeLabel($this->labels[$i],$img,$xc,$yc,
+                $this->la[$i],
+                $radius + $this->explode_radius[$n-1-$i]);
+            }
+        }
     }
 
     // Position the labels of each slice
-    public function StrokeLabel($label,$img,$xc,$yc,$a,$r)
-    {
-    // Default value
-    if( $this->ilabelposadj === 'auto' )
+    function StrokeLabel($label,$img,$xc,$yc,$a,$r) {
+
+        // Default value
+        if( $this->ilabelposadj === 'auto' )
         $this->ilabelposadj = 0.65;
 
-    // We position the values diferently depending on if they are inside
-    // or outside the pie
-    if ($this->ilabelposadj < 1.0) {
-
-        $this->value->SetAlign('center','center');
-        $this->value->margin = 0;
-
-        $xt=round($this->ilabelposadj*$r*cos($a)+$xc);
-        $yt=round($yc-$this->ilabelposadj*$r*sin($a));
-
-        $this->value->Stroke($img,$label,$xt,$yt);
-    } else {
-
-        $this->value->halign = "left";
-        $this->value->valign = "top";
-
-        // Position the axis title.
-        // dx, dy is the offset from the top left corner of the bounding box that sorrounds the text
-        // that intersects with the extension of the corresponding axis. The code looks a little
-        // bit messy but this is really the only way of having a reasonable position of the
-        // axis titles.
-        $img->SetFont($this->value->ff,$this->value->fs,$this->value->fsize);
-        $h=$img->GetTextHeight($label);
-        // For numeric values the format of the display value
-        // must be taken into account
-        if ( is_numeric($label) ) {
-        if( $label > 0 )
-            $w=$img->GetTextWidth(sprintf($this->value->format,$label));
-        else
-            $w=$img->GetTextWidth(sprintf($this->value->negformat,$label));
-        } else
-        $w=$img->GetTextWidth($label);
+        // We position the values diferently depending on if they are inside
+        // or outside the pie
+        if( $this->ilabelposadj < 1.0 ) {
+
+            $this->value->SetAlign('center','center');
+            $this->value->margin = 0;
+
+            $xt=round($this->ilabelposadj*$r*cos($a)+$xc);
+            $yt=round($yc-$this->ilabelposadj*$r*sin($a));
 
-        if ($this->ilabelposadj > 1.0 && $this->ilabelposadj < 5.0) {
-        $r *= $this->ilabelposadj;
+            $this->value->Stroke($img,$label,$xt,$yt);
         }
+        else {
+
+            $this->value->halign = "left";
+            $this->value->valign = "top";
+            $this->value->margin = 0;
+
+            // Position the axis title.
+            // dx, dy is the offset from the top left corner of the bounding box that sorrounds the text
+            // that intersects with the extension of the corresponding axis. The code looks a little
+            // bit messy but this is really the only way of having a reasonable position of the
+            // axis titles.
+            $this->value->ApplyFont($img);
+            $h=$img->GetTextHeight($label);
+            // For numeric values the format of the display value
+            // must be taken into account
+            if( is_numeric($label) ) {
+                if( $label > 0 )
+                $w=$img->GetTextWidth(sprintf($this->value->format,$label));
+                else
+                $w=$img->GetTextWidth(sprintf($this->value->negformat,$label));
+            }
+            else
+            $w=$img->GetTextWidth($label);
 
-        $r += $img->GetFontHeight()/1.5 + $this->value->margin ;
-        $xt=round($r*cos($a)+$xc);
-        $yt=round($yc-$r*sin($a));
+            if( $this->ilabelposadj > 1.0 && $this->ilabelposadj < 5.0) {
+                $r *= $this->ilabelposadj;
+            }
 
-        while( $a < 0 ) $a += 2*M_PI;
-        while( $a > 2*M_PI ) $a -= 2*M_PI;
+            $r += $img->GetFontHeight()/1.5;
+
+            $xt=round($r*cos($a)+$xc);
+            $yt=round($yc-$r*sin($a));
 
-        if( $a>=7*M_PI/4 || $a <= M_PI/4 ) $dx=0;
-        if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dx=($a-M_PI/4)*2/M_PI;
-        if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dx=1;
-        if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dx=(1-($a-M_PI*5/4)*2/M_PI);
+            // Normalize angle
+            while( $a < 0 ) $a += 2*M_PI;
+            while( $a > 2*M_PI ) $a -= 2*M_PI;
 
-        if( $a>=7*M_PI/4 ) $dy=(($a-M_PI)-3*M_PI/4)*2/M_PI;
-        if( $a<=M_PI/4 ) $dy=(1-$a*2/M_PI);
-        if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dy=1;
-        if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dy=(1-($a-3*M_PI/4)*2/M_PI);
-        if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dy=0;
+            if( $a>=7*M_PI/4 || $a <= M_PI/4 ) $dx=0;
+            if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dx=($a-M_PI/4)*2/M_PI;
+            if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dx=1;
+            if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dx=(1-($a-M_PI*5/4)*2/M_PI);
 
-        $oldmargin = $this->value->margin ;
-        $this->value->margin = 0;
-        $this->value->Stroke($img,$label,$xt-$dx*$w,$yt-$dy*$h);
-        $this->value->margin = $oldmargin ;
+            if( $a>=7*M_PI/4 ) $dy=(($a-M_PI)-3*M_PI/4)*2/M_PI;
+            if( $a<=M_PI/4 ) $dy=(1-$a*2/M_PI);
+            if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dy=1;
+            if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dy=(1-($a-3*M_PI/4)*2/M_PI);
+            if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dy=0;
+
+            $this->value->Stroke($img,$label,$xt-$dx*$w,$yt-$dy*$h);
+        }
     }
+
+    function UsePlotThemeColors($flag = true) {
+        $this->use_plot_theme_colors = $flag;
     }
 } // Class
 
@@ -610,397 +1041,455 @@ public function StrokeLabel($label,$img,$xc,$yc,$a,$r)
 // Description: Same as a normal pie plot but with a
 // filled circle in the center
 //===================================================
-class PiePlotC extends PiePlot
-{
-    public $imidsize=0.5;		// Fraction of total width
-    public $imidcolor='white';
+class PiePlotC extends PiePlot {
+    private $imidsize=0.5;  // Fraction of total width
+    private $imidcolor='white';
     public $midtitle='';
-    public $middlecsimtarget="",$middlecsimalt="";
+    private $middlecsimtarget='',$middlecsimwintarget='',$middlecsimalt='';
 
-    public function PiePlotC($data,$aCenterTitle='')
-    {
-    parent::PiePlot($data);
-    $this->midtitle = new Text();
-    $this->midtitle->ParagraphAlign('center');
+    function __construct($data,$aCenterTitle='') {
+        parent::__construct($data);
+        $this->midtitle = new Text();
+        $this->midtitle->ParagraphAlign('center');
     }
 
-    public function SetMid($aTitle,$aColor='white',$aSize=0.5)
-    {
-    $this->midtitle->Set($aTitle);
-    $this->imidsize = $aSize ;
-    $this->imidcolor = $aColor ;
+    function SetMid($aTitle,$aColor='white',$aSize=0.5) {
+        $this->midtitle->Set($aTitle);
+
+        $this->imidsize = $aSize ;
+        $this->imidcolor = $aColor ;
     }
 
-    public function SetMidTitle($aTitle)
-    {
-    $this->midtitle->Set($aTitle);
+    function SetMidTitle($aTitle) {
+        $this->midtitle->Set($aTitle);
     }
 
-    public function SetMidSize($aSize)
-    {
-    $this->imidsize = $aSize ;
+    function SetMidSize($aSize) {
+        $this->imidsize = $aSize ;
     }
 
-    public function SetMidColor($aColor)
-    {
-    $this->imidcolor = $aColor ;
+    function SetMidColor($aColor) {
+        $this->imidcolor = $aColor ;
     }
 
-    public function SetMidCSIM($aTarget,$aAlt)
-    {
-    $this->middlecsimtarget = $aTarget;
-    $this->middlecsimalt = $aAlt;
+    function SetMidCSIM($aTarget,$aAlt='',$aWinTarget='') {
+        $this->middlecsimtarget = $aTarget;
+        $this->middlecsimwintarget = $aWinTarget;
+        $this->middlecsimalt = $aAlt;
     }
 
-    public function AddSliceToCSIM($i,$xc,$yc,$radius,$sa,$ea)
-    {
+    function AddSliceToCSIM($i,$xc,$yc,$radius,$sa,$ea) {
         //Slice number, ellipse centre (x,y), radius, start angle, end angle
-    while( $sa > 2*M_PI ) $sa = $sa - 2*M_PI;
-    while( $ea > 2*M_PI ) $ea = $ea - 2*M_PI;
-
-    $sa = 2*M_PI - $sa;
-    $ea = 2*M_PI - $ea;
-
-    // Add inner circle first point
-    $xp = floor(($this->imidsize*$radius*cos($ea))+$xc);
-    $yp = floor($yc-($this->imidsize*$radius*sin($ea)));
-    $coords = "$xp, $yp";
-
-    //add coordinates every 0.25 radians
-    $a=$ea+0.25;
-    while ($a < $sa) {
-        $xp = floor(($this->imidsize*$radius*cos($a)+$xc));
-        $yp = floor($yc-($this->imidsize*$radius*sin($a)));
-        $coords.= ", $xp, $yp";
-        $a += 0.25;
-    }
+        while( $sa > 2*M_PI ) $sa = $sa - 2*M_PI;
+        while( $ea > 2*M_PI ) $ea = $ea - 2*M_PI;
+
+        $sa = 2*M_PI - $sa;
+        $ea = 2*M_PI - $ea;
+
+        // Special case when we have only one slice since then both start and end
+        // angle will be == 0
+        if( abs($sa - $ea) < 0.0001 ) {
+            $sa=2*M_PI; $ea=0;
+        }
+
+        // Add inner circle first point
+        $xp = floor(($this->imidsize*$radius*cos($ea))+$xc);
+        $yp = floor($yc-($this->imidsize*$radius*sin($ea)));
+        $coords = "$xp, $yp";
+
+        //add coordinates every 0.25 radians
+        $a=$ea+0.25;
+
+        // If we cross the 360-limit with a slice we need to handle
+        // the fact that end angle is smaller than start
+        if( $sa < $ea ) {
+            while ($a <= 2*M_PI) {
+                $xp = floor($radius*cos($a)+$xc);
+                $yp = floor($yc-$radius*sin($a));
+                $coords.= ", $xp, $yp";
+                $a += 0.25;
+            }
+            $a -= 2*M_PI;
+        }
 
-    // Make sure we end at the last point
-    $xp = floor(($this->imidsize*$radius*cos($sa)+$xc));
-    $yp = floor($yc-($this->imidsize*$radius*sin($sa)));
-    $coords.= ", $xp, $yp";
+        while ($a < $sa) {
+            $xp = floor(($this->imidsize*$radius*cos($a)+$xc));
+            $yp = floor($yc-($this->imidsize*$radius*sin($a)));
+            $coords.= ", $xp, $yp";
+            $a += 0.25;
+        }
 
-    // Straight line to outer circle
-    $xp = floor($radius*cos($sa)+$xc);
-    $yp = floor($yc-$radius*sin($sa));
-    $coords.= ", $xp, $yp";
+        // Make sure we end at the last point
+        $xp = floor(($this->imidsize*$radius*cos($sa)+$xc));
+        $yp = floor($yc-($this->imidsize*$radius*sin($sa)));
+        $coords.= ", $xp, $yp";
 
-    //add coordinates every 0.25 radians
-    $a=$sa - 0.25;
-    while ($a > $ea) {
-        $xp = floor($radius*cos($a)+$xc);
-        $yp = floor($yc-$radius*sin($a));
+        // Straight line to outer circle
+        $xp = floor($radius*cos($sa)+$xc);
+        $yp = floor($yc-$radius*sin($sa));
         $coords.= ", $xp, $yp";
-        $a -= 0.25;
-    }
 
-    //Add the last point on the arc
-    $xp = floor($radius*cos($ea)+$xc);
-    $yp = floor($yc-$radius*sin($ea));
-    $coords.= ", $xp, $yp";
+        //add coordinates every 0.25 radians
+        $a=$sa - 0.25;
+        while ($a > $ea) {
+            $xp = floor($radius*cos($a)+$xc);
+            $yp = floor($yc-$radius*sin($a));
+            $coords.= ", $xp, $yp";
+            $a -= 0.25;
+        }
 
-    // Close the arc
-    $xp = floor(($this->imidsize*$radius*cos($ea))+$xc);
-    $yp = floor($yc-($this->imidsize*$radius*sin($ea)));
-    $coords .= ", $xp, $yp";
+        //Add the last point on the arc
+        $xp = floor($radius*cos($ea)+$xc);
+        $yp = floor($yc-$radius*sin($ea));
+        $coords.= ", $xp, $yp";
+
+        // Close the arc
+        $xp = floor(($this->imidsize*$radius*cos($ea))+$xc);
+        $yp = floor($yc-($this->imidsize*$radius*sin($ea)));
+        $coords .= ", $xp, $yp";
 
-    if ( !empty($this->csimtargets[$i]) ) {
-        $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".
-        $this->csimtargets[$i]."\"";
-        if ( !empty($this->csimalts[$i]) ) {
-        $tmp=sprintf($this->csimalts[$i],$this->data[$i]);
-        $this->csimareas .= " alt=\"$tmp\" title=\"$tmp\"";
+        if( !empty($this->csimtargets[$i]) ) {
+            $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".
+            $this->csimtargets[$i]."\"";
+            if( !empty($this->csimwintargets[$i]) ) {
+                $this->csimareas .= " target=\"".$this->csimwintargets[$i]."\" ";
+            }
+            if( !empty($this->csimalts[$i]) ) {
+                $tmp=sprintf($this->csimalts[$i],$this->data[$i]);
+                $this->csimareas .= " title=\"$tmp\"  alt=\"$tmp\" ";
+            }
+            $this->csimareas .= " />\n";
         }
-        $this->csimareas .= ">\n";
-    }
     }
 
 
-    public function Stroke($img,$aaoption=0)
-    {
-    // Stroke the pie but don't stroke values
-    $tmp =  $this->value->show;
-    $this->value->show = false;
-    parent::Stroke($img,$aaoption);
-    $this->value->show = $tmp;
+    function Stroke($img,$aaoption=0) {
 
-     $xc = round($this->posx*$img->width);
-    $yc = round($this->posy*$img->height);
+        // Stroke the pie but don't stroke values
+        $tmp =  $this->value->show;
+        $this->value->show = false;
+        parent::Stroke($img,$aaoption);
+        $this->value->show = $tmp;
 
-    $radius = floor($this->radius * min($img->width,$img->height)) ;
+        $xc = round($this->posx*$img->width);
+        $yc = round($this->posy*$img->height);
 
-    if ($this->imidsize > 0 && $aaoption !== 2) {
+        $radius = floor($this->radius * min($img->width,$img->height)) ;
 
-        if ($this->ishadowcolor != "") {
-        $img->SetColor($this->ishadowcolor);
-        $img->FilledCircle($xc+$this->ishadowdrop,$yc+$this->ishadowdrop,
-                   round($radius*$this->imidsize));
-        }
 
-        $img->SetColor($this->imidcolor);
-        $img->FilledCircle($xc,$yc,round($radius*$this->imidsize));
+        if( $this->imidsize > 0 && $aaoption !== 2 ) {
 
-        if ($this->pie_border && $aaoption === 0) {
-        $img->SetColor($this->color);
-        $img->Circle($xc,$yc,round($radius*$this->imidsize));
-        }
+            if( $this->ishadowcolor != "" ) {
+                $img->SetColor($this->ishadowcolor);
+                $img->FilledCircle($xc+$this->ishadowdrop,$yc+$this->ishadowdrop,
+                round($radius*$this->imidsize));
+            }
 
-        if( !empty($this->middlecsimtarget) )
-        $this->AddMiddleCSIM($xc,$yc,round($radius*$this->imidsize));
+            $img->SetColor($this->imidcolor);
+            $img->FilledCircle($xc,$yc,round($radius*$this->imidsize));
 
-    }
+            if(  $this->pie_border && $aaoption === 0 ) {
+                $img->SetColor($this->color);
+                $img->Circle($xc,$yc,round($radius*$this->imidsize));
+            }
 
-    if ($this->value->show && $aaoption !== 1) {
-        $this->StrokeAllLabels($img,$xc,$yc,$radius);
-        $this->midtitle->Pos($xc,$yc,'center','center');
-        $this->midtitle->Stroke($img);
-    }
+            if( !empty($this->middlecsimtarget) )
+            $this->AddMiddleCSIM($xc,$yc,round($radius*$this->imidsize));
+
+        }
+
+        if( $this->value->show && $aaoption !== 1) {
+            $this->StrokeAllLabels($img,$xc,$yc,$radius);
+            $this->midtitle->SetPos($xc,$yc,'center','center');
+            $this->midtitle->Stroke($img);
+        }
 
     }
 
-    public function AddMiddleCSIM($xc,$yc,$r)
-    {
-    $this->csimareas .= "<area shape=\"circle\" coords=\"$xc,$yc,$r\" href=\"".
+    function AddMiddleCSIM($xc,$yc,$r) {
+        $xc=round($xc);$yc=round($yc);$r=round($r);
+        $this->csimareas .= "<area shape=\"circle\" coords=\"$xc,$yc,$r\" href=\"".
         $this->middlecsimtarget."\"";
-    if ( !empty($this->middlecsimalt) ) {
-        $tmp = $this->middlecsimalt;
-        $this->csimareas .= " alt=\"$tmp\" title=\"$tmp\"";
-    }
-    $this->csimareas .= ">\n";
+        if( !empty($this->middlecsimwintarget) ) {
+            $this->csimareas .= " target=\"".$this->middlecsimwintarget."\"";
+        }
+        if( !empty($this->middlecsimalt) ) {
+            $tmp = $this->middlecsimalt;
+            $this->csimareas .= " title=\"$tmp\" alt=\"$tmp\" ";
+        }
+        $this->csimareas .= " />\n";
     }
 
-    public function StrokeLabel($label,$img,$xc,$yc,$a,$r)
-    {
-    if( $this->ilabelposadj === 'auto' )
+    function StrokeLabel($label,$img,$xc,$yc,$a,$r) {
+
+        if( $this->ilabelposadj === 'auto' )
         $this->ilabelposadj = (1-$this->imidsize)/2+$this->imidsize;
 
-    parent::StrokeLabel($label,$img,$xc,$yc,$a,$r);
+        parent::StrokeLabel($label,$img,$xc,$yc,$a,$r);
 
     }
 
 }
 
+
 //===================================================
 // CLASS PieGraph
 // Description:
 //===================================================
-class PieGraph extends Graph
-{
-    public $posx, $posy, $radius;
-    public $legends=array();
+class PieGraph extends Graph {
+    private $posx, $posy, $radius;
+    private $legends=array();
     public $plots=array();
     public $pieaa = false ;
-//---------------
-// CONSTRUCTOR
-    public function PieGraph($width=300,$height=200,$cachedName="",$timeout=0,$inline=1)
-    {
-    $this->Graph($width,$height,$cachedName,$timeout,$inline);
-    $this->posx=$width/2;
-    $this->posy=$height/2;
-    $this->SetColor(array(255,255,255));
-    }
-
-//---------------
-// PUBLIC METHODS
-    public function Add($aObj)
-    {
-    if( is_array($aObj) && count($aObj) > 0 )
-        $cl = strtolower(get_class($aObj[0]));
-    else
-        $cl = strtolower(get_class($aObj));
-
-    if( $cl == 'text' )
+    //---------------
+    // CONSTRUCTOR
+    function __construct($width=300,$height=200,$cachedName="",$timeout=0,$inline=1) {
+        parent::__construct($width,$height,$cachedName,$timeout,$inline);
+        $this->posx=$width/2;
+        $this->posy=$height/2;
+        $this->SetColor(array(255,255,255));
+
+        if ($this->graph_theme) {
+          $this->graph_theme->ApplyGraph($this);
+        }
+    }
+
+    //---------------
+    // PUBLIC METHODS
+    function Add($aObj) {
+
+        if( is_array($aObj) && count($aObj) > 0 )
+        $cl = $aObj[0];
+        else
+        $cl = $aObj;
+
+        if( $cl instanceof Text )
         $this->AddText($aObj);
-    elseif( $cl == 'iconplot' )
+        elseif( class_exists('IconPlot',false) && ($cl instanceof IconPlot) )
         $this->AddIcon($aObj);
-    else {
-        if ( is_array($aObj) ) {
-        $n = count($aObj);
-        for ($i=0; $i < $n; ++$i) {
-            $this->plots[] = &$aObj[$i];
+        else {
+            if( is_array($aObj) ) {
+                $n = count($aObj);
+                for($i=0; $i < $n; ++$i ) {
+                    //if ($aObj[$i]->theme) {
+                    //    $this->ClearTheme();
+                    //}
+                    $this->plots[] = $aObj[$i];
+                }
+            }
+            else {
+                //if ($aObj->theme) {
+                //    $this->ClearTheme();
+                //}
+                $this->plots[] = $aObj;
+            }
         }
-        } else {
-        $this->plots[] = $aObj;
+
+        if ($this->graph_theme) {
+            $this->graph_theme->SetupPlot($aObj);
+            if ($aObj->is_using_plot_theme) {
+                $aObj->UsePlotThemeColors();
+            }
         }
     }
-    }
 
-    public function SetAntiAliasing($aFlg=true)
-    {
-    $this->pieaa = $aFlg;
+    function SetAntiAliasing($aFlg=true) {
+        $this->pieaa = $aFlg;
     }
 
-    public function SetColor($c)
-    {
-    $this->SetMarginColor($c);
+    function SetColor($c) {
+        $this->SetMarginColor($c);
     }
 
-    public function DisplayCSIMAreas()
-    {
+
+    function DisplayCSIMAreas() {
         $csim="";
-        foreach ($this->plots as $p) {
-        $csim .= $p->GetCSIMareas();
+        foreach($this->plots as $p ) {
+            $csim .= $p->GetCSIMareas();
         }
-        //$csim.= $this->legend->GetCSIMareas();
+        
+        $csim.= $this->legend->GetCSIMareas();
         if (preg_match_all("/area shape=\"(\w+)\" coords=\"([0-9\, ]+)\"/", $csim, $coords)) {
-        $this->img->SetColor($this->csimcolor);
-        for ($i=0; $i<count($coords[0]); $i++) {
-            if ($coords[1][$i]=="poly") {
-            preg_match_all('/\s*([0-9]+)\s*,\s*([0-9]+)\s*,*/',$coords[2][$i],$pts);
-            $this->img->SetStartPoint($pts[1][count($pts[0])-1],$pts[2][count($pts[0])-1]);
-            for ($j=0; $j<count($pts[0]); $j++) {
-                $this->img->LineTo($pts[1][$j],$pts[2][$j]);
+            $this->img->SetColor($this->csimcolor);
+            $n = count($coords[0]);
+            for ($i=0; $i < $n; $i++) {
+                if ($coords[1][$i]=="poly") {
+                    preg_match_all('/\s*([0-9]+)\s*,\s*([0-9]+)\s*,*/',$coords[2][$i],$pts);
+                    $this->img->SetStartPoint($pts[1][count($pts[0])-1],$pts[2][count($pts[0])-1]);
+                    $m = count($pts[0]);
+                    for ($j=0; $j < $m; $j++) {
+                        $this->img->LineTo($pts[1][$j],$pts[2][$j]);
+                    }
+                } else if ($coords[1][$i]=="rect") {
+                    $pts = preg_split('/,/', $coords[2][$i]);
+                    $this->img->SetStartPoint($pts[0],$pts[1]);
+                    $this->img->LineTo($pts[2],$pts[1]);
+                    $this->img->LineTo($pts[2],$pts[3]);
+                    $this->img->LineTo($pts[0],$pts[3]);
+                    $this->img->LineTo($pts[0],$pts[1]);
+
+                }
             }
-            } elseif ($coords[1][$i]=="rect") {
-            $pts = preg_split('/,/', $coords[2][$i]);
-            $this->img->SetStartPoint($pts[0],$pts[1]);
-            $this->img->LineTo($pts[2],$pts[1]);
-            $this->img->LineTo($pts[2],$pts[3]);
-            $this->img->LineTo($pts[0],$pts[3]);
-            $this->img->LineTo($pts[0],$pts[1]);
-
-            }
-        }
         }
     }
 
     // Method description
-    public function Stroke($aStrokeFileName="")
-    {
-    // If the filename is the predefined value = '_csim_special_'
-    // we assume that the call to stroke only needs to do enough
-    // to correctly generate the CSIM maps.
-    // We use this variable to skip things we don't strictly need
-    // to do to generate the image map to improve performance
-    // a best we can. Therefor you will see a lot of tests !$_csim in the
-    // code below.
-    $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
-
-    // We need to know if we have stroked the plot in the
-    // GetCSIMareas. Otherwise the CSIM hasn't been generated
-    // and in the case of GetCSIM called before stroke to generate
-    // CSIM without storing an image to disk GetCSIM must call Stroke.
-    $this->iHasStroked = true;
-
-    $n = count($this->plots);
-
-    if ($this->pieaa) {
-
-        if (!$_csim) {
-        if ($this->background_image != "") {
-            $this->StrokeFrameBackground();
-        } else {
-            $this->StrokeFrame();
-        }
-        }
+    function Stroke($aStrokeFileName="") {
+
+        // If the filename is the predefined value = '_csim_special_'
+        // we assume that the call to stroke only needs to do enough
+        // to correctly generate the CSIM maps.
+        // We use this variable to skip things we don't strictly need
+        // to do to generate the image map to improve performance
+        // a best we can. Therefor you will see a lot of tests !$_csim in the
+        // code below.
+        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
+
+        // If we are called the second time (perhaps the user has called GetHTMLImageMap()
+        // himself then the legends have alsready been populated once in order to get the
+        // CSIM coordinats. Since we do not want the legends to be populated a second time
+        // we clear the legends
+        $this->legend->Clear();
+
+        // We need to know if we have stroked the plot in the
+        // GetCSIMareas. Otherwise the CSIM hasn't been generated
+        // and in the case of GetCSIM called before stroke to generate
+        // CSIM without storing an image to disk GetCSIM must call Stroke.
+        $this->iHasStroked = true;
+
+        $n = count($this->plots);
+
+        if( $this->pieaa ) {
+
+            if( !$_csim ) {
+                if( $this->background_image != "" ) {
+                    $this->StrokeFrameBackground();
+                }
+                else {
+                    $this->StrokeFrame();
+                    $this->StrokeBackgroundGrad();
+                }
+            }
 
-        $w = $this->img->width;
-        $h = $this->img->height;
-        $oldimg = $this->img->img;
 
-        $this->img->CreateImgCanvas(2*$w,2*$h);
+            $w = $this->img->width;
+            $h = $this->img->height;
+            $oldimg = $this->img->img;
 
-        $this->img->SetColor( $this->margin_color );
-        $this->img->FilledRectangle(0,0,2*$w-1,2*$h-1);
+            $this->img->CreateImgCanvas(2*$w,2*$h);
 
-        // Make all icons *2 i size since we will be scaling down the
-        // imahe to do the anti aliasing
-        $ni = count($this->iIcons);
-        for ($i=0; $i < $ni; ++$i) {
-        $this->iIcons[$i]->iScale *= 2 ;
-        }
-        $this->StrokeIcons();
+            $this->img->SetColor( $this->margin_color );
+            $this->img->FilledRectangle(0,0,2*$w-1,2*$h-1);
 
-        for ($i=0; $i < $n; ++$i) {
-        if( $this->plots[$i]->posx > 1 )
-            $this->plots[$i]->posx *= 2 ;
-        if( $this->plots[$i]->posy > 1 )
-            $this->plots[$i]->posy *= 2 ;
+            // Make all icons *2 i size since we will be scaling down the
+            // imahe to do the anti aliasing
+            $ni = count($this->iIcons);
+            for($i=0; $i < $ni; ++$i) {
+                $this->iIcons[$i]->iScale *= 2 ;
+                if( $this->iIcons[$i]->iX > 1 )
+                $this->iIcons[$i]->iX *= 2 ;
+                if( $this->iIcons[$i]->iY > 1 )
+                $this->iIcons[$i]->iY *= 2 ;
+            }
 
-        $this->plots[$i]->Stroke($this->img,1);
+            $this->StrokeIcons();
 
-        if( $this->plots[$i]->posx > 1 )
-            $this->plots[$i]->posx /= 2 ;
-        if( $this->plots[$i]->posy > 1 )
-            $this->plots[$i]->posy /= 2 ;
-        }
+            for($i=0; $i < $n; ++$i) {
+                if( $this->plots[$i]->posx > 1 )
+                $this->plots[$i]->posx *= 2 ;
+                if( $this->plots[$i]->posy > 1 )
+                $this->plots[$i]->posy *= 2 ;
 
-        $indent = $this->doframe ? ($this->frame_weight + ($this->doshadow ? $this->shadow_width : 0 )) : 0 ;
-        $indent += $this->framebevel ? $this->framebeveldepth + 1 : 0 ;
-        $this->img->CopyCanvasH($oldimg,$this->img->img,$indent,$indent,$indent,$indent,
-                    $w-2*$indent,$h-2*$indent,2*($w-$indent),2*($h-$indent));
+                $this->plots[$i]->Stroke($this->img,1);
 
-        $this->img->img = $oldimg ;
-        $this->img->width = $w ;
-        $this->img->height = $h ;
+                if( $this->plots[$i]->posx > 1 )
+                $this->plots[$i]->posx /= 2 ;
+                if( $this->plots[$i]->posy > 1 )
+                $this->plots[$i]->posy /= 2 ;
+            }
 
-        for ($i=0; $i < $n; ++$i) {
-        $this->plots[$i]->Stroke($this->img,2); // Stroke labels
-        $this->plots[$i]->Legend($this);
-        }
+            $indent = $this->doframe ? ($this->frame_weight + ($this->doshadow ? $this->shadow_width : 0 )) : 0 ;
+            $indent += $this->framebevel ? $this->framebeveldepth + 1 : 0 ;
+            $this->img->CopyCanvasH($oldimg,$this->img->img,$indent,$indent,$indent,$indent,
+            $w-2*$indent,$h-2*$indent,2*($w-$indent),2*($h-$indent));
 
-    } else {
+            $this->img->img = $oldimg ;
+            $this->img->width = $w ;
+            $this->img->height = $h ;
+
+            for($i=0; $i < $n; ++$i) {
+                $this->plots[$i]->Stroke($this->img,2); // Stroke labels
+                $this->plots[$i]->Legend($this);
+            }
 
-        if (!$_csim) {
-        if ($this->background_image != "") {
-            $this->StrokeFrameBackground();
-        } else {
-            $this->StrokeFrame();
-        }
         }
+        else {
+
+            if( !$_csim ) {
+                if( $this->background_image != "" ) {
+                    $this->StrokeFrameBackground();
+                }
+                else {
+                    $this->StrokeFrame();
+                    $this->StrokeBackgroundGrad();
+                }
+            }
 
-        $this->StrokeIcons();
+            $this->StrokeIcons();
 
-        for ($i=0; $i < $n; ++$i) {
-        $this->plots[$i]->Stroke($this->img);
-        $this->plots[$i]->Legend($this);
+            for($i=0; $i < $n; ++$i) {
+                $this->plots[$i]->Stroke($this->img);
+                $this->plots[$i]->Legend($this);
+            }
         }
-    }
 
-    $this->legend->Stroke($this->img);
-    $this->footer->Stroke($this->img);
-    $this->StrokeTitles();
+        $this->legend->Stroke($this->img);
+        $this->footer->Stroke($this->img);
+        $this->StrokeTitles();
 
-    // Stroke texts
-    if ($this->texts != null) {
-        $n = count($this->texts);
-        for ($i=0; $i < $n; ++$i) {
-        $this->texts[$i]->Stroke($this->img);
-        }
-    }
+        if( !$_csim ) {
 
-    if (!$_csim) {
+            // Stroke texts
+            if( $this->texts != null ) {
+                $n = count($this->texts);
+                for($i=0; $i < $n; ++$i ) {
+                    $this->texts[$i]->Stroke($this->img);
+                }
+            }
 
-        if (_JPG_DEBUG) {
-        $this->DisplayCSIMAreas();
-        }
+            if( _JPG_DEBUG ) {
+                $this->DisplayCSIMAreas();
+            }
 
-        // Should we do any final image transformation
-        if ($this->iImgTrans) {
-        if ( !class_exists('ImgTrans') ) {
-            require_once 'jpgraph_imgtrans.php';
-            //JpGraphError::Raise('In order to use image transformation you must include the file jpgraph_imgtrans.php in your script.');
-        }
+            // Should we do any final image transformation
+            if( $this->iImgTrans ) {
+                if( !class_exists('ImgTrans',false) ) {
+                    require_once('jpgraph_imgtrans.php');
+                    //JpGraphError::Raise('In order to use image transformation you must include the file jpgraph_imgtrans.php in your script.');
+                }
+
+                $tform = new ImgTrans($this->img->img);
+                $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
+                $this->iImgTransDirection,$this->iImgTransHighQ,
+                $this->iImgTransMinSize,$this->iImgTransFillColor,
+                $this->iImgTransBorder);
+            }
 
-        $tform = new ImgTrans($this->img->img);
-        $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
-                         $this->iImgTransDirection,$this->iImgTransHighQ,
-                         $this->iImgTransMinSize,$this->iImgTransFillColor,
-                         $this->iImgTransBorder);
-        }
 
-        // If the filename is given as the special "__handle"
-        // then the image handler is returned and the image is NOT
-        // streamed back
-        if ($aStrokeFileName == _IMG_HANDLER) {
-        return $this->img->img;
-        } else {
-        // Finally stream the generated picture
-        $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,
-                       $aStrokeFileName);
+            // If the filename is given as the special "__handle"
+            // then the image handler is returned and the image is NOT
+            // streamed back
+            if( $aStrokeFileName == _IMG_HANDLER ) {
+                return $this->img->img;
+            }
+            else {
+                // Finally stream the generated picture
+                $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,
+                $aStrokeFileName);
+            }
         }
     }
-    }
 } // Class
 
 /* EOF */
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_pie3d.php b/common/lib/jpgraph_lib/jpgraph_pie3d.php
old mode 100644
new mode 100755
index 25a5f26a3..52b8631e6
--- a/common/lib/jpgraph_lib/jpgraph_pie3d.php
+++ b/common/lib/jpgraph_lib/jpgraph_pie3d.php
@@ -1,897 +1,933 @@
 <?php
 /*=======================================================================
-// File:	JPGRAPH_PIE3D.PHP
-// Description: 3D Pie plot extension for JpGraph
-// Created: 	2001-03-24
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_pie3d.php,v 1.46.2.5 2004/06/19 12:22:04 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2001,2002 Johan Persson
-//========================================================================
-*/
+ // File:        JPGRAPH_PIE3D.PHP
+ // Description: 3D Pie plot extension for JpGraph
+ // Created:     2001-03-24
+ // Ver:         $Id: jpgraph_pie3d.php 1329 2009-06-20 19:23:30Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
 
 //===================================================
 // CLASS PiePlot3D
 // Description: Plots a 3D pie with a specified projection
 // angle between 20 and 70 degrees.
 //===================================================
-class PiePlot3D extends PiePlot
-{
-    public $labelhintcolor="red",$showlabelhint=true;
-    public $angle=50;
-    public $edgecolor="", $edgeweight=1;
-    public $iThickness=false;
-
-//---------------
-// CONSTRUCTOR
-    public function PiePlot3d(&$data)
-    {
-    $this->radius = 0.5;
-    $this->data = $data;
-    $this->title = new Text("");
-    $this->title->SetFont(FF_FONT1,FS_BOLD);
-    $this->value = new DisplayValue();
-    $this->value->Show();
-    $this->value->SetFormat('%.0f%%');
-    }
-
-//---------------
-// PUBLIC METHODS
+class PiePlot3D extends PiePlot {
+    private $labelhintcolor="red",$showlabelhint=true;
+    private $angle=50;
+    private $edgecolor="", $edgeweight=1;
+    private $iThickness=false;
+
+    //---------------
+    // CONSTRUCTOR
+    function __construct($data) {
+        $this->radius = 0.5;
+        $this->data = $data;
+        $this->title = new Text("");
+        $this->title->SetFont(FF_FONT1,FS_BOLD);
+        $this->value = new DisplayValue();
+        $this->value->Show();
+        $this->value->SetFormat('%.0f%%');
+    }
+
+    //---------------
+    // PUBLIC METHODS
 
     // Set label arrays
-    public function SetLegends($aLegend)
-    {
-    $this->legends = array_reverse($aLegend);
+    function SetLegends($aLegend) {
+        $this->legends = array_reverse(array_slice($aLegend,0,count($this->data)));
     }
 
-    public function SetSliceColors($aColors)
-    {
-    $this->setslicecolors = $aColors;
+    function SetSliceColors($aColors) {
+        $this->setslicecolors = $aColors;
     }
 
-    public function Legend(&$aGraph)
-    {
-    parent::Legend($aGraph);
-    $aGraph->legend->txtcol = array_reverse($aGraph->legend->txtcol);
+    function Legend($aGraph) {
+        parent::Legend($aGraph);
+        $aGraph->legend->txtcol = array_reverse($aGraph->legend->txtcol);
     }
 
-    public function SetCSIMTargets($targets,$alts=null)
-    {
-    $this->csimtargets = $targets;
-    $this->csimalts = $alts;
+    function SetCSIMTargets($aTargets,$aAlts='',$aWinTargets='') {
+        $this->csimtargets = $aTargets;
+        $this->csimwintargets = $aWinTargets;
+        $this->csimalts = $aAlts;
     }
 
     // Should the slices be separated by a line? If color is specified as "" no line
     // will be used to separate pie slices.
-    public function SetEdge($aColor,$aWeight=1)
-    {
-    $this->edgecolor = $aColor;
-    $this->edgeweight = $aWeight;
+    function SetEdge($aColor='black',$aWeight=1) {
+        $this->edgecolor = $aColor;
+        $this->edgeweight = $aWeight;
     }
 
     // Specify projection angle for 3D in degrees
     // Must be between 20 and 70 degrees
-    public function SetAngle($a)
-    {
-    if( $a<5 || $a>90 )
-        JpGraphError::Raise("PiePlot3D::SetAngle() 3D Pie projection angle must be between 5 and 85 degrees.");
-    else
-        $this->angle = $a;
+    function SetAngle($a) {
+        if( $a<5 || $a>90 ) {
+            JpGraphError::RaiseL(14002);
+            //("PiePlot3D::SetAngle() 3D Pie projection angle must be between 5 and 85 degrees.");
+        }
+        else {
+            $this->angle = $a;
+        }
     }
 
-    public function AddSliceToCSIM($i,$xc,$yc,$height,$width,$thick,$sa,$ea) {  //Slice number, ellipse centre (x,y), height, width, start angle, end angle
-
-    $sa *= M_PI/180;
-    $ea *= M_PI/180;
+    function Add3DSliceToCSIM($i,$xc,$yc,$height,$width,$thick,$sa,$ea) {  //Slice number, ellipse centre (x,y), height, width, start angle, end angle
 
-    //add coordinates of the centre to the map
-    $coords = "$xc, $yc";
+        $sa *= M_PI/180;
+        $ea *= M_PI/180;
 
-    //add coordinates of the first point on the arc to the map
-    $xp = floor($width*cos($sa)/2+$xc);
-    $yp = floor($yc-$height*sin($sa)/2);
-    $coords.= ", $xp, $yp";
+        //add coordinates of the centre to the map
+        $coords = "$xc, $yc";
 
-    //If on the front half, add the thickness offset
-    if ($sa >= M_PI && $sa <= 2*M_PI*1.01) {
-        $yp = floor($yp+$thick);
+        //add coordinates of the first point on the arc to the map
+        $xp = floor($width*cos($sa)/2+$xc);
+        $yp = floor($yc-$height*sin($sa)/2);
         $coords.= ", $xp, $yp";
-    }
 
-    //add coordinates every 0.2 radians
-    $a=$sa+0.2;
-    while ($a<$ea) {
-        $xp = floor($width*cos($a)/2+$xc);
-        if ($a >= M_PI && $a <= 2*M_PI*1.01) {
-        $yp = floor($yc-($height*sin($a)/2)+$thick);
-        } else {
-        $yp = floor($yc-$height*sin($a)/2);
+        //If on the front half, add the thickness offset
+        if ($sa >= M_PI && $sa <= 2*M_PI*1.01) {
+            $yp = floor($yp+$thick);
+            $coords.= ", $xp, $yp";
         }
-        $coords.= ", $xp, $yp";
-        $a += 0.2;
-    }
 
-    //Add the last point on the arc
-    $xp = floor($width*cos($ea)/2+$xc);
-    $yp = floor($yc-$height*sin($ea)/2);
+        //add coordinates every 0.2 radians
+        $a=$sa+0.2;
+        while ($a<$ea) {
+            $xp = floor($width*cos($a)/2+$xc);
+            if ($a >= M_PI && $a <= 2*M_PI*1.01) {
+                $yp = floor($yc-($height*sin($a)/2)+$thick);
+            } else {
+                $yp = floor($yc-$height*sin($a)/2);
+            }
+            $coords.= ", $xp, $yp";
+            $a += 0.2;
+        }
+
+        //Add the last point on the arc
+        $xp = floor($width*cos($ea)/2+$xc);
+        $yp = floor($yc-$height*sin($ea)/2);
+
+
+        if ($ea >= M_PI && $ea <= 2*M_PI*1.01) {
+            $coords.= ", $xp, ".floor($yp+$thick);
+        }
+        $coords.= ", $xp, $yp";
+        $alt='';
+
+        if( !empty($this->csimtargets[$i]) ) {
+            $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->csimtargets[$i]."\"";
+
+            if( !empty($this->csimwintargets[$i]) ) {
+                $this->csimareas .= " target=\"".$this->csimwintargets[$i]."\" ";
+            }
+             
+            if( !empty($this->csimalts[$i]) ) {
+                $tmp=sprintf($this->csimalts[$i],$this->data[$i]);
+                $this->csimareas .= "alt=\"$tmp\" title=\"$tmp\" ";
+            }
+            $this->csimareas .=  " />\n";
+        }
 
-    if ($ea >= M_PI && $ea <= 2*M_PI*1.01) {
-        $coords.= ", $xp, ".floor($yp+$thick);
-    }
-    $coords.= ", $xp, $yp";
-    $alt='';
-    if ( !empty($this->csimalts[$i]) ) {
-        $tmp=sprintf($this->csimalts[$i],$this->data[$i]);
-        $alt="alt=\"$tmp\" title=\"$tmp\"";
-    }
-    if( !empty($this->csimtargets[$i]) )
-        $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".$this->csimtargets[$i]."\" $alt>\n";
     }
 
-    public function SetLabels($aLabels,$aLblPosAdj="auto")
-    {
-    $this->labels = $aLabels;
-    $this->ilabelposadj=$aLblPosAdj;
+    function SetLabels($aLabels,$aLblPosAdj="auto") {
+        $this->labels = $aLabels;
+        $this->ilabelposadj=$aLblPosAdj;
     }
 
+
     // Distance from the pie to the labels
-    public function SetLabelMargin($m)
-    {
-    $this->value->SetMargin($m);
+    function SetLabelMargin($m) {
+        $this->value->SetMargin($m);
     }
 
     // Show a thin line from the pie to the label for a specific slice
-    public function ShowLabelHint($f=true)
-    {
-    $this->showlabelhint=$f;
+    function ShowLabelHint($f=true) {
+        $this->showlabelhint=$f;
     }
 
     // Set color of hint line to label for each slice
-    public function SetLabelHintColor($c)
-    {
-    $this->labelhintcolor=$c;
+    function SetLabelHintColor($c) {
+        $this->labelhintcolor=$c;
     }
 
-    public function SetHeight($aHeight)
-    {
-      $this->iThickness = $aHeight;
+    function SetHeight($aHeight) {
+        $this->iThickness = $aHeight;
     }
 
-// Normalize Angle between 0-360
-    public function NormAngle($a)
-    {
-    // Normalize anle to 0 to 2M_PI
-    //
-    if ($a > 0) {
-        while($a > 360) $a -= 360;
-    } else {
-        while($a < 0) $a += 360;
-    }
-    if( $a < 0 )
-        $a = 360 + $a;
 
-    if( $a == 360 ) $a=0;
-
-    return $a;
-    }
+    // Normalize Angle between 0-360
+    function NormAngle($a) {
+        // Normalize anle to 0 to 2M_PI
+        //
+        if( $a > 0 ) {
+            while($a > 360) $a -= 360;
+        }
+        else {
+            while($a < 0) $a += 360;
+        }
+        if( $a < 0 )
+        $a = 360 + $a;
 
-// Draw one 3D pie slice at position ($xc,$yc) with height $z
-    public function Pie3DSlice($img,$xc,$yc,$w,$h,$sa,$ea,$z,$fillcolor,$shadow=0.65)
-    {
-    // Due to the way the 3D Pie algorithm works we are
-    // guaranteed that any slice we get into this method
-    // belongs to either the left or right side of the
-    // pie ellipse. Hence, no slice will cross 90 or 270
-    // point.
-    if ( ($sa < 90 && $ea > 90) || ( ($sa > 90 && $sa < 270) && $ea > 270) ) {
-        JpGraphError::Raise('Internal assertion failed. Pie3D::Pie3DSlice');
-        exit(1);
+        if( $a == 360 ) $a=0;
+        return $a;
     }
 
-    $p[] = array();
-
-    // Setup pre-calculated values
-    $rsa = $sa/180*M_PI;	// to Rad
-    $rea = $ea/180*M_PI;	// to Rad
-    $sinsa = sin($rsa);
-    $cossa = cos($rsa);
-    $sinea = sin($rea);
-    $cosea = cos($rea);
 
-    // p[] is the points for the overall slice and
-    // pt[] is the points for the top pie
 
-    // Angular step when approximating the arc with a polygon train.
-    $step = 0.05;
+    // Draw one 3D pie slice at position ($xc,$yc) with height $z
+    function Pie3DSlice($img,$xc,$yc,$w,$h,$sa,$ea,$z,$fillcolor,$shadow=0.65) {
 
-    if ($sa >= 270) {
-        if ( $ea > 360 || ($ea > 0 && $ea <= 90) ) {
-        if ($ea > 0 && $ea <= 90) {
-            // Adjust angle to simplify conditions in loops
-            $rea += 2*M_PI;
+        // Due to the way the 3D Pie algorithm works we are
+        // guaranteed that any slice we get into this method
+        // belongs to either the left or right side of the
+        // pie ellipse. Hence, no slice will cross 90 or 270
+        // point.
+        if( ($sa < 90 && $ea > 90) || ( ($sa > 90 && $sa < 270) && $ea > 270) ) {
+            JpGraphError::RaiseL(14003);//('Internal assertion failed. Pie3D::Pie3DSlice');
+            exit(1);
         }
 
-        $p = array($xc,$yc,$xc,$yc+$z,
-               $xc+$w*$cossa,$z+$yc-$h*$sinsa);
-        $pt = array($xc,$yc,$xc+$w*$cossa,$yc-$h*$sinsa);
-
-        for ($a=$rsa; $a < 2*M_PI; $a += $step) {
-            $tca = cos($a);
-            $tsa = sin($a);
-            $p[] = $xc+$w*$tca;
-            $p[] = $z+$yc-$h*$tsa;
-            $pt[] = $xc+$w*$tca;
-            $pt[] = $yc-$h*$tsa;
+        $p[] = array();
+
+        // Setup pre-calculated values
+        $rsa = $sa/180*M_PI; // to Rad
+        $rea = $ea/180*M_PI; // to Rad
+        $sinsa = sin($rsa);
+        $cossa = cos($rsa);
+        $sinea = sin($rea);
+        $cosea = cos($rea);
+
+        // p[] is the points for the overall slice and
+        // pt[] is the points for the top pie
+
+        // Angular step when approximating the arc with a polygon train.
+        $step = 0.05;
+
+        if( $sa >= 270 ) {
+            if( $ea > 360 || ($ea > 0 && $ea <= 90) ) {
+                if( $ea > 0 && $ea <= 90 ) {
+                    // Adjust angle to simplify conditions in loops
+                    $rea += 2*M_PI;
+                }
+
+                $p = array($xc,$yc,$xc,$yc+$z,
+                $xc+$w*$cossa,$z+$yc-$h*$sinsa);
+                $pt = array($xc,$yc,$xc+$w*$cossa,$yc-$h*$sinsa);
+
+                for( $a=$rsa; $a < 2*M_PI; $a += $step ) {
+                    $tca = cos($a);
+                    $tsa = sin($a);
+                    $p[] = $xc+$w*$tca;
+                    $p[] = $z+$yc-$h*$tsa;
+                    $pt[] = $xc+$w*$tca;
+                    $pt[] = $yc-$h*$tsa;
+                }
+
+                $pt[] = $xc+$w;
+                $pt[] = $yc;
+
+                $p[] = $xc+$w;
+                $p[] = $z+$yc;
+                $p[] = $xc+$w;
+                $p[] = $yc;
+                $p[] = $xc;
+                $p[] = $yc;
+
+                for( $a=2*M_PI+$step; $a < $rea; $a += $step ) {
+                    $pt[] = $xc + $w*cos($a);
+                    $pt[] = $yc - $h*sin($a);
+                }
+
+                $pt[] = $xc+$w*$cosea;
+                $pt[] = $yc-$h*$sinea;
+                $pt[] = $xc;
+                $pt[] = $yc;
+
+            }
+            else {
+                $p = array($xc,$yc,$xc,$yc+$z,
+                $xc+$w*$cossa,$z+$yc-$h*$sinsa);
+                $pt = array($xc,$yc,$xc+$w*$cossa,$yc-$h*$sinsa);
+
+                $rea = $rea == 0.0 ? 2*M_PI : $rea;
+                for( $a=$rsa; $a < $rea; $a += $step ) {
+                    $tca = cos($a);
+                    $tsa = sin($a);
+                    $p[] = $xc+$w*$tca;
+                    $p[] = $z+$yc-$h*$tsa;
+                    $pt[] = $xc+$w*$tca;
+                    $pt[] = $yc-$h*$tsa;
+                }
+
+                $pt[] = $xc+$w*$cosea;
+                $pt[] = $yc-$h*$sinea;
+                $pt[] = $xc;
+                $pt[] = $yc;
+
+                $p[] = $xc+$w*$cosea;
+                $p[] = $z+$yc-$h*$sinea;
+                $p[] = $xc+$w*$cosea;
+                $p[] = $yc-$h*$sinea;
+                $p[] = $xc;
+                $p[] = $yc;
+            }
         }
+        elseif( $sa >= 180 ) {
+            $p = array($xc,$yc,$xc,$yc+$z,$xc+$w*$cosea,$z+$yc-$h*$sinea);
+            $pt = array($xc,$yc,$xc+$w*$cosea,$yc-$h*$sinea);
+
+            for( $a=$rea; $a>$rsa; $a -= $step ) {
+                $tca = cos($a);
+                $tsa = sin($a);
+                $p[] = $xc+$w*$tca;
+                $p[] = $z+$yc-$h*$tsa;
+                $pt[] = $xc+$w*$tca;
+                $pt[] = $yc-$h*$tsa;
+            }
+
+            $pt[] = $xc+$w*$cossa;
+            $pt[] = $yc-$h*$sinsa;
+            $pt[] = $xc;
+            $pt[] = $yc;
+
+            $p[] = $xc+$w*$cossa;
+            $p[] = $z+$yc-$h*$sinsa;
+            $p[] = $xc+$w*$cossa;
+            $p[] = $yc-$h*$sinsa;
+            $p[] = $xc;
+            $p[] = $yc;
 
-        $pt[] = $xc+$w;
-        $pt[] = $yc;
-
-        $p[] = $xc+$w;
-        $p[] = $z+$yc;
-        $p[] = $xc+$w;
-        $p[] = $yc;
-        $p[] = $xc;
-        $p[] = $yc;
-
-        for ($a=2*M_PI+$step; $a < $rea; $a += $step) {
-            $pt[] = $xc + $w*cos($a);
-            $pt[] = $yc - $h*sin($a);
         }
+        elseif( $sa >= 90 ) {
+            if( $ea > 180 ) {
+                $p = array($xc,$yc,$xc,$yc+$z,$xc+$w*$cosea,$z+$yc-$h*$sinea);
+                $pt = array($xc,$yc,$xc+$w*$cosea,$yc-$h*$sinea);
+
+                for( $a=$rea; $a > M_PI; $a -= $step ) {
+                    $tca = cos($a);
+                    $tsa = sin($a);
+                    $p[] = $xc+$w*$tca;
+                    $p[] = $z + $yc - $h*$tsa;
+                    $pt[] = $xc+$w*$tca;
+                    $pt[] = $yc-$h*$tsa;
+                }
+
+                $p[] = $xc-$w;
+                $p[] = $z+$yc;
+                $p[] = $xc-$w;
+                $p[] = $yc;
+                $p[] = $xc;
+                $p[] = $yc;
+
+                $pt[] = $xc-$w;
+                $pt[] = $z+$yc;
+                $pt[] = $xc-$w;
+                $pt[] = $yc;
+
+                for( $a=M_PI-$step; $a > $rsa; $a -= $step ) {
+                    $pt[] = $xc + $w*cos($a);
+                    $pt[] = $yc - $h*sin($a);
+                }
+
+                $pt[] = $xc+$w*$cossa;
+                $pt[] = $yc-$h*$sinsa;
+                $pt[] = $xc;
+                $pt[] = $yc;
+
+            }
+            else { // $sa >= 90 && $ea <= 180
+                $p = array($xc,$yc,$xc,$yc+$z,
+                $xc+$w*$cosea,$z+$yc-$h*$sinea,
+                $xc+$w*$cosea,$yc-$h*$sinea,
+                $xc,$yc);
+
+                $pt = array($xc,$yc,$xc+$w*$cosea,$yc-$h*$sinea);
+
+                for( $a=$rea; $a>$rsa; $a -= $step ) {
+                    $pt[] = $xc + $w*cos($a);
+                    $pt[] = $yc - $h*sin($a);
+                }
+
+                $pt[] = $xc+$w*$cossa;
+                $pt[] = $yc-$h*$sinsa;
+                $pt[] = $xc;
+                $pt[] = $yc;
+
+            }
+        }
+        else { // sa > 0 && ea < 90
+
+            $p = array($xc,$yc,$xc,$yc+$z,
+            $xc+$w*$cossa,$z+$yc-$h*$sinsa,
+            $xc+$w*$cossa,$yc-$h*$sinsa,
+            $xc,$yc);
 
-        $pt[] = $xc+$w*$cosea;
-        $pt[] = $yc-$h*$sinea;
-        $pt[] = $xc;
-        $pt[] = $yc;
+            $pt = array($xc,$yc,$xc+$w*$cossa,$yc-$h*$sinsa);
 
-        } else {
-        $p = array($xc,$yc,$xc,$yc+$z,
-               $xc+$w*$cossa,$z+$yc-$h*$sinsa);
-        $pt = array($xc,$yc,$xc+$w*$cossa,$yc-$h*$sinsa);
+            for( $a=$rsa; $a < $rea; $a += $step ) {
+                $pt[] = $xc + $w*cos($a);
+                $pt[] = $yc - $h*sin($a);
+            }
 
-        $rea = $rea == 0.0 ? 2*M_PI : $rea;
-        for ($a=$rsa; $a < $rea; $a += $step) {
-            $tca = cos($a);
-            $tsa = sin($a);
-            $p[] = $xc+$w*$tca;
-            $p[] = $z+$yc-$h*$tsa;
-            $pt[] = $xc+$w*$tca;
-            $pt[] = $yc-$h*$tsa;
+            $pt[] = $xc+$w*$cosea;
+            $pt[] = $yc-$h*$sinea;
+            $pt[] = $xc;
+            $pt[] = $yc;
         }
+         
+        $img->PushColor($fillcolor.":".$shadow);
+        $img->FilledPolygon($p);
+        $img->PopColor();
 
-        $pt[] = $xc+$w*$cosea;
-        $pt[] = $yc-$h*$sinea;
-        $pt[] = $xc;
-        $pt[] = $yc;
+        $img->PushColor($fillcolor);
+        $img->FilledPolygon($pt);
+        $img->PopColor();
+    }
 
-        $p[] = $xc+$w*$cosea;
-        $p[] = $z+$yc-$h*$sinea;
-        $p[] = $xc+$w*$cosea;
-        $p[] = $yc-$h*$sinea;
-        $p[] = $xc;
-        $p[] = $yc;
+    function SetStartAngle($aStart) {
+        if( $aStart < 0 || $aStart > 360 ) {
+            JpGraphError::RaiseL(14004);//('Slice start angle must be between 0 and 360 degrees.');
         }
-    } elseif ($sa >= 180) {
-        $p = array($xc,$yc,$xc,$yc+$z,$xc+$w*$cosea,$z+$yc-$h*$sinea);
-        $pt = array($xc,$yc,$xc+$w*$cosea,$yc-$h*$sinea);
-
-        for ($a=$rea; $a>$rsa; $a -= $step) {
-        $tca = cos($a);
-        $tsa = sin($a);
-        $p[] = $xc+$w*$tca;
-        $p[] = $z+$yc-$h*$tsa;
-        $pt[] = $xc+$w*$tca;
-        $pt[] = $yc-$h*$tsa;
+        $this->startangle = $aStart;
+    }
+
+    // Draw a 3D Pie
+    function Pie3D($aaoption,$img,$data,$colors,$xc,$yc,$d,$angle,$z,
+                   $shadow=0.65,$startangle=0,$edgecolor="",$edgeweight=1) {
+
+        //---------------------------------------------------------------------------
+        // As usual the algorithm get more complicated than I originally
+        // envisioned. I believe that this is as simple as it is possible
+        // to do it with the features I want. It's a good exercise to start
+        // thinking on how to do this to convince your self that all this
+        // is really needed for the general case.
+        //
+        // The algorithm two draw 3D pies without "real 3D" is done in
+        // two steps.
+        // First imagine the pie cut in half through a thought line between
+        // 12'a clock and 6'a clock. It now easy to imagine that we can plot
+        // the individual slices for each half by starting with the topmost
+        // pie slice and continue down to 6'a clock.
+        //
+        // In the algortithm this is done in three principal steps
+        // Step 1. Do the knife cut to ensure by splitting slices that extends
+        // over the cut line. This is done by splitting the original slices into
+        // upto 3 subslices.
+        // Step 2. Find the top slice for each half
+        // Step 3. Draw the slices from top to bottom
+        //
+        // The thing that slightly complicates this scheme with all the
+        // angle comparisons below is that we can have an arbitrary start
+        // angle so we must take into account the different equivalence classes.
+        // For the same reason we must walk through the angle array in a
+        // modulo fashion.
+        //
+        // Limitations of algorithm:
+        // * A small exploded slice which crosses the 270 degree point
+        //   will get slightly nagged close to the center due to the fact that
+        //   we print the slices in Z-order and that the slice left part
+        //   get printed first and might get slightly nagged by a larger
+        //   slice on the right side just before the right part of the small
+        //   slice. Not a major problem though.
+        //---------------------------------------------------------------------------
+
+
+        // Determine the height of the ellippse which gives an
+        // indication of the inclination angle
+        $h = ($angle/90.0)*$d;
+        $sum = 0;
+        for($i=0; $i<count($data); ++$i ) {
+            $sum += $data[$i];
         }
 
-        $pt[] = $xc+$w*$cossa;
-        $pt[] = $yc-$h*$sinsa;
-        $pt[] = $xc;
-        $pt[] = $yc;
+        // Special optimization
+        if( $sum==0 ) return;
 
-        $p[] = $xc+$w*$cossa;
-        $p[] = $z+$yc-$h*$sinsa;
-        $p[] = $xc+$w*$cossa;
-        $p[] = $yc-$h*$sinsa;
-        $p[] = $xc;
-        $p[] = $yc;
-
-    } elseif ($sa >= 90) {
-        if ($ea > 180) {
-        $p = array($xc,$yc,$xc,$yc+$z,$xc+$w*$cosea,$z+$yc-$h*$sinea);
-        $pt = array($xc,$yc,$xc+$w*$cosea,$yc-$h*$sinea);
-
-        for ($a=$rea; $a > M_PI; $a -= $step) {
-            $tca = cos($a);
-            $tsa = sin($a);
-            $p[] = $xc+$w*$tca;
-            $p[] = $z + $yc - $h*$tsa;
-            $pt[] = $xc+$w*$tca;
-            $pt[] = $yc-$h*$tsa;
+        if( $this->labeltype == 2 ) {
+            $this->adjusted_data = $this->AdjPercentage($data);
         }
 
-        $p[] = $xc-$w;
-        $p[] = $z+$yc;
-        $p[] = $xc-$w;
-        $p[] = $yc;
-        $p[] = $xc;
-        $p[] = $yc;
-
-        $pt[] = $xc-$w;
-        $pt[] = $z+$yc;
-        $pt[] = $xc-$w;
-        $pt[] = $yc;
+        // Setup the start
+        $accsum = 0;
+        $a = $startangle;
+        $a = $this->NormAngle($a);
 
-        for ($a=M_PI-$step; $a > $rsa; $a -= $step) {
-            $pt[] = $xc + $w*cos($a);
-            $pt[] = $yc - $h*sin($a);
+        //
+        // Step 1 . Split all slices that crosses 90 or 270
+        //
+        $idx=0;
+        $adjexplode=array();
+        $numcolors = count($colors);
+        for($i=0; $i<count($data); ++$i, ++$idx ) {
+            $da = $data[$i]/$sum * 360;
+
+            if( empty($this->explode_radius[$i]) ) {
+                $this->explode_radius[$i]=0;
+            }
+
+            $expscale=1;
+            if( $aaoption == 1 ) {
+                $expscale=2;
+            }
+
+            $la = $a + $da/2;
+            $explode = array( $xc + $this->explode_radius[$i]*cos($la*M_PI/180)*$expscale,
+            $yc - $this->explode_radius[$i]*sin($la*M_PI/180) * ($h/$d) *$expscale );
+            $adjexplode[$idx] = $explode;
+            $labeldata[$i] = array($la,$explode[0],$explode[1]);
+            $originalangles[$i] = array($a,$a+$da);
+
+            $ne = $this->NormAngle($a+$da);
+            if( $da <= 180 ) {
+                // If the slice size is <= 90 it can at maximum cut across
+                // one boundary (either 90 or 270) where it needs to be split
+                $split=-1; // no split
+                if( ($da<=90 && ($a <= 90 && $ne > 90)) ||
+                (($da <= 180 && $da >90)  && (($a < 90 || $a >= 270) && $ne > 90)) ) {
+                    $split = 90;
+                }
+                elseif( ($da<=90 && ($a <= 270 && $ne > 270)) ||
+                (($da<=180 && $da>90) && ($a >= 90 && $a < 270 && ($a+$da) > 270 )) ) {
+                    $split = 270;
+                }
+                if( $split > 0 ) { // split in two
+                    $angles[$idx] = array($a,$split);
+                    $adjcolors[$idx] = $colors[$i % $numcolors];
+                    $adjexplode[$idx] = $explode;
+                    $angles[++$idx] = array($split,$ne);
+                    $adjcolors[$idx] = $colors[$i % $numcolors];
+                    $adjexplode[$idx] = $explode;
+                }
+                else { // no split
+                    $angles[$idx] = array($a,$ne);
+                    $adjcolors[$idx] = $colors[$i  % $numcolors];
+                    $adjexplode[$idx] = $explode;
+                }
+            }
+            else {
+                // da>180
+                // Slice may, depending on position, cross one or two
+                // bonudaries
+
+                if( $a < 90 )        $split = 90;
+                elseif( $a <= 270 )  $split = 270;
+                else                 $split = 90;
+
+                $angles[$idx] = array($a,$split);
+                $adjcolors[$idx] = $colors[$i % $numcolors];
+                $adjexplode[$idx] = $explode;
+                //if( $a+$da > 360-$split ) {
+                // For slices larger than 270 degrees we might cross
+                // another boundary as well. This means that we must
+                // split the slice further. The comparison gets a little
+                // bit complicated since we must take into accound that
+                // a pie might have a startangle >0 and hence a slice might
+                // wrap around the 0 angle.
+                // Three cases:
+                //  a) Slice starts before 90 and hence gets a split=90, but
+                //     we must also check if we need to split at 270
+                //  b) Slice starts after 90 but before 270 and slices
+                //     crosses 90 (after a wrap around of 0)
+                //  c) If start is > 270 (hence the firstr split is at 90)
+                //     and the slice is so large that it goes all the way
+                //     around 270.
+                if( ($a < 90 && ($a+$da > 270)) || ($a > 90 && $a<=270 && ($a+$da>360+90) ) || ($a > 270 && $this->NormAngle($a+$da)>270) ) {
+                    $angles[++$idx] = array($split,360-$split);
+                    $adjcolors[$idx] = $colors[$i % $numcolors];
+                    $adjexplode[$idx] = $explode;
+                    $angles[++$idx] = array(360-$split,$ne);
+                    $adjcolors[$idx] = $colors[$i % $numcolors];
+                    $adjexplode[$idx] = $explode;
+                }
+                else {
+                    // Just a simple split to the previous decided
+                    // angle.
+                    $angles[++$idx] = array($split,$ne);
+                    $adjcolors[$idx] = $colors[$i % $numcolors];
+                    $adjexplode[$idx] = $explode;
+                }
+            }
+            $a += $da;
+            $a = $this->NormAngle($a);
         }
 
-        $pt[] = $xc+$w*$cossa;
-        $pt[] = $yc-$h*$sinsa;
-        $pt[] = $xc;
-        $pt[] = $yc;
-
-        } else { // $sa >= 90 && $ea <= 180
-        $p = array($xc,$yc,$xc,$yc+$z,
-               $xc+$w*$cosea,$z+$yc-$h*$sinea,
-               $xc+$w*$cosea,$yc-$h*$sinea,
-               $xc,$yc);
-
-        $pt = array($xc,$yc,$xc+$w*$cosea,$yc-$h*$sinea);
+        // Total number of slices
+        $n = count($angles);
 
-        for ($a=$rea; $a>$rsa; $a -= $step) {
-            $pt[] = $xc + $w*cos($a);
-            $pt[] = $yc - $h*sin($a);
+        for($i=0; $i<$n; ++$i) {
+            list($dbgs,$dbge) = $angles[$i];
         }
 
-        $pt[] = $xc+$w*$cossa;
-        $pt[] = $yc-$h*$sinsa;
-        $pt[] = $xc;
-        $pt[] = $yc;
-
+        //
+        // Step 2. Find start index (first pie that starts in upper left quadrant)
+        //
+        $minval = $angles[0][0];
+        $min = 0;
+        for( $i=0; $i<$n; ++$i ) {
+            if( $angles[$i][0] < $minval ) {
+                $minval = $angles[$i][0];
+                $min = $i;
+            }
         }
-    } else { // sa > 0 && ea < 90
-
-        $p = array($xc,$yc,$xc,$yc+$z,
-               $xc+$w*$cossa,$z+$yc-$h*$sinsa,
-               $xc+$w*$cossa,$yc-$h*$sinsa,
-               $xc,$yc);
-
-        $pt = array($xc,$yc,$xc+$w*$cossa,$yc-$h*$sinsa);
-
-        for ($a=$rsa; $a < $rea; $a += $step) {
-        $pt[] = $xc + $w*cos($a);
-        $pt[] = $yc - $h*sin($a);
+        $j = $min;
+        $cnt = 0;
+        while( $angles[$j][1] <= 90 ) {
+            $j++;
+            if( $j>=$n) {
+                $j=0;
+            }
+            if( $cnt > $n ) {
+                JpGraphError::RaiseL(14005);
+                //("Pie3D Internal error (#1). Trying to wrap twice when looking for start index");
+            }
+            ++$cnt;
         }
+        $start = $j;
 
-        $pt[] = $xc+$w*$cosea;
-        $pt[] = $yc-$h*$sinea;
-        $pt[] = $xc;
-        $pt[] = $yc;
-    }
+        //
+        // Step 3. Print slices in z-order
+        //
+        $cnt = 0;
 
-    $img->PushColor($fillcolor.":".$shadow);
-    $img->FilledPolygon($p);
-    $img->PopColor();
+        // First stroke all the slices between 90 and 270 (left half circle)
+        // counterclockwise
+         
+        while( $angles[$j][0] < 270  && $aaoption !== 2 ) {
 
-    $img->PushColor($fillcolor);
-    $img->FilledPolygon($pt);
-    $img->PopColor();
-    }
+            list($x,$y) = $adjexplode[$j];
 
-    public function SetStartAngle($aStart)
-    {
-    if ($aStart < 0 || $aStart > 360) {
-        JpGraphError::Raise('Slice start angle must be between 0 and 360 degrees.');
-    }
-    $this->startangle = $aStart;
-    }
+            $this->Pie3DSlice($img,$x,$y,$d,$h,$angles[$j][0],$angles[$j][1],
+            $z,$adjcolors[$j],$shadow);
 
-// Draw a 3D Pie
-    public function Pie3D($aaoption,$img,$data,$colors,$xc,$yc,$d,$angle,$z,
-           $shadow=0.65,$startangle=0,$edgecolor="",$edgeweight=1) {
-
-    //---------------------------------------------------------------------------
-    // As usual the algorithm get more complicated than I originally
-    // envisioned. I believe that this is as simple as it is possible
-    // to do it with the features I want. It's a good exercise to start
-    // thinking on how to do this to convince your self that all this
-    // is really needed for the general case.
-    //
-    // The algorithm two draw 3D pies without "real 3D" is done in
-    // two steps.
-    // First imagine the pie cut in half through a thought line between
-    // 12'a clock and 6'a clock. It now easy to imagine that we can plot
-    // the individual slices for each half by starting with the topmost
-    // pie slice and continue down to 6'a clock.
-    //
-    // In the algortithm this is done in three principal steps
-    // Step 1. Do the knife cut to ensure by splitting slices that extends
-    // over the cut line. This is done by splitting the original slices into
-    // upto 3 subslices.
-    // Step 2. Find the top slice for each half
-    // Step 3. Draw the slices from top to bottom
-    //
-    // The thing that slightly complicates this scheme with all the
-    // angle comparisons below is that we can have an arbitrary start
-    // angle so we must take into account the different equivalence classes.
-    // For the same reason we must walk through the angle array in a
-    // modulo fashion.
-    //
-    // Limitations of algorithm:
-    // * A small exploded slice which crosses the 270 degree point
-    //   will get slightly nagged close to the center due to the fact that
-    //   we print the slices in Z-order and that the slice left part
-    //   get printed first and might get slightly nagged by a larger
-    //   slice on the right side just before the right part of the small
-    //   slice. Not a major problem though.
-    //---------------------------------------------------------------------------
-
-    // Determine the height of the ellippse which gives an
-    // indication of the inclination angle
-    $h = ($angle/90.0)*$d;
-    $sum = 0;
-    for ($i=0; $i<count($data); ++$i ) {
-        $sum += $data[$i];
-    }
+            $last = array($x,$y,$j);
 
-    // Special optimization
-    if( $sum==0 ) return;
-
-    if ($this->labeltype == 2) {
-        $this->adjusted_data = $this->AdjPercentage($data);
-    }
-
-    // Setup the start
-    $accsum = 0;
-    $a = $startangle;
-    $a = $this->NormAngle($a);
-
-    //
-    // Step 1 . Split all slices that crosses 90 or 270
-    //
-    $idx=0;
-    $adjexplode=array();
-    $numcolors = count($colors);
-    for ($i=0; $i<count($data); ++$i, ++$idx ) {
-        $da = $data[$i]/$sum * 360;
-
-        if( empty($this->explode_radius[$i]) )
-        $this->explode_radius[$i]=0;
-
-        $expscale=1;
-        if( $aaoption == 1 )
-        $expscale=2;
-
-        $la = $a + $da/2;
-        $explode = array( $xc + $this->explode_radius[$i]*cos($la*M_PI/180)*$expscale,
-                      $yc - $this->explode_radius[$i]*sin($la*M_PI/180) * ($h/$d) *$expscale );
-        $adjexplode[$idx] = $explode;
-        $labeldata[$i] = array($la,$explode[0],$explode[1]);
-        $originalangles[$i] = array($a,$a+$da);
-
-        $ne = $this->NormAngle($a+$da);
-        if ($da <= 180) {
-        // If the slice size is <= 90 it can at maximum cut across
-        // one boundary (either 90 or 270) where it needs to be split
-        $split=-1; // no split
-        if( ($da<=90 && ($a <= 90 && $ne > 90)) ||
-            (($da <= 180 && $da >90)  && (($a < 90 || $a >= 270) && $ne > 90)) ) {
-            $split = 90;
-        } elseif( ($da<=90 && ($a <= 270 && $ne > 270)) ||
-                (($da<=180 && $da>90) && ($a >= 90 && $a < 270 && ($a+$da) > 270 )) ) {
-            $split = 270;
-        }
-        if ($split > 0) { // split in two
-            $angles[$idx] = array($a,$split);
-            $adjcolors[$idx] = $colors[$i % $numcolors];
-            $adjexplode[$idx] = $explode;
-            $angles[++$idx] = array($split,$ne);
-            $adjcolors[$idx] = $colors[$i % $numcolors];
-            $adjexplode[$idx] = $explode;
-        } else { // no split
-            $angles[$idx] = array($a,$ne);
-            $adjcolors[$idx] = $colors[$i  % $numcolors];
-            $adjexplode[$idx] = $explode;
-        }
-        } else {
-        // da>180
-        // Slice may, depending on position, cross one or two
-        // bonudaries
-
-        if( $a < 90 )
-            $split = 90;
-        elseif( $a <= 270 )
-            $split = 270;
-        else
-            $split = 90;
-
-        $angles[$idx] = array($a,$split);
-        $adjcolors[$idx] = $colors[$i % $numcolors];
-        $adjexplode[$idx] = $explode;
-        //if ($a+$da > 360-$split) {
-        // For slices larger than 270 degrees we might cross
-        // another boundary as well. This means that we must
-        // split the slice further. The comparison gets a little
-        // bit complicated since we must take into accound that
-        // a pie might have a startangle >0 and hence a slice might
-        // wrap around the 0 angle.
-        // Three cases:
-        //  a) Slice starts before 90 and hence gets a split=90, but
-        //     we must also check if we need to split at 270
-        //  b) Slice starts after 90 but before 270 and slices
-        //     crosses 90 (after a wrap around of 0)
-        //  c) If start is > 270 (hence the firstr split is at 90)
-        //     and the slice is so large that it goes all the way
-        //     around 270.
-        if( ($a < 90 && ($a+$da > 270)) ||
-            ($a > 90 && $a<=270 && ($a+$da>360+90) ) ||
-            ($a > 270 && $this->NormAngle($a+$da)>270) ) {
-            $angles[++$idx] = array($split,360-$split);
-            $adjcolors[$idx] = $colors[$i % $numcolors];
-            $adjexplode[$idx] = $explode;
-            $angles[++$idx] = array(360-$split,$ne);
-            $adjcolors[$idx] = $colors[$i % $numcolors];
-            $adjexplode[$idx] = $explode;
-        } else {
-            // Just a simple split to the previous decided
-            // angle.
-            $angles[++$idx] = array($split,$ne);
-            $adjcolors[$idx] = $colors[$i % $numcolors];
-            $adjexplode[$idx] = $explode;
+            $j++;
+            if( $j >= $n ) $j=0;
+            if( $cnt > $n ) {
+                JpGraphError::RaiseL(14006);
+                //("Pie3D Internal Error: Z-Sorting algorithm for 3D Pies is not working properly (2). Trying to wrap twice while stroking.");
+            }
+            ++$cnt;
         }
+         
+        $slice_left = $n-$cnt;
+        $j=$start-1;
+        if($j<0) $j=$n-1;
+        $cnt = 0;
+
+        // The stroke all slices from 90 to -90 (right half circle)
+        // clockwise
+        while( $cnt < $slice_left  && $aaoption !== 2 ) {
+
+            list($x,$y) = $adjexplode[$j];
+
+            $this->Pie3DSlice($img,$x,$y,$d,$h,$angles[$j][0],$angles[$j][1],
+            $z,$adjcolors[$j],$shadow);
+            $j--;
+            if( $cnt > $n ) {
+                JpGraphError::RaiseL(14006);
+                //("Pie3D Internal Error: Z-Sorting algorithm for 3D Pies is not working properly (2). Trying to wrap twice while stroking.");
+            }
+            if($j<0) $j=$n-1;
+            $cnt++;
         }
-        $a += $da;
-        $a = $this->NormAngle($a);
-    }
 
-    // Total number of slices
-    $n = count($angles);
-
-    for ($i=0; $i<$n; ++$i) {
-        list($dbgs,$dbge) = $angles[$i];
-    }
-
-    //
-    // Step 2. Find start index (first pie that starts in upper left quadrant)
-    //
-    $minval = $angles[0][0];
-    $min = 0;
-    for ($i=0; $i<$n; ++$i) {
-        if ($angles[$i][0] < $minval) {
-        $minval = $angles[$i][0];
-        $min = $i;
-        }
-    }
-    $j = $min;
-    $cnt = 0;
-    while ($angles[$j][1] <= 90) {
-        $j++;
-        if ($j>=$n) {
-        $j=0;
-        }
-        if ($cnt > $n) {
-        JpGraphError::Raise("Pie3D Internal error (#1). Trying to wrap twice when looking for start index");
+        // Now do a special thing. Stroke the last slice on the left
+        // halfcircle one more time.  This is needed in the case where
+        // the slice close to 270 have been exploded. In that case the
+        // part of the slice close to the center of the pie might be
+        // slightly nagged.
+        if( $aaoption !== 2 )
+        $this->Pie3DSlice($img,$last[0],$last[1],$d,$h,$angles[$last[2]][0],
+        $angles[$last[2]][1],$z,$adjcolors[$last[2]],$shadow);
+
+
+        if( $aaoption !== 1 ) {
+            // Now print possible labels and add csim
+            $this->value->ApplyFont($img);
+            $margin = $img->GetFontHeight()/2 + $this->value->margin ;
+            for($i=0; $i < count($data); ++$i ) {
+                $la = $labeldata[$i][0];
+                $x = $labeldata[$i][1] + cos($la*M_PI/180)*($d+$margin)*$this->ilabelposadj;
+                $y = $labeldata[$i][2] - sin($la*M_PI/180)*($h+$margin)*$this->ilabelposadj;
+                if( $this->ilabelposadj >= 1.0 ) {
+                    if( $la > 180 && $la < 360 ) $y += $z;
+                }
+                if( $this->labeltype == 0 ) {
+                    if( $sum > 0 ) $l = 100*$data[$i]/$sum;
+                    else $l = 0;
+                }
+                elseif( $this->labeltype == 1 ) {
+                    $l = $data[$i];
+                }
+                else {
+                    $l = $this->adjusted_data[$i];
+                }
+                if( isset($this->labels[$i]) && is_string($this->labels[$i]) ) {
+                    $l=sprintf($this->labels[$i],$l);
+                }
+
+                $this->StrokeLabels($l,$img,$labeldata[$i][0]*M_PI/180,$x,$y,$z);
+                 
+                $this->Add3DSliceToCSIM($i,$labeldata[$i][1],$labeldata[$i][2],$h*2,$d*2,$z,
+                $originalangles[$i][0],$originalangles[$i][1]);
+            }
         }
-        ++$cnt;
-    }
-    $start = $j;
 
-    //
-    // Step 3. Print slices in z-order
-    //
-    $cnt = 0;
+        //
+        // Finally add potential lines in pie
+        //
 
-    // First stroke all the slices between 90 and 270 (left half circle)
-    // counterclockwise
+        if( $edgecolor=="" || $aaoption !== 0 ) return;
 
-    while ($angles[$j][0] < 270  && $aaoption !== 2) {
-
-        list($x,$y) = $adjexplode[$j];
+        $accsum = 0;
+        $a = $startangle;
+        $a = $this->NormAngle($a);
 
-        $this->Pie3DSlice($img,$x,$y,$d,$h,$angles[$j][0],$angles[$j][1],
-                  $z,$adjcolors[$j],$shadow);
+        $a *= M_PI/180.0;
 
-        $last = array($x,$y,$j);
+        $idx=0;
+        $img->PushColor($edgecolor);
+        $img->SetLineWeight($edgeweight);
 
-        $j++;
-        if( $j >= $n ) $j=0;
-        if ($cnt > $n) {
-        JpGraphError::Raise("Pie3D Internal Error: Z-Sorting algorithm for 3D Pies is not working properly (2). Trying to wrap twice while stroking.");
+        $fulledge = true;
+        for($i=0; $i < count($data) && $fulledge; ++$i ) {
+            if( empty($this->explode_radius[$i]) ) {
+                $this->explode_radius[$i]=0;
+            }
+            if( $this->explode_radius[$i] > 0 ) {
+                $fulledge = false;
+            }
         }
-        ++$cnt;
-    }
-
-    $slice_left = $n-$cnt;
-    $j=$start-1;
-    if($j<0) $j=$n-1;
-    $cnt = 0;
-
-    // The stroke all slices from 90 to -90 (right half circle)
-    // clockwise
-    while ($cnt < $slice_left  && $aaoption !== 2) {
+         
 
-        list($x,$y) = $adjexplode[$j];
+        for($i=0; $i < count($data); ++$i, ++$idx ) {
 
-        $this->Pie3DSlice($img,$x,$y,$d,$h,$angles[$j][0],$angles[$j][1],
-                  $z,$adjcolors[$j],$shadow);
-        $j--;
-        if ($cnt > $n) {
-        JpGraphError::Raise("Pie3D Internal Error: Z-Sorting algorithm for 3D Pies is not working properly (2). Trying to wrap twice while stroking.");
+            $da = $data[$i]/$sum * 2*M_PI;
+            $this->StrokeFullSliceFrame($img,$xc,$yc,$a,$a+$da,$d,$h,$z,$edgecolor,
+            $this->explode_radius[$i],$fulledge);
+            $a += $da;
         }
-        if($j<0) $j=$n-1;
-        $cnt++;
+        $img->PopColor();
     }
 
-    // Now do a special thing. Stroke the last slice on the left
-    // halfcircle one more time.  This is needed in the case where
-    // the slice close to 270 have been exploded. In that case the
-    // part of the slice close to the center of the pie might be
-    // slightly nagged.
-    if( $aaoption !== 2 )
-        $this->Pie3DSlice($img,$last[0],$last[1],$d,$h,$angles[$last[2]][0],
-                  $angles[$last[2]][1],$z,$adjcolors[$last[2]],$shadow);
-
-    if ($aaoption !== 1) {
-        // Now print possible labels and add csim
-        $img->SetFont($this->value->ff,$this->value->fs);
-        $margin = $img->GetFontHeight()/2 + $this->value->margin ;
-        for ($i=0; $i < count($data); ++$i ) {
-        $la = $labeldata[$i][0];
-        $x = $labeldata[$i][1] + cos($la*M_PI/180)*($d+$margin);
-        $y = $labeldata[$i][2] - sin($la*M_PI/180)*($h+$margin);
-        if( $la > 180 && $la < 360 ) $y += $z;
-        if ($this->labeltype == 0) {
-            if( $sum > 0 )
-            $l = 100*$data[$i]/$sum;
-            else
-            $l = 0;
-        } elseif ($this->labeltype == 1) {
-            $l = $data[$i];
-        } else {
-            $l = $this->adjusted_data[$i];
-        }
-        if( isset($this->labels[$i]) && is_string($this->labels[$i]) )
-            $l=sprintf($this->labels[$i],$l);
-
-        $this->StrokeLabels($l,$img,$labeldata[$i][0]*M_PI/180,$x,$y,$z);
-
-        $this->AddSliceToCSIM($i,$labeldata[$i][1],$labeldata[$i][2],$h*2,$d*2,$z,
-                      $originalangles[$i][0],$originalangles[$i][1]);
-        }
-    }
-
-    //
-    // Finally add potential lines in pie
-    //
-
-    if( $edgecolor=="" || $aaoption !== 0 ) return;
+    function StrokeFullSliceFrame($img,$xc,$yc,$sa,$ea,$w,$h,$z,$edgecolor,$exploderadius,$fulledge) {
+        $step = 0.02;
 
-    $accsum = 0;
-    $a = $startangle;
-    $a = $this->NormAngle($a);
-
-    $a *= M_PI/180.0;
-
-    $idx=0;
-    $img->PushColor($edgecolor);
-    $img->SetLineWeight($edgeweight);
-
-    $fulledge = true;
-    for ($i=0; $i < count($data) && $fulledge; ++$i ) {
-        if( empty($this->explode_radius[$i]) )
-        $this->explode_radius[$i]=0;
-        if ($this->explode_radius[$i] > 0) {
-        $fulledge = false;
+        if( $exploderadius > 0 ) {
+            $la = ($sa+$ea)/2;
+            $xc += $exploderadius*cos($la);
+            $yc -= $exploderadius*sin($la) * ($h/$w) ;
+             
         }
-    }
 
-    for ($i=0; $i < count($data); ++$i, ++$idx ) {
+        $p = array($xc,$yc,$xc+$w*cos($sa),$yc-$h*sin($sa));
 
-        $da = $data[$i]/$sum * 2*M_PI;
-        $this->StrokeFullSliceFrame($img,$xc,$yc,$a,$a+$da,$d,$h,$z,$edgecolor,
-                    $this->explode_radius[$i],$fulledge);
-        $a += $da;
-    }
-    $img->PopColor();
-    }
+        for($a=$sa; $a < $ea; $a += $step ) {
+            $p[] = $xc + $w*cos($a);
+            $p[] = $yc - $h*sin($a);
+        }
 
-    public function StrokeFullSliceFrame($img,$xc,$yc,$sa,$ea,$w,$h,$z,$edgecolor,$exploderadius,$fulledge)
-    {
-    $step = 0.02;
+        $p[] = $xc+$w*cos($ea);
+        $p[] = $yc-$h*sin($ea);
+        $p[] = $xc;
+        $p[] = $yc;
 
-    if ($exploderadius > 0) {
-        $la = ($sa+$ea)/2;
-        $xc += $exploderadius*cos($la);
-        $yc -= $exploderadius*sin($la) * ($h/$w) ;
+        $img->SetColor($edgecolor);
+        $img->Polygon($p);
 
+        // Unfortunately we can't really draw the full edge around the whole of
+        // of the slice if any of the slices are exploded. The reason is that
+        // this algorithm is to simply. There are cases where the edges will
+        // "overwrite" other slices when they have been exploded.
+        // Doing the full, proper 3D hidden lines stiff is actually quite
+        // tricky. So for exploded pies we only draw the top edge. Not perfect
+        // but the "real" solution is much more complicated.
+        if( $fulledge && !( $sa > 0 && $sa < M_PI && $ea < M_PI) ) {
+
+            if($sa < M_PI && $ea > M_PI) {
+                $sa = M_PI;
+            }
+
+            if($sa < 2*M_PI && (($ea >= 2*M_PI) || ($ea > 0 && $ea < $sa ) ) ) {
+                $ea = 2*M_PI;
+            }
+
+            if( $sa >= M_PI && $ea <= 2*M_PI ) {
+                $p = array($xc + $w*cos($sa),$yc - $h*sin($sa),
+                $xc + $w*cos($sa),$z + $yc - $h*sin($sa));
+
+                for($a=$sa+$step; $a < $ea; $a += $step ) {
+                    $p[] = $xc + $w*cos($a);
+                    $p[] = $z + $yc - $h*sin($a);
+                }
+                $p[] = $xc + $w*cos($ea);
+                $p[] = $z + $yc - $h*sin($ea);
+                $p[] = $xc + $w*cos($ea);
+                $p[] = $yc - $h*sin($ea);
+                $img->SetColor($edgecolor);
+                $img->Polygon($p);
+            }
+        }
     }
 
-    $p = array($xc,$yc,$xc+$w*cos($sa),$yc-$h*sin($sa));
+    function Stroke($img,$aaoption=0) {
+        $n = count($this->data);
+
+        // If user hasn't set the colors use the theme array
+        if( $this->setslicecolors==null ) {
+            $colors = array_keys($img->rgb->rgb_table);
+            sort($colors);
+            $idx_a=$this->themearr[$this->theme];
+            $ca = array();
+            $m = count($idx_a);
+            for($i=0; $i < $m; ++$i) {
+                $ca[$i] = $colors[$idx_a[$i]];
+            }
+            $ca = array_reverse(array_slice($ca,0,$n));
+        }
+        else {
+            $ca = $this->setslicecolors;
+        }
 
-    for ($a=$sa; $a < $ea; $a += $step) {
-        $p[] = $xc + $w*cos($a);
-        $p[] = $yc - $h*sin($a);
-    }
 
-    $p[] = $xc+$w*cos($ea);
-    $p[] = $yc-$h*sin($ea);
-    $p[] = $xc;
-    $p[] = $yc;
+        if( $this->posx <= 1 && $this->posx > 0 ) {
+            $xc = round($this->posx*$img->width);
+        }
+        else {
+            $xc = $this->posx ;
+        }
 
-    $img->SetColor($edgecolor);
-    $img->Polygon($p);
+        if( $this->posy <= 1 && $this->posy > 0 ) {
+            $yc = round($this->posy*$img->height);
+        }
+        else {
+            $yc = $this->posy ;
+        }
 
-    // Unfortunately we can't really draw the full edge around the whole of
-    // of the slice if any of the slices are exploded. The reason is that
-    // this algorithm is to simply. There are cases where the edges will
-    // "overwrite" other slices when they have been exploded.
-    // Doing the full, proper 3D hidden lines stiff is actually quite
-    // tricky. So for exploded pies we only draw the top edge. Not perfect
-    // but the "real" solution is much more complicated.
-    if ( $fulledge && !( $sa > 0 && $sa < M_PI && $ea < M_PI) ) {
+        if( $this->radius <= 1 ) {
+            $width = floor($this->radius*min($img->width,$img->height));
+            // Make sure that the pie doesn't overflow the image border
+            // The 0.9 factor is simply an extra margin to leave some space
+            // between the pie an the border of the image.
+            $width = min($width,min($xc*0.9,($yc*90/$this->angle-$width/4)*0.9));
+        }
+        else {
+            $width = $this->radius * ($aaoption === 1 ? 2 : 1 ) ;
+        }
 
-        if($sa < M_PI && $ea > M_PI)
-        $sa = M_PI;
+        // Add a sanity check for width
+        if( $width < 1 ) {
+            JpGraphError::RaiseL(14007);//("Width for 3D Pie is 0. Specify a size > 0");
+        }
 
-        if($sa < 2*M_PI && (($ea >= 2*M_PI) || ($ea > 0 && $ea < $sa ) ) )
-        $ea = 2*M_PI;
+        // Establish a thickness. By default the thickness is a fifth of the
+        // pie slice width (=pie radius) but since the perspective depends
+        // on the inclination angle we use some heuristics to make the edge
+        // slightly thicker the less the angle.
 
-        if ($sa >= M_PI && $ea <= 2*M_PI) {
-        $p = array($xc + $w*cos($sa),$yc - $h*sin($sa),
-               $xc + $w*cos($sa),$z + $yc - $h*sin($sa));
+        // Has user specified an absolute thickness? In that case use
+        // that instead
 
-        for ($a=$sa+$step; $a < $ea; $a += $step) {
-            $p[] = $xc + $w*cos($a);
-            $p[] = $z + $yc - $h*sin($a);
+        if( $this->iThickness ) {
+            $thick = $this->iThickness;
+            $thick *= ($aaoption === 1 ? 2 : 1 );
         }
-        $p[] = $xc + $w*cos($ea);
-        $p[] = $z + $yc - $h*sin($ea);
-        $p[] = $xc + $w*cos($ea);
-        $p[] = $yc - $h*sin($ea);
-        $img->SetColor($edgecolor);
-        $img->Polygon($p);
+        else {
+            $thick = $width/12;
+        }
+        $a = $this->angle;
+        
+        if( $a <= 30 ) $thick *= 1.6;
+        elseif( $a <= 40 ) $thick *= 1.4;
+        elseif( $a <= 50 ) $thick *= 1.2;
+        elseif( $a <= 60 ) $thick *= 1.0;
+        elseif( $a <= 70 ) $thick *= 0.8;
+        elseif( $a <= 80 ) $thick *= 0.7;
+        else $thick *= 0.6;
+
+        $thick = floor($thick);
+
+        if( $this->explode_all ) {
+            for($i=0; $i < $n; ++$i)
+                $this->explode_radius[$i]=$this->explode_r;
         }
-    }
-    }
-
-    public function Stroke($img,$aaoption=0)
-    {
-    $n = count($this->data);
-
-    // If user hasn't set the colors use the theme array
-       if ($this->setslicecolors==null) {
-        $colors = array_keys($img->rgb->rgb_table);
-        sort($colors);
-        $idx_a=$this->themearr[$this->theme];
-        $ca = array();
-        $m = count($idx_a);
-        for($i=0; $i < $m; ++$i)
-        $ca[$i] = $colors[$idx_a[$i]];
-        $ca = array_reverse(array_slice($ca,0,$n));
-    } else {
-        $ca = $this->setslicecolors;
-    }
-
-    if( $this->posx <= 1 && $this->posx > 0 )
-        $xc = round($this->posx*$img->width);
-    else
-        $xc = $this->posx ;
-
-    if( $this->posy <= 1 && $this->posy > 0 )
-        $yc = round($this->posy*$img->height);
-    else
-        $yc = $this->posy ;
-
-    if ($this->radius <= 1) {
-        $width = floor($this->radius*min($img->width,$img->height));
-        // Make sure that the pie doesn't overflow the image border
-        // The 0.9 factor is simply an extra margin to leave some space
-        // between the pie an the border of the image.
-        $width = min($width,min($xc*0.9,($yc*90/$this->angle-$width/4)*0.9));
-    } else {
-        $width = $this->radius * ($aaoption === 1 ? 2 : 1 ) ;
-    }
 
-    // Add a sanity check for width
-    if ($width < 1) {
-        JpGraphError::Raise("Width for 3D Pie is 0. Specify a size > 0");
-        exit();
-    }
+        $this->Pie3D($aaoption,$img,$this->data, $ca, $xc, $yc, $width, $this->angle,
+        $thick, 0.65, $this->startangle, $this->edgecolor, $this->edgeweight);
 
-    // Establish a thickness. By default the thickness is a fifth of the
-    // pie slice width (=pie radius) but since the perspective depends
-    // on the inclination angle we use some heuristics to make the edge
-    // slightly thicker the less the angle.
-
-    // Has user specified an absolute thickness? In that case use
-    // that instead
-
-    if ($this->iThickness) {
-      $thick = $this->iThickness;
-      $thick *= ($aaoption === 1 ? 2 : 1 );
-    } else
-      $thick = $width/12;
-    $a = $this->angle;
-    if( $a <= 30 ) $thick *= 1.6;
-    elseif( $a <= 40 ) $thick *= 1.4;
-    elseif( $a <= 50 ) $thick *= 1.2;
-    elseif( $a <= 60 ) $thick *= 1.0;
-    elseif( $a <= 70 ) $thick *= 0.8;
-    elseif( $a <= 80 ) $thick *= 0.7;
-    else $thick *= 0.6;
-
-    $thick = floor($thick);
-
-    if( $this->explode_all )
-        for($i=0; $i < $n; ++$i)
-        $this->explode_radius[$i]=$this->explode_r;
-
-    $this->Pie3D($aaoption,$img,$this->data, $ca, $xc, $yc, $width, $this->angle,
-                 $thick, 0.65, $this->startangle, $this->edgecolor, $this->edgeweight);
-
-    // Adjust title position
-    if ($aaoption != 1) {
-        $this->title->Pos($xc,$yc-$this->title->GetFontHeight($img)-$width/2-$this->title->margin,			      "center","bottom");
-        $this->title->Stroke($img);
-    }
+        // Adjust title position
+        if( $aaoption != 1 ) {
+            $this->title->SetPos($xc,$yc-$this->title->GetFontHeight($img)-$width/2-$this->title->margin,         "center","bottom");
+            $this->title->Stroke($img);
+        }
     }
 
-//---------------
-// PRIVATE METHODS
+    //---------------
+    // PRIVATE METHODS
 
     // Position the labels of each slice
-    public function StrokeLabels($label,$img,$a,$xp,$yp,$z)
-    {
-    $this->value->halign="left";
-    $this->value->valign="top";
-
-    // Position the axis title.
-    // dx, dy is the offset from the top left corner of the bounding box that sorrounds the text
-    // that intersects with the extension of the corresponding axis. The code looks a little
-    // bit messy but this is really the only way of having a reasonable position of the
-    // axis titles.
-    $img->SetFont($this->value->ff,$this->value->fs,$this->value->fsize);
-    $h=$img->GetTextHeight($label);
-    // For numeric values the format of the display value
-    // must be taken into account
-    if ( is_numeric($label) ) {
-        if( $label >= 0 )
-        $w=$img->GetTextWidth(sprintf($this->value->format,$label));
-        else
-        $w=$img->GetTextWidth(sprintf($this->value->negformat,$label));
-    } else
-        $w=$img->GetTextWidth($label);
-    while( $a > 2*M_PI ) $a -= 2*M_PI;
-    if( $a>=7*M_PI/4 || $a <= M_PI/4 ) $dx=0;
-    if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dx=($a-M_PI/4)*2/M_PI;
-    if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dx=1;
-    if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dx=(1-($a-M_PI*5/4)*2/M_PI);
-
-    if( $a>=7*M_PI/4 ) $dy=(($a-M_PI)-3*M_PI/4)*2/M_PI;
-    if( $a<=M_PI/4 ) $dy=(1-$a*2/M_PI);
-    if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dy=1;
-    if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dy=(1-($a-3*M_PI/4)*2/M_PI);
-    if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dy=0;
-
-    $x = round($xp-$dx*$w);
-    $y = round($yp-$dy*$h);
+    function StrokeLabels($label,$img,$a,$xp,$yp,$z) {
+        $this->value->halign="left";
+        $this->value->valign="top";
+
+        // Position the axis title.
+        // dx, dy is the offset from the top left corner of the bounding box that sorrounds the text
+        // that intersects with the extension of the corresponding axis. The code looks a little
+        // bit messy but this is really the only way of having a reasonable position of the
+        // axis titles.
+        $this->value->ApplyFont($img);
+        $h=$img->GetTextHeight($label);
+        // For numeric values the format of the display value
+        // must be taken into account
+        if( is_numeric($label) ) {
+            if( $label >= 0 ) {
+                $w=$img->GetTextWidth(sprintf($this->value->format,$label));
+            }
+            else {
+                $w=$img->GetTextWidth(sprintf($this->value->negformat,$label));
+            }
+        }
+        else {
+            $w=$img->GetTextWidth($label);
+        }
+        
+        while( $a > 2*M_PI ) {
+            $a -= 2*M_PI;
+        }
+        
+        if( $a>=7*M_PI/4 || $a <= M_PI/4 ) $dx=0;
+        if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dx=($a-M_PI/4)*2/M_PI;
+        if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dx=1;
+        if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dx=(1-($a-M_PI*5/4)*2/M_PI);
 
+        if( $a>=7*M_PI/4 ) $dy=(($a-M_PI)-3*M_PI/4)*2/M_PI;
+        if( $a<=M_PI/4 ) $dy=(1-$a*2/M_PI);
+        if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dy=1;
+        if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dy=(1-($a-3*M_PI/4)*2/M_PI);
+        if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dy=0;
+
+        $x = round($xp-$dx*$w);
+        $y = round($yp-$dy*$h);
 
         // Mark anchor point for debugging
-    /*
-    $img->SetColor('red');
-    $img->Line($xp-10,$yp,$xp+10,$yp);
-    $img->Line($xp,$yp-10,$xp,$yp+10);
-    */
-    $oldmargin = $this->value->margin;
-    $this->value->margin=0;
-    $this->value->Stroke($img,$label,$x,$y);
-    $this->value->margin=$oldmargin;
+        /*
+        $img->SetColor('red');
+        $img->Line($xp-10,$yp,$xp+10,$yp);
+        $img->Line($xp,$yp-10,$xp,$yp+10);
+        */
+
+        $oldmargin = $this->value->margin;
+        $this->value->margin=0;
+        $this->value->Stroke($img,$label,$x,$y);
+        $this->value->margin=$oldmargin;
 
     }
 } // Class
 
 /* EOF */
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_plotband.php b/common/lib/jpgraph_lib/jpgraph_plotband.php
old mode 100644
new mode 100755
index 370c8bb71..b7aef7506
--- a/common/lib/jpgraph_lib/jpgraph_plotband.php
+++ b/common/lib/jpgraph_lib/jpgraph_plotband.php
@@ -1,38 +1,35 @@
 <?php
 //=======================================================================
-// File:	JPGRAPH_PLOTBAND.PHP
-// Description:	PHP4 Graph Plotting library. Extension module.
-// Created: 	2004-02-18
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_plotband.php,v 1.1.2.1 2004/02/21 08:46:45 aditus Exp $
+// File:        JPGRAPH_PLOTBAND.PHP
+// Description: PHP4 Graph Plotting library. Extension module.
+// Created:     2004-02-18
+// Ver:         $Id: jpgraph_plotband.php 1106 2009-02-22 20:16:35Z ljp $
 //
-// License:	This code is released under QPL 1.0
-// Copyright (C) 2001,2002,2003,2004 Johan Persson
+// Copyright (c) Asial Corporation. All rights reserved.
 //========================================================================
 
 // Constants for types of static bands in plot area
-DEFINE("BAND_RDIAG",1);	// Right diagonal lines
-DEFINE("BAND_LDIAG",2); // Left diagonal lines
-DEFINE("BAND_SOLID",3); // Solid one color
-DEFINE("BAND_VLINE",4); // Vertical lines
-DEFINE("BAND_HLINE",5);  // Horizontal lines
-DEFINE("BAND_3DPLANE",6);  // "3D" Plane
-DEFINE("BAND_HVCROSS",7);  // Vertical/Hor crosses
-DEFINE("BAND_DIAGCROSS",8); // Diagonal crosses
+define("BAND_RDIAG",1); // Right diagonal lines
+define("BAND_LDIAG",2); // Left diagonal lines
+define("BAND_SOLID",3); // Solid one color
+define("BAND_VLINE",4); // Vertical lines
+define("BAND_HLINE",5);  // Horizontal lines
+define("BAND_3DPLANE",6);  // "3D" Plane
+define("BAND_HVCROSS",7);  // Vertical/Hor crosses
+define("BAND_DIAGCROSS",8); // Diagonal crosses
+
 
 // Utility class to hold coordinates for a rectangle
-class Rectangle
-{
+class Rectangle {
     public $x,$y,$w,$h;
     public $xe, $ye;
-    public function Rectangle($aX,$aY,$aWidth,$aHeight)
-    {
-    $this->x=$aX;
-    $this->y=$aY;
-    $this->w=$aWidth;
-    $this->h=$aHeight;
-    $this->xe=$aX+$aWidth-1;
-    $this->ye=$aY+$aHeight-1;
+    function __construct($aX,$aY,$aWidth,$aHeight) {
+        $this->x=$aX;
+        $this->y=$aY;
+        $this->w=$aWidth;
+        $this->h=$aHeight;
+        $this->xe=$aX+$aWidth-1;
+        $this->ye=$aY+$aHeight-1;
     }
 }
 
@@ -40,67 +37,62 @@ public function Rectangle($aX,$aY,$aWidth,$aHeight)
 // Class RectPattern
 // Base class for pattern hierarchi that is used to display patterned
 // bands on the graph. Any subclass that doesn't override Stroke()
-// must at least implement method DoPattern(&$aImg) which is responsible
+// must at least implement method DoPattern($aImg) which is responsible
 // for drawing the pattern onto the graph.
 //=====================================================================
-class RectPattern
-{
-    public $color;
-    public $weight;
-    public $rect=null;
-    public $doframe=true;
-    public $linespacing;	// Line spacing in pixels
-    public $iBackgroundColor=-1;  // Default is no background fill
+class RectPattern {
+    protected $color;
+    protected $weight;
+    protected $rect=null;
+    protected $doframe=true;
+    protected $linespacing; // Line spacing in pixels
+    protected $iBackgroundColor=-1;  // Default is no background fill
 
-    public function RectPattern($aColor,$aWeight=1)
-    {
-    $this->color = $aColor;
-    $this->weight = $aWeight;
+    function __construct($aColor,$aWeight=1) {
+        $this->color = $aColor;
+        $this->weight = $aWeight;
     }
 
-    public function SetBackground($aBackgroundColor)
-    {
-    $this->iBackgroundColor=$aBackgroundColor;
+    function SetBackground($aBackgroundColor) {
+        $this->iBackgroundColor=$aBackgroundColor;
     }
 
-    public function SetPos(&$aRect)
-    {
-    $this->rect = $aRect;
+    function SetPos($aRect) {
+        $this->rect = $aRect;
     }
 
-    public function ShowFrame($aShow=true)
-    {
-    $this->doframe=$aShow;
+    function ShowFrame($aShow=true) {
+        $this->doframe=$aShow;
     }
 
-    public function SetDensity($aDens)
-    {
-    if( $aDens < 1 || $aDens > 100 )
-        JpGraphError::Raise(" Desity for pattern must be between 1 and 100. (You tried $aDens)");
-    // 1% corresponds to linespacing=50
-    // 100 % corresponds to linespacing 1
-    $this->linespacing = floor(((100-$aDens)/100.0)*50)+1;
+    function SetDensity($aDens) {
+        if( $aDens < 1 || $aDens > 100 )
+        JpGraphError::RaiseL(16001,$aDens);
+        //(" Desity for pattern must be between 1 and 100. (You tried $aDens)");
+        // 1% corresponds to linespacing=50
+        // 100 % corresponds to linespacing 1
+        $this->linespacing = floor(((100-$aDens)/100.0)*50)+1;
 
     }
 
-    public function Stroke(&$aImg)
-    {
-    if( $this->rect == null )
-        JpGraphError::Raise(" No positions specified for pattern.");
+    function Stroke($aImg) {
+        if( $this->rect == null )
+        JpGraphError::RaiseL(16002);
+        //(" No positions specified for pattern.");
 
-    if ( !(is_numeric($this->iBackgroundColor) && $this->iBackgroundColor==-1) ) {
-        $aImg->SetColor($this->iBackgroundColor);
-        $aImg->FilledRectangle($this->rect->x,$this->rect->y,$this->rect->xe,$this->rect->ye);
-    }
+        if( !(is_numeric($this->iBackgroundColor) && $this->iBackgroundColor==-1) ) {
+            $aImg->SetColor($this->iBackgroundColor);
+            $aImg->FilledRectangle($this->rect->x,$this->rect->y,$this->rect->xe,$this->rect->ye);
+        }
 
-    $aImg->SetColor($this->color);
-    $aImg->SetLineWeight($this->weight);
+        $aImg->SetColor($this->color);
+        $aImg->SetLineWeight($this->weight);
 
-    // Virtual function implemented by subclass
-    $this->DoPattern($aImg);
+        // Virtual function implemented by subclass
+        $this->DoPattern($aImg);
 
-    // Frame around the pattern area
-    if( $this->doframe )
+        // Frame around the pattern area
+        if( $this->doframe )
         $aImg->Rectangle($this->rect->x,$this->rect->y,$this->rect->xe,$this->rect->ye);
     }
 
@@ -111,18 +103,16 @@ public function Stroke(&$aImg)
 // Class RectPatternSolid
 // Implements a solid band
 //=====================================================================
-class RectPatternSolid extends RectPattern
-{
-    public function RectPatternSolid($aColor="black",$aWeight=1)
-    {
-    parent::RectPattern($aColor,$aWeight);
+class RectPatternSolid extends RectPattern {
+
+    function __construct($aColor="black",$aWeight=1) {
+        parent::__construct($aColor,$aWeight);
     }
 
-    public function DoPattern(&$aImg)
-    {
-    $aImg->SetColor($this->color);
-    $aImg->FilledRectangle($this->rect->x,$this->rect->y,
-                   $this->rect->xe,$this->rect->ye);
+    function DoPattern($aImg) {
+        $aImg->SetColor($this->color);
+        $aImg->FilledRectangle($this->rect->x,$this->rect->y,
+        $this->rect->xe,$this->rect->ye);
     }
 }
 
@@ -130,23 +120,21 @@ public function DoPattern(&$aImg)
 // Class RectPatternHor
 // Implements horizontal line pattern
 //=====================================================================
-class RectPatternHor extends RectPattern
-{
-    public function RectPatternHor($aColor="black",$aWeight=1,$aLineSpacing=7)
-    {
-    parent::RectPattern($aColor,$aWeight);
-    $this->linespacing = $aLineSpacing;
-    }
-
-    public function DoPattern(&$aImg)
-    {
-    $x0 = $this->rect->x;
-    $x1 = $this->rect->xe;
-    $y = $this->rect->y;
-    while ($y < $this->rect->ye) {
-        $aImg->Line($x0,$y,$x1,$y);
-        $y += $this->linespacing;
+class RectPatternHor extends RectPattern {
+
+    function __construct($aColor="black",$aWeight=1,$aLineSpacing=7) {
+        parent::__construct($aColor,$aWeight);
+        $this->linespacing = $aLineSpacing;
     }
+
+    function DoPattern($aImg) {
+        $x0 = $this->rect->x;
+        $x1 = $this->rect->xe;
+        $y = $this->rect->y;
+        while( $y < $this->rect->ye ) {
+            $aImg->Line($x0,$y,$x1,$y);
+            $y += $this->linespacing;
+        }
     }
 }
 
@@ -154,28 +142,24 @@ public function DoPattern(&$aImg)
 // Class RectPatternVert
 // Implements vertical line pattern
 //=====================================================================
-class RectPatternVert extends RectPattern
-{
-    public $linespacing=10;	// Line spacing in pixels
+class RectPatternVert extends RectPattern {
 
-    public function RectPatternVert($aColor="black",$aWeight=1,$aLineSpacing=7)
-    {
-    parent::RectPattern($aColor,$aWeight);
-    $this->linespacing = $aLineSpacing;
+    function __construct($aColor="black",$aWeight=1,$aLineSpacing=7) {
+        parent::__construct($aColor,$aWeight);
+        $this->linespacing = $aLineSpacing;
     }
 
     //--------------------
     // Private methods
     //
-    public function DoPattern(&$aImg)
-    {
-    $x = $this->rect->x;
-    $y0 = $this->rect->y;
-    $y1 = $this->rect->ye;
-    while ($x < $this->rect->xe) {
-        $aImg->Line($x,$y0,$x,$y1);
-        $x += $this->linespacing;
-    }
+    function DoPattern($aImg) {
+        $x = $this->rect->x;
+        $y0 = $this->rect->y;
+        $y1 = $this->rect->ye;
+        while( $x < $this->rect->xe ) {
+            $aImg->Line($x,$y0,$x,$y1);
+            $x += $this->linespacing;
+        }
     }
 }
 
@@ -184,71 +168,68 @@ public function DoPattern(&$aImg)
 // Class RectPatternRDiag
 // Implements right diagonal pattern
 //=====================================================================
-class RectPatternRDiag extends RectPattern
-{
-    public $linespacing;	// Line spacing in pixels
-
-    public function RectPatternRDiag($aColor="black",$aWeight=1,$aLineSpacing=12)
-    {
-    parent::RectPattern($aColor,$aWeight);
-    $this->linespacing = $aLineSpacing;
-    }
-
-    public function DoPattern(&$aImg)
-    {
-    //  --------------------
-    //  | /   /   /   /   /|
-    //  |/   /   /   /   / |
-    //  |   /   /   /   /  |
-    //  --------------------
-    $xe = $this->rect->xe;
-    $ye = $this->rect->ye;
-    $x0 = $this->rect->x + round($this->linespacing/2);
-    $y0 = $this->rect->y;
-    $x1 = $this->rect->x;
-    $y1 = $this->rect->y + round($this->linespacing/2);
-
-    while ($x0<=$xe && $y1<=$ye) {
-        $aImg->Line($x0,$y0,$x1,$y1);
-        $x0 += $this->linespacing;
-        $y1 += $this->linespacing;
-    }
-
-    if ($xe-$x1 > $ye-$y0) {
-        // Width larger than height
-        $x1 = $this->rect->x + ($y1-$ye);
-        $y1 = $ye;
+class RectPatternRDiag extends RectPattern {
+
+    function __construct($aColor="black",$aWeight=1,$aLineSpacing=12) {
+        parent::__construct($aColor,$aWeight);
+        $this->linespacing = $aLineSpacing;
+    }
+
+    function DoPattern($aImg) {
+        //  --------------------
+        //  | /   /   /   /   /|
+        //  |/   /   /   /   / |
+        //  |   /   /   /   /  |
+        //  --------------------
+        $xe = $this->rect->xe;
+        $ye = $this->rect->ye;
+        $x0 = $this->rect->x + round($this->linespacing/2);
         $y0 = $this->rect->y;
-        while ($x0 <= $xe) {
-        $aImg->Line($x0,$y0,$x1,$y1);
-        $x0 += $this->linespacing;
-        $x1 += $this->linespacing;
-        }
-
-        $y0=$this->rect->y + ($x0-$xe);
-        $x0=$xe;
-    } else {
-        // Height larger than width
-        $diff = $x0-$xe;
-        $y0 = $diff+$this->rect->y;
-        $x0 = $xe;
         $x1 = $this->rect->x;
-        while ($y1 <= $ye) {
-        $aImg->Line($x0,$y0,$x1,$y1);
-        $y1 += $this->linespacing;
-        $y0 += $this->linespacing;
+        $y1 = $this->rect->y + round($this->linespacing/2);
+
+        while($x0<=$xe && $y1<=$ye) {
+            $aImg->Line($x0,$y0,$x1,$y1);
+            $x0 += $this->linespacing;
+            $y1 += $this->linespacing;
         }
 
-        $diff = $y1-$ye;
-        $y1 = $ye;
-        $x1 = $diff + $this->rect->x;
-    }
+        if( $xe-$x1 > $ye-$y0 ) {
+            // Width larger than height
+            $x1 = $this->rect->x + ($y1-$ye);
+            $y1 = $ye;
+            $y0 = $this->rect->y;
+            while( $x0 <= $xe ) {
+                $aImg->Line($x0,$y0,$x1,$y1);
+                $x0 += $this->linespacing;
+                $x1 += $this->linespacing;
+            }
+             
+            $y0=$this->rect->y + ($x0-$xe);
+            $x0=$xe;
+        }
+        else {
+            // Height larger than width
+            $diff = $x0-$xe;
+            $y0 = $diff+$this->rect->y;
+            $x0 = $xe;
+            $x1 = $this->rect->x;
+            while( $y1 <= $ye ) {
+                $aImg->Line($x0,$y0,$x1,$y1);
+                $y1 += $this->linespacing;
+                $y0 += $this->linespacing;
+            }
+             
+            $diff = $y1-$ye;
+            $y1 = $ye;
+            $x1 = $diff + $this->rect->x;
+        }
 
-    while ($y0 <= $ye) {
-        $aImg->Line($x0,$y0,$x1,$y1);
-        $y0 += $this->linespacing;
-        $x1 += $this->linespacing;
-    }
+        while( $y0 <= $ye ) {
+            $aImg->Line($x0,$y0,$x1,$y1);
+            $y0 += $this->linespacing;
+            $x1 += $this->linespacing;
+        }
     }
 }
 
@@ -256,66 +237,63 @@ public function DoPattern(&$aImg)
 // Class RectPatternLDiag
 // Implements left diagonal pattern
 //=====================================================================
-class RectPatternLDiag extends RectPattern
-{
-    public $linespacing;	// Line spacing in pixels
-
-    public function RectPatternLDiag($aColor="black",$aWeight=1,$aLineSpacing=12)
-    {
-    $this->linespacing = $aLineSpacing;
-    parent::RectPattern($aColor,$aWeight);
-    }
-
-    public function DoPattern(&$aImg)
-    {
-    //  --------------------
-    //  |\   \   \   \   \ |
-    //  | \   \   \   \   \|
-    //  |  \   \   \   \   |
-    //  |------------------|
-    $xe = $this->rect->xe;
-    $ye = $this->rect->ye;
-    $x0 = $this->rect->x + round($this->linespacing/2);
-    $y0 = $this->rect->ye;
-    $x1 = $this->rect->x;
-    $y1 = $this->rect->ye - round($this->linespacing/2);
-
-    while ($x0<=$xe && $y1>=$this->rect->y) {
-        $aImg->Line($x0,$y0,$x1,$y1);
-        $x0 += $this->linespacing;
-        $y1 -= $this->linespacing;
-    }
-    if ($xe-$x1 > $ye-$this->rect->y) {
-        // Width larger than height
-        $x1 = $this->rect->x + ($this->rect->y-$y1);
-        $y0=$ye; $y1=$this->rect->y;
-        while ($x0 <= $xe) {
-        $aImg->Line($x0,$y0,$x1,$y1);
-        $x0 += $this->linespacing;
-        $x1 += $this->linespacing;
-        }
+class RectPatternLDiag extends RectPattern {
+
+    function __construct($aColor="black",$aWeight=1,$aLineSpacing=12) {
+        $this->linespacing = $aLineSpacing;
+        parent::__construct($aColor,$aWeight);
+    }
+
+    function DoPattern($aImg) {
+        //  --------------------
+        //  |\   \   \   \   \ |
+        //  | \   \   \   \   \|
+        //  |  \   \   \   \   |
+        //  |------------------|
+        $xe = $this->rect->xe;
+        $ye = $this->rect->ye;
+        $x0 = $this->rect->x + round($this->linespacing/2);
+        $y0 = $this->rect->ye;
+        $x1 = $this->rect->x;
+        $y1 = $this->rect->ye - round($this->linespacing/2);
 
-        $y0=$this->rect->ye - ($x0-$xe);
-        $x0=$xe;
-    } else {
-        // Height larger than width
-        $diff = $x0-$xe;
-        $y0 = $ye-$diff;
-        $x0 = $xe;
-        while ($y1 >= $this->rect->y) {
-        $aImg->Line($x0,$y0,$x1,$y1);
-        $y0 -= $this->linespacing;
-        $y1 -= $this->linespacing;
+        while($x0<=$xe && $y1>=$this->rect->y) {
+            $aImg->Line($x0,$y0,$x1,$y1);
+            $x0 += $this->linespacing;
+            $y1 -= $this->linespacing;
+        }
+        if( $xe-$x1 > $ye-$this->rect->y ) {
+            // Width larger than height
+            $x1 = $this->rect->x + ($this->rect->y-$y1);
+            $y0=$ye; $y1=$this->rect->y;
+            while( $x0 <= $xe ) {
+                $aImg->Line($x0,$y0,$x1,$y1);
+                $x0 += $this->linespacing;
+                $x1 += $this->linespacing;
+            }
+             
+            $y0=$this->rect->ye - ($x0-$xe);
+            $x0=$xe;
+        }
+        else {
+            // Height larger than width
+            $diff = $x0-$xe;
+            $y0 = $ye-$diff;
+            $x0 = $xe;
+            while( $y1 >= $this->rect->y ) {
+                $aImg->Line($x0,$y0,$x1,$y1);
+                $y0 -= $this->linespacing;
+                $y1 -= $this->linespacing;
+            }
+            $diff = $this->rect->y - $y1;
+            $x1 = $this->rect->x + $diff;
+            $y1 = $this->rect->y;
+        }
+        while( $y0 >= $this->rect->y ) {
+            $aImg->Line($x0,$y0,$x1,$y1);
+            $y0 -= $this->linespacing;
+            $x1 += $this->linespacing;
         }
-        $diff = $this->rect->y - $y1;
-        $x1 = $this->rect->x + $diff;
-        $y1 = $this->rect->y;
-    }
-    while ($y0 >= $this->rect->y) {
-        $aImg->Line($x0,$y0,$x1,$y1);
-        $y0 -= $this->linespacing;
-        $x1 += $this->linespacing;
-    }
     }
 }
 
@@ -323,120 +301,116 @@ public function DoPattern(&$aImg)
 // Class RectPattern3DPlane
 // Implements "3D" plane pattern
 //=====================================================================
-class RectPattern3DPlane extends RectPattern
-{
-    public $alpha=50;  // Parameter that specifies the distance
+class RectPattern3DPlane extends RectPattern {
+    private $alpha=50;  // Parameter that specifies the distance
     // to "simulated" horizon in pixel from the
     // top of the band. Specifies how fast the lines
     // converge.
 
-    public function RectPattern3DPlane($aColor="black",$aWeight=1)
-    {
-    parent::RectPattern($aColor,$aWeight);
-    $this->SetDensity(10);  // Slightly larger default
-    }
-
-    public function SetHorizon($aHorizon)
-    {
-    $this->alpha=$aHorizon;
-    }
-
-    public function DoPattern(&$aImg)
-    {
-    // "Fake" a nice 3D grid-effect.
-    $x0 = $this->rect->x + $this->rect->w/2;
-    $y0 = $this->rect->y;
-    $x1 = $x0;
-    $y1 = $this->rect->ye;
-    $x0_right = $x0;
-    $x1_right = $x1;
-
-    // BTW "apa" means monkey in Swedish but is really a shortform for
-    // "alpha+a" which was the labels I used on paper when I derived the
-    // geometric to get the 3D perspective right.
-    // $apa is the height of the bounding rectangle plus the distance to the
-    // artifical horizon (alpha)
-    $apa = $this->rect->h + $this->alpha;
-
-    // Three cases and three loops
-    // 1) The endpoint of the line ends on the bottom line
-    // 2) The endpoint ends on the side
-    // 3) Horizontal lines
-
-    // Endpoint falls on bottom line
-    $middle=$this->rect->x + $this->rect->w/2;
-    $dist=$this->linespacing;
-    $factor=$this->alpha /($apa);
-    while ($x1>$this->rect->x) {
-        $aImg->Line($x0,$y0,$x1,$y1);
-        $aImg->Line($x0_right,$y0,$x1_right,$y1);
-        $x1 = $middle - $dist;
-        $x0 = $middle - $dist * $factor;
-        $x1_right = $middle + $dist;
-        $x0_right =  $middle + $dist * $factor;
-        $dist += $this->linespacing;
-    }
-
-    // Endpoint falls on sides
-    $dist -= $this->linespacing;
-    $d=$this->rect->w/2;
-    $c = $apa - $d*$apa/$dist;
-    while ($x0>$this->rect->x) {
-        $aImg->Line($x0,$y0,$this->rect->x,$this->rect->ye-$c);
-        $aImg->Line($x0_right,$y0,$this->rect->xe,$this->rect->ye-$c);
-        $dist += $this->linespacing;
-        $x0 = $middle - $dist * $factor;
-        $x1 = $middle - $dist;
-        $x0_right =  $middle + $dist * $factor;
-        $c = $apa - $d*$apa/$dist;
+    function __construct($aColor="black",$aWeight=1) {
+        parent::__construct($aColor,$aWeight);
+        $this->SetDensity(10);  // Slightly larger default
     }
 
-    // Horizontal lines
-    // They need some serious consideration since they are a function
-    // of perspective depth (alpha) and density (linespacing)
-    $x0=$this->rect->x;
-    $x1=$this->rect->xe;
-    $y=$this->rect->ye;
-
-    // The first line is drawn directly. Makes the loop below slightly
-    // more readable.
-    $aImg->Line($x0,$y,$x1,$y);
-    $hls = $this->linespacing;
-
-    // A correction factor for vertical "brick" line spacing to account for
-    // a) the difference in number of pixels hor vs vert
-    // b) visual apperance to make the first layer of "bricks" look more
-    // square.
-    $vls = $this->linespacing*0.6;
-
-    $ds = $hls*($apa-$vls)/$apa;
-    // Get the slope for the "perspective line" going from bottom right
-    // corner to top left corner of the "first" brick.
-
-    // Uncomment the following lines if you want to get a visual understanding
-    // of what this helpline does. BTW this mimics the way you would get the
-    // perspective right when drawing on paper.
-    /*
-      $x0 = $middle;
-      $y0 = $this->rect->ye;
-      $len=floor(($this->rect->ye-$this->rect->y)/$vls);
-      $x1 = $middle+round($len*$ds);
-      $y1 = $this->rect->ye-$len*$vls;
-      $aImg->PushColor("red");
-      $aImg->Line($x0,$y0,$x1,$y1);
-      $aImg->PopColor();
-    */
-
-    $y -= $vls;
-    $k=($this->rect->ye-($this->rect->ye-$vls))/($middle-($middle-$ds));
-    $dist = $hls;
-    while ($y>$this->rect->y) {
-        $aImg->Line($this->rect->x,$y,$this->rect->xe,$y);
-        $adj = $k*$dist/(1+$dist*$k/$apa);
-        if( $adj < 2 ) $adj=1;
-        $y = $this->rect->ye - round($adj);
-        $dist += $hls;
+    function SetHorizon($aHorizon) {
+        $this->alpha=$aHorizon;
     }
+
+    function DoPattern($aImg) {
+        // "Fake" a nice 3D grid-effect.
+        $x0 = $this->rect->x + $this->rect->w/2;
+        $y0 = $this->rect->y;
+        $x1 = $x0;
+        $y1 = $this->rect->ye;
+        $x0_right = $x0;
+        $x1_right = $x1;
+
+        // BTW "apa" means monkey in Swedish but is really a shortform for
+        // "alpha+a" which was the labels I used on paper when I derived the
+        // geometric to get the 3D perspective right.
+        // $apa is the height of the bounding rectangle plus the distance to the
+        // artifical horizon (alpha)
+        $apa = $this->rect->h + $this->alpha;
+
+        // Three cases and three loops
+        // 1) The endpoint of the line ends on the bottom line
+        // 2) The endpoint ends on the side
+        // 3) Horizontal lines
+
+        // Endpoint falls on bottom line
+        $middle=$this->rect->x + $this->rect->w/2;
+        $dist=$this->linespacing;
+        $factor=$this->alpha /($apa);
+        while($x1>$this->rect->x) {
+            $aImg->Line($x0,$y0,$x1,$y1);
+            $aImg->Line($x0_right,$y0,$x1_right,$y1);
+            $x1 = $middle - $dist;
+            $x0 = $middle - $dist * $factor;
+            $x1_right = $middle + $dist;
+            $x0_right =  $middle + $dist * $factor;
+            $dist += $this->linespacing;
+        }
+
+        // Endpoint falls on sides
+        $dist -= $this->linespacing;
+        $d=$this->rect->w/2;
+        $c = $apa - $d*$apa/$dist;
+        while( $x0>$this->rect->x ) {
+            $aImg->Line($x0,$y0,$this->rect->x,$this->rect->ye-$c);
+            $aImg->Line($x0_right,$y0,$this->rect->xe,$this->rect->ye-$c);
+            $dist += $this->linespacing;
+            $x0 = $middle - $dist * $factor;
+            $x1 = $middle - $dist;
+            $x0_right =  $middle + $dist * $factor;
+            $c = $apa - $d*$apa/$dist;
+        }
+
+        // Horizontal lines
+        // They need some serious consideration since they are a function
+        // of perspective depth (alpha) and density (linespacing)
+        $x0=$this->rect->x;
+        $x1=$this->rect->xe;
+        $y=$this->rect->ye;
+
+        // The first line is drawn directly. Makes the loop below slightly
+        // more readable.
+        $aImg->Line($x0,$y,$x1,$y);
+        $hls = $this->linespacing;
+
+        // A correction factor for vertical "brick" line spacing to account for
+        // a) the difference in number of pixels hor vs vert
+        // b) visual apperance to make the first layer of "bricks" look more
+        // square.
+        $vls = $this->linespacing*0.6;
+
+        $ds = $hls*($apa-$vls)/$apa;
+        // Get the slope for the "perspective line" going from bottom right
+        // corner to top left corner of the "first" brick.
+
+        // Uncomment the following lines if you want to get a visual understanding
+        // of what this helpline does. BTW this mimics the way you would get the
+        // perspective right when drawing on paper.
+        /*
+        $x0 = $middle;
+        $y0 = $this->rect->ye;
+        $len=floor(($this->rect->ye-$this->rect->y)/$vls);
+        $x1 = $middle+round($len*$ds);
+        $y1 = $this->rect->ye-$len*$vls;
+        $aImg->PushColor("red");
+        $aImg->Line($x0,$y0,$x1,$y1);
+        $aImg->PopColor();
+        */
+
+        $y -= $vls;
+        $k=($this->rect->ye-($this->rect->ye-$vls))/($middle-($middle-$ds));
+        $dist = $hls;
+        while( $y>$this->rect->y ) {
+            $aImg->Line($this->rect->x,$y,$this->rect->xe,$y);
+            $adj = $k*$dist/(1+$dist*$k/$apa);
+            if( $adj < 2 ) $adj=1;
+            $y = $this->rect->ye - round($adj);
+            $dist += $hls;
+        }
     }
 }
 
@@ -444,40 +418,34 @@ public function DoPattern(&$aImg)
 // Class RectPatternCross
 // Vert/Hor crosses
 //=====================================================================
-class RectPatternCross extends RectPattern
-{
-    public $vert=null;
-    public $hor=null;
-    public function RectPatternCross($aColor="black",$aWeight=1)
-    {
-    parent::RectPattern($aColor,$aWeight);
-    $this->vert = new RectPatternVert($aColor,$aWeight);
-    $this->hor  = new RectPatternHor($aColor,$aWeight);
+class RectPatternCross extends RectPattern {
+    private $vert=null;
+    private $hor=null;
+    function __construct($aColor="black",$aWeight=1) {
+        parent::__construct($aColor,$aWeight);
+        $this->vert = new RectPatternVert($aColor,$aWeight);
+        $this->hor  = new RectPatternHor($aColor,$aWeight);
     }
 
-    public function SetOrder($aDepth)
-    {
-    $this->vert->SetOrder($aDepth);
-    $this->hor->SetOrder($aDepth);
+    function SetOrder($aDepth) {
+        $this->vert->SetOrder($aDepth);
+        $this->hor->SetOrder($aDepth);
     }
 
-    public function SetPos(&$aRect)
-    {
-    parent::SetPos($aRect);
-    $this->vert->SetPos($aRect);
-    $this->hor->SetPos($aRect);
+    function SetPos($aRect) {
+        parent::SetPos($aRect);
+        $this->vert->SetPos($aRect);
+        $this->hor->SetPos($aRect);
     }
 
-    public function SetDensity($aDens)
-    {
-    $this->vert->SetDensity($aDens);
-    $this->hor->SetDensity($aDens);
+    function SetDensity($aDens) {
+        $this->vert->SetDensity($aDens);
+        $this->hor->SetDensity($aDens);
     }
 
-    public function DoPattern(&$aImg)
-    {
-    $this->vert->DoPattern($aImg);
-    $this->hor->DoPattern($aImg);
+    function DoPattern($aImg) {
+        $this->vert->DoPattern($aImg);
+        $this->hor->DoPattern($aImg);
     }
 }
 
@@ -486,40 +454,34 @@ public function DoPattern(&$aImg)
 // Vert/Hor crosses
 //=====================================================================
 
-class RectPatternDiagCross extends RectPattern
-{
-    public $left=null;
-    public $right=null;
-    public function RectPatternDiagCross($aColor="black",$aWeight=1)
-    {
-    parent::RectPattern($aColor,$aWeight);
-    $this->right = new RectPatternRDiag($aColor,$aWeight);
-    $this->left  = new RectPatternLDiag($aColor,$aWeight);
+class RectPatternDiagCross extends RectPattern {
+    private $left=null;
+    private $right=null;
+    function __construct($aColor="black",$aWeight=1) {
+        parent::__construct($aColor,$aWeight);
+        $this->right = new RectPatternRDiag($aColor,$aWeight);
+        $this->left  = new RectPatternLDiag($aColor,$aWeight);
     }
 
-    public function SetOrder($aDepth)
-    {
-    $this->left->SetOrder($aDepth);
-    $this->right->SetOrder($aDepth);
+    function SetOrder($aDepth) {
+        $this->left->SetOrder($aDepth);
+        $this->right->SetOrder($aDepth);
     }
 
-    public function SetPos(&$aRect)
-    {
-    parent::SetPos($aRect);
-    $this->left->SetPos($aRect);
-    $this->right->SetPos($aRect);
+    function SetPos($aRect) {
+        parent::SetPos($aRect);
+        $this->left->SetPos($aRect);
+        $this->right->SetPos($aRect);
     }
 
-    public function SetDensity($aDens)
-    {
-    $this->left->SetDensity($aDens);
-    $this->right->SetDensity($aDens);
+    function SetDensity($aDens) {
+        $this->left->SetDensity($aDens);
+        $this->right->SetDensity($aDens);
     }
 
-    public function DoPattern(&$aImg)
-    {
-    $this->left->DoPattern($aImg);
-    $this->right->DoPattern($aImg);
+    function DoPattern($aImg) {
+        $this->left->DoPattern($aImg);
+        $this->right->DoPattern($aImg);
     }
 
 }
@@ -528,44 +490,41 @@ public function DoPattern(&$aImg)
 // Class RectPatternFactory
 // Factory class for rectangular pattern
 //=====================================================================
-class RectPatternFactory
-{
-    public function RectPatternFactory()
-    {
-    // Empty
-    }
-    public function Create($aPattern,$aColor,$aWeight=1)
-    {
-    switch ($aPattern) {
-        case BAND_RDIAG:
-        $obj =  new RectPatternRDiag($aColor,$aWeight);
-        break;
-        case BAND_LDIAG:
-        $obj =  new RectPatternLDiag($aColor,$aWeight);
-        break;
-        case BAND_SOLID:
-        $obj =  new RectPatternSolid($aColor,$aWeight);
-        break;
-        case BAND_VLINE:
-        $obj =  new RectPatternVert($aColor,$aWeight);
-        break;
-        case BAND_HLINE:
-        $obj =  new RectPatternHor($aColor,$aWeight);
-        break;
-        case BAND_3DPLANE:
-        $obj =  new RectPattern3DPlane($aColor,$aWeight);
-        break;
-        case BAND_HVCROSS:
-        $obj =  new RectPatternCross($aColor,$aWeight);
-        break;
-        case BAND_DIAGCROSS:
-        $obj =  new RectPatternDiagCross($aColor,$aWeight);
-        break;
-        default:
-        JpGraphError::Raise(" Unknown pattern specification ($aPattern)");
-    }
-
-    return $obj;
+class RectPatternFactory {
+    function __construct() {
+        // Empty
+    }
+    function Create($aPattern,$aColor,$aWeight=1) {
+        switch($aPattern) {
+            case BAND_RDIAG:
+                $obj =  new RectPatternRDiag($aColor,$aWeight);
+                break;
+            case BAND_LDIAG:
+                $obj =  new RectPatternLDiag($aColor,$aWeight);
+                break;
+            case BAND_SOLID:
+                $obj =  new RectPatternSolid($aColor,$aWeight);
+                break;
+            case BAND_VLINE:
+                $obj =  new RectPatternVert($aColor,$aWeight);
+                break;
+            case BAND_HLINE:
+                $obj =  new RectPatternHor($aColor,$aWeight);
+                break;
+            case BAND_3DPLANE:
+                $obj =  new RectPattern3DPlane($aColor,$aWeight);
+                break;
+            case BAND_HVCROSS:
+                $obj =  new RectPatternCross($aColor,$aWeight);
+                break;
+            case BAND_DIAGCROSS:
+                $obj =  new RectPatternDiagCross($aColor,$aWeight);
+                break;
+            default:
+                JpGraphError::RaiseL(16003,$aPattern);
+                //(" Unknown pattern specification ($aPattern)");
+        }
+        return $obj;
     }
 }
 
@@ -576,102 +535,101 @@ public function Create($aPattern,$aColor,$aWeight=1)
 // It is responsible for factoring the corresponding pattern
 // concrete class.
 //=====================================================================
-class PlotBand
-{
-    public $prect=null;
-    public $depth;
-    public $dir, $min, $max;
-
-    public function PlotBand($aDir,$aPattern,$aMin,$aMax,$aColor="black",$aWeight=1,$aDepth=DEPTH_BACK)
-    {
-    $f =  new RectPatternFactory();
-    $this->prect = $f->Create($aPattern,$aColor,$aWeight);
-    if( is_numeric($aMin) && is_numeric($aMax) && ($aMin > $aMax) )
-        JpGraphError::Raise('Min value for plotband is larger than specified max value. Please correct.');
-    $this->dir = $aDir;
-    $this->min = $aMin;
-    $this->max = $aMax;
-    $this->depth=$aDepth;
+class PlotBand {
+    public $depth; // Determine if band should be over or under the plots
+    private $prect=null;
+    private $dir, $min, $max;
+
+    function __construct($aDir,$aPattern,$aMin,$aMax,$aColor="black",$aWeight=1,$aDepth=DEPTH_BACK) {
+        $f =  new RectPatternFactory();
+        $this->prect = $f->Create($aPattern,$aColor,$aWeight);
+        if( is_numeric($aMin) && is_numeric($aMax) && ($aMin > $aMax) )
+        JpGraphError::RaiseL(16004);
+        //('Min value for plotband is larger than specified max value. Please correct.');
+        $this->dir = $aDir;
+        $this->min = $aMin;
+        $this->max = $aMax;
+        $this->depth=$aDepth;
     }
 
     // Set position. aRect contains absolute image coordinates
-    public function SetPos(&$aRect)
-    {
-    assert( $this->prect != null ) ;
-    $this->prect->SetPos($aRect);
+    function SetPos($aRect) {
+        assert( $this->prect != null ) ;
+        $this->prect->SetPos($aRect);
     }
 
-    public function ShowFrame($aFlag=true)
-    {
-    $this->prect->ShowFrame($aFlag);
+    function ShowFrame($aFlag=true) {
+        $this->prect->ShowFrame($aFlag);
     }
 
     // Set z-order. In front of pplot or in the back
-    public function SetOrder($aDepth)
-    {
-    $this->depth=$aDepth;
+    function SetOrder($aDepth) {
+        $this->depth=$aDepth;
+    }
+
+    function SetDensity($aDens) {
+        $this->prect->SetDensity($aDens);
     }
 
-    public function SetDensity($aDens)
-    {
-    $this->prect->SetDensity($aDens);
+    function GetDir() {
+        return $this->dir;
     }
 
-    public function GetDir()
-    {
-    return $this->dir;
+    function GetMin() {
+        return $this->min;
     }
 
-    public function GetMin()
-    {
-    return $this->min;
+    function GetMax() {
+        return $this->max;
     }
 
-    public function GetMax()
-    {
-    return $this->max;
+    function PreStrokeAdjust($aGraph) {
+        // Nothing to do
     }
 
     // Display band
-    public function Stroke(&$aImg,&$aXScale,&$aYScale)
-    {
-    assert( $this->prect != null ) ;
-    if ($this->dir == HORIZONTAL) {
-        if( $this->min === 'min' ) $this->min = $aYScale->GetMinVal();
-        if( $this->max === 'max' ) $this->max = $aYScale->GetMaxVal();
+    function Stroke($aImg,$aXScale,$aYScale) {
+        assert( $this->prect != null ) ;
+        if( $this->dir == HORIZONTAL ) {
+            if( $this->min === 'min' ) $this->min = $aYScale->GetMinVal();
+            if( $this->max === 'max' ) $this->max = $aYScale->GetMaxVal();
 
             // Only draw the bar if it actually appears in the range
             if ($this->min < $aYScale->GetMaxVal() && $this->max > $aYScale->GetMinVal()) {
-
-        // Trucate to limit of axis
-        $this->min = max($this->min, $aYScale->GetMinVal());
-        $this->max = min($this->max, $aYScale->GetMaxVal());
-
-        $x=$aXScale->scale_abs[0];
-        $y=$aYScale->Translate($this->max);
-        $width=$aXScale->scale_abs[1]-$aXScale->scale_abs[0]+1;
-        $height=abs($y-$aYScale->Translate($this->min))+1;
-        $this->prect->SetPos(new Rectangle($x,$y,$width,$height));
-        $this->prect->Stroke($aImg);
+                 
+                // Trucate to limit of axis
+                $this->min = max($this->min, $aYScale->GetMinVal());
+                $this->max = min($this->max, $aYScale->GetMaxVal());
+
+                $x=$aXScale->scale_abs[0];
+                $y=$aYScale->Translate($this->max);
+                $width=$aXScale->scale_abs[1]-$aXScale->scale_abs[0]+1;
+                $height=abs($y-$aYScale->Translate($this->min))+1;
+                $this->prect->SetPos(new Rectangle($x,$y,$width,$height));
+                $this->prect->Stroke($aImg);
             }
-    } else {	// VERTICAL
-        if( $this->min === 'min' ) $this->min = $aXScale->GetMinVal();
-        if( $this->max === 'max' ) $this->max = $aXScale->GetMaxVal();
+        }
+        else { // VERTICAL
+            if( $this->min === 'min' ) $this->min = $aXScale->GetMinVal();
+            if( $this->max === 'max' ) $this->max = $aXScale->GetMaxVal();
 
             // Only draw the bar if it actually appears in the range
-        if ($this->min < $aXScale->GetMaxVal() && $this->max > $aXScale->GetMinVal()) {
-
-        // Trucate to limit of axis
-        $this->min = max($this->min, $aXScale->GetMinVal());
-        $this->max = min($this->max, $aXScale->GetMaxVal());
-
-        $y=$aYScale->scale_abs[1];
-        $x=$aXScale->Translate($this->min);
-        $height=abs($aYScale->scale_abs[1]-$aYScale->scale_abs[0]);
-        $width=abs($x-$aXScale->Translate($this->max));
-        $this->prect->SetPos(new Rectangle($x,$y,$width,$height));
-        $this->prect->Stroke($aImg);
+            if ($this->min < $aXScale->GetMaxVal() && $this->max > $aXScale->GetMinVal()) {
+                 
+                // Trucate to limit of axis
+                $this->min = max($this->min, $aXScale->GetMinVal());
+                $this->max = min($this->max, $aXScale->GetMaxVal());
+
+                $y=$aYScale->scale_abs[1];
+                $x=$aXScale->Translate($this->min);
+                $height=abs($aYScale->scale_abs[1]-$aYScale->scale_abs[0]);
+                $width=abs($x-$aXScale->Translate($this->max));
+                $this->prect->SetPos(new Rectangle($x,$y,$width,$height));
+                $this->prect->Stroke($aImg);
             }
-    }
+        }
     }
 }
+
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_plotline.php b/common/lib/jpgraph_lib/jpgraph_plotline.php
new file mode 100644
index 000000000..4ee0f5648
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_plotline.php
@@ -0,0 +1,142 @@
+<?php
+/*=======================================================================
+ // File:  		 JPGRAPH_PLOTLINE.PHP
+ // Description: PlotLine extension for JpGraph
+ // Created:  	 2009-03-24
+ // Ver:  		 $Id: jpgraph_plotline.php 1931 2010-03-22 15:05:48Z ljp $
+ //
+ // CLASS PlotLine
+ // Data container class to hold properties for a static
+ // line that is drawn directly in the plot area.
+ // Useful to add static borders inside a plot to show for example set-values
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+
+class PlotLine {
+    public $scaleposition, $direction=-1;
+    protected $weight=1;
+    protected $color = 'black';
+    private $legend='',$hidelegend=false, $legendcsimtarget='', $legendcsimalt='',$legendcsimwintarget='';
+    private $iLineStyle='solid';
+    public $numpoints=0; // Needed since the framework expects this property
+
+    function __construct($aDir=HORIZONTAL,$aPos=0,$aColor='black',$aWeight=1) {
+        $this->direction = $aDir;
+        $this->color=$aColor;
+        $this->weight=$aWeight;
+        $this->scaleposition=$aPos;
+    }
+
+    function SetLegend($aLegend,$aCSIM='',$aCSIMAlt='',$aCSIMWinTarget='') {
+        $this->legend = $aLegend;
+        $this->legendcsimtarget = $aCSIM;
+        $this->legendcsimwintarget = $aCSIMWinTarget;
+        $this->legendcsimalt = $aCSIMAlt;
+    }
+
+    function HideLegend($f=true) {
+        $this->hidelegend = $f;
+    }
+
+    function SetPosition($aScalePosition) {
+        $this->scaleposition=$aScalePosition;
+    }
+
+    function SetDirection($aDir) {
+        $this->direction = $aDir;
+    }
+
+    function SetColor($aColor) {
+        $this->color=$aColor;
+    }
+
+    function SetWeight($aWeight) {
+        $this->weight=$aWeight;
+    }
+
+    function SetLineStyle($aStyle) {
+        $this->iLineStyle = $aStyle;
+    }
+
+    function GetCSIMAreas() {
+        return '';
+    }
+
+    //---------------
+    // PRIVATE METHODS
+
+    function DoLegend($graph) {
+        if( !$this->hidelegend ) $this->Legend($graph);
+    }
+
+    // Framework function the chance for each plot class to set a legend
+    function Legend($aGraph) {
+        if( $this->legend != '' ) {
+            $dummyPlotMark = new PlotMark();
+            $lineStyle = 1;
+            $aGraph->legend->Add($this->legend,$this->color,$dummyPlotMark,$lineStyle,
+            $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
+        }
+    }
+
+    function PreStrokeAdjust($aGraph) {
+        // Nothing to do
+    }
+
+    // Called by framework to allow the object to draw
+    // optional information in the margin area
+    function StrokeMargin($aImg) {
+        // Nothing to do
+    }
+
+    // Framework function to allow the object to adjust the scale
+    function PrescaleSetup($aGraph) {
+        // Nothing to do
+    }
+
+    function Min() {
+        return array(null,null);
+    }
+
+    function Max() {
+        return array(null,null);
+    }
+
+    function _Stroke($aImg,$aMinX,$aMinY,$aMaxX,$aMaxY,$aXPos,$aYPos) {
+        $aImg->SetColor($this->color);
+        $aImg->SetLineWeight($this->weight);
+        $oldStyle = $aImg->SetLineStyle($this->iLineStyle);
+        if( $this->direction == VERTICAL ) {
+            $ymin_abs = $aMinY;
+            $ymax_abs = $aMaxY;
+            $xpos_abs = $aXPos;
+            $aImg->StyleLine($xpos_abs, $ymin_abs, $xpos_abs, $ymax_abs);
+        }
+        elseif( $this->direction == HORIZONTAL ) {
+            $xmin_abs = $aMinX;
+            $xmax_abs = $aMaxX;
+            $ypos_abs = $aYPos;
+            $aImg->StyleLine($xmin_abs, $ypos_abs, $xmax_abs, $ypos_abs);
+        }
+        else {
+            JpGraphError::RaiseL(25125);//(" Illegal direction for static line");
+        }
+        $aImg->SetLineStyle($oldStyle);
+    }
+
+    function Stroke($aImg,$aXScale,$aYScale) {
+        $this->_Stroke($aImg,
+            $aImg->left_margin,
+            $aYScale->Translate($aYScale->GetMinVal()),
+            $aImg->width-$aImg->right_margin,
+            $aYScale->Translate($aYScale->GetMaxVal()),
+            $aXScale->Translate($this->scaleposition),
+            $aYScale->Translate($this->scaleposition)
+        );
+    }
+}
+
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_plotmark.inc b/common/lib/jpgraph_lib/jpgraph_plotmark.inc
old mode 100644
new mode 100755
diff --git a/common/lib/jpgraph_lib/jpgraph_plotmark.inc.php b/common/lib/jpgraph_lib/jpgraph_plotmark.inc.php
new file mode 100644
index 000000000..29c4d0325
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_plotmark.inc.php
@@ -0,0 +1,504 @@
+<?php
+//=======================================================================
+// File:        JPGRAPH_PLOTMARK.PHP
+// Description: Class file. Handles plotmarks
+// Created:     2003-03-21
+// Ver:         $Id: jpgraph_plotmark.inc.php 1106 2009-02-22 20:16:35Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+
+//===================================================
+// CLASS PlotMark
+// Description: Handles the plot marks in graphs
+//===================================================
+
+class PlotMark {
+    public $title, $show=true;
+    public $type,$weight=1;
+    public $iFormatCallback="", $iFormatCallback2="";
+    public $fill_color="blue";
+    public $color="black", $width=4;
+    private $yvalue,$xvalue='',$csimtarget,$csimwintarget='',$csimalt,$csimareas;
+    private $markimg='',$iScale=1.0;
+    private $oldfilename='',$iFileName='';
+    private $imgdata_balls = null;
+    private $imgdata_diamonds = null;
+    private $imgdata_squares = null;
+    private $imgdata_bevels = null;
+    private $imgdata_stars = null;
+    private $imgdata_pushpins = null;
+
+    //--------------
+    // CONSTRUCTOR
+    function __construct() {
+        $this->title = new Text();
+        $this->title->Hide();
+        $this->csimareas = '';
+        $this->type=-1;
+    }
+    //---------------
+    // PUBLIC METHODS
+    function SetType($aType,$aFileName='',$aScale=1.0) {
+        $this->type = $aType;
+        if( $aType == MARK_IMG && $aFileName=='' ) {
+            JpGraphError::RaiseL(23003);//('A filename must be specified if you set the mark type to MARK_IMG.');
+        }
+        $this->iFileName = $aFileName;
+        $this->iScale = $aScale;
+    }
+
+    function SetCallback($aFunc) {
+        $this->iFormatCallback = $aFunc;
+    }
+
+    function SetCallbackYX($aFunc) {
+        $this->iFormatCallback2 = $aFunc;
+    }
+
+    function GetType() {
+        return $this->type;
+    }
+
+    function SetColor($aColor) {
+        $this->color=$aColor;
+    }
+
+    function SetFillColor($aFillColor) {
+        $this->fill_color = $aFillColor;
+    }
+
+    function SetWeight($aWeight) {
+        $this->weight = $aWeight;
+    }
+
+    // Synonym for SetWidth()
+    function SetSize($aWidth) {
+        $this->width=$aWidth;
+    }
+
+    function SetWidth($aWidth) {
+        $this->width=$aWidth;
+    }
+
+    function SetDefaultWidth() {
+        switch( $this->type ) {
+            case MARK_CIRCLE:
+            case MARK_FILLEDCIRCLE:
+                $this->width=4;
+                break;
+            default:
+                $this->width=7;
+        }
+    }
+
+    function GetWidth() {
+        return $this->width;
+    }
+
+    function Hide($aHide=true) {
+        $this->show = !$aHide;
+    }
+
+    function Show($aShow=true) {
+        $this->show = $aShow;
+    }
+
+    function SetCSIMAltVal($aY,$aX='') {
+        $this->yvalue=$aY;
+        $this->xvalue=$aX;
+    }
+
+    function SetCSIMTarget($aTarget,$aWinTarget='') {
+        $this->csimtarget=$aTarget;
+        $this->csimwintarget=$aWinTarget;
+    }
+
+    function SetCSIMAlt($aAlt) {
+        $this->csimalt=$aAlt;
+    }
+
+    function GetCSIMAreas(){
+        return $this->csimareas;
+    }
+
+    function AddCSIMPoly($aPts) {
+        $coords = round($aPts[0]).", ".round($aPts[1]);
+        $n = count($aPts)/2;
+        for( $i=1; $i < $n; ++$i){
+            $coords .= ", ".round($aPts[2*$i]).", ".round($aPts[2*$i+1]);
+        }
+        $this->csimareas="";
+        if( !empty($this->csimtarget) ) {
+            $this->csimareas .= "<area shape=\"poly\" coords=\"$coords\" href=\"".htmlentities($this->csimtarget)."\"";
+
+            if( !empty($this->csimwintarget) ) {
+                $this->csimareas .= " target=\"".$this->csimwintarget."\" ";
+            }
+
+            if( !empty($this->csimalt) ) {
+                $tmp=sprintf($this->csimalt,$this->yvalue,$this->xvalue);
+                $this->csimareas .= " title=\"$tmp\" alt=\"$tmp\"";
+            }
+            $this->csimareas .= " />\n";
+        }
+    }
+
+    function AddCSIMCircle($x,$y,$r) {
+        $x = round($x); $y=round($y); $r=round($r);
+        $this->csimareas="";
+        if( !empty($this->csimtarget) ) {
+            $this->csimareas .= "<area shape=\"circle\" coords=\"$x,$y,$r\" href=\"".htmlentities($this->csimtarget)."\"";
+
+            if( !empty($this->csimwintarget) ) {
+                $this->csimareas .= " target=\"".$this->csimwintarget."\" ";
+            }
+
+            if( !empty($this->csimalt) ) {
+                $tmp=sprintf($this->csimalt,$this->yvalue,$this->xvalue);
+                $this->csimareas .= " title=\"$tmp\" alt=\"$tmp\" ";
+            }
+            $this->csimareas .= " />\n";
+        }
+    }
+     
+    function Stroke($img,$x,$y) {
+        if( !$this->show ) return;
+
+        if( $this->iFormatCallback != '' || $this->iFormatCallback2 != '' ) {
+
+            if( $this->iFormatCallback != '' ) {
+                $f = $this->iFormatCallback;
+                list($width,$color,$fcolor) = call_user_func($f,$this->yvalue);
+                $filename = $this->iFileName;
+                $imgscale = $this->iScale;
+            }
+            else {
+                $f = $this->iFormatCallback2;
+                list($width,$color,$fcolor,$filename,$imgscale) = call_user_func($f,$this->yvalue,$this->xvalue);
+                if( $filename=="" ) $filename = $this->iFileName;
+                if( $imgscale=="" ) $imgscale = $this->iScale;
+            }
+
+            if( $width=="" ) $width = $this->width;
+            if( $color=="" ) $color = $this->color;
+            if( $fcolor=="" ) $fcolor = $this->fill_color;
+
+        }
+        else {
+            $fcolor = $this->fill_color;
+            $color = $this->color;
+            $width = $this->width;
+            $filename = $this->iFileName;
+            $imgscale = $this->iScale;
+        }
+
+        if( $this->type == MARK_IMG ||
+        ($this->type >= MARK_FLAG1 && $this->type <= MARK_FLAG4 ) ||
+        $this->type >= MARK_IMG_PUSHPIN ) {
+
+            // Note: For the builtin images we use the "filename" parameter
+            // to denote the color
+            $anchor_x = 0.5;
+            $anchor_y = 0.5;
+            switch( $this->type ) {
+                case MARK_FLAG1:
+                case MARK_FLAG2:
+                case MARK_FLAG3:
+                case MARK_FLAG4:
+                    $this->markimg = FlagCache::GetFlagImgByName($this->type-MARK_FLAG1+1,$filename);
+                    break;
+
+                case MARK_IMG :
+                    // Load an image and use that as a marker
+                    // Small optimization, if we have already read an image don't
+                    // waste time reading it again.
+                    if( $this->markimg == '' || !($this->oldfilename === $filename) ) {
+                        $this->markimg = Graph::LoadBkgImage('',$filename);
+                        $this->oldfilename = $filename ;
+                    }
+                    break;
+
+                case MARK_IMG_PUSHPIN:
+                case MARK_IMG_SPUSHPIN:
+                case MARK_IMG_LPUSHPIN:
+                    if( $this->imgdata_pushpins == null ) {
+                        require_once 'imgdata_pushpins.inc.php';
+                        $this->imgdata_pushpins = new ImgData_PushPins();
+                    }
+                    $this->markimg = $this->imgdata_pushpins->GetImg($this->type,$filename);
+                    list($anchor_x,$anchor_y) = $this->imgdata_pushpins->GetAnchor();
+                    break;
+
+                case MARK_IMG_SQUARE:
+                    if( $this->imgdata_squares == null ) {
+                        require_once 'imgdata_squares.inc.php';
+                        $this->imgdata_squares = new ImgData_Squares();
+                    }
+                    $this->markimg = $this->imgdata_squares->GetImg($this->type,$filename);
+                    list($anchor_x,$anchor_y) = $this->imgdata_squares->GetAnchor();
+                    break;
+
+                case MARK_IMG_STAR:
+                    if( $this->imgdata_stars == null ) {
+                        require_once 'imgdata_stars.inc.php';
+                        $this->imgdata_stars = new ImgData_Stars();
+                    }
+                    $this->markimg = $this->imgdata_stars->GetImg($this->type,$filename);
+                    list($anchor_x,$anchor_y) = $this->imgdata_stars->GetAnchor();
+                    break;
+
+                case MARK_IMG_BEVEL:
+                    if( $this->imgdata_bevels == null ) {
+                        require_once 'imgdata_bevels.inc.php';
+                        $this->imgdata_bevels = new ImgData_Bevels();
+                    }
+                    $this->markimg = $this->imgdata_bevels->GetImg($this->type,$filename);
+                    list($anchor_x,$anchor_y) = $this->imgdata_bevels->GetAnchor();
+                    break;
+
+                case MARK_IMG_DIAMOND:
+                    if( $this->imgdata_diamonds == null ) {
+                        require_once 'imgdata_diamonds.inc.php';
+                        $this->imgdata_diamonds = new ImgData_Diamonds();
+                    }
+                    $this->markimg = $this->imgdata_diamonds->GetImg($this->type,$filename);
+                    list($anchor_x,$anchor_y) = $this->imgdata_diamonds->GetAnchor();
+                    break;
+
+                case MARK_IMG_BALL:
+                case MARK_IMG_SBALL:
+                case MARK_IMG_MBALL:
+                case MARK_IMG_LBALL:
+                    if( $this->imgdata_balls == null ) {
+                        require_once 'imgdata_balls.inc.php';
+                        $this->imgdata_balls = new ImgData_Balls();
+                    }
+                    $this->markimg = $this->imgdata_balls->GetImg($this->type,$filename);
+                    list($anchor_x,$anchor_y) = $this->imgdata_balls->GetAnchor();
+                    break;
+            }
+
+            $w = $img->GetWidth($this->markimg);
+            $h = $img->GetHeight($this->markimg);
+             
+            $dw = round($imgscale * $w );
+            $dh = round($imgscale * $h );
+
+            // Do potential rotation
+            list($x,$y) = $img->Rotate($x,$y);
+
+            $dx = round($x-$dw*$anchor_x);
+            $dy = round($y-$dh*$anchor_y);
+             
+            $this->width = max($dx,$dy);
+             
+            $img->Copy($this->markimg,$dx,$dy,0,0,$dw,$dh,$w,$h);
+            if( !empty($this->csimtarget) ) {
+                $this->csimareas = "<area shape=\"rect\" coords=\"".
+                $dx.','.$dy.','.round($dx+$dw).','.round($dy+$dh).'" '.
+      "href=\"".htmlentities($this->csimtarget)."\"";
+
+                if( !empty($this->csimwintarget) ) {
+                    $this->csimareas .= " target=\"".$this->csimwintarget."\" ";
+                }
+
+                if( !empty($this->csimalt) ) {
+                    $tmp=sprintf($this->csimalt,$this->yvalue,$this->xvalue);
+                    $this->csimareas .= " title=\"$tmp\" alt=\"$tmp\" ";
+                }
+                $this->csimareas .= " />\n";
+            }
+             
+            // Stroke title
+            $this->title->Align("center","top");
+            $this->title->Stroke($img,$x,$y+round($dh/2));
+            return;
+        }
+
+        $weight = $this->weight;
+        $dx=round($width/2,0);
+        $dy=round($width/2,0);
+        $pts=0;
+
+        switch( $this->type ) {
+            case MARK_SQUARE:
+                $c[]=$x-$dx;$c[]=$y-$dy;
+                $c[]=$x+$dx;$c[]=$y-$dy;
+                $c[]=$x+$dx;$c[]=$y+$dy;
+                $c[]=$x-$dx;$c[]=$y+$dy;
+                $c[]=$x-$dx;$c[]=$y-$dy;
+                $pts=5;
+                break;
+            case MARK_UTRIANGLE:
+                ++$dx;++$dy;
+                $c[]=$x-$dx;$c[]=$y+0.87*$dy; // tan(60)/2*$dx
+                $c[]=$x;$c[]=$y-0.87*$dy;
+                $c[]=$x+$dx;$c[]=$y+0.87*$dy;
+                $c[]=$x-$dx;$c[]=$y+0.87*$dy; // tan(60)/2*$dx
+                $pts=4;
+                break;
+            case MARK_DTRIANGLE:
+                ++$dx;++$dy;
+                $c[]=$x;$c[]=$y+0.87*$dy; // tan(60)/2*$dx
+                $c[]=$x-$dx;$c[]=$y-0.87*$dy;
+                $c[]=$x+$dx;$c[]=$y-0.87*$dy;
+                $c[]=$x;$c[]=$y+0.87*$dy; // tan(60)/2*$dx
+                $pts=4;
+                break;
+            case MARK_DIAMOND:
+                $c[]=$x;$c[]=$y+$dy;
+                $c[]=$x-$dx;$c[]=$y;
+                $c[]=$x;$c[]=$y-$dy;
+                $c[]=$x+$dx;$c[]=$y;
+                $c[]=$x;$c[]=$y+$dy;
+                $pts=5;
+                break;
+            case MARK_LEFTTRIANGLE:
+                $c[]=$x;$c[]=$y;
+                $c[]=$x;$c[]=$y+2*$dy;
+                $c[]=$x+$dx*2;$c[]=$y;
+                $c[]=$x;$c[]=$y;
+                $pts=4;
+                break;
+            case MARK_RIGHTTRIANGLE:
+                $c[]=$x-$dx*2;$c[]=$y;
+                $c[]=$x;$c[]=$y+2*$dy;
+                $c[]=$x;$c[]=$y;
+                $c[]=$x-$dx*2;$c[]=$y;
+                $pts=4;
+                break;
+            case MARK_FLASH:
+                $dy *= 2;
+                $c[]=$x+$dx/2; $c[]=$y-$dy;
+                $c[]=$x-$dx+$dx/2; $c[]=$y+$dy*0.7-$dy;
+                $c[]=$x+$dx/2; $c[]=$y+$dy*1.3-$dy;
+                $c[]=$x-$dx+$dx/2; $c[]=$y+2*$dy-$dy;
+                $img->SetLineWeight($weight);
+                $img->SetColor($color);
+                $img->Polygon($c);
+                $img->SetLineWeight(1);
+                $this->AddCSIMPoly($c);
+                break;
+        }
+
+        if( $pts>0 ) {
+            $this->AddCSIMPoly($c);
+            $img->SetLineWeight($weight);
+            $img->SetColor($fcolor);
+            $img->FilledPolygon($c);
+            $img->SetColor($color);
+            $img->Polygon($c);
+            $img->SetLineWeight(1);
+        }
+        elseif( $this->type==MARK_CIRCLE ) {
+            $img->SetColor($color);
+            $img->Circle($x,$y,$width);
+            $this->AddCSIMCircle($x,$y,$width);
+        }
+        elseif( $this->type==MARK_FILLEDCIRCLE ) {
+            $img->SetColor($fcolor);
+            $img->FilledCircle($x,$y,$width);
+            $img->SetColor($color);
+            $img->Circle($x,$y,$width);
+            $this->AddCSIMCircle($x,$y,$width);
+        }
+        elseif( $this->type==MARK_CROSS ) {
+            // Oversize by a pixel to match the X
+            $img->SetColor($color);
+            $img->SetLineWeight($weight);
+            $img->Line($x,$y+$dy+1,$x,$y-$dy-1);
+            $img->Line($x-$dx-1,$y,$x+$dx+1,$y);
+            $this->AddCSIMCircle($x,$y,$dx);
+        }
+        elseif( $this->type==MARK_X ) {
+            $img->SetColor($color);
+            $img->SetLineWeight($weight);
+            $img->Line($x+$dx,$y+$dy,$x-$dx,$y-$dy);
+            $img->Line($x-$dx,$y+$dy,$x+$dx,$y-$dy);
+            $this->AddCSIMCircle($x,$y,$dx+$dy);
+        }
+        elseif( $this->type==MARK_STAR ) {
+            $img->SetColor($color);
+            $img->SetLineWeight($weight);
+            $img->Line($x+$dx,$y+$dy,$x-$dx,$y-$dy);
+            $img->Line($x-$dx,$y+$dy,$x+$dx,$y-$dy);
+            // Oversize by a pixel to match the X
+            $img->Line($x,$y+$dy+1,$x,$y-$dy-1);
+            $img->Line($x-$dx-1,$y,$x+$dx+1,$y);
+            $this->AddCSIMCircle($x,$y,$dx+$dy);
+        }
+
+        // Stroke title
+        $this->title->Align("center","center");
+        $this->title->Stroke($img,$x,$y);
+    }
+} // Class
+
+
+
+//========================================================================
+// CLASS ImgData
+// Description: Base class for all image data classes that contains the
+// real image data.
+//========================================================================
+class ImgData {
+    protected $name = '';  // Each subclass gives a name
+    protected $an = array();  // Data array names
+    protected $colors = array(); // Available colors
+    protected $index  = array(); // Index for colors
+    protected $maxidx = 0 ;  // Max color index
+    protected $anchor_x=0.5, $anchor_y=0.5 ;    // Where is the center of the image
+    
+    function __construct() {
+        // Empty
+    }
+    
+    // Create a GD image from the data and return a GD handle
+    function GetImg($aMark,$aIdx) {
+        $n = $this->an[$aMark];
+        if( is_string($aIdx) ) {
+            if( !in_array($aIdx,$this->colors) ) {
+                JpGraphError::RaiseL(23001,$this->name,$aIdx);//('This marker "'.($this->name).'" does not exist in color: '.$aIdx);
+            }
+            $idx = $this->index[$aIdx];
+        }
+        elseif( !is_integer($aIdx) ||
+        (is_integer($aIdx) && $aIdx > $this->maxidx ) ) {
+            JpGraphError::RaiseL(23002,$this->name);//('Mark color index too large for marker "'.($this->name).'"');
+        }
+        else
+        $idx = $aIdx ;
+        return Image::CreateFromString(base64_decode($this->{$n}[$idx][1]));
+    }
+    
+    function GetAnchor() {
+        return array($this->anchor_x,$this->anchor_y);
+    }
+}
+
+
+// Keep a global flag cache to reduce memory usage
+$_gFlagCache=array(
+1 => null,
+2 => null,
+3 => null,
+4 => null,
+);
+// Only supposed to b called as statics
+class FlagCache {
+    
+    static function GetFlagImgByName($aSize,$aName) {
+        global $_gFlagCache;
+        require_once('jpgraph_flags.php');
+        if( $_gFlagCache[$aSize] === null ) {
+            $_gFlagCache[$aSize] = new FlagImages($aSize);
+        }
+        $f = $_gFlagCache[$aSize];
+        $idx = $f->GetIdxByName($aName,$aFullName);
+        return $f->GetImgByIdx($idx);
+    }
+}
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_polar.php b/common/lib/jpgraph_lib/jpgraph_polar.php
old mode 100644
new mode 100755
index 84c2adeb6..62c6bbc86
--- a/common/lib/jpgraph_lib/jpgraph_polar.php
+++ b/common/lib/jpgraph_lib/jpgraph_polar.php
@@ -1,22 +1,20 @@
 <?php
 /*=======================================================================
-// File: 	JPGRAPH_POLAR.PHP
-// Description:	Polar plot extension for JpGraph
-// Created: 	2003-02-02
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_polar.php,v 1.2.2.5 2004/08/29 19:14:29 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2003 Johan Persson
-//========================================================================
-*/
+ // File:        JPGRAPH_POLAR.PHP
+ // Description: Polar plot extension for JpGraph
+ // Created:     2003-02-02
+ // Ver:         $Id: jpgraph_polar.php 1796 2009-09-07 09:37:19Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
 
-require_once 'jpgraph_plotmark.inc';
+require_once ('jpgraph_plotmark.inc.php');
+require_once "jpgraph_log.php";
 
-require_once 'jpgraph_log.php';
 
-DEFINE('POLAR_360',1);
-DEFINE('POLAR_180',2);
+define('POLAR_360',1);
+define('POLAR_180',2);
 
 //
 // Note. Don't attempt to make sense of this code.
@@ -33,822 +31,867 @@
 //--------------------------------------------------------------------------
 // class PolarPlot
 //--------------------------------------------------------------------------
-class PolarPlot
-{
-    public $numpoints=0;
-    public $iColor='navy',$iFillColor='';
-    public $iLineWeight=1;
-    public $coord=null;
+class PolarPlot {
+    public $line_style='solid',$mark;
     public $legendcsimtarget='';
     public $legendcsimalt='';
     public $legend="";
-    public $csimtargets=array();	// Array of targets for CSIM
-    public $csimareas="";			// Resultant CSIM area tags
-    public $csimalts=null;			// ALT:s for corresponding target
-    public $line_style='solid',$mark;
-
-    public function PolarPlot($aData)
-    {
-    $n = count($aData);
-    if ($n & 1) {
-        JpGraphError::Raise('Polar plots must have an even number of data point. Each data point is a tuple (angle,radius).');
-    }
-    $this->numpoints = $n/2;
-    $this->coord = $aData;
-    $this->mark = new PlotMark();
-    }
-
-    public function SetWeight($aWeight)
-    {
-    $this->iLineWeight = $aWeight;
+    public $csimtargets=array(); // Array of targets for CSIM
+    public $csimareas="";   // Resultant CSIM area tags
+    public $csimalts=null;   // ALT:s for corresponding target
+    public $scale=null;
+    private $numpoints=0;
+    private $iColor='navy',$iFillColor='';
+    private $iLineWeight=1;
+    private $coord=null;
+
+    function __construct($aData) {
+        $n = count($aData);
+        if( $n & 1 ) {
+            JpGraphError::RaiseL(17001);
+            //('Polar plots must have an even number of data point. Each data point is a tuple (angle,radius).');
+        }
+        $this->numpoints = $n/2;
+        $this->coord = $aData;
+        $this->mark = new PlotMark();
     }
 
-    public function SetColor($aColor)
-    {
-    $this->iColor = $aColor;
+    function SetWeight($aWeight) {
+        $this->iLineWeight = $aWeight;
     }
 
-    public function SetFillColor($aColor)
-    {
-    $this->iFillColor = $aColor;
+    function SetColor($aColor){
+        $this->iColor = $aColor;
     }
 
-    public function Max()
-    {
-    $m = $this->coord[1];
-    $i=1;
-    while ($i < $this->numpoints) {
-        $m = max($m,$this->coord[2*$i+1]);
-        ++$i;
+    function SetFillColor($aColor){
+        $this->iFillColor = $aColor;
     }
 
-    return $m;
+    function Max() {
+        $m = $this->coord[1];
+        $i=1;
+        while( $i < $this->numpoints ) {
+            $m = max($m,$this->coord[2*$i+1]);
+            ++$i;
+        }
+        return $m;
     }
     // Set href targets for CSIM
-    public function SetCSIMTargets($aTargets,$aAlts=null)
-    {
-    $this->csimtargets=$aTargets;
-    $this->csimalts=$aAlts;
+    function SetCSIMTargets($aTargets,$aAlts=null) {
+        $this->csimtargets=$aTargets;
+        $this->csimalts=$aAlts;
     }
 
     // Get all created areas
-    public function GetCSIMareas()
-    {
-    return $this->csimareas;
+    function GetCSIMareas() {
+        return $this->csimareas;
     }
 
-    public function SetLegend($aLegend,$aCSIM="",$aCSIMAlt="")
-    {
-    $this->legend = $aLegend;
-    $this->legendcsimtarget = $aCSIM;
-    $this->legendcsimalt = $aCSIMAlt;
+    function SetLegend($aLegend,$aCSIM="",$aCSIMAlt="") {
+        $this->legend = $aLegend;
+        $this->legendcsimtarget = $aCSIM;
+        $this->legendcsimalt = $aCSIMAlt;
     }
 
     // Private methods
 
-    public function Legend(&$aGraph)
-    {
-    $color = $this->iColor ;
-    if ($this->legend != "") {
-        if ($this->iFillColor!='') {
-        $color = $this->iFillColor;
-        $aGraph->legend->Add($this->legend,$color,$this->mark,0,
-                     $this->legendcsimtarget,$this->legendcsimalt);
-        } else {
-        $aGraph->legend->Add($this->legend,$color,$this->mark,$this->line_style,
-                     $this->legendcsimtarget,$this->legendcsimalt);
+    function Legend($aGraph) {
+        $color = $this->iColor ;
+        if( $this->legend != "" ) {
+            if( $this->iFillColor!='' ) {
+                $color = $this->iFillColor;
+                $aGraph->legend->Add($this->legend,$color,$this->mark,0,
+                $this->legendcsimtarget,$this->legendcsimalt);
+            }
+            else {
+                $aGraph->legend->Add($this->legend,$color,$this->mark,$this->line_style,
+                $this->legendcsimtarget,$this->legendcsimalt);
+            }
         }
     }
-    }
 
-    public function Stroke($img,$scale)
-    {
-    $i=0;
-    $p=array();
-    $this->csimareas='';
-    while ($i < $this->numpoints) {
-        list($x1,$y1) = $scale->PTranslate($this->coord[2*$i],$this->coord[2*$i+1]);
-        $p[2*$i] = $x1;
-        $p[2*$i+1] = $y1;
+    function Stroke($img,$scale) {
 
-        if ( isset($this->csimtargets[$i]) ) {
-            $this->mark->SetCSIMTarget($this->csimtargets[$i]);
-            $this->mark->SetCSIMAlt($this->csimalts[$i]);
-        $this->mark->SetCSIMAltVal($this->coord[2*$i], $this->coord[2*$i+1]);
-        $this->mark->Stroke($img,$x1,$y1);
-        $this->csimareas .= $this->mark->GetCSIMAreas();
-        } else
-        $this->mark->Stroke($img,$x1,$y1);
+        $i=0;
+        $p=array();
+        $this->csimareas='';
+        while($i < $this->numpoints) {
+            list($x1,$y1) = $scale->PTranslate($this->coord[2*$i],$this->coord[2*$i+1]);
+            $p[2*$i] = $x1;
+            $p[2*$i+1] = $y1;
+
+            if( isset($this->csimtargets[$i]) ) {
+                $this->mark->SetCSIMTarget($this->csimtargets[$i]);
+                $this->mark->SetCSIMAlt($this->csimalts[$i]);
+                $this->mark->SetCSIMAltVal($this->coord[2*$i], $this->coord[2*$i+1]);
+                $this->mark->Stroke($img,$x1,$y1);
+                $this->csimareas .= $this->mark->GetCSIMAreas();
+            }
+            else {
+            	$this->mark->Stroke($img,$x1,$y1);
+            }
 
-        ++$i;
-    }
+            ++$i;
+        }
 
-    if ($this->iFillColor != '') {
-        $img->SetColor($this->iFillColor);
-        $img->FilledPolygon($p);
-    }
-    $img->SetLineWeight($this->iLineWeight);
-    $img->SetColor($this->iColor);
-    $img->Polygon($p,$this->iFillColor!='');
+        if( $this->iFillColor != '' ) {
+            $img->SetColor($this->iFillColor);
+            $img->FilledPolygon($p);
+        }
+        $img->SetLineWeight($this->iLineWeight);
+        $img->SetColor($this->iColor);
+        $img->Polygon($p,$this->iFillColor!='');
     }
 }
 
 //--------------------------------------------------------------------------
 // class PolarAxis
 //--------------------------------------------------------------------------
-class PolarAxis extends Axis
-{
-    public $angle_step=15,$angle_color='lightgray',$angle_label_color='black';
-    public $angle_fontfam=FF_FONT1,$angle_fontstyle=FS_NORMAL,$angle_fontsize=10;
-    public $angle_fontcolor = 'navy';
-    public $gridminor_color='lightgray',$gridmajor_color='lightgray';
-    public $show_minor_grid = false, $show_major_grid = true ;
-    public $show_angle_mark=true, $show_angle_grid=true, $show_angle_label=true;
-    public $angle_tick_len=3, $angle_tick_len2=3, $angle_tick_color='black';
-    public $show_angle_tick=true;
-    public $radius_tick_color='black';
+class PolarAxis extends Axis {
+    private $angle_step=15,$angle_color='lightgray',$angle_label_color='black';
+    private $angle_fontfam=FF_FONT1,$angle_fontstyle=FS_NORMAL,$angle_fontsize=10;
+    private $angle_fontcolor = 'navy';
+    private $gridminor_color='lightgray',$gridmajor_color='lightgray';
+    private $show_minor_grid = false, $show_major_grid = true ;
+    private $show_angle_mark=true, $show_angle_grid=true, $show_angle_label=true;
+    private $angle_tick_len=3, $angle_tick_len2=3, $angle_tick_color='black';
+    private $show_angle_tick=true;
+    private $radius_tick_color='black';
 
-    public function PolarAxis(&$img,&$aScale)
-    {
-    parent::Axis($img,$aScale);
+    function __construct($img,$aScale) {
+        parent::__construct($img,$aScale);
     }
 
-    public function ShowAngleDegreeMark($aFlg=true)
-    {
-    $this->show_angle_mark = $aFlg;
+    function ShowAngleDegreeMark($aFlg=true) {
+        $this->show_angle_mark = $aFlg;
     }
 
-    public function SetAngleStep($aStep)
-    {
-    $this->angle_step=$aStep;
+    function SetAngleStep($aStep) {
+        $this->angle_step=$aStep;
     }
 
-    public function HideTicks($aFlg=true,$aAngleFlg=true)
-    {
-    parent::HideTicks($aFlg,$aFlg);
-    $this->show_angle_tick = !$aAngleFlg;
+    function HideTicks($aFlg=true,$aAngleFlg=true) {
+        parent::HideTicks($aFlg,$aFlg);
+        $this->show_angle_tick = !$aAngleFlg;
     }
 
-    public function ShowAngleLabel($aFlg=true)
-    {
-    $this->show_angle_label = $aFlg;
+    function ShowAngleLabel($aFlg=true) {
+        $this->show_angle_label = $aFlg;
     }
 
-    public function ShowGrid($aMajor=true,$aMinor=false,$aAngle=true)
-    {
-    $this->show_minor_grid = $aMinor;
-    $this->show_major_grid = $aMajor;
-    $this->show_angle_grid = $aAngle ;
+    function ShowGrid($aMajor=true,$aMinor=false,$aAngle=true) {
+        $this->show_minor_grid = $aMinor;
+        $this->show_major_grid = $aMajor;
+        $this->show_angle_grid = $aAngle ;
     }
 
-    public function SetAngleFont($aFontFam,$aFontStyle=FS_NORMAL,$aFontSize=10)
-    {
-    $this->angle_fontfam = $aFontFam;
-    $this->angle_fontstyle = $aFontStyle;
-    $this->angle_fontsize = $aFontSize;
+    function SetAngleFont($aFontFam,$aFontStyle=FS_NORMAL,$aFontSize=10) {
+        $this->angle_fontfam = $aFontFam;
+        $this->angle_fontstyle = $aFontStyle;
+        $this->angle_fontsize = $aFontSize;
     }
 
-    public function SetColor($aColor,$aRadColor='',$aAngleColor='')
-    {
-    if( $aAngleColor == '' )
+    function SetColor($aColor,$aRadColor='',$aAngleColor='') {
+        if( $aAngleColor == '' )
         $aAngleColor=$aColor;
-    parent::SetColor($aColor,$aRadColor);
-    $this->angle_fontcolor = $aAngleColor;
+        parent::SetColor($aColor,$aRadColor);
+        $this->angle_fontcolor = $aAngleColor;
     }
 
-    public function SetGridColor($aMajorColor,$aMinorColor='',$aAngleColor='')
-    {
-    if( $aMinorColor == '' )
+    function SetGridColor($aMajorColor,$aMinorColor='',$aAngleColor='') {
+        if( $aMinorColor == '' )
         $aMinorColor = $aMajorColor;
-    if( $aAngleColor == '' )
+        if( $aAngleColor == '' )
         $aAngleColor = $aMajorColor;
 
-    $this->gridminor_color = $aMinorColor;
-    $this->gridmajor_color = $aMajorColor;
-    $this->angle_color = $aAngleColor;
+        $this->gridminor_color = $aMinorColor;
+        $this->gridmajor_color = $aMajorColor;
+        $this->angle_color = $aAngleColor;
     }
 
-    public function SetTickColors($aRadColor,$aAngleColor='')
-    {
-    $this->radius_tick_color = $aRadColor;
-    $this->angle_tick_color = $aAngleColor;
+    function SetTickColors($aRadColor,$aAngleColor='') {
+        $this->radius_tick_color = $aRadColor;
+        $this->angle_tick_color = $aAngleColor;
     }
 
     // Private methods
-    public function StrokeGrid($pos)
-    {
-    $x = round($this->img->left_margin + $this->img->plotwidth/2);
-    $this->scale->ticks->Stroke($this->img,$this->scale,$pos);
-
-    // Stroke the minor arcs
-    $pmin = array();
-    $p = $this->scale->ticks->ticks_pos;
-    $n = count($p);
-    $i = 0;
-    $this->img->SetColor($this->gridminor_color);
-    while ($i < $n) {
-        $r = $p[$i]-$x+1;
-        $pmin[]=$r;
-        if ($this->show_minor_grid) {
-        $this->img->Circle($x,$pos,$r);
-        }
-        $i++;
-    }
-
-    $limit = max($this->img->plotwidth,$this->img->plotheight)*1.4 ;
-    while ($r < $limit) {
-        $off = $r;
-        $i=1;
-        $r = $off + round($p[$i]-$x+1);
-        while ($r < $limit && $i < $n) {
-        $r = $off+$p[$i]-$x;
-        $pmin[]=$r;
-        if ($this->show_minor_grid) {
-            $this->img->Circle($x,$pos,$r);
-        }
-        $i++;
-        }
-    }
+    function StrokeGrid($pos) {
+        $x = round($this->img->left_margin + $this->img->plotwidth/2);
+        $this->scale->ticks->Stroke($this->img,$this->scale,$pos);
 
-    // Stroke the major arcs
-    if ($this->show_major_grid) {
-        // First determine how many minor step on
-        // every major step. We have recorded the minor radius
-        // in pmin and use these values. This is done in order
-        // to avoid rounding errors if we were to recalculate the
-        // different major radius.
-        $pmaj = $this->scale->ticks->maj_ticks_pos;
+        // Stroke the minor arcs
+        $pmin = array();
         $p = $this->scale->ticks->ticks_pos;
-        if ($this->scale->name == 'lin') {
-        $step=round(($pmaj[1] - $pmaj[0])/($p[1] - $p[0]));
-        } else {
-        $step=9;
-        }
-        $n = round(count($pmin)/$step);
+        $n = count($p);
         $i = 0;
-        $this->img->SetColor($this->gridmajor_color);
-        $limit = max($this->img->plotwidth,$this->img->plotheight)*1.4 ;
-        $off = $r;
-        $i=0;
-        $r = $pmin[$i*$step];
-        while ($r < $limit && $i < $n) {
-        $r = $pmin[$i*$step];
-        $this->img->Circle($x,$pos,$r);
-        $i++;
+        $this->img->SetColor($this->gridminor_color);
+        while( $i < $n ) {
+            $r = $p[$i]-$x+1;
+            $pmin[]=$r;
+            if( $this->show_minor_grid ) {
+                $this->img->Circle($x,$pos,$r);
+            }
+            $i++;
         }
-    }
 
-    // Draw angles
-    if ($this->show_angle_grid) {
-        $this->img->SetColor($this->angle_color);
-        $d = max($this->img->plotheight,$this->img->plotwidth)*1.4 ;
-        $a = 0;
-        $p = $this->scale->ticks->ticks_pos;
-        $start_radius = $p[1]-$x;
-        while ($a < 360) {
-        if ($a == 90 || $a == 270) {
-            // Make sure there are no rounding problem with
-            // exactly vertical lines
-            $this->img->Line($x+$start_radius*cos($a/180*M_PI)+1,
-                     $pos-$start_radius*sin($a/180*M_PI),
-                     $x+$start_radius*cos($a/180*M_PI)+1,
-                     $pos-$d*sin($a/180*M_PI));
-
-        } else {
-            $this->img->Line($x+$start_radius*cos($a/180*M_PI)+1,
-                     $pos-$start_radius*sin($a/180*M_PI),
-                     $x+$d*cos($a/180*M_PI),
-                     $pos-$d*sin($a/180*M_PI));
-        }
-        $a += $this->angle_step;
-        }
-    }
-    }
-
-    public function StrokeAngleLabels($pos,$type)
-    {
-    if( !$this->show_angle_label )
-
-        return;
-
-    $x0 = round($this->img->left_margin+$this->img->plotwidth/2)+1;
-
-    $d = max($this->img->plotwidth,$this->img->plotheight)*1.42;
-    $a = $this->angle_step;
-    $t = new Text();
-    $t->SetColor($this->angle_fontcolor);
-    $t->SetFont($this->angle_fontfam,$this->angle_fontstyle,$this->angle_fontsize);
-    $xright = $this->img->width - $this->img->right_margin;
-    $ytop = $this->img->top_margin;
-    $xleft = $this->img->left_margin;
-    $ybottom = $this->img->height - $this->img->bottom_margin;
-    $ha = 'left';
-    $va = 'center';
-    $w = $this->img->plotwidth/2;
-    $h = $this->img->plotheight/2;
-    $xt = $x0; $yt = $pos;
-    $margin=5;
-
-    $tl  = $this->angle_tick_len ; // Outer len
-    $tl2 = $this->angle_tick_len2 ; // Interior len
-
-    $this->img->SetColor($this->angle_tick_color);
-    $rot90 = $this->img->a == 90 ;
-
-    if ($type == POLAR_360) {
-        $ca1 = atan($h/$w)/M_PI*180;
-        $ca2 = 180-$ca1;
-        $ca3 = $ca1+180;
-        $ca4 = 360-$ca1;
-        $end = 360;
-        while ($a < $end) {
-        $ca = cos($a/180*M_PI);
-        $sa = sin($a/180*M_PI);
-        $x = $d*$ca;
-        $y = $d*$sa;
-        $xt=1000;$yt=1000;
-        if ($a <= $ca1 || $a >= $ca4) {
-            $yt = $pos - $w * $y/$x;
-            $xt = $xright + $margin;
-             if ($rot90) {
-            $ha = 'center';
-            $va = 'top';
-            } else {
-            $ha = 'left';
-            $va = 'center';
+        $limit = max($this->img->plotwidth,$this->img->plotheight)*1.4 ;
+        while( $r < $limit ) {
+            $off = $r;
+            $i=1;
+            $r = $off + round($p[$i]-$x+1);
+            while( $r < $limit && $i < $n ) {
+                $r = $off+$p[$i]-$x;
+                $pmin[]=$r;
+                if( $this->show_minor_grid ) {
+                    $this->img->Circle($x,$pos,$r);
+                }
+                $i++;
             }
-            $x1=$xright-$tl2; $x2=$xright+$tl;
-            $y1=$y2=$yt;
-        } elseif ($a > $ca1 && $a < $ca2) {
-            $xt = $x0 + $h * $x/$y;
-            $yt = $ytop - $margin;
-             if ($rot90) {
-            $ha = 'left';
-            $va = 'center';
-            } else {
-            $ha = 'center';
-            $va = 'bottom';
+        }
+
+        // Stroke the major arcs
+        if( $this->show_major_grid ) {
+            // First determine how many minor step on
+            // every major step. We have recorded the minor radius
+            // in pmin and use these values. This is done in order
+            // to avoid rounding errors if we were to recalculate the
+            // different major radius.
+            $pmaj = $this->scale->ticks->maj_ticks_pos;
+            $p = $this->scale->ticks->ticks_pos;
+            if( $this->scale->name == 'lin' ) {
+                $step=round(($pmaj[1] - $pmaj[0])/($p[1] - $p[0]));
             }
-            $y1=$ytop+$tl2;$y2=$ytop-$tl;
-            $x1=$x2=$xt;
-        } elseif ($a >= $ca2 && $a <= $ca3) {
-            $yt = $pos + $w * $y/$x;
-            $xt = $xleft - $margin;
-             if ($rot90) {
-            $ha = 'center';
-            $va = 'bottom';
-            } else {
-            $ha = 'right';
-            $va = 'center';
+            else {
+                $step=9;
             }
-            $x1=$xleft+$tl2;$x2=$xleft-$tl;
-            $y1=$y2=$yt;
-        } else {
-            $xt = $x0 - $h * $x/$y;
-            $yt = $ybottom + $margin;
-             if ($rot90) {
-            $ha = 'right';
-            $va = 'center';
-            } else {
-            $ha = 'center';
-            $va = 'top';
+            $n = round(count($pmin)/$step);
+            $i = 0;
+            $this->img->SetColor($this->gridmajor_color);
+            $limit = max($this->img->plotwidth,$this->img->plotheight)*1.4 ;
+            $off = $r;
+            $i=0;
+            $r = $pmin[$i*$step];
+            while( $r < $limit && $i < $n ) {
+                $r = $pmin[$i*$step];
+                $this->img->Circle($x,$pos,$r);
+                $i++;
             }
-            $y1=$ybottom-$tl2;$y2=$ybottom+$tl;
-            $x1=$x2=$xt;
-        }
-        if ($a != 0 && $a != 180) {
-            $t->Align($ha,$va);
-            if( $this->show_angle_mark )
-            $a .= '�';
-            $t->Set($a);
-            $t->Stroke($this->img,$xt,$yt);
-            if( $this->show_angle_tick )
-            $this->img->Line($x1,$y1,$x2,$y2);
-        }
-        $a += $this->angle_step;
-        }
-    } else {
-        // POLAR_HALF
-        $ca1 = atan($h/$w*2)/M_PI*180;
-        $ca2 = 180-$ca1;
-        $end = 180;
-        while ($a < $end) {
-        $ca = cos($a/180*M_PI);
-        $sa = sin($a/180*M_PI);
-        $x = $d*$ca;
-        $y = $d*$sa;
-        if ($a <= $ca1) {
-            $yt = $pos - $w * $y/$x;
-            $xt = $xright + $margin;
-             if ($rot90) {
-            $ha = 'center';
-            $va = 'top';
-            } else {
-            $ha = 'left';
-            $va = 'center';
+        }
+
+        // Draw angles
+        if( $this->show_angle_grid ) {
+            $this->img->SetColor($this->angle_color);
+            $d = max($this->img->plotheight,$this->img->plotwidth)*1.4 ;
+            $a = 0;
+            $p = $this->scale->ticks->ticks_pos;
+            $start_radius = $p[1]-$x;
+            while( $a < 360 ) {
+                if( $a == 90 || $a == 270 ) {
+                    // Make sure there are no rounding problem with
+                    // exactly vertical lines
+                    $this->img->Line($x+$start_radius*cos($a/180*M_PI)+1,
+                                     $pos-$start_radius*sin($a/180*M_PI),
+                                     $x+$start_radius*cos($a/180*M_PI)+1,
+                                     $pos-$d*sin($a/180*M_PI));
+
+                }
+                else {
+                    $this->img->Line($x+$start_radius*cos($a/180*M_PI)+1,
+                                     $pos-$start_radius*sin($a/180*M_PI),
+                                     $x+$d*cos($a/180*M_PI),
+                                     $pos-$d*sin($a/180*M_PI));
+                }
+                $a += $this->angle_step;
             }
-            $x1=$xright-$tl2; $x2=$xright+$tl;
-            $y1=$y2=$yt;
-        } elseif ($a > $ca1 && $a < $ca2) {
-            $xt = $x0 + 2*$h * $x/$y;
-            $yt = $ytop - $margin;
-             if ($rot90) {
-            $ha = 'left';
-            $va = 'center';
-            } else {
-            $ha = 'center';
-            $va = 'bottom';
+        }
+    }
+
+    function StrokeAngleLabels($pos,$type) {
+
+        if( !$this->show_angle_label )
+            return;
+
+        $x0 = round($this->img->left_margin+$this->img->plotwidth/2)+1;
+
+        $d = max($this->img->plotwidth,$this->img->plotheight)*1.42;
+        $a = $this->angle_step;
+        $t = new Text();
+        $t->SetColor($this->angle_fontcolor);
+        $t->SetFont($this->angle_fontfam,$this->angle_fontstyle,$this->angle_fontsize);
+        $xright = $this->img->width - $this->img->right_margin;
+        $ytop = $this->img->top_margin;
+        $xleft = $this->img->left_margin;
+        $ybottom = $this->img->height - $this->img->bottom_margin;
+        $ha = 'left';
+        $va = 'center';
+        $w = $this->img->plotwidth/2;
+        $h = $this->img->plotheight/2;
+        $xt = $x0; $yt = $pos;
+        $margin=5;
+
+        $tl  = $this->angle_tick_len ; // Outer len
+        $tl2 = $this->angle_tick_len2 ; // Interior len
+
+        $this->img->SetColor($this->angle_tick_color);
+        $rot90 = $this->img->a == 90 ;
+
+        if( $type == POLAR_360 ) {
+
+            // Corner angles of the four corners
+            $ca1 = atan($h/$w)/M_PI*180;
+            $ca2 = 180-$ca1;
+            $ca3 = $ca1+180;
+            $ca4 = 360-$ca1;
+            $end = 360;
+
+            while( $a < $end ) {
+                $ca = cos($a/180*M_PI);
+                $sa = sin($a/180*M_PI);
+                $x = $d*$ca;
+                $y = $d*$sa;
+                $xt=1000;$yt=1000;
+                if( $a <= $ca1 || $a >= $ca4 ) {
+                    $yt = $pos - $w * $y/$x;
+                    $xt = $xright + $margin;
+                    if( $rot90 ) {
+                        $ha = 'center';
+                        $va = 'top';
+                    }
+                    else {
+                        $ha = 'left';
+                        $va = 'center';
+                    }
+                    $x1=$xright-$tl2; $x2=$xright+$tl;
+                    $y1=$y2=$yt;
+                }
+                elseif( $a > $ca1 && $a < $ca2 ) {
+                    $xt = $x0 + $h * $x/$y;
+                    $yt = $ytop - $margin;
+                    if( $rot90 ) {
+                        $ha = 'left';
+                        $va = 'center';
+                    }
+                    else {
+                        $ha = 'center';
+                        $va = 'bottom';
+                    }
+                    $y1=$ytop+$tl2;$y2=$ytop-$tl;
+                    $x1=$x2=$xt;
+                }
+                elseif( $a >= $ca2 && $a <= $ca3 ) {
+                    $yt = $pos + $w * $y/$x;
+                    $xt = $xleft - $margin;
+                    if( $rot90 ) {
+                        $ha = 'center';
+                        $va = 'bottom';
+                    }
+                    else {
+                        $ha = 'right';
+                        $va = 'center';
+                    }
+                    $x1=$xleft+$tl2;$x2=$xleft-$tl;
+                    $y1=$y2=$yt;
+                }
+                else {
+                    $xt = $x0 - $h * $x/$y;
+                    $yt = $ybottom + $margin;
+                    if( $rot90 ) {
+                        $ha = 'right';
+                        $va = 'center';
+                    }
+                    else {
+                        $ha = 'center';
+                        $va = 'top';
+                    }
+                    $y1=$ybottom-$tl2;$y2=$ybottom+$tl;
+                    $x1=$x2=$xt;
+                }
+                if( $a != 0 && $a != 180 ) {
+                    $t->Align($ha,$va);
+                    if( $this->scale->clockwise ) {
+                        $t->Set(360-$a);
+                    }
+                    else {
+                        $t->Set($a);
+                    }
+                    if( $this->show_angle_mark && $t->font_family > 4 ) {
+                        $a .= SymChar::Get('degree');
+                    }
+                    $t->Stroke($this->img,$xt,$yt);
+                    if( $this->show_angle_tick ) {
+                        $this->img->Line($x1,$y1,$x2,$y2);
+                    }
+                }
+                $a += $this->angle_step;
             }
-            $y1=$ytop+$tl2;$y2=$ytop-$tl;
-            $x1=$x2=$xt;
-        } elseif ($a >= $ca2) {
-            $yt = $pos + $w * $y/$x;
-            $xt = $xleft - $margin;
-             if ($rot90) {
-            $ha = 'center';
-            $va = 'bottom';
-            } else {
-            $ha = 'right';
-            $va = 'center';
+        }
+        else {
+            // POLAR_HALF
+            $ca1 = atan($h/$w*2)/M_PI*180;
+            $ca2 = 180-$ca1;
+            $end = 180;
+            while( $a < $end ) {
+                $ca = cos($a/180*M_PI);
+                $sa = sin($a/180*M_PI);
+                $x = $d*$ca;
+                $y = $d*$sa;
+                if( $a <= $ca1 ) {
+                    $yt = $pos - $w * $y/$x;
+                    $xt = $xright + $margin;
+                    if( $rot90 ) {
+                        $ha = 'center';
+                        $va = 'top';
+                    }
+                    else {
+                        $ha = 'left';
+                        $va = 'center';
+                    }
+                    $x1=$xright-$tl2; $x2=$xright+$tl;
+                    $y1=$y2=$yt;
+                }
+                elseif( $a > $ca1 && $a < $ca2 ) {
+                    $xt = $x0 + 2*$h * $x/$y;
+                    $yt = $ytop - $margin;
+                    if( $rot90 ) {
+                        $ha = 'left';
+                        $va = 'center';
+                    }
+                    else {
+                        $ha = 'center';
+                        $va = 'bottom';
+                    }
+                    $y1=$ytop+$tl2;$y2=$ytop-$tl;
+                    $x1=$x2=$xt;
+                }
+                elseif( $a >= $ca2 ) {
+                    $yt = $pos + $w * $y/$x;
+                    $xt = $xleft - $margin;
+                    if( $rot90 ) {
+                        $ha = 'center';
+                        $va = 'bottom';
+                    }
+                    else {
+                        $ha = 'right';
+                        $va = 'center';
+                    }
+                    $x1=$xleft+$tl2;$x2=$xleft-$tl;
+                    $y1=$y2=$yt;
+                }
+                $t->Align($ha,$va);
+                if( $this->show_angle_mark && $t->font_family > 4 ) {
+                	$a .= SymChar::Get('degree');
+                }
+                $t->Set($a);
+                $t->Stroke($this->img,$xt,$yt);
+                if( $this->show_angle_tick ) {
+                    $this->img->Line($x1,$y1,$x2,$y2);
+                }
+                $a += $this->angle_step;
             }
-            $x1=$xleft+$tl2;$x2=$xleft-$tl;
-            $y1=$y2=$yt;
-        }
-        $t->Align($ha,$va);
-        if( $this->show_angle_mark )
-            $a .= '�';
-        $t->Set($a);
-        $t->Stroke($this->img,$xt,$yt);
-        if( $this->show_angle_tick )
-            $this->img->Line($x1,$y1,$x2,$y2);
-        $a += $this->angle_step;
-        }
-    }
-    }
-
-    public function Stroke($pos)
-    {
-    $this->img->SetLineWeight($this->weight);
-    $this->img->SetColor($this->color);
-    $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
-    if( !$this->hide_line )
-        $this->img->FilledRectangle($this->img->left_margin,$pos,
-             $this->img->width-$this->img->right_margin,$pos+$this->weight-1);
-    $y=$pos+$this->img->GetFontHeight()+$this->title_margin+$this->title->margin;
-    if( $this->title_adjust=="high" )
-        $this->title->Pos($this->img->width-$this->img->right_margin,$y,"right","top");
-    elseif( $this->title_adjust=="middle" || $this->title_adjust=="center" )
-        $this->title->Pos(($this->img->width-$this->img->left_margin-
-                   $this->img->right_margin)/2+$this->img->left_margin,
-                  $y,"center","top");
-    elseif($this->title_adjust=="low")
-        $this->title->Pos($this->img->left_margin,$y,"left","top");
-    else {
-        JpGraphError::Raise('Unknown alignment specified for X-axis title. ('.
-                $this->title_adjust.')');
-    }
-
-
-    if (!$this->hide_labels) {
-        $this->StrokeLabels($pos,false);
-    }
-    $this->img->SetColor($this->radius_tick_color);
-    $this->scale->ticks->Stroke($this->img,$this->scale,$pos);
-
-    //
-    // Mirror the positions for the left side of the scale
-        //
-    $mid = 2*($this->img->left_margin+$this->img->plotwidth/2);
-    $n = count($this->scale->ticks->ticks_pos);
-    $i=0;
-    while ($i < $n) {
-        $this->scale->ticks->ticks_pos[$i] =
-        $mid-$this->scale->ticks->ticks_pos[$i] ;
-        ++$i;
+        }
     }
 
-    $n = count($this->scale->ticks->maj_ticks_pos);
-    $i=0;
-    while ($i < $n) {
-        $this->scale->ticks->maj_ticks_pos[$i] =
-        $mid-$this->scale->ticks->maj_ticks_pos[$i] ;
-        ++$i;
-    }
+    function Stroke($pos,$dummy=true) {
 
-    $n = count($this->scale->ticks->maj_ticklabels_pos);
-    $i=1;
-    while ($i < $n) {
-        $this->scale->ticks->maj_ticklabels_pos[$i] =
-        $mid-$this->scale->ticks->maj_ticklabels_pos[$i] ;
-        ++$i;
-    }
+        $this->img->SetLineWeight($this->weight);
+        $this->img->SetColor($this->color);
+        $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
+        if( !$this->hide_line ) {
+            $this->img->FilledRectangle($this->img->left_margin,$pos,
+                                        $this->img->width-$this->img->right_margin,
+                                        $pos+$this->weight-1);
+        }
+        $y=$pos+$this->img->GetFontHeight()+$this->title_margin+$this->title->margin;
+        if( $this->title_adjust=="high" ) {
+            $this->title->SetPos($this->img->width-$this->img->right_margin,$y,"right","top");
+        }
+        elseif( $this->title_adjust=="middle" || $this->title_adjust=="center" ) {
+            $this->title->SetPos(($this->img->width-$this->img->left_margin-$this->img->right_margin)/2+$this->img->left_margin,
+                                $y,"center","top");
+        }
+        elseif($this->title_adjust=="low") {
+            $this->title->SetPos($this->img->left_margin,$y,"left","top");
+        }
+        else {
+            JpGraphError::RaiseL(17002,$this->title_adjust);
+            //('Unknown alignment specified for X-axis title. ('.$this->title_adjust.')');
+        }
 
-    // Draw the left side of the scale
-    $n = count($this->scale->ticks->ticks_pos);
-    $yu = $pos - $this->scale->ticks->direction*$this->scale->ticks->GetMinTickAbsSize();
 
+        if (!$this->hide_labels) {
+            $this->StrokeLabels($pos,false);
+        }
+        $this->img->SetColor($this->radius_tick_color);
+        $this->scale->ticks->Stroke($this->img,$this->scale,$pos);
+
+        //
+        // Mirror the positions for the left side of the scale
+        //
+        $mid = 2*($this->img->left_margin+$this->img->plotwidth/2);
+        $n = count($this->scale->ticks->ticks_pos);
+        $i=0;
+        while( $i < $n ) {
+            $this->scale->ticks->ticks_pos[$i] =
+            $mid-$this->scale->ticks->ticks_pos[$i] ;
+            ++$i;
+        }
 
-    // Minor ticks
-    if (! $this->scale->ticks->supress_minor_tickmarks) {
+        $n = count($this->scale->ticks->maj_ticks_pos);
+        $i=0;
+        while( $i < $n ) {
+            $this->scale->ticks->maj_ticks_pos[$i] =
+            $mid-$this->scale->ticks->maj_ticks_pos[$i] ;
+            ++$i;
+        }
+
+        $n = count($this->scale->ticks->maj_ticklabels_pos);
         $i=1;
-        while ($i < $n/2) {
-        $x = round($this->scale->ticks->ticks_pos[$i]) ;
-        $this->img->Line($x,$pos,$x,$yu);
-        ++$i;
+        while( $i < $n ) {
+            $this->scale->ticks->maj_ticklabels_pos[$i] =
+            $mid-$this->scale->ticks->maj_ticklabels_pos[$i] ;
+            ++$i;
         }
-    }
 
-    $n = count($this->scale->ticks->maj_ticks_pos);
-    $yu = $pos - $this->scale->ticks->direction*$this->scale->ticks->GetMajTickAbsSize();
+        // Draw the left side of the scale
+        $n = count($this->scale->ticks->ticks_pos);
+        $yu = $pos - $this->scale->ticks->direction*$this->scale->ticks->GetMinTickAbsSize();
 
 
-    // Major ticks
-    if (! $this->scale->ticks->supress_tickmarks) {
-        $i=1;
-        while ($i < $n/2) {
-        $x = round($this->scale->ticks->maj_ticks_pos[$i]) ;
-        $this->img->Line($x,$pos,$x,$yu);
-        ++$i;
+        // Minor ticks
+        if( ! $this->scale->ticks->supress_minor_tickmarks ) {
+            $i=1;
+            while( $i < $n/2 ) {
+                $x = round($this->scale->ticks->ticks_pos[$i]) ;
+                $this->img->Line($x,$pos,$x,$yu);
+                ++$i;
+            }
         }
-    }
-    if (!$this->hide_labels) {
-        $this->StrokeLabels($pos,false);
-    }
-    $this->title->Stroke($this->img);
+
+        $n = count($this->scale->ticks->maj_ticks_pos);
+        $yu = $pos - $this->scale->ticks->direction*$this->scale->ticks->GetMajTickAbsSize();
+
+
+        // Major ticks
+        if( ! $this->scale->ticks->supress_tickmarks ) {
+            $i=1;
+            while( $i < $n/2 ) {
+                $x = round($this->scale->ticks->maj_ticks_pos[$i]) ;
+                $this->img->Line($x,$pos,$x,$yu);
+                ++$i;
+            }
+        }
+        if (!$this->hide_labels) {
+            $this->StrokeLabels($pos,false);
+        }
+        $this->title->Stroke($this->img);
     }
 }
 
-class PolarScale extends LinearScale
-{
-    public $graph;
-    public function PolarScale($aMax=0,&$graph)
-    {
-    parent::LinearScale(0,$aMax,'x');
-    $this->graph = &$graph;
+class PolarScale extends LinearScale {
+    private $graph;
+    public $clockwise=false;
+
+    function __construct($aMax,$graph,$aClockwise) {
+        parent::__construct(0,$aMax,'x');
+        $this->graph = $graph;
+        $this->clockwise = $aClockwise;
     }
 
-    public function _Translate($v)
-    {
-    return parent::Translate($v);
+    function SetClockwise($aFlg) {
+        $this->clockwise = $aFlg;
     }
 
-    public function PTranslate($aAngle,$aRad)
-    {
-    $m = $this->scale[1];
-    $w = $this->graph->img->plotwidth/2;
-    $aRad = $aRad/$m*$w;
+    function _Translate($v) {
+        return parent::Translate($v);
+    }
 
-    $x = cos( $aAngle/180 * M_PI ) * $aRad;
-    $y = sin( $aAngle/180 * M_PI ) * $aRad;
+    function PTranslate($aAngle,$aRad) {
 
-    $x += $this->_Translate(0);
+        $m = $this->scale[1];
+        $w = $this->graph->img->plotwidth/2;
+        $aRad = $aRad/$m*$w;
 
-    if ($this->graph->iType == POLAR_360) {
-        $y = ($this->graph->img->top_margin + $this->graph->img->plotheight/2) - $y;
-    } else {
-        $y = ($this->graph->img->top_margin + $this->graph->img->plotheight) - $y;
-    }
+        $a = $aAngle/180 * M_PI;
+        if( $this->clockwise ) { 
+            $a = 2*M_PI-$a;
+        }
+
+        $x = cos($a) * $aRad;
+        $y = sin($a) * $aRad;
 
-    return array($x,$y);
+        $x += $this->_Translate(0);
+
+        if( $this->graph->iType == POLAR_360 ) {
+            $y = ($this->graph->img->top_margin + $this->graph->img->plotheight/2) - $y;
+        }
+        else {
+            $y = ($this->graph->img->top_margin + $this->graph->img->plotheight) - $y;
+        }
+        return array($x,$y);
     }
 }
 
-class PolarLogScale extends LogScale
-{
-    public $graph;
-    public function PolarLogScale($aMax=1,&$graph)
-    {
-    parent::LogScale(0,$aMax,'x');
-    $this->graph = &$graph;
-    $this->ticks->SetLabelLogType(LOGLABELS_MAGNITUDE);
+class PolarLogScale extends LogScale {
+    private $graph;
+    public $clockwise=false;
+
+    function __construct($aMax,$graph,$aClockwise=false) {
+        parent::__construct(0,$aMax,'x');
+        $this->graph = $graph;
+        $this->ticks->SetLabelLogType(LOGLABELS_MAGNITUDE);
+        $this->clockwise = $aClockwise;
 
     }
 
-    public function PTranslate($aAngle,$aRad)
-    {
-    if( $aRad == 0 )
-        $aRad = 1;
-    $aRad = log10($aRad);
-    $m = $this->scale[1];
-    $w = $this->graph->img->plotwidth/2;
-    $aRad = $aRad/$m*$w;
+    function SetClockwise($aFlg) {
+        $this->clockwise = $aFlg;
+    }
 
-    $x = cos( $aAngle/180 * M_PI ) * $aRad;
-    $y = sin( $aAngle/180 * M_PI ) * $aRad;
+    function PTranslate($aAngle,$aRad) {
 
-    $x += $w+$this->graph->img->left_margin;//$this->_Translate(0);
-    if ($this->graph->iType == POLAR_360) {
-        $y = ($this->graph->img->top_margin + $this->graph->img->plotheight/2) - $y;
-    } else {
-        $y = ($this->graph->img->top_margin + $this->graph->img->plotheight) - $y;
-    }
+        if( $aRad == 0 )
+        $aRad = 1;
+        $aRad = log10($aRad);
+        $m = $this->scale[1];
+        $w = $this->graph->img->plotwidth/2;
+        $aRad = $aRad/$m*$w;
+
+        $a = $aAngle/180 * M_PI;
+        if( $this->clockwise ) {
+            $a = 2*M_PI-$a;
+        }
+
+        $x = cos( $a ) * $aRad;
+        $y = sin( $a ) * $aRad;
 
-    return array($x,$y);
+        $x += $w+$this->graph->img->left_margin;//$this->_Translate(0);
+        if( $this->graph->iType == POLAR_360 ) {
+            $y = ($this->graph->img->top_margin + $this->graph->img->plotheight/2) - $y;
+        }
+        else {
+            $y = ($this->graph->img->top_margin + $this->graph->img->plotheight) - $y;
+        }
+        return array($x,$y);
     }
 }
 
-class PolarGraph extends Graph
-{
+class PolarGraph extends Graph {
     public $scale;
-    public $iType=POLAR_360;
     public $axis;
+    public $iType=POLAR_360;
+    private $iClockwise=false;
 
-    public function PolarGraph($aWidth=300,$aHeight=200,$aCachedName="",$aTimeOut=0,$aInline=true)
-    {
-    parent::Graph($aWidth,$aHeight,$aCachedName,$aTimeOut,$aInline) ;
-    $this->SetDensity(TICKD_DENSE);
-    $this->SetBox();
-    $this->SetMarginColor('white');
+    function __construct($aWidth=300,$aHeight=200,$aCachedName="",$aTimeOut=0,$aInline=true) {
+        parent::__construct($aWidth,$aHeight,$aCachedName,$aTimeOut,$aInline) ;
+        $this->SetDensity(TICKD_DENSE);
+        $this->SetBox();
+        $this->SetMarginColor('white');
     }
 
-    public function SetDensity($aDense)
-    {
-    $this->SetTickDensity(TICKD_NORMAL,$aDense);
+    function SetDensity($aDense) {
+        $this->SetTickDensity(TICKD_NORMAL,$aDense);
     }
 
-    public function Set90AndMargin($lm=0,$rm=0,$tm=0,$bm=0)
-    {
-    $adj = ($this->img->height - $this->img->width)/2;
-    $this->SetAngle(90);
-    $this->img->SetMargin($lm-$adj,$rm-$adj,$tm+$adj,$bm+$adj);
-    $this->img->SetCenter(floor($this->img->width/2),floor($this->img->height/2));
-    $this->axis->SetLabelAlign('right','center');
-    //JpGraphError::Raise('Set90AndMargin() is not supported for polar graphs.');
+    function SetClockwise($aFlg) {
+        $this->scale->SetClockwise($aFlg);
     }
 
-    public function SetScale($aScale,$rmax=0)
-    {
-    if( $aScale == 'lin' )
-        $this->scale = new PolarScale($rmax,$this);
-    elseif ($aScale == 'log') {
-        $this->scale = new PolarLogScale($rmax,$this);
-    } else {
-        JpGraphError::Raise('Unknown scale type for polar graph. Must be "lin" or "log"');
+    function Set90AndMargin($lm=0,$rm=0,$tm=0,$bm=0) {
+        $adj = ($this->img->height - $this->img->width)/2;
+        $this->SetAngle(90);
+        $lm2 = -$adj + ($lm-$rm+$tm+$bm)/2;
+        $rm2 = -$adj + (-$lm+$rm+$tm+$bm)/2;
+        $tm2 = $adj + ($tm-$bm+$lm+$rm)/2;
+        $bm2 = $adj + (-$tm+$bm+$lm+$rm)/2;
+        $this->SetMargin($lm2, $rm2, $tm2, $bm2);
+        $this->axis->SetLabelAlign('right','center');
     }
 
-    $this->axis = new PolarAxis($this->img,$this->scale);
-    $this->SetMargin(40,40,50,40);
+    function SetScale($aScale,$rmax=0,$dummy1=1,$dummy2=1,$dummy3=1) {
+        if( $aScale == 'lin' ) {
+            $this->scale = new PolarScale($rmax,$this,$this->iClockwise);
+        }
+        elseif( $aScale == 'log' ) {
+            $this->scale = new PolarLogScale($rmax,$this,$this->iClockwise);
+        }
+        else {
+            JpGraphError::RaiseL(17004);//('Unknown scale type for polar graph. Must be "lin" or "log"');
+        }
+
+        $this->axis = new PolarAxis($this->img,$this->scale);
+        $this->SetMargin(40,40,50,40);
     }
 
-    public function SetType($aType)
-    {
-    $this->iType = $aType;
+    function SetType($aType) {
+        $this->iType = $aType;
     }
 
-    public function SetPlotSize($w,$h)
-    {
-    $this->SetMargin(($this->img->width-$w)/2,($this->img->width-$w)/2,
-             ($this->img->height-$h)/2,($this->img->height-$h)/2);
+    function SetPlotSize($w,$h) {
+        $this->SetMargin(($this->img->width-$w)/2,($this->img->width-$w)/2,
+                         ($this->img->height-$h)/2,($this->img->height-$h)/2);
     }
 
     // Private methods
-    public function GetPlotsMax()
-    {
-    $n = count($this->plots);
-    $m = $this->plots[0]->Max();
-    $i=1;
-    while ($i < $n) {
-        $m = max($this->plots[$i]->Max());
-        ++$i;
-    }
-
-    return $m;
-    }
-
-    public function Stroke($aStrokeFileName="")
-    {
-    // Start by adjusting the margin so that potential titles will fit.
-    $this->AdjustMarginsForTitles();
-
-    // If the filename is the predefined value = '_csim_special_'
-    // we assume that the call to stroke only needs to do enough
-    // to correctly generate the CSIM maps.
-    // We use this variable to skip things we don't strictly need
-    // to do to generate the image map to improve performance
-    // a best we can. Therefor you will see a lot of tests !$_csim in the
-    // code below.
-    $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
+    function GetPlotsMax() {
+        $n = count($this->plots);
+        $m = $this->plots[0]->Max();
+        $i=1;
+        while($i < $n) {
+            $m = max($this->plots[$i]->Max(),$m);
+            ++$i;
+        }
+        return $m;
+    }
+
+    function Stroke($aStrokeFileName="") {
+
+        // Start by adjusting the margin so that potential titles will fit.
+        $this->AdjustMarginsForTitles();
+
+        // If the filename is the predefined value = '_csim_special_'
+        // we assume that the call to stroke only needs to do enough
+        // to correctly generate the CSIM maps.
+        // We use this variable to skip things we don't strictly need
+        // to do to generate the image map to improve performance
+        // a best we can. Therefor you will see a lot of tests !$_csim in the
+        // code below.
+        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
+
+        // We need to know if we have stroked the plot in the
+        // GetCSIMareas. Otherwise the CSIM hasn't been generated
+        // and in the case of GetCSIM called before stroke to generate
+        // CSIM without storing an image to disk GetCSIM must call Stroke.
+        $this->iHasStroked = true;
+
+        //Check if we should autoscale axis
+        if( !$this->scale->IsSpecified() && count($this->plots)>0 ) {
+            $max = $this->GetPlotsMax();
+            $t1 = $this->img->plotwidth;
+            $this->img->plotwidth /= 2;
+            $t2 = $this->img->left_margin;
+            $this->img->left_margin += $this->img->plotwidth+1;
+            $this->scale->AutoScale($this->img,0,$max,
+            $this->img->plotwidth/$this->xtick_factor/2);
+            $this->img->plotwidth = $t1;
+            $this->img->left_margin = $t2;
+        }
+        else {
+            // The tick calculation will use the user suplied min/max values to determine
+            // the ticks. If auto_ticks is false the exact user specifed min and max
+            // values will be used for the scale.
+            // If auto_ticks is true then the scale might be slightly adjusted
+            // so that the min and max values falls on an even major step.
+            //$min = 0;
+            $max = $this->scale->scale[1];
+            $t1 = $this->img->plotwidth;
+            $this->img->plotwidth /= 2;
+            $t2 = $this->img->left_margin;
+            $this->img->left_margin += $this->img->plotwidth+1;
+            $this->scale->AutoScale($this->img,0,$max,
+            $this->img->plotwidth/$this->xtick_factor/2);
+            $this->img->plotwidth = $t1;
+            $this->img->left_margin = $t2;
+        }
 
-    // We need to know if we have stroked the plot in the
-    // GetCSIMareas. Otherwise the CSIM hasn't been generated
-    // and in the case of GetCSIM called before stroke to generate
-    // CSIM without storing an image to disk GetCSIM must call Stroke.
-    $this->iHasStroked = true;
-
-    //Check if we should autoscale axis
-    if ( !$this->scale->IsSpecified() && count($this->plots)>0 ) {
-        $max = $this->GetPlotsMax();
-        $t1 = $this->img->plotwidth;
-        $this->img->plotwidth /= 2;
-        $t2 = $this->img->left_margin;
-        $this->img->left_margin += $this->img->plotwidth+1;
-        $this->scale->AutoScale($this->img,0,$max,
-                     $this->img->plotwidth/$this->xtick_factor/2);
-        $this->img->plotwidth = $t1;
-        $this->img->left_margin = $t2;
-    } else {
-        // The tick calculation will use the user suplied min/max values to determine
-        // the ticks. If auto_ticks is false the exact user specifed min and max
-        // values will be used for the scale.
-        // If auto_ticks is true then the scale might be slightly adjusted
-        // so that the min and max values falls on an even major step.
-        //$min = 0;
-        $max = $this->scale->scale[1];
-        $t1 = $this->img->plotwidth;
-        $this->img->plotwidth /= 2;
-        $t2 = $this->img->left_margin;
-        $this->img->left_margin += $this->img->plotwidth+1;
-        $this->scale->AutoScale($this->img,0,$max,
-                     $this->img->plotwidth/$this->xtick_factor/2);
-        $this->img->plotwidth = $t1;
-        $this->img->left_margin = $t2;
-    }
+        if( $this->iType ==  POLAR_180 ) {
+        	$pos = $this->img->height - $this->img->bottom_margin;
+        }
+        else {
+        	$pos = $this->img->plotheight/2 + $this->img->top_margin;
+        }
 
-    if( $this->iType ==  POLAR_180 )
-        $pos = $this->img->height - $this->img->bottom_margin;
-    else
-        $pos = $this->img->plotheight/2 + $this->img->top_margin;
+        if( !$_csim ) {
+            $this->StrokePlotArea();
+        }
 
-    if (!$_csim) {
-        $this->StrokePlotArea();
-    }
+        $this->iDoClipping = true;
 
-    $this->iDoClipping = true;
+        if( $this->iDoClipping ) {
+            $oldimage = $this->img->CloneCanvasH();
+        }
 
-    if ($this->iDoClipping) {
-        $oldimage = $this->img->CloneCanvasH();
-    }
+        if( !$_csim ) {
+            $this->axis->StrokeGrid($pos);
+        }
 
-    if (!$_csim) {
-        $this->axis->StrokeGrid($pos);
-    }
+        // Stroke all plots for Y1 axis
+        for($i=0; $i < count($this->plots); ++$i) {
+            $this->plots[$i]->Stroke($this->img,$this->scale);
+        }
 
-    // Stroke all plots for Y1 axis
-    for ($i=0; $i < count($this->plots); ++$i) {
-        $this->plots[$i]->Stroke($this->img,$this->scale);
-    }
 
-    if ($this->iDoClipping) {
-        // Clipping only supports graphs at 0 and 90 degrees
-        if ($this->img->a == 0) {
-        $this->img->CopyCanvasH($oldimage,$this->img->img,
-                    $this->img->left_margin,$this->img->top_margin,
-                    $this->img->left_margin,$this->img->top_margin,
-                    $this->img->plotwidth+1,$this->img->plotheight+1);
-        } elseif ($this->img->a == 90) {
-        $adj = round(($this->img->height - $this->img->width)/2);
-        $this->img->CopyCanvasH($oldimage,$this->img->img,
-                    $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
-                    $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
-                    $this->img->plotheight,$this->img->plotwidth);
+        if( $this->iDoClipping ) {
+            // Clipping only supports graphs at 0 and 90 degrees
+            if( $this->img->a == 0  ) {
+                $this->img->CopyCanvasH($oldimage,$this->img->img,
+                                        $this->img->left_margin,$this->img->top_margin,
+                                        $this->img->left_margin,$this->img->top_margin,
+                                        $this->img->plotwidth+1,$this->img->plotheight+1);
+            }
+            elseif( $this->img->a == 90 ) {
+                $adj1 = round(($this->img->height - $this->img->width)/2);
+                $adj2 = round(($this->img->width - $this->img->height)/2);
+                $lm = $this->img->left_margin;
+                $rm = $this->img->right_margin;
+                $tm = $this->img->top_margin;
+                $bm = $this->img->bottom_margin;
+                $this->img->CopyCanvasH($oldimage,$this->img->img,
+                                        $adj2 + round(($lm-$rm+$tm+$bm)/2),
+                                        $adj1 + round(($tm-$bm+$lm+$rm)/2),
+                                        $adj2 + round(($lm-$rm+$tm+$bm)/2),
+                                        $adj1 + round(($tm-$bm+$lm+$rm)/2),
+                                        $this->img->plotheight+1,
+                                        $this->img->plotwidth+1);
+            }
+            $this->img->Destroy();
+            $this->img->SetCanvasH($oldimage);
         }
-        $this->img->Destroy();
-        $this->img->SetCanvasH($oldimage);
-    }
-
-    if (!$_csim) {
-        $this->axis->Stroke($pos);
-        $this->axis->StrokeAngleLabels($pos,$this->iType);
-    }
 
-    if (!$_csim) {
-        $this->StrokePlotBox();
-        $this->footer->Stroke($this->img);
+        if( !$_csim ) {
+            $this->axis->Stroke($pos);
+            $this->axis->StrokeAngleLabels($pos,$this->iType);
+        }
 
-        // The titles and legends never gets rotated so make sure
-        // that the angle is 0 before stroking them
-        $aa = $this->img->SetAngle(0);
-        $this->StrokeTitles();
-    }
+        if( !$_csim ) {
+            $this->StrokePlotBox();
+            $this->footer->Stroke($this->img);
 
-    for ($i=0; $i < count($this->plots) ; ++$i ) {
-        $this->plots[$i]->Legend($this);
-    }
+            // The titles and legends never gets rotated so make sure
+            // that the angle is 0 before stroking them
+            $aa = $this->img->SetAngle(0);
+            $this->StrokeTitles();
+        }
 
-    $this->legend->Stroke($this->img);
+        for($i=0; $i < count($this->plots) ; ++$i ) {
+            $this->plots[$i]->Legend($this);
+        }
 
-    if (!$_csim) {
+        $this->legend->Stroke($this->img);
 
-        $this->StrokeTexts();
-        $this->img->SetAngle($aa);
+        if( !$_csim ) {
 
-        // Draw an outline around the image map
-        if(_JPG_DEBUG)
-        $this->DisplayClientSideaImageMapAreas();
+            $this->StrokeTexts();
+            $this->img->SetAngle($aa);
 
-        // Adjust the appearance of the image
-        $this->AdjustSaturationBrightnessContrast();
+            // Draw an outline around the image map
+            if(_JPG_DEBUG)
+            	$this->DisplayClientSideaImageMapAreas();
 
-        // If the filename is given as the special "__handle"
-        // then the image handler is returned and the image is NOT
-        // streamed back
-        if ($aStrokeFileName == _IMG_HANDLER) {
-        return $this->img->img;
-        } else {
-        // Finally stream the generated picture
-        $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,
-                       $aStrokeFileName);
+            // If the filename is given as the special "__handle"
+            // then the image handler is returned and the image is NOT
+            // streamed back
+            if( $aStrokeFileName == _IMG_HANDLER ) {
+                return $this->img->img;
+            }
+            else {
+                // Finally stream the generated picture
+                $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,$aStrokeFileName);
+            }
         }
     }
-    }
 }
+
+
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_radar.php b/common/lib/jpgraph_lib/jpgraph_radar.php
old mode 100644
new mode 100755
index 214bc4376..1d3de6286
--- a/common/lib/jpgraph_lib/jpgraph_radar.php
+++ b/common/lib/jpgraph_lib/jpgraph_radar.php
@@ -1,656 +1,861 @@
 <?php
 /*=======================================================================
-// File:	JPGRAPH_RADAR.PHP
-// Description: Radar plot extension for JpGraph
-// Created: 	2001-02-04
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_radar.php,v 1.7.2.5 2004/06/12 17:46:01 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2001,2002 Johan Persson
-//========================================================================
-*/
-
-require_once 'jpgraph_plotmark.inc';
-
-class RadarLogTicks extends Ticks
-{
-//---------------
-// CONSTRUCTOR
-    public function RadarLogTicks()
-    {
-    }
-//---------------
-// PUBLIC METHODS
-
-    // TODO: Add Argument grid
-    public function Stroke(&$aImg,&$grid,$aPos,$aAxisAngle,&$aScale,&$aMajPos,&$aMajLabel)
-    {
-    $start = $aScale->GetMinVal();
-    $limit = $aScale->GetMaxVal();
-    $nextMajor = 10*$start;
-    $step = $nextMajor / 10.0;
-    $count=1;
-
-    $ticklen_maj=5;
-    $dx_maj=round(sin($aAxisAngle)*$ticklen_maj);
-    $dy_maj=round(cos($aAxisAngle)*$ticklen_maj);
-    $ticklen_min=3;
-    $dx_min=round(sin($aAxisAngle)*$ticklen_min);
-    $dy_min=round(cos($aAxisAngle)*$ticklen_min);
-
-    $aMajPos=array();
-    $aMajLabel=array();
-
-    if( $this->supress_first )
-        $aMajLabel[]="";
-    else
-        $aMajLabel[]=$start;
-    $yr=$aScale->RelTranslate($start);
-    $xt=round($yr*cos($aAxisAngle))+$aScale->scale_abs[0];
-    $yt=$aPos-round($yr*sin($aAxisAngle));
-    $aMajPos[]=$xt+2*$dx_maj;
-    $aMajPos[]=$yt-$aImg->GetFontheight()/2;
-    $grid[]=$xt;
-    $grid[]=$yt;
-
-    $aImg->SetLineWeight($this->weight);
-
-    for ($y=$start; $y<=$limit; $y+=$step,++$count) {
-        $yr=$aScale->RelTranslate($y);
+ // File:        JPGRAPH_RADAR.PHP
+ // Description: Radar plot extension for JpGraph
+ // Created:     2001-02-04
+ // Ver:         $Id: jpgraph_radar.php 1783 2009-08-25 11:41:01Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+
+require_once('jpgraph_plotmark.inc.php');
+
+//===================================================
+// CLASS RadarLogTicks
+// Description: Logarithmic ticks
+//===================================================
+class RadarLogTicks extends Ticks {
+
+    function __construct() {
+            // Empty
+    }
+
+    function Stroke($aImg,&$grid,$aPos,$aAxisAngle,$aScale,&$aMajPos,&$aMajLabel) {
+        $start = $aScale->GetMinVal();
+        $limit = $aScale->GetMaxVal();
+        $nextMajor = 10*$start;
+        $step = $nextMajor / 10.0;
+        $count=1;
+
+        $ticklen_maj=5;
+        $dx_maj=round(sin($aAxisAngle)*$ticklen_maj);
+        $dy_maj=round(cos($aAxisAngle)*$ticklen_maj);
+        $ticklen_min=3;
+        $dx_min=round(sin($aAxisAngle)*$ticklen_min);
+        $dy_min=round(cos($aAxisAngle)*$ticklen_min);
+
+        $aMajPos=array();
+        $aMajLabel=array();
+
+        if( $this->supress_first ) {
+            $aMajLabel[] = '';
+        }
+        else {
+            $aMajLabel[]=$start;
+        }
+
+        $yr=$aScale->RelTranslate($start);
         $xt=round($yr*cos($aAxisAngle))+$aScale->scale_abs[0];
         $yt=$aPos-round($yr*sin($aAxisAngle));
-        if ($count % 10 == 0) {
-        $grid[]=$xt;
-        $grid[]=$yt;
         $aMajPos[]=$xt+2*$dx_maj;
         $aMajPos[]=$yt-$aImg->GetFontheight()/2;
-        if (!$this->supress_tickmarks) {
-            if( $this->majcolor!="" ) $aImg->PushColor($this->majcolor);
-            $aImg->Line($xt+$dx_maj,$yt+$dy_maj,$xt-$dx_maj,$yt-$dy_maj);
-            if( $this->majcolor!="" ) $aImg->PopColor();
-        }
-        $aMajLabel[]=$nextMajor;
-        $nextMajor *= 10;
-        $step *= 10;
-        $count=1;
-        } else
-        if (!$this->supress_minor_tickmarks) {
-            if( $this->mincolor!="" ) $aImg->PushColor($this->mincolor);
-            $aImg->Line($xt+$dx_min,$yt+$dy_min,$xt-$dx_min,$yt-$dy_min);
-            if( $this->mincolor!="" ) $aImg->PopColor();
+        $grid[]=$xt;
+        $grid[]=$yt;
+
+        $aImg->SetLineWeight($this->weight);
+
+        for($y=$start; $y<=$limit; $y+=$step,++$count  ) {
+            $yr=$aScale->RelTranslate($y);
+            $xt=round($yr*cos($aAxisAngle))+$aScale->scale_abs[0];
+            $yt=$aPos-round($yr*sin($aAxisAngle));
+            if( $count % 10 == 0 ) {
+                $grid[]=$xt;
+                $grid[]=$yt;
+                $aMajPos[]=$xt+2*$dx_maj;
+                $aMajPos[]=$yt-$aImg->GetFontheight()/2;
+                if( !$this->supress_tickmarks ) {
+                    if( $this->majcolor != '' ) {
+                        $aImg->PushColor($this->majcolor);
+                    }
+                    $aImg->Line($xt+$dx_maj,$yt+$dy_maj,$xt-$dx_maj,$yt-$dy_maj);
+                    if( $this->majcolor != '' ) {
+                        $aImg->PopColor();
+                    }
+                }
+                if( $this->label_formfunc != '' ) {
+                    $f=$this->label_formfunc;
+                    $l = call_user_func($f,$nextMajor);
+                }
+                else {
+                    $l = $nextMajor;
+                }
+
+                $aMajLabel[]=$l;
+                $nextMajor *= 10;
+                $step *= 10;
+                $count=1;
+            }
+            else {
+                if( !$this->supress_minor_tickmarks ) {
+                    if( $this->mincolor != '' ) {
+                        $aImg->PushColor($this->mincolor);
+                    }
+                    $aImg->Line($xt+$dx_min,$yt+$dy_min,$xt-$dx_min,$yt-$dy_min);
+                    if( $this->mincolor != '' ) {
+                        $aImg->PopColor();
+                    }
+                }
+            }
         }
     }
-    }
 }
 
-class RadarLinearTicks extends LinearTicks
-{
-//---------------
-// CONSTRUCTOR
-    public function RadarLinearTicks()
-    {
-    // Empty
-    }
-
-//---------------
-// PUBLIC METHODS
-
-    // TODO: Add argument grid
-    public function Stroke(&$aImg,&$grid,$aPos,$aAxisAngle,&$aScale,&$aMajPos,&$aMajLabel)
-    {
-    // Prepare to draw linear ticks
-    $maj_step_abs = abs($aScale->scale_factor*$this->major_step);
-    $min_step_abs = abs($aScale->scale_factor*$this->minor_step);
-    $nbrmaj = floor(($aScale->world_abs_size)/$maj_step_abs);
-    $nbrmin = floor(($aScale->world_abs_size)/$min_step_abs);
-    $skip = round($nbrmin/$nbrmaj); // Don't draw minor ontop of major
-
-    // Draw major ticks
-    $ticklen2=$this->major_abs_size;
-    $dx=round(sin($aAxisAngle)*$ticklen2);
-    $dy=round(cos($aAxisAngle)*$ticklen2);
-    $label=$aScale->scale[0]+$this->major_step;
-
-    $aImg->SetLineWeight($this->weight);
-
-    for ($i=1; $i<=$nbrmaj; ++$i) {
-        $xt=round($i*$maj_step_abs*cos($aAxisAngle))+$aScale->scale_abs[0];
-        $yt=$aPos-round($i*$maj_step_abs*sin($aAxisAngle));
-        $aMajLabel[]=$label;
-        $label += $this->major_step;
-        $grid[]=$xt;
-        $grid[]=$yt;
-        $aMajPos[($i-1)*2]=$xt+2*$dx;
-        $aMajPos[($i-1)*2+1]=$yt-$aImg->GetFontheight()/2;
-        if (!$this->supress_tickmarks) {
-        if( $this->majcolor!="" ) $aImg->PushColor($this->majcolor);
-        $aImg->Line($xt+$dx,$yt+$dy,$xt-$dx,$yt-$dy);
-        if( $this->majcolor!="" ) $aImg->PopColor();
-        }
+//===================================================
+// CLASS RadarLinear
+// Description: Linear ticks
+//===================================================
+class RadarLinearTicks extends Ticks {
+
+    private $minor_step=1, $major_step=2;
+    private $xlabel_offset=0,$xtick_offset=0;
+
+    function __construct() {
+        // Empty
     }
 
-    // Draw minor ticks
-    $ticklen2=$this->minor_abs_size;
-    $dx=round(sin($aAxisAngle)*$ticklen2);
-    $dy=round(cos($aAxisAngle)*$ticklen2);
-    if (!$this->supress_tickmarks && !$this->supress_minor_tickmarks) {
-        if( $this->mincolor!="" ) $aImg->PushColor($this->mincolor);
-        for ($i=1; $i<=$nbrmin; ++$i) {
-        if( ($i % $skip) == 0 ) continue;
-        $xt=round($i*$min_step_abs*cos($aAxisAngle))+$aScale->scale_abs[0];
-        $yt=$aPos-round($i*$min_step_abs*sin($aAxisAngle));
-        $aImg->Line($xt+$dx,$yt+$dy,$xt-$dx,$yt-$dy);
-        }
-        if( $this->mincolor!="" ) $aImg->PopColor();
+    // Return major step size in world coordinates
+    function GetMajor() {
+        return $this->major_step;
     }
+
+    // Return minor step size in world coordinates
+    function GetMinor() {
+        return $this->minor_step;
     }
-}
 
+    // Set Minor and Major ticks (in world coordinates)
+    function Set($aMajStep,$aMinStep=false) {
+        if( $aMinStep==false ) {
+            $aMinStep=$aMajStep;
+        }
+
+        if( $aMajStep <= 0 || $aMinStep <= 0 ) {
+            JpGraphError::RaiseL(25064);
+            //JpGraphError::Raise(" Minor or major step size is 0. Check that you haven't got an accidental SetTextTicks(0) in your code. If this is not the case you might have stumbled upon a bug in JpGraph. Please report this and if possible include the data that caused the problem.");
+        }
+
+        $this->major_step=$aMajStep;
+        $this->minor_step=$aMinStep;
+        $this->is_set = true;
+    }
+
+    function Stroke($aImg,&$grid,$aPos,$aAxisAngle,$aScale,&$aMajPos,&$aMajLabel) {
+        // Prepare to draw linear ticks
+        $maj_step_abs = abs($aScale->scale_factor*$this->major_step);
+        $min_step_abs = abs($aScale->scale_factor*$this->minor_step);
+        $nbrmaj = round($aScale->world_abs_size/$maj_step_abs);
+        $nbrmin = round($aScale->world_abs_size/$min_step_abs);
+        $skip = round($nbrmin/$nbrmaj); // Don't draw minor on top of major
+
+        // Draw major ticks
+        $ticklen2=$this->major_abs_size;
+        $dx=round(sin($aAxisAngle)*$ticklen2);
+        $dy=round(cos($aAxisAngle)*$ticklen2);
+        $label=$aScale->scale[0]+$this->major_step;
+
+        $aImg->SetLineWeight($this->weight);
+
+        $aMajPos = array();
+        $aMajLabel = array();
+
+        for($i=1; $i<=$nbrmaj; ++$i) {
+            $xt=round($i*$maj_step_abs*cos($aAxisAngle))+$aScale->scale_abs[0];
+            $yt=$aPos-round($i*$maj_step_abs*sin($aAxisAngle));
+
+            if( $this->label_formfunc != '' ) {
+                $f=$this->label_formfunc;
+                $l = call_user_func($f,$label);
+            }
+            else {
+                $l = $label;
+            }
+
+            $aMajLabel[]=$l;
+            $label += $this->major_step;
+            $grid[]=$xt;
+            $grid[]=$yt;
+            $aMajPos[($i-1)*2]=$xt+2*$dx;
+            $aMajPos[($i-1)*2+1]=$yt-$aImg->GetFontheight()/2;
+            if( !$this->supress_tickmarks ) {
+                if( $this->majcolor != '' ) {
+                    $aImg->PushColor($this->majcolor);
+                }
+                $aImg->Line($xt+$dx,$yt+$dy,$xt-$dx,$yt-$dy);
+                if( $this->majcolor != '' ) {
+                    $aImg->PopColor();
+                }
+            }
+        }
+
+        // Draw minor ticks
+        $ticklen2=$this->minor_abs_size;
+        $dx=round(sin($aAxisAngle)*$ticklen2);
+        $dy=round(cos($aAxisAngle)*$ticklen2);
+        if( !$this->supress_tickmarks && !$this->supress_minor_tickmarks) {
+            if( $this->mincolor != '' ) {
+                $aImg->PushColor($this->mincolor);
+            }
+            for($i=1; $i<=$nbrmin; ++$i) {
+                if( ($i % $skip) == 0 ) {
+                    continue;
+                }
+                $xt=round($i*$min_step_abs*cos($aAxisAngle))+$aScale->scale_abs[0];
+                $yt=$aPos-round($i*$min_step_abs*sin($aAxisAngle));
+                $aImg->Line($xt+$dx,$yt+$dy,$xt-$dx,$yt-$dy);
+            }
+            if( $this->mincolor != '' ) {
+                $aImg->PopColor();
+            }
+        }
+    }
+}
 
 
 //===================================================
 // CLASS RadarAxis
-// Description: Implements axis for the spider graph
+// Description: Implements axis for the radar graph
 //===================================================
-class RadarAxis extends Axis
-{
-    public $title_color="navy";
+class RadarAxis extends AxisPrototype {
     public $title=null;
-//---------------
-// CONSTRUCTOR
-    public function RadarAxis(&$img,&$aScale,$color=array(0,0,0))
-    {
-    parent::Axis($img,$aScale,$color);
-    $this->len=$img->plotheight;
-    $this->title = new Text();
-    $this->title->SetFont(FF_FONT1,FS_BOLD);
-    $this->color = array(0,0,0);
-    }
-//---------------
-// PUBLIC METHODS
-    public function SetTickLabels($l)
-    {
-    $this->ticks_label = $l;
-    }
+    private $title_color='navy';
+    private $len=0;
 
+    function __construct($img,$aScale,$color=array(0,0,0)) {
+        parent::__construct($img,$aScale,$color);
+        $this->len = $img->plotheight;
+        $this->title = new Text();
+        $this->title->SetFont(FF_FONT1,FS_BOLD);
+        $this->color = array(0,0,0);
+    }
 
     // Stroke the axis
-    // $pos 			= Vertical position of axis
+    // $pos    = Vertical position of axis
     // $aAxisAngle = Axis angle
-    // $grid			= Returns an array with positions used to draw the grid
-    //	$lf			= Label flag, TRUE if the axis should have labels
-    public function Stroke($pos,$aAxisAngle,&$grid,$title,$lf)
-    {
-    $this->img->SetColor($this->color);
-
-    // Determine end points for the axis
-    $x=round($this->scale->world_abs_size*cos($aAxisAngle)+$this->scale->scale_abs[0]);
-    $y=round($pos-$this->scale->world_abs_size*sin($aAxisAngle));
-
-    // Draw axis
-    $this->img->SetColor($this->color);
-    $this->img->SetLineWeight($this->weight);
-    if( !$this->hide )
-        $this->img->Line($this->scale->scale_abs[0],$pos,$x,$y);
-
-    $this->scale->ticks->Stroke($this->img,$grid,$pos,$aAxisAngle,$this->scale,$majpos,$majlabel);
-
-    // Draw labels
-    if ($lf && !$this->hide) {
-        $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
-        $this->img->SetTextAlign("left","top");
+    // $grid   = Returns an array with positions used to draw the grid
+    // $lf   = Label flag, TRUE if the axis should have labels
+    function Stroke($pos,$aAxisAngle,&$grid,$title,$lf) {
+        $this->img->SetColor($this->color);
+
+        // Determine end points for the axis
+        $x=round($this->scale->world_abs_size*cos($aAxisAngle)+$this->scale->scale_abs[0]);
+        $y=round($pos-$this->scale->world_abs_size*sin($aAxisAngle));
+
+        // Draw axis
         $this->img->SetColor($this->color);
+        $this->img->SetLineWeight($this->weight);
+        if( !$this->hide ) {
+            $this->img->Line($this->scale->scale_abs[0],$pos,$x,$y);
+        }
 
-        // majpos contsins (x,y) coordinates for labels
-        for ($i=0; $i<count($majpos)/2; ++$i) {
-        if( $this->ticks_label != null )
-            $this->img->StrokeText($majpos[$i*2],$majpos[$i*2+1],$this->ticks_label[$i]);
-        else
-            $this->img->StrokeText($majpos[$i*2],$majpos[$i*2+1],$majlabel[$i]);
+        $this->scale->ticks->Stroke($this->img,$grid,$pos,$aAxisAngle,$this->scale,$majpos,$majlabel);
+        $ncolor=0;
+        if( isset($this->ticks_label_colors) ) {
+            $ncolor=count($this->ticks_label_colors);
         }
-    }
-    $this->_StrokeAxisTitle($pos,$aAxisAngle,$title);
-    }
-//---------------
-// PRIVATE METHODS
 
-    public function _StrokeAxisTitle($pos,$aAxisAngle,$title)
-    {
-    $this->title->Set($title);
-    $marg=6+$this->title->margin;
-    $xt=round(($this->scale->world_abs_size+$marg)*cos($aAxisAngle)+$this->scale->scale_abs[0]);
-    $yt=round($pos-($this->scale->world_abs_size+$marg)*sin($aAxisAngle));
+        // Draw labels
+        if( $lf && !$this->hide ) {
+            $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
+            $this->img->SetTextAlign('left','top');
+            $this->img->SetColor($this->label_color);
+
+            // majpos contains (x,y) coordinates for labels
+            if( ! $this->hide_labels ) {
+                $n = floor(count($majpos)/2);
+                for($i=0; $i < $n; ++$i) {
+                    // Set specific label color if specified
+                    if( $ncolor > 0 ) {
+                        $this->img->SetColor($this->ticks_label_colors[$i % $ncolor]);
+                    }
+
+                    if( $this->ticks_label != null && isset($this->ticks_label[$i]) ) {
+                        $this->img->StrokeText($majpos[$i*2],$majpos[$i*2+1],$this->ticks_label[$i]);
+                    }
+                    else {
+                        $this->img->StrokeText($majpos[$i*2],$majpos[$i*2+1],$majlabel[$i]);
+                    }
+                }
+            }
+        }
+        $this->_StrokeAxisTitle($pos,$aAxisAngle,$title);
+    }
+
+    function _StrokeAxisTitle($pos,$aAxisAngle,$title) {
+        $this->title->Set($title);
+        $marg=6+$this->title->margin;
+        $xt=round(($this->scale->world_abs_size+$marg)*cos($aAxisAngle)+$this->scale->scale_abs[0]);
+        $yt=round($pos-($this->scale->world_abs_size+$marg)*sin($aAxisAngle));
+
+        // Position the axis title.
+        // dx, dy is the offset from the top left corner of the bounding box that sorrounds the text
+        // that intersects with the extension of the corresponding axis. The code looks a little
+        // bit messy but this is really the only way of having a reasonable position of the
+        // axis titles.
+        if( $this->title->iWordwrap > 0 ) {
+            $title = wordwrap($title,$this->title->iWordwrap,"\n");
+        }
 
-    // Position the axis title.
-    // dx, dy is the offset from the top left corner of the bounding box that sorrounds the text
-    // that intersects with the extension of the corresponding axis. The code looks a little
-    // bit messy but this is really the only way of having a reasonable position of the
-    // axis titles.
-    $h=$this->img->GetFontHeight();
-    $w=$this->img->GetTextWidth($title);
-    while( $aAxisAngle > 2*M_PI ) $aAxisAngle -= 2*M_PI;
-    if( $aAxisAngle>=7*M_PI/4 || $aAxisAngle <= M_PI/4 ) $dx=0;
-    if( $aAxisAngle>=M_PI/4 && $aAxisAngle <= 3*M_PI/4 ) $dx=($aAxisAngle-M_PI/4)*2/M_PI;
-    if( $aAxisAngle>=3*M_PI/4 && $aAxisAngle <= 5*M_PI/4 ) $dx=1;
-    if( $aAxisAngle>=5*M_PI/4 && $aAxisAngle <= 7*M_PI/4 ) $dx=(1-($aAxisAngle-M_PI*5/4)*2/M_PI);
+        $h=$this->img->GetTextHeight($title)*1.2;
+        $w=$this->img->GetTextWidth($title)*1.2;
 
-    if( $aAxisAngle>=7*M_PI/4 ) $dy=(($aAxisAngle-M_PI)-3*M_PI/4)*2/M_PI;
-    if( $aAxisAngle<=M_PI/4 ) $dy=(1-$aAxisAngle*2/M_PI);
-    if( $aAxisAngle>=M_PI/4 && $aAxisAngle <= 3*M_PI/4 ) $dy=1;
-    if( $aAxisAngle>=3*M_PI/4 && $aAxisAngle <= 5*M_PI/4 ) $dy=(1-($aAxisAngle-3*M_PI/4)*2/M_PI);
-    if( $aAxisAngle>=5*M_PI/4 && $aAxisAngle <= 7*M_PI/4 ) $dy=0;
+        while( $aAxisAngle > 2*M_PI )
+            $aAxisAngle -= 2*M_PI;
 
-    if (!$this->hide) {
-        $this->title->Stroke($this->img,$xt-$dx*$w,$yt-$dy*$h,$title);
-    }
-    }
+        // Around 3 a'clock
+        if( $aAxisAngle>=7*M_PI/4 || $aAxisAngle <= M_PI/4 ) $dx=-0.15; // Small trimming to make the dist to the axis more even
+
+        // Around 12 a'clock
+        if( $aAxisAngle>=M_PI/4 && $aAxisAngle <= 3*M_PI/4 ) $dx=($aAxisAngle-M_PI/4)*2/M_PI;
+
+        // Around 9 a'clock
+        if( $aAxisAngle>=3*M_PI/4 && $aAxisAngle <= 5*M_PI/4 ) $dx=1;
+
+        // Around 6 a'clock
+        if( $aAxisAngle>=5*M_PI/4 && $aAxisAngle <= 7*M_PI/4 ) $dx=(1-($aAxisAngle-M_PI*5/4)*2/M_PI);
+
+        if( $aAxisAngle>=7*M_PI/4 ) $dy=(($aAxisAngle-M_PI)-3*M_PI/4)*2/M_PI;
+        if( $aAxisAngle<=M_PI/12 ) $dy=(0.5-$aAxisAngle*2/M_PI);
+        if( $aAxisAngle<=M_PI/4 && $aAxisAngle > M_PI/12) $dy=(1-$aAxisAngle*2/M_PI);
+        if( $aAxisAngle>=M_PI/4 && $aAxisAngle <= 3*M_PI/4 ) $dy=1;
+        if( $aAxisAngle>=3*M_PI/4 && $aAxisAngle <= 5*M_PI/4 ) $dy=(1-($aAxisAngle-3*M_PI/4)*2/M_PI);
+        if( $aAxisAngle>=5*M_PI/4 && $aAxisAngle <= 7*M_PI/4 ) $dy=0;
 
+        if( !$this->hide ) {
+            $this->title->Stroke($this->img,$xt-$dx*$w,$yt-$dy*$h,$title);
+        }
+    }
 
 } // Class
 
 
 //===================================================
 // CLASS RadarGrid
-// Description: Draws grid for the spider graph
+// Description: Draws grid for the radar graph
 //===================================================
-class RadarGrid extends Grid
-{
-//------------
-// CONSTRUCTOR
-    public function RadarGrid()
-    {
-    }
-
-//----------------
-// PRIVATE METHODS
-    public function Stroke(&$img,&$grid)
-    {
-    if( !$this->show ) return;
-    $nbrticks = count($grid[0])/2;
-    $nbrpnts = count($grid);
-    $img->SetColor($this->grid_color);
-    $img->SetLineWeight($this->weight);
-    for ($i=0; $i<$nbrticks; ++$i) {
-        for ($j=0; $j<$nbrpnts; ++$j) {
-        $pnts[$j*2]=$grid[$j][$i*2];
-        $pnts[$j*2+1]=$grid[$j][$i*2+1];
-        }
-        for ($k=0; $k<$nbrpnts; ++$k) {
-        $l=($k+1)%$nbrpnts;
-        if( $this->type == "solid" )
-            $img->Line($pnts[$k*2],$pnts[$k*2+1],$pnts[$l*2],$pnts[$l*2+1]);
-        elseif( $this->type == "dotted" )
-            $img->DashedLine($pnts[$k*2],$pnts[$k*2+1],$pnts[$l*2],$pnts[$l*2+1],1,6);
-        elseif( $this->type == "dashed" )
-            $img->DashedLine($pnts[$k*2],$pnts[$k*2+1],$pnts[$l*2],$pnts[$l*2+1],2,4);
-        elseif( $this->type == "longdashed" )
-            $img->DashedLine($pnts[$k*2],$pnts[$k*2+1],$pnts[$l*2],$pnts[$l*2+1],8,6);
-        }
-        $pnts=array();
+class RadarGrid { //extends Grid {
+    private $type='solid';
+    private $grid_color='#DDDDDD';
+    private $show=false, $weight=1;
+
+    function __construct() {
+        // Empty
+    }
+
+    function SetColor($aMajColor) {
+        $this->grid_color = $aMajColor;
+    }
+
+    function SetWeight($aWeight) {
+        $this->weight=$aWeight;
     }
+
+    // Specify if grid should be dashed, dotted or solid
+    function SetLineStyle($aType) {
+        $this->type = $aType;
+    }
+
+    // Decide if both major and minor grid should be displayed
+    function Show($aShowMajor=true) {
+        $this->show=$aShowMajor;
+    }
+
+    function Stroke($img,$grid) {
+        if( !$this->show ) {
+            return;
+        }
+
+        $nbrticks = count($grid[0])/2;
+        $nbrpnts = count($grid);
+        $img->SetColor($this->grid_color);
+        $img->SetLineWeight($this->weight);
+
+        for($i=0; $i<$nbrticks; ++$i) {
+            for($j=0; $j<$nbrpnts; ++$j) {
+                $pnts[$j*2]=$grid[$j][$i*2];
+                $pnts[$j*2+1]=$grid[$j][$i*2+1];
+            }
+            for($k=0; $k<$nbrpnts; ++$k ){
+                $l=($k+1)%$nbrpnts;
+                if( $this->type == 'solid' )
+                    $img->Line($pnts[$k*2],$pnts[$k*2+1],$pnts[$l*2],$pnts[$l*2+1]);
+                elseif( $this->type == 'dotted' )
+                    $img->DashedLine($pnts[$k*2],$pnts[$k*2+1],$pnts[$l*2],$pnts[$l*2+1],1,6);
+                elseif( $this->type == 'dashed' )
+                    $img->DashedLine($pnts[$k*2],$pnts[$k*2+1],$pnts[$l*2],$pnts[$l*2+1],2,4);
+                elseif( $this->type == 'longdashed' )
+                    $img->DashedLine($pnts[$k*2],$pnts[$k*2+1],$pnts[$l*2],$pnts[$l*2+1],8,6);
+            }
+            $pnts=array();
+        }
     }
 } // Class
 
 
 //===================================================
 // CLASS RadarPlot
-// Description: Plot a spiderplot
+// Description: Plot a radarplot
 //===================================================
-class RadarPlot
-{
-    public $data=array();
-    public $fill=false, $fill_color=array(200,170,180);
-    public $color=array(0,0,0);
-    public $legend="";
-    public $weight=1;
-    public $linestyle='solid';
+class RadarPlot {
     public $mark=null;
-//---------------
-// CONSTRUCTOR
-    public function RadarPlot($data)
-    {
-    $this->data = $data;
-    $this->mark = new PlotMark();
+    public $legend='';
+    public $legendcsimtarget='';
+    public $legendcsimalt='';
+    public $csimtargets=array(); // Array of targets for CSIM
+    public $csimareas="";   // Resultant CSIM area tags
+    public $csimalts=null;   // ALT:s for corresponding target
+    private $data=array();
+    private $fill=false, $fill_color=array(200,170,180);
+    private $color=array(0,0,0);
+    private $weight=1;
+    private $linestyle='solid';
+
+    //---------------
+    // CONSTRUCTOR
+    function __construct($data) {
+        $this->data = $data;
+        $this->mark = new PlotMark();
     }
 
-//---------------
-// PUBLIC METHODS
-    public function Min()
-    {
-    return Min($this->data);
+    function Min() {
+        return Min($this->data);
     }
 
-    public function Max()
-    {
-    return Max($this->data);
+    function Max() {
+        return Max($this->data);
     }
 
-    public function SetLegend($legend)
-    {
-    $this->legend=$legend;
+    function SetLegend($legend) {
+        $this->legend=$legend;
     }
 
-    public function SetLineStyle($aStyle)
-    {
-    $this->linestyle=$aStyle;
+    function SetLineStyle($aStyle) {
+        $this->linestyle=$aStyle;
     }
 
-    public function SetLineWeight($w)
-    {
-    $this->weight=$w;
+    function SetLineWeight($w) {
+        $this->weight=$w;
     }
 
-    public function SetFillColor($aColor)
-    {
-    $this->fill_color = $aColor;
-    $this->fill = true;
+    function SetFillColor($aColor) {
+        $this->fill_color = $aColor;
+        $this->fill = true;
     }
 
-    public function SetFill($f=true)
-    {
-    $this->fill = $f;
+    function SetFill($f=true) {
+        $this->fill = $f;
     }
 
-    public function SetColor($aColor,$aFillColor=false)
-    {
-    $this->color = $aColor;
-    if ($aFillColor) {
-        $this->SetFillColor($aFillColor);
-        $this->fill = true;
+    function SetColor($aColor,$aFillColor=false) {
+        $this->color = $aColor;
+        if( $aFillColor ) {
+            $this->SetFillColor($aFillColor);
+            $this->fill = true;
+        }
     }
+
+    // Set href targets for CSIM
+    function SetCSIMTargets($aTargets,$aAlts=null) {
+        $this->csimtargets=$aTargets;
+        $this->csimalts=$aAlts;
     }
 
-    public function GetCSIMareas()
-    {
-    JpGraphError::Raise("Client side image maps not supported for RadarPlots.");
+    // Get all created areas
+    function GetCSIMareas() {
+        return $this->csimareas;
     }
 
-    public function Stroke(&$img, $pos, &$scale, $startangle)
-    {
-    $nbrpnts = count($this->data);
-    $astep=2*M_PI/$nbrpnts;
-    $a=$startangle;
+    function Stroke($img, $pos, $scale, $startangle) {
+        $nbrpnts = count($this->data);
+        $astep=2*M_PI/$nbrpnts;
+        $a=$startangle;
 
-    // Rotate each point to the correct axis-angle
-    // TODO: Update for LogScale
-    for ($i=0; $i<$nbrpnts; ++$i) {
-        //$c=$this->data[$i];
-        $cs=$scale->RelTranslate($this->data[$i]);
-        $x=round($cs*cos($a)+$scale->scale_abs[0]);
-        $y=round($pos-$cs*sin($a));
-        /*
-          $c=log10($c);
-          $x=round(($c-$scale->scale[0])*$scale->scale_factor*cos($a)+$scale->scale_abs[0]);
-          $y=round($pos-($c-$scale->scale[0])*$scale->scale_factor*sin($a));
-        */
-        $pnts[$i*2]=$x;
-        $pnts[$i*2+1]=$y;
-        $a += $astep;
-    }
-    if ($this->fill) {
-        $img->SetColor($this->fill_color);
-        $img->FilledPolygon($pnts);
-    }
-    $img->SetLineWeight($this->weight);
-    $img->SetColor($this->color);
-    $img->SetLineStyle($this->linestyle);
-    $pnts[]=$pnts[0];
-    $pnts[]=$pnts[1];
-    $img->Polygon($pnts);
-    $img->SetLineStyle('solid'); // Reset line style to default
-    // Add plotmarks on top
-    if ($this->mark->show) {
-        for ($i=0; $i < $nbrpnts; ++$i) {
-        $this->mark->Stroke($img,$pnts[$i*2],$pnts[$i*2+1]);
+        for($i=0; $i<$nbrpnts; ++$i) {
+
+            // Rotate each non null point to the correct axis-angle
+            $cs=$scale->RelTranslate($this->data[$i]);
+            $x=round($cs*cos($a)+$scale->scale_abs[0]);
+            $y=round($pos-$cs*sin($a));
+
+            $pnts[$i*2]=$x;
+            $pnts[$i*2+1]=$y;
+
+            // If the next point is null then we draw this polygon segment
+            // to the center, skip the next and draw the next segment from
+            // the center up to the point on the axis with the first non-null
+            // value and continues from that point. Some additoinal logic is necessary
+            // to handle the boundary conditions
+            if( $i < $nbrpnts-1 ) {
+                if( is_null($this->data[$i+1]) ) {
+                    $cs = 0;
+                    $x=round($cs*cos($a)+$scale->scale_abs[0]);
+                    $y=round($pos-$cs*sin($a));
+                    $pnts[$i*2]=$x;
+                    $pnts[$i*2+1]=$y;
+                    $a += $astep;
+                }
+            }
+
+            $a += $astep;
+        }
+
+        if( $this->fill ) {
+            $img->SetColor($this->fill_color);
+            $img->FilledPolygon($pnts);
+        }
+
+        $img->SetLineWeight($this->weight);
+        $img->SetColor($this->color);
+        $img->SetLineStyle($this->linestyle);
+        $pnts[] = $pnts[0];
+        $pnts[] = $pnts[1];
+        $img->Polygon($pnts);
+        $img->SetLineStyle('solid'); // Reset line style to default
+
+        // Add plotmarks on top
+        if( $this->mark->show ) {
+			for($i=0; $i < $nbrpnts; ++$i) {
+	            if( isset($this->csimtargets[$i]) ) {
+	                $this->mark->SetCSIMTarget($this->csimtargets[$i]);
+	                $this->mark->SetCSIMAlt($this->csimalts[$i]);
+	                $this->mark->SetCSIMAltVal($pnts[$i*2], $pnts[$i*2+1]);
+	                $this->mark->Stroke($img, $pnts[$i*2], $pnts[$i*2+1]);
+	                $this->csimareas .= $this->mark->GetCSIMAreas();
+	            }
+	            else {
+					$this->mark->Stroke($img,$pnts[$i*2],$pnts[$i*2+1]);
+	            }
+            }
         }
-    }
 
     }
 
-//---------------
-// PRIVATE METHODS
-    public function GetCount()
-    {
-    return count($this->data);
+    function GetCount() {
+        return count($this->data);
     }
 
-    public function Legend(&$graph)
-    {
-    if( $this->legend=="" ) return;
-    if( $this->fill )
-        $graph->legend->Add($this->legend,$this->fill_color,$this->mark);
-    else
-        $graph->legend->Add($this->legend,$this->color,$this->mark);
+    function Legend($graph) {
+        if( $this->legend == '' ) {
+            return;
+        }
+        if( $this->fill ) {
+            $graph->legend->Add($this->legend,$this->fill_color,$this->mark);
+        } else {
+            $graph->legend->Add($this->legend,$this->color,$this->mark);
+        }
     }
 
 } // Class
 
 //===================================================
 // CLASS RadarGraph
-// Description: Main container for a spider graph
+// Description: Main container for a radar graph
 //===================================================
-class RadarGraph extends Graph
-{
-    public $posx;
-    public $posy;
-    public $len;
-    public $plots=null, $axis_title=null;
+class RadarGraph extends Graph {
     public $grid,$axis=null;
-//---------------
-// CONSTRUCTOR
-    public function RadarGraph($width=300,$height=200,$cachedName="",$timeout=0,$inline=1)
-    {
-    $this->Graph($width,$height,$cachedName,$timeout,$inline);
-    $this->posx=$width/2;
-    $this->posy=$height/2;
-    $this->len=min($width,$height)*0.35;
-    $this->SetColor(array(255,255,255));
-    $this->SetTickDensity(TICKD_NORMAL);
-    $this->SetScale("lin");
-    $this->SetGridDepth(DEPTH_FRONT);
-
-    }
-
-//---------------
-// PUBLIC METHODS
-    public function SupressTickMarks($f=true)
-    {
-        if( ERR_DEPRECATED )
-            JpGraphError::Raise('RadarGraph::SupressTickMarks() is deprecated. Use HideTickMarks() instead.');
-        $this->axis->scale->ticks->SupressTickMarks($f);
-    }
-
-    public function HideTickMarks($aFlag=true)
-    {
+    private $posx,$posy;
+    private $len;
+    private $axis_title=null;
+
+    function __construct($width=300,$height=200,$cachedName="",$timeout=0,$inline=1) {
+        parent::__construct($width,$height,$cachedName,$timeout,$inline);
+        $this->posx = $width/2;
+        $this->posy = $height/2;
+        $this->len = min($width,$height)*0.35;
+        $this->SetColor(array(255,255,255));
+        $this->SetTickDensity(TICKD_NORMAL);
+        $this->SetScale('lin');
+        $this->SetGridDepth(DEPTH_FRONT);
+    }
+
+    function HideTickMarks($aFlag=true) {
         $this->axis->scale->ticks->SupressTickMarks($aFlag);
     }
 
-    public function ShowMinorTickmarks($aFlag=true)
-    {
+    function ShowMinorTickmarks($aFlag=true) {
         $this->yscale->ticks->SupressMinorTickMarks(!$aFlag);
     }
 
-    public function SetScale($axtype,$ymin=1,$ymax=1)
-    {
-    if ($axtype != "lin" && $axtype != "log") {
-        JpGraphError::Raise("Illegal scale for spiderplot ($axtype). Must be \"lin\" or \"log\"");
-    }
-    if ($axtype=="lin") {
-        $this->yscale = & new LinearScale($ymin,$ymax);
-        $this->yscale->ticks = & new RadarLinearTicks();
-        $this->yscale->ticks->SupressMinorTickMarks();
-    } elseif ($axtype=="log") {
-        $this->yscale = & new LogScale($ymin,$ymax);
-        $this->yscale->ticks = & new RadarLogTicks();
-    }
+    function SetScale($axtype,$ymin=1,$ymax=1,$dummy1=null,$dumy2=null) {
+        if( $axtype != 'lin' && $axtype != 'log' ) {
+            JpGraphError::RaiseL(18003,$axtype);
+            //("Illegal scale for radarplot ($axtype). Must be \"lin\" or \"log\"");
+        }
+        if( $axtype == 'lin' ) {
+            $this->yscale = new LinearScale($ymin,$ymax);
+            $this->yscale->ticks = new RadarLinearTicks();
+            $this->yscale->ticks->SupressMinorTickMarks();
+        }
+        elseif( $axtype == 'log' ) {
+            $this->yscale = new LogScale($ymin,$ymax);
+            $this->yscale->ticks = new RadarLogTicks();
+        }
 
-    $this->axis = & new RadarAxis($this->img,$this->yscale);
-    $this->grid = & new RadarGrid();
+        $this->axis = new RadarAxis($this->img,$this->yscale);
+        $this->grid = new RadarGrid();
     }
 
-    public function SetSize($aSize)
-    {
-    if( $aSize<0.1 || $aSize>1 )
-        JpGraphError::Raise("Radar Plot size must be between 0.1 and 1. (Your value=$s)");
-    $this->len=min($this->img->width,$this->img->height)*$aSize/2;
+    function SetSize($aSize) {
+        if( $aSize < 0.1 || $aSize>1 ) {
+            JpGraphError::RaiseL(18004,$aSize);
+            //("Radar Plot size must be between 0.1 and 1. (Your value=$s)");
+        }
+        $this->len=min($this->img->width,$this->img->height)*$aSize/2;
     }
 
-    public function SetPlotSize($aSize)
-    {
-    $this->SetSize($aSize);
+    function SetPlotSize($aSize) {
+        $this->SetSize($aSize);
     }
 
-    public function SetTickDensity($densy=TICKD_NORMAL)
-    {
-    $this->ytick_factor=25;
-    switch ($densy) {
-        case TICKD_DENSE:
-        $this->ytick_factor=12;
-        break;
-        case TICKD_NORMAL:
+    function SetTickDensity($densy=TICKD_NORMAL,$dummy1=null) {
         $this->ytick_factor=25;
-        break;
-        case TICKD_SPARSE:
-        $this->ytick_factor=40;
-        break;
-        case TICKD_VERYSPARSE:
-        $this->ytick_factor=70;
-        break;
-        default:
-        JpGraphError::Raise("RadarPlot Unsupported Tick density: $densy");
-    }
+        switch( $densy ) {
+            case TICKD_DENSE:
+                $this->ytick_factor=12;
+                break;
+            case TICKD_NORMAL:
+                $this->ytick_factor=25;
+                break;
+            case TICKD_SPARSE:
+                $this->ytick_factor=40;
+                break;
+            case TICKD_VERYSPARSE:
+                $this->ytick_factor=70;
+                break;
+            default:
+                JpGraphError::RaiseL(18005,$densy);
+                //("RadarPlot Unsupported Tick density: $densy");
+        }
     }
 
-    public function SetPos($px,$py=0.5)
-    {
-    $this->SetCenter($px,$py);
+    function SetPos($px,$py=0.5) {
+        $this->SetCenter($px,$py);
     }
 
-    public function SetCenter($px,$py=0.5)
-    {
-    assert($px > 0 && $py > 0 );
-    $this->posx=$this->img->width*$px;
-    $this->posy=$this->img->height*$py;
+    function SetCenter($px,$py=0.5) {
+        if( $px >= 0 && $px <= 1 ) {
+        	$this->posx = $this->img->width*$px;
+        }
+        else {
+        	$this->posx = $px;
+        }
+        if( $py >= 0 && $py <= 1 ) {
+        	$this->posy = $this->img->height*$py;
+        }
+        else {
+        	$this->posy = $py;
+        }
     }
 
-    public function SetColor($c)
-    {
-    $this->SetMarginColor($c);
+    function SetColor($aColor) {
+        $this->SetMarginColor($aColor);
     }
 
-    public function SetTitles($title)
-    {
-    $this->axis_title = $title;
+    function SetTitles($aTitleArray) {
+        $this->axis_title = $aTitleArray;
     }
 
-    public function Add(&$splot)
-    {
-    $this->plots[]=$splot;
-    }
+    function Add($aPlot) {
+    	if( $aPlot == null ) {
+            JpGraphError::RaiseL(25010);//("Graph::Add() You tried to add a null plot to the graph.");
+        }
+        if( is_array($aPlot) && count($aPlot) > 0 ) {
+            $cl = $aPlot[0];
+        }
+        else {
+            $cl = $aPlot;
+        }
 
-    public function GetPlotsYMinMax()
-    {
-    $min=$this->plots[0]->Min();
-    $max=$this->plots[0]->Max();
-    foreach ($this->plots as $p) {
-        $max=max($max,$p->Max());
-        $min=min($min,$p->Min());
+        if( $cl instanceof Text ) $this->AddText($aPlot);
+        elseif( class_exists('IconPlot',false) && ($cl instanceof IconPlot) ) $this->AddIcon($aPlot);
+        else {
+            $this->plots[] = $aPlot;
+        }
     }
-    if( $min < 0 )
-        JpGraphError::Raise("Minimum data $min (Radar plots only makes sence to use when all data points > 0)");
 
-    return array($min,$max);
+    function GetPlotsYMinMax($aPlots) {
+        $min=$aPlots[0]->Min();
+        $max=$aPlots[0]->Max();
+        foreach( $this->plots as $p ) {
+            $max=max($max,$p->Max());
+            $min=min($min,$p->Min());
+        }
+        if( $min < 0 ) {
+            JpGraphError::RaiseL(18006,$min);
+            //("Minimum data $min (Radar plots should only be used when all data points > 0)");
+        }
+        return array($min,$max);
     }
 
-    // Stroke the Radar graph
-    public function Stroke($aStrokeFileName="")
-    {
-    // Set Y-scale
-    if ( !$this->yscale->IsSpecified() && count($this->plots)>0 ) {
-        list($min,$max) = $this->GetPlotsYMinMax();
-        $this->yscale->AutoScale($this->img,0,$max,$this->len/$this->ytick_factor);
+    function StrokeIcons() {
+    	if( $this->iIcons != null ) {
+        	$n = count($this->iIcons);
+        	for( $i=0; $i < $n; ++$i ) {
+            	$this->iIcons[$i]->Stroke($this->img);
+        	}
+    	}
     }
-    // Set start position end length of scale (in absolute pixels)
-    $this->yscale->SetConstants($this->posx,$this->len);
-
-    // We need as many axis as there are data points
-    $nbrpnts=$this->plots[0]->GetCount();
-
-    // If we have no titles just number the axis 1,2,3,...
-    if ($this->axis_title==null) {
-        for($i=0; $i < $nbrpnts; ++$i )
-        $this->axis_title[$i] = $i+1;
-    } elseif(count($this->axis_title)<$nbrpnts)
-        JpGraphError::Raise("Number of titles does not match number of points in plot.");
-    for($i=0; $i<count($this->plots); ++$i )
-        if( $nbrpnts != $this->plots[$i]->GetCount() )
-        JpGraphError::Raise("Each spider plot must have the same number of data points.");
 
-    if ($this->background_image != "") {
-        $this->StrokeFrameBackground();
-    } else {
-        $this->StrokeFrame();
+	function StrokeTexts() {
+        if( $this->texts != null ) {
+			$n = count($this->texts);
+            for( $i=0; $i < $n; ++$i ) {
+                $this->texts[$i]->Stroke($this->img);
+            }
+        }
     }
-    $astep=2*M_PI/$nbrpnts;
-
-    // Prepare legends
-    for($i=0; $i<count($this->plots); ++$i)
-        $this->plots[$i]->Legend($this);
-    $this->legend->Stroke($this->img);
-    $this->footer->Stroke($this->img);
 
-    if ($this->grid_depth == DEPTH_BACK) {
-        // Draw axis and grid
-        for ($i=0,$a=M_PI/2; $i < $nbrpnts; ++$i, $a += $astep) {
-        $this->axis->Stroke($this->posy,$a,$grid[$i],$this->axis_title[$i],$i==0);
+    // Stroke the Radar graph
+    function Stroke($aStrokeFileName='') {
+
+        // If the filename is the predefined value = '_csim_special_'
+        // we assume that the call to stroke only needs to do enough
+        // to correctly generate the CSIM maps.
+        // We use this variable to skip things we don't strictly need
+        // to do to generate the image map to improve performance
+        // a best we can. Therefor you will see a lot of tests !$_csim in the
+        // code below.
+        $_csim = ( $aStrokeFileName === _CSIM_SPECIALFILE );
+
+        // We need to know if we have stroked the plot in the
+        // GetCSIMareas. Otherwise the CSIM hasn't been generated
+        // and in the case of GetCSIM called before stroke to generate
+        // CSIM without storing an image to disk GetCSIM must call Stroke.
+        $this->iHasStroked = true;
+
+        $n = count($this->plots);
+        // Set Y-scale
+
+        if( !$this->yscale->IsSpecified() && count($this->plots) > 0 ) {
+            list($min,$max) = $this->GetPlotsYMinMax($this->plots);
+            $this->yscale->AutoScale($this->img,0,$max,$this->len/$this->ytick_factor);
+        }
+        elseif( $this->yscale->IsSpecified() &&
+                ( $this->yscale->auto_ticks || !$this->yscale->ticks->IsSpecified()) ) {
+
+            // The tick calculation will use the user suplied min/max values to determine
+            // the ticks. If auto_ticks is false the exact user specifed min and max
+            // values will be used for the scale.
+            // If auto_ticks is true then the scale might be slightly adjusted
+            // so that the min and max values falls on an even major step.
+            $min = $this->yscale->scale[0];
+            $max = $this->yscale->scale[1];
+            $this->yscale->AutoScale($this->img,$min,$max,
+                                     $this->len/$this->ytick_factor,
+                                     $this->yscale->auto_ticks);
         }
-    }
 
-    // Plot points
-    $a=M_PI/2;
-    for($i=0; $i<count($this->plots); ++$i )
-        $this->plots[$i]->Stroke($this->img, $this->posy, $this->yscale, $a);
+        // Set start position end length of scale (in absolute pixels)
+        $this->yscale->SetConstants($this->posx,$this->len);
 
-    if ($this->grid_depth != DEPTH_BACK) {
-        // Draw axis and grid
-        for ($i=0,$a=M_PI/2; $i < $nbrpnts; ++$i, $a += $astep) {
-        $this->axis->Stroke($this->posy,$a,$grid[$i],$this->axis_title[$i],$i==0);
-        }
-    }
-    $this->grid->Stroke($this->img,$grid);
-    $this->StrokeTitles();
+        // We need as many axis as there are data points
+        $nbrpnts=$this->plots[0]->GetCount();
 
-    // Stroke texts
-    if ($this->texts != null) {
-        foreach( $this->texts as $t)
-        $t->Stroke($this->img);
-    }
+        // If we have no titles just number the axis 1,2,3,...
+        if( $this->axis_title==null ) {
+            for($i=0; $i < $nbrpnts; ++$i ) {
+                $this->axis_title[$i] = $i+1;
+            }
+        }
+        elseif( count($this->axis_title) < $nbrpnts) {
+            JpGraphError::RaiseL(18007);
+            // ("Number of titles does not match number of points in plot.");
+        }
+        for( $i=0; $i < $n; ++$i ) {
+            if( $nbrpnts != $this->plots[$i]->GetCount() ) {
+                JpGraphError::RaiseL(18008);
+                //("Each radar plot must have the same number of data points.");
+            }
+        }
 
-    // Should we do any final image transformation
-    if ($this->iImgTrans) {
-        if ( !class_exists('ImgTrans') ) {
-        require_once 'jpgraph_imgtrans.php';
+        if( !$_csim ) {
+        	if( $this->background_image != '' ) {
+            	$this->StrokeFrameBackground();
+        	}
+        	else {
+            	$this->StrokeFrame();
+            	$this->StrokeBackgroundGrad();
+        	}
+        }
+        $astep=2*M_PI/$nbrpnts;
+
+		if( !$_csim ) {
+     		if( $this->iIconDepth == DEPTH_BACK ) {
+        		$this->StrokeIcons();
+        	}
+
+
+	        // Prepare legends
+    	    for($i=0; $i < $n; ++$i) {
+        	    $this->plots[$i]->Legend($this);
+	        }
+    	    $this->legend->Stroke($this->img);
+        	$this->footer->Stroke($this->img);
+		}
+
+		if( !$_csim ) {
+	        if( $this->grid_depth == DEPTH_BACK ) {
+	            // Draw axis and grid
+	            for( $i=0,$a=M_PI/2; $i < $nbrpnts; ++$i, $a += $astep ) {
+	                $this->axis->Stroke($this->posy,$a,$grid[$i],$this->axis_title[$i],$i==0);
+	            }
+                $this->grid->Stroke($this->img,$grid);
+	        }
+            if( $this->iIconDepth == DEPTH_BACK ) {
+                $this->StrokeIcons();
+            }
+
+		}
+
+        // Plot points
+        $a=M_PI/2;
+        for($i=0; $i < $n; ++$i ) {
+            $this->plots[$i]->Stroke($this->img, $this->posy, $this->yscale, $a);
         }
 
-        $tform = new ImgTrans($this->img->img);
-        $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
-                         $this->iImgTransDirection,$this->iImgTransHighQ,
-                         $this->iImgTransMinSize,$this->iImgTransFillColor,
-                         $this->iImgTransBorder);
-    }
+        if( !$_csim ) {
+            if( $this->grid_depth != DEPTH_BACK ) {
+                // Draw axis and grid
+                for( $i=0,$a=M_PI/2; $i < $nbrpnts; ++$i, $a += $astep ) {
+                   $this->axis->Stroke($this->posy,$a,$grid[$i],$this->axis_title[$i],$i==0);
+                }
+                $this->grid->Stroke($this->img,$grid);
+            }
+
+        	$this->StrokeTitles();
+       		$this->StrokeTexts();
+       		if( $this->iIconDepth == DEPTH_FRONT ) {
+        		$this->StrokeIcons();
+        	}
+		}
+
+        // Should we do any final image transformation
+        if( $this->iImgTrans && !$_csim ) {
+            if( !class_exists('ImgTrans',false) ) {
+                require_once('jpgraph_imgtrans.php');
+            }
+
+            $tform = new ImgTrans($this->img->img);
+            $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
+            $this->iImgTransDirection,$this->iImgTransHighQ,
+            $this->iImgTransMinSize,$this->iImgTransFillColor,
+            $this->iImgTransBorder);
+        }
 
-    // If the filename is given as the special "__handle"
-    // then the image handler is returned and the image is NOT
-    // streamed back
-    if ($aStrokeFileName == _IMG_HANDLER) {
-        return $this->img->img;
-        } else {
-        // Finally stream the generated picture
-        $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,
-                       $aStrokeFileName);
-    }
+		if( !$_csim ) {
+	        // If the filename is given as the special "__handle"
+	        // then the image handler is returned and the image is NOT
+	        // streamed back
+	        if( $aStrokeFileName == _IMG_HANDLER ) {
+	            return $this->img->img;
+	        }
+	        else {
+	            // Finally stream the generated picture
+	            $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,$aStrokeFileName);
+	        }
+		}
     }
 } // Class
 
 /* EOF */
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_regstat.php b/common/lib/jpgraph_lib/jpgraph_regstat.php
old mode 100644
new mode 100755
index 1fa9d302f..0f6c96be7
--- a/common/lib/jpgraph_lib/jpgraph_regstat.php
+++ b/common/lib/jpgraph_lib/jpgraph_regstat.php
@@ -1,108 +1,215 @@
 <?php
 /*=======================================================================
-// File:	JPGRAPH_REGSTAT.PHP
-// Description: Regression and statistical analysis helper classes
-// Created: 	2002-12-01
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_regstat.php,v 1.2 2003/03/08 11:29:21 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2002 Johan Persson
-//========================================================================
-*/
+ // File:        JPGRAPH_REGSTAT.PHP
+ // Description: Regression and statistical analysis helper classes
+ // Created:     2002-12-01
+ // Ver:         $Id: jpgraph_regstat.php 1131 2009-03-11 20:08:24Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
 
 //------------------------------------------------------------------------
 // CLASS Spline
 // Create a new data array from an existing data array but with more points.
 // The new points are interpolated using a cubic spline algorithm
 //------------------------------------------------------------------------
-class Spline
-{
+class Spline {
     // 3:rd degree polynom approximation
 
-    public $xdata,$ydata;   // Data vectors
-    public $y2;		 // 2:nd derivate of ydata
-    public $n=0;
-
-    public function Spline($xdata,$ydata)
-    {
-    $this->y2 = array();
-    $this->xdata = $xdata;
-    $this->ydata = $ydata;
-
-    $n = count($ydata);
-    $this->n = $n;
-
-    // Natural spline 2:derivate == 0 at endpoints
-    $this->y2[0]    = 0.0;
-    $this->y2[$n-1] = 0.0;
-    $delta[0] = 0.0;
-
-    // Calculate 2:nd derivate
-    for ($i=1; $i < $n-1; ++$i) {
-        $d = ($xdata[$i+1]-$xdata[$i-1]);
-        if ($d == 0) {
-        JpGraphError::Raise('Invalid input data for spline. Two or more consecutive input X-values are equal. Each input X-value must differ since from a mathematical point of view it must be a one-to-one mapping, i.e. each X-value must correspond to exactly one Y-value.');
+    private $xdata,$ydata;   // Data vectors
+    private $y2;   // 2:nd derivate of ydata
+    private $n=0;
+
+    function __construct($xdata,$ydata) {
+        $this->y2 = array();
+        $this->xdata = $xdata;
+        $this->ydata = $ydata;
+
+        $n = count($ydata);
+        $this->n = $n;
+        if( $this->n !== count($xdata) ) {
+            JpGraphError::RaiseL(19001);
+            //('Spline: Number of X and Y coordinates must be the same');
         }
-        $s = ($xdata[$i]-$xdata[$i-1])/$d;
-        $p = $s*$this->y2[$i-1]+2.0;
-        $this->y2[$i] = ($s-1.0)/$p;
-        $delta[$i] = ($ydata[$i+1]-$ydata[$i])/($xdata[$i+1]-$xdata[$i]) -
-                 ($ydata[$i]-$ydata[$i-1])/($xdata[$i]-$xdata[$i-1]);
-        $delta[$i] = (6.0*$delta[$i]/($xdata[$i+1]-$xdata[$i-1])-$s*$delta[$i-1])/$p;
-    }
 
-    // Backward substitution
-    for ($j=$n-2; $j >= 0; --$j) {
-        $this->y2[$j] = $this->y2[$j]*$this->y2[$j+1] + $delta[$j];
-    }
-    }
+        // Natural spline 2:derivate == 0 at endpoints
+        $this->y2[0]    = 0.0;
+        $this->y2[$n-1] = 0.0;
+        $delta[0] = 0.0;
+
+        // Calculate 2:nd derivate
+        for($i=1; $i < $n-1; ++$i) {
+            $d = ($xdata[$i+1]-$xdata[$i-1]);
+            if( $d == 0  ) {
+                JpGraphError::RaiseL(19002);
+                //('Invalid input data for spline. Two or more consecutive input X-values are equal. Each input X-value must differ since from a mathematical point of view it must be a one-to-one mapping, i.e. each X-value must correspond to exactly one Y-value.');
+            }
+            $s = ($xdata[$i]-$xdata[$i-1])/$d;
+            $p = $s*$this->y2[$i-1]+2.0;
+            $this->y2[$i] = ($s-1.0)/$p;
+            $delta[$i] = ($ydata[$i+1]-$ydata[$i])/($xdata[$i+1]-$xdata[$i]) -
+            ($ydata[$i]-$ydata[$i-1])/($xdata[$i]-$xdata[$i-1]);
+            $delta[$i] = (6.0*$delta[$i]/($xdata[$i+1]-$xdata[$i-1])-$s*$delta[$i-1])/$p;
+        }
 
-    // Return the two new data vectors
-    public function Get($num=50)
-    {
-    $n = $this->n ;
-    $step = ($this->xdata[$n-1]-$this->xdata[0]) / ($num-1);
-    $xnew=array();
-    $ynew=array();
-    $xnew[0] = $this->xdata[0];
-    $ynew[0] = $this->ydata[0];
-    for ($j=1; $j < $num; ++$j) {
-        $xnew[$j] = $xnew[0]+$j*$step;
-        $ynew[$j] = $this->Interpolate($xnew[$j]);
+        // Backward substitution
+        for( $j=$n-2; $j >= 0; --$j ) {
+            $this->y2[$j] = $this->y2[$j]*$this->y2[$j+1] + $delta[$j];
+        }
     }
 
-    return array($xnew,$ynew);
+    // Return the two new data vectors
+    function Get($num=50) {
+        $n = $this->n ;
+        $step = ($this->xdata[$n-1]-$this->xdata[0]) / ($num-1);
+        $xnew=array();
+        $ynew=array();
+        $xnew[0] = $this->xdata[0];
+        $ynew[0] = $this->ydata[0];
+        for( $j=1; $j < $num; ++$j ) {
+            $xnew[$j] = $xnew[0]+$j*$step;
+            $ynew[$j] = $this->Interpolate($xnew[$j]);
+        }
+        return array($xnew,$ynew);
     }
 
     // Return a single interpolated Y-value from an x value
-    public function Interpolate($xpoint)
-    {
-    $max = $this->n-1;
-    $min = 0;
-
-    // Binary search to find interval
-    while ($max-$min > 1) {
-        $k = ($max+$min) / 2;
-        if( $this->xdata[$k] > $xpoint )
-        $max=$k;
-        else
-        $min=$k;
+    function Interpolate($xpoint) {
+
+        $max = $this->n-1;
+        $min = 0;
+
+        // Binary search to find interval
+        while( $max-$min > 1 ) {
+            $k = ($max+$min) / 2;
+            if( $this->xdata[$k] > $xpoint )
+            $max=$k;
+            else
+            $min=$k;
+        }
+
+        // Each interval is interpolated by a 3:degree polynom function
+        $h = $this->xdata[$max]-$this->xdata[$min];
+
+        if( $h == 0  ) {
+            JpGraphError::RaiseL(19002);
+            //('Invalid input data for spline. Two or more consecutive input X-values are equal. Each input X-value must differ since from a mathematical point of view it must be a one-to-one mapping, i.e. each X-value must correspond to exactly one Y-value.');
+        }
+
+
+        $a = ($this->xdata[$max]-$xpoint)/$h;
+        $b = ($xpoint-$this->xdata[$min])/$h;
+        return $a*$this->ydata[$min]+$b*$this->ydata[$max]+
+        (($a*$a*$a-$a)*$this->y2[$min]+($b*$b*$b-$b)*$this->y2[$max])*($h*$h)/6.0;
     }
+}
 
-    // Each interval is interpolated by a 3:degree polynom function
-    $h = $this->xdata[$max]-$this->xdata[$min];
+//------------------------------------------------------------------------
+// CLASS Bezier
+// Create a new data array from a number of control points
+//------------------------------------------------------------------------
+class Bezier {
+    /**
+     * @author Thomas Despoix, openXtrem company
+     * @license released under QPL
+     * @abstract Bezier interoplated point generation,
+     * computed from control points data sets, based on Paul Bourke algorithm :
+     * http://local.wasp.uwa.edu.au/~pbourke/geometry/bezier/index2.html
+     */
+    private $datax = array();
+    private $datay = array();
+    private $n=0;
+
+    function __construct($datax, $datay, $attraction_factor = 1) {
+        // Adding control point multiple time will raise their attraction power over the curve
+        $this->n = count($datax);
+        if( $this->n !== count($datay) ) {
+            JpGraphError::RaiseL(19003);
+            //('Bezier: Number of X and Y coordinates must be the same');
+        }
+        $idx=0;
+        foreach($datax as $datumx) {
+            for ($i = 0; $i < $attraction_factor; $i++) {
+                $this->datax[$idx++] = $datumx;
+            }
+        }
+        $idx=0;
+        foreach($datay as $datumy) {
+            for ($i = 0; $i < $attraction_factor; $i++) {
+                $this->datay[$idx++] = $datumy;
+            }
+        }
+        $this->n *= $attraction_factor;
+    }
 
-    if ($h == 0) {
-        JpGraphError::Raise('Invalid input data for spline. Two or more consecutive input X-values are equal. Each input X-value must differ since from a mathematical point of view it must be a one-to-one mapping, i.e. each X-value must correspond to exactly one Y-value.');
+    /**
+     * Return a set of data points that specifies the bezier curve with $steps points
+     * @param $steps Number of new points to return
+     * @return array($datax, $datay)
+     */
+    function Get($steps) {
+        $datax = array();
+        $datay = array();
+        for ($i = 0; $i < $steps; $i++) {
+            list($datumx, $datumy) = $this->GetPoint((double) $i / (double) $steps);
+            $datax[$i] = $datumx;
+            $datay[$i] = $datumy;
+        }
+         
+        $datax[] = end($this->datax);
+        $datay[] = end($this->datay);
+         
+        return array($datax, $datay);
     }
 
-    $a = ($this->xdata[$max]-$xpoint)/$h;
-    $b = ($xpoint-$this->xdata[$min])/$h;
+    /**
+     * Return one point on the bezier curve. $mu is the position on the curve where $mu is in the
+     * range 0 $mu < 1 where 0 is tha start point and 1 is the end point. Note that every newly computed
+     * point depends on all the existing points
+     * 
+     * @param $mu Position on the bezier curve
+     * @return array($x, $y)
+     */
+    function GetPoint($mu) {
+        $n = $this->n - 1;
+        $k = 0;
+        $kn = 0;
+        $nn = 0;
+        $nkn = 0;
+        $blend = 0.0;
+        $newx = 0.0;
+        $newy = 0.0;
+
+        $muk = 1.0;
+        $munk = (double) pow(1-$mu,(double) $n);
+
+        for ($k = 0; $k <= $n; $k++) {
+            $nn = $n;
+            $kn = $k;
+            $nkn = $n - $k;
+            $blend = $muk * $munk;
+            $muk *= $mu;
+            $munk /= (1-$mu);
+            while ($nn >= 1) {
+                $blend *= $nn;
+                $nn--;
+                if ($kn > 1) {
+                    $blend /= (double) $kn;
+                    $kn--;
+                }
+                if ($nkn > 1) {
+                    $blend /= (double) $nkn;
+                    $nkn--;
+                }
+            }
+            $newx += $this->datax[$k] * $blend;
+            $newy += $this->datay[$k] * $blend;
+        }
 
-    return $a*$this->ydata[$min]+$b*$this->ydata[$max]+
-         (($a*$a*$a-$a)*$this->y2[$min]+($b*$b*$b-$b)*$this->y2[$max])*($h*$h)/6.0;
+        return array($newx, $newy);
     }
 }
 
 // EOF
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_rgb.inc.php b/common/lib/jpgraph_lib/jpgraph_rgb.inc.php
new file mode 100644
index 000000000..53892611e
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_rgb.inc.php
@@ -0,0 +1,615 @@
+<?php
+//=======================================================================
+// File:        JPGRAPH_RGB.INC.PHP
+// Description: Class to handle RGb color space specification and
+//              named colors
+// Created:     2001-01-08 (Refactored to separate file 2008-08-01)
+// Ver:         $Id: jpgraph_rgb.inc.php 1893 2009-10-02 23:15:25Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+
+/*===================================================
+// CLASS RGB
+// Description: Color definitions as RGB triples
+//===================================================
+*/
+
+class RGB {
+    public $rgb_table;
+    public $img;
+
+    function __construct($aImg=null) {
+        $this->img = $aImg;
+
+        // Conversion array between color names and RGB
+        $this->rgb_table = array(
+            'aqua'=> array(0,255,255),
+            'lime'=> array(0,255,0),
+            'teal'=> array(0,128,128),
+            'whitesmoke'=>array(245,245,245),
+            'gainsboro'=>array(220,220,220),
+            'oldlace'=>array(253,245,230),
+            'linen'=>array(250,240,230),
+            'antiquewhite'=>array(250,235,215),
+            'papayawhip'=>array(255,239,213),
+            'blanchedalmond'=>array(255,235,205),
+            'bisque'=>array(255,228,196),
+            'peachpuff'=>array(255,218,185),
+            'navajowhite'=>array(255,222,173),
+            'moccasin'=>array(255,228,181),
+            'cornsilk'=>array(255,248,220),
+            'ivory'=>array(255,255,240),
+            'lemonchiffon'=>array(255,250,205),
+            'seashell'=>array(255,245,238),
+            'mintcream'=>array(245,255,250),
+            'azure'=>array(240,255,255),
+            'aliceblue'=>array(240,248,255),
+            'lavender'=>array(230,230,250),
+            'lavenderblush'=>array(255,240,245),
+            'mistyrose'=>array(255,228,225),
+            'white'=>array(255,255,255),
+            'black'=>array(0,0,0),
+            'darkslategray'=>array(47,79,79),
+            'dimgray'=>array(105,105,105),
+            'slategray'=>array(112,128,144),
+            'lightslategray'=>array(119,136,153),
+            'gray'=>array(190,190,190),
+            'lightgray'=>array(211,211,211),
+            'midnightblue'=>array(25,25,112),
+            'navy'=>array(0,0,128),
+            'indigo'=>array(75,0,130),
+            'electricindigo'=>array(102,0,255),
+            'deepindigo'=>array(138,43,226),
+            'pigmentindigo'=>array(75,0,130),
+            'indigodye'=>array(0,65,106),
+            'cornflowerblue'=>array(100,149,237),
+            'darkslateblue'=>array(72,61,139),
+            'slateblue'=>array(106,90,205),
+            'mediumslateblue'=>array(123,104,238),
+            'lightslateblue'=>array(132,112,255),
+            'mediumblue'=>array(0,0,205),
+            'royalblue'=>array(65,105,225),
+            'blue'=>array(0,0,255),
+            'dodgerblue'=>array(30,144,255),
+            'deepskyblue'=>array(0,191,255),
+            'skyblue'=>array(135,206,235),
+            'lightskyblue'=>array(135,206,250),
+            'steelblue'=>array(70,130,180),
+            'lightred'=>array(211,167,168),
+            'lightsteelblue'=>array(176,196,222),
+            'lightblue'=>array(173,216,230),
+            'powderblue'=>array(176,224,230),
+            'paleturquoise'=>array(175,238,238),
+            'darkturquoise'=>array(0,206,209),
+            'mediumturquoise'=>array(72,209,204),
+            'turquoise'=>array(64,224,208),
+            'cyan'=>array(0,255,255),
+            'lightcyan'=>array(224,255,255),
+            'cadetblue'=>array(95,158,160),
+            'mediumaquamarine'=>array(102,205,170),
+            'aquamarine'=>array(127,255,212),
+            'darkgreen'=>array(0,100,0),
+            'darkolivegreen'=>array(85,107,47),
+            'darkseagreen'=>array(143,188,143),
+            'seagreen'=>array(46,139,87),
+            'mediumseagreen'=>array(60,179,113),
+            'lightseagreen'=>array(32,178,170),
+            'palegreen'=>array(152,251,152),
+            'springgreen'=>array(0,255,127),
+            'lawngreen'=>array(124,252,0),
+            'green'=>array(0,255,0),
+            'chartreuse'=>array(127,255,0),
+            'mediumspringgreen'=>array(0,250,154),
+            'greenyellow'=>array(173,255,47),
+            'limegreen'=>array(50,205,50),
+            'yellowgreen'=>array(154,205,50),
+            'forestgreen'=>array(34,139,34),
+            'olivedrab'=>array(107,142,35),
+            'darkkhaki'=>array(189,183,107),
+            'khaki'=>array(240,230,140),
+            'palegoldenrod'=>array(238,232,170),
+            'lightgoldenrodyellow'=>array(250,250,210),
+            'lightyellow'=>array(255,255,200),
+            'yellow'=>array(255,255,0),
+            'gold'=>array(255,215,0),
+            'lightgoldenrod'=>array(238,221,130),
+            'goldenrod'=>array(218,165,32),
+            'darkgoldenrod'=>array(184,134,11),
+            'rosybrown'=>array(188,143,143),
+            'indianred'=>array(205,92,92),
+            'saddlebrown'=>array(139,69,19),
+            'sienna'=>array(160,82,45),
+            'peru'=>array(205,133,63),
+            'burlywood'=>array(222,184,135),
+            'beige'=>array(245,245,220),
+            'wheat'=>array(245,222,179),
+            'sandybrown'=>array(244,164,96),
+            'tan'=>array(210,180,140),
+            'chocolate'=>array(210,105,30),
+            'firebrick'=>array(178,34,34),
+            'brown'=>array(165,42,42),
+            'darksalmon'=>array(233,150,122),
+            'salmon'=>array(250,128,114),
+            'lightsalmon'=>array(255,160,122),
+            'orange'=>array(255,165,0),
+            'darkorange'=>array(255,140,0),
+            'coral'=>array(255,127,80),
+            'lightcoral'=>array(240,128,128),
+            'tomato'=>array(255,99,71),
+            'orangered'=>array(255,69,0),
+            'red'=>array(255,0,0),
+            'hotpink'=>array(255,105,180),
+            'deeppink'=>array(255,20,147),
+            'pink'=>array(255,192,203),
+            'lightpink'=>array(255,182,193),
+            'palevioletred'=>array(219,112,147),
+            'maroon'=>array(176,48,96),
+            'mediumvioletred'=>array(199,21,133),
+            'violetred'=>array(208,32,144),
+            'magenta'=>array(255,0,255),
+            'violet'=>array(238,130,238),
+            'plum'=>array(221,160,221),
+            'orchid'=>array(218,112,214),
+            'mediumorchid'=>array(186,85,211),
+            'darkorchid'=>array(153,50,204),
+            'darkviolet'=>array(148,0,211),
+            'blueviolet'=>array(138,43,226),
+            'purple'=>array(160,32,240),
+            'mediumpurple'=>array(147,112,219),
+            'thistle'=>array(216,191,216),
+            'snow1'=>array(255,250,250),
+            'snow2'=>array(238,233,233),
+            'snow3'=>array(205,201,201),
+            'snow4'=>array(139,137,137),
+            'seashell1'=>array(255,245,238),
+            'seashell2'=>array(238,229,222),
+            'seashell3'=>array(205,197,191),
+            'seashell4'=>array(139,134,130),
+            'AntiqueWhite1'=>array(255,239,219),
+            'AntiqueWhite2'=>array(238,223,204),
+            'AntiqueWhite3'=>array(205,192,176),
+            'AntiqueWhite4'=>array(139,131,120),
+            'bisque1'=>array(255,228,196),
+            'bisque2'=>array(238,213,183),
+            'bisque3'=>array(205,183,158),
+            'bisque4'=>array(139,125,107),
+            'peachPuff1'=>array(255,218,185),
+            'peachpuff2'=>array(238,203,173),
+            'peachpuff3'=>array(205,175,149),
+            'peachpuff4'=>array(139,119,101),
+            'navajowhite1'=>array(255,222,173),
+            'navajowhite2'=>array(238,207,161),
+            'navajowhite3'=>array(205,179,139),
+            'navajowhite4'=>array(139,121,94),
+            'lemonchiffon1'=>array(255,250,205),
+            'lemonchiffon2'=>array(238,233,191),
+            'lemonchiffon3'=>array(205,201,165),
+            'lemonchiffon4'=>array(139,137,112),
+            'ivory1'=>array(255,255,240),
+            'ivory2'=>array(238,238,224),
+            'ivory3'=>array(205,205,193),
+            'ivory4'=>array(139,139,131),
+            'honeydew'=>array(193,205,193),
+            'lavenderblush1'=>array(255,240,245),
+            'lavenderblush2'=>array(238,224,229),
+            'lavenderblush3'=>array(205,193,197),
+            'lavenderblush4'=>array(139,131,134),
+            'mistyrose1'=>array(255,228,225),
+            'mistyrose2'=>array(238,213,210),
+            'mistyrose3'=>array(205,183,181),
+            'mistyrose4'=>array(139,125,123),
+            'azure1'=>array(240,255,255),
+            'azure2'=>array(224,238,238),
+            'azure3'=>array(193,205,205),
+            'azure4'=>array(131,139,139),
+            'slateblue1'=>array(131,111,255),
+            'slateblue2'=>array(122,103,238),
+            'slateblue3'=>array(105,89,205),
+            'slateblue4'=>array(71,60,139),
+            'royalblue1'=>array(72,118,255),
+            'royalblue2'=>array(67,110,238),
+            'royalblue3'=>array(58,95,205),
+            'royalblue4'=>array(39,64,139),
+            'dodgerblue1'=>array(30,144,255),
+            'dodgerblue2'=>array(28,134,238),
+            'dodgerblue3'=>array(24,116,205),
+            'dodgerblue4'=>array(16,78,139),
+            'steelblue1'=>array(99,184,255),
+            'steelblue2'=>array(92,172,238),
+            'steelblue3'=>array(79,148,205),
+            'steelblue4'=>array(54,100,139),
+            'deepskyblue1'=>array(0,191,255),
+            'deepskyblue2'=>array(0,178,238),
+            'deepskyblue3'=>array(0,154,205),
+            'deepskyblue4'=>array(0,104,139),
+            'skyblue1'=>array(135,206,255),
+            'skyblue2'=>array(126,192,238),
+            'skyblue3'=>array(108,166,205),
+            'skyblue4'=>array(74,112,139),
+            'lightskyblue1'=>array(176,226,255),
+            'lightskyblue2'=>array(164,211,238),
+            'lightskyblue3'=>array(141,182,205),
+            'lightskyblue4'=>array(96,123,139),
+            'slategray1'=>array(198,226,255),
+            'slategray2'=>array(185,211,238),
+            'slategray3'=>array(159,182,205),
+            'slategray4'=>array(108,123,139),
+            'lightsteelblue1'=>array(202,225,255),
+            'lightsteelblue2'=>array(188,210,238),
+            'lightsteelblue3'=>array(162,181,205),
+            'lightsteelblue4'=>array(110,123,139),
+            'lightblue1'=>array(191,239,255),
+            'lightblue2'=>array(178,223,238),
+            'lightblue3'=>array(154,192,205),
+            'lightblue4'=>array(104,131,139),
+            'lightcyan1'=>array(224,255,255),
+            'lightcyan2'=>array(209,238,238),
+            'lightcyan3'=>array(180,205,205),
+            'lightcyan4'=>array(122,139,139),
+            'paleturquoise1'=>array(187,255,255),
+            'paleturquoise2'=>array(174,238,238),
+            'paleturquoise3'=>array(150,205,205),
+            'paleturquoise4'=>array(102,139,139),
+            'cadetblue1'=>array(152,245,255),
+            'cadetblue2'=>array(142,229,238),
+            'cadetblue3'=>array(122,197,205),
+            'cadetblue4'=>array(83,134,139),
+            'turquoise1'=>array(0,245,255),
+            'turquoise2'=>array(0,229,238),
+            'turquoise3'=>array(0,197,205),
+            'turquoise4'=>array(0,134,139),
+            'cyan1'=>array(0,255,255),
+            'cyan2'=>array(0,238,238),
+            'cyan3'=>array(0,205,205),
+            'cyan4'=>array(0,139,139),
+            'darkslategray1'=>array(151,255,255),
+            'darkslategray2'=>array(141,238,238),
+            'darkslategray3'=>array(121,205,205),
+            'darkslategray4'=>array(82,139,139),
+            'aquamarine1'=>array(127,255,212),
+            'aquamarine2'=>array(118,238,198),
+            'aquamarine3'=>array(102,205,170),
+            'aquamarine4'=>array(69,139,116),
+            'darkseagreen1'=>array(193,255,193),
+            'darkseagreen2'=>array(180,238,180),
+            'darkseagreen3'=>array(155,205,155),
+            'darkseagreen4'=>array(105,139,105),
+            'seagreen1'=>array(84,255,159),
+            'seagreen2'=>array(78,238,148),
+            'seagreen3'=>array(67,205,128),
+            'seagreen4'=>array(46,139,87),
+            'palegreen1'=>array(154,255,154),
+            'palegreen2'=>array(144,238,144),
+            'palegreen3'=>array(124,205,124),
+            'palegreen4'=>array(84,139,84),
+            'springgreen1'=>array(0,255,127),
+            'springgreen2'=>array(0,238,118),
+            'springgreen3'=>array(0,205,102),
+            'springgreen4'=>array(0,139,69),
+            'chartreuse1'=>array(127,255,0),
+            'chartreuse2'=>array(118,238,0),
+            'chartreuse3'=>array(102,205,0),
+            'chartreuse4'=>array(69,139,0),
+            'olivedrab1'=>array(192,255,62),
+            'olivedrab2'=>array(179,238,58),
+            'olivedrab3'=>array(154,205,50),
+            'olivedrab4'=>array(105,139,34),
+            'darkolivegreen1'=>array(202,255,112),
+            'darkolivegreen2'=>array(188,238,104),
+            'darkolivegreen3'=>array(162,205,90),
+            'darkolivegreen4'=>array(110,139,61),
+            'khaki1'=>array(255,246,143),
+            'khaki2'=>array(238,230,133),
+            'khaki3'=>array(205,198,115),
+            'khaki4'=>array(139,134,78),
+            'lightgoldenrod1'=>array(255,236,139),
+            'lightgoldenrod2'=>array(238,220,130),
+            'lightgoldenrod3'=>array(205,190,112),
+            'lightgoldenrod4'=>array(139,129,76),
+            'yellow1'=>array(255,255,0),
+            'yellow2'=>array(238,238,0),
+            'yellow3'=>array(205,205,0),
+            'yellow4'=>array(139,139,0),
+            'gold1'=>array(255,215,0),
+            'gold2'=>array(238,201,0),
+            'gold3'=>array(205,173,0),
+            'gold4'=>array(139,117,0),
+            'goldenrod1'=>array(255,193,37),
+            'goldenrod2'=>array(238,180,34),
+            'goldenrod3'=>array(205,155,29),
+            'goldenrod4'=>array(139,105,20),
+            'darkgoldenrod1'=>array(255,185,15),
+            'darkgoldenrod2'=>array(238,173,14),
+            'darkgoldenrod3'=>array(205,149,12),
+            'darkgoldenrod4'=>array(139,101,8),
+            'rosybrown1'=>array(255,193,193),
+            'rosybrown2'=>array(238,180,180),
+            'rosybrown3'=>array(205,155,155),
+            'rosybrown4'=>array(139,105,105),
+            'indianred1'=>array(255,106,106),
+            'indianred2'=>array(238,99,99),
+            'indianred3'=>array(205,85,85),
+            'indianred4'=>array(139,58,58),
+            'sienna1'=>array(255,130,71),
+            'sienna2'=>array(238,121,66),
+            'sienna3'=>array(205,104,57),
+            'sienna4'=>array(139,71,38),
+            'burlywood1'=>array(255,211,155),
+            'burlywood2'=>array(238,197,145),
+            'burlywood3'=>array(205,170,125),
+            'burlywood4'=>array(139,115,85),
+            'wheat1'=>array(255,231,186),
+            'wheat2'=>array(238,216,174),
+            'wheat3'=>array(205,186,150),
+            'wheat4'=>array(139,126,102),
+            'tan1'=>array(255,165,79),
+            'tan2'=>array(238,154,73),
+            'tan3'=>array(205,133,63),
+            'tan4'=>array(139,90,43),
+            'chocolate1'=>array(255,127,36),
+            'chocolate2'=>array(238,118,33),
+            'chocolate3'=>array(205,102,29),
+            'chocolate4'=>array(139,69,19),
+            'firebrick1'=>array(255,48,48),
+            'firebrick2'=>array(238,44,44),
+            'firebrick3'=>array(205,38,38),
+            'firebrick4'=>array(139,26,26),
+            'brown1'=>array(255,64,64),
+            'brown2'=>array(238,59,59),
+            'brown3'=>array(205,51,51),
+            'brown4'=>array(139,35,35),
+            'salmon1'=>array(255,140,105),
+            'salmon2'=>array(238,130,98),
+            'salmon3'=>array(205,112,84),
+            'salmon4'=>array(139,76,57),
+            'lightsalmon1'=>array(255,160,122),
+            'lightsalmon2'=>array(238,149,114),
+            'lightsalmon3'=>array(205,129,98),
+            'lightsalmon4'=>array(139,87,66),
+            'orange1'=>array(255,165,0),
+            'orange2'=>array(238,154,0),
+            'orange3'=>array(205,133,0),
+            'orange4'=>array(139,90,0),
+            'darkorange1'=>array(255,127,0),
+            'darkorange2'=>array(238,118,0),
+            'darkorange3'=>array(205,102,0),
+            'darkorange4'=>array(139,69,0),
+            'coral1'=>array(255,114,86),
+            'coral2'=>array(238,106,80),
+            'coral3'=>array(205,91,69),
+            'coral4'=>array(139,62,47),
+            'tomato1'=>array(255,99,71),
+            'tomato2'=>array(238,92,66),
+            'tomato3'=>array(205,79,57),
+            'tomato4'=>array(139,54,38),
+            'orangered1'=>array(255,69,0),
+            'orangered2'=>array(238,64,0),
+            'orangered3'=>array(205,55,0),
+            'orangered4'=>array(139,37,0),
+            'deeppink1'=>array(255,20,147),
+            'deeppink2'=>array(238,18,137),
+            'deeppink3'=>array(205,16,118),
+            'deeppink4'=>array(139,10,80),
+            'hotpink1'=>array(255,110,180),
+            'hotpink2'=>array(238,106,167),
+            'hotpink3'=>array(205,96,144),
+            'hotpink4'=>array(139,58,98),
+            'pink1'=>array(255,181,197),
+            'pink2'=>array(238,169,184),
+            'pink3'=>array(205,145,158),
+            'pink4'=>array(139,99,108),
+            'lightpink1'=>array(255,174,185),
+            'lightpink2'=>array(238,162,173),
+            'lightpink3'=>array(205,140,149),
+            'lightpink4'=>array(139,95,101),
+            'palevioletred1'=>array(255,130,171),
+            'palevioletred2'=>array(238,121,159),
+            'palevioletred3'=>array(205,104,137),
+            'palevioletred4'=>array(139,71,93),
+            'maroon1'=>array(255,52,179),
+            'maroon2'=>array(238,48,167),
+            'maroon3'=>array(205,41,144),
+            'maroon4'=>array(139,28,98),
+            'violetred1'=>array(255,62,150),
+            'violetred2'=>array(238,58,140),
+            'violetred3'=>array(205,50,120),
+            'violetred4'=>array(139,34,82),
+            'magenta1'=>array(255,0,255),
+            'magenta2'=>array(238,0,238),
+            'magenta3'=>array(205,0,205),
+            'magenta4'=>array(139,0,139),
+            'mediumred'=>array(140,34,34),
+            'orchid1'=>array(255,131,250),
+            'orchid2'=>array(238,122,233),
+            'orchid3'=>array(205,105,201),
+            'orchid4'=>array(139,71,137),
+            'plum1'=>array(255,187,255),
+            'plum2'=>array(238,174,238),
+            'plum3'=>array(205,150,205),
+            'plum4'=>array(139,102,139),
+            'mediumorchid1'=>array(224,102,255),
+            'mediumorchid2'=>array(209,95,238),
+            'mediumorchid3'=>array(180,82,205),
+            'mediumorchid4'=>array(122,55,139),
+            'darkorchid1'=>array(191,62,255),
+            'darkorchid2'=>array(178,58,238),
+            'darkorchid3'=>array(154,50,205),
+            'darkorchid4'=>array(104,34,139),
+            'purple1'=>array(155,48,255),
+            'purple2'=>array(145,44,238),
+            'purple3'=>array(125,38,205),
+            'purple4'=>array(85,26,139),
+            'mediumpurple1'=>array(171,130,255),
+            'mediumpurple2'=>array(159,121,238),
+            'mediumpurple3'=>array(137,104,205),
+            'mediumpurple4'=>array(93,71,139),
+            'thistle1'=>array(255,225,255),
+            'thistle2'=>array(238,210,238),
+            'thistle3'=>array(205,181,205),
+            'thistle4'=>array(139,123,139),
+            'gray1'=>array(10,10,10),
+            'gray2'=>array(40,40,30),
+            'gray3'=>array(70,70,70),
+            'gray4'=>array(100,100,100),
+            'gray5'=>array(130,130,130),
+            'gray6'=>array(160,160,160),
+            'gray7'=>array(190,190,190),
+            'gray8'=>array(210,210,210),
+            'gray9'=>array(240,240,240),
+            'darkgray'=>array(100,100,100),
+            'darkblue'=>array(0,0,139),
+            'darkcyan'=>array(0,139,139),
+            'darkmagenta'=>array(139,0,139),
+            'darkred'=>array(139,0,0),
+            'silver'=>array(192, 192, 192),
+            'eggplant'=>array(144,176,168),
+            'lightgreen'=>array(144,238,144));
+    }
+
+
+    //----------------
+    // PUBLIC METHODS
+    // Colors can be specified as either
+    // 1. #xxxxxx   HTML style
+    // 2. "colorname"  as a named color
+    // 3. array(r,g,b) RGB triple
+    // This function translates this to a native RGB format and returns an
+    // RGB triple.
+
+    function Color($aColor) {
+        if (is_string($aColor)) {
+            $matches = array();
+            // this regex will parse a color string and fill the $matches array as such:
+            // 0: the full match if any
+            // 1: a hex string preceded by a hash, can be 3 characters (#fff) or 6 (#ffffff) (4 or 5 also accepted but...)
+            // 2,3,4: r,g,b values in hex if the first character of the string is #
+            // 5: all alpha-numeric characters at the beginning of the string if string does not start with #
+            // 6: alpha value prefixed by @ if supplied
+            // 7: alpha value with @ stripped
+            // 8: adjust value prefixed with : if supplied
+            // 9: adjust value with : stripped
+            $regex = '/(#([0-9a-fA-F]{1,2})([0-9a-fA-F]{1,2})([0-9a-fA-F]{1,2}))?([\w]+)?(@([\d\.,]+))?(:([\d\.,]+))?/';
+            if(!preg_match($regex, $aColor, $matches)) {
+                JpGraphError::RaiseL(25078,$aColor);//(" Unknown color: $aColor");
+            }
+            if(empty($matches[5])) {
+                $r = strlen($matches[2]) == 1 ? $matches[2].$matches[2] : $matches[2];
+                $g = strlen($matches[3]) == 1 ? $matches[3].$matches[3] : $matches[3];
+                $b = strlen($matches[4]) == 1 ? $matches[4].$matches[4] : $matches[4];
+                $r = hexdec($r);
+                $g = hexdec($g);
+                $b = hexdec($b);
+            }else {
+                if(!isset($this->rgb_table[$matches[5]]) ) {
+                    JpGraphError::RaiseL(25078,$aColor);//(" Unknown color: $aColor");
+                }
+                $r = $this->rgb_table[$matches[5]][0];
+                $g = $this->rgb_table[$matches[5]][1];
+                $b = $this->rgb_table[$matches[5]][2];
+            }
+            $alpha	= isset($matches[7]) ? str_replace(',','.',$matches[7]) : 0;
+            $adj	= isset($matches[9]) ? str_replace(',','.',$matches[9]) : 1.0;
+
+            if( $adj < 0 ) {
+                JpGraphError::RaiseL(25077);//('Adjustment factor for color must be > 0');
+            }
+
+            // Scale adj so that an adj=2 always
+            // makes the color 100% white (i.e. 255,255,255.
+            // and adj=1 neutral and adj=0 black.
+            if( $adj == 1) {
+                return array($r,$g,$b,$alpha);
+            }
+            elseif( $adj > 1 ) {
+                $m = ($adj-1.0)*(255-min(255,min($r,min($g,$b))));
+                return array(min(255,$r+$m), min(255,$g+$m), min(255,$b+$m),$alpha);
+            }
+            elseif( $adj < 1 ) {
+                $m = ($adj-1.0)*max(255,max($r,max($g,$b)));
+                return array(max(0,$r+$m), max(0,$g+$m), max(0,$b+$m),$alpha);
+            }
+        } elseif( is_array($aColor) ) {
+            if(!isset($aColor[3])) $aColor[3] = 0;
+            return $aColor;
+        }
+        else {
+            JpGraphError::RaiseL(25079,$aColor,count($aColor));//(" Unknown color specification: $aColor , size=".count($aColor));
+        }
+    }
+
+    // Compare two colors
+    // return true if equal
+    function Equal($aCol1,$aCol2) {
+        $c1 = $this->Color($aCol1);
+        $c2 = $this->Color($aCol2);
+        return $c1[0]==$c2[0] && $c1[1]==$c2[1] && $c1[2]==$c2[2] ;
+    }
+
+    // Allocate a new color in the current image
+    // Return new color index, -1 if no more colors could be allocated
+    function Allocate($aColor,$aAlpha=0.0) {
+        list ($r, $g, $b, $a) = $this->color($aColor);
+        // If alpha is specified in the color string then this
+        // takes precedence over the second argument
+        if( $a > 0 ) {
+            $aAlpha = $a;
+        }
+        if( $aAlpha < 0 || $aAlpha > 1 ) {
+            JpGraphError::RaiseL(25080);//('Alpha parameter for color must be between 0.0 and 1.0');
+        }
+        return imagecolorresolvealpha($this->img, $r, $g, $b, round($aAlpha * 127));
+    }
+
+    // Try to convert an array with three valid numbers to the corresponding hex array
+    // This is currenly only used in processing the colors for barplots in order to be able
+    // to handle the case where the color might be specified as an array of colros as well.
+    // In that case we must be able to find out if an array of values should be interpretated as
+    // a single color (specifeid as an RGB triple)
+    static function tryHexConversion($aColor) {
+        if( is_array( $aColor ) ) {
+            if( count( $aColor ) == 3 ) {
+                if( is_numeric($aColor[0]) && is_numeric($aColor[1]) && is_numeric($aColor[2]) ) {
+                    if( ($aColor[0] >= 0 && $aColor[0] <= 255) &&
+                        ($aColor[1] >= 0 && $aColor[1] <= 255) &&
+                        ($aColor[2] >= 0 && $aColor[2] <= 255) ) {
+                        return sprintf('#%02x%02x%02x',$aColor[0],$aColor[1],$aColor[2]);
+                    }
+                }
+            }
+        }
+        return $aColor;
+    }
+
+    // Return a RGB tripple corresponding to a position in the normal light spectrum
+    // The argumen values is in the range [0, 1] where a value of 0 correponds to blue and
+    // a value of 1 corresponds to red. Values in betwen is mapped to a linear interpolation
+    // of the constituting colors in the visible color spectra.
+    // The $aDynamicRange specified how much of the dynamic range we shold use
+    // a value of 1.0 give the full dyanmic range and a lower value give more dark
+    // colors. In the extreme of 0.0 then all colors will be black.
+    static function GetSpectrum($aVal,$aDynamicRange=1.0) {
+        if( $aVal < 0 || $aVal > 1.0001 ) {
+            return array(0,0,0); // Invalid case - just return black
+        }
+
+        $sat = round(255*$aDynamicRange);
+        $a = 0.25;
+        if( $aVal <= 0.25 ) {
+            return array(0, round($sat*$aVal/$a), $sat);
+        }
+        elseif( $aVal <= 0.5 ) {
+            return array(0, $sat, round($sat-$sat*($aVal-0.25)/$a));
+        }
+        elseif( $aVal <= 0.75 ) {
+            return array(round($sat*($aVal-0.5)/$a), $sat, 0);
+        }
+        else {
+            return array($sat, round($sat-$sat*($aVal-0.75)/$a), 0);
+        }
+    }
+
+} // Class
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_scatter.php b/common/lib/jpgraph_lib/jpgraph_scatter.php
old mode 100644
new mode 100755
index e96de7497..fe987c2c9
--- a/common/lib/jpgraph_lib/jpgraph_scatter.php
+++ b/common/lib/jpgraph_lib/jpgraph_scatter.php
@@ -1,61 +1,60 @@
 <?php
 /*=======================================================================
-// File:	JPGRAPH_SCATTER.PHP
-// Description: Scatter (and impuls) plot extension for JpGraph
-// Created: 	2001-02-11
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_scatter.php,v 1.31.2.2 2004/03/27 12:19:36 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2001,2002 Johan Persson
-//========================================================================
-*/
-require_once 'jpgraph_plotmark.inc';
+ // File:        JPGRAPH_SCATTER.PHP
+ // Description: Scatter (and impuls) plot extension for JpGraph
+ // Created:     2001-02-11
+ // Ver:         $Id: jpgraph_scatter.php 1397 2009-06-27 21:34:14Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+require_once ('jpgraph_plotmark.inc.php');
 
 //===================================================
 // CLASS FieldArrow
 // Description: Draw an arrow at (x,y) with angle a
 //===================================================
-class FieldArrow
-{
+class FieldArrow {
+    public $iColor='black';
     public $iSize=10;  // Length in pixels for  arrow
     public $iArrowSize = 2;
-    public $iColor='black';
-    public $isizespec = array(
-    array(2,1),array(3,2),array(4,3),array(6,4),array(7,4),array(8,5),array(10,6),array(12,7),array(16,8),array(20,10));
-    public function FieldArrow()
-    {
+    private $isizespec = array(
+    	array(2,1),array(3,2),array(4,3),array(6,4),array(7,4),array(8,5),array(10,6),array(12,7),array(16,8),array(20,10)
+    	);
+    function __construct() {
+    	// Empty
     }
 
-    public function SetSize($aSize,$aArrowSize=2)
-    {
-    $this->iSize = $aSize;
-    $this->iArrowSize = $aArrowSize;
+    function SetSize($aSize,$aArrowSize=2) {
+        $this->iSize = $aSize;
+        $this->iArrowSize = $aArrowSize;
     }
 
-    public function SetColor($aColor)
-    {
-    $this->iColor = $aColor;
+    function SetColor($aColor) {
+        $this->iColor = $aColor;
     }
 
-    public function Stroke($aImg,$x,$y,$a)
-    {
-    $old_origin = $aImg->SetCenter($x,$y);
-    $old_a = $aImg->SetAngle(-$a);
+    function Stroke($aImg,$x,$y,$a) {
+        // First rotate the center coordinates
+        list($x,$y) = $aImg->Rotate($x,$y);
+
+        $old_origin = $aImg->SetCenter($x,$y);
+        $old_a = $aImg->a;
+        $aImg->SetAngle(-$a+$old_a);
 
-    $dx = round($this->iSize/2);
-    $c = array($x-$dx,$y,$x+$dx,$y);
-    $x += $dx;
+        $dx = round($this->iSize/2);
+        $c = array($x-$dx,$y,$x+$dx,$y);
+        $x += $dx;
 
-    list($dx,$dy) = $this->isizespec[$this->iArrowSize];
-    $ca = array($x,$y,$x-$dx,$y-$dy,$x-$dx,$y+$dy,$x,$y);
+        list($dx,$dy) = $this->isizespec[$this->iArrowSize];
+        $ca = array($x,$y,$x-$dx,$y-$dy,$x-$dx,$y+$dy,$x,$y);
 
-    $aImg->SetColor($this->iColor);
-    $aImg->Polygon($c);
-    $aImg->FilledPolygon($ca);
+        $aImg->SetColor($this->iColor);
+        $aImg->Polygon($c);
+        $aImg->FilledPolygon($ca);
 
-    $aImg->SetCenter($old_origin[0],$old_origin[1]);
-    $aImg->SetAngle($old_a);
+        $aImg->SetCenter($old_origin[0],$old_origin[1]);
+        $aImg->SetAngle($old_a);
     }
 }
 
@@ -63,70 +62,67 @@ public function Stroke($aImg,$x,$y,$a)
 // CLASS FieldPlot
 // Description: Render a field plot
 //===================================================
-class FieldPlot extends Plot
-{
-    public $iAngles;
-    public $iCallback='';
-    public function FieldPlot($datay,$datax,$angles)
-    {
-    if( (count($datax) != count($datay)) )
-        JpGraphError::Raise("Fieldplots must have equal number of X and Y points.");
-    if( (count($datax) != count($angles)) )
-        JpGraphError::Raise("Fieldplots must have an angle specified for each X and Y points.");
-
-    $this->iAngles = $angles;
-
-    $this->Plot($datay,$datax);
-    $this->value->SetAlign('center','center');
-    $this->value->SetMargin(15);
-
-    $this->arrow = new FieldArrow();
+class FieldPlot extends Plot {
+    public $arrow = '';
+    private $iAngles = array();
+    private $iCallback = '';
+
+    function __construct($datay,$datax,$angles) {
+        if( (count($datax) != count($datay)) )
+        JpGraphError::RaiseL(20001);//("Fieldplots must have equal number of X and Y points.");
+        if( (count($datax) != count($angles)) )
+        JpGraphError::RaiseL(20002);//("Fieldplots must have an angle specified for each X and Y points.");
+
+        $this->iAngles = $angles;
+
+        parent::__construct($datay,$datax);
+        $this->value->SetAlign('center','center');
+        $this->value->SetMargin(15);
+
+        $this->arrow = new FieldArrow();
     }
 
-    public function SetCallback($aFunc)
-    {
-    $this->iCallback = $aFunc;
+    function SetCallback($aFunc) {
+        $this->iCallback = $aFunc;
     }
 
-    public function Stroke(&$img,&$xscale,&$yscale)
-    {
-    // Remeber base color and size
-    $bc = $this->arrow->iColor;
-    $bs = $this->arrow->iSize;
-    $bas = $this->arrow->iArrowSize;
-
-    for ($i=0; $i<$this->numpoints; ++$i) {
-        // Skip null values
-        if( $this->coords[0][$i]==="" )
-        continue;
-
-        $f = $this->iCallback;
-        if ($f != "") {
-        list($cc,$cs,$cas) = call_user_func($f,$this->coords[1][$i],$this->coords[0][$i],$this->iAngles[$i]);
-        // Fall back on global data if the callback isn't set
-        if( $cc  == "" ) $cc = $bc;
-        if( $cs  == "" ) $cs = $bs;
-        if( $cas == "" ) $cas = $bas;
-        //echo "f=$f, cc=$cc, cs=$cs, cas=$cas<br>";
-        $this->arrow->SetColor($cc);
-        $this->arrow->SetSize($cs,$cas);
-        }
+    function Stroke($img,$xscale,$yscale) {
 
-        $xt = $xscale->Translate($this->coords[1][$i]);
-        $yt = $yscale->Translate($this->coords[0][$i]);
+        // Remeber base color and size
+        $bc = $this->arrow->iColor;
+        $bs = $this->arrow->iSize;
+        $bas = $this->arrow->iArrowSize;
 
-        $this->arrow->Stroke($img,$xt,$yt,$this->iAngles[$i]);
-        $this->value->Stroke($img,$this->coords[0][$i],$xt,$yt);
-    }
+        for( $i=0; $i<$this->numpoints; ++$i ) {
+            // Skip null values
+            if( $this->coords[0][$i]==="" )
+            continue;
+
+            $f = $this->iCallback;
+            if( $f != "" ) {
+                list($cc,$cs,$cas) = call_user_func($f,$this->coords[1][$i],$this->coords[0][$i],$this->iAngles[$i]);
+                // Fall back on global data if the callback isn't set
+                if( $cc  == "" ) $cc = $bc;
+                if( $cs  == "" ) $cs = $bs;
+                if( $cas == "" ) $cas = $bas;
+                $this->arrow->SetColor($cc);
+                $this->arrow->SetSize($cs,$cas);
+            }
+
+            $xt = $xscale->Translate($this->coords[1][$i]);
+            $yt = $yscale->Translate($this->coords[0][$i]);
+
+            $this->arrow->Stroke($img,$xt,$yt,$this->iAngles[$i]);
+            $this->value->Stroke($img,$this->coords[0][$i],$xt,$yt);
+        }
     }
 
     // Framework function
-    public function Legend(&$aGraph)
-    {
-    if ($this->legend != "") {
-        $aGraph->legend->Add($this->legend,$this->mark->fill_color,$this->mark,0,
-                 $this->legendcsimtarget,$this->legendcsimalt);
-    }
+    function Legend($aGraph) {
+        if( $this->legend != "" ) {
+            $aGraph->legend->Add($this->legend,$this->mark->fill_color,$this->mark,0,
+            $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
+        }
     }
 }
 
@@ -134,100 +130,113 @@ public function Legend(&$aGraph)
 // CLASS ScatterPlot
 // Description: Render X and Y plots
 //===================================================
-class ScatterPlot extends Plot
-{
-    public $impuls = false;
-    public $linkpoints = false, $linkpointweight=1, $linkpointcolor="black";
-//---------------
-// CONSTRUCTOR
-    public function ScatterPlot($datay,$datax=false)
-    {
-    if( (count($datax) != count($datay)) && is_array($datax))
-        JpGraphError::Raise("Scatterplot must have equal number of X and Y points.");
-    $this->Plot($datay,$datax);
-    $this->mark = new PlotMark();
-    $this->mark->SetType(MARK_SQUARE);
-    $this->mark->SetColor($this->color);
-    $this->value->SetAlign('center','center');
-    $this->value->SetMargin(0);
+class ScatterPlot extends Plot {
+    public $mark,$link;
+    private $impuls = false;
+    //---------------
+    // CONSTRUCTOR
+    function __construct($datay,$datax=false) {
+        if( (count($datax) != count($datay)) && is_array($datax)) {
+        	JpGraphError::RaiseL(20003);//("Scatterplot must have equal number of X and Y points.");
+        }
+        parent::__construct($datay,$datax);
+        $this->mark = new PlotMark();
+        $this->mark->SetType(MARK_SQUARE);
+        $this->mark->SetColor($this->color);
+        $this->value->SetAlign('center','center');
+        $this->value->SetMargin(0);
+        $this->link = new LineProperty(1,'black','solid');
+        $this->link->iShow = false;
     }
 
-//---------------
-// PUBLIC METHODS
-    public function SetImpuls($f=true)
-    {
-    $this->impuls = $f;
+    //---------------
+    // PUBLIC METHODS
+    function SetImpuls($f=true) {
+        $this->impuls = $f;
     }
 
-    // Combine the scatter plot points with a line
-    public function SetLinkPoints($aFlag=true,$aColor="black",$aWeight=1)
-    {
-    $this->linkpoints=$aFlag;
-    $this->linkpointcolor=$aColor;
-    $this->linkpointweight=$aWeight;
+    function SetStem($f=true) {
+        $this->impuls = $f;
     }
 
-    public function Stroke(&$img,&$xscale,&$yscale)
-    {
-    $ymin=$yscale->scale_abs[0];
-    if( $yscale->scale[0] < 0 )
-        $yzero=$yscale->Translate(0);
-    else
-        $yzero=$yscale->scale_abs[0];
-
-    $this->csimareas = '';
-    for ($i=0; $i<$this->numpoints; ++$i) {
+    // Combine the scatter plot points with a line
+    function SetLinkPoints($aFlag=true,$aColor="black",$aWeight=1,$aStyle='solid') {
+    	$this->link->iShow = $aFlag;
+    	$this->link->iColor = $aColor;
+    	$this->link->iWeight = $aWeight;
+    	$this->link->iStyle = $aStyle;
+    }
 
-        // Skip null values
-        if( $this->coords[0][$i]==="" )
-        continue;
+    function Stroke($img,$xscale,$yscale) {
 
-        if( isset($this->coords[1]) )
-        $xt = $xscale->Translate($this->coords[1][$i]);
+        $ymin=$yscale->scale_abs[0];
+        if( $yscale->scale[0] < 0 )
+        $yzero=$yscale->Translate(0);
         else
-        $xt = $xscale->Translate($i);
-        $yt = $yscale->Translate($this->coords[0][$i]);
-
-        if ( $this->linkpoints && isset($yt_old) ) {
-        $img->SetColor($this->linkpointcolor);
-        $img->SetLineWeight($this->linkpointweight);
-        $img->Line($xt_old,$yt_old,$xt,$yt);
-        }
-
-        if ($this->impuls) {
-        $img->SetColor($this->color);
-        $img->SetLineWeight($this->weight);
-        $img->Line($xt,$yzero,$xt,$yt);
-        }
-
-        if ( !empty($this->csimtargets[$i]) ) {
-            $this->mark->SetCSIMTarget($this->csimtargets[$i]);
-            $this->mark->SetCSIMAlt($this->csimalts[$i]);
-        }
+        $yzero=$yscale->scale_abs[0];
 
-        if ( isset($this->coords[1]) ) {
-        $this->mark->SetCSIMAltVal($this->coords[0][$i],$this->coords[1][$i]);
-        } else {
-        $this->mark->SetCSIMAltVal($this->coords[0][$i],$i);
+        $this->csimareas = '';
+        for( $i=0; $i<$this->numpoints; ++$i ) {
+
+            // Skip null values
+            if( $this->coords[0][$i]==='' || $this->coords[0][$i]==='-' || $this->coords[0][$i]==='x')
+            continue;
+
+            if( isset($this->coords[1]) )
+            $xt = $xscale->Translate($this->coords[1][$i]);
+            else
+            $xt = $xscale->Translate($i);
+            $yt = $yscale->Translate($this->coords[0][$i]);
+
+
+            if( $this->link->iShow && isset($yt_old) ) {
+                $img->SetColor($this->link->iColor);
+                $img->SetLineWeight($this->link->iWeight);
+                $old = $img->SetLineStyle($this->link->iStyle);
+                $img->StyleLine($xt_old,$yt_old,$xt,$yt);
+                $img->SetLineStyle($old);
+            }
+
+            if( $this->impuls ) {
+                $img->SetColor($this->color);
+                $img->SetLineWeight($this->weight);
+                $img->Line($xt,$yzero,$xt,$yt);
+            }
+
+            if( !empty($this->csimtargets[$i]) ) {
+                if( !empty($this->csimwintargets[$i]) ) {
+                    $this->mark->SetCSIMTarget($this->csimtargets[$i],$this->csimwintargets[$i]);
+                }
+                else {
+                    $this->mark->SetCSIMTarget($this->csimtargets[$i]);
+                }
+                $this->mark->SetCSIMAlt($this->csimalts[$i]);
+            }
+
+            if( isset($this->coords[1]) ) {
+                $this->mark->SetCSIMAltVal($this->coords[0][$i],$this->coords[1][$i]);
+            }
+            else {
+                $this->mark->SetCSIMAltVal($this->coords[0][$i],$i);
+            }
+
+            $this->mark->Stroke($img,$xt,$yt);
+
+            $this->csimareas .= $this->mark->GetCSIMAreas();
+            $this->value->Stroke($img,$this->coords[0][$i],$xt,$yt);
+
+            $xt_old = $xt;
+            $yt_old = $yt;
         }
-
-        $this->mark->Stroke($img,$xt,$yt);
-
-        $this->csimareas .= $this->mark->GetCSIMAreas();
-        $this->value->Stroke($img,$this->coords[0][$i],$xt,$yt);
-
-        $xt_old = $xt;
-        $yt_old = $yt;
-    }
     }
 
     // Framework function
-    public function Legend(&$aGraph)
-    {
-    if ($this->legend != "") {
-        $aGraph->legend->Add($this->legend,$this->mark->fill_color,$this->mark,0,
-                 $this->legendcsimtarget,$this->legendcsimalt);
-    }
+    function Legend($aGraph) {
+        if( $this->legend != "" ) {
+            $aGraph->legend->Add($this->legend,$this->mark->fill_color,$this->mark,0,
+            $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
+        }
     }
 } // Class
 /* EOF */
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_stock.php b/common/lib/jpgraph_lib/jpgraph_stock.php
old mode 100644
new mode 100755
index 021f5bd30..88c420848
--- a/common/lib/jpgraph_lib/jpgraph_stock.php
+++ b/common/lib/jpgraph_lib/jpgraph_stock.php
@@ -1,192 +1,198 @@
 <?php
 /*=======================================================================
-// File: 	JPGRAPH_STOCK.PHP
-// Description:	Stock plot extension for JpGraph
-// Created: 	2003-01-27
-// Author:	Johan Persson (johanp@aditus.nu)
-// Ver:		$Id: jpgraph_stock.php,v 1.5.2.2 2004/12/11 14:41:54 aditus Exp $
-//
-// License:	This code is released under QPL
-// Copyright (C) 2003 Johan Persson
-//========================================================================
-*/
+ // File:        JPGRAPH_STOCK.PHP
+ // Description: Stock plot extension for JpGraph
+ // Created:     2003-01-27
+ // Ver:         $Id: jpgraph_stock.php 1364 2009-06-24 07:07:44Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
 
 //===================================================
 // CLASS StockPlot
 //===================================================
-class StockPlot extends Plot
-{
-    public $iTupleSize = 4;
-    public $iWidth=9;
-    public $iEndLines=1;
-    public $iStockColor1='white',$iStockColor2='darkred',$iStockColor3='darkred';
-//---------------
-// CONSTRUCTOR
-    public function StockPlot(&$datay,$datax=false)
-    {
-    if ( count($datay) % $this->iTupleSize ) {
-        JpGraphError::Raise('Data values for Stock charts must contain an even multiple of '.$this->iTupleSize.' data points.');
-    }
-    $this->Plot($datay,$datax);
-    $this->numpoints /= $this->iTupleSize;
+class StockPlot extends Plot {
+    protected $iTupleSize = 4;
+    private $iWidth=9;
+    private $iEndLines=1;
+    private $iStockColor1='white',$iStockColor2='darkred',$iStockColor3='darkred';
+    //---------------
+    // CONSTRUCTOR
+    function __construct($datay,$datax=false) {
+        if( count($datay) % $this->iTupleSize ) {
+            JpGraphError::RaiseL(21001,$this->iTupleSize);
+            //('Data values for Stock charts must contain an even multiple of '.$this->iTupleSize.' data points.');
+        }
+        parent::__construct($datay,$datax);
+        $this->numpoints /= $this->iTupleSize;
     }
-//---------------
-// PUBLIC METHODS
-
-    public function SetColor($aColor,$aColor1='white',$aColor2='darkred',$aColor3='darkred')
-    {
-    $this->color = $aColor;
-    $this->iStockColor1 = $aColor1;
-    $this->iStockColor2 = $aColor2;
-    $this->iStockColor3 = $aColor3;
+    //---------------
+    // PUBLIC METHODS
+
+    function SetColor($aColor,$aColor1='white',$aColor2='darkred',$aColor3='darkred') {
+        $this->color = $aColor;
+        $this->iStockColor1 = $aColor1;
+        $this->iStockColor2 = $aColor2;
+        $this->iStockColor3 = $aColor3;
     }
 
-    public function SetWidth($aWidth)
-    {
-    // Make sure it's odd
-    $this->iWidth = 2*floor($aWidth/2)+1;
+    function SetWidth($aWidth) {
+        // Make sure it's odd
+        $this->iWidth = 2*floor($aWidth/2)+1;
     }
 
-    public function HideEndLines($aHide=true)
-    {
-    $this->iEndLines = !$aHide;
+    function HideEndLines($aHide=true) {
+        $this->iEndLines = !$aHide;
     }
 
     // Gets called before any axis are stroked
-    public function PreStrokeAdjust(&$graph)
-    {
-    if ($this->center) {
-        $a=0.5; $b=0.5;
-        $this->numpoints++;
-    } else {
-        $a=0; $b=0;
-    }
-    $graph->xaxis->scale->ticks->SetXLabelOffset($a);
-    $graph->SetTextScaleOff($b);
+    function PreStrokeAdjust($graph) {
+        if( $this->center ) {
+            $a=0.5; $b=0.5;
+            $this->numpoints++;
+        } else {
+            $a=0; $b=0;
+        }
+        $graph->xaxis->scale->ticks->SetXLabelOffset($a);
+        $graph->SetTextScaleOff($b);
     }
 
     // Method description
-    public function Stroke($img,$xscale,$yscale)
-    {
-    $n=$this->numpoints;
-    if( $this->center ) $n--;
-    if ( isset($this->coords[1]) ) {
-        if( count($this->coords[1])!=$n )
-        JpGraphError::Raise("Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])." Number of Y-points:$numpoints");
-        else
-        $exist_x = true;
-    } else
-        $exist_x = false;
-
-    if( $exist_x )
-        $xs=$this->coords[1][0];
-    else
-        $xs=0;
-
-    $ts = $this->iTupleSize;
-    $this->csimareas = '';
-    for ($i=0; $i<$n; ++$i) {
-
-        //If value is NULL, then don't draw a bar at all
-         if ($this->coords[0][$i] === null) continue;
-
-        if( $exist_x ) $x=$this->coords[1][$i];
-        else $x=$i;
-        $xt = $xscale->Translate($x);
-
-        $neg = $this->coords[0][$i*$ts] > $this->coords[0][$i*$ts+1] ;
-        $yopen  = $yscale->Translate($this->coords[0][$i*$ts]);
-        $yclose = $yscale->Translate($this->coords[0][$i*$ts+1]);
-        $ymin   = $yscale->Translate($this->coords[0][$i*$ts+2]);
-        $ymax   = $yscale->Translate($this->coords[0][$i*$ts+3]);
-
-        $dx = floor($this->iWidth/2);
-        $xl = $xt - $dx;
-        $xr = $xt + $dx;
-
-        if( $neg )
-        $img->SetColor($this->iStockColor3);
-        else
-        $img->SetColor($this->iStockColor1);
-        $img->FilledRectangle($xl,$yopen,$xr,$yclose);
-        $img->SetLineWeight($this->weight);
-        if( $neg )
-        $img->SetColor($this->iStockColor2);
-        else
-        $img->SetColor($this->color);
-
-        $img->Rectangle($xl,$yopen,$xr,$yclose);
-
-        if ($yopen < $yclose) {
-        $ytop = $yopen ;
-        $ybottom = $yclose ;
-        } else {
-        $ytop = $yclose ;
-        $ybottom = $yopen ;
+    function Stroke($img,$xscale,$yscale) {
+        $n=$this->numpoints;
+        if( $this->center ) $n--;
+        if( isset($this->coords[1]) ) {
+            if( count($this->coords[1])!=$n ) {
+                JpGraphError::RaiseL(2003,count($this->coords[1]),$n);
+                // ("Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])." Number of Y-points:$numpoints");
+            }
+            else {
+                $exist_x = true;
+            }
         }
-        $img->SetColor($this->color);
-        $img->Line($xt,$ytop,$xt,$ymax);
-        $img->Line($xt,$ybottom,$xt,$ymin);
-
-        if ($this->iEndLines) {
-        $img->Line($xl,$ymax,$xr,$ymax);
-        $img->Line($xl,$ymin,$xr,$ymin);
+        else {
+            $exist_x = false;
         }
 
-        // A chance for subclasses to add things to the bar
-        // for data point i
-        $this->ModBox($img,$xscale,$yscale,$i,$xl,$xr,$neg);
-
-        // Setup image maps
-        if ( !empty($this->csimtargets[$i]) ) {
-        $this->csimareas.= '<area shape="rect" coords="'.
-            round($xl).','.round($ytop).','.
-            round($xr).','.round($ybottom).'" ';
-        $this->csimareas .= ' href="'.$this->csimtargets[$i].'"';
-        if ( !empty($this->csimalts[$i]) ) {
-            $sval=$this->csimalts[$i];
-            $this->csimareas .= " alt=\"$sval\" title=\"$sval\" ";
+        if( $exist_x ) {
+            $xs=$this->coords[1][0];
         }
-        $this->csimareas.= ">\n";
+        else {
+            $xs=0;
         }
-    }
 
-    return true;
+        $ts = $this->iTupleSize;
+        $this->csimareas = '';
+        for( $i=0; $i<$n; ++$i) {
+
+            //If value is NULL, then don't draw a bar at all
+            if ($this->coords[0][$i*$ts] === null) continue;
+
+            if( $exist_x ) {
+                $x=$this->coords[1][$i];
+				if ($x === null) continue;
+            }
+            else {
+                $x=$i;
+            }
+            $xt = $xscale->Translate($x);
+
+            $neg = $this->coords[0][$i*$ts] > $this->coords[0][$i*$ts+1] ;
+            $yopen  = $yscale->Translate($this->coords[0][$i*$ts]);
+            $yclose = $yscale->Translate($this->coords[0][$i*$ts+1]);
+            $ymin   = $yscale->Translate($this->coords[0][$i*$ts+2]);
+            $ymax   = $yscale->Translate($this->coords[0][$i*$ts+3]);
+
+            $dx = floor($this->iWidth/2);
+            $xl = $xt - $dx;
+            $xr = $xt + $dx;
+
+            if( $neg ) {
+                $img->SetColor($this->iStockColor3);
+            }
+            else {
+                $img->SetColor($this->iStockColor1);
+            }
+            $img->FilledRectangle($xl,$yopen,$xr,$yclose);
+            $img->SetLineWeight($this->weight);
+            if( $neg ) {
+                $img->SetColor($this->iStockColor2);
+            }
+            else {
+                $img->SetColor($this->color);
+            }
+
+            $img->Rectangle($xl,$yopen,$xr,$yclose);
+
+            if( $yopen < $yclose ) {
+                $ytop = $yopen ;
+                $ybottom = $yclose ;
+            }
+            else {
+                $ytop = $yclose ;
+                $ybottom = $yopen ;
+            }
+            $img->SetColor($this->color);
+            $img->Line($xt,$ytop,$xt,$ymax);
+            $img->Line($xt,$ybottom,$xt,$ymin);
+
+            if( $this->iEndLines ) {
+                $img->Line($xl,$ymax,$xr,$ymax);
+                $img->Line($xl,$ymin,$xr,$ymin);
+            }
+
+            // A chance for subclasses to add things to the bar
+            // for data point i
+            $this->ModBox($img,$xscale,$yscale,$i,$xl,$xr,$neg);
+
+            // Setup image maps
+            if( !empty($this->csimtargets[$i]) ) {
+                $this->csimareas.= '<area shape="rect" coords="'.
+                round($xl).','.round($ytop).','.
+                round($xr).','.round($ybottom).'" ';
+                $this->csimareas .= ' href="'.$this->csimtargets[$i].'"';
+                if( !empty($this->csimalts[$i]) ) {
+                    $sval=$this->csimalts[$i];
+                    $this->csimareas .= " title=\"$sval\" alt=\"$sval\" ";
+                }
+                $this->csimareas.= "  />\n";
+            }
+        }
+        return true;
     }
 
     // A hook for subclasses to modify the plot
-    public function ModBox($img,$xscale,$yscale,$i,$xl,$xr,$neg) {}
+    function ModBox($img,$xscale,$yscale,$i,$xl,$xr,$neg) {}
 
 } // Class
 
 //===================================================
 // CLASS BoxPlot
 //===================================================
-class BoxPlot extends StockPlot
-{
-    public $iPColor='black',$iNColor='white';
-    public function BoxPlot($datay,$datax=false)
-    {
-    $this->iTupleSize=5;
-    parent::StockPlot($datay,$datax);
+class BoxPlot extends StockPlot {
+    private $iPColor='black',$iNColor='white';
+
+    function __construct($datay,$datax=false) {
+        $this->iTupleSize=5;
+        parent::__construct($datay,$datax);
     }
 
-    public function SetMedianColor($aPos,$aNeg)
-    {
-    $this->iPColor = $aPos;
-    $this->iNColor = $aNeg;
+    function SetMedianColor($aPos,$aNeg) {
+        $this->iPColor = $aPos;
+        $this->iNColor = $aNeg;
     }
 
-    public function ModBox($img,$xscale,$yscale,$i,$xl,$xr,$neg)
-    {
-    if( $neg )
+    function ModBox($img,$xscale,$yscale,$i,$xl,$xr,$neg) {
+        if( $neg )
         $img->SetColor($this->iNColor);
-    else
+        else
         $img->SetColor($this->iPColor);
 
-    $y = $yscale->Translate($this->coords[0][$i*5+4]);
-    $img->Line($xl,$y,$xr,$y);
+        $y = $yscale->Translate($this->coords[0][$i*5+4]);
+        $img->Line($xl,$y,$xr,$y);
     }
 }
 
 /* EOF */
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_table.php b/common/lib/jpgraph_lib/jpgraph_table.php
new file mode 100644
index 000000000..852d78b02
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_table.php
@@ -0,0 +1,1325 @@
+<?php
+/*=======================================================================
+ // File:        JPGRAPH_TABLE.PHP
+ // Description: Classes to create basic tables of data
+ // Created:     2006-01-25
+ // Ver:         $Id: jpgraph_table.php 1514 2009-07-07 11:15:58Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+
+// Style of grid lines in table
+DEFINE('TGRID_SINGLE',1);
+DEFINE('TGRID_DOUBLE',2);
+DEFINE('TGRID_DOUBLE2',3);
+
+// Type of constrain for image constrain
+DEFINE('TIMG_WIDTH',1);
+DEFINE('TIMG_HEIGHT',2);
+
+//---------------------------------------------------------------------
+// CLASS GTextTableCell
+// Description:
+// Internal class that represents each cell in the table
+//---------------------------------------------------------------------
+class GTextTableCell {
+    public $iColSpan=1,$iRowSpan=1;
+    public $iMarginLeft=5,$iMarginRight=5,$iMarginTop=5,$iMarginBottom=5;
+    public $iVal=NULL;
+    private $iBGColor='', $iFontColor='black';
+    private $iFF=FF_FONT1,$iFS=FS_NORMAL,$iFSize=10;
+    private $iRow=0, $iCol=0;
+    private $iVertAlign = 'bottom', $iHorAlign = 'left';
+    private $iMerged=FALSE,$iPRow=NULL,$iPCol=NULL;
+    private $iTable=NULL;
+    private $iGridColor=array('darkgray','darkgray','darkgray','darkgray');
+    private $iGridWeight=array(1,1,0,0); // left,top,bottom,right;
+    private $iGridStyle=array(TGRID_SINGLE,TGRID_SINGLE,TGRID_SINGLE,TGRID_SINGLE); // left,top,bottom,right;
+    private $iNumberFormat=null;
+    private $iIcon=null, $iIconConstrain=array();
+    private $iCSIMtarget = '',$iCSIMwintarget = '', $iCSIMalt = '', $iCSIMArea = '';
+
+    function __construct($aVal='',$aRow=0,$aCol=0) {
+        $this->iVal = new Text($aVal);
+        $this->iRow = $aRow;
+        $this->iCol = $aCol;
+        $this->iPRow = $aRow; // Initialiy each cell is its own parent
+        $this->iPCol = $aCol;
+        $this->iIconConstrain = array(-1,-1);
+    }
+
+    function Init($aTable) {
+        $this->iTable = $aTable;
+    }
+
+    function SetCSIMTarget($aTarget,$aAlt='',$aWinTarget='') {
+        $this->iCSIMtarget = $aTarget;
+        $this->iCSIMwintarget = $aWinTarget;
+        $this->iCSIMalt = $aAlt;
+    }
+
+    function GetCSIMArea() {
+        if( $this->iCSIMtarget !== '' )
+        return $this->iCSIMArea;
+        else
+        return '';
+    }
+
+    function SetImageConstrain($aType,$aVal) {
+        if( !in_array($aType,array(TIMG_WIDTH, TIMG_HEIGHT)) ) {
+            JpGraphError::RaiseL(27015);
+        }
+        $this->iIconConstrain = array($aType,$aVal);
+    }
+
+    function SetCountryFlag($aFlag,$aScale=1.0,$aMix=100,$aStdSize=3) {
+        $this->iIcon = new IconPlot();
+        $this->iIcon->SetCountryFlag($aFlag,0,0,$aScale,$aMix,$aStdSize);
+    }
+
+    function SetImage($aFile,$aScale=1.0,$aMix=100) {
+        $this->iIcon = new IconPlot($aFile,0,0,$aScale,$aMix);
+    }
+
+    function SetImageFromString($aStr,$aScale=1.0,$aMix=100) {
+        $this->iIcon = new IconPlot("",0,0,$aScale,$aMix);
+        $this->iIcon->CreateFromString($aStr);
+    }
+
+    function SetRowColSpan($aRowSpan,$aColSpan) {
+        $this->iRowSpan = $aRowSpan;
+        $this->iColSpan = $aColSpan;
+        $this->iMerged = true;
+    }
+
+    function SetMerged($aPRow,$aPCol,$aFlg=true) {
+        $this->iMerged = $aFlg;
+        $this->iPRow=$aPRow;
+        $this->iPCol=$aPCol;
+    }
+
+    function IsMerged() {
+        return $this->iMerged;
+    }
+
+    function SetNumberFormat($aF) {
+        $this->iNumberFormat = $aF;
+    }
+
+    function Set($aTxt) {
+        $this->iVal->Set($aTxt);
+    }
+
+    function SetFont($aFF,$aFS,$aFSize) {
+        $this->iFF = $aFF;
+        $this->iFS = $aFS;
+        $this->iFSize = $aFSize;
+        $this->iVal->SetFont($aFF,$aFS,$aFSize);
+    }
+
+    function SetFillColor($aColor) {
+        $this->iBGColor=$aColor;
+    }
+
+    function SetFontColor($aColor) {
+        $this->iFontColor=$aColor;
+    }
+
+    function SetGridColor($aLeft,$aTop=null,$aBottom=null,$aRight=null) {
+        if( $aLeft !== null ) $this->iGridColor[0] = $aLeft;
+        if( $aTop !== null ) $this->iGridColor[1] = $aTop;
+        if( $aBottom !== null ) $this->iGridColor[2] = $aBottom;
+        if( $aRight !== null )$this->iGridColor[3] = $aRight;
+    }
+
+    function SetGridStyle($aLeft,$aTop=null,$aBottom=null,$aRight=null) {
+        if( $aLeft !== null ) $this->iGridStyle[0] = $aLeft;
+        if( $aTop !== null ) $this->iGridStyle[1] = $aTop;
+        if( $aBottom !== null ) $this->iGridStyle[2] = $aBottom;
+        if( $aRight !== null )$this->iGridStyle[3] = $aRight;
+    }
+
+    function SetGridWeight($aLeft=null,$aTop=null,$aBottom=null,$aRight=null) {
+        if( $aLeft !== null ) $this->iGridWeight[0] = $aLeft;
+        if( $aTop !== null ) $this->iGridWeight[1] = $aTop;
+        if( $aBottom !== null ) $this->iGridWeight[2] = $aBottom;
+        if( $aRight !== null ) $this->iGridWeight[3] = $aRight;
+    }
+
+    function SetMargin($aLeft,$aRight,$aTop,$aBottom) {
+        $this->iMarginLeft=$aLeft;
+        $this->iMarginRight=$aRight;
+        $this->iMarginTop=$aTop;
+        $this->iMarginBottom=$aBottom;
+    }
+
+    function GetWidth($aImg) {
+        if( $this->iIcon !== null ) {
+            if( $this->iIconConstrain[0] == TIMG_WIDTH ) {
+            	$this->iIcon->SetScale(1);
+            	$tmp = $this->iIcon->GetWidthHeight();
+                $this->iIcon->SetScale($this->iIconConstrain[1]/$tmp[0]);
+            }
+            elseif( $this->iIconConstrain[0] == TIMG_HEIGHT ) {
+            	$this->iIcon->SetScale(1);
+            	$tmp = $this->iIcon->GetWidthHeight();
+                $this->iIcon->SetScale($this->iIconConstrain[1]/$tmp[1]);
+            }
+            $tmp = $this->iIcon->GetWidthHeight();
+            $iwidth = $tmp[0];
+        }
+        else {
+            $iwidth=0;
+        }
+        if( $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->dir == 0 ) {
+            $pwidth = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetWidth($aImg);
+        }
+        elseif( $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->dir == 90 ) {
+            $pwidth = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetFontHeight($aImg)+2;
+        }
+        else {
+            $pwidth = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetWidth($aImg)+2;
+        }
+
+        $pcolspan = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iColSpan;
+        return round(max($iwidth,$pwidth)/$pcolspan) + $this->iMarginLeft + $this->iMarginRight;
+    }
+
+    function GetHeight($aImg) {
+        if( $this->iIcon !== null ) {
+            if( $this->iIconConstrain[0] == TIMG_WIDTH ) {
+            	$this->iIcon->SetScale(1);
+            	$tmp = $this->iIcon->GetWidthHeight();
+            	$this->iIcon->SetScale($this->iIconConstrain[1]/$tmp[0]);
+            }
+            elseif( $this->iIconConstrain[0] == TIMG_HEIGHT ) {
+            	$this->iIcon->SetScale(1);
+            	$tmp = $this->iIcon->GetWidthHeight();
+                $this->iIcon->SetScale($this->iIconConstrain[1]/$tmp[1]);
+            }
+            $tmp = $this->iIcon->GetWidthHeight();
+            $iheight =  $tmp[1];
+        }
+        else {
+            $iheight = 0;
+        }
+        if( $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->dir == 0 ) {
+            $pheight = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetHeight($aImg);
+        }
+        else {
+            $pheight = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iVal->GetHeight($aImg)+1;
+        }
+        $prowspan = $this->iTable->iCells[$this->iPRow][$this->iPCol]->iRowSpan;
+        return round(max($iheight,$pheight)/$prowspan) + $this->iMarginTop + $this->iMarginBottom;
+    }
+
+    function SetAlign($aHorAlign='left',$aVertAlign='bottom') {
+        $aHorAlign = strtolower($aHorAlign);
+        $aVertAlign = strtolower($aVertAlign);
+        $chk = array('left','right','center','bottom','top','middle');
+        if( !in_array($aHorAlign,$chk) || !in_array($aVertAlign,$chk) ) {
+            JpGraphError::RaiseL(27011,$aHorAlign,$aVertAlign);
+        }
+        $this->iVertAlign = $aVertAlign;
+        $this->iHorAlign = $aHorAlign;
+    }
+
+    function AdjustMarginsForGrid() {
+        if( $this->iCol > 0 ) {
+            switch( $this->iGridStyle[0] ) {
+                case TGRID_SINGLE:  $wf=1;  break;
+                case TGRID_DOUBLE:  $wf=3;  break;
+                case TGRID_DOUBLE2: $wf=4;  break;
+            }
+            $this->iMarginLeft += $this->iGridWeight[0]*$wf;
+        }
+        if( $this->iRow > 0 ) {
+            switch( $this->iGridStyle[1] ) {
+                case TGRID_SINGLE:  $wf=1;  break;
+                case TGRID_DOUBLE:  $wf=3;  break;
+                case TGRID_DOUBLE2: $wf=4;  break;
+            }
+            $this->iMarginTop += $this->iGridWeight[1]*$wf;
+        }
+        if( $this->iRow+$this->iRowSpan-1 < $this->iTable->iSize[0]-1 ) {
+            switch( $this->iGridStyle[2] ) {
+                case TGRID_SINGLE: $wf=1; break;
+                case TGRID_DOUBLE: $wf=3; break;
+                case TGRID_DOUBLE2: $wf=4; break;
+            }
+            $this->iMarginBottom += $this->iGridWeight[2]*$wf;
+        }
+        if( $this->iCol+$this->iColSpan-1 < $this->iTable->iSize[1]-1 ) {
+            switch( $this->iGridStyle[3] ) {
+                case TGRID_SINGLE: $wf=1; break;
+                case TGRID_DOUBLE: $wf=3; break;
+                case TGRID_DOUBLE2: $wf=4; break;
+            }
+            $this->iMarginRight += $this->iGridWeight[3]*$wf;
+        }
+    }
+
+    function StrokeVGrid($aImg,$aX,$aY,$aWidth,$aHeight,$aDir=1) {
+        // Left or right grid line
+        // For the right we increase the X-pos and for the right we decrease it. This is
+        // determined by the direction argument.
+        $idx = $aDir==1 ? 0 : 3;
+
+        // We don't stroke the grid lines that are on the edge of the table since this is
+        // the place of the border.
+        if( ( ($this->iCol > 0 && $idx==0) || ($this->iCol+$this->iColSpan-1 < $this->iTable->iSize[1]-1 && $idx==3) )
+        && $this->iGridWeight[$idx] > 0 ) {
+            $x = $aDir==1 ? $aX : $aX + $aWidth-1;
+            $y = $aY+$aHeight-1;
+            $aImg->SetColor($this->iGridColor[$idx]);
+            switch( $this->iGridStyle[$idx] ) {
+                case TGRID_SINGLE:
+                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
+                    $aImg->Line($x+$i*$aDir,$aY, $x+$i*$aDir,$y);
+                    break;
+
+                case TGRID_DOUBLE:
+                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
+                    $aImg->Line($x+$i*$aDir,$aY, $x+$i*$aDir,$y);
+                    $x += $this->iGridWeight[$idx]*2;
+                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
+                    $aImg->Line($x+$i*$aDir,$aY, $x+$i*$aDir,$y);
+                    break;
+
+                case TGRID_DOUBLE2:
+                    for( $i=0; $i < $this->iGridWeight[$idx]*2; ++$i )
+                    $aImg->Line($x+$i*$aDir,$aY,$x+$i*$aDir,$y);
+                    $x += $this->iGridWeight[$idx]*3;
+                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
+                    $aImg->Line($x+$i*$aDir,$aY, $x+$i*$aDir,$y);
+                    break;
+            }
+        }
+    }
+
+    function StrokeHGrid($aImg,$aX,$aY,$aWidth,$aHeight,$aDir=1) {
+        // Top or bottom grid line
+        // For the left we increase the X-pos and for the right we decrease it. This is
+        // determined by the direction argument.
+        $idx = $aDir==1 ? 1 : 2;
+
+        // We don't stroke the grid lines that are on the edge of the table since this is
+        // the place of the border.
+        if( ( ($this->iRow > 0 && $idx==1) || ($this->iRow+$this->iRowSpan-1 < $this->iTable->iSize[0]-1 && $idx==2) )
+        && $this->iGridWeight[$idx] > 0) {
+            $y = $aDir==1 ? $aY : $aY+$aHeight-1;
+            $x = $aX+$aWidth-1;
+            $aImg->SetColor($this->iGridColor[$idx]);
+            switch( $this->iGridStyle[$idx] ) {
+                case TGRID_SINGLE:
+                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
+                    $aImg->Line($aX,$y+$i, $x,$y+$i);
+                    break;
+
+                case TGRID_DOUBLE:
+                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
+                    $aImg->Line($aX,$y+$i, $x,$y+$i);
+                    $y += $this->iGridWeight[$idx]*2;
+                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
+                    $aImg->Line($aX,$y+$i, $x,$y+$i);
+                    break;
+
+                case TGRID_DOUBLE2:
+                    for( $i=0; $i < $this->iGridWeight[$idx]*2; ++$i )
+                    $aImg->Line($aX,$y+$i, $x,$y+$i);
+                    $y += $this->iGridWeight[$idx]*3;
+                    for( $i=0; $i < $this->iGridWeight[$idx]; ++$i )
+                    $aImg->Line($aX,$y+$i, $x,$y+$i);
+                    break;
+            }
+        }
+    }
+
+    function Stroke($aImg,$aX,$aY,$aWidth,$aHeight) {
+        // If this is a merged cell we only stroke if it is the parent cell.
+        // The parent cell holds the merged cell block
+        if( $this->iMerged && ($this->iRow != $this->iPRow || $this->iCol != $this->iPCol) ) {
+            return;
+        }
+
+        if( $this->iBGColor != '' ) {
+            $aImg->SetColor($this->iBGColor);
+            $aImg->FilledRectangle($aX,$aY,$aX+$aWidth-1,$aY+$aHeight-1);
+        }
+
+        $coords = $aX.','.$aY.','.($aX+$aWidth-1).','.$aY.','.($aX+$aWidth-1).','.($aY+$aHeight-1).','.$aX.','.($aY+$aHeight-1);
+        if( ! empty($this->iCSIMtarget) ) {
+            $this->iCSIMArea = '<area shape="poly" coords="'.$coords.'" href="'.$this->iCSIMtarget.'"';
+            if( ! empty($this->iCSIMwintarget) ) {
+                $this->iCSIMArea .= " target=\"".$this->iCSIMwintarget."\"";
+            }
+            if( ! empty($this->iCSIMalt) ) {
+                $this->iCSIMArea .= ' alt="'.$this->iCSIMalt.'" title="'.$this->iCSIMalt."\" ";
+            }
+            $this->iCSIMArea .= " />\n";
+        }
+
+        $this->StrokeVGrid($aImg,$aX,$aY,$aWidth,$aHeight);
+        $this->StrokeVGrid($aImg,$aX,$aY,$aWidth,$aHeight,-1);
+        $this->StrokeHGrid($aImg,$aX,$aY,$aWidth,$aHeight);
+        $this->StrokeHGrid($aImg,$aX,$aY,$aWidth,$aHeight,-1);
+
+        if( $this->iIcon !== null ) {
+            switch( $this->iHorAlign ) {
+                case 'left':
+                    $x = $aX+$this->iMarginLeft;
+                    $hanchor='left';
+                    break;
+                case 'center':
+                case 'middle':
+                    $x = $aX+$this->iMarginLeft+round(($aWidth-$this->iMarginLeft-$this->iMarginRight)/2);
+                    $hanchor='center';
+                    break;
+                case 'right':
+                    $x = $aX+$aWidth-$this->iMarginRight-1;
+                    $hanchor='right';
+                    break;
+                default:
+                    JpGraphError::RaiseL(27012,$this->iHorAlign);
+            }
+
+            switch( $this->iVertAlign ) {
+                case 'top':
+                    $y = $aY+$this->iMarginTop;
+                    $vanchor='top';
+                    break;
+                case 'center':
+                case 'middle':
+                    $y = $aY+$this->iMarginTop+round(($aHeight-$this->iMarginTop-$this->iMarginBottom)/2);
+                    $vanchor='center';
+                    break;
+                case 'bottom':
+                    $y = $aY+$aHeight-1-$this->iMarginBottom;
+                    $vanchor='bottom';
+                    break;
+                default:
+                    JpGraphError::RaiseL(27012,$this->iVertAlign);
+            }
+            $this->iIcon->SetAnchor($hanchor,$vanchor);
+            $this->iIcon->_Stroke($aImg,$x,$y);
+        }
+        $this->iVal->SetColor($this->iFontColor);
+        $this->iVal->SetFont($this->iFF,$this->iFS,$this->iFSize);
+        switch( $this->iHorAlign ) {
+            case 'left':
+                $x = $aX+$this->iMarginLeft;
+                break;
+            case 'center':
+            case 'middle':
+                $x = $aX+$this->iMarginLeft+round(($aWidth-$this->iMarginLeft-$this->iMarginRight)/2);
+                break;
+            case 'right':
+                $x = $aX+$aWidth-$this->iMarginRight-1;
+                break;
+            default:
+                JpGraphError::RaiseL(27012,$this->iHorAlign);
+        }
+        // A workaround for the shortcomings in the TTF font handling in GD
+        // The anchor position for rotated text (=90) is to "short" so we add
+        // an offset based on the actual font size
+        if( $this->iVal->dir != 0 && $this->iVal->font_family >= 10 ) {
+            $aY += 4 + round($this->iVal->font_size*0.8);
+        }
+        switch( $this->iVertAlign ) {
+            case 'top':
+                $y = $aY+$this->iMarginTop;
+                break;
+            case 'center':
+            case 'middle':
+                $y = $aY+$this->iMarginTop+round(($aHeight-$this->iMarginTop-$this->iMarginBottom)/2);
+                //$y -= round($this->iVal->GetFontHeight($aImg)/2);
+                $y -= round($this->iVal->GetHeight($aImg)/2);
+                break;
+            case 'bottom':
+                //$y = $aY+$aHeight-1-$this->iMarginBottom-$this->iVal->GetFontHeight($aImg);
+                $y = $aY+$aHeight-$this->iMarginBottom-$this->iVal->GetHeight($aImg);
+                break;
+            default:
+                JpGraphError::RaiseL(27012,$this->iVertAlign);
+        }
+        $this->iVal->SetAlign($this->iHorAlign,'top');
+        if( $this->iNumberFormat !== null && is_numeric($this->iVal->t) ) {
+            $this->iVal->t = sprintf($this->iNumberFormat,$this->iVal->t);
+        }
+        $this->iVal->Stroke($aImg,$x,$y);
+    }
+}
+
+//---------------------------------------------------------------------
+// CLASS GTextTable
+// Description:
+// Graphic text table
+//---------------------------------------------------------------------
+class GTextTable {
+    public $iCells = array(), $iSize=array(0,0); // Need to be public since they are used by the cell
+    private $iWidth=0, $iHeight=0;
+    private $iColWidth=NULL,$iRowHeight=NULL;
+    private $iImg=NULL;
+    private $iXPos=0, $iYPos=0;
+    private $iScaleXPos=null,$iScaleYPos=null;
+    private $iBGColor='';
+    private $iBorderColor='black',$iBorderWeight=1;
+    private $iInit=false;
+    private $iYAnchor='top',$iXAnchor='left';
+    /*-----------------------------------------------------------------
+     * First and second phase constructors
+     *-----------------------------------------------------------------
+     */
+    function __construct() {
+        // Empty
+    }
+
+    function Init($aRows=0,$aCols=0,$aFillText='') {
+        $this->iSize[0] = $aRows;
+        $this->iSize[1] = $aCols;
+        for($i=0; $i < $this->iSize[0]; ++$i) {
+            for($j=0; $j < $this->iSize[1]; ++$j) {
+                $this->iCells[$i][$j] = new GTextTableCell($aFillText,$i,$j);
+                $this->iCells[$i][$j]->Init($this);
+            }
+        }
+        $this->iInit=true;
+    }
+
+    /*-----------------------------------------------------------------
+     * Outer border of table
+     *-----------------------------------------------------------------
+     */
+    function SetBorder($aWeight=1,$aColor='black') {
+        $this->iBorderColor=$aColor;
+        $this->iBorderWeight = $aWeight;
+    }
+
+
+    /*-----------------------------------------------------------------
+     * Position in graph of table
+     *-----------------------------------------------------------------
+     */
+    function SetPos($aX,$aY) {
+        $this->iXPos = $aX;
+        $this->iYPos = $aY;
+    }
+
+    function SetScalePos($aX,$aY) {
+        $this->iScaleXPos = $aX;
+        $this->iScaleYPos = $aY;
+    }
+
+    function SetAnchorPos($aXAnchor,$aYAnchor='top') {
+        $this->iXAnchor = $aXAnchor;
+        $this->iYAnchor = $aYAnchor;
+    }
+
+    /*-----------------------------------------------------------------
+     * Setup country flag in a cell
+     *-----------------------------------------------------------------
+     */
+    function SetCellCountryFlag($aRow,$aCol,$aFlag,$aScale=1.0,$aMix=100,$aStdSize=3) {
+        $this->_chkR($aRow);
+        $this->_chkC($aCol);
+        $this->iCells[$aRow][$aCol]->SetCountryFlag($aFlag,$aScale,$aMix,$aStdSize);
+
+    }
+
+    /*-----------------------------------------------------------------
+     * Setup image in a cell
+     *-----------------------------------------------------------------
+     */
+    function SetCellImage($aRow,$aCol,$aFile,$aScale=1.0,$aMix=100) {
+        $this->_chkR($aRow);
+        $this->_chkC($aCol);
+        $this->iCells[$aRow][$aCol]->SetImage($aFile,$aScale,$aMix);
+    }
+
+    function SetRowImage($aRow,$aFile,$aScale=1.0,$aMix=100) {
+        $this->_chkR($aRow);
+        for($j=0; $j < $this->iSize[1]; ++$j) {
+            $this->iCells[$aRow][$j]->SetImage($aFile,$aScale,$aMix);
+        }
+    }
+
+    function SetColImage($aCol,$aFile,$aScale=1.0,$aMix=100) {
+        $this->_chkC($aCol);
+        for($j=0; $j < $this->iSize[0]; ++$j) {
+            $this->iCells[$j][$aCol]->SetImage($aFile,$aScale,$aMix);
+        }
+    }
+
+    function SetImage($aFileR1,$aScaleC1=null,$aMixR2=null,$aC2=null,$aFile=null,$aScale=1.0,$aMix=100) {
+        if( $aScaleC1 !== null && $aMixR2!==null && $aC2!==null && $aFile!==null ) {
+            $this->_chkR($aArgR1);  $this->_chkC($aC1);
+            $this->_chkR($aR2);  $this->_chkC($aC2);
+        }
+        else {
+            if( $aScaleC1 !== null ) $aScale = $aScaleC1;
+            if( $aMixR2 !== null ) $aMix = $aMixR2;
+            $aFile = $aFileR1;
+            $aMixR2 = $this->iSize[0]-1; $aFileR1 = 0;
+            $aC2 = $this->iSize[1]-1; $aScaleC1 = 0;
+        }
+        for($i=$aArgR1; $i <= $aR2; ++$i) {
+            for($j=$aC1; $j <= $aC2; ++$j) {
+                $this->iCells[$i][$j]->SetImage($aFile,$aScale,$aMix);
+            }
+        }
+    }
+
+    function SetCellImageConstrain($aRow,$aCol,$aType,$aVal) {
+        $this->_chkR($aRow);
+        $this->_chkC($aCol);
+        $this->iCells[$aRow][$aCol]->SetImageConstrain($aType,$aVal);
+    }
+
+    /*-----------------------------------------------------------------
+     * Generate a HTML version of the table
+     *-----------------------------------------------------------------
+     */
+    function toString() {
+        $t = '<table border=1 cellspacing=0 cellpadding=0>';
+        for($i=0; $i < $this->iSize[0]; ++$i) {
+            $t .= '<tr>';
+            for($j=0; $j < $this->iSize[1]; ++$j) {
+                $t .= '<td>';
+                if( $this->iCells[$i][$j]->iMerged )
+                $t .= 'M ';
+                $t .= 'val='.$this->iCells[$i][$j]->iVal->t;
+                $t .= ' (cs='.$this->iCells[$i][$j]->iColSpan.
+        ', rs='.$this->iCells[$i][$j]->iRowSpan.')';
+                $t .= '</td>';
+            }
+            $t .= '</tr>';
+        }
+        $t .= '</table>';
+        return $t;
+    }
+
+    /*-----------------------------------------------------------------
+     * Specify data for table
+     *-----------------------------------------------------------------
+     */
+    function Set($aArg1,$aArg2=NULL,$aArg3=NULL) {
+        if( $aArg2===NULL && $aArg3===NULL ) {
+            if( is_array($aArg1) ) {
+                if( is_array($aArg1[0]) ) {
+                    $m = count($aArg1);
+                    // Find the longest row
+                    $n=0;
+                    for($i=0; $i < $m; ++$i)
+                    $n = max(count($aArg1[$i]),$n);
+                    for($i=0; $i < $m; ++$i) {
+                        for($j=0; $j < $n; ++$j) {
+                            if( isset($aArg1[$i][$j]) ){
+                                $this->_setcell($i,$j,(string)$aArg1[$i][$j]);
+                            }
+                            else {
+                                $this->_setcell($i,$j);
+                            }
+                        }
+                    }
+                    $this->iSize[0] = $m;
+                    $this->iSize[1] = $n;
+                    $this->iInit=true;
+                }
+                else {
+                    JpGraphError::RaiseL(27001);
+                    //('Illegal argument to GTextTable::Set(). Array must be 2 dimensional');
+                }
+            }
+            else {
+                JpGraphError::RaiseL(27002);
+                //('Illegal argument to GTextTable::Set()');
+            }
+        }
+        else {
+            // Must be in the form (row,col,val)
+            $this->_chkR($aArg1);
+            $this->_chkC($aArg2);
+            $this->_setcell($aArg1,$aArg2,(string)$aArg3);
+        }
+    }
+
+    /*---------------------------------------------------------------------
+     * Cell margin setting
+     *---------------------------------------------------------------------
+     */
+    function SetPadding($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aPad=null) {
+        if( $aC1 !== null && $aR2!==null && $aC2!==null && $aPad!==null ) {
+            $this->_chkR($aArgR1);  $this->_chkC($aC1);
+            $this->_chkR($aR2);  $this->_chkC($aC2);
+        }
+        else {
+            $aPad = $aArgR1;
+            $aR2 = $this->iSize[0]-1; $aArgR1 = 0;
+            $aC2 = $this->iSize[1]-1; $aC1 = 0;
+        }
+        for($i=$aArgR1; $i <= $aR2; ++$i) {
+            for($j=$aC1; $j <= $aC2; ++$j) {
+                $this->iCells[$i][$j]->SetMargin($aPad,$aPad,$aPad,$aPad);
+            }
+        }
+    }
+
+    function SetRowPadding($aRow,$aPad) {
+        $this->_chkR($aRow);
+        for($j=0; $j < $this->iSize[1]; ++$j) {
+            $this->iCells[$aRow][$j]->SetMargin($aPad,$aPad,$aPad,$aPad);
+        }
+    }
+
+    function SetColPadding($aCol,$aPad) {
+        $this->_chkC($aCol);
+        for($j=0; $j < $this->iSize[0]; ++$j) {
+            $this->iCells[$j][$aCol]->SetMargin($aPad,$aPad,$aPad,$aPad);
+        }
+    }
+
+    function SetCellPadding($aRow,$aCol,$aPad) {
+        $this->_chkR($aRow);
+        $this->_chkC($aCol);
+        $this->iCells[$aRow][$aCol]->SetMargin($aPad,$aPad,$aPad,$aPad);
+    }
+
+
+    /*---------------------------------------------------------------------
+     * Cell text orientation setting
+     *---------------------------------------------------------------------
+     */
+    function SetTextOrientation($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aO=null) {
+        if( $aC1 !== null && $aR2!==null && $aC2!==null && $aPad!==null ) {
+            $this->_chkR($aArgR1);  $this->_chkC($aC1);
+            $this->_chkR($aR2);  $this->_chkC($aC2);
+        }
+        else {
+            $aO = $aArgR1;
+            $aR2 = $this->iSize[0]-1; $aArgR1 = 0;
+            $aC2 = $this->iSize[1]-1; $aC1 = 0;
+        }
+        for($i=$aArgR1; $i <= $aR2; ++$i) {
+            for($j=$aC1; $j <= $aC2; ++$j) {
+                $this->iCells[$i][$j]->iVal->SetOrientation($aO);
+            }
+        }
+    }
+
+    function SetRowTextOrientation($aRow,$aO) {
+        $this->_chkR($aRow);
+        for($j=0; $j < $this->iSize[1]; ++$j) {
+            $this->iCells[$aRow][$j]->iVal->SetOrientation($aO);
+        }
+    }
+
+    function SetColTextOrientation($aCol,$aO) {
+        $this->_chkC($aCol);
+        for($j=0; $j < $this->iSize[0]; ++$j) {
+            $this->iCells[$j][$aCol]->iVal->SetOrientation($aO);
+        }
+    }
+
+    function SetCellTextOrientation($aRow,$aCol,$aO) {
+        $this->_chkR($aRow);
+        $this->_chkC($aCol);
+        $this->iCells[$aRow][$aCol]->iVal->SetOrientation($aO);
+    }
+
+
+
+
+    /*---------------------------------------------------------------------
+     * Font color setting
+     *---------------------------------------------------------------------
+     */
+
+    function SetColor($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aArg=null) {
+        if( $aC1 !== null && $aR2!==null && $aC2!==null && $aArg!==null ) {
+            $this->_chkR($aArgR1);  $this->_chkC($aC1);
+            $this->_chkR($aR2);  $this->_chkC($aC2);
+        }
+        else {
+            $aArg = $aArgR1;
+            $aR2 = $this->iSize[0]-1; $aArgR1 = 0;
+            $aC2 = $this->iSize[1]-1; $aC1 = 0;
+        }
+        for($i=$aArgR1; $i <= $aR2; ++$i) {
+            for($j=$aC1; $j <= $aC2; ++$j) {
+                $this->iCells[$i][$j]->SetFontColor($aArg);
+            }
+        }
+    }
+
+    function SetRowColor($aRow,$aColor) {
+        $this->_chkR($aRow);
+        for($j=0; $j < $this->iSize[1]; ++$j) {
+            $this->iCells[$aRow][$j]->SetFontColor($aColor);
+        }
+    }
+
+    function SetColColor($aCol,$aColor) {
+        $this->_chkC($aCol);
+        for($i=0; $i < $this->iSize[0]; ++$i) {
+            $this->iCells[$i][$aCol]->SetFontColor($aColor);
+        }
+    }
+
+    function SetCellColor($aRow,$aCol,$aColor) {
+        $this->_chkR($aRow);
+        $this->_chkC($aCol);
+        $this->iCells[$aRow][$aCol]->SetFontColor($aColor);
+    }
+
+    /*---------------------------------------------------------------------
+     * Fill color settings
+     *---------------------------------------------------------------------
+     */
+
+    function SetFillColor($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aArg=null) {
+        if( $aC1 !== null && $aR2!==null && $aC2!==null && $aArg!==null ) {
+            $this->_chkR($aArgR1);  $this->_chkC($aC1);
+            $this->_chkR($aR2);  $this->_chkC($aC2);
+            for($i=$aArgR1; $i <= $aR2; ++$i) {
+                for($j=$aC1; $j <= $aC2; ++$j) {
+                    $this->iCells[$i][$j]->SetFillColor($aArg);
+                }
+            }
+        }
+        else {
+            $this->iBGColor = $aArgR1;
+        }
+    }
+
+    function SetRowFillColor($aRow,$aColor) {
+        $this->_chkR($aRow);
+        for($j=0; $j < $this->iSize[1]; ++$j) {
+            $this->iCells[$aRow][$j]->SetFillColor($aColor);
+        }
+    }
+
+    function SetColFillColor($aCol,$aColor) {
+        $this->_chkC($aCol);
+        for($i=0; $i < $this->iSize[0]; ++$i) {
+            $this->iCells[$i][$aCol]->SetFillColor($aColor);
+        }
+    }
+
+    function SetCellFillColor($aRow,$aCol,$aColor) {
+        $this->_chkR($aRow);
+        $this->_chkC($aCol);
+        $this->iCells[$aRow][$aCol]->SetFillColor($aColor);
+    }
+
+    /*---------------------------------------------------------------------
+     * Font family setting
+     *---------------------------------------------------------------------
+     */
+    function SetFont() {
+        $numargs = func_num_args();
+        if( $numargs == 2 || $numargs == 3 ) {
+            $aFF = func_get_arg(0);
+            $aFS = func_get_arg(1);
+            if( $numargs == 3 )
+            $aFSize=func_get_arg(2);
+            else
+            $aFSize=10;
+            $aR2 = $this->iSize[0]-1; $aR1 = 0;
+            $aC2 = $this->iSize[1]-1; $aC1 = 0;
+
+        }
+        elseif($numargs == 6 || $numargs == 7 ) {
+            $aR1 = func_get_arg(0); $aC1 = func_get_arg(1);
+            $aR2 = func_get_arg(2); $aC2 = func_get_arg(3);
+            $aFF = func_get_arg(4); $aFS = func_get_arg(5);
+            if( $numargs == 7 )
+            $aFSize=func_get_arg(6);
+            else
+            $aFSize=10;
+        }
+        else {
+            JpGraphError::RaiseL(27003);
+            //('Wrong number of arguments to GTextTable::SetColor()');
+        }
+        $this->_chkR($aR1);  $this->_chkC($aC1);
+        $this->_chkR($aR2);  $this->_chkC($aC2);
+        for($i=$aR1; $i <= $aR2; ++$i) {
+            for($j=$aC1; $j <= $aC2; ++$j) {
+                $this->iCells[$i][$j]->SetFont($aFF,$aFS,$aFSize);
+            }
+        }
+    }
+
+    function SetRowFont($aRow,$aFF,$aFS,$aFSize=10) {
+        $this->_chkR($aRow);
+        for($j=0; $j < $this->iSize[1]; ++$j) {
+            $this->iCells[$aRow][$j]->SetFont($aFF,$aFS,$aFSize);
+        }
+    }
+
+    function SetColFont($aCol,$aFF,$aFS,$aFSize=10) {
+        $this->_chkC($aCol);
+        for($i=0; $i < $this->iSize[0]; ++$i) {
+            $this->iCells[$i][$aCol]->SetFont($aFF,$aFS,$aFSize);
+        }
+    }
+
+    function SetCellFont($aRow,$aCol,$aFF,$aFS,$aFSize=10) {
+        $this->_chkR($aRow);
+        $this->_chkC($aCol);
+        $this->iCells[$aRow][$aCol]->SetFont($aFF,$aFS,$aFSize);
+    }
+
+    /*---------------------------------------------------------------------
+     * Cell align settings
+     *---------------------------------------------------------------------
+     */
+
+    function SetAlign($aR1HAlign=null,$aC1VAlign=null,$aR2=null,$aC2=null,$aHArg=null,$aVArg='center') {
+        if( $aC1VAlign !== null && $aR2!==null && $aC2!==null && $aHArg!==null ) {
+            $this->_chkR($aR1HAlign);  $this->_chkC($aC1VAlign);
+            $this->_chkR($aR2);  $this->_chkC($aC2);
+        }
+        else {
+            if( $aR1HAlign === null ) {
+                JpGraphError::RaiseL(27010);
+            }
+            if( $aC1VAlign === null ) {
+                $aC1VAlign = 'center';
+            }
+            $aHArg = $aR1HAlign;
+            $aVArg = $aC1VAlign === null ? 'center' : $aC1VAlign ;
+            $aR2 = $this->iSize[0]-1; $aR1HAlign = 0;
+            $aC2 = $this->iSize[1]-1; $aC1VAlign = 0;
+        }
+        for($i=$aR1HAlign; $i <= $aR2; ++$i) {
+            for($j=$aC1VAlign; $j <= $aC2; ++$j) {
+                $this->iCells[$i][$j]->SetAlign($aHArg,$aVArg);
+            }
+        }
+    }
+
+    function SetCellAlign($aRow,$aCol,$aHorAlign,$aVertAlign='bottom') {
+        $this->_chkR($aRow);
+        $this->_chkC($aCol);
+        $this->iCells[$aRow][$aCol]->SetAlign($aHorAlign,$aVertAlign);
+    }
+
+    function SetRowAlign($aRow,$aHorAlign,$aVertAlign='bottom') {
+        $this->_chkR($aRow);
+        for($j=0; $j < $this->iSize[1]; ++$j) {
+            $this->iCells[$aRow][$j]->SetAlign($aHorAlign,$aVertAlign);
+        }
+    }
+
+    function SetColAlign($aCol,$aHorAlign,$aVertAlign='bottom') {
+        $this->_chkC($aCol);
+        for($i=0; $i < $this->iSize[0]; ++$i) {
+            $this->iCells[$i][$aCol]->SetAlign($aHorAlign,$aVertAlign);
+        }
+    }
+
+    /*---------------------------------------------------------------------
+     * Cell number format
+     *---------------------------------------------------------------------
+     */
+
+    function SetNumberFormat($aArgR1,$aC1=null,$aR2=null,$aC2=null,$aArg=null) {
+        if( $aC1 !== null && $aR2!==null && $aC2!==null && $aArg!==null ) {
+            $this->_chkR($aArgR1);  $this->_chkC($aC1);
+            $this->_chkR($aR2);  $this->_chkC($aC2);
+        }
+        else {
+            $aArg = $aArgR1;
+            $aR2 = $this->iSize[0]-1; $aArgR1 = 0;
+            $aC2 = $this->iSize[1]-1; $aC1 = 0;
+        }
+        if( !is_string($aArg) ) {
+            JpGraphError::RaiseL(27013); // argument must be a string
+        }
+        for($i=$aArgR1; $i <= $aR2; ++$i) {
+            for($j=$aC1; $j <= $aC2; ++$j) {
+                $this->iCells[$i][$j]->SetNumberFormat($aArg);
+            }
+        }
+    }
+
+    function SetRowNumberFormat($aRow,$aF) {
+        $this->_chkR($aRow);
+        if( !is_string($aF) ) {
+            JpGraphError::RaiseL(27013); // argument must be a string
+        }
+        for($j=0; $j < $this->iSize[1]; ++$j) {
+            $this->iCells[$aRow][$j]->SetNumberFormat($aF);
+        }
+    }
+
+    function SetColNumberFormat($aCol,$aF) {
+        $this->_chkC($aCol);
+        if( !is_string($aF) ) {
+            JpGraphError::RaiseL(27013); // argument must be a string
+        }
+        for($i=0; $i < $this->iSize[0]; ++$i) {
+            $this->iCells[$i][$aCol]->SetNumberFormat($aF);
+        }
+    }
+
+    function SetCellNumberFormat($aRow,$aCol,$aF) {
+        $this->_chkR($aRow); $this->_chkC($aCol);
+        if( !is_string($aF) ) {
+            JpGraphError::RaiseL(27013); // argument must be a string
+        }
+        $this->iCells[$aRow][$aCol]->SetNumberFormat($aF);
+    }
+
+    /*---------------------------------------------------------------------
+     * Set row and column min size
+     *---------------------------------------------------------------------
+     */
+
+    function SetMinColWidth($aColWidth,$aWidth=null) {
+        // If there is only one argument this means that all
+        // columns get set to the same width
+        if( $aWidth===null ) {
+            for($i=0; $i < $this->iSize[1]; ++$i) {
+                $this->iColWidth[$i]  = $aColWidth;
+            }
+        }
+        else {
+            $this->_chkC($aColWidth);
+            $this->iColWidth[$aColWidth]  = $aWidth;
+        }
+    }
+
+    function SetMinRowHeight($aRowHeight,$aHeight=null) {
+        // If there is only one argument this means that all
+        // rows get set to the same height
+        if( $aHeight===null ) {
+            for($i=0; $i < $this->iSize[0]; ++$i) {
+                $this->iRowHeight[$i]  = $aRowHeight;
+            }
+        }
+        else {
+            $this->_chkR($aRowHeight);
+            $this->iRowHeight[$aRowHeight]  = $aHeight;
+        }
+    }
+
+    /*---------------------------------------------------------------------
+     * Grid line settings
+     *---------------------------------------------------------------------
+     */
+
+    function SetGrid($aWeight=1,$aColor='black',$aStyle=TGRID_SINGLE) {
+        $rc = $this->iSize[0];
+        $cc = $this->iSize[1];
+        for($i=0; $i < $rc; ++$i) {
+            for($j=0; $j < $cc; ++$j) {
+                $this->iCells[$i][$j]->SetGridColor($aColor,$aColor);
+                $this->iCells[$i][$j]->SetGridWeight($aWeight,$aWeight);
+                $this->iCells[$i][$j]->SetGridStyle($aStyle);
+            }
+        }
+    }
+
+    function SetColGrid($aCol,$aWeight=1,$aColor='black',$aStyle=TGRID_SINGLE) {
+        $this->_chkC($aCol);
+        for($i=0; $i < $this->iSize[0]; ++$i) {
+            $this->iCells[$i][$aCol]->SetGridWeight($aWeight);
+            $this->iCells[$i][$aCol]->SetGridColor($aColor);
+            $this->iCells[$i][$aCol]->SetGridStyle($aStyle);
+        }
+    }
+
+    function SetRowGrid($aRow,$aWeight=1,$aColor='black',$aStyle=TGRID_SINGLE) {
+        $this->_chkR($aRow);
+        for($j=0; $j < $this->iSize[1]; ++$j) {
+            $this->iCells[$aRow][$j]->SetGridWeight(NULL,$aWeight);
+            $this->iCells[$aRow][$j]->SetGridColor(NULL,$aColor);
+            $this->iCells[$aRow][$j]->SetGridStyle(NULL,$aStyle);
+        }
+    }
+
+    /*---------------------------------------------------------------------
+     * Merge cells
+     *---------------------------------------------------------------------
+     */
+
+    function MergeRow($aRow,$aHAlign='center',$aVAlign='center') {
+        $this->_chkR($aRow);
+        $this->MergeCells($aRow,0,$aRow,$this->iSize[1]-1,$aHAlign,$aVAlign);
+    }
+
+    function MergeCol($aCol,$aHAlign='center',$aVAlign='center') {
+        $this->_chkC($aCol);
+        $this->MergeCells(0,$aCol,$this->iSize[0]-1,$aCol,$aHAlign,$aVAlign);
+    }
+
+    function MergeCells($aR1,$aC1,$aR2,$aC2,$aHAlign='center',$aVAlign='center') {
+        if( $aR1 > $aR2 || $aC1 > $aC2 ) {
+            JpGraphError::RaiseL(27004);
+            //('GTextTable::MergeCells(). Specified cell range to be merged is not valid.');
+        }
+        $this->_chkR($aR1); $this->_chkC($aC1);
+        $this->_chkR($aR2); $this->_chkC($aC2);
+        $rspan = $aR2-$aR1+1;
+        $cspan = $aC2-$aC1+1;
+        // Setup the parent cell for this merged group
+        if( $this->iCells[$aR1][$aC1]->IsMerged() ) {
+            JpGraphError::RaiseL(27005,$aR1,$aC1,$aR2,$aC2);
+            //("Cannot merge already merged cells in the range ($aR1,$aC1), ($aR2,$aC2)");
+        }
+        $this->iCells[$aR1][$aC1]->SetRowColSpan($rspan,$cspan);
+        $this->iCells[$aR1][$aC1]->SetAlign($aHAlign,$aVAlign);
+        for($i=$aR1; $i <= $aR2; ++$i) {
+            for($j=$aC1; $j <= $aC2; ++$j) {
+                if( ! ($i == $aR1 && $j == $aC1) ) {
+                    if( $this->iCells[$i][$j]->IsMerged() ) {
+                        JpGraphError::RaiseL(27005,$aR1,$aC1,$aR2,$aC2);
+                        //("Cannot merge already merged cells in the range ($aR1,$aC1), ($aR2,$aC2)");
+                    }
+                    $this->iCells[$i][$j]->SetMerged($aR1,$aC1,true);
+                }
+            }
+        }
+    }
+
+
+    /*---------------------------------------------------------------------
+     * CSIM methods
+     *---------------------------------------------------------------------
+     */
+
+    function SetCSIMTarget($aTarget,$aAlt=null,$aAutoTarget=false) {
+        $m = $this->iSize[0];
+        $n = $this->iSize[1];
+        $csim = '';
+        for($i=0; $i < $m; ++$i) {
+            for($j=0; $j < $n; ++$j) {
+                if( $aAutoTarget )
+                $t = $aTarget."?row=$i&col=$j";
+                else
+                $t = $aTarget;
+                $this->iCells[$i][$j]->SetCSIMTarget($t,$aAlt);
+            }
+        }
+    }
+
+    function SetCellCSIMTarget($aRow,$aCol,$aTarget,$aAlt=null) {
+        $this->_chkR($aRow);
+        $this->_chkC($aCol);
+        $this->iCells[$aRow][$aCol]->SetCSIMTarget($aTarget,$aAlt);
+    }
+
+    /*---------------------------------------------------------------------
+     * Private methods
+     *---------------------------------------------------------------------
+     */
+
+    function GetCSIMAreas() {
+        $m = $this->iSize[0];
+        $n = $this->iSize[1];
+        $csim = '';
+        for($i=0; $i < $m; ++$i) {
+            for($j=0; $j < $n; ++$j) {
+                $csim .= $this->iCells[$i][$j]->GetCSIMArea();
+            }
+        }
+        return $csim;
+    }
+
+    function _chkC($aCol) {
+        if( ! $this->iInit ) {
+            JpGraphError::Raise(27014); // Table not initialized
+        }
+        if( $aCol < 0 || $aCol >= $this->iSize[1] )
+        JpGraphError::RaiseL(27006,$aCol);
+        //("GTextTable:\nColumn argument ($aCol) is outside specified table size.");
+    }
+
+    function _chkR($aRow) {
+        if( ! $this->iInit ) {
+            JpGraphError::Raise(27014); // Table not initialized
+        }
+        if( $aRow < 0 || $aRow >= $this->iSize[0] )
+        JpGraphError::RaiseL(27007,$aRow);
+        //("GTextTable:\nRow argument ($aRow) is outside specified table size.");
+    }
+
+    function _getScalePos() {
+        if( $this->iScaleXPos === null || $this->iScaleYPos === null ) {
+            return false;
+        }
+        return array($this->iScaleXPos, $this->iScaleYPos);
+    }
+
+    function _autoSizeTable($aImg) {
+        // Get maximum column width and row height
+        $m = $this->iSize[0];
+        $n = $this->iSize[1];
+        $w=1;$h=1;
+
+        // Get maximum row height per row
+        for($i=0; $i < $m; ++$i) {
+            $h=0;
+            for($j=0; $j < $n; ++$j) {
+                $h = max($h,$this->iCells[$i][$j]->GetHeight($aImg));
+            }
+            if( isset($this->iRowHeight[$i]) ) {
+                $this->iRowHeight[$i]  = max($h,$this->iRowHeight[$i]);
+            }
+            else
+            $this->iRowHeight[$i]  = $h;
+        }
+
+        // Get maximum col width per columns
+        for($j=0; $j < $n; ++$j) {
+            $w=0;
+            for($i=0; $i < $m; ++$i) {
+                $w = max($w,$this->iCells[$i][$j]->GetWidth($aImg));
+            }
+            if( isset($this->iColWidth[$j]) ) {
+                $this->iColWidth[$j]  = max($w,$this->iColWidth[$j]);
+            }
+            else
+            $this->iColWidth[$j]  = $w;
+        }
+    }
+
+    function _setcell($aRow,$aCol,$aVal='') {
+        if( isset($this->iCells[$aRow][$aCol]) ) {
+            $this->iCells[$aRow][$aCol]->Set($aVal);
+        }
+        else {
+            $this->iCells[$aRow][$aCol] = new GTextTableCell((string)$aVal,$aRow,$aCol);
+            $this->iCells[$aRow][$aCol]->Init($this);
+        }
+    }
+
+    function StrokeWithScale($aImg,$aXScale,$aYScale) {
+        if( is_numeric($this->iScaleXPos) && is_numeric($this->iScaleYPos) ) {
+            $x = round($aXScale->Translate($this->iScaleXPos));
+            $y = round($aYScale->Translate($this->iScaleYPos));
+            $this->Stroke($aImg,$x,$y);
+        }
+        else {
+            $this->Stroke($aImg);
+        }
+    }
+
+    function Stroke($aImg,$aX=NULL,$aY=NULL) {
+        if( $aX !== NULL && $aY !== NULL ) {
+            $this->iXPos = $aX;
+            $this->iYPos = $aY;
+        }
+
+        $rc = $this->iSize[0]; // row count
+        $cc = $this->iSize[1]; // column count
+
+        if( $rc == 0 || $cc == 0 ) {
+            JpGraphError::RaiseL(27009);
+        }
+
+        // Adjust margins of each cell based on the weight of the grid. Each table grid line
+        // is actually occupying the left side and top part of each cell.
+        for($j=0; $j < $cc; ++$j) {
+            $this->iCells[0][$j]->iMarginTop += $this->iBorderWeight;
+        }
+        for($i=0; $i < $rc; ++$i) {
+            $this->iCells[$i][0]->iMarginLeft += $this->iBorderWeight;
+        }
+        for($i=0; $i < $rc; ++$i) {
+            for($j=0; $j < $cc; ++$j) {
+                $this->iCells[$i][$j]->AdjustMarginsForGrid();
+            }
+        }
+
+        // adjust row and column size depending on cell content
+        $this->_autoSizeTable($aImg);
+
+        if( $this->iSize[1] != count($this->iColWidth) || $this->iSize[0] != count($this->iRowHeight) ) {
+            JpGraphError::RaiseL(27008);
+            //('Column and row size arrays must match the dimesnions of the table');
+        }
+
+        // Find out overall table size
+        $width=0;
+        for($i=0; $i < $cc; ++$i) {
+            $width += $this->iColWidth[$i];
+        }
+        $height=0;
+        for($i=0; $i < $rc; ++$i) {
+            $height += $this->iRowHeight[$i];
+        }
+
+        // Adjust the X,Y position to alway be at the top left corner
+        // The anchor position, i.e. how the client want to interpret the specified
+        // x and y coordinate must be taken into account
+        switch( strtolower($this->iXAnchor) ) {
+            case 'left' :
+                break;
+            case 'center':
+                $this->iXPos -= round($width/2);
+                break;
+            case 'right':
+                $this->iXPos -= $width;
+                break;
+        }
+        switch( strtolower($this->iYAnchor) ) {
+            case 'top' :
+                break;
+            case 'center':
+            case 'middle':
+                $this->iYPos -= round($height/2);
+                break;
+            case 'bottom':
+                $this->iYPos -= $height;
+                break;
+        }
+
+        // Set the overall background color of the table if set
+        if( $this->iBGColor !== '' ) {
+            $aImg->SetColor($this->iBGColor);
+            $aImg->FilledRectangle($this->iXPos,$this->iYPos,$this->iXPos+$width,$this->iYPos+$height);
+        }
+
+        // Stroke all cells
+        $rpos=$this->iYPos;
+        for($i=0; $i < $rc; ++$i) {
+            $cpos=$this->iXPos;
+            for($j=0; $j < $cc; ++$j) {
+                // Calculate width and height of this cell if it is spanning
+                // more than one column or row
+                $cwidth=0;
+                for( $k=0; $k < $this->iCells[$i][$j]->iColSpan; ++$k ) {
+                    $cwidth += $this->iColWidth[$j+$k];
+                }
+                $cheight=0;
+                for( $k=0; $k < $this->iCells[$i][$j]->iRowSpan; ++$k ) {
+                    $cheight += $this->iRowHeight[$i+$k];
+                }
+
+                $this->iCells[$i][$j]->Stroke($aImg,$cpos,$rpos,$cwidth,$cheight);
+                $cpos += $this->iColWidth[$j];
+            }
+            $rpos += $this->iRowHeight[$i];
+        }
+
+        // Stroke outer border
+        $aImg->SetColor($this->iBorderColor);
+        if( $this->iBorderWeight == 1 )
+        $aImg->Rectangle($this->iXPos,$this->iYPos,$this->iXPos+$width,$this->iYPos+$height);
+        else {
+            for( $i=0; $i < $this->iBorderWeight; ++$i )
+            $aImg->Rectangle($this->iXPos+$i,$this->iYPos+$i,
+            $this->iXPos+$width-1+$this->iBorderWeight-$i,
+            $this->iYPos+$height-1+$this->iBorderWeight-$i);
+        }
+    }
+}
+
+/*
+ EOF
+ */
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_text.inc.php b/common/lib/jpgraph_lib/jpgraph_text.inc.php
new file mode 100644
index 000000000..7d0f6687f
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_text.inc.php
@@ -0,0 +1,327 @@
+<?php
+//=======================================================================
+// File:        JPGRAPH_TEXT.INC.PHP
+// Description: Class to handle text as object in the graph.
+//              The low level text layout engine is handled by the GD class
+// Created:     2001-01-08 (Refactored to separate file 2008-08-01)
+// Ver:         $Id: jpgraph_text.inc.php 1844 2009-09-26 17:05:31Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+
+//===================================================
+// CLASS Text
+// Description: Arbitrary text object that can be added to the graph
+//===================================================
+class Text {
+    public $t;
+    public $x=0,$y=0,$halign="left",$valign="top",$color=array(0,0,0);
+    public $hide=false, $dir=0;
+    public $iScalePosY=null,$iScalePosX=null;
+    public $iWordwrap=0;
+    public $font_family=FF_DEFAULT,$font_style=FS_NORMAL; // old. FF_FONT1
+    protected $boxed=false; // Should the text be boxed
+    protected $paragraph_align="left";
+    protected $icornerradius=0,$ishadowwidth=3;
+    protected $fcolor='white',$bcolor='black',$shadow=false;
+    protected $iCSIMarea='',$iCSIMalt='',$iCSIMtarget='',$iCSIMWinTarget='';
+    private $iBoxType = 1; // Which variant of filled box around text we want
+
+    // for __get, __set
+    private $_margin;
+    private $_font_size=8; // old. 12
+
+    //---------------
+    // CONSTRUCTOR
+
+    // Create new text at absolute pixel coordinates
+    function __construct($aTxt="",$aXAbsPos=0,$aYAbsPos=0) {
+        if( ! is_string($aTxt) ) {
+            JpGraphError::RaiseL(25050);//('First argument to Text::Text() must be s atring.');
+        }
+        $this->t = $aTxt;
+        $this->x = round($aXAbsPos);
+        $this->y = round($aYAbsPos);
+        $this->margin = 0;
+    }
+    //---------------
+    // PUBLIC METHODS
+    // Set the string in the text object
+    function Set($aTxt) {
+        $this->t = $aTxt;
+    }
+
+    // Alias for Pos()
+    function SetPos($aXAbsPos=0,$aYAbsPos=0,$aHAlign="left",$aVAlign="top") {
+    //$this->Pos($aXAbsPos,$aYAbsPos,$aHAlign,$aVAlign);
+        $this->x = $aXAbsPos;
+        $this->y = $aYAbsPos;
+        $this->halign = $aHAlign;
+        $this->valign = $aVAlign;
+    }
+
+    function SetScalePos($aX,$aY) {
+        $this->iScalePosX = $aX;
+        $this->iScalePosY = $aY;
+    }
+
+    // Specify alignment for the text
+    function Align($aHAlign,$aVAlign="top",$aParagraphAlign="") {
+        $this->halign = $aHAlign;
+        $this->valign = $aVAlign;
+        if( $aParagraphAlign != "" )
+            $this->paragraph_align = $aParagraphAlign;
+    }
+
+    // Alias
+    function SetAlign($aHAlign,$aVAlign="top",$aParagraphAlign="") {
+        $this->Align($aHAlign,$aVAlign,$aParagraphAlign);
+    }
+
+    // Specifies the alignment for a multi line text
+    function ParagraphAlign($aAlign) {
+        $this->paragraph_align = $aAlign;
+    }
+
+    // Specifies the alignment for a multi line text
+    function SetParagraphAlign($aAlign) {
+        $this->paragraph_align = $aAlign;
+    }
+
+    function SetShadow($aShadowColor='gray',$aShadowWidth=3) {
+        $this->ishadowwidth=$aShadowWidth;
+        $this->shadow=$aShadowColor;
+        $this->boxed=true;
+    }
+
+    function SetWordWrap($aCol) {
+        $this->iWordwrap = $aCol ;
+    }
+
+    // Specify that the text should be boxed. fcolor=frame color, bcolor=border color,
+    // $shadow=drop shadow should be added around the text.
+    function SetBox($aFrameColor=array(255,255,255),$aBorderColor=array(0,0,0),$aShadowColor=false,$aCornerRadius=4,$aShadowWidth=3) {
+        if( $aFrameColor === false ) {
+            $this->boxed=false;
+        }
+        else {
+            $this->boxed=true;
+        }
+        $this->fcolor=$aFrameColor;
+        $this->bcolor=$aBorderColor;
+        // For backwards compatibility when shadow was just true or false
+        if( $aShadowColor === true ) {
+            $aShadowColor = 'gray';
+        }
+        $this->shadow=$aShadowColor;
+        $this->icornerradius=$aCornerRadius;
+        $this->ishadowwidth=$aShadowWidth;
+    }
+
+    function SetBox2($aFrameColor=array(255,255,255),$aBorderColor=array(0,0,0),$aShadowColor=false,$aCornerRadius=4,$aShadowWidth=3) {
+        $this->iBoxType=2;
+        $this->SetBox($aFrameColor,$aBorderColor,$aShadowColor,$aCornerRadius,$aShadowWidth);
+    }
+
+    // Hide the text
+    function Hide($aHide=true) {
+        $this->hide=$aHide;
+    }
+
+    // This looks ugly since it's not a very orthogonal design
+    // but I added this "inverse" of Hide() to harmonize
+    // with some classes which I designed more recently (especially)
+    // jpgraph_gantt
+    function Show($aShow=true) {
+        $this->hide=!$aShow;
+    }
+
+    // Specify font
+    function SetFont($aFamily,$aStyle=FS_NORMAL,$aSize=10) {
+        $this->font_family=$aFamily;
+        $this->font_style=$aStyle;
+        $this->font_size=$aSize;
+    }
+
+    // Center the text between $left and $right coordinates
+    function Center($aLeft,$aRight,$aYAbsPos=false) {
+        $this->x = $aLeft + ($aRight-$aLeft )/2;
+        $this->halign = "center";
+        if( is_numeric($aYAbsPos) )
+            $this->y = $aYAbsPos;
+    }
+
+    // Set text color
+    function SetColor($aColor) {
+        $this->color = $aColor;
+    }
+
+    function SetAngle($aAngle) {
+        $this->SetOrientation($aAngle);
+    }
+
+    // Orientation of text. Note only TTF fonts can have an arbitrary angle
+    function SetOrientation($aDirection=0) {
+        if( is_numeric($aDirection) )
+            $this->dir=$aDirection;
+        elseif( $aDirection=="h" )
+            $this->dir = 0;
+        elseif( $aDirection=="v" )
+            $this->dir = 90;
+        else
+            JpGraphError::RaiseL(25051);//(" Invalid direction specified for text.");
+    }
+
+    // Total width of text
+    function GetWidth($aImg) {
+        $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size);
+        $w = $aImg->GetTextWidth($this->t,$this->dir);
+        return $w;
+    }
+
+    // Hight of font
+    function GetFontHeight($aImg) {
+        $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size);
+        $h = $aImg->GetFontHeight();
+        return $h;
+
+    }
+
+    function GetTextHeight($aImg) {
+        $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size);
+        $h = $aImg->GetTextHeight($this->t,$this->dir);
+        return $h;
+    }
+
+    function GetHeight($aImg) {
+    // Synonym for GetTextHeight()
+        $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size);
+        $h = $aImg->GetTextHeight($this->t,$this->dir);
+        return $h;
+    }
+
+    // Set the margin which will be interpretated differently depending
+    // on the context.
+    function SetMargin($aMarg) {
+        $this->margin = $aMarg;
+    }
+
+    function StrokeWithScale($aImg,$axscale,$ayscale) {
+        if( $this->iScalePosX === null || $this->iScalePosY === null ) {
+            $this->Stroke($aImg);
+        }
+        else {
+            $this->Stroke($aImg,
+                round($axscale->Translate($this->iScalePosX)),
+                round($ayscale->Translate($this->iScalePosY)));
+        }
+    }
+
+    function SetCSIMTarget($aURITarget,$aAlt='',$aWinTarget='') {
+        $this->iCSIMtarget = $aURITarget;
+        $this->iCSIMalt = $aAlt;
+        $this->iCSIMWinTarget = $aWinTarget;
+    }
+
+    function GetCSIMareas() {
+        if( $this->iCSIMtarget !== '' ) {
+            return $this->iCSIMarea;
+        }
+        else {
+            return '';
+        }
+    }
+
+    // Display text in image
+    function Stroke($aImg,$x=null,$y=null) {
+
+        if( $x !== null ) $this->x = round($x);
+        if( $y !== null ) $this->y = round($y);
+
+        // Insert newlines
+        if( $this->iWordwrap > 0 ) {
+            $this->t = wordwrap($this->t,$this->iWordwrap,"\n");
+        }
+
+        // If position been given as a fraction of the image size
+        // calculate the absolute position
+        if( $this->x < 1 && $this->x > 0 ) $this->x *= $aImg->width;
+        if( $this->y < 1 && $this->y > 0 ) $this->y *= $aImg->height;
+
+        $aImg->PushColor($this->color);
+        $aImg->SetFont($this->font_family,$this->font_style,$this->raw_font_size);
+        $aImg->SetTextAlign($this->halign,$this->valign);
+
+        if( $this->boxed ) {
+            if( $this->fcolor=="nofill" ) {
+                $this->fcolor=false;
+            }
+
+            $oldweight=$aImg->SetLineWeight(1);
+
+            if( $this->iBoxType == 2 && $this->font_family > FF_FONT2+2 ) {
+
+                $bbox = $aImg->StrokeBoxedText2($this->x, $this->y,
+                                                $this->t, $this->dir,
+                                                $this->fcolor,
+                                                $this->bcolor,
+                                                $this->shadow,
+                                                $this->paragraph_align,
+                                                2,4,
+                                                $this->icornerradius,
+                                                $this->ishadowwidth);
+            }
+            else {
+                $bbox = $aImg->StrokeBoxedText($this->x,$this->y,$this->t,
+                    $this->dir,$this->fcolor,$this->bcolor,$this->shadow,
+                    $this->paragraph_align,3,3,$this->icornerradius,
+                    $this->ishadowwidth);
+            }
+
+            $aImg->SetLineWeight($oldweight);
+        }
+        else {
+            $debug=false;
+            $bbox = $aImg->StrokeText($this->x,$this->y,$this->t,$this->dir,$this->paragraph_align,$debug);
+        }
+
+        // Create CSIM targets
+        $coords = $bbox[0].','.$bbox[1].','.$bbox[2].','.$bbox[3].','.$bbox[4].','.$bbox[5].','.$bbox[6].','.$bbox[7];
+        $this->iCSIMarea = "<area shape=\"poly\" coords=\"$coords\" href=\"".htmlentities($this->iCSIMtarget)."\" ";
+        if( trim($this->iCSIMalt) != '' ) {
+            $this->iCSIMarea .= " alt=\"".$this->iCSIMalt."\" ";
+            $this->iCSIMarea .= " title=\"".$this->iCSIMalt."\" ";
+        }
+        if( trim($this->iCSIMWinTarget) != '' ) {
+            $this->iCSIMarea .= " target=\"".$this->iCSIMWinTarget."\" ";
+        }
+        $this->iCSIMarea .= " />\n";
+
+        $aImg->PopColor($this->color);
+    }
+
+    function __get($name) {
+
+        if (strpos($name, 'raw_') !== false) {
+            // if $name == 'raw_left_margin' , return $this->_left_margin;
+            $variable_name = '_' . str_replace('raw_', '', $name);
+            return $this->$variable_name;
+        }
+
+        $variable_name = '_' . $name; 
+
+        if (isset($this->$variable_name)) {
+            return $this->$variable_name * SUPERSAMPLING_SCALE;
+        } else {
+            JpGraphError::RaiseL('25132', $name);
+        } 
+    }
+
+    function __set($name, $value) {
+        $this->{'_'.$name} = $value;
+    }
+} // Class
+
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_theme.inc.php b/common/lib/jpgraph_lib/jpgraph_theme.inc.php
new file mode 100644
index 000000000..0cc54c476
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_theme.inc.php
@@ -0,0 +1,136 @@
+<?php
+//=======================================================================
+// File:        JPGRAPH_THEME.INC.PHP
+// Description: Class to define graph theme
+// Created:     2010-09-29 
+// Ver:         $Id: jpgraph_theme.inc.php 83 2010-10-01 11:24:19Z atsushi $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+
+// include Theme classes
+foreach (glob(dirname(__FILE__) . '/themes/*.php') as $theme_class_script) {
+  require_once($theme_class_script);
+}
+
+//===================================================
+// CLASS 
+// Description: 
+//===================================================
+abstract class Theme {
+    protected $color_index;
+    
+    function __construct() {
+        $this->color_index = 0;
+    }
+    /**
+    * 
+    */
+    abstract function GetColorList();
+
+    /**
+    *
+    */
+    abstract function ApplyPlot($plot);
+
+
+    /**
+    *
+    */   
+    function SetupPlot($plot) {
+        if (is_array($plot)) {
+            foreach ($plot as $obj) {
+                $this->ApplyPlot($obj);
+            }
+        } else {
+            $this->ApplyPlot($plot);
+        }
+    }
+
+    /**
+    *
+    */
+    function ApplyGraph($graph) {
+
+        $this->graph = $graph;
+        $method_name = '';
+
+        if (get_class($graph) == 'Graph') {
+            $method_name = 'SetupGraph';
+        } else {
+            $method_name = 'Setup' . get_class($graph);
+        }
+
+        if (method_exists($this, $method_name)) {
+            $this->$method_name($graph);
+        } else {
+            JpGraphError::RaiseL(30001, $method_name, $method_name); //Theme::%s() is not defined. \nPlease make %s(\$graph) function in your theme classs.
+        }
+    }
+
+    /**
+    *
+    */
+    function PreStrokeApply($graph) {
+    }
+
+    /**
+    *
+    */
+    function GetThemeColors($num = 30) { 
+        $result_list = array();
+
+        $old_index = $this->color_index;
+        $this->color_index = 0;
+        $count = 0;
+  
+        $i = 0;
+        while (true) {
+            for ($j = 0; $j < count($this->GetColorList()); $j++) {
+                if (++$count > $num) {
+                    break 2;
+                }
+                $result_list[] = $this->GetNextColor();
+            }
+            $i++;
+        }
+
+        $this->color_index = $old_index;
+        
+        return $result_list;
+    }
+
+    /**
+    *
+    */
+    function GetNextColor() {
+        $color_list = $this->GetColorList();
+
+        $color = null;
+        if (isset($color_list[$this->color_index])) {
+            $color = $color_list[$this->color_index];
+        } else {
+            $color_count = count($color_list);
+            if ($color_count <= $this->color_index) {
+                $color_tmp = $color_list[$this->color_index % $color_count];
+                $brightness = 1.0 - intval($this->color_index / $color_count) * 0.2;
+                $rgb = new RGB();
+                $color = $color_tmp . ':' . $brightness;
+                $color = $rgb->Color($color);
+                $alpha = array_pop($color);
+                $color = $rgb->tryHexConversion($color);
+                if ($alpha) {
+                    $color .= '@' . $alpha;
+                }
+            }
+        }
+
+        $this->color_index++;
+
+        return $color;
+    }
+
+} // Class
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_ttf.inc.php b/common/lib/jpgraph_lib/jpgraph_ttf.inc.php
new file mode 100644
index 000000000..5a1bc3e23
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_ttf.inc.php
@@ -0,0 +1,631 @@
+<?php
+//=======================================================================
+// File:        jpgraph_ttf.inc.php
+// Description: Handling of TTF fonts
+// Created:     2006-11-19
+// Ver:         $Id: jpgraph_ttf.inc.php 1858 2009-09-28 14:39:51Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+
+// TTF Font families
+define("FF_COURIER",10);
+define("FF_VERDANA",11);
+define("FF_TIMES",12);
+define("FF_COMIC",14);
+define("FF_ARIAL",15);
+define("FF_GEORGIA",16);
+define("FF_TREBUCHE",17);
+
+// Gnome Vera font
+// Available from http://www.gnome.org/fonts/
+define("FF_VERA",18);
+define("FF_VERAMONO",19);
+define("FF_VERASERIF",20);
+
+// Chinese font
+define("FF_SIMSUN",30);
+define("FF_CHINESE",31);
+define("FF_BIG5",32);
+
+// Japanese font
+define("FF_MINCHO",40);
+define("FF_PMINCHO",41);
+define("FF_GOTHIC",42);
+define("FF_PGOTHIC",43);
+
+// Hebrew fonts
+define("FF_DAVID",44);
+define("FF_MIRIAM",45);
+define("FF_AHRON",46);
+
+// Dejavu-fonts http://sourceforge.net/projects/dejavu
+define("FF_DV_SANSSERIF",47);
+define("FF_DV_SERIF",48);
+define("FF_DV_SANSSERIFMONO",49);
+define("FF_DV_SERIFCOND",50);
+define("FF_DV_SANSSERIFCOND",51);
+
+// Extra fonts
+// Download fonts from
+// http://www.webfontlist.com
+// http://www.webpagepublicity.com/free-fonts.html
+// http://www.fontonic.com/fonts.asp?width=d&offset=120
+// http://www.fontspace.com/category/famous
+
+// define("FF_SPEEDO",71);  // This font is also known as Bauer (Used for development gauge fascia)
+define("FF_DIGITAL",72); // Digital readout font
+define("FF_COMPUTER",73); // The classic computer font
+define("FF_CALCULATOR",74); // Triad font
+
+define("FF_USERFONT",90);
+define("FF_USERFONT1",90);
+define("FF_USERFONT2",91);
+define("FF_USERFONT3",92);
+
+// Limits for fonts
+define("_FIRST_FONT",10);
+define("_LAST_FONT",99);
+
+// TTF Font styles
+define("FS_NORMAL",9001);
+define("FS_BOLD",9002);
+define("FS_ITALIC",9003);
+define("FS_BOLDIT",9004);
+define("FS_BOLDITALIC",9004);
+
+//Definitions for internal font
+define("FF_FONT0",1);
+define("FF_FONT1",2);
+define("FF_FONT2",4);
+
+//------------------------------------------------------------------------
+// Defines for font setup
+//------------------------------------------------------------------------
+
+// Actual name of the TTF file used together with FF_CHINESE aka FF_BIG5
+// This is the TTF file being used when the font family is specified as
+// either FF_CHINESE or FF_BIG5
+define('CHINESE_TTF_FONT','bkai00mp.ttf');
+
+// Special unicode greek language support
+define("LANGUAGE_GREEK",false);
+
+// If you are setting this config to true the conversion of greek characters
+// will assume that the input text is windows 1251
+define("GREEK_FROM_WINDOWS",false);
+
+// Special unicode cyrillic language support
+define("LANGUAGE_CYRILLIC",false);
+
+// If you are setting this config to true the conversion
+// will assume that the input text is windows 1251, if
+// false it will assume koi8-r
+define("CYRILLIC_FROM_WINDOWS",false);
+
+// The following constant is used to auto-detect
+// whether cyrillic conversion is really necessary
+// if enabled. Just replace 'windows-1251' with a variable
+// containing the input character encoding string
+// of your application calling jpgraph.
+// A typical such string would be 'UTF-8' or 'utf-8'.
+// The comparison is case-insensitive.
+// If this charset is not a 'koi8-r' or 'windows-1251'
+// derivate then no conversion is done.
+//
+// This constant can be very important in multi-user
+// multi-language environments where a cyrillic conversion
+// could be needed for some cyrillic people
+// and resulting in just erraneous conversions
+// for not-cyrillic language based people.
+//
+// Example: In the free project management
+// software dotproject.net $locale_char_set is dynamically
+// set by the language environment the user has chosen.
+//
+// Usage: define('LANGUAGE_CHARSET', $locale_char_set);
+//
+// where $locale_char_set is a GLOBAL (string) variable
+// from the application including JpGraph.
+//
+define('LANGUAGE_CHARSET', null);
+
+// Japanese TrueType font used with FF_MINCHO, FF_PMINCHO, FF_GOTHIC, FF_PGOTHIC
+// Standard fonts from Infomation-technology Promotion Agency (IPA)
+// See http://mix-mplus-ipa.sourceforge.jp/
+define('MINCHO_TTF_FONT','ipam.ttf');
+define('PMINCHO_TTF_FONT','ipamp.ttf');
+define('GOTHIC_TTF_FONT','ipag.ttf');
+define('PGOTHIC_TTF_FONT','ipagp.ttf');
+
+// Assume that Japanese text have been entered in EUC-JP encoding.
+// If this define is true then conversion from EUC-JP to UTF8 is done
+// automatically in the library using the mbstring module in PHP.
+define('ASSUME_EUCJP_ENCODING',false);
+
+
+// Default font family
+define('FF_DEFAULT', FF_DV_SANSSERIF);
+
+
+
+//=================================================================
+// CLASS LanguageConv
+// Description:
+// Converts various character encoding into proper
+// UTF-8 depending on how the library have been configured and
+// what font family is being used
+//=================================================================
+class LanguageConv {
+    private $g2312 = null ;
+
+    function Convert($aTxt,$aFF) {
+        if( LANGUAGE_GREEK ) {
+            if( GREEK_FROM_WINDOWS ) {
+                $unistring = LanguageConv::gr_win2uni($aTxt);
+            } else  {
+                $unistring = LanguageConv::gr_iso2uni($aTxt);
+            }
+            return $unistring;
+        } elseif( LANGUAGE_CYRILLIC ) {
+            if( CYRILLIC_FROM_WINDOWS && (!defined('LANGUAGE_CHARSET') || stristr(LANGUAGE_CHARSET, 'windows-1251')) ) {
+                $aTxt = convert_cyr_string($aTxt, "w", "k");
+            }
+            if( !defined('LANGUAGE_CHARSET') || stristr(LANGUAGE_CHARSET, 'koi8-r') || stristr(LANGUAGE_CHARSET, 'windows-1251')) {
+                $isostring = convert_cyr_string($aTxt, "k", "i");
+                $unistring = LanguageConv::iso2uni($isostring);
+            }
+            else {
+                $unistring = $aTxt;
+            }
+            return $unistring;
+        }
+        elseif( $aFF === FF_SIMSUN ) {
+            // Do Chinese conversion
+            if( $this->g2312 == null ) {
+                include_once 'jpgraph_gb2312.php' ;
+                $this->g2312 = new GB2312toUTF8();
+            }
+            return $this->g2312->gb2utf8($aTxt);
+        }
+        elseif( $aFF === FF_BIG5 ) {
+            if( !function_exists('iconv') ) {
+                JpGraphError::RaiseL(25006);
+                //('Usage of FF_CHINESE (FF_BIG5) font family requires that your PHP setup has the iconv() function. By default this is not compiled into PHP (needs the "--width-iconv" when configured).');
+            }
+            return iconv('BIG5','UTF-8',$aTxt);
+        }
+        elseif( ASSUME_EUCJP_ENCODING &&
+        ($aFF == FF_MINCHO || $aFF == FF_GOTHIC || $aFF == FF_PMINCHO || $aFF == FF_PGOTHIC) ) {
+            if( !function_exists('mb_convert_encoding') ) {
+                JpGraphError::RaiseL(25127);
+            }
+            return mb_convert_encoding($aTxt, 'UTF-8','EUC-JP');
+        }
+        elseif( $aFF == FF_DAVID || $aFF == FF_MIRIAM || $aFF == FF_AHRON ) {
+            return LanguageConv::heb_iso2uni($aTxt);
+        }
+        else
+        return $aTxt;
+    }
+
+    // Translate iso encoding to unicode
+    public static function iso2uni ($isoline){
+        $uniline='';
+        for ($i=0; $i < strlen($isoline); $i++){
+            $thischar=substr($isoline,$i,1);
+            $charcode=ord($thischar);
+            $uniline.=($charcode>175) ? "&#" . (1040+($charcode-176)). ";" : $thischar;
+        }
+        return $uniline;
+    }
+
+    // Translate greek iso encoding to unicode
+    public static function gr_iso2uni ($isoline) {
+        $uniline='';
+        for ($i=0; $i < strlen($isoline); $i++) {
+            $thischar=substr($isoline,$i,1);
+            $charcode=ord($thischar);
+            $uniline.=($charcode>179 && $charcode!=183 && $charcode!=187 && $charcode!=189) ? "&#" . (900+($charcode-180)). ";" : $thischar;
+        }
+        return $uniline;
+    }
+
+    // Translate greek win encoding to unicode
+    public static function gr_win2uni ($winline) {
+        $uniline='';
+        for ($i=0; $i < strlen($winline); $i++) {
+            $thischar=substr($winline,$i,1);
+            $charcode=ord($thischar);
+            if ($charcode==161 || $charcode==162) {
+                $uniline.="&#" . (740+$charcode). ";";
+            }
+            else {
+                $uniline.=(($charcode>183 && $charcode!=187 && $charcode!=189) || $charcode==180) ? "&#" . (900+($charcode-180)). ";" : $thischar;
+            }
+        }
+        return $uniline;
+    }
+
+    public static function heb_iso2uni($isoline) {
+        $isoline = hebrev($isoline);
+        $o = '';
+
+        $n = strlen($isoline);
+        for($i=0; $i < $n; $i++) {
+            $c=ord( substr($isoline,$i,1) );
+            $o .= ($c > 223) && ($c < 251) ? '&#'.(1264+$c).';' : chr($c);
+        }
+        return utf8_encode($o);
+    }
+}
+
+//=============================================================
+// CLASS TTF
+// Description: Handle TTF font names and mapping and loading of
+//              font files
+//=============================================================
+class TTF {
+    private $font_files,$style_names;
+
+    function __construct() {
+
+	        // String names for font styles to be used in error messages
+	    $this->style_names=array(
+	    	FS_NORMAL =>'normal',
+	    	FS_BOLD =>'bold',
+	    	FS_ITALIC =>'italic',
+	    	FS_BOLDITALIC =>'bolditalic');
+
+	    // File names for available fonts
+	    $this->font_files=array(
+	    FF_COURIER => array(FS_NORMAL =>'cour.ttf',
+	    	FS_BOLD  =>'courbd.ttf',
+	    	FS_ITALIC =>'couri.ttf',
+	    	FS_BOLDITALIC =>'courbi.ttf' ),
+	    FF_GEORGIA => array(FS_NORMAL =>'georgia.ttf',
+	    	FS_BOLD  =>'georgiab.ttf',
+	    	FS_ITALIC =>'georgiai.ttf',
+	    	FS_BOLDITALIC =>'' ),
+	    FF_TREBUCHE =>array(FS_NORMAL =>'trebuc.ttf',
+	    	FS_BOLD  =>'trebucbd.ttf',
+	    	FS_ITALIC =>'trebucit.ttf',
+	    	FS_BOLDITALIC =>'trebucbi.ttf' ),
+	    FF_VERDANA  => array(FS_NORMAL =>'verdana.ttf',
+	    	FS_BOLD  =>'verdanab.ttf',
+	    	FS_ITALIC =>'verdanai.ttf',
+	    	FS_BOLDITALIC =>'' ),
+	    FF_TIMES =>   array(FS_NORMAL =>'times.ttf',
+	    	FS_BOLD  =>'timesbd.ttf',
+	    	FS_ITALIC =>'timesi.ttf',
+	    	FS_BOLDITALIC =>'timesbi.ttf' ),
+	    FF_COMIC =>   array(FS_NORMAL =>'comic.ttf',
+	    	FS_BOLD  =>'comicbd.ttf',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+	    FF_ARIAL =>   array(FS_NORMAL =>'arial.ttf',
+	    	FS_BOLD  =>'arialbd.ttf',
+	    	FS_ITALIC =>'ariali.ttf',
+	    	FS_BOLDITALIC =>'arialbi.ttf' ) ,
+	    FF_VERA =>    array(FS_NORMAL =>'Vera.ttf',
+	    	FS_BOLD  =>'VeraBd.ttf',
+	    	FS_ITALIC =>'VeraIt.ttf',
+	    	FS_BOLDITALIC =>'VeraBI.ttf' ),
+	    FF_VERAMONO => array(FS_NORMAL =>'VeraMono.ttf',
+	    	FS_BOLD =>'VeraMoBd.ttf',
+	    	FS_ITALIC =>'VeraMoIt.ttf',
+	    	FS_BOLDITALIC =>'VeraMoBI.ttf' ),
+	    FF_VERASERIF=> array(FS_NORMAL =>'VeraSe.ttf',
+	    	FS_BOLD =>'VeraSeBd.ttf',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ) ,
+
+	    /* Chinese fonts */
+	    FF_SIMSUN  =>  array(
+	    	FS_NORMAL =>'simsun.ttc',
+	    	FS_BOLD =>'simhei.ttf',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+	    FF_CHINESE  =>   array(
+	    	FS_NORMAL =>CHINESE_TTF_FONT,
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+	    FF_BIG5  =>   array(
+	    	FS_NORMAL =>CHINESE_TTF_FONT,
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+
+	    /* Japanese fonts */
+	    FF_MINCHO  =>  array(
+	    	FS_NORMAL =>MINCHO_TTF_FONT,
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+
+	    FF_PMINCHO  =>  array(
+	    	FS_NORMAL =>PMINCHO_TTF_FONT,
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+
+	    FF_GOTHIC   =>  array(
+	    	FS_NORMAL =>GOTHIC_TTF_FONT,
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+
+	    FF_PGOTHIC  =>  array(
+	    	FS_NORMAL =>PGOTHIC_TTF_FONT,
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+
+	    /* Hebrew fonts */
+	    FF_DAVID  =>  array(
+	    	FS_NORMAL =>'DAVIDNEW.TTF',
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+
+	    FF_MIRIAM  =>  array(
+	    	FS_NORMAL =>'MRIAMY.TTF',
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+
+	    FF_AHRON  =>  array(
+	    	FS_NORMAL =>'ahronbd.ttf',
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+
+	    /* Misc fonts */
+	    FF_DIGITAL =>   array(
+	    	FS_NORMAL =>'DIGIRU__.TTF',
+	    	FS_BOLD =>'Digirtu_.ttf',
+	    	FS_ITALIC =>'Digir___.ttf',
+	    	FS_BOLDITALIC =>'DIGIRT__.TTF' ),
+
+	    /* This is an experimental font for the speedometer development
+	    FF_SPEEDO =>    array(
+	    FS_NORMAL =>'Speedo.ttf',
+	    FS_BOLD =>'',
+	    FS_ITALIC =>'',
+	    FS_BOLDITALIC =>'' ),
+	    */
+
+	    FF_COMPUTER  =>  array(
+	    	FS_NORMAL =>'COMPUTER.TTF',
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+
+	    FF_CALCULATOR => array(
+	    	FS_NORMAL =>'Triad_xs.ttf',
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+
+	    /* Dejavu fonts */
+	    FF_DV_SANSSERIF => array(
+	    	FS_NORMAL =>array('DejaVuSans.ttf'),
+	    	FS_BOLD =>array('DejaVuSans-Bold.ttf','DejaVuSansBold.ttf'),
+	    	FS_ITALIC =>array('DejaVuSans-Oblique.ttf','DejaVuSansOblique.ttf'),
+	    	FS_BOLDITALIC =>array('DejaVuSans-BoldOblique.ttf','DejaVuSansBoldOblique.ttf') ),
+
+	    FF_DV_SANSSERIFMONO => array(
+	    	FS_NORMAL =>array('DejaVuSansMono.ttf','DejaVuMonoSans.ttf'),
+	    	FS_BOLD =>array('DejaVuSansMono-Bold.ttf','DejaVuMonoSansBold.ttf'),
+	    	FS_ITALIC =>array('DejaVuSansMono-Oblique.ttf','DejaVuMonoSansOblique.ttf'),
+	    	FS_BOLDITALIC =>array('DejaVuSansMono-BoldOblique.ttf','DejaVuMonoSansBoldOblique.ttf') ),
+
+	    FF_DV_SANSSERIFCOND => array(
+	    	FS_NORMAL =>array('DejaVuSansCondensed.ttf','DejaVuCondensedSans.ttf'),
+	    	FS_BOLD =>array('DejaVuSansCondensed-Bold.ttf','DejaVuCondensedSansBold.ttf'),
+	    	FS_ITALIC =>array('DejaVuSansCondensed-Oblique.ttf','DejaVuCondensedSansOblique.ttf'),
+	    	FS_BOLDITALIC =>array('DejaVuSansCondensed-BoldOblique.ttf','DejaVuCondensedSansBoldOblique.ttf') ),
+
+	    FF_DV_SERIF => array(
+	    	FS_NORMAL =>array('DejaVuSerif.ttf'),
+	    	FS_BOLD =>array('DejaVuSerif-Bold.ttf','DejaVuSerifBold.ttf'),
+	    	FS_ITALIC =>array('DejaVuSerif-Italic.ttf','DejaVuSerifItalic.ttf'),
+	    	FS_BOLDITALIC =>array('DejaVuSerif-BoldItalic.ttf','DejaVuSerifBoldItalic.ttf') ),
+
+	    FF_DV_SERIFCOND => array(
+	    	FS_NORMAL =>array('DejaVuSerifCondensed.ttf','DejaVuCondensedSerif.ttf'),
+	    	FS_BOLD =>array('DejaVuSerifCondensed-Bold.ttf','DejaVuCondensedSerifBold.ttf'),
+	    	FS_ITALIC =>array('DejaVuSerifCondensed-Italic.ttf','DejaVuCondensedSerifItalic.ttf'),
+	    	FS_BOLDITALIC =>array('DejaVuSerifCondensed-BoldItalic.ttf','DejaVuCondensedSerifBoldItalic.ttf') ),
+
+
+	    /* Placeholders for defined fonts */
+	    FF_USERFONT1 => array(
+	    	FS_NORMAL =>'',
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+
+	    FF_USERFONT2 => array(
+	    	FS_NORMAL =>'',
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+
+	    FF_USERFONT3 => array(
+	    	FS_NORMAL =>'',
+	    	FS_BOLD =>'',
+	    	FS_ITALIC =>'',
+	    	FS_BOLDITALIC =>'' ),
+
+	    );
+    }
+
+    //---------------
+    // PUBLIC METHODS
+    // Create the TTF file from the font specification
+    function File($family,$style=FS_NORMAL) {
+        $fam = @$this->font_files[$family];
+        if( !$fam ) {
+            JpGraphError::RaiseL(25046,$family);//("Specified TTF font family (id=$family) is unknown or does not exist. Please note that TTF fonts are not distributed with JpGraph for copyright reasons. You can find the MS TTF WEB-fonts (arial, courier etc) for download at http://corefonts.sourceforge.net/");
+        }
+        $ff = @$fam[$style];
+
+        // There are several optional file names. They are tried in order
+        // and the first one found is used
+        if( !is_array($ff) ) {
+            $ff = array($ff);
+        }
+
+        $jpgraph_font_dir = dirname(__FILE__).'/fonts/';
+
+        foreach ($ff as $font_file) {
+            // All font families are guaranteed to have the normal style
+
+            if( $font_file==='' )
+                    JpGraphError::RaiseL(25047,$this->style_names[$style],$this->font_files[$family][FS_NORMAL]);//('Style "'.$this->style_names[$style].'" is not available for font family '.$this->font_files[$family][FS_NORMAL].'.');
+            if( !$font_file ) {
+                JpGraphError::RaiseL(25048,$fam);//("Unknown font style specification [$fam].");
+            }
+
+            // check jpgraph/src/fonts dir
+            $jpgraph_font_file = $jpgraph_font_dir . $font_file;
+            if (file_exists($jpgraph_font_file) === true && is_readable($jpgraph_font_file) === true) { 
+                $font_file = $jpgraph_font_file;
+                break;
+            }
+
+            // check OS font dir
+            if ($family >= FF_MINCHO && $family <= FF_PGOTHIC) {
+                $font_file = MBTTF_DIR.$font_file;
+            } else {
+                $font_file = TTF_DIR.$font_file;
+            }
+            if (file_exists($font_file) === true && is_readable($font_file) === true) { 
+                break;
+            }
+        }
+
+        if( !file_exists($font_file) ) {
+        	JpGraphError::RaiseL(25049,$font_file);//("Font file \"$font_file\" is not readable or does not exist.");
+        }
+
+        return $font_file;
+    }
+
+    function SetUserFont($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
+        $this->font_files[FF_USERFONT] =
+        	array(FS_NORMAL     => $aNormal,
+        		  FS_BOLD => $aBold,
+        		  FS_ITALIC => $aItalic,
+        		  FS_BOLDITALIC => $aBoldIt ) ;
+    }
+
+    function SetUserFont1($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
+        $this->font_files[FF_USERFONT1] =
+        	array(FS_NORMAL     => $aNormal,
+        		  FS_BOLD => $aBold,
+        		  FS_ITALIC => $aItalic,
+        		  FS_BOLDITALIC => $aBoldIt ) ;
+    }
+
+    function SetUserFont2($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
+        $this->font_files[FF_USERFONT2] =
+        	array(FS_NORMAL     => $aNormal,
+        		  FS_BOLD => $aBold,
+        		  FS_ITALIC => $aItalic,
+        		  FS_BOLDITALIC => $aBoldIt ) ;
+    }
+
+    function SetUserFont3($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
+        $this->font_files[FF_USERFONT3] =
+        	array(FS_NORMAL     => $aNormal,
+        		  FS_BOLD => $aBold,
+        		  FS_ITALIC => $aItalic,
+        		  FS_BOLDITALIC => $aBoldIt ) ;
+    }
+
+} // Class
+
+
+//=============================================================================
+// CLASS SymChar
+// Description: Code values for some commonly used characters that
+//              normally isn't available directly on the keyboard, for example
+//              mathematical and greek symbols.
+//=============================================================================
+class  SymChar {
+    static function Get($aSymb,$aCapital=FALSE) {
+        $iSymbols = array(
+        /* Greek */
+        array('alpha','03B1','0391'),
+        array('beta','03B2','0392'),
+        array('gamma','03B3','0393'),
+        array('delta','03B4','0394'),
+        array('epsilon','03B5','0395'),
+        array('zeta','03B6','0396'),
+        array('ny','03B7','0397'),
+        array('eta','03B8','0398'),
+        array('theta','03B8','0398'),
+        array('iota','03B9','0399'),
+        array('kappa','03BA','039A'),
+        array('lambda','03BB','039B'),
+        array('mu','03BC','039C'),
+        array('nu','03BD','039D'),
+        array('xi','03BE','039E'),
+        array('omicron','03BF','039F'),
+        array('pi','03C0','03A0'),
+        array('rho','03C1','03A1'),
+        array('sigma','03C3','03A3'),
+        array('tau','03C4','03A4'),
+        array('upsilon','03C5','03A5'),
+        array('phi','03C6','03A6'),
+        array('chi','03C7','03A7'),
+        array('psi','03C8','03A8'),
+        array('omega','03C9','03A9'),
+        /* Money */
+        array('euro','20AC'),
+        array('yen','00A5'),
+        array('pound','20A4'),
+        /* Math */
+        array('approx','2248'),
+        array('neq','2260'),
+        array('not','2310'),
+        array('def','2261'),
+        array('inf','221E'),
+        array('sqrt','221A'),
+        array('int','222B'),
+        /* Misc */
+        array('copy','00A9'),
+        array('para','00A7'),
+        array('tm','2122'),   /* Trademark symbol */
+        array('rtm','00AE'),   /* Registered trademark */
+        array('degree','00b0'),
+        array('lte','2264'), /* Less than or equal */
+        array('gte','2265'), /* Greater than or equal */
+
+        );
+
+        $n = count($iSymbols);
+        $i=0;
+        $found = false;
+        $aSymb = strtolower($aSymb);
+        while( $i < $n && !$found ) {
+            $found = $aSymb === $iSymbols[$i++][0];
+        }
+        if( $found ) {
+            $ca = $iSymbols[--$i];
+            if( $aCapital && count($ca)==3 )
+                $s = $ca[2];
+            else
+                $s = $ca[1];
+            return sprintf('&#%04d;',hexdec($s));
+        }
+        else
+            return '';
+    }
+}
+
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_utils.inc.php b/common/lib/jpgraph_lib/jpgraph_utils.inc.php
new file mode 100644
index 000000000..f0d002c14
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_utils.inc.php
@@ -0,0 +1,685 @@
+<?php
+/*=======================================================================
+ // File:        JPGRAPH_UTILS.INC
+ // Description: Collection of non-essential "nice to have" utilities
+ // Created:     2005-11-20
+ // Ver:         $Id: jpgraph_utils.inc.php 1777 2009-08-23 17:34:36Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+
+//===================================================
+// CLASS FuncGenerator
+// Description: Utility class to help generate data for function plots.
+// The class supports both parametric and regular functions.
+//===================================================
+class FuncGenerator {
+    private $iFunc='',$iXFunc='',$iMin,$iMax,$iStepSize;
+
+    function __construct($aFunc,$aXFunc='') {
+        $this->iFunc = $aFunc;
+        $this->iXFunc = $aXFunc;
+    }
+
+    function E($aXMin,$aXMax,$aSteps=50) {
+        $this->iMin = $aXMin;
+        $this->iMax = $aXMax;
+        $this->iStepSize = ($aXMax-$aXMin)/$aSteps;
+
+        if( $this->iXFunc != '' )
+        $t = 'for($i='.$aXMin.'; $i<='.$aXMax.'; $i += '.$this->iStepSize.') {$ya[]='.$this->iFunc.';$xa[]='.$this->iXFunc.';}';
+        elseif( $this->iFunc != '' )
+        $t = 'for($x='.$aXMin.'; $x<='.$aXMax.'; $x += '.$this->iStepSize.') {$ya[]='.$this->iFunc.';$xa[]=$x;} $x='.$aXMax.';$ya[]='.$this->iFunc.';$xa[]=$x;';
+        else
+        JpGraphError::RaiseL(24001);//('FuncGenerator : No function specified. ');
+
+        @eval($t);
+
+        // If there is an error in the function specifcation this is the only
+        // way we can discover that.
+        if( empty($xa) || empty($ya) )
+        JpGraphError::RaiseL(24002);//('FuncGenerator : Syntax error in function specification ');
+
+        return array($xa,$ya);
+    }
+}
+
+
+//=============================================================================
+// CLASS DateScaleUtils
+// Description: Help to create a manual date scale
+//=============================================================================
+define('DSUTILS_MONTH',1); // Major and minor ticks on a monthly basis
+define('DSUTILS_MONTH1',1); // Major and minor ticks on a monthly basis
+define('DSUTILS_MONTH2',2); // Major ticks on a bi-monthly basis
+define('DSUTILS_MONTH3',3); // Major icks on a tri-monthly basis
+define('DSUTILS_MONTH6',4); // Major on a six-monthly basis
+define('DSUTILS_WEEK1',5); // Major ticks on a weekly basis
+define('DSUTILS_WEEK2',6); // Major ticks on a bi-weekly basis
+define('DSUTILS_WEEK4',7); // Major ticks on a quod-weekly basis
+define('DSUTILS_DAY1',8); // Major ticks on a daily basis
+define('DSUTILS_DAY2',9); // Major ticks on a bi-daily basis
+define('DSUTILS_DAY4',10); // Major ticks on a qoud-daily basis
+define('DSUTILS_YEAR1',11); // Major ticks on a yearly basis
+define('DSUTILS_YEAR2',12); // Major ticks on a bi-yearly basis
+define('DSUTILS_YEAR5',13); // Major ticks on a five-yearly basis
+
+
+class DateScaleUtils {
+    public static $iMin=0, $iMax=0;
+
+    private static $starthour,$startmonth, $startday, $startyear;
+    private static $endmonth, $endyear, $endday;
+    private static $tickPositions=array(),$minTickPositions=array();
+    private static $iUseWeeks = true;
+
+    static function UseWeekFormat($aFlg) {
+        self::$iUseWeeks = $aFlg;
+    }
+
+    static function doYearly($aType,$aMinor=false) {
+        $i=0; $j=0;
+        $m = self::$startmonth;
+        $y = self::$startyear;
+
+        if( self::$startday == 1 ) {
+            self::$tickPositions[$i++] = mktime(0,0,0,$m,1,$y);
+        }
+        ++$m;
+
+
+        switch( $aType ) {
+            case DSUTILS_YEAR1:
+                for($y=self::$startyear; $y <= self::$endyear; ++$y ) {
+                    if( $aMinor ) {
+                        while( $m <= 12 ) {
+                            if( !($y == self::$endyear && $m > self::$endmonth) ) {
+                                self::$minTickPositions[$j++] = mktime(0,0,0,$m,1,$y);
+                            }
+                            ++$m;
+                        }
+                        $m=1;
+                    }
+                    self::$tickPositions[$i++] = mktime(0,0,0,1,1,$y);
+                }
+                break;
+            case DSUTILS_YEAR2:
+                $y=self::$startyear;
+                while( $y <= self::$endyear ) {
+                    self::$tickPositions[$i++] = mktime(0,0,0,1,1,$y);
+                    for($k=0; $k < 1; ++$k ) {
+                        ++$y;
+                        if( $aMinor ) {
+                            self::$minTickPositions[$j++] = mktime(0,0,0,1,1,$y);
+                        }
+                    }
+                    ++$y;
+                }
+                break;
+            case DSUTILS_YEAR5:
+                $y=self::$startyear;
+                while( $y <= self::$endyear ) {
+                    self::$tickPositions[$i++] = mktime(0,0,0,1,1,$y);
+                    for($k=0; $k < 4; ++$k ) {
+                        ++$y;
+                        if( $aMinor ) {
+                            self::$minTickPositions[$j++] = mktime(0,0,0,1,1,$y);
+                        }
+                    }
+                    ++$y;
+                }
+                break;
+        }
+    }
+
+    static function doDaily($aType,$aMinor=false) {
+        $m = self::$startmonth;
+        $y = self::$startyear;
+        $d = self::$startday;
+        $h = self::$starthour;
+        $i=0;$j=0;
+
+        if( $h == 0 ) {
+            self::$tickPositions[$i++] = mktime(0,0,0,$m,$d,$y);
+        }
+        $t = mktime(0,0,0,$m,$d,$y);
+
+        switch($aType) {
+            case DSUTILS_DAY1:
+                while( $t <= self::$iMax ) {
+                    $t = strtotime('+1 day',$t);
+                    self::$tickPositions[$i++] = $t;
+                    if( $aMinor ) {
+                        self::$minTickPositions[$j++] = strtotime('+12 hours',$t);
+                    }
+                }
+                break;
+            case DSUTILS_DAY2:
+                while( $t <= self::$iMax ) {
+                    $t = strtotime('+1 day',$t);
+                    if( $aMinor ) {
+                        self::$minTickPositions[$j++] = $t;
+                    }
+                    $t = strtotime('+1 day',$t);
+                    self::$tickPositions[$i++] = $t;
+                }
+                break;
+            case DSUTILS_DAY4:
+                while( $t <= self::$iMax ) {
+                    for($k=0; $k < 3; ++$k ) {
+                        $t = strtotime('+1 day',$t);
+                        if( $aMinor ) {
+                            self::$minTickPositions[$j++] = $t;
+                        }
+                    }
+                    $t = strtotime('+1 day',$t);
+                    self::$tickPositions[$i++] = $t;
+                }
+                break;
+        }
+    }
+
+    static function doWeekly($aType,$aMinor=false) {
+        $hpd = 3600*24;
+        $hpw = 3600*24*7;
+        // Find out week number of min date
+        $thursday = self::$iMin + $hpd * (3 - (date('w', self::$iMin) + 6) % 7);
+        $week = 1 + (date('z', $thursday) - (11 - date('w', mktime(0, 0, 0, 1, 1, date('Y', $thursday)))) % 7) / 7;
+        $daynumber = date('w',self::$iMin);
+        if( $daynumber == 0 ) $daynumber = 7;
+        $m = self::$startmonth;
+        $y = self::$startyear;
+        $d = self::$startday;
+        $i=0;$j=0;
+        // The assumption is that the weeks start on Monday. If the first day
+        // is later in the week then the first week tick has to be on the following
+        // week.
+        if( $daynumber == 1 ) {
+            self::$tickPositions[$i++] = mktime(0,0,0,$m,$d,$y);
+            $t = mktime(0,0,0,$m,$d,$y) + $hpw;
+        }
+        else {
+            $t = mktime(0,0,0,$m,$d,$y) + $hpd*(8-$daynumber);
+        }
+
+        switch($aType) {
+            case DSUTILS_WEEK1:
+                $cnt=0;
+                break;
+            case DSUTILS_WEEK2:
+                $cnt=1;
+                break;
+            case DSUTILS_WEEK4:
+                $cnt=3;
+                break;
+        }
+        while( $t <= self::$iMax ) {
+            self::$tickPositions[$i++] = $t;
+            for($k=0; $k < $cnt; ++$k ) {
+                $t += $hpw;
+                if( $aMinor ) {
+                    self::$minTickPositions[$j++] = $t;
+                }
+            }
+            $t += $hpw;
+        }
+    }
+
+    static function doMonthly($aType,$aMinor=false) {
+        $monthcount=0;
+        $m = self::$startmonth;
+        $y = self::$startyear;
+        $i=0; $j=0;
+
+        // Skip the first month label if it is before the startdate
+        if( self::$startday == 1 ) {
+            self::$tickPositions[$i++] = mktime(0,0,0,$m,1,$y);
+            $monthcount=1;
+        }
+        if( $aType == 1 ) {
+            if( self::$startday < 15 ) {
+                self::$minTickPositions[$j++] = mktime(0,0,0,$m,15,$y);
+            }
+        }
+        ++$m;
+
+        // Loop through all the years included in the scale
+        for($y=self::$startyear; $y <= self::$endyear; ++$y ) {
+            // Loop through all the months. There are three cases to consider:
+            // 1. We are in the first year and must start with the startmonth
+            // 2. We are in the end year and we must stop at last month of the scale
+            // 3. A year in between where we run through all the 12 months
+            $stopmonth = $y == self::$endyear ? self::$endmonth : 12;
+            while( $m <= $stopmonth ) {
+                switch( $aType ) {
+                    case DSUTILS_MONTH1:
+                        // Set minor tick at the middle of the month
+                        if( $aMinor ) {
+                            if( $m <= $stopmonth ) {
+                                if( !($y==self::$endyear && $m==$stopmonth && self::$endday < 15) )
+                                self::$minTickPositions[$j++] = mktime(0,0,0,$m,15,$y);
+                            }
+                        }
+                        // Major at month
+                        // Get timestamp of first hour of first day in each month
+                        self::$tickPositions[$i++] = mktime(0,0,0,$m,1,$y);
+
+                        break;
+                    case DSUTILS_MONTH2:
+                        if( $aMinor ) {
+                            // Set minor tick at start of each month
+                            self::$minTickPositions[$j++] = mktime(0,0,0,$m,1,$y);
+                        }
+
+                        // Major at every second month
+                        // Get timestamp of first hour of first day in each month
+                        if( $monthcount % 2 == 0 ) {
+                            self::$tickPositions[$i++] = mktime(0,0,0,$m,1,$y);
+                        }
+                        break;
+                    case DSUTILS_MONTH3:
+                        if( $aMinor ) {
+                            // Set minor tick at start of each month
+                            self::$minTickPositions[$j++] = mktime(0,0,0,$m,1,$y);
+                        }
+                        // Major at every third month
+                        // Get timestamp of first hour of first day in each month
+                        if( $monthcount % 3 == 0 ) {
+                            self::$tickPositions[$i++] = mktime(0,0,0,$m,1,$y);
+                        }
+                        break;
+                    case DSUTILS_MONTH6:
+                        if( $aMinor ) {
+                            // Set minor tick at start of each month
+                            self::$minTickPositions[$j++] = mktime(0,0,0,$m,1,$y);
+                        }
+                        // Major at every third month
+                        // Get timestamp of first hour of first day in each month
+                        if( $monthcount % 6 == 0 ) {
+                            self::$tickPositions[$i++] = mktime(0,0,0,$m,1,$y);
+                        }
+                        break;
+                }
+                ++$m;
+                ++$monthcount;
+            }
+            $m=1;
+        }
+
+        // For the case where all dates are within the same month
+        // we want to make sure we have at least two ticks on the scale
+        // since the scale want work properly otherwise
+        if(self::$startmonth == self::$endmonth && self::$startyear == self::$endyear && $aType==1 ) {
+            self::$tickPositions[$i++] = mktime(0 ,0 ,0, self::$startmonth + 1, 1, self::$startyear);
+        }
+
+        return array(self::$tickPositions,self::$minTickPositions);
+    }
+
+    static function GetTicks($aData,$aType=1,$aMinor=false,$aEndPoints=false) {
+        $n = count($aData);
+        return self::GetTicksFromMinMax($aData[0],$aData[$n-1],$aType,$aMinor,$aEndPoints);
+    }
+
+    static function GetAutoTicks($aMin,$aMax,$aMaxTicks=10,$aMinor=false) {
+        $diff = $aMax - $aMin;
+        $spd = 3600*24;
+        $spw = $spd*7;
+        $spm = $spd*30;
+        $spy = $spd*352;
+
+        if( self::$iUseWeeks )
+        $w = 'W';
+        else
+        $w = 'd M';
+
+        // Decision table for suitable scales
+        // First value: Main decision point
+        // Second value: Array of formatting depending on divisor for wanted max number of ticks. <divisor><formatting><format-string>,..
+        $tt = array(
+            array($spw, array(1,DSUTILS_DAY1,'d M',2,DSUTILS_DAY2,'d M',-1,DSUTILS_DAY4,'d M')),
+            array($spm, array(1,DSUTILS_DAY1,'d M',2,DSUTILS_DAY2,'d M',4,DSUTILS_DAY4,'d M',7,DSUTILS_WEEK1,$w,-1,DSUTILS_WEEK2,$w)),
+            array($spy, array(1,DSUTILS_DAY1,'d M',2,DSUTILS_DAY2,'d M',4,DSUTILS_DAY4,'d M',7,DSUTILS_WEEK1,$w,14,DSUTILS_WEEK2,$w,30,DSUTILS_MONTH1,'M',60,DSUTILS_MONTH2,'M',-1,DSUTILS_MONTH3,'M')),
+            array(-1, array(30,DSUTILS_MONTH1,'M-Y',60,DSUTILS_MONTH2,'M-Y',90,DSUTILS_MONTH3,'M-Y',180,DSUTILS_MONTH6,'M-Y',352,DSUTILS_YEAR1,'Y',704,DSUTILS_YEAR2,'Y',-1,DSUTILS_YEAR5,'Y')));
+
+        $ntt = count($tt);
+        $nd = floor($diff/$spd);
+        for($i=0; $i < $ntt; ++$i ) {
+            if( $diff <= $tt[$i][0] || $i==$ntt-1) {
+                $t = $tt[$i][1];
+                $n = count($t)/3;
+                for( $j=0; $j < $n; ++$j ) {
+                    if( $nd/$t[3*$j] <= $aMaxTicks || $j==$n-1) {
+                        $type = $t[3*$j+1];
+                        $fs = $t[3*$j+2];
+                        list($tickPositions,$minTickPositions) = self::GetTicksFromMinMax($aMin,$aMax,$type,$aMinor);
+                        return array($fs,$tickPositions,$minTickPositions,$type);
+                    }
+                }
+            }
+        }
+    }
+
+    static function GetTicksFromMinMax($aMin,$aMax,$aType,$aMinor=false,$aEndPoints=false) {
+        self::$starthour = date('G',$aMin);
+        self::$startmonth = date('n',$aMin);
+        self::$startday = date('j',$aMin);
+        self::$startyear = date('Y',$aMin);
+        self::$endmonth = date('n',$aMax);
+        self::$endyear = date('Y',$aMax);
+        self::$endday = date('j',$aMax);
+        self::$iMin = $aMin;
+        self::$iMax = $aMax;
+
+        if( $aType <= DSUTILS_MONTH6 ) {
+            self::doMonthly($aType,$aMinor);
+        }
+        elseif( $aType <= DSUTILS_WEEK4 ) {
+            self::doWeekly($aType,$aMinor);
+        }
+        elseif( $aType <= DSUTILS_DAY4 ) {
+            self::doDaily($aType,$aMinor);
+        }
+        elseif( $aType <= DSUTILS_YEAR5 ) {
+            self::doYearly($aType,$aMinor);
+        }
+        else {
+            JpGraphError::RaiseL(24003);
+        }
+        // put a label at the very left data pos
+        if( $aEndPoints ) {
+            $tickPositions[$i++] = $aData[0];
+        }
+
+        // put a label at the very right data pos
+        if( $aEndPoints ) {
+            $tickPositions[$i] = $aData[$n-1];
+        }
+
+        return array(self::$tickPositions,self::$minTickPositions);
+    }
+}
+
+//=============================================================================
+// Class ReadFileData
+//=============================================================================
+Class ReadFileData {
+    //----------------------------------------------------------------------------
+    // Desciption:
+    // Read numeric data from a file.
+    // Each value should be separated by either a new line or by a specified
+    // separator character (default is ',').
+    // Before returning the data each value is converted to a proper float
+    // value. The routine is robust in the sense that non numeric data in the
+    // file will be discarded.
+    //
+    // Returns:
+    // The number of data values read on success, FALSE on failure
+    //----------------------------------------------------------------------------
+    static function FromCSV($aFile,&$aData,$aSepChar=',',$aMaxLineLength=1024) {
+        $rh = @fopen($aFile,'r');
+        if( $rh === false ) {
+                return false;
+        }
+        $tmp = array();
+        $lineofdata = fgetcsv($rh, 1000, ',');
+        while ( $lineofdata !== FALSE) {
+            $tmp = array_merge($tmp,$lineofdata);
+            $lineofdata = fgetcsv($rh, $aMaxLineLength, $aSepChar);
+        }
+        fclose($rh);
+
+        // Now make sure that all data is numeric. By default
+        // all data is read as strings
+        $n = count($tmp);
+        $aData = array();
+        $cnt=0;
+        for($i=0; $i < $n; ++$i) {
+            if( $tmp[$i] !== "" ) {
+                $aData[$cnt++] = floatval($tmp[$i]);
+            }
+        }
+        return $cnt;
+    }
+
+    //----------------------------------------------------------------------------
+    // Desciption:
+    // Read numeric data from a file.
+    // Each value should be separated by either a new line or by a specified
+    // separator character (default is ',').
+    // Before returning the data each value is converted to a proper float
+    // value. The routine is robust in the sense that non numeric data in the
+    // file will be discarded.
+    //
+    // Options:
+    // 'separator'     => ',',
+    // 'enclosure'     => '"',
+    // 'readlength'    => 1024,
+    // 'ignore_first'  => false,
+    // 'first_as_key'  => false
+    // 'escape'        => '\',   # PHP >= 5.3 only
+    //
+    // Returns:
+    // The number of lines read on success, FALSE on failure
+    //----------------------------------------------------------------------------
+    static function FromCSV2($aFile, &$aData, $aOptions = array()) {
+        $aDefaults = array(
+            'separator'     => ',',
+            'enclosure'     => chr(34),
+            'escape'        => chr(92),
+            'readlength'    => 1024,
+            'ignore_first'  => false,
+            'first_as_key'  => false
+            );
+
+        $aOptions = array_merge(
+            $aDefaults, is_array($aOptions) ? $aOptions : array());
+
+        if( $aOptions['first_as_key'] ) {
+            $aOptions['ignore_first'] =  true;
+        }
+
+        $rh = @fopen($aFile, 'r');
+
+        if( $rh === false ) {
+            return false;
+        }
+
+        $aData  = array();
+        $aLine  = fgetcsv($rh,
+                          $aOptions['readlength'],
+                          $aOptions['separator'],
+                          $aOptions['enclosure']
+                          /*, $aOptions['escape']     # PHP >= 5.3 only */
+                          );
+
+        // Use numeric array keys for the columns by default
+        // If specified use first lines values as assoc keys instead
+        $keys = array_keys($aLine);
+        if( $aOptions['first_as_key'] ) {
+            $keys = array_values($aLine);
+        }
+
+        $num_lines = 0;
+        $num_cols  = count($aLine);
+
+        while ($aLine !== false) {
+            if( is_array($aLine) && count($aLine) != $num_cols ) {
+                JpGraphError::RaiseL(24004);
+                // 'ReadCSV2: Column count mismatch in %s line %d'
+            }
+
+            // fgetcsv returns NULL for empty lines
+            if( !is_null($aLine) ) {
+                $num_lines++;
+
+                if( !($aOptions['ignore_first'] && $num_lines == 1) && is_numeric($aLine[0]) ) {
+                    for( $i = 0; $i < $num_cols; $i++ ) {
+                        $aData[ $keys[$i] ][] = floatval($aLine[$i]);
+                    }
+                }
+            }
+
+            $aLine = fgetcsv($rh,
+                             $aOptions['readlength'],
+                             $aOptions['separator'],
+                             $aOptions['enclosure']
+                             /*, $aOptions['escape']     # PHP >= 5.3 only*/
+                );
+        }
+
+        fclose($rh);
+
+        if( $aOptions['ignore_first'] ) {
+            $num_lines--;
+        }
+
+        return $num_lines;
+    }
+
+    // Read data from two columns in a plain text file
+    static function From2Col($aFile, $aCol1, $aCol2, $aSepChar=' ') {
+        $lines = @file($aFile,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
+        if( $lines === false ) {
+                return false;
+        }
+        $s = '/[\s]+/';
+        if( $aSepChar == ',' ) {
+                        $s = '/[\s]*,[\s]*/';
+        }
+        elseif( $aSepChar == ';' ) {
+                        $s = '/[\s]*;[\s]*/';
+        }
+        foreach( $lines as $line => $datarow ) {
+                $split = preg_split($s,$datarow);
+                $aCol1[] = floatval(trim($split[0]));
+                $aCol2[] = floatval(trim($split[1]));
+        }
+
+        return count($lines);
+    }
+
+    // Read data from one columns in a plain text file
+    static function From1Col($aFile, $aCol1) {
+        $lines = @file($aFile,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
+        if( $lines === false ) {
+                return false;
+        }
+        foreach( $lines as $line => $datarow ) {
+                $aCol1[] = floatval(trim($datarow));
+        }
+
+        return count($lines);
+    }
+
+    static function FromMatrix($aFile,$aSepChar=' ') {
+        $lines = @file($aFile,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
+        if( $lines === false ) {
+                return false;
+        }
+        $mat = array();
+        $reg = '/'.$aSepChar.'/';
+        foreach( $lines as $line => $datarow ) {
+                $row = preg_split($reg,trim($datarow));
+                foreach ($row as $key => $cell ) {
+                        $row[$key] = floatval(trim($cell));
+                }
+                $mat[] = $row;
+        }
+        return $mat;
+    }
+
+
+}
+
+define('__LR_EPSILON', 1.0e-8);
+//=============================================================================
+// Class LinearRegression
+//=============================================================================
+class LinearRegression {
+        private $ix=array(),$iy=array();
+        private $ib=0, $ia=0;
+        private $icalculated=false;
+        public $iDet=0, $iCorr=0, $iStdErr=0;
+
+        public function __construct($aDataX,$aDataY) {
+                if( count($aDataX) !== count($aDataY) ) {
+                        JpGraph::Raise('LinearRegression: X and Y data array must be of equal length.');
+                }
+                $this->ix = $aDataX;
+                $this->iy = $aDataY;
+        }
+
+        public function Calc() {
+
+                $this->icalculated = true;
+
+                $n = count($this->ix);
+                $sx2 = 0 ;
+                $sy2 = 0 ;
+                $sxy = 0 ;
+                $sx = 0 ;
+                $sy = 0 ;
+
+                for( $i=0; $i < $n; ++$i ) {
+                        $sx2 += $this->ix[$i] * $this->ix[$i];
+                        $sy2 += $this->iy[$i] * $this->iy[$i];
+                        $sxy += $this->ix[$i] * $this->iy[$i];
+                        $sx += $this->ix[$i];
+                        $sy += $this->iy[$i];
+                }
+
+                if( $n*$sx2 - $sx*$sx > __LR_EPSILON ) {
+                        $this->ib = ($n*$sxy - $sx*$sy) / ( $n*$sx2 - $sx*$sx );
+                        $this->ia = ( $sy - $this->ib*$sx ) / $n;
+
+                        $sx = $this->ib * ( $sxy - $sx*$sy/$n );
+                        $sy2 = $sy2 - $sy*$sy/$n;
+                        $sy = $sy2 - $sx;
+
+                        $this->iDet = $sx / $sy2;
+                        $this->iCorr = sqrt($this->iDet);
+                        if( $n > 2 ) {
+                                $this->iStdErr = sqrt( $sy / ($n-2) );
+                        }
+                        else {
+                                $this->iStdErr = NAN ;
+                        }
+                }
+                else {
+                        $this->ib = 0;
+                        $this->ia = 0;
+                }
+
+        }
+
+        public function GetAB() {
+                if( $this->icalculated == false )
+                        $this->Calc();
+                return array($this->ia, $this->ib);
+        }
+
+        public function GetStat() {
+                if( $this->icalculated == false )
+                        $this->Calc();
+                return array($this->iStdErr, $this->iCorr, $this->iDet);
+        }
+
+        public function GetY($aMinX, $aMaxX, $aStep=1) {
+                if( $this->icalculated == false )
+                        $this->Calc();
+
+                $yy = array();
+                $i = 0;
+                for( $x=$aMinX; $x <= $aMaxX; $x += $aStep ) {
+                        $xx[$i  ] = $x;
+                        $yy[$i++] = $this->ia + $this->ib * $x;
+                }
+
+                return array($xx,$yy);
+        }
+
+}
+
+?>
diff --git a/common/lib/jpgraph_lib/jpgraph_windrose.php b/common/lib/jpgraph_lib/jpgraph_windrose.php
new file mode 100644
index 000000000..8eef2cbe4
--- /dev/null
+++ b/common/lib/jpgraph_lib/jpgraph_windrose.php
@@ -0,0 +1,1566 @@
+<?php
+/*=======================================================================
+ // File:        JPGRAPH_WINDROSE.PHP
+ // Description: Windrose extension for JpGraph
+ // Created:     2003-09-17
+ // Ver:         $Id: jpgraph_windrose.php 1928 2010-01-11 19:56:51Z ljp $
+ //
+ // Copyright (c) Asial Corporation. All rights reserved.
+ //========================================================================
+ */
+
+require_once('jpgraph_glayout_vh.inc.php');
+
+//------------------------------------------------------------------------
+// Determine how many compass directions to show
+//------------------------------------------------------------------------
+define('WINDROSE_TYPE4',1);
+define('WINDROSE_TYPE8',2);
+define('WINDROSE_TYPE16',3);
+define('WINDROSE_TYPEFREE',4);
+
+//------------------------------------------------------------------------
+// How should the labels for the circular grids be aligned
+//------------------------------------------------------------------------
+define('LBLALIGN_CENTER',1);
+define('LBLALIGN_TOP',2);
+
+//------------------------------------------------------------------------
+// How should the labels around the plot be align
+//------------------------------------------------------------------------
+define('LBLPOSITION_CENTER',1);
+define('LBLPOSITION_EDGE',2);
+
+//------------------------------------------------------------------------
+// Interpretation of ordinal values in the data
+//------------------------------------------------------------------------
+define('KEYENCODING_CLOCKWISE',1);
+define('KEYENCODING_ANTICLOCKWISE',2);
+
+// Internal debug flag
+define('__DEBUG',false);
+
+
+//===================================================
+// CLASS WindrosePlotScale
+//===================================================
+class WindrosePlotScale {
+    private $iMax,$iDelta=5;
+    private $iNumCirc=3;
+    public $iMaxNum=0;
+    private $iLblFmt='%.0f%%';
+    public $iFontFamily=FF_VERDANA,$iFontStyle=FS_NORMAL,$iFontSize=10;
+    public $iZFontFamily=FF_ARIAL,$iZFontStyle=FS_NORMAL,$iZFontSize=10;
+    public $iFontColor='black',$iZFontColor='black';
+    private $iFontFrameColor=false, $iFontBkgColor=false;
+    private $iLblZeroTxt=null;
+    private $iLblAlign=LBLALIGN_CENTER;
+    public $iAngle='auto';
+    private $iManualScale = false;
+    private $iHideLabels = false;
+
+    function __construct($aData) {
+        $max=0;
+        $totlegsum = 0;
+        $maxnum=0;
+        $this->iZeroSum=0;
+        foreach( $aData as $idx => $legdata ) {
+            $legsum = array_sum($legdata);
+            $maxnum = max($maxnum,count($legdata)-1);
+            $max = max($legsum-$legdata[0],$max);
+            $totlegsum += $legsum;
+            $this->iZeroSum += $legdata[0] ;
+        }
+        if( round($totlegsum) > 100 ) {
+            JpGraphError::RaiseL(22001,$legsum);
+            //("Total percentage for all windrose legs in a windrose plot can not exceed  100% !\n(Current max is: ".$legsum.')');
+        }
+        $this->iMax = $max ;
+        $this->iMaxNum = $maxnum;
+        $this->iNumCirc = $this->GetNumCirc();
+        $this->iMaxVal = $this->iNumCirc * $this->iDelta ;
+    }
+
+    // Return number of grid circles
+    function GetNumCirc() {
+        // Never return less than 1 circles
+        $num = ceil($this->iMax / $this->iDelta);
+        return max(1,$num) ;
+    }
+
+    function SetMaxValue($aMax) {
+        $this->iMax = $aMax;
+        $this->iNumCirc = $this->GetNumCirc();
+        $this->iMaxVal = $this->iNumCirc * $this->iDelta ;
+    }
+
+    // Set step size for circular grid
+    function Set($aMax,$aDelta=null) {
+        if( $aDelta==null ) {
+            $this->SetMaxValue($aMax);
+            return;
+        }
+        $this->iDelta = $aDelta;
+        $this->iNumCirc = ceil($aMax/$aDelta); //$this->GetNumCirc();
+        $this->iMaxVal = $this->iNumCirc * $this->iDelta ;
+        $this->iMax=$aMax;
+        // Remember that user has specified interval so don't
+        // do autoscaling
+        $this->iManualScale = true;
+    }
+
+    function AutoScale($aRadius,$aMinDist=30) {
+
+        if( $this->iManualScale ) return;
+
+        // Make sure distance (in pixels) between two circles
+        // is never less than $aMinDist pixels
+        $tst = ceil($aRadius / $this->iNumCirc) ;
+
+        while( $tst <= $aMinDist && $this->iDelta < 100 ) {
+            $this->iDelta += 5;
+            $tst = ceil($aRadius / $this->GetNumCirc()) ;
+        }
+
+        if( $this->iDelta >= 100 ) {
+            JpGraphError::RaiseL(22002);//('Graph is too small to have a scale. Please make the graph larger.');
+        }
+
+        // If the distance is to large try with multiples of 2 instead
+        if( $tst > $aMinDist * 3 ) {
+            $this->iDelta = 2;
+            $tst = ceil($aRadius / $this->iNumCirc) ;
+
+            while( $tst <= $aMinDist && $this->iDelta < 100 ) {
+                $this->iDelta += 2;
+                $tst = ceil($aRadius / $this->GetNumCirc()) ;
+            }
+
+            if( $this->iDelta >= 100 ) {
+                JpGraphError::RaiseL(22002); //('Graph is too small to have a scale. Please make the graph larger.');
+            }
+        }
+
+        $this->iNumCirc = $this->GetNumCirc();
+        $this->iMaxVal = $this->iNumCirc * $this->iDelta ;
+    }
+
+    // Return max of all leg values
+    function GetMax() {
+        return $this->iMax;
+    }
+
+    function Hide($aFlg=true) {
+        $this->iHideLabels = $aFlg;
+    }
+
+    function SetAngle($aAngle) {
+        $this->iAngle = $aAngle ;
+    }
+
+    // Translate a Leg value to radius distance
+    function RelTranslate($aVal,$r,$ri) {
+        $tv = round($aVal/$this->iMaxVal*($r-$ri));
+        return $tv ;
+    }
+
+    function SetLabelAlign($aAlign) {
+        $this->iLblAlign = $aAlign ;
+    }
+
+    function SetLabelFormat($aFmt) {
+        $this->iLblFmt = $aFmt ;
+    }
+
+    function SetLabelFillColor($aBkgColor,$aBorderColor=false) {
+
+        $this->iFontBkgColor = $aBkgColor;
+        if( $aBorderColor === false ) {
+            $this->iFontFrameColor = $aBkgColor;
+        }
+        else {
+            $this->iFontFrameColor = $aBorderColor;
+        }
+    }
+
+    function SetFontColor($aColor) {
+        $this->iFontColor = $aColor ;
+        $this->iZFontColor = $aColor ;
+    }
+
+    function SetFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) {
+        $this->iFontFamily = $aFontFamily ;
+        $this->iFontStyle = $aFontStyle ;
+        $this->iFontSize = $aFontSize ;
+        $this->SetZFont($aFontFamily,$aFontStyle,$aFontSize);
+    }
+
+    function SetZFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) {
+        $this->iZFontFamily = $aFontFamily ;
+        $this->iZFontStyle = $aFontStyle ;
+        $this->iZFontSize = $aFontSize ;
+    }
+
+    function SetZeroLabel($aTxt) {
+        $this->iLblZeroTxt = $aTxt ;
+    }
+
+    function SetZFontColor($aColor) {
+        $this->iZFontColor = $aColor ;
+    }
+
+    function StrokeLabels($aImg,$xc,$yc,$ri,$rr) {
+
+        if( $this->iHideLabels ) return;
+
+        // Setup some convinient vairables
+        $a = $this->iAngle * M_PI/180.0;
+        $n = $this->iNumCirc;
+        $d = $this->iDelta;
+
+        // Setup the font and font color
+        $val = new Text();
+        $val->SetFont($this->iFontFamily,$this->iFontStyle,$this->iFontSize);
+        $val->SetColor($this->iFontColor);
+
+        if( $this->iFontBkgColor !== false ) {
+            $val->SetBox($this->iFontBkgColor,$this->iFontFrameColor);
+        }
+
+        // Position the labels relative to the radiant circles
+        if( $this->iLblAlign == LBLALIGN_TOP ) {
+            if( $a > 0 && $a <= M_PI/2 ) {
+                $val->SetAlign('left','bottom');
+            }
+            elseif( $a > M_PI/2 && $a <= M_PI ) {
+                $val->SetAlign('right','bottom');
+            }
+        }
+        elseif( $this->iLblAlign == LBLALIGN_CENTER ) {
+            $val->SetAlign('center','center');
+        }
+
+        // Stroke the labels close to each circle
+        $v = $d ;
+        $si = sin($a);
+        $co = cos($a);
+        for( $i=0; $i < $n; ++$i, $v += $d ) {
+            $r = $ri + ($i+1) * $rr;
+            $x = $xc + $co * $r;
+            $y = $yc - $si * $r;
+            $val->Set(sprintf($this->iLblFmt,$v));
+            $val->Stroke($aImg,$x,$y);
+        }
+
+        // Print the text in the zero circle
+        if( $this->iLblZeroTxt === null ) {
+            $this->iLblZeroTxt = sprintf($this->iLblFmt,$this->iZeroSum);
+        }
+        else {
+            $this->iLblZeroTxt = sprintf($this->iLblZeroTxt,$this->iZeroSum);
+        }
+
+        $val->Set($this->iLblZeroTxt);
+        $val->SetAlign('center','center');
+        $val->SetParagraphAlign('center');
+        $val->SetColor($this->iZFontColor);
+        $val->SetFont($this->iZFontFamily,$this->iZFontStyle,$this->iZFontSize);
+        $val->Stroke($aImg,$xc,$yc);
+    }
+}
+
+//===================================================
+// CLASS LegendStyle
+//===================================================
+class LegendStyle {
+    public $iLength = 40, $iMargin = 20 , $iBottomMargin=5;
+    public $iCircleWeight=2,  $iCircleRadius = 18, $iCircleColor='black';
+    public $iTxtFontFamily=FF_VERDANA,$iTxtFontStyle=FS_NORMAL,$iTxtFontSize=8;
+    public $iLblFontFamily=FF_VERDANA,$iLblFontStyle=FS_NORMAL,$iLblFontSize=8;
+    public $iCircleFontFamily=FF_VERDANA,$iCircleFontStyle=FS_NORMAL,$iCircleFontSize=8;
+    public $iLblFontColor='black',$iTxtFontColor='black',$iCircleFontColor='black';
+    public $iShow=true;
+    public $iFormatString='%.1f';
+    public $iTxtMargin=6, $iTxt='';
+    public $iZCircleTxt='Calm';
+
+    function SetFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) {
+        $this->iLblFontFamily = $aFontFamily ;
+        $this->iLblFontStyle = $aFontStyle ;
+        $this->iLblFontSize = $aFontSize ;
+        $this->iTxtFontFamily = $aFontFamily ;
+        $this->iTxtFontStyle = $aFontStyle ;
+        $this->iTxtFontSize = $aFontSize ;
+        $this->iCircleFontFamily = $aFontFamily ;
+        $this->iCircleFontStyle = $aFontStyle ;
+        $this->iCircleFontSize = $aFontSize ;
+    }
+
+    function SetLFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) {
+        $this->iLblFontFamily = $aFontFamily ;
+        $this->iLblFontStyle = $aFontStyle ;
+        $this->iLblFontSize = $aFontSize ;
+    }
+
+    function SetTFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) {
+        $this->iTxtFontFamily = $aFontFamily ;
+        $this->iTxtFontStyle = $aFontStyle ;
+        $this->iTxtFontSize = $aFontSize ;
+    }
+
+    function SetCFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) {
+        $this->iCircleFontFamily = $aFontFamily ;
+        $this->iCircleFontStyle = $aFontStyle ;
+        $this->iCircleFontSize = $aFontSize ;
+    }
+
+
+    function SetFontColor($aColor) {
+        $this->iTxtFontColor = $aColor ;
+        $this->iLblFontColor = $aColor ;
+        $this->iCircleFontColor = $aColor ;
+    }
+
+    function SetTFontColor($aColor) {
+        $this->iTxtFontColor = $aColor ;
+    }
+
+    function SetLFontColor($aColor) {
+        $this->iLblFontColor = $aColor ;
+    }
+
+    function SetCFontColor($aColor) {
+        $this->iCircleFontColor = $aColor ;
+    }
+
+    function SetCircleWeight($aWeight) {
+        $this->iCircleWeight = $aWeight;
+    }
+
+    function SetCircleRadius($aRadius) {
+        $this->iCircleRadius = $aRadius;
+    }
+
+    function SetCircleColor($aColor) {
+        $this->iCircleColor = $aColor ;
+    }
+
+    function SetCircleText($aTxt) {
+        $this->iZCircleTxt = $aTxt;
+    }
+
+    function SetMargin($aMarg,$aBottomMargin=5) {
+        $this->iMargin=$aMarg;
+        $this->iBottomMargin=$aBottomMargin;
+    }
+
+    function SetLength($aLength) {
+        $this->iLength = $aLength ;
+    }
+
+    function Show($aFlg=true) {
+        $this->iShow = $aFlg;
+    }
+
+    function Hide($aFlg=true) {
+        $this->iShow = ! $aFlg;
+    }
+
+    function SetFormat($aFmt) {
+        $this->iFormatString=$aFmt;
+    }
+
+    function SetText($aTxt) {
+        $this->iTxt = $aTxt ;
+    }
+
+}
+
+define('RANGE_OVERLAPPING',0);
+define('RANGE_DISCRETE',1);
+
+//===================================================
+// CLASS WindrosePlot
+//===================================================
+class WindrosePlot {
+    private $iAntiAlias=true;
+    private $iData=array();
+    public $iX=0.5,$iY=0.5;
+    public $iSize=0.55;
+    private $iGridColor1='gray',$iGridColor2='darkgreen';
+    private $iRadialColorArray=array();
+    private $iRadialWeightArray=array();
+    private $iRadialStyleArray=array();
+    private $iRanges = array(1,2,3,5,6,10,13.5,99.0);
+    private $iRangeStyle = RANGE_OVERLAPPING ;
+    public $iCenterSize=60;
+    private $iType = WINDROSE_TYPE16;
+    public $iFontFamily=FF_VERDANA,$iFontStyle=FS_NORMAL,$iFontSize=10;
+    public $iFontColor='darkgray';
+    private $iRadialGridStyle='longdashed';
+    private $iAllDirectionLabels =  array('E','ENE','NE','NNE','N','NNW','NW','WNW','W','WSW','SW','SSW','S','SSE','SE','ESE');
+    private $iStandardDirections = array();
+    private $iCircGridWeight=3, $iRadialGridWeight=1;
+    private $iLabelMargin=12;
+    private $iLegweights = array(2,4,6,8,10,12,14,16,18,20);
+    private $iLegColors = array('orange','black','blue','red','green','purple','navy','yellow','brown');
+    private $iLabelFormatString='', $iLabels=array();
+    private $iLabelPositioning = LBLPOSITION_EDGE;
+    private $iColor='white';
+    private $iShowBox=false, $iBoxColor='black',$iBoxWeight=1,$iBoxStyle='solid';
+    private $iOrdinalEncoding=KEYENCODING_ANTICLOCKWISE;
+    public $legend=null;
+
+    function __construct($aData) {
+        $this->iData = $aData;
+        $this->legend = new LegendStyle();
+
+        // Setup the scale
+        $this->scale = new WindrosePlotScale($this->iData);
+
+        // default label for free type i agle and a degree sign
+        $this->iLabelFormatString = '%.1f'.SymChar::Get('degree');
+
+        $delta = 2*M_PI/16;
+        for( $i=0, $a=0; $i < 16; ++$i, $a += $delta ) {
+            $this->iStandardDirections[$this->iAllDirectionLabels[$i]] = $a;
+        }
+    }
+
+    // Dummy method to make window plots have the same signature as the
+    // layout classes since windrose plots are "leaf" classes in the hierarchy
+    function LayoutSize() {
+        return 1;
+    }
+
+    function SetSize($aSize) {
+        $this->iSize = $aSize;
+    }
+
+    function SetDataKeyEncoding($aEncoding) {
+        $this->iOrdinalEncoding = $aEncoding;
+    }
+
+    function SetColor($aColor) {
+        $this->iColor = $aColor;
+    }
+
+    function SetRadialColors($aColors) {
+        $this->iRadialColorArray = $aColors;
+    }
+
+    function SetRadialWeights($aWeights) {
+        $this->iRadialWeightArray = $aWeights;
+    }
+
+    function SetRadialStyles($aStyles) {
+        $this->iRadialStyleArray = $aStyles;
+    }
+
+    function SetBox($aColor='black',$aWeight=1, $aStyle='solid', $aShow=true) {
+        $this->iShowBox = $aShow ;
+        $this->iBoxColor = $aColor ;
+        $this->iBoxWeight = $aWeight ;
+        $this->iBoxStyle = $aStyle;
+    }
+
+    function SetLabels($aLabels) {
+        $this->iLabels = $aLabels ;
+    }
+
+    function SetLabelMargin($aMarg) {
+        $this->iLabelMargin = $aMarg ;
+    }
+
+    function SetLabelFormat($aLblFormat) {
+        $this->iLabelFormatString = $aLblFormat ;
+    }
+
+    function SetCompassLabels($aLabels) {
+        if( count($aLabels) != 16 ) {
+            JpgraphError::RaiseL(22004); //('Label specification for windrose directions must have 16 values (one for each compass direction).');
+        }
+        $this->iAllDirectionLabels = $aLabels ;
+
+        $delta = 2*M_PI/16;
+        for( $i=0, $a=0; $i < 16; ++$i, $a += $delta ) {
+            $this->iStandardDirections[$this->iAllDirectionLabels[$i]] = $a;
+        }
+
+    }
+
+    function SetCenterSize($aSize) {
+        $this->iCenterSize = $aSize;
+    }
+    // Alias for SetCenterSize
+    function SetZCircleSize($aSize) {
+        $this->iCenterSize = $aSize;
+    }
+
+    function SetFont($aFFam,$aFStyle=FS_NORMAL,$aFSize=10) {
+        $this->iFontFamily = $aFFam ;
+        $this->iFontStyle = $aFStyle ;
+        $this->iFontSize = $aFSize ;
+    }
+
+    function SetFontColor($aColor) {
+        $this->iFontColor=$aColor;
+    }
+
+    function SetGridColor($aColor1,$aColor2) {
+        $this->iGridColor1 = $aColor1;
+        $this->iGridColor2 = $aColor2;
+    }
+
+    function SetGridWeight($aGrid1=1,$aGrid2=2) {
+        $this->iCircGridWeight = $aGrid1 ;
+        $this->iRadialGridWeight = $aGrid2 ;
+    }
+
+    function SetRadialGridStyle($aStyle) {
+        $aStyle = strtolower($aStyle);
+        if( !in_array($aStyle,array('solid','dotted','dashed','longdashed')) ) {
+            JpGraphError::RaiseL(22005); //("Line style for radial lines must be on of ('solid','dotted','dashed','longdashed') ");
+        }
+        $this->iRadialGridStyle=$aStyle;
+    }
+
+    function SetRanges($aRanges) {
+        $this->iRanges = $aRanges;
+    }
+
+    function SetRangeStyle($aStyle) {
+        $this->iRangeStyle = $aStyle;
+    }
+
+    function SetRangeColors($aLegColors) {
+        $this->iLegColors = $aLegColors;
+    }
+
+    function SetRangeWeights($aWeights) {
+        $n=count($aWeights);
+        for($i=0; $i< $n; ++$i ) {
+            $aWeights[$i] = floor($aWeights[$i]/2);
+        }
+        $this->iLegweights = $aWeights;
+
+    }
+
+    function SetType($aType) {
+        if( $aType < WINDROSE_TYPE4 || $aType > WINDROSE_TYPEFREE ) {
+            JpGraphError::RaiseL(22006); //('Illegal windrose type specified.');
+        }
+        $this->iType = $aType;
+    }
+
+    // Alias for SetPos()
+    function SetCenterPos($aX,$aY) {
+        $this->iX = $aX;
+        $this->iY = $aY;        
+    }
+    
+    function SetPos($aX,$aY) {
+        $this->iX = $aX;
+        $this->iY = $aY;
+    }
+
+    function SetAntiAlias($aFlag) {
+        $this->iAntiAlias = $aFlag ;
+        if( ! $aFlag )
+        $this->iCircGridWeight = 1;
+    }
+
+    function _ThickCircle($aImg,$aXC,$aYC,$aRad,$aWeight=2,$aColor) {
+
+        $aImg->SetColor($aColor);
+        $aRad *= 2 ;
+        $aImg->Ellipse($aXC,$aYC,$aRad,$aRad);
+        if( $aWeight > 1 ) {
+            $aImg->Ellipse($aXC,$aYC,$aRad+1,$aRad+1);
+            $aImg->Ellipse($aXC,$aYC,$aRad+2,$aRad+2);
+            if( $aWeight > 2 ) {
+                $aImg->Ellipse($aXC,$aYC,$aRad+3,$aRad+3);
+                $aImg->Ellipse($aXC,$aYC,$aRad+3,$aRad+4);
+                $aImg->Ellipse($aXC,$aYC,$aRad+4,$aRad+3);
+            }
+        }
+    }
+
+    function _StrokeWindLeg($aImg,$xc,$yc,$a,$ri,$r,$weight,$color) {
+
+        // If less than 1 px long then we assume this has been caused by rounding problems
+        // and should not be stroked
+        if( $r < 1 ) return;
+
+        $xt = $xc + cos($a)*$ri;
+        $yt = $yc - sin($a)*$ri;
+        $xxt = $xc + cos($a)*($ri+$r);
+        $yyt = $yc - sin($a)*($ri+$r);
+
+        $x1 = $xt - $weight*sin($a);
+        $y1 = $yt - $weight*cos($a);
+        $x2 = $xxt - $weight*sin($a);
+        $y2 = $yyt - $weight*cos($a);
+
+        $x3 = $xxt + $weight*sin($a);
+        $y3 = $yyt + $weight*cos($a);
+        $x4 = $xt + $weight*sin($a);
+        $y4 = $yt + $weight*cos($a);
+
+        $pts = array($x1,$y1,$x2,$y2,$x3,$y3,$x4,$y4);
+        $aImg->SetColor($color);
+        $aImg->FilledPolygon($pts);
+
+    }
+
+    function _StrokeLegend($aImg,$x,$y,$scaling=1,$aReturnWidth=false) {
+
+        if( ! $this->legend->iShow ) return 0;
+
+        $nlc = count($this->iLegColors);
+        $nlw = count($this->iLegweights);
+
+        // Setup font for ranges
+        $value = new Text();
+        $value->SetAlign('center','bottom');
+        $value->SetFont($this->legend->iLblFontFamily,
+        $this->legend->iLblFontStyle,
+        $this->legend->iLblFontSize*$scaling);
+        $value->SetColor($this->legend->iLblFontColor);
+
+        // Remember x-center
+        $xcenter = $x ;
+
+        // Construct format string
+        $fmt = $this->legend->iFormatString.'-'.$this->legend->iFormatString;
+
+        // Make sure that the length of each range is enough to cover the
+        // size of the labels
+        $tst = sprintf($fmt,$this->iRanges[0],$this->iRanges[1]);
+        $value->Set($tst);
+        $w = $value->GetWidth($aImg);
+        $l = round(max($this->legend->iLength * $scaling,$w*1.5));
+
+        $r = $this->legend->iCircleRadius * $scaling ;
+        $len = 2*$r + $this->scale->iMaxNum * $l;
+
+        // We are called just to find out the width
+        if( $aReturnWidth ) return $len;
+
+        $x -= round($len/2);
+        $x += $r;
+
+        // 4 pixels extra vertical margin since the circle sometimes is +/- 1 pixel of the
+        // theorethical radius due to imperfection in the GD library
+        //$y -= round(max($r,$scaling*$this->iLegweights[($this->scale->iMaxNum-1) % $nlw])+4*$scaling);
+        $y -= ($this->legend->iCircleRadius + 2)*$scaling+$this->legend->iBottomMargin*$scaling;
+
+        // Adjust for bottom text
+        if( $this->legend->iTxt != '' ) {
+            // Setup font for text
+            $value->Set($this->legend->iTxt);
+            $y -= /*$this->legend->iTxtMargin + */ $value->GetHeight($aImg);
+        }
+
+        // Stroke 0-circle
+        $this->_ThickCircle($aImg,$x,$y,$r,$this->legend->iCircleWeight,
+        $this->legend->iCircleColor);
+
+        // Remember the center of the circe
+        $xc=$x; $yc=$y;
+
+        $value->SetAlign('center','bottom');
+        $x += $r+1;
+
+        // Stroke all used ranges
+        $txty = $y -
+        round($this->iLegweights[($this->scale->iMaxNum-1)%$nlw]*$scaling) - 4*$scaling;
+        if( $this->scale->iMaxNum >= count($this->iRanges) ) {
+            JpGraphError::RaiseL(22007); //('To few values for the range legend.');
+        }
+        $i=0;$idx=0;
+        while( $i < $this->scale->iMaxNum ) {
+            $y1 = $y - round($this->iLegweights[$i % $nlw]*$scaling);
+            $y2 = $y + round($this->iLegweights[$i % $nlw]*$scaling);
+            $x2 = $x + $l ;
+            $aImg->SetColor($this->iLegColors[$i % $nlc]);
+            $aImg->FilledRectangle($x,$y1,$x2,$y2);
+            if( $this->iRangeStyle == RANGE_OVERLAPPING ) {
+                $lbl = sprintf($fmt,$this->iRanges[$idx],$this->iRanges[$idx+1]);
+            }
+            else {
+                $lbl = sprintf($fmt,$this->iRanges[$idx],$this->iRanges[$idx+1]);
+                ++$idx;
+            }
+            $value->Set($lbl);
+            $value->Stroke($aImg,$x+$l/2,$txty);
+            $x = $x2;
+            ++$i;++$idx;
+        }
+
+        // Setup circle font
+        $value->SetFont($this->legend->iCircleFontFamily,
+        $this->legend->iCircleFontStyle,
+        $this->legend->iCircleFontSize*$scaling);
+        $value->SetColor($this->legend->iCircleFontColor);
+
+        // Stroke 0-circle text
+        $value->Set($this->legend->iZCircleTxt);
+        $value->SetAlign('center','center');
+        $value->ParagraphAlign('center');
+        $value->Stroke($aImg,$xc,$yc);
+
+        // Setup circle font
+        $value->SetFont($this->legend->iTxtFontFamily,
+        $this->legend->iTxtFontStyle,
+        $this->legend->iTxtFontSize*$scaling);
+        $value->SetColor($this->legend->iTxtFontColor);
+
+        // Draw the text under the legend
+        $value->Set($this->legend->iTxt);
+        $value->SetAlign('center','top');
+        $value->SetParagraphAlign('center');
+        $value->Stroke($aImg,$xcenter,$y2+$this->legend->iTxtMargin*$scaling);
+    }
+
+    function SetAutoScaleAngle($aIsRegRose=true) {
+
+        // If the user already has manually set an angle don't
+        // trye to find a position
+        if( is_numeric($this->scale->iAngle) )
+            return;
+
+        if( $aIsRegRose ) {
+
+            // Create a complete data for all directions
+            // and translate string directions to ordinal values.
+            // This will much simplify the logic below
+            for( $i=0; $i < 16; ++$i ) {
+                $dtxt = $this->iAllDirectionLabels[$i];
+                if( !empty($this->iData[$dtxt]) ) {
+                    $data[$i] = $this->iData[$dtxt];
+                }
+                elseif( !empty($this->iData[strtolower($dtxt)]) ) {
+                    $data[$i] = $this->iData[strtolower($dtxt)];
+                }
+                elseif( !empty($this->iData[$i]) ) {
+                    $data[$i] = $this->iData[$i];
+                }
+                else {
+                    $data[$i] = array();
+                }
+            }
+
+            // Find the leg which has the lowest weighted sum of number of data around it
+            $c0 = array_sum($data[0]);
+            $c1 = array_sum($data[1]);
+            $found = 1;
+            $min = $c0+$c1*100; // Initialize to a high value
+            for( $i=1; $i < 15; ++$i ) {
+                $c2 = array_sum($data[$i+1]);
+
+                // Weight the leg we will use more to give preference
+                // to a short middle leg even if the 3 way sum is similair
+                $w = $c0 + 3*$c1 + $c2 ;
+                if( $w < $min ) {
+                    $min = $w;
+                    $found = $i;
+                }
+                $c0 = $c1;
+                $c1 = $c2;
+            }
+            $this->scale->iAngle = $found*22.5;
+        }
+        else {
+            $n = count($this->iData);
+            foreach( $this->iData as $dir => $leg ) {
+                if( !is_numeric($dir) ) {
+                    $pos = array_search(strtoupper($dir),$this->iAllDirectionLabels);
+                    if( $pos !== false ) {
+                        $dir = $pos*22.5;
+                    }
+                }
+                $data[round($dir)] = $leg;
+            }
+
+            // Get all the angles for the data and sort it
+            $keys = array_keys($data);
+            sort($keys, SORT_NUMERIC);
+
+            $n = count($data);
+            $found = false;
+            $max = 0 ;
+            for( $i=0; $i < 15; ++$i ) {
+                $try_a = round(22.5*$i);
+
+                if( $try_a > $keys[$n-1] ) break;
+
+                if( in_array($try_a,$keys) ) continue;
+
+                // Find the angle just lower than this
+                $j=0;
+                while( $j < $n && $keys[$j] <= $try_a ) ++$j;
+                if( $j == 0 ) {
+                    $kj = 0; $keys[$n-1];
+                    $d1 = 0; abs($kj-$try_a);
+                }
+                else {
+                    --$j;
+                    $kj = $keys[$j];
+                    $d1 = abs($kj-$try_a);
+                }
+
+                // Find the angle just larger than this
+                $l=$n-1;
+                while( $l >= 0 && $keys[$l] >= $try_a ) --$l;
+                if( $l == $n-1) {
+                    $kl = $keys[0];
+                    $d2 = abs($kl-$try_a);
+                }
+                else {
+                    ++$l;
+                    $kl = $keys[$l];
+                    $d2 = abs($kl-$try_a);
+                }
+
+                // Weight the distance so that legs with large spread
+                // gets a better weight
+                $w = $d1 + $d2;
+                if( $i == 0 ) {
+                    $w = round(1.4 * $w);
+                }
+                $diff = abs($d1 - $d2);
+                $w *= (360-$diff);
+                if( $w > $max ) {
+                    $found = $i;
+                    $max = $w;
+                }
+            }
+
+            $a = $found*22.5;
+
+            // Some heuristics to have some preferred positions
+            if( $keys[$n-1] < 25 ) $a = 45;
+            elseif( $keys[0] > 60 ) $a = 45;
+            elseif( $keys[0] > 25 && $keys[$n-1] < 340 ) $a = 0;
+            elseif( $keys[$n-1] < 75 ) $a = 90;
+            elseif( $keys[$n-1] < 120 ) $a = 135;
+            elseif( $keys[$n-1] < 160 ) $a = 180;
+
+            $this->scale->iAngle = $a ;
+        }
+    }
+
+    function NormAngle($a) {
+        while( $a > 360 ) {
+            $a -= 360;
+        }
+        return $a;
+    }
+
+    function SetLabelPosition($aPos) {
+        $this->iLabelPositioning  = $aPos ;
+    }
+
+    function _StrokeFreeRose($dblImg,$value,$scaling,$xc,$yc,$r,$ri) {
+
+        // Plot radial grid lines and remember the end position
+        // and the angle for later use when plotting the labels
+        if( $this->iType != WINDROSE_TYPEFREE ) {
+            JpGraphError::RaiseL(22008); //('Internal error: Trying to plot free Windrose even though type is not a free windorose');
+        }
+
+        // Check if we should auto-position the angle for the
+        // labels. Basically we try to find a firection with smallest
+        // (or none) data.
+        $this->SetAutoScaleAngle(false);
+
+        $nlc = count($this->iLegColors);
+        $nlw = count($this->iLegweights);
+
+        // Stroke grid lines for directions and remember the
+        // position for the labels
+        $txtpos=array();
+        $num = count($this->iData);
+
+        $keys = array_keys($this->iData);
+
+        foreach( $this->iData as $dir => $legdata ) {
+            if( in_array($dir,$this->iAllDirectionLabels,true) === true) {
+                $a = $this->iStandardDirections[strtoupper($dir)];
+                if( in_array($a*180/M_PI,$keys) ) {
+                    JpGraphError::RaiseL(22009,round($a*180/M_PI));
+                    //('You have specified the same direction twice, once with an angle and once with a compass direction ('.$a*180/M_PI.' degrees.)');
+                }
+            }
+            elseif( is_numeric($dir) ) {
+                $this->NormAngle($dir);
+
+                if( $this->iOrdinalEncoding == KEYENCODING_CLOCKWISE ) {
+                    $dir = 360-$dir;
+                }
+
+                $a = $dir * M_PI/180;
+            }
+            else {
+                JpGraphError::RaiseL(22010);//('Direction must either be a numeric value or one of the 16 compass directions');
+            }
+
+            $xxc = round($xc + cos($a)*$ri);
+            $yyc = round($yc - sin($a)*$ri);
+            $x = round($xc + cos($a)*$r);
+            $y = round($yc - sin($a)*$r);
+            if( empty($this->iRadialColorArray[$dir]) ) {
+                $dblImg->SetColor($this->iGridColor2);
+            }
+            else {
+                $dblImg->SetColor($this->iRadialColorArray[$dir]);
+            }
+            if( empty($this->iRadialWeightArray[$dir]) ) {
+                $dblImg->SetLineWeight($this->iRadialGridWeight);
+            }
+            else {
+                $dblImg->SetLineWeight($this->iRadialWeightArray[$dir]);
+            }
+            if( empty($this->iRadialStyleArray[$dir]) ) {
+                $dblImg->SetLineStyle($this->iRadialGridStyle);
+            }
+            else {
+                $dblImg->SetLineStyle($this->iRadialStyleArray[$dir]);
+            }
+            $dblImg->StyleLine($xxc,$yyc,$x,$y);
+            $txtpos[] = array($x,$y,$a);
+        }
+        $dblImg->SetLineWeight(1);
+
+        // Setup labels
+        $lr = $scaling * $this->iLabelMargin;
+
+        if( $this->iLabelPositioning == LBLPOSITION_EDGE ) {
+            $value->SetAlign('left','top');
+        }
+        else {
+            $value->SetAlign('center','center');
+            $value->SetMargin(0);
+        }
+
+        for($i=0; $i < $num; ++$i ) {
+
+            list($x,$y,$a) = $txtpos[$i];
+
+            // Determine the label
+
+            $da = $a*180/M_PI;
+            if( $this->iOrdinalEncoding == KEYENCODING_CLOCKWISE ) {
+                $da = 360 - $da;
+            }
+
+            //$da = 360-$da;
+            
+            if( !empty($this->iLabels[$keys[$i]]) ) {
+                $lbl = $this->iLabels[$keys[$i]];
+            }
+            else {
+                $lbl = sprintf($this->iLabelFormatString,$da);
+            }
+
+            if( $this->iLabelPositioning == LBLPOSITION_CENTER ) {
+                $dx = $dy = 0;
+            }
+            else {
+                // LBLPOSIITON_EDGE
+                if( $a>=7*M_PI/4 || $a <= M_PI/4 ) $dx=0;
+                if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dx=($a-M_PI/4)*2/M_PI;
+                if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dx=1;
+                if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dx=(1-($a-M_PI*5/4)*2/M_PI);
+
+                if( $a>=7*M_PI/4 ) $dy=(($a-M_PI)-3*M_PI/4)*2/M_PI;
+                if( $a<=M_PI/4 ) $dy=(0.5+$a*2/M_PI);
+                if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dy=1;
+                if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dy=(1-($a-3*M_PI/4)*2/M_PI);
+                if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dy=0;
+            }
+
+            $value->Set($lbl);
+            $th = $value->GetHeight($dblImg);
+            $tw = $value->GetWidth($dblImg);
+            $xt=round($lr*cos($a)+$x) - $dx*$tw;
+            $yt=round($y-$lr*sin($a)) - $dy*$th;
+
+            $value->Stroke($dblImg,$xt,$yt);
+        }
+
+        if( __DEBUG ) {
+            $dblImg->SetColor('red');
+            $dblImg->Circle($xc,$yc,$lr+$r);
+        }
+
+        // Stroke all the legs
+        reset($this->iData);
+        $i=0;
+        foreach($this->iData as $dir => $legdata) {
+            $legdata = array_slice($legdata,1);
+            $nn = count($legdata);
+
+            $a = $txtpos[$i][2];
+            $rri = $ri/$scaling;
+            for( $j=0; $j < $nn; ++$j ) {
+                // We want the non scaled original radius
+                $legr = $this->scale->RelTranslate($legdata[$j],$r/$scaling,$ri/$scaling) ;
+                $this->_StrokeWindLeg($dblImg, $xc, $yc, $a,
+                $rri *$scaling,
+                $legr *$scaling,
+                $this->iLegweights[$j % $nlw] * $scaling,
+                $this->iLegColors[$j % $nlc]);
+                $rri += $legr;
+            }
+            ++$i;
+        }
+    }
+
+    // Translate potential string specified compass labels to their
+    // corresponding index.
+    function FixupIndexes($aDataArray,$num) {
+        $ret = array();
+        $keys = array_keys($aDataArray);
+        foreach($aDataArray as $idx => $data) {
+            if( is_string($idx) ) {
+                $idx = strtoupper($idx);
+                $res = array_search($idx,$this->iAllDirectionLabels);
+                if( $res === false ) {
+                    JpGraphError::RaiseL(22011,$idx); //('Windrose index must be numeric or direction label. You have specified index='.$idx);
+                }
+                $idx = $res;
+                if( $idx % (16 / $num) !== 0 ) {
+                    JpGraphError::RaiseL(22012); //('Windrose radial axis specification contains a direction which is not enabled.');
+                }
+                $idx /= (16/$num) ;
+
+                if( in_array($idx,$keys,1) ) {
+                    JpgraphError::RaiseL(22013,$idx); //('You have specified the look&feel for the same compass direction twice, once with text and once with index (Index='.$idx.')');
+                }
+            }
+            if( $idx < 0 || $idx > 15 ) {
+                JpgraphError::RaiseL(22014); //('Index for copmass direction must be between 0 and 15.');
+            }
+            $ret[$idx] = $data;
+        }
+        return $ret;
+    }
+
+    function _StrokeRegularRose($dblImg,$value,$scaling,$xc,$yc,$r,$ri) {
+        // _StrokeRegularRose($dblImg,$xc,$yc,$r,$ri)
+        // Plot radial grid lines and remember the end position
+        // and the angle for later use when plotting the labels
+        switch( $this->iType ) {
+            case WINDROSE_TYPE4:
+                $num = 4; break;
+            case WINDROSE_TYPE8:
+                $num = 8; break;
+            case WINDROSE_TYPE16:
+                $num = 16; break;
+            default:
+                JpGraphError::RaiseL(22015);//('You have specified an undefined Windrose plot type.');
+        }
+
+        // Check if we should auto-position the angle for the
+        // labels. Basically we try to find a firection with smallest
+        // (or none) data.
+        $this->SetAutoScaleAngle(true);
+
+        $nlc = count($this->iLegColors);
+        $nlw = count($this->iLegweights);
+
+        $this->iRadialColorArray = $this->FixupIndexes($this->iRadialColorArray,$num);
+        $this->iRadialWeightArray = $this->FixupIndexes($this->iRadialWeightArray,$num);
+        $this->iRadialStyleArray = $this->FixupIndexes($this->iRadialStyleArray,$num);
+
+        $txtpos=array();
+        $a = 2*M_PI/$num;
+        $dblImg->SetColor($this->iGridColor2);
+        $dblImg->SetLineStyle($this->iRadialGridStyle);
+        $dblImg->SetLineWeight($this->iRadialGridWeight);
+
+        // Translate any name specified directions to the index
+        // so we can easily use it in the loop below
+        for($i=0; $i < $num; ++$i ) {
+            $xxc = round($xc + cos($a*$i)*$ri);
+            $yyc = round($yc - sin($a*$i)*$ri);
+            $x = round($xc + cos($a*$i)*$r);
+            $y = round($yc - sin($a*$i)*$r);
+            if( empty($this->iRadialColorArray[$i]) ) {
+                $dblImg->SetColor($this->iGridColor2);
+            }
+            else {
+                $dblImg->SetColor($this->iRadialColorArray[$i]);
+            }
+            if( empty($this->iRadialWeightArray[$i]) ) {
+                $dblImg->SetLineWeight($this->iRadialGridWeight);
+            }
+            else {
+                $dblImg->SetLineWeight($this->iRadialWeightArray[$i]);
+            }
+            if( empty($this->iRadialStyleArray[$i]) ) {
+                $dblImg->SetLineStyle($this->iRadialGridStyle);
+            }
+            else {
+                $dblImg->SetLineStyle($this->iRadialStyleArray[$i]);
+            }
+
+            $dblImg->StyleLine($xxc,$yyc,$x,$y);
+            $txtpos[] = array($x,$y,$a*$i);
+        }
+        $dblImg->SetLineWeight(1);
+
+        $lr = $scaling * $this->iLabelMargin;
+        if( $this->iLabelPositioning == LBLPOSITION_CENTER ) {
+            $value->SetAlign('center','center');
+        }
+        else {
+            $value->SetAlign('left','top');
+            $value->SetMargin(0);
+            $lr /= 2 ;
+        }
+
+        for($i=0; $i < $num; ++$i ) {
+            list($x,$y,$a) = $txtpos[$i];
+
+            // Set the position of the label
+            if( $this->iLabelPositioning == LBLPOSITION_CENTER ) {
+                $dx = $dy = 0;
+            }
+            else {
+                // LBLPOSIITON_EDGE
+                if( $a>=7*M_PI/4 || $a <= M_PI/4 ) $dx=0;
+                if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dx=($a-M_PI/4)*2/M_PI;
+                if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dx=1;
+                if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dx=(1-($a-M_PI*5/4)*2/M_PI);
+
+                if( $a>=7*M_PI/4 ) $dy=(($a-M_PI)-3*M_PI/4)*2/M_PI;
+                if( $a<=M_PI/4 ) $dy=(0.5+$a*2/M_PI);
+                if( $a>=M_PI/4 && $a <= 3*M_PI/4 ) $dy=1;
+                if( $a>=3*M_PI/4 && $a <= 5*M_PI/4 ) $dy=(1-($a-3*M_PI/4)*2/M_PI);
+                if( $a>=5*M_PI/4 && $a <= 7*M_PI/4 ) $dy=0;
+            }
+
+            $value->Set($this->iAllDirectionLabels[$i*(16/$num)]);
+            $th = $value->GetHeight($dblImg);
+            $tw = $value->GetWidth($dblImg);
+            $xt=round($lr*cos($a)+$x) - $dx*$tw;
+            $yt=round($y-$lr*sin($a)) - $dy*$th;
+
+            $value->Stroke($dblImg,$xt,$yt);
+        }
+
+        if( __DEBUG ) {
+            $dblImg->SetColor("red");
+            $dblImg->Circle($xc,$yc,$lr+$r);
+        }
+
+        // Stroke all the legs
+        reset($this->iData);
+        $keys = array_keys($this->iData);
+        foreach($this->iData as $idx => $legdata) {
+            $legdata = array_slice($legdata,1);
+            $nn = count($legdata);
+            if( is_string($idx) ) {
+                $idx = strtoupper($idx);
+                $idx = array_search($idx,$this->iAllDirectionLabels);
+                if( $idx === false ) {
+                    JpGraphError::RaiseL(22016);//('Windrose leg index must be numeric or direction label.');
+                }
+                if( $idx % (16 / $num) !== 0 ) {
+                    JpGraphError::RaiseL(22017);//('Windrose data contains a direction which is not enabled. Please adjust what labels are displayed.');
+                }
+                $idx /= (16/$num) ;
+
+                if( in_array($idx,$keys,1) ) {
+                    JpgraphError::RaiseL(22018,$idx);//('You have specified data for the same compass direction twice, once with text and once with index (Index='.$idx.')');
+
+                }
+            }
+            if( $idx < 0 || $idx > 15 ) {
+                JpgraphError::RaiseL(22019);//('Index for direction must be between 0 and 15. You can\'t specify angles for a Regular Windplot, only index and compass directions.');
+            }
+            $a = $idx * (360 / $num) ;
+            $a *= M_PI/180.0;
+            $rri = $ri/$scaling;
+            for( $j=0; $j < $nn; ++$j ) {
+                // We want the non scaled original radius
+                $legr = $this->scale->RelTranslate($legdata[$j], $r/$scaling,$ri/$scaling) ;
+                $this->_StrokeWindLeg($dblImg, $xc, $yc, $a,
+                $rri *$scaling,
+                $legr *$scaling,
+                $this->iLegweights[$j % $nlw] * $scaling,
+                $this->iLegColors[$j % $nlc]);
+                $rri += $legr;
+            }
+        }
+    }
+
+
+    function getWidth($aImg) {
+
+        $scaling = 1;//$this->iAntiAlias ? 2 : 1 ;
+       	if( $this->iSize > 0 && $this->iSize < 1 ) {
+			$this->iSize *= min($aImg->width,$aImg->height);
+       	}
+
+
+        $value = new Text();
+        $value->SetFont($this->iFontFamily,$this->iFontStyle,$this->iFontSize*$scaling);
+        $value->SetColor($this->iFontColor);
+        // Setup extra size around the graph needed so that the labels
+        // doesn't get cut. For this we need to find the largest label.
+        // The code below gives a possible a little to large margin. The
+        // really, really proper way would be to account for what angle
+        // the label are at
+        $n = count($this->iLabels);
+        if( $n > 0 ) {
+            $maxh=0;$maxw=0;
+            foreach($this->iLabels as $key => $lbl) {
+                $value->Set($lbl);
+                $maxw = max($maxw,$value->GetWidth($aImg));
+            }
+        }
+        else {
+            $value->Set('888.888'); // Dummy value to get width/height
+            $maxw = $value->GetWidth($aImg);
+        }
+        // Add an extra margin of 50% the font size
+        $maxw += round($this->iFontSize*$scaling * 0.4) ;
+
+        $valxmarg = 1.5*$maxw+2*$this->iLabelMargin*$scaling;
+        $w = round($this->iSize*$scaling + $valxmarg);
+
+        // Make sure that the width of the legend fits
+        $legendwidth = $this->_StrokeLegend($aImg,0,0,$scaling,true)+10*$scaling;
+        $w = max($w,$legendwidth);
+
+        return $w;
+    }
+
+    function getHeight($aImg) {
+
+        $scaling = 1;//$this->iAntiAlias ? 2 : 1 ;
+       	if( $this->iSize > 0 && $this->iSize < 1 ) {
+			$this->iSize *= min($aImg->width,$aImg->height);
+       	}
+
+        $value = new Text();
+        $value->SetFont($this->iFontFamily,$this->iFontStyle,$this->iFontSize*$scaling);
+        $value->SetColor($this->iFontColor);
+        // Setup extra size around the graph needed so that the labels
+        // doesn't get cut. For this we need to find the largest label.
+        // The code below gives a possible a little to large margin. The
+        // really, really proper way would be to account for what angle
+        // the label are at
+        $n = count($this->iLabels);
+        if( $n > 0 ) {
+            $maxh=0;$maxw=0;
+            foreach($this->iLabels as $key => $lbl) {
+                $value->Set($lbl);
+                $maxh = max($maxh,$value->GetHeight($aImg));
+            }
+        }
+        else {
+            $value->Set('180.8'); // Dummy value to get width/height
+            $maxh = $value->GetHeight($aImg);
+        }
+        // Add an extra margin of 50% the font size
+        //$maxh += round($this->iFontSize*$scaling * 0.5) ;
+        $valymarg = 2*$maxh+2*$this->iLabelMargin*$scaling;
+
+        $legendheight = round($this->legend->iShow ? 1 : 0);
+        $legendheight *= max($this->legend->iCircleRadius*2,$this->legend->iTxtFontSize*2)+
+        				 $this->legend->iMargin + $this->legend->iBottomMargin + 2;
+        $legendheight *= $scaling;
+        $h = round($this->iSize*$scaling + $valymarg) + $legendheight ;
+
+        return $h;
+    }
+
+    function Stroke($aGraph) {
+
+		$aImg = $aGraph->img;
+
+		if( $this->iX > 0 && $this->iX < 1 ) {
+			$this->iX = round( $aImg->width * $this->iX ) ;
+		}
+
+       	if( $this->iY > 0 && $this->iY < 1 ) {
+       		$this->iY = round( $aImg->height * $this->iY ) ;
+       	}
+
+       	if( $this->iSize > 0 && $this->iSize < 1 ) {
+			$this->iSize *= min($aImg->width,$aImg->height);
+       	}
+
+       	if( $this->iCenterSize > 0 && $this->iCenterSize < 1 ) {
+			$this->iCenterSize *= $this->iSize;
+       	}
+
+        $this->scale->AutoScale(($this->iSize - $this->iCenterSize)/2, round(2.5*$this->scale->iFontSize));
+
+        $scaling = $this->iAntiAlias ? 2 : 1 ;
+
+        $value = new Text();
+        $value->SetFont($this->iFontFamily,$this->iFontStyle,$this->iFontSize*$scaling);
+        $value->SetColor($this->iFontColor);
+
+        $legendheight = round($this->legend->iShow ? 1 : 0);
+        $legendheight *= max($this->legend->iCircleRadius*2,$this->legend->iTxtFontSize*2)+
+        $this->legend->iMargin + $this->legend->iBottomMargin + 2;
+        $legendheight *= $scaling;
+
+        $w = $scaling*$this->getWidth($aImg);
+        $h = $scaling*$this->getHeight($aImg);
+
+        // Copy back the double buffered image to the proper canvas
+        $ww = $w / $scaling ;
+        $hh = $h / $scaling ;
+
+        // Create the double buffer
+        if( $this->iAntiAlias ) {
+            $dblImg = new RotImage($w,$h);
+            // Set the background color
+            $dblImg->SetColor($this->iColor);
+            $dblImg->FilledRectangle(0,0,$w,$h);
+        }
+        else {
+            $dblImg = $aImg ;
+            // Make sure the ix and it coordinates correpond to the new top left center
+            $dblImg->SetTranslation($this->iX-$w/2, $this->iY-$h/2);
+        }
+
+        if( __DEBUG ) {
+            $dblImg->SetColor('red');
+            $dblImg->Rectangle(0,0,$w-1,$h-1);
+        }
+
+        $dblImg->SetColor('black');
+
+        if( $this->iShowBox ) {
+            $dblImg->SetColor($this->iBoxColor);
+            $old = $dblImg->SetLineWeight($this->iBoxWeight);
+            $dblImg->SetLineStyle($this->iBoxStyle);
+            $dblImg->Rectangle(0,0,$w-1,$h-1);
+            $dblImg->SetLineWeight($old);
+        }
+
+        $xc = round($w/2);
+        $yc = round(($h-$legendheight)/2);
+
+        if( __DEBUG ) {
+            $dblImg->SetColor('red');
+            $old = $dblImg->SetLineWeight(2);
+            $dblImg->Line($xc-5,$yc-5,$xc+5,$yc+5);
+			$dblImg->Line($xc+5,$yc-5,$xc-5,$yc+5);
+			$dblImg->SetLineWeight($old);
+        }
+
+        $this->iSize *= $scaling;
+
+        // Inner circle size
+        $ri = $this->iCenterSize/2 ;
+
+        // Full circle radius
+        $r = round( $this->iSize/2 );
+
+        // Get number of grid circles
+        $n = $this->scale->GetNumCirc();
+
+        // Plot circle grids
+        $ri *= $scaling ;
+        $rr = round(($r-$ri)/$n);
+        for( $i = 1; $i <= $n; ++$i ) {
+            $this->_ThickCircle($dblImg,$xc,$yc,$rr*$i+$ri,
+            $this->iCircGridWeight,$this->iGridColor1);
+        }
+
+        $num = 0 ;
+
+        if( $this->iType == WINDROSE_TYPEFREE ) {
+            $this->_StrokeFreeRose($dblImg,$value,$scaling,$xc,$yc,$r,$ri);
+        }
+        else {
+            // Check if we need to re-code the interpretation of the ordinal
+            // number in the data. Internally ordinal value 0 is East and then
+            // counted anti-clockwise. The user might choose an encoding
+            // that have 0 being the first axis to the right of the "N" axis and then
+            // counted clock-wise
+            if( $this->iOrdinalEncoding == KEYENCODING_CLOCKWISE ) {
+                if( $this->iType == WINDROSE_TYPE16 ) {
+                    $const1 = 19; $const2 = 16;
+                }
+                elseif( $this->iType == WINDROSE_TYPE8 ) {
+                    $const1 = 9; $const2 = 8;
+                }
+                else {
+                    $const1 = 4; $const2 = 4;
+                }
+                $tmp = array();
+                $n=count($this->iData);
+                foreach( $this->iData as $key => $val ) {
+                    if( is_numeric($key) ) {
+                        $key = ($const1 - $key) % $const2 ;
+                    }
+                    $tmp[$key] = $val;
+                }
+                $this->iData = $tmp;
+            }
+            $this->_StrokeRegularRose($dblImg,$value,$scaling,$xc,$yc,$r,$ri);
+        }
+
+        // Stroke the labels
+        $this->scale->iFontSize *= $scaling;
+        $this->scale->iZFontSize *= $scaling;
+        $this->scale->StrokeLabels($dblImg,$xc,$yc,$ri,$rr);
+
+        // Stroke the inner circle again since the legs
+        // might have written over it
+        $this->_ThickCircle($dblImg,$xc,$yc,$ri,$this->iCircGridWeight,$this->iGridColor1);
+
+        if( $ww > $aImg->width ) {
+            JpgraphError::RaiseL(22020);
+            //('Windrose plot is too large to fit the specified Graph size. Please use WindrosePlot::SetSize() to make the plot smaller or increase the size of the Graph in the initial WindroseGraph() call.');
+        }
+
+        $x = $xc;
+        $y = $h;
+        $this->_StrokeLegend($dblImg,$x,$y,$scaling);
+
+        if( $this->iAntiAlias ) {
+            $aImg->Copy($dblImg->img, $this->iX-$ww/2, $this->iY-$hh/2, 0, 0, $ww,$hh, $w,$h);
+        }
+
+        // We need to restore the translation matrix
+        $aImg->SetTranslation(0,0);
+
+    }
+
+}
+
+//============================================================
+// CLASS WindroseGraph
+//============================================================
+class WindroseGraph extends Graph {
+    private $posx, $posy;
+    public $plots=array();
+
+    function __construct($width=300,$height=200,$cachedName="",$timeout=0,$inline=1) {
+        parent::__construct($width,$height,$cachedName,$timeout,$inline);
+        $this->posx=$width/2;
+        $this->posy=$height/2;
+        $this->SetColor('white');
+        $this->title->SetFont(FF_VERDANA,FS_NORMAL,12);
+        $this->title->SetMargin(8);
+        $this->subtitle->SetFont(FF_VERDANA,FS_NORMAL,10);
+        $this->subtitle->SetMargin(0);
+        $this->subsubtitle->SetFont(FF_VERDANA,FS_NORMAL,8);
+        $this->subsubtitle->SetMargin(0);
+    }
+
+    function StrokeTexts() {
+        if( $this->texts != null ) {
+            $n = count($this->texts);
+            for($i=0; $i < $n; ++$i ) {
+                $this->texts[$i]->Stroke($this->img);
+            }
+        }
+    }
+
+    function StrokeIcons() {
+        if( $this->iIcons != null ) {
+            $n = count($this->iIcons);
+            for( $i=0; $i < $n; ++$i ) {
+                // Since Windrose graphs doesn't have any linear scale the position of
+                // each icon has to be given as absolute coordinates
+                $this->iIcons[$i]->_Stroke($this->img);
+            }
+        }
+    }
+
+    //---------------
+    // PUBLIC METHODS
+    function Add($aObj) {
+        if( is_array($aObj) && count($aObj) > 0 ) {
+            $cl = $aObj[0];
+        }
+        else {
+            $cl = $aObj;
+        }
+        if( $cl instanceof Text ) {
+            $this->AddText($aObj);
+        }
+        elseif( $cl instanceof IconPlot ) {
+            $this->AddIcon($aObj);
+        }
+        elseif( ($cl instanceof WindrosePlot) || ($cl instanceof LayoutRect) || ($cl instanceof LayoutHor)) {
+            $this->plots[] = $aObj;
+        }
+        else {
+            JpgraphError::RaiseL(22021);
+        }
+    }
+
+    function AddText($aTxt,$aToY2=false) {
+        parent::AddText($aTxt);
+    }
+
+    function SetColor($c) {
+        $this->SetMarginColor($c);
+    }
+
+    // Method description
+    function Stroke($aStrokeFileName="") {
+
+        // If the filename is the predefined value = '_csim_special_'
+        // we assume that the call to stroke only needs to do enough
+        // to correctly generate the CSIM maps.
+        // We use this variable to skip things we don't strictly need
+        // to do to generate the image map to improve performance
+        // as best we can. Therefore you will see a lot of tests !$_csim in the
+        // code below.
+        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
+
+        // We need to know if we have stroked the plot in the
+        // GetCSIMareas. Otherwise the CSIM hasn't been generated
+        // and in the case of GetCSIM called before stroke to generate
+        // CSIM without storing an image to disk GetCSIM must call Stroke.
+        $this->iHasStroked = true;
+
+        if( $this->background_image != "" || $this->background_cflag != "" ) {
+            $this->StrokeFrameBackground();
+        }
+        else {
+            $this->StrokeFrame();
+        }
+
+        // n holds number of plots
+        $n = count($this->plots);
+        for($i=0; $i < $n ; ++$i) {
+     		$this->plots[$i]->Stroke($this);
+        }
+
+        $this->footer->Stroke($this->img);
+        $this->StrokeIcons();
+        $this->StrokeTexts();
+        $this->StrokeTitles();
+
+        // If the filename is given as the special "__handle"
+        // then the image handler is returned and the image is NOT
+        // streamed back
+        if( $aStrokeFileName == _IMG_HANDLER ) {
+            return $this->img->img;
+        }
+        else {
+            // Finally stream the generated picture
+            $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,
+            $aStrokeFileName);
+        }
+    }
+
+} // Class
+
+?>
diff --git a/common/lib/jpgraph_lib/lang/de.inc.php b/common/lib/jpgraph_lib/lang/de.inc.php
new file mode 100644
index 000000000..37ba264f4
--- /dev/null
+++ b/common/lib/jpgraph_lib/lang/de.inc.php
@@ -0,0 +1,552 @@
+<?php
+/*=======================================================================
+// File:        DE.INC.PHP
+// Description: German language file for error messages
+// Created:     2006-03-06
+// Author:      Timo Leopold (timo@leopold-hh.de)
+//              Johan Persson (ljp@localhost.nil)
+// Ver:         $Id: de.inc.php 1886 2009-10-01 23:30:16Z ljp $
+//
+// Copyright (c)
+//========================================================================
+*/
+
+// Notiz: Das Format fuer jede Fehlermeldung ist array(<Fehlermeldung>,<Anzahl der Argumente>)
+$_jpg_messages = array(
+
+/*
+** Headers wurden bereits gesendet - Fehler. Dies wird als HTML formatiert, weil es direkt als text zurueckgesendet wird
+*/
+10  => array('<table border="1"><tr><td style="color:darkred;font-size:1.2em;"><b>JpGraph Fehler:</b>
+HTTP header wurden bereits gesendet.<br>Fehler in der Datei <b>%s</b> in der Zeile <b>%d</b>.</td></tr><tr><td><b>Erklärung:</b><br>HTTP header wurden bereits zum Browser gesendet, wobei die Daten als Text gekennzeichnet wurden, bevor die Bibliothek die Chance hatte, seinen Bild-HTTP-Header zum Browser zu schicken. Dies verhindert, dass die Bibliothek Bilddaten zum Browser schicken kann (weil sie vom Browser als Text interpretiert würden und daher nur Mist dargestellt würde).<p>Wahrscheinlich steht Text im Skript bevor <i>Graph::Stroke()</i> aufgerufen wird. Wenn dieser Text zum Browser gesendet wird, nimmt dieser an, dass die gesamten Daten aus Text bestehen. Such nach irgendwelchem Text, auch nach Leerzeichen und Zeilenumbrüchen, die eventuell bereits zum Browser gesendet wurden. <p>Zum Beispiel ist ein oft auftretender Fehler, eine Leerzeile am Anfang der Datei oder vor <i>Graph::Stroke()</i> zu lassen."<b>&lt;?php</b>".</td></tr></table>',2),
+
+/*
+** Setup Fehler
+*/
+11 => array('Es wurde kein Pfad für CACHE_DIR angegeben. Bitte gib einen Pfad CACHE_DIR in der Datei jpg-config.inc an.',0),
+12 => array('Es wurde kein Pfad für TTF_DIR angegeben und der Pfad kann nicht automatisch ermittelt werden. Bitte gib den Pfad in der Datei jpg-config.inc an.',0),
+13 => array('The installed PHP version (%s) is not compatible with this release of the library. The library requires at least PHP version %s',2),
+
+/*
+**  jpgraph_bar
+*/
+
+2001 => array('Die Anzahl der Farben ist nicht gleich der Anzahl der Vorlagen in BarPlot::SetPattern().',0),
+2002 => array('Unbekannte Vorlage im Aufruf von BarPlot::SetPattern().',0),
+2003 => array('Anzahl der X- und Y-Koordinaten sind nicht identisch. Anzahl der X-Koordinaten: %d; Anzahl der Y-Koordinaten: %d.',2),
+2004 => array('Alle Werte für ein Balkendiagramm (barplot) müssen numerisch sein. Du hast den Wert nr [%d] == %s angegeben.',2),
+2005 => array('Du hast einen leeren Vektor für die Schattierungsfarben im Balkendiagramm (barplot) angegeben.',0),
+2006 => array('Unbekannte Position für die Werte der Balken: %s.',1),
+2007 => array('Kann GroupBarPlot nicht aus einem leeren Vektor erzeugen.',0),
+2008 => array('GroupBarPlot Element nbr %d wurde nicht definiert oder ist leer.',0),
+2009 => array('Eins der Objekte, das an GroupBar weitergegeben wurde ist kein Balkendiagramm (BarPlot). Versichere Dich, dass Du den GroupBarPlot aus einem Vektor von Balkendiagrammen (barplot) oder AccBarPlot-Objekten erzeugst. (Class = %s)',1),
+2010 => array('Kann AccBarPlot nicht aus einem leeren Vektor erzeugen.',0),
+2011 => array('AccBarPlot-Element nbr %d wurde nicht definiert oder ist leer.',1),
+2012 => array('Eins der Objekte, das an AccBar weitergegeben wurde ist kein Balkendiagramm (barplot). Versichere Dich, dass Du den AccBar-Plot aus einem Vektor von Balkendiagrammen (barplot) erzeugst. (Class=%s)',1),
+2013 => array('Du hast einen leeren Vektor für die Schattierungsfarben im Balkendiagramm (barplot) angegeben.',0),
+2014 => array('Die Anzahl der Datenpunkte jeder Datenreihe in AccBarPlot muss gleich sein.',0),
+2015 => array('Individual bar plots in an AccBarPlot or GroupBarPlot can not have specified X-coordinates',0),
+
+
+/*
+**  jpgraph_date
+*/
+
+3001 => array('Es ist nur möglich, entweder SetDateAlign() oder SetTimeAlign() zu benutzen, nicht beides!',0),
+
+/*
+**  jpgraph_error
+*/
+
+4002 => array('Fehler bei den Eingabedaten von LineErrorPlot. Die Anzahl der Datenpunkte mus ein Mehrfaches von drei sein!',0),
+
+/*
+**  jpgraph_flags
+*/
+
+5001 => array('Unbekannte Flaggen-Größe (%d).',1),
+5002 => array('Der Flaggen-Index %s existiert nicht.',1),
+5003 => array('Es wurde eine ungültige Ordnungszahl (%d) für den Flaggen-Index angegeben.',1),
+5004 => array('Der Landesname %s hat kein korrespondierendes Flaggenbild. Die Flagge mag existieren, abr eventuell unter einem anderen Namen, z.B. versuche "united states" statt "usa".',1),
+
+
+/*
+**  jpgraph_gantt
+*/
+
+6001 => array('Interner Fehler. Die Höhe für ActivityTitles ist < 0.',0),
+6002 => array('Es dürfen keine negativen Werte für die Gantt-Diagramm-Dimensionen angegeben werden. Verwende 0, wenn die Dimensionen automatisch ermittelt werden sollen.',0),
+6003 => array('Ungültiges Format für den Bedingungs-Parameter bei Index=%d in CreateSimple(). Der Parameter muss bei index 0 starten und Vektoren in der Form (Row,Constrain-To,Constrain-Type) enthalten.',1),
+6004 => array('Ungültiges Format für den Fortschritts-Parameter bei Index=%d in CreateSimple(). Der Parameter muss bei Index 0 starten und Vektoren in der Form (Row,Progress) enthalten.',1),
+6005 => array('SetScale() ist nicht sinnvoll bei Gantt-Diagrammen.',0),
+6006 => array('Das Gantt-Diagramm kann nicht automatisch skaliert werden. Es existieren keine Aktivitäten mit Termin. [GetBarMinMax() start >= n]',0),
+6007 => array('Plausibiltätsprüfung für die automatische Gantt-Diagramm-Größe schlug fehl. Entweder die Breite (=%d) oder die Höhe (=%d) ist größer als MAX_GANTTIMG_SIZE. Dies kann möglicherweise durch einen falschen Wert bei einer Aktivität hervorgerufen worden sein.',2),
+6008 => array('Du hast eine Bedingung angegeben von Reihe=%d bis Reihe=%d, die keine Aktivität hat.',2),
+6009 => array('Unbekannter Bedingungstyp von Reihe=%d bis Reihe=%d',2),
+6010 => array('Ungültiger Icon-Index für das eingebaute Gantt-Icon [%d]',1),
+6011 => array('Argument für IconImage muss entweder ein String oder ein Integer sein.',0),
+6012 => array('Unbekannter Typ bei der Gantt-Objekt-Title-Definition.',0),
+6015 => array('Ungültige vertikale Position %d',1),
+6016 => array('Der eingegebene Datums-String (%s) für eine Gantt-Aktivität kann nicht interpretiert werden. Versichere Dich, dass es ein gültiger Datumsstring ist, z.B. 2005-04-23 13:30',1),
+6017 => array('Unbekannter Datumstyp in GanttScale (%s).',1),
+6018 => array('Intervall für Minuten muss ein gerader Teiler einer Stunde sein, z.B. 1,5,10,12,15,20,30, etc. Du hast ein Intervall von %d Minuten angegeben.',1),
+6019 => array('Die vorhandene Breite (%d) für die Minuten ist zu klein, um angezeigt zu werden. Bitte benutze die automatische Größenermittlung oder vergrößere die Breite des Diagramms.',1),
+6020 => array('Das Intervall für die Stunden muss ein gerader Teiler eines Tages sein, z.B. 0:30, 1:00, 1:30, 4:00, etc. Du hast ein Intervall von %d eingegeben.',1),
+6021 => array('Unbekanntes Format für die Woche.',0),
+6022 => array('Die Gantt-Skala wurde nicht eingegeben.',0),
+6023 => array('Wenn Du sowohl Stunden als auch Minuten anzeigen lassen willst, muss das Stunden-Interval gleich 1 sein (anderenfalls ist es nicht sinnvoll, Minuten anzeigen zu lassen).',0),
+6024 => array('Das CSIM-Ziel muss als String angegeben werden. Der Start des Ziels ist: %d',1),
+6025 => array('Der CSIM-Alt-Text muss als String angegeben werden. Der Beginn des Alt-Textes ist: %d',1),
+6027 => array('Der Fortschrittswert muss im Bereich [0, 1] liegen.',0),
+6028 => array('Die eingegebene Höhe (%d) für GanttBar ist nicht im zulässigen Bereich.',1),
+6029 => array('Der Offset für die vertikale Linie muss im Bereich [0,1] sein.',0),
+6030 => array('Unbekannte Pfeilrichtung für eine Verbindung.',0),
+6031 => array('Unbekannter Pfeiltyp für eine Verbindung.',0),
+6032 => array('Interner Fehler: Unbekannter Pfadtyp (=%d) für eine Verbindung.',1),
+6033 => array('Array of fonts must contain arrays with 3 elements, i.e. (Family, Style, Size)',0),
+
+/*
+**  jpgraph_gradient
+*/
+
+7001 => array('Unbekannter Gradiententyp (=%d).',1),
+
+/*
+**  jpgraph_iconplot
+*/
+
+8001 => array('Der Mix-Wert für das Icon muss zwischen 0 und 100 sein.',0),
+8002 => array('Die Ankerposition für Icons muss entweder "top", "bottom", "left", "right" oder "center" sein.',0),
+8003 => array('Es ist nicht möglich, gleichzeitig ein Bild und eine Landesflagge für dasselbe Icon zu definieren',0),
+8004 => array('Wenn Du Landesflaggen benutzen willst, musst Du die Datei "jpgraph_flags.php" hinzufügen (per include).',0),
+
+/*
+**  jpgraph_imgtrans
+*/
+
+9001 => array('Der Wert für die Bildtransformation ist außerhalb des zulässigen Bereichs. Der verschwindende Punkt am Horizont muss als Wert zwischen 0 und 1 angegeben werden.',0),
+
+/*
+**  jpgraph_lineplot
+*/
+
+10001 => array('Die Methode LinePlot::SetFilled() sollte nicht mehr benutzt werden. Benutze lieber SetFillColor()',0),
+10002 => array('Der Plot ist zu kompliziert für FastLineStroke. Benutze lieber den StandardStroke()',0),
+10003 => array('Each plot in an accumulated lineplot must have the same number of data points.',0),
+/*
+**  jpgraph_log
+*/
+
+11001 => array('Deine Daten enthalten nicht-numerische Werte.',0),
+11002 => array('Negative Werte können nicht für logarithmische Achsen verwendet werden.',0),
+11003 => array('Deine Daten enthalten nicht-numerische Werte.',0),
+11004 => array('Skalierungsfehler für die logarithmische Achse. Es gibt ein Problem mit den Daten der Achse. Der größte Wert muss größer sein als Null. Es ist mathematisch nicht möglich, einen Wert gleich Null in der Skala zu haben.',0),
+11005 => array('Das Tick-Intervall für die logarithmische Achse ist nicht definiert. Lösche jeden Aufruf von SetTextLabelStart() oder SetTextTickInterval() bei der logarithmischen Achse.',0),
+
+/*
+**  jpgraph_mgraph
+*/
+
+12001 => array("Du benutzt GD 2.x und versuchst ein Nicht-Truecolor-Bild als Hintergrundbild zu benutzen. Um Hintergrundbilder mit GD 2.x zu benutzen, ist es notwendig Truecolor zu aktivieren, indem die USE_TRUECOLOR-Konstante auf TRUE gesetzt wird. Wegen eines Bugs in GD 2.0.1 ist die Qualität der Truetype-Schriften sehr schlecht, wenn man Truetype-Schriften mit Truecolor-Bildern verwendet.",0),
+12002 => array('Ungültiger Dateiname für MGraph::SetBackgroundImage() : %s. Die Datei muss eine gültige Dateierweiterung haben (jpg,gif,png), wenn die automatische Typerkennung verwendet wird.',1),
+12003 => array('Unbekannte Dateierweiterung (%s) in MGraph::SetBackgroundImage() für Dateiname: %s',2),
+12004 => array('Das Bildformat des Hintergrundbildes (%s) wird von Deiner System-Konfiguration nicht unterstützt. ',1),
+12005 => array('Das Hintergrundbild kann nicht gelesen werden: %s',1),
+12006 => array('Es wurden ungültige Größen für Breite oder Höhe beim Erstellen des Bildes angegeben, (Breite=%d, Höhe=%d)',2),
+12007 => array('Das Argument für MGraph::Add() ist nicht gültig für GD.',0),
+12008 => array('Deine PHP- (und GD-lib-) Installation scheint keine bekannten Bildformate zu unterstützen.',0),
+12009 => array('Deine PHP-Installation unterstützt das gewählte Bildformat nicht: %s',1),
+12010 => array('Es konnte kein Bild als Datei %s erzeugt werden. Überprüfe, ob Du die entsprechenden Schreibrechte im aktuellen Verzeichnis hast.',1),
+12011 => array('Es konnte kein Truecolor-Bild erzeugt werden. Überprüfe, ob Du wirklich die GD2-Bibliothek installiert hast.',0),
+12012 => array('Es konnte kein Bild erzeugt werden. Überprüfe, ob Du wirklich die GD2-Bibliothek installiert hast.',0),
+
+/*
+**  jpgraph_pie3d
+*/
+
+14001 => array('Pie3D::ShowBorder(). Missbilligte Funktion. Benutze Pie3D::SetEdge(), um die Ecken der Tortenstücke zu kontrollieren.',0),
+14002 => array('PiePlot3D::SetAngle() 3D-Torten-Projektionswinkel muss zwischen 5 und 85 Grad sein.',0),
+14003 => array('Interne Festlegung schlug fehl. Pie3D::Pie3DSlice',0),
+14004 => array('Tortenstück-Startwinkel muss zwischen 0 und 360 Grad sein.',0),
+14005 => array('Pie3D Interner Fehler: Versuch, zweimal zu umhüllen bei der Suche nach dem Startindex.',0,),
+14006 => array('Pie3D Interner Fehler: Z-Sortier-Algorithmus für 3D-Tortendiagramme funktioniert nicht einwandfrei (2). Versuch, zweimal zu umhüllen beim Erstellen des Bildes.',0),
+14007 => array('Die Breite für das 3D-Tortendiagramm ist 0. Gib eine Breite > 0 an.',0),
+
+/*
+**  jpgraph_pie
+*/
+
+15001 => array('PiePLot::SetTheme() Unbekannter Stil: %s',1),
+15002 => array('Argument für PiePlot::ExplodeSlice() muss ein Integer-Wert sein',0),
+15003 => array('Argument für PiePlot::Explode() muss ein Vektor mit Integer-Werten sein.',0),
+15004 => array('Tortenstück-Startwinkel muss zwischen 0 und 360 Grad sein.',0),
+15005 => array('PiePlot::SetFont() sollte nicht mehr verwendet werden. Benutze stattdessen PiePlot->value->SetFont().',0),
+15006 => array('PiePlot::SetSize() Radius für Tortendiagramm muss entweder als Bruch [0, 0.5] der Bildgröße oder als Absoluwert in Pixel im Bereich [10, 1000] angegeben werden.',0),
+15007 => array('PiePlot::SetFontColor() sollte nicht mehr verwendet werden. Benutze stattdessen PiePlot->value->SetColor()..',0),
+15008 => array('PiePlot::SetLabelType() der Typ für Tortendiagramme muss entweder 0 or 1 sein (nicht %d).',1),
+15009 => array('Ungültiges Tortendiagramm. Die Summe aller Daten ist Null.',0),
+15010 => array('Die Summe aller Daten ist Null.',0),
+15011 => array('Um Bildtransformationen benutzen zu können, muss die Datei jpgraph_imgtrans.php eingefügt werden (per include).',0), // @todo translate into German
+15012 => array('PiePlot::SetTheme() is no longer recommended. Use PieGraph::SetTheme()',0),
+
+/*
+**  jpgraph_plotband
+*/
+
+16001 => array('Die Dichte für das Pattern muss zwischen 1 und 100 sein. (Du hast %f eingegeben)',1),
+16002 => array('Es wurde keine Position für das Pattern angegeben.',0),
+16003 => array('Unbekannte Pattern-Definition (%d)',0),
+16004 => array('Der Mindeswert für das PlotBand ist größer als der Maximalwert. Bitte korrigiere dies!',0),
+
+
+/*
+**  jpgraph_polar
+*/
+
+17001 => array('PolarPlots müssen eine gerade Anzahl von Datenpunkten haben. Jeder Datenpunkt ist ein Tupel (Winkel, Radius).',0),
+17002 => array('Unbekannte Ausrichtung für X-Achsen-Titel. (%s)',1),
+//17003 => array('Set90AndMargin() wird für PolarGraph nicht unterstützt.',0),
+17004 => array('Unbekannter Achsentyp für PolarGraph. Er muss entweder \'lin\' oder \'log\' sein.',0),
+
+/*
+**  jpgraph_radar
+*/
+
+18001 => array('ClientSideImageMaps werden für RadarPlots nicht unterstützt.',0),
+18002 => array('RadarGraph::SupressTickMarks() sollte nicht mehr verwendet werden. Benutze stattdessen HideTickMarks().',0),
+18003 => array('Ungültiger Achsentyp für RadarPlot (%s). Er muss entweder \'lin\' oder \'log\' sein.',1),
+18004 => array('Die RadarPlot-Größe muss zwischen 0.1 und 1 sein. (Dein Wert=%f)',1),
+18005 => array('RadarPlot: nicht unterstützte Tick-Dichte: %d',1),
+18006 => array('Minimum Daten %f (RadarPlots sollten nur verwendet werden, wenn alle Datenpunkte einen Wert > 0 haben).',1),
+18007 => array('Die Anzahl der Titel entspricht nicht der Anzahl der Datenpunkte.',0),
+18008 => array('Jeder RadarPlot muss die gleiche Anzahl von Datenpunkten haben.',0),
+
+/*
+**  jpgraph_regstat
+*/
+
+19001 => array('Spline: Anzahl der X- und Y-Koordinaten muss gleich sein.',0),
+19002 => array('Ungültige Dateneingabe für Spline. Zwei oder mehr aufeinanderfolgende X-Werte sind identisch. Jeder eigegebene X-Wert muss unterschiedlich sein, weil vom mathematischen Standpunkt ein Eins-zu-Eins-Mapping vorliegen muss, d.h. jeder X-Wert korrespondiert mit exakt einem Y-Wert.',0),
+19003 => array('Bezier: Anzahl der X- und Y-Koordinaten muss gleich sein.',0),
+
+/*
+**  jpgraph_scatter
+*/
+
+20001 => array('Fieldplots müssen die gleiche Anzahl von X und Y Datenpunkten haben.',0),
+20002 => array('Bei Fieldplots muss ein Winkel für jeden X und Y Datenpunkt angegeben werden.',0),
+20003 => array('Scatterplots müssen die gleiche Anzahl von X- und Y-Datenpunkten haben.',0),
+
+/*
+**  jpgraph_stock
+*/
+
+21001 => array('Die Anzahl der Datenwerte für Stock-Charts müssen ein Mehrfaches von %d Datenpunkten sein.',1),
+
+/*
+**  jpgraph_plotmark
+*/
+
+23001 => array('Der Marker "%s" existiert nicht in der Farbe: %d',2),
+23002 => array('Der Farb-Index ist zu hoch für den Marker "%s"',1),
+23003 => array('Ein Dateiname muss angegeben werden, wenn Du den Marker-Typ auf MARK_IMG setzt.',0),
+
+/*
+**  jpgraph_utils
+*/
+
+24001 => array('FuncGenerator : Keine Funktion definiert. ',0),
+24002 => array('FuncGenerator : Syntax-Fehler in der Funktionsdefinition ',0),
+24003 => array('DateScaleUtils: Unknown tick type specified in call to GetTicks()',0),
+24004 => array('ReadCSV2: Die anzahl der spalten fehler in %s reihe %d',2),
+/*
+**  jpgraph
+*/
+
+25001 => array('Diese PHP-Installation ist nicht mit der GD-Bibliothek kompiliert. Bitte kompiliere PHP mit GD-Unterstützung neu, damit JpGraph funktioniert. (Weder die Funktion imagetypes() noch imagecreatefromstring() existiert!)',0),
+25002 => array('Diese PHP-Installation scheint nicht die benötigte GD-Bibliothek zu unterstützen. Bitte schau in der PHP-Dokumentation nach, wie man die GD-Bibliothek installiert und aktiviert.',0),
+25003 => array('Genereller PHP Fehler : Bei %s:%d : %s',3),
+25004 => array('Genereller PHP Fehler : %s ',1),
+25005 => array('PHP_SELF, die PHP-Global-Variable kann nicht ermittelt werden. PHP kann nicht von der Kommandozeile gestartet werden, wenn der Cache oder die Bilddateien automatisch benannt werden sollen.',0),
+25006 => array('Die Benutzung der FF_CHINESE (FF_BIG5) Schriftfamilie benötigt die iconv() Funktion in Deiner PHP-Konfiguration. Dies wird nicht defaultmäßig in PHP kompiliert (benötigt "--width-iconv" bei der Konfiguration).',0),
+25007 => array('Du versuchst das lokale (%s) zu verwenden, was von Deiner PHP-Installation nicht unterstützt wird. Hinweis: Benutze \'\', um das defaultmäßige Lokale für diese geographische Region festzulegen.',1),
+25008 => array('Die Bild-Breite und Höhe in Graph::Graph() müssen numerisch sein',0),
+25009 => array('Die Skalierung der Achsen muss angegeben werden mit Graph::SetScale()',0),
+
+25010 => array('Graph::Add() Du hast versucht, einen leeren Plot zum Graph hinzuzufügen.',0),
+25011 => array('Graph::AddY2() Du hast versucht, einen leeren Plot zum Graph hinzuzufügen.',0),
+25012 => array('Graph::AddYN() Du hast versucht, einen leeren Plot zum Graph hinzuzufügen.',0),
+25013 => array('Es können nur Standard-Plots zu multiplen Y-Achsen hinzugefügt werden',0),
+25014 => array('Graph::AddText() Du hast versucht, einen leeren Text zum Graph hinzuzufügen.',0),
+25015 => array('Graph::AddLine() Du hast versucht, eine leere Linie zum Graph hinzuzufügen.',0),
+25016 => array('Graph::AddBand() Du hast versucht, ein leeres Band zum Graph hinzuzufügen.',0),
+25017 => array('Du benutzt GD 2.x und versuchst, ein Hintergrundbild in einem Truecolor-Bild zu verwenden. Um Hintergrundbilder mit GD 2.x zu verwenden, ist es notwendig, Truecolor zu aktivieren, indem die USE_TRUECOLOR-Konstante auf TRUE gesetzt wird. Wegen eines Bugs in GD 2.0.1 ist die Qualität der Schrift sehr schlecht, wenn Truetype-Schrift in Truecolor-Bildern verwendet werden.',0),
+25018 => array('Falscher Dateiname für Graph::SetBackgroundImage() : "%s" muss eine gültige Dateinamenerweiterung (jpg,gif,png) haben, wenn die automatische Dateityperkennung verwenndet werden soll.',1),
+25019 => array('Unbekannte Dateinamenerweiterung (%s) in Graph::SetBackgroundImage() für Dateiname: "%s"',2),
+
+25020 => array('Graph::SetScale(): Dar Maximalwert muss größer sein als der Mindestwert.',0),
+25021 => array('Unbekannte Achsendefinition für die Y-Achse. (%s)',1),
+25022 => array('Unbekannte Achsendefinition für die X-Achse. (%s)',1),
+25023 => array('Nicht unterstützter Y2-Achsentyp: "%s" muss einer von (lin,log,int) sein.',1),
+25024 => array('Nicht unterstützter X-Achsentyp: "%s" muss einer von (lin,log,int) sein.',1),
+25025 => array('Nicht unterstützte Tick-Dichte: %d',1),
+25026 => array('Nicht unterstützter Typ der nicht angegebenen Y-Achse. Du hast entweder: 1. einen Y-Achsentyp für automatisches Skalieren definiert, aber keine Plots angegeben. 2. eine Achse direkt definiert, aber vergessen, die Tick-Dichte zu festzulegen.',0),
+25027 => array('Kann cached CSIM "%s" zum Lesen nicht öffnen.',1),
+25028 => array('Apache/PHP hat keine Schreibrechte, in das CSIM-Cache-Verzeichnis (%s) zu schreiben. Überprüfe die Rechte.',1),
+25029 => array('Kann nicht in das CSIM "%s" schreiben. Überprüfe die Schreibrechte und den freien Speicherplatz.',1),
+
+25030 => array('Fehlender Skriptname für StrokeCSIM(). Der Name des aktuellen Skriptes muss als erster Parameter von StrokeCSIM() angegeben werden.',0),
+25031 => array('Der Achsentyp muss mittels Graph::SetScale() angegeben werden.',0),
+25032 => array('Es existieren keine Plots für die Y-Achse nbr:%d',1),
+25033 => array('',0),
+25034 => array('Undefinierte X-Achse kann nicht gezeichnet werden. Es wurden keine Plots definiert.',0),
+25035 => array('Du hast Clipping aktiviert. Clipping wird nur für Diagramme mit 0 oder 90 Grad Rotation unterstützt. Bitte verändere Deinen Rotationswinkel (=%d Grad) dementsprechend oder deaktiviere Clipping.',1),
+25036 => array('Unbekannter Achsentyp AxisStyle() : %s',1),
+25037 => array('Das Bildformat Deines Hintergrundbildes (%s) wird von Deiner System-Konfiguration nicht unterstützt. ',1),
+25038 => array('Das Hintergrundbild scheint von einem anderen Typ (unterschiedliche Dateierweiterung) zu sein als der angegebene Typ. Angegebenen: %s; Datei: %s',2),
+25039 => array('Hintergrundbild kann nicht gelesen werden: "%s"',1),
+
+25040 => array('Es ist nicht möglich, sowohl ein Hintergrundbild als auch eine Hintergrund-Landesflagge anzugeben.',0),
+25041 => array('Um Landesflaggen als Hintergrund benutzen zu können, muss die Datei "jpgraph_flags.php" eingefügt werden (per include).',0),
+25042 => array('Unbekanntes Hintergrundbild-Layout',0),
+25043 => array('Unbekannter Titelhintergrund-Stil.',0),
+25044 => array('Automatisches Skalieren kann nicht verwendet werden, weil es unmöglich ist, einen gültigen min/max Wert für die Y-Achse zu ermitteln (nur Null-Werte).',0),
+25045 => array('Die Schriftfamilien FF_HANDWRT und FF_BOOK sind wegen Copyright-Problemen nicht mehr verfügbar. Diese Schriften können nicht mehr mit JpGraph verteilt werden. Bitte lade Dir Schriften von http://corefonts.sourceforge.net/ herunter.',0),
+25046 => array('Angegebene TTF-Schriftfamilie (id=%d) ist unbekannt oder existiert nicht. Bitte merke Dir, dass TTF-Schriften wegen Copyright-Problemen nicht mit JpGraph mitgeliefert werden. Du findest MS-TTF-Internetschriften (arial, courier, etc.) zum Herunterladen unter http://corefonts.sourceforge.net/',1),
+25047 => array('Stil %s ist nicht verfügbar für Schriftfamilie %s',2),
+25048 => array('Unbekannte Schriftstildefinition [%s].',1),
+25049 => array('Schriftdatei "%s" ist nicht lesbar oder existiert nicht.',1),
+
+25050 => array('Erstes Argument für Text::Text() muss ein String sein.',0),
+25051 => array('Ungültige Richtung angegeben für Text.',0),
+25052 => array('PANIK: Interner Fehler in SuperScript::Stroke(). Unbekannte vertikale Ausrichtung für Text.',0),
+25053 => array('PANIK: Interner Fehler in SuperScript::Stroke(). Unbekannte horizontale Ausrichtung für Text.',0),
+25054 => array('Interner Fehler: Unbekannte Grid-Achse %s',1),
+25055 => array('Axis::SetTickDirection() sollte nicht mehr verwendet werden. Benutze stattdessen Axis::SetTickSide().',0),
+25056 => array('SetTickLabelMargin() sollte nicht mehr verwendet werden. Benutze stattdessen Axis::SetLabelMargin().',0),
+25057 => array('SetTextTicks() sollte nicht mehr verwendet werden. Benutze stattdessen SetTextTickInterval().',0),
+25058 => array('TextLabelIntevall >= 1 muss angegeben werden.',0),
+25059 => array('SetLabelPos() sollte nicht mehr verwendet werden. Benutze stattdessen Axis::SetLabelSide().',0),
+
+25060 => array('Unbekannte Ausrichtung angegeben für X-Achsentitel (%s).',1),
+25061 => array('Unbekannte Ausrichtung angegeben für Y-Achsentitel (%s).',1),
+25062 => array('Label unter einem Winkel werden für die Y-Achse nicht unterstützt.',0),
+25063 => array('Ticks::SetPrecision() sollte nicht mehr verwendet werden. Benutze stattdessen Ticks::SetLabelFormat() (oder Ticks::SetFormatCallback()).',0),
+25064 => array('Kleinere oder größere Schrittgröße ist 0. Überprüfe, ob Du fälschlicherweise SetTextTicks(0) in Deinem Skript hast. Wenn dies nicht der Fall ist, bist Du eventuell über einen Bug in JpGraph gestolpert. Bitte sende einen Report und füge den Code an, der den Fehler verursacht hat.',0),
+25065 => array('Tick-Positionen müssen als array() angegeben werden',0),
+25066 => array('Wenn die Tick-Positionen und -Label von Hand eingegeben werden, muss die Anzahl der Ticks und der Label gleich sein.',0),
+25067 => array('Deine von Hand eingegebene Achse und Ticks sind nicht korrekt. Die Skala scheint zu klein zu sein für den Tickabstand.',0),
+25068 => array('Ein Plot hat eine ungültige Achse. Dies kann beispielsweise der Fall sein, wenn Du automatisches Text-Skalieren verwendest, um ein Liniendiagramm zu zeichnen mit nur einem Datenpunkt, oder wenn die Bildfläche zu klein ist. Es kann auch der Fall sein, dass kein Datenpunkt einen numerischen Wert hat (vielleicht nur \'-\' oder \'x\').',0),
+25069 => array('Grace muss größer sein als 0',0),
+
+25070 => array('Deine Daten enthalten nicht-numerische Werte.',0),
+25071 => array('Du hast mit SetAutoMin() einen Mindestwert angegeben, der größer ist als der Maximalwert für die Achse. Dies ist nicht möglich.',0),
+25072 => array('Du hast mit SetAutoMax() einen Maximalwert angegeben, der kleiner ist als der Minimalwert der Achse. Dies ist nicht möglich.',0),
+25073 => array('Interner Fehler. Der Integer-Skalierungs-Algorithmus-Vergleich ist außerhalb der Grenzen  (r=%f).',1),
+25074 => array('Interner Fehler. Der Skalierungsbereich ist negativ (%f) [für %s Achse]. Dieses Problem könnte verursacht werden durch den Versuch, \'ungültige\' Werte in die Daten-Vektoren einzugeben (z.B. nur String- oder NULL-Werte), was beim automatischen Skalieren einen Fehler erzeugt.',2),
+25075 => array('Die automatischen Ticks können nicht gesetzt werden, weil min==max.',0),
+25077 => array('Einstellfaktor für die Farbe muss größer sein als 0',0),
+25078 => array('Unbekannte Farbe: %s',1),
+25079 => array('Unbekannte Farbdefinition: %s, Größe=%d',2),
+
+25080 => array('Der Alpha-Parameter für Farben muss zwischen 0.0 und 1.0 liegen.',0),
+25081 => array('Das ausgewählte Grafikformat wird entweder nicht unterstützt oder ist unbekannt [%s]',1),
+25082 => array('Es wurden ungültige Größen für Breite und Höhe beim Erstellen des Bildes definiert (Breite=%d, Höhe=%d).',2),
+25083 => array('Es wurde eine ungültige Größe beim Kopieren des Bildes angegeben. Die Größe für das kopierte Bild wurde auf 1 Pixel oder weniger gesetzt.',0),
+25084 => array('Fehler beim Erstellen eines temporären GD-Canvas. Möglicherweise liegt ein Arbeitsspeicherproblem vor.',0),
+25085 => array('Ein Bild kann nicht aus dem angegebenen String erzeugt werden. Er ist entweder in einem nicht unterstützen Format oder er represäntiert ein kaputtes Bild.',0),
+25086 => array('Du scheinst nur GD 1.x installiert zu haben. Um Alphablending zu aktivieren, ist GD 2.x oder höher notwendig. Bitte installiere GD 2.x oder versichere Dich, dass die Konstante USE_GD2 richtig gesetzt ist. Standardmäßig wird die installierte GD-Version automatisch erkannt. Ganz selten wird GD2 erkannt, obwohl nur GD1 installiert ist. Die Konstante USE_GD2 muss dann zu "false" gesetzt werden.',0),
+25087 => array('Diese PHP-Version wurde ohne TTF-Unterstützung konfiguriert. PHP muss mit TTF-Unterstützung neu kompiliert und installiert werden.',0),
+25088 => array('Die GD-Schriftunterstützung wurde falsch konfiguriert. Der Aufruf von imagefontwidth() ist fehlerhaft.',0),
+25089 => array('Die GD-Schriftunterstützung wurde falsch konfiguriert. Der Aufruf von imagefontheight() ist fehlerhaft.',0),
+
+25090 => array('Unbekannte Richtung angegeben im Aufruf von StrokeBoxedText() [%s].',1),
+25091 => array('Die interne Schrift untestützt das Schreiben von Text in einem beliebigen Winkel nicht. Benutze stattdessen TTF-Schriften.',0),
+25092 => array('Es liegt entweder ein Konfigurationsproblem mit TrueType oder ein Problem beim Lesen der Schriftdatei "%s" vor. Versichere Dich, dass die Datei existiert und Leserechte und -pfad vergeben sind. (wenn \'basedir\' restriction in PHP aktiviert ist, muss die Schriftdatei im Dokumentwurzelverzeichnis abgelegt werden). Möglicherweise ist die FreeType-Bibliothek falsch installiert. Versuche, mindestens zur FreeType-Version 2.1.13 zu aktualisieren und kompiliere GD mit einem korrekten Setup neu, damit die FreeType-Bibliothek gefunden werden kann.',1),
+25093 => array('Die Schriftdatei "%s" kann nicht gelesen werden beim Aufruf von Image::GetBBoxTTF. Bitte versichere Dich, dass die Schrift gesetzt wurde, bevor diese Methode aufgerufen wird, und dass die Schrift im TTF-Verzeichnis installiert ist.',1),
+25094 => array('Die Textrichtung muss in einem Winkel zwischen 0 und 90 engegeben werden.',0),
+25095 => array('Unbekannte Schriftfamilien-Definition. ',0),
+25096 => array('Der Farbpalette können keine weiteren Farben zugewiesen werden. Dem Bild wurde bereits die größtmögliche Anzahl von Farben (%d) zugewiesen und die Palette ist voll. Verwende stattdessen ein TrueColor-Bild',0),
+25097 => array('Eine Farbe wurde als leerer String im Aufruf von PushColor() angegegeben.',0),
+25098 => array('Negativer Farbindex. Unpassender Aufruf von PopColor().',0),
+25099 => array('Die Parameter für Helligkeit und Kontrast sind außerhalb des zulässigen Bereichs [-1,1]',0),
+
+25100 => array('Es liegt ein Problem mit der Farbpalette und dem GD-Setup vor. Bitte deaktiviere anti-aliasing oder verwende GD2 mit TrueColor. Wenn die GD2-Bibliothek installiert ist, versichere Dich, dass die Konstante USE_GD2 auf "true" gesetzt und TrueColor aktiviert ist.',0),
+25101 => array('Ungültiges numerisches Argument für SetLineStyle(): (%d)',1),
+25102 => array('Ungültiges String-Argument für SetLineStyle(): %s',1),
+25103 => array('Ungültiges Argument für SetLineStyle %s',1),
+25104 => array('Unbekannter Linientyp: %s',1),
+25105 => array('Es wurden NULL-Daten für ein gefülltes Polygon angegeben. Sorge dafür, dass keine NULL-Daten angegeben werden.',0),
+25106 => array('Image::FillToBorder : es können keine weiteren Farben zugewiesen werden.',0),
+25107 => array('In Datei "%s" kann nicht geschrieben werden. Überprüfe die aktuellen Schreibrechte.',1),
+25108 => array('Das Bild kann nicht gestreamt werden. Möglicherweise liegt ein Fehler im PHP/GD-Setup vor. Kompiliere PHP neu und verwende die eingebaute GD-Bibliothek, die mit PHP angeboten wird.',0),
+25109 => array('Deine PHP- (und GD-lib-) Installation scheint keine bekannten Grafikformate zu unterstützen. Sorge zunächst dafür, dass GD als PHP-Modul kompiliert ist. Wenn Du außerdem JPEG-Bilder verwenden willst, musst Du die JPEG-Bibliothek installieren. Weitere Details sind in der PHP-Dokumentation zu finden.',0),
+
+25110 => array('Dein PHP-Installation unterstützt das gewählte Grafikformat nicht: %s',1),
+25111 => array('Das gecachete Bild %s kann nicht gelöscht werden. Problem mit den Rechten?',1),
+25112 => array('Das Datum der gecacheten Datei (%s) liegt in der Zukunft.',1),
+25113 => array('Das gecachete Bild %s kann nicht gelöscht werden. Problem mit den Rechten?',1),
+25114 => array('PHP hat nicht die erforderlichen Rechte, um in die Cache-Datei %s zu schreiben. Bitte versichere Dich, dass der Benutzer, der PHP anwendet, die entsprechenden Schreibrechte für die Datei hat, wenn Du das Cache-System in JPGraph verwenden willst.',1),
+25115 => array('Berechtigung für gecachetes Bild %s kann nicht gesetzt werden. Problem mit den Rechten?',1),
+25116 => array('Datei kann nicht aus dem Cache %s geöffnet werden',1),
+25117 => array('Gecachetes Bild %s kann nicht zum Lesen geöffnet werden.',1),
+25118 => array('Verzeichnis %s kann nicht angelegt werden. Versichere Dich, dass PHP die Schreibrechte in diesem Verzeichnis hat.',1),
+25119 => array('Rechte für Datei %s können nicht gesetzt werden. Problem mit den Rechten?',1),
+
+25120 => array('Die Position für die Legende muss als Prozentwert im Bereich 0-1 angegeben werden.',0),
+25121 => array('Eine leerer Datenvektor wurde für den Plot eingegeben. Es muss wenigstens ein Datenpunkt vorliegen.',0),
+25122 => array('Stroke() muss als Subklasse der Klasse Plot definiert sein.',0),
+25123 => array('Du kannst keine Text-X-Achse mit X-Koordinaten verwenden. Benutze stattdessen eine "int" oder "lin" Achse.',0),
+25124 => array('Der Eingabedatenvektor mus aufeinanderfolgende Werte von 0 aufwärts beinhalten. Der angegebene Y-Vektor beginnt mit leeren Werten (NULL).',0),
+25125 => array('Ungültige Richtung für statische Linie.',0),
+25126 => array('Es kann kein TrueColor-Bild erzeugt werden. Überprüfe, ob die GD2-Bibliothek und PHP korrekt aufgesetzt wurden.',0),
+25127 => array('The library has been configured for automatic encoding conversion of Japanese fonts. This requires that PHP has the mb_convert_encoding() function. Your PHP installation lacks this function (PHP needs the "--enable-mbstring" when compiled).',0),
+25128 => array('The function imageantialias() is not available in your PHP installation. Use the GD version that comes with PHP and not the standalone version.',0),
+25129 => array('Anti-alias can not be used with dashed lines. Please disable anti-alias or use solid lines.',0),
+25130 => array('Too small plot area. (%d x %d). With the given image size and margins there is to little space left for the plot. Increase the plot size or reduce the margins.',2),
+
+25131 => array('StrokeBoxedText2() only supports TTF fonts and not built-in bitmap fonts.',0),
+25132 => array('Undefined property %s.',1), // @todo translate
+25133 => array('Use Graph::SetTheme() after Graph::SetScale().',0), // @todo translate
+
+/*
+**  jpgraph_led
+*/
+
+25500 => array('Multibyte strings must be enabled in the PHP installation in order to run the LED module so that the function mb_strlen() is available. See PHP documentation for more information.',0),
+
+
+/*
+**---------------------------------------------------------------------------------------------
+** Pro-version strings
+**---------------------------------------------------------------------------------------------
+*/
+
+/*
+**  jpgraph_table
+*/
+
+27001 => array('GTextTable: Ungültiges Argument für Set(). Das Array-Argument muss 2-- dimensional sein.',0),
+27002 => array('GTextTable: Ungültiges Argument für Set()',0),
+27003 => array('GTextTable: Falsche Anzahl von Argumenten für GTextTable::SetColor()',0),
+27004 => array('GTextTable: Angegebener Zellenbereich, der verschmolzen werden soll, ist ungültig.',0),
+27005 => array('GTextTable: Bereits verschmolzene Zellen im Bereich (%d,%d) bis (%d,%d) können nicht ein weiteres Mal verschmolzen werden.',4),
+27006 => array('GTextTable: Spalten-Argument = %d liegt außerhalb der festgelegten Tabellengröße.',1),
+27007 => array('GTextTable: Zeilen-Argument = %d liegt außerhalb der festgelegten Tabellengröße.',1),
+27008 => array('GTextTable: Spalten- und Zeilengröße müssen zu den Dimensionen der Tabelle passen.',0),
+27009 => array('GTextTable: Die Anzahl der Tabellenspalten oder -zeilen ist 0. Versichere Dich, dass die Methoden Init() oder Set() aufgerufen werden.',0),
+27010 => array('GTextTable: Es wurde keine Ausrichtung beim Aufruf von SetAlign() angegeben.',0),
+27011 => array('GTextTable: Es wurde eine unbekannte Ausrichtung beim Aufruf von SetAlign() abgegeben. Horizontal=%s, Vertikal=%s',2),
+27012 => array('GTextTable: Interner Fehler. Es wurde ein ungültiges Argument festgeleget %s',1),
+27013 => array('GTextTable: Das Argument für FormatNumber() muss ein String sein.',0),
+27014 => array('GTextTable: Die Tabelle wurde weder mit einem Aufruf von Set() noch von Init() initialisiert.',0),
+27015 => array('GTextTable: Der Zellenbildbedingungstyp muss entweder TIMG_WIDTH oder TIMG_HEIGHT sein.',0),
+
+/*
+**  jpgraph_windrose
+*/
+
+22001 => array('Die Gesamtsumme der prozentualen Anteile aller Windrosenarme darf 100%% nicht überschreiten!\n(Aktuell max: %d)',1),
+22002 => array('Das Bild ist zu klein für eine Skala. Bitte vergrößere das Bild.',0),
+22004 => array('Die Etikettendefinition für Windrosenrichtungen müssen 16 Werte haben (eine für jede Kompassrichtung).',0),
+22005 => array('Der Linientyp für radiale Linien muss einer von ("solid","dotted","dashed","longdashed") sein.',0),
+22006 => array('Es wurde ein ungültiger Windrosentyp angegeben.',0),
+22007 => array('Es wurden zu wenig Werte für die Bereichslegende angegeben.',0),
+22008 => array('Interner Fehler: Versuch, eine freie Windrose zu plotten, obwohl der Typ keine freie Windrose ist.',0),
+22009 => array('Du hast die gleiche Richtung zweimal angegeben, einmal mit einem Winkel und einmal mit einer Kompassrichtung (%f Grad).',0),
+22010 => array('Die Richtung muss entweder ein numerischer Wert sein oder eine der 16 Kompassrichtungen',0),
+22011 => array('Der Windrosenindex muss ein numerischer oder Richtungswert sein. Du hast angegeben Index=%d',1),
+22012 => array('Die radiale Achsendefinition für die Windrose enthält eine nicht aktivierte Richtung.',0),
+22013 => array('Du hast dasselbe Look&Feel für die gleiche Kompassrichtung zweimal engegeben, einmal mit Text und einmal mit einem Index (Index=%d)',1),
+22014 => array('Der Index für eine Kompassrichtung muss zwischen 0 und 15 sein.',0),
+22015 => array('Du hast einen unbekannten Windrosenplottyp angegeben.',0),
+22016 => array('Der Windrosenarmindex muss ein numerischer oder ein Richtungswert sein.',0),
+22017 => array('Die Windrosendaten enthalten eine Richtung, die nicht aktiviert ist. Bitte berichtige, welche Label angezeigt werden sollen.',0),
+22018 => array('Du hast für dieselbe Kompassrichtung zweimal Daten angegeben, einmal mit Text und einmal mit einem Index (Index=%d)',1),
+22019 => array('Der Index für eine Richtung muss zwischen 0 und 15 sein. Winkel dürfen nicht für einen regelmäßigen Windplot angegeben werden, sondern entweder ein Index oder eine Kompassrichtung.',0),
+22020 => array('Der Windrosenplot ist zu groß für die angegebene Bildgröße. Benutze entweder WindrosePlot::SetSize(), um den Plot kleiner zu machen oder vergrößere das Bild im ursprünglichen Aufruf von WindroseGraph().',0),
+22021 => array('It is only possible to add Text, IconPlot or WindrosePlot to a Windrose Graph',0),
+
+/*
+**  jpgraph_odometer
+*/
+
+13001 => array('Unbekannter Nadeltypstil (%d).',1),
+13002 => array('Ein Wert für das Odometer (%f) ist außerhalb des angegebenen Bereichs [%f,%f]',3),
+
+/*
+**  jpgraph_barcode
+*/
+
+1001 => array('Unbekannte Kodier-Specifikation: %s',1),
+1002 => array('datenvalidierung schlug fehl. [%s] kann nicht mittels der Kodierung "%s" kodiert werden',2),
+1003 => array('Interner Kodierfehler. Kodieren von %s ist nicht möglich in Code 128',1),
+1004 => array('Interner barcode Fehler. Unbekannter UPC-E Kodiertyp: %s',1),
+1005 => array('Interner Fehler. Das Textzeichen-Tupel (%s, %s) kann nicht im Code-128 Zeichensatz C kodiert werden.',2),
+1006 => array('Interner Kodierfehler für CODE 128. Es wurde versucht, CTRL in CHARSET != A zu kodieren.',0),
+1007 => array('Interner Kodierfehler für CODE 128. Es wurde versucht, DEL in CHARSET != B zu kodieren.',0),
+1008 => array('Interner Kodierfehler für CODE 128. Es wurde versucht, kleine Buchstaben in CHARSET != B zu kodieren.',0),
+1009 => array('Kodieren mittels CODE 93 wird noch nicht unterstützt.',0),
+1010 => array('Kodieren mittels POSTNET wird noch nicht unterstützt.',0),
+1011 => array('Nicht untrstütztes Barcode-Backend für den Typ %s',1),
+
+/*
+** PDF417
+*/
+
+26000 => array('PDF417: The PDF417 module requires that the PHP installation must support the function bcmod(). This is normally enabled at compile time. See documentation for more information.',0),
+26001 => array('PDF417: Die Anzahl der Spalten muss zwischen 1 und 30 sein.',0),
+26002 => array('PDF417: Der Fehler-Level muss zwischen 0 und 8 sein.',0),
+26003 => array('PDF417: Ungültiges Format für Eingabedaten, um sie mit PDF417 zu kodieren.',0),
+26004 => array('PDF417: die eigebenen Daten können nicht mit Fehler-Level %d und %d spalten kodiert werden, weil daraus zu viele Symbole oder mehr als 90 Zeilen resultieren.',2),
+26005 => array('PDF417: Die Datei "%s" kann nicht zum Schreiben geöffnet werden.',1),
+26006 => array('PDF417: Interner Fehler. Die Eingabedatendatei für PDF417-Cluster %d ist fehlerhaft.',1),
+26007 => array('PDF417: Interner Fehler. GetPattern: Ungültiger Code-Wert %d (Zeile %d)',2),
+26008 => array('PDF417: Interner Fehler. Modus wurde nicht in der Modusliste!! Modus %d',1),
+26009 => array('PDF417: Kodierfehler: Ungültiges Zeichen. Zeichen kann nicht mit ASCII-Code %d kodiert werden.',1),
+26010 => array('PDF417: Interner Fehler: Keine Eingabedaten beim Dekodieren.',0),
+26011 => array('PDF417: Kodierfehler. Numerisches Kodieren bei nicht-numerischen Daten nicht möglich.',0),
+26012 => array('PDF417: Interner Fehler. Es wurden für den Binary-Kompressor keine Daten zum Dekodieren eingegeben.',0),
+26013 => array('PDF417: Interner Fehler. Checksum Fehler. Koeffiziententabellen sind fehlerhaft.',0),
+26014 => array('PDF417: Interner Fehler. Es wurden keine Daten zum Berechnen von Kodewörtern eingegeben.',0),
+26015 => array('PDF417: Interner Fehler. Ein Eintrag 0 in die Statusübertragungstabellen ist nicht NULL. Eintrag 1 = (%s)',1),
+26016 => array('PDF417: Interner Fehler: Nichtregistrierter Statusübertragungsmodus beim Dekodieren.',0),
+
+
+/*
+** jpgraph_contour
+*/
+
+28001 => array('Dritten parameter fur Contour muss ein vector der fargen sind.',0),
+28002 => array('Die anzahlen der farges jeder isobar linien muss gleich sein.',0),
+28003 => array('ContourPlot Interner Fehler: isobarHCrossing: Spalten index ist zu hoch (%d)',1),
+28004 => array('ContourPlot Interner Fehler: isobarHCrossing: Reihe index ist zu hoch (%d)',1),
+28005 => array('ContourPlot Interner Fehler: isobarVCrossing: Reihe index ist zu hoch (%d)',1),
+28006 => array('ContourPlot Interner Fehler: isobarVCrossing: Spalten index ist zu hoch (%d)',1),
+28007 => array('ContourPlot. Interpolation faktor ist zu hoch (>5)',0),
+
+
+/*
+ * jpgraph_matrix and colormap
+*/
+29201 => array('Min range value must be less or equal to max range value for colormaps',0),
+29202 => array('The distance between min and max value is too small for numerical precision',0),
+29203 => array('Number of color quantification level must be at least %d',1),
+29204 => array('Number of colors (%d) is invalid for this colormap. It must be a number that can be written as: %d + k*%d',3),
+29205 => array('Colormap specification out of range. Must be an integer in range [0,%d]',1),
+29206 => array('Invalid object added to MatrixGraph',0),
+29207 => array('Empty input data specified for MatrixPlot',0),
+29208 => array('Unknown side specifiction for matrix labels "%s"',1),
+29209 => array('CSIM Target matrix must be the same size as the data matrix (csim=%d x %d, data=%d x %d)',4),
+29210 => array('CSIM Target for matrix labels does not match the number of labels (csim=%d, labels=%d)',2),
+
+
+/*
+* jpgraph_theme
+*/
+30001 => array("Theme::%s() is not defined. \nPlease make %s(\$graph) function in your theme classs.",2),
+
+
+);
+
+?>
diff --git a/common/lib/jpgraph_lib/lang/en.inc.php b/common/lib/jpgraph_lib/lang/en.inc.php
new file mode 100644
index 000000000..101e8bd82
--- /dev/null
+++ b/common/lib/jpgraph_lib/lang/en.inc.php
@@ -0,0 +1,545 @@
+<?php
+/*=======================================================================
+// File:     EN.INC.PHP
+// Description: English language file for error messages
+// Created:     2006-01-25
+// Ver:        $Id: en.inc.php 1886 2009-10-01 23:30:16Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+*/
+
+// Note: Format of each error message is array(<error message>,<number of arguments>)
+$_jpg_messages = array(
+
+/*
+** Headers already sent error. This is formatted as HTML different since this will be sent back directly as text
+*/
+10  => array('<table border="1"><tr><td style="color:darkred; font-size:1.2em;"><b>JpGraph Error:</b>
+HTTP headers have already been sent.<br>Caused by output from file <b>%s</b> at line <b>%d</b>.</td></tr><tr><td><b>Explanation:</b><br>HTTP headers have already been sent back to the browser indicating the data as text before the library got a chance to send it\'s image HTTP header to this browser. This makes it impossible for the library to send back image data to the browser (since that would be interpretated as text by the browser and show up as junk text).<p>Most likely you have some text in your script before the call to <i>Graph::Stroke()</i>. If this texts gets sent back to the browser the browser will assume that all data is plain text. Look for any text, even spaces and newlines, that might have been sent back to the browser. <p>For example it is a common mistake to leave a blank line before the opening "<b>&lt;?php</b>".</td></tr></table>',2),
+
+/*
+** Setup errors
+*/
+11 => array('No path specified for CACHE_DIR. Please specify CACHE_DIR manually in jpg-config.inc',0),
+12 => array('No path specified for TTF_DIR and path can not be determined automatically. Please specify TTF_DIR manually (in jpg-config.inc).',0),
+13 => array('The installed PHP version (%s) is not compatible with this release of the library. The library requires at least PHP version %s',2),
+
+
+/*
+**  jpgraph_bar
+*/
+
+2001 => array('Number of colors is not the same as the number of patterns in BarPlot::SetPattern()',0),
+2002 => array('Unknown pattern specified in call to BarPlot::SetPattern()',0),
+2003 => array('Number of X and Y points are not equal. Number of X-points: %d Number of Y-points: %d',2),
+2004 => array('All values for a barplot must be numeric. You have specified value nr [%d] == %s',2),
+2005 => array('You have specified an empty array for shadow colors in the bar plot.',0),
+2006 => array('Unknown position for values on bars : %s',1),
+2007 => array('Cannot create GroupBarPlot from empty plot array.',0),
+2008 => array('Group bar plot element nbr %d is undefined or empty.',0),
+2009 => array('One of the objects submitted to GroupBar is not a BarPlot. Make sure that you create the GroupBar plot from an array of BarPlot or AccBarPlot objects. (Class = %s)',1),
+2010 => array('Cannot create AccBarPlot from empty plot array.',0),
+2011 => array('Acc bar plot element nbr %d is undefined or empty.',1),
+2012 => array('One of the objects submitted to AccBar is not a BarPlot. Make sure that you create the AccBar plot from an array of BarPlot objects. (Class=%s)',1),
+2013 => array('You have specified an empty array for shadow colors in the bar plot.',0),
+2014 => array('Number of datapoints for each data set in accbarplot must be the same',0),
+2015 => array('Individual bar plots in an AccBarPlot or GroupBarPlot can not have specified X-coordinates',0),
+
+
+/*
+**  jpgraph_date
+*/
+
+3001 => array('It is only possible to use either SetDateAlign() or SetTimeAlign() but not both',0),
+
+/*
+**  jpgraph_error
+*/
+
+4002 => array('Error in input data to LineErrorPlot. Number of data points must be a multiple of 3',0),
+
+/*
+**  jpgraph_flags
+*/
+
+5001 => array('Unknown flag size (%d).',1),
+5002 => array('Flag index %s does not exist.',1),
+5003 => array('Invalid ordinal number (%d) specified for flag index.',1),
+5004 => array('The (partial) country name %s does not have a corresponding flag image. The flag may still exist but under another name, e.g. instead of "usa" try "united states".',1),
+
+
+/*
+**  jpgraph_gantt
+*/
+
+6001 => array('Internal error. Height for ActivityTitles is < 0',0),
+6002 => array('You can\'t specify negative sizes for Gantt graph dimensions. Use 0 to indicate that you want the library to automatically determine a dimension.',0),
+6003 => array('Invalid format for Constrain parameter at index=%d in CreateSimple(). Parameter must start with index 0 and contain arrays of (Row,Constrain-To,Constrain-Type)',1),
+6004 => array('Invalid format for Progress parameter at index=%d in CreateSimple(). Parameter must start with index 0 and contain arrays of (Row,Progress)',1),
+6005 => array('SetScale() is not meaningful with Gantt charts.',0),
+6006 => array('Cannot autoscale Gantt chart. No dated activities exist. [GetBarMinMax() start >= n]',0),
+6007 => array('Sanity check for automatic Gantt chart size failed. Either the width (=%d) or height (=%d) is larger than MAX_GANTTIMG_SIZE. This could potentially be caused by a wrong date in one of the activities.',2),
+6008 => array('You have specified a constrain from row=%d to row=%d which does not have any activity',2),
+6009 => array('Unknown constrain type specified from row=%d to row=%d',2),
+6010 => array('Illegal icon index for Gantt builtin icon [%d]',1),
+6011 => array('Argument to IconImage must be string or integer',0),
+6012 => array('Unknown type in Gantt object title specification',0),
+6015 => array('Illegal vertical position %d',1),
+6016 => array('Date string (%s) specified for Gantt activity can not be interpretated. Please make sure it is a valid time string, e.g. 2005-04-23 13:30',1),
+6017 => array('Unknown date format in GanttScale (%s).',1),
+6018 => array('Interval for minutes must divide the hour evenly, e.g. 1,5,10,12,15,20,30 etc You have specified an interval of %d minutes.',1),
+6019 => array('The available width (%d) for minutes are to small for this scale to be displayed. Please use auto-sizing or increase the width of the graph.',1),
+6020 => array('Interval for hours must divide the day evenly, e.g. 0:30, 1:00, 1:30, 4:00 etc. You have specified an interval of %d',1),
+6021 => array('Unknown formatting style for week.',0),
+6022 => array('Gantt scale has not been specified.',0),
+6023 => array('If you display both hour and minutes the hour interval must be 1 (Otherwise it doesn\'t make sense to display minutes).',0),
+6024 => array('CSIM Target must be specified as a string. Start of target is: %d',1),
+6025 => array('CSIM Alt text must be specified as a string. Start of alt text is: %d',1),
+6027 => array('Progress value must in range [0, 1]',0),
+6028 => array('Specified height (%d) for gantt bar is out of range.',1),
+6029 => array('Offset for vertical line must be in range [0,1]',0),
+6030 => array('Unknown arrow direction for link.',0),
+6031 => array('Unknown arrow type for link.',0),
+6032 => array('Internal error: Unknown path type (=%d) specified for link.',1),
+6033 => array('Array of fonts must contain arrays with 3 elements, i.e. (Family, Style, Size)',0),
+
+/*
+**  jpgraph_gradient
+*/
+
+7001 => array('Unknown gradient style (=%d).',1),
+
+/*
+**  jpgraph_iconplot
+*/
+
+8001 => array('Mix value for icon must be between 0 and 100.',0),
+8002 => array('Anchor position for icons must be one of "top", "bottom", "left", "right" or "center"',0),
+8003 => array('It is not possible to specify both an image file and a country flag for the same icon.',0),
+8004 => array('In order to use Country flags as icons you must include the "jpgraph_flags.php" file.',0),
+
+/*
+**  jpgraph_imgtrans
+*/
+
+9001 => array('Value for image transformation out of bounds. Vanishing point on horizon must be specified as a value between 0 and 1.',0),
+
+/*
+**  jpgraph_lineplot
+*/
+
+10001 => array('LinePlot::SetFilled() is deprecated. Use SetFillColor()',0),
+10002 => array('Plot too complicated for fast line Stroke. Use standard Stroke()',0),
+10003 => array('Each plot in an accumulated lineplot must have the same number of data points.',0),
+
+/*
+**  jpgraph_log
+*/
+
+11001 => array('Your data contains non-numeric values.',0),
+11002 => array('Negative data values can not be used in a log scale.',0),
+11003 => array('Your data contains non-numeric values.',0),
+11004 => array('Scale error for logarithmic scale. You have a problem with your data values. The max value must be greater than 0. It is mathematically impossible to have 0 in a logarithmic scale.',0),
+11005 => array('Specifying tick interval for a logarithmic scale is undefined. Remove any calls to SetTextLabelStart() or SetTextTickInterval() on the logarithmic scale.',0),
+
+/*
+**  jpgraph_mgraph
+*/
+
+12001 => array("You are using GD 2.x and are trying to use a background images on a non truecolor image. To use background images with GD 2.x it is necessary to enable truecolor by setting the USE_TRUECOLOR constant to TRUE. Due to a bug in GD 2.0.1 using any truetype fonts with truecolor images will result in very poor quality fonts.",0),
+12002 => array('Incorrect file name for MGraph::SetBackgroundImage() : %s Must have a valid image extension (jpg,gif,png) when using auto detection of image type',1),
+12003 => array('Unknown file extension (%s) in MGraph::SetBackgroundImage() for filename: %s',2),
+12004 => array('The image format of your background image (%s) is not supported in your system configuration. ',1),
+12005 => array('Can\'t read background image: %s',1),
+12006 => array('Illegal sizes specified for width or height when creating an image, (width=%d, height=%d)',2),
+12007 => array('Argument to MGraph::Add() is not a valid GD image handle.',0),
+12008 => array('Your PHP (and GD-lib) installation does not appear to support any known graphic formats.',0),
+12009 => array('Your PHP installation does not support the chosen graphic format: %s',1),
+12010 => array('Can\'t create or stream image to file %s Check that PHP has enough permission to write a file to the current directory.',1),
+12011 => array('Can\'t create truecolor image. Check that you really have GD2 library installed.',0),
+12012 => array('Can\'t create image. Check that you really have GD2 library installed.',0),
+
+/*
+**  jpgraph_pie3d
+*/
+
+14001 => array('Pie3D::ShowBorder() . Deprecated function. Use Pie3D::SetEdge() to control the edges around slices.',0),
+14002 => array('PiePlot3D::SetAngle() 3D Pie projection angle must be between 5 and 85 degrees.',0),
+14003 => array('Internal assertion failed. Pie3D::Pie3DSlice',0),
+14004 => array('Slice start angle must be between 0 and 360 degrees.',0),
+14005 => array('Pie3D Internal error: Trying to wrap twice when looking for start index',0,),
+14006 => array('Pie3D Internal Error: Z-Sorting algorithm for 3D Pies is not working properly (2). Trying to wrap twice while stroking.',0),
+14007 => array('Width for 3D Pie is 0. Specify a size > 0',0),
+
+/*
+**  jpgraph_pie
+*/
+
+15001 => array('PiePLot::SetTheme() Unknown theme: %s',1),
+15002 => array('Argument to PiePlot::ExplodeSlice() must be an integer',0),
+15003 => array('Argument to PiePlot::Explode() must be an array with integer distances.',0),
+15004 => array('Slice start angle must be between 0 and 360 degrees.',0),
+15005 => array('PiePlot::SetFont() is deprecated. Use PiePlot->value->SetFont() instead.',0),
+15006 => array('PiePlot::SetSize() Radius for pie must either be specified as a fraction [0, 0.5] of the size of the image or as an absolute size in pixels  in the range [10, 1000]',0),
+15007 => array('PiePlot::SetFontColor() is deprecated. Use PiePlot->value->SetColor() instead.',0),
+15008 => array('PiePlot::SetLabelType() Type for pie plots must be 0 or 1 (not %d).',1),
+15009 => array('Illegal pie plot. Sum of all data is zero for Pie Plot',0),
+15010 => array('Sum of all data is 0 for Pie.',0),
+15011 => array('In order to use image transformation you must include the file jpgraph_imgtrans.php in your script.',0),
+15012 => array('PiePlot::SetTheme() is no longer supported. Use PieGraph::SetTheme()',0),
+
+/*
+**  jpgraph_plotband
+*/
+
+16001 => array('Density for pattern must be between 1 and 100. (You tried %f)',1),
+16002 => array('No positions specified for pattern.',0),
+16003 => array('Unknown pattern specification (%d)',0),
+16004 => array('Min value for plotband is larger than specified max value. Please correct.',0),
+
+
+/*
+**  jpgraph_polar
+*/
+
+17001 => array('Polar plots must have an even number of data point. Each data point is a tuple (angle,radius).',0),
+17002 => array('Unknown alignment specified for X-axis title. (%s)',1),
+//17003 => array('Set90AndMargin() is not supported for polar graphs.',0),
+17004 => array('Unknown scale type for polar graph. Must be "lin" or "log"',0),
+
+/*
+**  jpgraph_radar
+*/
+
+18001 => array('Client side image maps not supported for RadarPlots.',0),
+18002 => array('RadarGraph::SupressTickMarks() is deprecated. Use HideTickMarks() instead.',0),
+18003 => array('Illegal scale for radarplot (%s). Must be \'lin\' or \'log\'',1),
+18004 => array('Radar Plot size must be between 0.1 and 1. (Your value=%f)',1),
+18005 => array('RadarPlot Unsupported Tick density: %d',1),
+18006 => array('Minimum data %f (Radar plots should only be used when all data points > 0)',1),
+18007 => array('Number of titles does not match number of points in plot.',0),
+18008 => array('Each radar plot must have the same number of data points.',0),
+
+/*
+**  jpgraph_regstat
+*/
+
+19001 => array('Spline: Number of X and Y coordinates must be the same',0),
+19002 => array('Invalid input data for spline. Two or more consecutive input X-values are equal. Each input X-value must differ since from a mathematical point of view it must be a one-to-one mapping, i.e. each X-value must correspond to exactly one Y-value.',0),
+19003 => array('Bezier: Number of X and Y coordinates must be the same',0),
+
+/*
+**  jpgraph_scatter
+*/
+
+20001 => array('Fieldplots must have equal number of X and Y points.',0),
+20002 => array('Fieldplots must have an angle specified for each X and Y points.',0),
+20003 => array('Scatterplot must have equal number of X and Y points.',0),
+
+/*
+**  jpgraph_stock
+*/
+
+21001 => array('Data values for Stock charts must contain an even multiple of %d data points.',1),
+
+/*
+**  jpgraph_plotmark
+*/
+
+23001 => array('This marker "%s" does not exist in color with index: %d',2),
+23002 => array('Mark color index too large for marker "%s"',1),
+23003 => array('A filename must be specified if you set the mark type to MARK_IMG.',0),
+
+/*
+**  jpgraph_utils
+*/
+
+24001 => array('FuncGenerator : No function specified. ',0),
+24002 => array('FuncGenerator : Syntax error in function specification ',0),
+24003 => array('DateScaleUtils: Unknown tick type specified in call to GetTicks()',0),
+24004 => array('ReadCSV2: Column count mismatch in %s line %d',2),
+/*
+**  jpgraph
+*/
+
+25001 => array('This PHP installation is not configured with the GD library. Please recompile PHP with GD support to run JpGraph. (Neither function imagetypes() nor imagecreatefromstring() does exist)',0),
+25002 => array('Your PHP installation does not seem to have the required GD library. Please see the PHP documentation on how to install and enable the GD library.',0),
+25003 => array('General PHP error : At %s:%d : %s',3),
+25004 => array('General PHP error : %s ',1),
+25005 => array('Can\'t access PHP_SELF, PHP global variable. You can\'t run PHP from command line if you want to use the \'auto\' naming of cache or image files.',0),
+25006 => array('Usage of FF_CHINESE (FF_BIG5) font family requires that your PHP setup has the iconv() function. By default this is not compiled into PHP (needs the "--width-iconv" when configured).',0),
+25007 => array('You are trying to use the locale (%s) which your PHP installation does not support. Hint: Use \'\' to indicate the default locale for this geographic region.',1),
+25008 => array('Image width/height argument in Graph::Graph() must be numeric',0),
+25009 => array('You must specify what scale to use with a call to Graph::SetScale()',0),
+
+25010 => array('Graph::Add() You tried to add a null plot to the graph.',0),
+25011 => array('Graph::AddY2() You tried to add a null plot to the graph.',0),
+25012 => array('Graph::AddYN() You tried to add a null plot to the graph.',0),
+25013 => array('You can only add standard plots to multiple Y-axis',0),
+25014 => array('Graph::AddText() You tried to add a null text to the graph.',0),
+25015 => array('Graph::AddLine() You tried to add a null line to the graph.',0),
+25016 => array('Graph::AddBand() You tried to add a null band to the graph.',0),
+25017 => array('You are using GD 2.x and are trying to use a background images on a non truecolor image. To use background images with GD 2.x it is necessary to enable truecolor by setting the USE_TRUECOLOR constant to TRUE. Due to a bug in GD 2.0.1 using any truetype fonts with truecolor images will result in very poor quality fonts.',0),
+25018 => array('Incorrect file name for Graph::SetBackgroundImage() : "%s" Must have a valid image extension (jpg,gif,png) when using auto detection of image type',1),
+25019 => array('Unknown file extension (%s) in Graph::SetBackgroundImage() for filename: "%s"',2),
+
+25020 => array('Graph::SetScale(): Specified Max value must be larger than the specified Min value.',0),
+25021 => array('Unknown scale specification for Y-scale. (%s)',1),
+25022 => array('Unknown scale specification for X-scale. (%s)',1),
+25023 => array('Unsupported Y2 axis type: "%s" Must be one of (lin,log,int)',1),
+25024 => array('Unsupported Y axis type:  "%s" Must be one of (lin,log,int)',1),
+25025 => array('Unsupported Tick density: %d',1),
+25026 => array('Can\'t draw unspecified Y-scale. You have either: 1. Specified an Y axis for auto scaling but have not supplied any plots. 2. Specified a scale manually but have forgot to specify the tick steps',0),
+25027 => array('Can\'t open cached CSIM "%s" for reading.',1),
+25028 => array('Apache/PHP does not have permission to write to the CSIM cache directory (%s). Check permissions.',1),
+25029 => array('Can\'t write CSIM "%s" for writing. Check free space and permissions.',1),
+
+25030 => array('Missing script name in call to StrokeCSIM(). You must specify the name of the actual image script as the first parameter to StrokeCSIM().',0),
+25031 => array('You must specify what scale to use with a call to Graph::SetScale().',0),
+25032 => array('No plots for Y-axis nbr:%d',1),
+25033 => array('',0),
+25034 => array('Can\'t draw unspecified X-scale. No plots specified.',0),
+25035 => array('You have enabled clipping. Clipping is only supported for graphs at 0 or 90 degrees rotation. Please adjust you current angle (=%d degrees) or disable clipping.',1),
+25036 => array('Unknown AxisStyle() : %s',1),
+25037 => array('The image format of your background image (%s) is not supported in your system configuration. ',1),
+25038 => array('Background image seems to be of different type (has different file extension) than specified imagetype. Specified: %s File: %s',2),
+25039 => array('Can\'t read background image: "%s"',1),
+
+25040 => array('It is not possible to specify both a background image and a background country flag.',0),
+25041 => array('In order to use Country flags as backgrounds you must include the "jpgraph_flags.php" file.',0),
+25042 => array('Unknown background image layout',0),
+25043 => array('Unknown title background style.',0),
+25044 => array('Cannot use auto scaling since it is impossible to determine a valid min/max value of the Y-axis (only null values).',0),
+25045 => array('Font families FF_HANDWRT and FF_BOOK are no longer available due to copyright problem with these fonts. Fonts can no longer be distributed with JpGraph. Please download fonts from http://corefonts.sourceforge.net/',0),
+25046 => array('Specified TTF font family (id=%d) is unknown or does not exist. Please note that TTF fonts are not distributed with JpGraph for copyright reasons. You can find the MS TTF WEB-fonts (arial, courier etc) for download at http://corefonts.sourceforge.net/',1),
+25047 => array('Style %s is not available for font family %s',2),
+25048 => array('Unknown font style specification [%s].',1),
+25049 => array('Font file "%s" is not readable or does not exist.',1),
+
+25050 => array('First argument to Text::Text() must be a string.',0),
+25051 => array('Invalid direction specified for text.',0),
+25052 => array('PANIC: Internal error in SuperScript::Stroke(). Unknown vertical alignment for text',0),
+25053 => array('PANIC: Internal error in SuperScript::Stroke(). Unknown horizontal alignment for text',0),
+25054 => array('Internal error: Unknown grid axis %s',1),
+25055 => array('Axis::SetTickDirection() is deprecated. Use Axis::SetTickSide() instead',0),
+25056 => array('SetTickLabelMargin() is deprecated. Use Axis::SetLabelMargin() instead.',0),
+25057 => array('SetTextTicks() is deprecated. Use SetTextTickInterval() instead.',0),
+25058 => array('Text label interval must be specified >= 1.',0),
+25059 => array('SetLabelPos() is deprecated. Use Axis::SetLabelSide() instead.',0),
+
+25060 => array('Unknown alignment specified for X-axis title. (%s)',1),
+25061 => array('Unknown alignment specified for Y-axis title. (%s)',1),
+25062 => array('Labels at an angle are not supported on Y-axis',0),
+25063 => array('Ticks::SetPrecision() is deprecated. Use Ticks::SetLabelFormat() (or Ticks::SetFormatCallback()) instead',0),
+25064 => array('Minor or major step size is 0. Check that you haven\'t got an accidental SetTextTicks(0) in your code. If this is not the case you might have stumbled upon a bug in JpGraph. Please report this and if possible include the data that caused the problem',0),
+25065 => array('Tick positions must be specified as an array()',0),
+25066 => array('When manually specifying tick positions and labels the number of labels must be the same as the number of specified ticks.',0),
+25067 => array('Your manually specified scale and ticks is not correct. The scale seems to be too small to hold any of the specified tick marks.',0),
+25068 => array('A plot has an illegal scale. This could for example be that you are trying to use text auto scaling to draw a line plot with only one point or that the plot area is too small. It could also be that no input data value is numeric (perhaps only \'-\' or \'x\')',0),
+25069 => array('Grace must be larger then 0',0),
+25070 => array('Either X or Y data arrays contains non-numeric values. Check that the data is really specified as numeric data and not as strings. It is an error to specify data for example as \'-2345.2\' (using quotes).',0),
+25071 => array('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.',0),
+25072 => array('You have specified a max value with SetAutoMax() which is smaller than the minimum value used for the scale. This is not possible.',0),
+25073 => array('Internal error. Integer scale algorithm comparison out of bound (r=%f)',1),
+25074 => array('Internal error. The scale range is negative (%f) [for %s scale] This problem could potentially be caused by trying to use \"illegal\" values in the input data arrays (like trying to send in strings or only NULL values) which causes the auto scaling to fail.',2),
+25075 => array('Can\'t automatically determine ticks since min==max.',0),
+25077 => array('Adjustment factor for color must be > 0',0),
+25078 => array('Unknown color: %s',1),
+25079 => array('Unknown color specification: %s, size=%d',2),
+
+25080 => array('Alpha parameter for color must be between 0.0 and 1.0',0),
+25081 => array('Selected graphic format is either not supported or unknown [%s]',1),
+25082 => array('Illegal sizes specified for width or height when creating an image, (width=%d, height=%d)',2),
+25083 => array('Illegal image size when copying image. Size for copied to image is 1 pixel or less.',0),
+25084 => array('Failed to create temporary GD canvas. Possible Out of memory problem.',0),
+25085 => array('An image can not be created from the supplied string. It is either in a format not supported or the string is representing an corrupt image.',0),
+25086 => array('You only seem to have GD 1.x installed. To enable Alphablending requires GD 2.x or higher. Please install GD or make sure the constant USE_GD2 is specified correctly to reflect your installation. By default it tries to auto detect what version of GD you have installed. On some very rare occasions it may falsely detect GD2 where only GD1 is installed. You must then set USE_GD2 to false.',0),
+25087 => array('This PHP build has not been configured with TTF support. You need to recompile your PHP installation with FreeType support.',0),
+25088 => array('You have a misconfigured GD font support. The call to imagefontwidth() fails.',0),
+25089 => array('You have a misconfigured GD font support. The call to imagefontheight() fails.',0),
+
+25090 => array('Unknown direction specified in call to StrokeBoxedText() [%s]',1),
+25091 => array('Internal font does not support drawing text at arbitrary angle. Use TTF fonts instead.',0),
+25092 => array('There is either a configuration problem with TrueType or a problem reading font file "%s" Make sure file exists and is in a readable place for the HTTP process. (If \'basedir\' restriction is enabled in PHP then the font file must be located in the document root.). It might also be a wrongly installed FreeType library. Try upgrading to at least FreeType 2.1.13 and recompile GD with the correct setup so it can find the new FT library.',1),
+25093 => array('Can not read font file "%s" in call to Image::GetBBoxTTF. Please make sure that you have set a font before calling this method and that the font is installed in the TTF directory.',1),
+25094 => array('Direction for text most be given as an angle between 0 and 90.',0),
+25095 => array('Unknown font font family specification. ',0),
+25096 => array('Can\'t allocate any more colors in palette image. Image has already allocated maximum of %d colors and the palette  is now full. Change to a truecolor image instead',0),
+25097 => array('Color specified as empty string in PushColor().',0),
+25098 => array('Negative Color stack index. Unmatched call to PopColor()',0),
+25099 => array('Parameters for brightness and Contrast out of range [-1,1]',0),
+
+25100 => array('Problem with color palette and your GD setup. Please disable anti-aliasing or use GD2 with true-color. If you have GD2 library installed please make sure that you have set the USE_GD2 constant to true and truecolor is enabled.',0),
+25101 => array('Illegal numeric argument to SetLineStyle(): (%d)',1),
+25102 => array('Illegal string argument to SetLineStyle(): %s',1),
+25103 => array('Illegal argument to SetLineStyle %s',1),
+25104 => array('Unknown line style: %s',1),
+25105 => array('NULL data specified for a filled polygon. Check that your data is not NULL.',0),
+25106 => array('Image::FillToBorder : Can not allocate more colors',0),
+25107 => array('Can\'t write to file "%s". Check that the process running PHP has enough permission.',1),
+25108 => array('Can\'t stream image. This is most likely due to a faulty PHP/GD setup. Try to recompile PHP and use the built-in GD library that comes with PHP.',0),
+25109 => array('Your PHP (and GD-lib) installation does not appear to support any known graphic formats. You need to first make sure GD is compiled as a module to PHP. If you also want to use JPEG images you must get the JPEG library. Please see the PHP docs for details.',0),
+
+25110 => array('Your PHP installation does not support the chosen graphic format: %s',1),
+25111 => array('Can\'t delete cached image %s. Permission problem?',1),
+25112 => array('Cached imagefile (%s) has file date in the future.',1),
+25113 => array('Can\'t delete cached image "%s". Permission problem?',1),
+25114 => array('PHP has not enough permissions to write to the cache file "%s". Please make sure that the user running PHP has write permission for this file if you wan to use the cache system with JpGraph.',1),
+25115 => array('Can\'t set permission for cached image "%s". Permission problem?',1),
+25116 => array('Cant open file from cache "%s"',1),
+25117 => array('Can\'t open cached image "%s" for reading.',1),
+25118 => array('Can\'t create directory "%s". Make sure PHP has write permission to this directory.',1),
+25119 => array('Can\'t set permissions for "%s". Permission problems?',1),
+
+25120 => array('Position for legend must be given as percentage in range 0-1',0),
+25121 => array('Empty input data array specified for plot. Must have at least one data point.',0),
+25122 => array('Stroke() must be implemented by concrete subclass to class Plot',0),
+25123 => array('You can\'t use a text X-scale with specified X-coords. Use a "int" or "lin" scale instead.',0),
+25124 => array('The input data array must have consecutive values from position 0 and forward. The given y-array starts with empty values (NULL)',0),
+25125 => array('Illegal direction for static line',0),
+25126 => array('Can\'t create truecolor image. Check that the GD2 library is properly setup with PHP.',0),
+25127 => array('The library has been configured for automatic encoding conversion of Japanese fonts. This requires that PHP has the mb_convert_encoding() function. Your PHP installation lacks this function (PHP needs the "--enable-mbstring" when compiled).',0),
+25128 => array('The function imageantialias() is not available in your PHP installation. Use the GD version that comes with PHP and not the standalone version.',0),
+25129 => array('Anti-alias can not be used with dashed lines. Please disable anti-alias or use solid lines.',0),
+25130 => array('Too small plot area. (%d x %d). With the given image size and margins there is to little space left for the plot. Increase the plot size or reduce the margins.',2),
+
+25131 => array('StrokeBoxedText2() only supports TTF fonts and not built-in bitmap fonts.',0),
+25132 => array('Undefined property %s.',1),
+25133 => array('Use Graph::SetTheme() after Graph::SetScale().',0),
+
+/*
+**  jpgraph_led
+*/
+
+25500 => array('Multibyte strings must be enabled in the PHP installation in order to run the LED module so that the function mb_strlen() is available. See PHP documentation for more information.',0),
+
+/*
+**---------------------------------------------------------------------------------------------
+** Pro-version strings
+**---------------------------------------------------------------------------------------------
+*/
+
+/*
+**  jpgraph_table
+*/
+
+27001 => array('GTextTable: Invalid argument to Set(). Array argument must be 2 dimensional',0),
+27002 => array('GTextTable: Invalid argument to Set()',0),
+27003 => array('GTextTable: Wrong number of arguments to GTextTable::SetColor()',0),
+27004 => array('GTextTable: Specified cell range to be merged is not valid.',0),
+27005 => array('GTextTable: Cannot merge already merged cells in the range: (%d,%d) to (%d,%d)',4),
+27006 => array('GTextTable: Column argument = %d is outside specified table size.',1),
+27007 => array('GTextTable: Row argument = %d is outside specified table size.',1),
+27008 => array('GTextTable: Column and row size arrays must match the dimensions of the table',0),
+27009 => array('GTextTable: Number of table columns or rows are 0. Make sure Init() or Set() is called.',0),
+27010 => array('GTextTable: No alignment specified in call to SetAlign()',0),
+27011 => array('GTextTable: Unknown alignment specified in SetAlign(). Horizontal=%s, Vertical=%s',2),
+27012 => array('GTextTable: Internal error. Invalid alignment specified =%s',1),
+27013 => array('GTextTable: Argument to FormatNumber() must be a string.',0),
+27014 => array('GTextTable: Table is not initilaized with either a call to Set() or Init()',0),
+27015 => array('GTextTable: Cell image constrain type must be TIMG_WIDTH or TIMG_HEIGHT',0),
+
+/*
+**  jpgraph_windrose
+*/
+
+22001 => array('Total percentage for all windrose legs in a windrose plot can not exceed 100%% !\n(Current max is: %d)',1),
+22002 => array('Graph is too small to have a scale. Please make the graph larger.',0),
+22004 => array('Label specification for windrose directions must have 16 values (one for each compass direction).',0),
+22005 => array('Line style for radial lines must be on of ("solid","dotted","dashed","longdashed") ',0),
+22006 => array('Illegal windrose type specified.',0),
+22007 => array('To few values for the range legend.',0),
+22008 => array('Internal error: Trying to plot free Windrose even though type is not a free windrose',0),
+22009 => array('You have specified the same direction twice, once with an angle and once with a compass direction (%f degrees)',0),
+22010 => array('Direction must either be a numeric value or one of the 16 compass directions',0),
+22011 => array('Windrose index must be numeric or direction label. You have specified index=%d',1),
+22012 => array('Windrose radial axis specification contains a direction which is not enabled.',0),
+22013 => array('You have specified the look&feel for the same compass direction twice, once with text and once with index (Index=%d)',1),
+22014 => array('Index for compass direction must be between 0 and 15.',0),
+22015 => array('You have specified an undefined Windrose plot type.',0),
+22016 => array('Windrose leg index must be numeric or direction label.',0),
+22017 => array('Windrose data contains a direction which is not enabled. Please adjust what labels are displayed.',0),
+22018 => array('You have specified data for the same compass direction twice, once with text and once with index (Index=%d)',1),
+22019 => array('Index for direction must be between 0 and 15. You can\'t specify angles for a Regular Windplot, only index and compass directions.',0),
+22020 => array('Windrose plot is too large to fit the specified Graph size. Please use WindrosePlot::SetSize() to make the plot smaller or increase the size of the Graph in the initial WindroseGraph() call.',0),
+22021 => array('It is only possible to add Text, IconPlot or WindrosePlot to a Windrose Graph',0),
+/*
+**  jpgraph_odometer
+*/
+
+13001 => array('Unknown needle style (%d).',1),
+13002 => array('Value for odometer (%f) is outside specified scale [%f,%f]',3),
+
+/*
+**  jpgraph_barcode
+*/
+
+1001 => array('Unknown encoder specification: %s',1),
+1002 => array('Data validation failed. Can\'t encode [%s] using encoding "%s"',2),
+1003 => array('Internal encoding error. Trying to encode %s is not possible in Code 128',1),
+1004 => array('Internal barcode error. Unknown UPC-E encoding type: %s',1),
+1005 => array('Internal error. Can\'t encode character tuple (%s, %s) in Code-128 charset C',2),
+1006 => array('Internal encoding error for CODE 128. Trying to encode control character in CHARSET != A',0),
+1007 => array('Internal encoding error for CODE 128. Trying to encode DEL in CHARSET != B',0),
+1008 => array('Internal encoding error for CODE 128. Trying to encode small letters in CHARSET != B',0),
+1009 => array('Encoding using CODE 93 is not yet supported.',0),
+1010 => array('Encoding using POSTNET is not yet supported.',0),
+1011 => array('Non supported barcode backend for type %s',1),
+
+/*
+** PDF417
+*/
+26000 => array('PDF417: The PDF417 module requires that the PHP installation must support the function bcmod(). This is normally enabled at compile time. See documentation for more information.',0),
+26001 => array('PDF417: Number of Columns must be >= 1 and <= 30',0),
+26002 => array('PDF417: Error level must be between 0 and 8',0),
+26003 => array('PDF417: Invalid format for input data to encode with PDF417',0),
+26004 => array('PDF417: Can\'t encode given data with error level %d and %d columns since it results in too many symbols or more than 90 rows.',2),
+26005 => array('PDF417: Can\'t open file "%s" for writing',1),
+26006 => array('PDF417: Internal error. Data files for PDF417 cluster %d is corrupted.',1),
+26007 => array('PDF417: Internal error. GetPattern: Illegal Code Value = %d (row=%d)',2),
+26008 => array('PDF417: Internal error. Mode not found in mode list!! mode=%d',1),
+26009 => array('PDF417: Encode error: Illegal character. Can\'t encode character with ASCII code=%d',1),
+26010 => array('PDF417: Internal error: No input data in decode.',0),
+26011 => array('PDF417: Encoding error. Can\'t use numeric encoding on non-numeric data.',0),
+26012 => array('PDF417: Internal error. No input data to decode for Binary compressor.',0),
+26013 => array('PDF417: Internal error. Checksum error. Coefficient tables corrupted.',0),
+26014 => array('PDF417: Internal error. No data to calculate codewords on.',0),
+26015 => array('PDF417: Internal error. State transition table entry 0 is NULL. Entry 1 = (%s)',1),
+26016 => array('PDF417: Internal error: Unrecognized state transition mode in decode.',0),
+
+/*
+** jpgraph_contour
+*/
+
+28001 => array('Third argument to Contour must be an array of colors.',0),
+28002 => array('Number of colors must equal the number of isobar lines specified',0),
+28003 => array('ContourPlot Internal Error: isobarHCrossing: Coloumn index too large (%d)',1),
+28004 => array('ContourPlot Internal Error: isobarHCrossing: Row index too large (%d)',1),
+28005 => array('ContourPlot Internal Error: isobarVCrossing: Row index too large (%d)',1),
+28006 => array('ContourPlot Internal Error: isobarVCrossing: Col index too large (%d)',1),
+28007 => array('ContourPlot interpolation factor is too large (>5)',0),
+
+/*
+ * jpgraph_matrix and colormap
+*/
+29201 => array('Min range value must be less or equal to max range value for colormaps',0),
+29202 => array('The distance between min and max value is too small for numerical precision',0),
+29203 => array('Number of color quantification level must be at least %d',1),
+29204 => array('Number of colors (%d) is invalid for this colormap. It must be a number that can be written as: %d + k*%d',3),
+29205 => array('Colormap specification out of range. Must be an integer in range [0,%d]',1),
+29206 => array('Invalid object added to MatrixGraph',0),
+29207 => array('Empty input data specified for MatrixPlot',0),
+29208 => array('Unknown side specifiction for matrix labels "%s"',1),
+29209 => array('CSIM Target matrix must be the same size as the data matrix (csim=%d x %d, data=%d x %d)',4),
+29210 => array('CSIM Target for matrix labels does not match the number of labels (csim=%d, labels=%d)',2),
+
+
+/*
+* jpgraph_theme
+*/
+30001 => array("Theme::%s() is not defined. \nPlease make %s(\$graph) function in your theme classs.",2),
+
+);
+
+?>
diff --git a/common/lib/jpgraph_lib/lang/prod.inc.php b/common/lib/jpgraph_lib/lang/prod.inc.php
new file mode 100644
index 000000000..c34c2b3bc
--- /dev/null
+++ b/common/lib/jpgraph_lib/lang/prod.inc.php
@@ -0,0 +1,386 @@
+<?php
+/*=======================================================================
+// File: 	PROD.INC.PHP
+// Description: Special localization file with the same error messages
+//              for all errors.
+// Created: 	2006-02-18
+// Ver:		$Id: prod.inc.php 1886 2009-10-01 23:30:16Z ljp $
+//
+// Copyright (c) Asial Corporation. All rights reserved.
+//========================================================================
+*/
+
+// The single error message for all errors
+DEFINE('DEFAULT_ERROR_MESSAGE','We are sorry but the system could not generate the requested image. Please contact site support to resolve this problem. Problem no: #');
+
+// Note: Format of each error message is array(<error message>,<number of arguments>)
+$_jpg_messages = array(
+
+/*
+** Headers already sent error. This is formatted as HTML different since this will be sent back directly as text
+*/
+10  => array('<table border=1><tr><td><font color=darkred size=4><b>JpGraph Error:</b>
+HTTP headers have already been sent.<br>Caused by output from file <b>%s</b> at line <b>%d</b>.</font></td></tr><tr><td><b>Explanation:</b><br>HTTP headers have already been sent back to the browser indicating the data as text before the library got a chance to send it\'s image HTTP header to this browser. This makes it impossible for the library to send back image data to the browser (since that would be interpretated as text by the browser and show up as junk text).<p>Most likely you have some text in your script before the call to <i>Graph::Stroke()</i>. If this texts gets sent back to the browser the browser will assume that all data is plain text. Look for any text, even spaces and newlines, that might have been sent back to the browser. <p>For example it is a common mistake to leave a blank line before the opening "<b>&lt;?php</b>".</td></tr></table>',2),
+
+
+11 => array(DEFAULT_ERROR_MESSAGE.'11',0),
+12 => array(DEFAULT_ERROR_MESSAGE.'12',0),
+13 => array(DEFAULT_ERROR_MESSAGE.'13',0),
+2001 => array(DEFAULT_ERROR_MESSAGE.'2001',0),
+2002 => array(DEFAULT_ERROR_MESSAGE.'2002',0),
+2003 => array(DEFAULT_ERROR_MESSAGE.'2003',0),
+2004 => array(DEFAULT_ERROR_MESSAGE.'2004',0),
+2005 => array(DEFAULT_ERROR_MESSAGE.'2005',0),
+2006 => array(DEFAULT_ERROR_MESSAGE.'2006',0),
+2007 => array(DEFAULT_ERROR_MESSAGE.'2007',0),
+2008 => array(DEFAULT_ERROR_MESSAGE.'2008',0),
+2009 => array(DEFAULT_ERROR_MESSAGE.'2009',0),
+2010 => array(DEFAULT_ERROR_MESSAGE.'2010',0),
+2011 => array(DEFAULT_ERROR_MESSAGE.'2011',0),
+2012 => array(DEFAULT_ERROR_MESSAGE.'2012',0),
+2013 => array(DEFAULT_ERROR_MESSAGE.'2013',0),
+2014 => array(DEFAULT_ERROR_MESSAGE.'2014',0),
+3001 => array(DEFAULT_ERROR_MESSAGE.'3001',0),
+4002 => array(DEFAULT_ERROR_MESSAGE.'4002',0),
+5001 => array(DEFAULT_ERROR_MESSAGE.'5001',0),
+5002 => array(DEFAULT_ERROR_MESSAGE.'5002',0),
+5003 => array(DEFAULT_ERROR_MESSAGE.'5003',0),
+5004 => array(DEFAULT_ERROR_MESSAGE.'5004',0),
+6001 => array(DEFAULT_ERROR_MESSAGE.'6001',0),
+6002 => array(DEFAULT_ERROR_MESSAGE.'6002',0),
+6003 => array(DEFAULT_ERROR_MESSAGE.'6003',0),
+6004 => array(DEFAULT_ERROR_MESSAGE.'6004',0),
+6005 => array(DEFAULT_ERROR_MESSAGE.'6005',0),
+6006 => array(DEFAULT_ERROR_MESSAGE.'6006',0),
+6007 => array(DEFAULT_ERROR_MESSAGE.'6007',0),
+6008 => array(DEFAULT_ERROR_MESSAGE.'6008',0),
+6009 => array(DEFAULT_ERROR_MESSAGE.'6009',0),
+6010 => array(DEFAULT_ERROR_MESSAGE.'6010',0),
+6011 => array(DEFAULT_ERROR_MESSAGE.'6011',0),
+6012 => array(DEFAULT_ERROR_MESSAGE.'6012',0),
+6015 => array(DEFAULT_ERROR_MESSAGE.'6015',0),
+6016 => array(DEFAULT_ERROR_MESSAGE.'6016',0),
+6017 => array(DEFAULT_ERROR_MESSAGE.'6017',0),
+6018 => array(DEFAULT_ERROR_MESSAGE.'6018',0),
+6019 => array(DEFAULT_ERROR_MESSAGE.'6019',0),
+6020 => array(DEFAULT_ERROR_MESSAGE.'6020',0),
+6021 => array(DEFAULT_ERROR_MESSAGE.'6021',0),
+6022 => array(DEFAULT_ERROR_MESSAGE.'6022',0),
+6023 => array(DEFAULT_ERROR_MESSAGE.'6023',0),
+6024 => array(DEFAULT_ERROR_MESSAGE.'6024',0),
+6025 => array(DEFAULT_ERROR_MESSAGE.'6025',0),
+6027 => array(DEFAULT_ERROR_MESSAGE.'6027',0),
+6028 => array(DEFAULT_ERROR_MESSAGE.'6028',0),
+6029 => array(DEFAULT_ERROR_MESSAGE.'6029',0),
+6030 => array(DEFAULT_ERROR_MESSAGE.'6030',0),
+6031 => array(DEFAULT_ERROR_MESSAGE.'6031',0),
+6032 => array(DEFAULT_ERROR_MESSAGE.'6032',0),
+6033 => array(DEFAULT_ERROR_MESSAGE.'6033',0),
+7001 => array(DEFAULT_ERROR_MESSAGE.'7001',0),
+8001 => array(DEFAULT_ERROR_MESSAGE.'8001',0),
+8002 => array(DEFAULT_ERROR_MESSAGE.'8002',0),
+8003 => array(DEFAULT_ERROR_MESSAGE.'8003',0),
+8004 => array(DEFAULT_ERROR_MESSAGE.'8004',0),
+9001 => array(DEFAULT_ERROR_MESSAGE.'9001',0),
+10001 => array(DEFAULT_ERROR_MESSAGE.'10001',0),
+10002 => array(DEFAULT_ERROR_MESSAGE.'10002',0),
+10003 => array(DEFAULT_ERROR_MESSAGE.'10003',0),
+11001 => array(DEFAULT_ERROR_MESSAGE.'11001',0),
+11002 => array(DEFAULT_ERROR_MESSAGE.'11002',0),
+11003 => array(DEFAULT_ERROR_MESSAGE.'11003',0),
+11004 => array(DEFAULT_ERROR_MESSAGE.'11004',0),
+11005 => array(DEFAULT_ERROR_MESSAGE.'11005',0),
+12001 => array(DEFAULT_ERROR_MESSAGE.'12001',0),
+12002 => array(DEFAULT_ERROR_MESSAGE.'12002',0),
+12003 => array(DEFAULT_ERROR_MESSAGE.'12003',0),
+12004 => array(DEFAULT_ERROR_MESSAGE.'12004',0),
+12005 => array(DEFAULT_ERROR_MESSAGE.'12005',0),
+12006 => array(DEFAULT_ERROR_MESSAGE.'12006',0),
+12007 => array(DEFAULT_ERROR_MESSAGE.'12007',0),
+12008 => array(DEFAULT_ERROR_MESSAGE.'12008',0),
+12009 => array(DEFAULT_ERROR_MESSAGE.'12009',0),
+12010 => array(DEFAULT_ERROR_MESSAGE.'12010',0),
+12011 => array(DEFAULT_ERROR_MESSAGE.'12011',0),
+12012 => array(DEFAULT_ERROR_MESSAGE.'12012',0),
+14001 => array(DEFAULT_ERROR_MESSAGE.'14001',0),
+14002 => array(DEFAULT_ERROR_MESSAGE.'14002',0),
+14003 => array(DEFAULT_ERROR_MESSAGE.'14003',0),
+14004 => array(DEFAULT_ERROR_MESSAGE.'14004',0),
+14005 => array(DEFAULT_ERROR_MESSAGE.'14005',0),
+14006 => array(DEFAULT_ERROR_MESSAGE.'14006',0),
+14007 => array(DEFAULT_ERROR_MESSAGE.'14007',0),
+15001 => array(DEFAULT_ERROR_MESSAGE.'15001',0),
+15002 => array(DEFAULT_ERROR_MESSAGE.'15002',0),
+15003 => array(DEFAULT_ERROR_MESSAGE.'15003',0),
+15004 => array(DEFAULT_ERROR_MESSAGE.'15004',0),
+15005 => array(DEFAULT_ERROR_MESSAGE.'15005',0),
+15006 => array(DEFAULT_ERROR_MESSAGE.'15006',0),
+15007 => array(DEFAULT_ERROR_MESSAGE.'15007',0),
+15008 => array(DEFAULT_ERROR_MESSAGE.'15008',0),
+15009 => array(DEFAULT_ERROR_MESSAGE.'15009',0),
+15010 => array(DEFAULT_ERROR_MESSAGE.'15010',0),
+15011 => array(DEFAULT_ERROR_MESSAGE.'15011',0),
+15012 => array(DEFAULT_ERROR_MESSAGE.'15012',0),
+16001 => array(DEFAULT_ERROR_MESSAGE.'16001',0),
+16002 => array(DEFAULT_ERROR_MESSAGE.'16002',0),
+16003 => array(DEFAULT_ERROR_MESSAGE.'16003',0),
+16004 => array(DEFAULT_ERROR_MESSAGE.'16004',0),
+17001 => array(DEFAULT_ERROR_MESSAGE.'17001',0),
+17002 => array(DEFAULT_ERROR_MESSAGE.'17002',0),
+17004 => array(DEFAULT_ERROR_MESSAGE.'17004',0),
+18001 => array(DEFAULT_ERROR_MESSAGE.'18001',0),
+18002 => array(DEFAULT_ERROR_MESSAGE.'18002',0),
+18003 => array(DEFAULT_ERROR_MESSAGE.'18003',0),
+18004 => array(DEFAULT_ERROR_MESSAGE.'18004',0),
+18005 => array(DEFAULT_ERROR_MESSAGE.'18005',0),
+18006 => array(DEFAULT_ERROR_MESSAGE.'18006',0),
+18007 => array(DEFAULT_ERROR_MESSAGE.'18007',0),
+18008 => array(DEFAULT_ERROR_MESSAGE.'18008',0),
+19001 => array(DEFAULT_ERROR_MESSAGE.'19001',0),
+19002 => array(DEFAULT_ERROR_MESSAGE.'19002',0),
+19003 => array(DEFAULT_ERROR_MESSAGE.'19003',0),
+20001 => array(DEFAULT_ERROR_MESSAGE.'20001',0),
+20002 => array(DEFAULT_ERROR_MESSAGE.'20002',0),
+20003 => array(DEFAULT_ERROR_MESSAGE.'20003',0),
+21001 => array(DEFAULT_ERROR_MESSAGE.'21001',0),
+23001 => array(DEFAULT_ERROR_MESSAGE.'23001',0),
+23002 => array(DEFAULT_ERROR_MESSAGE.'23002',0),
+23003 => array(DEFAULT_ERROR_MESSAGE.'23003',0),
+24001 => array(DEFAULT_ERROR_MESSAGE.'24001',0),
+24002 => array(DEFAULT_ERROR_MESSAGE.'24002',0),
+24003 => array(DEFAULT_ERROR_MESSAGE.'24003',0),
+24004 => array(DEFAULT_ERROR_MESSAGE.'24004',0),
+25001 => array(DEFAULT_ERROR_MESSAGE.'25001',0),
+25002 => array(DEFAULT_ERROR_MESSAGE.'25002',0),
+25003 => array(DEFAULT_ERROR_MESSAGE.'25003',0),
+25004 => array(DEFAULT_ERROR_MESSAGE.'25004',0),
+25005 => array(DEFAULT_ERROR_MESSAGE.'25005',0),
+25006 => array(DEFAULT_ERROR_MESSAGE.'25006',0),
+25007 => array(DEFAULT_ERROR_MESSAGE.'25007',0),
+25008 => array(DEFAULT_ERROR_MESSAGE.'25008',0),
+25009 => array(DEFAULT_ERROR_MESSAGE.'25009',0),
+25010 => array(DEFAULT_ERROR_MESSAGE.'25010',0),
+25011 => array(DEFAULT_ERROR_MESSAGE.'25011',0),
+25012 => array(DEFAULT_ERROR_MESSAGE.'25012',0),
+25013 => array(DEFAULT_ERROR_MESSAGE.'25013',0),
+25014 => array(DEFAULT_ERROR_MESSAGE.'25014',0),
+25015 => array(DEFAULT_ERROR_MESSAGE.'25015',0),
+25016 => array(DEFAULT_ERROR_MESSAGE.'25016',0),
+25017 => array(DEFAULT_ERROR_MESSAGE.'25017',0),
+25018 => array(DEFAULT_ERROR_MESSAGE.'25018',0),
+25019 => array(DEFAULT_ERROR_MESSAGE.'25019',0),
+25020 => array(DEFAULT_ERROR_MESSAGE.'25020',0),
+25021 => array(DEFAULT_ERROR_MESSAGE.'25021',0),
+25022 => array(DEFAULT_ERROR_MESSAGE.'25022',0),
+25023 => array(DEFAULT_ERROR_MESSAGE.'25023',0),
+25024 => array(DEFAULT_ERROR_MESSAGE.'25024',0),
+25025 => array(DEFAULT_ERROR_MESSAGE.'25025',0),
+25026 => array(DEFAULT_ERROR_MESSAGE.'25026',0),
+25027 => array(DEFAULT_ERROR_MESSAGE.'25027',0),
+25028 => array(DEFAULT_ERROR_MESSAGE.'25028',0),
+25029 => array(DEFAULT_ERROR_MESSAGE.'25029',0),
+25030 => array(DEFAULT_ERROR_MESSAGE.'25030',0),
+25031 => array(DEFAULT_ERROR_MESSAGE.'25031',0),
+25032 => array(DEFAULT_ERROR_MESSAGE.'25032',0),
+25033 => array(DEFAULT_ERROR_MESSAGE.'25033',0),
+25034 => array(DEFAULT_ERROR_MESSAGE.'25034',0),
+25035 => array(DEFAULT_ERROR_MESSAGE.'25035',0),
+25036 => array(DEFAULT_ERROR_MESSAGE.'25036',0),
+25037 => array(DEFAULT_ERROR_MESSAGE.'25037',0),
+25038 => array(DEFAULT_ERROR_MESSAGE.'25038',0),
+25039 => array(DEFAULT_ERROR_MESSAGE.'25039',0),
+25040 => array(DEFAULT_ERROR_MESSAGE.'25040',0),
+25041 => array(DEFAULT_ERROR_MESSAGE.'25041',0),
+25042 => array(DEFAULT_ERROR_MESSAGE.'25042',0),
+25043 => array(DEFAULT_ERROR_MESSAGE.'25043',0),
+25044 => array(DEFAULT_ERROR_MESSAGE.'25044',0),
+25045 => array(DEFAULT_ERROR_MESSAGE.'25045',0),
+25046 => array(DEFAULT_ERROR_MESSAGE.'25046',0),
+25047 => array(DEFAULT_ERROR_MESSAGE.'25047',0),
+25048 => array(DEFAULT_ERROR_MESSAGE.'25048',0),
+25049 => array(DEFAULT_ERROR_MESSAGE.'25049',0),
+25050 => array(DEFAULT_ERROR_MESSAGE.'25050',0),
+25051 => array(DEFAULT_ERROR_MESSAGE.'25051',0),
+25052 => array(DEFAULT_ERROR_MESSAGE.'25052',0),
+25053 => array(DEFAULT_ERROR_MESSAGE.'25053',0),
+25054 => array(DEFAULT_ERROR_MESSAGE.'25054',0),
+25055 => array(DEFAULT_ERROR_MESSAGE.'25055',0),
+25056 => array(DEFAULT_ERROR_MESSAGE.'25056',0),
+25057 => array(DEFAULT_ERROR_MESSAGE.'25057',0),
+25058 => array(DEFAULT_ERROR_MESSAGE.'25058',0),
+25059 => array(DEFAULT_ERROR_MESSAGE.'25059',0),
+25060 => array(DEFAULT_ERROR_MESSAGE.'25060',0),
+25061 => array(DEFAULT_ERROR_MESSAGE.'25061',0),
+25062 => array(DEFAULT_ERROR_MESSAGE.'25062',0),
+25063 => array(DEFAULT_ERROR_MESSAGE.'25063',0),
+25064 => array(DEFAULT_ERROR_MESSAGE.'25064',0),
+25065 => array(DEFAULT_ERROR_MESSAGE.'25065',0),
+25066 => array(DEFAULT_ERROR_MESSAGE.'25066',0),
+25067 => array(DEFAULT_ERROR_MESSAGE.'25067',0),
+25068 => array(DEFAULT_ERROR_MESSAGE.'25068',0),
+25069 => array(DEFAULT_ERROR_MESSAGE.'25069',0),
+25070 => array(DEFAULT_ERROR_MESSAGE.'25070',0),
+25071 => array(DEFAULT_ERROR_MESSAGE.'25071',0),
+25072 => array(DEFAULT_ERROR_MESSAGE.'25072',0),
+25073 => array(DEFAULT_ERROR_MESSAGE.'25073',0),
+25074 => array(DEFAULT_ERROR_MESSAGE.'25074',0),
+25075 => array(DEFAULT_ERROR_MESSAGE.'25075',0),
+25077 => array(DEFAULT_ERROR_MESSAGE.'25077',0),
+25078 => array(DEFAULT_ERROR_MESSAGE.'25078',0),
+25079 => array(DEFAULT_ERROR_MESSAGE.'25079',0),
+25080 => array(DEFAULT_ERROR_MESSAGE.'25080',0),
+25081 => array(DEFAULT_ERROR_MESSAGE.'25081',0),
+25082 => array(DEFAULT_ERROR_MESSAGE.'25082',0),
+25083 => array(DEFAULT_ERROR_MESSAGE.'25083',0),
+25084 => array(DEFAULT_ERROR_MESSAGE.'25084',0),
+25085 => array(DEFAULT_ERROR_MESSAGE.'25085',0),
+25086 => array(DEFAULT_ERROR_MESSAGE.'25086',0),
+25087 => array(DEFAULT_ERROR_MESSAGE.'25087',0),
+25088 => array(DEFAULT_ERROR_MESSAGE.'25088',0),
+25089 => array(DEFAULT_ERROR_MESSAGE.'25089',0),
+25090 => array(DEFAULT_ERROR_MESSAGE.'25090',0),
+25091 => array(DEFAULT_ERROR_MESSAGE.'25091',0),
+25092 => array(DEFAULT_ERROR_MESSAGE.'25092',0),
+25093 => array(DEFAULT_ERROR_MESSAGE.'25093',0),
+25094 => array(DEFAULT_ERROR_MESSAGE.'25094',0),
+25095 => array(DEFAULT_ERROR_MESSAGE.'25095',0),
+25096 => array(DEFAULT_ERROR_MESSAGE.'25096',0),
+25097 => array(DEFAULT_ERROR_MESSAGE.'25097',0),
+25098 => array(DEFAULT_ERROR_MESSAGE.'25098',0),
+25099 => array(DEFAULT_ERROR_MESSAGE.'25099',0),
+25100 => array(DEFAULT_ERROR_MESSAGE.'25100',0),
+25101 => array(DEFAULT_ERROR_MESSAGE.'25101',0),
+25102 => array(DEFAULT_ERROR_MESSAGE.'25102',0),
+25103 => array(DEFAULT_ERROR_MESSAGE.'25103',0),
+25104 => array(DEFAULT_ERROR_MESSAGE.'25104',0),
+25105 => array(DEFAULT_ERROR_MESSAGE.'25105',0),
+25106 => array(DEFAULT_ERROR_MESSAGE.'25106',0),
+25107 => array(DEFAULT_ERROR_MESSAGE.'25107',0),
+25108 => array(DEFAULT_ERROR_MESSAGE.'25108',0),
+25109 => array(DEFAULT_ERROR_MESSAGE.'25109',0),
+25110 => array(DEFAULT_ERROR_MESSAGE.'25110',0),
+25111 => array(DEFAULT_ERROR_MESSAGE.'25111',0),
+25112 => array(DEFAULT_ERROR_MESSAGE.'25112',0),
+25113 => array(DEFAULT_ERROR_MESSAGE.'25113',0),
+25114 => array(DEFAULT_ERROR_MESSAGE.'25114',0),
+25115 => array(DEFAULT_ERROR_MESSAGE.'25115',0),
+25116 => array(DEFAULT_ERROR_MESSAGE.'25116',0),
+25117 => array(DEFAULT_ERROR_MESSAGE.'25117',0),
+25118 => array(DEFAULT_ERROR_MESSAGE.'25118',0),
+25119 => array(DEFAULT_ERROR_MESSAGE.'25119',0),
+25120 => array(DEFAULT_ERROR_MESSAGE.'25120',0),
+25121 => array(DEFAULT_ERROR_MESSAGE.'25121',0),
+25122 => array(DEFAULT_ERROR_MESSAGE.'25122',0),
+25123 => array(DEFAULT_ERROR_MESSAGE.'25123',0),
+25124 => array(DEFAULT_ERROR_MESSAGE.'25124',0),
+25125 => array(DEFAULT_ERROR_MESSAGE.'25125',0),
+25126 => array(DEFAULT_ERROR_MESSAGE.'25126',0),
+25127 => array(DEFAULT_ERROR_MESSAGE.'25127',0),
+25128 => array(DEFAULT_ERROR_MESSAGE.'25128',0),
+25129 => array(DEFAULT_ERROR_MESSAGE.'25129',0),
+25130 => array(DEFAULT_ERROR_MESSAGE.'25130',0),
+25131 => array(DEFAULT_ERROR_MESSAGE.'25131',0),
+25132 => array(DEFAULT_ERROR_MESSAGE.'25132',0),
+25133 => array(DEFAULT_ERROR_MESSAGE.'25133',0),
+25500 => array(DEFAULT_ERROR_MESSAGE.'25500',0),
+24003 => array(DEFAULT_ERROR_MESSAGE.'24003',0),
+24004 => array(DEFAULT_ERROR_MESSAGE.'24004',0),
+24005 => array(DEFAULT_ERROR_MESSAGE.'24005',0),
+24006 => array(DEFAULT_ERROR_MESSAGE.'24006',0),
+24007 => array(DEFAULT_ERROR_MESSAGE.'24007',0),
+24008 => array(DEFAULT_ERROR_MESSAGE.'24008',0),
+24009 => array(DEFAULT_ERROR_MESSAGE.'24009',0),
+24010 => array(DEFAULT_ERROR_MESSAGE.'24010',0),
+24011 => array(DEFAULT_ERROR_MESSAGE.'24011',0),
+24012 => array(DEFAULT_ERROR_MESSAGE.'24012',0),
+24013 => array(DEFAULT_ERROR_MESSAGE.'24013',0),
+24014 => array(DEFAULT_ERROR_MESSAGE.'24014',0),
+24015 => array(DEFAULT_ERROR_MESSAGE.'24015',0),
+22001 => array(DEFAULT_ERROR_MESSAGE.'22001',0),
+22002 => array(DEFAULT_ERROR_MESSAGE.'22002',0),
+22004 => array(DEFAULT_ERROR_MESSAGE.'22004',0),
+22005 => array(DEFAULT_ERROR_MESSAGE.'22005',0),
+22006 => array(DEFAULT_ERROR_MESSAGE.'22006',0),
+22007 => array(DEFAULT_ERROR_MESSAGE.'22007',0),
+22008 => array(DEFAULT_ERROR_MESSAGE.'22008',0),
+22009 => array(DEFAULT_ERROR_MESSAGE.'22009',0),
+22010 => array(DEFAULT_ERROR_MESSAGE.'22010',0),
+22011 => array(DEFAULT_ERROR_MESSAGE.'22011',0),
+22012 => array(DEFAULT_ERROR_MESSAGE.'22012',0),
+22013 => array(DEFAULT_ERROR_MESSAGE.'22013',0),
+22014 => array(DEFAULT_ERROR_MESSAGE.'22014',0),
+22015 => array(DEFAULT_ERROR_MESSAGE.'22015',0),
+22016 => array(DEFAULT_ERROR_MESSAGE.'22016',0),
+22017 => array(DEFAULT_ERROR_MESSAGE.'22017',0),
+22018 => array(DEFAULT_ERROR_MESSAGE.'22018',0),
+22019 => array(DEFAULT_ERROR_MESSAGE.'22019',0),
+22020 => array(DEFAULT_ERROR_MESSAGE.'22020',0),
+13001 => array(DEFAULT_ERROR_MESSAGE.'13001',0),
+13002 => array(DEFAULT_ERROR_MESSAGE.'13002',0),
+1001 => array(DEFAULT_ERROR_MESSAGE.'1001',0),
+1002 => array(DEFAULT_ERROR_MESSAGE.'1002',0),
+1003 => array(DEFAULT_ERROR_MESSAGE.'1003',0),
+1004 => array(DEFAULT_ERROR_MESSAGE.'1004',0),
+1005 => array(DEFAULT_ERROR_MESSAGE.'1005',0),
+1006 => array(DEFAULT_ERROR_MESSAGE.'1006',0),
+1007 => array(DEFAULT_ERROR_MESSAGE.'1007',0),
+1008 => array(DEFAULT_ERROR_MESSAGE.'1008',0),
+1009 => array(DEFAULT_ERROR_MESSAGE.'1009',0),
+1010 => array(DEFAULT_ERROR_MESSAGE.'1010',0),
+1011 => array(DEFAULT_ERROR_MESSAGE.'1011',0),
+26000 => array(DEFAULT_ERROR_MESSAGE.'26000',0),
+26001 => array(DEFAULT_ERROR_MESSAGE.'26001',0),
+26002 => array(DEFAULT_ERROR_MESSAGE.'26002',0),
+26003 => array(DEFAULT_ERROR_MESSAGE.'26003',0),
+26004 => array(DEFAULT_ERROR_MESSAGE.'26004',0),
+26005 => array(DEFAULT_ERROR_MESSAGE.'26005',0),
+26006 => array(DEFAULT_ERROR_MESSAGE.'26006',0),
+26007 => array(DEFAULT_ERROR_MESSAGE.'26007',0),
+26008 => array(DEFAULT_ERROR_MESSAGE.'26008',0),
+26009 => array(DEFAULT_ERROR_MESSAGE.'26009',0),
+26010 => array(DEFAULT_ERROR_MESSAGE.'26010',0),
+26011 => array(DEFAULT_ERROR_MESSAGE.'26011',0),
+26012 => array(DEFAULT_ERROR_MESSAGE.'26012',0),
+26013 => array(DEFAULT_ERROR_MESSAGE.'26013',0),
+26014 => array(DEFAULT_ERROR_MESSAGE.'26014',0),
+26015 => array(DEFAULT_ERROR_MESSAGE.'26015',0),
+26016 => array(DEFAULT_ERROR_MESSAGE.'26016',0),
+
+27001 => array(DEFAULT_ERROR_MESSAGE.'27001',0),
+27002 => array(DEFAULT_ERROR_MESSAGE.'27002',0),
+27003 => array(DEFAULT_ERROR_MESSAGE.'27003',0),
+27004 => array(DEFAULT_ERROR_MESSAGE.'27004',0),
+27005 => array(DEFAULT_ERROR_MESSAGE.'27005',0),
+27006 => array(DEFAULT_ERROR_MESSAGE.'27006',0),
+27007 => array(DEFAULT_ERROR_MESSAGE.'27007',0),
+27008 => array(DEFAULT_ERROR_MESSAGE.'27008',0),
+27009 => array(DEFAULT_ERROR_MESSAGE.'27009',0),
+27010 => array(DEFAULT_ERROR_MESSAGE.'27010',0),
+27011 => array(DEFAULT_ERROR_MESSAGE.'27011',0),
+27012 => array(DEFAULT_ERROR_MESSAGE.'27012',0),
+27013 => array(DEFAULT_ERROR_MESSAGE.'27013',0),
+27014 => array(DEFAULT_ERROR_MESSAGE.'27014',0),
+27015 => array(DEFAULT_ERROR_MESSAGE.'27015',0),
+
+28001 => array(DEFAULT_ERROR_MESSAGE.'28001',0),
+28002 => array(DEFAULT_ERROR_MESSAGE.'28002',0),
+28003 => array(DEFAULT_ERROR_MESSAGE.'28003',0),
+28004 => array(DEFAULT_ERROR_MESSAGE.'28004',0),
+28005 => array(DEFAULT_ERROR_MESSAGE.'28005',0),
+28006 => array(DEFAULT_ERROR_MESSAGE.'28006',0),
+28007 => array(DEFAULT_ERROR_MESSAGE.'28007',0),
+
+29201 => array(DEFAULT_ERROR_MESSAGE.'28001',0),
+29202 => array(DEFAULT_ERROR_MESSAGE.'28002',0),
+29203 => array(DEFAULT_ERROR_MESSAGE.'28003',0),
+29204 => array(DEFAULT_ERROR_MESSAGE.'28004',0),
+29205 => array(DEFAULT_ERROR_MESSAGE.'28005',0),
+29206 => array(DEFAULT_ERROR_MESSAGE.'28006',0),
+29207 => array(DEFAULT_ERROR_MESSAGE.'28007',0),
+29208 => array(DEFAULT_ERROR_MESSAGE.'28008',0),
+29209 => array(DEFAULT_ERROR_MESSAGE.'28009',0),
+29210 => array(DEFAULT_ERROR_MESSAGE.'28010',0),
+
+);
+
+?>
diff --git a/common/lib/jpgraph_lib/themes/AquaTheme.class.php b/common/lib/jpgraph_lib/themes/AquaTheme.class.php
new file mode 100644
index 000000000..751b42026
--- /dev/null
+++ b/common/lib/jpgraph_lib/themes/AquaTheme.class.php
@@ -0,0 +1,202 @@
+<?php
+
+/**
+* Aqua Theme class
+*/
+class AquaTheme extends Theme 
+{
+    protected $font_color       = '#0044CC';
+    protected $background_color = '#DDFFFF';
+    protected $axis_color       = '#0066CC';
+    protected $grid_color       = '#3366CC';
+
+    function GetColorList() {
+        return array(
+            '#183152',
+            '#C4D7ED',
+            '#375D81',
+            '#ABC8E2',
+            '#E1E6FA',
+            '#9BBAB2',
+            '#3B4259',
+            '#0063BC',
+            '#1D5A73',
+            '#ABABFF',
+            '#27ADC5',
+            '#EDFFCC',
+
+/*
+
+            '#66FFFF',
+            '#00AABB',
+            '#00FFCC',
+            '#33CCFF',
+            '#008866',
+            '#99FFFF',
+            '#0099FF',
+            '#99FFCC',
+            '#3399FF',
+            '#2277FF',
+            '#445588',
+            '#003388',
+            '#338877',
+            '#55DDFF',
+            '#00FF99',
+            '#BBBBBB',
+            '#77AAFF',
+            '#00FFCC',
+*/
+        );
+    }
+
+    function SetupGraph($graph) {
+
+        // graph
+        /*
+        $img = $graph->img;
+        $height = $img->height;
+        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        */
+        $graph->SetFrame(false);
+        $graph->SetMarginColor('white');
+        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
+
+        // legend
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
+        $graph->legend->SetFillColor('white');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(3);
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // xaxis
+        $graph->xaxis->title->SetColor($this->font_color);  
+        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
+        $graph->xaxis->SetLabelMargin(10);
+                
+        // yaxis
+        $graph->yaxis->title->SetColor($this->font_color);  
+        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->yaxis->SetTickSide(SIDE_LEFT);
+        $graph->yaxis->SetLabelMargin(8);
+        $graph->yaxis->HideLine();
+        $graph->yaxis->HideTicks();
+        $graph->xaxis->SetTitleMargin(15);
+
+        // grid
+        $graph->ygrid->SetColor($this->grid_color);
+        $graph->ygrid->SetLineStyle('dotted');
+
+
+        // font
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+//        $graph->img->SetAntiAliasing();
+    }
+
+
+    function SetupPieGraph($graph) {
+
+        // graph
+        $graph->SetFrame(false);
+
+        // legend
+        $graph->legend->SetFillColor('white');
+
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.80, 'center', 'top');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(4);
+
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // title
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+        $graph->SetAntiAliasing();
+    }
+
+
+    function PreStrokeApply($graph) {
+        if ($graph->legend->HasItems()) {
+            $img = $graph->img;
+            $height = $img->height;
+            $graph->SetMargin(
+                $img->raw_left_margin, 
+                $img->raw_right_margin, 
+                $img->raw_top_margin, 
+                $height * 0.25
+            );
+        }
+    }
+
+    function ApplyPlot($plot) {
+
+        switch (get_class($plot))
+        { 
+            case 'GroupBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'AccBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'BarPlot':
+            {
+                $plot->Clear();
+
+                $color = $this->GetNextColor();
+                $plot->SetColor($color);
+                $plot->SetFillColor($color);
+                //$plot->SetShadow();
+                break;
+            }
+
+            case 'LinePlot':
+            {
+                $plot->Clear();
+                $plot->SetColor($this->GetNextColor());
+                $plot->SetWeight(2);
+//                $plot->SetBarCenter();
+                break;
+            }
+
+            case 'PiePlot':
+            {
+                $plot->SetCenter(0.5, 0.45);
+                $plot->ShowBorder(false);
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+
+            case 'PiePlot3D':
+            {
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+    
+            default:
+            {
+            }
+        }
+    }
+}
+
+
+?>
diff --git a/common/lib/jpgraph_lib/themes/GreenTheme.class.php b/common/lib/jpgraph_lib/themes/GreenTheme.class.php
new file mode 100644
index 000000000..a61fbd834
--- /dev/null
+++ b/common/lib/jpgraph_lib/themes/GreenTheme.class.php
@@ -0,0 +1,178 @@
+<?php
+
+/**
+* Green Theme class
+*/
+class GreenTheme extends Theme 
+{
+    private $font_color       = '#009900';
+    private $background_color = '#EEFFDD';
+    private $axis_color       = '#00CC00';
+    private $grid_color       = '#33CC33';
+
+    function GetColorList() {
+        return array(
+            '#66CC00',
+            '#009900',
+            '#AAFF77',
+            '#559922',
+            '#00CC33',
+            '#99FF00',
+            '#009966',
+            '#00FF99',
+            '#99BB66',
+            '#33FF00',
+            '#DDFFBB',
+            '#669933',
+            '#BBDDCC',
+            '#77CCBB',
+            '#668833',
+            '#BBEE66',
+        );
+    }
+
+    function SetupGraph($graph) {
+
+        // graph
+        /*
+        $img = $graph->img;
+        $height = $img->height;
+        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        */
+        $graph->SetFrame(false);
+        $graph->SetMarginColor('white');
+        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
+
+        // legend
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
+        $graph->legend->SetFillColor('white');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(3);
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // xaxis
+        $graph->xaxis->title->SetColor($this->font_color);  
+        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
+        $graph->xaxis->SetLabelMargin(10);
+                
+        // yaxis
+        $graph->yaxis->title->SetColor($this->font_color);  
+        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->yaxis->SetTickSide(SIDE_LEFT);
+        $graph->yaxis->SetLabelMargin(8);
+        $graph->yaxis->HideLine();
+        $graph->yaxis->HideTicks();
+        $graph->xaxis->SetTitleMargin(15);
+
+        // grid
+        $graph->ygrid->SetColor($this->grid_color);
+        $graph->ygrid->SetLineStyle('dotted');
+
+
+        // font
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+//        $graph->img->SetAntiAliasing();
+    }
+
+
+    function SetupPieGraph($graph) {
+
+        // graph
+        $graph->SetFrame(false);
+
+        // legend
+        $graph->legend->SetFillColor('white');
+        /*
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(3);
+        */
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // title
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+        $graph->SetAntiAliasing();
+    }
+
+
+    function PreStrokeApply($graph) {
+        if ($graph->legend->HasItems()) {
+            $img = $graph->img;
+            $height = $img->height;
+            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        }
+    }
+
+    function ApplyPlot($plot) {
+
+        switch (get_class($plot))
+        { 
+            case 'GroupBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'AccBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'BarPlot':
+            {
+                $plot->Clear();
+
+                $color = $this->GetNextColor();
+                $plot->SetColor($color);
+                $plot->SetFillColor($color);
+                $plot->SetShadow('red', 3, 4, false);
+                break;
+            }
+
+            case 'LinePlot':
+            {
+                $plot->Clear();
+
+                $plot->SetColor($this->GetNextColor().'@0.4');
+                $plot->SetWeight(2);
+                break;
+            }
+
+            case 'PiePlot':
+            {
+                $plot->ShowBorder(false);
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+
+            case 'PiePlot3D':
+            {
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+    
+            default:
+            {
+            }
+        }
+    }
+}
+
+
+?>
diff --git a/common/lib/jpgraph_lib/themes/OceanTheme.class.php b/common/lib/jpgraph_lib/themes/OceanTheme.class.php
new file mode 100644
index 000000000..b2750360d
--- /dev/null
+++ b/common/lib/jpgraph_lib/themes/OceanTheme.class.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+* Ocean Theme class
+*/
+class OceanTheme extends Theme 
+{
+    protected $font_color       = '#0066FF';
+    private $background_color = '#DDEEFF';
+    private $axis_color       = '#0000CC';
+    private $grid_color       = '#3333CC';
+
+    function GetColorList() {
+        return array(
+            '#0066FF',
+            '#CCCCFF',
+            '#0000FF',
+            '#3366FF',
+            '#33CCFF',
+            '#660088',
+            '#3300FF',
+            '#0099FF',
+            '#6633FF',
+            '#0055EE',
+            '#2277EE',
+            '#3300FF',
+            '#AA00EE',
+            '#778899',
+            '#114499',
+            '#7744EE',
+            '#002288',
+            '#6666FF',
+        );
+    }
+
+    function SetupGraph($graph) {
+
+        // graph
+        /*
+        $img = $graph->img;
+        $height = $img->height;
+        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        */
+        $graph->SetFrame(false);
+        $graph->SetMarginColor('white');
+        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
+
+        // legend
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
+        $graph->legend->SetFillColor('white');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(3);
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // xaxis
+        $graph->xaxis->title->SetColor($this->font_color);  
+        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
+        $graph->xaxis->SetLabelMargin(10);
+                
+        // yaxis
+        $graph->yaxis->title->SetColor($this->font_color);  
+        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->yaxis->SetTickSide(SIDE_LEFT);
+        $graph->yaxis->SetLabelMargin(8);
+        $graph->yaxis->HideLine();
+        $graph->yaxis->HideTicks();
+        $graph->xaxis->SetTitleMargin(15);
+
+        // grid
+        $graph->ygrid->SetColor($this->grid_color);
+        $graph->ygrid->SetLineStyle('dotted');
+
+
+        // font
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+//        $graph->img->SetAntiAliasing();
+    }
+
+
+    function SetupPieGraph($graph) {
+
+        // graph
+        $graph->SetFrame(false);
+
+        // legend
+        $graph->legend->SetFillColor('white');
+        /*
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(3);
+        */
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // title
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+        $graph->SetAntiAliasing();
+    }
+
+
+    function PreStrokeApply($graph) {
+        if ($graph->legend->HasItems()) {
+            $img = $graph->img;
+            $height = $img->height;
+            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        }
+    }
+
+    function ApplyPlot($plot) {
+
+        switch (get_class($plot))
+        { 
+            case 'GroupBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'AccBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'BarPlot':
+            {
+                $plot->Clear();
+
+                $color = $this->GetNextColor();
+                $plot->SetColor($color);
+                $plot->SetFillColor($color);
+                $plot->SetShadow('red', 3, 4, false);
+                break;
+            }
+
+            case 'LinePlot':
+            {
+                $plot->Clear();
+
+                $plot->SetColor($this->GetNextColor());
+                $plot->SetWeight(2);
+                break;
+            }
+
+            case 'PiePlot':
+            {
+                $plot->ShowBorder(false);
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+
+            case 'PiePlot3D':
+            {
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+    
+            default:
+            {
+            }
+        }
+    }
+}
+
+
+?>
diff --git a/common/lib/jpgraph_lib/themes/OrangeTheme.class.php b/common/lib/jpgraph_lib/themes/OrangeTheme.class.php
new file mode 100644
index 000000000..ea26dad85
--- /dev/null
+++ b/common/lib/jpgraph_lib/themes/OrangeTheme.class.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+* Orange Theme class
+*/
+class OrangeTheme extends Theme 
+{
+    private $font_color       = '#CC4400';
+    private $background_color = '#FFEEDD';
+    private $axis_color       = '#CC6600';
+    private $grid_color       = '#CC6633';
+
+    function GetColorList() {
+        return array(
+            '#FF9900',
+            '#FFCC00',
+            '#AA6600',
+            '#CCCC00',
+            '#CC6600',
+            '#FFFF66',
+            '#CCFF00',
+            '#CC3300',
+            '#669933',
+            '#EE7700',
+            '#AAEE33',
+            '#77AA00',
+            '#CCFF99',
+            '#FF6633',
+            '#885500',
+            '#AADD00',
+            '#99CC44',
+            '#887711',
+        );
+    }
+
+    function SetupGraph($graph) {
+
+        // graph
+        /*
+        $img = $graph->img;
+        $height = $img->height;
+        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        */
+        $graph->SetFrame(false);
+        $graph->SetMarginColor('white');
+        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
+
+        // legend
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
+        $graph->legend->SetFillColor('white');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(3);
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // xaxis
+        $graph->xaxis->title->SetColor($this->font_color);  
+        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
+        $graph->xaxis->SetLabelMargin(10);
+                
+        // yaxis
+        $graph->yaxis->title->SetColor($this->font_color);  
+        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->yaxis->SetTickSide(SIDE_LEFT);
+        $graph->yaxis->SetLabelMargin(8);
+        $graph->yaxis->HideLine();
+        $graph->yaxis->HideTicks();
+        $graph->xaxis->SetTitleMargin(15);
+
+        // grid
+        $graph->ygrid->SetColor($this->grid_color);
+        $graph->ygrid->SetLineStyle('dotted');
+
+
+        // font
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+//        $graph->img->SetAntiAliasing();
+    }
+
+
+    function SetupPieGraph($graph) {
+
+        // graph
+        $graph->SetFrame(false);
+
+        // legend
+        $graph->legend->SetFillColor('white');
+        /*
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(3);
+        */
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // title
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+        $graph->SetAntiAliasing();
+    }
+
+
+    function PreStrokeApply($graph) {
+        if ($graph->legend->HasItems()) {
+            $img = $graph->img;
+            $height = $img->height;
+            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        }
+    }
+
+    function ApplyPlot($plot) {
+
+        switch (get_class($plot))
+        { 
+            case 'GroupBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'AccBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'BarPlot':
+            {
+                $plot->Clear();
+
+                $color = $this->GetNextColor();
+                $plot->SetColor($color);
+                $plot->SetFillColor($color);
+                $plot->SetShadow('red', 3, 4, false);
+                break;
+            }
+
+            case 'LinePlot':
+            {
+                $plot->Clear();
+
+                $plot->SetColor($this->GetNextColor().'@0.4');
+                $plot->SetWeight(2);
+                break;
+            }
+
+            case 'PiePlot':
+            {
+                $plot->ShowBorder(false);
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+
+            case 'PiePlot3D':
+            {
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+    
+            default:
+            {
+            }
+        }
+    }
+}
+
+
+?>
diff --git a/common/lib/jpgraph_lib/themes/PastelTheme.class.php b/common/lib/jpgraph_lib/themes/PastelTheme.class.php
new file mode 100644
index 000000000..d3f1ddb6a
--- /dev/null
+++ b/common/lib/jpgraph_lib/themes/PastelTheme.class.php
@@ -0,0 +1,175 @@
+<?php
+
+/**
+* Pastel Theme class
+*/
+class PastelTheme extends Theme 
+{
+    private $font_color       = '#0044CC';
+    private $background_color = '#DDFFFF';
+    private $axis_color       = '#0066CC';
+    private $grid_color       = '#3366CC';
+
+    function GetColorList() {
+        return array(
+            '#FFAACC',
+            '#AAEECC',
+            '#AACCFF',
+            '#CCAAFF',
+            '#EEDDFF',
+            '#FFCCAA',
+            '#CCBBDD',
+            '#CCFFAA',
+            '#C7D7C2',
+            '#FFEEDD',
+            '#FFCCEE',
+            '#BFECFA',
+        );
+    }
+
+    function SetupGraph($graph) {
+
+        // graph
+        /*
+        $img = $graph->img;
+        $height = $img->height;
+        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        */
+        $graph->SetFrame(false);
+        $graph->SetMarginColor('white');
+        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
+
+        // legend
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
+        $graph->legend->SetFillColor('white');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(3);
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // xaxis
+        $graph->xaxis->title->SetColor($this->font_color);  
+        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
+        $graph->xaxis->SetLabelMargin(10);
+                
+        // yaxis
+        $graph->yaxis->title->SetColor($this->font_color);  
+        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->yaxis->SetTickSide(SIDE_LEFT);
+        $graph->yaxis->SetLabelMargin(8);
+        $graph->yaxis->HideLine();
+        $graph->yaxis->HideTicks();
+        $graph->xaxis->SetTitleMargin(15);
+
+        // grid
+        $graph->ygrid->SetColor($this->grid_color);
+        $graph->ygrid->SetLineStyle('dotted');
+
+
+        // font
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+//        $graph->img->SetAntiAliasing();
+    }
+
+
+    function SetupPieGraph($graph) {
+
+        // graph
+        $graph->SetFrame(false);
+
+        // legend
+        $graph->legend->SetFillColor('white');
+
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.80, 'center', 'top');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(4);
+
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // title
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+        $graph->SetAntiAliasing();
+    }
+
+
+    function PreStrokeApply($graph) {
+        if ($graph->legend->HasItems()) {
+            $img = $graph->img;
+            $height = $img->height;
+            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        }
+    }
+
+    function ApplyPlot($plot) {
+
+        switch (get_class($plot))
+        { 
+            case 'GroupBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'AccBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'BarPlot':
+            {
+                $plot->Clear();
+
+                $color = $this->GetNextColor();
+                $plot->SetColor($color);
+                $plot->SetFillColor($color);
+                $plot->SetShadow('red', 3, 4, false);
+                break;
+            }
+
+            case 'LinePlot':
+            {
+                $plot->Clear();
+                $plot->SetColor($this->GetNextColor().'@0.4');
+                $plot->SetWeight(2);
+//                $plot->SetBarCenter();
+                break;
+            }
+
+            case 'PiePlot':
+            {
+                $plot->SetCenter(0.5, 0.45);
+                $plot->ShowBorder(false);
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+
+            case 'PiePlot3D':
+            {
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+    
+            default:
+            {
+            }
+        }
+    }
+}
+
+
+?>
diff --git a/common/lib/jpgraph_lib/themes/RoseTheme.class.php b/common/lib/jpgraph_lib/themes/RoseTheme.class.php
new file mode 100644
index 000000000..5a1463005
--- /dev/null
+++ b/common/lib/jpgraph_lib/themes/RoseTheme.class.php
@@ -0,0 +1,180 @@
+<?php
+
+/**
+* Rose Theme class
+*/
+class RoseTheme extends Theme 
+{
+    private $font_color       = '#CC0044';
+    private $background_color = '#FFDDDD';
+    private $axis_color       = '#CC0000';
+    private $grid_color       = '#CC3333';
+
+    function GetColorList() {
+        return array(
+            '#FF0000',
+            '#FF99FF',
+            '#AA0099',
+            '#FF00FF',
+            '#FF6666',
+            '#FF0099',
+            '#FFBB88',
+            '#AA2211',
+            '#FF6699',
+            '#BBAA88',
+            '#FF2200',
+            '#883333',
+            '#EE7777',
+            '#EE7711',
+            '#FF0066',
+            '#DD7711',
+            '#AA6600',
+            '#EE5500',
+        );
+    }
+
+    function SetupGraph($graph) {
+
+        // graph
+        /*
+        $img = $graph->img;
+        $height = $img->height;
+        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        */
+        $graph->SetFrame(false);
+        $graph->SetMarginColor('white');
+        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
+
+        // legend
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
+        $graph->legend->SetFillColor('white');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(3);
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // xaxis
+        $graph->xaxis->title->SetColor($this->font_color);  
+        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
+        $graph->xaxis->SetLabelMargin(10);
+                
+        // yaxis
+        $graph->yaxis->title->SetColor($this->font_color);  
+        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->yaxis->SetTickSide(SIDE_LEFT);
+        $graph->yaxis->SetLabelMargin(8);
+        $graph->yaxis->HideLine();
+        $graph->yaxis->HideTicks();
+        $graph->xaxis->SetTitleMargin(15);
+
+        // grid
+        $graph->ygrid->SetColor($this->grid_color);
+        $graph->ygrid->SetLineStyle('dotted');
+
+
+        // font
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+//        $graph->img->SetAntiAliasing();
+    }
+
+
+    function SetupPieGraph($graph) {
+
+        // graph
+        $graph->SetFrame(false);
+
+        // legend
+        $graph->legend->SetFillColor('white');
+        /*
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(3);
+        */
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // title
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+        $graph->SetAntiAliasing();
+    }
+
+
+    function PreStrokeApply($graph) {
+        if ($graph->legend->HasItems()) {
+            $img = $graph->img;
+            $height = $img->height;
+            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        }
+    }
+
+    function ApplyPlot($plot) {
+
+        switch (get_class($plot))
+        { 
+            case 'GroupBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'AccBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'BarPlot':
+            {
+                $plot->Clear();
+
+                $color = $this->GetNextColor();
+                $plot->SetColor($color);
+                $plot->SetFillColor($color);
+                $plot->SetShadow('red', 3, 4, false);
+                break;
+            }
+
+            case 'LinePlot':
+            {
+                $plot->Clear();
+
+                $plot->SetColor($this->GetNextColor().'@0.4');
+                $plot->SetWeight(2);
+                break;
+            }
+
+            case 'PiePlot':
+            {
+                $plot->ShowBorder(false);
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+
+            case 'PiePlot3D':
+            {
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+    
+            default:
+            {
+            }
+        }
+    }
+}
+
+
+?>
diff --git a/common/lib/jpgraph_lib/themes/SoftyTheme.class.php b/common/lib/jpgraph_lib/themes/SoftyTheme.class.php
new file mode 100644
index 000000000..222cf85a1
--- /dev/null
+++ b/common/lib/jpgraph_lib/themes/SoftyTheme.class.php
@@ -0,0 +1,209 @@
+<?php
+
+/**
+* Softy Theme class
+*/
+class SoftyTheme extends Theme 
+{
+    protected $font_color       = '#000000';
+    protected $background_color = '#F7F8F4';
+    protected $axis_color       = '#000000';
+    protected $grid_color       = '#CCCCCC';
+
+    function GetColorList() {
+        return array(
+            '#CFE7FB',
+            '#F9D76F',
+            '#B9D566',
+            '#FFBB90',
+            '#66BBBB',
+            '#E69090',
+            '#BB90BB',
+            '#9AB67C',
+            '#D1CC66',
+
+/*
+
+            '#AFD8F8',
+            '#F6BD0F',
+            '#8BBA00',
+            '#FF8E46',
+            '#008E8E',
+
+            '#D64646',
+            '#8E468E',
+            '#588526',
+            '#B3AA00',
+            '#008ED6',
+
+            '#9D080D',
+            '#A186BE',
+            */
+        );
+    }
+
+    function SetupGraph($graph) {
+
+        // graph
+        $graph->SetFrame(false);
+        $graph->SetMarginColor('white');
+
+        // legend
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
+        $graph->legend->SetFillColor('white');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(3);
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // xaxis
+        $graph->xaxis->title->SetColor($this->font_color);  
+        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
+        $graph->xaxis->SetLabelMargin(10);
+                
+        // yaxis
+        $graph->yaxis->title->SetColor($this->font_color);  
+        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->yaxis->SetTickSide(SIDE_LEFT);
+        $graph->yaxis->SetLabelMargin(8);
+        $graph->yaxis->HideLine();
+        $graph->yaxis->HideTicks();
+        $graph->xaxis->SetTitleMargin(15);
+
+        // y2~
+        if (isset($graph->y2axis)) {
+            $graph->y2axis->title->SetColor($this->font_color);  
+            $graph->y2axis->SetColor($this->axis_color, $this->font_color);    
+            $graph->y2axis->SetTickSide(SIDE_LEFT);
+            $graph->y2axis->SetLabelMargin(8);
+            $graph->y2axis->HideLine();
+            $graph->y2axis->HideTicks();
+        }
+
+        // yn
+        if (isset($graph->y2axis)) {
+            foreach ($graph->ynaxis as $axis) {
+                $axis->title->SetColor($this->font_color);  
+                $axis->SetColor($this->axis_color, $this->font_color);    
+                $axis->SetTickSide(SIDE_LEFT);
+                $axis->SetLabelMargin(8);
+                $axis->HideLine();
+                $axis->HideTicks();
+            }
+        }
+
+        // grid
+        $graph->ygrid->SetColor($this->grid_color);
+        $graph->ygrid->SetLineStyle('dotted');
+        $graph->ygrid->SetFill(true, '#FFFFFF', $this->background_color);
+        $graph->xgrid->Show();
+        $graph->xgrid->SetColor($this->grid_color);
+        $graph->xgrid->SetLineStyle('dotted');
+
+
+        // font
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+//        $graph->img->SetAntiAliasing();
+    }
+
+
+    function SetupPieGraph($graph) {
+
+        // graph
+        $graph->SetFrame(false);
+
+        // title
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+        $graph->SetAntiAliasing();
+    }
+
+
+    function PreStrokeApply($graph) {
+        if ($graph->legend->HasItems()) {
+            $img = $graph->img;
+            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $img->height * 0.25);
+//            $graph->SetMargin(200, $img->right_margin, $img->top_margin, $height * 0.25);
+        }
+    }
+
+    function ApplyPlot($plot) {
+
+        switch (get_class($plot))
+        { 
+            case 'BarPlot':
+            {
+                $plot->Clear();
+
+                $color = $this->GetNextColor();
+                $plot->SetColor($color);
+                $plot->SetFillColor($color);
+                $plot->SetShadow('red', 3, 4, false);
+                $plot->value->SetAlign('center', 'center');
+                break;
+            }
+
+            case 'LinePlot':
+            {
+                $plot->Clear();
+
+                $plot->SetColor($this->GetNextColor());
+                $plot->SetWeight(2);
+//                $plot->SetBarCenter();
+                break;
+            }
+
+            case 'PiePlot':
+            {
+                $plot->ShowBorder(false);
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+
+
+            case 'GroupBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'AccBarPlot':
+            {
+                $plot->value->SetAlign('center', 'center');
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                    $_plot->SetValuePos('center');
+                }
+                break;
+            }
+
+            case 'ScatterPlot':
+            {
+                break;
+            }
+
+
+            case 'PiePlot3D':
+            {
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+    
+            default:
+            {
+            }
+        }
+    }
+}
+
+
+?>
diff --git a/common/lib/jpgraph_lib/themes/UniversalTheme.class.php b/common/lib/jpgraph_lib/themes/UniversalTheme.class.php
new file mode 100644
index 000000000..44b57a6ea
--- /dev/null
+++ b/common/lib/jpgraph_lib/themes/UniversalTheme.class.php
@@ -0,0 +1,188 @@
+<?php
+
+/**
+* Universal Theme class
+*/
+class UniversalTheme extends Theme 
+{
+    private $font_color       = '#444444';
+    private $background_color = '#F4F4F4';
+    private $axis_color       = '#888888';
+    private $grid_color       = '#E3E3E3';
+
+    function GetColorList() {
+        return array(
+            '#61a9f3',#blue
+            '#f381b9',#red
+            '#61E3A9',#green
+
+            #'#D56DE2',
+            '#85eD82',
+            '#F7b7b7',
+            '#CFDF49',
+            '#88d8f2',
+            '#07AF7B',
+            '#B9E3F9',
+            '#FFF3AD',
+            '#EF606A',
+            '#EC8833',
+            '#FFF100',
+            '#87C9A5',
+        );
+    }
+
+    function SetupGraph($graph) {
+
+        // graph
+        /*
+        $img = $graph->img;
+        $height = $img->height;
+        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        */
+        $graph->SetFrame(false);
+        $graph->SetMarginColor('white');
+        $graph->SetBox(true, '#DADADA');
+//        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
+
+        // legend
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
+        $graph->legend->SetFillColor('white');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(3);
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // xaxis
+        $graph->xaxis->title->SetColor($this->font_color);  
+        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
+        $graph->xaxis->SetLabelMargin(10);
+        $graph->xaxis->HideTicks();
+        $graph->xaxis->SetTitleMargin(15);
+        //$graph->xaxis->SetLabelMargin(30);
+                
+        // yaxis
+        $graph->yaxis->title->SetColor($this->font_color);  
+        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->yaxis->SetTickSide(SIDE_LEFT);
+        $graph->yaxis->SetLabelMargin(8);
+//        $graph->yaxis->SetTickPositions(array(50, 100, 150));
+//        $graph->yaxis->HideLine();
+        $graph->yaxis->HideTicks();
+
+        // grid
+        $graph->ygrid->SetColor($this->grid_color);
+        $graph->ygrid->SetFill(true, '#FFFFFF', $this->background_color);
+ //       $graph->ygrid->SetLineStyle('dotted');
+
+
+        // font
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+        $graph->img->SetAntiAliasing();
+    }
+
+
+    function SetupPieGraph($graph) {
+
+        // graph
+        $graph->SetFrame(false);
+
+        // legend
+        $graph->legend->SetFillColor('white');
+
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.80, 'center', 'top');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(4);
+
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // title
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+        $graph->SetAntiAliasing();
+    }
+
+
+    function PreStrokeApply($graph) {
+        if ($graph->legend->HasItems()) {
+            $img = $graph->img;
+            $height = $img->height;
+            $graph->SetMargin(
+                $img->raw_left_margin, 
+                $img->raw_right_margin, 
+                $img->raw_top_margin, 
+                $height * 0.25
+            );
+        }
+    }
+
+    function ApplyPlot($plot) {
+
+        switch (get_class($plot))
+        { 
+            case 'GroupBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'AccBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'BarPlot':
+            {
+                $plot->Clear();
+
+                $color = $this->GetNextColor();
+                $plot->SetColor($color);
+                $plot->SetFillColor($color);
+                $plot->SetShadow('red', 3, 4, false);
+                break;
+            }
+
+            case 'LinePlot':
+            {
+                $plot->Clear();
+                $plot->SetColor($this->GetNextColor().'@0.4');
+                $plot->SetWeight(2);
+                break;
+            }
+
+            case 'PiePlot':
+            {
+                $plot->SetCenter(0.5, 0.45);
+                $plot->ShowBorder(false);
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+
+            case 'PiePlot3D':
+            {
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+    
+            default:
+            {
+            }
+        }
+    }
+}
+
+
+?>
diff --git a/common/lib/jpgraph_lib/themes/VividTheme.class.php b/common/lib/jpgraph_lib/themes/VividTheme.class.php
new file mode 100644
index 000000000..38a770918
--- /dev/null
+++ b/common/lib/jpgraph_lib/themes/VividTheme.class.php
@@ -0,0 +1,175 @@
+<?php
+
+/**
+* Vivid Theme class
+*/
+class VividTheme extends Theme 
+{
+    private $font_color       = '#0044CC';
+    private $background_color = '#DDFFFF';
+    private $axis_color       = '#0066CC';
+    private $grid_color       = '#3366CC';
+
+    function GetColorList() {
+        return array(
+            '#FFFB11',
+            '#005EBC',
+            '#9AEB67',
+            '#FF4A26',
+            '#FDFF98',
+            '#6B7EFF',
+            '#BCE02E',
+            '#E0642E',
+            '#E0D62E',
+            '#2E97E0',
+            '#02927F',
+            '#FF005A',
+        );
+    }
+
+    function SetupGraph($graph) {
+
+        // graph
+        /*
+        $img = $graph->img;
+        $height = $img->height;
+        $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        */
+        $graph->SetFrame(false);
+        $graph->SetMarginColor('white');
+        $graph->SetBackgroundGradient($this->background_color, '#FFFFFF', GRAD_HOR, BGRAD_PLOT);
+
+        // legend
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.85, 'center', 'top');
+        $graph->legend->SetFillColor('white');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(3);
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // xaxis
+        $graph->xaxis->title->SetColor($this->font_color);  
+        $graph->xaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->xaxis->SetTickSide(SIDE_BOTTOM);
+        $graph->xaxis->SetLabelMargin(10);
+                
+        // yaxis
+        $graph->yaxis->title->SetColor($this->font_color);  
+        $graph->yaxis->SetColor($this->axis_color, $this->font_color);    
+        $graph->yaxis->SetTickSide(SIDE_LEFT);
+        $graph->yaxis->SetLabelMargin(8);
+        $graph->yaxis->HideLine();
+        $graph->yaxis->HideTicks();
+        $graph->xaxis->SetTitleMargin(15);
+
+        // grid
+        $graph->ygrid->SetColor($this->grid_color);
+        $graph->ygrid->SetLineStyle('dotted');
+
+
+        // font
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+//        $graph->img->SetAntiAliasing();
+    }
+
+
+    function SetupPieGraph($graph) {
+
+        // graph
+        $graph->SetFrame(false);
+
+        // legend
+        $graph->legend->SetFillColor('white');
+
+        $graph->legend->SetFrameWeight(0);
+        $graph->legend->Pos(0.5, 0.80, 'center', 'top');
+        $graph->legend->SetLayout(LEGEND_HOR);
+        $graph->legend->SetColumns(4);
+
+        $graph->legend->SetShadow(false);
+        $graph->legend->SetMarkAbsSize(5);
+
+        // title
+        $graph->title->SetColor($this->font_color);
+        $graph->subtitle->SetColor($this->font_color);
+        $graph->subsubtitle->SetColor($this->font_color);
+
+        $graph->SetAntiAliasing();
+    }
+
+
+    function PreStrokeApply($graph) {
+        if ($graph->legend->HasItems()) {
+            $img = $graph->img;
+            $height = $img->height;
+            $graph->SetMargin($img->left_margin, $img->right_margin, $img->top_margin, $height * 0.25);
+        }
+    }
+
+    function ApplyPlot($plot) {
+
+        switch (get_class($plot))
+        { 
+            case 'GroupBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'AccBarPlot':
+            {
+                foreach ($plot->plots as $_plot) {
+                    $this->ApplyPlot($_plot);
+                }
+                break;
+            }
+
+            case 'BarPlot':
+            {
+                $plot->Clear();
+
+                $color = $this->GetNextColor();
+                $plot->SetColor($color);
+                $plot->SetFillColor($color);
+                $plot->SetShadow('red', 3, 4, false);
+                break;
+            }
+
+            case 'LinePlot':
+            {
+                $plot->Clear();
+                $plot->SetColor($this->GetNextColor().'@0.4');
+                $plot->SetWeight(2);
+//                $plot->SetBarCenter();
+                break;
+            }
+
+            case 'PiePlot':
+            {
+                $plot->SetCenter(0.5, 0.45);
+                $plot->ShowBorder(false);
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+
+            case 'PiePlot3D':
+            {
+                $plot->SetSliceColors($this->GetThemeColors());
+                break;
+            }
+    
+            default:
+            {
+            }
+        }
+    }
+}
+
+
+?>
diff --git a/common/lib/languageSettings.php b/common/lib/languageSettings.php
old mode 100644
new mode 100755
index 125c1873a..c7f15ac12
--- a/common/lib/languageSettings.php
+++ b/common/lib/languageSettings.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/common/lib/mail/class.phpmailer.php b/common/lib/mail/class.phpmailer.php
old mode 100644
new mode 100755
index 66046d9b3..194f14688
--- a/common/lib/mail/class.phpmailer.php
+++ b/common/lib/mail/class.phpmailer.php
@@ -11,7 +11,7 @@
 |   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
 |          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
 |   Founder: Brent R. Matzelle (original founder)                           |
-| Copyright (c) 2004-2012, Andy Prevost. All Rights Reserved.               |
+| Copyright (c) 2004-2015, Andy Prevost. All Rights Reserved.               |
 | Copyright (c) 2001-2003, Brent R. Matzelle                                |
 | ------------------------------------------------------------------------- |
 |   License: Distributed under the Lesser General Public License (LGPL)     |
diff --git a/common/lib/mail/class.pop3.php b/common/lib/mail/class.pop3.php
old mode 100644
new mode 100755
index 2a95ded7d..a1325a3c0
--- a/common/lib/mail/class.pop3.php
+++ b/common/lib/mail/class.pop3.php
@@ -11,7 +11,7 @@
 |   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
 |          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
 |   Founder: Brent R. Matzelle (original founder)                           |
-| Copyright (c) 2004-2012, Andy Prevost. All Rights Reserved.               |
+| Copyright (c) 2004-2015, Andy Prevost. All Rights Reserved.               |
 | Copyright (c) 2001-2003, Brent R. Matzelle                                |
 | ------------------------------------------------------------------------- |
 |   License: Distributed under the Lesser General Public License (LGPL)     |
diff --git a/common/lib/mail/class.smtp.php b/common/lib/mail/class.smtp.php
old mode 100644
new mode 100755
index 491d718df..e01f2ca1b
--- a/common/lib/mail/class.smtp.php
+++ b/common/lib/mail/class.smtp.php
@@ -11,7 +11,7 @@
 |   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
 |          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
 |   Founder: Brent R. Matzelle (original founder)                           |
-| Copyright (c) 2004-2012, Andy Prevost. All Rights Reserved.               |
+| Copyright (c) 2004-2015, Andy Prevost. All Rights Reserved.               |
 | Copyright (c) 2001-2003, Brent R. Matzelle                                |
 | ------------------------------------------------------------------------- |
 |   License: Distributed under the Lesser General Public License (LGPL)     |
diff --git a/common/lib/phpagi/A2Billing_changes b/common/lib/phpagi/A2Billing_changes
old mode 100644
new mode 100755
diff --git a/common/lib/phpagi/README.phpagi-asmanager b/common/lib/phpagi/README.phpagi-asmanager
old mode 100644
new mode 100755
diff --git a/common/lib/phpagi/index.php b/common/lib/phpagi/index.php
old mode 100644
new mode 100755
diff --git a/common/lib/phpagi/phpagi-asmanager.php b/common/lib/phpagi/phpagi-asmanager.php
old mode 100644
new mode 100755
diff --git a/common/lib/pqp/README.markdown b/common/lib/pqp/README.markdown
old mode 100644
new mode 100755
diff --git a/common/lib/pqp/README.txt b/common/lib/pqp/README.txt
old mode 100644
new mode 100755
diff --git a/common/lib/pqp/classes/Console.php b/common/lib/pqp/classes/Console.php
old mode 100644
new mode 100755
diff --git a/common/lib/pqp/classes/MySqlDatabase.php b/common/lib/pqp/classes/MySqlDatabase.php
old mode 100644
new mode 100755
diff --git a/common/lib/pqp/classes/PhpQuickProfiler.php b/common/lib/pqp/classes/PhpQuickProfiler.php
old mode 100644
new mode 100755
diff --git a/common/lib/pqp/classes/PqpDatabase.Interface.php b/common/lib/pqp/classes/PqpDatabase.Interface.php
old mode 100644
new mode 100755
diff --git a/common/lib/pqp/css/pQp.css b/common/lib/pqp/css/pQp.css
old mode 100644
new mode 100755
diff --git a/common/lib/pqp/display.php b/common/lib/pqp/display.php
old mode 100644
new mode 100755
index 4a8bbbc40..0907e728b
--- a/common/lib/pqp/display.php
+++ b/common/lib/pqp/display.php
@@ -15,8 +15,8 @@
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-function displayPqp($output, $config)
-{
+function displayPqp($output, $config) {
+
 $cssUrl = $config.'css/pQp.css';
 
 echo <<<JAVASCRIPT
@@ -27,15 +27,13 @@ function displayPqp($output, $config)
 
     addEvent(window, 'load', loadCSS);
 
-    public function changeTab(tab)
-    {
+    function changeTab(tab) {
         var pQp = document.getElementById('pQp');
         hideAllTabs();
         addClassName(pQp, tab, true);
     }
 
-    public function hideAllTabs()
-    {
+    function hideAllTabs() {
         var pQp = document.getElementById('pQp');
         removeClassName(pQp, 'console');
         removeClassName(pQp, 'speed');
@@ -44,33 +42,32 @@ public function hideAllTabs()
         removeClassName(pQp, 'files');
     }
 
-    public function toggleDetails()
-    {
+    function toggleDetails(){
         var container = document.getElementById('pqp-container');
 
-        if (PQP_DETAILS) {
+        if(PQP_DETAILS){
             addClassName(container, 'hideDetails', true);
             PQP_DETAILS = false;
-        } else {
+        }
+        else{
             removeClassName(container, 'hideDetails');
             PQP_DETAILS = true;
         }
     }
-    public function toggleHeight()
-    {
+    function toggleHeight(){
         var container = document.getElementById('pqp-container');
 
-        if (PQP_HEIGHT == "short") {
+        if(PQP_HEIGHT == "short"){
             addClassName(container, 'tallDetails', true);
             PQP_HEIGHT = "tall";
-        } else {
+        }
+        else{
             removeClassName(container, 'tallDetails');
             PQP_HEIGHT = "short";
         }
     }
 
-    public function loadCSS()
-    {
+    function loadCSS() {
         var sheet = document.createElement("link");
         sheet.setAttribute("rel", "stylesheet");
         sheet.setAttribute("type", "text/css");
@@ -81,14 +78,13 @@ public function loadCSS()
 
 
     //http://www.bigbold.com/snippets/posts/show/2630
-    public function addClassName(objElement, strClass, blnMayAlreadyExist)
-    {
-       if (objElement.className) {
+    function addClassName(objElement, strClass, blnMayAlreadyExist){
+       if ( objElement.className ){
           var arrList = objElement.className.split(' ');
-          if (blnMayAlreadyExist) {
+          if ( blnMayAlreadyExist ){
              var strClassUpper = strClass.toUpperCase();
-             for (var i = 0; i < arrList.length; i++) {
-                if ( arrList[i].toUpperCase() == strClassUpper ) {
+             for ( var i = 0; i < arrList.length; i++ ){
+                if ( arrList[i].toUpperCase() == strClassUpper ){
                    arrList.splice(i, 1);
                    i--;
                  }
@@ -96,19 +92,19 @@ public function addClassName(objElement, strClass, blnMayAlreadyExist)
           }
           arrList[arrList.length] = strClass;
           objElement.className = arrList.join(' ');
-       } else {
+       }
+       else{
           objElement.className = strClass;
           }
     }
 
     //http://www.bigbold.com/snippets/posts/show/2630
-    public function removeClassName(objElement, strClass)
-    {
-       if (objElement.className) {
+    function removeClassName(objElement, strClass){
+       if ( objElement.className ){
           var arrList = objElement.className.split(' ');
           var strClassUpper = strClass.toUpperCase();
-          for (var i = 0; i < arrList.length; i++) {
-             if ( arrList[i].toUpperCase() == strClassUpper ) {
+          for ( var i = 0; i < arrList.length; i++ ){
+             if ( arrList[i].toUpperCase() == strClassUpper ){
                 arrList.splice(i, 1);
                 i--;
              }
@@ -118,13 +114,13 @@ public function removeClassName(objElement, strClass)
     }
 
     //http://ejohn.org/projects/flexible-javascript-events/
-    public function addEvent( obj, type, fn )
-    {
-      if (obj.attachEvent) {
+    function addEvent( obj, type, fn ) {
+      if ( obj.attachEvent ) {
         obj["e"+type+fn] = fn;
         obj[type+fn] = function() { obj["e"+type+fn]( window.event ) };
         obj.attachEvent( "on"+type, obj[type+fn] );
-      } else {
+      }
+      else{
         obj.addEventListener( type, fn, false );
       }
     }
@@ -169,9 +165,10 @@ public function addEvent( obj, type, fn )
 
 echo '<div id="pqp-console" class="pqp-box">';
 
-if ($logCount ==  0) {
+if($logCount ==  0) {
     echo '<h3>This panel has no log items.</h3>';
-} else {
+}
+else {
     echo '<table class="side" cellspacing="0">
         <tr>
             <td class="alt1"><var>'.$output['logs']['logCount'].'</var><h4>Logs</h4></td>
@@ -185,17 +182,20 @@ public function addEvent( obj, type, fn )
         <table class="main" cellspacing="0">';
 
         $class = '';
-        foreach ($output['logs']['console'] as $log) {
+        foreach($output['logs']['console'] as $log) {
             echo '<tr class="log-'.$log['type'].'">
                 <td class="type">'.$log['type'].'</td>
                 <td class="'.$class.'">';
-            if ($log['type'] == 'log') {
+            if($log['type'] == 'log') {
                 echo '<div><pre>'.$log['data'].'</pre></div>';
-            } elseif ($log['type'] == 'memory') {
+            }
+            elseif($log['type'] == 'memory') {
                 echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['dataType'].'</em>: '.$log['name'].' </div>';
-            } elseif ($log['type'] == 'speed') {
+            }
+            elseif($log['type'] == 'speed') {
                 echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['name'].'</em></div>';
-            } elseif ($log['type'] == 'error') {
+            }
+            elseif($log['type'] == 'error') {
                 echo '<div><em>Line '.$log['line'].'</em> : '.$log['data'].' <pre>'.$log['file'].'</pre></div>';
             }
 
@@ -211,9 +211,10 @@ public function addEvent( obj, type, fn )
 
 echo '<div id="pqp-speed" class="pqp-box">';
 
-if ($output['logs']['speedCount'] ==  0) {
+if($output['logs']['speedCount'] ==  0) {
     echo '<h3>This panel has no log items.</h3>';
-} else {
+}
+else {
     echo '<table class="side" cellspacing="0">
           <tr><td><var>'.$output['speedTotals']['total'].'</var><h4>Load Time</h4></td></tr>
           <tr><td class="alt"><var>'.$output['speedTotals']['allowed'].'</var> <h4>Max Execution Time</h4></td></tr>
@@ -221,8 +222,8 @@ public function addEvent( obj, type, fn )
         <table class="main" cellspacing="0">';
 
         $class = '';
-        foreach ($output['logs']['console'] as $log) {
-            if ($log['type'] == 'speed') {
+        foreach($output['logs']['console'] as $log) {
+            if($log['type'] == 'speed') {
                 echo '<tr class="log-'.$log['type'].'">
                 <td class="'.$class.'">';
                 echo '<div><pre>'.$log['data'].'</pre> <em>'.$log['name'].'</em></div>';
@@ -239,9 +240,10 @@ public function addEvent( obj, type, fn )
 
 echo '<div id="pqp-queries" class="pqp-box">';
 
-if ($output['queryTotals']['count'] ==  0) {
+if($output['queryTotals']['count'] ==  0) {
     echo '<h3>This panel has no log items.</h3>';
-} else {
+}
+else {
     echo '<table class="side" cellspacing="0">
           <tr><td><var>'.$output['queryTotals']['count'].'</var><h4>Total Queries</h4></td></tr>
           <tr><td class="alt"><var>'.$output['queryTotals']['time'].'</var> <h4>Total Time</h4></td></tr>
@@ -250,10 +252,10 @@ public function addEvent( obj, type, fn )
         <table class="main" cellspacing="0">';
 
         $class = '';
-        foreach ($output['queries'] as $query) {
+        foreach($output['queries'] as $query) {
             echo '<tr>
                 <td class="'.$class.'">'.$query['sql'];
-            if ($query['explain']) {
+            if($query['explain']) {
                     echo '<em>
                         Possible keys: <b>'.$query['explain']['possible_keys'].'</b> &middot;
                         Key Used: <b>'.$query['explain']['key'].'</b> &middot;
@@ -274,9 +276,10 @@ public function addEvent( obj, type, fn )
 
 echo '<div id="pqp-memory" class="pqp-box">';
 
-if ($output['logs']['memoryCount'] ==  0) {
+if($output['logs']['memoryCount'] ==  0) {
     echo '<h3>This panel has no log items.</h3>';
-} else {
+}
+else {
     echo '<table class="side" cellspacing="0">
           <tr><td><var>'.$output['memoryTotals']['used'].'</var><h4>Used Memory</h4></td></tr>
           <tr><td class="alt"><var>'.$output['memoryTotals']['total'].'</var> <h4>Total Available</h4></td></tr>
@@ -284,8 +287,8 @@ public function addEvent( obj, type, fn )
         <table class="main" cellspacing="0">';
 
         $class = '';
-        foreach ($output['logs']['console'] as $log) {
-            if ($log['type'] == 'memory') {
+        foreach($output['logs']['console'] as $log) {
+            if($log['type'] == 'memory') {
                 echo '<tr class="log-'.$log['type'].'">';
                 echo '<td class="'.$class.'"><b>'.$log['data'].'</b> <em>'.$log['dataType'].'</em>: '.$log['name'].'</td>';
                 echo '</tr>';
@@ -301,18 +304,19 @@ public function addEvent( obj, type, fn )
 
 echo '<div id="pqp-files" class="pqp-box">';
 
-if ($output['fileTotals']['count'] ==  0) {
+if($output['fileTotals']['count'] ==  0) {
     echo '<h3>This panel has no log items.</h3>';
-} else {
+}
+else {
     echo '<table class="side" cellspacing="0">
-              <tr><td><var>'.$output['fileTotals']['count'].'</var><h4>Total Files</h4></td></tr>
+            <tr><td><var>'.$output['fileTotals']['count'].'</var><h4>Total Files</h4></td></tr>
             <tr><td class="alt"><var>'.$output['fileTotals']['size'].'</var> <h4>Total Size</h4></td></tr>
             <tr><td><var>'.$output['fileTotals']['largest'].'</var> <h4>Largest</h4></td></tr>
          </table>
         <table class="main" cellspacing="0">';
 
         $class ='';
-        foreach ($output['files'] as $file) {
+        foreach($output['files'] as $file) {
             echo '<tr><td class="'.$class.'"><b>'.$file['size'].'</b> '.$file['name'].'</td></tr>';
             if($class == '') $class = 'alt';
             else $class = '';
@@ -342,3 +346,5 @@ public function addEvent( obj, type, fn )
 echo '</div></div>';
 
 }
+
+?>
\ No newline at end of file
diff --git a/common/lib/pqp/images/overlay.gif b/common/lib/pqp/images/overlay.gif
old mode 100644
new mode 100755
diff --git a/common/lib/pqp/images/side.png b/common/lib/pqp/images/side.png
old mode 100644
new mode 100755
diff --git a/common/lib/pqp/index.php b/common/lib/pqp/index.php
old mode 100644
new mode 100755
diff --git a/common/lib/pqp/pqp.tpl b/common/lib/pqp/pqp.tpl
old mode 100644
new mode 100755
diff --git a/common/lib/protect_sqli.php b/common/lib/protect_sqli.php
old mode 100644
new mode 100755
index dc0736864..5c0b1c0f6
--- a/common/lib/protect_sqli.php
+++ b/common/lib/protect_sqli.php
@@ -3,6 +3,9 @@
 function array_map_recursive( $func, $arr )
 {
     $newArr = array();
+    if (!$arr) {
+        return $newArr;
+    }
     foreach ($arr as $key => $value) {
         $newArr[ $key ] = ( is_array( $value ) ? array_map_recursive( $func, $value ) : $func( $value ) );
     }
diff --git a/common/lib/smarty/Config_File.class.php b/common/lib/smarty/Config_File.class.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/Smarty.class.php b/common/lib/smarty/Smarty.class.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/Smarty_Compiler.class.php b/common/lib/smarty/Smarty_Compiler.class.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/debug.tpl b/common/lib/smarty/debug.tpl
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.assemble_plugin_filepath.php b/common/lib/smarty/internals/core.assemble_plugin_filepath.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.assign_smarty_interface.php b/common/lib/smarty/internals/core.assign_smarty_interface.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.create_dir_structure.php b/common/lib/smarty/internals/core.create_dir_structure.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.display_debug_console.php b/common/lib/smarty/internals/core.display_debug_console.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.get_include_path.php b/common/lib/smarty/internals/core.get_include_path.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.get_microtime.php b/common/lib/smarty/internals/core.get_microtime.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.get_php_resource.php b/common/lib/smarty/internals/core.get_php_resource.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.is_secure.php b/common/lib/smarty/internals/core.is_secure.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.is_trusted.php b/common/lib/smarty/internals/core.is_trusted.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.load_plugins.php b/common/lib/smarty/internals/core.load_plugins.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.load_resource_plugin.php b/common/lib/smarty/internals/core.load_resource_plugin.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.process_cached_inserts.php b/common/lib/smarty/internals/core.process_cached_inserts.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.process_compiled_include.php b/common/lib/smarty/internals/core.process_compiled_include.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.read_cache_file.php b/common/lib/smarty/internals/core.read_cache_file.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.rm_auto.php b/common/lib/smarty/internals/core.rm_auto.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.rmdir.php b/common/lib/smarty/internals/core.rmdir.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.run_insert_handler.php b/common/lib/smarty/internals/core.run_insert_handler.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.smarty_include_php.php b/common/lib/smarty/internals/core.smarty_include_php.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.write_cache_file.php b/common/lib/smarty/internals/core.write_cache_file.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.write_compiled_include.php b/common/lib/smarty/internals/core.write_compiled_include.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.write_compiled_resource.php b/common/lib/smarty/internals/core.write_compiled_resource.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/internals/core.write_file.php b/common/lib/smarty/internals/core.write_file.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/block.textformat.php b/common/lib/smarty/plugins/block.textformat.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/compiler.assign.php b/common/lib/smarty/plugins/compiler.assign.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.assign_debug_info.php b/common/lib/smarty/plugins/function.assign_debug_info.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.config_load.php b/common/lib/smarty/plugins/function.config_load.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.counter.php b/common/lib/smarty/plugins/function.counter.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.cycle.php b/common/lib/smarty/plugins/function.cycle.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.debug.php b/common/lib/smarty/plugins/function.debug.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.eval.php b/common/lib/smarty/plugins/function.eval.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.fetch.php b/common/lib/smarty/plugins/function.fetch.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.html_checkboxes.php b/common/lib/smarty/plugins/function.html_checkboxes.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.html_image.php b/common/lib/smarty/plugins/function.html_image.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.html_options.php b/common/lib/smarty/plugins/function.html_options.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.html_radios.php b/common/lib/smarty/plugins/function.html_radios.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.html_select_date.php b/common/lib/smarty/plugins/function.html_select_date.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.html_select_time.php b/common/lib/smarty/plugins/function.html_select_time.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.html_table.php b/common/lib/smarty/plugins/function.html_table.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.mailto.php b/common/lib/smarty/plugins/function.mailto.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.math.php b/common/lib/smarty/plugins/function.math.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.popup.php b/common/lib/smarty/plugins/function.popup.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/function.popup_init.php b/common/lib/smarty/plugins/function.popup_init.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.capitalize.php b/common/lib/smarty/plugins/modifier.capitalize.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.cat.php b/common/lib/smarty/plugins/modifier.cat.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.count_characters.php b/common/lib/smarty/plugins/modifier.count_characters.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.count_paragraphs.php b/common/lib/smarty/plugins/modifier.count_paragraphs.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.count_sentences.php b/common/lib/smarty/plugins/modifier.count_sentences.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.count_words.php b/common/lib/smarty/plugins/modifier.count_words.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.date_format.php b/common/lib/smarty/plugins/modifier.date_format.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.debug_print_var.php b/common/lib/smarty/plugins/modifier.debug_print_var.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.default.php b/common/lib/smarty/plugins/modifier.default.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.escape.php b/common/lib/smarty/plugins/modifier.escape.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.indent.php b/common/lib/smarty/plugins/modifier.indent.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.lower.php b/common/lib/smarty/plugins/modifier.lower.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.nl2br.php b/common/lib/smarty/plugins/modifier.nl2br.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.regex_replace.php b/common/lib/smarty/plugins/modifier.regex_replace.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.replace.php b/common/lib/smarty/plugins/modifier.replace.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.spacify.php b/common/lib/smarty/plugins/modifier.spacify.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.string_format.php b/common/lib/smarty/plugins/modifier.string_format.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.strip.php b/common/lib/smarty/plugins/modifier.strip.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.strip_tags.php b/common/lib/smarty/plugins/modifier.strip_tags.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.truncate.php b/common/lib/smarty/plugins/modifier.truncate.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.upper.php b/common/lib/smarty/plugins/modifier.upper.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/modifier.wordwrap.php b/common/lib/smarty/plugins/modifier.wordwrap.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/outputfilter.trimwhitespace.php b/common/lib/smarty/plugins/outputfilter.trimwhitespace.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/shared.escape_special_chars.php b/common/lib/smarty/plugins/shared.escape_special_chars.php
old mode 100644
new mode 100755
diff --git a/common/lib/smarty/plugins/shared.make_timestamp.php b/common/lib/smarty/plugins/shared.make_timestamp.php
old mode 100644
new mode 100755
diff --git a/common/lib/support/classes/comment.php b/common/lib/support/classes/comment.php
old mode 100644
new mode 100755
diff --git a/common/lib/support/classes/ticket.php b/common/lib/support/classes/ticket.php
old mode 100644
new mode 100755
diff --git a/composer.json b/composer.json
new file mode 100644
index 000000000..6fb6f8f9e
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,26 @@
+{
+  "name": "start2billing/a2billing",
+  "description": "Phone billing system based on PHP",
+  "autoload": {
+    "psr-4": {
+      "": "src/"
+    }
+  },
+  "require": {
+    "php": ">=5.3.0",
+    "adodb/adodb-php": "dev-master",
+    "smarty/smarty": "3.*"
+  },
+  "license": "AGPL",
+  "authors": [
+    {
+      "name": "Areski Belaid",
+      "email": "areski@gmail.com"
+    }
+  ],
+  "minimum-stability": "stable",
+  "prefer-stable" : true,
+  "require-dev": {
+    "phpunit/phpunit": "4.7.*"
+  }
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 000000000..c6366be32
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,1074 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "c4ac485970145354f6a8a45247d54656",
+    "packages": [
+        {
+            "name": "adodb/adodb-php",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ADOdb/ADOdb.git",
+                "reference": "86bce522c7d985e68c3e898609970fd89bdd4cda"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ADOdb/ADOdb/zipball/86bce522c7d985e68c3e898609970fd89bdd4cda",
+                "reference": "86bce522c7d985e68c3e898609970fd89bdd4cda",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "adodb.inc.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1",
+                " BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "John Lim",
+                    "email": "jlim@natsoft.com",
+                    "role": "Author"
+                },
+                {
+                    "name": "Damien Regad",
+                    "role": "Current maintainer"
+                }
+            ],
+            "description": "ADOdb is a PHP database abstraction layer library",
+            "homepage": "http://adodb.sourceforge.net/",
+            "keywords": [
+                "database"
+            ],
+            "time": "2015-06-28 12:34:07"
+        },
+        {
+            "name": "smarty/smarty",
+            "version": "v3.1.27",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/smarty-php/smarty.git",
+                "reference": "4537d8aae6c4a26f5439bc3a05d3437d25c2c4d2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/4537d8aae6c4a26f5439bc3a05d3437d25c2c4d2",
+                "reference": "4537d8aae6c4a26f5439bc3a05d3437d25c2c4d2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "libs/Smarty.class.php",
+                    "libs/SmartyBC.class.php",
+                    "libs/sysplugins/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Monte Ohrt",
+                    "email": "monte@ohrt.com"
+                },
+                {
+                    "name": "Uwe Tews",
+                    "email": "uwe.tews@googlemail.com"
+                },
+                {
+                    "name": "Rodney Rehm",
+                    "email": "rodney.rehm@medialize.de"
+                }
+            ],
+            "description": "Smarty - the compiling PHP template engine",
+            "homepage": "http://www.smarty.net",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2015-06-18 00:55:59"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14 21:17:01"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "dflydev/markdown": "~1.0",
+                "erusev/parsedown": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "time": "2015-02-03 12:10:50"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
+                "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "phpdocumentor/reflection-docblock": "~2.0",
+                "sebastian/comparator": "~1.1"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2015-04-27 22:15:08"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "2.1.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "6044546998c7627ab997501a3d0db972b3db9790"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6044546998c7627ab997501a3d0db972b3db9790",
+                "reference": "6044546998c7627ab997501a3d0db972b3db9790",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "~1.0",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-07-13 11:25:58"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a923bb15680d0089e2316f7a4af8f437046e96bb",
+                "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2015-04-02 05:19:05"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21 13:50:34"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/83fe1bdc5d47658b727595c14da140da92b3d66d",
+                "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2015-06-13 07:35:30"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
+                "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2015-06-19 03:43:16"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "4.7.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "9b97f9d807b862c2de2a36e86690000801c85724"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9b97f9d807b862c2de2a36e86690000801c85724",
+                "reference": "9b97f9d807b862c2de2a36e86690000801c85724",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpspec/prophecy": "~1.3,>=1.3.1",
+                "phpunit/php-code-coverage": "~2.1",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": ">=1.0.6",
+                "phpunit/phpunit-mock-objects": "~2.3",
+                "sebastian/comparator": "~1.1",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "~1.2",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.7.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-07-13 11:28:34"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "1c330b1b6e1ea8fd15f2fbea46770576e366855c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/1c330b1b6e1ea8fd15f2fbea46770576e366855c",
+                "reference": "1c330b1b6e1ea8fd15f2fbea46770576e366855c",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "~1.0,>=1.0.2",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2015-07-04 05:41:32"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e",
+                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2015-01-29 16:28:08"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
+                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "http://www.github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-02-22 15:13:53"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5a8c7d31914337b69923db26c4221b81ff5a196e",
+                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2015-01-01 10:01:08"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "84839970d05254c73cde183a721c7af13aede943"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943",
+                "reference": "84839970d05254c73cde183a721c7af13aede943",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2015-01-27 07:23:06"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2014-10-06 09:23:50"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "3989662bbb30a29d20d9faa04a846af79b276252"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252",
+                "reference": "3989662bbb30a29d20d9faa04a846af79b276252",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2015-01-24 09:48:32"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2015-06-21 13:59:46"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.7.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Yaml.git",
+                "reference": "4bfbe0ed3909bfddd75b70c094391ec1f142f860"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/4bfbe0ed3909bfddd75b70c094391ec1f142f860",
+                "reference": "4bfbe0ed3909bfddd75b70c094391ec1f142f860",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-07-01 11:25:50"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {
+        "adodb/adodb-php": 20
+    },
+    "prefer-stable": true,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.3.0"
+    },
+    "platform-dev": []
+}
diff --git a/customer/A2B_billing_preview.php b/customer/A2B_billing_preview.php
index 2103a0e24..58ef32a77 100755
--- a/customer/A2B_billing_preview.php
+++ b/customer/A2B_billing_preview.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/A2B_entity_autodialer.php b/customer/A2B_entity_autodialer.php
index 545ff1475..62ef14bd8 100644
--- a/customer/A2B_entity_autodialer.php
+++ b/customer/A2B_entity_autodialer.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -60,7 +60,6 @@
 
         $QUERY = "INSERT INTO cc_callerid (id_cc_card, cid) VALUES ('".$_SESSION["card_id"]."', '".$add_callerid."')";
         $result = $instance_sub_table -> SQLExec ($HD_Form -> DBHandle, $QUERY, 0);
-
     }
 }
 
diff --git a/customer/A2B_entity_callerid.php b/customer/A2B_entity_callerid.php
index 34615ccef..455168895 100644
--- a/customer/A2B_entity_callerid.php
+++ b/customer/A2B_entity_callerid.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/A2B_entity_card.php b/customer/A2B_entity_card.php
index c17dadea7..0894d3847 100644
--- a/customer/A2B_entity_card.php
+++ b/customer/A2B_entity_card.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/A2B_entity_did.php b/customer/A2B_entity_did.php
index d0a23b3ba..1ea57e323 100644
--- a/customer/A2B_entity_did.php
+++ b/customer/A2B_entity_did.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -74,7 +74,7 @@
         $rate = $list_did[0][2];
     } else {
         $rate = $did_rate[1];
-        if (!is_numeric($rate)) {
+        if (!is_numeric($rate) || $rate < 0) {
             $rate = 0;
         }
     }
@@ -90,7 +90,7 @@
     $user_typepaid = $row[2];
 }
 
-/*           release the choosen did                        */
+// release the choosen did
 if ($action_release == "confirm_release") {
 
     $message = "\n\n" . gettext("The following Destinaton-DID has been relesed:") . "\n\n";
@@ -177,13 +177,13 @@
         $result = $instance_table_did_use->SQLExec($HD_Form->DBHandle, $QUERY, 0);
         if ($confirm_buy_did == 2) {
             $QUERY1 = "INSERT INTO cc_charge (id_cc_card, amount, chargetype, id_cc_did) " .
-                    "VALUES ('" . $_SESSION["card_id"] . "', '" . $rate . "', '2','" . $choose_did . "')";
+                    "VALUES ('" . $_SESSION["card_id"] . "', '" . abs($rate) . "', '2','" . $choose_did . "')";
             $result = $instance_table_did_use->SQLExec($HD_Form->DBHandle, $QUERY1, 0);
 
             $QUERY1 = "UPDATE cc_did set iduser = " . $_SESSION["card_id"] . ",reserved=1 where id = '" . $choose_did . "'";
             $result = $instance_table_did_use->SQLExec($HD_Form->DBHandle, $QUERY1, 0);
 
-            $QUERY1 = "UPDATE cc_card set credit = credit -" . $rate . " where id = '" . $_SESSION["card_id"] . "'";
+            $QUERY1 = "UPDATE cc_card set credit = credit -" . abs($rate) . " where id = '" . $_SESSION["card_id"] . "'";
             $result = $instance_table_did_use->SQLExec($HD_Form->DBHandle, $QUERY1, 0);
 
             $QUERY1 = "UPDATE cc_did_use set releasedate = now() where id_did = '" . $choose_did . "' and activated = 0";
@@ -206,14 +206,14 @@
     } else {
         if ($voip_call==1 && strpos(substr($destination, strpos( $destination, '@')),'.') === false) {
             $confirm_buy_did = 5;
-        } else {
-            if ($confirm_buy_did != 4)
-                $confirm_buy_did = 0;
+        } elseif ($confirm_buy_did != 4) {
+            $confirm_buy_did = 0;
         }
     }
 
-    if (!isset ($current_page) || ($current_page == ""))
+    if (!isset ($current_page) || ($current_page == "")) {
         $current_page = 0;
+    }
 
     if ($id != "" || !is_null($id)) {
         if (isset ($form_action) && ($form_action == 'ask-edit' || $form_action == 'edit')) {
@@ -388,17 +388,19 @@ function CheckCountry(Source)
                     <option value=''><?php echo gettext("Select Virtual Phone Number");?></option>
 
                     <?php
-                      foreach ($list_did as $recordset) {
-                      // fixrate, connection_charge, selling_rate, aleg_retail_connect_charge, aleg_retail_cost_min
-                    $price_annoucement = gettext("Monthly:").$recordset[2].' '.BASE_CURRENCY;
-                    $price_annoucement .= ';'.gettext("B-Leg Connect:").$recordset[3].' '.BASE_CURRENCY;
-                    $price_annoucement .= ';'.gettext("B-Leg Rate:").$recordset[4].' '.BASE_CURRENCY;
-                    $price_annoucement .= ';'.gettext("A-Leg Connect:").$recordset[5].' '.BASE_CURRENCY;
-                    $price_annoucement .= ';'.gettext("A-Leg Rate:").$recordset[6].' '.BASE_CURRENCY;
+                    foreach ($list_did as $recordset) {
+                        // fixrate, connection_charge, selling_rate, aleg_retail_connect_charge, aleg_retail_cost_min
+                        $price_annoucement = gettext("Monthly:").$recordset[2].' '.BASE_CURRENCY;
+                        $price_annoucement .= ';'.gettext("B-Leg Connect:").$recordset[3].' '.BASE_CURRENCY;
+                        $price_annoucement .= ';'.gettext("B-Leg Rate:").$recordset[4].' '.BASE_CURRENCY;
+                        $price_annoucement .= ';'.gettext("A-Leg Connect:").$recordset[5].' '.BASE_CURRENCY;
+                        $price_annoucement .= ';'.gettext("A-Leg Rate:").$recordset[6].' '.BASE_CURRENCY;
                     ?>
 
-                        <option class=input value='<?php echo $recordset[0]."CUR".$recordset[2] ?>'<?php if ($choose_did_rate == $recordset[0]."CUR".$recordset[2]) echo 'selected';?>><?php echo $recordset[1]?>  (<?php echo $price_annoucement; ?>)</option>
-                    <?php 	 }
+                        <option class=input value='<?php echo $recordset[0]."CUR".$recordset[2] ?>'<?php
+                        if ($choose_did_rate == $recordset[0]."CUR".$recordset[2]) echo 'selected';?>><?php echo $recordset[1]?>  (<?php echo $price_annoucement; ?>)</option>
+                    <?php
+                        }
                     ?>
                 </select>
             </td>
diff --git a/customer/A2B_entity_invoice.php b/customer/A2B_entity_invoice.php
index a2c3d2655..78df6e08d 100644
--- a/customer/A2B_entity_invoice.php
+++ b/customer/A2B_entity_invoice.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/A2B_entity_password.php b/customer/A2B_entity_password.php
index 6df64736e..d1eb48d9c 100644
--- a/customer/A2B_entity_password.php
+++ b/customer/A2B_entity_password.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/A2B_entity_phonenumber.php b/customer/A2B_entity_phonenumber.php
deleted file mode 100644
index ed0eaefae..000000000
--- a/customer/A2B_entity_phonenumber.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * This file is part of A2Billing (http://www.a2billing.net/)
- *
- * A2Billing, Commercial Open Source Telecom Billing platform,
- * powered by Star2billing S.L. <http://www.star2billing.com/>
- *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
- * @author      Belaid Arezqui <areski@gmail.com>
- * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
- * @package     A2Billing
- *
- * Software License Agreement (GNU Affero General Public License)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
-**/
-
-include './lib/customer.defines.php';
-include './lib/customer.module.access.php';
-include './lib/Form/Class.FormHandler.inc.php';
-include './form_data/FG_var_phonenumber.inc';
-include 'lib/customer.smarty.php';
-
-if (!has_rights(ACX_AUTODIALER)) {
-    Header("HTTP/1.0 401 Unauthorized");
-    Header("Location: PP_error.php?c=accessdenied");
-    die();
-}
-
-getpost_ifset(array (
-    'action',
-    'campaign'
-));
-
-if (!empty ($action) && !empty ($campaign) && is_numeric($campaign) && ($action == "run" || $action == "hold" || $action == "stop")) {
-
-    $DBHandle = DbConnect();
-    $status = 0;
-    if ($action == "stop")
-        $status = 2;
-    elseif ($action == "hold")
-        $status = 1;
-
-    $table = new Table();
-    $table->SQLExec($DBHandle, "UPDATE cc_campaign_phonestatus SET status = $status WHERE id_phonenumber =$id AND id_campaign = $campaign ");
-    Header("Location: A2B_entity_phonenumber.php?form_action=ask-edit&id=$id");
-
-}
-
-$HD_Form->setDBHandler(DbConnect());
-
-$HD_Form->init();
-
-if ($id != "" || !is_null($id)) {
-    $HD_Form->FG_EDITION_CLAUSE = str_replace("%id", "$id", $HD_Form->FG_EDITION_CLAUSE);
-}
-
-if (!isset ($form_action))
-    $form_action = "list"; //ask-add
-if (!isset ($action))
-    $action = $form_action;
-
-$list = $HD_Form->perform_action($form_action);
-
-// #### HEADER SECTION
-$smarty->display('main.tpl');
-
-// #### HELP SECTION
-echo $CC_help_phonelist;
-
-// #### TOP SECTION PAGE
-$HD_Form->create_toppage($form_action);
-
-$HD_Form->create_form($form_action, $list);
-
-if ($form_action = "ask_edit") {
-
-    $DBHandle = DbConnect();
-    $instance_table = new Table();
-
-    $QUERY_PHONENUMBERS = 'SELECT cc_campaign.id, cc_campaign.name,cc_campaign.status, cc_campaign.startingdate <= CURRENT_TIMESTAMP started ,cc_campaign.expirationdate <= CURRENT_TIMESTAMP expired  FROM cc_phonenumber , cc_phonebook , cc_campaign_phonebook, cc_campaign WHERE ';
-    //JOIN CLAUSE
-    $QUERY_PHONENUMBERS .= 'cc_phonenumber.id_phonebook = cc_phonebook.id AND cc_campaign_phonebook.id_phonebook = cc_phonebook.id AND cc_campaign_phonebook.id_campaign = cc_campaign.id ';
-    //CAMPAIGN CLAUSE
-    $QUERY_PHONENUMBERS .= 'AND cc_phonenumber.id= ' . $id;
-    $result = $instance_table->SQLExec($DBHandle, $QUERY_PHONENUMBERS);
-
-    if ($result) {
-    ?>
-         <br/>
-         <br/>
-        <table width="100%" class="editform_table1" >
-        <tr>
-            <th>
-                <?php echo gettext("CAMPAIGN") ?>
-            </th>
-            <th>
-                <?php echo gettext("INFO") ?>
-            </th>
-            <th>
-                <?php echo gettext("STATUS") ?>
-            </th>
-            <th>
-                <?php echo gettext("ACTION") ?>
-            </th>
-        </tr>
-
-        <?php
-        foreach ($result as $phone) {
-            $query = "SELECT id_callback, status FROM cc_campaign_phonestatus WHERE id_campaign = $phone[0] AND id_phonenumber = $id";
-            $res = $instance_table -> SQLExec ($DBHandle, $query);
-         ?>
-        <tr>
-            <td class="form_head" align="center" width="20%" >
-             <?php echo $phone['name'] ?>
-            </td>
-            <td  class="tableBodyRight"  background="../Public/templates/default/images/background_cells.gif" width="40%" >
-             <?php
-                 if ($phone['expired']) echo gettext("EXPIRED");
-                else if ($phone['started']) {
-                    if($res) echo gettext("STARTED AND IN PROCESS");
-                    else echo gettext("STARTED BUT NOT IN PROCESS : check the batch");
-                }else echo gettext("NOT STARTED");
-
-             ?>
-            </td>
-            <td  class="tableBodyRight"  background="../Public/templates/default/images/background_cells.gif" width="10%" >
-                 <?php
-                 if ($res) {
-                     if($res[0]['status']==0) echo gettext("RUN");
-                     elseif ($res[0]['status']==1) echo gettext("HOLD");
-                     else echo gettext("STOP");
-                 }else echo gettext("NO STATUS");
-                 ?>
-            </td>
-            <td  class="tableBodyRight"  background="../Public/templates/default/images/background_cells.gif" align="center" width="30%" >
-                 &nbsp;
-                 <?php
-                 if ($res) {
-                 ?>
-                     <a href="<?php echo "A2B_entity_phonenumber.php?action=run&id=$id&campaign=$phone[0]&section=16"?>"> <img src="<?php echo Images_Path."/control_play.png" ?>" border="0" title="<?php echo "RUN"?>" alt="<?php echo "RUN"?>"></a>
-                     <a href="<?php echo "A2B_entity_phonenumber.php?action=hold&id=$id&campaign=$phone[0]&section=16"?>"> <img src="<?php echo Images_Path."/control_pause.png" ?>" border="0" title="<?php echo "PAUSE"?>" alt="<?php echo "PAUSE"?>"></a>
-                     <a href="<?php echo "A2B_entity_phonenumber.php?action=stop&id=$id&campaign=$phone[0]&section=16"?>"> <img src="<?php echo Images_Path."/control_stop.png" ?>" border="0" title="<?php echo "STOP"?>" alt="<?php echo "STOP"?>"></a>
-
-                <?php } ?>
-            </td>
-        </tr>
-
-        <?php
-        }
-
-        ?>
-        </table>
-        <?php
-
-    }
-}
-
-// #### FOOTER SECTION
-$smarty->display('footer.tpl');
diff --git a/customer/A2B_entity_ratecard.php b/customer/A2B_entity_ratecard.php
index 59d4d1f4b..3d393bc6f 100644
--- a/customer/A2B_entity_ratecard.php
+++ b/customer/A2B_entity_ratecard.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/A2B_entity_receipt.php b/customer/A2B_entity_receipt.php
index b36497933..d662b237c 100644
--- a/customer/A2B_entity_receipt.php
+++ b/customer/A2B_entity_receipt.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/A2B_entity_sipiax_info.php b/customer/A2B_entity_sipiax_info.php
index 0a3c06eb8..bf2556e4f 100644
--- a/customer/A2B_entity_sipiax_info.php
+++ b/customer/A2B_entity_sipiax_info.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/A2B_entity_speeddial.php b/customer/A2B_entity_speeddial.php
index 69dce8734..2f625b7d3 100644
--- a/customer/A2B_entity_speeddial.php
+++ b/customer/A2B_entity_speeddial.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/A2B_entity_voucher.php b/customer/A2B_entity_voucher.php
index 4389bd7f2..051d3fbb3 100644
--- a/customer/A2B_entity_voucher.php
+++ b/customer/A2B_entity_voucher.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/A2B_invoice_view.php b/customer/A2B_invoice_view.php
index 6af4a2df5..91e72d5ba 100755
--- a/customer/A2B_invoice_view.php
+++ b/customer/A2B_invoice_view.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -226,13 +226,13 @@ function amount_convert($amount)
                     <?php echo $item->getDescription(); ?>
                 </td>
                 <td align="right">
-                    <?php echo number_format(round(amount_convert($item->getPrice()),2),2); ?>
+                    <?php echo number_format(amount_convert($item->getPrice()),2); ?>
                 </td>
                 <td align="right">
-                    <?php echo number_format(round($item->getVAT(),2),2)."%"; ?>
+                    <?php echo number_format($item->getVAT(),2)."%"; ?>
                 </td>
                 <td align="right">
-                    <?php echo number_format(round(amount_convert($item->getPrice())*(1+($item->getVAT()/100)),2),2); ?>
+                    <?php echo number_format(amount_convert($item->getPrice())*(1+($item->getVAT()/100)),2); ?>
                 </td>
             </tr>
              <?php  $i++;} ?>
@@ -241,42 +241,43 @@ function amount_convert($amount)
       </td>
     </tr>
     <?php
-        $price_without_vat = 0;
-        $price_with_vat = 0;
-        $vat_array = array();
-        foreach ($items as $item) {
-             $price_without_vat = $price_without_vat + $item->getPrice();
-            $price_with_vat = $price_with_vat + ($item->getPrice()*(1+($item->getVAT()/100)));
-            if (array_key_exists("".$item->getVAT(),$vat_array)) {
-                $vat_array[$item->getVAT()] = $vat_array[$item->getVAT()] + $item->getPrice()*($item->getVAT()/100) ;
-            } else {
-                $vat_array[$item->getVAT()] =  $item->getPrice()*($item->getVAT()/100) ;
-            }
-         }
-
-         ?>
-
+      $price_without_vat = 0;
+      $price_with_vat = 0;
+      $vat_array = array();
+      foreach ($items as $item) {
+        $price_without_vat = $price_without_vat + $item->getPrice();
+        $price_with_vat = $price_with_vat + ($item->getPrice()*(1+($item->getVAT()/100)));
+        if (array_key_exists("".$item->getVAT(),$vat_array)) {
+          $vat_array[$item->getVAT()] = $vat_array[$item->getVAT()] + $item->getPrice()*($item->getVAT()/100) ;
+        } else {
+          $vat_array[$item->getVAT()] =  $item->getPrice()*($item->getVAT()/100) ;
+        }
+      }
+    ?>
     <tr>
       <td colspan="3">
         <table class="total">
-         <tbody><tr class="extotal">
-           <td class="one"></td>
-           <td class="two"><?php echo gettext("Subtotal excl. VAT:"); ?></td>
-           <td class="three"><?php echo number_format(round(amount_convert($price_without_vat)*100)/100,2)." $display_curr"; ?></td>
-         </tr>
-
-         <?php foreach ($vat_array as $key => $val) { ?>
-                 <tr class="vat">
-                   <td class="one"></td>
-                   <td class="two"><?php echo gettext("VAT")."$key%:"; ?></td>
-                   <td class="three"><?php echo number_format(round(amount_convert($val),2),2)." $display_curr"; ?></td>
-                 </tr>
-         <?php } ?>
-         <tr class="inctotal">
-           <td class="one"></td>
-           <td class="two"><?php echo gettext("Total incl. VAT:") ?></td>
-           <td class="three"><div class="inctotal"><div class="inctotal inner"><?php echo number_format(round(amount_convert($price_with_vat)*100)/100,2)." $display_curr"; ?></div></div></td>
-         </tr>
+          <tbody><tr class="extotal">
+            <td class="one"></td>
+            <td class="two"><?php echo gettext("Subtotal excl. VAT:"); ?></td>
+            <td class="three"><?php echo number_format(amount_convert($price_without_vat),2)." $display_curr"; ?></td>
+          </tr>
+          <?php foreach ($vat_array as $key => $val) { ?>
+            <tr class="vat">
+              <td class="one"></td>
+              <td class="two"><?php echo gettext("VAT")."$key%:"; ?></td>
+              <td class="three"><?php echo number_format(amount_convert($val),2)." $display_curr"; ?></td>
+            </tr>
+          <?php } ?>
+          <tr class="inctotal">
+            <td class="one"></td>
+            <td class="two"><?php echo gettext("Total incl. VAT:") ?></td>
+            <td class="three">
+              <div class="inctotal inner">
+                <?php echo number_format(amount_convert($price_with_vat),2)." $display_curr"; ?>
+              </div>
+             </td>
+          </tr>
         </tbody></table>
       </td>
     </tr>
diff --git a/customer/A2B_notification.php b/customer/A2B_notification.php
index 1ac8617b4..818dbe743 100644
--- a/customer/A2B_notification.php
+++ b/customer/A2B_notification.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/A2B_receipt_detail.php b/customer/A2B_receipt_detail.php
index 5567d54ac..b9c4c282c 100755
--- a/customer/A2B_receipt_detail.php
+++ b/customer/A2B_receipt_detail.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -147,7 +147,7 @@ function amount_convert($amount)
                     <?php echo $item->getDescription(); ?>
                 </td>
                 <td align="right">
-                    <?php echo number_format(round(amount_convert($item->getPrice()),6),6); ?>
+                    <?php echo number_format(amount_convert($item->getPrice()),6); ?>
                 </td>
             </tr>
              <?php  $i++;} ?>
@@ -165,20 +165,28 @@ function amount_convert($amount)
     <tr>
       <td colspan="3">
         <table class="total">
-         <tbody>
-         <?php if ($nb_page>1) { ?>
-         <tr class="extotal">
-           <td class="one"></td>
-           <td class="two"><?php echo gettext("Total Page");" "+$page ?></td>
-           <td class="three"><div class="inctotal"><div class="inctotal inner"><?php echo number_format(ceil(amount_convert(ceil($price*100)/100)*100)/100,2)." $display_curr"; ?></div></div></td>
-         </tr>
-         <?php } else { ?>
-         <?php } ?>
-         <tr class="inctotal">
-           <td class="one"></td>
-           <td class="two"><?php echo gettext("Total Receipt :") ?></td>
-           <td class="three"><div class="inctotal"><div class="inctotal inner"><?php echo number_format(ceil(amount_convert(ceil($totalprice*100)/100)*100)/100,2)." $display_curr"; ?></div></div></td>
-         </tr>
+          <tbody>
+          <?php if ($nb_page>1) { ?>
+          <tr class="extotal">
+            <td class="one"></td>
+            <td class="two"><?php echo gettext("Total Page");" "+$page ?></td>
+            <td class="three">
+              <div class="inctotal inner">
+                <?php echo number_format(amount_convert($price),2)." $display_curr"; ?></div>
+              </div>
+            </td>
+          </tr>
+          <?php } else { ?>
+          <?php } ?>
+          <tr class="inctotal">
+            <td class="one"></td>
+            <td class="two"><?php echo gettext("Total Receipt :") ?></td>
+            <td class="three">
+              <div class="inctotal inner">
+                <?php echo number_format(amount_convert($totalprice),2)." $display_curr"; ?>
+              </div>
+            </td>
+          </tr>
         </tbody></table>
       </td>
     </tr>
diff --git a/customer/A2B_receipt_preview_detail.php b/customer/A2B_receipt_preview_detail.php
index 95cbbd43f..df43f9599 100644
--- a/customer/A2B_receipt_preview_detail.php
+++ b/customer/A2B_receipt_preview_detail.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -229,7 +229,7 @@ function amount_convert($amount)
                                     <?php echo $item->getDescription(); ?>
                                 </td>
                                 <td align="right">
-                                    <?php echo number_format(round(amount_convert($item->getPrice()),6),6); ?>
+                                    <?php echo number_format(amount_convert($item->getPrice()),6); ?>
                                 </td>
                             </tr>
                             <?php
@@ -254,13 +254,20 @@ function amount_convert($amount)
                             <tr class="extotal">
                                 <td class="one"></td>
                                 <td class="two"><?php echo gettext("Total Page")." ".$page ?></td>
-                                <td class="three"><div class="inctotal"><div class="inctotal inner"><?php echo number_format(ceil(amount_convert(ceil($price*100)/100)*100)/100,2)." $display_curr"; ?></div></div></td>
+                                <td class="three"><div class="inctotal">
+                                    <div class="inctotal inner">
+                                        <?php echo number_format(amount_convert($price),2)." $display_curr"; ?></div>
+                                    </div>
+                                </td>
                             </tr>
             <?php } ?>
                             <tr class="inctotal">
                                 <td class="one"></td>
                                 <td class="two"><?php echo gettext("Total Receipt :") ?></td>
-                                <td class="three"><div class="inctotal"><div class="inctotal inner"><?php echo number_format(ceil(amount_convert(ceil($totalprice*100)/100)*100)/100,2)." $display_curr"; ?></div></div></td>
+                                <td class="three">
+                                    <div class="inctotal inner"><?php echo number_format(amount_convert($totalprice),2)." $display_curr"; ?>
+                                    </div>
+                                </td>
                             </tr>
                         </tbody></table>
                 </td>
diff --git a/customer/A2B_receipt_view.php b/customer/A2B_receipt_view.php
index 0ce95bc3b..6514c2f2e 100755
--- a/customer/A2B_receipt_view.php
+++ b/customer/A2B_receipt_view.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -212,7 +212,7 @@ function amount_convert($amount)
                     <?php echo $item->getDescription(); ?>
                 </td>
                 <td align="right">
-                    <?php echo number_format(round(amount_convert($item->getPrice()),2),2); ?>
+                    <?php echo number_format(amount_convert($item->getPrice()),3); ?>
                 </td>
             </tr>
              <?php  $i++;} ?>
@@ -221,22 +221,26 @@ function amount_convert($amount)
       </td>
     </tr>
     <?php
-        $price = 0;
-        foreach ($items as $item) {
-             $price = $price + $item->getPrice();
-        }
+    $price = 0;
+    foreach ($items as $item) {
+        $price = $price + $item->getPrice();
+    }
     ?>
 
     <tr>
       <td colspan="3">
         <table class="total">
-             <tbody>
-             <tr class="inctotal">
-               <td class="one"></td>
-               <td class="two"><?php echo gettext("Total:") ?></td>
-               <td class="three"><div class="inctotal"><div class="inctotal inner"><?php echo number_format(ceil(amount_convert($price)*100)/100,2)." $display_curr"; ?></div></div></td>
-             </tr>
-            </tbody>
+          <tbody>
+            <tr class="inctotal">
+              <td class="one"></td>
+              <td class="two"><?php echo gettext("Total:") ?></td>
+              <td class="three">
+                <div class="inctotal inner">
+                  <?php echo number_format(amount_convert($price),3)." $display_curr"; ?>
+                </div>
+              </td>
+            </tr>
+          </tbody>
         </table>
       </td>
     </tr>
diff --git a/customer/A2B_recurring_payment.php b/customer/A2B_recurring_payment.php
index a9d093cf4..3eb619caa 100644
--- a/customer/A2B_recurring_payment.php
+++ b/customer/A2B_recurring_payment.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/A2B_support.php b/customer/A2B_support.php
index 34992d5d8..164e538ee 100644
--- a/customer/A2B_support.php
+++ b/customer/A2B_support.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/A2B_ticket_view.php b/customer/A2B_ticket_view.php
index 87b206a08..68dcbfc3e 100644
--- a/customer/A2B_ticket_view.php
+++ b/customer/A2B_ticket_view.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/CC_entity_edit_did_destination.php b/customer/CC_entity_edit_did_destination.php
index d01ac5289..bd4f31011 100644
--- a/customer/CC_entity_edit_did_destination.php
+++ b/customer/CC_entity_edit_did_destination.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -1082,7 +1082,6 @@ function sendtolittle(direction)
           </b></div>
       </blockquote>
       <br>
-
             <TABLE width="85%" border=0 align="center" cellPadding=2 cellSpacing=2 style="PADDING-BOTTOM: 7px; PADDING-LEFT: 5px; PADDING-RIGHT: 5px; PADDING-TOP: 5px">
                   <FORM action=<?php echo $PHP_SELF?> id=form1 method=post name=form1>
                   <INPUT type="hidden" name="id" value="<?php echo $id?>">
diff --git a/customer/CC_entity_edit_speeddial.php b/customer/CC_entity_edit_speeddial.php
index 413d3fd19..e169815db 100644
--- a/customer/CC_entity_edit_speeddial.php
+++ b/customer/CC_entity_edit_speeddial.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/PP_error.php b/customer/PP_error.php
index 9b6ba4224..b36727179 100644
--- a/customer/PP_error.php
+++ b/customer/PP_error.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/activate.php b/customer/activate.php
index e0a46e0d0..875379a02 100644
--- a/customer/activate.php
+++ b/customer/activate.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/call-history.php b/customer/call-history.php
index 29decec05..47842a5f8 100644
--- a/customer/call-history.php
+++ b/customer/call-history.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/callback.php b/customer/callback.php
index 7048aaece..8bc3c184a 100644
--- a/customer/callback.php
+++ b/customer/callback.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/captcha/captcha_gd.php b/customer/captcha/captcha_gd.php
index 98dd58d89..62c33c027 100755
--- a/customer/captcha/captcha_gd.php
+++ b/customer/captcha/captcha_gd.php
@@ -16,9 +16,9 @@
 */
 class captcha
 {
-    public $width = 240;
-    public $height = 60;
-    public $captcha_gd_noise = 1;
+    public $width = 300;
+    public $height = 80;
+    public $captcha_gd_noise = 0;
 
     public function execute($code, $seed)
     {
diff --git a/customer/card-history.php b/customer/card-history.php
index faa05db22..0c34155f8 100644
--- a/customer/card-history.php
+++ b/customer/card-history.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/checkout_confirmation.php b/customer/checkout_confirmation.php
index e8009409e..b3eb0b5c3 100644
--- a/customer/checkout_confirmation.php
+++ b/customer/checkout_confirmation.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/checkout_payment.php b/customer/checkout_payment.php
index 069f0fa64..b6ab761e3 100644
--- a/customer/checkout_payment.php
+++ b/customer/checkout_payment.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -96,22 +96,18 @@
 
 ?>
 <script language="javascript">
-function checkamount()
-{
-     if (document.checkout_amount.amount == "") {
-        alert('Please enter some amount.');
 
+function checkamount() {
+    if (document.checkout_amount.amount == "") {
+        alert('Please enter some amount.');
         return false;
     }
-
     return true;
 }
-</script>
-<script language="javascript"><!--
+
 var selected;
 
-function selectRowEffect(object, buttonSelect)
-{
+function selectRowEffect(object, buttonSelect) {
     if (!selected) {
         if (document.getElementById) {
             selected = document.getElementById('defaultSelected');
@@ -123,7 +119,6 @@ function selectRowEffect(object, buttonSelect)
     if (selected) selected.className = 'moduleRow';
     object.className = 'moduleRowSelected';
     selected = object;
-
     // one button is not an array
     if (document.checkout_payment.payment[0]) {
         document.checkout_payment.payment[buttonSelect].checked=true;
@@ -132,13 +127,11 @@ function selectRowEffect(object, buttonSelect)
     }
 }
 
-function rowOverEffect(object)
-{
+function rowOverEffect(object) {
     if (object.className == 'moduleRow') object.className = 'moduleRowOver';
 }
 
-function rowOutEffect(object)
-{
+function rowOutEffect(object) {
     if (object.className == 'moduleRowOver') object.className = 'moduleRow';
 }
 //--></script>
@@ -155,11 +148,19 @@ function rowOutEffect(object)
 $form_action_url = tep_href_link("checkout_confirmation.php", '', 'SSL');
 echo tep_draw_form('checkout_amount', $form_action_url, 'post', 'onsubmit="checkamount()"');
 ?>
+    <?php
+        if ($HD_Form->FG_CSRF_STATUS == true) {
+    ?>
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+        <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+    <?php
+        }
+    ?>
 
-    <input name="item_id" type=hidden value="<?php echo $item_id?>">
-    <input name="item_type" type=hidden value="<?php echo $item_type?>">
+    <input name="item_id" type="hidden" value="<?php echo $item_id?>">
+    <input name="item_type" type="hidden" value="<?php echo $item_type?>">
 
-    <table width="80%" cellspacing="0" cellpadding="2" align=center>
+    <table width="80%" cellspacing="0" cellpadding="2" align="center">
     <?php
     if (isset($payment_error) && is_object(${$payment_error}) && ($error = ${$payment_error}->get_error())) {
           write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__." ERROR ".$error['title']." ".$error['error']);
@@ -344,15 +345,16 @@ function rowOutEffect(object)
          <br/>
 
       <table class="infoBox" width="80%" cellspacing="0" cellpadding="2" align=center>
-          <tr height="20">
-          <td  align=left class="main"> <b>Continue Checkout Procedure</b><br>to confirm this order.
-
+        <tr height="20">
+          <td  align=left class="main">
+              <b>Continue Checkout Procedure</b><br>to confirm this order.
           </td>
           <td align=right halign=center >
-            <input type="image" src="<?php echo Images_Path;?>/button_continue.gif" alt="Continue" border="0" title="Continue">
-             &nbsp;</td>
-          </tr>
-         </table>
+              <input type="image" src="<?php echo Images_Path;?>/button_continue.gif" alt="Continue" border="0" title="Continue">
+              &nbsp;
+          </td>
+        </tr>
+      </table>
          <?php } ?>
      </form>
 
diff --git a/customer/checkout_process.php b/customer/checkout_process.php
index 4b64e275f..032e11dac 100644
--- a/customer/checkout_process.php
+++ b/customer/checkout_process.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -33,21 +33,25 @@
 
 include './lib/customer.defines.php';
 
-getpost_ifset(array('transactionID', 'sess_id', 'key', 'mc_currency', 'currency', 'md5sig', 'merchant_id', 'mb_amount', 'status', 'mb_currency',
-                    'transaction_id', 'mc_fee', 'card_number'));
+getpost_ifset(array('transactionID', 'sess_id', 'key', 'mc_currency', 'currency', 'md5sig', 'merchant_id', 'mb_amount', 'status', 'mb_currency', 'transaction_id', 'mc_fee', 'card_number'));
 
-write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."EPAYMENT : transactionID=$transactionID - transactionKey=$key \n -POST Var \n".print_r($_POST, true));
+$trans_str = "transactionID=$transactionID";
 
-if ($sess_id =="") {
-    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." ERROR NO SESSION ID PROVIDED IN RETURN URL TO PAYMENT MODULE");
+write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."EPAYMENT : $trans_str - transactionKey=$key \n -Vars: $transactionID : $sess_id : $transaction_id : $card_number");
+
+write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."EPAYMENT : $trans_str - transactionKey=$key \n -POST Var \n".print_r($_POST, true));
+
+if (!intval($transactionID) > 0) {
+    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : Wrong transactionID ($transactionID) provided in request");
     exit();
 }
 
-if ($transactionID == "") {
-    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." NO TRANSACTION ID PROVIDED IN REQUEST");
+if ($sess_id == "") {
+    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : Error no session id provided in return url to payment module");
     exit();
 }
 
+
 include './lib/customer.module.access.php';
 include './lib/Form/Class.FormHandler.inc.php';
 include './lib/epayment/classes/payment.php';
@@ -79,18 +83,18 @@
 $amount = $transaction_data[0][2];
 $item_type = $transaction_data[0][14];
 
-//Update the Transaction Status to 1
+//Update the Transaction Status to 2
 $QUERY = "UPDATE cc_epayment_log SET status = 2 WHERE id = ".$transactionID;
 write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."- QUERY = $QUERY");
 $paymentTable->SQLExec ($DBHandle_max, $QUERY);
 
 if (!is_array($transaction_data) && count($transaction_data) == 0) {
     write_log(LOGFILE_EPAYMENT, basename(__FILE__).
-        ' line:'.__LINE__."- transactionID=$transactionID"." ERROR INVALID TRANSACTION ID PROVIDED, TRANSACTION ID =".$transactionID);
+        ' line:'.__LINE__."- $trans_str : ERROR INVALID TRANSACTION ID PROVIDED, TRANSACTION ID =".$transactionID);
     exit();
 } else {
     write_log(LOGFILE_EPAYMENT, basename(__FILE__).
-        ' line:'.__LINE__."- transactionID=$transactionID"." EPAYMENT RESPONSE: TRANSACTIONID = ".$transactionID.
+        ' line:'.__LINE__."- $trans_str : EPAYMENT RESPONSE: TRANSACTIONID = ".$transactionID.
         " FROM ".$transaction_data[0][4]."; FOR CUSTOMER ID ".$transaction_data[0][1]."; OF AMOUNT ".$transaction_data[0][2]);
 }
 
@@ -99,19 +103,16 @@
 
 $currencyObject = new currencies();
 $currencies_list = get_currencies();
+
 switch ($transaction_data[0][4]) {
     case "paypal":
+        // Set currency & Amount
         $currCurrency = $mc_currency;
         if ($A2B->config['epayment_method']['charge_paypal_fee']==1) {
             $currAmount = $transaction_data[0][2] ;
         } else {
             $currAmount = $transaction_data[0][2] - $mc_fee;
         }
-        $postvars = array();
-        $req = 'cmd=_notify-validate';
-        foreach ($_POST as $vkey => $Value) {
-            $req .= "&" . $vkey . "=" . urlencode ($Value);
-        }
 
         // Check amount is correct
         if (intval($amount) != intval($_POST['mc_gross'])){
@@ -120,42 +121,68 @@
             sleep(3);
         }
 
-        // Headers PayPal system to validate
-        $header .= "POST /cgi-bin/webscr HTTP/1.1\r\n";
-        $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-        $header .= "Host: www.paypal.com\r\n";
-        $header .= "Content-Length: " . strlen ($req) . "\r\n\r\n";
-        for ($i = 1; $i <=3; $i++) {
-            write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-OPENDING HTTP CONNECTION TO ".PAYPAL_VERIFY_URL);
-            $fp = fsockopen (PAYPAL_VERIFY_URL, 443, $errno, $errstr, 30);
-            if ($fp) {
-                break;
-            } else {
-                write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__." -Try#".$i." Failed to open HTTP Connection : ".$errstr.". Error Code: ".$errno);
-                sleep(3);
-            }
+        // Reading POSTed data directly from $_POST causes serialization issues with array data in the POST.
+        // Instead, read raw POST data from the input stream.
+        $raw_post_data = file_get_contents('php://input');
+        $raw_post_array = explode('&', $raw_post_data);
+        $myPost = array();
+        foreach ($raw_post_array as $keyval) {
+          $keyval = explode ('=', $keyval);
+          if (count($keyval) == 2)
+             $myPost[$keyval[0]] = urldecode($keyval[1]);
+        }
+        // read the IPN message sent from PayPal and prepend 'cmd=_notify-validate'
+        $req = 'cmd=_notify-validate';
+        if(function_exists('get_magic_quotes_gpc')) {
+           $get_magic_quotes_exists = true;
         }
-        if (!$fp) {
-            write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-Failed to open HTTP Connection: ".$errstr.". Error Code: ".$errno);
-            exit();
+        foreach ($myPost as $lkey => $value) {
+           if($get_magic_quotes_exists == true && get_magic_quotes_gpc() == 1) {
+                $value = urlencode(stripslashes($value));
+           } else {
+                $value = urlencode($value);
+           }
+           $req .= "&$lkey=$value";
+        }
+
+        // Step 2: POST IPN data back to PayPal to validate
+
+        define("USE_PAYPAL_SANDBOX", false);
+        if (USE_PAYPAL_SANDBOX == true) {
+            $paypal_url = "https://www.sandbox.paypal.com/cgi-bin/webscr";
         } else {
-            fputs ($fp, $header . $req);
-            $flag_ver = False;
-            while (!feof($fp)) {
-                $res = fgets ($fp, 1024);
-                $gather_res .= $res;
-                $res = trim($res);
-                if (strcmp ($res, "VERIFIED") == 0) {
-                    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-PAYPAL Transaction Verification Status: Verified ");
-                    $flag_ver = True;
-                }
-            }
-            if (!$flag_ver) {
-                write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-PAYPAL Transaction Verification Status: Failed \nreq=$req\n$gather_res");
+            $paypal_url = "https://www.paypal.com/cgi-bin/webscr";
+        }
+        $ch = curl_init($paypal_url);
+        curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+        curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $req);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+        curl_setopt($ch, CURLOPT_FORBID_REUSE, 1);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, array('Connection: Close'));
+        // In wamp-like environments that do not come bundled with root authority certificates,
+        // please download 'cacert.pem' from "http://curl.haxx.se/docs/caextract.html" and set
+        // the directory path of the certificate as shown below:
+        // curl_setopt($ch, CURLOPT_CAINFO, dirname(__FILE__) . '/cacert.pem');
+        if( !($res = curl_exec($ch)) ) {
+            write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__." Got " . curl_error($ch) . " when processing IPN data");
+            curl_close($ch);
+            exit;
+        }
+        curl_close($ch);
+
+        // inspect IPN validation result and act accordingly
+        if (strcmp ($res, "VERIFIED") == 0) {
+            // The IPN is verified, process it
+            write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-PAYPAL Transaction Verification Status: Verified ");
+        } else if (strcmp ($res, "INVALID") == 0) {
+            // IPN invalid, log for manual investigation
+            write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-PAYPAL Transaction Verification Status: Failed \nreq: $req\nres: $res");
                 $security_verify = false;
-            }
         }
-        fclose ($fp);
+
         break;
 
     case "moneybookers":
@@ -249,7 +276,7 @@
         //TODO create mail class for agent
         $mail = new Mail('epaymentverify', $id);
     } catch (A2bMailException $e) {
-        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." ERROR NO EMAIL TEMPLATE FOUND");
+        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : ERROR NO EMAIL TEMPLATE FOUND");
         exit();
     }
     $mail->replaceInEmail(Mail::$TIME_KEY,date("y-m-d H:i:s"));
@@ -269,7 +296,7 @@
     write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."----NEW KEY =".$newkey." OLD KEY= ".$key." ------- Transaction Key Verification Failed:".$transaction_data[0][8]."^".$transactionID."^".$transaction_data[0][2]."^".$transaction_data[0][1]." ------------\n");
     exit();
 }
-write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." ---------- TRANSACTION INFO ------------\n".print_r($transaction_data,1));
+write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : ---------- TRANSACTION INFO ------------\n".print_r($transaction_data,1));
 $payment_modules = new payment($transaction_data[0][4]);
 // load the before_process function from the payment modules
 //$payment_modules->before_process();
@@ -280,7 +307,7 @@
 if ($resmax) {
     $numrow = $resmax -> RecordCount();
 } else {
-    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." ERROR NO SUCH CUSTOMER EXISTS, CUSTOMER ID = ".$transaction_data[0][1]);
+    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : ERROR NO SUCH CUSTOMER EXISTS, CUSTOMER ID = ".$transaction_data[0][1]);
     exit(gettext("No Such Customer exists."));
 }
 $customer_info = $resmax -> fetchRow();
@@ -302,7 +329,7 @@
     $inv_vat_amount= $inv_amount * $VAT / 100;
     $inv_total_amount = $inv_amount + ($inv_amount * $VAT / 100);
     if ($inv_total_amount != $amount) {
-        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." ERROR PAYMENT INVOICE $inv_total_amount != $amount_paid");
+        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : ERROR PAYMENT INVOICE $inv_total_amount != $amount_paid");
         exit();
     }
 }
@@ -325,9 +352,9 @@
     if ($customer_info[0] == $list_tariff_card[0][0]) {
         $id = $list_tariff_card[0][1];
     }
-    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." CARD FOUND IN DB ($id)");
+    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : CARD FOUND IN DB ($id)");
 } else {
-    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." ERROR CUSTOMER INFO OR ORDERSTATUS ($orderStatus)\n".print_r($_POST, true)."\n");
+    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : ERROR CUSTOMER INFO OR ORDERSTATUS ($orderStatus)\n".print_r($_POST, true)."\n");
 }
 
 if ($id > 0) {
@@ -338,7 +365,7 @@
         $param_update .= " credit = credit+'".$amount_without_vat."'";
         $FG_EDITION_CLAUSE = " id='$id'";
         $instance_table -> Update_table ($DBHandle, $param_update, $FG_EDITION_CLAUSE, $func_table = null);
-        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." Update_table cc_card : $param_update - CLAUSE : $FG_EDITION_CLAUSE");
+        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : Update_table cc_card : $param_update - CLAUSE : $FG_EDITION_CLAUSE");
 
         $table_transaction = new Table();
         $result_agent = $table_transaction -> SQLExec($DBHandle,"SELECT cc_card_group.id_agent FROM cc_card LEFT JOIN cc_card_group ON cc_card_group.id = cc_card.id_group WHERE cc_card.id = $id");
@@ -354,13 +381,13 @@
         $value_insert = "'$nowDate', '".$amount_without_vat."', '$id', '".$transaction_data[0][4]."',$id_agent_insert";
         $instance_sub_table = new Table("cc_logrefill", $field_insert);
         $id_logrefill = $instance_sub_table -> Add_table ($DBHandle, $value_insert, null, null, 'id');
-        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." Add_table cc_logrefill : $field_insert - VALUES $value_insert");
+        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : Add_table cc_logrefill : $field_insert - VALUES $value_insert");
 
         $field_insert = "date, payment, card_id, id_logrefill, description, agent_id";
         $value_insert = "'$nowDate', '".$amount_paid."', '$id', '$id_logrefill', '".$transaction_data[0][4]."',$id_agent_insert ";
         $instance_sub_table = new Table("cc_logpayment", $field_insert);
         $id_payment = $instance_sub_table -> Add_table ($DBHandle, $value_insert, null, null,"id");
-        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." Add_table cc_logpayment : $field_insert - VALUES $value_insert");
+        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : Add_table cc_logpayment : $field_insert - VALUES $value_insert");
 
         //ADD an INVOICE
         $reference = generate_invoice_reference();
@@ -411,13 +438,13 @@
                 $value_insert = "'".$id_payment."', '$id', '$commission','$description_commission','$id_agent','$commission_percent','0'";
                 $commission_table = new Table("cc_agent_commission", $field_insert);
                 $id_commission = $commission_table -> Add_table ($DBHandle, $value_insert, null, null,"id");
-                write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." Add_table cc_agent_commission : $field_insert - VALUES $value_insert");
+                write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : Add_table cc_agent_commission : $field_insert - VALUES $value_insert");
 
                 $table_agent = new Table('cc_agent');
                 $param_update_agent = "com_balance = com_balance + '".$commission."'";
                 $clause_update_agent = " id='".$id_agent."'";
                 $table_agent -> Update_table ($DBHandle, $param_update_agent, $clause_update_agent, $func_table = null);
-                write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." Update_table cc_agent : $param_update_agent - CLAUSE : $clause_update_agent");
+                write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : Update_table cc_agent : $param_update_agent - CLAUSE : $clause_update_agent");
             }
 
         }
@@ -435,7 +462,7 @@
                 $value_insert = "'$nowDate', '".$amount_paid."', '$id', '(".$transaction_data[0][4].") ".gettext('Invoice Payment Ref: ')."$reference '";
                 $instance_sub_table = new Table("cc_logpayment", $field_insert);
                 $id_payment = $instance_sub_table -> Add_table ($DBHandle, $value_insert, null, null,"id");
-                write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." Add_table cc_logpayment : $field_insert - VALUES $value_insert");
+                write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : Add_table cc_logpayment : $field_insert - VALUES $value_insert");
 
                 //update invoice to paid
                 $invoice = new Invoice($item_id);
@@ -538,11 +565,11 @@
 }
 
 if ( ($orderStatus == 0) && ($transaction_data[0][4]=='iridium')) {
-    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." EPAYMENT ORDER STATUS  = ".$statusmessage);
+    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : EPAYMENT ORDER STATUS  = ".$statusmessage);
     die();
 }
 
-write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." EPAYMENT ORDER STATUS  = ".$statusmessage);
+write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : EPAYMENT ORDER STATUS  = ".$statusmessage);
 
 // CHECK IF THE EMAIL ADDRESS IS CORRECT
 if (preg_match("/^[a-z]+[a-z0-9_-]*(([.]{1})|([a-z0-9_-]*))[a-z0-9_-]+[@]{1}[a-z0-9_-]+[.](([a-z]{2,3})|([a-z]{3}[.]{1}[a-z]{2}))$/i", $customer_info["email"])) {
@@ -559,7 +586,7 @@
         $mail->send($customer_info["email"]);
 
         write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-SENDING EMAIL TO CUSTOMER ".$customer_info["email"]);
-        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"."- MAILTO:".$customer_info["email"]."-Sub=".$mail->getTitle()." , mtext=".$mail->getMessage());
+        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str :- MAILTO:".$customer_info["email"]."-Sub=".$mail->getTitle()." , mtext=".$mail->getMessage());
 
         // Add Post information / useful to track down payment transaction without having to log
         $mail->AddToMessage("\n\n\n\n"."-POST Var \n".print_r($_POST, true));
@@ -567,17 +594,17 @@
         $mail->send(ADMIN_EMAIL);
 
     } catch (A2bMailException $e) {
-        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." ERROR NO EMAIL TEMPLATE FOUND");
+        write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : ERROR NO EMAIL TEMPLATE FOUND");
     }
 
 } else {
-    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." Customer : no email info !!!");
+    write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : Customer : no email info !!!");
 }
 
 // load the after_process function from the payment modules
 $payment_modules->after_process();
-write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." EPAYMENT ORDER STATUS ID = ".$orderStatus." ".$statusmessage);
-write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-transactionID=$transactionID"." ----EPAYMENT TRANSACTION END----");
+write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : EPAYMENT ORDER STATUS ID = ".$orderStatus." ".$statusmessage);
+write_log(LOGFILE_EPAYMENT, basename(__FILE__).' line:'.__LINE__."-$trans_str : ----EPAYMENT TRANSACTION END----");
 
 if ($transaction_data[0][4]=='plugnpay') {
     Header ("Location: userinfo.php");
diff --git a/customer/checkout_success.php b/customer/checkout_success.php
index f10b3b89d..3066556b9 100644
--- a/customer/checkout_success.php
+++ b/customer/checkout_success.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/cvv.php b/customer/cvv.php
index 676b24223..668180b7a 100644
--- a/customer/cvv.php
+++ b/customer/cvv.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/forgotpassword.php b/customer/forgotpassword.php
index ca1c1cb62..a648877b2 100644
--- a/customer/forgotpassword.php
+++ b/customer/forgotpassword.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/form_data/FG_var_callerid.inc b/customer/form_data/FG_var_callerid.inc
index 063b2d694..9a5c8686e 100644
--- a/customer/form_data/FG_var_callerid.inc
+++ b/customer/form_data/FG_var_callerid.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -66,12 +66,12 @@ if (strlen($HD_Form -> FG_TABLE_CLAUSE)>0)
     $HD_Form -> FG_TABLE_CLAUSE.=" AND ";
 
 $HD_Form -> FG_TABLE_CLAUSE.="id_cc_card =".$_SESSION["card_id"];
-	
+
 if (strlen($HD_Form -> FG_EDITION_CLAUSE)>0)
     $HD_Form -> FG_EDITION_CLAUSE.=" AND ";
 
 $HD_Form -> FG_EDITION_CLAUSE.="id_cc_card =".$_SESSION["card_id"];
-	
+
 
 $HD_Form -> FG_ADDITION = true;
 $HD_Form -> FG_EDITION = true;
@@ -107,7 +107,7 @@ $HD_Form -> FieldEditElement ('cid, activated');
 if (isset($filterprefix)  &&  (strlen($filterprefix)>0)) {
     if (strlen($HD_Form -> FG_TABLE_CLAUSE)>0)
         $HD_Form -> FG_TABLE_CLAUSE.=" AND ";
-    
+
     $HD_Form -> FG_TABLE_CLAUSE.="cid like '$filterprefix%'";
 }
 
@@ -127,9 +127,9 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Made your change to edit this callerid.");
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
 
diff --git a/customer/form_data/FG_var_campaign.inc b/customer/form_data/FG_var_campaign.inc
index 138a562b3..cddc2ecf8 100644
--- a/customer/form_data/FG_var_campaign.inc
+++ b/customer/form_data/FG_var_campaign.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -77,7 +77,7 @@ $HD_Form -> AddViewElement(gettext("STATUS"), "status", "5%", "center", "sort",
 $HD_Form -> FieldViewElement ('cc_campaign.name, cc_campaign.startingdate, cc_campaign.expirationdate, username,cc_campaign.status');
 
 
-$HD_Form -> CV_NO_FIELDS  = gettext("No campaigns have been created."); 
+$HD_Form -> CV_NO_FIELDS  = gettext("No campaigns have been created.");
 $HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
 $HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
 $HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
@@ -117,11 +117,10 @@ $HD_Form -> AddEditElement (gettext("CONFIG TO APPLY"),
    "cc_campaign_config.id = id_campaign_config AND id_card_group = cc_card_group.id AND cc_card_group.id = cc_card.id_group AND cc_card.id = $id_card", "", "%1 (%3 ".strtoupper(BASE_CURRENCY)." ) ", "", gettext("Define the configuration that you want apply on this campaign"));
 
 
-
 // TODO integrate in new framework
 if ($form_action=="ask-add") {
 	$begin_date = date("Y");
-	$begin_date_plus = date("Y")+25;
+	$begin_date_plus = date("Y") + 10;
 	$end_date = date("-m-d H:i:s");
 	$time = "value= '10:00:00'";
 	$time_plus = "value= '18:00:00'";
@@ -165,7 +164,7 @@ $HD_Form -> AddEditElement (gettext("FREQUENCY"),
 	"size=20 maxlength=10",
 	"4",
 	gettext("Insert the frequency of callback in min "),
-	"" , "", "", "", "" , "", "", gettext("Please insert the frequency in minutes"));	
+	"" , "", "", "", "" , "", "", gettext("Please insert the frequency in minutes"));
 
 $HD_Form -> AddEditElement (gettext("DAILY STARTING TIME"),
 	"daily_start_time",
@@ -193,7 +192,7 @@ $HD_Form -> AddEditElement (gettext("MONDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the monday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-   
+
 $HD_Form -> AddEditElement (gettext("TUESDAY"),
    "tuesday",
    '1',
@@ -202,7 +201,7 @@ $HD_Form -> AddEditElement (gettext("TUESDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the monday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-   
+
 $HD_Form -> AddEditElement (gettext("WEDNESDAY"),
    "wednesday",
    '1',
@@ -211,7 +210,7 @@ $HD_Form -> AddEditElement (gettext("WEDNESDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the monday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-   
+
 $HD_Form -> AddEditElement (gettext("THURSDAY"),
    "thursday",
    '1',
@@ -220,7 +219,7 @@ $HD_Form -> AddEditElement (gettext("THURSDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the thursday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-   
+
 $HD_Form -> AddEditElement (gettext("FRIDAY"),
    "friday",
    '1',
@@ -229,7 +228,7 @@ $HD_Form -> AddEditElement (gettext("FRIDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the friday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-   
+
 $HD_Form -> AddEditElement (gettext("SATURDAY"),
    "saturday",
    '0',
@@ -238,7 +237,7 @@ $HD_Form -> AddEditElement (gettext("SATURDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the saturday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-   
+
 $HD_Form -> AddEditElement (gettext("SUNDAY"),
    "sunday",
    '0',
@@ -247,7 +246,7 @@ $HD_Form -> AddEditElement (gettext("SUNDAY"),
    "",
    gettext("Choose if you want to enable the campaign callback for the sunday"),
    "" , "", "", "Yes :1, - No:0", "", "" , "", "");
-	
+
 $HD_Form -> AddEditElement (gettext("DESCRIPTION"),
 	"description",
 	'',
@@ -266,20 +265,20 @@ if ($form_action!="ask-delete") {
 	$resmax = $DBHandle_max -> Execute("SELECT * FROM cc_phonebook");
 	if ( $resmax )
 		$numrow = $resmax -> RecordCount( );
-	
-	if ($numrow>0){ 
+
+	if ($numrow>0){
 		$HD_Form -> AddEditElement (gettext("PHONE BOOK"),
-			"phonebook",	
-			'$value',	
-			"SELECT",		
+			"phonebook",
+			'$value',
+			"SELECT",
 			'size="10" multiple="multiple"',
-			"",		
-			"",	
-			"sql",		
-			"campaigns_phonebooks",	
-			"name, id",		
-			"", "", "%1 : (%2)", "", "", "cc_campaign_phonebook:id_phonebook:cc_phonebook LEFT JOIN cc_campaign_phonebook ON cc_phonebook.id=cc_campaign_phonebook.id_phonebook :DISTINCT cc_phonebook.name, cc_phonebook.id: cc_campaign_phonebook.id_campaign = %id:id_campaign:%2 - (%1)::::%1:id='%1'::::id_card=".$_SESSION['card_id']);		
-		
+			"",
+			"",
+			"sql",
+			"campaigns_phonebooks",
+			"name, id",
+			"", "", "%1 : (%2)", "", "", "cc_campaign_phonebook:id_phonebook:cc_phonebook LEFT JOIN cc_campaign_phonebook ON cc_phonebook.id=cc_campaign_phonebook.id_phonebook :DISTINCT cc_phonebook.name, cc_phonebook.id: cc_campaign_phonebook.id_campaign = %id:id_campaign:%2 - (%1)::::%1:id='%1'::::id_card=".$_SESSION['card_id']);
+
 	}
 }
 
diff --git a/customer/form_data/FG_var_card.inc b/customer/form_data/FG_var_card.inc
index ca7efdfcd..1d279148c 100755
--- a/customer/form_data/FG_var_card.inc
+++ b/customer/form_data/FG_var_card.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -91,10 +91,10 @@ $HD_Form -> AddEditElement (gettext("CITY"),
 
 $HD_Form -> AddEditElement (gettext("STATE/PROVINCE"),
 			   "state",
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=40",	
-			   "11",	
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=40",
+			   "11",
 			   gettext("Insert the state"),
 			   "" , "", "",	"", "", "" , "NO", "");
 
@@ -111,10 +111,10 @@ $HD_Form -> AddEditElement (gettext("COUNTRY"),
 
 
 $HD_Form -> AddEditElement (gettext("ZIP/POSTAL CODE"),
-			   "zipcode",			
+			   "zipcode",
 			   '$value',
-			   "INPUT",	
-			   "size=30 maxlength=20",	
+			   "INPUT",
+			   "size=30 maxlength=20",
 			   "0",
 			   gettext("Insert the zipcode"),
 			   "" , "", "",	"", "", "" , "NO", "");
@@ -128,23 +128,23 @@ $HD_Form -> AddEditElement (gettext("TIMEZONE"),
 			   "cc_timezone",
 			   "gmtzone, id",
 			   "", "", "%1", "", "", "", "" );
-			   
+
 $HD_Form -> AddEditElement (gettext("PHONE NUMBER"),
-			   "phone",			
-			   '$value',	
-			   "INPUT",	
-			   "size=30 maxlength=20",	
-			   "7",	
+			   "phone",
+			   '$value',
+			   "INPUT",
+			   "size=30 maxlength=20",
+			   "7",
 			   gettext("Insert the phone number of the customers"),
 			   "" , "", "",	"", "", "" , "NO", "");
 
 
 $HD_Form -> AddEditElement (gettext("FAX NUMBER"),
-			   "fax",			
-			   '$value',	
-			   "INPUT",	
+			   "fax",
+			   '$value',
+			   "INPUT",
 			   "size=30 maxlength=20",
-			   "",	
+			   "",
 			   gettext("Insert the fax number of the customers"),
 			   "" , "", "",	"", "", "" , "NO", "");
 
@@ -171,7 +171,7 @@ $HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily update your informat
 $HD_Form -> FG_INTRO_TEXT_ADITION = '';
 $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your record has been updated.")."<br>";
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?message=success";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?message=success";
 
 
 
diff --git a/customer/form_data/FG_var_did.inc b/customer/form_data/FG_var_did.inc
index 0b1dab73b..a49e58062 100644
--- a/customer/form_data/FG_var_did.inc
+++ b/customer/form_data/FG_var_did.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -58,8 +58,8 @@ $priority_list = array();
 for ($k=1;$k<=5;$k++) {
     $priority_list["$k"]  = array( "Priority : $k", "$k");
 }
-$actived_list = array(); 
-$actived_list["1"] = array( gettext("Active"), "1"); 
+$actived_list = array();
+$actived_list["1"] = array( gettext("Active"), "1");
 $actived_list["0"]  = array( gettext("Inactive"), "0");
 
 $validated_list = array();
@@ -79,28 +79,28 @@ if (isset($form_action) && ($form_action=='ask-edit' || $form_action=='edit')) {
 	$HD_Form -> FG_TABLE_NAME = "cc_did_destination AS t1";
 	$country_field = '';
 	$validated = 1;
-	
+
 	if ($voip_call == 1) {
 	    // It's a Voip Call
 	    $DBHandle_max = DbConnect();
 	    $numrow = 0;
 	    $resmax = $DBHandle_max -> Execute("SELECT * FROM cc_did_destination WHERE id='$id' AND destination='$destination' AND validated=1");
-	    
+
 	    if ( $resmax )
 		    $numrow = $resmax -> RecordCount( );
         $validated = ($numrow == 1) ? 1 : 0;
-	
+
 	    if ($validated)
 	        NotificationsDAO::AddNotification("did_destination_edited_cust", Notification::$LOW, Notification::$CUST, $_SESSION['card_id'], Notification::$LINK_DID_DESTINATION, $id);
-	    
+
 	    //$HD_Form->_processed['destination'] = intval($destination);
-	    
+
 	} else {
 	    // It's not a Voip call, check if we don't try to inject
 	    $destination = (intval($destination) > 0) ? $destination : 'no valid';
 	    //echo "Validity check ($destination)";
 	}
-	
+
 } else {
 	$HD_Form -> FG_TABLE_NAME = "cc_did_destination AS t1, cc_did AS t2";
 	$HD_Form -> FG_TABLE_CLAUSE = " id_cc_card='".$_SESSION["card_id"]."' AND t1.id_cc_did=t2.id";
@@ -139,7 +139,7 @@ $HD_Form -> AddEditElement (gettext("ACTIVATED"),
 	"",
 	gettext("Choose if you want to activate this card"),
 	"" , "", "", "Yes :1, - No:0",   "", "" , "", "");
-	
+
 $HD_Form -> AddEditElement (gettext("PRIORITY"),
 	"priority",
 	"",
@@ -181,8 +181,8 @@ $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM
 
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/customer/form_data/FG_var_phonenumber.inc b/customer/form_data/FG_var_phonenumber.inc
deleted file mode 100644
index be9638cca..000000000
--- a/customer/form_data/FG_var_phonenumber.inc
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * This file is part of A2Billing (http://www.a2billing.net/)
- *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
- * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
- * @author      Belaid Arezqui <areski@gmail.com>
- * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
- * @package     A2Billing
- *
- * Software License Agreement (GNU Affero General Public License)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
-**/
-
-
-
-getpost_ifset(array('id', 'number', 'id_phonebook', 'name', 'status',  'info'));
-
-if (!isset($form_action) || $form_action=="list") {
-	$HD_Form = new FormHandler("cc_phonenumber, cc_phonebook","phonenumber");
-	$HD_Form -> FG_TABLE_CLAUSE = " cc_phonenumber.id_phonebook = cc_phonebook.id  AND cc_phonebook.id_card=".$_SESSION['card_id'] ;
-} else {
-	$HD_Form = new FormHandler("cc_phonenumber","phonenumber");	
-}
-$HD_Form -> FG_TABLE_ID = 'cc_phonenumber.id';
-$HD_Form -> FG_DEBUG = 0;
-$HD_Form -> FG_TABLE_DEFAULT_ORDER = "number";
-$HD_Form -> FG_TABLE_DEFAULT_SENS = "DESC";
-
-
-
-$HD_Form ->FG_LIST_ADDING_BUTTON1 = true;
-$HD_Form ->FG_LIST_ADDING_BUTTON_LINK1 = "A2B_entity_phonenumber.php?form_action=ask-add&section=10";
-$HD_Form ->FG_LIST_ADDING_BUTTON_ALT1 = $HD_Form ->FG_LIST_ADDING_BUTTON_MSG1 = gettext("Add PHONE NUMBER");
-$HD_Form ->FG_LIST_ADDING_BUTTON_IMG1 = Images_Path ."/telephone_add.png" ;
-
-
-// TODO Integrate a generic LIST to Framework
-$cnts = new Constants();
-$actived_list = $cnts->getActivationList();
-
-$HD_Form -> AddViewElement(gettext("PHONEBOOK"), "id_phonebook", "15%", "center", "sort", "15", "lie", "cc_phonebook", "name", "id='%id'", "%1");
-$HD_Form -> AddViewElement(gettext("PHONENUMBER"), "number", "10%", "center", "sort", "26");
-$HD_Form -> AddViewElement(gettext("NAME"), "name", "20%", "center", "sort", "26");
-$HD_Form -> AddViewElement(gettext("AMOUNT"), "amount", "15%", "center", "sort", "26");
-$HD_Form -> AddViewElement(gettext("DATE"), "creationdate", "15%", "center", "sort", "16", "", "", "", "", "", "display_dateformat");
-$HD_Form -> AddViewElement(gettext("STATUS"), "status", "5%", "center", "sort", "", "list", $actived_list);
-
-// added a parameter to append  FG_TABLE_ID  ( by default ) or disable 0.
-$HD_Form -> FieldViewElement ('id_phonebook, number, cc_phonenumber.name, amount, creationdate, status');
-
-
-$HD_Form -> CV_NO_FIELDS  = gettext("No phone numbers have been created");
-$HD_Form -> CV_DISPLAY_LINE_TITLE_ABOVE_TABLE = false;
-$HD_Form -> CV_TEXT_TITLE_ABOVE_TABLE = '';
-$HD_Form -> CV_DISPLAY_FILTER_ABOVE_TABLE = false;
-
-
-$HD_Form -> FG_EDITION = true;
-$HD_Form -> FG_DELETION = true;
-$HD_Form -> FG_ADDITION = true;
-
-
-$HD_Form -> AddEditElement (gettext("Phone Number"),
-	"number",
-	'$value',
-	"INPUT",
-	"size=30 maxlength=40",
-	"0",
-	gettext("Insert the phonenumber"),
-	"" , "", "", "", "", "", "", gettext("Enter here the phonenumber to call"));
-
-$HD_Form -> AddEditElement (gettext("Phone Book"),
-	"id_phonebook",
-	'$value',
-	"SELECT",
-	"", "", "",
-	"sql",
-	"cc_phonebook",
-	"name, id",
-	"id_card = ".$_SESSION['card_id'], "", "%1", "", "");
-
-$HD_Form -> AddEditElement (gettext("NAME"),
-	"name",
-	'$value',
-	"INPUT",
-	"size=30 maxlength=20",
-	"",
-	gettext("Insert the name "),
-	"" , "", "", "", "" , "", "", "");
-
-$HD_Form -> AddEditElement (gettext("AMOUNT"),
-	"amount",
-	'$value',
-	"INPUT",
-	"size=10 maxlength=10",
-	"4",
-	gettext("Insert the amount "),
-	"" , "", "", "", "" , "", "", "");
-
-$HD_Form -> AddEditElement ("STATUS",
-	"status",
-	'1',
-	"SELECT",
-	"",
-	"",
-	"",
-	"list" , "", "", "", $actived_list, "%1" , "", gettext("Define if this phone number is active or not"));
-	
-$HD_Form -> AddEditElement (gettext("ADDITIONALINFO"),
-	"info",
-	'',
-	"TEXTAREA",
-	"cols=50 rows=4",
-	"",
-	gettext("Insert additional information"),
-	"" , "", "", "", "" , "", "", "");
-
-
-$HD_Form -> FieldEditElement ('number, id_phonebook, cc_phonenumber.name, amount, status, info');
-
-$HD_Form -> FG_EDITION_CLAUSE = " cc_phonenumber.id='%id'";
-
-
-$HD_Form -> FG_INTRO_TEXT_EDITION = gettext("You can modify, through the following form, the different properties of your")." ".$HD_Form->FG_INSTANCE_NAME;
-$HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this")." ".$HD_Form->FG_INSTANCE_NAME.", ".gettext("click on the delete button.");
-$HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new")." ".$HD_Form->FG_INSTANCE_NAME.".<br>".gettext("Fill the following fields and confirm by clicking on the button add.");
-
-
-$HD_Form -> FG_INTRO_TEXT_ADITION = gettext("Add a new phone number.");
-$HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new phone number has been inserted.")."<br>";
-
-
-$HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
-$HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
-
-
-
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-
-
diff --git a/customer/form_data/FG_var_signup.inc b/customer/form_data/FG_var_signup.inc
index 49b8f68c1..b1a857849 100755
--- a/customer/form_data/FG_var_signup.inc
+++ b/customer/form_data/FG_var_signup.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -172,7 +172,7 @@ if (isset ($form_action) && $form_action == "ask-add") {
 	$comp_zero = "value='0'";
 }
 if (LASTNAME_ENABLE)  {
-$HD_Form->AddEditElement(gettext("LASTNAME"), 
+$HD_Form->AddEditElement(gettext("LASTNAME"),
 		"lastname",
 		'$value',
 		"INPUT",
@@ -181,7 +181,7 @@ $HD_Form->AddEditElement(gettext("LASTNAME"),
 $lastname_editFG = "lastname,";
 }
 if (FIRSTNAME_ENABLE)  {
-$HD_Form->AddEditElement(gettext("FIRSTNAME"), 
+$HD_Form->AddEditElement(gettext("FIRSTNAME"),
 		"firstname",
 		'$value',
 		"INPUT",
@@ -189,14 +189,14 @@ $HD_Form->AddEditElement(gettext("FIRSTNAME"),
 		gettext("Insert your firstname"), "", "", "", "", "", "", "", "");
 $firstname_editFG = "firstname,";
 }
-$HD_Form->AddEditElement(gettext("EMAIL"), 
+$HD_Form->AddEditElement(gettext("EMAIL"),
 		"email",
 		'$value',
 		"INPUT",
 		"size=30 maxlength=70", "1",
 		gettext("Insert your email"), "", "", "", "", "", "", "", "");
 if (ADDRESS_ENABLE)  {
-$HD_Form->AddEditElement(gettext("ADDRESS"), 
+$HD_Form->AddEditElement(gettext("ADDRESS"),
 		"address",
 		'$value',
 		"INPUT",
@@ -205,7 +205,7 @@ $HD_Form->AddEditElement(gettext("ADDRESS"),
 $address_editFG = "address,";
 }
 if (CITY_ENABLE)  {
-$HD_Form->AddEditElement(gettext("CITY"), 
+$HD_Form->AddEditElement(gettext("CITY"),
 		"city",
 		'$value',
 		"INPUT",
@@ -214,8 +214,8 @@ $HD_Form->AddEditElement(gettext("CITY"),
 $city_editFG = "city,";
 }
 if (STATE_ENABLE)  {
-$HD_Form->AddEditElement(gettext("STATE/PROVINCE"), 
-		"state", 
+$HD_Form->AddEditElement(gettext("STATE/PROVINCE"),
+		"state",
 		'$value',
 		"INPUT",
 		"size=30 maxlength=40", "11",
@@ -226,12 +226,12 @@ if ($form_action == 'ask-add') {
 	$country_default_val = 'USA';
 }
 if (COUNTRY_ENABLE)  {
-$HD_Form->AddEditElement(gettext("COUNTRY"), 
-					"country", 
-					"$country_default_val", 
-					"SELECT", "", "", "", 
-					"sql", 
-					"cc_country", "countryname, countrycode", 
+$HD_Form->AddEditElement(gettext("COUNTRY"),
+					"country",
+					"$country_default_val",
+					"SELECT", "", "", "",
+					"sql",
+					"cc_country", "countryname, countrycode",
 					"", "", "%1", "", "", "", '');
 $country_editFG = "country,";
 }
@@ -254,69 +254,69 @@ foreach ($timezone_list as $key => $cur_value) {
 	}
 }
 if (TIMEZONE_ENABLE)  {
-$HD_Form->AddEditElement(gettext("TIMEZONE"), 
-								"id_timezone", 
-								"$timezone_default_val", 
-								"SELECT", 
-								"", "", "", 
-								"list", "", "", "", 
-								$timezone_list, 
+$HD_Form->AddEditElement(gettext("TIMEZONE"),
+								"id_timezone",
+								"$timezone_default_val",
+								"SELECT",
+								"", "", "",
+								"list", "", "", "",
+								$timezone_list,
 								"%1", "", "");
 $id_timezone_editFG = "id_timezone,";
 }
 if (PHONE_ENABLE)  {
-$HD_Form->AddEditElement(gettext("PHONENUMBER"), 
-								"phone", 
-								'$value', 
-								"INPUT", "size=30 maxlength=20", 
+$HD_Form->AddEditElement(gettext("PHONENUMBER"),
+								"phone",
+								'$value',
+								"INPUT", "size=30 maxlength=20",
 								"7", gettext("Insert your phone number"), "", "", "", "", "", "", "", "");
 $phone_editFG = "phone,";
 }
 if (FAX_ENABLE)  {
-$HD_Form->AddEditElement(gettext("FAXNUMBER"), 
-								"fax", 
-								'$value', 
-								"INPUT", "size=30 maxlength=20", 
+$HD_Form->AddEditElement(gettext("FAXNUMBER"),
+								"fax",
+								'$value',
+								"INPUT", "size=30 maxlength=20",
 								"", gettext("Insert your fax number"), "", "", "", "", "", "", "", "");
 $fax_editFG = "fax,";
 }
 if (COMP_ENABLE)  {
-$HD_Form->AddEditElement(gettext("COMPANY NAME"), 
-								"company_name", 
-								'$value', 
-								"INPUT", "size=40 maxlength=50", 
+$HD_Form->AddEditElement(gettext("COMPANY NAME"),
+								"company_name",
+								'$value',
+								"INPUT", "size=40 maxlength=50",
 								"", gettext("Insert Company name of this customer"), "", "", "", "", "", "", "NO", "");
 $company_name_editFG = "company_name,";
 }
 if (COMP_WEB_ENABLE)  {
-$HD_Form->AddEditElement(gettext("COMPANY WEBSITE"), 
-								"company_website", 
-								'$value', 
-								"INPUT", "size=40 maxlength=60", 
+$HD_Form->AddEditElement(gettext("COMPANY WEBSITE"),
+								"company_website",
+								'$value',
+								"INPUT", "size=40 maxlength=60",
 								"", gettext("Insert the company website of this customer"), "", "", "", "", "", "", "NO", "");
 $company_website_editFG = "company_website,";
 }
 if (VAT_RN_ENABLE)  {
-$HD_Form->AddEditElement(gettext("VAT REGISTRATION NUMBER "), 
-								"VAT_RN", 
-								'$value', 
-								"INPUT", "size=40 maxlength=40", 
+$HD_Form->AddEditElement(gettext("VAT REGISTRATION NUMBER "),
+								"VAT_RN",
+								'$value',
+								"INPUT", "size=40 maxlength=40",
 								"", gettext("Insert the VAT registration number of this customer"), "", "", "", "", "", "", "NO", "");
 $VAT_RN_editFG = "VAT_RN,";
 }
 if (TRAFFIC_ENABLE)  {
-$HD_Form->AddEditElement(gettext("TRAFFIC PER MONTH"), 
-								"traffic", 
-								'$value', 
-								"INPUT", "size=30 maxlength=20", 
+$HD_Form->AddEditElement(gettext("TRAFFIC PER MONTH"),
+								"traffic",
+								'$value',
+								"INPUT", "size=30 maxlength=20",
 								"4", gettext("Insert the traffic per month for this customer"), "", "", "", "", "", "", "NO", "");
 $traffic_editFG = "traffic,";
 }
 if (TRAFFIC_TARGET_ENABLE)  {
-$HD_Form->AddEditElement(gettext("TARGET TRAFFIC"), 
-								"traffic_target", 
-								'', 
-								"TEXTAREA", "cols=50 rows=4", 
+$HD_Form->AddEditElement(gettext("TARGET TRAFFIC"),
+								"traffic_target",
+								'',
+								"TEXTAREA", "cols=50 rows=4",
 								"", gettext("Insert the target traffic description"), "", "", "", "", "", "", "", "");
 $traffic_target_editFG = "traffic_target,";
 }
@@ -411,7 +411,7 @@ if (is_numeric($subscriber_signup)) {
 		$HD_Form->FG_QUERY_ADITION_HIDDEN_FIELDS .= ", tariff";
 		$HD_Form->FG_QUERY_ADITION_HIDDEN_VALUE .= ", $id_callplan";
 	}
-	
+
 	// HIDDEN VALUE
 	$HD_Form->FG_ADITION_HIDDEN_PARAM = 'subscriber_signup';
 	$HD_Form->FG_ADITION_HIDDEN_PARAM_VALUE = "$subscriber_signup";
@@ -434,7 +434,7 @@ $HD_Form->FG_ADD_PAGE_CONFIRM_BUTTON = gettext("SIGNUP");
 
 $HD_Form->FG_ADDITIONAL_FUNCTION_AFTER_ADD = 'processing_card_signup';
 
-$HD_Form->FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF'] . "?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form->FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF'] . "?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form->FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) . "?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form->FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL) . "?atmenu=document&stitle=Document&wh=AC&id=";
 
 
diff --git a/customer/form_data/FG_var_speeddial.inc b/customer/form_data/FG_var_speeddial.inc
index 0e33f534b..714f70b1c 100644
--- a/customer/form_data/FG_var_speeddial.inc
+++ b/customer/form_data/FG_var_speeddial.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -65,11 +65,11 @@ $HD_Form -> FG_VIEW_TABLE_WITDH = '70%';
 if (strlen($HD_Form -> FG_TABLE_CLAUSE)>0)
     $HD_Form -> FG_TABLE_CLAUSE.=" AND ";
 	$HD_Form -> FG_TABLE_CLAUSE.="id_cc_card =".$_SESSION["card_id"];
-	
+
 if (strlen($HD_Form -> FG_EDITION_CLAUSE)>0)
     $HD_Form -> FG_EDITION_CLAUSE.=" AND ";
 	$HD_Form -> FG_EDITION_CLAUSE.="id_cc_card =".$_SESSION["card_id"];
-	
+
 
 //end My Code for Where Clause
 
@@ -128,7 +128,7 @@ $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Once you have completed the form above, click on the CONTINUE button.");
 
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
diff --git a/customer/form_data/FG_var_ticket.inc b/customer/form_data/FG_var_ticket.inc
index 83ef237ba..0d325c7ed 100755
--- a/customer/form_data/FG_var_ticket.inc
+++ b/customer/form_data/FG_var_ticket.inc
@@ -5,10 +5,10 @@
 /**
  * This file is part of A2Billing (http://www.a2billing.net/)
  *
- * A2Billing, Commercial Open Source Telecom Billing platform,   
+ * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
- * 
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L. 
+ *
+ * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -27,8 +27,8 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * 
+ *
+ *
 **/
 
 
@@ -87,7 +87,7 @@ $HD_Form -> FG_TEXT_ADITION_CONFIRMATION = gettext("Your new")." ".$HD_Form->FG_
 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC  = Images_Path . "/cormfirmboton.gif";
 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Click 'Confirm Data' to continue");
 
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
-$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = $_SERVER['PHP_SELF']."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_ADD = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_EDIT = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
+$HD_Form -> FG_GO_LINK_AFTER_ACTION_DELETE = filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)."?atmenu=document&stitle=Document&wh=AC&id=";
 
diff --git a/customer/importsamples.php b/customer/importsamples.php
index a5f6beabe..d1398dedc 100755
--- a/customer/importsamples.php
+++ b/customer/importsamples.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/index.php b/customer/index.php
index 8766f3a32..3f21e1dfe 100644
--- a/customer/index.php
+++ b/customer/index.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/index2.php b/customer/index2.php
index 0b4c1a884..eb9c8d70a 100644
--- a/customer/index2.php
+++ b/customer/index2.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/logout.php b/customer/logout.php
index cc72ed604..d3dd11ea1 100644
--- a/customer/logout.php
+++ b/customer/logout.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/payment-history.php b/customer/payment-history.php
index 8aa185aa0..67c3ee60b 100755
--- a/customer/payment-history.php
+++ b/customer/payment-history.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/signup.php b/customer/signup.php
index 941458a3b..509f9af25 100755
--- a/customer/signup.php
+++ b/customer/signup.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -51,8 +51,10 @@
 include './form_data/FG_var_signup.inc';
 include './lib/customer.smarty.php';
 
-if (!$A2B->config["signup"]['enable_signup'])
+if (!$A2B->config["signup"]['enable_signup']) {
+    echo ("No Signup page!");
     exit;
+}
 
 getpost_ifset(array ('subscriber_signup'));
 
diff --git a/customer/signup_confirmation.php b/customer/signup_confirmation.php
index 2373064af..adbc3bb6a 100755
--- a/customer/signup_confirmation.php
+++ b/customer/signup_confirmation.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -35,7 +35,8 @@
 include './lib/customer.smarty.php';
 
 if (!$A2B->config["signup"]['enable_signup']) {
-    exit ();
+    echo ("No Signup page!");
+    exit;
 }
 
 if (!isset ($_SESSION["date_mail"]) || (time() - $_SESSION["date_mail"]) > 60) {
diff --git a/customer/signup_service.php b/customer/signup_service.php
index abd036d29..f79405083 100755
--- a/customer/signup_service.php
+++ b/customer/signup_service.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -36,8 +36,15 @@
 include './lib/Form/Class.FormHandler.inc.php';
 include './lib/customer.smarty.php';
 
-if (!$A2B->config["signup"]['enable_signup'])
+if (!$A2B->config["signup"]['enable_signup']) {
+    echo ("No Signup page!");
     exit;
+}
+
+$HD_Form = new FormHandler();
+
+$HD_Form->setDBHandler(DbConnect());
+$HD_Form->init();
 
 //check subscriber
 $table_subscriber = new Table("cc_subscription_signup", "*");
@@ -49,23 +56,32 @@
 
 ?>
 
-<BR/><BR/><BR/><BR/>
-
+<br/><br/>
+<br/><br/>
 <form id="myForm" method="post" name="myForm" action="signup.php">
 
+<?php
+    if ($HD_Form->FG_CSRF_STATUS == true) {
+?>
+    <INPUT type="hidden" name="<?php echo $HD_Form->FG_FORM_UNIQID_FIELD ?>" value="<?php echo $HD_Form->FG_FORM_UNIQID; ?>" />
+    <INPUT type="hidden" name="<?php echo $HD_Form->FG_CSRF_FIELD ?>" value="<?php echo $HD_Form->FG_CSRF_TOKEN; ?>" />
+<?php
+    }
+?>
+
 <div align="center">
 <table  style="width : 80%;" class="editform_table1">
    <tr>
-           <th colspan="2" background="templates/default/images/background_cells.gif">
-               <?php echo gettext("SELECT THE SERVICE THAT YOU WANT SUBSCRIBE") ?>
-           </th>
+       <th colspan="2" background="templates/default/images/background_cells.gif">
+           <?php echo gettext("SELECT THE SERVICE THAT YOU WANT SUBSCRIBE") ?>
+       </th>
    </tr>
    <tr height="20px">
         <td  colspan="2">
             &nbsp;
         </td>
     </tr>
-   <tr height="20px">
+    <tr height="20px">
         <td  class="form_head">
             &nbsp;<?php echo gettext("SERVICE") ?> :
         </td>
@@ -101,11 +117,12 @@
         </td>
     </tr>
 
- </table>
- </div>
+</table>
+</div>
 </form>
 
-<BR/><BR/><BR/><BR/>
+<br/><br/>
+<br/><br/>
 
 <?php
 
diff --git a/customer/simulator.php b/customer/simulator.php
index 0f6b0cefd..7e84db20e 100644
--- a/customer/simulator.php
+++ b/customer/simulator.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/templates/default/images/icons/.svn/all-wcprops b/customer/templates/default/images/icons/.svn/all-wcprops
deleted file mode 100755
index 0d300002e..000000000
--- a/customer/templates/default/images/icons/.svn/all-wcprops
+++ /dev/null
@@ -1,329 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 81
-/svn/asterisk2billing/!svn/ver/1407/trunk/customer/templates/default/images/icons
-END
-users.png
-K 25
-svn:wc:ra_dav:version-url
-V 90
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/users.png
-END
-checkin.png
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/checkin.png
-END
-query.png
-K 25
-svn:wc:ra_dav:version-url
-V 90
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/query.png
-END
-warning.png
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/warning.png
-END
-Mastercard.gif
-K 25
-svn:wc:ra_dav:version-url
-V 96
-/svn/asterisk2billing/!svn/ver/1407/trunk/customer/templates/default/images/icons/Mastercard.gif
-END
-globe1.png
-K 25
-svn:wc:ra_dav:version-url
-V 91
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/globe1.png
-END
-globe2.png
-K 25
-svn:wc:ra_dav:version-url
-V 91
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/globe2.png
-END
-content.png
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/content.png
-END
-globe3.png
-K 25
-svn:wc:ra_dav:version-url
-V 91
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/globe3.png
-END
-Amex.gif
-K 25
-svn:wc:ra_dav:version-url
-V 90
-/svn/asterisk2billing/!svn/ver/1407/trunk/customer/templates/default/images/icons/Amex.gif
-END
-globe4.png
-K 25
-svn:wc:ra_dav:version-url
-V 91
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/globe4.png
-END
-add_section.png
-K 25
-svn:wc:ra_dav:version-url
-V 96
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/add_section.png
-END
-messaging_inbox.png
-K 25
-svn:wc:ra_dav:version-url
-V 100
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/messaging_inbox.png
-END
-messaging.png
-K 25
-svn:wc:ra_dav:version-url
-V 94
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/messaging.png
-END
-spacer.png
-K 25
-svn:wc:ra_dav:version-url
-V 91
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/spacer.png
-END
-document.png
-K 25
-svn:wc:ra_dav:version-url
-V 93
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/document.png
-END
-preview.png
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/preview.png
-END
-mail.png
-K 25
-svn:wc:ra_dav:version-url
-V 89
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/mail.png
-END
-restore.png
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/restore.png
-END
-emailButton.png
-K 25
-svn:wc:ra_dav:version-url
-V 96
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/emailButton.png
-END
-module.png
-K 25
-svn:wc:ra_dav:version-url
-V 91
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/module.png
-END
-edit.png
-K 25
-svn:wc:ra_dav:version-url
-V 89
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/edit.png
-END
-menus.png
-K 25
-svn:wc:ra_dav:version-url
-V 90
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/menus.png
-END
-help.png
-K 25
-svn:wc:ra_dav:version-url
-V 89
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/help.png
-END
-credits.png
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/credits.png
-END
-Discover.gif
-K 25
-svn:wc:ra_dav:version-url
-V 94
-/svn/asterisk2billing/!svn/ver/1407/trunk/customer/templates/default/images/icons/Discover.gif
-END
-controlpanel.png
-K 25
-svn:wc:ra_dav:version-url
-V 97
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/controlpanel.png
-END
-messaging_config.png
-K 25
-svn:wc:ra_dav:version-url
-V 101
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/messaging_config.png
-END
-component.png
-K 25
-svn:wc:ra_dav:version-url
-V 94
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/component.png
-END
-config.png
-K 25
-svn:wc:ra_dav:version-url
-V 91
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/config.png
-END
-backup.png
-K 25
-svn:wc:ra_dav:version-url
-V 91
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/backup.png
-END
-install.png
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/install.png
-END
-mainmenu.png
-K 25
-svn:wc:ra_dav:version-url
-V 93
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/mainmenu.png
-END
-search_text.png
-K 25
-svn:wc:ra_dav:version-url
-V 96
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/search_text.png
-END
-users_add.png
-K 25
-svn:wc:ra_dav:version-url
-V 94
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/users_add.png
-END
-mass_email.png
-K 25
-svn:wc:ra_dav:version-url
-V 95
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/mass_email.png
-END
-template.png
-K 25
-svn:wc:ra_dav:version-url
-V 93
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/template.png
-END
-user.png
-K 25
-svn:wc:ra_dav:version-url
-V 89
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/user.png
-END
-media.png
-K 25
-svn:wc:ra_dav:version-url
-V 90
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/media.png
-END
-tux.png
-K 25
-svn:wc:ra_dav:version-url
-V 88
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/tux.png
-END
-trash.png
-K 25
-svn:wc:ra_dav:version-url
-V 90
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/trash.png
-END
-license.png
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/license.png
-END
-language.png
-K 25
-svn:wc:ra_dav:version-url
-V 93
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/language.png
-END
-Visa.gif
-K 25
-svn:wc:ra_dav:version-url
-V 90
-/svn/asterisk2billing/!svn/ver/1407/trunk/customer/templates/default/images/icons/Visa.gif
-END
-con_tel.png
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/con_tel.png
-END
-db.png
-K 25
-svn:wc:ra_dav:version-url
-V 87
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/db.png
-END
-categories.png
-K 25
-svn:wc:ra_dav:version-url
-V 95
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/categories.png
-END
-blank.png
-K 25
-svn:wc:ra_dav:version-url
-V 90
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/blank.png
-END
-sections.png
-K 25
-svn:wc:ra_dav:version-url
-V 93
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/sections.png
-END
-home.png
-K 25
-svn:wc:ra_dav:version-url
-V 89
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/home.png
-END
-arrow.png
-K 25
-svn:wc:ra_dav:version-url
-V 90
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/arrow.png
-END
-statistics.png
-K 25
-svn:wc:ra_dav:version-url
-V 95
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/statistics.png
-END
-sysinfo.png
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/sysinfo.png
-END
-tooltip.png
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/asterisk2billing/!svn/ver/738/trunk/customer/templates/default/images/icons/tooltip.png
-END
diff --git a/customer/templates/default/images/icons/.svn/entries b/customer/templates/default/images/icons/.svn/entries
deleted file mode 100755
index 0e3fca59c..000000000
--- a/customer/templates/default/images/icons/.svn/entries
+++ /dev/null
@@ -1,730 +0,0 @@
-8
-
-dir
-2071
-http://svn.a2billing.net/svn/asterisk2billing/trunk/customer/templates/default/images/icons
-http://svn.a2billing.net/svn/asterisk2billing
-
-
-
-2009-01-19T19:49:44.503304Z
-1407
-areski
-
-
-svn:special svn:externals svn:needs-lock
-
-
-
-
-
-
-
-
-
-
-
-9d51a8f0-6521-42ea-932e-d822aa02ce2f
-
-users.png
-file
-
-
-
-
-2009-05-31T20:23:42.000000Z
-ca76ab5e944337b67afb4075b536ade0
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-checkin.png
-file
-
-
-
-
-2009-05-31T20:23:42.000000Z
-6307aa7a16cb549e7a9d7295f9da25bd
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-query.png
-file
-
-
-
-
-2009-05-31T20:23:42.000000Z
-0616f240c4c9d0dfb8daabeda9bfbeee
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-warning.png
-file
-
-
-
-
-2009-05-31T20:23:42.000000Z
-a764eb57324079f738fe2ff29aa465b6
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-Mastercard.gif
-file
-
-
-
-
-2009-05-31T20:23:42.000000Z
-e44febc76e8878974e1608550424e093
-2009-01-19T19:49:44.503304Z
-1407
-areski
-has-props
-
-globe1.png
-file
-
-
-
-
-2009-05-31T20:23:42.000000Z
-1aaa4744659b8eeadcb3cbd2d250fca9
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-globe2.png
-file
-
-
-
-
-2009-05-31T20:23:42.000000Z
-cf9e2c401297a03f527a2680e87e793d
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-content.png
-file
-
-
-
-
-2009-05-31T20:23:42.000000Z
-1aad2fed67d330b1c1e6ae0fc81236c0
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-globe3.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-b50f99cca22f91d5813f2bfc23f9aa80
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-Amex.gif
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-56b6ff6bc2372a19c24e744b2b048acf
-2009-01-19T19:49:44.503304Z
-1407
-areski
-has-props
-
-globe4.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-2f2cc7ec9f827fa7a07d9a01cef2879a
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-add_section.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-258c0fb7dbf317ccab6ad72675d4ea57
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-messaging_inbox.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-347093a9bac60e6c79cfaea4b131f1e0
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-messaging.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-32f09eecff4093bc9c87ad44307215b6
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-spacer.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-451b473e90df4592e2473b078e390e3a
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-document.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-e1ac4f6ce5a454e27b900321de17fa3a
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-preview.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-9880a517647cbe3088f2d9a22c8a4dee
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-mail.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-b1bdac329f08e749c88a76fb9c133fc0
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-restore.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-1be59a037c3b4c2e28f36828ca2a541d
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-emailButton.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-4ef8c4f8b44141b9813b0c62c43c1031
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-module.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-d3b4ecc1b0a3380f1b279ea7e87c35fa
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-edit.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-ad9f4ce84090d5f8126dc124ae6eb8dc
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-menus.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-33db99ed8757a57ea1a0c5aac01612fe
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-help.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-4a6f430e403bd4fff6b10e8369a50ec3
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-credits.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-8f167b3fe8f47091b7ccbbfc05bd4cb4
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-Discover.gif
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-7546e62ed4afb800a896a931d7a360c7
-2009-01-19T19:49:44.503304Z
-1407
-areski
-has-props
-
-controlpanel.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-36032d1f9dc5946ef2fdb78ba60442c8
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-messaging_config.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-87843817e74dd53c92fde840c7288e02
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-component.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-16690624d9321f40311ee8514a1b1873
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-config.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-1c064c806f176a9d0ec513064db1a447
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-backup.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-c80ca8cb934422b6426da0577a208f74
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-install.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-2435d9f0e1b6f7be8531b8fe5f4b2cda
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-mainmenu.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-554a243e0d2180e255371347fa6f8930
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-search_text.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-cd7cce05b83ede59b050bbf027aacf2c
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-users_add.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-d8a3e3a3b31f88233a1b9f80ec6d849b
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-mass_email.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-f3e46b2cdd66b1de607ebaf64d3afe83
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-template.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-29f0d8d4abd4ec7caf0e5aebb2ea7a49
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-user.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-55e773200432b6a79edea5900f019fd9
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-media.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-958ebf5d238e2f7a426f8823880ac1c5
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-tux.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-f6ad4c6e32211466ccc9fb1c59b95491
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-trash.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-b30b755cfa9d4618ccd170340f9996d8
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-license.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-7c986b95dcd2191de9541d485d7df3af
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-language.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-17366d9836e79f1fde506b7e80b5c005
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-Visa.gif
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-cb64186b1ac3b11260d37c85ef461fb2
-2009-01-19T19:49:44.503304Z
-1407
-areski
-has-props
-
-con_tel.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-a40bb1dac13c108e4946b8af431f38c6
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-db.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-e26fdee08087b210e4a1f7699ef16382
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-categories.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-a43cc7b920023ee08b2d2f176483d4cf
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-blank.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-5742efc3561436f5547f1c85e0c6eb4c
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-sections.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-4df48b3659625f42936922d1cc988bf8
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-home.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-d60d07edb63571df88ddd73b12571f82
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-arrow.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-1b49e07aa7863d9025e27082ffaac87c
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-statistics.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-f45d7ea0666f6fa7aaf64bc5e91a0a71
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-sysinfo.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-93559b8b1933470b3768a65baed8f9cf
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
-tooltip.png
-file
-
-
-
-
-2009-05-31T20:23:43.000000Z
-0c320c1429c0b9ea57618c393fe3743b
-2007-05-29T00:36:37.002445Z
-1
-areski
-has-props
-
diff --git a/customer/templates/default/images/icons/.svn/format b/customer/templates/default/images/icons/.svn/format
deleted file mode 100755
index 45a4fb75d..000000000
--- a/customer/templates/default/images/icons/.svn/format
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/customer/templates/default/images/icons/.svn/prop-base/Amex.gif.svn-base b/customer/templates/default/images/icons/.svn/prop-base/Amex.gif.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/Amex.gif.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/Discover.gif.svn-base b/customer/templates/default/images/icons/.svn/prop-base/Discover.gif.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/Discover.gif.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/Mastercard.gif.svn-base b/customer/templates/default/images/icons/.svn/prop-base/Mastercard.gif.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/Mastercard.gif.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/Visa.gif.svn-base b/customer/templates/default/images/icons/.svn/prop-base/Visa.gif.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/Visa.gif.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/add_section.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/add_section.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/add_section.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/arrow.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/arrow.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/arrow.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/backup.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/backup.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/backup.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/blank.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/blank.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/blank.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/categories.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/categories.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/categories.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/checkin.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/checkin.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/checkin.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/component.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/component.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/component.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/con_tel.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/con_tel.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/con_tel.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/config.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/config.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/config.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/content.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/content.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/content.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/controlpanel.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/controlpanel.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/controlpanel.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/credits.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/credits.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/credits.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/db.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/db.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/db.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/document.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/document.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/document.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/edit.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/edit.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/edit.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/emailButton.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/emailButton.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/emailButton.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/globe1.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/globe1.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/globe1.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/globe2.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/globe2.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/globe2.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/globe3.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/globe3.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/globe3.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/globe4.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/globe4.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/globe4.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/help.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/help.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/help.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/home.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/home.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/home.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/install.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/install.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/install.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/language.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/language.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/language.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/license.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/license.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/license.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/mail.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/mail.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/mail.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/mainmenu.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/mainmenu.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/mainmenu.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/mass_email.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/mass_email.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/mass_email.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/media.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/media.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/media.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/menus.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/menus.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/menus.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/messaging.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/messaging.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/messaging.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/messaging_config.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/messaging_config.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/messaging_config.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/messaging_inbox.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/messaging_inbox.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/messaging_inbox.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/module.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/module.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/module.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/preview.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/preview.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/preview.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/query.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/query.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/query.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/restore.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/restore.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/restore.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/search_text.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/search_text.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/search_text.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/sections.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/sections.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/sections.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/spacer.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/spacer.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/spacer.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/statistics.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/statistics.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/statistics.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/sysinfo.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/sysinfo.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/sysinfo.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/template.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/template.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/template.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/tooltip.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/tooltip.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/tooltip.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/trash.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/trash.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/trash.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/tux.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/tux.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/tux.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/user.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/user.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/user.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/users.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/users.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/users.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/users_add.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/users_add.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/users_add.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/prop-base/warning.png.svn-base b/customer/templates/default/images/icons/.svn/prop-base/warning.png.svn-base
deleted file mode 100755
index 5e9587e65..000000000
--- a/customer/templates/default/images/icons/.svn/prop-base/warning.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/customer/templates/default/images/icons/.svn/text-base/Amex.gif.svn-base b/customer/templates/default/images/icons/.svn/text-base/Amex.gif.svn-base
deleted file mode 100755
index 0cf2cadbd..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/Amex.gif.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/Discover.gif.svn-base b/customer/templates/default/images/icons/.svn/text-base/Discover.gif.svn-base
deleted file mode 100755
index 61ae16298..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/Discover.gif.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/Mastercard.gif.svn-base b/customer/templates/default/images/icons/.svn/text-base/Mastercard.gif.svn-base
deleted file mode 100755
index 3ad172355..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/Mastercard.gif.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/Visa.gif.svn-base b/customer/templates/default/images/icons/.svn/text-base/Visa.gif.svn-base
deleted file mode 100755
index ace7392c6..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/Visa.gif.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/add_section.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/add_section.png.svn-base
deleted file mode 100755
index b4b802d9e..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/add_section.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/arrow.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/arrow.png.svn-base
deleted file mode 100755
index b7e9eb74f..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/arrow.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/backup.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/backup.png.svn-base
deleted file mode 100755
index 6963673f7..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/backup.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/blank.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/blank.png.svn-base
deleted file mode 100755
index b1dcba7b4..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/blank.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/categories.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/categories.png.svn-base
deleted file mode 100755
index 5b5b80c27..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/categories.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/checkin.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/checkin.png.svn-base
deleted file mode 100755
index fd49d15f4..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/checkin.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/component.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/component.png.svn-base
deleted file mode 100755
index d70eb0c57..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/component.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/con_tel.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/con_tel.png.svn-base
deleted file mode 100755
index e68f78f89..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/con_tel.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/config.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/config.png.svn-base
deleted file mode 100755
index 90cf753f9..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/config.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/content.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/content.png.svn-base
deleted file mode 100755
index da6c77b18..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/content.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/controlpanel.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/controlpanel.png.svn-base
deleted file mode 100755
index f6070017f..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/controlpanel.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/credits.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/credits.png.svn-base
deleted file mode 100755
index 9490216f1..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/credits.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/db.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/db.png.svn-base
deleted file mode 100755
index 1de1faf2e..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/db.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/document.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/document.png.svn-base
deleted file mode 100755
index 7595818f1..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/document.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/edit.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/edit.png.svn-base
deleted file mode 100755
index 983190f41..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/edit.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/emailButton.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/emailButton.png.svn-base
deleted file mode 100755
index f30bdadfc..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/emailButton.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/globe1.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/globe1.png.svn-base
deleted file mode 100755
index 7edbac74a..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/globe1.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/globe2.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/globe2.png.svn-base
deleted file mode 100755
index eb33934f4..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/globe2.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/globe3.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/globe3.png.svn-base
deleted file mode 100755
index 37b2a4bdd..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/globe3.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/globe4.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/globe4.png.svn-base
deleted file mode 100755
index 8c100a47d..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/globe4.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/help.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/help.png.svn-base
deleted file mode 100755
index 2c079fed2..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/help.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/home.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/home.png.svn-base
deleted file mode 100755
index 44d012f49..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/home.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/install.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/install.png.svn-base
deleted file mode 100755
index 8d639b549..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/install.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/language.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/language.png.svn-base
deleted file mode 100755
index 1b2aee8ef..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/language.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/license.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/license.png.svn-base
deleted file mode 100755
index 21adc2bef..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/license.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/mail.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/mail.png.svn-base
deleted file mode 100755
index 63d6e13a8..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/mail.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/mainmenu.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/mainmenu.png.svn-base
deleted file mode 100755
index b07725495..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/mainmenu.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/mass_email.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/mass_email.png.svn-base
deleted file mode 100755
index 05d965cf3..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/mass_email.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/media.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/media.png.svn-base
deleted file mode 100755
index 63e34d84e..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/media.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/menus.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/menus.png.svn-base
deleted file mode 100755
index 7946c5f5a..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/menus.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/messaging.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/messaging.png.svn-base
deleted file mode 100755
index b77951880..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/messaging.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/messaging_config.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/messaging_config.png.svn-base
deleted file mode 100755
index ef4239995..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/messaging_config.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/messaging_inbox.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/messaging_inbox.png.svn-base
deleted file mode 100755
index a44621932..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/messaging_inbox.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/module.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/module.png.svn-base
deleted file mode 100755
index 4027bb788..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/module.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/preview.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/preview.png.svn-base
deleted file mode 100755
index a84c4cbc9..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/preview.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/query.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/query.png.svn-base
deleted file mode 100755
index 39d010bc4..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/query.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/restore.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/restore.png.svn-base
deleted file mode 100755
index 8bbded4a2..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/restore.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/search_text.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/search_text.png.svn-base
deleted file mode 100755
index 5d7c6d17c..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/search_text.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/sections.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/sections.png.svn-base
deleted file mode 100755
index e83f7446a..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/sections.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/spacer.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/spacer.png.svn-base
deleted file mode 100755
index ff2a8baa0..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/spacer.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/statistics.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/statistics.png.svn-base
deleted file mode 100755
index ce1793b59..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/statistics.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/sysinfo.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/sysinfo.png.svn-base
deleted file mode 100755
index 40d95f0c1..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/sysinfo.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/template.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/template.png.svn-base
deleted file mode 100755
index f1f0b2858..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/template.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/tooltip.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/tooltip.png.svn-base
deleted file mode 100755
index 6da328d73..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/tooltip.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/trash.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/trash.png.svn-base
deleted file mode 100755
index 195f6fd0e..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/trash.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/tux.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/tux.png.svn-base
deleted file mode 100755
index 48939bd5c..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/tux.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/user.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/user.png.svn-base
deleted file mode 100755
index 1678d1c7e..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/user.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/users.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/users.png.svn-base
deleted file mode 100755
index dfd57152a..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/users.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/users_add.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/users_add.png.svn-base
deleted file mode 100755
index 24e6c5047..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/users_add.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/images/icons/.svn/text-base/warning.png.svn-base b/customer/templates/default/images/icons/.svn/text-base/warning.png.svn-base
deleted file mode 100755
index 6a5d33460..000000000
Binary files a/customer/templates/default/images/icons/.svn/text-base/warning.png.svn-base and /dev/null differ
diff --git a/customer/templates/default/main.tpl b/customer/templates/default/main.tpl
index 9a8871b3a..fc6d1f843 100644
--- a/customer/templates/default/main.tpl
+++ b/customer/templates/default/main.tpl
@@ -96,30 +96,6 @@
 	<div class="toggle_menu"><li><a href="A2B_notification.php?form_action=ask-edit"><strong>{php} echo gettext("NOTIFICATION");{/php}</strong></a></li></div>
 	{/if}
 
-	{if $ACXAUTODIALER>0 }
-	<div class="toggle_menu"><li>
-	<a href="javascript:;" class="toggle_menu" target="_self"> <div> <div id="menutitlebutton"> <img id="img10"
-	{if ($section == "10")}
-	src="templates/{$SKIN_NAME}/images/minus.gif"
-	{else}
-	src="templates/{$SKIN_NAME}/images/plus.gif"
-	{/if} onmouseover="this.style.cursor='hand';" ></div> <div id="menutitlesection"><strong>{php} echo gettext("AUTO DIALLER");{/php}</strong></div></div></a></li></div>
-		<div class="tohide"
-	{if ($section =="10")}
-		style="">
-	{else}
-	style="display:none;">
-	{/if}
-	<ul>
-		<li><ul>
-				<li><a href="A2B_entity_campaign.php?section=10">{php} echo gettext("Campaign's");{/php}</a></li>
-				<li><a href="A2B_entity_phonebook.php?section=10">{php} echo gettext("Phone Book");{/php}</a></li>
-				<li><a href="A2B_entity_phonenumber.php?section=10">{php} echo gettext("Phone Number");{/php}</a></li>
-				<li><a href="A2B_phonelist_import.php?section=10">{php} echo gettext("Import Phone List");{/php}</a></li>
-		</ul></li>
-	</ul>
-	</div>
-	{/if}
 
 </ul>
 
diff --git a/customer/userinfo.php b/customer/userinfo.php
index 308b89bdd..bd017d389 100644
--- a/customer/userinfo.php
+++ b/customer/userinfo.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/webservice/create_trunkconfig.php b/customer/webservice/create_trunkconfig.php
index a86b5bbdf..a395f1f60 100755
--- a/customer/webservice/create_trunkconfig.php
+++ b/customer/webservice/create_trunkconfig.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/webservice/get_balance.php b/customer/webservice/get_balance.php
index d32044fc0..de9448af7 100644
--- a/customer/webservice/get_balance.php
+++ b/customer/webservice/get_balance.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/customer/webservice/get_rates.php b/customer/webservice/get_rates.php
index 739a4088f..f51b0aa77 100644
--- a/customer/webservice/get_rates.php
+++ b/customer/webservice/get_rates.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 000000000..1237189ec
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false">
+    <testsuites>
+        <testsuite name="Application Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <blacklist>
+            <directory>vendor</directory>
+        </blacklist>
+    </filter>
+    <php>
+        <env name="APP_ENV" value="testing"/>
+        <env name="SESSION_DRIVER" value="array"/>
+    </php>
+</phpunit>
diff --git a/src/Contracts/Factory/Factory.php b/src/Contracts/Factory/Factory.php
new file mode 100644
index 000000000..46cd7a5d4
--- /dev/null
+++ b/src/Contracts/Factory/Factory.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Contracts\Factory;
+
+
+interface Factory {
+    public static function getInstance();
+}
\ No newline at end of file
diff --git a/src/Factory/SmartyFactory.php b/src/Factory/SmartyFactory.php
new file mode 100644
index 000000000..c35786930
--- /dev/null
+++ b/src/Factory/SmartyFactory.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Factory;
+
+
+use Contracts\Factory\Factory;
+use Smarty_Security;
+
+class SmartyFactory implements Factory{
+
+    /**
+     * @return \Smarty
+     * @throws \SmartyException
+     */
+    public static function getInstance()
+    {
+        $smarty = new \SmartyBC();
+
+        $securityPolicy = new Smarty_Security($smarty);
+        $securityPolicy->php_handling = \Smarty::PHP_ALLOW;
+        $smarty->enableSecurity($securityPolicy);
+
+        return $smarty;
+    }
+}
\ No newline at end of file
diff --git a/tests/.gitkeep b/tests/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/Factory/SmartyFactoryTest.php b/tests/Factory/SmartyFactoryTest.php
new file mode 100644
index 000000000..5adb7d7da
--- /dev/null
+++ b/tests/Factory/SmartyFactoryTest.php
@@ -0,0 +1,13 @@
+<?php
+
+use Factory\SmartyFactory;
+
+class SmartyFactoryTest extends PHPUnit_Framework_TestCase
+{
+    public function testCreateInstance(){
+        $smarty = SmartyFactory::getInstance();
+
+        $this->assertInstanceOf('\Smarty', $smarty);
+    }
+}
+
diff --git a/webservice/SOAP/soap-a2billing-server.php b/webservice/SOAP/soap-a2billing-server.php
index cf2300a22..4dcccd4fe 100755
--- a/webservice/SOAP/soap-a2billing-server.php
+++ b/webservice/SOAP/soap-a2billing-server.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/webservice/SOAP/soap-a2billing-test.php b/webservice/SOAP/soap-a2billing-test.php
index f84a4dbb9..1ff2c7565 100644
--- a/webservice/SOAP/soap-a2billing-test.php
+++ b/webservice/SOAP/soap-a2billing-test.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/webservice/SOAP/soap-callback-server.php b/webservice/SOAP/soap-callback-server.php
index f6dad8c33..005e01831 100755
--- a/webservice/SOAP/soap-callback-server.php
+++ b/webservice/SOAP/soap-callback-server.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/webservice/SOAP/soap-stress-a2billing.php b/webservice/SOAP/soap-stress-a2billing.php
index 224be0244..493f9f6d2 100755
--- a/webservice/SOAP/soap-stress-a2billing.php
+++ b/webservice/SOAP/soap-stress-a2billing.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/webservice/SOAP/stress-a2billing-test.php b/webservice/SOAP/stress-a2billing-test.php
index 1cdc5bbf0..0fd48181d 100644
--- a/webservice/SOAP/stress-a2billing-test.php
+++ b/webservice/SOAP/stress-a2billing-test.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/webservice/SOAP/test-a2billing-server.php b/webservice/SOAP/test-a2billing-server.php
index 8ef7cb034..46a08a1f5 100755
--- a/webservice/SOAP/test-a2billing-server.php
+++ b/webservice/SOAP/test-a2billing-server.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/webservice/SOAP/test-callback-server.php b/webservice/SOAP/test-callback-server.php
index aab367e3c..c1cfe9f62 100755
--- a/webservice/SOAP/test-callback-server.php
+++ b/webservice/SOAP/test-callback-server.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
diff --git a/webservice/api.php b/webservice/api.php
new file mode 100755
index 000000000..d207d2c3c
--- /dev/null
+++ b/webservice/api.php
@@ -0,0 +1,193 @@
+<?php
+
+interface IApi {
+    public function init($api);
+}
+
+class Api {
+    private
+        $config = null,
+        $dbh = null,
+        $api = array(),
+        $format = array();
+    
+    public function __construct() {
+        if (!$this->initConfig())
+            throw new RuntimeException('Cannot load config');
+            
+        if (!$this->initDb())
+            throw new RuntimeException('Cannot connect to db');
+        
+        if (!$this->initApi())
+            throw new RuntimeException('Cannot init APIs');
+    }
+    
+    public function getConfig($key, $default = null) {
+        $keys = explode('.', $key);
+        if (!is_array($keys))
+            $keys = array($key);
+        
+        // get param
+        $value = $this->config;
+        foreach ($keys as $key) {
+            $value = (is_array($value) && isset($value[$key])) ? $value[$key] : $default;
+        }
+        
+        return $value;
+    }
+    
+    private function initConfig() {
+        $config = '/etc/a2billing.conf';
+        if (!file_exists($config))
+            return false;
+        $this->config = parse_ini_file($config, true);
+        return is_array($this->config);
+    }
+    
+    private function initDb() {
+        // connecting to DB
+        if (strcasecmp($this->getConfig('database.dbtype', ''), 'mysql') != 0) {
+            self::log('Supports only mysql database', LOG_ERR);
+            return false;
+        }
+        $host = $this->getConfig('database.hostname', '127.0.0.1');
+        $user = $this->getConfig('database.user', 'root');
+        $pass = $this->getConfig('database.password', '');
+        $db = $this->getConfig('database.dbname', 'a2billing');
+        $mysqli = new mysqli($host, $user, $pass, $db);
+        if ($mysqli->connect_error) {
+            self::log('Mysql connection error (' . $mysqli->connect_errno . ') ' . $mysqli->connect_error, LOG_ERR);
+            return false;
+        }
+        $this->dbh = $mysqli;
+        $this->dbh->set_charset("utf8");
+        return true;
+    }
+    
+    private function initApi() {
+        $scripts = glob(dirname(__FILE__).'/api/*.php');
+        if (!is_array($scripts))
+            return false;
+        
+        foreach ($scripts as $script) {
+            try {
+                require_once($script);
+                $class = basename($script, '.php');
+                $api = new $class();
+                if ($api instanceof IApi)
+                    $api->init($this);
+            } catch (Exception $e) {
+                return false;
+            }
+        }
+        
+        return true;
+    }
+    
+    public function columnExists($table, $column) {
+        $result = false;
+        $sql = "show fields from $table";
+        $data = $this->query($sql);
+        foreach ($data as $row) {
+            if (strtolower($row['Field']) == strtolower($column)) {
+                $result = true;
+                break;
+            }
+        }
+        return $result;
+    }
+    
+    public function getParam($key, $default = null, $group = 'global') {
+        $sql = "select * from cc_config where config_group_title = '$group' and config_key = '$key' limit 1";
+        $data = $this->query($sql);
+        
+        return (is_array($data) && count($data)) > 0 ? $data[0]['config_value'] : $default;
+    }
+    
+    public function getQueryParam($key, $default = null) {
+        return array_key_exists($key, $_REQUEST) ? $_REQUEST[$key] : $default;
+    }
+    
+    public function query($sql) {
+        $data = array();
+        if ($this->dbh) {
+            try {
+                $result = $this->dbh->query($sql);
+                if ($result === true) { // data changed
+                    $data['affected_rows'] = $this->dbh->affected_rows;
+                    $data['insert_id'] = $this->dbh->insert_id;
+                } else if ($result instanceof mysqli_result) { // data extracted
+                    while ($row = $result->fetch_assoc())
+                        $data[] = $row;
+                    $result->free();
+                } else {
+                    $data['error'] = $this->dbh->error;
+                }
+            } catch (Exception $e) {
+                $data['error'] = $e->getMessage();
+            }
+        } else {
+            $data['error'] = 'No connection';
+        }
+        return $data;
+    }
+    
+    public function escape($value) {
+        return $this->dbh ? $this->dbh->real_escape_string($value) : $value;
+    }
+    
+    public function registerApi($name, $callback) {
+        if (!array_key_exists($name, $this->api) && is_callable($callback))
+            $this->api[$name] = $callback;
+    }
+
+    public function registerFormat($name, $callback) {
+        if (!array_key_exists($name, $this->format) && is_callable($callback))
+            $this->format[$name] = $callback;
+    }
+    
+    private function check() {
+        $ips = $this->getParam('api_ip_auth', null, 'webui');
+        if (strlen($ips) > 0 && $ips != '*') {
+            if (!in_array($_SERVER['REMOTE_ADDR'], explode(';', $ips))) {
+                return 'Your IP is not allowed';
+            }
+        }
+        
+        if (strtolower(md5($this->getParam('api_security_key', null, 'webui'))) != strtolower($this->getQueryParam('api_security_key', 'error'))) {
+            return 'Wrong API key';
+        }
+
+        return $error;
+    }
+    
+    public function process() {
+        $data = '';
+        $ips = $this->getParam('api_ip_auth', null, 'webui');
+        if (!strlen($ips) || $ips == '*' || in_array($_SERVER['REMOTE_ADDR'], explode(';', $ips))) {
+            if (strtolower(md5($this->getParam('api_security_key', null, 'webui'))) == strtolower($this->getQueryParam('api_security_key', 'error'))) {
+                $method = $this->getQueryParam('api_method');
+                if (!is_null($method) && strlen($method) > 0 && array_key_exists($method, $this->api) && is_callable($this->api[$method])) {
+                    $data = call_user_func($this->api[$method]);
+                } else {
+                    $data = 'Wrong API method';
+                }
+            } else {
+                $data = 'Wrong API key';
+            }
+        } else {
+            $data = 'Your IP is not allowed';
+        }
+        
+        $format = $this->getQueryParam('api_format');
+        if (!is_null($format) && strlen($format) > 0 && array_key_exists($format, $this->format) && is_callable($this->format[$format])) {
+            echo call_user_func($this->format[$format], $data);
+        } else {
+            print_r($data);
+        }
+    }
+    
+}
+
+$api = new Api();
+$api->process();
diff --git a/webservice/api/JsonFormat.php b/webservice/api/JsonFormat.php
new file mode 100755
index 000000000..ffa4fd228
--- /dev/null
+++ b/webservice/api/JsonFormat.php
@@ -0,0 +1,20 @@
+<?php
+
+class JsonFormat implements IApi {
+    
+    public function init($api) {
+        
+        $api->registerFormat('json', array($this, 'format'));
+        
+    }
+
+    public function format($data) {
+        
+        if (!is_array($data))
+            $data = array('data' => $data);
+        
+        return json_encode($data);
+        
+    }
+    
+}
diff --git a/webservice/api/OneWorldApi.php b/webservice/api/OneWorldApi.php
new file mode 100755
index 000000000..26e10654e
--- /dev/null
+++ b/webservice/api/OneWorldApi.php
@@ -0,0 +1,791 @@
+<?php
+
+class OneWorldApi implements IApi {
+    
+    private
+        $api = null,
+        $base_currency = null,
+        $currencies = array();
+    
+    public function init($api) {
+        $api->registerApi('card_create', array($this, 'card_create'));
+        $api->registerApi('card_delete', array($this, 'card_delete'));
+        $api->registerApi('card_find', array($this, 'card_find'));
+        $api->registerApi('card_pin_update', array($this, 'card_pin_update'));
+        $api->registerApi('tariff_find', array($this, 'tariff_find'));
+        $api->registerApi('helper_param_get', array($this, 'helper_param_get'));
+        $api->registerApi('helper_currency_convert', array($this, 'helper_currency_convert'));
+        $api->registerApi('card_balance', array($this, 'card_balance'));
+        $api->registerApi('card_balance_add', array($this, 'card_balance_add'));
+        $api->registerApi('card_tariff', array($this, 'card_tariff'));
+        $api->registerApi('card_tariff_change', array($this, 'card_tariff_change'));
+        $api->registerApi('call_rate', array($this, 'call_rate'));
+        $api->registerApi('did_find', array($this, 'did_find'));
+        $api->registerApi('did_buy', array($this, 'did_buy'));
+        $api->registerApi('did_list', array($this, 'did_list'));
+        $api->registerApi('did_release', array($this, 'did_release'));
+        $api->registerApi('voucher_activate', array($this, 'voucher_activate'));
+        $api->registerApi('conference_create', array($this, 'conference_create'));
+        $api->registerApi('callback_create', array($this, 'callback_create'));
+
+        $this->api = $api;
+        $this->base_currency = $api->getParam('base_currency');
+        $data = $api->query("select lower(currency) currency, value from cc_currencies");
+        foreach ($data as $row)
+            $this->currencies[$row['currency']] = $row['value'];
+    }
+    
+    public function getCurrencyRate($currency) {
+        $currency = strtolower($currency);
+
+        return array_key_exists($currency, $this->currencies) ? $this->currencies[$currency] : 0;
+    }
+    
+    public function getRate($from, $to) {
+        $fromRate = $this->getCurrencyRate($from);
+        $toRate = $this->getCurrencyRate($to);
+        if ($fromRate == 0 || $toRate == 0)
+            return 0;
+
+        $rate = 0;
+        if ($from == $this->base_currency) {
+            $rate = 1 / $toRate;
+        } else if ($to == $this->base_currency) {
+            $rate = $fromRate;
+        } else {
+            $rate = $fromRate * (1 / $toRate);
+        }
+
+        return $rate;
+    }
+
+    /**
+     * Converts from one to another
+     * 
+     * @param float $amount
+     * @param mixed $from
+     * @param mixed $to if null - base currency will be used
+     * @return float
+     */
+    public function convertCurrency($amount, $from, $to = null) {
+        if ($to === null)
+            $to = $this->base_currency;
+
+        return $amount * $this->getRate($from, $to);
+    }
+    
+    /**
+     * Expects:
+     *  query_column
+     *  query_value
+     *  query_condition
+     * 
+     * @return mixed
+     */
+    private function find_query($table) {
+        $response = null;
+        $query_value = $this->api->escape($this->api->getQueryParam('query_value', '%'));
+        $query_column = $this->api->getQueryParam('query_column', 'id');
+        $query_condition = $this->api->getQueryParam('query_condition', 'like');
+        if ($this->api->columnExists($table, $query_column)) {
+            try {
+                $sql = "select * from $table where `$query_column` $query_condition '$query_value'";
+                $response = $this->response(true, array('data' => $this->api->query($sql)));
+            } catch (Exception $e) {
+                $response = $this->response(false, array('msg' => $e->getMessage()));
+            }
+        } else {
+            $response = $this->response(false, array('msg' => "Wrong query_column"));
+        }        
+        return $response;
+    }
+
+    /**
+     * Expects:
+     *  query_column
+     *  query_value
+     * 
+     * @return mixed
+     */
+    public function delete_query($table) {
+        $response = null;
+        $query_value = $this->api->escape($this->api->getQueryParam('query_value'));
+        $query_column = $this->api->getQueryParam('query_column', 'id');
+        if ($this->api->columnExists($table, $query_column)) {
+            try {
+                $sql = "delete from $table where `$query_column` = '$query_value' limit 1";
+                $result = $this->api->query($sql);
+                $response = (isset($result['affected_rows']) && $result['affected_rows'] > 0) ? $this->response(true) : $this->response(false, array('msg' => "Cannot find card where $query_column = $query_value"));
+            } catch (Exception $e) {
+                $response = $this->response(false, array('msg' => $e->getMessage()));
+            }
+        } else {
+            $response = $this->response(false, array('msg' => "Wrong query_column"));
+        }        
+        return $response;
+    }
+    
+    private function response($success, $params = array()) {
+        return array_merge(array('success' => $success), $params);
+    }
+    
+    /**
+     * Creates new card
+     * 
+     * Expectes:
+     *  parameters like col_REALCOLUMNNAME and a value for it
+     * 
+     * @return array
+     */
+    public function card_create() {
+        $username = $this->api->escape($this->api->getQueryParam('username', ''));
+        $password = $this->api->escape($this->api->getQueryParam('password', ''));
+        $tariff = intval($this->api->getQueryParam('tariff', 0));
+        $pin = $this->api->escape($this->api->getQueryParam('pin', ''));
+        
+        $sql = "select * from cc_tariffgroup where id = '$tariff'";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Bad tariff'));
+        
+        $values = array(
+            'username' => $username,
+            'useralias' => $username,
+            'uipass' => $password,
+            'tariff' => $tariff,
+            'credit' => '0',
+            'activated' => 't',
+            'status' => '1',
+            'lastname' => '',
+            'firstname' => '',
+            'address' => '',
+            'city' => '',
+            'state' => '',
+            'country' => '',
+            'zipcode' => '',
+            'phone' => '',
+            'email' => '',
+            'fax' => '',
+            'typepaid' => '0',
+            'loginkey' => '',
+            'email_notification' => '',
+            'company_name' => '',
+            'company_website' => '',
+            'traffic_target' => '0',
+            'simultaccess' => '0',
+            'max_concurrent' => '1',
+            'redial' => '',
+            'tag' => 'oneworld',
+            'block' => '1',
+            'lock_pin' => $pin
+        );
+                
+        $fields = array();
+        foreach ($values as $col => $value)
+            $fields[] = "$col = '$value'";
+
+        $response = null;
+        try {
+            $sql = "insert into cc_card set " . join(', ', $fields);
+            $result = $this->api->query($sql);
+            if (isset($result['insert_id']) && $result['insert_id'] > 0) {
+                $sql = "select * from cc_card where id = '{$result['insert_id']}'";
+                $data = $this->api->query($sql);
+                $response = count($data) > 0 ? $this->response(true, array('card' => $data[0])) : $this->response(false, array('msg' => "Cannot find card by id {{$result['insert_id']}}"));
+            } else {
+                $response = $this->response(false, array('msg' => "Cannot create card"));
+            }
+        } catch (Exception $e) {
+            $response = $this->response(false, array('msg' => $e->getMessage()));
+        }
+        
+        return $response;
+    }
+    
+    public function card_pin_update() {
+        $username = $this->api->escape($this->api->getQueryParam('username', ''));
+        $pin = $this->api->escape($this->api->getQueryParam('pin', ''));
+        
+        $sql = "select * from cc_card where username = '$username' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Billing record not found.'));
+        
+        $card = $data[0];
+        
+        $sql = "update cc_card set lock_pin = '$pin' where id = '{$card['id']}' limit 1";
+        $data = $this->api->query($sql);
+        
+        if (!isset($data['affected_rows']) || !$data['affected_rows'])
+            return $this->response(false, array('msg' => isset($data['error']) ? $data['error'] : 'Pin is not changed.'));
+        
+        return $this->response(true);
+    }
+    
+    public function card_delete() {
+        return $this->delete_query('cc_card');
+    }
+    
+    public function tariff_find() {
+        return $this->find_query('cc_tariffgroup');
+    }
+
+    public function card_find() {
+        return $this->find_query('cc_card');
+    }
+
+    /**
+     * Expects:
+     *  key (optional)
+     *  group (optional)
+     *  default (optional)
+     * 
+     */
+    public function helper_param_get() {
+        $key = $this->api->getQueryParam('key', '');
+        $group = $this->api->getQueryParam('group', 'global');
+        $default = $this->api->getQueryParam('default', null);
+        
+        return $this->response(true, array('data' => $this->api->getParam($key, $default, $group)));
+    }
+    
+    /**
+     * Expects:
+     *  amount
+     *  from
+     *  to (optional)
+     * 
+     */
+    public function helper_currency_convert() {
+        $amount = $this->api->getQueryParam('amount', 0);
+        $from = $this->api->getQueryParam('from');
+        $to = $this->api->getQueryParam('to', $this->base_currency);
+        
+        return $this->response(true, array('data' => $this->convertCurrency($amount, $from, $to)));
+    }
+    
+    public function card_balance() {
+        $username = $this->api->escape($this->api->getQueryParam('username', ''));
+
+        $sql = "select credit, currency from cc_card where username = '$username' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Billing record not found.'));
+        
+        return $this->response(true, array('balance' => $this->convertCurrency($data[0]['credit'], $this->base_currency, $data[0]['currency']), 'currency' => $data[0]['currency']));
+    }
+    
+    public function card_tariff_change() {
+        $username = $this->api->escape($this->api->getQueryParam('username', ''));
+        $tariff = intval($this->api->getQueryParam('tariff', 0));
+        
+        $sql = "select * from cc_tariffgroup where id = '$tariff' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Tariff record not found.'));
+
+        $new_tariff = $data[0];
+        
+        $sql = "select c.id card_id, t.id tariff_id from cc_card c left join cc_tariffgroup t on t.id = c.tariff where c.username = '$username' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Billing record not found.'));
+        
+        $ids = $data[0];
+        
+        if ($ids['tariff_id'] == $tariff)
+            return $this->response(false, array('msg' => 'Tariff is same.'));
+        
+        // changing tariff
+        $sql = "update cc_card set tariff = '$tariff' where id = '{$ids['card_id']}' limit 1";
+        $data = $this->api->query($sql);
+        
+        if (!isset($data['affected_rows']) || !$data['affected_rows']) {
+            return $this->response(false, array('msg' => isset($data['error']) ? $data['error'] : 'Cannot change tariff.'));
+        } else {
+            // TODO: additional actions
+            
+            
+        }
+        
+        return $this->response(true, array('plan' => $new_tariff['tariffgroupname'], 'id' => $new_tariff['id']));
+    }
+    
+    public function card_tariff() {
+        $username = $this->api->escape($this->api->getQueryParam('username', ''));
+        
+        $sql = "select t.id id, t.tariffgroupname tariff from cc_card c left join cc_tariffgroup t on t.id = c.tariff where c.username = '$username' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Billing record not found.'));
+                
+        return $this->response(true, array('plan' => $data[0]['tariff'], 'id' => $data[0]['id']));
+    }
+    
+    public function call_rate() {
+        $username = $this->api->escape($this->api->getQueryParam('username', ''));
+        $number = $this->api->escape($this->api->getQueryParam('number', ''));
+
+        $sql = "select * from cc_card where username = '$username' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Billing record not found.'));
+        
+        $card = $data[0];
+        
+        if (!strlen($number))
+            return $this->response(false, array('msg' => 'Number is empty.'));
+        
+        require_once dirname(__FILE__) . '/../lib/admin.defines.php';
+        require_once dirname(__FILE__) . '/../lib/Class.RateEngine.php';        
+        
+        $A2B->DBHandle = DbConnect();
+        $A2B->set_instance_table(new Table());
+        $A2B->cardnumber = $username;
+        if (!$A2B->callingcard_ivr_authenticate_light($error_msg, $balance))
+            return $this->response(false, array('msg' => $error_msg));
+        
+        $RateEngine = new RateEngine();
+        $RateEngine->webui = 0;
+
+        $A2B->agiconfig['accountcode'] = $A2B->cardnumber ;
+        $A2B->agiconfig['use_dnid'] = 1;
+        $A2B->agiconfig['say_timetocall'] = 0;
+        $A2B->dnid = $A2B ->destination = $number;
+        if ($A2B->removeinterprefix) $A2B->destination = $A2B->apply_rules($A2B->destination);
+        
+        $resfindrate = $RateEngine->rate_engine_findrates($A2B, $A2B->destination, $card['tariff']);
+        if (!$resfindrate)
+            return $this->response(false, array('msg' => 'No matching rate found.'));
+        
+        $res_all_calcultimeout = $RateEngine->rate_engine_all_calcultimeout($A2B, $A2B->credit);
+        
+        if (!is_array($RateEngine->ratecard_obj) || !count($RateEngine->ratecard_obj))
+            return $this->response(false, array('msg' => 'No matching rate found.'));
+        
+        $rate = $RateEngine->ratecard_obj[0];
+        
+        return $this->response(true, array('rate' => $rate['rateinitial'], 'currency' => $this->base_currency, 'duration' => $rate['timeout']));
+    }
+    
+    public function voucher_activate() {
+        $username = $this->api->escape($this->api->getQueryParam('username', ''));
+        $voucher_id = $this->api->escape($this->api->getQueryParam('voucher_id', ''));
+
+        $sql = "select * from cc_card where username = '$username' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Billing record not found.'));
+        
+        $card = $data[0];
+        
+        $sql = "select * from cc_voucher where expirationdate >= CURRENT_TIMESTAMP AND activated='t' AND voucher='$voucher_id' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Voucher record not found.'));
+        
+        $voucher = $data[0];
+        
+        if (!array_key_exists(strtolower($voucher['currency']), $this->currencies))
+            return $this->response(false, array('msg' => 'Voucher currency is invalid.'));
+
+        $amount = $this->convertCurrency($voucher['credit'], $voucher['currency']);
+        if ($amount <= 0)
+            return $this->response(false, array('msg' => 'Invalid amount.'));
+        
+        $sql = "update cc_voucher set activated = 'f', usedcardnumber = '$username', usedate = now() where voucher = '$voucher_id' limit 1";
+        $data = $this->api->query($sql);
+        if (!isset($data['affected_rows']) || !$data['affected_rows'])
+            $this->response(false, array('msg' => isset($data['error']) ? $data['error'] : 'Cannot activate voucher.'));
+
+        $sql = "update cc_card set credit = credit + '$amount' where username = '$username'";
+        $data = $this->api->query($sql);
+        if (!isset($data['affected_rows']) || !$data['affected_rows'])
+            $this->response(false, array('msg' => isset($data['error']) ? $data['error'] : 'Cannot add balance.'));
+        
+        return $this->card_balance();
+    }
+    
+    public function card_balance_add() {
+        $username = $this->api->escape($this->api->getQueryParam('username', ''));
+        $amount = floatval($this->api->getQueryParam('amount', 0));
+        $currency = $this->api->escape($this->api->getQueryParam('currency', $this->base_currency));
+        
+        $sql = "select * from cc_card where username = '$username' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Billing record not found.'));
+        
+        $card = $data[0];
+
+        if (!array_key_exists(strtolower($currency), $this->currencies))
+            return $this->response(false, array('msg' => 'Currency is invalid.'));
+        
+        $amount = $this->convertCurrency($amount, $currency);
+        
+        if ($amount <= 0)
+            return $this->response(false, array('msg' => 'Invalid amount.'));
+        
+        $sql = "insert into cc_logrefill set credit = '$amount', card_id = '{$card['id']}', description = 'oneworld refill', refill_type = '0', added_invoice = '0'";
+        $data = $this->api->query($sql);
+        if (!isset($data['insert_id']) || !$result['insert_id'])
+            $this->response(false, array('msg' => isset($data['error']) ? $data['error'] : 'Cannot add refill record.'));
+        
+        $sql = "update cc_card set credit = credit + '$amount' where username = '$username'";
+        $data = $this->api->query($sql);
+        if (!isset($data['affected_rows']) || !$data['affected_rows'])
+            $this->response(false, array('msg' => isset($data['error']) ? $data['error'] : 'Cannot add balance.'));
+                
+        return $this->card_balance();
+    }
+    
+    public function did_find() {
+        $country = $this->api->escape($this->api->getQueryParam('country', ''));
+        $prefix = $this->api->escape($this->api->getQueryParam('prefix', ''));
+        $max_rate = floatval($this->api->getQueryParam('max_rate', 0));
+        
+        $sql = "select d.id, c.countryname, d.did, d.billingtype, d.fixrate, d.selling_rate from cc_did d left join cc_country c on c.id = d.id_cc_country where d.activated = '1' and d.reserved = '0' and d.iduser = '0'";
+        if (strlen($country)) {
+            $sql .= " and lower(c.countryname) like '%" . strtolower($country) . "%'";
+        }
+        if (strlen($prefix)) {
+            $sql .= " and d.did like '" . $prefix . "%'";
+        }
+        if ($max_rate) {
+            $sql .= " and d.fixrate <= '" . $max_rate . "'";
+        }
+        $sql .= " order by d.did asc";
+        
+        $data = $this->api->query($sql);
+        
+        return $this->response(true, array('data' => $data));
+    }
+
+    public function did_list() {
+        $username = $this->api->escape($this->api->getQueryParam('username', ''));
+        
+        $sql = "select * from cc_card where username = '$username' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Billing record not found.'));
+        
+        $card = $data[0];
+
+        $sql = "select d.id, c.countryname, d.did, d.billingtype, d.fixrate, d.selling_rate from cc_did d left join cc_country c on c.id = d.id_cc_country where d.activated = '1' and d.reserved = '1' and d.iduser = '{$card['id']}'";
+        $data = $this->api->query($sql);
+        
+        return $this->response(true, array('data' => $data));
+    }
+    
+    public function did_buy() {
+        $username = $this->api->escape($this->api->getQueryParam('username', ''));
+        $destination = $this->api->escape($this->api->getQueryParam('destination', ''));
+        $did_id = intval($this->api->getQueryParam('did_id', 0));
+        
+        $sql = "select * from cc_card where username = '$username' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Billing record not found.'));
+        
+        $card = $data[0];
+        
+        $sql = "select * from cc_did where id = '$did_id' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'DID record not found.'));
+        
+        $did = $data[0];
+        
+        if ($did['activated'] != '1' || $did['iduser'] != '0' || $did['reserved'] != '0')
+            return $this->response(false, array('msg' => 'Bad DID record.'));
+        
+        if ($did['billingtype'] < 2 && $card['credit'] < $did['fixrate'])
+            return $this->response(false, array('msg' => 'No enough balance.'));
+        
+        // update DID
+        $sql = "update cc_did set iduser = '{$card['id']}', reserved = '1' where id = '$did_id' limit 1";
+        $data = $this->api->query($sql);
+        if (!isset($data['affected_rows']) || !$data['affected_rows'])
+            return $this->response(false, array('msg' => isset($data['error']) ? $data['error'] : 'Cannot assign DID.'));
+            
+        // update cc_charge
+        $sql = "insert into cc_charge set id_cc_card = '{$card['id']}', amount = '{$did['fixrate']}', chargetype = '2', id_cc_did = '$did_id'";
+        $data = $this->api->query($sql);
+        if (!isset($data['insert_id']) || !$data['insert_id'])
+            return $this->response(false, array('msg' => isset($data['error']) ? $data['error'] : 'Cannot create charge record.'));
+                
+        // update cc_card
+        $sql = "update cc_card set credit = credit - '{$did['fixrate']}' where id = '{$card['id']}' limit 1";
+        $data = $this->api->query($sql);
+        if (!isset($data['affected_rows']) || !$data['affected_rows'])
+            return $this->response(false, array('msg' => isset($data['error']) ? $data['error'] : 'Cannot deduct balance.'));
+        
+        // update cc_did_use previous record
+        $sql = "select * from cc_did_use where id_did = '$did_id' and activated = '0' limit 1";
+        $data = $this->api->query($sql);
+        if (count($data)) {
+            $did_use = $data[0];
+            $sql = "update cc_did_use set releasedate = now() where id = '{$did_use['id']}' limit 1";
+            $this->api->query($sql);
+        }
+                
+        // update cc_did_use with new data
+        $sql = "insert into cc_did_use set activated = '1', id_cc_card = '{$card['id']}', id_did = '$did_id', month_payed = '1'";
+        $data = $this->api->query($sql);
+        if (!isset($data['insert_id']) || !$data['insert_id'])
+            return $this->response(false, array('msg' => isset($data['error']) ? $data['error'] : 'Cannot create DID use record.'));
+        
+        // adding default voip destination
+        if (strlen($destination)) {
+            $sql = "insert into cc_did_destination set activated = '1', id_cc_card = '{$card['id']}', id_cc_did = '$did_id', destination = '$destination', voip_call = '1', validated = '1', priority = '0'";
+            $data = $this->api->query($sql);
+            if (!isset($data['insert_id']) || !$data['insert_id'])
+                return $this->response(false, array('msg' => isset($data['error']) ? $data['error'] : 'Cannot create DID destination record.'));
+        }
+
+        return $this->response(true);
+    }
+
+    public function did_release() {
+        $username = $this->api->escape($this->api->getQueryParam('username', ''));
+        $did_id = intval($this->api->getQueryParam('did_id', 0));
+        
+        $sql = "select * from cc_card where username = '$username' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Billing record not found.'));
+        
+        $card = $data[0];
+        
+        $sql = "select * from cc_did where id = '$did_id' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'DID record not found.'));
+        
+        $did = $data[0];
+        
+        if ($did['iduser'] != $card['id'])
+            return $this->response(false, array('msg' => 'Bad DID record.'));
+        
+        // update DID
+        $sql = "update cc_did set iduser = '0', reserved = '0' where id = '$did_id' limit 1";
+        $data = $this->api->query($sql);
+        if (!isset($data['affected_rows']) || !$data['affected_rows'])
+            return $this->response(false, array('msg' => isset($data['error']) ? $data['error'] : 'Cannot release DID.'));
+        
+        // update cc_did_use previous record
+        $sql = "select * from cc_did_use where id_did = '$did_id' and activated = '1' limit 1";
+        $data = $this->api->query($sql);
+        if (count($data)) {
+            $did_use = $data[0];
+            $sql = "update cc_did_use set releasedate = now() where id = '{$did_use['id']}' limit 1";
+            $this->api->query($sql);
+        }
+
+        // update cc_did_use with new data
+        $sql = "insert into cc_did_use set activated = '0', id_did = '$did_id'";
+        $data = $this->api->query($sql);
+        if (!isset($data['insert_id']) || !$data['insert_id'])
+            return $this->response(false, array('msg' => isset($data['error']) ? $data['error'] : 'Cannot create DID use record.'));
+        
+        // remove destinations
+        $sql = "delete from cc_did_destination where id_cc_did = '$did_id'";
+        $this->api->query($sql);
+        
+        return $this->response(true);
+    }
+
+    /**
+     * Creates new conference with unique N digit number, minimum 5
+     * Requires an asterisk DB available with "meetme" table, extconfig should be configured on asterisk!
+     */
+    public function conference_create() {
+        $username = $this->api->escape($this->api->getQueryParam('username', ''));
+        $pin = $this->api->escape($this->api->getQueryParam('pin', ''));
+        $length = max(intval($this->api->getQueryParam('length', 6)), 5);
+        $response = "";
+        
+        // meetme table location
+        $database = "asterisk";
+        $table = "meetme";
+
+        // get next incremental ID
+        $sql = "select AUTO_INCREMENT id from information_schema.tables where table_name = '$table' and table_schema = '$database'";
+        $data = $this->api->query($sql);
+        $next_id = count($data) ? $data[0]['id'] : 1;
+        
+        // generate padding
+        $padding = "";
+        for ($i = 0; $i < $length - strlen($next_id); $i++)
+            $padding .= rand(0, 9);
+        
+        // generating confno
+        $confno = $next_id . $padding;
+        
+        $fields = array(
+            "confno = '$confno'",
+            "pin = '$pin'",
+            "opts = 'MA'",
+            "owner = '$username'",
+            "starttime = now()"
+        );
+        $sql = "insert into $database.$table set " . join(', ', $fields);
+        
+        try {
+            $result = $this->api->query($sql);
+            $response = (isset($result['insert_id']) && $result['insert_id'] > 0) ? $this->response(true, array('confno' => $confno)) : $this->response(false, array('msg' => "Cannot create conference"));
+        } catch (Exception $e) {
+            $response = $this->response(false, array('msg' => $e->getMessage()));
+        }
+        
+        return $response;
+    }
+    
+    public function callback_create() {
+        $lib = dirname(__FILE__) . '/../lib';
+        
+        define ("FSROOT", substr($lib,0,-3));
+        
+        require_once "$lib/Misc.php";
+        require_once "$lib/interface/constants.php";
+        require_once "$lib/Class.A2Billing.php";
+        require_once "$lib/adodb/adodb.inc.php";
+        require_once "$lib/Class.Table.php";
+        require_once "$lib/Class.Connection.php";
+        require_once "$lib/Class.Realtime.php";
+        require_once "$lib/Class.RateEngine.php";
+
+        $A2B = new A2Billing();
+
+        // LOAD THE CONFIGURATION
+        $res_load_conf = $A2B -> load_conf($agi, A2B_CONFIG_DIR."a2billing.conf", 1);
+        if (!$res_load_conf)
+            return $this->response(false, array('msg' => 'Cannot load A2B config'));
+
+        require_once "$lib/common.defines.php";
+        
+        $username = $this->api->escape($this->api->getQueryParam('username', ''));
+        $number = $this->api->getQueryParam('number', '');
+        $destination = $this->api->getQueryParam('destination', '');
+        
+        $sql = "select * from cc_card where username = '$username' limit 1";
+        $data = $this->api->query($sql);
+        if (!count($data))
+            return $this->response(false, array('msg' => 'Billing record not found.'));
+        
+        $card = $data[0];
+        
+        if (strlen($number) < 6)
+            return $this->response(false, array('msg' => 'Bad number "' . $number . '"'));
+
+        $A2B -> DBHandle = DbConnect();
+        $instance_table = new Table();
+        $A2B -> set_instance_table ($instance_table);
+        $A2B -> cardnumber = $username;
+
+        if ($A2B -> callingcard_ivr_authenticate_light ($error_msg)) {
+
+            $RateEngine = new RateEngine();
+            $RateEngine -> webui = 0;
+            // LOOKUP RATE : FIND A RATE FOR THIS DESTINATION
+
+            $A2B -> agiconfig['accountcode']=$username;
+            $A2B -> agiconfig['use_dnid']=1;
+            $A2B -> agiconfig['say_timetocall']=0;
+            $A2B -> extension = $A2B -> dnid = $A2B -> destination = $username;
+
+            $resfindrate = $RateEngine->rate_engine_findrates($A2B, $username, $card["tariff"]);
+
+            // IF FIND RATE
+            if ($resfindrate!=0) {
+                $res_all_calcultimeout = $RateEngine->rate_engine_all_calcultimeout($A2B, $A2B->credit);
+                if ($res_all_calcultimeout) {
+
+                    // MAKE THE CALL
+                    if ($RateEngine -> ratecard_obj[0][34]!='-1') {
+                        $usetrunk = 34;
+                        $usetrunk_failover = 1;
+                        $RateEngine -> usedtrunk = $RateEngine -> ratecard_obj[0][34];
+                    } else {
+                        $usetrunk = 29;
+                        $RateEngine -> usedtrunk = $RateEngine -> ratecard_obj[0][29];
+                        $usetrunk_failover = 0;
+                    }
+
+                    $prefix		= $RateEngine -> ratecard_obj[0][$usetrunk+1];
+                    $tech 		= $RateEngine -> ratecard_obj[0][$usetrunk+2];
+                    $ipaddress 		= $RateEngine -> ratecard_obj[0][$usetrunk+3];
+                    $removeprefix 	= $RateEngine -> ratecard_obj[0][$usetrunk+4];
+                    $timeout		= $RateEngine -> ratecard_obj[0]['timeout'];
+                    $failover_trunk	= $RateEngine -> ratecard_obj[0][40+$usetrunk_failover];
+                    $addparameter	= $RateEngine -> ratecard_obj[0][42+$usetrunk_failover];
+
+                    $destination = $username;
+                    if (strncmp($destination, $removeprefix, strlen($removeprefix)) == 0) $destination= substr($destination, strlen($removeprefix));
+
+                    $pos_dialingnumber = strpos($ipaddress, '%dialingnumber%' );
+                    $ipaddress = str_replace("%cardnumber%", $A2B->cardnumber, $ipaddress);
+                    $ipaddress = str_replace("%dialingnumber%", $prefix.$destination, $ipaddress);
+
+                    $dialparams = '';
+                    if ($pos_dialingnumber !== false) {
+                        $dialstr = "$tech/$ipaddress".$dialparams;
+                    } else {
+                        if ($A2B->agiconfig['switchdialcommand'] == 1) {
+                            $dialstr = "$tech/$prefix$destination@$ipaddress".$dialparams;
+                        } else {
+                            $dialstr = "$tech/$ipaddress/$prefix$destination".$dialparams;
+                        }
+                    }
+
+                    //ADDITIONAL PARAMETER 			%dialingnumber%,	%cardnumber%
+                    if (strlen($addparameter)>0) {
+                        $addparameter = str_replace("%cardnumber%", $A2B->cardnumber, $addparameter);
+                        $addparameter = str_replace("%dialingnumber%", $prefix.$destination, $addparameter);
+                        $dialstr .= $addparameter;
+                    }
+
+                    $channel= $dialstr;
+                    $exten = $number;
+                    $context = $A2B -> config["callback"]['context_callback'];
+                    $id_server_group = $A2B -> config["callback"]['id_server_group'];
+                    $priority=1;
+                    $timeout = $A2B -> config["callback"]['timeout']*1000;
+                    $application='';
+                    $callerid = $username; // was before: $A2B -> config["callback"]['callerid'];
+                    $account = $username;
+
+                    $uniqueid 	=  MDP_NUMERIC(5).'-'.MDP_STRING(7);
+                    $status = 'PENDING';
+                    $server_ip = 'localhost';
+                    $num_attempt = 0;
+
+                    if ($A2B->config['global']['asterisk_version'] == "1_2" || $A2B->config['global']['asterisk_version'] == "1_4") {
+                        $variable = "CALLED=$username|CALLING=$number|CBID=$uniqueid|LEG=".$A2B->cardnumber;
+                    } else {
+                        $variable = "CALLED=$username,CALLING=$number,CBID=$uniqueid,LEG=".$A2B->cardnumber;
+                    }
+
+                    $QUERY = " INSERT INTO cc_callback_spool (uniqueid, status, server_ip, num_attempt, channel, exten, context, priority," .
+                             " variable, id_server_group, callback_time, account, callerid, timeout ) " .
+                             " VALUES ('$uniqueid', '$status', '$server_ip', '$num_attempt', '$channel', '$exten', '$context', '$priority'," .
+                             " '$variable', '$id_server_group',  now(), '$account', '$callerid', '30000')";
+                    $res = $A2B -> DBHandle -> Execute($QUERY);
+
+                    if (!$res) {
+                        return $this->response(false, array('msg' => 'Cannot insert the callback request in the spool!'));
+                    } else {
+                        return $this->response(true);
+                    }
+                } else {
+                    return $this->response(false, array('msg' => 'You don t have enough credit to call you back!'));
+                }
+            } else {
+                return $this->response(false, array('msg' => 'There is no route to call back your phonenumber!'));
+            }
+        } else {
+            return $this->response(false, array('msg' => strip_tags($error_msg)));
+        }
+    }
+    
+}
diff --git a/webservice/api/Voipru.php b/webservice/api/Voipru.php
new file mode 100755
index 000000000..c05108399
--- /dev/null
+++ b/webservice/api/Voipru.php
@@ -0,0 +1,162 @@
+<?php
+
+require_once dirname(__FILE__) . '/../lib/admin.defines.php';
+require_once dirname(__FILE__) . '/../lib/admin.module.access.php';
+require_once dirname(__FILE__) . '/../lib/phpagi/phpagi-asmanager.php';
+
+class Voipru implements IApi {
+    
+    private
+        $api = null,
+        $base_currency = null,
+        $currencies = array();
+    
+    public function init($api) {
+        $this->api = $api;
+        
+        $api->registerApi('ping', array($this, 'ping'));
+        $api->registerApi('voipru_account_create', array($this, 'accountCreate'));
+        $api->registerApi('voipru_apply_config', array($this, 'applySipConfig'));
+        $api->registerApi('voipru_card_create', array($this, 'createCard'));
+        $api->registerApi('voipru_sip_create', array($this, 'createSip'));
+    }
+
+    private function response($success, $params = array()) {
+        return array_merge(array('success' => $success), $params);
+    }
+
+    private function getAllQueryParams($prefix) {
+        $data = array();
+        foreach ($_REQUEST as $key => $value) {
+            if (preg_match("/^$prefix(.+)/i", $key, $matches)) {
+                $data[$matches[1]] = $value;
+            }
+        }
+        return $data;
+    }
+    
+    public function ping() {
+        return $this->response(true, array('msg' => 'pong'));
+    }
+    
+    public function applySipConfig() {
+        if (!USE_REALTIME) {
+            ob_start();
+            $instance_realtime = new Realtime();
+            $instance_realtime->create_trunk_config_file('sip');
+            $output = ob_get_clean();
+
+            if (!file_exists(BUDDY_SIP_FILE)) {
+                return $this->response(false, array('msg' => 'File is not created, check rights'));
+            } else if (strlen($output)) {
+                return $this->response(false, array('msg' => $output));
+            }
+            
+            $as = new AGI_AsteriskManager();
+            if ($as->connect(MANAGER_HOST, MANAGER_USERNAME, MANAGER_SECRET)) {
+                $res = $as->Command('sip reload');
+                $as->disconnect();
+            }
+        }
+        
+        return $this->response(true);
+    }
+    
+    public function createCard() {
+        $data = $this->getAllQueryParams('card_');
+        if (!count($data))
+            return $this->response(false, array('msg' => "Data array expected, param prefix is 'card_'"));
+        
+        $values = array_merge(array(
+            'username' => gen_card(),
+            'useralias' => null,
+            'uipass' => null,
+            'tariff' => null,
+            'credit' => '0',
+            'activated' => 't',
+            'status' => '1',
+            'lastname' => '',
+            'firstname' => '',
+            'address' => '',
+            'city' => '',
+            'state' => '',
+            'country' => '',
+            'zipcode' => '',
+            'phone' => '',
+            'email' => '',
+            'fax' => '',
+            'typepaid' => '0',
+            'loginkey' => '',
+            'email_notification' => '',
+            'company_name' => '',
+            'company_website' => '',
+            'traffic_target' => '0',
+            'simultaccess' => '0',
+            'max_concurrent' => '1',
+            'redial' => '',
+            'tag' => 'voipru'
+        ), $data);
+        
+        $fields = array();
+        foreach ($values as $col => $value)
+            $fields[] = "$col = '$value'";
+
+        $response = null;
+        try {
+            $sql = "insert into cc_card set " . join(', ', $fields);
+            $result = $this->api->query($sql);
+            if (isset($result['insert_id']) && $result['insert_id'] > 0) {
+                $sql = "select * from cc_card where id = '{$result['insert_id']}'";
+                $data = $this->api->query($sql);
+                $response = count($data) > 0 ? $this->response(true, array('card' => $data[0])) : $this->response(false, array('msg' => "Cannot find card by id {{$result['insert_id']}}"));
+            } else {
+                $response = $this->response(false, array('msg' => "Cannot create card"));
+            }
+        } catch (Exception $e) {
+            $response = $this->response(false, array('msg' => $e->getMessage()));
+        }
+        
+        return $response;
+    }
+    
+    public function createSip() {
+        $data = $this->getAllQueryParams('sip_');
+        if (!count($data))
+            return $this->response(false, array('msg' => "Data array expected, param prefix is 'sip_'"));
+
+        if (!isset($data['card_id']))
+            return $this->response(false, array('msg' => "Parameter 'sip_card_id' expected"));
+
+        if (!isset($data['secret']))
+            return $this->response(false, array('msg' => "Parameter 'sip_secret' expected"));
+        
+        $sql = "select * from cc_card where id = '{$data['card_id']}' limit 1";
+        $records = $this->api->query($sql);
+        if (!count($records))
+            return $this->response(false, array('msg' => 'Card record not found'));
+
+        $instance_realtime = new Realtime();
+        $instance_realtime->insert_voip_config(1, 0, $data['card_id'], $records[0]['username'], $data['secret']);
+
+        $sql = "select * from cc_sip_buddies where id_cc_card = '{$data['card_id']}' limit 1";
+        $records = $this->api->query($sql);
+        if (!count($records))
+            return $this->response(false, array('msg' => 'SIP buddy record not found'));
+        
+        return $this->response(true, array('sip' => $records[0]));
+    }
+    
+    public function accountCreate() {
+        $response = $this->createCard();
+        if ($response['success'] && $response['card']) {
+            $_REQUEST['sip_card_id'] = $response['card']['id'];
+            if (!isset($_REQUEST['sip_secret']))
+                $_REQUEST['sip_secret'] = MDP(10);
+            $response = $this->createSip();
+            if ($response['success']) {
+                $response = $this->applySipConfig();
+            }
+        }
+        return $response;
+    }
+}
diff --git a/webservice/api/client/ApiClient.php b/webservice/api/client/ApiClient.php
new file mode 100755
index 000000000..259b66657
--- /dev/null
+++ b/webservice/api/client/ApiClient.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * Description of ApiClient
+ *
+ * @author Roman Davydov http://openvoip.co
+ */
+class ApiClient {
+    
+    private
+        $url = null,
+        $defaultFormat = null;
+    
+    public function __construct($api_security_key, $url, $defaultFormat) {
+        $this->url = $url . '?api_security_key=' . md5($api_security_key);
+        $this->defaultFormat = $defaultFormat;
+    }
+    
+    public function __call($name, $arguments) {
+        $params = is_array($arguments) && count($arguments) > 0 && is_array($arguments[0]) ? $arguments[0] : array();
+        $format = is_array($arguments) && count($arguments) > 1 ? $arguments[1] : null;
+        
+        return $this->execute($name, $params, $format);
+    }
+    
+    public function execute($method, $params = array(), $format = null) {
+        $strParams = array();
+        if (is_array($params)) {
+            foreach ($params as $key => $value) {
+                $strParams[] = "$key=" . urlencode($value);
+            }
+        }
+        
+        $format = is_null($format) ? $this->defaultFormat : $format;
+        $url = $this->url . '&api_format=' . $format . '&api_method=' . $method . '&' . join('&', $strParams);
+        $ch = curl_init($url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        $result = curl_exec($ch);
+        curl_close($ch);
+        
+        return $this->formatResult($result, $format);
+    }
+    
+    /**
+     * Decodes result
+     * 
+     * @param mixed $data
+     * @param string $format
+     * @return mixed
+     */
+    private function formatResult($data, $format) {
+        $result = $data;
+        switch (strtolower($format)) {
+            case 'json':
+                $result = json_decode($data, true);
+                break;
+        }
+        return $result;
+    }
+    
+}
diff --git a/webservice/display_ratecard.php b/webservice/display_ratecard.php
index 965d795e8..c39067edb 100644
--- a/webservice/display_ratecard.php
+++ b/webservice/display_ratecard.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing
@@ -132,7 +132,7 @@
     $choose_currency = $currency_select;
 }
 if (!isset ($css_url) || strlen($css_url) == 0)
-    $css_url = substr("http://" . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'], 0, strlen("http://" . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) - 31) . "webservice/css/api_ratecard.css";
+    $css_url = substr("http://" . $_SERVER['HTTP_HOST'] . filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL), 0, strlen("http://" . $_SERVER['HTTP_HOST'] . filter_input(INPUT_SERVER, 'PHP_SELF', FILTER_SANITIZE_URL)) - 31) . "webservice/css/api_ratecard.css";
 
 if (!isset ($merge_form) || strlen($merge_form) == 0)
     $merge_form = 0;
diff --git a/webservice/sample_display_ratecard.php b/webservice/sample_display_ratecard.php
index 45d24c388..7f960f809 100644
--- a/webservice/sample_display_ratecard.php
+++ b/webservice/sample_display_ratecard.php
@@ -8,7 +8,7 @@
  * A2Billing, Commercial Open Source Telecom Billing platform,
  * powered by Star2billing S.L. <http://www.star2billing.com/>
  *
- * @copyright   Copyright (C) 2004-2012 - Star2billing S.L.
+ * @copyright   Copyright (C) 2004-2015 - Star2billing S.L.
  * @author      Belaid Arezqui <areski@gmail.com>
  * @license     http://www.fsf.org/licensing/licenses/agpl-3.0.html
  * @package     A2Billing