Updated graph handling

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19448 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_categoryActionOverTime.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_categoryActionOverTime.inc
index dad7dbe8251c4dd7796d985230299bde89d06a99..a22de0d550d5387a754421331e56d7a8fc1c680c 100644 (file)
--- a/gosa-core/plugins/generic/statistics/chartClasses/class_categoryActionOverTime.inc
+++ b/gosa-core/plugins/generic/statistics/chartClasses/class_categoryActionOverTime.inc
@@ -2,8 +2,7 @@
 
 class categoryActionsOverTime extends statChart
 {
-    var $title = 'Plugin usage over time';
-    var $enableCaching = FALSE;
+    protected $title = 'Plugin usage over time';
 
     function __construct(&$config)
     {

diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_cpuLoadChart.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_cpuLoadChart.inc
index 81c80843154ff83a95e2b32c16e40979366396c8..764d2b0148d3794678a48d5ba1b736d1609b1c93 100644 (file)
--- a/gosa-core/plugins/generic/statistics/chartClasses/class_cpuLoadChart.inc
+++ b/gosa-core/plugins/generic/statistics/chartClasses/class_cpuLoadChart.inc
@@ -2,8 +2,8 @@
 
 class cpuLoadChart extends memoryUsageChart
 {
-    var $title = 'CPU load';
-    var $enableCaching = TRUE;
+    protected $title = 'CPU load';
+    protected $enableCaching = TRUE;
 
     function __construct(&$config)
     {

diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_durationTimeChart.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_durationTimeChart.inc
index 874e0b5045dc031eab4d28bdbdda3716b78453fc..c40f91b3a9ecbcd1be4886fc23cde323f91eac97 100644 (file)
--- a/gosa-core/plugins/generic/statistics/chartClasses/class_durationTimeChart.inc
+++ b/gosa-core/plugins/generic/statistics/chartClasses/class_durationTimeChart.inc
@@ -2,8 +2,8 @@
 
 class durationTimeChart extends memoryUsageChart
 {
-    var $title = 'Plugin duration';
-    var $enableCaching = TRUE;
+    protected $title = 'Plugin duration';
+    protected $enableCaching = TRUE;
 
     function __construct(&$config)
     {

diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_memoryUsageChart.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_memoryUsageChart.inc
index 2dd9f87f70b3bbc2fd78735b36c6f527796b2042..73b9ec42b0e65299fa4d2e9fe153e0761e70f561 100644 (file)
--- a/gosa-core/plugins/generic/statistics/chartClasses/class_memoryUsageChart.inc
+++ b/gosa-core/plugins/generic/statistics/chartClasses/class_memoryUsageChart.inc
@@ -2,8 +2,8 @@
 
 class memoryUsageChart extends statChart
 {
-    var $title = 'Memory usage';
-    var $enableCaching = TRUE;
+    protected $title = 'Memory usage';
+    protected $enableCaching = TRUE;
 
     function __construct(&$config)
     {

diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_pieChart1.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_pieChart1.inc
index 4fd22194f81b4cc47ff9065448375c068446072e..e63ecb6e423d2d9d29db5c2b1e8cd83a525b264f 100644 (file)
--- a/gosa-core/plugins/generic/statistics/chartClasses/class_pieChart1.inc
+++ b/gosa-core/plugins/generic/statistics/chartClasses/class_pieChart1.inc
@@ -2,10 +2,8 @@
 
 class pieChart1 extends statChart
 {
-    var $title = 'Plugin usage';
-    var $enableCaching = FALSE;
-
-    var $keyName = "actionsPerCategory";
+    protected $title = 'Plugin usage';
+    protected $keyName = "actionsPerCategory";
 
 
     function __construct(&$config)

diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_pieChart2.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_pieChart2.inc
index 04dc1aedf7bfee1e24ee4a9076401bda89c8b7a0..21baa9e169f8bf3673a5ac2c9585ebe4c14e319f 100644 (file)
--- a/gosa-core/plugins/generic/statistics/chartClasses/class_pieChart2.inc
+++ b/gosa-core/plugins/generic/statistics/chartClasses/class_pieChart2.inc
@@ -2,10 +2,8 @@
 
 class pieChart2 extends pieChart1
 {
-    var $title = 'Action usage';
-    var $enableCaching = FALSE;
-
-    var $keyName = "actionsPerPluginAction";
+    protected $title = 'Action usage';
+    protected $keyName = "actionsPerPluginAction";
 
     function __construct(&$config)
     {

diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_renderTimeChart.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_renderTimeChart.inc
index 0dd0382404fc150717c80410587a73598475fd50..e871836a04abdd42d5f7116cc11c5e663911775a 100644 (file)
--- a/gosa-core/plugins/generic/statistics/chartClasses/class_renderTimeChart.inc
+++ b/gosa-core/plugins/generic/statistics/chartClasses/class_renderTimeChart.inc
@@ -2,8 +2,8 @@
 
 class renderTimeChart extends memoryUsageChart
 {
-    var $title = 'Render time';
-    var $enableCaching = TRUE;
+    protected $title = 'Render time';
+    protected $enableCaching = TRUE;
 
     function __construct(&$config)
     {

diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_statChart.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_statChart.inc
index 4028b160d48cd8cbdef90cf680677dad9cbb82f0..97d723239432ecbd6cc25593b0c0bcaf6dfcfd8f 100644 (file)
--- a/gosa-core/plugins/generic/statistics/chartClasses/class_statChart.inc
+++ b/gosa-core/plugins/generic/statistics/chartClasses/class_statChart.inc
@@ -3,16 +3,16 @@
 class statChart{
 
     // Graph data 
-    var $statisticData = array();       // Via rpc received stats
+    protected $statisticData = array();       // Via rpc received stats
     
     // Font used in graphs
-    var $font = "./themes/default/fonts/LiberationSans-Regular.ttf";
-    var $graphData = array();    
-    var $graphID = 0;
-    var $enableCaching = TRUE;
-    var $skipSeries = array();
-    var $graphName = 0;
-    var $seriesList = array();
+    protected $font = "./themes/default/fonts/LiberationSans-Regular.ttf";
+    protected $graphData = array();    
+    protected $graphID = 0;
+    protected $enableCaching = TRUE;
+    protected $skipSeries = array();
+    protected $graphName = 0;
+    protected $seriesList = array();
 
     function __construct(&$config,$gData = array())
     {