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

2010-06-02 Sergio Martin <sergio.martin@artica.es>

Browse Source 
* include/auth/ldap.php
	include/fgraph.php
	godmode/reporting/graph_builder.php: Changed the deprecated
	function split() by explode() function for bug: 2989970



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2849 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-06-02 16:56:38 +00:00
parent d0972921ff
commit a4661a3796
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2010-06-02 Sergio Martin <sergio.martin@artica.es>
* include/auth/ldap.php
include/fgraph.php
godmode/reporting/graph_builder.php: Changed the deprecated
function split() by explode() function for bug: 2989970
2010-06-02 Miguel de Dios <miguel.dedios@artica.es> 2010-06-02 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_plugin.php: fixed, now show the * godmode/agentes/module_manager_editor_plugin.php: fixed, now show the

10
pandora_console/godmode/reporting/graph_builder.php
View File

@ -149,7 +149,7 @@ if (isset ($_GET["delete_module"] )) {
$chunkdata = $_POST["chunk"]; $chunkdata = $_POST["chunk"];
if (isset($chunkdata)) { if (isset($chunkdata)) {
$chunk1 = array(); $chunk1 = array();
$chunk1 = split ("\|", $chunkdata); $chunk1 = explode ("\|", $chunkdata);
$modules="";$weights=""; $modules="";$weights="";
for ($a = 0; $a < count ($chunk1); $a++) { for ($a = 0; $a < count ($chunk1); $a++) {
if (isset ($_POST["delete_$a"])) { if (isset ($_POST["delete_$a"])) {
@ -163,7 +163,7 @@ if (isset ($_GET["delete_module"] )) {
$agent_array = array (); $agent_array = array ();
for ($a = 0; $a < count ($chunk1); $a++) { for ($a = 0; $a < count ($chunk1); $a++) {
$chunk2[$a] = array(); $chunk2[$a] = array();
$chunk2[$a] = split (",", $chunk1[$a]); $chunk2[$a] = explode (",", $chunk1[$a]);
$skip_module =0; $skip_module =0;
for ($b = 0; $b < count ($deleted_id); $b++) { for ($b = 0; $b < count ($deleted_id); $b++) {
if ($deleted_id[$b] == $chunk2[$a][1]) { if ($deleted_id[$b] == $chunk2[$a][1]) {
@ -250,11 +250,11 @@ if (! isset($_GET["delete_module"])) {
$weight_array = array(); $weight_array = array();
$agent_array = array(); $agent_array = array();
$chunk1 = array(); $chunk1 = array();
$chunk1 = split ("\|", $chunkdata); $chunk1 = explode ("\|", $chunkdata);
$modules="";$weights=""; $modules="";$weights="";
for ($a=0; $a < count($chunk1); $a++){ for ($a=0; $a < count($chunk1); $a++){
$chunk2[$a] = array(); $chunk2[$a] = array();
$chunk2[$a] = split ( ",", $chunk1[$a]); $chunk2[$a] = explode ( ",", $chunk1[$a]);
if (strpos($modules, $chunk2[$a][1]) == 0){ // Skip dupes if (strpos($modules, $chunk2[$a][1]) == 0){ // Skip dupes
$module_array[] = $chunk2[$a][1]; $module_array[] = $chunk2[$a][1];
$agent_array[] = $chunk2[$a][0]; $agent_array[] = $chunk2[$a][0];
@ -375,7 +375,7 @@ if (($render == 1) && (isset($modules))) {
echo "<table class='databox'>"; echo "<table class='databox'>";
echo "<tr><td>"; echo "<tr><td>";
if ($config['flash_charts']) { if ($config['flash_charts']) {
echo graphic_combined_module (split (',', $modules), split (',', $weights), $period, $width, $height, echo graphic_combined_module (explode (',', $modules), explode (',', $weights), $period, $width, $height,
'Combined%20Sample%20Graph', '', $events, 0, 0, $stacked); 'Combined%20Sample%20Graph', '', $events, 0, 0, $stacked);
} else { } else {
echo "<img src='include/fgraph.php?tipo=combined&id=$modules&weight_l=$weights&label=Combined%20Sample%20Graph&height=$height&width=$width&stacked=$stacked&period=$period' border=1 alt=''>"; echo "<img src='include/fgraph.php?tipo=combined&id=$modules&weight_l=$weights&label=Combined%20Sample%20Graph&height=$height&width=$width&stacked=$stacked&period=$period' border=1 alt=''>";

4
pandora_console/include/auth/ldap.php
View File

@ -518,8 +518,8 @@ function get_users ($order = false) {
* @return string userid * @return string userid
*/ */
function stripdn ($dn) { function stripdn ($dn) {
list ($uid, $trash) = split (',', $dn, 2); list ($uid, $trash) = explode (',', $dn, 2);
list ($trash, $user) = split ('=', $uid); list ($trash, $user) = explode ('=', $uid);
return ($user); return ($user);
} }

4
pandora_console/include/fgraph.php
View File

@ -2440,9 +2440,9 @@ if ($graphic_type) {
case "combined": case "combined":
// Split id to get all parameters // Split id to get all parameters
$module_list = array(); $module_list = array();
$module_list = split (",", $id); $module_list = explode (",", $id);
$weight_list = array(); $weight_list = array();
$weight_list = split (",", $weight_l); $weight_list = explode (",", $weight_l);
graphic_combined_module ($module_list, $weight_list, $period, $width, $height, graphic_combined_module ($module_list, $weight_list, $period, $width, $height,
$label, $unit_name, $draw_events, $draw_alerts, $pure, $stacked, $date); $label, $unit_name, $draw_events, $draw_alerts, $pure, $stacked, $date);