tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 09:15:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

2013-07-16 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* include/functions.php,
	include/javascript/jquery.pandora.controls.js: improved the
	functions to pass the php vars to js, now it supports json.
	
	* include/javascript/d3.v3.js: added this library for to make
	beautiful things.
	
	* include/functions_ui.php, include/graphs/fgraph.php,
	include/javascript/pandora_events.js, include/javascript/pandora.js,
	include/functions_treeview.php,
	include/include_graph_dependencies.php,
	include/functions_categories.php, include/db/postgresql.php,
	include/db/oracle.php, include/db/mysql.php: cleaned source code
	style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8528 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-07-16 14:13:23 +00:00
parent 3eed1ff8be
commit 0875fb0af9
14 changed files with 8943 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/ChangeLog
View File

@ -1,3 +1,20 @@
2013-07-16 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php,
include/javascript/jquery.pandora.controls.js: improved the
functions to pass the php vars to js, now it supports json.
* include/javascript/d3.v3.js: added this library for to make
beautiful things.
* include/functions_ui.php, include/graphs/fgraph.php,
include/javascript/pandora_events.js, include/javascript/pandora.js,
include/functions_treeview.php,
include/include_graph_dependencies.php,
include/functions_categories.php, include/db/postgresql.php,
include/db/oracle.php, include/db/mysql.php: cleaned source code
style.
2013-07-16 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/flot/pandora.flot.js,

1
pandora_console/include/db/postgresql.php
View File

@ -171,6 +171,7 @@ function postgresql_db_get_all_rows_sql ($sql, $search_history_db = false, $cach
if (! empty ($history))
return $history;
//Return false, check with === or !==
return false;
}

47
pandora_console/include/functions.php
View File

@ -138,48 +138,6 @@ function safe_url_extraclean ($string, $default_string = '') {
return $string;
}
/**
* DEPRECATED: This function is not used anywhere. Remove it?
* (use general/noaccess.php followed by exit instead)
*/
function no_permission () {
require ("config.php");
ui_print_error_message(__('You don\'t have access'));
echo html_print_image('images/noaccess.png', true, array("alt" => 'No access', "width" => '120')) . "<br /><br />";
echo "<table width=550>";
echo "<tr><td>";
echo __('You don\'t have enough permission to access this resource');
echo "</table>";
echo "<tr><td><td><td><td>";
include "general/footer.php";
exit;
}
/**
* DEPRECATED: This function is not used anywhere. Remove it?
* (use print_error function instead followed by return or exit)
*
* @param string $error Aditional error string to be shown. Blank by default
*/
function unmanaged_error ($error = "") {
require_once ("config.php");
ui_print_error_message(__('Unmanaged error'));
echo html_print_image('images/error.png', true, array("alt" => 'error')) . "<br /><br />";
echo "<table width=550>";
echo "<tr><td>";
echo __('Unmanaged error');
echo "<tr><td>";
echo $error;
echo "</table>";
echo "<tr><td><td><td><td>";
include "general/footer.php";
exit;
}
/**
* List files in a directory in the local path.
*
@ -1775,10 +1733,11 @@ function is_snapshot_data ($data) {
/**
* Create an invisible div with a provided ID and value to
* can retrieve it from javascript with function get_php_value(value)
* can retrieve it from javascript with function get_php_value(name)
*/
function set_js_value($name, $value) {
html_print_div(array('id' => 'php_to_js_value_' . $name, 'content' => $value, 'hidden' => true));
html_print_div(array('id' => 'php_to_js_value_' . $name,
'content' => json_encode($value), 'hidden' => true));
}

34
pandora_console/include/graphs/fgraph.php
View File

@ -13,40 +13,6 @@
$ttl = 1;
$homeurl = '';
/*function include_graphs_dependencies($home_url = '', $serialize_ttl = 1) {
global $ttl;
global $homeurl;
$ttl = $serialize_ttl;
$homeurl = $home_url;
include_once($homeurl . 'include/functions.php');
include_once($homeurl . 'include/functions_html.php');
include_once($homeurl . 'include/graphs/functions_fsgraph.php');
include_once($homeurl . 'include/graphs/functions_gd.php');
include_once($homeurl . 'include/graphs/functions_utils.php');
}*/
/*
// If is called from index
if(file_exists('include/functions.php')) {
include_once('include/functions.php');
include_once('include/graphs/functions_fsgraph.php');
include_once('include/graphs/functions_utils.php');
} // If is called through url
else if(file_exists('../functions.php')) {
include_once('../functions.php');
include_once('../functions_html.php');
include_once('functions_fsgraph.php');
include_once('functions_gd.php');
include_once('functions_utils.php');
}
include_once('functions_fsgraph.php');
include_once('functions_utils.php');
*/
if (isset($_GET['homeurl'])) {
$homeurl = $_GET['homeurl'];
}

8803
pandora_console/include/javascript/d3.v3.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

2
pandora_console/include/javascript/pandora.js
View File

@ -794,5 +794,5 @@ function hidded_sidebar(position, menuW, menuH, icon_width, top_dist, autotop, r
// Function that recover a previously stored value from php code
function get_php_value(value) {
return $('#php_to_js_value_' + value).html();
return $.parseJSON($('#php_to_js_value_' + value).html());
}