2011-07-21 Sergio Martin <sergio.martin@artica.es>

* include/functions_users.php
	extensions/module_groups.php
	godmode/groups/modu_group_list.php
	godmode/groups/group_list.php
	godmode/alerts/alert_commands.php
	godmode/setup/os.list.php
	godmode/setup/news.php
	godmode/users/profile_list.php
	godmode/modules/manage_network_components.php
	godmode/modules/manage_nc_groups.php: Fixed several lonely 
	headers when no data and other no data little bugs for 3371455



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4614 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,17 @@
+2011-07-21  Sergio Martin <sergio.martin@artica.es>
+
+	* include/functions_users.php
+	extensions/module_groups.php
+	godmode/groups/modu_group_list.php
+	godmode/groups/group_list.php
+	godmode/alerts/alert_commands.php
+	godmode/setup/os.list.php
+	godmode/setup/news.php
+	godmode/users/profile_list.php
+	godmode/modules/manage_network_components.php
+	godmode/modules/manage_nc_groups.php: Fixed several lonely 
+	headers when no data and other no data little bugs for 3371455
+
 2011-07-21  Ramon Novoa  <rnovoa@artica.es>
 
 	* include/functions_config.php: Set dbtype to mysql by default

pandora_console/extensions/module_groups.php

@@ -125,6 +125,8 @@ function mainModuleGroups() {
 	
 	$agentGroups = users_get_groups ($config['id_user'], "AR", false);
 	$modelGroups = users_get_all_model_groups();
+
+	if(!empty($agentGroups) && !empty($modelGroups)) {
 		array_walk($modelGroups, 'translate'); //Translate all head titles to language is set
 
 		foreach ($modelGroups as $i => $n) {
@@ -259,6 +261,10 @@ function mainModuleGroups() {
 				'</li>' .
 			"</ul>" .
 		"</p>";
+	}
+	else {
+		echo "<div class='nf'>".__('There are no defined groups or module groups')."</div>";
+	}
 	
 	ui_require_css_file('cluetip');
 	ui_require_jquery_file('cluetip');

pandora_console/godmode/alerts/alert_commands.php

@@ -162,7 +162,12 @@ foreach ($commands as $command) {
 	array_push ($table->data, $data);
 }
 
+if(isset($data)) {
 	html_print_table ($table);
+}
+else {
+	echo "<div class='nf'>".__('No alert commands configured')."</div>";
+}
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 echo '<form method="post" action="index.php?sec=galertas&sec2=godmode/alerts/configure_alert_command">';

pandora_console/godmode/groups/group_list.php

@@ -205,8 +205,10 @@ if ($delete_group) {
 		 
 }
 
-
+$groups = users_get_groups_tree ($config['id_user'], "AR", true);
 $table->width = '98%';
+
+if(!empty($groups)) {
 	$table->head = array ();
 	$table->head[0] = __('Name');
 	$table->head[1] = __('ID');
@@ -218,7 +220,6 @@ $table->align[2] = 'center';
 	$table->align[4] = 'center';
 	$table->data = array ();
 
-$groups = users_get_groups_tree ($config['id_user'], "AR", true);
 	$iterator = 0;
 
 	foreach ($groups as $id_group => $group) {
@@ -309,7 +310,20 @@ foreach ($groups as $id_group => $group) {
 		$iterator++;
 	}
 
+	html_print_table ($table);
+}
+else {
+	echo "<div class='nf'>".__('There are no defined groups')."</div>";
+}
+
+echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/groups/configure_group">';
+echo '<div class="action-buttons" style="width: '.$table->width.'">';
+html_print_submit_button (__('Create group'), 'crt', false, 'class="sub next"');
+echo '</div>';
+echo '</form>';
+
 ?>
+
 <script type="text/javascript">
 function showBranch(parent) {
 	display = $('.parent_' + parent).css('display');
@@ -328,14 +342,3 @@ function showBranch(parent) {
 	}
 }
 </script>
-<?php
-
-html_print_table ($table);
-
-echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/groups/configure_group">';
-echo '<div class="action-buttons" style="width: '.$table->width.'">';
-html_print_submit_button (__('Create group'), 'crt', false, 'class="sub next"');
-echo '</div>';
-echo '</form>';
-
-?>

pandora_console/godmode/groups/modu_group_list.php

@@ -129,7 +129,13 @@ if ($delete_group) {
 		echo "<h3 class='suc'>".__('Group successfully deleted')."</h3>";
 }
 
+$sql = "SELECT * 
+		FROM tmodule_group ";
+$groups = db_get_all_rows_sql ($sql, true);
+
 $table->width = '98%';
+
+if(!empty($groups)) {
 	$table->head = array ();
 	$table->head[0] = __('ID');
 	$table->head[1] = __('Name');
@@ -139,11 +145,6 @@ $table->align[1] = 'left';
 	$table->align[2] = 'center';
 	$table->data = array ();
 
-$sql = "SELECT * 
-		FROM tmodule_group ";
-$groups = db_get_all_rows_sql ($sql, true);
-
-
 	foreach ($groups as $id_group ) {
 		$data = array ();
 		$data[0] = 	$id_group["id_mg"];
@@ -154,6 +155,10 @@ foreach ($groups as $id_group ) {
 	}
 
 	html_print_table ($table);
+}
+else{
+	echo "<div class='nf'>".__('There are no defined module groups')."</div>";
+}
 
 echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/groups/configure_modu_group">';
 echo '<div class="action-buttons" style="width: '.$table->width.'">';

pandora_console/godmode/modules/manage_nc_groups.php

@@ -85,6 +85,14 @@ $url = ui_get_url_refresh (array ('offset' => false,
 	'upd' => false,
 	'id_sg' => false));
 
+$filter = array ();
+$filter['offset'] = (int) get_parameter ('offset');
+$filter['limit'] = (int) $config['block_size'];
+	
+$groups = db_get_all_rows_filter ('tnetwork_component_group', $filter);
+if ($groups === false)
+	$groups = array ();
+	
 $table->width = '98%';
 $table->head = array ();
 $table->head[0] = __('Name');
@@ -103,14 +111,6 @@ $table->data = array ();
 $total_groups = db_get_all_rows_filter ('tnetwork_component_group', false, 'COUNT(*) AS total');
 $total_groups = $total_groups[0]['total'];
 
-$filter = array ();
-$filter['offset'] = (int) get_parameter ('offset');
-$filter['limit'] = (int) $config['block_size'];
-
-$groups = db_get_all_rows_filter ('tnetwork_component_group', $filter);
-if ($groups === false)
-	$groups = array ();
-
 ui_pagination ($total_groups, $url);
 
 foreach ($groups as $group) {
@@ -130,7 +130,13 @@ foreach ($groups as $group) {
 	array_push ($table->data, $data);
 }
 
+if(isset($data)) {
 	html_print_table ($table);
+}
+else {
+	echo "<div class='nf'>".__('There are no defined component groups')."</div>";
+}
+
 
 echo '<form method="post">';
 echo '<div class="action-buttons" style="width: '.$table->width.'">';

pandora_console/godmode/modules/manage_network_components.php

@@ -299,6 +299,7 @@ if ($components === false)
 	$components = array ();
 
 unset ($table);
+
 $table->width = '98%';
 $table->head = array ();
 $table->head[0] = __('Module name');
@@ -340,7 +341,13 @@ foreach ($components as $component) {
 	array_push ($table->data, $data);
 }
 
+if(isset($data)) {
 	html_print_table ($table);
+}
+else {
+	echo "<div class='nf'>".__('There are no defined network components')."</div>";
+}
+
 
 echo '<form method="post" action="'.$url.'">';
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
@@ -349,7 +356,7 @@ html_print_select (array (2 => __('Create a new network component'),
 	4 => __('Create a new plugin component'),
 	6 => __('Create a new WMI component')),
 	'id_component_type', '', '', '', '', '');
-html_print_submit_button (__('Create'), 'crt', false, 'class="sub next"');
+html_print_submit_button (__('Create'), 'crt', false, 'class="sub next" style="margin-left: 5px;"');
 echo '</div>';
 echo '</form>'
 ?>

pandora_console/godmode/setup/news.php

@@ -126,7 +126,12 @@ if ((isset ($_GET["form_add"])) || (isset ($_GET["form_edit"]))) {
 	echo '</form></td></tr></table>';
 } 
 else {
-
+	$rows = db_get_all_rows_in_table("tnews", "timestamp");
+	if ($rows === false) {
+		$rows = array();
+		echo "<div class='nf'>".__('There are no defined news')."</div>";
+	} 
+	else {
 		// Main list view for Links editor
 		echo "<table cellpadding='4' cellspacing='4' class='databox' width=98%>";
 		echo "<th>".__('Subject')."</th>";
@@ -134,10 +139,7 @@ else {
 		echo "<th>".__('Timestamp')."</th>";
 		echo "<th>".__('Delete')."</th>";
 		
-	$rows = db_get_all_rows_in_table("tnews", "timestamp");
+
-	if ($rows === false) {
-		$rows = array();
-	} 
 		
 		$color = 1;
 		foreach ($rows as $row) {
@@ -157,6 +159,8 @@ else {
 			echo '<td class="'.$tdcolor.'" align="center"><a href="index.php?sec=gsetup&sec2=godmode/setup/news&id_news='.$row["id_news"].'&borrar='.$row["id_news"].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">' . html_print_image("images/cross.png", true, array("border" => '0')) . '</a></td></tr>';
 		}
 		echo "</table>";
+	}
+	
 	echo "<table width='98%'>";
 	echo "<tr><td align='right'>";
 	echo "<form method='post' action='index.php?sec=gsetup&sec2=godmode/setup/news&form_add=1'>";

pandora_console/godmode/setup/os.list.php

@@ -60,5 +60,10 @@ foreach ($osList as $os) {
 	$table->data[] = $data;
 }
 
+if(isset($data)) {
 	html_print_table($table);
+}
+else {
+	echo "<div class='nf'>".__('There are no defined operating systems')."</div>";
+}
 ?>

pandora_console/godmode/users/profile_list.php

@@ -99,7 +99,12 @@ foreach ($profiles as $profile) {
 }
 	
 	echo '<form method="post" action="index.php?sec=gusuarios&sec2=godmode/users/configure_profile">';
+	if(isset($data)) {
 		html_print_table ($table);
+	}
+	else {
+		echo "<div class='nf'>".__('There are no defined profiles')."</div>";
+	}
 	echo '<div class="action-buttons" style="width: '.$table->width.'">';
 	html_print_input_hidden ('new_profile', 1);
 	html_print_submit_button (__('Create'), "crt", false, 'class="sub next"');

pandora_console/include/functions_users.php

@@ -48,7 +48,9 @@ function users_get_info ($order = "fullname", $info = "fullname") {
  */
 function users_get_all_model_groups () {
 	$groups = db_get_all_rows_in_table ('tmodule_group');
-
+	if($groups === false) {
+		$groups = array();
+	}
 	$returnGroups = array();
 	foreach ($groups as $group)
 	$returnGroups[$group['id_mg']] = $group['name'];