From 25d3b78299d292b2a6df740f2b631833cd33b96b Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 25 Aug 2010 07:11:56 +0000 Subject: [PATCH] Updated graph handling git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19448 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../class_categoryActionOverTime.inc | 3 +-- .../chartClasses/class_cpuLoadChart.inc | 4 ++-- .../chartClasses/class_durationTimeChart.inc | 4 ++-- .../chartClasses/class_memoryUsageChart.inc | 4 ++-- .../statistics/chartClasses/class_pieChart1.inc | 6 ++---- .../statistics/chartClasses/class_pieChart2.inc | 6 ++---- .../chartClasses/class_renderTimeChart.inc | 4 ++-- .../statistics/chartClasses/class_statChart.inc | 16 ++++++++-------- 8 files changed, 21 insertions(+), 26 deletions(-) diff --git a/gosa-core/plugins/generic/statistics/chartClasses/class_categoryActionOverTime.inc b/gosa-core/plugins/generic/statistics/chartClasses/class_categoryActionOverTime.inc index dad7dbe82..a22de0d55 100644 --- 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 81c808431..764d2b014 100644 --- 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 874e0b504..c40f91b3a 100644 --- 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 2dd9f87f7..73b9ec42b 100644 --- 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 4fd22194f..e63ecb6e4 100644 --- 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 04dc1aedf..21baa9e16 100644 --- 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 0dd038240..e871836a0 100644 --- 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 4028b160d..97d723239 100644 --- 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()) { -- 2.30.2