Add user geolocation and user statistical graphs

README.md

@@ -105,6 +105,8 @@ Ampache includes some external modules that carry their own licensing.
 * [jsTree] (http://www.jstree.com): MIT
 * [php-tmdb-api] (https://github.com/wtfzdotnet/php-tmdb-api) : MIT
 * [TvDb] (https://github.com/Moinax/TvDb) : MIT
+* [jQuery DateTimePicker] (https://github.com/xdan/datetimepicker) : MIT
+* [pChart] (http://www.pchart.net) : GPL v3
 
 
 Translations

config/ampache.cfg.php.dist

@@ -398,6 +398,12 @@ notify = "true"
 ; DEFAULT: false
 ;resize_images = "false"
 
+; Statistical Graphs * Requires PHP-GD *
+; Set this to true if you want Ampache to generate statistical
+; graphs on usages / users.
+; DEFAULT: false
+;statistical_graphs = "false"
+
 ; Art Gather Order
 ; Simply arrange the following in the order you would like
 ; ampache to search. If you want to disable one of the search

graph.php

@@ -0,0 +1,55 @@
+<?php
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
+/**
+ *
+ * LICENSE: GNU General Public License, version 2 (GPLv2)
+ * Copyright 2001 - 2014 Ampache.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License v2
+ * as published by the Free Software Foundation.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ */
+
+// This file is a little weird it needs to allow API session
+// this needs to be done a little better, but for now... eah
+define('NO_SESSION','1');
+require_once 'lib/init.php';
+
+// Check to see if they've got an interface session or a valid API session, if not GTFO
+if (!Session::exists('interface', $_COOKIE[AmpConfig::get('session_name')]) && !Session::exists('api', $_REQUEST['auth'])) {
+    debug_event('graph', 'Access denied, checked cookie session:' . $_COOKIE[AmpConfig::get('session_name')] . ' and auth:' . $_REQUEST['auth'], 1);
+    exit;
+}
+
+if (!AmpConfig::get('statistical_graphs')) {
+    debug_event('graph', 'Access denied, statistical graph disabled.', 1);
+    exit;
+}
+
+$type = $_REQUEST['type'];
+
+$user = $_REQUEST['user'];
+$start_date = $_REQUEST['start_date'];
+$end_date = $_REQUEST['end_date'];
+$zoom = $_REQUEST['zoom'];
+
+$graph = new Graph();
+
+switch ($type) {
+    case 'user_hits':
+        $graph->render_user_hits($user, $start_date, $end_date, $zoom);
+        break;
+    case 'user_bandwidth':
+        $graph->render_user_bandwidth($user, $start_date, $end_date, $zoom);
+        break;
+}

lib/class/broadcast_server.class.php

@@ -150,7 +150,7 @@ class Broadcast_Server implements MessageComponentInterface
             $broadcast = $this->broadcasters[$from->resourceId];
             $clients = $this->getListeners($broadcast);
 
-            Session::extend(Stream::$session, 'stream');
+            Session::extend(Stream::get_session(), 'stream');
 
             $broadcast->update_song($song_id);
             $this->broadcastMessage($clients, self::BROADCAST_SONG, base64_encode($this->getSongJS($song_id)));

lib/class/channel.class.php

@@ -405,7 +405,7 @@ class Channel extends database_object implements media, library_item
 
                     // End of file, prepare to move on for next call
                     if (feof($this->transcoder['handle'])) {
-                        $this->media->set_played();
+                        $this->media->set_played(-1, 'Ampache', array());
                         if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
                             fread($this->transcoder['stderr'], 4096);
                             fclose($this->transcoder['stderr']);
@@ -458,7 +458,7 @@ class Channel extends database_object implements media, library_item
         return $this->get_fullname();
     }
 
-    public function set_played($user, $agent)
+    public function set_played($user, $agent, $location)
     {
         // Do nothing
     }

lib/class/graph.class.php

@@ -0,0 +1,249 @@
+<?php
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
+/**
+ *
+ * LICENSE: GNU General Public License, version 2 (GPLv2)
+ * Copyright 2001 - 2014 Ampache.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License v2
+ * as published by the Free Software Foundation.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ */
+
+class Graph
+{
+    public function __construct()
+    {
+        require_once AmpConfig::get('prefix') . '/modules/pChart/pData.class.php';
+        require_once AmpConfig::get('prefix') . '/modules/pChart/pDraw.class.php';
+        require_once AmpConfig::get('prefix') . '/modules/pChart/pImage.class.php';
+
+        return true;
+    }
+
+    protected function get_sql_date_format($zoom)
+    {
+        switch ($zoom) {
+            case 'hour':
+                $df = "DATE_FORMAT(FROM_UNIXTIME(`object_count`.`date`), '%Y-%m-%d %H:00:00')";
+                break;
+            case 'year':
+                $df = "DATE_FORMAT(FROM_UNIXTIME(`object_count`.`date`), '%Y')";
+                break;
+            case 'month':
+                $df = "DATE_FORMAT(FROM_UNIXTIME(`object_count`.`date`), '%Y-%m')";
+                break;
+            case 'day':
+            default:
+                $df = "DATE_FORMAT(FROM_UNIXTIME(`object_count`.`date`), '%Y-%m-%d')";
+                break;
+        }
+
+        return "UNIX_TIMESTAMP(" . $df . ")";
+    }
+
+    protected function get_sql_where($user = 0, $start_date = null, $end_date = null)
+    {
+        if ($end_date == null) {
+            $end_date = time();
+        } else {
+            $end_date = intval($end_date);
+        }
+        if ($start_date == null) {
+            $start_date = $end_date - 2592000;
+        } else {
+            $start_date = intval($start_date);
+        }
+
+        $sql = "WHERE `object_count`.`date` > " . $start_date . " AND `object_count`.`date` < " . $end_date;
+        if ($user > 0) {
+            $user = intval($user);
+            $sql .= " AND `object_count`.`user` = " . $user;
+        }
+        return $sql;
+    }
+
+    protected function get_all_type_pts($fct, $user = 0, $start_date = null, $end_date = null, $zoom = 'day', $type = 'song')
+    {
+        $song_values = $this->$fct($user, $start_date, $end_date, $zoom, 'song');
+        if (AmpConfig::get('allow_video')) {
+            $video_values = $this->$fct($user, $start_date, $end_date, $zoom, 'video');
+        } else {
+            $vide_values = array();
+        }
+        $values = $song_values;
+        foreach ($video_values as $date => $value) {
+            if (array_key_exists($date, $values)) {
+                $values[$date] += $value;
+            } else {
+                $values[$date] = $value;
+            }
+        }
+        ksort($values, SORT_NUMERIC);
+        return $values;
+    }
+
+    protected function get_all_pts($fct, pData $MyData, $user = 0, $start_date = null, $end_date = null, $zoom = 'day')
+    {
+        $values = $this->get_all_type_pts($fct, $user, $start_date, $end_date, $zoom);
+        foreach ($values as $date => $value) {
+            $MyData->addPoints($value, "Total");
+            $MyData->addPoints($date, "TimeStamp");
+        }
+
+        $ustats = User::count();
+        // Only display other users if the graph is not for a specific user and user count is small
+        if (!$user && $ustats['users'] < 20) {
+            $user_ids = User::get_valid_users();
+            foreach ($user_ids as $id) {
+                $u = new User($id);
+                $user_values = $this->get_all_type_pts($fct, $id, $start_date, $end_date, $zoom);
+                foreach ($values as $date => $value) {
+                    if (array_key_exists($date, $user_values)) {
+                        $value = $user_values[$date];
+                    } else {
+                        $values = 0;
+                    }
+                    $MyData->addPoints($value, $u->username);
+                }
+            }
+        }
+    }
+
+    protected function get_user_hits_pts($user = 0, $start_date = null, $end_date = null, $zoom = 'day', $type = 'song')
+    {
+        $df = $this->get_sql_date_format($zoom);
+        $where = $this->get_sql_where($user, $start_date, $end_date);
+        $sql = "SELECT " . $df . " AS `zoom_date`, COUNT(`object_count`.`id`) AS `hits` FROM `object_count` " . $where .
+                "  AND `object_count`.`object_type` = '" . $type . "'" .
+                " GROUP BY " . $df;
+        $db_results = Dba::read($sql);
+
+        $values = array();
+        while ($results = Dba::fetch_assoc($db_results)) {
+            $values[$results['zoom_date']] = $results['hits'];
+        }
+        return $values;
+    }
+
+    protected function get_user_bandwidth_pts($user = 0, $start_date = null, $end_date = null, $zoom = 'day', $type = 'song')
+    {
+        $df = $this->get_sql_date_format($zoom);
+        $where = $this->get_sql_where($user, $start_date, $end_date);
+        $sql = "SELECT " . $df . " AS `zoom_date`, SUM(`" . $type . "`.`size`) AS `bandwith` FROM `object_count` " .
+                " JOIN `" . $type . "` ON `" . $type . "`.`id` = `object_count`.`object_id` " . $where .
+                "  AND `object_count`.`object_type` = '" . $type . "'" .
+                " GROUP BY " . $df;
+        $db_results = Dba::read($sql);
+
+        $values = array();
+        while ($results = Dba::fetch_assoc($db_results)) {
+            $values[$results['zoom_date']] = $results['bandwith'];
+        }
+        return $values;
+    }
+
+    protected function render_graph($title, $MyData, $zoom)
+    {
+        $MyData->setSerieDescription("TimeStamp","time");
+        $MyData->setAbscissa("TimeStamp");
+        switch ($zoom) {
+            case 'hour':
+                $MyData->setXAxisDisplay(AXIS_FORMAT_TIME,"H:00");
+                break;
+            case 'year':
+                $MyData->setXAxisDisplay(AXIS_FORMAT_DATE,"Y");
+                break;
+            case 'month':
+                $MyData->setXAxisDisplay(AXIS_FORMAT_DATE,"Y-m");
+                break;
+            case 'day':
+                $MyData->setXAxisDisplay(AXIS_FORMAT_DATE,"Y-m-d");
+                break;
+        }
+
+        /* Create the pChart object */
+        $myPicture = new pImage(700,230,$MyData);
+
+        /* Turn of Antialiasing */
+        $myPicture->Antialias = FALSE;
+
+        /* Draw a background */
+        $Settings = array("R"=>90, "G"=>90, "B"=>90, "Dash"=>1, "DashR"=>120, "DashG"=>120, "DashB"=>120);
+        $myPicture->drawFilledRectangle(0,0,700,230,$Settings);
+
+        /* Overlay with a gradient */
+        $Settings = array("StartR"=>200, "StartG"=>200, "StartB"=>200, "EndR"=>50, "EndG"=>50, "EndB"=>50, "Alpha"=>50);
+        $myPicture->drawGradientArea(0,0,700,230,DIRECTION_VERTICAL,$Settings);
+        $myPicture->drawGradientArea(0,0,700,230,DIRECTION_HORIZONTAL,$Settings);
+
+        /* Add a border to the picture */
+        $myPicture->drawRectangle(0,0,699,229,array("R"=>0,"G"=>0,"B"=>0));
+
+        /* Write the chart title */
+        $myPicture->setFontProperties(array("FontName"=>AmpConfig::get('prefix')."/modules/pChart/fonts/Forgotte.ttf","FontSize"=>11));
+        $myPicture->drawText(150,35,$title,array("FontSize"=>20,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+
+        /* Set the default font */
+        $myPicture->setFontProperties(array("FontName"=>AmpConfig::get('prefix')."/modules/pChart/fonts/pf_arma_five.ttf","FontSize"=>6));
+
+        /* Define the chart area */
+        $myPicture->setGraphArea(60,40,680,200);
+
+        /* Draw the scale */
+        $scaleSettings = array("XMargin"=>10,"YMargin"=>10,"Floating"=>TRUE,"GridR"=>200,"GridG"=>200,"GridB"=>200,"RemoveSkippedAxis"=>TRUE,"DrawSubTicks"=>FALSE,"Mode"=>SCALE_MODE_START0,"LabelingMethod"=>LABELING_DIFFERENT);
+        $myPicture->drawScale($scaleSettings);
+
+        /* Turn on Antialiasing */
+        $myPicture->Antialias = TRUE;
+
+        /* Draw the line chart */
+        $myPicture->setShadow(TRUE,array("X"=>1,"Y"=>1,"R"=>0,"G"=>0,"B"=>0,"Alpha"=>10));
+        $myPicture->drawLineChart();
+
+        /* Write a label over the chart */
+        $myPicture->writeLabel("Inbound",720);
+
+        /* Write the chart legend */
+        $myPicture->drawLegend(580,20,array("Style"=>LEGEND_NOBORDER,"Mode"=>LEGEND_HORIZONTAL));
+
+        /* Render the picture (choose the best way) */
+        $myPicture->autoOutput();
+    }
+
+    public function render_user_hits($user = 0, $start_date = null, $end_date = null, $zoom = 'day')
+    {
+        /* Create and populate the pData object */
+        $MyData = new pData();
+
+        $this->get_all_pts('get_user_hits_pts', $MyData, $user, $start_date, $end_date, $zoom);
+
+        $MyData->setAxisName(0, "Hits");
+        $MyData->setAxisDisplay(0, AXIS_FORMAT_METRIC);
+
+        $this->render_graph('Hits', $MyData, $zoom);
+    }
+
+    public function render_user_bandwidth($user = 0, $start_date = null, $end_date = null, $zoom = 'day')
+    {
+        /* Create and populate the pData object */
+        $MyData = new pData();
+
+        $this->get_all_pts('get_user_bandwidth_pts', $MyData, $user, $start_date, $end_date, $zoom);
+
+        $MyData->setAxisName(0, "Hits");
+        $MyData->setAxisDisplay(0, AXIS_FORMAT_TRAFFIC);
+
+        $this->render_graph('Bandwidth', $MyData, $zoom);
+    }
+}

lib/class/live_stream.class.php

@@ -302,7 +302,7 @@ class Live_Stream extends database_object implements media, library_item
 
     }
 
-    public function set_played($user, $agent)
+    public function set_played($user, $agent, $location)
     {
         // Do nothing
     }

lib/class/media.interface.php

@@ -60,6 +60,6 @@ interface media
      */
     public function get_stream_name();
 
-    public function set_played($user, $agent);
+    public function set_played($user, $agent, $location);
 
 } // end interface

lib/class/session.class.php

@@ -202,12 +202,25 @@ class Session
             $expire = time() + AmpConfig::get('session_length');
         }
 
+        $latitude = null;
+        if (isset($data['geo_latitude'])) {
+            $latitude = $data['geo_latitude'];
+        }
+        $longitude = null;
+        if (isset($data['geo_longitude'])) {
+            $longitude = $data['geo_longitude'];
+        }
+        $geoname = null;
+        if (isset($data['geo_name'])) {
+            $geoname = $data['geo_name'];
+        }
+
         if (!strlen($value)) { $value = ' '; }
 
         /* Insert the row */
-        $sql = 'INSERT INTO `session` (`id`,`username`,`ip`,`type`,`agent`,`value`,`expire`) ' .
-            'VALUES (?, ?, ?, ?, ?, ?, ?)';
-        $db_results = Dba::write($sql, array($key, $username, $ip, $type, $agent, $value, $expire));
+        $sql = 'INSERT INTO `session` (`id`,`username`,`ip`,`type`,`agent`,`value`,`expire`,`geo_latitude`,`geo_longitude`, `geo_name`) ' .
+            'VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
+        $db_results = Dba::write($sql, array($key, $username, $ip, $type, $agent, $value, $expire, $latitude, $longitude, $geoname));
 
         if (!$db_results) {
             debug_event('session', 'Session creation failed', '1');
@@ -326,6 +339,46 @@ class Session
         return Dba::write($sql, array($username, $sid));
     }
 
+    /**
+     * update_geolocation
+     * Update session geolocation.
+     * @param string $sid
+     * @param float $latitude
+     * @param float $longitude
+     */
+    public static function update_geolocation($sid, $latitude, $longitude, $name)
+    {
+        if ($sid) {
+            $sql = "UPDATE `session` SET `geo_latitude` = ?, `geo_longitude` = ?, `geo_name` = ? WHERE `id` = ?";
+            Dba::write($sql, array($latitude, $longitude, $name, $sid));
+        } else {
+            debug_event('session', 'Missing session id to update geolocation.', 3);
+        }
+    }
+
+    /**
+     * get_geolocation
+     * Get session geolocation.
+     * @param string $sid
+     * @return array
+     */
+    public static function get_geolocation($sid)
+    {
+        $location = array();
+
+        if ($sid) {
+            $sql = "SELECT `geo_latitude`, `geo_longitude`, `geo_name` FROM `session` WHERE `id` = ?";
+            $db_results = Dba::read($sql, array($sid));
+            if ($row = Dba::fetch_assoc($db_results)) {
+                $location['latitude'] = $row['geo_latitude'];
+                $location['longitude'] = $row['geo_longitude'];
+                $location['name'] = $row['geo_name'];
+            }
+        }
+
+        return $location;
+    }
+
     /**
      * _auto_init
      *

lib/class/song.class.php

@@ -735,13 +735,14 @@ class Song extends database_object implements media, library_item
      * if not then it sets it to played. In any case it updates stats.
      * @param int $user
      * @param string $agent
+     * @param array $location
      * @return boolean
      */
-    public function set_played($user, $agent)
+    public function set_played($user, $agent, $location)
     {
-        Stats::insert('song', $this->id, $user, $agent);
-        Stats::insert('album', $this->album, $user, $agent);
-        Stats::insert('artist', $this->artist, $user, $agent);
+        Stats::insert('song', $this->id, $user, $agent, $location);
+        Stats::insert('album', $this->album, $user, $agent, $location);
+        Stats::insert('artist', $this->artist, $user, $agent, $location);
 
         if ($this->played) {
             return true;
@@ -1548,7 +1549,7 @@ class Song extends database_object implements media, library_item
     {
         $user_id = intval($user_id);
 
-        $sql = "SELECT `object_id`, `user`, `object_type`, `date`, `agent` " .
+        $sql = "SELECT `object_id`, `user`, `object_type`, `date`, `agent`, `geo_latitude`, `geo_longitude`, `geo_name` " .
             "FROM `object_count` WHERE `object_type`='song' ";
         if (AmpConfig::get('catalog_disable')) {
             $sql .= "AND " . Catalog::get_enable_filter('song', '`object_id`') . " ";
@@ -1570,6 +1571,9 @@ class Song extends database_object implements media, library_item
         $results = array();
 
         while ($row = Dba::fetch_assoc($db_results)) {
+            if (empty($row['geo_name']) && $row['latitude'] && $row['longitude']) {
+                $geo_name = Stats::get_cached_place_name($row['latitude'], $row['longitude']);
+            }
             $results[] = $row;
             if (count($results) >= AmpConfig::get('popular_threshold')) { break; }
         }

lib/class/song_preview.class.php

@@ -313,7 +313,7 @@ class Song_Preview extends database_object implements media, playable_item
         return $this->title;
     }
 
-    public function set_played($user, $agent)
+    public function set_played($user, $agent, $location)
     {
         // Do nothing
     }

lib/class/stats.class.php

@@ -90,13 +90,23 @@ class Stats
      * This inserts a new record for the specified object
      * with the specified information, amazing!
      */
-    public static function insert($type, $oid, $user, $agent='')
+    public static function insert($type, $oid, $user, $agent='', $location)
     {
         $type = self::validate_type($type);
 
-        $sql = "INSERT INTO `object_count` (`object_type`,`object_id`,`date`,`user`,`agent`) " .
-            " VALUES (?, ?, ?, ?, ?)";
-        $db_results = Dba::write($sql, array($type, $oid, time(), $user, $agent));
+        $latitude = null;
+        $longitude = null;
+        $geoname = null;
+        if (isset($location['latitude']))
+            $latitude = $location['latitude'];
+        if (isset($location['longitude']))
+            $longitude = $location['longitude'];
+        if (isset($location['name']))
+            $geoname = $location['name'];
+
+        $sql = "INSERT INTO `object_count` (`object_type`,`object_id`,`date`,`user`,`agent`, `geo_latitude`, `geo_longitude`, `geo_name`) " .
+            " VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
+        $db_results = Dba::write($sql, array($type, $oid, time(), $user, $agent, $latitude, $longitude, $geoname));
 
         if (!$db_results) {
             debug_event('statistics', 'Unabled to insert statistics:' . $sql, '3');
@@ -118,6 +128,17 @@ class Stats
         return $results['object_cnt'];
     } // get_object_count
 
+    public static function get_cached_place_name($latitude, $longitude)
+    {
+        $name = null;
+        $sql = "SELECT `geo_name` FROM `object_count` WHERE `geo_latitude` = ? AND `geo_longitude` = ? AND `geo_name` IS NOT NULL ORDER BY `id` DESC LIMIT 1";
+        $db_results = Dba::read($sql, array($latitude, $longitude));
+        if ($results = Dba::fetch_assoc($db_results)) {
+            $name = $results['geo_name'];
+        }
+        return $name;
+    }
+
     /**
      * get_last_song
      * This returns the full data for the last song that was played, including when it

lib/class/stream.class.php

@@ -22,7 +22,7 @@
 
 class Stream
 {
-    public static $session;
+    private static $session;
 
     private function __construct()
     {
@@ -41,6 +41,38 @@ class Stream
         self::$session=$sid;
     } // set_session
 
+    public static function get_session()
+    {
+        if (!self::$session) {
+            // Generate the session ID.  This is slightly wasteful.
+            $data = array();
+            $data['type'] = 'stream';
+            // This shouldn't be done here but at backend endpoint side
+            if (isset($_REQUEST['client'])) {
+                $data['agent'] = $_REQUEST['client'];
+            }
+
+            // Copy session geolocation
+            // Same thing, should be done elsewhere
+            $sid = session_id();
+            if ($sid) {
+                $location = Session::get_geolocation($sid);
+                if (isset($location['latitude'])) {
+                    $data['geo_latitude'] = $location['latitude'];
+                }
+                if (isset($location['longitude'])) {
+                    $data['geo_longitude'] = $location['longitude'];
+                }
+                if (isset($location['name'])) {
+                    $data['geo_name'] = $location['name'];
+                }
+            }
+
+            self::$session = Session::create($data);
+        }
+        return self::$session;
+    }
+
     /**
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -363,21 +395,6 @@ class Stream
         return true;
     }
 
-    /**
-     * auto_init
-     * This is called on class load it sets the session
-     */
-    public static function _auto_init()
-    {
-        // Generate the session ID.  This is slightly wasteful.
-        $data = array();
-        $data['type'] = 'stream';
-        if (isset($_REQUEST['client'])) {
-            $data['agent'] = $_REQUEST['client'];
-        }
-        self::$session = Session::create($data);
-    }
-
     /**
      * run_playlist_method
      *
@@ -420,7 +437,7 @@ class Stream
     {
         $session_string = '';
         if (AmpConfig::get('require_session')) {
-            $session_string = 'ssid=' . self::$session . '&';
+            $session_string = 'ssid=' . self::get_session() . '&';
         }
 
         if ($local) {

lib/class/stream_playlist.class.php

@@ -45,7 +45,7 @@ class Stream_Playlist
                 Stream::set_session($id);
             }
 
-            $this->id = Stream::$session;
+            $this->id = Stream::get_session();
 
             if (!Session::exists('stream', $this->id)) {
                 debug_event('stream_playlist', 'Session::exists failed', 2);
@@ -130,7 +130,7 @@ class Stream_Playlist
                 //FIXME: play_url shouldn't be static
                 $url['url'] = $type::play_url($object->id, $additional_params);
 
-                $api_session = (AmpConfig::get('require_session')) ? Stream::$session : false;
+                $api_session = (AmpConfig::get('require_session')) ? Stream::get_session() : false;
 
                 // Set a default which can be overridden
                 $url['author'] = 'Ampache';

lib/class/update.class.php

@@ -464,6 +464,9 @@ class Update
         $update_string = '- Add rating to playlists, tvshows and tvshows seasons.<br />';
         $version[] = array('version' => '370021','description' => $update_string);
 
+        $update_string = '- Add users geolocation.<br />';
+        $version[] = array('version' => '370022','description' => $update_string);
+
         return $version;
     }
 
@@ -3127,4 +3130,29 @@ class Update
 
         return $retval;
     }
+
+    /**
+     * update 370022
+     *
+     * Add users geolocation
+     */
+    public static function update_370022()
+    {
+        $retval = true;
+
+        $sql = "ALTER TABLE `session` ADD COLUMN `geo_latitude` DECIMAL(10,6) NULL, ADD COLUMN `geo_longitude` DECIMAL(10,6) NULL, ADD COLUMN `geo_name` VARCHAR(255) NULL";
+        $retval = Dba::write($sql) ? $retval : false;
+
+        $sql = "ALTER TABLE `object_count` ADD COLUMN `geo_latitude` DECIMAL(10,6) NULL, ADD COLUMN `geo_longitude` DECIMAL(10,6) NULL, ADD COLUMN `geo_name` VARCHAR(255) NULL";
+        $retval = Dba::write($sql) ? $retval : false;
+
+        $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " .
+            "VALUES ('geolocation','1','Allow geolocation',25,'integer','options')";
+        $retval = Dba::write($sql) ? $retval : false;
+        $id = Dba::insert_id();
+        $sql = "INSERT INTO `user_preference` VALUES (-1,?,'1')";
+        $retval = Dba::write($sql, array($id)) ? $retval : false;
+
+        return $retval;
+    }
 }

lib/class/upnp_api.class.php

@@ -874,7 +874,7 @@ class Upnp_Api
 
     private static function _itemAlbum($album, $parent)
     {
-        $api_session = (AmpConfig::get('require_session')) ? Stream::$session : false;
+        $api_session = (AmpConfig::get('require_session')) ? Stream::get_session() : false;
         $art_url = Art::url($album->id, 'album', $api_session);
 
         return array(
@@ -914,7 +914,7 @@ class Upnp_Api
 
     private static function _itemSong($song, $parent)
     {
-        $api_session = (AmpConfig::get('require_session')) ? Stream::$session : false;
+        $api_session = (AmpConfig::get('require_session')) ? Stream::get_session() : false;
         $art_url = Art::url($song->album, 'album', $api_session);
 
         $fileTypesByExt = self::_getFileTypes();
@@ -970,7 +970,7 @@ class Upnp_Api
 
     private static function _itemVideo($video, $parent)
     {
-        $api_session = (AmpConfig::get('require_session')) ? Stream::$session : false;
+        $api_session = (AmpConfig::get('require_session')) ? Stream::get_session() : false;
         $art_url = Art::url($video->id, 'video', $api_session);
 
         $fileTypesByExt = self::_getFileTypes();

lib/class/user.class.php

@@ -775,7 +775,7 @@ class User extends database_object
      * update_user_stats
      * updates the playcount mojo for this specific user
      */
-    public function update_stats($media_type, $media_id, $agent = '')
+    public function update_stats($media_type, $media_id, $agent = '', $location = array())
     {
         debug_event('user.class.php', 'Updating stats for {'.$media_type.'/'.$media_id.'} {'.$agent.'}...', '5');
         $media = new $media_type($media_id);
@@ -800,7 +800,7 @@ class User extends database_object
             User::save_mediaplay($GLOBALS['user'], $media);
         }
 
-        $media->set_played($user, $agent);
+        $media->set_played($user, $agent, $location);
 
         return true;
 
@@ -1177,9 +1177,9 @@ class User extends database_object
     {
         if (!$type) { $type = 'song'; }
 
-        $sql = "SELECT * FROM `object_count` WHERE `object_type`='$type' AND `user`='$this->id' " .
-            "ORDER BY `date` DESC LIMIT $limit";
-        $db_results = Dba::read($sql);
+        $sql = "SELECT * FROM `object_count` WHERE `object_type` = ? AND `user` = ? " .
+            "ORDER BY `date` DESC LIMIT " . $limit;
+        $db_results = Dba::read($sql, array($type, $this->id));
 
         $results = array();
         while ($row = Dba::fetch_assoc($db_results)) {

lib/class/video.class.php

@@ -675,11 +675,12 @@ class Video extends database_object implements media, library_item
      * if not then it sets it to played. In any case it updates stats.
      * @param int $user
      * @param string $agent
+     * @param array $location
      * @return boolean
      */
-    public function set_played($user, $agent)
+    public function set_played($user, $agent, $location)
     {
-        Stats::insert('video', $this->id, $user, $agent);
+        Stats::insert('video', $this->id, $user, $agent, $location);
 
         if ($this->played) {
             return true;

lib/general.lib.php

@@ -341,15 +341,20 @@ if (!function_exists('apache_request_headers')) {
     }
 }
 
-function get_web_path()
+function get_current_path()
 {
-    $root = '';
     if (strlen($_SERVER['PHP_SELF'])) {
         $root = $_SERVER['PHP_SELF'];
     } else {
         $root = $_SERVER['REQUEST_URI'];
     }
 
+    return $root;
+}
+
+function get_web_path()
+{
+    $root = get_current_path();
     //$root = rtrim(dirname($root),"/\\");
     $root = preg_replace('#(.*)/(\w+\.php)$#', '$1', $root);
     return $root;

lib/javascript/tools.js

@@ -323,3 +323,16 @@ function getPagePlaySettings() {
 
     return settings;
 }
+
+function geolocate_user() {
+    if(navigator.geolocation) {
+        navigator.geolocation.getCurrentPosition(geolocate_user_callback);
+    } else {
+        Console.error("This browser does not support geolocation");
+    }
+}
+
+function geolocate_user_callback(position) {
+    var url = jsAjaxUrl + '?page=stats&action=geolocation&latitude=' + position.coords.latitude + '&longitude=' + position.coords.longitude;
+    $.get(url);
+}

lib/preferences.php

@@ -191,6 +191,7 @@ function create_preference_input($name,$value)
         case 'home_now_playing':
         case 'browser_notify':
         case 'allow_video':
+        case 'geolocation':
             $is_true = '';
             $is_false = '';
             if ($value == '1') {

modules/catalog/dropbox.catalog.php

@@ -204,7 +204,7 @@ class Catalog_dropbox extends Catalog
         $webAuth = $this->getWebAuth();
         $authurl = $webAuth->start();
         echo "<br />Go to <strong><a href='" . $authurl . "' target='_blank'>" . $authurl . "</a></strong> to generate the authorization code, then enter it bellow.<br />";
-        echo "<form action='' method='post' enctype='multipart/form-data'>";
+        echo "<form action='" . get_current_path() . "' method='post' enctype='multipart/form-data'>";
         if ($_POST['action']) {
             echo "<input type='hidden' name='action' value='add_to_catalog' />";
             echo "<input type='hidden' name='catalogs[]' value='". $this->id ."' />";

modules/catalog/soundcloud.catalog.php

@@ -182,7 +182,7 @@ class Catalog_soundcloud extends Catalog
         $api = new Services_Soundcloud($this->userid, $this->secret, $this->getRedirectUri());
         $authurl = $api->getAuthorizeUrl(array('scope' => 'non-expiring'));
         echo "<br />Go to <strong><a href='" . $authurl . "' target='_blank'>" . $authurl . "</a></strong> to generate the authorization code, then enter it bellow.<br />";
-        echo "<form action='' method='post' enctype='multipart/form-data'>";
+        echo "<form action='" . get_current_path() . "' method='post' enctype='multipart/form-data'>";
         if ($_POST['action']) {
             echo "<input type='hidden' name='action' value='add_to_catalog' />";
             echo "<input type='hidden' name='catalogs[]' value='". $this->id ."' />";

modules/jquery-datetimepicker/jquery.datetimepicker.css

@@ -0,0 +1,417 @@
+.xdsoft_datetimepicker{
+	box-shadow: 0px 5px 15px -5px rgba(0, 0, 0, 0.506);
+	background: #FFFFFF;
+	border-bottom: 1px solid #BBBBBB;
+	border-left: 1px solid #CCCCCC;
+	border-right: 1px solid #CCCCCC;
+	border-top: 1px solid #CCCCCC;
+	color: #333333;
+	font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif;
+	padding: 8px;
+	padding-left: 0px;
+	padding-top: 2px;
+	position: absolute;
+	z-index: 9999;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	display:none;
+}
+
+.xdsoft_datetimepicker iframe {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 75px;
+    height: 210px;
+    background: transparent;
+    border:none;
+}
+/*For IE8 or lower*/
+.xdsoft_datetimepicker button {
+    border:none !important;
+}
+
+.xdsoft_noselect{
+	-webkit-touch-callout: none;
+	-webkit-user-select: none;
+	-khtml-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	-o-user-select: none;
+	user-select: none;
+}
+.xdsoft_noselect::selection { background: transparent; }
+.xdsoft_noselect::-moz-selection { background: transparent; }
+.xdsoft_datetimepicker.xdsoft_inline{
+	display: inline-block;
+	position: static;
+	box-shadow: none;
+}
+.xdsoft_datetimepicker *{
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	padding:0px;
+	margin:0px;
+}
+.xdsoft_datetimepicker .xdsoft_datepicker, .xdsoft_datetimepicker  .xdsoft_timepicker{
+	display:none;
+}
+.xdsoft_datetimepicker .xdsoft_datepicker.active, .xdsoft_datetimepicker  .xdsoft_timepicker.active{
+	display:block;
+}
+.xdsoft_datetimepicker .xdsoft_datepicker{
+	width: 224px;
+	float:left;
+	margin-left:8px;
+}
+.xdsoft_datetimepicker.xdsoft_showweeks .xdsoft_datepicker{
+	width: 256px;
+}
+.xdsoft_datetimepicker  .xdsoft_timepicker{
+	width: 58px;
+	float:left;
+	text-align:center;
+	margin-left:8px;
+	margin-top:0px;
+}
+.xdsoft_datetimepicker  .xdsoft_datepicker.active+.xdsoft_timepicker{
+	margin-top:8px;
+	margin-bottom:3px
+}
+.xdsoft_datetimepicker  .xdsoft_mounthpicker{
+	position: relative;
+	text-align: center;
+}
+
+.xdsoft_datetimepicker .xdsoft_label i,
+.xdsoft_datetimepicker  .xdsoft_prev, 
+.xdsoft_datetimepicker  .xdsoft_next,
+.xdsoft_datetimepicker  .xdsoft_today_button{
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAeCAYAAADaW7vzAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Q0NBRjI1NjM0M0UwMTFFNDk4NkFGMzJFQkQzQjEwRUIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Q0NBRjI1NjQ0M0UwMTFFNDk4NkFGMzJFQkQzQjEwRUIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpDQ0FGMjU2MTQzRTAxMUU0OTg2QUYzMkVCRDNCMTBFQiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpDQ0FGMjU2MjQzRTAxMUU0OTg2QUYzMkVCRDNCMTBFQiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PoNEP54AAAIOSURBVHja7Jq9TsMwEMcxrZD4WpBYeKUCe+kTMCACHZh4BFfHO/AAIHZGFhYkBBsSEqxsLCAgXKhbXYOTxh9pfJVP+qutnZ5s/5Lz2Y5I03QhWji2GIcgAokWgfCxNvcOCCGKqiSqhUp0laHOne05vdEyGMfkdxJDVjgwDlEQgYQBgx+ULJaWSXXS6r/ER5FBVR8VfGftTKcITNs+a1XpcFoExREIDF14AVIFxgQUS+h520cdud6wNkC0UBw6BCO/HoCYwBhD8QCkQ/x1mwDyD4plh4D6DDV0TAGyo4HcawLIBBSLDkHeH0Mg2yVP3l4TQMZQDDsEOl/MgHQqhMNuE0D+oBh0CIr8MAKyazBH9WyBuKxDWgbXfjNf32TZ1KWm/Ap1oSk/R53UtQ5xTh3LUlMmT8gt6g51Q9p+SobxgJQ/qmsfZhWywGFSl0yBjCLJCMgXail3b7+rumdVJ2YRss4cN+r6qAHDkPWjPjdJCF4n9RmAD/V9A/Wp4NQassDjwlB6XBiCxcJQWmZZb8THFilfy/lfrTvLghq2TqTHrRMTKNJ0sIhdo15RT+RpyWwFdY96UZ/LdQKBGjcXpcc1AlSFEfLmouD+1knuxBDUVrvOBmoOC/rEcN7OQxKVeJTCiAdUzUJhA2Oez9QTkp72OTVcxDcXY8iKNkxGAJXmJCOQwOa6dhyXsOa6XwEGAKdeb5ET3rQdAAAAAElFTkSuQmCC);
+}
+
+.xdsoft_datetimepicker .xdsoft_label i{
+	opacity:0.5;
+	background-position:-92px -19px;
+	display: inline-block;
+	width: 9px;
+	height: 20px;
+	vertical-align: middle;
+}
+
+.xdsoft_datetimepicker  .xdsoft_prev{
+    float: left;
+	background-position:-20px 0px;
+}
+.xdsoft_datetimepicker  .xdsoft_today_button{
+    float: left;
+	background-position:-70px 0px;
+	margin-left:5px;
+}
+
+.xdsoft_datetimepicker  .xdsoft_next{
+    float: right;
+	background-position:0px 0px;
+}
+
+.xdsoft_datetimepicker  .xdsoft_next,
+.xdsoft_datetimepicker  .xdsoft_prev ,
+.xdsoft_datetimepicker  .xdsoft_today_button{
+	background-color: transparent;
+	background-repeat: no-repeat;
+	border: 0px none currentColor;
+	cursor: pointer;
+	display: block;
+	height: 30px;
+	opacity: 0.5;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+	outline: medium none currentColor;
+	overflow: hidden;
+	padding: 0px;
+	position: relative;
+	text-indent: 100%;
+	white-space: nowrap;
+	width: 20px;
+}
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_prev,
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_next{
+	float:none;
+	background-position:-40px -15px;
+	height: 15px;
+	width: 30px;
+	display: block;
+	margin-left:14px;
+	margin-top:7px;
+}
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_prev{
+	background-position:-40px 0px;
+	margin-bottom:7px;
+	margin-top:0px;
+}
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box{
+	height:151px;
+	overflow:hidden;
+	border-bottom:1px solid #DDDDDD;
+}
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div >div{
+	background: #F5F5F5;
+	border-top:1px solid #DDDDDD;
+	color: #666666;
+	font-size: 12px;
+	text-align: center;
+	border-collapse:collapse;
+	cursor:pointer;
+	border-bottom-width:0px;
+	height:25px;
+	line-height:25px;
+}
+
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div > div:first-child{
+ border-top-width:0px;
+}
+.xdsoft_datetimepicker  .xdsoft_today_button:hover,
+.xdsoft_datetimepicker  .xdsoft_next:hover,
+.xdsoft_datetimepicker  .xdsoft_prev:hover {
+    opacity: 1;
+    -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+}
+.xdsoft_datetimepicker  .xdsoft_label{
+	display: inline;
+    position: relative;
+    z-index: 9999;
+    margin: 0;
+    padding: 5px 3px;
+    font-size: 14px;
+    line-height: 20px;
+    font-weight: bold;
+    background-color: #fff;
+	float:left;
+	width:182px;
+	text-align:center;
+	cursor:pointer;
+}
+.xdsoft_datetimepicker  .xdsoft_label:hover{
+	text-decoration:underline;
+}
+.xdsoft_datetimepicker  .xdsoft_label:hover i{
+	opacity:1.0;
+}
+.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select{
+	border:1px solid #ccc;
+	position:absolute;
+	right:0px;
+	top:30px;
+	z-index:101;
+	display:none;
+	background:#fff;
+	max-height:160px;
+	overflow-y:hidden;
+}
+.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select.xdsoft_monthselect{right:-7px;}
+.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select.xdsoft_yearselect{right:2px;}
+.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select > div > .xdsoft_option:hover{
+	color: #fff;
+    background: #ff8000;
+}
+.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select > div > .xdsoft_option{
+	padding:2px 10px 2px 5px; 
+}
+.xdsoft_datetimepicker  .xdsoft_label > .xdsoft_select > div > .xdsoft_option.xdsoft_current{
+	background: #33AAFF;
+	box-shadow: #178FE5 0px 1px 3px 0px inset;
+	color:#fff;
+	font-weight: 700;
+}
+.xdsoft_datetimepicker  .xdsoft_month{
+	width:100px;
+	text-align:right;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar{
+	clear:both;
+}
+.xdsoft_datetimepicker  .xdsoft_year{
+	width: 48px;
+	margin-left: 5px;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar table{
+	border-collapse:collapse;
+	width:100%;
+	
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td > div{
+	padding-right:5px;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar th{
+	height: 25px;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td,.xdsoft_datetimepicker  .xdsoft_calendar th{
+	width:14.2857142%;
+	background: #F5F5F5;
+	border:1px solid #DDDDDD;
+	color: #666666;
+	font-size: 12px;
+	text-align: right;
+	vertical-align: middle;
+	padding:0px;
+	border-collapse:collapse;
+	cursor:pointer;
+	height: 25px;
+}
+.xdsoft_datetimepicker.xdsoft_showweeks  .xdsoft_calendar td,.xdsoft_datetimepicker.xdsoft_showweeks  .xdsoft_calendar th{
+	width:12.5%;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar th{
+	background: #F1F1F1;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_today{
+	color:#33AAFF;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_default,
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_current,
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div >div.xdsoft_current{
+	background: #33AAFF;
+	box-shadow: #178FE5 0px 1px 3px 0px inset;
+	color:#fff;
+	font-weight: 700;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_other_month,
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_disabled,
+.xdsoft_datetimepicker  .xdsoft_time_box >div >div.xdsoft_disabled{
+	opacity:0.5;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_other_month.xdsoft_disabled{
+	opacity:0.2;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td:hover,
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div >div:hover{
+	color: #fff !important;
+    background: #ff8000 !important;
+    box-shadow: none !important;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar td.xdsoft_disabled:hover,
+.xdsoft_datetimepicker  .xdsoft_timepicker .xdsoft_time_box >div >div.xdsoft_disabled:hover{
+	color: inherit	!important;
+    background: inherit !important;
+    box-shadow: inherit !important;
+}
+.xdsoft_datetimepicker  .xdsoft_calendar th{
+	font-weight: 700;
+	text-align: center;
+	color: #999;
+	cursor:default;
+}
+.xdsoft_datetimepicker  .xdsoft_copyright{ color:#ccc !important; font-size:10px;clear:both;float:none;margin-left:8px;}
+.xdsoft_datetimepicker  .xdsoft_copyright a{ color:#eee !important;}
+.xdsoft_datetimepicker  .xdsoft_copyright a:hover{ color:#aaa !important;}
+
+
+.xdsoft_time_box{
+	position:relative;
+	border:1px solid #ccc;
+}
+.xdsoft_scrollbar >.xdsoft_scroller{
+	background:#ccc !important;
+	height:20px;
+	border-radius:3px;
+}
+.xdsoft_scrollbar{
+	position:absolute;
+	width:7px;
+	right:0px;
+	top:0px;
+	bottom:0px;
+	cursor:pointer;
+}
+.xdsoft_scroller_box{
+position:relative;
+}
+
+
+.xdsoft_datetimepicker.xdsoft_dark{
+	box-shadow: 0px 5px 15px -5px rgba(255, 255, 255, 0.506);
+	background: #000000;
+	border-bottom: 1px solid #444444;
+	border-left: 1px solid #333333;
+	border-right: 1px solid #333333;
+	border-top: 1px solid #333333;
+	color: #cccccc;
+}
+
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_timepicker .xdsoft_time_box{
+	border-bottom:1px solid #222222;
+}
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_timepicker .xdsoft_time_box >div >div{
+	background: #0a0a0a;
+	border-top:1px solid #222222;
+	color: #999999;
+}
+
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_label{
+    background-color: #000;
+}
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_label > .xdsoft_select{
+	border:1px solid #333;
+	background:#000;
+}
+
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_label > .xdsoft_select > div > .xdsoft_option:hover{
+	color: #000;
+    background: #007fff;
+}
+
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_label > .xdsoft_select > div > .xdsoft_option.xdsoft_current{
+	background: #cc5500;
+	box-shadow: #b03e00 0px 1px 3px 0px inset;
+	color:#000;
+}
+
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_label i,
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_prev, 
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_next,
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_today_button{
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAeCAYAAADaW7vzAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QUExQUUzOTA0M0UyMTFFNDlBM0FFQTJENTExRDVBODYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QUExQUUzOTE0M0UyMTFFNDlBM0FFQTJENTExRDVBODYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpBQTFBRTM4RTQzRTIxMUU0OUEzQUVBMkQ1MTFENUE4NiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpBQTFBRTM4RjQzRTIxMUU0OUEzQUVBMkQ1MTFENUE4NiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pp0VxGEAAAIASURBVHja7JrNSgMxEMebtgh+3MSLr1T1Xn2CHoSKB08+QmR8Bx9A8e7RixdB9CKCoNdexIugxFlJa7rNZneTbLIpM/CnNLsdMvNjM8l0mRCiQ9Ye61IKCAgZAUnH+mU3MMZaHYChBnJUDzWOFZdVfc5+ZFLbrWDeXPwbxIqrLLfaeS0hEBVGIRQCEiZoHQwtlGSByCCdYBl8g8egTTAWoKQMRBRBcZxYlhzhKegqMOageErsCHVkk3hXIFooDgHB1KkHIHVgzKB4ADJQ/A1jAFmAYhkQqA5TOBtocrKrgXwQA8gcFIuAIO8sQSA7hidvPwaQGZSaAYHOUWJABhWWw2EMIH9QagQERU4SArJXo0ZZL18uvaxejXt/Em8xjVBXmvFr1KVm/AJ10tRe2XnraNqaJvKE3KHuUbfK1E+VHB0q40/y3sdQSxY4FHWeKJCunP8UyDdqJZenT3ntVV5jIYCAh20vT7ioP8tpf6E2lfEMwERe+whV1MHjwZB7PBiCxcGQWwKZKD62lfGNnP/1poFAA60T7rF1UgcKd2id3KDeUS+oLWV8DfWAepOfq00CgQabi9zjcgJVYVD7PVzQUAUGAQkbNJTBICDhgwYTjDYD6XeW08ZKh+A4pYkzenOxXUbvZcWz7E8ykRMnIHGX1XPl+1m2vPYpL+2qdb8CDAARlKFEz/ZVkAAAAABJRU5ErkJggg==);
+}
+
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_calendar td,
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_calendar th{
+	background: #0a0a0a;
+	border:1px solid #222222;
+	color: #999999;
+}
+
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_calendar th{
+	background: #0e0e0e;
+}
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_calendar td.xdsoft_today{
+	color:#cc5500;
+}
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_calendar td.xdsoft_default,
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_calendar td.xdsoft_current,
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_timepicker .xdsoft_time_box >div >div.xdsoft_current{
+	background: #cc5500;
+	box-shadow: #b03e00 0px 1px 3px 0px inset;
+	color:#000;
+}
+
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_calendar td:hover,
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_timepicker .xdsoft_time_box >div >div:hover{
+	color: #000 !important;
+    background: #007fff !important;
+}
+
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_calendar th{
+	color: #666;
+}
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_copyright{ color:#333 !important;}
+.xdsoft_datetimepicker.xdsoft_dark  .xdsoft_copyright a{ color:#111 !important;}
+.xdsoft_datetimepicker.xdsoft_dark .xdsoft_copyright a:hover{ color:#555 !important;}
+
+
+.xdsoft_dark .xdsoft_time_box{
+	border:1px solid #333;
+}
+.xdsoft_dark .xdsoft_scrollbar >.xdsoft_scroller{
+	background:#333 !important;
+}

modules/pChart/pBarcode128.class.php

@@ -0,0 +1,184 @@
+<?php
+ /*
+     pBarcode128 - class to create barcodes (128B)
+
+     Version     : 2.1.4
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 19/01/2014
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ /* pData class definition */
+ class pBarcode128
+  {
+   var $Codes;
+   var $Reverse;
+   var $Result;
+   var $pChartObject;
+   var $CRC;
+
+   /* Class creator */
+   function pBarcode128($BasePath="")
+    {
+     $this->Codes   = "";
+     $this->Reverse = "";
+
+     $FileHandle = @fopen($BasePath."data/128B.db", "r");
+
+     if (!$FileHandle) { die("Cannot find barcode database (".$BasePath."128B.db)."); }
+
+     while (!feof($FileHandle))
+      {
+       $Buffer = fgets($FileHandle,4096);
+       $Buffer = str_replace(chr(10),"",$Buffer);
+       $Buffer = str_replace(chr(13),"",$Buffer);
+       $Values = preg_split("/;/",$Buffer);
+
+       $this->Codes[$Values[1]]["ID"]     = $Values[0];
+       $this->Codes[$Values[1]]["Code"]   = $Values[2];
+       $this->Reverse[$Values[0]]["Code"] = $Values[2];
+       $this->Reverse[$Values[0]]["Asc"]  = $Values[1];
+      }
+     fclose($FileHandle);
+    }
+
+   /* Return the projected size of a barcode */
+   function getSize($TextString,$Format="")
+    {
+     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
+     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+
+     $TextString    = $this->encode128($TextString);
+     $BarcodeLength = strlen($this->Result);
+
+     if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
+     if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
+
+     $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+     $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+
+     $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
+     $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
+
+
+     $AreaWidth  = max(abs($X1),abs($X2));
+     $AreaHeight = max(abs($Y1),abs($Y2));
+
+     return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
+    }
+
+   function encode128($Value,$Format="")
+    {
+     $this->Result  = "11010010000";
+     $this->CRC     = 104;
+     $TextString    = "";
+
+     for($i=1;$i<=strlen($Value);$i++)
+      {
+       $CharCode = ord($this->mid($Value,$i,1));
+       if ( isset($this->Codes[$CharCode]) )
+        {
+         $this->Result = $this->Result.$this->Codes[$CharCode]["Code"];
+         $this->CRC = $this->CRC + $i*$this->Codes[$CharCode]["ID"];
+         $TextString = $TextString.chr($CharCode);
+        }
+      }
+     $this->CRC = $this->CRC - floor($this->CRC/103)*103;
+
+     $this->Result = $this->Result.$this->Reverse[$this->CRC]["Code"];
+     $this->Result = $this->Result."1100011101011";
+
+     return($TextString);
+    }
+
+   /* Create the encoded string */
+   function draw($Object,$Value,$X,$Y,$Format="")
+    {
+     $this->pChartObject = $Object;
+
+     $R			= isset($Format["R"]) ? $Format["R"] : 0;
+     $G			= isset($Format["G"]) ? $Format["G"] : 0;
+     $B			= isset($Format["B"]) ? $Format["B"] : 0;
+     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+     $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
+     $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
+     $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
+     $AreaBorderR	= isset($Format["AreaBorderR"]) ? $Format["AreaBorderR"] : $AreaR;
+     $AreaBorderG	= isset($Format["AreaBorderG"]) ? $Format["AreaBorderG"] : $AreaG;
+     $AreaBorderB	= isset($Format["AreaBorderB"]) ? $Format["AreaBorderB"] : $AreaB;
+
+     $TextString = $this->encode128($Value);
+
+     if ( $DrawArea )
+      {
+       $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
+       $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
+
+       $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
+       $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
+
+       if ( $ShowLegend )
+        {
+         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+        }
+       else
+        {
+         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
+         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
+        }
+
+       $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+       $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+
+       $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
+       $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
+       $this->pChartObject->drawPolygon($Polygon,$Settings);
+      }
+
+     for($i=1;$i<=strlen($this->Result);$i++)
+      {
+       if ( $this->mid($this->Result,$i,1) == 1 )
+        {
+         $X1 = $X + cos($Angle * PI / 180) * $i;
+         $Y1 = $Y + sin($Angle * PI / 180) * $i;
+         $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
+         $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
+
+         $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+         $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+        }
+      }
+
+     if ( $ShowLegend )
+      {
+       $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
+       $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
+
+       $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+       $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+
+       $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
+       $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
+      }
+    }
+
+   function left($value,$NbChar) { return substr($value,0,$NbChar); }  
+   function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
+   function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
+  }
+?>

modules/pChart/pBarcode39.class.php

@@ -0,0 +1,200 @@
+<?php
+ /*
+     pBarcode39 - class to create barcodes (39B)
+
+     Version     : 2.1.4
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 19/01/2014
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ /* pData class definition */
+ class pBarcode39
+  {
+   var $Codes;
+   var $Reverse;
+   var $Result;
+   var $pChartObject;
+   var $CRC;
+   var $MOD43;
+
+   /* Class creator */
+   function pBarcode39($BasePath="",$EnableMOD43=FALSE)
+    {
+     $this->MOD43  = $EnableMOD43;
+     $this->Codes   = "";
+     $this->Reverse = "";
+
+     $FileHandle = @fopen($BasePath."data/39.db", "r");
+
+     if (!$FileHandle) { die("Cannot find barcode database (".$BasePath."data/39.db)."); }
+
+     while (!feof($FileHandle))
+      {
+       $Buffer = fgets($FileHandle,4096);
+       $Buffer = str_replace(chr(10),"",$Buffer);
+       $Buffer = str_replace(chr(13),"",$Buffer);
+       $Values = preg_split("/;/",$Buffer);
+
+       $this->Codes[$Values[0]] = $Values[1];
+      }
+     fclose($FileHandle);
+    }
+
+   /* Return the projected size of a barcode */
+   function getSize($TextString,$Format="")
+    {
+     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : 12;
+     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+
+     $TextString    = $this->encode39($TextString);
+     $BarcodeLength = strlen($this->Result);
+
+     if ( $DrawArea )   { $WOffset = 20; } else { $WOffset = 0; }
+     if ( $ShowLegend ) { $HOffset = $FontSize+$LegendOffset+$WOffset; } else { $HOffset = 0; }
+
+     $X1 = cos($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+     $Y1 = sin($Angle * PI / 180) * ($WOffset+$BarcodeLength);
+
+     $X2 = $X1 + cos(($Angle+90) * PI / 180) * ($HOffset+$Height);
+     $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * ($HOffset+$Height);
+
+
+     $AreaWidth  = max(abs($X1),abs($X2));
+     $AreaHeight = max(abs($Y1),abs($Y2));
+
+     return(array("Width"=>$AreaWidth,"Height"=>$AreaHeight));
+    }
+
+   /* Create the encoded string */
+   function encode39($Value)
+    {
+     $this->Result = "100101101101"."0";
+     $TextString   = "";
+     for($i=1;$i<=strlen($Value);$i++)
+      {
+       $CharCode = ord($this->mid($Value,$i,1));
+       if ( $CharCode >= 97 && $CharCode <= 122 ) { $CharCode = $CharCode - 32; }
+
+       if ( isset($this->Codes[chr($CharCode)]) )
+        {
+         $this->Result = $this->Result.$this->Codes[chr($CharCode)]."0";
+         $TextString = $TextString.chr($CharCode);
+        }
+      }
+
+     if ( $this->MOD43 )
+      {
+       $Checksum = $this->checksum($TextString);
+       $this->Result = $this->Result.$this->Codes[$Checksum]."0";
+      }
+
+     $this->Result = $this->Result."100101101101";
+     $TextString   = "*".$TextString."*";
+
+     return($TextString);
+    }
+
+   /* Create the encoded string */
+   function draw($Object,$Value,$X,$Y,$Format="")
+    {
+     $this->pChartObject = $Object;
+
+     $R			= isset($Format["R"]) ? $Format["R"] : 0;
+     $G			= isset($Format["G"]) ? $Format["G"] : 0;
+     $B			= isset($Format["B"]) ? $Format["B"] : 0;
+     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $Height		= isset($Format["Height"]) ? $Format["Height"] : 30;
+     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+     $ShowLegend	= isset($Format["ShowLegend"]) ? $Format["ShowLegend"] : FALSE;
+     $LegendOffset	= isset($Format["LegendOffset"]) ? $Format["LegendOffset"] : 5;
+     $DrawArea		= isset($Format["DrawArea"]) ? $Format["DrawArea"] : FALSE;
+     $AreaR		= isset($Format["AreaR"]) ? $Format["AreaR"] : 255;
+     $AreaG		= isset($Format["AreaG"]) ? $Format["AreaG"] : 255;
+     $AreaB		= isset($Format["AreaB"]) ? $Format["AreaB"] : 255;
+     $AreaBorderR	= isset($Format["AreaBorderR"]) ? $Format["AreaBorderR"] : $AreaR;
+     $AreaBorderG	= isset($Format["AreaBorderG"]) ? $Format["AreaBorderG"] : $AreaG;
+     $AreaBorderB	= isset($Format["AreaBorderB"]) ? $Format["AreaBorderB"] : $AreaB;
+
+     $TextString   = $this->encode39($Value);
+
+     if ( $DrawArea )
+      {
+       $X1 = $X + cos(($Angle-135) * PI / 180) * 10;
+       $Y1 = $Y + sin(($Angle-135) * PI / 180) * 10;
+
+       $X2 = $X1 + cos($Angle * PI / 180) * (strlen($this->Result)+20);
+       $Y2 = $Y1 + sin($Angle * PI / 180) * (strlen($this->Result)+20);
+
+       if ( $ShowLegend )
+        {
+         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset+$this->pChartObject->FontSize+10);
+        }
+       else
+        {
+         $X3 = $X2 + cos(($Angle+90) * PI / 180) * ($Height+20);
+         $Y3 = $Y2 + sin(($Angle+90) * PI / 180) * ($Height+20);
+        }
+
+       $X4 = $X3 + cos(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+       $Y4 = $Y3 + sin(($Angle+180) * PI / 180) * (strlen($this->Result)+20);
+
+       $Polygon  = array($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4);
+       $Settings = array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"BorderR"=>$AreaBorderR,"BorderG"=>$AreaBorderG,"BorderB"=>$AreaBorderB);
+       $this->pChartObject->drawPolygon($Polygon,$Settings);
+      }
+
+     for($i=1;$i<=strlen($this->Result);$i++)
+      {
+       if ( $this->mid($this->Result,$i,1) == 1 )
+        {
+         $X1 = $X + cos($Angle * PI / 180) * $i;
+         $Y1 = $Y + sin($Angle * PI / 180) * $i;
+         $X2 = $X1 + cos(($Angle+90) * PI / 180) * $Height;
+         $Y2 = $Y1 + sin(($Angle+90) * PI / 180) * $Height;
+
+         $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+         $this->pChartObject->drawLine($X1,$Y1,$X2,$Y2,$Settings);
+        }
+      }
+
+     if ( $ShowLegend )
+      {
+       $X1 = $X + cos($Angle * PI / 180) * (strlen($this->Result)/2);
+       $Y1 = $Y + sin($Angle * PI / 180) * (strlen($this->Result)/2);
+
+       $LegendX = $X1 + cos(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+       $LegendY = $Y1 + sin(($Angle+90) * PI / 180) * ($Height+$LegendOffset);
+
+       $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Angle"=>-$Angle,"Align"=>TEXT_ALIGN_TOPMIDDLE);
+       $this->pChartObject->drawText($LegendX,$LegendY,$TextString,$Settings);
+      }
+    }
+
+   function checksum( $string )
+    {
+     $checksum = 0;
+     $length   = strlen( $string );
+     $charset  = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%';
+
+     for( $i=0; $i < $length; ++$i )
+      $checksum += strpos( $charset, $string[$i] );
+ 
+     return substr( $charset, ($checksum % 43), 1 );
+    }
+
+   function left($value,$NbChar) { return substr($value,0,$NbChar); }  
+   function right($value,$NbChar) { return substr($value,strlen($value)-$NbChar,$NbChar); }  
+   function mid($value,$Depart,$NbChar) { return substr($value,$Depart-1,$NbChar); }  
+  }
+?>

modules/pChart/pBubble.class.php

@@ -0,0 +1,326 @@
+<?php
+ /*
+     pBubble - class to draw bubble charts
+
+     Version     : 2.1.4
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 19/01/2014
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ define("BUBBLE_SHAPE_ROUND"		, 700001);
+ define("BUBBLE_SHAPE_SQUARE"		, 700002);
+
+ /* pBubble class definition */
+ class pBubble
+  {
+   var $pChartObject;
+   var $pDataObject;
+
+   /* Class creator */
+   function pBubble($pChartObject,$pDataObject)
+    {
+     $this->pChartObject = $pChartObject;
+     $this->pDataObject  = $pDataObject;
+    }
+
+   /* Prepare the scale */
+   function bubbleScale($DataSeries,$WeightSeries)
+    {
+     if ( !is_array($DataSeries) )	{ $DataSeries = array($DataSeries); }
+     if ( !is_array($WeightSeries) )	{ $WeightSeries = array($WeightSeries); }
+
+     /* Parse each data series to find the new min & max boundaries to scale */
+     $NewPositiveSerie = ""; $NewNegativeSerie = ""; $MaxValues = 0; $LastPositive = 0; $LastNegative = 0;
+     foreach($DataSeries as $Key => $SerieName)
+      {
+       $SerieWeightName = $WeightSeries[$Key];
+
+       $this->pDataObject->setSerieDrawable($SerieWeightName,FALSE);
+
+       if ( count($this->pDataObject->Data["Series"][$SerieName]["Data"]) > $MaxValues ) { $MaxValues = count($this->pDataObject->Data["Series"][$SerieName]["Data"]); }
+
+       foreach($this->pDataObject->Data["Series"][$SerieName]["Data"] as $Key => $Value)
+        {
+         if ( $Value >= 0 )
+          {
+           $BubbleBounds = $Value + $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
+
+           if ( !isset($NewPositiveSerie[$Key]) )
+            { $NewPositiveSerie[$Key] = $BubbleBounds; }
+           elseif ( $NewPositiveSerie[$Key] < $BubbleBounds )
+            { $NewPositiveSerie[$Key] = $BubbleBounds; }
+
+           $LastPositive = $BubbleBounds;
+          }
+         else
+          {
+           $BubbleBounds = $Value - $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
+
+           if ( !isset($NewNegativeSerie[$Key]) )
+            { $NewNegativeSerie[$Key] = $BubbleBounds; }
+           elseif ( $NewNegativeSerie[$Key] > $BubbleBounds )
+            { $NewNegativeSerie[$Key] = $BubbleBounds; }
+
+           $LastNegative = $BubbleBounds;
+          }
+        }
+      }
+
+     /* Check for missing values and all the fake positive serie */
+     if ( $NewPositiveSerie != "" )
+      {
+       for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewPositiveSerie[$i])) { $NewPositiveSerie[$i] = $LastPositive; } }
+
+       $this->pDataObject->addPoints($NewPositiveSerie,"BubbleFakePositiveSerie");
+      }
+
+     /* Check for missing values and all the fake negative serie */
+     if ( $NewNegativeSerie != "" )
+      {
+       for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewNegativeSerie[$i])) { $NewNegativeSerie[$i] = $LastNegative; } }
+
+       $this->pDataObject->addPoints($NewNegativeSerie,"BubbleFakeNegativeSerie");
+      }
+    }
+
+   function resetSeriesColors()
+    {
+     $Data    = $this->pDataObject->getData();
+     $Palette = $this->pDataObject->getPalette();
+
+     $ID = 0;
+     foreach($Data["Series"] as $SerieName => $SeriesParameters)
+      {
+       if ( $SeriesParameters["isDrawable"] )
+        {
+         $this->pDataObject->Data["Series"][$SerieName]["Color"]["R"]     = $Palette[$ID]["R"];
+         $this->pDataObject->Data["Series"][$SerieName]["Color"]["G"]     = $Palette[$ID]["G"];
+         $this->pDataObject->Data["Series"][$SerieName]["Color"]["B"]     = $Palette[$ID]["B"];
+         $this->pDataObject->Data["Series"][$SerieName]["Color"]["Alpha"] = $Palette[$ID]["Alpha"];
+         $ID++;
+        }
+      }
+    }
+
+   /* Prepare the scale */
+   function drawBubbleChart($DataSeries,$WeightSeries,$Format="")
+    {
+     $ForceAlpha	= isset($Format["ForceAlpha"]) ? $Format["ForceAlpha"] : VOID;
+     $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : TRUE;
+     $BorderWidth	= isset($Format["BorderWidth"]) ? $Format["BorderWidth"] : 1;
+     $Shape		= isset($Format["Shape"]) ? $Format["Shape"] : BUBBLE_SHAPE_ROUND;
+     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
+     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 30;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+     if ( !is_array($DataSeries) )	{ $DataSeries = array($DataSeries); }
+     if ( !is_array($WeightSeries) )	{ $WeightSeries = array($WeightSeries); }
+
+     $Data    = $this->pDataObject->getData();
+     $Palette = $this->pDataObject->getPalette();
+
+     if ( isset($Data["Series"]["BubbleFakePositiveSerie"] ) ) { $this->pDataObject->setSerieDrawable("BubbleFakePositiveSerie",FALSE); }
+     if ( isset($Data["Series"]["BubbleFakeNegativeSerie"] ) ) { $this->pDataObject->setSerieDrawable("BubbleFakeNegativeSerie",FALSE); }
+
+     $this->resetSeriesColors();
+
+     list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
+
+     foreach($DataSeries as $Key => $SerieName)
+      {
+       $AxisID	= $Data["Series"][$SerieName]["Axis"];
+       $Mode	= $Data["Axis"][$AxisID]["Display"];
+       $Format	= $Data["Axis"][$AxisID]["Format"];
+       $Unit	= $Data["Axis"][$AxisID]["Unit"];
+
+       if (isset($Data["Series"][$SerieName]["Description"])) { $SerieDescription = $Data["Series"][$SerieName]["Description"]; } else { $SerieDescription = $SerieName; }
+
+       $XStep	= ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs;
+
+       $X = $this->pChartObject->GraphAreaX1 + $XMargin;
+       $Y = $this->pChartObject->GraphAreaY1 + $XMargin;
+
+       $Color = array("R"=>$Palette[$Key]["R"],"G"=>$Palette[$Key]["G"],"B"=>$Palette[$Key]["B"],"Alpha"=>$Palette[$Key]["Alpha"]);
+
+       if ( $ForceAlpha != VOID ) { $Color["Alpha"]=$ForceAlpha; }
+
+       if ( $DrawBorder )
+        {
+         if ( $BorderWidth != 1 )
+          {
+           if ( $Surrounding != NULL )
+            { $BorderR = $Palette[$Key]["R"]+$Surrounding; $BorderG = $Palette[$Key]["G"]+$Surrounding; $BorderB = $Palette[$Key]["B"]+$Surrounding; }
+           else
+            { $BorderR = $BorderR; $BorderG = $BorderG; $BorderB = $BorderB; }
+           if ( $ForceAlpha != VOID ) { $BorderAlpha = $ForceAlpha/2; }
+           $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
+          }
+         else
+          {
+           $Color["BorderAlpha"] = $BorderAlpha;
+
+           if ( $Surrounding != NULL )
+            { $Color["BorderR"] = $Palette[$Key]["R"]+$Surrounding; $Color["BorderG"] = $Palette[$Key]["G"]+$Surrounding; $Color["BorderB"] = $Palette[$Key]["B"]+$Surrounding; }
+           else
+            { $Color["BorderR"] = $BorderR; $Color["BorderG"] = $BorderG; $Color["BorderB"] = $BorderB; }
+           if ( $ForceAlpha != VOID ) { $Color["BorderAlpha"] = $ForceAlpha/2; }
+          }
+        }
+
+       foreach($Data["Series"][$SerieName]["Data"] as $iKey => $Point)
+        {
+         $Weight = $Point + $Data["Series"][$WeightSeries[$Key]]["Data"][$iKey];
+
+         $PosArray    = $this->pChartObject->scaleComputeY($Point,array("AxisID"=>$AxisID));
+         $WeightArray = $this->pChartObject->scaleComputeY($Weight,array("AxisID"=>$AxisID));
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
+           $Y = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
+
+           if ( $Shape == BUBBLE_SHAPE_SQUARE )
+            {
+             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
+
+             if ( $BorderWidth != 1 )
+              {
+               $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
+               $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+              }
+             else
+              $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+            }
+           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
+            {
+             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
+
+             if ( $BorderWidth != 1 )
+              {
+               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
+               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+              }
+             else
+              $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+            }
+
+           $X = $X + $XStep;
+          }
+         elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+          {
+           if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
+           $X = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
+
+           if ( $Shape == BUBBLE_SHAPE_SQUARE )
+            {
+             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
+
+             if ( $BorderWidth != 1 )
+              {
+               $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
+               $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+              }
+             else
+              $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
+            }
+           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
+            {
+             if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
+
+             if ( $BorderWidth != 1 )
+              {
+               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
+               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+              }
+             else
+              $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
+            }
+
+           $Y = $Y + $XStep;
+          }
+        }
+      }
+    }
+
+   function writeBubbleLabel($SerieName,$SerieWeightName,$Points,$Format="")
+    {
+     $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
+     $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
+
+     if ( !is_array($Points) ) { $Point = $Points; $Points = ""; $Points[] = $Point; }
+
+     $Data    = $this->pDataObject->getData();
+     $Palette = $this->pDataObject->getPalette();
+
+     if ( !isset($Data["Series"][$SerieName]) || !isset($Data["Series"][$SerieWeightName]) )
+      return(0);
+
+     list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
+
+     $AxisID	 = $Data["Series"][$SerieName]["Axis"];
+     $AxisMode	 = $Data["Axis"][$AxisID]["Display"];
+     $AxisFormat = $Data["Axis"][$AxisID]["Format"];
+     $AxisUnit	 = $Data["Axis"][$AxisID]["Unit"];
+     $XStep	 = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs;
+
+     $X = $this->pChartObject->GraphAreaX1 + $XMargin;
+     $Y = $this->pChartObject->GraphAreaY1 + $XMargin;
+
+     $Color = array("R"=>$Data["Series"][$SerieName]["Color"]["R"],"G"=>$Data["Series"][$SerieName]["Color"]["G"],"B"=>$Data["Series"][$SerieName]["Color"]["B"],"Alpha"=>$Data["Series"][$SerieName]["Color"]["Alpha"]);
+
+     foreach($Points as $Key => $Point)
+      {
+       $Value    = $Data["Series"][$SerieName]["Data"][$Point];
+       $PosArray = $this->pChartObject->scaleComputeY($Value,array("AxisID"=>$AxisID));
+
+       if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Point]) )
+        $Abscissa = $Data["Series"][$Data["Abscissa"]]["Data"][$Point]." : ";
+       else
+        $Abscissa = "";
+
+       $Value   = $this->pChartObject->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
+       $Weight  = $Data["Series"][$SerieWeightName]["Data"][$Point];
+       $Caption = $Abscissa.$Value." / ".$Weight;
+
+       if ( isset($Data["Series"][$SerieName]["Description"]) )
+        $Description = $Data["Series"][$SerieName]["Description"];
+       else
+        $Description = "No description";
+
+       $Series = "";
+       $Series[] = array("Format"=>$Color,"Caption"=>$Caption);
+
+       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+         if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
+
+         $X = floor($X + $Point * $XStep);
+         $Y = floor($PosArray);
+        }
+       else
+        {
+         if ( $XDivs == 0 ) { $YStep = 0; } else { $YStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
+
+         $X = floor($PosArray);
+         $Y = floor($Y + $Point * $YStep);
+        }
+
+       if ( $DrawPoint == LABEL_POINT_CIRCLE )
+        $this->pChartObject->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+       elseif ( $DrawPoint == LABEL_POINT_BOX )
+        $this->pChartObject->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+
+       $this->pChartObject->drawLabelBox($X,$Y-3,$Description,$Series,$Format);
+      }
+    }
+  }
+?>

modules/pChart/pCache.class.php

@@ -0,0 +1,280 @@
+<?php
+ /*
+     pCache - speed up the rendering by caching up the pictures
+
+     Version     : 2.1.4
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 19/01/2014
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ /* pData class definition */
+ class pCache
+  {
+   var $CacheFolder;
+   var $CacheIndex;
+   var $CacheDB;
+
+   /* Class creator */
+   function pCache($Settings="")
+    {
+     $CacheFolder	= isset($Settings["CacheFolder"]) ? $Settings["CacheFolder"] : "cache";
+     $CacheIndex	= isset($Settings["CacheIndex"]) ? $Settings["CacheIndex"] : "index.db";
+     $CacheDB		= isset($Settings["CacheDB"]) ? $Settings["CacheDB"] : "cache.db";
+
+     $this->CacheFolder	= $CacheFolder;
+     $this->CacheIndex	= $CacheIndex;
+     $this->CacheDB	= $CacheDB;
+
+     if (!file_exists($this->CacheFolder."/".$this->CacheIndex)) { touch($this->CacheFolder."/".$this->CacheIndex); }
+     if (!file_exists($this->CacheFolder."/".$this->CacheDB))    { touch($this->CacheFolder."/".$this->CacheDB); }
+    }
+
+   /* Flush the cache contents */
+   function flush()
+    {
+     if (file_exists($this->CacheFolder."/".$this->CacheIndex)) { unlink($this->CacheFolder."/".$this->CacheIndex); touch($this->CacheFolder."/".$this->CacheIndex); }
+     if (file_exists($this->CacheFolder."/".$this->CacheDB))    { unlink($this->CacheFolder."/".$this->CacheDB); touch($this->CacheFolder."/".$this->CacheDB); }
+    }
+
+   /* Return the MD5 of the data array to clearly identify the chart */
+   function getHash($Data,$Marker="")
+    { return(md5($Marker.serialize($Data->Data))); }
+
+   /* Write the generated picture to the cache */
+   function writeToCache($ID,$pChartObject)
+    {
+     /* Compute the paths */
+     $TemporaryFile = $this->CacheFolder."/tmp_".rand(0,1000).".png";
+     $Database      = $this->CacheFolder."/".$this->CacheDB;
+     $Index         = $this->CacheFolder."/".$this->CacheIndex;
+
+     /* Flush the picture to a temporary file */
+     imagepng($pChartObject->Picture ,$TemporaryFile);
+
+     /* Retrieve the files size */
+     $PictureSize = filesize($TemporaryFile);
+     $DBSize      = filesize($Database);
+
+     /* Save the index */
+     $Handle = fopen($Index,"a");
+     fwrite($Handle, $ID.",".$DBSize.",".$PictureSize.",".time().",0      \r\n");
+     fclose($Handle);
+
+     /* Get the picture raw contents */
+     $Handle = fopen($TemporaryFile,"r");
+     $Raw    = fread($Handle,$PictureSize);
+     fclose($Handle);
+
+     /* Save the picture in the solid database file */
+     $Handle = fopen($Database,"a");
+     fwrite($Handle, $Raw);
+     fclose($Handle);
+
+     /* Remove temporary file */
+     unlink($TemporaryFile);
+    }
+
+   /* Remove object older than the specified TS */
+   function removeOlderThan($Expiry)
+    { $this->dbRemoval(array("Expiry"=>$Expiry)); }
+
+   /* Remove an object from the cache */
+   function remove($ID)
+    { $this->dbRemoval(array("Name"=>$ID)); }
+
+   /* Remove with specified criterias */
+   function dbRemoval($Settings)
+    {
+     $ID     = isset($Settings["Name"]) ? $Settings["Name"] : NULL;
+     $Expiry = isset($Settings["Expiry"]) ? $Settings["Expiry"] : -(24*60*60);
+     $TS     = time()-$Expiry;
+
+     /* Compute the paths */
+     $Database     = $this->CacheFolder."/".$this->CacheDB;
+     $Index        = $this->CacheFolder."/".$this->CacheIndex;
+     $DatabaseTemp = $this->CacheFolder."/".$this->CacheDB.".tmp";
+     $IndexTemp    = $this->CacheFolder."/".$this->CacheIndex.".tmp";
+
+     /* Single file removal */
+     if ( $ID != NULL )
+      {
+       /* Retrieve object informations */
+       $Object = $this->isInCache($ID,TRUE);
+
+       /* If it's not in the cache DB, go away */
+       if ( !$Object ) { return(0); }
+      }
+
+     /* Create the temporary files */
+     if (!file_exists($DatabaseTemp)) { touch($DatabaseTemp); }
+     if (!file_exists($IndexTemp))    { touch($IndexTemp); }
+
+     /* Open the file handles */
+     $IndexHandle     = @fopen($Index, "r");
+     $IndexTempHandle = @fopen($IndexTemp, "w");
+     $DBHandle        = @fopen($Database, "r");
+     $DBTempHandle    = @fopen($DatabaseTemp, "w");
+
+     /* Remove the selected ID from the database */
+     while (!feof($IndexHandle))
+      {
+       $Entry    = fgets($IndexHandle, 4096);
+       $Entry    = str_replace("\r","",$Entry);
+       $Entry    = str_replace("\n","",$Entry);
+       $Settings = preg_split("/,/",$Entry);
+
+       if ( $Entry != "" )
+        {
+         $PicID       = $Settings[0];
+         $DBPos       = $Settings[1];
+         $PicSize     = $Settings[2];
+         $GeneratedTS = $Settings[3];
+         $Hits        = $Settings[4];
+
+         if ( $Settings[0] != $ID && $GeneratedTS > $TS)
+          {
+           $CurrentPos  = ftell($DBTempHandle);
+           fwrite($IndexTempHandle, $PicID.",".$CurrentPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
+
+           fseek($DBHandle,$DBPos);
+           $Picture = fread($DBHandle,$PicSize);
+           fwrite($DBTempHandle,$Picture);
+          }
+        }
+      }
+
+     /* Close the handles */
+     fclose($IndexHandle);
+     fclose($IndexTempHandle);
+     fclose($DBHandle);
+     fclose($DBTempHandle);
+
+     /* Remove the prod files */
+     unlink($Database);
+     unlink($Index);
+
+     /* Swap the temp & prod DB */
+     rename($DatabaseTemp,$Database);
+     rename($IndexTemp,$Index);
+    }
+
+   function isInCache($ID,$Verbose=FALSE,$UpdateHitsCount=FALSE)
+    {
+     /* Compute the paths */
+     $Index = $this->CacheFolder."/".$this->CacheIndex;
+
+     /* Search the picture in the index file */
+     $Handle = @fopen($Index, "r");
+     while (!feof($Handle))
+      {
+       $IndexPos = ftell($Handle);
+       $Entry = fgets($Handle, 4096);
+       if ( $Entry != "" )
+        {
+         $Settings = preg_split("/,/",$Entry);
+         $PicID    = $Settings[0];
+         if ( $PicID == $ID )
+          {
+           fclose($Handle);
+
+           $DBPos       = $Settings[1];
+           $PicSize     = $Settings[2];
+           $GeneratedTS = $Settings[3];
+           $Hits        = intval($Settings[4]);
+
+           if ( $UpdateHitsCount )
+            {
+             $Hits++;
+             if ( strlen($Hits) < 7 ) { $Hits = $Hits.str_repeat(" ",7-strlen($Hits)); }
+
+             $Handle = @fopen($Index, "r+");
+             fseek($Handle,$IndexPos);
+             fwrite($Handle, $PicID.",".$DBPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
+             fclose($Handle);
+            }
+
+           if ($Verbose)
+            { return(array("DBPos"=>$DBPos,"PicSize"=>$PicSize,"GeneratedTS"=>$GeneratedTS,"Hits"=>$Hits)); }
+           else
+            { return(TRUE); }
+          }
+        }
+      }
+     fclose($Handle);
+
+     /* Picture isn't in the cache */
+     return(FALSE);
+    }
+
+   /* Automatic output method based on the calling interface */
+   function autoOutput($ID,$Destination="output.png")
+    {
+     if (php_sapi_name() == "cli")
+      $this->saveFromCache($ID,$Destination);
+     else
+      $this->strokeFromCache($ID);
+    }
+
+   function strokeFromCache($ID)
+    {
+     /* Get the raw picture from the cache */
+     $Picture = $this->getFromCache($ID);
+
+     /* Do we have a hit? */
+     if ( $Picture == NULL ) { return(FALSE); }
+
+     header('Content-type: image/png');
+     echo $Picture;
+
+     return(TRUE);
+    }
+
+   function saveFromCache($ID,$Destination)
+    {
+     /* Get the raw picture from the cache */
+     $Picture = $this->getFromCache($ID);
+
+     /* Do we have a hit? */
+     if ( $Picture == NULL ) { return(FALSE); }
+
+     /* Flush the picture to a file */
+     $Handle = fopen($Destination,"w");
+     fwrite($Handle,$Picture);
+     fclose($Handle);
+
+     /* All went fine */
+     return(TRUE);
+    }
+
+   function getFromCache($ID)
+    {
+     /* Compute the path */
+     $Database = $this->CacheFolder."/".$this->CacheDB;
+
+     /* Lookup for the picture in the cache */
+     $CacheInfo = $this->isInCache($ID,TRUE,TRUE);
+
+     /* Not in the cache */
+     if (!$CacheInfo) { return(NULL); }
+
+     /* Get the database extended information */     
+     $DBPos   = $CacheInfo["DBPos"];
+     $PicSize = $CacheInfo["PicSize"];
+
+     /* Extract the picture from the solid cache file */
+     $Handle = @fopen($Database, "r");
+     fseek($Handle,$DBPos);
+     $Picture = fread($Handle,$PicSize);
+     fclose($Handle);
+
+     /* Return back the raw picture data */
+     return($Picture);
+    }
+  }
+?>

modules/pChart/pData.class.php

@@ -0,0 +1,788 @@
+<?php
+ /*
+     pDraw - class to manipulate data arrays
+
+     Version     : 2.1.4
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 19/01/2014
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ /* Axis configuration */
+ define("AXIS_FORMAT_DEFAULT"		, 680001);
+ define("AXIS_FORMAT_TIME"		, 680002);
+ define("AXIS_FORMAT_DATE"		, 680003);
+ define("AXIS_FORMAT_METRIC"		, 680004);
+ define("AXIS_FORMAT_CURRENCY"		, 680005);
+ define("AXIS_FORMAT_TRAFFIC"		, 680006);
+ define("AXIS_FORMAT_CUSTOM"		, 680007);
+
+ /* Axis position */
+ define("AXIS_POSITION_LEFT"		, 681001);
+ define("AXIS_POSITION_RIGHT"		, 681002);
+ define("AXIS_POSITION_TOP"		, 681001);
+ define("AXIS_POSITION_BOTTOM"		, 681002);
+
+ /* Families of data points */
+ define("SERIE_SHAPE_FILLEDCIRCLE"	, 681011);
+ define("SERIE_SHAPE_FILLEDTRIANGLE"	, 681012);
+ define("SERIE_SHAPE_FILLEDSQUARE"	, 681013);
+ define("SERIE_SHAPE_FILLEDDIAMOND"	, 681017);
+ define("SERIE_SHAPE_CIRCLE"		, 681014);
+ define("SERIE_SHAPE_TRIANGLE"		, 681015);
+ define("SERIE_SHAPE_SQUARE"		, 681016);
+ define("SERIE_SHAPE_DIAMOND"		, 681018);
+
+ /* Axis position */
+ define("AXIS_X"			, 682001);
+ define("AXIS_Y"			, 682002);
+
+ /* Define value limits */
+ define("ABSOLUTE_MIN"          	, -10000000000000);
+ define("ABSOLUTE_MAX"          	, 10000000000000);
+
+ /* Replacement to the PHP NULL keyword */
+ define("VOID"                  	, 0.123456789);
+
+ /* Euro symbol for GD fonts */
+ define("EURO_SYMBOL"			, utf8_encode("&#8364;"));
+
+ /* pData class definition */
+ class pData
+  {
+   var $Data;
+
+   var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46,"Alpha"=>100),
+                        "1"=>array("R"=>224,"G"=>100,"B"=>46,"Alpha"=>100),
+                        "2"=>array("R"=>224,"G"=>214,"B"=>46,"Alpha"=>100),
+                        "3"=>array("R"=>46,"G"=>151,"B"=>224,"Alpha"=>100),
+                        "4"=>array("R"=>176,"G"=>46,"B"=>224,"Alpha"=>100),
+                        "5"=>array("R"=>224,"G"=>46,"B"=>117,"Alpha"=>100),
+                        "6"=>array("R"=>92,"G"=>224,"B"=>46,"Alpha"=>100),
+                        "7"=>array("R"=>224,"G"=>176,"B"=>46,"Alpha"=>100));
+
+   /* Class creator */
+   function pData()
+    {
+     $this->Data = "";
+     $this->Data["XAxisDisplay"]	= AXIS_FORMAT_DEFAULT;
+     $this->Data["XAxisFormat"]		= NULL;
+     $this->Data["XAxisName"]		= NULL;
+     $this->Data["XAxisUnit"]		= NULL;
+     $this->Data["Abscissa"]		= NULL;
+     $this->Data["AbsicssaPosition"]	= AXIS_POSITION_BOTTOM;
+
+     $this->Data["Axis"][0]["Display"]  = AXIS_FORMAT_DEFAULT;
+     $this->Data["Axis"][0]["Position"] = AXIS_POSITION_LEFT;
+     $this->Data["Axis"][0]["Identity"] = AXIS_Y;
+    }
+
+   /* Add a single point or an array to the given serie */
+   function addPoints($Values,$SerieName="Serie1")
+    {
+     if (!isset($this->Data["Series"][$SerieName]))
+      $this->initialise($SerieName);
+
+     if ( is_array($Values) )
+      {
+       foreach($Values as $Key => $Value)
+        { $this->Data["Series"][$SerieName]["Data"][] = $Value; }
+      }
+     else
+      $this->Data["Series"][$SerieName]["Data"][] = $Values;
+
+     if ( $Values != VOID )
+      {
+       $StrippedData = $this->stripVOID($this->Data["Series"][$SerieName]["Data"]);
+       if ( empty($StrippedData) ) { $this->Data["Series"][$SerieName]["Max"] = 0; $this->Data["Series"][$SerieName]["Min"] =0; return(0); }
+       $this->Data["Series"][$SerieName]["Max"] = max($StrippedData);
+       $this->Data["Series"][$SerieName]["Min"] = min($StrippedData);
+      }
+    }
+
+   /* Strip VOID values */
+   function stripVOID($Values)
+    { if (!is_array($Values)) { return(array()); } $Result = array(); foreach($Values as $Key => $Value) { if ( $Value != VOID ) { $Result[] = $Value; } } return($Result); }
+
+   /* Return the number of values contained in a given serie */
+   function getSerieCount($Serie)
+    { if (isset($this->Data["Series"][$Serie]["Data"])) { return(sizeof($this->Data["Series"][$Serie]["Data"])); } else { return(0); } }
+
+   /* Remove a serie from the pData object */
+   function removeSerie($Series)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie])) { unset($this->Data["Series"][$Serie]); } }
+    }
+
+   /* Return a value from given serie & index */
+   function getValueAt($Serie,$Index=0)
+    { if (isset($this->Data["Series"][$Serie]["Data"][$Index])) { return($this->Data["Series"][$Serie]["Data"][$Index]); } else { return(NULL); } }
+
+   /* Return the values array */
+   function getValues($Serie)
+    { if (isset($this->Data["Series"][$Serie]["Data"])) { return($this->Data["Series"][$Serie]["Data"]); } else { return(NULL); } }
+
+   /* Reverse the values in the given serie */
+   function reverseSerie($Series)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]["Data"])) { $this->Data["Series"][$Serie]["Data"] = array_reverse($this->Data["Series"][$Serie]["Data"]); } }
+    }
+
+   /* Return the sum of the serie values */
+   function getSum($Serie)
+    { if (isset($this->Data["Series"][$Serie])) { return(array_sum($this->Data["Series"][$Serie]["Data"])); } else { return(NULL); } }
+
+   /* Return the max value of a given serie */
+   function getMax($Serie)
+    { if (isset($this->Data["Series"][$Serie]["Max"])) { return($this->Data["Series"][$Serie]["Max"]); } else { return(NULL); } }
+
+   /* Return the min value of a given serie */
+   function getMin($Serie)
+    { if (isset($this->Data["Series"][$Serie]["Min"])) { return($this->Data["Series"][$Serie]["Min"]); } else { return(NULL); } }
+
+   /* Set the description of a given serie */
+   function setSerieShape($Series,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Shape"] = $Shape; } }
+    }
+
+   /* Set the description of a given serie */
+   function setSerieDescription($Series,$Description="My serie")
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Description"] = $Description; } }
+    }
+
+   /* Set a serie as "drawable" while calling a rendering function */
+   function setSerieDrawable($Series,$Drawable=TRUE)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["isDrawable"] = $Drawable; } }
+    }
+
+   /* Set the icon associated to a given serie */
+   function setSeriePicture($Series,$Picture=NULL)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Picture"] = $Picture; } }
+    }
+
+   /* Set the name of the X Axis */
+   function setXAxisName($Name)
+    { $this->Data["XAxisName"] = $Name; }
+
+   /* Set the display mode of the  X Axis */
+   function setXAxisDisplay($Mode,$Format=NULL)
+    { $this->Data["XAxisDisplay"] = $Mode; $this->Data["XAxisFormat"]  = $Format; }
+
+   /* Set the unit that will be displayed on the X axis */
+   function setXAxisUnit($Unit)
+    { $this->Data["XAxisUnit"] = $Unit; }
+
+   /* Set the serie that will be used as abscissa */
+   function setAbscissa($Serie)
+    { if (isset($this->Data["Series"][$Serie])) { $this->Data["Abscissa"] = $Serie; } }
+
+   function setAbsicssaPosition($Position = AXIS_POSITION_BOTTOM)
+    { $this->Data["AbsicssaPosition"] = $Position; }
+
+   /* Set the name of the abscissa axis */
+   function setAbscissaName($Name)
+    { $this->Data["AbscissaName"] = $Name; }
+
+   /* Create a scatter group specifyin X and Y data series */
+   function setScatterSerie($SerieX,$SerieY,$ID=0)
+    { if (isset($this->Data["Series"][$SerieX]) && isset($this->Data["Series"][$SerieY]) ) { $this->initScatterSerie($ID); $this->Data["ScatterSeries"][$ID]["X"] = $SerieX; $this->Data["ScatterSeries"][$ID]["Y"] = $SerieY; } }
+
+   /* Set the shape of a given sctatter serie */
+   function setScatterSerieShape($ID,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
+    { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Shape"] = $Shape; } }
+
+   /* Set the description of a given scatter serie */
+   function setScatterSerieDescription($ID,$Description="My serie")
+    { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Description"] = $Description; } }
+
+   /* Set the icon associated to a given scatter serie */
+   function setScatterSeriePicture($ID,$Picture=NULL)
+    { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Picture"] = $Picture; } }
+
+   /* Set a scatter serie as "drawable" while calling a rendering function */
+   function setScatterSerieDrawable($ID ,$Drawable=TRUE)
+    { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["isDrawable"] = $Drawable; } }
+
+   /* Define if a scatter serie should be draw with ticks */
+   function setScatterSerieTicks($ID,$Width=0)
+    { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Ticks"] = $Width; } }
+
+   /* Define if a scatter serie should be draw with a special weight */
+   function setScatterSerieWeight($ID,$Weight=0)
+    { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Weight"] = $Weight; } }
+
+   /* Associate a color to a scatter serie */
+   function setScatterSerieColor($ID,$Format)
+    {
+     $R	    = isset($Format["R"]) ? $Format["R"] : 0;
+     $G	    = isset($Format["G"]) ? $Format["G"] : 0;
+     $B	    = isset($Format["B"]) ? $Format["B"] : 0;
+     $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+
+     if ( isset($this->Data["ScatterSeries"][$ID]) )
+      {
+       $this->Data["ScatterSeries"][$ID]["Color"]["R"] = $R;
+       $this->Data["ScatterSeries"][$ID]["Color"]["G"] = $G;
+       $this->Data["ScatterSeries"][$ID]["Color"]["B"] = $B;
+       $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = $Alpha;
+      }
+    }
+
+   /* Compute the series limits for an individual and global point of view */
+   function limits()
+    {
+     $GlobalMin = ABSOLUTE_MAX;
+     $GlobalMax = ABSOLUTE_MIN;
+
+     foreach($this->Data["Series"] as $Key => $Value)
+      {
+       if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"] == TRUE)
+        {
+         if ( $GlobalMin > $this->Data["Series"][$Key]["Min"] ) { $GlobalMin = $this->Data["Series"][$Key]["Min"]; }
+         if ( $GlobalMax < $this->Data["Series"][$Key]["Max"] ) { $GlobalMax = $this->Data["Series"][$Key]["Max"]; }
+        }
+      }
+     $this->Data["Min"] = $GlobalMin;
+     $this->Data["Max"] = $GlobalMax;
+
+     return(array($GlobalMin,$GlobalMax));
+    }
+
+   /* Mark all series as drawable */
+   function drawAll()
+    { foreach($this->Data["Series"] as $Key => $Value) { if ( $this->Data["Abscissa"] != $Key ) { $this->Data["Series"][$Key]["isDrawable"]=TRUE; } } }    
+
+   /* Return the average value of the given serie */
+   function getSerieAverage($Serie)
+    {
+     if ( isset($this->Data["Series"][$Serie]) )
+      {
+       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+       return(array_sum($SerieData)/sizeof($SerieData));
+      }
+     else
+      return(NULL);
+    }
+
+   /* Return the geometric mean of the given serie */
+   function getGeometricMean($Serie)
+    {
+     if ( isset($this->Data["Series"][$Serie]) )
+      {
+       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+       $Seriesum  = 1; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum * $Value; }
+       return(pow($Seriesum,1/sizeof($SerieData)));
+      }
+     else
+      return(NULL);
+    }
+
+   /* Return the harmonic mean of the given serie */
+   function getHarmonicMean($Serie)
+    {
+     if ( isset($this->Data["Series"][$Serie]) )
+      {
+       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+       $Seriesum  = 0; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum + 1/$Value; }
+       return(sizeof($SerieData)/$Seriesum);
+      }
+     else
+      return(NULL);
+    }
+
+   /* Return the standard deviation of the given serie */
+   function getStandardDeviation($Serie)
+    {
+     if ( isset($this->Data["Series"][$Serie]) )
+      {
+       $Average   = $this->getSerieAverage($Serie);
+       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+
+       $DeviationSum = 0;
+       foreach($SerieData as $Key => $Value)
+        $DeviationSum = $DeviationSum + ($Value-$Average)*($Value-$Average);
+
+       $Deviation = sqrt($DeviationSum/count($SerieData));
+
+       return($Deviation);
+      }
+     else
+      return(NULL);
+    }
+
+   /* Return the Coefficient of variation of the given serie */
+   function getCoefficientOfVariation($Serie)
+    {
+     if ( isset($this->Data["Series"][$Serie]) )
+      {
+       $Average           = $this->getSerieAverage($Serie);
+       $StandardDeviation = $this->getStandardDeviation($Serie);
+
+       if ( $StandardDeviation != 0 )
+        return($StandardDeviation/$Average);
+       else
+        return(NULL);
+      }
+     else
+      return(NULL);
+    }
+
+   /* Return the median value of the given serie */
+   function getSerieMedian($Serie)
+    {
+     if ( isset($this->Data["Series"][$Serie]) )
+      {
+       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+       sort($SerieData);
+       $SerieCenter = floor(sizeof($SerieData)/2);
+
+       if ( isset($SerieData[$SerieCenter]) )
+        return($SerieData[$SerieCenter]);
+       else
+        return(NULL);
+      }
+     else
+      return(NULL);
+    }
+
+   /* Return the x th percentil of the given serie */
+   function getSeriePercentile($Serie="Serie1",$Percentil=95)
+    {
+     if (!isset($this->Data["Series"][$Serie]["Data"])) { return(NULL); }
+
+     $Values = count($this->Data["Series"][$Serie]["Data"])-1;
+     if ( $Values < 0 ) { $Values = 0; }
+
+     $PercentilID  = floor(($Values/100)*$Percentil+.5);
+     $SortedValues = $this->Data["Series"][$Serie]["Data"];
+     sort($SortedValues);
+
+     if ( is_numeric($SortedValues[$PercentilID]) )
+      return($SortedValues[$PercentilID]);
+     else
+      return(NULL);
+    }
+
+   /* Add random values to a given serie */
+   function addRandomValues($SerieName="Serie1",$Options="")
+    {
+     $Values    = isset($Options["Values"]) ? $Options["Values"] : 20;
+     $Min       = isset($Options["Min"]) ? $Options["Min"] : 0;
+     $Max       = isset($Options["Max"]) ? $Options["Max"] : 100;
+     $withFloat = isset($Options["withFloat"]) ? $Options["withFloat"] : FALSE;
+
+     for ($i=0;$i<=$Values;$i++)
+      {
+       if ( $withFloat ) { $Value = rand($Min*100,$Max*100)/100; } else { $Value = rand($Min,$Max); }
+       $this->addPoints($Value,$SerieName);
+      }
+    }
+
+   /* Test if we have valid data */
+   function containsData()
+    {
+     if (!isset($this->Data["Series"])) { return(FALSE); }
+
+     $Result = FALSE;
+     foreach($this->Data["Series"] as $Key => $Value)
+      { if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"]==TRUE) { $Result=TRUE; } }
+     return($Result);
+    }
+
+   /* Set the display mode of an Axis */
+   function setAxisDisplay($AxisID,$Mode=AXIS_FORMAT_DEFAULT,$Format=NULL)
+    {
+     if ( isset($this->Data["Axis"][$AxisID] ) )
+      {
+       $this->Data["Axis"][$AxisID]["Display"] = $Mode;
+       if ( $Format != NULL ) { $this->Data["Axis"][$AxisID]["Format"] = $Format; }
+      }
+    }
+
+   /* Set the position of an Axis */
+   function setAxisPosition($AxisID,$Position=AXIS_POSITION_LEFT)
+    { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Position"] = $Position; } }
+
+   /* Associate an unit to an axis */
+   function setAxisUnit($AxisID,$Unit)
+    { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Unit"] = $Unit; } }
+
+   /* Associate a name to an axis */
+   function setAxisName($AxisID,$Name)
+    { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Name"] = $Name; } }
+
+   /* Associate a color to an axis */
+   function setAxisColor($AxisID,$Format)
+    {
+     $R	    = isset($Format["R"]) ? $Format["R"] : 0;
+     $G	    = isset($Format["G"]) ? $Format["G"] : 0;
+     $B	    = isset($Format["B"]) ? $Format["B"] : 0;
+     $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+
+     if ( isset($this->Data["Axis"][$AxisID] ) )
+      {
+       $this->Data["Axis"][$AxisID]["Color"]["R"] = $R;
+       $this->Data["Axis"][$AxisID]["Color"]["G"] = $G;
+       $this->Data["Axis"][$AxisID]["Color"]["B"] = $B;
+       $this->Data["Axis"][$AxisID]["Color"]["Alpha"] = $Alpha;
+      }
+    }
+
+
+   /* Design an axis as X or Y member */
+   function setAxisXY($AxisID,$Identity=AXIS_Y)
+    { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Identity"] = $Identity; } }
+
+   /* Associate one data serie with one axis */
+   function setSerieOnAxis($Series,$AxisID)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+     foreach($Series as $Key => $Serie)
+      {
+       $PreviousAxis = $this->Data["Series"][$Serie]["Axis"];
+
+       /* Create missing axis */
+       if ( !isset($this->Data["Axis"][$AxisID] ) )
+        { $this->Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_LEFT; $this->Data["Axis"][$AxisID]["Identity"] = AXIS_Y;}
+
+       $this->Data["Series"][$Serie]["Axis"] = $AxisID;
+
+       /* Cleanup unused axis */
+       $Found = FALSE;
+       foreach($this->Data["Series"] as $SerieName => $Values) { if ( $Values["Axis"] == $PreviousAxis ) { $Found = TRUE; } }
+       if (!$Found) { unset($this->Data["Axis"][$PreviousAxis]); }
+      }
+    }
+
+   /* Define if a serie should be draw with ticks */
+   function setSerieTicks($Series,$Width=0)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+     foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Ticks"] = $Width; } }
+    }
+
+   /* Define if a serie should be draw with a special weight */
+   function setSerieWeight($Series,$Weight=0)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+     foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Weight"] = $Weight; } }
+    }
+
+   /* Returns the palette of the given serie */
+   function getSeriePalette($Serie)
+    {
+     if ( !isset($this->Data["Series"][$Serie]) ) { return(NULL); }
+
+     $Result = "";
+     $Result["R"] = $this->Data["Series"][$Serie]["Color"]["R"];
+     $Result["G"] = $this->Data["Series"][$Serie]["Color"]["G"];
+     $Result["B"] = $this->Data["Series"][$Serie]["Color"]["B"];
+     $Result["Alpha"] = $this->Data["Series"][$Serie]["Color"]["Alpha"];
+
+     return($Result);
+    }
+
+   /* Set the color of one serie */
+   function setPalette($Series,$Format=NULL)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+
+     foreach($Series as $Key => $Serie)
+      {
+       $R	    = isset($Format["R"]) ? $Format["R"] : 0;
+       $G	    = isset($Format["G"]) ? $Format["G"] : 0;
+       $B	    = isset($Format["B"]) ? $Format["B"] : 0;
+       $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+
+       if ( isset($this->Data["Series"][$Serie]) )
+        {
+         $OldR = $this->Data["Series"][$Serie]["Color"]["R"]; $OldG = $this->Data["Series"][$Serie]["Color"]["G"]; $OldB = $this->Data["Series"][$Serie]["Color"]["B"];
+         $this->Data["Series"][$Serie]["Color"]["R"] = $R;
+         $this->Data["Series"][$Serie]["Color"]["G"] = $G;
+         $this->Data["Series"][$Serie]["Color"]["B"] = $B;
+         $this->Data["Series"][$Serie]["Color"]["Alpha"] = $Alpha;
+
+         /* Do reverse processing on the internal palette array */
+         foreach ($this->Palette as $Key => $Value)
+          { if ($Value["R"] == $OldR && $Value["G"] == $OldG && $Value["B"] == $OldB) { $this->Palette[$Key]["R"] = $R; $this->Palette[$Key]["G"] = $G; $this->Palette[$Key]["B"] = $B; $this->Palette[$Key]["Alpha"] = $Alpha;} }
+        }
+      }
+    }
+
+   /* Load a palette file */
+   function loadPalette($FileName,$Overwrite=FALSE)
+    {
+     if ( !file_exists($FileName) ) { return(-1); }
+     if ( $Overwrite ) { $this->Palette = ""; }
+
+     $fileHandle = @fopen($FileName, "r");
+     if (!$fileHandle) { return(-1); }
+     while (!feof($fileHandle))
+      {
+       $buffer = fgets($fileHandle, 4096);
+       if ( preg_match("/,/",$buffer) )
+        {
+         list($R,$G,$B,$Alpha) = preg_split("/,/",$buffer);
+         if ( $this->Palette == "" ) { $ID = 0; } else { $ID = count($this->Palette); }
+         $this->Palette[$ID] = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+        }
+      }
+     fclose($fileHandle);
+
+     /* Apply changes to current series */
+     $ID = 0;
+     if ( isset($this->Data["Series"]))
+      {
+       foreach($this->Data["Series"] as $Key => $Value)
+        {
+         if ( !isset($this->Palette[$ID]) )
+          $this->Data["Series"][$Key]["Color"] = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>0);
+         else
+          $this->Data["Series"][$Key]["Color"] = $this->Palette[$ID];
+         $ID++;
+        }
+      }
+    }
+
+   /* Initialise a given scatter serie */
+   function initScatterSerie($ID)
+    {
+     if ( isset($this->Data["ScatterSeries"][$ID]) ) { return(0); }
+
+     $this->Data["ScatterSeries"][$ID]["Description"]	= "Scatter ".$ID;
+     $this->Data["ScatterSeries"][$ID]["isDrawable"]	= TRUE;
+     $this->Data["ScatterSeries"][$ID]["Picture"]	= NULL;
+     $this->Data["ScatterSeries"][$ID]["Ticks"]		= 0;
+     $this->Data["ScatterSeries"][$ID]["Weight"]	= 0;
+
+     if ( isset($this->Palette[$ID]) )
+      $this->Data["ScatterSeries"][$ID]["Color"] = $this->Palette[$ID];
+     else
+      {
+       $this->Data["ScatterSeries"][$ID]["Color"]["R"] = rand(0,255);
+       $this->Data["ScatterSeries"][$ID]["Color"]["G"] = rand(0,255);
+       $this->Data["ScatterSeries"][$ID]["Color"]["B"] = rand(0,255);
+       $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = 100;
+      }
+    }
+
+   /* Initialise a given serie */
+   function initialise($Serie)
+    {
+     if ( isset($this->Data["Series"]) ) { $ID = count($this->Data["Series"]); } else { $ID = 0; }
+
+     $this->Data["Series"][$Serie]["Description"]	= $Serie;
+     $this->Data["Series"][$Serie]["isDrawable"]	= TRUE;
+     $this->Data["Series"][$Serie]["Picture"]		= NULL;
+     $this->Data["Series"][$Serie]["Max"]		= NULL;
+     $this->Data["Series"][$Serie]["Min"]		= NULL;
+     $this->Data["Series"][$Serie]["Axis"]		= 0;
+     $this->Data["Series"][$Serie]["Ticks"]		= 0;
+     $this->Data["Series"][$Serie]["Weight"]		= 0;
+     $this->Data["Series"][$Serie]["Shape"]		= SERIE_SHAPE_FILLEDCIRCLE;
+
+     if ( isset($this->Palette[$ID]) )
+      $this->Data["Series"][$Serie]["Color"] = $this->Palette[$ID];
+     else
+      {
+       $this->Data["Series"][$Serie]["Color"]["R"] = rand(0,255);
+       $this->Data["Series"][$Serie]["Color"]["G"] = rand(0,255);
+       $this->Data["Series"][$Serie]["Color"]["B"] = rand(0,255);
+       $this->Data["Series"][$Serie]["Color"]["Alpha"] = 100;
+      }
+    }
+     
+   function normalize($NormalizationFactor=100,$UnitChange=NULL,$Round=1)
+    {
+     $Abscissa = $this->Data["Abscissa"];
+
+     $SelectedSeries = "";
+     $MaxVal         = 0;
+     foreach($this->Data["Axis"] as $AxisID => $Axis)
+      {
+       if ( $UnitChange != NULL ) { $this->Data["Axis"][$AxisID]["Unit"] = $UnitChange; }
+
+       foreach($this->Data["Series"] as $SerieName => $Serie)
+        {
+         if ($Serie["Axis"] == $AxisID && $Serie["isDrawable"] == TRUE && $SerieName != $Abscissa)
+          {
+           $SelectedSeries[$SerieName] = $SerieName;
+
+           if ( count($Serie["Data"] ) > $MaxVal ) { $MaxVal = count($Serie["Data"]); }
+          }
+        }
+      }
+
+     for($i=0;$i<=$MaxVal-1;$i++)
+      {
+       $Factor = 0;
+       foreach ($SelectedSeries as $Key => $SerieName )
+        {
+         $Value = $this->Data["Series"][$SerieName]["Data"][$i];
+         if ( $Value != VOID )
+          $Factor = $Factor + abs($Value);
+        }
+
+       if ( $Factor != 0 )
+        {
+         $Factor = $NormalizationFactor / $Factor;
+
+         foreach ($SelectedSeries as $Key => $SerieName )
+          {
+           $Value = $this->Data["Series"][$SerieName]["Data"][$i];
+
+           if ( $Value != VOID && $Factor != $NormalizationFactor )
+            $this->Data["Series"][$SerieName]["Data"][$i] = round(abs($Value)*$Factor,$Round);
+           elseif ( $Value == VOID || $Value == 0 )
+            $this->Data["Series"][$SerieName]["Data"][$i] = VOID;
+           elseif ( $Factor == $NormalizationFactor )
+            $this->Data["Series"][$SerieName]["Data"][$i] = $NormalizationFactor;
+          }
+        }
+      }
+
+     foreach ($SelectedSeries as $Key => $SerieName )
+      {
+       $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+       $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+      }
+    }
+
+   /* Load data from a CSV (or similar) data source */
+   function importFromCSV($FileName,$Options="")
+    {
+     $Delimiter		= isset($Options["Delimiter"]) ? $Options["Delimiter"] : ",";
+     $GotHeader		= isset($Options["GotHeader"]) ? $Options["GotHeader"] : FALSE;
+     $SkipColumns	= isset($Options["SkipColumns"]) ? $Options["SkipColumns"] : array(-1);
+     $DefaultSerieName	= isset($Options["DefaultSerieName"]) ? $Options["DefaultSerieName"] : "Serie";
+
+     $Handle = @fopen($FileName,"r");
+     if ($Handle)
+      {
+       $HeaderParsed = FALSE; $SerieNames = "";
+       while (!feof($Handle))
+        {
+         $Buffer = fgets($Handle, 4096);
+         $Buffer = str_replace(chr(10),"",$Buffer);
+         $Buffer = str_replace(chr(13),"",$Buffer);
+         $Values = preg_split("/".$Delimiter."/",$Buffer);
+
+         if ( $Buffer != "" )
+          {
+           if ( $GotHeader && !$HeaderParsed )
+            {
+             foreach($Values as $Key => $Name) { if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $Name; } }
+             $HeaderParsed = TRUE;
+            }
+           else
+            {
+             if ($SerieNames == "" ) { foreach($Values as $Key => $Name) {  if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $DefaultSerieName.$Key; } } }
+             foreach($Values as $Key => $Value) {  if ( !in_array($Key,$SkipColumns) ) { $this->addPoints($Value,$SerieNames[$Key]); } }
+            }
+          }
+        }
+       fclose($Handle);
+      }
+    }
+
+   /* Create a dataset based on a formula */
+   function createFunctionSerie($SerieName,$Formula="",$Options="")
+    {
+     $MinX		= isset($Options["MinX"]) ? $Options["MinX"] : -10;
+     $MaxX		= isset($Options["MaxX"]) ? $Options["MaxX"] : 10;
+     $XStep		= isset($Options["XStep"]) ? $Options["XStep"] : 1;
+     $AutoDescription	= isset($Options["AutoDescription"]) ? $Options["AutoDescription"] : FALSE;
+     $RecordAbscissa	= isset($Options["RecordAbscissa"]) ? $Options["RecordAbscissa"] : FALSE;
+     $AbscissaSerie	= isset($Options["AbscissaSerie"]) ? $Options["AbscissaSerie"] : "Abscissa";
+
+     if ( $Formula == "" ) { return(0); }
+
+     $Result = ""; $Abscissa = "";
+     for($i=$MinX; $i<=$MaxX; $i=$i+$XStep)
+      {
+       $Expression = "\$return = '!'.(".str_replace("z",$i,$Formula).");";
+       if ( @eval($Expression) === FALSE ) { $return = VOID; }
+       if ( $return == "!" ) { $return = VOID; } else { $return = $this->right($return,strlen($return)-1); }
+       if ( $return == "NAN" ) { $return = VOID; }
+       if ( $return == "INF" ) { $return = VOID; }
+       if ( $return == "-INF" ) { $return = VOID; }
+
+       $Abscissa[] = $i;
+       $Result[]   = $return;
+      }
+
+     $this->addPoints($Result,$SerieName);
+     if ( $AutoDescription ) { $this->setSerieDescription($SerieName,$Formula); }
+     if ( $RecordAbscissa ) { $this->addPoints($Abscissa,$AbscissaSerie); }
+    }
+
+   function negateValues($Series)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+     foreach($Series as $Key => $SerieName)
+      {
+       if (isset($this->Data["Series"][$SerieName]))
+        {
+         $Data = "";
+         foreach($this->Data["Series"][$SerieName]["Data"] as $Key => $Value)
+          { if ( $Value == VOID ) { $Data[] = VOID; } else { $Data[] = -$Value; } }
+         $this->Data["Series"][$SerieName]["Data"] = $Data;
+
+         $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+         $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
+        }
+      }
+    }
+
+   /* Return the data & configuration of the series */
+   function getData()
+    { return($this->Data); }
+
+   /* Save a palette element */
+   function savePalette($ID,$Color)
+    { $this->Palette[$ID] = $Color; }
+
+   /* Return the palette of the series */
+   function getPalette()
+    { return($this->Palette); }
+
+   /* Called by the scaling algorithm to save the config */
+   function saveAxisConfig($Axis) { $this->Data["Axis"]=$Axis; }
+
+   /* Save the Y Margin if set */
+   function saveYMargin($Value) { $this->Data["YMargin"]=$Value; }
+
+   /* Save extended configuration to the pData object */
+   function saveExtendedData($Tag,$Values) { $this->Data["Extended"][$Tag]=$Values; }
+
+   /* Called by the scaling algorithm to save the orientation of the scale */
+   function saveOrientation($Orientation) { $this->Data["Orientation"]=$Orientation; }
+
+   /* Convert a string to a single elements array */
+   function convertToArray($Value)
+    { $Values = ""; $Values[] = $Value; return($Values); }
+
+   /* Class string wrapper */
+   function __toString()
+    { return("pData object."); }
+
+   function left($value,$NbChar)	{ return substr($value,0,$NbChar); }  
+   function right($value,$NbChar)	{ return substr($value,strlen($value)-$NbChar,$NbChar); }  
+   function mid($value,$Depart,$NbChar)	{ return substr($value,$Depart-1,$NbChar); }  
+  }
+?>

modules/pChart/pImage.class.php

@@ -0,0 +1,472 @@
+<?php
+ /*
+     pDraw - pChart core class
+
+     Version     : 2.1.4
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 19/01/2014
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ /* The GD extension is mandatory */
+ if (!extension_loaded('gd') && !extension_loaded('gd2'))
+  {
+   echo "GD extension must be loaded. \r\n";
+   exit();
+  }
+
+ /* Image map handling */
+ define("IMAGE_MAP_STORAGE_FILE"	, 680001);
+ define("IMAGE_MAP_STORAGE_SESSION"	, 680002);
+
+ /* Last generated chart layout */
+ define("CHART_LAST_LAYOUT_REGULAR"	, 680011);
+ define("CHART_LAST_LAYOUT_STACKED"	, 680012);
+
+ /* ImageMap string delimiter */
+ define("IMAGE_MAP_DELIMITER"		, chr(1));
+
+ class pImage extends pDraw
+  {
+   /* Image settings, size, quality, .. */
+   var $XSize		= NULL;				// Width of the picture
+   var $YSize		= NULL;				// Height of the picture
+   var $Picture		= NULL;				// GD picture object
+   var $Antialias	= TRUE;				// Turn antialias on or off
+   var $AntialiasQuality  = 0;				// Quality of the antialiasing implementation (0-1)
+   var $Mask		= "";				// Already drawn pixels mask (Filled circle implementation)
+   var $TransparentBackground = FALSE;			// Just to know if we need to flush the alpha channels when rendering
+
+   /* Graph area settings */
+   var $GraphAreaX1	= NULL;				// Graph area X origin
+   var $GraphAreaY1	= NULL;				// Graph area Y origin
+   var $GraphAreaX2	= NULL;				// Graph area bottom right X position
+   var $GraphAreaY2	= NULL;				// Graph area bottom right Y position
+
+   /* Scale settings */
+   var $ScaleMinDivHeight = 20;				// Minimum height for scame divs
+
+   /* Font properties */
+   var $FontName	= "fonts/GeosansLight.ttf";	// Default font file
+   var $FontSize	= 12;				// Default font size
+   var $FontBox		= NULL;				// Return the bounding box of the last written string
+   var $FontColorR	= 0;				// Default color settings
+   var $FontColorG	= 0;				// Default color settings
+   var $FontColorB	= 0;				// Default color settings
+   var $FontColorA	= 100;				// Default transparency
+
+   /* Shadow properties */
+   var $Shadow		= FALSE;			// Turn shadows on or off
+   var $ShadowX		= NULL;				// X Offset of the shadow
+   var $ShadowY		= NULL;				// Y Offset of the shadow
+   var $ShadowR		= NULL;				// R component of the shadow
+   var $ShadowG		= NULL;				// G component of the shadow
+   var $ShadowB		= NULL;				// B component of the shadow
+   var $Shadowa		= NULL;				// Alpha level of the shadow
+
+   /* Image map */
+   var $ImageMap	= NULL;				// Aray containing the image map
+   var $ImageMapIndex	= "pChart";			// Name of the session array
+   var $ImageMapStorageMode = NULL;			// Save the current imagemap storage mode
+   var $ImageMapAutoDelete  = TRUE;			// Automatic deletion of the image map temp files
+
+   /* Data Set */
+   var $DataSet		= NULL;				// Attached dataset
+
+   /* Last generated chart info */
+   var $LastChartLayout	= CHART_LAST_LAYOUT_REGULAR;	// Last layout : regular or stacked
+
+   /* Class constructor */
+   function pImage($XSize,$YSize,$DataSet=NULL,$TransparentBackground=FALSE)
+    {
+     $this->TransparentBackground = $TransparentBackground;
+
+     if ( $DataSet != NULL ) { $this->DataSet = $DataSet; }
+
+     $this->XSize   = $XSize;
+     $this->YSize   = $YSize;
+     $this->Picture = imagecreatetruecolor($XSize,$YSize);
+
+     if ( $this->TransparentBackground )
+      {
+       imagealphablending($this->Picture,FALSE);
+       imagefilledrectangle($this->Picture, 0,0,$XSize, $YSize, imagecolorallocatealpha($this->Picture, 255, 255, 255, 127));
+       imagealphablending($this->Picture,TRUE);
+       imagesavealpha($this->Picture,true); 
+      }
+     else
+      {
+       $C_White = $this->AllocateColor($this->Picture,255,255,255);
+       imagefilledrectangle($this->Picture,0,0,$XSize,$YSize,$C_White);
+      }
+    }
+
+   /* Enable / Disable and set shadow properties */
+   function setShadow($Enabled=TRUE,$Format="")
+    {
+     $X	    = isset($Format["X"]) ? $Format["X"] : 2;
+     $Y	    = isset($Format["Y"]) ? $Format["Y"] : 2;
+     $R	    = isset($Format["R"]) ? $Format["R"] : 0;
+     $G	    = isset($Format["G"]) ? $Format["G"] : 0;
+     $B	    = isset($Format["B"]) ? $Format["B"] : 0;
+     $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 10;
+
+     $this->Shadow  = $Enabled;
+     $this->ShadowX = $X;
+     $this->ShadowY = $Y;
+     $this->ShadowR = $R;
+     $this->ShadowG = $G;
+     $this->ShadowB = $B;
+     $this->Shadowa = $Alpha;
+    }
+
+   /* Set the graph area position */
+   function setGraphArea($X1,$Y1,$X2,$Y2)
+    {
+     if ( $X2 < $X1 || $X1 == $X2 || $Y2 < $Y1 || $Y1 == $Y2 ) { return(-1); }
+
+     $this->GraphAreaX1 = $X1; $this->DataSet->Data["GraphArea"]["X1"] = $X1;
+     $this->GraphAreaY1 = $Y1; $this->DataSet->Data["GraphArea"]["Y1"] = $Y1;
+     $this->GraphAreaX2 = $X2; $this->DataSet->Data["GraphArea"]["X2"] = $X2;
+     $this->GraphAreaY2 = $Y2; $this->DataSet->Data["GraphArea"]["Y2"] = $Y2;
+    }
+
+   /* Return the width of the picture */
+   function getWidth()
+    { return($this->XSize); }
+
+   /* Return the heigth of the picture */
+   function getHeight()
+    { return($this->YSize); }
+
+   /* Render the picture to a file */
+   function render($FileName)
+    {
+     if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
+     imagepng($this->Picture,$FileName);
+    }
+
+   /* Render the picture to a web browser stream */
+   function stroke($BrowserExpire=FALSE)
+    {
+     if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
+
+     if ( $BrowserExpire )
+      {
+       header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+       header("Cache-Control: no-cache");
+       header("Pragma: no-cache");
+      }
+
+     header('Content-type: image/png');
+     imagepng($this->Picture);
+    }
+
+   /* Automatic output method based on the calling interface */
+   function autoOutput($FileName="output.png")
+    {
+     if (php_sapi_name() == "cli")
+      $this->Render($FileName);
+     else
+      $this->Stroke();
+    }
+
+   /* Return the length between two points */
+   function getLength($X1,$Y1,$X2,$Y2)
+    { return(sqrt(pow(max($X1,$X2)-min($X1,$X2),2)+pow(max($Y1,$Y2)-min($Y1,$Y2),2))); }
+
+   /* Return the orientation of a line */
+   function getAngle($X1,$Y1,$X2,$Y2)
+    {
+     $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
+     if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
+    }
+
+   /* Return the surrounding box of text area */
+   function getTextBox_deprecated($X,$Y,$FontName,$FontSize,$Angle,$Text)
+    {
+     $Size    = imagettfbbox($FontSize,$Angle,$FontName,$Text);
+     $Width   = $this->getLength($Size[0],$Size[1],$Size[2],$Size[3])+1;
+     $Height  = $this->getLength($Size[2],$Size[3],$Size[4],$Size[5])+1;
+
+     $RealPos[0]["X"] = $X; $RealPos[0]["Y"] = $Y;
+     $RealPos[1]["X"] = cos((360-$Angle)*PI/180)*$Width + $RealPos[0]["X"]; $RealPos[1]["Y"] = sin((360-$Angle)*PI/180)*$Width + $RealPos[0]["Y"];
+     $RealPos[2]["X"] = cos((270-$Angle)*PI/180)*$Height + $RealPos[1]["X"]; $RealPos[2]["Y"] = sin((270-$Angle)*PI/180)*$Height + $RealPos[1]["Y"];
+     $RealPos[3]["X"] = cos((180-$Angle)*PI/180)*$Width + $RealPos[2]["X"]; $RealPos[3]["Y"] = sin((180-$Angle)*PI/180)*$Width + $RealPos[2]["Y"];
+
+     $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"] = $RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"] = $RealPos[0]["Y"];
+     $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"] = $RealPos[1]["X"];	$RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"] = $RealPos[1]["Y"];
+
+     return($RealPos);
+    }
+
+   /* Return the surrounding box of text area */
+   function getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text)
+    {
+     $coords = imagettfbbox($FontSize, 0, $FontName, $Text);
+
+     $a = deg2rad($Angle); $ca = cos($a); $sa = sin($a); $RealPos = array();
+     for($i = 0; $i < 7; $i += 2)
+      {
+       $RealPos[$i/2]["X"] = $X + round($coords[$i] * $ca + $coords[$i+1] * $sa);
+       $RealPos[$i/2]["Y"] = $Y + round($coords[$i+1] * $ca - $coords[$i] * $sa);
+      }
+
+     $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"]	= $RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"]	= $RealPos[0]["Y"];
+     $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"]	= $RealPos[1]["X"];	$RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"]	= $RealPos[1]["Y"];
+     $RealPos[TEXT_ALIGN_TOPLEFT]["X"]		= $RealPos[3]["X"];	$RealPos[TEXT_ALIGN_TOPLEFT]["Y"]	= $RealPos[3]["Y"];
+     $RealPos[TEXT_ALIGN_TOPRIGHT]["X"]		= $RealPos[2]["X"];	$RealPos[TEXT_ALIGN_TOPRIGHT]["Y"]	= $RealPos[2]["Y"];
+     $RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["X"]	= ($RealPos[1]["X"]-$RealPos[0]["X"])/2+$RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["Y"]	= ($RealPos[0]["Y"]-$RealPos[1]["Y"])/2+$RealPos[1]["Y"];
+     $RealPos[TEXT_ALIGN_TOPMIDDLE]["X"]	= ($RealPos[2]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_TOPMIDDLE]["Y"]	= ($RealPos[3]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
+     $RealPos[TEXT_ALIGN_MIDDLELEFT]["X"]	= ($RealPos[0]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_MIDDLELEFT]["Y"]	= ($RealPos[0]["Y"]-$RealPos[3]["Y"])/2+$RealPos[3]["Y"];
+     $RealPos[TEXT_ALIGN_MIDDLERIGHT]["X"]	= ($RealPos[1]["X"]-$RealPos[2]["X"])/2+$RealPos[2]["X"];	$RealPos[TEXT_ALIGN_MIDDLERIGHT]["Y"]	= ($RealPos[1]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
+     $RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["X"]	= ($RealPos[1]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["Y"]	= ($RealPos[0]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
+
+     return($RealPos);
+    }
+
+   /* Set current font properties */
+   function setFontProperties($Format="")
+    {
+     $R		= isset($Format["R"]) ? $Format["R"] : -1;
+     $G		= isset($Format["G"]) ? $Format["G"] : -1;
+     $B		= isset($Format["B"]) ? $Format["B"] : -1;
+     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : NULL;
+     $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : NULL;
+
+     if ( $R != -1)       {  $this->FontColorR = $R; }
+     if ( $G != -1)       {  $this->FontColorG = $G; }
+     if ( $B != -1)       {  $this->FontColorB = $B; }
+     if ( $Alpha != NULL) {  $this->FontColorA = $Alpha; }
+
+     if ( $FontName != NULL  )
+      $this->FontName = $FontName;
+ 
+     if ( $FontSize != NULL  )
+      $this->FontSize = $FontSize;
+    }
+
+   /* Returns the 1st decimal values (used to correct AA bugs) */
+   function getFirstDecimal($Value)
+    {
+     $Values = preg_split("/\./",$Value);
+     if ( isset($Values[1]) ) { return(substr($Values[1],0,1)); } else { return(0); }
+    }
+
+   /* Attach a dataset to your pChart Object */
+   function setDataSet(&$DataSet)
+    { $this->DataSet = $DataSet; }
+
+   /* Print attached dataset contents to STDOUT */
+   function printDataSet()
+    { print_r($this->DataSet); }
+
+   /* Initialise the image map methods */
+   function initialiseImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
+    {
+     $this->ImageMapIndex 		= $Name;
+     $this->ImageMapStorageMode		= $StorageMode;
+
+     if ($StorageMode == IMAGE_MAP_STORAGE_SESSION)
+      {
+       if(!isset($_SESSION)) { session_start(); }
+       $_SESSION[$this->ImageMapIndex]    = NULL;
+      }
+     elseif($StorageMode == IMAGE_MAP_STORAGE_FILE)
+      {
+       $this->ImageMapFileName 		= $UniqueID;
+       $this->ImageMapStorageFolder	= $StorageFolder;
+
+       if (file_exists($StorageFolder."/".$UniqueID.".map")) { unlink($StorageFolder."/".$UniqueID.".map"); }
+      }
+    }
+
+   /* Add a zone to the image map */
+   function addToImageMap($Type,$Plots,$Color=NULL,$Title=NULL,$Message=NULL,$HTMLEncode=FALSE)
+    {
+     if ( $this->ImageMapStorageMode == NULL ) { $this->initialiseImageMap(); }
+
+     /* Encode the characters in the imagemap in HTML standards */
+     $Title   = str_replace("&#8364;","\u20AC",$Title);
+     $Title   = htmlentities($Title,ENT_QUOTES,"ISO-8859-15");
+     if ( $HTMLEncode )
+      {
+       $Message = htmlentities($Message,ENT_QUOTES,"ISO-8859-15");
+       $Message = str_replace("&lt;","<",$Message);
+       $Message = str_replace("&gt;",">",$Message);
+      }
+
+     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+      {
+       if(!isset($_SESSION)) { $this->initialiseImageMap(); }
+       $_SESSION[$this->ImageMapIndex][] = array($Type,$Plots,$Color,$Title,$Message);
+      }
+     elseif($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
+      {
+       $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'a');
+       fwrite($Handle, $Type.IMAGE_MAP_DELIMITER.$Plots.IMAGE_MAP_DELIMITER.$Color.IMAGE_MAP_DELIMITER.$Title.IMAGE_MAP_DELIMITER.$Message."\r\n");
+       fclose($Handle);
+      }
+    }
+
+   /* Remove VOID values from an imagemap custom values array */
+   function removeVOIDFromArray($SerieName, $Values)
+    {
+     if ( !isset($this->DataSet->Data["Series"][$SerieName]) ) { return(-1); }
+
+     $Result = "";
+     foreach($this->DataSet->Data["Series"][$SerieName]["Data"] as $Key => $Value)
+      { if ( $Value != VOID && isset($Values[$Key]) ) { $Result[] = $Values[$Key]; } }
+     return($Result);
+    }
+
+   /* Replace the title of one image map serie */
+   function replaceImageMapTitle($OldTitle, $NewTitle)
+    {
+     if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
+
+     if ( is_array($NewTitle) ) { $NewTitle = $this->removeVOIDFromArray($OldTitle, $NewTitle); }
+ 
+     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+      {
+       if(!isset($_SESSION)) { return(-1); }
+       if ( is_array($NewTitle) )
+        { $ID = 0; foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID])) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle[$ID]; $ID++; } } }
+       else
+        { foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle; } } }
+      }
+     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+      {
+       $TempArray = "";
+       $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
+       if ($Handle)
+        {
+         while (($Buffer = fgets($Handle, 4096)) !== false)
+          {
+           $Fields      = preg_split("/".IMAGE_MAP_DELIMITER."/",str_replace(array(chr(10),chr(13)),"",$Buffer));
+           $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
+          }
+         fclose($Handle);
+
+         if ( is_array($NewTitle) )
+          { $ID = 0; foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID]) ) { $TempArray[$Key][3] = $NewTitle[$ID]; $ID++; } } }
+         else
+          { foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $TempArray[$Key][3] = $NewTitle; } } }
+
+         $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
+         foreach($TempArray as $Key => $Settings)
+          { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
+         fclose($Handle);
+        }
+      }
+    }
+
+   /* Replace the values of the image map contents */
+   function replaceImageMapValues($Title, $Values)
+    {
+     if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
+
+     $Values = $this->removeVOIDFromArray($Title, $Values);
+     $ID = 0; 
+     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+      {
+       if(!isset($_SESSION)) { return(-1); }
+       foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $_SESSION[$this->ImageMapIndex][$Key][4] = $Values[$ID]; } $ID++; } }
+      }
+     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+      {
+       $TempArray = "";
+       $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
+       if ($Handle)
+        {
+         while (($Buffer = fgets($Handle, 4096)) !== false)
+          {
+           $Fields      = preg_split("/".IMAGE_MAP_DELIMITER."/",str_replace(array(chr(10),chr(13)),"",$Buffer));
+           $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
+          }
+         fclose($Handle);
+
+         foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $TempArray[$Key][4] = $Values[$ID]; } $ID++; } }
+
+         $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
+         foreach($TempArray as $Key => $Settings)
+          { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
+         fclose($Handle);
+        }
+      }
+    }
+
+   /* Dump the image map */
+   function dumpImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
+    {
+     $this->ImageMapIndex 		= $Name;
+     $this->ImageMapStorageMode		= $StorageMode;
+
+     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
+      {
+       if(!isset($_SESSION)) { session_start(); }
+       if ( $_SESSION[$Name] != NULL )
+        {
+         foreach($_SESSION[$Name] as $Key => $Params)
+          { echo $Params[0].IMAGE_MAP_DELIMITER.$Params[1].IMAGE_MAP_DELIMITER.$Params[2].IMAGE_MAP_DELIMITER.$Params[3].IMAGE_MAP_DELIMITER.$Params[4]."\r\n"; }
+        }
+      }
+     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+      {
+       if (file_exists($StorageFolder."/".$UniqueID.".map"))
+        {
+         $Handle = @fopen($StorageFolder."/".$UniqueID.".map", "r");
+         if ($Handle) { while (($Buffer = fgets($Handle, 4096)) !== false) { echo $Buffer; } }
+         fclose($Handle);
+
+         if ( $this->ImageMapAutoDelete ) { unlink($StorageFolder."/".$UniqueID.".map"); }
+        }
+      }
+
+     /* When the image map is returned to the client, the script ends */
+     exit();
+    }
+
+   /* Return the HTML converted color from the RGB composite values */
+   function toHTMLColor($R,$G,$B)
+    {
+     $R=intval($R); $G=intval($G); $B=intval($B);
+     $R=dechex($R<0?0:($R>255?255:$R)); $G=dechex($G<0?0:($G>255?255:$G));$B=dechex($B<0?0:($B>255?255:$B));
+     $Color="#".(strlen($R) < 2?'0':'').$R; $Color.=(strlen($G) < 2?'0':'').$G; $Color.= (strlen($B) < 2?'0':'').$B;
+     return($Color);
+    }
+
+   /* Reverse an array of points */
+   function reversePlots($Plots)
+    {
+     $Result = "";
+     for($i=count($Plots)-2;$i>=0;$i=$i-2) { $Result[] = $Plots[$i]; $Result[] = $Plots[$i+1]; }
+     return($Result);
+    }
+
+   /* Mirror Effect */
+   function drawAreaMirror($X,$Y,$Width,$Height,$Format="")
+    {
+     $StartAlpha	= isset($Format["StartAlpha"]) ? $Format["StartAlpha"] : 80;
+     $EndAlpha		= isset($Format["EndAlpha"]) ? $Format["EndAlpha"] : 0;
+
+     $AlphaStep = ($StartAlpha-$EndAlpha)/$Height;
+
+     $Picture = imagecreatetruecolor($this->XSize,$this->YSize);
+     imagecopy($Picture,$this->Picture,0,0,0,0,$this->XSize,$this->YSize);
+     
+     for($i=1;$i<=$Height;$i++)
+      {
+       if ( $Y+($i-1) < $this->YSize && $Y-$i > 0 ) { imagecopymerge($Picture,$this->Picture,$X,$Y+($i-1),$X,$Y-$i,$Width,1,$StartAlpha-$AlphaStep*$i); }
+      }
+
+     imagecopy($this->Picture,$Picture,0,0,0,0,$this->XSize,$this->YSize);
+    }
+  }
+?>

modules/pChart/pIndicator.class.php

@@ -0,0 +1,241 @@
+<?php
+ /*
+     pIndicator - class to draw indicators
+
+     Version     : 2.1.4
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 19/01/2014
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ define("INDICATOR_CAPTION_DEFAULT"	, 700001);
+ define("INDICATOR_CAPTION_EXTENDED"	, 700002);
+
+ define("INDICATOR_CAPTION_INSIDE"	, 700011);
+ define("INDICATOR_CAPTION_BOTTOM"	, 700012);
+
+ define("INDICATOR_VALUE_BUBBLE"	, 700021);
+ define("INDICATOR_VALUE_LABEL"		, 700022);
+
+ /* pIndicator class definition */
+ class pIndicator
+  {
+   var $pChartObject;
+
+   /* Class creator */
+   function pIndicator($pChartObject)
+    {
+     $this->pChartObject = $pChartObject;
+    }
+
+   /* Draw an indicator */
+   function draw($X,$Y,$Width,$Height,$Format="")
+    {
+     $Values			= isset($Format["Values"]) ? $Format["Values"] : VOID;
+     $IndicatorSections		= isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : NULL;
+     $ValueDisplay		= isset($Format["ValueDisplay"]) ? $Format["ValueDisplay"] : INDICATOR_VALUE_BUBBLE;
+     $SectionsMargin		= isset($Format["SectionsMargin"]) ? $Format["SectionsMargin"] : 4;
+     $DrawLeftHead		= isset($Format["DrawLeftHead"]) ? $Format["DrawLeftHead"] : TRUE;
+     $DrawRightHead		= isset($Format["DrawRightHead"]) ? $Format["DrawRightHead"] : TRUE;
+     $HeadSize			= isset($Format["HeadSize"]) ? $Format["HeadSize"] : floor($Height/4);
+     $TextPadding		= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 4;
+     $CaptionLayout		= isset($Format["CaptionLayout"]) ? $Format["CaptionLayout"] : INDICATOR_CAPTION_EXTENDED;
+     $CaptionPosition		= isset($Format["CaptionPosition"]) ? $Format["CaptionPosition"] : INDICATOR_CAPTION_INSIDE;
+     $CaptionColorFactor	= isset($Format["CaptionColorFactor"]) ? $Format["CaptionColorFactor"] : NULL;
+     $CaptionR			= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
+     $CaptionG			= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
+     $CaptionB			= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
+     $CaptionAlpha		= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
+     $SubCaptionColorFactor	= isset($Format["SubCaptionColorFactor"]) ? $Format["SubCaptionColorFactor"] : NULL;
+     $SubCaptionR		= isset($Format["SubCaptionR"]) ? $Format["SubCaptionR"] : 50;
+     $SubCaptionG		= isset($Format["SubCaptionG"]) ? $Format["SubCaptionG"] : 50;
+     $SubCaptionB		= isset($Format["SubCaptionB"]) ? $Format["SubCaptionB"] : 50;
+     $SubCaptionAlpha		= isset($Format["SubCaptionAlpha"]) ? $Format["SubCaptionAlpha"] : 100;
+     $ValueFontName		= isset($Format["ValueFontName"]) ? $Format["ValueFontName"] : $this->pChartObject->FontName;
+     $ValueFontSize		= isset($Format["ValueFontSize"]) ? $Format["ValueFontSize"] : $this->pChartObject->FontSize;
+     $CaptionFontName		= isset($Format["CaptionFontName"]) ? $Format["CaptionFontName"] : $this->pChartObject->FontName;
+     $CaptionFontSize		= isset($Format["CaptionFontSize"]) ? $Format["CaptionFontSize"] : $this->pChartObject->FontSize;
+     $Unit			= isset($Format["Unit"]) ? $Format["Unit"] : "";
+
+     /* Convert the Values to display to an array if needed */
+     if ( !is_array($Values) ) { $Value = $Values; $Values = ""; $Values[] = $Value; }
+
+     /* No section, let's die */
+     if ( $IndicatorSections == NULL ) { return(0); }
+
+     /* Determine indicator visual configuration */
+     $OverallMin = $IndicatorSections[0]["End"]; $OverallMax = $IndicatorSections[0]["Start"];
+     foreach ($IndicatorSections as $Key => $Settings)
+      {
+       if ( $Settings["End"] > $OverallMax )   { $OverallMax = $Settings["End"]; }
+       if ( $Settings["Start"] < $OverallMin ) { $OverallMin = $Settings["Start"]; }
+      }
+     $RealWidth = $Width - (count($IndicatorSections)-1)*$SectionsMargin;
+     $XScale    = $RealWidth / ($OverallMax-$OverallMin);
+
+     $X1 = $X; $ValuesPos = "";
+     foreach ($IndicatorSections as $Key => $Settings)
+      {
+       $Color      = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]);
+       $Caption    = $Settings["Caption"];
+       $SubCaption = $Settings["Start"]." - ".$Settings["End"];
+
+       $X2 = $X1 + ($Settings["End"] - $Settings["Start"]) * $XScale;
+
+       if ( $Key == 0 && $DrawLeftHead )
+        {
+         $Poly = ""; $Poly[] = $X1-1; $Poly[] = $Y; $Poly[] = $X1-1; $Poly[] = $Y+$Height; $Poly[] = $X1-1-$HeadSize; $Poly[] = $Y+($Height/2);
+         $this->pChartObject->drawPolygon($Poly,$Color);
+         $this->pChartObject->drawLine($X1-2,$Y,$X1-2-$HeadSize,$Y+($Height/2),$Color);
+         $this->pChartObject->drawLine($X1-2,$Y+$Height,$X1-2-$HeadSize,$Y+($Height/2),$Color);
+        }
+
+       /* Determine the position of the breaks */
+       $Break = "";
+       foreach($Values as $iKey => $Value)
+        {
+         if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
+          {
+           $XBreak  = $X1 + ($Value - $Settings["Start"]) * $XScale;
+           $ValuesPos[$Value] = $XBreak;
+           $Break[] = floor($XBreak);
+          }
+        }
+
+       if ( $ValueDisplay == INDICATOR_VALUE_LABEL )
+        {
+         if ( $Break == "" )
+          $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
+         else
+          {
+           sort($Break);
+           $Poly = ""; $Poly[] = $X1; $Poly[] = $Y; $LastPointWritten = FALSE;
+           foreach($Break as $iKey => $Value)
+            {
+             if ( $Value-5 >= $X1 )
+              { $Poly[] = $Value-5; $Poly[] = $Y; }
+             elseif ($X1 - ($Value-5) > 0 )
+              {
+               $Offset = $X1 - ($Value-5);
+               $Poly = ""; $Poly[] = $X1; $Poly[] = $Y + $Offset;
+              }
+
+             $Poly[] = $Value;   $Poly[] = $Y+5;
+
+             if ( $Value+5 <= $X2 )
+              { $Poly[] = $Value+5; $Poly[] = $Y; }
+             elseif (($Value+5) > $X2 )
+              {
+               $Offset = ($Value+5) - $X2;
+               $Poly[] = $X2; $Poly[] = $Y + $Offset;
+               $LastPointWritten = TRUE;
+              }
+
+            }
+           if ( !$LastPointWritten ) { $Poly[] = $X2; $Poly[] = $Y; }
+           $Poly[] = $X2; $Poly[] = $Y+$Height;
+           $Poly[] = $X1; $Poly[] = $Y+$Height;
+
+           $this->pChartObject->drawPolygon($Poly,$Color);
+          }
+        }
+       else
+        $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
+
+       if ( $Key == count($IndicatorSections)-1 && $DrawRightHead )
+        {
+         $Poly = ""; $Poly[] = $X2+1; $Poly[] = $Y; $Poly[] = $X2+1; $Poly[] = $Y+$Height; $Poly[] = $X2+1+$HeadSize; $Poly[] = $Y+($Height/2);
+         $this->pChartObject->drawPolygon($Poly,$Color);
+         $this->pChartObject->drawLine($X2+1,$Y,$X2+1+$HeadSize,$Y+($Height/2),$Color);
+         $this->pChartObject->drawLine($X2+1,$Y+$Height,$X2+1+$HeadSize,$Y+($Height/2),$Color);
+        }
+
+       if ( $CaptionPosition == INDICATOR_CAPTION_INSIDE )
+        {
+         $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
+         $YOffset = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding;
+
+         if ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
+          {
+           $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$SubCaption);
+           $YOffset = $YOffset + ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding*2;
+          }
+
+         $XOffset = $TextPadding;
+        }
+       else
+        { $YOffset = 0; $XOffset = 0; }
+
+       if ( $CaptionColorFactor == NULL )
+        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha); }
+       else
+        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$CaptionColorFactor,"G"=>$Settings["G"]+$CaptionColorFactor,"B"=>$Settings["B"]+$CaptionColorFactor); }
+
+       if ( $SubCaptionColorFactor == NULL )
+        $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$SubCaptionR,"G"=>$SubCaptionG,"B"=>$SubCaptionB,"Alpha"=>$SubCaptionAlpha);
+       else
+        $SubCaptionColor = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$SubCaptionColorFactor,"G"=>$Settings["G"]+$SubCaptionColorFactor,"B"=>$Settings["B"]+$SubCaptionColorFactor);
+
+       $RestoreShadow = $this->pChartObject->Shadow;
+       $this->pChartObject->Shadow = FALSE;
+
+       if ( $CaptionLayout == INDICATOR_CAPTION_DEFAULT )
+        $this->pChartObject->drawText($X1,$Y+$Height+$TextPadding,$Caption,$CaptionColor);
+       elseif ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
+        {
+         $TxtPos        = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
+         $CaptionHeight = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
+
+         $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$TextPadding,$Caption,$CaptionColor);
+         $this->pChartObject->drawText($X1+$XOffset,$Y+$Height-$YOffset+$CaptionHeight+$TextPadding*2,$SubCaption,$SubCaptionColor);
+        }
+
+       $this->pChartObject->Shadow = $RestoreShadow;
+
+       $X1 = $X2 + $SectionsMargin;
+      }
+
+     $RestoreShadow = $this->pChartObject->Shadow;
+     $this->pChartObject->Shadow = FALSE;
+
+     foreach($Values as $Key => $Value)
+      {
+       if ( $Value >= $OverallMin && $Value <= $OverallMax )
+        {
+         foreach ($IndicatorSections as $Key => $Settings)
+          {
+           if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
+            {
+             $X1 = $ValuesPos[$Value]; //$X + $Key*$SectionsMargin + ($Value - $OverallMin) * $XScale;
+
+             if ( $ValueDisplay == INDICATOR_VALUE_BUBBLE )
+              {
+               $TxtPos = $this->pChartObject->getTextBox($X1,$Y,$ValueFontName,$ValueFontSize,0,$Value.$Unit);
+               $Radius = floor(($TxtPos[1]["X"] - $TxtPos[0]["X"] + $TextPadding*4)/2);
+
+               $this->pChartObject->drawFilledCircle($X1,$Y,$Radius+4,array("R"=>$Settings["R"]+20,"G"=>$Settings["G"]+20,"B"=>$Settings["B"]+20));
+               $this->pChartObject->drawFilledCircle($X1,$Y,$Radius,array("R"=>255,"G"=>255,"B"=>255));
+
+               $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontName"=>$ValueFontName,"FontSize"=>$ValueFontSize);
+               $this->pChartObject->drawText($X1-1,$Y-1,$Value.$Unit,$TextSettings);
+              }
+             elseif( $ValueDisplay == INDICATOR_VALUE_LABEL )
+              {
+               $Caption = "";
+               $Caption[] = array("Format"=>array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>100),"Caption"=>$Value.$Unit);
+               $this->pChartObject->drawLabelBox(floor($X1),floor($Y)+2,"Value - ".$Settings["Caption"],$Caption);
+              }
+            }
+           $X1 = $X2 + $SectionsMargin;
+          }
+        }
+      }
+     $this->pChartObject->Shadow = $RestoreShadow;
+    }
+  }
+?>

modules/pChart/pRadar.class.php

@@ -0,0 +1,681 @@
+<?php
+ /*
+     pRadar - class to draw radar charts
+
+     Version     : 2.1.4
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 19/01/2014
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ define("SEGMENT_HEIGHT_AUTO"		, 690001);
+
+ define("RADAR_LAYOUT_STAR"		, 690011);
+ define("RADAR_LAYOUT_CIRCLE"		, 690012);
+
+ define("RADAR_LABELS_ROTATED"		, 690021);
+ define("RADAR_LABELS_HORIZONTAL"	, 690022);
+
+ /* pRadar class definition */
+ class pRadar
+  {
+   var $pChartObject;
+
+   /* Class creator */
+   function pRadar()
+    { }
+
+   /* Draw a radar chart */
+   function drawRadar($Object,$Values,$Format="")
+    {
+     $this->pChartObject = $Object;
+
+     $FixedMax		= isset($Format["FixedMax"]) ? $Format["FixedMax"] : VOID;
+     $AxisR		= isset($Format["AxisR"]) ? $Format["AxisR"] : 60;
+     $AxisG		= isset($Format["AxisG"]) ? $Format["AxisG"] : 60;
+     $AxisB		= isset($Format["AxisB"]) ? $Format["AxisB"] : 60;
+     $AxisAlpha		= isset($Format["AxisAlpha"]) ? $Format["AxisAlpha"] : 50;
+     $AxisRotation      = isset($Format["AxisRotation"]) ? $Format["AxisRotation"] : 0;
+     $DrawTicks		= isset($Format["DrawTicks"]) ? $Format["DrawTicks"] : TRUE;
+     $TicksLength	= isset($Format["TicksLength"]) ? $Format["TicksLength"] : 2;
+     $DrawAxisValues	= isset($Format["DrawAxisValues"]) ? $Format["DrawAxisValues"] : TRUE;
+     $AxisBoxRounded	= isset($Format["AxisBoxRounded"]) ? $Format["AxisBoxRounded"] : TRUE;
+     $AxisFontName	= isset($Format["AxisFontName"]) ? $Format["AxisFontName"] : $this->pChartObject->FontName;
+     $AxisFontSize	= isset($Format["AxisFontSize"]) ? $Format["AxisFontSize"] : $this->pChartObject->FontSize;
+     $WriteValues	= isset($Format["WriteValues"]) ? $Format["WriteValues"] : FALSE;
+     $WriteValuesInBubble = isset($Format["WriteValuesInBubble"]) ? $Format["WriteValuesInBubble"] : TRUE;
+     $ValueFontName	= isset($Format["ValueFontName"]) ? $Format["ValueFontName"] : $this->pChartObject->FontName;
+     $ValueFontSize	= isset($Format["ValueFontSize"]) ? $Format["ValueFontSize"] : $this->pChartObject->FontSize;
+     $ValuePadding	= isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 4;
+     $OuterBubbleRadius	= isset($Format["OuterBubbleRadius"]) ? $Format["OuterBubbleRadius"] : 2;
+     $OuterBubbleR	= isset($Format["OuterBubbleR"]) ? $Format["OuterBubbleR"] : VOID;
+     $OuterBubbleG	= isset($Format["OuterBubbleG"]) ? $Format["OuterBubbleG"] : VOID;
+     $OuterBubbleB	= isset($Format["OuterBubbleB"]) ? $Format["OuterBubbleB"] : VOID;
+     $OuterBubbleAlpha	= isset($Format["OuterBubbleAlpha"]) ? $Format["OuterBubbleAlpha"] : 100;
+     $InnerBubbleR	= isset($Format["InnerBubbleR"]) ? $Format["InnerBubbleR"] : 255;
+     $InnerBubbleG	= isset($Format["InnerBubbleG"]) ? $Format["InnerBubbleG"] : 255;
+     $InnerBubbleB	= isset($Format["InnerBubbleB"]) ? $Format["InnerBubbleB"] : 255;
+     $InnerBubbleAlpha	= isset($Format["InnerBubbleAlpha"]) ? $Format["InnerBubbleAlpha"] : 100;
+     $DrawBackground	= isset($Format["DrawBackground"]) ? $Format["DrawBackground"] : TRUE;
+     $BackgroundR	= isset($Format["BackgroundR"]) ? $Format["BackgroundR"] : 255;
+     $BackgroundG	= isset($Format["BackgroundG"]) ? $Format["BackgroundG"] : 255;
+     $BackgroundB	= isset($Format["BackgroundB"]) ? $Format["BackgroundB"] : 255;
+     $BackgroundAlpha	= isset($Format["BackgroundAlpha"]) ? $Format["BackgroundAlpha"] : 50;
+     $BackgroundGradient= isset($Format["BackgroundGradient"]) ? $Format["BackgroundGradient"] : NULL;
+     $Layout		= isset($Format["Layout"]) ? $Format["Layout"] : RADAR_LAYOUT_STAR;
+     $SegmentHeight	= isset($Format["SegmentHeight"]) ? $Format["SegmentHeight"] : SEGMENT_HEIGHT_AUTO;
+     $Segments		= isset($Format["Segments"]) ? $Format["Segments"] : 4;
+     $WriteLabels	= isset($Format["WriteLabels"]) ? $Format["WriteLabels"] : TRUE;
+     $SkipLabels	= isset($Format["SkipLabels"]) ? $Format["SkipLabels"] : 1;
+     $LabelMiddle	= isset($Format["LabelMiddle"]) ? $Format["LabelMiddle"] : FALSE;
+     $LabelsBackground	= isset($Format["LabelsBackground"]) ? $Format["LabelsBackground"] : TRUE;
+     $LabelsBGR		= isset($Format["LabelsBGR"]) ? $Format["LabelsBGR"] : 255;
+     $LabelsBGG		= isset($Format["LabelsBGR"]) ? $Format["LabelsBGG"] : 255;
+     $LabelsBGB		= isset($Format["LabelsBGR"]) ? $Format["LabelsBGB"] : 255;
+     $LabelsBGAlpha	= isset($Format["LabelsBGAlpha"]) ? $Format["LabelsBGAlpha"] : 50;
+     $LabelPos		= isset($Format["LabelPos"]) ? $Format["LabelPos"] : RADAR_LABELS_ROTATED;
+     $LabelPadding	= isset($Format["LabelPadding"]) ? $Format["LabelPadding"] : 4;
+     $DrawPoints	= isset($Format["DrawPoints"]) ? $Format["DrawPoints"] : TRUE;
+     $PointRadius	= isset($Format["PointRadius"]) ? $Format["PointRadius"] : 4;
+     $PointSurrounding	= isset($Format["PointRadius"]) ? $Format["PointRadius"] : -30;
+     $DrawLines		= isset($Format["DrawLines"]) ? $Format["DrawLines"] : TRUE;
+     $LineLoopStart	= isset($Format["LineLoopStart"]) ? $Format["LineLoopStart"] : TRUE;
+     $DrawPoly		= isset($Format["DrawPoly"]) ? $Format["DrawPoly"] : FALSE;
+     $PolyAlpha		= isset($Format["PolyAlpha"]) ? $Format["PolyAlpha"] : 40;
+     $FontSize		= $Object->FontSize;
+     $X1		= $Object->GraphAreaX1;
+     $Y1		= $Object->GraphAreaY1;
+     $X2		= $Object->GraphAreaX2;
+     $Y2		= $Object->GraphAreaY2;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+     /* Cancel default tick length if ticks not enabled */
+     if ( $DrawTicks == FALSE ) { $TicksLength = 0; }
+
+     /* Data Processing */
+     $Data    = $Values->getData();
+     $Palette = $Values->getPalette();
+
+     /* Catch the number of required axis */
+     $LabelSerie = $Data["Abscissa"];
+     if ( $LabelSerie != "" )
+      { $Points = count($Data["Series"][$LabelSerie]["Data"]); }
+     else
+      {
+       $Points = 0;
+       foreach($Data["Series"] as $SerieName => $DataArray)
+        { if ( count($DataArray["Data"]) > $Points ) { $Points = count($DataArray["Data"]); } }
+      }
+
+     /* Draw the axis */
+     $CenterX = ($X2-$X1)/2 + $X1;
+     $CenterY = ($Y2-$Y1)/2 + $Y1;
+
+     $EdgeHeight = min(($X2-$X1)/2,($Y2-$Y1)/2);
+     if ( $WriteLabels )
+      $EdgeHeight = $EdgeHeight - $FontSize - $LabelPadding - $TicksLength;
+
+     /* Determine the scale if set to automatic */
+     if ( $SegmentHeight == SEGMENT_HEIGHT_AUTO)
+      {
+       if ( $FixedMax != VOID )
+        $Max = $FixedMax;
+       else
+        {
+         $Max = 0;
+         foreach($Data["Series"] as $SerieName => $DataArray)
+          {
+           if ( $SerieName != $LabelSerie )
+            {
+             if ( max($DataArray["Data"]) > $Max ) { $Max = max($DataArray["Data"]); }
+            }
+          }
+        }
+       $MaxSegments = $EdgeHeight/20;
+       $Scale = $Object->computeScale(0,$Max,$MaxSegments,array(1,2,5));
+
+       $Segments      = $Scale["Rows"];
+       $SegmentHeight = $Scale["RowHeight"];
+      }
+
+     if ( $LabelMiddle && $SkipLabels == 1 )
+      { $Axisoffset = (360/$Points)/2; }
+     elseif ( $LabelMiddle && $SkipLabels != 1 )
+      { $Axisoffset = (360/($Points/$SkipLabels))/2; }
+     elseif ( !$LabelMiddle )
+      { $Axisoffset = 0; }
+
+     /* Background processing */
+     if ( $DrawBackground )
+      {
+       $RestoreShadow = $Object->Shadow;
+       $Object->Shadow = FALSE;
+
+       if ($BackgroundGradient == NULL)
+        {
+         if ( $Layout == RADAR_LAYOUT_STAR )
+          {
+           $Color      = array("R"=>$BackgroundR,"G"=>$BackgroundG,"B"=>$BackgroundB,"Alpha"=>$BackgroundAlpha);
+           $PointArray = "";
+           for($i=0;$i<=360;$i=$i+(360/$Points))
+            {
+             $PointArray[] = cos(deg2rad($i+$AxisRotation)) * $EdgeHeight + $CenterX;
+             $PointArray[] = sin(deg2rad($i+$AxisRotation)) * $EdgeHeight + $CenterY;
+            }
+           $Object->drawPolygon($PointArray,$Color);
+          }
+         elseif ( $Layout == RADAR_LAYOUT_CIRCLE )
+          {
+           $Color = array("R"=>$BackgroundR,"G"=>$BackgroundG,"B"=>$BackgroundB,"Alpha"=>$BackgroundAlpha);
+           $Object->drawFilledCircle($CenterX,$CenterY,$EdgeHeight,$Color);
+          }
+        }
+       else
+        {
+         $GradientROffset	= ($BackgroundGradient["EndR"] - $BackgroundGradient["StartR"]) / $Segments;
+         $GradientGOffset	= ($BackgroundGradient["EndG"] - $BackgroundGradient["StartG"]) / $Segments;
+         $GradientBOffset	= ($BackgroundGradient["EndB"] - $BackgroundGradient["StartB"]) / $Segments;
+         $GradientAlphaOffset	= ($BackgroundGradient["EndAlpha"] - $BackgroundGradient["StartAlpha"]) / $Segments;
+
+         if ( $Layout == RADAR_LAYOUT_STAR )
+          {
+           for($j=$Segments;$j>=1;$j--)
+            {
+             $Color      = array("R"=>$BackgroundGradient["StartR"]+$GradientROffset*$j,"G"=>$BackgroundGradient["StartG"]+$GradientGOffset*$j,"B"=>$BackgroundGradient["StartB"]+$GradientBOffset*$j,"Alpha"=>$BackgroundGradient["StartAlpha"]+$GradientAlphaOffset*$j);
+             $PointArray = "";
+
+             for($i=0;$i<=360;$i=$i+(360/$Points))
+              {
+               $PointArray[] = cos(deg2rad($i+$AxisRotation)) * ($EdgeHeight/$Segments)*$j + $CenterX;
+               $PointArray[] = sin(deg2rad($i+$AxisRotation)) * ($EdgeHeight/$Segments)*$j + $CenterY;
+              }
+             $Object->drawPolygon($PointArray,$Color);
+            }
+          }
+         elseif ( $Layout == RADAR_LAYOUT_CIRCLE )
+          {
+           for($j=$Segments;$j>=1;$j--)
+            {
+             $Color = array("R"=>$BackgroundGradient["StartR"]+$GradientROffset*$j,"G"=>$BackgroundGradient["StartG"]+$GradientGOffset*$j,"B"=>$BackgroundGradient["StartB"]+$GradientBOffset*$j,"Alpha"=>$BackgroundGradient["StartAlpha"]+$GradientAlphaOffset*$j);
+             $Object->drawFilledCircle($CenterX,$CenterY,($EdgeHeight/$Segments)*$j,$Color);
+            }
+          }
+        }
+       $Object->Shadow = $RestoreShadow;
+      }
+
+     /* Axis to axis lines */
+     $Color = array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha);
+     $ColorDotted = array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha*.8, "Ticks"=>2);
+     if ( $Layout == RADAR_LAYOUT_STAR )
+      {
+       for($j=1;$j<=$Segments;$j++)
+        {
+         for($i=0;$i<360;$i=$i+(360/$Points))
+          {
+           $EdgeX1 = cos(deg2rad($i+$AxisRotation)) * ($EdgeHeight/$Segments)*$j + $CenterX;
+           $EdgeY1 = sin(deg2rad($i+$AxisRotation)) * ($EdgeHeight/$Segments)*$j + $CenterY;
+           $EdgeX2 = cos(deg2rad($i+$AxisRotation+(360/$Points))) * ($EdgeHeight/$Segments)*$j + $CenterX;
+           $EdgeY2 = sin(deg2rad($i+$AxisRotation+(360/$Points))) * ($EdgeHeight/$Segments)*$j + $CenterY;
+
+           $Object->drawLine($EdgeX1,$EdgeY1,$EdgeX2,$EdgeY2,$Color);
+          }
+        }
+      }
+     elseif ( $Layout == RADAR_LAYOUT_CIRCLE )
+      {
+       for($j=1;$j<=$Segments;$j++)
+        {
+         $Radius = ($EdgeHeight/$Segments)*$j;
+         $Object->drawCircle($CenterX,$CenterY,$Radius,$Radius,$Color);
+        }
+      }
+
+     if ( $DrawAxisValues )
+      {
+       if ( $LabelsBackground )
+        $Options = array("DrawBox"=>TRUE, "Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"BoxR"=>$LabelsBGR,"BoxG"=>$LabelsBGG,"BoxB"=>$LabelsBGB,"BoxAlpha"=>$LabelsBGAlpha);
+       else
+        $Options = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE);
+
+       if ( $AxisBoxRounded ) { $Options["BoxRounded"] = TRUE; }
+
+       $Options["FontName"] = $AxisFontName;
+       $Options["FontSize"] = $AxisFontSize;
+
+       $Angle  = 360 / ($Points*2);
+       for($j=1;$j<=$Segments;$j++)
+        {
+         $Label  = $j * $SegmentHeight;
+
+         if ( $Layout == RADAR_LAYOUT_CIRCLE )
+          {
+           $EdgeX1 = cos(deg2rad($Angle+$AxisRotation)) * ($EdgeHeight/$Segments)*$j + $CenterX;
+           $EdgeY1 = sin(deg2rad($Angle+$AxisRotation)) * ($EdgeHeight/$Segments)*$j + $CenterY;
+          }
+         elseif ( $Layout == RADAR_LAYOUT_STAR )
+          {
+           $EdgeX1 = cos(deg2rad($AxisRotation)) * ($EdgeHeight/$Segments)*$j + $CenterX;
+           $EdgeY1 = sin(deg2rad($AxisRotation)) * ($EdgeHeight/$Segments)*$j + $CenterY;
+           $EdgeX2 = cos(deg2rad((360 / $Points) + $AxisRotation)) * ($EdgeHeight/$Segments)*$j + $CenterX;
+           $EdgeY2 = sin(deg2rad((360 / $Points) + $AxisRotation)) * ($EdgeHeight/$Segments)*$j + $CenterY;
+
+           $EdgeX1 = ($EdgeX2 - $EdgeX1)/2 + $EdgeX1;
+           $EdgeY1 = ($EdgeY2 - $EdgeY1)/2 + $EdgeY1;
+          }
+
+         $Object->drawText($EdgeX1,$EdgeY1,$Label,$Options);
+        }
+      }
+
+     /* Axis lines */
+     $ID = 0;
+     for($i=0;$i<360;$i=$i+(360/$Points))
+      {
+       $EdgeX = cos(deg2rad($i+$AxisRotation)) * ($EdgeHeight+$TicksLength) + $CenterX;
+       $EdgeY = sin(deg2rad($i+$AxisRotation)) * ($EdgeHeight+$TicksLength) + $CenterY;
+
+       if ($ID % $SkipLabels == 0)
+        { $Object->drawLine($CenterX,$CenterY,$EdgeX,$EdgeY,$Color); }
+       else
+        { $Object->drawLine($CenterX,$CenterY,$EdgeX,$EdgeY,$ColorDotted); }
+
+       if ( $WriteLabels )
+        {
+         $LabelX = cos(deg2rad($i+$AxisRotation+$Axisoffset)) * ($EdgeHeight+$LabelPadding+$TicksLength) + $CenterX;
+         $LabelY = sin(deg2rad($i+$AxisRotation+$Axisoffset)) * ($EdgeHeight+$LabelPadding+$TicksLength) + $CenterY;
+
+         if ( $LabelSerie != "" )
+          { $Label = isset($Data["Series"][$LabelSerie]["Data"][$ID]) ? $Data["Series"][$LabelSerie]["Data"][$ID] : ""; }
+         else
+          $Label = $ID;
+
+         if ($ID % $SkipLabels == 0)
+          {
+           if ( $LabelPos == RADAR_LABELS_ROTATED )
+            $Object->drawText($LabelX,$LabelY,$Label,array("Angle"=>(360-($i+$AxisRotation+$Axisoffset))-90,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+           else
+            {
+             if ( (floor($LabelX) == floor($CenterX)) && (floor($LabelY) <  floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
+             if ( (floor($LabelX) >  floor($CenterX)) && (floor($LabelY) <  floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_BOTTOMLEFT)); }
+             if ( (floor($LabelX) >  floor($CenterX)) && (floor($LabelY) == floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_MIDDLELEFT)); }
+             if ( (floor($LabelX) >  floor($CenterX)) && (floor($LabelY) >  floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_TOPLEFT)); }
+             if ( (floor($LabelX) <  floor($CenterX)) && (floor($LabelY) <  floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_BOTTOMRIGHT)); }
+             if ( (floor($LabelX) <  floor($CenterX)) && (floor($LabelY) == floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_MIDDLERIGHT)); }
+             if ( (floor($LabelX) <  floor($CenterX)) && (floor($LabelY) >  floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_TOPRIGHT)); }
+             if ( (floor($LabelX) == floor($CenterX)) && (floor($LabelY) >  floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_TOPMIDDLE)); }
+            }
+          }
+        }
+       $ID++;
+      }
+
+     /* Compute the plots position */
+     $ID = 0; $Plot = "";
+     foreach($Data["Series"] as $SerieName => $DataS)
+      {
+       if ( $SerieName != $LabelSerie )
+        {
+         $Color = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"],"Surrounding"=>$PointSurrounding);
+         foreach($DataS["Data"] as $Key => $Value)
+          {
+           $Angle  = (360/$Points) * $Key;
+           $Length = ($EdgeHeight/($Segments*$SegmentHeight))*$Value;
+
+           $X = cos(deg2rad($Angle+$AxisRotation)) * $Length  + $CenterX;
+           $Y = sin(deg2rad($Angle+$AxisRotation)) * $Length  + $CenterY;
+
+           $Plot[$ID][] = array($X,$Y,$Value);
+
+           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($PointRadius),$this->pChartObject->toHTMLColor($Palette[$ID]["R"],$Palette[$ID]["G"],$Palette[$ID]["B"]),$DataS["Description"],$Data["Series"][$LabelSerie]["Data"][$Key]." = ".$Value); }
+          }
+         $ID++;
+        }
+      }
+
+     /* Draw all that stuff! */
+     foreach($Plot as $ID => $Points)
+      {
+       $Color = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"],"Surrounding"=>$PointSurrounding);
+
+       /* Draw the polygons */
+       if ( $DrawPoly )
+        {
+         if ($PolyAlpha != NULL)
+          $Color = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$PolyAlpha,"Surrounding"=>$PointSurrounding);
+
+         $PointsArray = "";
+         for($i=0; $i<count($Points);$i++) 
+          { $PointsArray[] = $Points[$i][0]; $PointsArray[] = $Points[$i][1]; }
+         $Object->drawPolygon($PointsArray,$Color);
+        }
+
+       $Color = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"],"Surrounding"=>$PointSurrounding);
+
+       /* Bubble and labels settings */
+       $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontName"=>$ValueFontName,"FontSize"=>$ValueFontSize,"R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"]);
+       $InnerColor = array("R"=>$InnerBubbleR,"G"=>$InnerBubbleG,"B"=>$InnerBubbleB,"Alpha"=>$InnerBubbleAlpha);
+       if ( $OuterBubbleR != VOID )
+        $OuterColor = array("R"=>$OuterBubbleR,"G"=>$OuterBubbleG,"B"=>$OuterBubbleB,"Alpha"=>$OuterBubbleAlpha);
+       else
+        $OuterColor = array("R"=>$Palette[$ID]["R"]+20,"G"=>$Palette[$ID]["G"]+20,"B"=>$Palette[$ID]["B"]+20,"Alpha"=>$Palette[$ID]["Alpha"]);
+
+       /* Loop to the starting points if asked */
+       if ( $LineLoopStart && $DrawLines )
+        $Object->drawLine($Points[count($Points)-1][0],$Points[count($Points)-1][1],$Points[0][0],$Points[0][1],$Color);
+
+       /* Draw the lines & points */
+       for($i=0; $i<count($Points);$i++) 
+        {
+         if ( $DrawLines && $i < count($Points)-1)
+          $Object->drawLine($Points[$i][0],$Points[$i][1],$Points[$i+1][0],$Points[$i+1][1],$Color);
+
+         if ( $DrawPoints )
+          $Object->drawFilledCircle($Points[$i][0],$Points[$i][1],$PointRadius,$Color);
+
+         if ( $WriteValuesInBubble && $WriteValues )
+          {
+           $TxtPos = $this->pChartObject->getTextBox($Points[$i][0],$Points[$i][1],$ValueFontName,$ValueFontSize,0,$Points[$i][2]);
+           $Radius = floor(($TxtPos[1]["X"] - $TxtPos[0]["X"] + $ValuePadding*2)/2);
+
+           $this->pChartObject->drawFilledCircle($Points[$i][0],$Points[$i][1],$Radius+$OuterBubbleRadius,$OuterColor);
+           $this->pChartObject->drawFilledCircle($Points[$i][0],$Points[$i][1],$Radius,$InnerColor);
+          }
+
+         if ( $WriteValues )
+          $this->pChartObject->drawText($Points[$i][0]-1,$Points[$i][1]-1,$Points[$i][2],$TextSettings);
+        }
+      }
+    }
+
+
+
+   /* Draw a radar chart */
+   function drawPolar($Object,$Values,$Format="")
+    {
+     $this->pChartObject = $Object;
+
+     $FixedMax		= isset($Format["FixedMax"]) ? $Format["FixedMax"] : VOID;
+     $AxisR		= isset($Format["AxisR"]) ? $Format["AxisR"] : 60;
+     $AxisG		= isset($Format["AxisG"]) ? $Format["AxisG"] : 60;
+     $AxisB		= isset($Format["AxisB"]) ? $Format["AxisB"] : 60;
+     $AxisAlpha		= isset($Format["AxisAlpha"]) ? $Format["AxisAlpha"] : 50;
+     $AxisRotation      = isset($Format["AxisRotation"]) ? $Format["AxisRotation"] : -90;
+     $DrawTicks		= isset($Format["DrawTicks"]) ? $Format["DrawTicks"] : TRUE;
+     $TicksLength	= isset($Format["TicksLength"]) ? $Format["TicksLength"] : 2;
+     $DrawAxisValues	= isset($Format["DrawAxisValues"]) ? $Format["DrawAxisValues"] : TRUE;
+     $AxisBoxRounded	= isset($Format["AxisBoxRounded"]) ? $Format["AxisBoxRounded"] : TRUE;
+     $AxisFontName	= isset($Format["FontName"]) ? $Format["FontName"] : $this->pChartObject->FontName;
+     $AxisFontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->pChartObject->FontSize;
+     $WriteValues	= isset($Format["WriteValues"]) ? $Format["WriteValues"] : FALSE;
+     $WriteValuesInBubble = isset($Format["WriteValuesInBubble"]) ? $Format["WriteValuesInBubble"] : TRUE;
+     $ValueFontName	= isset($Format["ValueFontName"]) ? $Format["ValueFontName"] : $this->pChartObject->FontName;
+     $ValueFontSize	= isset($Format["ValueFontSize"]) ? $Format["ValueFontSize"] : $this->pChartObject->FontSize;
+     $ValuePadding	= isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 4;
+     $OuterBubbleRadius	= isset($Format["OuterBubbleRadius"]) ? $Format["OuterBubbleRadius"] : 2;
+     $OuterBubbleR	= isset($Format["OuterBubbleR"]) ? $Format["OuterBubbleR"] : VOID;
+     $OuterBubbleG	= isset($Format["OuterBubbleG"]) ? $Format["OuterBubbleG"] : VOID;
+     $OuterBubbleB	= isset($Format["OuterBubbleB"]) ? $Format["OuterBubbleB"] : VOID;
+     $OuterBubbleAlpha	= isset($Format["OuterBubbleAlpha"]) ? $Format["OuterBubbleAlpha"] : 100;
+     $InnerBubbleR	= isset($Format["InnerBubbleR"]) ? $Format["InnerBubbleR"] : 255;
+     $InnerBubbleG	= isset($Format["InnerBubbleG"]) ? $Format["InnerBubbleG"] : 255;
+     $InnerBubbleB	= isset($Format["InnerBubbleB"]) ? $Format["InnerBubbleB"] : 255;
+     $InnerBubbleAlpha	= isset($Format["InnerBubbleAlpha"]) ? $Format["InnerBubbleAlpha"] : 100;
+     $DrawBackground	= isset($Format["DrawBackground"]) ? $Format["DrawBackground"] : TRUE;
+     $BackgroundR	= isset($Format["BackgroundR"]) ? $Format["BackgroundR"] : 255;
+     $BackgroundG	= isset($Format["BackgroundG"]) ? $Format["BackgroundG"] : 255;
+     $BackgroundB	= isset($Format["BackgroundB"]) ? $Format["BackgroundB"] : 255;
+     $BackgroundAlpha	= isset($Format["BackgroundAlpha"]) ? $Format["BackgroundAlpha"] : 50;
+     $BackgroundGradient= isset($Format["BackgroundGradient"]) ? $Format["BackgroundGradient"] : NULL;
+     $AxisSteps		= isset($Format["AxisSteps"]) ? $Format["AxisSteps"] : 20;
+     $SegmentHeight	= isset($Format["SegmentHeight"]) ? $Format["SegmentHeight"] : SEGMENT_HEIGHT_AUTO;
+     $Segments		= isset($Format["Segments"]) ? $Format["Segments"] : 4;
+     $WriteLabels	= isset($Format["WriteLabels"]) ? $Format["WriteLabels"] : TRUE;
+     $LabelsBackground	= isset($Format["LabelsBackground"]) ? $Format["LabelsBackground"] : TRUE;
+     $LabelsBGR		= isset($Format["LabelsBGR"]) ? $Format["LabelsBGR"] : 255;
+     $LabelsBGG		= isset($Format["LabelsBGR"]) ? $Format["LabelsBGG"] : 255;
+     $LabelsBGB		= isset($Format["LabelsBGR"]) ? $Format["LabelsBGB"] : 255;
+     $LabelsBGAlpha	= isset($Format["LabelsBGAlpha"]) ? $Format["LabelsBGAlpha"] : 50;
+     $LabelPos		= isset($Format["LabelPos"]) ? $Format["LabelPos"] : RADAR_LABELS_ROTATED;
+     $LabelPadding	= isset($Format["LabelPadding"]) ? $Format["LabelPadding"] : 4;
+     $DrawPoints	= isset($Format["DrawPoints"]) ? $Format["DrawPoints"] : TRUE;
+     $PointRadius	= isset($Format["PointRadius"]) ? $Format["PointRadius"] : 4;
+     $PointSurrounding	= isset($Format["PointRadius"]) ? $Format["PointRadius"] : -30;
+     $DrawLines		= isset($Format["DrawLines"]) ? $Format["DrawLines"] : TRUE;
+     $LineLoopStart	= isset($Format["LineLoopStart"]) ? $Format["LineLoopStart"] : FALSE;
+     $DrawPoly		= isset($Format["DrawPoly"]) ? $Format["DrawPoly"] : FALSE;
+     $PolyAlpha		= isset($Format["PolyAlpha"]) ? $Format["PolyAlpha"] : NULL;
+     $FontSize		= $Object->FontSize;
+     $X1		= $Object->GraphAreaX1;
+     $Y1		= $Object->GraphAreaY1;
+     $X2		= $Object->GraphAreaX2;
+     $Y2		= $Object->GraphAreaY2;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+     if ( $AxisBoxRounded ) { $DrawAxisValues = TRUE; }
+
+     /* Cancel default tick length if ticks not enabled */
+     if ( $DrawTicks == FALSE ) { $TicksLength = 0; }
+
+     /* Data Processing */
+     $Data    = $Values->getData();
+     $Palette = $Values->getPalette();
+
+     /* Catch the number of required axis */
+     $LabelSerie = $Data["Abscissa"];
+     if ( $LabelSerie != "" )
+      { $Points = count($Data["Series"][$LabelSerie]["Data"]); }
+     else
+      {
+       $Points = 0;
+       foreach($Data["Series"] as $SerieName => $DataArray)
+        { if ( count($DataArray["Data"]) > $Points ) { $Points = count($DataArray["Data"]); } }
+      }
+
+     /* Draw the axis */
+     $CenterX = ($X2-$X1)/2 + $X1;
+     $CenterY = ($Y2-$Y1)/2 + $Y1;
+
+     $EdgeHeight = min(($X2-$X1)/2,($Y2-$Y1)/2);
+     if ( $WriteLabels )
+      $EdgeHeight = $EdgeHeight - $FontSize - $LabelPadding - $TicksLength;
+
+     /* Determine the scale if set to automatic */
+     if ( $SegmentHeight == SEGMENT_HEIGHT_AUTO)
+      {
+       if ( $FixedMax != VOID )
+        $Max = $FixedMax;
+       else
+        {
+         $Max = 0;
+         foreach($Data["Series"] as $SerieName => $DataArray)
+          {
+           if ( $SerieName != $LabelSerie )
+            {
+             if ( max($DataArray["Data"]) > $Max ) { $Max = max($DataArray["Data"]); }
+            }
+          }
+         }
+       $MaxSegments = $EdgeHeight/20;
+       $Scale = $Object->computeScale(0,$Max,$MaxSegments,array(1,2,5));
+
+       $Segments      = $Scale["Rows"];
+       $SegmentHeight = $Scale["RowHeight"];
+      }
+
+
+     /* Background processing */
+     if ( $DrawBackground )
+      {
+       $RestoreShadow = $Object->Shadow;
+       $Object->Shadow = FALSE;
+
+       if ($BackgroundGradient == NULL)
+        {
+         $Color = array("R"=>$BackgroundR,"G"=>$BackgroundG,"B"=>$BackgroundB,"Alpha"=>$BackgroundAlpha);
+         $Object->drawFilledCircle($CenterX,$CenterY,$EdgeHeight,$Color);
+        }
+       else
+        {
+         $GradientROffset	= ($BackgroundGradient["EndR"] - $BackgroundGradient["StartR"]) / $Segments;
+         $GradientGOffset	= ($BackgroundGradient["EndG"] - $BackgroundGradient["StartG"]) / $Segments;
+         $GradientBOffset	= ($BackgroundGradient["EndB"] - $BackgroundGradient["StartB"]) / $Segments;
+         $GradientAlphaOffset	= ($BackgroundGradient["EndAlpha"] - $BackgroundGradient["StartAlpha"]) / $Segments;
+
+         for($j=$Segments;$j>=1;$j--)
+          {
+           $Color      = array("R"=>$BackgroundGradient["StartR"]+$GradientROffset*$j,"G"=>$BackgroundGradient["StartG"]+$GradientGOffset*$j,"B"=>$BackgroundGradient["StartB"]+$GradientBOffset*$j,"Alpha"=>$BackgroundGradient["StartAlpha"]+$GradientAlphaOffset*$j);
+           $Object->drawFilledCircle($CenterX,$CenterY,($EdgeHeight/$Segments)*$j,$Color);
+          }
+        }
+       $Object->Shadow = $RestoreShadow;
+      }
+
+     /* Axis to axis lines */
+     $Color = array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha);
+     for($j=1;$j<=$Segments;$j++)
+      {
+       $Radius = ($EdgeHeight/$Segments)*$j;
+       $Object->drawCircle($CenterX,$CenterY,$Radius,$Radius,$Color);
+      }
+
+     if ( $DrawAxisValues )
+      {
+       if ( $LabelsBackground )
+        $Options = array("DrawBox"=>TRUE, "Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"BoxR"=>$LabelsBGR,"BoxG"=>$LabelsBGG,"BoxB"=>$LabelsBGB,"BoxAlpha"=>$LabelsBGAlpha);
+       else
+        $Options = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE);
+
+       if ( $AxisBoxRounded ) { $Options["BoxRounded"] = TRUE; }
+
+       $Options["FontName"] = $AxisFontName;
+       $Options["FontSize"] = $AxisFontSize;
+
+       $Angle  = 360 / ($Points*2);
+       for($j=1;$j<=$Segments;$j++)
+        {
+         $EdgeX1 = cos(deg2rad($Angle+$AxisRotation)) * ($EdgeHeight/$Segments)*$j + $CenterX;
+         $EdgeY1 = sin(deg2rad($Angle+$AxisRotation)) * ($EdgeHeight/$Segments)*$j + $CenterY;
+         $Label  = $j*$SegmentHeight;
+
+         $Object->drawText($EdgeX1,$EdgeY1,$Label,$Options);
+        }
+      }
+
+     /* Axis lines */
+     $ID = 0;
+     for($i=0;$i<=359;$i=$i+$AxisSteps)
+      {
+       $EdgeX = cos(deg2rad($i+$AxisRotation)) * ($EdgeHeight+$TicksLength) + $CenterX;
+       $EdgeY = sin(deg2rad($i+$AxisRotation)) * ($EdgeHeight+$TicksLength) + $CenterY;
+
+       $Object->drawLine($CenterX,$CenterY,$EdgeX,$EdgeY,$Color);
+
+       if ( $WriteLabels )
+        {
+         $LabelX = cos(deg2rad($i+$AxisRotation)) * ($EdgeHeight+$LabelPadding+$TicksLength) + $CenterX;
+         $LabelY = sin(deg2rad($i+$AxisRotation)) * ($EdgeHeight+$LabelPadding+$TicksLength) + $CenterY;
+         $Label = $i."°";
+
+         if ( $LabelPos == RADAR_LABELS_ROTATED )
+          $Object->drawText($LabelX,$LabelY,$Label,array("Angle"=>(360-$i),"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+         else
+          {
+           if ( (floor($LabelX) == floor($CenterX)) && (floor($LabelY) <  floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
+           if ( (floor($LabelX) >  floor($CenterX)) && (floor($LabelY) <  floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_BOTTOMLEFT)); }
+           if ( (floor($LabelX) >  floor($CenterX)) && (floor($LabelY) == floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_MIDDLELEFT)); }
+           if ( (floor($LabelX) >  floor($CenterX)) && (floor($LabelY) >  floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_TOPLEFT)); }
+           if ( (floor($LabelX) <  floor($CenterX)) && (floor($LabelY) <  floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_BOTTOMRIGHT)); }
+           if ( (floor($LabelX) <  floor($CenterX)) && (floor($LabelY) == floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_MIDDLERIGHT)); }
+           if ( (floor($LabelX) <  floor($CenterX)) && (floor($LabelY) >  floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_TOPRIGHT)); }
+           if ( (floor($LabelX) == floor($CenterX)) && (floor($LabelY) >  floor($CenterY)) )	{ $Object->drawText($LabelX,$LabelY,$Label,array("Align"=>TEXT_ALIGN_TOPMIDDLE)); }
+          }
+        }
+       $ID++;
+      }
+
+     /* Compute the plots position */
+     $ID = 0; $Plot = "";
+     foreach($Data["Series"] as $SerieName => $DataSet)
+      {
+       if ( $SerieName != $LabelSerie )
+        {
+         $Color = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"],"Surrounding"=>$PointSurrounding);
+         foreach($DataSet["Data"] as $Key => $Value)
+          {
+           $Angle  = $Data["Series"][$LabelSerie]["Data"][$Key];
+           $Length = ($EdgeHeight/($Segments*$SegmentHeight))*$Value;
+
+           $X = cos(deg2rad($Angle+$AxisRotation)) * $Length  + $CenterX;
+           $Y = sin(deg2rad($Angle+$AxisRotation)) * $Length  + $CenterY;
+
+           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($PointRadius),$this->pChartObject->toHTMLColor($Palette[$ID]["R"],$Palette[$ID]["G"],$Palette[$ID]["B"]),$DataSet["Description"],$Data["Series"][$LabelSerie]["Data"][$Key]."&deg = ".$Value); }
+
+           $Plot[$ID][] = array($X,$Y,$Value);
+          }
+         $ID++;
+        }
+      }
+
+     /* Draw all that stuff! */
+     foreach($Plot as $ID => $Points)
+      {
+       $Color = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"],"Surrounding"=>$PointSurrounding);
+
+       /* Draw the polygons */
+       if ( $DrawPoly )
+        {
+         if ($PolyAlpha != NULL)
+          $Color = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$PolyAlpha,"Surrounding"=>$PointSurrounding);
+
+         $PointsArray = "";
+         for($i=0; $i<count($Points);$i++) 
+          { $PointsArray[] = $Points[$i][0]; $PointsArray[] = $Points[$i][1]; }
+
+         $Object->drawPolygon($PointsArray,$Color);
+        }
+
+       $Color = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"],"Surrounding"=>$PointSurrounding);
+
+       /* Bubble and labels settings */
+       $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontName"=>$ValueFontName,"FontSize"=>$ValueFontSize,"R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"]);
+       $InnerColor = array("R"=>$InnerBubbleR,"G"=>$InnerBubbleG,"B"=>$InnerBubbleB,"Alpha"=>$InnerBubbleAlpha);
+       if ( $OuterBubbleR != VOID )
+        $OuterColor = array("R"=>$OuterBubbleR,"G"=>$OuterBubbleG,"B"=>$OuterBubbleB,"Alpha"=>$OuterBubbleAlpha);
+       else
+        $OuterColor = array("R"=>$Palette[$ID]["R"]+20,"G"=>$Palette[$ID]["G"]+20,"B"=>$Palette[$ID]["B"]+20,"Alpha"=>$Palette[$ID]["Alpha"]);
+
+       /* Loop to the starting points if asked */
+       if ( $LineLoopStart && $DrawLines )
+        $Object->drawLine($Points[count($Points)-1][0],$Points[count($Points)-1][1],$Points[0][0],$Points[0][1],$Color);
+       
+       /* Draw the lines & points */
+       for($i=0; $i<count($Points);$i++) 
+        {
+         if ( $DrawLines && $i < count($Points)-1)
+          $Object->drawLine($Points[$i][0],$Points[$i][1],$Points[$i+1][0],$Points[$i+1][1],$Color);
+
+         if ( $DrawPoints )
+          $Object->drawFilledCircle($Points[$i][0],$Points[$i][1],$PointRadius,$Color);
+
+         if ( $WriteValuesInBubble && $WriteValues )
+          {
+           $TxtPos = $this->pChartObject->getTextBox($Points[$i][0],$Points[$i][1],$ValueFontName,$ValueFontSize,0,$Points[$i][2]);
+           $Radius = floor(($TxtPos[1]["X"] - $TxtPos[0]["X"] + $ValuePadding*2)/2);
+
+           $this->pChartObject->drawFilledCircle($Points[$i][0],$Points[$i][1],$Radius+$OuterBubbleRadius,$OuterColor);
+           $this->pChartObject->drawFilledCircle($Points[$i][0],$Points[$i][1],$Radius,$InnerColor);
+          }
+
+         if ( $WriteValues )
+          $this->pChartObject->drawText($Points[$i][0]-1,$Points[$i][1]-1,$Points[$i][2],$TextSettings);
+        }
+      }
+    }
+  }
+?>

modules/pChart/pSplit.class.php

@@ -0,0 +1,131 @@
+<?php
+ /*
+     pSplit - class to draw spline splitted charts
+
+     Version     : 2.1.4
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 19/01/2014
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ define("TEXT_POS_TOP"		, 690001);
+ define("TEXT_POS_RIGHT"	, 690002);
+
+ /* pSplit class definition */
+ class pSplit
+  {
+   var $pChartObject;
+
+   /* Class creator */
+   function pSplit()
+    { }
+
+   /* Create the encoded string */
+   function drawSplitPath($Object,$Values,$Format="")
+    {
+     $this->pChartObject = $Object;
+
+     $Spacing		= isset($Format["Spacing"]) ? $Format["Spacing"] : 20;
+     $TextPadding	= isset($Format["TextPadding"]) ? $Format["TextPadding"] : 2;
+     $TextPos		= isset($Format["TextPos"]) ? $Format["TextPos"] : TEXT_POS_TOP;
+     $Surrounding       = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $Force		= isset($Format["Force"]) ? $Format["Force"] : 70;
+     $Segments		= isset($Format["Segments"]) ? $Format["Segments"] : 15;
+     $FontSize		= $Object->FontSize;
+     $X1		= $Object->GraphAreaX1;
+     $Y1		= $Object->GraphAreaY1;
+     $X2		= $Object->GraphAreaX2;
+     $Y2		= $Object->GraphAreaY2;
+
+     /* Data Processing */
+     $Data    = $Values->getData();
+     $Palette = $Values->getPalette();
+
+     $LabelSerie = $Data["Abscissa"];
+     $DataSerie  = "";
+
+     foreach($Data["Series"] as $SerieName => $Value)
+      { if ( $SerieName != $LabelSerie && $DataSerie == "" ) { $DataSerie = $SerieName; } }
+
+     $DataSerieSum   = array_sum($Data["Series"][$DataSerie]["Data"]);
+     $DataSerieCount = count($Data["Series"][$DataSerie]["Data"]);
+
+     /* Scale Processing */
+     if ( $TextPos == TEXT_POS_RIGHT )
+      $YScale     = (($Y2-$Y1) - (($DataSerieCount+1)*$Spacing)) / $DataSerieSum;
+     else
+      $YScale     = (($Y2-$Y1) - ($DataSerieCount*$Spacing)) / $DataSerieSum;
+     $LeftHeight = $DataSerieSum * $YScale;
+
+     /* Re-compute graph width depending of the text mode choosen */
+     if ( $TextPos == TEXT_POS_RIGHT )
+      {
+       $MaxWidth = 0;
+       foreach($Data["Series"][$LabelSerie]["Data"] as $Key => $Label)
+        {
+         $Boundardies = $Object->getTextBox(0,0,$Object->FontName,$Object->FontSize,0,$Label);
+         if ( $Boundardies[1]["X"] > $MaxWidth ) { $MaxWidth = $Boundardies[1]["X"] + $TextPadding*2; }
+        }
+       $X2 = $X2 - $MaxWidth;
+      }
+
+     /* Drawing */
+     $LeftY    = ((($Y2-$Y1) / 2) + $Y1) - ($LeftHeight/2);
+     $RightY   = $Y1;
+     $VectorX  = (($X2-$X1) / 2);
+
+     foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+      {
+       if ( isset($Data["Series"][$LabelSerie]["Data"][$Key]) )
+        $Label = $Data["Series"][$LabelSerie]["Data"][$Key];
+       else
+        $Label = "-";
+
+       $LeftY1 = $LeftY;
+       $LeftY2 = $LeftY + $Value * $YScale;
+
+       $RightY1 = $RightY + $Spacing;
+       $RightY2 = $RightY + $Spacing + $Value * $YScale;;
+
+       $Settings = array("R"=>$Palette[$Key]["R"],"G"=>$Palette[$Key]["G"],"B"=>$Palette[$Key]["B"],"Alpha"=>$Palette[$Key]["Alpha"],"NoDraw"=>TRUE,"Segments"=>$Segments,"Surrounding"=>$Surrounding);
+
+       $PolyGon = "";
+
+       $Angle    = $Object->getAngle($X2,$RightY1,$X1,$LeftY1);
+       $VectorX1 = cos(deg2rad($Angle+90)) * $Force + ($X2-$X1)/2 + $X1;
+       $VectorY1 = sin(deg2rad($Angle+90)) * $Force + ($RightY1-$LeftY1)/2 + $LeftY1;
+       $VectorX2 = cos(deg2rad($Angle-90)) * $Force + ($X2-$X1)/2 + $X1;
+       $VectorY2 = sin(deg2rad($Angle-90)) * $Force + ($RightY1-$LeftY1)/2 + $LeftY1;
+
+       $Points = $Object->drawBezier($X1,$LeftY1,$X2,$RightY1,$VectorX1,$VectorY1,$VectorX2,$VectorY2,$Settings);
+       foreach($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
+
+
+       $Angle    = $Object->getAngle($X2,$RightY2,$X1,$LeftY2);
+       $VectorX1 = cos(deg2rad($Angle+90)) * $Force + ($X2-$X1)/2 +$X1;
+       $VectorY1 = sin(deg2rad($Angle+90)) * $Force + ($RightY2-$LeftY2)/2 + $LeftY2;
+       $VectorX2 = cos(deg2rad($Angle-90)) * $Force + ($X2-$X1)/2 +$X1;
+       $VectorY2 = sin(deg2rad($Angle-90)) * $Force + ($RightY2-$LeftY2)/2 + $LeftY2;
+
+       $Points = $Object->drawBezier($X1,$LeftY2,$X2,$RightY2,$VectorX1,$VectorY1,$VectorX2,$VectorY2,$Settings);
+       $Points = array_reverse($Points);
+       foreach($Points as $Key => $Pos) { $PolyGon[] = $Pos["X"]; $PolyGon[] = $Pos["Y"]; }
+
+       $Object->drawPolygon($PolyGon,$Settings);
+
+       if ( $TextPos == TEXT_POS_RIGHT )
+        $Object->drawText($X2+$TextPadding,($RightY2-$RightY1)/2+$RightY1,$Label,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
+       else
+        $Object->drawText($X2,$RightY1-$TextPadding,$Label,array("Align"=>TEXT_ALIGN_BOTTOMRIGHT));
+
+       $LeftY  = $LeftY2;
+       $RightY = $RightY2;
+      }
+    }
+  }
+?>

modules/pChart/pSpring.class.php

@@ -0,0 +1,868 @@
+<?php
+ /*
+     pSpring - class to draw spring graphs
+
+     Version     : 2.1.4
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 19/01/2014
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ define("NODE_TYPE_FREE"	, 690001);
+ define("NODE_TYPE_CENTRAL"	, 690002);
+
+ define("NODE_SHAPE_CIRCLE"	, 690011);
+ define("NODE_SHAPE_TRIANGLE"	, 690012);
+ define("NODE_SHAPE_SQUARE"	, 690013);
+
+ define("ALGORITHM_RANDOM"	, 690021);
+ define("ALGORITHM_WEIGHTED"	, 690022);
+ define("ALGORITHM_CIRCULAR"	, 690023);
+ define("ALGORITHM_CENTRAL"	, 690024);
+
+ define("LABEL_CLASSIC"		, 690031);
+ define("LABEL_LIGHT"		, 690032);
+
+ /* pSpring class definition */
+ class pSpring
+  {
+   var $History;
+   var $pChartObject;
+   var $Data;
+   var $Links;
+   var $X1;
+   var $Y1;
+   var $X2;
+   var $Y2;
+   var $AutoComputeFreeZone;
+   var $Labels;
+
+   /* Class creator */
+   function pSpring()
+    {
+     /* Initialise data arrays */
+     $this->Data = "";
+     $this->Links = "";
+
+     /* Set nodes defaults */
+     $this->Default["R"]		= 255;
+     $this->Default["G"]		= 255;
+     $this->Default["B"]		= 255;
+     $this->Default["Alpha"]		= 100;
+     $this->Default["BorderR"]		= 0;
+     $this->Default["BorderG"]		= 0;
+     $this->Default["BorderB"]		= 0;
+     $this->Default["BorderAlpha"]	= 100;
+     $this->Default["Surrounding"]	= NULL;
+     $this->Default["BackgroundR"]	= 255;
+     $this->Default["BackgroundG"]	= 255;
+     $this->Default["BackgroundB"]	= 255;
+     $this->Default["BackgroundAlpha"]	= 0;
+     $this->Default["Force"]		= 1;
+     $this->Default["NodeType"]		= NODE_TYPE_FREE;
+     $this->Default["Size"]		= 5;
+     $this->Default["Shape"]		= NODE_SHAPE_CIRCLE;
+     $this->Default["FreeZone"]		= 40;
+     $this->Default["LinkR"]		= 0;
+     $this->Default["LinkG"]		= 0;
+     $this->Default["LinkB"]		= 0;
+     $this->Default["LinkAlpha"]	= 0;
+
+     $this->Labels["Type"]		= LABEL_CLASSIC;
+     $this->Labels["R"]			= 0;
+     $this->Labels["G"]			= 0;
+     $this->Labels["B"]			= 0;
+     $this->Labels["Alpha"]		= 100;
+
+     $this->AutoComputeFreeZone         = FALSE;
+    }
+
+   /* Set default links options */
+   function setLinkDefaults($Settings="")
+    {
+     if ( isset($Settings["R"]) )     { $this->Default["LinkR"] = $Settings["R"]; }
+     if ( isset($Settings["G"]) )     { $this->Default["LinkG"] = $Settings["G"]; }
+     if ( isset($Settings["B"]) )     { $this->Default["LinkB"] = $Settings["B"]; }
+     if ( isset($Settings["Alpha"]) ) { $this->Default["LinkAlpha"] = $Settings["Alpha"]; }
+    }
+
+   /* Set default links options */
+   function setLabelsSettings($Settings="")
+    {
+     if ( isset($Settings["Type"]) )  { $this->Labels["Type"] = $Settings["Type"]; }
+     if ( isset($Settings["R"]) )     { $this->Labels["R"] = $Settings["R"]; }
+     if ( isset($Settings["G"]) )     { $this->Labels["G"] = $Settings["G"]; }
+     if ( isset($Settings["B"]) )     { $this->Labels["B"] = $Settings["B"]; }
+     if ( isset($Settings["Alpha"]) ) { $this->Labels["Alpha"] = $Settings["Alpha"]; }
+    }
+
+   /* Auto compute the FreeZone size based on the number of connections */
+   function autoFreeZone()
+    {
+     /* Check connections reciprocity */
+     foreach($this->Data as $Key => $Settings)
+      {
+       if ( isset($Settings["Connections"]) )
+        { $this->Data[$Key]["FreeZone"] = count($Settings["Connections"])*10 + 20; }
+       else
+        { $this->Data[$Key]["FreeZone"] = 20; }
+      }
+
+    }
+
+   /* Set link properties */
+   function linkProperties($FromNode,$ToNode,$Settings)
+    {
+     if ( !isset($this->Data[$FromNode]) ) { return(0); }
+     if ( !isset($this->Data[$ToNode]) )   { return(0); }
+
+     $R			= isset($Settings["R"]) ? $Settings["R"] : 0;
+     $G			= isset($Settings["G"]) ? $Settings["G"] : 0;
+     $B			= isset($Settings["B"]) ? $Settings["B"] : 0;
+     $Alpha		= isset($Settings["Alpha"]) ? $Settings["Alpha"] : 100;
+     $Name		= isset($Settings["Name"]) ? $Settings["Name"] : NULL;
+     $Ticks		= isset($Settings["Ticks"]) ? $Settings["Ticks"] : NULL;
+
+     $this->Links[$FromNode][$ToNode]["R"] = $R;         $this->Links[$ToNode][$FromNode]["R"] = $R;
+     $this->Links[$FromNode][$ToNode]["G"] = $G;         $this->Links[$ToNode][$FromNode]["G"] = $G;
+     $this->Links[$FromNode][$ToNode]["B"] = $B;         $this->Links[$ToNode][$FromNode]["B"] = $B;
+     $this->Links[$FromNode][$ToNode]["Alpha"] = $Alpha; $this->Links[$ToNode][$FromNode]["Alpha"] = $Alpha;
+     $this->Links[$FromNode][$ToNode]["Name"] = $Name;   $this->Links[$ToNode][$FromNode]["Name"] = $Name;
+     $this->Links[$FromNode][$ToNode]["Ticks"] = $Ticks; $this->Links[$ToNode][$FromNode]["Ticks"] = $Ticks;
+    }
+
+   function setNodeDefaults($Settings="")
+    {
+     if ( isset($Settings["R"]) ) { $this->Default["R"]					= $Settings["R"]; }
+     if ( isset($Settings["G"]) ) { $this->Default["G"]					= $Settings["G"]; }
+     if ( isset($Settings["B"]) ) { $this->Default["B"]					= $Settings["B"]; }
+     if ( isset($Settings["Alpha"]) ) { $this->Default["Alpha"]				= $Settings["Alpha"]; }
+     if ( isset($Settings["BorderR"]) ) { $this->Default["BorderR"]			= $Settings["BorderR"]; }
+     if ( isset($Settings["BorderG"]) ) { $this->Default["BorderG"]			= $Settings["BorderG"]; }
+     if ( isset($Settings["BorderB"]) ) { $this->Default["BorderB"]			= $Settings["BorderB"]; }
+     if ( isset($Settings["BorderAlpha"]) ) { $this->Default["BorderAlpha"]		= $Settings["BorderAlpha"]; }
+     if ( isset($Settings["Surrounding"]) ) { $this->Default["Surrounding"]		= $Settings["Surrounding"]; }
+     if ( isset($Settings["BackgroundR"]) ) { $this->Default["BackgroundR"]		= $Settings["BackgroundR"]; }
+     if ( isset($Settings["BackgroundG"]) ) { $this->Default["BackgroundG"]		= $Settings["BackgroundG"]; }
+     if ( isset($Settings["BackgroundB"]) ) { $this->Default["BackgroundB"]		= $Settings["BackgroundB"]; }
+     if ( isset($Settings["BackgroundAlpha"]) ) { $this->Default["BackgroundAlpha"]	= $Settings["BackgroundAlpha"]; }
+     if ( isset($Settings["NodeType"]) ) { $this->Default["NodeType"]			= $Settings["NodeType"]; }
+     if ( isset($Settings["Size"]) ) { $this->Default["Size"]				= $Settings["Size"]; }
+     if ( isset($Settings["Shape"]) ) { $this->Default["Shape"]				= $Settings["Shape"]; }
+     if ( isset($Settings["FreeZone"]) ) { $this->Default["FreeZone"]			= $Settings["FreeZone"]; }
+    }
+
+   /* Add a node */
+   function addNode($NodeID,$Settings="")
+    {
+     /* if the node already exists, ignore */
+     if (isset($this->Data[$NodeID])) { return(0); }
+
+     $Name		= isset($Settings["Name"]) ? $Settings["Name"] : "Node ".$NodeID;
+     $Connections	= isset($Settings["Connections"]) ? $Settings["Connections"] : NULL;
+
+     $R			= isset($Settings["R"]) ? $Settings["R"] : $this->Default["R"];
+     $G			= isset($Settings["G"]) ? $Settings["G"] : $this->Default["G"];
+     $B			= isset($Settings["B"]) ? $Settings["B"] : $this->Default["B"];
+     $Alpha		= isset($Settings["Alpha"]) ? $Settings["Alpha"] : $this->Default["Alpha"];
+     $BorderR		= isset($Settings["BorderR"]) ? $Settings["BorderR"] : $this->Default["BorderR"];
+     $BorderG		= isset($Settings["BorderG"]) ? $Settings["BorderG"] : $this->Default["BorderG"];
+     $BorderB		= isset($Settings["BorderB"]) ? $Settings["BorderB"] : $this->Default["BorderB"];
+     $BorderAlpha	= isset($Settings["BorderAlpha"]) ? $Settings["BorderAlpha"] : $this->Default["BorderAlpha"];
+     $Surrounding	= isset($Settings["Surrounding"]) ? $Settings["Surrounding"] : $this->Default["Surrounding"];
+     $BackgroundR	= isset($Settings["BackgroundR"]) ? $Settings["BackgroundR"] : $this->Default["BackgroundR"];
+     $BackgroundG	= isset($Settings["BackgroundG"]) ? $Settings["BackgroundG"] : $this->Default["BackgroundG"];
+     $BackgroundB	= isset($Settings["BackgroundB"]) ? $Settings["BackgroundB"] : $this->Default["BackgroundB"];
+     $BackgroundAlpha	= isset($Settings["BackgroundAlpha"]) ? $Settings["BackgroundAlpha"] : $this->Default["BackgroundAlpha"];
+     $Force		= isset($Settings["Force"]) ? $Settings["Force"] :  $this->Default["Force"];
+     $NodeType		= isset($Settings["NodeType"]) ? $Settings["NodeType"] : $this->Default["NodeType"];
+     $Size		= isset($Settings["Size"]) ? $Settings["Size"] : $this->Default["Size"];
+     $Shape		= isset($Settings["Shape"]) ? $Settings["Shape"] : $this->Default["Shape"];
+     $FreeZone		= isset($Settings["FreeZone"]) ? $Settings["FreeZone"] : $this->Default["FreeZone"];
+
+     if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+
+     $this->Data[$NodeID]["R"] = $R; $this->Data[$NodeID]["G"] = $G; $this->Data[$NodeID]["B"] = $B; $this->Data[$NodeID]["Alpha"] = $Alpha;
+     $this->Data[$NodeID]["BorderR"] = $BorderR; $this->Data[$NodeID]["BorderG"] = $BorderG; $this->Data[$NodeID]["BorderB"] = $BorderB; $this->Data[$NodeID]["BorderAlpha"] = $BorderAlpha;
+     $this->Data[$NodeID]["BackgroundR"]	= $BackgroundR; $this->Data[$NodeID]["BackgroundG"] = $BackgroundG; $this->Data[$NodeID]["BackgroundB"] = $BackgroundB; $this->Data[$NodeID]["BackgroundAlpha"] = $BackgroundAlpha;
+     $this->Data[$NodeID]["Name"]		= $Name;
+     $this->Data[$NodeID]["Force"]		= $Force;
+     $this->Data[$NodeID]["Type"]		= $NodeType;
+     $this->Data[$NodeID]["Size"]		= $Size;
+     $this->Data[$NodeID]["Shape"]		= $Shape;
+     $this->Data[$NodeID]["FreeZone"]		= $FreeZone;
+     if ( $Connections != NULL )
+      {
+       if ( is_array($Connections ) )
+        {
+         foreach($Connections as $Key => $Value)
+          $this->Data[$NodeID]["Connections"][] = $Value;
+        }
+       else
+        $this->Data[$NodeID]["Connections"][] = $Connections;
+      }
+    }
+
+   /* Set color attribute for a list of nodes */
+   function setNodesColor($Nodes,$Settings="")
+    {
+     if ( is_array($Nodes) )
+      {
+       foreach ($Nodes as $Key => $NodeID)
+        {
+         if (isset($this->Data[$NodeID]) )
+          {
+           if ( isset($Settings["R"]) ) { $this->Data[$NodeID]["R"] = $Settings["R"]; }
+           if ( isset($Settings["G"]) ) { $this->Data[$NodeID]["G"] = $Settings["G"]; }
+           if ( isset($Settings["B"]) ) { $this->Data[$NodeID]["B"] = $Settings["B"]; }
+           if ( isset($Settings["Alpha"]) ) { $this->Data[$NodeID]["Alpha"] = $Settings["Alpha"]; }
+           if ( isset($Settings["BorderR"]) ) { $this->Data[$NodeID]["BorderR"] = $Settings["BorderR"]; }
+           if ( isset($Settings["BorderG"]) ) { $this->Data[$NodeID]["BorderG"] = $Settings["BorderG"]; }
+           if ( isset($Settings["BorderB"]) ) { $this->Data[$NodeID]["BorderB"] = $Settings["BorderB"]; }
+           if ( isset($Settings["BorderAlpha"]) ) { $this->Data[$NodeID]["BorderAlpha"] = $Settings["BorderAlpha"]; }
+           if ( isset($Settings["Surrounding"]) ) { $this->Data[$NodeID]["BorderR"] = $this->Data[$NodeID]["R"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderG"] = $this->Data[$NodeID]["G"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderB"] = $this->Data[$NodeID]["B"] + $Settings["Surrounding"]; }
+          }
+        }
+      }
+     else
+      {
+       if ( isset($Settings["R"]) ) { $this->Data[$Nodes]["R"] = $Settings["R"]; }
+       if ( isset($Settings["G"]) ) { $this->Data[$Nodes]["G"] = $Settings["G"]; }
+       if ( isset($Settings["B"]) ) { $this->Data[$Nodes]["B"] = $Settings["B"]; }
+       if ( isset($Settings["Alpha"]) ) { $this->Data[$Nodes]["Alpha"] = $Settings["Alpha"]; }
+       if ( isset($Settings["BorderR"]) ) { $this->Data[$Nodes]["BorderR"] = $Settings["BorderR"]; }
+       if ( isset($Settings["BorderG"]) ) { $this->Data[$Nodes]["BorderG"] = $Settings["BorderG"]; }
+       if ( isset($Settings["BorderB"]) ) { $this->Data[$Nodes]["BorderB"] = $Settings["BorderB"]; }
+       if ( isset($Settings["BorderAlpha"]) ) { $this->Data[$Nodes]["BorderAlpha"] = $Settings["BorderAlpha"]; }
+       if ( isset($Settings["Surrounding"]) ) { $this->Data[$Nodes]["BorderR"] = $this->Data[$NodeID]["R"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderG"] = $this->Data[$NodeID]["G"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderB"] = $this->Data[$NodeID]["B"] + $Settings["Surrounding"]; }
+      }
+    }
+
+   /* Returns all the nodes details */
+   function dumpNodes()
+    { return($this->Data); }
+
+   /* Check if a connection exists and create it if required */
+   function checkConnection($SourceID, $TargetID)
+    {
+     if ( isset($this->Data[$SourceID]["Connections"]) )
+      {
+       foreach ($this->Data[$SourceID]["Connections"] as $Key => $ConnectionID)
+        { if ( $TargetID == $ConnectionID ) { return(TRUE); } }
+      }
+     $this->Data[$SourceID]["Connections"][] = $TargetID;
+    }
+   /* Get the median linked nodes position */
+   function getMedianOffset($Key,$X,$Y)
+    {
+     $Cpt = 1;
+     if ( isset($this->Data[$Key]["Connections"]) )
+      {
+       foreach($this->Data[$Key]["Connections"] as $ID => $NodeID)
+        {
+         if ( isset($this->Data[$NodeID]["X"]) && isset($this->Data[$NodeID]["Y"]) )
+          {
+           $X = $X + $this->Data[$NodeID]["X"];
+           $Y = $Y + $this->Data[$NodeID]["Y"];
+           $Cpt++;
+          }
+        }
+      }
+     return(array("X"=>$X/$Cpt,"Y"=>$Y/$Cpt));
+    }
+
+   /* Return the ID of the attached partner with the biggest weight */
+   function getBiggestPartner($Key)
+    {
+     if ( !isset($this->Data[$Key]["Connections"]) ) { return(""); }
+
+     $MaxWeight = 0; $Result = "";
+     foreach($this->Data[$Key]["Connections"] as $Key => $PeerID)
+      {
+       if ( $this->Data[$PeerID]["Weight"] > $MaxWeight )
+        { $MaxWeight = $this->Data[$PeerID]["Weight"]; $Result = $PeerID; }
+      }
+     return($Result);
+    }
+
+   /* Do the initial node positions computing pass */
+   function firstPass($Algorithm)
+    {
+     $CenterX = ($this->X2 - $this->X1) / 2 + $this->X1;
+     $CenterY = ($this->Y2 - $this->Y1) / 2 + $this->Y1;
+
+     /* Check connections reciprocity */
+     foreach($this->Data as $Key => $Settings)
+      {
+       if ( isset($Settings["Connections"]) )
+        {
+         foreach($Settings["Connections"] as $ID => $ConnectionID)
+          $this->checkConnection($ConnectionID,$Key);
+        }
+      }
+
+     if ( $this->AutoComputeFreeZone ) { $this->autoFreeZone(); }
+
+     /* Get the max number of connections */
+     $MaxConnections = 0;
+     foreach($this->Data as $Key => $Settings)
+      { if ( isset($Settings["Connections"]) ) { if ( $MaxConnections < count($Settings["Connections"] ) ) { $MaxConnections = count($Settings["Connections"]); } } }
+
+     if ( $Algorithm == ALGORITHM_WEIGHTED )
+      {
+       foreach($this->Data as $Key => $Settings)
+        {
+         if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
+         if ( $Settings["Type"] == NODE_TYPE_FREE )
+          {
+           if ( isset($Settings["Connections"]) )
+            { $Connections = count($Settings["Connections"]); }
+           else
+            { $Connections = 0; }
+
+           $Ring  = $MaxConnections - $Connections;
+           $Angle = rand(0,360);
+           
+           $this->Data[$Key]["X"] = cos(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterX;
+           $this->Data[$Key]["Y"] = sin(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterY;
+          }
+        }
+      }
+     elseif ( $Algorithm == ALGORITHM_CENTRAL )
+      {
+       /* Put a weight on each nodes */
+       foreach($this->Data as $Key => $Settings)
+        {
+         if ( isset($Settings["Connections"]) )
+          $this->Data[$Key]["Weight"] = count($Settings["Connections"]);
+         else
+          $this->Data[$Key]["Weight"] = 0;
+        }
+
+       $MaxConnections = $MaxConnections + 1;
+       for($i=$MaxConnections;$i>=0;$i--)
+        {
+         foreach($this->Data as $Key => $Settings)
+          {
+           if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
+           if ( $Settings["Type"] == NODE_TYPE_FREE )
+            {
+             if ( isset($Settings["Connections"]) )
+              { $Connections = count($Settings["Connections"]); }
+             else
+              { $Connections = 0; }
+
+             if ( $Connections == $i )
+              {
+               $BiggestPartner = $this->getBiggestPartner($Key);
+               if ( $BiggestPartner != "" )
+                {
+                 $Ring          = $this->Data[$BiggestPartner]["FreeZone"];
+                 $Weight        = $this->Data[$BiggestPartner]["Weight"];
+                 $AngleDivision = 360 / $this->Data[$BiggestPartner]["Weight"];
+                 $Done          = FALSE; $Tries = 0;
+                 while (!$Done && $Tries <= $Weight*2)
+                  {
+                   $Tries++;
+                   $Angle = floor(rand(0,$Weight)*$AngleDivision);
+                   if ( !isset($this->Data[$BiggestPartner]["Angular"][$Angle]) || !isset($this->Data[$BiggestPartner]["Angular"]) )
+                    {
+                     $this->Data[$BiggestPartner]["Angular"][$Angle] = $Angle;
+                     $Done = TRUE; 
+                    }
+                  }
+                 if ( !$Done )
+                  { $Angle = rand(0,360); $this->Data[$BiggestPartner]["Angular"][$Angle] = $Angle; }
+
+                 $X = cos(deg2rad($Angle)) * ($Ring) + $this->Data[$BiggestPartner]["X"];
+                 $Y = sin(deg2rad($Angle)) * ($Ring) + $this->Data[$BiggestPartner]["Y"];
+
+                 $this->Data[$Key]["X"] = $X;
+                 $this->Data[$Key]["Y"] = $Y;
+                }
+              }
+            }
+          }
+        }
+      }
+     elseif ( $Algorithm == ALGORITHM_CIRCULAR )
+      {
+       $MaxConnections = $MaxConnections + 1;
+       for($i=$MaxConnections;$i>=0;$i--)
+        {
+         foreach($this->Data as $Key => $Settings)
+          {
+           if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
+           if ( $Settings["Type"] == NODE_TYPE_FREE )
+            {
+             if ( isset($Settings["Connections"]) )
+              { $Connections = count($Settings["Connections"]); }
+             else
+              { $Connections = 0; }
+
+             if ( $Connections == $i )
+              {
+               $Ring  = $MaxConnections - $Connections;
+               $Angle = rand(0,360);
+
+               $X = cos(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterX;
+               $Y = sin(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterY;
+
+               $MedianOffset = $this->getMedianOffset($Key,$X,$Y);
+
+               $this->Data[$Key]["X"] = $MedianOffset["X"];
+               $this->Data[$Key]["Y"] = $MedianOffset["Y"];
+              }
+            }
+          }
+        }
+      }
+     elseif ( $Algorithm == ALGORITHM_RANDOM )
+      {
+       foreach($this->Data as $Key => $Settings)
+        {
+         if ( $Settings["Type"] == NODE_TYPE_FREE )
+          {
+           $this->Data[$Key]["X"] = $CenterX + rand(-20,20);
+           $this->Data[$Key]["Y"] = $CenterY + rand(-20,20);
+          }
+         if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
+        }
+      }
+    }
+
+   /* Compute one pass */
+   function doPass()
+    {
+     /* Compute vectors */
+     foreach($this->Data as $Key => $Settings)
+      {
+       if ( $Settings["Type"] != NODE_TYPE_CENTRAL )
+        {
+         unset($this->Data[$Key]["Vectors"]);
+
+         $X1 = $Settings["X"];
+         $Y1 = $Settings["Y"];
+
+         /* Repulsion vectors */
+         foreach($this->Data as $Key2 => $Settings2)
+          {
+           if ( $Key != $Key2 )
+            {
+             $X2 = $this->Data[$Key2]["X"];
+             $Y2 = $this->Data[$Key2]["Y"];
+             $FreeZone = $this->Data[$Key2]["FreeZone"];
+
+             $Distance = $this->getDistance($X1,$Y1,$X2,$Y2);
+             $Angle    = $this->getAngle($X1,$Y1,$X2,$Y2) + 180;
+
+             /* Nodes too close, repulsion occurs */
+             if ( $Distance < $FreeZone )
+              {
+               $Force = log(pow(2,$FreeZone-$Distance));
+               if ( $Force > 1 )
+                { $this->Data[$Key]["Vectors"][] = array("Type"=>"R","Angle"=>$Angle % 360,"Force"=>$Force); }
+              }
+            }
+          }
+
+         /* Attraction vectors */
+         if ( isset($Settings["Connections"]) )
+          {
+           foreach($Settings["Connections"] as $ID => $NodeID)
+            {
+             if ( isset($this->Data[$NodeID]) )
+              {
+               $X2 = $this->Data[$NodeID]["X"];
+               $Y2 = $this->Data[$NodeID]["Y"];
+               $FreeZone = $this->Data[$Key2]["FreeZone"];
+
+               $Distance = $this->getDistance($X1,$Y1,$X2,$Y2);
+               $Angle    = $this->getAngle($X1,$Y1,$X2,$Y2);
+
+               if ( $Distance > $FreeZone )
+                $Force = log(($Distance-$FreeZone)+1);
+               else
+                { $Force = log(($FreeZone-$Distance)+1); ($Angle = $Angle + 180); }
+
+               if ( $Force > 1 )
+                $this->Data[$Key]["Vectors"][] = array("Type"=>"A","Angle"=>$Angle % 360,"Force"=>$Force);
+              }
+            }
+          }
+        }
+      }
+
+     /* Move the nodes accoding to the vectors */
+     foreach($this->Data as $Key => $Settings)
+      {
+       $X = $Settings["X"];
+       $Y = $Settings["Y"];
+
+       if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL )
+        {
+         foreach($Settings["Vectors"] as $ID => $Vector)
+          {
+           $Type  = $Vector["Type"];
+           $Force = $Vector["Force"];
+           $Angle = $Vector["Angle"];
+           $Factor = $Type == "A" ? $this->MagneticForceA : $this->MagneticForceR;
+
+           $X = cos(deg2rad($Angle)) * $Force * $Factor + $X;
+           $Y = sin(deg2rad($Angle)) * $Force * $Factor + $Y;
+          }
+        }
+
+       $this->Data[$Key]["X"] = $X;
+       $this->Data[$Key]["Y"] = $Y;
+      }
+    }
+
+   function lastPass()
+    {
+     /* Put everything inside the graph area */
+     foreach($this->Data as $Key => $Settings)
+      {
+       $X = $Settings["X"];
+       $Y = $Settings["Y"];
+
+       if ( $X < $this->X1 ) { $X = $this->X1; }
+       if ( $X > $this->X2 ) { $X = $this->X2; }
+       if ( $Y < $this->Y1 ) { $Y = $this->Y1; }
+       if ( $Y > $this->Y2 ) { $Y = $this->Y2; }
+
+       $this->Data[$Key]["X"] = $X;
+       $this->Data[$Key]["Y"] = $Y;
+      }
+
+     /* Dump all links */
+     $Links = "";
+     foreach($this->Data as $Key => $Settings)
+      {
+       $X1 = $Settings["X"];
+       $Y1 = $Settings["Y"];
+
+       if ( isset($Settings["Connections"]) )
+        {
+         foreach ($Settings["Connections"] as $ID => $NodeID)
+          {
+           if ( isset($this->Data[$NodeID]) )
+            {
+             $X2 = $this->Data[$NodeID]["X"];
+             $Y2 = $this->Data[$NodeID]["Y"];
+
+             $Links[] = array("X1"=>$X1,"Y1"=>$Y1,"X2"=>$X2,"Y2"=>$Y2,"Source"=>$Settings["Name"],"Destination"=>$this->Data[$NodeID]["Name"]);
+            }
+          }
+        }
+      }
+
+     /* Check collisions */
+     $Conflicts = 0;
+     foreach($this->Data as $Key => $Settings)
+      {
+       $X1 = $Settings["X"];
+       $Y1 = $Settings["Y"];
+
+       if ( isset($Settings["Connections"]) )
+        {
+         foreach ($Settings["Connections"] as $ID => $NodeID)
+          {
+           if ( isset($this->Data[$NodeID]) )
+            {
+             $X2 = $this->Data[$NodeID]["X"];
+             $Y2 = $this->Data[$NodeID]["Y"];
+
+             foreach($Links as $IDLinks => $Link)
+              {
+               $X3 = $Link["X1"]; $Y3 = $Link["Y1"]; $X4 = $Link["X2"]; $Y4 = $Link["Y2"];
+
+               if ( !($X1 == $X3 && $X2 == $X4 && $Y1 == $Y3 && $Y2 == $Y4 ) )
+                {
+                 if ( $this->intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4) )
+                  {
+                   if ( $Link["Source"] != $Settings["Name"] && $Link["Source"] != $this->Data[$NodeID]["Name"] && $Link["Destination"] != $Settings["Name"] && $Link["Destination"] != $this->Data[$NodeID]["Name"] )
+                    { $Conflicts++; }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+     return($Conflicts/2);
+    }
+
+   /* Center the graph */
+   function center()
+    {
+     /* Determine the real center */
+     $TargetCenterX = ($this->X2 - $this->X1) / 2 + $this->X1;
+     $TargetCenterY = ($this->Y2 - $this->Y1) / 2 + $this->Y1;
+
+     /* Get current boundaries */
+     $XMin = $this->X2; $XMax = $this->X1;
+     $YMin = $this->Y2; $YMax = $this->Y1;
+     foreach($this->Data as $Key => $Settings)
+      {
+       $X = $Settings["X"];
+       $Y = $Settings["Y"];
+
+       if ( $X < $XMin) { $XMin = $X; }
+       if ( $X > $XMax) { $XMax = $X; }
+       if ( $Y < $YMin) { $YMin = $Y; }
+       if ( $Y > $YMax) { $YMax = $Y; }
+      }
+     $CurrentCenterX = ($XMax - $XMin) / 2 + $XMin;
+     $CurrentCenterY = ($YMax - $YMin) / 2 + $YMin;
+
+     /* Compute the offset to apply */
+     $XOffset = $TargetCenterX - $CurrentCenterX;
+     $YOffset = $TargetCenterY - $CurrentCenterY;
+
+     /* Correct the points position */
+     foreach($this->Data as $Key => $Settings)
+      {
+       $this->Data[$Key]["X"] = $Settings["X"] + $XOffset;
+       $this->Data[$Key]["Y"] = $Settings["Y"] + $YOffset;
+      }
+    }
+
+   /* Create the encoded string */
+   function drawSpring($Object,$Settings="")
+    {
+     $this->pChartObject = $Object;
+
+     $Pass			= isset($Settings["Pass"]) ? $Settings["Pass"] : 50;
+     $Retries			= isset($Settings["Retry"]) ? $Settings["Retry"] : 10;
+     $this->MagneticForceA	= isset($Settings["MagneticForceA"]) ? $Settings["MagneticForceA"] : 1.5;
+     $this->MagneticForceR	= isset($Settings["MagneticForceR"]) ? $Settings["MagneticForceR"] : 2;
+     $this->RingSize		= isset($Settings["RingSize"]) ? $Settings["RingSize"] : 40;
+     $DrawVectors		= isset($Settings["DrawVectors"]) ? $Settings["DrawVectors"] : FALSE;
+     $DrawQuietZone		= isset($Settings["DrawQuietZone"]) ? $Settings["DrawQuietZone"] : FALSE;
+     $CenterGraph		= isset($Settings["CenterGraph"]) ? $Settings["CenterGraph"] : TRUE;
+     $TextPadding		= isset($Settings["TextPadding"]) ? $Settings["TextPadding"] : 4;
+     $Algorithm			= isset($Settings["Algorithm"]) ? $Settings["Algorithm"] : ALGORITHM_WEIGHTED;
+
+     $FontSize		= $Object->FontSize;
+     $this->X1		= $Object->GraphAreaX1;
+     $this->Y1		= $Object->GraphAreaY1;
+     $this->X2		= $Object->GraphAreaX2;
+     $this->Y2		= $Object->GraphAreaY2;
+
+     $Conflicts = 1; $Jobs = 0; $this->History["MinimumConflicts"] = -1;
+     while ($Conflicts != 0 && $Jobs < $Retries )
+      {
+       $Jobs++;
+
+       /* Compute the initial settings */
+       $this->firstPass($Algorithm);
+
+       /* Apply the vectors */
+       if ( $Pass > 0 ) 
+        {
+         for ($i=0; $i<=$Pass; $i++) { $this->doPass(); }
+        }
+
+       $Conflicts = $this->lastPass();
+       if ( $this->History["MinimumConflicts"] == -1 || $Conflicts < $this->History["MinimumConflicts"] )
+        { $this->History["MinimumConflicts"] = $Conflicts; $this->History["Result"] = $this->Data; }
+      }
+
+     $Conflicts  = $this->History["MinimumConflicts"];
+     $this->Data = $this->History["Result"];
+
+     if ( $CenterGraph ) { $this->center(); }
+
+     /* Draw the connections */
+     $Drawn = "";
+     foreach($this->Data as $Key => $Settings)
+      {
+       $X	= $Settings["X"];
+       $Y	= $Settings["Y"];
+
+       if ( isset($Settings["Connections"]) )
+        {
+         foreach ($Settings["Connections"] as $ID => $NodeID)
+          {
+           if ( !isset($Drawn[$Key]) )    { $Drawn[$Key] = ""; }
+           if ( !isset($Drawn[$NodeID]) ) { $Drawn[$NodeID] = ""; }
+
+           if ( isset($this->Data[$NodeID]) && !isset($Drawn[$Key][$NodeID]) && !isset($Drawn[$NodeID][$Key]) )
+            {
+             $Color = array("R"=>$this->Default["LinkR"],"G"=>$this->Default["LinkG"],"B"=>$this->Default["LinkB"],"Alpha"=>$this->Default["Alpha"]);
+
+             if ( $this->Links != "" )
+              {
+               if ( isset($this->Links[$Key][$NodeID]["R"]) )
+                { $Color = array("R"=>$this->Links[$Key][$NodeID]["R"],"G"=>$this->Links[$Key][$NodeID]["G"],"B"=>$this->Links[$Key][$NodeID]["B"],"Alpha"=>$this->Links[$Key][$NodeID]["Alpha"]); }
+
+               if ( isset($this->Links[$Key][$NodeID]["Ticks"]) )
+                 { $Color["Ticks"] = $this->Links[$Key][$NodeID]["Ticks"]; }
+              }
+
+             $X2 = $this->Data[$NodeID]["X"];
+             $Y2 = $this->Data[$NodeID]["Y"];
+             $this->pChartObject->drawLine($X,$Y,$X2,$Y2,$Color);
+             $Drawn[$Key][$NodeID] = TRUE;
+
+             if ( isset($this->Links) && $this->Links != "" )
+              {
+               if ( isset($this->Links[$Key][$NodeID]["Name"]) || isset($this->Links[$NodeID][$Key]["Name"]) )
+                {
+                 $Name  = isset($this->Links[$Key][$NodeID]["Name"]) ? $this->Links[$Key][$NodeID]["Name"] : $this->Links[$NodeID][$Key]["Name"];
+                 $TxtX  = ($X2 - $X)/2 + $X;
+                 $TxtY  = ($Y2 - $Y)/2 + $Y;
+
+                 if ( $X <= $X2 )
+                  $Angle = (360-$this->getAngle($X,$Y,$X2,$Y2)) % 360;
+                 else
+                  $Angle = (360-$this->getAngle($X2,$Y2,$X,$Y)) % 360;
+
+                 $Settings          = $Color;
+                 $Settings["Angle"] = $Angle;
+                 $Settings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE;
+                 $this->pChartObject->drawText($TxtX,$TxtY,$Name,$Settings);
+                }
+              }
+            }
+          }
+        }
+      }
+
+     /* Draw the quiet zones */
+     if ( $DrawQuietZone )
+      {
+       foreach($this->Data as $Key => $Settings)
+        {
+         $X	 = $Settings["X"];
+         $Y	 = $Settings["Y"];
+         $FreeZone = $Settings["FreeZone"];
+
+         $this->pChartObject->drawFilledCircle($X,$Y,$FreeZone,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>2));
+        }
+      }
+
+
+     /* Draw the nodes */
+     foreach($this->Data as $Key => $Settings)
+      {
+       $X	 = $Settings["X"];
+       $Y	 = $Settings["Y"];
+       $Name	 = $Settings["Name"];
+       $FreeZone = $Settings["FreeZone"];
+       $Shape    = $Settings["Shape"];
+       $Size     = $Settings["Size"];
+
+       $Color	 = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>$Settings["Alpha"],"BorderR"=>$Settings["BorderR"],"BorderG"=>$Settings["BorderG"],"BorderB"=>$Settings["BorderB"],"BorderApha"=>$Settings["BorderAlpha"]);
+
+       if ( $Shape == NODE_SHAPE_CIRCLE )
+        {
+         $this->pChartObject->drawFilledCircle($X,$Y,$Size,$Color);
+        }
+       elseif ( $Shape == NODE_SHAPE_TRIANGLE )
+        {
+         $Points = "";
+         $Points[] = cos(deg2rad(270)) * $Size + $X; $Points[] = sin(deg2rad(270)) * $Size + $Y;
+         $Points[] = cos(deg2rad(45)) * $Size + $X;  $Points[] = sin(deg2rad(45)) * $Size + $Y;
+         $Points[] = cos(deg2rad(135)) * $Size + $X; $Points[] = sin(deg2rad(135)) * $Size + $Y;
+         $this->pChartObject->drawPolygon($Points,$Color);
+        }
+       elseif ( $Shape == NODE_SHAPE_SQUARE )
+        {
+         $Offset = $Size/2; $Size = $Size / 2;
+         $this->pChartObject->drawFilledRectangle($X-$Offset,$Y-$Offset,$X+$Offset,$Y+$Offset,$Color);
+        }
+
+       if ( $Name != "" )
+        {
+         $LabelOptions = array("R"=>$this->Labels["R"],"G"=>$this->Labels["G"],"B"=>$this->Labels["B"],"Alpha"=>$this->Labels["Alpha"]);
+
+         if ( $this->Labels["Type"] == LABEL_LIGHT )
+          {
+           $LabelOptions["Align"] = TEXT_ALIGN_BOTTOMLEFT;
+           $this->pChartObject->drawText($X,$Y,$Name,$LabelOptions);
+          }
+         elseif ( $this->Labels["Type"] == LABEL_CLASSIC )
+          {
+           $LabelOptions["Align"]         = TEXT_ALIGN_TOPMIDDLE;
+           $LabelOptions["DrawBox"]       = TRUE;
+           $LabelOptions["BoxAlpha"]      = 50;
+           $LabelOptions["BorderOffset"]  = 4;
+           $LabelOptions["RoundedRadius"] = 3;
+           $LabelOptions["BoxRounded"]    = TRUE;
+           $LabelOptions["NoShadow"]      = TRUE;
+
+           $this->pChartObject->drawText($X,$Y+$Size+$TextPadding,$Name,$LabelOptions);
+          }
+        }
+      }
+
+     /* Draw the vectors */
+     if ( $DrawVectors )
+      {
+       foreach($this->Data as $Key => $Settings)
+        {
+         $X1 = $Settings["X"];
+         $Y1 = $Settings["Y"];
+
+         if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL )
+          {
+           foreach($Settings["Vectors"] as $ID => $Vector)
+            {
+             $Type  = $Vector["Type"];
+             $Force = $Vector["Force"];
+             $Angle = $Vector["Angle"];
+             $Factor = $Type == "A" ? $this->MagneticForceA : $this->MagneticForceR;
+             $Color  = $Type == "A" ? array("FillR"=>255,"FillG"=>0,"FillB"=>0) : array("FillR"=>0,"FillG"=>255,"FillB"=>0);
+
+             $X2 = cos(deg2rad($Angle)) * $Force * $Factor + $X1;
+             $Y2 = sin(deg2rad($Angle)) * $Force * $Factor + $Y1;
+
+             $this->pChartObject->drawArrow($X1,$Y1,$X2,$Y2,$Color);
+            }
+          }
+        }
+      }
+
+     return(array("Pass"=>$Jobs,"Conflicts"=>$Conflicts));
+    }
+
+   /* Return the distance between two points */
+   function getDistance($X1,$Y1,$X2,$Y2)
+    { return (sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1))); }
+
+   /* Return the angle made by a line and the X axis */
+   function getAngle($X1,$Y1,$X2,$Y2)
+    {
+     $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
+     if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
+    }
+
+   function intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4)
+    {
+     $A = (($X3 * $Y4 - $X4 * $Y3) * ($X1 - $X2) - ($X1 * $Y2 - $X2 * $Y1) * ($X3 - $X4));
+     $B = (($Y1 - $Y2) * ($X3 - $X4) - ($Y3 - $Y4) * ($X1 - $X2));
+
+     if ( $B == 0 ) { return(FALSE); }
+     $Xi = $A / $B;
+
+     $C = ($X1 - $X2);
+     if ( $C == 0 ) { return(FALSE); }
+     $Yi = $Xi * (($Y1 - $Y2)/$C) + (($X1 * $Y2 - $X2 * $Y1)/$C);
+
+     if ( $Xi >= min($X1,$X2) && $Xi >= min($X3,$X4) && $Xi <= max($X1,$X2) && $Xi <= max($X3,$X4))
+      {
+       if ( $Yi >= min($Y1,$Y2) && $Yi >= min($Y3,$Y4) && $Yi <= max($Y1,$Y2) && $Yi <= max($Y3,$Y4))
+        { return(TRUE); }
+      }
+
+      return(FALSE);   
+    }
+  }
+?>

modules/pChart/pStock.class.php

@@ -0,0 +1,216 @@
+<?php
+ /*
+     pStock - class to draw stock charts
+
+     Version     : 2.1.4
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 19/01/2014
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ define("STOCK_MISSING_SERIE"	, 180001);
+
+ /* pStock class definition */
+ class pStock
+  {
+   var $pChartObject;
+   var $pDataObject;
+
+   /* Class creator */
+   function pStock($pChartObject,$pDataObject)
+    {
+     $this->pChartObject = $pChartObject;
+     $this->pDataObject  = $pDataObject;
+    }
+
+   /* Draw a stock chart */
+   function drawStockChart($Format="")
+    {
+     $SerieOpen		= isset($Format["SerieOpen"]) ? $Format["SerieOpen"] : "Open";
+     $SerieClose	= isset($Format["SerieClose"]) ? $Format["SerieClose"] : "Close";
+     $SerieMin		= isset($Format["SerieMin"]) ? $Format["SerieMin"] : "Min";
+     $SerieMax		= isset($Format["SerieMax"]) ? $Format["SerieMax"] : "Max";
+     $SerieMedian	= isset($Format["SerieMedian"]) ? $Format["SerieMedian"] : NULL;
+     $LineWidth		= isset($Format["LineWidth"]) ? $Format["LineWidth"] : 1;
+     $LineR		= isset($Format["LineR"]) ? $Format["LineR"] : 0;
+     $LineG		= isset($Format["LineG"]) ? $Format["LineG"] : 0;
+     $LineB		= isset($Format["LineB"]) ? $Format["LineB"] : 0;
+     $LineAlpha		= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 100;
+     $ExtremityWidth	= isset($Format["ExtremityWidth"]) ? $Format["ExtremityWidth"] : 1;
+     $ExtremityLength	= isset($Format["ExtremityLength"]) ? $Format["ExtremityLength"] : 3;
+     $ExtremityR	= isset($Format["ExtremityR"]) ? $Format["ExtremityR"] : 0;
+     $ExtremityG	= isset($Format["ExtremityG"]) ? $Format["ExtremityG"] : 0;
+     $ExtremityB	= isset($Format["ExtremityB"]) ? $Format["ExtremityB"] : 0;
+     $ExtremityAlpha	= isset($Format["ExtremityAlpha"]) ? $Format["ExtremityAlpha"] : 100;
+     $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 8;
+     $BoxUpR		= isset($Format["BoxUpR"]) ? $Format["BoxUpR"] : 188;
+     $BoxUpG		= isset($Format["BoxUpG"]) ? $Format["BoxUpG"] : 224;
+     $BoxUpB		= isset($Format["BoxUpB"]) ? $Format["BoxUpB"] : 46;
+     $BoxUpAlpha	= isset($Format["BoxUpAlpha"]) ? $Format["BoxUpAlpha"] : 100;
+     $BoxUpSurrounding	= isset($Format["BoxUpSurrounding"]) ? $Format["BoxUpSurrounding"] : NULL;
+     $BoxUpBorderR	= isset($Format["BoxUpBorderR"]) ? $Format["BoxUpBorderR"] : $BoxUpR-20;
+     $BoxUpBorderG	= isset($Format["BoxUpBorderG"]) ? $Format["BoxUpBorderG"] : $BoxUpG-20;
+     $BoxUpBorderB	= isset($Format["BoxUpBorderB"]) ? $Format["BoxUpBorderB"] : $BoxUpB-20;
+     $BoxUpBorderAlpha	= isset($Format["BoxUpBorderAlpha"]) ? $Format["BoxUpBorderAlpha"] : 100;
+     $BoxDownR		= isset($Format["BoxDownR"]) ? $Format["BoxDownR"] : 224;
+     $BoxDownG		= isset($Format["BoxDownG"]) ? $Format["BoxDownG"] : 100;
+     $BoxDownB		= isset($Format["BoxDownB"]) ? $Format["BoxDownB"] : 46;
+     $BoxDownAlpha	= isset($Format["BoxDownAlpha"]) ? $Format["BoxDownAlpha"] : 100;
+     $BoxDownSurrounding= isset($Format["BoxDownSurrounding"]) ? $Format["BoxDownSurrounding"] : NULL;
+     $BoxDownBorderR	= isset($Format["BoxDownBorderR"]) ? $Format["BoxDownBorderR"] : $BoxDownR-20;
+     $BoxDownBorderG	= isset($Format["BoxDownBorderG"]) ? $Format["BoxDownBorderG"] : $BoxDownG-20;
+     $BoxDownBorderB	= isset($Format["BoxDownBorderB"]) ? $Format["BoxDownBorderB"] : $BoxDownB-20;
+     $BoxDownBorderAlpha= isset($Format["BoxDownBorderAlpha"]) ? $Format["BoxDownBorderAlpha"] : 100;
+     $ShadowOnBoxesOnly	= isset($Format["ShadowOnBoxesOnly"]) ? $Format["ShadowOnBoxesOnly"] : TRUE;
+     $MedianR		= isset($Format["MedianR"]) ? $Format["MedianR"] : 255;
+     $MedianG		= isset($Format["MedianG"]) ? $Format["MedianG"] : 0;
+     $MedianB		= isset($Format["MedianB"]) ? $Format["MedianB"] : 0;
+     $MedianAlpha	= isset($Format["MedianAlpha"]) ? $Format["MedianAlpha"] : 100;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $ImageMapTitle	= isset($Format["ImageMapTitle"]) ? $Format["ImageMapTitle"] : "Stock Chart";
+
+
+     /* Data Processing */
+     $Data    = $this->pDataObject->getData();
+     $Palette = $this->pDataObject->getPalette();
+
+     if ( $BoxUpSurrounding != NULL )	{ $BoxUpBorderR = $BoxUpR + $BoxUpSurrounding; $BoxUpBorderG = $BoxUpG + $BoxUpSurrounding; $BoxUpBorderB = $BoxUpB + $BoxUpSurrounding; }
+     if ( $BoxDownSurrounding != NULL )	{ $BoxDownBorderR = $BoxDownR + $BoxDownSurrounding; $BoxDownBorderG = $BoxDownG + $BoxDownSurrounding; $BoxDownBorderB = $BoxDownB + $BoxDownSurrounding; }
+
+     if ( $LineWidth != 1 ) { $LineOffset = $LineWidth / 2; }
+     $BoxOffset = $BoxWidth / 2;
+
+     $Data = $this->pChartObject->DataSet->getData();
+     list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
+
+     if ( !isset($Data["Series"][$SerieOpen]) || !isset($Data["Series"][$SerieClose]) || !isset($Data["Series"][$SerieMin]) || !isset($Data["Series"][$SerieMax]) )
+      return(STOCK_MISSING_SERIE);
+
+     $Plots = "";
+     foreach($Data["Series"][$SerieOpen]["Data"] as $Key => $Value)
+      {
+       $Point = "";
+       if ( isset($Data["Series"][$SerieClose]["Data"][$Key]) || isset($Data["Series"][$SerieMin]["Data"][$Key]) || isset($Data["Series"][$SerieMax]["Data"][$Key]) )
+        $Point = array($Value,$Data["Series"][$SerieClose]["Data"][$Key],$Data["Series"][$SerieMin]["Data"][$Key],$Data["Series"][$SerieMax]["Data"][$Key]);
+       if ( $SerieMedian != NULL && isset($Data["Series"][$SerieMedian]["Data"][$Key]) )
+        $Point[] = $Data["Series"][$SerieMedian]["Data"][$Key];
+
+       $Plots[] = $Point;
+      }
+
+     $AxisID	= $Data["Series"][$SerieOpen]["Axis"];
+     $Mode	= $Data["Axis"][$AxisID]["Display"];
+     $Format	= $Data["Axis"][$AxisID]["Format"];
+     $Unit	= $Data["Axis"][$AxisID]["Unit"];
+
+     $YZero	= $this->pChartObject->scaleComputeY(0,array("AxisID"=>$AxisID));
+     $XStep	= ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs;
+
+     $X = $this->pChartObject->GraphAreaX1 + $XMargin;
+     $Y = $this->pChartObject->GraphAreaY1 + $XMargin;
+
+     $LineSettings	= array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha);
+     $ExtremitySettings	= array("R"=>$ExtremityR,"G"=>$ExtremityG,"B"=>$ExtremityB,"Alpha"=>$ExtremityAlpha);
+     $BoxUpSettings	= array("R"=>$BoxUpR,"G"=>$BoxUpG,"B"=>$BoxUpB,"Alpha"=>$BoxUpAlpha,"BorderR"=>$BoxUpBorderR,"BorderG"=>$BoxUpBorderG,"BorderB"=>$BoxUpBorderB,"BorderAlpha"=>$BoxUpBorderAlpha);
+     $BoxDownSettings	= array("R"=>$BoxDownR,"G"=>$BoxDownG,"B"=>$BoxDownB,"Alpha"=>$BoxDownAlpha,"BorderR"=>$BoxDownBorderR,"BorderG"=>$BoxDownBorderG,"BorderB"=>$BoxDownBorderB,"BorderAlpha"=>$BoxDownBorderAlpha);
+     $MedianSettings	= array("R"=>$MedianR,"G"=>$MedianG,"B"=>$MedianB,"Alpha"=>$MedianAlpha);
+
+     foreach($Plots as $Key =>$Points)
+      {
+       $PosArray = $this->pChartObject->scaleComputeY($Points,array("AxisID"=>$AxisID));
+
+       $Values = "Open :".$Data["Series"][$SerieOpen]["Data"][$Key]."<BR>Close : ".$Data["Series"][$SerieClose]["Data"][$Key]."<BR>Min : ".$Data["Series"][$SerieMin]["Data"][$Key]."<BR>Max : ".$Data["Series"][$SerieMax]["Data"][$Key]."<BR>";
+       if ( $SerieMedian != NULL ) { $Values = $Values."Median : ".$Data["Series"][$SerieMedian]["Data"][$Key]."<BR>"; }
+       if ( $PosArray[0] > $PosArray[1] ) { $ImageMapColor = $this->pChartObject->toHTMLColor($BoxUpR,$BoxUpG,$BoxUpB); } else { $ImageMapColor = $this->pChartObject->toHTMLColor($BoxDownR,$BoxDownG,$BoxDownB); } 
+
+       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+         if ( $YZero > $this->pChartObject->GraphAreaY2-1 ) { $YZero = $this->pChartObject->GraphAreaY2-1; }
+         if ( $YZero < $this->pChartObject->GraphAreaY1+1 ) { $YZero = $this->pChartObject->GraphAreaY1+1; }
+
+         if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
+
+         if ( $ShadowOnBoxesOnly ) { $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE; }
+
+         if ( $LineWidth == 1 )
+          $this->pChartObject->drawLine($X,$PosArray[2],$X,$PosArray[3],$LineSettings);
+         else
+          $this->pChartObject->drawFilledRectangle($X-$LineOffset,$PosArray[2],$X+$LineOffset,$PosArray[3],$LineSettings);
+
+         if ( $ExtremityWidth == 1 )
+          {
+           $this->pChartObject->drawLine($X-$ExtremityLength,$PosArray[2],$X+$ExtremityLength,$PosArray[2],$ExtremitySettings);
+           $this->pChartObject->drawLine($X-$ExtremityLength,$PosArray[3],$X+$ExtremityLength,$PosArray[3],$ExtremitySettings);
+
+           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$ExtremityLength).",".floor($PosArray[2]).",".floor($X+$ExtremityLength).",".floor($PosArray[3]),$ImageMapColor,$ImageMapTitle,$Values); }
+          }
+         else
+          {
+           $this->pChartObject->drawFilledRectangle($X-$ExtremityLength,$PosArray[2],$X+$ExtremityLength,$PosArray[2]-$ExtremityWidth,$ExtremitySettings);
+           $this->pChartObject->drawFilledRectangle($X-$ExtremityLength,$PosArray[3],$X+$ExtremityLength,$PosArray[3]+$ExtremityWidth,$ExtremitySettings);
+
+           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$ExtremityLength).",".floor($PosArray[2]-$ExtremityWidth).",".floor($X+$ExtremityLength).",".floor($PosArray[3]+$ExtremityWidth),$ImageMapColor,$ImageMapTitle,$Values); }
+          }
+
+         if ( $ShadowOnBoxesOnly ) { $this->pChartObject->Shadow = $RestoreShadow; }
+
+         if ( $PosArray[0] > $PosArray[1] )
+          $this->pChartObject->drawFilledRectangle($X-$BoxOffset,$PosArray[0],$X+$BoxOffset,$PosArray[1],$BoxUpSettings);
+         else
+          $this->pChartObject->drawFilledRectangle($X-$BoxOffset,$PosArray[0],$X+$BoxOffset,$PosArray[1],$BoxDownSettings);
+
+         if ( isset($PosArray[4]) )
+          $this->pChartObject->drawLine($X-$ExtremityLength,$PosArray[4],$X+$ExtremityLength,$PosArray[4],$MedianSettings);
+
+         $X = $X + $XStep;
+        }
+       elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+        {
+         if ( $YZero > $this->pChartObject->GraphAreaX2-1 ) { $YZero = $this->pChartObject->GraphAreaX2-1; }
+         if ( $YZero < $this->pChartObject->GraphAreaX1+1 ) { $YZero = $this->pChartObject->GraphAreaX1+1; }
+
+         if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
+
+         if ( $LineWidth == 1 )
+          $this->pChartObject->drawLine($PosArray[2],$Y,$PosArray[3],$Y,$LineSettings);
+         else
+          $this->pChartObject->drawFilledRectangle($PosArray[2],$Y-$LineOffset,$PosArray[3],$Y+$LineOffset,$LineSettings);
+
+         if ( $ShadowOnBoxesOnly ) { $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE; }
+
+         if ( $ExtremityWidth == 1 )
+          {
+           $this->pChartObject->drawLine($PosArray[2],$Y-$ExtremityLength,$PosArray[2],$Y+$ExtremityLength,$ExtremitySettings);
+           $this->pChartObject->drawLine($PosArray[3],$Y-$ExtremityLength,$PosArray[3],$Y+$ExtremityLength,$ExtremitySettings);
+
+           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($PosArray[2]).",".floor($Y-$ExtremityLength).",".floor($PosArray[3]).",".floor($Y+$ExtremityLength),$ImageMapColor,$ImageMapTitle,$Values); }
+          }
+         else
+          {
+           $this->pChartObject->drawFilledRectangle($PosArray[2],$Y-$ExtremityLength,$PosArray[2]-$ExtremityWidth,$Y+$ExtremityLength,$ExtremitySettings);
+           $this->pChartObject->drawFilledRectangle($PosArray[3],$Y-$ExtremityLength,$PosArray[3]+$ExtremityWidth,$Y+$ExtremityLength,$ExtremitySettings);
+
+           if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($PosArray[2]-$ExtremityWidth).",".floor($Y-$ExtremityLength).",".floor($PosArray[3]+$ExtremityWidth).",".floor($Y+$ExtremityLength),$ImageMapColor,$ImageMapTitle,$Values); }
+          }
+
+         if ( $ShadowOnBoxesOnly ) { $this->pChartObject->Shadow = $RestoreShadow; }
+
+         if ( $PosArray[0] < $PosArray[1] )
+          $this->pChartObject->drawFilledRectangle($PosArray[0],$Y-$BoxOffset,$PosArray[1],$Y+$BoxOffset,$BoxUpSettings);
+         else
+          $this->pChartObject->drawFilledRectangle($PosArray[0],$Y-$BoxOffset,$PosArray[1],$Y+$BoxOffset,$BoxDownSettings);
+
+         if ( isset($PosArray[4]) )
+          $this->pChartObject->drawLine($PosArray[4],$Y-$ExtremityLength,$PosArray[4],$Y+$ExtremityLength,$MedianSettings);
+
+         $Y = $Y + $XStep;
+        }
+      }
+    }
+  }
+?>

modules/pChart/pSurface.class.php

@@ -0,0 +1,315 @@
+<?php
+ /*
+     pSurface - class to draw surface charts
+
+     Version     : 2.1.4
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 19/01/2014
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ define("UNKNOWN"		, 0.123456789);
+ define("IGNORED"		, -1);
+
+ define("LABEL_POSITION_LEFT"	, 880001);
+ define("LABEL_POSITION_RIGHT"	, 880002);
+ define("LABEL_POSITION_TOP"	, 880003);
+ define("LABEL_POSITION_BOTTOM"	, 880004);
+
+ /* pStock class definition */
+ class pSurface
+  {
+   var $pChartObject;
+   var $GridSizeX;
+   var $GridSizeY;
+   var $Points;
+
+   /* Class creator */
+   function pSurface($pChartObject)
+    {
+     $this->pChartObject = $pChartObject;
+     $this->GridSize     = 10;
+     $this->Points       = "";
+    }
+
+   /* Define the grid size and initialise the 2D matrix */
+   function setGrid($XSize=10,$YSize=10)
+    {
+     for($X=0; $X<=$XSize; $X++) { for($Y=0; $Y<=$YSize; $Y++) { $this->Points[$X][$Y]=UNKNOWN; } } 
+
+     $this->GridSizeX = $XSize;
+     $this->GridSizeY = $YSize;
+    }
+
+   /* Add a point on the grid */
+   function addPoint($X,$Y,$Value,$Force=TRUE)
+    {
+     if ( $X < 0 || $X >$this->GridSizeX ) { return(0); }
+     if ( $Y < 0 || $Y >$this->GridSizeY ) { return(0); }
+
+     if ( $this->Points[$X][$Y] == UNKNOWN || $Force )
+      $this->Points[$X][$Y] = $Value;
+     elseif ( $this->Points[$X][$Y] == UNKNOWN )
+      $this->Points[$X][$Y] = $Value;
+     else
+      $this->Points[$X][$Y] = ($this->Points[$X][$Y] + $Value)/2;
+    }
+
+   /* Write the X labels */
+   function writeXLabels($Format="")
+    {
+     $R			= isset($Format["R"]) ? $Format["R"] : $this->pChartObject->FontColorR;
+     $G			= isset($Format["G"]) ? $Format["G"] : $this->pChartObject->FontColorG;
+     $B			= isset($Format["B"]) ? $Format["B"] : $this->pChartObject->FontColorB;
+     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->pChartObject->FontColorA;
+     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+     $Padding		= isset($Format["Padding"]) ? $Format["Padding"] : 5;
+     $Position		= isset($Format["Position"]) ? $Format["Position"] : LABEL_POSITION_TOP;
+     $Labels		= isset($Format["Labels"]) ? $Format["Labels"] : NULL;
+     $CountOffset	= isset($Format["CountOffset"]) ? $Format["CountOffset"] : 0;
+
+     if ( $Labels != NULL && !is_array($Labels) ) { $Label = $Labels; $Labels = ""; $Labels[] = $Label; }
+
+     $X0    = $this->pChartObject->GraphAreaX1;
+     $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
+
+     $Settings = array("Angle"=>$Angle,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+     if ( $Position == LABEL_POSITION_TOP )
+      {
+       $YPos  = $this->pChartObject->GraphAreaY1 - $Padding;
+       if ($Angle == 0 ) { $Settings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
+       if ($Angle != 0 ) { $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
+      }
+     elseif ( $Position == LABEL_POSITION_BOTTOM )
+      {
+       $YPos  = $this->pChartObject->GraphAreaY2 + $Padding;
+       if ($Angle == 0 ) { $Settings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
+       if ($Angle != 0 ) { $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
+      }
+     else
+      return(-1);
+
+     for($X=0;$X<=$this->GridSizeX;$X++)
+      {
+       $XPos = floor($X0+$X*$XSize + $XSize/2);
+
+       if( $Labels == NULL || !isset($Labels[$X]) )
+        $Value = $X+$CountOffset;
+       else
+        $Value = $Labels[$X];
+
+       $this->pChartObject->drawText($XPos,$YPos,$Value,$Settings);
+      }
+    }
+
+   /* Write the Y labels */
+   function writeYLabels($Format="")
+    {
+     $R			= isset($Format["R"]) ? $Format["R"] : $this->pChartObject->FontColorR;
+     $G			= isset($Format["G"]) ? $Format["G"] : $this->pChartObject->FontColorG;
+     $B			= isset($Format["B"]) ? $Format["B"] : $this->pChartObject->FontColorB;
+     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->pChartObject->FontColorA;
+     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+     $Padding		= isset($Format["Padding"]) ? $Format["Padding"] : 5;
+     $Position		= isset($Format["Position"]) ? $Format["Position"] : LABEL_POSITION_LEFT;
+     $Labels		= isset($Format["Labels"]) ? $Format["Labels"] : NULL;
+     $CountOffset	= isset($Format["CountOffset"]) ? $Format["CountOffset"] : 0;
+
+     if ( $Labels != NULL && !is_array($Labels) ) { $Label = $Labels; $Labels = ""; $Labels[] = $Label; }
+
+     $Y0    = $this->pChartObject->GraphAreaY1;
+     $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) / ($this->GridSizeY+1);
+
+     $Settings = array("Angle"=>$Angle,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+     if ( $Position == LABEL_POSITION_LEFT )
+      { $XPos  = $this->pChartObject->GraphAreaX1 - $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
+     elseif ( $Position == LABEL_POSITION_RIGHT )
+      { $XPos  = $this->pChartObject->GraphAreaX2 + $Padding; $Settings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
+     else
+      return(-1);
+
+     for($Y=0;$Y<=$this->GridSizeY;$Y++)
+      {
+       $YPos = floor($Y0+$Y*$YSize + $YSize/2);
+
+       if( $Labels == NULL || !isset($Labels[$Y]) )
+        $Value = $Y+$CountOffset;
+       else
+        $Value = $Labels[$Y];
+
+       $this->pChartObject->drawText($XPos,$YPos,$Value,$Settings);
+      }
+    }
+
+   /* Draw the area arround the specified Threshold */
+   function drawContour($Threshold,$Format="")
+    {
+     $R		= isset($Format["R"]) ? $Format["R"] : 0;
+     $G		= isset($Format["G"]) ? $Format["G"] : 0;
+     $B		= isset($Format["B"]) ? $Format["B"] : 0;
+     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : 3;
+     $Padding	= isset($Format["Padding"]) ? $Format["Padding"] : 0;
+
+     $X0    = $this->pChartObject->GraphAreaX1;
+     $Y0    = $this->pChartObject->GraphAreaY1;
+     $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
+     $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) / ($this->GridSizeY+1);
+
+     $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks);
+
+     for($X=0;$X<=$this->GridSizeX;$X++)
+      {
+       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+        {
+         $Value = $this->Points[$X][$Y];
+
+         if ( $Value != UNKNOWN && $Value != IGNORED && $Value >= $Threshold)
+          {
+           $X1 = floor($X0+$X*$XSize)+$Padding;
+           $Y1 = floor($Y0+$Y*$YSize)+$Padding;
+           $X2 = floor($X0+$X*$XSize+$XSize);
+           $Y2 = floor($Y0+$Y*$YSize+$YSize);
+
+           if ( $X > 0 && $this->Points[$X-1][$Y] != UNKNOWN && $this->Points[$X-1][$Y] != IGNORED && $this->Points[$X-1][$Y] < $Threshold)
+            $this->pChartObject->drawLine($X1,$Y1,$X1,$Y2,$Color);
+           if ( $Y > 0 && $this->Points[$X][$Y-1] != UNKNOWN && $this->Points[$X][$Y-1] != IGNORED && $this->Points[$X][$Y-1] < $Threshold)
+            $this->pChartObject->drawLine($X1,$Y1,$X2,$Y1,$Color);
+           if ( $X < $this->GridSizeX && $this->Points[$X+1][$Y] != UNKNOWN && $this->Points[$X+1][$Y] != IGNORED && $this->Points[$X+1][$Y] < $Threshold)
+            $this->pChartObject->drawLine($X2,$Y1,$X2,$Y2,$Color);
+           if ( $Y < $this->GridSizeY && $this->Points[$X][$Y+1] != UNKNOWN && $this->Points[$X][$Y+1] != IGNORED && $this->Points[$X][$Y+1] < $Threshold)
+            $this->pChartObject->drawLine($X1,$Y2,$X2,$Y2,$Color);
+          }
+        }
+      }
+    }
+
+   /* Draw the surface chart */
+   function drawSurface($Format="")
+    {
+     $Palette		= isset($Format["Palette"]) ? $Format["Palette"] : NULL;
+     $ShadeR1		= isset($Format["ShadeR1"]) ? $Format["ShadeR1"] : 77;
+     $ShadeG1		= isset($Format["ShadeG1"]) ? $Format["ShadeG1"] : 205;
+     $ShadeB1		= isset($Format["ShadeB1"]) ? $Format["ShadeB1"] : 21;
+     $ShadeA1		= isset($Format["ShadeA1"]) ? $Format["ShadeA1"] : 40;
+     $ShadeR2		= isset($Format["ShadeR2"]) ? $Format["ShadeR2"] : 227;
+     $ShadeG2		= isset($Format["ShadeG2"]) ? $Format["ShadeG2"] : 135;
+     $ShadeB2		= isset($Format["ShadeB2"]) ? $Format["ShadeB2"] : 61;
+     $ShadeA2		= isset($Format["ShadeA2"]) ? $Format["ShadeA2"] : 100;
+     $Border		= isset($Format["Border"]) ? $Format["Border"] : FALSE;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
+     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : -1;
+     $Padding		= isset($Format["Padding"]) ? $Format["Padding"] : 1;
+
+     $X0    = $this->pChartObject->GraphAreaX1;
+     $Y0    = $this->pChartObject->GraphAreaY1;
+     $XSize = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) / ($this->GridSizeX+1);
+     $YSize = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) / ($this->GridSizeY+1);
+
+     for($X=0;$X<=$this->GridSizeX;$X++)
+      {
+       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+        {
+         $Value = $this->Points[$X][$Y];
+
+         if ( $Value != UNKNOWN && $Value != IGNORED )
+          {
+           $X1 = floor($X0+$X*$XSize)+$Padding;
+           $Y1 = floor($Y0+$Y*$YSize)+$Padding;
+           $X2 = floor($X0+$X*$XSize+$XSize);
+           $Y2 = floor($Y0+$Y*$YSize+$YSize);
+
+           if ( $Palette != NULL )
+            {
+             if ( isset($Palette[$Value]) && isset($Palette[$Value]["R"]) ) { $R = $Palette[$Value]["R"]; } else { $R = 0; }
+             if ( isset($Palette[$Value]) && isset($Palette[$Value]["G"]) ) { $G = $Palette[$Value]["G"]; } else { $G = 0; }
+             if ( isset($Palette[$Value]) && isset($Palette[$Value]["B"]) ) { $B = $Palette[$Value]["B"]; } else { $B = 0; }
+             if ( isset($Palette[$Value]) && isset($Palette[$Value]["Alpha"]) ) { $Alpha = $Palette[$Value]["Alpha"]; } else { $Alpha = 1000; }
+            }
+           else
+            {
+             $R = (($ShadeR2-$ShadeR1)/100)*$Value + $ShadeR1;
+             $G = (($ShadeG2-$ShadeG1)/100)*$Value + $ShadeG1;
+             $B = (($ShadeB2-$ShadeB1)/100)*$Value + $ShadeB1;
+             $Alpha = (($ShadeA2-$ShadeA1)/100)*$Value + $ShadeA1;
+            }
+
+           $Settings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+           if ( $Border ) { $Settings["BorderR"] = $BorderR; $Settings["BorderG"] = $BorderG; $Settings["BorderB"] = $BorderB; }
+           if ( $Surrounding != -1 ) { $Settings["BorderR"] = $R+$Surrounding; $Settings["BorderG"] = $G+$Surrounding; $Settings["BorderB"] = $B+$Surrounding; }
+
+           $this->pChartObject->drawFilledRectangle($X1,$Y1,$X2-1,$Y2-1,$Settings);
+          }
+        }
+      }
+    }
+
+   /* Compute the missing points */
+   function computeMissing()
+    {
+     $Missing = "";
+     for($X=0;$X<=$this->GridSizeX;$X++)
+      {
+       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+        {
+         if ( $this->Points[$X][$Y] == UNKNOWN )
+          $Missing[] = $X.",".$Y;
+        }
+      }
+     shuffle($Missing);
+     
+     foreach($Missing as $Key => $Pos)
+      {
+       $Pos = preg_split("/,/",$Pos);
+       $X   = $Pos[0];
+       $Y   = $Pos[1];
+
+       if ( $this->Points[$X][$Y] == UNKNOWN )
+        {
+         $NearestNeighbor = $this->getNearestNeighbor($X,$Y);
+
+         $Value = 0; $Points = 0;
+         for($Xi=$X-$NearestNeighbor;$Xi<=$X+$NearestNeighbor;$Xi++)
+          {
+           for($Yi=$Y-$NearestNeighbor;$Yi<=$Y+$NearestNeighbor;$Yi++)
+            {
+             if ($Xi >=0 && $Yi >= 0 && $Xi <= $this->GridSizeX && $Yi <= $this->GridSizeY && $this->Points[$Xi][$Yi] != UNKNOWN && $this->Points[$Xi][$Yi] != IGNORED)
+              {
+               $Value = $Value + $this->Points[$Xi][$Yi]; $Points++;
+              }
+            }
+          }
+
+         if ( $Points != 0 ) { $this->Points[$X][$Y] = $Value / $Points; }
+        }
+      }
+    }
+
+   /* Return the nearest Neighbor distance of a point */
+   function getNearestNeighbor($Xp,$Yp)
+    {
+     $Nearest = UNKNOWN;
+     for($X=0;$X<=$this->GridSizeX;$X++)
+      {
+       for($Y=0;$Y<=$this->GridSizeY;$Y++)
+        {
+         if ( $this->Points[$X][$Y] != UNKNOWN && $this->Points[$X][$Y] != IGNORED )
+          {
+           $DistanceX = max($Xp,$X)-min($Xp,$X);
+           $DistanceY = max($Yp,$Y)-min($Yp,$Y);
+           $Distance  = max($DistanceX,$DistanceY);
+           if ( $Distance < $Nearest || $Nearest == UNKNOWN ) { $Nearest = $Distance; }
+          }
+        }
+      }
+     return($Nearest);
+    }
+  }
+?>

modules/plugins/Flickr.plugin.php

@@ -30,6 +30,8 @@ class Ampacheflickr {
     public $min_ampache = '360045';
     public $max_ampache = '999999';
 
+    private $api_key;
+    
     /**
      * Constructor
      * This function does nothing...

modules/plugins/GoogleMaps.plugin.php

@@ -0,0 +1,106 @@
+<?php
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
+/**
+ *
+ * LICENSE: GNU General Public License, version 2 (GPLv2)
+ * Copyright 2001 - 2014 Ampache.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License v2
+ * as published by the Free Software Foundation.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ */
+
+class AmpacheGoogleMaps {
+    
+    public $name        = 'GoogleMaps';
+    public $categories  = 'geolocation';
+    public $description = 'Geolocation analyze with GoogleMaps';
+    public $url         = 'http://maps.google.com';
+    public $version     = '000001';
+    public $min_ampache = '370022';
+    public $max_ampache = '999999';
+
+    private $api_key;
+    
+    /**
+     * Constructor
+     * This function does nothing...
+     */
+    public function __construct() {
+
+        return true;
+
+    } // constructor
+
+    /**
+     * install
+     * This is a required plugin function. It inserts our preferences
+     * into Ampache
+     */
+    public function install() {
+        if (Preference::exists('gmaps_api_key')) { return false; }
+        Preference::insert('gmaps_api_key','GoogleMaps api key','','75','string','plugins');
+        return true;
+    } // install
+
+    /**
+     * uninstall
+     * This is a required plugin function. It removes our preferences from
+     * the database returning it to its original form
+     */
+    public function uninstall() {
+        Preference::delete('gmaps_api_key');
+        return true;
+    } // uninstall
+
+    /**
+     * upgrade
+     * This is a recommended plugin function
+     */
+    public function upgrade() {
+        return true;
+    } // upgrade
+
+    public function get_location_name($latitude, $longitude) {
+        $name = "";
+        try {
+            $url = "http://maps.googleapis.com/maps/api/geocode/json?latlng=" . $latitude . "," . $longitude . "&sensor=false";
+            $request = Requests::get($url);
+
+            $place = json_decode($request->body, true);
+            if (count($place['results']) > 0) {
+                $name = $place['results'][0]['formatted_address'];
+            }
+        } catch (Exception $e) {
+            debug_event('gmaps', 'Error getting location name: ' . $e->getMessage(), 1);
+        }
+        
+        return $name;
+    }
+    
+    /**
+     * load
+     * This loads up the data we need into this object, this stuff comes 
+     * from the preferences.
+     */
+    public function load($user) {
+        $user->set_preferences();
+        $data = $user->prefs;
+        
+        if (strlen(trim($data['gmaps_api_key']))) {
+            $this->api_key = trim($data['gmaps_api_key']);
+        }
+        
+        return true;
+    } // load
+}

play/index.php

@@ -529,9 +529,10 @@ if (!isset($_REQUEST['segment'])) {
         if (!$share_id) {
             if ($_SERVER['REQUEST_METHOD'] != 'HEAD') {
                 debug_event('play', 'Registering stats for {'.$media->get_stream_name() .'}...', '5');
-                $sessionkey = Stream::$session;
+                $sessionkey = $sid ?: Stream::get_session();
                 $agent = Session::agent($sessionkey);
-                $GLOBALS['user']->update_stats($type, $media->id, $agent);
+                $location = Session::get_geolocation($sessionkey);
+                $GLOBALS['user']->update_stats($type, $media->id, $agent, $location);
             }
         }
     }

server/stats.ajax.php

@@ -27,6 +27,37 @@ if (!defined('AJAX_INCLUDE')) { exit; }
 
 $results = array();
 switch ($_REQUEST['action']) {
+    case 'geolocation':
+        if (AmpConfig::get('geolocation')) {
+            if ($GLOBALS['user']->id) {
+                $latitude = floatval($_REQUEST['latitude']);
+                $longitude = floatval($_REQUEST['longitude']);
+                $name = $_REQUEST['name'];
+                if (empty($name)) {
+                    // First try to get from local cache (avoid external api requests)
+                    $name = Stats::get_cached_place_name($latitude, $longitude);
+                    if (empty($name)) {
+                        foreach (Plugin::get_plugins('get_location_name') as $plugin_name) {
+                            $plugin = new Plugin($plugin_name);
+                            if ($plugin->load($GLOBALS['user'])) {
+                                $name = $plugin->_plugin->get_location_name($latitude, $longitude);
+                                if (!empty($name))
+                                    break;
+                            }
+                        }
+                    }
+                }
+
+                // Better to check for bugged values here and keep previous user good location
+                // Someone listing music at 0.0,0.0 location would need a waterproof music player btw
+                if ($latitude > 0 && $longitude > 0) {
+                    Session::update_geolocation(session_id(), $latitude, $longitude, $name);
+                }
+            }
+        } else {
+            debug_event('stats.ajax.php', 'Geolocation not enabled for the user.', 3);
+        }
+        break;
     default:
         $results['rfc3514'] = '0x1';
     break;

stats.php

@@ -57,6 +57,14 @@ switch ($_REQUEST['action']) {
     case 'upload':
         require_once AmpConfig::get('prefix') . '/templates/show_uploads.inc.php';
     break;
+    case 'graph_user':
+        $user = $_REQUEST['user'];
+        $end_date = $_REQUEST['end_date'] ?: time();
+        $start_date = $_REQUEST['start_date'] ?: ($end_date - 2592000);
+        $zoom = $_REQUEST['zoom'] ?: 'day';
+
+        require_once AmpConfig::get('prefix') . '/templates/show_user_graph.inc.php';
+        break;
     case 'show':
     default:
         require_once AmpConfig::get('prefix') . '/templates/show_stats.inc.php';

stream.php

@@ -164,7 +164,7 @@ debug_event('stream.php' , 'Stream Type: ' . $stream_type . ' Media IDs: '. json
 
 if (count(media_ids)) {
     if ($GLOBALS['user']->id > -1) {
-        Session::update_username(Stream::$session, $GLOBALS['user']->username);
+        Session::update_username(Stream::get_session(), $GLOBALS['user']->username);
     }
 
     $playlist = new Stream_Playlist();

templates/header.inc.php

@@ -48,6 +48,7 @@ $_SESSION['login'] = false;
         <link rel="stylesheet" href="<?php echo $web_path; ?>/modules/tag-it/jquery.tagit.css" type="text/css" media="screen" />
         <link rel="stylesheet" href="<?php echo $web_path; ?>/modules/rhinoslider/css/rhinoslider-1.05.css" type="text/css" media="screen" />
         <link rel="stylesheet" href="<?php echo $web_path; ?>/modules/jquery-mediaTable/jquery.mediaTable.css" type="text/css" media="screen" />
+        <link rel="stylesheet" href="<?php echo $web_path; ?>/modules/jquery-datetimepicker/jquery.datetimepicker.css" type="text/css" media="screen" />
         <script src="<?php echo $web_path; ?>/modules/jquery/jquery.min.js" language="javascript" type="text/javascript"></script>
         <script src="<?php echo $web_path; ?>/modules/jquery-ui/jquery-ui.min.js" language="javascript" type="text/javascript"></script>
         <script src="<?php echo $web_path; ?>/modules/prettyPhoto/js/jquery.prettyPhoto.js" language="javascript" type="text/javascript"></script>
@@ -59,6 +60,7 @@ $_SESSION['login'] = false;
         <script src="<?php echo $web_path; ?>/modules/rhinoslider/js/rhinoslider-1.05.min.js" language="javascript" type="text/javascript"></script>
         <script src="<?php echo $web_path; ?>/modules/responsive-elements/responsive-elements.js" language="javascript" type="text/javascript"></script>
         <script src="<?php echo $web_path; ?>/modules/jquery-mediaTable/jquery.mediaTable.js" language="javascript" type="text/javascript"></script>
+        <script src="<?php echo $web_path; ?>/modules/jquery-datetimepicker/jquery.datetimepicker.js" language="javascript" type="text/javascript"></script>
         <script src="<?php echo $web_path; ?>/modules/jquery-knob/jquery.knob.js" language="javascript" type="text/javascript"></script>
         <script src="<?php echo $web_path; ?>/modules/jquery-file-upload/jquery.iframe-transport.js" language="javascript" type="text/javascript"></script>
         <script src="<?php echo $web_path; ?>/modules/jquery-file-upload/jquery.fileupload.js" language="javascript" type="text/javascript"></script>
@@ -69,6 +71,9 @@ $_SESSION['login'] = false;
         <script type="text/javascript" charset="utf-8">
             $(document).ready(function(){
                 $("a[rel^='prettyPhoto']").prettyPhoto({social_tools:false});
+                <?php if (AmpConfig::get('geolocation')) { ?>
+                    geolocate_user();
+                <?php } ?>
             });
 
             // Using the following workaround to set global variable available from any javascript script.

templates/show_html5_player_headers.inc.php

@@ -274,7 +274,7 @@ function startBroadcastListening(broadcast_id)
     $('.jp-seek-bar').css('pointer-events', 'none');
 
     brconn.onopen = function(e) {
-        sendBroadcastMessage('AUTH_SID', '<?php echo Stream::$session; ?>');
+        sendBroadcastMessage('AUTH_SID', '<?php echo Stream::get_session(); ?>');
         sendBroadcastMessage('REGISTER_LISTENER', broadcast_id);
     };
 }

templates/show_recently_played.inc.php

@@ -56,6 +56,9 @@ foreach ($data as $row) {
 
     if ($is_allowed || $has_allowed_agent) {
         $agent = $row['agent'];
+        if (!empty($row['geo_name'])) {
+            $agent .= ' - ' . $row['geo_name'];
+        }
     }
 
     if ($is_allowed || $has_allowed_time) {

templates/show_stats.inc.php

@@ -97,3 +97,14 @@ $catalogs = Catalog::get_catalogs();
     </tbody>
 </table>
 <?php UI::show_box_bottom(); ?>
+
+<?php
+if (AmpConfig::get('statistical_graphs')) {
+    $user = $_REQUEST['user'];
+    $end_date = $_REQUEST['end_date'] ?: time();
+    $start_date = $_REQUEST['start_date'] ?: ($end_date - 2592000);
+    $zoom = $_REQUEST['zoom'] ?: 'day';
+
+    require_once AmpConfig::get('prefix') . '/templates/show_user_graph.inc.php';
+}
+?>

templates/show_user.inc.php

@@ -30,7 +30,7 @@ if ($client->f_avatar) {
     echo '<div class="user_avatar">' . $client->f_avatar . '</div>';
 }
 ?>
-<dl class="song_details">
+<dl class="media_details">
     <?php $rowparity = UI::flip_class(); ?>
     <dt class="<?php echo $rowparity; ?>"><?php echo T_('Full Name'); ?></dt>
     <dd class="<?php echo $rowparity; ?>"><?php echo $client->fullname; ?></dd>
@@ -42,7 +42,12 @@ if ($client->f_avatar) {
     <dd class="<?php echo $rowparity; ?>"><?php echo $last_seen; ?></dd>
     <?php $rowparity = UI::flip_class(); ?>
     <dt class="<?php echo $rowparity; ?>"><?php echo T_('Activity'); ?></dt>
-    <dd class="<?php echo $rowparity; ?>"><?php echo $client->f_useage; ?></dd>
+    <dd class="<?php echo $rowparity; ?>">
+        <?php echo $client->f_useage; ?>
+        <?php if (AmpConfig::get('statistical_graphs')) { ?>
+            (<a href="<?php echo AmpConfig::get('web_path'); ?>/stats.php?action=graph_user&user=<?php echo $client->id; ?>"><?php echo T_('Graphs'); ?></a>)
+        <?php } ?>
+    </dd>
     <?php $rowparity = UI::flip_class(); ?>
     <dt class="<?php echo $rowparity; ?>"><?php echo T_('Status'); ?></dt>
     <dd class="<?php echo $rowparity; ?>">

templates/show_user_graph.inc.php

@@ -0,0 +1,88 @@
+<?php
+/* vim:set softtabstop=4 shiftwidth=4 expandtab: */
+/**
+ *
+ * LICENSE: GNU General Public License, version 2 (GPLv2)
+ * Copyright 2001 - 2014 Ampache.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License v2
+ * as published by the Free Software Foundation.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ */
+
+$boxtitle = T_('Statistical Graphs');
+if ($user) {
+    $u = new User($user);
+    $u->format();
+    $boxtitle .= ' - ' . $u->f_link;
+}
+?>
+<?php UI::show_box_top($boxtitle, 'box box_graph'); ?>
+<div class="stats_graph">
+    <?php
+    $types = array('user_hits', 'user_bandwidth');
+    foreach ($types as $type) {
+    ?>
+        <img src="<?php echo AmpConfig::get('web_path'); ?>/graph.php?type=<?php echo $type; ?>&start_date=<?php echo $start_date; ?>&end_date=<?php echo $end_date; ?>&zoom=<?php echo $zoom; ?>&user=<?php echo $user; ?>" />
+        <br /><br />
+    <?php } ?>
+</div>
+<?php if (AmpConfig::get('geolocation')) { ?>
+
+<?php } ?>
+<form action='<?php echo get_current_path(); ?>' method='post' enctype='multipart/form-data'>
+    <dl class="media_details">
+        <?php $rowparity = UI::flip_class(); ?>
+        <dt class="<?php echo $rowparity; ?>"><?php echo T_('Start Date'); ?></dt>
+        <dd class="<?php echo $rowparity; ?>"><input type="text" name="start_date" id="start_date" value="<?php echo $start_date; ?>" /></dd>
+        <?php $rowparity = UI::flip_class(); ?>
+        <dt class="<?php echo $rowparity; ?>"><?php echo T_('End Date'); ?></dt>
+        <dd class="<?php echo $rowparity; ?>"><input type="text" name="end_date" id="end_date" value="<?php echo $end_date; ?>" /></dd>
+        <?php $rowparity = UI::flip_class(); ?>
+        <dt class="<?php echo $rowparity; ?>"><?php echo T_('Zoom'); ?></dt>
+        <dd class="<?php echo $rowparity; ?>">
+            <select name="zoom">
+            <?php
+                $date_formats = array(
+                    'year' => T_('Year'),
+                    'month' => T_('Month'),
+                    'day' => T_('Day'),
+                    'hour' => T_('Hour')
+                );
+                foreach ($date_formats as $dtype => $dname) {
+                    echo "<option value='" . $dtype . "' ";
+                    if ($dtype == $zoom) echo "selected";
+                    echo ">" . $dname . "</option>";
+                }
+            ?>
+            </select>
+        </dd>
+        <?php $rowparity = UI::flip_class(); ?>
+        <dt class="<?php echo $rowparity; ?>"></dt>
+        <dd class="<?php echo $rowparity; ?>">
+            <input type="submit" value="<?php echo T_('View'); ?>" />
+        </dd>
+    </dl>
+    <input type="hidden" name="user" value="<?php echo $user; ?>" />
+    <input type="hidden" name="action" value="<?php echo $action; ?>" />
+    <input type="hidden" name="type" value="<?php echo $type; ?>" />
+</form>
+<script>
+    $('#start_date').datetimepicker({
+        format: 'unixtime'
+    });
+    $('#end_date').datetimepicker({
+        format: 'unixtime'
+    });
+</script>
+<?php UI::show_box_bottom(); ?>

themes/reborn/templates/default.css

@@ -1540,3 +1540,7 @@ a.option-list {
 a.option-list:hover {
 	border: 1px solid;
 }
+
+.stats_graph {
+    text-align: center;
+}