deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

More fixes to work with KH 3.3

Browse Source
This commit is contained in:
Deon George 2013-01-04 15:13:48 +11:00
parent 6db02ae77d
commit 19411b6352
10 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
includes/kohana/modules/cron/classes/cron.php → includes/kohana/modules/cron/classes/Cron.php
View File

0
includes/kohana/modules/cron/classes/kohana/cron.php → includes/kohana/modules/cron/classes/Kohana/Cron.php
View File

2
includes/kohana/modules/minion/classes/Kohana/Minion/CLI.php
View File

@ -92,7 +92,7 @@ class Kohana_Minion_CLI {
{
foreach ($values as $opt => $value)
{
if ( ! in_array($opt, $options))
if ( ! in_array($opt, $options, TRUE))
{
// Set the given value
unset($values[$opt]);

10
modules/adsl/classes/Model/Service/Plugin/ADSL.php
View File

@ -246,11 +246,11 @@ class Model_Service_Plugin_ADSL extends Model_Service_Plugin {
->title(sprintf('DSL traffic usage as at %s',Config::date($date)));
foreach ($traffic_data as $k => $details)
$google->data(array('yl'=>($x=isset($friendly[$k]) ? $friendly[$k] : $k)),array($x=>$traffic_data[$k]));
$google->sdata(array('yl'=>($x=isset($friendly[$k]) ? $friendly[$k] : $k)),array($x=>$traffic_data[$k]));
// Work out comulative numbers
foreach ($traffic_data as $k => $details)
$google->data(array('yr'=>($x=isset($friendly['cumulative'.$k]) ? $friendly['cumulative'.$k] : 'cumulative'.$k)),array($x=>$this->cumulative($traffic_data[$k])));
$google->sdata(array('yr'=>($x=isset($friendly['cumulative'.$k]) ? $friendly['cumulative'.$k] : 'cumulative'.$k)),array($x=>$this->cumulative($traffic_data[$k])));
foreach ($array as $item) {
switch ($item) {
@ -371,10 +371,10 @@ class Model_Service_Plugin_ADSL extends Model_Service_Plugin {
$traffic_data = $this->get_traffic_data_daily(strtotime($_POST['month'].'-01'));
foreach ($traffic_data as $k => $details)
$google->data(array('yl'=>($x=isset($friendly[$k]) ? $friendly[$k] : $k)),array($x=>$traffic_data[$k]));
$google->sdata(array('yl'=>($x=isset($friendly[$k]) ? $friendly[$k] : $k)),array($x=>$traffic_data[$k]));
foreach ($traffic_data as $k => $details)
$google->data(array('yr'=>($x=isset($friendly['cumulative'.$k]) ? $friendly['cumulative'.$k] : 'cumulative'.$k)),array($x=>$this->cumulative($traffic_data[$k])));
$google->sdata(array('yr'=>($x=isset($friendly['cumulative'.$k]) ? $friendly['cumulative'.$k] : 'cumulative'.$k)),array($x=>$this->cumulative($traffic_data[$k])));
} else {
// @todo Change the date to the last record date
@ -382,7 +382,7 @@ class Model_Service_Plugin_ADSL extends Model_Service_Plugin {
$traffic_data = $this->get_traffic_data_monthly();
foreach ($traffic_data as $k => $details)
$google->data(array('yl'=>($x=isset($friendly[$k]) ? $friendly[$k] : $k)),array($x=>$traffic_data[$k]));
$google->sdata(array('yl'=>($x=isset($friendly[$k]) ? $friendly[$k] : $k)),array($x=>$traffic_data[$k]));
}
return (string)$google;

2
modules/domain/classes/Model/Service/Plugin/DOMAIN.php
View File

@ -81,7 +81,7 @@ class Model_Service_Plugin_DOMAIN extends Model_Service_Plugin {
}
public function manage_dns_button() {
return $this->service_plugin_host->manage_button('service_plugin_host');
return $this->service_plugin_HOST->manage_button('service_plugin_host');
}
}
?>

2
modules/gchart/classes/GoogleChart.php
View File

@ -19,7 +19,7 @@ abstract class GoogleChart implements Iterator,Countable {
// Chart title
protected $_title = '';
protected $_dataurl = '';
protected $_divname = '';
protected $_divname = 'gchart';
// Default chart size.
protected $_height = '200';
protected $_width = '700';

41
modules/gchart/classes/GoogleChart/ComboChart.php
View File

@ -99,36 +99,51 @@ class GoogleChart_ComboChart extends GoogleChart {
Script::add(array(
'type'=>'stdin',
'data'=>"
function drawChart".$this->_divname."() {
var jsonData = $.ajax({
url: '".$this->_dataurl."',
dataType:'json',
async: false,
}).responseText;
function drawChart_".$this->_divname."() {
div = document.getElementById('".$this->_divname."');
var x = JSON.parse(jsonData);
for(var key in x) {
if (! div) {
alert(\"Unable to render chart, DIV ['".$this->_divname."'] doesnt exist.\");
return;
}
$.ajax({
url: '".$this->_dataurl."',
dataType: 'json',
async: true,
timeout: 10000,
success: function(jsonData) {
for(var key in jsonData) {
if (key == 'data')
data = x[key];
data = jsonData[key];
else if (key == 'options')
options = x[key];
options = jsonData[key];
else
alert('UNKNOWN Key: '+key);
}
// Create our data table out of JSON data loaded from server.
var data = new google.visualization.DataTable(data);
var x = new google.visualization.DataTable(data);
// Instantiate and draw our chart, passing in some options.
var chart = new google.visualization.ComboChart(document.getElementById('".$this->_divname."'));
chart.draw(data, options);
chart.draw(x, options);
},
error: function(x, t, m) {
if (t==='timeout') {
alert('got timeout');
} else {
alert('t is: '+t+', X: '+x+', M: '+m);
}
}
});
}
",
));
Script::add(array(
'type'=>'stdin',
'data'=>'google.setOnLoadCallback(drawChart'.$this->_divname.');',
'data'=>'$(document).ready(function() {google.setOnLoadCallback(drawChart_'.$this->_divname.'); });',
));
return sprintf('<div id="%s" style="width: %spx; height: %spx;"></div>',$this->_divname,$this->_width,$this->_height);

4
modules/invoice/classes/Controller/User/Invoice.php
View File

@ -105,8 +105,8 @@ class Controller_User_Invoice extends Controller_TemplateDefault_User {
height: 100%;
margin: 0;
z-index: 1;
left:350px;
top:-200px;
left:250px;
top:-20px;
}
'));

11
modules/service/classes/Controller/Admin/Service.php
View File

@ -54,9 +54,9 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
$google = GoogleChart::factory('ComboChart');
foreach ($data['data'] as $key => $values)
$google->data(array('yl'=>$key),array($key=>$values));
$google->sdata(array('yl'=>$key),array($key=>$values));
$google->data(array('yr'=>'services'),array('services'=>$data['svs']));
$google->sdata(array('yr'=>'services'),array('services'=>$data['svs']));
$this->auto_render = FALSE;
$this->response->headers('Content-Type','application/json');
@ -195,16 +195,11 @@ class Controller_Admin_Service extends Controller_TemplateDefault_Admin {
public function action_listadslservices() {
$svs = ORM::factory('Service')->list_bylistgroup('ADSL');
$data = $this->consoltraffic($svs,time());
$google = GoogleChart::factory('ComboChart')
->dataurl(URL::site('admin/service/ajaxjson_traffic'))
->title(sprintf('ADSL traffic as at %s',date('Y-m-d',strtotime('yesterday'))));
foreach ($data['data'] as $key => $values)
$google->data(array('yl'=>$key),array($key=>$values));
$google->data(array('yr'=>'services'),array('services'=>$data['svs']));
Block::add(array('body'=>(string)$google));
Block::add(array(

2
modules/task/classes/Task/Task/ListActive.php → modules/task/classes/Task/Task/Listactive.php
View File

@ -10,7 +10,7 @@
* @copyright (c) 2010 Open Source Billing
* @license http://dev.osbill.net/license.html
*/
class Task_Task_ListActive extends Task {
class Task_Task_Listactive extends Task {
protected function _execute(array $params) {
$output = '';