From 9433df0195ca9ea42f6c37c8916f58ec2df59cbd Mon Sep 17 00:00:00 2001
From: esanchezm <noreply@pandorafms.org>
Date: Tue, 17 Mar 2009 11:19:36 +0000
Subject: [PATCH] 2009-03-17  Esteban Sanchez  <estebans@artica.es>

        * include/functions_html.php: Do not add id counter if it's 0 on
        print_select. It's a backwards compatibility workaround until we
        take a decision on correct HTML elements. Fixed comment styles, please
        do not add comments in the same line.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1542 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                  |  7 +++++
 pandora_console/include/functions_html.php | 33 ++++++++++++----------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index f57530ff19..fe22bbf9d8 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-17  Esteban Sanchez  <estebans@artica.es>
+
+	* include/functions_html.php: Do not add id counter if it's 0 on
+	print_select. It's a backwards compatibility workaround until we
+	take a decision on correct HTML elements. Fixed comment styles, please
+	do not add comments in the same line.
+
 2009-03-17  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* include/languages/es.po, include/languages/es.mo: Updated Spanish
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 3dfe945bba..b85a3def4a 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -48,8 +48,8 @@ function print_select ($fields, $name, $selected = '', $script = '', $nothing =
 		$idcounter[$name] = 0;
 	}
 	
-	$id = preg_replace('/[^a-z0-9\:\;\-\_]/i', '', $name.$idcounter[$name]);
-		
+	$id = preg_replace('/[^a-z0-9\:\;\-\_]/i', '', $name.($idcounter[$name] ? $idcounter[$name] : ''));
+	
 	$attributes = "";
 	if (!empty ($script)) {
 		$attributes .= ' onchange="'.$script.'"';
@@ -74,7 +74,6 @@ function print_select ($fields, $name, $selected = '', $script = '', $nothing =
 		if ($nothing_value == $selected) {
 			$output .= ' selected="selected"';
 		}
-		//You should pass a translated string already
 		$output .= '>'.$nothing.'</option>';
 	}
 
@@ -86,9 +85,11 @@ function print_select ($fields, $name, $selected = '', $script = '', $nothing =
 			$output .= '<option value="'.$value.'"';
 			if (is_array ($selected) && in_array ($value, $selected)) {
 				$output .= ' selected="selected"';
-			} elseif (is_numeric ($value) && is_numeric ($selected) && $value == $selected) { //This fixes string ($value) to int ($selected) comparisons 
+			} elseif (is_numeric ($value) && is_numeric ($selected) && $value == $selected) {
+				//This fixes string ($value) to int ($selected) comparisons 
 				$output .= ' selected="selected"';
-			} elseif ($value === $selected) { //Needs type comparison otherwise if $selected = 0 and $value = "string" this would evaluate to true
+			} elseif ($value === $selected) {
+				//Needs type comparison otherwise if $selected = 0 and $value = "string" this would evaluate to true
 				$output .= ' selected="selected"';
 			}
 			if ($label === '') {
@@ -160,24 +161,24 @@ function print_select_from_sql ($sql, $name, $selected = '', $script = '', $noth
 function print_input_text_extended ($name, $value, $id, $alt, $size, $maxlength, $disabled, $script, $attributes, $return = false, $password = false) {
 	static $idcounter = 0;
 	
-    if ($maxlength == 0)
-        $maxlength = 255;
-    if ($size == 0)
-        $size = 10;
+	if ($maxlength == 0)
+		$maxlength = 255;
+	if ($size == 0)
+		$size = 10;
 
 	++$idcounter;
 	
 	$valid_attrs = array ("accept", "disabled", "maxlength", "name", "readonly", "size", "value",
-					"accesskey", "class", "dir", "id", "lang", "style", "tabindex", "title", "xml:lang",
-					"onfocus", "onblur", "onselect", "onchange", "onclick", "ondblclick", "onmousedown", 
-					"onmouseup", "onmouseover", "onmousemove", "onmouseout", "onkeypress", "onkeydown", "onkeyup");
+		"accesskey", "class", "dir", "id", "lang", "style", "tabindex", "title", "xml:lang",
+		"onfocus", "onblur", "onselect", "onchange", "onclick", "ondblclick", "onmousedown", 
+		"onmouseup", "onmouseover", "onmousemove", "onmouseout", "onkeypress", "onkeydown", "onkeyup");
 
 	$output = '<input '.($password ? 'type="password" ' : 'type="text" ');
 
 	if ($disabled && (!is_array ($attributes) || !array_key_exists ("disabled", $attributes))) {
 		$output .= 'readonly="readonly" ';
 	}
-				
+	
 	if (is_array ($attributes)) {
 		foreach ($attributes as $attribute => $attr_value) {
 			if (! in_array ($valid_attrs)) {
@@ -191,7 +192,9 @@ function print_input_text_extended ($name, $value, $id, $alt, $size, $maxlength,
 	}
 	
 	//Attributes specified by function call
-	$attrs = array ("name" => "unnamed", "value" => "", "id" => "text-".sprintf ('%04d', $idcounter), "size" => "", "maxlength" => "");
+	$attrs = array ("name" => "unnamed", "value" => "",
+		"id" => "text-".sprintf ('%04d', $idcounter),
+		"size" => "", "maxlength" => "");
 
 	foreach ($attrs as $attribute => $default) {
 		if (array_key_exists ($attribute, $attributes)) {
@@ -253,7 +256,7 @@ function print_input_password ($name, $value, $alt = '', $size = 50, $maxlength
 function print_input_text ($name, $value, $alt = '', $size = 50, $maxlength = 255, $return = false) {
 	if ($maxlength == 0)
 		$maxlength = 255;
-	if ($size == 0)		
+	if ($size == 0)
 		$size = 10;
 		
 	return print_input_text_extended ($name, $value, 'text-'.$name, '', $size, $maxlength, false, '', '', $return);