XoopsModules25x / songlist

htdocs/modules/songlist/include/songlist.object.php

Braces +11 added lines, -8 removed lines

@@ -2,11 +2,13 @@ 
 	
 	$module_handler = xoops_gethandler('module');
 	$config_handler = xoops_gethandler('config');
-	if (!isset($GLOBALS['songlistModule']))
-		$GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist');
-	if (is_object($GLOBALS['songlistModule']))
-		if (!isset($GLOBALS['songlistModuleConfig']))
-			$GLOBALS['songlistModuleConfig'] = $config_handler->getConfigList($GLOBALS['songlistModule']->getVar('mid')); 
+	if (!isset($GLOBALS['songlistModule'])) {
+			$GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist');
+	}
+	if (is_object($GLOBALS['songlistModule'])) {
+			if (!isset($GLOBALS['songlistModuleConfig']))
+			$GLOBALS['songlistModuleConfig'] = $config_handler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
+	}
 	
 	require_once($GLOBALS['xoops']->path('class/xoopsformloader.php'));
 	require_once($GLOBALS['xoops']->path('class/pagenav.php'));
@@ -18,6 +20,7 @@ 
 	require_once('formselectvoice.php');
 	require_once('formselectsong.php');
 	
-	if (file_exists($GLOBALS['xoops']->path('/modules/tag/include/formtag.php')) && $GLOBALS['songlistModuleConfig']['tags'])
-		include_once $GLOBALS['xoops']->path('/modules/tag/include/formtag.php');
-?>
\ No newline at end of file
+	if (file_exists($GLOBALS['xoops']->path('/modules/tag/include/formtag.php')) && $GLOBALS['songlistModuleConfig']['tags']) {
+			include_once $GLOBALS['xoops']->path('/modules/tag/include/formtag.php');
+	}
+	?>
\ No newline at end of file

htdocs/modules/songlist/include/functions.php

Indentation +134 added lines, -134 removed lines

@@ -103,64 +103,64 @@ 
 		$ele = false;
 		include_once('songlist.object.php');
 		switch ($field) {
-		    case 'gid':
+			case 'gid':
 				if ($op!='genre') {
 					$ele = new SonglistFormSelectGenre('', 'filter_'.$field.'', $components['value'], 1, false);
-			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+					$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
 				}
 				break;
-		    case 'vcid':
+			case 'vcid':
 				if ($op!='voice') {
 					$ele = new SonglistFormSelectVoice('', 'filter_'.$field.'', $components['value'], 1, false);
-			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+					$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
 				}
 				break;				
 			case 'cid':
 				if ($op!='category') {
 					$ele = new SonglistFormSelectCategory('', 'filter_'.$field.'', $components['value'], 1, false);
-			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+					$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
 				}
 				break;
-		    case 'pid':
+			case 'pid':
 				$ele = new SonglistFormSelectCategory('', 'filter_'.$field.'', $components['value'], 1, false);
-			    $ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+				$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
 				break;
 			case 'abid':
 				if ($op!='albums') {
 					$ele = new SonglistFormSelectAlbum('', 'filter_'.$field.'', $components['value'], 1, false);
-			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+					$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
 				}
 				break;
 			case 'aid':
 				if ($op!='artists') {
 					$ele = new SonglistFormSelectArtist('', 'filter_'.$field.'', $components['value'], 1, false);
-			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+					$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
 				}
 				break;				
 			case 'sid':
 				if ($op!='songs') {
 					$ele = new SonglistFormSelectSong('', 'filter_'.$field.'', $components['value'], 1, false);
-			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+					$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
 				}
 				break;				
 			case 'name':
-		    case 'title':
-		    case 'artists':
+			case 'title':
+			case 'artists':
 			case 'albums':
-		    case 'songs':
-		    case 'hits':
-		    case 'rank':
-		    case 'votes':
-		    case 'description':
-		    case 'lyrics':
-		    case 'songid':
-		    case 'tags':
-		    	$ele = new XoopsFormElementTray('');
+			case 'songs':
+			case 'hits':
+			case 'rank':
+			case 'votes':
+			case 'description':
+			case 'lyrics':
+			case 'songid':
+			case 'tags':
+				$ele = new XoopsFormElementTray('');
 				$ele->addElement(new XoopsFormText('', 'filter_'.$field.'', 11, 40, $components['value']));
 				$button = new XoopsFormButton('', 'button_'.$field.'', '[+]');
-		    	$button->setExtra('onclick="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+$(\'#filter_'.$field.'\').val()'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
-		    	$ele->addElement($button);
-		    	break;
+				$button->setExtra('onclick="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+$(\'#filter_'.$field.'\').val()'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+				$ele->addElement($button);
+				break;
 		}
 		return $ele;
 	}
@@ -173,26 +173,26 @@ 
 		$value = '';
 		$ele_value = '';
 		$operator = '';
-    	foreach($parts as $part) {
-    		$var = explode(',', $part);
-    		if (count($var)>1) {
-	    		if ($var[0]==$field) {
-	    			$ele_value = $var[1];
-	    			if (isset($var[2]))
-	    				$operator = $var[2];
-	    		} elseif ($var[0]!=1) {
-	    			$ret[] = implode(',', $var);
-	    		}
-    		}
-    	}
-    	$pagenav = array();
-    	$pagenav['op'] = isset($_REQUEST['op'])?$_REQUEST['op']:"videos";
+		foreach($parts as $part) {
+			$var = explode(',', $part);
+			if (count($var)>1) {
+				if ($var[0]==$field) {
+					$ele_value = $var[1];
+					if (isset($var[2]))
+						$operator = $var[2];
+				} elseif ($var[0]!=1) {
+					$ret[] = implode(',', $var);
+				}
+			}
+		}
+		$pagenav = array();
+		$pagenav['op'] = isset($_REQUEST['op'])?$_REQUEST['op']:"videos";
 		$pagenav['fct'] = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list";
 		$pagenav['limit'] = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
 		$pagenav['start'] = 0;
 		$pagenav['order'] = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC';
 		$pagenav['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':$sort;
-    	$retb = array();
+		$retb = array();
 		foreach($pagenav as $key=>$value) {
 			$retb[] = "$key=$value";
 		}
@@ -252,126 +252,126 @@ 
 
 if (!function_exists("songlist_xml2array")) {
 	function songlist_xml2array($contents, $get_attributes=1, $priority = 'tag') { 
-	    if(!$contents) return array(); 
+		if(!$contents) return array(); 
 	
-	    if(!function_exists('xml_parser_create')) { 
-	        return array(); 
-	    } 
+		if(!function_exists('xml_parser_create')) { 
+			return array(); 
+		} 
 	
-	    //Get the XML parser of PHP - PHP must have this module for the parser to work
-	     $parser = xml_parser_create(''); 
-	    xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8"); # http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
-	     xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); 
-	    xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1); 
-	    xml_parse_into_struct($parser, trim($contents), $xml_values); 
-	    xml_parser_free($parser); 
+		//Get the XML parser of PHP - PHP must have this module for the parser to work
+		 $parser = xml_parser_create(''); 
+		xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8"); # http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
+		 xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); 
+		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1); 
+		xml_parse_into_struct($parser, trim($contents), $xml_values); 
+		xml_parser_free($parser); 
 	
-	    if(!$xml_values) return;//Hmm... 
+		if(!$xml_values) return;//Hmm... 
 	
-	    //Initializations 
-	    $xml_array = array(); 
-	    $parents = array(); 
-	    $opened_tags = array(); 
-	    $arr = array(); 
+		//Initializations 
+		$xml_array = array(); 
+		$parents = array(); 
+		$opened_tags = array(); 
+		$arr = array(); 
 	
-	    $current = &$xml_array; //Refference 
+		$current = &$xml_array; //Refference 
 	
-	    //Go through the tags. 
-	    $repeated_tag_index = array();//Multiple tags with same name will be turned into an array
-	     foreach($xml_values as $data) { 
-	        unset($attributes,$value);//Remove existing values, or there will be trouble
+		//Go through the tags. 
+		$repeated_tag_index = array();//Multiple tags with same name will be turned into an array
+		 foreach($xml_values as $data) { 
+			unset($attributes,$value);//Remove existing values, or there will be trouble
 	 
-	        //This command will extract these variables into the foreach scope 
-	        // tag(string), type(string), level(int), attributes(array). 
-	        extract($data);//We could use the array by itself, but this cooler. 
+			//This command will extract these variables into the foreach scope 
+			// tag(string), type(string), level(int), attributes(array). 
+			extract($data);//We could use the array by itself, but this cooler. 
 	
-	        $result = array(); 
-	        $attributes_data = array(); 
+			$result = array(); 
+			$attributes_data = array(); 
 	         
-	        if(isset($value)) { 
-	            if($priority == 'tag') $result = $value; 
-	            else $result['value'] = $value; //Put the value in a assoc array if we are in the 'Attribute' mode
-	         } 
+			if(isset($value)) { 
+				if($priority == 'tag') $result = $value; 
+				else $result['value'] = $value; //Put the value in a assoc array if we are in the 'Attribute' mode
+			 } 
 	
-	        //Set the attributes too. 
-	        if(isset($attributes) and $get_attributes) { 
-	            foreach($attributes as $attr => $val) { 
-	                if($priority == 'tag') $attributes_data[$attr] = $val; 
-	                else $result['attr'][$attr] = $val; //Set all the attributes in a array called 'attr'
-	             } 
-	        } 
+			//Set the attributes too. 
+			if(isset($attributes) and $get_attributes) { 
+				foreach($attributes as $attr => $val) { 
+					if($priority == 'tag') $attributes_data[$attr] = $val; 
+					else $result['attr'][$attr] = $val; //Set all the attributes in a array called 'attr'
+				 } 
+			} 
 	
-	        //See tag status and do the needed. 
-	        if($type == "open") {//The starting of the tag '<tag>' 
-	            $parent[$level-1] = &$current; 
-	            if(!is_array($current) or (!in_array($tag, array_keys($current)))) { //Insert New tag
-	                 $current[$tag] = $result; 
-	                if($attributes_data) $current[$tag. '_attr'] = $attributes_data;
-	                 $repeated_tag_index[$tag.'_'.$level] = 1; 
+			//See tag status and do the needed. 
+			if($type == "open") {//The starting of the tag '<tag>' 
+				$parent[$level-1] = &$current; 
+				if(!is_array($current) or (!in_array($tag, array_keys($current)))) { //Insert New tag
+					 $current[$tag] = $result; 
+					if($attributes_data) $current[$tag. '_attr'] = $attributes_data;
+					 $repeated_tag_index[$tag.'_'.$level] = 1; 
 	
-	                $current = &$current[$tag]; 
+					$current = &$current[$tag]; 
 	
-	            } else { //There was another element with the same tag name 
+				} else { //There was another element with the same tag name 
 	
-	                if(isset($current[$tag][0])) {//If there is a 0th element it is already an array
-	                     $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
-	                     $repeated_tag_index[$tag.'_'.$level]++; 
-	                } else {//This section will make the value an array if multiple tags with the same name appear together
-	                     $current[$tag] = array($current[$tag],$result);//This will combine the existing item and the new item together to make an array
-	                     $repeated_tag_index[$tag.'_'.$level] = 2; 
+					if(isset($current[$tag][0])) {//If there is a 0th element it is already an array
+						 $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
+						 $repeated_tag_index[$tag.'_'.$level]++; 
+					} else {//This section will make the value an array if multiple tags with the same name appear together
+						 $current[$tag] = array($current[$tag],$result);//This will combine the existing item and the new item together to make an array
+						 $repeated_tag_index[$tag.'_'.$level] = 2; 
 	                     
-	                    if(isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
-	                         $current[$tag]['0_attr'] = $current[$tag.'_attr']; 
-	                        unset($current[$tag.'_attr']); 
-	                    } 
+						if(isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
+							 $current[$tag]['0_attr'] = $current[$tag.'_attr']; 
+							unset($current[$tag.'_attr']); 
+						} 
 	
-	                } 
-	                $last_item_index = $repeated_tag_index[$tag.'_'.$level]-1; 
-	                $current = &$current[$tag][$last_item_index]; 
-	            } 
+					} 
+					$last_item_index = $repeated_tag_index[$tag.'_'.$level]-1; 
+					$current = &$current[$tag][$last_item_index]; 
+				} 
 	
-	        } elseif($type == "complete") { //Tags that ends in 1 line '<tag />' 
-	            //See if the key is already taken. 
-	            if(!isset($current[$tag])) { //New Key 
-	                $current[$tag] = $result; 
-	                $repeated_tag_index[$tag.'_'.$level] = 1; 
-	                if($priority == 'tag' and $attributes_data) $current[$tag. '_attr'] = $attributes_data;
+			} elseif($type == "complete") { //Tags that ends in 1 line '<tag />' 
+				//See if the key is already taken. 
+				if(!isset($current[$tag])) { //New Key 
+					$current[$tag] = $result; 
+					$repeated_tag_index[$tag.'_'.$level] = 1; 
+					if($priority == 'tag' and $attributes_data) $current[$tag. '_attr'] = $attributes_data;
 	 
-	            } else { //If taken, put all things inside a list(array) 
-	                if(isset($current[$tag][0]) and is_array($current[$tag])) {//If it is already an array...
+				} else { //If taken, put all things inside a list(array) 
+					if(isset($current[$tag][0]) and is_array($current[$tag])) {//If it is already an array...
 	 
-	                    // ...push the new element into that array. 
-	                    $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
+						// ...push the new element into that array. 
+						$current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
 	                      
-	                    if($priority == 'tag' and $get_attributes and $attributes_data) {
-	                         $current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
-	                     } 
-	                    $repeated_tag_index[$tag.'_'.$level]++; 
+						if($priority == 'tag' and $get_attributes and $attributes_data) {
+							 $current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
+						 } 
+						$repeated_tag_index[$tag.'_'.$level]++; 
 	
-	                } else { //If it is not an array... 
-	                    $current[$tag] = array($current[$tag],$result); //...Make it an array using using the existing value and the new value
-	                     $repeated_tag_index[$tag.'_'.$level] = 1; 
-	                    if($priority == 'tag' and $get_attributes) { 
-	                        if(isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
+					} else { //If it is not an array... 
+						$current[$tag] = array($current[$tag],$result); //...Make it an array using using the existing value and the new value
+						 $repeated_tag_index[$tag.'_'.$level] = 1; 
+						if($priority == 'tag' and $get_attributes) { 
+							if(isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
 	                              
-	                            $current[$tag]['0_attr'] = $current[$tag.'_attr']; 
-	                            unset($current[$tag.'_attr']); 
-	                        } 
+								$current[$tag]['0_attr'] = $current[$tag.'_attr']; 
+								unset($current[$tag.'_attr']); 
+							} 
 	                         
-	                        if($attributes_data) { 
-	                            $current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
-	                         } 
-	                    } 
-	                    $repeated_tag_index[$tag.'_'.$level]++; //0 and 1 index is already taken
-	                 } 
-	            } 
+							if($attributes_data) { 
+								$current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
+							 } 
+						} 
+						$repeated_tag_index[$tag.'_'.$level]++; //0 and 1 index is already taken
+					 } 
+				} 
 	
-	        } elseif($type == 'close') { //End of tag '</tag>' 
-	            $current = &$parent[$level-1]; 
-	        } 
-	    } 
+			} elseif($type == 'close') { //End of tag '</tag>' 
+				$current = &$parent[$level-1]; 
+			} 
+		} 
 	     
-	    return($xml_array); 
+		return($xml_array); 
 	}
 }  
 

Spacing +69 added lines, -69 removed lines

@@ -12,14 +12,14 @@ 
 if (!function_exists('ucword')) {
 	function ucword($string) {
 		$ret = array();
-		foreach(explode(' ', strtolower($string)) as $part)
+		foreach (explode(' ', strtolower($string)) as $part)
 			$ret[] = ucfirst($part);
 		return implode(' ', $ret);
 	}
 }
 	
 if (!function_exists("songlist_getIPData")) {
-	function songlist_getIPData($ip=false){
+	function songlist_getIPData($ip = false) {
 		$ret = array();
 		if (is_object($GLOBALS['xoopsUser'])) {
 			$ret['uid'] = $GLOBALS['xoopsUser']->getVar('uid');
@@ -27,13 +27,13 @@ 
 			$ret['email'] = $GLOBALS['xoopsUser']->getVar('email');
 		} else {
 			$ret['uid'] = 0;
-			$ret['uname'] = (isset($_REQUEST['uname'])?$_REQUEST['uname']:'');
-			$ret['email'] = (isset($_REQUEST['email'])?$_REQUEST['email']:'');
+			$ret['uname'] = (isset($_REQUEST['uname']) ? $_REQUEST['uname'] : '');
+			$ret['email'] = (isset($_REQUEST['email']) ? $_REQUEST['email'] : '');
 		}
 		$ret['agent'] = $_SERVER['HTTP_USER_AGENT'];
 		if (!$ip) {
-			if (isset($_SERVER["HTTP_X_FORWARDED_FOR"])){ 
-				$ip = (string)$_SERVER["HTTP_X_FORWARDED_FOR"]; 
+			if (isset($_SERVER["HTTP_X_FORWARDED_FOR"])) { 
+				$ip = (string) $_SERVER["HTTP_X_FORWARDED_FOR"]; 
 				$ret['is_proxied'] = true;
 				$proxy_ip = $_SERVER["REMOTE_ADDR"]; 
 				$ret['network-addy'] = @gethostbyaddr($ip); 
@@ -51,9 +51,9 @@ 
 				}
 				$ret['ip'] = $ip;
 				$ret['proxy-ip'] = $proxy_ip;
-			}else{ 
+			} else { 
 				$ret['is_proxied'] = false;
-				$ip = (string)$_SERVER["REMOTE_ADDR"]; 
+				$ip = (string) $_SERVER["REMOTE_ADDR"]; 
 				$ret['network-addy'] = @gethostbyaddr($ip); 
 				$ret['long'] = @ip2long($ip);
 				if (is_ipv6($ip)) {
@@ -86,10 +86,10 @@ 
 if (!function_exists("is_ipv6")) {
 	function is_ipv6($ip = "") 
 	{ 
-		if ($ip == "") 
+		if ($ip=="") 
 			return false;
 			
-		if (substr_count($ip,":") > 0){ 
+		if (substr_count($ip, ":")>0) { 
 			return true; 
 		} else { 
 			return false; 
@@ -98,7 +98,7 @@ 
 }
 
 if (!function_exists('songlist_getFilterElement')) {
-	function songlist_getFilterElement($filter, $field, $sort='created', $op = '', $fct = '') {
+	function songlist_getFilterElement($filter, $field, $sort = 'created', $op = '', $fct = '') {
 		$components = songlist_getFilterURLComponents($filter, $field, $sort);
 		$ele = false;
 		include_once('songlist.object.php');
@@ -106,41 +106,41 @@ 
 		    case 'gid':
 				if ($op!='genre') {
 					$ele = new SonglistFormSelectGenre('', 'filter_'.$field.'', $components['value'], 1, false);
-			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter']) ? '|' : '').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator']) ? '+\','.$components['operator'].'\'' : '').',\'_self\')"');
 				}
 				break;
 		    case 'vcid':
 				if ($op!='voice') {
 					$ele = new SonglistFormSelectVoice('', 'filter_'.$field.'', $components['value'], 1, false);
-			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter']) ? '|' : '').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator']) ? '+\','.$components['operator'].'\'' : '').',\'_self\')"');
 				}
 				break;				
 			case 'cid':
 				if ($op!='category') {
 					$ele = new SonglistFormSelectCategory('', 'filter_'.$field.'', $components['value'], 1, false);
-			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter']) ? '|' : '').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator']) ? '+\','.$components['operator'].'\'' : '').',\'_self\')"');
 				}
 				break;
 		    case 'pid':
 				$ele = new SonglistFormSelectCategory('', 'filter_'.$field.'', $components['value'], 1, false);
-			    $ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+			    $ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter']) ? '|' : '').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator']) ? '+\','.$components['operator'].'\'' : '').',\'_self\')"');
 				break;
 			case 'abid':
 				if ($op!='albums') {
 					$ele = new SonglistFormSelectAlbum('', 'filter_'.$field.'', $components['value'], 1, false);
-			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter']) ? '|' : '').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator']) ? '+\','.$components['operator'].'\'' : '').',\'_self\')"');
 				}
 				break;
 			case 'aid':
 				if ($op!='artists') {
 					$ele = new SonglistFormSelectArtist('', 'filter_'.$field.'', $components['value'], 1, false);
-			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter']) ? '|' : '').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator']) ? '+\','.$components['operator'].'\'' : '').',\'_self\')"');
 				}
 				break;				
 			case 'sid':
 				if ($op!='songs') {
 					$ele = new SonglistFormSelectSong('', 'filter_'.$field.'', $components['value'], 1, false);
-			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+			    	$ele->setExtra('onchange="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter']) ? '|' : '').$field.',\'+this.options[this.selectedIndex].value'.(!empty($components['operator']) ? '+\','.$components['operator'].'\'' : '').',\'_self\')"');
 				}
 				break;				
 			case 'name':
@@ -158,7 +158,7 @@ 
 		    	$ele = new XoopsFormElementTray('');
 				$ele->addElement(new XoopsFormText('', 'filter_'.$field.'', 11, 40, $components['value']));
 				$button = new XoopsFormButton('', 'button_'.$field.'', '[+]');
-		    	$button->setExtra('onclick="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter'])?'|':'').$field.',\'+$(\'#filter_'.$field.'\').val()'.(!empty($components['operator'])?'+\','.$components['operator'].'\'':'').',\'_self\')"');
+		    	$button->setExtra('onclick="window.open(\''.$_SERVER['PHP_SELF'].'?'.$components['extra'].'&filter='.$components['filter'].(!empty($components['filter']) ? '|' : '').$field.',\'+$(\'#filter_'.$field.'\').val()'.(!empty($components['operator']) ? '+\','.$components['operator'].'\'' : '').',\'_self\')"');
 		    	$ele->addElement($button);
 		    	break;
 		}
@@ -167,13 +167,13 @@ 
 }
 
 if (!function_exists('songlist_getFilterURLComponents')) {
-	function songlist_getFilterURLComponents($filter, $field, $sort='created') {
+	function songlist_getFilterURLComponents($filter, $field, $sort = 'created') {
 		$parts = explode('|', $filter);
 		$ret = array();
 		$value = '';
 		$ele_value = '';
 		$operator = '';
-    	foreach($parts as $part) {
+    	foreach ($parts as $part) {
     		$var = explode(',', $part);
     		if (count($var)>1) {
 	    		if ($var[0]==$field) {
@@ -186,14 +186,14 @@ 
     		}
     	}
     	$pagenav = array();
-    	$pagenav['op'] = isset($_REQUEST['op'])?$_REQUEST['op']:"videos";
-		$pagenav['fct'] = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list";
-		$pagenav['limit'] = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
+    	$pagenav['op'] = isset($_REQUEST['op']) ? $_REQUEST['op'] : "videos";
+		$pagenav['fct'] = isset($_REQUEST['fct']) ? $_REQUEST['fct'] : "list";
+		$pagenav['limit'] = !empty($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 30;
 		$pagenav['start'] = 0;
-		$pagenav['order'] = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC';
-		$pagenav['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':$sort;
+		$pagenav['order'] = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
+		$pagenav['sort'] = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : $sort;
     	$retb = array();
-		foreach($pagenav as $key=>$value) {
+		foreach ($pagenav as $key=>$value) {
 			$retb[] = "$key=$value";
 		}
 		return array('value'=>$ele_value, 'field'=>$field, 'operator'=>$operator, 'filter'=>implode('|', $ret), 'extra'=>implode('&', $retb));
@@ -203,7 +203,7 @@ 
 if (!function_exists("songlist_obj2array")) {
 	function songlist_obj2array($objects) {
 		$ret = array();
-		foreach((array)$objects as $key => $value) {
+		foreach ((array) $objects as $key => $value) {
 			if (is_a($value, 'stdClass')) {
 				$ret[$key] = songlist_obj2array($value);
 			} elseif (is_array($value)) {
@@ -223,7 +223,7 @@ 
 		$GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist');
 		$GLOBALS['songlistModuleConfig'] = $config_handler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
 	
-		if (!empty($GLOBALS['songlistModuleConfig']['bitly_username'])&&!empty($GLOBALS['songlistModuleConfig']['bitly_apikey'])) {
+		if (!empty($GLOBALS['songlistModuleConfig']['bitly_username']) && !empty($GLOBALS['songlistModuleConfig']['bitly_apikey'])) {
 			$source_url = $GLOBALS['songlistModuleConfig']['bitly_apiurl'].'/shorten?login='.$GLOBALS['songlistModuleConfig']['bitly_username'].'&apiKey='.$GLOBALS['songlistModuleConfig']['bitly_apikey'].'&format=json&longUrl='.urlencode($url);
 			$cookies = XOOPS_ROOT_PATH.'/uploads/songlist_'.md5($GLOBALS['songlistModuleConfig']['bitly_apikey']).'.cookie';
 			if (!$ch = curl_init($source_url)) {
@@ -237,7 +237,7 @@ 
 			$data = curl_exec($ch); 
 			curl_close($ch); 
 			$result = songlist_object2array(json_decode($data));
-			if ($result['status_code']=200) {
+			if ($result['status_code'] = 200) {
 				if (!empty($result['data']['url']))
 					return $result['data']['url'];
 				else 
@@ -251,10 +251,10 @@ 
 }
 
 if (!function_exists("songlist_xml2array")) {
-	function songlist_xml2array($contents, $get_attributes=1, $priority = 'tag') { 
-	    if(!$contents) return array(); 
+	function songlist_xml2array($contents, $get_attributes = 1, $priority = 'tag') { 
+	    if (!$contents) return array(); 
 	
-	    if(!function_exists('xml_parser_create')) { 
+	    if (!function_exists('xml_parser_create')) { 
 	        return array(); 
 	    } 
 	
@@ -266,7 +266,7 @@ 
 	    xml_parse_into_struct($parser, trim($contents), $xml_values); 
 	    xml_parser_free($parser); 
 	
-	    if(!$xml_values) return;//Hmm... 
+	    if (!$xml_values) return; //Hmm... 
 	
 	    //Initializations 
 	    $xml_array = array(); 
@@ -277,50 +277,50 @@ 
 	    $current = &$xml_array; //Refference 
 	
 	    //Go through the tags. 
-	    $repeated_tag_index = array();//Multiple tags with same name will be turned into an array
-	     foreach($xml_values as $data) { 
-	        unset($attributes,$value);//Remove existing values, or there will be trouble
+	    $repeated_tag_index = array(); //Multiple tags with same name will be turned into an array
+	     foreach ($xml_values as $data) { 
+	        unset($attributes, $value); //Remove existing values, or there will be trouble
 	 
 	        //This command will extract these variables into the foreach scope 
 	        // tag(string), type(string), level(int), attributes(array). 
-	        extract($data);//We could use the array by itself, but this cooler. 
+	        extract($data); //We could use the array by itself, but this cooler. 
 	
 	        $result = array(); 
 	        $attributes_data = array(); 
 	         
-	        if(isset($value)) { 
-	            if($priority == 'tag') $result = $value; 
+	        if (isset($value)) { 
+	            if ($priority=='tag') $result = $value; 
 	            else $result['value'] = $value; //Put the value in a assoc array if we are in the 'Attribute' mode
 	         } 
 	
 	        //Set the attributes too. 
-	        if(isset($attributes) and $get_attributes) { 
-	            foreach($attributes as $attr => $val) { 
-	                if($priority == 'tag') $attributes_data[$attr] = $val; 
+	        if (isset($attributes) and $get_attributes) { 
+	            foreach ($attributes as $attr => $val) { 
+	                if ($priority=='tag') $attributes_data[$attr] = $val; 
 	                else $result['attr'][$attr] = $val; //Set all the attributes in a array called 'attr'
 	             } 
 	        } 
 	
 	        //See tag status and do the needed. 
-	        if($type == "open") {//The starting of the tag '<tag>' 
+	        if ($type=="open") {//The starting of the tag '<tag>' 
 	            $parent[$level-1] = &$current; 
-	            if(!is_array($current) or (!in_array($tag, array_keys($current)))) { //Insert New tag
+	            if (!is_array($current) or (!in_array($tag, array_keys($current)))) { //Insert New tag
 	                 $current[$tag] = $result; 
-	                if($attributes_data) $current[$tag. '_attr'] = $attributes_data;
+	                if ($attributes_data) $current[$tag.'_attr'] = $attributes_data;
 	                 $repeated_tag_index[$tag.'_'.$level] = 1; 
 	
 	                $current = &$current[$tag]; 
 	
 	            } else { //There was another element with the same tag name 
 	
-	                if(isset($current[$tag][0])) {//If there is a 0th element it is already an array
+	                if (isset($current[$tag][0])) {//If there is a 0th element it is already an array
 	                     $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
 	                     $repeated_tag_index[$tag.'_'.$level]++; 
 	                } else {//This section will make the value an array if multiple tags with the same name appear together
-	                     $current[$tag] = array($current[$tag],$result);//This will combine the existing item and the new item together to make an array
+	                     $current[$tag] = array($current[$tag], $result); //This will combine the existing item and the new item together to make an array
 	                     $repeated_tag_index[$tag.'_'.$level] = 2; 
 	                     
-	                    if(isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
+	                    if (isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
 	                         $current[$tag]['0_attr'] = $current[$tag.'_attr']; 
 	                        unset($current[$tag.'_attr']); 
 	                    } 
@@ -330,43 +330,43 @@ 
 	                $current = &$current[$tag][$last_item_index]; 
 	            } 
 	
-	        } elseif($type == "complete") { //Tags that ends in 1 line '<tag />' 
+	        } elseif ($type=="complete") { //Tags that ends in 1 line '<tag />' 
 	            //See if the key is already taken. 
-	            if(!isset($current[$tag])) { //New Key 
+	            if (!isset($current[$tag])) { //New Key 
 	                $current[$tag] = $result; 
 	                $repeated_tag_index[$tag.'_'.$level] = 1; 
-	                if($priority == 'tag' and $attributes_data) $current[$tag. '_attr'] = $attributes_data;
+	                if ($priority=='tag' and $attributes_data) $current[$tag.'_attr'] = $attributes_data;
 	 
 	            } else { //If taken, put all things inside a list(array) 
-	                if(isset($current[$tag][0]) and is_array($current[$tag])) {//If it is already an array...
+	                if (isset($current[$tag][0]) and is_array($current[$tag])) {//If it is already an array...
 	 
 	                    // ...push the new element into that array. 
 	                    $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
 	                      
-	                    if($priority == 'tag' and $get_attributes and $attributes_data) {
-	                         $current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
+	                    if ($priority=='tag' and $get_attributes and $attributes_data) {
+	                         $current[$tag][$repeated_tag_index[$tag.'_'.$level].'_attr'] = $attributes_data;
 	                     } 
 	                    $repeated_tag_index[$tag.'_'.$level]++; 
 	
 	                } else { //If it is not an array... 
-	                    $current[$tag] = array($current[$tag],$result); //...Make it an array using using the existing value and the new value
+	                    $current[$tag] = array($current[$tag], $result); //...Make it an array using using the existing value and the new value
 	                     $repeated_tag_index[$tag.'_'.$level] = 1; 
-	                    if($priority == 'tag' and $get_attributes) { 
-	                        if(isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
+	                    if ($priority=='tag' and $get_attributes) { 
+	                        if (isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
 	                              
 	                            $current[$tag]['0_attr'] = $current[$tag.'_attr']; 
 	                            unset($current[$tag.'_attr']); 
 	                        } 
 	                         
-	                        if($attributes_data) { 
-	                            $current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
+	                        if ($attributes_data) { 
+	                            $current[$tag][$repeated_tag_index[$tag.'_'.$level].'_attr'] = $attributes_data;
 	                         } 
 	                    } 
 	                    $repeated_tag_index[$tag.'_'.$level]++; //0 and 1 index is already taken
 	                 } 
 	            } 
 	
-	        } elseif($type == 'close') { //End of tag '</tag>' 
+	        } elseif ($type=='close') { //End of tag '</tag>' 
 	            $current = &$parent[$level-1]; 
 	        } 
 	    } 
@@ -376,13 +376,13 @@ 
 }  
 
 if (!function_exists("songlist_toXml")) { 
-	function songlist_toXml($array, $name, $standalone=false, $beginning=true, $nested) {
+	function songlist_toXml($array, $name, $standalone = false, $beginning = true, $nested) {
 		
 		if ($beginning) {
 			if ($standalone)
 				header("content-type:text/xml;charset="._CHARSET);
-			$output .= '<'.'?'.'xml version="1.0" encoding="'._CHARSET.'"'.'?'.'>' . "\n";    
-			$output .= '<' . $name . '>' . "\n";
+			$output .= '<'.'?'.'xml version="1.0" encoding="'._CHARSET.'"'.'?'.'>'."\n";    
+			$output .= '<'.$name.'>'."\n";
 			$nested = 0;
 		}    
 		
@@ -390,15 +390,15 @@ 
 			foreach ($array as $key=>$value) {
 				$nested++;	
 				if (is_array($value)) {
-					$output .= str_repeat("\t", (1 * $nested)) . '<' . (is_string($key) ? $key : $name.'_' . $key) . '>' . "\n";
+					$output .= str_repeat("\t", (1*$nested)).'<'.(is_string($key) ? $key : $name.'_'.$key).'>'."\n";
 					$nested++;				
 					$output .= songlist_toXml($value, $name, false, false, $nested);
 					$nested--;
-					$output .= str_repeat("\t", (1 * $nested)) . '</' . (is_string($key) ? $key : $name.'_' . $key) . '>' . "\n";
+					$output .= str_repeat("\t", (1*$nested)).'</'.(is_string($key) ? $key : $name.'_'.$key).'>'."\n";
 				} else {
 					if (strlen($value)>0) {
 					$nested++;				
-						$output .= str_repeat("\t", (1 * $nested)) . '  <' . (is_string($key) ? $key : $name.'_' . $key) . '>' . trim($value) . '</' . (is_string($key) ? $key : $name.'_' . $key) . '>' . "\n";
+						$output .= str_repeat("\t", (1*$nested)).'  <'.(is_string($key) ? $key : $name.'_'.$key).'>'.trim($value).'</'.(is_string($key) ? $key : $name.'_'.$key).'>'."\n";
 						$nested--;
 					}
 				}
@@ -406,12 +406,12 @@ 
 			}
 		} elseif (strlen($array)>0) {
 			$nested++; 
-			$output .= str_repeat("\t", (1 * $nested)) . trim($array) ."\n";
+			$output .= str_repeat("\t", (1*$nested)).trim($array)."\n";
 			$nested--;
 		}
 			
 		if ($beginning) {
-			$output .= '</' . $name . '>';
+			$output .= '</'.$name.'>';
 			return $output;
 		} else {
 			return $output;

Braces +43 added lines, -21 removed lines

@@ -12,8 +12,9 @@ 
 if (!function_exists('ucword')) {
 	function ucword($string) {
 		$ret = array();
-		foreach(explode(' ', strtolower($string)) as $part)
-			$ret[] = ucfirst($part);
+		foreach(explode(' ', strtolower($string)) as $part) {
+					$ret[] = ucfirst($part);
+		}
 		return implode(' ', $ret);
 	}
 }
@@ -51,7 +52,7 @@ 
 				}
 				$ret['ip'] = $ip;
 				$ret['proxy-ip'] = $proxy_ip;
-			}else{ 
+			} else{ 
 				$ret['is_proxied'] = false;
 				$ip = (string)$_SERVER["REMOTE_ADDR"]; 
 				$ret['network-addy'] = @gethostbyaddr($ip); 
@@ -86,8 +87,9 @@ 
 if (!function_exists("is_ipv6")) {
 	function is_ipv6($ip = "") 
 	{ 
-		if ($ip == "") 
-			return false;
+		if ($ip == "") {
+					return false;
+		}
 			
 		if (substr_count($ip,":") > 0){ 
 			return true; 
@@ -178,8 +180,9 @@ 
     		if (count($var)>1) {
 	    		if ($var[0]==$field) {
 	    			$ele_value = $var[1];
-	    			if (isset($var[2]))
-	    				$operator = $var[2];
+	    			if (isset($var[2])) {
+	    				    				$operator = $var[2];
+	    			}
 	    		} elseif ($var[0]!=1) {
 	    			$ret[] = implode(',', $var);
 	    		}
@@ -238,10 +241,11 @@ 
 			curl_close($ch); 
 			$result = songlist_object2array(json_decode($data));
 			if ($result['status_code']=200) {
-				if (!empty($result['data']['url']))
-					return $result['data']['url'];
-				else 
-					return $url;
+				if (!empty($result['data']['url'])) {
+									return $result['data']['url'];
+				} else {
+									return $url;
+				}
 			}
 			return $url;
 		} else {
@@ -252,7 +256,9 @@ 
 
 if (!function_exists("songlist_xml2array")) {
 	function songlist_xml2array($contents, $get_attributes=1, $priority = 'tag') { 
-	    if(!$contents) return array(); 
+	    if(!$contents) {
+	    	return array();
+	    }
 	
 	    if(!function_exists('xml_parser_create')) { 
 	        return array(); 
@@ -266,7 +272,10 @@ 
 	    xml_parse_into_struct($parser, trim($contents), $xml_values); 
 	    xml_parser_free($parser); 
 	
-	    if(!$xml_values) return;//Hmm... 
+	    if(!$xml_values) {
+	    	return;
+	    }
+	    //Hmm... 
 	
 	    //Initializations 
 	    $xml_array = array(); 
@@ -289,15 +298,23 @@ 
 	        $attributes_data = array(); 
 	         
 	        if(isset($value)) { 
-	            if($priority == 'tag') $result = $value; 
-	            else $result['value'] = $value; //Put the value in a assoc array if we are in the 'Attribute' mode
+	            if($priority == 'tag') {
+	            	$result = $value;
+	            } else {
+	            	$result['value'] = $value;
+	            }
+	            //Put the value in a assoc array if we are in the 'Attribute' mode
 	         } 
 	
 	        //Set the attributes too. 
 	        if(isset($attributes) and $get_attributes) { 
 	            foreach($attributes as $attr => $val) { 
-	                if($priority == 'tag') $attributes_data[$attr] = $val; 
-	                else $result['attr'][$attr] = $val; //Set all the attributes in a array called 'attr'
+	                if($priority == 'tag') {
+	                	$attributes_data[$attr] = $val;
+	                } else {
+	                	$result['attr'][$attr] = $val;
+	                }
+	                //Set all the attributes in a array called 'attr'
 	             } 
 	        } 
 	
@@ -306,7 +323,9 @@ 
 	            $parent[$level-1] = &$current; 
 	            if(!is_array($current) or (!in_array($tag, array_keys($current)))) { //Insert New tag
 	                 $current[$tag] = $result; 
-	                if($attributes_data) $current[$tag. '_attr'] = $attributes_data;
+	                if($attributes_data) {
+	                	$current[$tag. '_attr'] = $attributes_data;
+	                }
 	                 $repeated_tag_index[$tag.'_'.$level] = 1; 
 	
 	                $current = &$current[$tag]; 
@@ -335,7 +354,9 @@ 
 	            if(!isset($current[$tag])) { //New Key 
 	                $current[$tag] = $result; 
 	                $repeated_tag_index[$tag.'_'.$level] = 1; 
-	                if($priority == 'tag' and $attributes_data) $current[$tag. '_attr'] = $attributes_data;
+	                if($priority == 'tag' and $attributes_data) {
+	                	$current[$tag. '_attr'] = $attributes_data;
+	                }
 	 
 	            } else { //If taken, put all things inside a list(array) 
 	                if(isset($current[$tag][0]) and is_array($current[$tag])) {//If it is already an array...
@@ -379,8 +400,9 @@ 
 	function songlist_toXml($array, $name, $standalone=false, $beginning=true, $nested) {
 		
 		if ($beginning) {
-			if ($standalone)
-				header("content-type:text/xml;charset="._CHARSET);
+			if ($standalone) {
+							header("content-type:text/xml;charset="._CHARSET);
+			}
 			$output .= '<'.'?'.'xml version="1.0" encoding="'._CHARSET.'"'.'?'.'>' . "\n";    
 			$output .= '<' . $name . '>' . "\n";
 			$nested = 0;

htdocs/modules/songlist/include/update.php

Spacing +2 added lines, -2 removed lines

@@ -22,9 +22,9 @@
 			xoops_error($sql, 'SQL Executed Successfully!!!');
 		}
 	} elseif (is_array($sql)) {
-		foreach($sql as $id => $question) {
+		foreach ($sql as $id => $question) {
 			if (is_array($question)) {
-				foreach($question as $kquestion => $questionb) {
+				foreach ($question as $kquestion => $questionb) {
 					if ($GLOBALS['xoopsDB']->queryF($kquestion)) {
 						xoops_error($kquestion, 'SQL Executed Successfully!!!');
 						xoops_module_update_vs_executesql($questionb);

htdocs/modules/songlist/include/formselectsinger.php

Indentation +190 added lines, -190 removed lines

@@ -54,215 +54,215 @@
  */
 class SonglistFormSelectSinger extends XoopsFormElement
 {
-    /**
-     * Options
-     *
-     * @var array
-     * @access private
-     */
-    var $_options = array();
+	/**
+	 * Options
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_options = array();
 
-    /**
-     * Allow multiple selections?
-     *
-     * @var bool
-     * @access private
-     */
-    var $_multiple = false;
+	/**
+	 * Allow multiple selections?
+	 *
+	 * @var bool
+	 * @access private
+	 */
+	var $_multiple = false;
 
-    /**
-     * Number of rows. "1" makes a dropdown list.
-     *
-     * @var int
-     * @access private
-     */
-    var $_size;
+	/**
+	 * Number of rows. "1" makes a dropdown list.
+	 *
+	 * @var int
+	 * @access private
+	 */
+	var $_size;
 
-    /**
-     * Pre-selcted values
-     *
-     * @var array
-     * @access private
-     */
-    var $_value = array();
+	/**
+	 * Pre-selcted values
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_value = array();
 
-    /**
-     * Constructor
-     *
-     * @param string $caption Caption
-     * @param string $name "name" attribute
-     * @param mixed $value Pre-selected value (or array of them).
-     * @param int $size Number or rows. "1" makes a drop-down-list
-     * @param bool $multiple Allow multiple selections?
-     */
-    function SonglistFormSelectSinger($caption, $name, $value = null, $size = 1, $multiple = false)
-    {
-    	xoops_loadLanguage('enum', 'songlist');
+	/**
+	 * Constructor
+	 *
+	 * @param string $caption Caption
+	 * @param string $name "name" attribute
+	 * @param mixed $value Pre-selected value (or array of them).
+	 * @param int $size Number or rows. "1" makes a drop-down-list
+	 * @param bool $multiple Allow multiple selections?
+	 */
+	function SonglistFormSelectSinger($caption, $name, $value = null, $size = 1, $multiple = false)
+	{
+		xoops_loadLanguage('enum', 'songlist');
     	
-        $this->setCaption($caption);
-        $this->setName($name);
-        $this->_multiple = $multiple;
-        $this->_size = intval($size);
-        if (isset($value)) {
-            $this->setValue($value);
-        }
+		$this->setCaption($caption);
+		$this->setName($name);
+		$this->_multiple = $multiple;
+		$this->_size = intval($size);
+		if (isset($value)) {
+			$this->setValue($value);
+		}
 		$this->addOption('_', _MI_SONGLIST_NONE);
 		foreach(array('_ENUM_SONGLIST_SOLO','_ENUM_SONGLIST_DUET') as $enum) 
 			$this->addOption($enum, constant($enum));
 
-    }
+	}
 
-    /**
-     * Are multiple selections allowed?
-     *
-     * @return bool
-     */
-    function isMultiple()
-    {
-        return $this->_multiple;
-    }
+	/**
+	 * Are multiple selections allowed?
+	 *
+	 * @return bool
+	 */
+	function isMultiple()
+	{
+		return $this->_multiple;
+	}
 
-    /**
-     * Get the size
-     *
-     * @return int
-     */
-    function getSize()
-    {
-        return $this->_size;
-    }
+	/**
+	 * Get the size
+	 *
+	 * @return int
+	 */
+	function getSize()
+	{
+		return $this->_size;
+	}
 
-    /**
-     * Get an array of pre-selected values
-     *
-     * @param bool $encode To sanitizer the text?
-     * @return array
-     */
-    function getValue($encode = false)
-    {
-        if (! $encode) {
-            return $this->_value;
-        }
-        $value = array();
-        foreach($this->_value as $val) {
-            $value[] = $val ? htmlspecialchars($val, ENT_QUOTES) : $val;
-        }
-        return $value;
-    }
+	/**
+	 * Get an array of pre-selected values
+	 *
+	 * @param bool $encode To sanitizer the text?
+	 * @return array
+	 */
+	function getValue($encode = false)
+	{
+		if (! $encode) {
+			return $this->_value;
+		}
+		$value = array();
+		foreach($this->_value as $val) {
+			$value[] = $val ? htmlspecialchars($val, ENT_QUOTES) : $val;
+		}
+		return $value;
+	}
 
-    /**
-     * Set pre-selected values
-     *
-     * @param  $value mixed
-     */
-    function setValue($value)
-    {
-        if (is_array($value)) {
-            foreach($value as $v) {
-                $this->_value[] = $v;
-            }
-        } elseif (isset($value)) {
-            $this->_value[] = $value;
-        }
-    }
+	/**
+	 * Set pre-selected values
+	 *
+	 * @param  $value mixed
+	 */
+	function setValue($value)
+	{
+		if (is_array($value)) {
+			foreach($value as $v) {
+				$this->_value[] = $v;
+			}
+		} elseif (isset($value)) {
+			$this->_value[] = $value;
+		}
+	}
 
-    /**
-     * Add an option
-     *
-     * @param string $value "value" attribute
-     * @param string $name "name" attribute
-     */
-    function addOption($value, $name = '')
-    {
-        if ($name != '') {
-            $this->_options[$value] = $name;
-        } else {
-            $this->_options[$value] = $value;
-        }
-    }
+	/**
+	 * Add an option
+	 *
+	 * @param string $value "value" attribute
+	 * @param string $name "name" attribute
+	 */
+	function addOption($value, $name = '')
+	{
+		if ($name != '') {
+			$this->_options[$value] = $name;
+		} else {
+			$this->_options[$value] = $value;
+		}
+	}
 
-    /**
-     * Add multiple options
-     *
-     * @param array $options Associative array of value->name pairs
-     */
-    function addOptionArray($options)
-    {
-        if (is_array($options)) {
-            foreach($options as $k => $v) {
-                $this->addOption($k, $v);
-            }
-        }
-    }
+	/**
+	 * Add multiple options
+	 *
+	 * @param array $options Associative array of value->name pairs
+	 */
+	function addOptionArray($options)
+	{
+		if (is_array($options)) {
+			foreach($options as $k => $v) {
+				$this->addOption($k, $v);
+			}
+		}
+	}
 
-    /**
-     * Get an array with all the options
-     *
-     * Note: both name and value should be sanitized. However for backward compatibility, only value is sanitized for now.
-     *
-     * @param int $encode To sanitizer the text? potential values: 0 - skip; 1 - only for value; 2 - for both value and name
-     * @return array Associative array of value->name pairs
-     */
-    function getOptions($encode = false)
-    {
-        if (! $encode) {
-            return $this->_options;
-        }
-        $value = array();
-        foreach($this->_options as $val => $name) {
-            $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode > 1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
-        }
-        return $value;
-    }
+	/**
+	 * Get an array with all the options
+	 *
+	 * Note: both name and value should be sanitized. However for backward compatibility, only value is sanitized for now.
+	 *
+	 * @param int $encode To sanitizer the text? potential values: 0 - skip; 1 - only for value; 2 - for both value and name
+	 * @return array Associative array of value->name pairs
+	 */
+	function getOptions($encode = false)
+	{
+		if (! $encode) {
+			return $this->_options;
+		}
+		$value = array();
+		foreach($this->_options as $val => $name) {
+			$value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode > 1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
+		}
+		return $value;
+	}
 
-    /**
-     * Prepare HTML for output
-     *
-     * @return string HTML
-     */
-    function render()
-    {
-        $ele_name = $this->getName();
+	/**
+	 * Prepare HTML for output
+	 *
+	 * @return string HTML
+	 */
+	function render()
+	{
+		$ele_name = $this->getName();
 		$ele_title = $this->getTitle();
-        $ele_value = $this->getValue();
-        $ele_options = $this->getOptions();
-        $ret = '<select size="'.$this->getSize().'"'.$this->getExtra();
-        if ($this->isMultiple() != false) {
-            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'. $ele_title. '" multiple="multiple">' ;
-        } else {
-            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'. $ele_title. '">' ;
-        }
-        foreach($ele_options as $value => $name) {
-            $ret .= '<option value="'.htmlspecialchars($value, ENT_QUOTES).'"';
-            if (count($ele_value) > 0 && in_array($value, $ele_value)) {
-                $ret .= ' selected="selected"';
-            }
-            $ret .= '>'.$name.'</option>' ;
-        }
-        $ret .= '</select>';
-        return $ret;
-    }
+		$ele_value = $this->getValue();
+		$ele_options = $this->getOptions();
+		$ret = '<select size="'.$this->getSize().'"'.$this->getExtra();
+		if ($this->isMultiple() != false) {
+			$ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'. $ele_title. '" multiple="multiple">' ;
+		} else {
+			$ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'. $ele_title. '">' ;
+		}
+		foreach($ele_options as $value => $name) {
+			$ret .= '<option value="'.htmlspecialchars($value, ENT_QUOTES).'"';
+			if (count($ele_value) > 0 && in_array($value, $ele_value)) {
+				$ret .= ' selected="selected"';
+			}
+			$ret .= '>'.$name.'</option>' ;
+		}
+		$ret .= '</select>';
+		return $ret;
+	}
 
-    /**
-     * Render custom javascript validation code
-     *
-     * @seealso XoopsForm::renderValidationJS
-     */
-    function renderValidationJS()
-    {
-        // render custom validation code if any
-        if (! empty($this->customValidationCode)) {
-            return implode("\n", $this->customValidationCode);
-            // generate validation code if required
-        } elseif ($this->isRequired()) {
-            $eltname = $this->getName();
-            $eltcaption = $this->getCaption();
-            $eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
-            $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
-            return "\nvar hasSelected = false; var selectBox = myform.{$eltname};"."for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true) { hasSelected = true; break; } }"."if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
-        }
-        return '';
-    }
+	/**
+	 * Render custom javascript validation code
+	 *
+	 * @seealso XoopsForm::renderValidationJS
+	 */
+	function renderValidationJS()
+	{
+		// render custom validation code if any
+		if (! empty($this->customValidationCode)) {
+			return implode("\n", $this->customValidationCode);
+			// generate validation code if required
+		} elseif ($this->isRequired()) {
+			$eltname = $this->getName();
+			$eltcaption = $this->getCaption();
+			$eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
+			$eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
+			return "\nvar hasSelected = false; var selectBox = myform.{$eltname};"."for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true) { hasSelected = true; break; } }"."if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
+		}
+		return '';
+	}
 }
 
 ?>
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -107,7 +107,7 @@ 
             $this->setValue($value);
         }
 		$this->addOption('_', _MI_SONGLIST_NONE);
-		foreach(array('_ENUM_SONGLIST_SOLO','_ENUM_SONGLIST_DUET') as $enum) 
+		foreach (array('_ENUM_SONGLIST_SOLO', '_ENUM_SONGLIST_DUET') as $enum) 
 			$this->addOption($enum, constant($enum));
 
     }
@@ -140,11 +140,11 @@ 
      */
     function getValue($encode = false)
     {
-        if (! $encode) {
+        if (!$encode) {
             return $this->_value;
         }
         $value = array();
-        foreach($this->_value as $val) {
+        foreach ($this->_value as $val) {
             $value[] = $val ? htmlspecialchars($val, ENT_QUOTES) : $val;
         }
         return $value;
@@ -158,7 +158,7 @@ 
     function setValue($value)
     {
         if (is_array($value)) {
-            foreach($value as $v) {
+            foreach ($value as $v) {
                 $this->_value[] = $v;
             }
         } elseif (isset($value)) {
@@ -174,7 +174,7 @@ 
      */
     function addOption($value, $name = '')
     {
-        if ($name != '') {
+        if ($name!='') {
             $this->_options[$value] = $name;
         } else {
             $this->_options[$value] = $value;
@@ -189,7 +189,7 @@ 
     function addOptionArray($options)
     {
         if (is_array($options)) {
-            foreach($options as $k => $v) {
+            foreach ($options as $k => $v) {
                 $this->addOption($k, $v);
             }
         }
@@ -205,12 +205,12 @@ 
      */
     function getOptions($encode = false)
     {
-        if (! $encode) {
+        if (!$encode) {
             return $this->_options;
         }
         $value = array();
-        foreach($this->_options as $val => $name) {
-            $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode > 1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
+        foreach ($this->_options as $val => $name) {
+            $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode>1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
         }
         return $value;
     }
@@ -227,17 +227,17 @@ 
         $ele_value = $this->getValue();
         $ele_options = $this->getOptions();
         $ret = '<select size="'.$this->getSize().'"'.$this->getExtra();
-        if ($this->isMultiple() != false) {
-            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'. $ele_title. '" multiple="multiple">' ;
+        if ($this->isMultiple()!=false) {
+            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'.$ele_title.'" multiple="multiple">';
         } else {
-            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'. $ele_title. '">' ;
+            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'.$ele_title.'">';
         }
-        foreach($ele_options as $value => $name) {
+        foreach ($ele_options as $value => $name) {
             $ret .= '<option value="'.htmlspecialchars($value, ENT_QUOTES).'"';
-            if (count($ele_value) > 0 && in_array($value, $ele_value)) {
+            if (count($ele_value)>0 && in_array($value, $ele_value)) {
                 $ret .= ' selected="selected"';
             }
-            $ret .= '>'.$name.'</option>' ;
+            $ret .= '>'.$name.'</option>';
         }
         $ret .= '</select>';
         return $ret;
@@ -251,7 +251,7 @@ 
     function renderValidationJS()
     {
         // render custom validation code if any
-        if (! empty($this->customValidationCode)) {
+        if (!empty($this->customValidationCode)) {
             return implode("\n", $this->customValidationCode);
             // generate validation code if required
         } elseif ($this->isRequired()) {

Braces +3 added lines, -2 removed lines

@@ -107,8 +107,9 @@
             $this->setValue($value);
         }
 		$this->addOption('_', _MI_SONGLIST_NONE);
-		foreach(array('_ENUM_SONGLIST_SOLO','_ENUM_SONGLIST_DUET') as $enum) 
-			$this->addOption($enum, constant($enum));
+		foreach(array('_ENUM_SONGLIST_SOLO','_ENUM_SONGLIST_DUET') as $enum) {
+					$this->addOption($enum, constant($enum));
+		}
 
     }
 

htdocs/modules/songlist/include/songlist.form.php

Indentation +6 added lines, -6 removed lines

@@ -243,12 +243,12 @@
 	
 	
 	/**
-	* Get {@link XoopsThemeForm} for editing a user
-	*
-	* @param object $user {@link XoopsUser} to edit
-	*
-	* @return object
-	*/
+	 * Get {@link XoopsThemeForm} for editing a user
+	 *
+	 * @param object $user {@link XoopsUser} to edit
+	 *
+	 * @return object
+	 */
 	function songlist_getUserSearchForm($action = false)
 	{
 		

Spacing +261 added lines, -261 removed lines

@@ -12,7 +12,7 @@ 
 	 */
 	function songlist_getFieldForm(&$field, $action = false)
 	{
-		if ( $action === false ) {
+		if ($action===false) {
 			$action = $_SERVER['PHP_SELF'];
 		}
 		
@@ -35,7 +35,7 @@ 
 		$category_handler = xoops_getmodulehandler('category', 'songlist');
 		$cat_select = new XoopsFormSelect(_FRM_SONGLIST_FIELDS_CATEGORY, 'cids', $fieldcid, 7, true);
 		$cat_select->addOption(0, _FRM_SONGLIST_FIELDS_DEFAULT);
-		foreach($category_handler->getObjects(NULL, true) as $cid => $category)
+		foreach ($category_handler->getObjects(NULL, true) as $cid => $category)
 			$cat_select->addOption($cid, $category->getVar('name'));
 		$form->addElement($cat_select);
 		$form->addElement(new XoopsFormText(_FRM_SONGLIST_FIELDS_WEIGHT, 'field_weight', 10, 10, $field->getVar('field_weight', 'e')));
@@ -109,9 +109,9 @@ 
 	
 			//$form->addElement(new XoopsFormRadioYN(_FRM_SONGLIST_FIELDS_NOTNULL, 'field_notnull', $field->getVar('field_notnull', 'e') ));
 	
-			if ($field->getVar('field_type') == "select" || $field->getVar('field_type') == "select_multi" || $field->getVar('field_type') == "radio" || $field->getVar('field_type') == "checkbox") {
+			if ($field->getVar('field_type')=="select" || $field->getVar('field_type')=="select_multi" || $field->getVar('field_type')=="radio" || $field->getVar('field_type')=="checkbox") {
 				$options = $field->getVar('field_options');
-				if (count($options) > 0) {
+				if (count($options)>0) {
 					$remove_options = new XoopsFormCheckBox(_FRM_SONGLIST_FIELDS_REMOVEOPTIONS, 'removeOptions');
 					$remove_options->columns = 3;
 					asort($options);
@@ -122,13 +122,13 @@ 
 					$form->addElement($remove_options);
 				}
 	
-				$option_text = "<table  cellspacing='1'><tr><td width='20%'>" . _FRM_SONGLIST_FIELDS_KEY . "</td><td>" . _FRM_SONGLIST_FIELDS_VALUE . "</td></tr>";
-				for ($i = 0; $i < 3; $i++) {
+				$option_text = "<table  cellspacing='1'><tr><td width='20%'>"._FRM_SONGLIST_FIELDS_KEY."</td><td>"._FRM_SONGLIST_FIELDS_VALUE."</td></tr>";
+				for ($i = 0; $i<3; $i++) {
 					$option_text .= "<tr><td><input type='text' name='addOption[{$i}][key]' id='addOption[{$i}][key]' size='15' /></td><td><input type='text' name='addOption[{$i}][value]' id='addOption[{$i}][value]' size='35' /></td></tr>";
 					$option_text .= "<tr height='3px'><td colspan='2'> </td></tr>";
 				}
 				$option_text .= "</table>";
-				$form->addElement(new XoopsFormLabel(_FRM_SONGLIST_FIELDS_ADDOPTION, $option_text) );
+				$form->addElement(new XoopsFormLabel(_FRM_SONGLIST_FIELDS_ADDOPTION, $option_text));
 			}
 		}
 	
@@ -143,7 +143,7 @@ 
 	
 				case "checkbox":
 				case "select_multi":
-					$def_value = $field->getVar('field_default', 'e') != null ? unserialize($field->getVar('field_default', 'n')) : null;
+					$def_value = $field->getVar('field_default', 'e')!=null ? unserialize($field->getVar('field_default', 'n')) : null;
 					$element = new XoopsFormSelect(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $def_value, 8, true);
 					$options = $field->getVar('field_options');
 					asort($options);
@@ -157,7 +157,7 @@ 
 	
 				case "select":
 				case "radio":
-					$def_value = $field->getVar('field_default', 'e') != null ? $field->getVar('field_default') : null;
+					$def_value = $field->getVar('field_default', 'e')!=null ? $field->getVar('field_default') : null;
 					$element = new XoopsFormSelect(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $def_value);
 					$options = $field->getVar('field_options');
 					asort($options);
@@ -223,7 +223,7 @@ 
 			'language');
 		if (in_array($field->getVar('field_type'), $searchable_types)) {
 			$search_groups = $groupperm_handler->getGroupIds('songlist_search', $field->getVar('field_id'), $GLOBALS['songlistModule']->getVar('mid'));
-			$form->addElement(new XoopsFormSelectGroup(_FRM_SONGLIST_FIELDS_PROF_SEARCH, 'songlist_search', true, $search_groups, 5, true) );
+			$form->addElement(new XoopsFormSelectGroup(_FRM_SONGLIST_FIELDS_PROF_SEARCH, 'songlist_search', true, $search_groups, 5, true));
 		}
 		if ($field->getVar('field_edit') || $field->isNew()) {
 			if (!$field->isNew()) {
@@ -235,7 +235,7 @@ 
 			$form->addElement(new XoopsFormSelectGroup(_FRM_SONGLIST_FIELDS_PROF_EDITABLE, 'songlist_edit', false, $editable_groups, 5, true));
 			$form->addElement($steps_select);
 		}
-		$form->addElement(new XoopsFormHidden('op', 'save') );
+		$form->addElement(new XoopsFormHidden('op', 'save'));
 		$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 	
 		return $form;
@@ -254,7 +254,7 @@ 
 		
 		xoops_loadLanguage('forms', 'songlist');
 		
-		if ($action === false) {
+		if ($action===false) {
 			$action = $_SERVER['PHP_SELF'];
 		}
 		if (empty($GLOBALS['xoopsConfigUser'])) {
@@ -280,35 +280,35 @@ 
 		// Get ids of fields that can be edited
 		$gperm_handler = xoops_gethandler('groupperm');
 	
-		$editable_fields = $gperm_handler->getItemIds('songlist_search', $groups, $modid );
+		$editable_fields = $gperm_handler->getItemIds('songlist_search', $groups, $modid);
 	
 		$cat_handler = xoops_getmodulehandler('category');
 	
-		$selcat = new XoopsFormSelectForum('Forum', 'cid', (!empty($_REQUEST['cid']))?intval($_REQUEST['cid']):0, 1, false, false, false, true );
+		$selcat = new XoopsFormSelectForum('Forum', 'cid', (!empty($_REQUEST['cid'])) ?intval($_REQUEST['cid']) : 0, 1, false, false, false, true);
 		$selcat->setExtra(' onChange="window.location=\''.XOOPS_URL.'/modules/objects/search.php?op=search&fct=form&cid=\'+document.search.cid.options[document.search.cid.selectedIndex].value"');
 	
 		$form->addElement($selcat, true);
 	
 		$categories = array();
 	
-		$criteria = new CriteriaCompo(new Criteria('cid', (!empty($_REQUEST['cid']))?intval($_REQUEST['cid']):'0'), "OR");
+		$criteria = new CriteriaCompo(new Criteria('cid', (!empty($_REQUEST['cid'])) ?intval($_REQUEST['cid']) : '0'), "OR");
 		$all_categories = $cat_handler->getObjects($criteria, true, false);
 		$count_fields = count($fields);
 	
-		foreach (array_keys($fields) as $i ) {
-			if ( in_array($fields[$i]->getVar('field_id'), $editable_fields)  ) {
+		foreach (array_keys($fields) as $i) {
+			if (in_array($fields[$i]->getVar('field_id'), $editable_fields)) {
 				// Set default value for user fields if available
 				$fieldinfo['element'] = $fields[$i]->getSearchElement();
 				$fieldinfo['required'] = false;
 	
-				foreach($fields[$i]->getVar('cids') as $catidid => $cid) {
+				foreach ($fields[$i]->getVar('cids') as $catidid => $cid) {
 					if (in_array($cid, array_keys($all_categories))) {
-						$key = $all_categories[$cid]['cat_weight'] * $count_fields + $cid;
+						$key = $all_categories[$cid]['cat_weight']*$count_fields+$cid;
 						$elements[$key][] = $fieldinfo;
 						$weights[$key][] = $fields[$i]->getVar('field_weight');
 						$categories[$key] = $all_categories[$cid];
 					} elseif (in_array(0, $fields[$i]->getVar('cids'))) {
-						$key = $all_categories[$cid]['cat_weight'] * $count_fields + $cid;
+						$key = $all_categories[$cid]['cat_weight']*$count_fields+$cid;
 						$elements[$key][] = $fieldinfo;
 						$weights[$key][] = $fields[$i]->getVar('field_weight');
 						$categories[$key] = $all_categories[$cid];
@@ -328,8 +328,8 @@ 
 			}
 		}
 	
-		$form->addElement(new XoopsFormHidden('fct', 'objects' ));
-		$form->addElement(new XoopsFormHidden('op', 'search' ));
+		$form->addElement(new XoopsFormHidden('fct', 'objects'));
+		$form->addElement(new XoopsFormHidden('op', 'search'));
 		$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 		return $form;
 	}
@@ -339,17 +339,17 @@ 
 		xoops_loadLanguage('forms', 'songlist');
 		
 		$sform = new XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_IMPORT, 'import', $_SERVER['PHP_SELF'], 'post');
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$ele['op'] = new XoopsFormHidden('op', 'import');
 		$ele['fct'] = new XoopsFormHidden('fct', 'upload');
-		$ele['xmlfile'] = new XoopsFormFile(($as_array==false?_FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML:''), 'xmlfile', (1024*1024*1024*32));
-		$ele['xmlfile']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML_DESC:''));
-		$ele['file'] = new XoopsFormSelect(($as_array==false?_FRM_SONGLIST_FORM_IMPORT_EXISTING_XML:''), 'file');
-		$ele['file']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_IMPORT_EXISTING_XML_DESC:''));
+		$ele['xmlfile'] = new XoopsFormFile(($as_array==false ?_FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML:''), 'xmlfile', (1024*1024*1024*32));
+		$ele['xmlfile']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML_DESC:''));
+		$ele['file'] = new XoopsFormSelect(($as_array==false ?_FRM_SONGLIST_FORM_IMPORT_EXISTING_XML:''), 'file');
+		$ele['file']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_IMPORT_EXISTING_XML_DESC:''));
 		$ele['file']->addOption('', '*********');
 		xoops_load('XoopsLists');
-		foreach(XoopsLists::getFileListAsArray($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $file) {
+		foreach (XoopsLists::getFileListAsArray($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $file) {
 			if (substr($file, strlen($file)-3, 3)=='xml') {
 				$ele['file']->addOption($file, $file);
 			}
@@ -358,7 +358,7 @@ 
 		
 		$required = array();
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -375,68 +375,68 @@ 
 		$sform = new XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_ELEMENTS, 'elements', $_SERVER['PHP_SELF'], 'post');
 		
 		$filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$file));
-		$mb = floor($filesize / 1024 / 1024);
+		$mb = floor($filesize/1024/1024);
 		if ($mb>32) {
 			set_ini('memory_limit', ($mb+128).'M');	
 		}
 		set_time_limit(3600);
 								
-		$i=0;
+		$i = 0;
 		foreach (file($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile'])) as $data) {
 			$i++;
 			if ($i<20) {
-				$line .= htmlspecialchars($data) . ($i<19?"\n":'');
+				$line .= htmlspecialchars($data).($i<19 ? "\n" : '');
 			}
 		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'import');
 		$ele['fct'] = new XoopsFormHidden('fct', 'import');
-		$ele['example'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_EXAMPLE:''), '<pre>'.$line.'</pre>');
-		$ele['example']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_EXAMPLE_DESC:''));
-		$ele['collection'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_COLLECTION:''), 'collection', 32, 128, 'collection');
-		$ele['collection']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_COLLECTION_DESC:''));
-		$ele['record'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_RECORD:''), 'record', 32, 128, 'record');
-		$ele['record']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_RECORD_DESC:''));
-		$ele['genre'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_GENRES:''), 'genre', 32, 128, 'genre');
-		$ele['genre']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_GENRES_DESC:''));
-		$ele['voice'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_VOICE:''), 'voice', 32, 128, 'voice');
-		$ele['voice']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_VOICE_DESC:''));		
-		$ele['category'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_CATEGORY:''), 'category', 32, 128, 'category');
-		$ele['category']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_CATEGORY_DESC:''));
-		$ele['artist'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_ARTIST:''), 'artist', 32, 128, 'artist');
-		$ele['artist']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_ARTIST_DESC:''));
-		$ele['album'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_ALBUM:''), 'album', 32, 128, 'album');
-		$ele['album']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_ALBUM_DESC:''));
-		$ele['songid'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_SONGID:''), 'songid', 32, 128, 'songid');
-		$ele['songid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_SONGID_DESC:''));
-		$ele['traxid'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_TRAXID:''), 'traxid', 32, 128, 'trackno');
-		$ele['traxid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_TRAXID_DESC:''));
-		$ele['title'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_TITLE:''), 'title', 32, 128, 'title');
-		$ele['title']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_TITLE_DESC:''));
-		$ele['lyrics'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_LYRICS:''), 'lyrics', 32, 128, 'lyric');
-		$ele['lyrics']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_LYRICS_DESC:''));
-		$ele['tags'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_TAGS:''), 'tags', 32, 128, 'tags');
-		$ele['tags']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_TAGS_DESC:''));
-		$ele['mp3'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_MP3:''), 'mp3', 32, 128, 'mp3');
-		$ele['mp3']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_MP3_DESC:''));
+		$ele['example'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_EXAMPLE:''), '<pre>'.$line.'</pre>');
+		$ele['example']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_EXAMPLE_DESC:''));
+		$ele['collection'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_COLLECTION:''), 'collection', 32, 128, 'collection');
+		$ele['collection']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_COLLECTION_DESC:''));
+		$ele['record'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_RECORD:''), 'record', 32, 128, 'record');
+		$ele['record']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_RECORD_DESC:''));
+		$ele['genre'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_GENRES:''), 'genre', 32, 128, 'genre');
+		$ele['genre']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_GENRES_DESC:''));
+		$ele['voice'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_VOICE:''), 'voice', 32, 128, 'voice');
+		$ele['voice']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_VOICE_DESC:''));		
+		$ele['category'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_CATEGORY:''), 'category', 32, 128, 'category');
+		$ele['category']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_CATEGORY_DESC:''));
+		$ele['artist'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_ARTIST:''), 'artist', 32, 128, 'artist');
+		$ele['artist']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_ARTIST_DESC:''));
+		$ele['album'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_ALBUM:''), 'album', 32, 128, 'album');
+		$ele['album']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_ALBUM_DESC:''));
+		$ele['songid'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_SONGID:''), 'songid', 32, 128, 'songid');
+		$ele['songid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_SONGID_DESC:''));
+		$ele['traxid'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_TRAXID:''), 'traxid', 32, 128, 'trackno');
+		$ele['traxid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_TRAXID_DESC:''));
+		$ele['title'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_TITLE:''), 'title', 32, 128, 'title');
+		$ele['title']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_TITLE_DESC:''));
+		$ele['lyrics'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_LYRICS:''), 'lyrics', 32, 128, 'lyric');
+		$ele['lyrics']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_LYRICS_DESC:''));
+		$ele['tags'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_TAGS:''), 'tags', 32, 128, 'tags');
+		$ele['tags']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_TAGS_DESC:''));
+		$ele['mp3'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_MP3:''), 'mp3', 32, 128, 'mp3');
+		$ele['mp3']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_MP3_DESC:''));
 		$extras_handler = xoops_getmodulehandler('extras', 'songlist');
 		$fields = $extras_handler->getFields(NULL);
-		foreach($fields as $field) {
-			$ele[$field->getVar('field_name')] = new XoopsFormText(($as_array==false?$field->getVar('field_title'):''), $field->getVar('field_name'), 32, 128, $field->getVar('field_name'));
-			$ele[$field->getVar('field_name')]->setDescription(($as_array==false?$field->getVar('field_description'):''));
+		foreach ($fields as $field) {
+			$ele[$field->getVar('field_name')] = new XoopsFormText(($as_array==false ? $field->getVar('field_title') : ''), $field->getVar('field_name'), 32, 128, $field->getVar('field_name'));
+			$ele[$field->getVar('field_name')]->setDescription(($as_array==false ? $field->getVar('field_description') : ''));
 		}
-		$ele['limiting'] = new XoopsFormRadioYN(($as_array==false?_FRM_SONGLIST_FORM_IMPORT_LIMITING:''), 'limiting', true);
-		$ele['limiting']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_IMPORT_LIMITING_DESC:''));
-		$ele['records'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_IMPORT_RECORDS:''), 'records', 10, 10, '250');
-		$ele['records']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_IMPORT_RECORDS_DESC:''));
-		$ele['wait'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_IMPORT_WAIT:''), 'wait', 10, 10, '40');
-		$ele['wait']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_IMPORT_WAIT_DESC:''));
+		$ele['limiting'] = new XoopsFormRadioYN(($as_array==false ?_FRM_SONGLIST_FORM_IMPORT_LIMITING:''), 'limiting', true);
+		$ele['limiting']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_IMPORT_LIMITING_DESC:''));
+		$ele['records'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_IMPORT_RECORDS:''), 'records', 10, 10, '250');
+		$ele['records']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_IMPORT_RECORDS_DESC:''));
+		$ele['wait'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_IMPORT_WAIT:''), 'wait', 10, 10, '40');
+		$ele['wait']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_IMPORT_WAIT_DESC:''));
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array();
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -446,7 +446,7 @@ 
 		
 	}
 
-	function songlist_genre_get_form($object, $as_array=false) {
+	function songlist_genre_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('genre', 'songlist');
@@ -464,7 +464,7 @@ 
 			$ele['mode'] = new XoopsFormHidden('mode', 'edit');
 		}
 		
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$id = $object->getVar('gid');
 		if (empty($id)) $id = '0';
@@ -475,24 +475,24 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
-		$ele['name'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_GENRE_NAME:''), $id.'[name]', ($as_array==false?55:21),128, $object->getVar('name'));
-		$ele['name']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_GENRE_NAME_DESC:''));
-		$ele['albums'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_ALBUMS:''), $object->getVar('albums'));
-		$ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_ARTISTS:''), $object->getVar('artists'));
-		$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_SONGS:''), $object->getVar('songs'));
-		$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_HITS:''), $object->getVar('hits'));
-		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
+		$ele['name'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_GENRE_NAME:''), $id.'[name]', ($as_array==false ? 55 : 21), 128, $object->getVar('name'));
+		$ele['name']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_GENRE_NAME_DESC:''));
+		$ele['albums'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_GENRE_ALBUMS:''), $object->getVar('albums'));
+		$ele['artists'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_GENRE_ARTISTS:''), $object->getVar('artists'));
+		$ele['songs'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_GENRE_SONGS:''), $object->getVar('songs'));
+		$ele['hits'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_GENRE_HITS:''), $object->getVar('hits'));
+		$ele['rank'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_GENRE_RANK:''), number_format(($object->getVar('rank')>0 && $object->getVar('votes')>0 ? $object->getVar('rank')/$object->getVar('votes') : 0), 2).' of 10');
 		if ($object->getVar('created')>0) {
-			$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_CREATED:''), date(_DATESTRING, $object->getVar('created')));
+			$ele['created'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_GENRE_CREATED:''), date(_DATESTRING, $object->getVar('created')));
 		}
 		if ($object->getVar('updated')>0) {
-			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
+			$ele['updated'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_GENRE_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 
 		if ($as_array==true)
@@ -502,7 +502,7 @@ 
 		
 		$required = array('name');
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -512,7 +512,7 @@ 
 		
 	}
 
-	function songlist_voice_get_form($object, $as_array=false) {
+	function songlist_voice_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('voice', 'songlist');
@@ -530,7 +530,7 @@ 
 			$ele['mode'] = new XoopsFormHidden('mode', 'edit');
 		}
 		
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$id = $object->getVar('vcid');
 		if (empty($id)) $id = '0';
@@ -541,24 +541,24 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
-		$ele['name'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_VOICE_NAME:''), $id.'[name]', ($as_array==false?55:21),128, $object->getVar('name'));
-		$ele['name']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_VOICE_NAME_DESC:''));
-		$ele['albums'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOICE_ALBUMS:''), $object->getVar('albums'));
-		$ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOICE_ARTISTS:''), $object->getVar('artists'));
-		$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOICE_SONGS:''), $object->getVar('songs'));
-		$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOICE_HITS:''), $object->getVar('hits'));
-		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOICE_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
+		$ele['name'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_VOICE_NAME:''), $id.'[name]', ($as_array==false ? 55 : 21), 128, $object->getVar('name'));
+		$ele['name']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_VOICE_NAME_DESC:''));
+		$ele['albums'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOICE_ALBUMS:''), $object->getVar('albums'));
+		$ele['artists'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOICE_ARTISTS:''), $object->getVar('artists'));
+		$ele['songs'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOICE_SONGS:''), $object->getVar('songs'));
+		$ele['hits'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOICE_HITS:''), $object->getVar('hits'));
+		$ele['rank'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOICE_RANK:''), number_format(($object->getVar('rank')>0 && $object->getVar('votes')>0 ? $object->getVar('rank')/$object->getVar('votes') : 0), 2).' of 10');
 		if ($object->getVar('created')>0) {
-			$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOICE_CREATED:''), date(_DATESTRING, $object->getVar('created')));
+			$ele['created'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOICE_CREATED:''), date(_DATESTRING, $object->getVar('created')));
 		}
 		if ($object->getVar('updated')>0) {
-			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOICE_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
+			$ele['updated'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOICE_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 
 		if ($as_array==true)
@@ -568,7 +568,7 @@ 
 		
 		$required = array('name');
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -579,7 +579,7 @@ 
 	}
 
 
-	function songlist_albums_get_form($object, $as_array=false) {
+	function songlist_albums_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('albums', 'songlist');
@@ -597,7 +597,7 @@ 
 			$ele['mode'] = new XoopsFormHidden('mode', 'edit');
 		}
 		
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$id = $object->getVar('abid');
 		if (empty($id)) $id = '0';
@@ -608,31 +608,31 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
-		$ele['cid'] = new SonglistFormSelectCategory(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_CATEGORY:''), $id.'[cid]', $object->getVar('cid'), 1, false, false, false);
-		$ele['cid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_CATEGORY_DESC:''));
-		$ele['title'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_TITLE:''), $id.'[title]', ($as_array==false?55:21),128, $object->getVar('title'));
-		$ele['title']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_TITLE_DESC:''));
-		$ele['image'] = new XoopsFormFile(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER:''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
-		$ele['image']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER_DESC:''));
-		if (strlen($object->getVar('image'))>0&&file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('image')))) {
-			$ele['image_preview'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_POSTER:''), '<img src="'.$object->getImage('image').'" width="340px" />' );
-			$ele['image_preview']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_POSTER_DESC:''));
+		$ele['cid'] = new SonglistFormSelectCategory(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_CATEGORY:''), $id.'[cid]', $object->getVar('cid'), 1, false, false, false);
+		$ele['cid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_CATEGORY_DESC:''));
+		$ele['title'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_TITLE:''), $id.'[title]', ($as_array==false ? 55 : 21), 128, $object->getVar('title'));
+		$ele['title']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_TITLE_DESC:''));
+		$ele['image'] = new XoopsFormFile(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER:''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
+		$ele['image']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER_DESC:''));
+		if (strlen($object->getVar('image'))>0 && file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('image')))) {
+			$ele['image_preview'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_POSTER:''), '<img src="'.$object->getImage('image').'" width="340px" />');
+			$ele['image_preview']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_POSTER_DESC:''));
 		}
-		$ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_ARTISTS:''), $object->getVar('artists'));
-		$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_SONGS:''), $object->getVar('songs'));
-		$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_HITS:''), $object->getVar('hits'));
-		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
+		$ele['artists'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_ARTISTS:''), $object->getVar('artists'));
+		$ele['songs'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_SONGS:''), $object->getVar('songs'));
+		$ele['hits'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_HITS:''), $object->getVar('hits'));
+		$ele['rank'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format(($object->getVar('rank')>0 && $object->getVar('votes')>0 ? $object->getVar('rank')/$object->getVar('votes') : 0), 2).' of 10');
 		if ($object->getVar('created')>0) {
-			$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
+			$ele['created'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
 		}
 		if ($object->getVar('updated')>0) {
-			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
+			$ele['updated'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 
 		if ($as_array==true)
@@ -642,7 +642,7 @@ 
 		
 		$required = array('name', 'id', 'source');
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -652,7 +652,7 @@ 
 		
 	}
 
-	function songlist_artists_get_form($object, $as_array=false) {
+	function songlist_artists_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('artists', 'songlist');
@@ -679,27 +679,27 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
-		$ele['cids'] = new SonglistFormSelectCategory(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_CATEGORY:''), $id.'[cids]', $object->getVar('cids'), 7, true, false, false);
-		$ele['cids']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_CATEGORY_DESC:''));
+		$ele['cids'] = new SonglistFormSelectCategory(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_CATEGORY:''), $id.'[cids]', $object->getVar('cids'), 7, true, false, false);
+		$ele['cids']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_CATEGORY_DESC:''));
 		//$ele['singer'] = new SonglistFormSelectSinger(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SINGER:''), $id.'[singer]', $object->getVar('singer'), 1, false, false, false);
 		//$ele['singer']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SINGER_DESC:''));
-		$ele['name'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_NAME:''), $id.'[name]', ($as_array==false?55:21),128, $object->getVar('name'));
-		$ele['name']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_NAME_DESC:''));
-		$ele['albums'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_ALBUMS:''), $object->getVar('albums'));
-		$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SONGS:''), $object->getVar('songs'));
-		$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_HITS:''), $object->getVar('hits'));
-		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
+		$ele['name'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_NAME:''), $id.'[name]', ($as_array==false ? 55 : 21), 128, $object->getVar('name'));
+		$ele['name']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_NAME_DESC:''));
+		$ele['albums'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_ALBUMS:''), $object->getVar('albums'));
+		$ele['songs'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_SONGS:''), $object->getVar('songs'));
+		$ele['hits'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_HITS:''), $object->getVar('hits'));
+		$ele['rank'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_RANK:''), number_format(($object->getVar('rank')>0 && $object->getVar('votes')>0 ? $object->getVar('rank')/$object->getVar('votes') : 0), 2).' of 10');
 		if ($object->getVar('created')>0) {
-			$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
+			$ele['created'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
 		}
 		if ($object->getVar('updated')>0) {
-			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
+			$ele['updated'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 				
 		if ($as_array==true)
@@ -709,7 +709,7 @@ 
 		
 		$required = array('name', 'mimetype', 'support');
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -719,7 +719,7 @@ 
 		
 	}
 
-	function songlist_category_get_form($object, $as_array=false) {
+	function songlist_category_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('category', 'songlist');
@@ -737,7 +737,7 @@ 
 			$ele['mode'] = new XoopsFormHidden('mode', 'edit');
 		}
 		
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$id = $object->getVar('cid');
 		if (empty($id)) $id = '0';
@@ -748,16 +748,16 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
-		$ele['pid'] = new SonglistFormSelectCategory(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_PARENT:''), $id.'[pid]', $object->getVar('pid'), 1, false, $object->getVar('cid'));
-		$ele['pid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_PARENT_DESC:''));
-		$ele['name'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_NAME:''), $id.'[name]', ($as_array==false?55:21),128, $object->getVar('name'));
-		$ele['name']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_NAME_DESC:''));
+		$ele['pid'] = new SonglistFormSelectCategory(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_PARENT:''), $id.'[pid]', $object->getVar('pid'), 1, false, $object->getVar('cid'));
+		$ele['pid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_PARENT_DESC:''));
+		$ele['name'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_NAME:''), $id.'[name]', ($as_array==false ? 55 : 21), 128, $object->getVar('name'));
+		$ele['name']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_NAME_DESC:''));
 		$description_configs = array();
 		$description_configs['name'] = $id.'[description]';
 		$description_configs['value'] = $object->getVar('description');
@@ -766,22 +766,22 @@ 
 		$description_configs['width'] = "100%";
 		$description_configs['height'] = "400px";
 		$ele['description'] = new XoopsFormEditor(_FRM_SONGLIST_FORM_CATEGORY_DESCRIPTION, $GLOBALS['songlistModuleConfig']['editor'], $description_configs);
-		$ele['description']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_DESCRIPTION_DESC:''));
-		$ele['image'] = new XoopsFormFile(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_UPLOAD_POSTER:''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
-		$ele['image']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_UPLOAD_POSTER_DESC:''));
-		if (strlen($object->getVar('image'))>0&&file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('image')))) {
-			$ele['image_preview'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_POSTER:''), '<img src="'.$object->getImage('image').'" width="340px" />' );
-			$ele['image_preview']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_POSTER_DESC:''));
+		$ele['description']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_DESCRIPTION_DESC:''));
+		$ele['image'] = new XoopsFormFile(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_UPLOAD_POSTER:''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
+		$ele['image']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_UPLOAD_POSTER_DESC:''));
+		if (strlen($object->getVar('image'))>0 && file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('image')))) {
+			$ele['image_preview'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_POSTER:''), '<img src="'.$object->getImage('image').'" width="340px" />');
+			$ele['image_preview']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_POSTER_DESC:''));
 		}
-		$ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_ARTISTS:''), $object->getVar('artists'));
-		$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_SONGS:''), $object->getVar('songs'));
-		$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_HITS:''), $object->getVar('hits'));
-		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
+		$ele['artists'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_ARTISTS:''), $object->getVar('artists'));
+		$ele['songs'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_SONGS:''), $object->getVar('songs'));
+		$ele['hits'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_HITS:''), $object->getVar('hits'));
+		$ele['rank'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_RANK:''), number_format(($object->getVar('rank')>0 && $object->getVar('votes')>0 ? $object->getVar('rank')/$object->getVar('votes') : 0), 2).' of 10');
 		if ($object->getVar('created')>0) {
-			$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_CREATED:''), date(_DATESTRING, $object->getVar('created')));
+			$ele['created'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_CREATED:''), date(_DATESTRING, $object->getVar('created')));
 		}
 		if ($object->getVar('updated')>0) {
-			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
+			$ele['updated'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 		
 		if ($as_array==true)
@@ -791,7 +791,7 @@ 
 		
 		$required = array('name', 'id', 'source');
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -801,7 +801,7 @@ 
 		
 	}
 
-	function songlist_utf8map_get_form($object, $as_array=false) {
+	function songlist_utf8map_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('utf8map', 'songlist');
@@ -819,7 +819,7 @@ 
 			$ele['mode'] = new XoopsFormHidden('mode', 'edit');
 		}
 		
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$id = $object->getVar('utfid');
 		if (empty($id)) $id = '0';
@@ -830,22 +830,22 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
-		$ele['from'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_UTF8MAP_FROM:''), $id.'[from]', ($as_array==false?6:4),2, $object->getVar('from'));
-		$ele['from']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_UTF8MAP_FROM_DESC:''));
-		$ele['to'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_UTF8MAP_TO:''), $id.'[to]', ($as_array==false?6:4),2, $object->getVar('to'));
-		$ele['to']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_UTF8MAP_TO_DESC:''));
+		$ele['from'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_UTF8MAP_FROM:''), $id.'[from]', ($as_array==false ? 6 : 4), 2, $object->getVar('from'));
+		$ele['from']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_UTF8MAP_FROM_DESC:''));
+		$ele['to'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_UTF8MAP_TO:''), $id.'[to]', ($as_array==false ? 6 : 4), 2, $object->getVar('to'));
+		$ele['to']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_UTF8MAP_TO_DESC:''));
 		
 		if ($object->getVar('created')>0) {
-			$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_UTF8MAP_CREATED:''), date(_DATESTRING, $object->getVar('created')));
+			$ele['created'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_UTF8MAP_CREATED:''), date(_DATESTRING, $object->getVar('created')));
 		}
 		if ($object->getVar('updated')>0) {
-			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_UTF8MAP_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
+			$ele['updated'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_UTF8MAP_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 		
 		if ($as_array==true)
@@ -855,7 +855,7 @@ 
 		
 		$required = array('from', 'to');
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -865,7 +865,7 @@ 
 		
 	}
 	
-	function songlist_requests_get_form($object, $as_array=false) {
+	function songlist_requests_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('requests', 'songlist');
@@ -883,7 +883,7 @@ 
 			$ele['mode'] = new XoopsFormHidden('mode', 'edit');
 		}
 		
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$id = $object->getVar('rid');
 		if (empty($id)) $id = '0';
@@ -894,39 +894,39 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
-		$ele['artist'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_ARTIST:''), $id.'[artist]', ($as_array==false?55:21),128, $object->getVar('artist'));
-		$ele['artist']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_ARTIST_DESC:''));
-		$ele['album'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_ALBUM:''), $id.'[album]', ($as_array==false?55:21),128, $object->getVar('album'));
-		$ele['album']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_ALBUM_DESC:''));
-		$ele['title'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_TITLE:''), $id.'[title]', ($as_array==false?55:21),128, $object->getVar('title'));
-		$ele['title']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_TITLE_DESC:''));
-		$ele['lyrics'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_LYRICS:''), $id.'[lyrics]', ($as_array==false?55:21),128, $object->getVar('lyrics'));
-		$ele['lyrics']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_LYRICS_DESC:''));
+		$ele['artist'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_ARTIST:''), $id.'[artist]', ($as_array==false ? 55 : 21), 128, $object->getVar('artist'));
+		$ele['artist']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_ARTIST_DESC:''));
+		$ele['album'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_ALBUM:''), $id.'[album]', ($as_array==false ? 55 : 21), 128, $object->getVar('album'));
+		$ele['album']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_ALBUM_DESC:''));
+		$ele['title'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_TITLE:''), $id.'[title]', ($as_array==false ? 55 : 21), 128, $object->getVar('title'));
+		$ele['title']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_TITLE_DESC:''));
+		$ele['lyrics'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_LYRICS:''), $id.'[lyrics]', ($as_array==false ? 55 : 21), 128, $object->getVar('lyrics'));
+		$ele['lyrics']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_LYRICS_DESC:''));
 		
 		if (is_object($GLOBALS['xoopsUser'])) {
 			$ele['uid'] = new XoopsFormHidden('uid', $GLOBALS['xoopsUser']->getVar('uid'));
-			$ele['name'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_NAME:''), $id.'[name]', ($as_array==false?55:21),128, ($object->isNew()?$GLOBALS['xoopsUser']->getVar('name'):$object->getVar('name')));
-			$ele['name']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_NAME_DESC:''));
-			$ele['email'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_EMAIL:''), $id.'[email]', ($as_array==false?55:21),128, ($object->isNew()?$GLOBALS['xoopsUser']->getVar('email'):$object->getVar('email')));
-			$ele['email']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_EMAIL_DESC:''));
+			$ele['name'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_NAME:''), $id.'[name]', ($as_array==false ? 55 : 21), 128, ($object->isNew() ? $GLOBALS['xoopsUser']->getVar('name') : $object->getVar('name')));
+			$ele['name']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_NAME_DESC:''));
+			$ele['email'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_EMAIL:''), $id.'[email]', ($as_array==false ? 55 : 21), 128, ($object->isNew() ? $GLOBALS['xoopsUser']->getVar('email') : $object->getVar('email')));
+			$ele['email']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_EMAIL_DESC:''));
 		} else {
 			$ele['uid'] = new XoopsFormHidden('uid', 0);
-			$ele['name'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_NAME:''), $id.'[name]', ($as_array==false?55:21),128, ($object->isNew()?'':$object->getVar('name')));
-			$ele['name']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_NAME_DESC:''));
-			$ele['email'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_EMAIL:''), $id.'[email]', ($as_array==false?55:21),128, ($object->isNew()?'':$object->getVar('email')));
-			$ele['email']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_EMAIL_DESC:''));
+			$ele['name'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_NAME:''), $id.'[name]', ($as_array==false ? 55 : 21), 128, ($object->isNew() ? '' : $object->getVar('name')));
+			$ele['name']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_NAME_DESC:''));
+			$ele['email'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_EMAIL:''), $id.'[email]', ($as_array==false ? 55 : 21), 128, ($object->isNew() ? '' : $object->getVar('email')));
+			$ele['email']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_EMAIL_DESC:''));
 		}		
 		if ($object->getVar('created')>0) {
-			$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
+			$ele['created'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
 		}
 		if ($object->getVar('updated')>0) {
-			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
+			$ele['updated'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_REQUESTS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 		
 		if ($as_array==true)
@@ -936,7 +936,7 @@ 
 		
 		$required = array('name', 'email');
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -947,7 +947,7 @@ 
 	}
 	
 	
-	function songlist_songs_get_form($object, $as_array=false) {
+	function songlist_songs_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('songs', 'songlist');
@@ -965,7 +965,7 @@ 
 			$ele['mode'] = new XoopsFormHidden('mode', 'edit');
 		}
 		
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$id = $object->getVar('sid');
 		if (empty($id)) $id = '0';
@@ -976,34 +976,34 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
-		$ele['cid'] = new SonglistFormSelectCategory(($as_array==false?_FRM_SONGLIST_FORM_SONGS_CATEGORY:''), $id.'[cid]', (isset($_REQUEST['cid'])?$_REQUEST['cid']:$object->getVar('cid')), 1, false);
-		$ele['cid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_CATEGORY_DESC:''));
+		$ele['cid'] = new SonglistFormSelectCategory(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_CATEGORY:''), $id.'[cid]', (isset($_REQUEST['cid']) ? $_REQUEST['cid'] : $object->getVar('cid')), 1, false);
+		$ele['cid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_CATEGORY_DESC:''));
 		if ($GLOBALS['songlistModuleConfig']['genre']) {
-			$ele['gids'] = new SonglistFormSelectGenre(($as_array==false?_FRM_SONGLIST_FORM_SONGS_GENRE:''), $id.'[gids]', (isset($_REQUEST['gids'])?$_REQUEST['gids']:$object->getVar('gids')), 8, true);
-			$ele['gids']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_GENRE_DESC:''));
+			$ele['gids'] = new SonglistFormSelectGenre(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_GENRE:''), $id.'[gids]', (isset($_REQUEST['gids']) ? $_REQUEST['gids'] : $object->getVar('gids')), 8, true);
+			$ele['gids']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_GENRE_DESC:''));
 		}
 		if ($GLOBALS['songlistModuleConfig']['voice']) {
-			$ele['vcid'] = new SonglistFormSelectVoice(($as_array==false?_FRM_SONGLIST_FORM_SONGS_VOICE:''), $id.'[vcid]', (isset($_REQUEST['vcid'])?$_REQUEST['vcid']:$object->getVar('vcid')), 1, false);
-			$ele['vcid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_VOICE_DESC:''));
+			$ele['vcid'] = new SonglistFormSelectVoice(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_VOICE:''), $id.'[vcid]', (isset($_REQUEST['vcid']) ? $_REQUEST['vcid'] : $object->getVar('vcid')), 1, false);
+			$ele['vcid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_VOICE_DESC:''));
 		}		
 		if ($GLOBALS['songlistModuleConfig']['album']) {
-			$ele['abid'] = new SonglistFormSelectAlbum(($as_array==false?_FRM_SONGLIST_FORM_SONGS_ALBUM:''), $id.'[abid]', $object->getVar('abid'), 1, false);
-			$ele['abid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_ALBUM_DESC:''));
+			$ele['abid'] = new SonglistFormSelectAlbum(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_ALBUM:''), $id.'[abid]', $object->getVar('abid'), 1, false);
+			$ele['abid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_ALBUM_DESC:''));
 		}
-		$ele['aids'] = new SonglistFormSelectArtist(($as_array==false?_FRM_SONGLIST_FORM_SONGS_ARTISTS:''), $id.'[aids]', $object->getVar('aids'), 7, true);
-		$ele['aids']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_ARTISTS_DESC:''));
-		$ele['songid'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_SONGS_SONGID:''), $id.'[songid]', ($as_array==false?25:15),32, $object->getVar('songid'));
-		$ele['songid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_SONGID_DESC:''));
-		$ele['traxid'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_SONGS_TRAXID:''), $id.'[traxid]', ($as_array==false?25:15),32, $object->getVar('traxid'));
-		$ele['traxid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_TRAXID_DESC:''));
-		$ele['title'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_SONGS_TITLE:''), $id.'[title]', ($as_array==false?55:21),128, $object->getVar('title'));
-		$ele['title']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_TITLE_DESC:''));
+		$ele['aids'] = new SonglistFormSelectArtist(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_ARTISTS:''), $id.'[aids]', $object->getVar('aids'), 7, true);
+		$ele['aids']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_ARTISTS_DESC:''));
+		$ele['songid'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_SONGID:''), $id.'[songid]', ($as_array==false ? 25 : 15), 32, $object->getVar('songid'));
+		$ele['songid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_SONGID_DESC:''));
+		$ele['traxid'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_TRAXID:''), $id.'[traxid]', ($as_array==false ? 25 : 15), 32, $object->getVar('traxid'));
+		$ele['traxid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_TRAXID_DESC:''));
+		$ele['title'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_TITLE:''), $id.'[title]', ($as_array==false ? 55 : 21), 128, $object->getVar('title'));
+		$ele['title']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_TITLE_DESC:''));
 		$description_configs = array();
 		$description_configs['name'] = $id.'[lyrics]';
 		$description_configs['value'] = $object->getVar('lyrics');
@@ -1012,11 +1012,11 @@ 
 		$description_configs['width'] = "100%";
 		$description_configs['height'] = "400px";
 		$ele['lyrics'] = new XoopsFormEditor(_FRM_SONGLIST_FORM_SONGS_LYRICS, $GLOBALS['songlistModuleConfig']['editor'], $description_configs);
-		$ele['lyrics']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_LYRICS_DESC:''));
-		$ele['mp3'] = new XoopsFormFile(($as_array==false?_FRM_SONGLIST_FORM_SONGS_MP3:''), 'mp3'.$id, $GLOBALS['songlistModuleConfig']['mp3_filesize']);
-		$ele['mp3']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_MP3_DESC:''));
+		$ele['lyrics']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_LYRICS_DESC:''));
+		$ele['mp3'] = new XoopsFormFile(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_MP3:''), 'mp3'.$id, $GLOBALS['songlistModuleConfig']['mp3_filesize']);
+		$ele['mp3']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_MP3_DESC:''));
 		$category_handler = xoops_getmodulehandler('category', 'songlist');
-		$criteria = new CriteriaCompo(new Criteria('cid', (!empty($_REQUEST['cid']))?intval($_REQUEST['cid']):$object->getVar('cid')));
+		$criteria = new CriteriaCompo(new Criteria('cid', (!empty($_REQUEST['cid'])) ?intval($_REQUEST['cid']) : $object->getVar('cid')));
 		$all_categories = $category_handler->getObjects($criteria, true, false);
 
 		// Dynamic fields
@@ -1044,19 +1044,19 @@ 
 		$allnames = array();
 		if (is_array($fields)) {
 			foreach (array_keys($fields) as $i) {
-				if (($object->getVar('sid')<>0&&$gperm_handler->checkRight('songlist_edit',$fields[$i]->getVar('field_id'),$groups, $modid)) ||
-					($object->getVar('sid')==0&&$gperm_handler->checkRight('songlist_post',$fields[$i]->getVar('field_id'),$groups, $modid))) {
+				if (($object->getVar('sid')<>0 && $gperm_handler->checkRight('songlist_edit', $fields[$i]->getVar('field_id'), $groups, $modid)) ||
+					($object->getVar('sid')==0 && $gperm_handler->checkRight('songlist_post', $fields[$i]->getVar('field_id'), $groups, $modid))) {
 					$fieldinfo['element'] = $fields[$i]->getEditElement($object, $extra);
 					$fieldinfo['required'] = $fields[$i]->getVar('field_required');
-					foreach($fields[$i]->getVar('cids') as $catidid => $cid) {
+					foreach ($fields[$i]->getVar('cids') as $catidid => $cid) {
 						if (!in_array($fields[$i]->getVar('field_name'), $allnames)) {
 							$allnames[] = $fields[$i]->getVar('field_name');
-							if (in_array($cid, array_keys($all_categories))||$cid==((!empty($_REQUEST['cid']))?intval($_REQUEST['cid']):$object->getVar('cid'))) {
-								$key = $all_categories[$cid]['weight'] * $count_fields + $object->getVar('cid');
+							if (in_array($cid, array_keys($all_categories)) || $cid==((!empty($_REQUEST['cid'])) ?intval($_REQUEST['cid']) : $object->getVar('cid'))) {
+								$key = $all_categories[$cid]['weight']*$count_fields+$object->getVar('cid');
 								$elements[$key][] = $fieldinfo;
 								$weights[$key][] = $fields[$i]->getVar('field_weight');
 							} elseif (in_array(0, $fields[$i]->getVar('cids'))) {
-								$key = $all_categories[$cid]['weight'] * $count_fields + $object->getVar('cid');
+								$key = $all_categories[$cid]['weight']*$count_fields+$object->getVar('cid');
 								$elements[$key][] = $fieldinfo;
 								$weights[$key][] = $fields[$i]->getVar('field_weight');
 							}
@@ -1084,20 +1084,20 @@ 
 			$ele['tags'] = new XoopsFormTag('tags', 60, 255, $object->getVar('sid'), $object->getVar('cid'));
 		}
 		
-		$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_HITS:''), $object->getVar('hits'));
-		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_RANK:''), number_format(($object->getVar('rank')>0&&$object->getVar('votes')>0?$object->getVar('rank')/$object->getVar('votes'):0),2). ' of 10');
+		$ele['hits'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_HITS:''), $object->getVar('hits'));
+		$ele['rank'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_RANK:''), number_format(($object->getVar('rank')>0 && $object->getVar('votes')>0 ? $object->getVar('rank')/$object->getVar('votes') : 0), 2).' of 10');
 		if ($object->getVar('created')>0) {
-			$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
+			$ele['created'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
 		}
 		if ($object->getVar('updated')>0) {
-			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
+			$ele['updated'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 		if ($as_array==true)
 			return $ele;
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -1107,7 +1107,7 @@ 
 		
 	}
 	
-	function songlist_votes_get_form($object, $as_array=false) {
+	function songlist_votes_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('votes', 'songlist');
@@ -1125,7 +1125,7 @@ 
 			$ele['mode'] = new XoopsFormHidden('mode', 'edit');
 		}
 		
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$id = $object->getVar('cid');
 		if (empty($id)) $id = '0';
@@ -1136,29 +1136,29 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
 		$songs_handler = xoops_getmodulehandler('songs', 'songlist');
 		$user_handler = xoops_gethandler('user');
 		$song = $songs_handler->get($object->getVar('sid'));
 		$user = $user_handler->get($object->getVar('uid'));
 		if (is_object($song)) {
-			$ele['sid'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_SONG:''), $song->getVar('title'));
+			$ele['sid'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_SONG:''), $song->getVar('title'));
 		} else {
-			$ele['sid'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_SONG:''), $object->getVar('sid'));
+			$ele['sid'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_SONG:''), $object->getVar('sid'));
 		}
 		if (is_object($user)) {
-			$ele['uid'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_USER:''), $user->getVar('uname'));
+			$ele['uid'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_USER:''), $user->getVar('uname'));
 		} else {
-			$ele['uid'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_USER:''), _GUESTS);
+			$ele['uid'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_USER:''), _GUESTS);
 		}
-		$ele['ip'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_IP:''), $object->getVar('ip'));
-		$ele['netaddy'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_NETADDY:''), $object->getVar('netaddy'));
-		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_RANK:''), $object->getVar('rank'). ' of 10');
+		$ele['ip'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_IP:''), $object->getVar('ip'));
+		$ele['netaddy'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_NETADDY:''), $object->getVar('netaddy'));
+		$ele['rank'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_RANK:''), $object->getVar('rank').' of 10');
 		
 		if ($as_array==true)
 			return $ele;
@@ -1167,7 +1167,7 @@ 
 		
 		$required = array();
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else

Braces +189 added lines, -128 removed lines

@@ -35,8 +35,9 @@ 
 		$category_handler = xoops_getmodulehandler('category', 'songlist');
 		$cat_select = new XoopsFormSelect(_FRM_SONGLIST_FIELDS_CATEGORY, 'cids', $fieldcid, 7, true);
 		$cat_select->addOption(0, _FRM_SONGLIST_FIELDS_DEFAULT);
-		foreach($category_handler->getObjects(NULL, true) as $cid => $category)
-			$cat_select->addOption($cid, $category->getVar('name'));
+		foreach($category_handler->getObjects(NULL, true) as $cid => $category) {
+					$cat_select->addOption($cid, $category->getVar('name'));
+		}
 		$form->addElement($cat_select);
 		$form->addElement(new XoopsFormText(_FRM_SONGLIST_FIELDS_WEIGHT, 'field_weight', 10, 10, $field->getVar('field_weight', 'e')));
 		if ($field->getVar('field_config') || $field->isNew()) {
@@ -358,11 +359,13 @@ 
 		
 		$required = array();
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -436,11 +439,13 @@ 
 		
 		$required = array();
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -467,14 +472,17 @@ 
 		$sform->setExtra( "enctype='multipart/form-data'" ) ;
 		
 		$id = $object->getVar('gid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'genre');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -495,18 +503,21 @@ 
 			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_GENRE_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array('name');
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -533,14 +544,17 @@ 
 		$sform->setExtra( "enctype='multipart/form-data'" ) ;
 		
 		$id = $object->getVar('vcid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'voice');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -561,18 +575,21 @@ 
 			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOICE_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array('name');
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -600,14 +617,17 @@ 
 		$sform->setExtra( "enctype='multipart/form-data'" ) ;
 		
 		$id = $object->getVar('abid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'albums');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -635,18 +655,21 @@ 
 			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array('name', 'id', 'source');
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -671,14 +694,17 @@ 
 		}
 		
 		$id = $object->getVar('aid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'artists');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -702,18 +728,21 @@ 
 			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 				
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array('name', 'mimetype', 'support');
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -740,14 +769,17 @@ 
 		$sform->setExtra( "enctype='multipart/form-data'" ) ;
 		
 		$id = $object->getVar('cid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'category');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -784,18 +816,21 @@ 
 			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 		
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array('name', 'id', 'source');
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -822,14 +857,17 @@ 
 		$sform->setExtra( "enctype='multipart/form-data'" ) ;
 		
 		$id = $object->getVar('utfid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'utf8map');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -848,18 +886,21 @@ 
 			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_UTF8MAP_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 		
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array('from', 'to');
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -886,14 +927,17 @@ 
 		$sform->setExtra( "enctype='multipart/form-data'" ) ;
 		
 		$id = $object->getVar('rid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'requests');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -929,18 +973,21 @@ 
 			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_REQUESTS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 		
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array('name', 'email');
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -968,14 +1015,17 @@ 
 		$sform->setExtra( "enctype='multipart/form-data'" ) ;
 		
 		$id = $object->getVar('sid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'songs');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -1026,10 +1076,11 @@ 
 		$xoModule = $module_handler->getByDirname('songlist');
 		$modid = $xoModule->getVar('mid');
 		
-		if (is_object($GLOBALS['xoopsUser']))
-			$groups = $GLOBALS['xoopsUser']->getGroups();
-		else
-			$groups = array(XOOPS_GROUP_ANONYMOUS=>XOOPS_GROUP_ANONYMOUS);
+		if (is_object($GLOBALS['xoopsUser'])) {
+					$groups = $GLOBALS['xoopsUser']->getGroups();
+		} else {
+					$groups = array(XOOPS_GROUP_ANONYMOUS=>XOOPS_GROUP_ANONYMOUS);
+		}
 		
 		$count_fields = 0;
 		$fields = $extras_handler->loadFields();
@@ -1037,10 +1088,11 @@ 
 		$required = array();
 		$elements = array();
 		$weights = array();
-		if ($object->getVar('sid')>0)
-			$extra = $extras_handler->get($object->getVar('sid'));
-		else
-			$extra = $extras_handler->create();
+		if ($object->getVar('sid')>0) {
+					$extra = $extras_handler->get($object->getVar('sid'));
+		} else {
+					$extra = $extras_handler->create();
+		}
 		$allnames = array();
 		if (is_array($fields)) {
 			foreach (array_keys($fields) as $i) {
@@ -1092,16 +1144,19 @@ 
 		if ($object->getVar('updated')>0) {
 			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -1128,14 +1183,17 @@ 
 		$sform->setExtra( "enctype='multipart/form-data'" ) ;
 		
 		$id = $object->getVar('cid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'votes');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -1160,18 +1218,21 @@ 
 		$ele['netaddy'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_NETADDY:''), $object->getVar('netaddy'));
 		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_RANK:''), $object->getVar('rank'). ' of 10');
 		
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array();
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		

htdocs/modules/songlist/include/songlists.object.php

Braces +11 added lines, -8 removed lines

@@ -2,11 +2,13 @@ 
 	
 	$module_handler = xoops_gethandler('module');
 	$config_handler = xoops_gethandler('config');
-	if (!isset($GLOBALS['songlistModule']))
-		$GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist');
-	if (is_object($GLOBALS['songlistModule']))
-		if (!isset($GLOBALS['songlistModuleConfig']))
-			$GLOBALS['songlistModuleConfig'] = $config_handler->getConfigList($GLOBALS['songlistModule']->getVar('mid')); 
+	if (!isset($GLOBALS['songlistModule'])) {
+			$GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist');
+	}
+	if (is_object($GLOBALS['songlistModule'])) {
+			if (!isset($GLOBALS['songlistModuleConfig']))
+			$GLOBALS['songlistModuleConfig'] = $config_handler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
+	}
 	
 	require_once($GLOBALS['xoops']->path('class/xoopsformloader.php'));
 	require_once($GLOBALS['xoops']->path('class/pagenav.php'));
@@ -18,6 +20,7 @@ 
 	require_once('formselectsinger.php');
 	require_once('formselectsong.php');
 	
-	if (file_exists($GLOBALS['xoops']->path('/modules/tag/include/formtag.php')) && $GLOBALS['songlistModuleConfig']['tags'])
-		include_once $GLOBALS['xoops']->path('/modules/tag/include/formtag.php');
-?>
\ No newline at end of file
+	if (file_exists($GLOBALS['xoops']->path('/modules/tag/include/formtag.php')) && $GLOBALS['songlistModuleConfig']['tags']) {
+			include_once $GLOBALS['xoops']->path('/modules/tag/include/formtag.php');
+	}
+	?>
\ No newline at end of file

htdocs/modules/songlist/include/formselectsong.php

Indentation +191 added lines, -191 removed lines

@@ -54,59 +54,59 @@ 
  */
 class SonglistFormSelectSong extends XoopsFormElement
 {
-    /**
-     * Options
-     *
-     * @var array
-     * @access private
-     */
-    var $_options = array();
+	/**
+	 * Options
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_options = array();
 
-    /**
-     * Allow multiple selections?
-     *
-     * @var bool
-     * @access private
-     */
-    var $_multiple = false;
+	/**
+	 * Allow multiple selections?
+	 *
+	 * @var bool
+	 * @access private
+	 */
+	var $_multiple = false;
 
-    /**
-     * Number of rows. "1" makes a dropdown list.
-     *
-     * @var int
-     * @access private
-     */
-    var $_size;
+	/**
+	 * Number of rows. "1" makes a dropdown list.
+	 *
+	 * @var int
+	 * @access private
+	 */
+	var $_size;
 
-    /**
-     * Pre-selcted values
-     *
-     * @var array
-     * @access private
-     */
-    var $_value = array();
+	/**
+	 * Pre-selcted values
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_value = array();
 
-    /**
-     * Constructor
-     *
-     * @param string $caption Caption
-     * @param string $name "name" attribute
-     * @param mixed $value Pre-selected value (or array of them).
-     * @param int $size Number or rows. "1" makes a drop-down-list
-     * @param bool $multiple Allow multiple selections?
-     */
-    function SonglistFormSelectSong($caption, $name, $value = null, $size = 1, $multiple = false, $id=-1, $field = 'cid')
-    {
-    	global $_form_object_options;
-    	xoops_loadLanguage('modinfo', 'songlist');
+	/**
+	 * Constructor
+	 *
+	 * @param string $caption Caption
+	 * @param string $name "name" attribute
+	 * @param mixed $value Pre-selected value (or array of them).
+	 * @param int $size Number or rows. "1" makes a drop-down-list
+	 * @param bool $multiple Allow multiple selections?
+	 */
+	function SonglistFormSelectSong($caption, $name, $value = null, $size = 1, $multiple = false, $id=-1, $field = 'cid')
+	{
+		global $_form_object_options;
+		xoops_loadLanguage('modinfo', 'songlist');
     	
-        $this->setCaption($caption);
-        $this->setName($name);
-        $this->_multiple = $multiple;
-        $this->_size = intval($size);
-        if (isset($value)) {
-            $this->setValue($value);
-        }
+		$this->setCaption($caption);
+		$this->setName($name);
+		$this->_multiple = $multiple;
+		$this->_size = intval($size);
+		if (isset($value)) {
+			$this->setValue($value);
+		}
 		$this->addOption('0', _MI_SONGLIST_NONE);
 		if ($id==-1) {
 			if (!isset($_form_object_options['songs'][$field][$id])) {
@@ -132,159 +132,159 @@ 
 		if (isset($_form_object_options['songs'][$field][$id]))
 			foreach($_form_object_options['songs'][$field][$id] as $id => $value)
 				$this->addOption($id, $value);
-    }
+	}
 
-    /**
-     * Are multiple selections allowed?
-     *
-     * @return bool
-     */
-    function isMultiple()
-    {
-        return $this->_multiple;
-    }
+	/**
+	 * Are multiple selections allowed?
+	 *
+	 * @return bool
+	 */
+	function isMultiple()
+	{
+		return $this->_multiple;
+	}
 
-    /**
-     * Get the size
-     *
-     * @return int
-     */
-    function getSize()
-    {
-        return $this->_size;
-    }
+	/**
+	 * Get the size
+	 *
+	 * @return int
+	 */
+	function getSize()
+	{
+		return $this->_size;
+	}
 
-    /**
-     * Get an array of pre-selected values
-     *
-     * @param bool $encode To sanitizer the text?
-     * @return array
-     */
-    function getValue($encode = false)
-    {
-        if (! $encode) {
-            return $this->_value;
-        }
-        $value = array();
-        foreach($this->_value as $val) {
-            $value[] = $val ? htmlspecialchars($val, ENT_QUOTES) : $val;
-        }
-        return $value;
-    }
+	/**
+	 * Get an array of pre-selected values
+	 *
+	 * @param bool $encode To sanitizer the text?
+	 * @return array
+	 */
+	function getValue($encode = false)
+	{
+		if (! $encode) {
+			return $this->_value;
+		}
+		$value = array();
+		foreach($this->_value as $val) {
+			$value[] = $val ? htmlspecialchars($val, ENT_QUOTES) : $val;
+		}
+		return $value;
+	}
 
-    /**
-     * Set pre-selected values
-     *
-     * @param  $value mixed
-     */
-    function setValue($value)
-    {
-        if (is_array($value)) {
-            foreach($value as $v) {
-                $this->_value[] = $v;
-            }
-        } elseif (isset($value)) {
-            $this->_value[] = $value;
-        }
-    }
+	/**
+	 * Set pre-selected values
+	 *
+	 * @param  $value mixed
+	 */
+	function setValue($value)
+	{
+		if (is_array($value)) {
+			foreach($value as $v) {
+				$this->_value[] = $v;
+			}
+		} elseif (isset($value)) {
+			$this->_value[] = $value;
+		}
+	}
 
-    /**
-     * Add an option
-     *
-     * @param string $value "value" attribute
-     * @param string $name "name" attribute
-     */
-    function addOption($value, $name = '')
-    {
-        if ($name != '') {
-            $this->_options[$value] = $name;
-        } else {
-            $this->_options[$value] = $value;
-        }
-    }
+	/**
+	 * Add an option
+	 *
+	 * @param string $value "value" attribute
+	 * @param string $name "name" attribute
+	 */
+	function addOption($value, $name = '')
+	{
+		if ($name != '') {
+			$this->_options[$value] = $name;
+		} else {
+			$this->_options[$value] = $value;
+		}
+	}
 
-    /**
-     * Add multiple options
-     *
-     * @param array $options Associative array of value->name pairs
-     */
-    function addOptionArray($options)
-    {
-        if (is_array($options)) {
-            foreach($options as $k => $v) {
-                $this->addOption($k, $v);
-            }
-        }
-    }
+	/**
+	 * Add multiple options
+	 *
+	 * @param array $options Associative array of value->name pairs
+	 */
+	function addOptionArray($options)
+	{
+		if (is_array($options)) {
+			foreach($options as $k => $v) {
+				$this->addOption($k, $v);
+			}
+		}
+	}
 
-    /**
-     * Get an array with all the options
-     *
-     * Note: both name and value should be sanitized. However for backward compatibility, only value is sanitized for now.
-     *
-     * @param int $encode To sanitizer the text? potential values: 0 - skip; 1 - only for value; 2 - for both value and name
-     * @return array Associative array of value->name pairs
-     */
-    function getOptions($encode = false)
-    {
-        if (! $encode) {
-            return $this->_options;
-        }
-        $value = array();
-        foreach($this->_options as $val => $name) {
-            $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode > 1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
-        }
-        return $value;
-    }
+	/**
+	 * Get an array with all the options
+	 *
+	 * Note: both name and value should be sanitized. However for backward compatibility, only value is sanitized for now.
+	 *
+	 * @param int $encode To sanitizer the text? potential values: 0 - skip; 1 - only for value; 2 - for both value and name
+	 * @return array Associative array of value->name pairs
+	 */
+	function getOptions($encode = false)
+	{
+		if (! $encode) {
+			return $this->_options;
+		}
+		$value = array();
+		foreach($this->_options as $val => $name) {
+			$value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode > 1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
+		}
+		return $value;
+	}
 
-    /**
-     * Prepare HTML for output
-     *
-     * @return string HTML
-     */
-    function render()
-    {
-        $ele_name = $this->getName();
+	/**
+	 * Prepare HTML for output
+	 *
+	 * @return string HTML
+	 */
+	function render()
+	{
+		$ele_name = $this->getName();
 		$ele_title = $this->getTitle();
-        $ele_value = $this->getValue();
-        $ele_options = $this->getOptions();
-        $ret = '<select size="'.$this->getSize().'"'.$this->getExtra();
-        if ($this->isMultiple() != false) {
-            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'. $ele_title. '" multiple="multiple">' ;
-        } else {
-            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'. $ele_title. '">' ;
-        }
-        foreach($ele_options as $value => $name) {
-            $ret .= '<option value="'.htmlspecialchars($value, ENT_QUOTES).'"';
-            if (count($ele_value) > 0 && in_array($value, $ele_value)) {
-                $ret .= ' selected="selected"';
-            }
-            $ret .= '>'.$name.'</option>' ;
-        }
-        $ret .= '</select>';
-        return $ret;
-    }
+		$ele_value = $this->getValue();
+		$ele_options = $this->getOptions();
+		$ret = '<select size="'.$this->getSize().'"'.$this->getExtra();
+		if ($this->isMultiple() != false) {
+			$ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'. $ele_title. '" multiple="multiple">' ;
+		} else {
+			$ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'. $ele_title. '">' ;
+		}
+		foreach($ele_options as $value => $name) {
+			$ret .= '<option value="'.htmlspecialchars($value, ENT_QUOTES).'"';
+			if (count($ele_value) > 0 && in_array($value, $ele_value)) {
+				$ret .= ' selected="selected"';
+			}
+			$ret .= '>'.$name.'</option>' ;
+		}
+		$ret .= '</select>';
+		return $ret;
+	}
 
-    /**
-     * Render custom javascript validation code
-     *
-     * @seealso XoopsForm::renderValidationJS
-     */
-    function renderValidationJS()
-    {
-        // render custom validation code if any
-        if (! empty($this->customValidationCode)) {
-            return implode("\n", $this->customValidationCode);
-            // generate validation code if required
-        } elseif ($this->isRequired()) {
-            $eltname = $this->getName();
-            $eltcaption = $this->getCaption();
-            $eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
-            $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
-            return "\nvar hasSelected = false; var selectBox = myform.{$eltname};"."for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true) { hasSelected = true; break; } }"."if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
-        }
-        return '';
-    }
+	/**
+	 * Render custom javascript validation code
+	 *
+	 * @seealso XoopsForm::renderValidationJS
+	 */
+	function renderValidationJS()
+	{
+		// render custom validation code if any
+		if (! empty($this->customValidationCode)) {
+			return implode("\n", $this->customValidationCode);
+			// generate validation code if required
+		} elseif ($this->isRequired()) {
+			$eltname = $this->getName();
+			$eltcaption = $this->getCaption();
+			$eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
+			$eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
+			return "\nvar hasSelected = false; var selectBox = myform.{$eltname};"."for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true) { hasSelected = true; break; } }"."if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
+		}
+		return '';
+	}
 }
 
 ?>
\ No newline at end of file

Spacing +21 added lines, -21 removed lines

@@ -95,7 +95,7 @@ 
      * @param int $size Number or rows. "1" makes a drop-down-list
      * @param bool $multiple Allow multiple selections?
      */
-    function SonglistFormSelectSong($caption, $name, $value = null, $size = 1, $multiple = false, $id=-1, $field = 'cid')
+    function SonglistFormSelectSong($caption, $name, $value = null, $size = 1, $multiple = false, $id = -1, $field = 'cid')
     {
     	global $_form_object_options;
     	xoops_loadLanguage('modinfo', 'songlist');
@@ -110,27 +110,27 @@ 
 		$this->addOption('0', _MI_SONGLIST_NONE);
 		if ($id==-1) {
 			if (!isset($_form_object_options['songs'][$field][$id])) {
-				$songs_handler =& xoops_getmodulehandler('songs', 'songlist');
+				$songs_handler = & xoops_getmodulehandler('songs', 'songlist');
 				$criteria = new Criteria('1', '1');
 				$criteria->setSort('`title`');
 				$criteria->setOrder('ASC');
-				foreach($songs_handler->getObjects($criteria, true) as $id => $obj) { 
+				foreach ($songs_handler->getObjects($criteria, true) as $id => $obj) { 
 					$_form_object_options['songs'][$field][$id][$id] = $obj->getVar('title');
 				}
 			}
 		} else {
 			if (!isset($_form_object_options['songs'][$field][$id])) {
-				$songs_handler =& xoops_getmodulehandler('songs', 'songlist');
+				$songs_handler = & xoops_getmodulehandler('songs', 'songlist');
 				$criteria = new Criteria('`'.$field.'`', $id);
 				$criteria->setSort('`title`');
 				$criteria->setOrder('ASC');
-				foreach($songs_handler->getObjects($criteria) as $id => $obj) { 
+				foreach ($songs_handler->getObjects($criteria) as $id => $obj) { 
 					$_form_object_options['songs'][$field][$id][$id] = $obj->getVar('title');
 				}
 			}
 		}
 		if (isset($_form_object_options['songs'][$field][$id]))
-			foreach($_form_object_options['songs'][$field][$id] as $id => $value)
+			foreach ($_form_object_options['songs'][$field][$id] as $id => $value)
 				$this->addOption($id, $value);
     }
 
@@ -162,11 +162,11 @@ 
      */
     function getValue($encode = false)
     {
-        if (! $encode) {
+        if (!$encode) {
             return $this->_value;
         }
         $value = array();
-        foreach($this->_value as $val) {
+        foreach ($this->_value as $val) {
             $value[] = $val ? htmlspecialchars($val, ENT_QUOTES) : $val;
         }
         return $value;
@@ -180,7 +180,7 @@ 
     function setValue($value)
     {
         if (is_array($value)) {
-            foreach($value as $v) {
+            foreach ($value as $v) {
                 $this->_value[] = $v;
             }
         } elseif (isset($value)) {
@@ -196,7 +196,7 @@ 
      */
     function addOption($value, $name = '')
     {
-        if ($name != '') {
+        if ($name!='') {
             $this->_options[$value] = $name;
         } else {
             $this->_options[$value] = $value;
@@ -211,7 +211,7 @@ 
     function addOptionArray($options)
     {
         if (is_array($options)) {
-            foreach($options as $k => $v) {
+            foreach ($options as $k => $v) {
                 $this->addOption($k, $v);
             }
         }
@@ -227,12 +227,12 @@ 
      */
     function getOptions($encode = false)
     {
-        if (! $encode) {
+        if (!$encode) {
             return $this->_options;
         }
         $value = array();
-        foreach($this->_options as $val => $name) {
-            $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode > 1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
+        foreach ($this->_options as $val => $name) {
+            $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode>1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
         }
         return $value;
     }
@@ -249,17 +249,17 @@ 
         $ele_value = $this->getValue();
         $ele_options = $this->getOptions();
         $ret = '<select size="'.$this->getSize().'"'.$this->getExtra();
-        if ($this->isMultiple() != false) {
-            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'. $ele_title. '" multiple="multiple">' ;
+        if ($this->isMultiple()!=false) {
+            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'.$ele_title.'" multiple="multiple">';
         } else {
-            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'. $ele_title. '">' ;
+            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'.$ele_title.'">';
         }
-        foreach($ele_options as $value => $name) {
+        foreach ($ele_options as $value => $name) {
             $ret .= '<option value="'.htmlspecialchars($value, ENT_QUOTES).'"';
-            if (count($ele_value) > 0 && in_array($value, $ele_value)) {
+            if (count($ele_value)>0 && in_array($value, $ele_value)) {
                 $ret .= ' selected="selected"';
             }
-            $ret .= '>'.$name.'</option>' ;
+            $ret .= '>'.$name.'</option>';
         }
         $ret .= '</select>';
         return $ret;
@@ -273,7 +273,7 @@ 
     function renderValidationJS()
     {
         // render custom validation code if any
-        if (! empty($this->customValidationCode)) {
+        if (!empty($this->customValidationCode)) {
             return implode("\n", $this->customValidationCode);
             // generate validation code if required
         } elseif ($this->isRequired()) {

Braces +3 added lines, -2 removed lines

@@ -129,9 +129,10 @@
 				}
 			}
 		}
-		if (isset($_form_object_options['songs'][$field][$id]))
-			foreach($_form_object_options['songs'][$field][$id] as $id => $value)
+		if (isset($_form_object_options['songs'][$field][$id])) {
+					foreach($_form_object_options['songs'][$field][$id] as $id => $value)
 				$this->addOption($id, $value);
+		}
     }
 
     /**

htdocs/modules/songlist/include/formselectcategory.php

Indentation +194 added lines, -194 removed lines

@@ -54,69 +54,69 @@ 
  */
 class SonglistFormSelectCategory extends XoopsFormElement
 {
-    /**
-     * Options
-     *
-     * @var array
-     * @access private
-     */
-    var $_options = array();
+	/**
+	 * Options
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_options = array();
 
-    /**
-     * Allow multiple selections?
-     *
-     * @var bool
-     * @access private
-     */
-    var $_multiple = false;
+	/**
+	 * Allow multiple selections?
+	 *
+	 * @var bool
+	 * @access private
+	 */
+	var $_multiple = false;
 
-    /**
-     * Number of rows. "1" makes a dropdown list.
-     *
-     * @var int
-     * @access private
-     */
-    var $_size;
+	/**
+	 * Number of rows. "1" makes a dropdown list.
+	 *
+	 * @var int
+	 * @access private
+	 */
+	var $_size;
 
-    /**
-     * Pre-selcted values
-     *
-     * @var array
-     * @access private
-     */
-    var $_value = array();
+	/**
+	 * Pre-selcted values
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $_value = array();
 
-    /**
-     * Constructor
-     *
-     * @param string $caption Caption
-     * @param string $name "name" attribute
-     * @param mixed $value Pre-selected value (or array of them).
-     * @param int $size Number or rows. "1" makes a drop-down-list
-     * @param bool $multiple Allow multiple selections?
-     */
-    function SonglistFormSelectCategory($caption, $name, $value = null, $size = 1, $multiple = false, $ownid=0)
-    {
-    	global $_form_object_options;
-    	xoops_loadLanguage('modinfo', 'songlist');
+	/**
+	 * Constructor
+	 *
+	 * @param string $caption Caption
+	 * @param string $name "name" attribute
+	 * @param mixed $value Pre-selected value (or array of them).
+	 * @param int $size Number or rows. "1" makes a drop-down-list
+	 * @param bool $multiple Allow multiple selections?
+	 */
+	function SonglistFormSelectCategory($caption, $name, $value = null, $size = 1, $multiple = false, $ownid=0)
+	{
+		global $_form_object_options;
+		xoops_loadLanguage('modinfo', 'songlist');
     	
-        $this->setCaption($caption);
-        $this->setName($name);
-        $this->_multiple = $multiple;
-        $this->_size = intval($size);
-        if (isset($value)) {
-            $this->setValue($value);
-        }
+		$this->setCaption($caption);
+		$this->setName($name);
+		$this->_multiple = $multiple;
+		$this->_size = intval($size);
+		if (isset($value)) {
+			$this->setValue($value);
+		}
 		$this->addOption('0', _MI_SONGLIST_ALL);
 		if (!isset($_form_object_options['category'])) {
 			$_form_object_options['category'] = $this->GetCategory(0);
 		}
 		if (isset($_form_object_options['category'])) 
 			$this->populateList($_form_object_options['category'], $ownid);
-    }
+	}
 
-    function populateList($vars, $ownid = 0) {
-    	foreach($vars as $previd => $cats) {
+	function populateList($vars, $ownid = 0) {
+		foreach($vars as $previd => $cats) {
 			if ($previd!=$ownid||$ownid==0) {
 				foreach($cats as $catid => $title) {
 					if ($catid!=$ownid||$ownid==0) {
@@ -128,7 +128,7 @@ 
 				}
 			} 
 		}
-    }
+	}
 	function GetCategory($ownid){
 	
 		$category_handler =& xoops_getmodulehandler('category', 'songlist');
@@ -158,157 +158,157 @@ 
 		return ($langs_array);
 	}
 
-    /**
-     * Are multiple selections allowed?
-     *
-     * @return bool
-     */
-    function isMultiple()
-    {
-        return $this->_multiple;
-    }
+	/**
+	 * Are multiple selections allowed?
+	 *
+	 * @return bool
+	 */
+	function isMultiple()
+	{
+		return $this->_multiple;
+	}
 
-    /**
-     * Get the size
-     *
-     * @return int
-     */
-    function getSize()
-    {
-        return $this->_size;
-    }
+	/**
+	 * Get the size
+	 *
+	 * @return int
+	 */
+	function getSize()
+	{
+		return $this->_size;
+	}
 
-    /**
-     * Get an array of pre-selected values
-     *
-     * @param bool $encode To sanitizer the text?
-     * @return array
-     */
-    function getValue($encode = false)
-    {
-        if (! $encode) {
-            return $this->_value;
-        }
-        $value = array();
-        foreach($this->_value as $val) {
-            $value[] = $val ? htmlspecialchars($val, ENT_QUOTES) : $val;
-        }
-        return $value;
-    }
+	/**
+	 * Get an array of pre-selected values
+	 *
+	 * @param bool $encode To sanitizer the text?
+	 * @return array
+	 */
+	function getValue($encode = false)
+	{
+		if (! $encode) {
+			return $this->_value;
+		}
+		$value = array();
+		foreach($this->_value as $val) {
+			$value[] = $val ? htmlspecialchars($val, ENT_QUOTES) : $val;
+		}
+		return $value;
+	}
 
-    /**
-     * Set pre-selected values
-     *
-     * @param  $value mixed
-     */
-    function setValue($value)
-    {
-        if (is_array($value)) {
-            foreach($value as $v) {
-                $this->_value[] = $v;
-            }
-        } elseif (isset($value)) {
-            $this->_value[] = $value;
-        }
-    }
+	/**
+	 * Set pre-selected values
+	 *
+	 * @param  $value mixed
+	 */
+	function setValue($value)
+	{
+		if (is_array($value)) {
+			foreach($value as $v) {
+				$this->_value[] = $v;
+			}
+		} elseif (isset($value)) {
+			$this->_value[] = $value;
+		}
+	}
 
-    /**
-     * Add an option
-     *
-     * @param string $value "value" attribute
-     * @param string $name "name" attribute
-     */
-    function addOption($value, $name = '')
-    {
-        if ($name != '') {
-            $this->_options[$value] = $name;
-        } else {
-            $this->_options[$value] = $value;
-        }
-    }
+	/**
+	 * Add an option
+	 *
+	 * @param string $value "value" attribute
+	 * @param string $name "name" attribute
+	 */
+	function addOption($value, $name = '')
+	{
+		if ($name != '') {
+			$this->_options[$value] = $name;
+		} else {
+			$this->_options[$value] = $value;
+		}
+	}
 
-    /**
-     * Add multiple options
-     *
-     * @param array $options Associative array of value->name pairs
-     */
-    function addOptionArray($options)
-    {
-        if (is_array($options)) {
-            foreach($options as $k => $v) {
-                $this->addOption($k, $v);
-            }
-        }
-    }
+	/**
+	 * Add multiple options
+	 *
+	 * @param array $options Associative array of value->name pairs
+	 */
+	function addOptionArray($options)
+	{
+		if (is_array($options)) {
+			foreach($options as $k => $v) {
+				$this->addOption($k, $v);
+			}
+		}
+	}
 
-    /**
-     * Get an array with all the options
-     *
-     * Note: both name and value should be sanitized. However for backward compatibility, only value is sanitized for now.
-     *
-     * @param int $encode To sanitizer the text? potential values: 0 - skip; 1 - only for value; 2 - for both value and name
-     * @return array Associative array of value->name pairs
-     */
-    function getOptions($encode = false)
-    {
-        if (! $encode) {
-            return $this->_options;
-        }
-        $value = array();
-        foreach($this->_options as $val => $name) {
-            $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode > 1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
-        }
-        return $value;
-    }
+	/**
+	 * Get an array with all the options
+	 *
+	 * Note: both name and value should be sanitized. However for backward compatibility, only value is sanitized for now.
+	 *
+	 * @param int $encode To sanitizer the text? potential values: 0 - skip; 1 - only for value; 2 - for both value and name
+	 * @return array Associative array of value->name pairs
+	 */
+	function getOptions($encode = false)
+	{
+		if (! $encode) {
+			return $this->_options;
+		}
+		$value = array();
+		foreach($this->_options as $val => $name) {
+			$value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode > 1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
+		}
+		return $value;
+	}
 
-    /**
-     * Prepare HTML for output
-     *
-     * @return string HTML
-     */
-    function render()
-    {
-        $ele_name = $this->getName();
+	/**
+	 * Prepare HTML for output
+	 *
+	 * @return string HTML
+	 */
+	function render()
+	{
+		$ele_name = $this->getName();
 		$ele_title = $this->getTitle();
-        $ele_value = $this->getValue();
-        $ele_options = $this->getOptions();
-        $ret = '<select size="'.$this->getSize().'"'.$this->getExtra();
-        if ($this->isMultiple() != false) {
-            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'. $ele_title. '" multiple="multiple">' ;
-        } else {
-            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'. $ele_title. '">' ;
-        }
-        foreach($ele_options as $value => $name) {
-            $ret .= '<option value="'.htmlspecialchars($value, ENT_QUOTES).'"';
-            if (count($ele_value) > 0 && in_array($value, $ele_value)) {
-                $ret .= ' selected="selected"';
-            }
-            $ret .= '>'.$name.'</option>' ;
-        }
-        $ret .= '</select>';
-        return $ret;
-    }
+		$ele_value = $this->getValue();
+		$ele_options = $this->getOptions();
+		$ret = '<select size="'.$this->getSize().'"'.$this->getExtra();
+		if ($this->isMultiple() != false) {
+			$ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'. $ele_title. '" multiple="multiple">' ;
+		} else {
+			$ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'. $ele_title. '">' ;
+		}
+		foreach($ele_options as $value => $name) {
+			$ret .= '<option value="'.htmlspecialchars($value, ENT_QUOTES).'"';
+			if (count($ele_value) > 0 && in_array($value, $ele_value)) {
+				$ret .= ' selected="selected"';
+			}
+			$ret .= '>'.$name.'</option>' ;
+		}
+		$ret .= '</select>';
+		return $ret;
+	}
 
-    /**
-     * Render custom javascript validation code
-     *
-     * @seealso XoopsForm::renderValidationJS
-     */
-    function renderValidationJS()
-    {
-        // render custom validation code if any
-        if (! empty($this->customValidationCode)) {
-            return implode("\n", $this->customValidationCode);
-            // generate validation code if required
-        } elseif ($this->isRequired()) {
-            $eltname = $this->getName();
-            $eltcaption = $this->getCaption();
-            $eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
-            $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
-            return "\nvar hasSelected = false; var selectBox = myform.{$eltname};"."for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true) { hasSelected = true; break; } }"."if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
-        }
-        return '';
-    }
+	/**
+	 * Render custom javascript validation code
+	 *
+	 * @seealso XoopsForm::renderValidationJS
+	 */
+	function renderValidationJS()
+	{
+		// render custom validation code if any
+		if (! empty($this->customValidationCode)) {
+			return implode("\n", $this->customValidationCode);
+			// generate validation code if required
+		} elseif ($this->isRequired()) {
+			$eltname = $this->getName();
+			$eltcaption = $this->getCaption();
+			$eltmsg = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
+			$eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
+			return "\nvar hasSelected = false; var selectBox = myform.{$eltname};"."for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected == true) { hasSelected = true; break; } }"."if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
+		}
+		return '';
+	}
 }
 
 ?>
\ No newline at end of file

Spacing +26 added lines, -26 removed lines

@@ -95,7 +95,7 @@ 
      * @param int $size Number or rows. "1" makes a drop-down-list
      * @param bool $multiple Allow multiple selections?
      */
-    function SonglistFormSelectCategory($caption, $name, $value = null, $size = 1, $multiple = false, $ownid=0)
+    function SonglistFormSelectCategory($caption, $name, $value = null, $size = 1, $multiple = false, $ownid = 0)
     {
     	global $_form_object_options;
     	xoops_loadLanguage('modinfo', 'songlist');
@@ -116,10 +116,10 @@ 
     }
 
     function populateList($vars, $ownid = 0) {
-    	foreach($vars as $previd => $cats) {
-			if ($previd!=$ownid||$ownid==0) {
-				foreach($cats as $catid => $title) {
-					if ($catid!=$ownid||$ownid==0) {
+    	foreach ($vars as $previd => $cats) {
+			if ($previd!=$ownid || $ownid==0) {
+				foreach ($cats as $catid => $title) {
+					if ($catid!=$ownid || $ownid==0) {
 						$this->addOption($catid, $title['item']);
 						if (isset($title['sub'])) {
 							$this->populateList($title['sub'], $ownid);
@@ -129,9 +129,9 @@ 
 			} 
 		}
     }
-	function GetCategory($ownid){
+	function GetCategory($ownid) {
 	
-		$category_handler =& xoops_getmodulehandler('category', 'songlist');
+		$category_handler = & xoops_getmodulehandler('category', 'songlist');
 		$criteria = new Criteria('pid', '0');
 		$criteria->setSort('`name`');
 		$criteria->setOrder('ASC');
@@ -140,16 +140,16 @@ 
 		return $langs_array;
 	}
 	
-	function TreeMenu($langs_array, $categories, $level, $ownid, $previd=0) {
+	function TreeMenu($langs_array, $categories, $level, $ownid, $previd = 0) {
 		$level++;
-		$category_handler =& xoops_getmodulehandler('category', 'songlist');
-		foreach($categories as $catid => $category) {
+		$category_handler = & xoops_getmodulehandler('category', 'songlist');
+		foreach ($categories as $catid => $category) {
 			if ($catid!=$ownid) {
 				$langs_array[$previd][$catid]['item'] = str_repeat('--', $level).$category->getVar('name');
 				$criteria = new Criteria('pid', $catid);
 				$criteria->setSort('`name`');
 				$criteria->setOrder('ASC');
-				if ($categoriesb = $category_handler->getObjects($criteria, true)){
+				if ($categoriesb = $category_handler->getObjects($criteria, true)) {
 					$langs_array[$previd][$catid]['sub'] = $this->TreeMenu($langs_array, $categoriesb, $level, $ownid, $catid);
 				}
 			}
@@ -186,11 +186,11 @@ 
      */
     function getValue($encode = false)
     {
-        if (! $encode) {
+        if (!$encode) {
             return $this->_value;
         }
         $value = array();
-        foreach($this->_value as $val) {
+        foreach ($this->_value as $val) {
             $value[] = $val ? htmlspecialchars($val, ENT_QUOTES) : $val;
         }
         return $value;
@@ -204,7 +204,7 @@ 
     function setValue($value)
     {
         if (is_array($value)) {
-            foreach($value as $v) {
+            foreach ($value as $v) {
                 $this->_value[] = $v;
             }
         } elseif (isset($value)) {
@@ -220,7 +220,7 @@ 
      */
     function addOption($value, $name = '')
     {
-        if ($name != '') {
+        if ($name!='') {
             $this->_options[$value] = $name;
         } else {
             $this->_options[$value] = $value;
@@ -235,7 +235,7 @@ 
     function addOptionArray($options)
     {
         if (is_array($options)) {
-            foreach($options as $k => $v) {
+            foreach ($options as $k => $v) {
                 $this->addOption($k, $v);
             }
         }
@@ -251,12 +251,12 @@ 
      */
     function getOptions($encode = false)
     {
-        if (! $encode) {
+        if (!$encode) {
             return $this->_options;
         }
         $value = array();
-        foreach($this->_options as $val => $name) {
-            $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode > 1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
+        foreach ($this->_options as $val => $name) {
+            $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode>1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
         }
         return $value;
     }
@@ -273,17 +273,17 @@ 
         $ele_value = $this->getValue();
         $ele_options = $this->getOptions();
         $ret = '<select size="'.$this->getSize().'"'.$this->getExtra();
-        if ($this->isMultiple() != false) {
-            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'. $ele_title. '" multiple="multiple">' ;
+        if ($this->isMultiple()!=false) {
+            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'.$ele_title.'" multiple="multiple">';
         } else {
-            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'. $ele_title. '">' ;
+            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'.$ele_title.'">';
         }
-        foreach($ele_options as $value => $name) {
+        foreach ($ele_options as $value => $name) {
             $ret .= '<option value="'.htmlspecialchars($value, ENT_QUOTES).'"';
-            if (count($ele_value) > 0 && in_array($value, $ele_value)) {
+            if (count($ele_value)>0 && in_array($value, $ele_value)) {
                 $ret .= ' selected="selected"';
             }
-            $ret .= '>'.$name.'</option>' ;
+            $ret .= '>'.$name.'</option>';
         }
         $ret .= '</select>';
         return $ret;
@@ -297,7 +297,7 @@ 
     function renderValidationJS()
     {
         // render custom validation code if any
-        if (! empty($this->customValidationCode)) {
+        if (!empty($this->customValidationCode)) {
             return implode("\n", $this->customValidationCode);
             // generate validation code if required
         } elseif ($this->isRequired()) {

Braces +3 added lines, -2 removed lines

@@ -111,8 +111,9 @@
 		if (!isset($_form_object_options['category'])) {
 			$_form_object_options['category'] = $this->GetCategory(0);
 		}
-		if (isset($_form_object_options['category'])) 
-			$this->populateList($_form_object_options['category'], $ownid);
+		if (isset($_form_object_options['category'])) {
+					$this->populateList($_form_object_options['category'], $ownid);
+		}
     }
 
     function populateList($vars, $ownid = 0) {

htdocs/modules/songlist/include/songlists.form.php

Indentation +6 added lines, -6 removed lines

@@ -240,12 +240,12 @@
 	
 	
 	/**
-	* Get {@link XoopsThemeForm} for editing a user
-	*
-	* @param object $user {@link XoopsUser} to edit
-	*
-	* @return object
-	*/
+	 * Get {@link XoopsThemeForm} for editing a user
+	 *
+	 * @param object $user {@link XoopsUser} to edit
+	 *
+	 * @return object
+	 */
 	function songlist_getUserSearchForm($action = false)
 	{
 		if ($action === false) {

Spacing +167 added lines, -167 removed lines

@@ -12,7 +12,7 @@ 
 	 */
 	function songlist_getFieldForm(&$field, $action = false)
 	{
-		if ( $action === false ) {
+		if ($action===false) {
 			$action = $_SERVER['PHP_SELF'];
 		}
 		$title = $field->isNew() ? sprintf(_AM_SONGLIST_ADD, _AM_SONGLIST_FIELD) : sprintf(_AM_SONGLIST_EDIT, _AM_SONGLIST_FIELD);
@@ -32,7 +32,7 @@ 
 		$category_handler = xoops_getmodulehandler('category');
 		$cat_select = new XoopsFormSelect(_AM_SONGLIST_CATEGORY, 'cids', $fieldcid, 7, true);
 		$cat_select->addOption(0, _AM_SONGLIST_DEFAULT);
-		foreach($category_handler->getObjects(NULL, true) as $cid => $category)
+		foreach ($category_handler->getObjects(NULL, true) as $cid => $category)
 			$cat_select->addOption($cid, $category->getVar('name'));
 		$form->addElement($cat_select);
 		$form->addElement(new XoopsFormText(_AM_SONGLIST_WEIGHT, 'field_weight', 10, 10, $field->getVar('field_weight', 'e')));
@@ -106,9 +106,9 @@ 
 	
 			//$form->addElement(new XoopsFormRadioYN(_AM_SONGLIST_NOTNULL, 'field_notnull', $field->getVar('field_notnull', 'e') ));
 	
-			if ($field->getVar('field_type') == "select" || $field->getVar('field_type') == "select_multi" || $field->getVar('field_type') == "radio" || $field->getVar('field_type') == "checkbox") {
+			if ($field->getVar('field_type')=="select" || $field->getVar('field_type')=="select_multi" || $field->getVar('field_type')=="radio" || $field->getVar('field_type')=="checkbox") {
 				$options = $field->getVar('field_options');
-				if (count($options) > 0) {
+				if (count($options)>0) {
 					$remove_options = new XoopsFormCheckBox(_AM_SONGLIST_REMOVEOPTIONS, 'removeOptions');
 					$remove_options->columns = 3;
 					asort($options);
@@ -119,13 +119,13 @@ 
 					$form->addElement($remove_options);
 				}
 	
-				$option_text = "<table  cellspacing='1'><tr><td width='20%'>" . _AM_SONGLIST_KEY . "</td><td>" . _AM_SONGLIST_VALUE . "</td></tr>";
-				for ($i = 0; $i < 3; $i++) {
+				$option_text = "<table  cellspacing='1'><tr><td width='20%'>"._AM_SONGLIST_KEY."</td><td>"._AM_SONGLIST_VALUE."</td></tr>";
+				for ($i = 0; $i<3; $i++) {
 					$option_text .= "<tr><td><input type='text' name='addOption[{$i}][key]' id='addOption[{$i}][key]' size='15' /></td><td><input type='text' name='addOption[{$i}][value]' id='addOption[{$i}][value]' size='35' /></td></tr>";
 					$option_text .= "<tr height='3px'><td colspan='2'> </td></tr>";
 				}
 				$option_text .= "</table>";
-				$form->addElement(new XoopsFormLabel(_AM_SONGLIST_ADDOPTION, $option_text) );
+				$form->addElement(new XoopsFormLabel(_AM_SONGLIST_ADDOPTION, $option_text));
 			}
 		}
 	
@@ -140,7 +140,7 @@ 
 	
 				case "checkbox":
 				case "select_multi":
-					$def_value = $field->getVar('field_default', 'e') != null ? unserialize($field->getVar('field_default', 'n')) : null;
+					$def_value = $field->getVar('field_default', 'e')!=null ? unserialize($field->getVar('field_default', 'n')) : null;
 					$element = new XoopsFormSelect(_AM_SONGLIST_DEFAULT, 'field_default', $def_value, 8, true);
 					$options = $field->getVar('field_options');
 					asort($options);
@@ -154,7 +154,7 @@ 
 	
 				case "select":
 				case "radio":
-					$def_value = $field->getVar('field_default', 'e') != null ? $field->getVar('field_default') : null;
+					$def_value = $field->getVar('field_default', 'e')!=null ? $field->getVar('field_default') : null;
 					$element = new XoopsFormSelect(_AM_SONGLIST_DEFAULT, 'field_default', $def_value);
 					$options = $field->getVar('field_options');
 					asort($options);
@@ -220,7 +220,7 @@ 
 			'language');
 		if (in_array($field->getVar('field_type'), $searchable_types)) {
 			$search_groups = $groupperm_handler->getGroupIds('songlist_search', $field->getVar('field_id'), $GLOBALS['songlistModule']->getVar('mid'));
-			$form->addElement(new XoopsFormSelectGroup(_AM_SONGLIST_PROF_SEARCH, 'songlist_search', true, $search_groups, 5, true) );
+			$form->addElement(new XoopsFormSelectGroup(_AM_SONGLIST_PROF_SEARCH, 'songlist_search', true, $search_groups, 5, true));
 		}
 		if ($field->getVar('field_edit') || $field->isNew()) {
 			if (!$field->isNew()) {
@@ -232,7 +232,7 @@ 
 			$form->addElement(new XoopsFormSelectGroup(_AM_SONGLIST_PROF_EDITABLE, 'songlist_edit', false, $editable_groups, 5, true));
 			$form->addElement($steps_select);
 		}
-		$form->addElement(new XoopsFormHidden('op', 'save') );
+		$form->addElement(new XoopsFormHidden('op', 'save'));
 		$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 	
 		return $form;
@@ -248,7 +248,7 @@ 
 	*/
 	function songlist_getUserSearchForm($action = false)
 	{
-		if ($action === false) {
+		if ($action===false) {
 			$action = $_SERVER['PHP_SELF'];
 		}
 		if (empty($GLOBALS['xoopsConfigUser'])) {
@@ -274,35 +274,35 @@ 
 		// Get ids of fields that can be edited
 		$gperm_handler = xoops_gethandler('groupperm');
 	
-		$editable_fields = $gperm_handler->getItemIds('songlist_search', $groups, $modid );
+		$editable_fields = $gperm_handler->getItemIds('songlist_search', $groups, $modid);
 	
 		$cat_handler = xoops_getmodulehandler('category');
 	
-		$selcat = new XoopsFormSelectForum('Forum', 'cid', (!empty($_REQUEST['cid']))?intval($_REQUEST['cid']):0, 1, false, false, false, true );
+		$selcat = new XoopsFormSelectForum('Forum', 'cid', (!empty($_REQUEST['cid'])) ?intval($_REQUEST['cid']) : 0, 1, false, false, false, true);
 		$selcat->setExtra(' onChange="window.location=\''.XOOPS_URL.'/modules/objects/search.php?op=search&fct=form&cid=\'+document.search.cid.options[document.search.cid.selectedIndex].value"');
 	
 		$form->addElement($selcat, true);
 	
 		$categories = array();
 	
-		$criteria = new CriteriaCompo(new Criteria('cid', (!empty($_REQUEST['cid']))?intval($_REQUEST['cid']):'0'), "OR");
+		$criteria = new CriteriaCompo(new Criteria('cid', (!empty($_REQUEST['cid'])) ?intval($_REQUEST['cid']) : '0'), "OR");
 		$all_categories = $cat_handler->getObjects($criteria, true, false);
 		$count_fields = count($fields);
 	
-		foreach (array_keys($fields) as $i ) {
-			if ( in_array($fields[$i]->getVar('field_id'), $editable_fields)  ) {
+		foreach (array_keys($fields) as $i) {
+			if (in_array($fields[$i]->getVar('field_id'), $editable_fields)) {
 				// Set default value for user fields if available
 				$fieldinfo['element'] = $fields[$i]->getSearchElement();
 				$fieldinfo['required'] = false;
 	
-				foreach($fields[$i]->getVar('cids') as $catidid => $cid) {
+				foreach ($fields[$i]->getVar('cids') as $catidid => $cid) {
 					if (in_array($cid, array_keys($all_categories))) {
-						$key = $all_categories[$cid]['cat_weight'] * $count_fields + $cid;
+						$key = $all_categories[$cid]['cat_weight']*$count_fields+$cid;
 						$elements[$key][] = $fieldinfo;
 						$weights[$key][] = $fields[$i]->getVar('field_weight');
 						$categories[$key] = $all_categories[$cid];
 					} elseif (in_array(0, $fields[$i]->getVar('cids'))) {
-						$key = $all_categories[$cid]['cat_weight'] * $count_fields + $cid;
+						$key = $all_categories[$cid]['cat_weight']*$count_fields+$cid;
 						$elements[$key][] = $fieldinfo;
 						$weights[$key][] = $fields[$i]->getVar('field_weight');
 						$categories[$key] = $all_categories[$cid];
@@ -322,25 +322,25 @@ 
 			}
 		}
 	
-		$form->addElement(new XoopsFormHidden('fct', 'objects' ));
-		$form->addElement(new XoopsFormHidden('op', 'search' ));
+		$form->addElement(new XoopsFormHidden('fct', 'objects'));
+		$form->addElement(new XoopsFormHidden('op', 'search'));
 		$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 		return $form;
 	}
 	
 	function songlist_import_get_form() {
 		$sform = new XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_IMPORT, 'import', $_SERVER['PHP_SELF'], 'post');
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$ele['op'] = new XoopsFormHidden('op', 'import');
 		$ele['fct'] = new XoopsFormHidden('fct', 'upload');
-		$ele['xmlfile'] = new XoopsFormFile(($as_array==false?_FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML:''), 'xmlfile', 1024*1024*1024*32);
-		$ele['xmlfile']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML_DESC:''));
+		$ele['xmlfile'] = new XoopsFormFile(($as_array==false ?_FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML:''), 'xmlfile', 1024*1024*1024*32);
+		$ele['xmlfile']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML_DESC:''));
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array('xmlfile');
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -354,52 +354,52 @@ 
 		$sform = new XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_ELEMENTS, 'elements', $_SERVER['PHP_SELF'], 'post');
 		
 		$filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$file));
-		$mb = floor($filesize / 1024 / 1024);
+		$mb = floor($filesize/1024/1024);
 		if ($mb>32) {
 			set_ini('memory_limit', ($mb+128).'M');	
 		}
 		set_time_limit(3600);
 								
-		$i=0;
+		$i = 0;
 		foreach (file($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile'])) as $data) {
 			$i++;
 			if ($i<20) {
-				$line .= $data . ($i<19?'<br/>':'');
+				$line .= $data.($i<19 ? '<br/>' : '');
 			}
 		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'import');
 		$ele['fct'] = new XoopsFormHidden('fct', 'import');
-		$ele['example'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_EXAMPLE:''), '<pre>'.$line.'</pre>');
-		$ele['example']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_EXAMPLE_DESC:''));
-		$ele['collection'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_GENRE:''), 'collection', 32, 128, 'collection');
-		$ele['collection']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_GENRE_DESC:''));
-		$ele['genre'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_GENRE:''), 'genre', 32, 128, '');
-		$ele['genre']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_GENRE_DESC:''));
-		$ele['category'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_CATEGORY:''), 'category', 32, 128, '');
-		$ele['category']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_CATEGORY_DESC:''));
-		$ele['artist'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_ARTIST:''), 'artist', 32, 128, 'artist');
-		$ele['artist']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_ARTIST_DESC:''));
-		$ele['singer'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_SINGER:''), 'singer', 32, 128, '');
-		$ele['singer']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_SINGER_DESC:''));
-		$ele['duet'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_DATA_SINGER_DUET:''), 'duet', 32, 128, 'duet');
-		$ele['duet']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_DATA_SINGER_DUET_DESC:''));
-		$ele['solo'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_DATA_SINGER_SOLO:''), 'solo', 32, 128, 'solo');
-		$ele['solo']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_DATA_SINGER_SOLO_DESC:''));
-		$ele['album'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_ALBUM:''), 'album', 32, 128, '');
-		$ele['album']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_ALBUM_DESC:''));
-		$ele['songid'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_SONGID:''), 'songid', 32, 128, 'songid');
-		$ele['songid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_SONGID_DESC:''));
-		$ele['title'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_TITLE:''), 'title', 32, 128, 'title');
-		$ele['title']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_TITLE_DESC:''));
-		$ele['lyrics'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_LYRICS:''), 'lyrics', 32, 128, 'lyrics');
-		$ele['lyrics']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ELEMENT_LYRICS_DESC:''));
+		$ele['example'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_EXAMPLE:''), '<pre>'.$line.'</pre>');
+		$ele['example']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_EXAMPLE_DESC:''));
+		$ele['collection'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_GENRE:''), 'collection', 32, 128, 'collection');
+		$ele['collection']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_GENRE_DESC:''));
+		$ele['genre'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_GENRE:''), 'genre', 32, 128, '');
+		$ele['genre']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_GENRE_DESC:''));
+		$ele['category'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_CATEGORY:''), 'category', 32, 128, '');
+		$ele['category']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_CATEGORY_DESC:''));
+		$ele['artist'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_ARTIST:''), 'artist', 32, 128, 'artist');
+		$ele['artist']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_ARTIST_DESC:''));
+		$ele['singer'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_SINGER:''), 'singer', 32, 128, '');
+		$ele['singer']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_SINGER_DESC:''));
+		$ele['duet'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_DATA_SINGER_DUET:''), 'duet', 32, 128, 'duet');
+		$ele['duet']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_DATA_SINGER_DUET_DESC:''));
+		$ele['solo'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_DATA_SINGER_SOLO:''), 'solo', 32, 128, 'solo');
+		$ele['solo']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_DATA_SINGER_SOLO_DESC:''));
+		$ele['album'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_ALBUM:''), 'album', 32, 128, '');
+		$ele['album']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_ALBUM_DESC:''));
+		$ele['songid'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_SONGID:''), 'songid', 32, 128, 'songid');
+		$ele['songid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_SONGID_DESC:''));
+		$ele['title'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_TITLE:''), 'title', 32, 128, 'title');
+		$ele['title']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_TITLE_DESC:''));
+		$ele['lyrics'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_LYRICS:''), 'lyrics', 32, 128, 'lyrics');
+		$ele['lyrics']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ELEMENT_LYRICS_DESC:''));
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array();
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -409,7 +409,7 @@ 
 		
 	}
 	
-	function songlist_albums_get_form($object, $as_array=false) {
+	function songlist_albums_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('albums', 'songlist');
@@ -427,7 +427,7 @@ 
 			$ele['mode'] = new XoopsFormHidden('mode', 'edit');
 		}
 		
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$id = $object->getVar('abid');
 		if (empty($id)) $id = '0';
@@ -438,31 +438,31 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
-		$ele['cid'] = new SonglistFormSelectCategory(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_CATEGORY:''), $id.'[cid]', $object->getVar('cid'), 1, false, false, false);
-		$ele['cid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_CATEGORY_DESC:''));
-		$ele['title'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_TITLE:''), $id.'[title]', ($as_array==false?55:21),128, $object->getVar('title'));
-		$ele['title']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_TITLE_DESC:''));
-		$ele['image'] = new XoopsFormFile(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER:''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
-		$ele['image']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER_DESC:''));
-		if (strlen($object->getVar('image'))>0&&file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('image')))) {
-			$ele['image_preview'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_POSTER:''), '<img src="'.$object->getImage('image').'" width="340px" />' );
-			$ele['image_preview']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_POSTER_DESC:''));
-		}
-		$ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_ARTISTS:''), $object->getVar('artists'));
-		$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_SONGS:''), $object->getVar('songs'));
-		$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_HITS:''), $object->getVar('hits'));
-		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+		$ele['cid'] = new SonglistFormSelectCategory(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_CATEGORY:''), $id.'[cid]', $object->getVar('cid'), 1, false, false, false);
+		$ele['cid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_CATEGORY_DESC:''));
+		$ele['title'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_TITLE:''), $id.'[title]', ($as_array==false ? 55 : 21), 128, $object->getVar('title'));
+		$ele['title']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_TITLE_DESC:''));
+		$ele['image'] = new XoopsFormFile(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER:''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
+		$ele['image']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER_DESC:''));
+		if (strlen($object->getVar('image'))>0 && file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('image')))) {
+			$ele['image_preview'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_POSTER:''), '<img src="'.$object->getImage('image').'" width="340px" />');
+			$ele['image_preview']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_POSTER_DESC:''));
+		}
+		$ele['artists'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_ARTISTS:''), $object->getVar('artists'));
+		$ele['songs'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_SONGS:''), $object->getVar('songs'));
+		$ele['hits'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_HITS:''), $object->getVar('hits'));
+		$ele['rank'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'), 2).' of 10');
 		if ($object->getVar('created')>0) {
-			$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
+			$ele['created'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
 		}
 		if ($object->getVar('updated')>0) {
-			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
+			$ele['updated'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 
 		if ($as_array==true)
@@ -472,7 +472,7 @@ 
 		
 		$required = array('name', 'id', 'source');
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -482,7 +482,7 @@ 
 		
 	}
 
-	function songlist_artists_get_form($object, $as_array=false) {
+	function songlist_artists_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('artists', 'songlist');
@@ -509,27 +509,27 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
-		$ele['cid'] = new SonglistFormSelectCategory(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_CATEGORY:''), $id.'[cid]', $object->getVar('cid'), 1, false, false, false);
-		$ele['cid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_CATEGORY_DESC:''));
-		$ele['singer'] = new SonglistFormSelectSinger(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SINGER:''), $id.'[singer]', $object->getVar('singer'), 1, false, false, false);
-		$ele['singer']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SINGER_DESC:''));
-		$ele['name'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_NAME:''), $id.'[name]', ($as_array==false?55:21),128, $object->getVar('name'));
-		$ele['name']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_NAME_DESC:''));
-		$ele['albums'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_ALBUMS:''), $object->getVar('albums'));
-		$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SONGS:''), $object->getVar('songs'));
-		$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_HITS:''), $object->getVar('hits'));
-		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+		$ele['cid'] = new SonglistFormSelectCategory(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_CATEGORY:''), $id.'[cid]', $object->getVar('cid'), 1, false, false, false);
+		$ele['cid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_CATEGORY_DESC:''));
+		$ele['singer'] = new SonglistFormSelectSinger(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_SINGER:''), $id.'[singer]', $object->getVar('singer'), 1, false, false, false);
+		$ele['singer']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_SINGER_DESC:''));
+		$ele['name'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_NAME:''), $id.'[name]', ($as_array==false ? 55 : 21), 128, $object->getVar('name'));
+		$ele['name']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_NAME_DESC:''));
+		$ele['albums'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_ALBUMS:''), $object->getVar('albums'));
+		$ele['songs'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_SONGS:''), $object->getVar('songs'));
+		$ele['hits'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_HITS:''), $object->getVar('hits'));
+		$ele['rank'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'), 2).' of 10');
 		if ($object->getVar('created')>0) {
-			$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
+			$ele['created'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
 		}
 		if ($object->getVar('updated')>0) {
-			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
+			$ele['updated'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ARTISTS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 				
 		if ($as_array==true)
@@ -539,7 +539,7 @@ 
 		
 		$required = array('name', 'mimetype', 'support');
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -549,7 +549,7 @@ 
 		
 	}
 
-	function songlist_category_get_form($object, $as_array=false) {
+	function songlist_category_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('category', 'songlist');
@@ -567,7 +567,7 @@ 
 			$ele['mode'] = new XoopsFormHidden('mode', 'edit');
 		}
 		
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$id = $object->getVar('cid');
 		if (empty($id)) $id = '0';
@@ -578,16 +578,16 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
-		$ele['pid'] = new SonglistFormSelectCategory(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_PARENT:''), $id.'[pid]', $object->getVar('pid'), 1, false, $object->getVar('cid'));
-		$ele['pid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_PARENT_DESC:''));
-		$ele['name'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_NAME:''), $id.'[name]', ($as_array==false?55:21),128, $object->getVar('name'));
-		$ele['name']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_NAME_DESC:''));
+		$ele['pid'] = new SonglistFormSelectCategory(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_PARENT:''), $id.'[pid]', $object->getVar('pid'), 1, false, $object->getVar('cid'));
+		$ele['pid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_PARENT_DESC:''));
+		$ele['name'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_NAME:''), $id.'[name]', ($as_array==false ? 55 : 21), 128, $object->getVar('name'));
+		$ele['name']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_NAME_DESC:''));
 		$description_configs = array();
 		$description_configs['name'] = $id.'[description]';
 		$description_configs['value'] = $object->getVar('decription');
@@ -596,22 +596,22 @@ 
 		$description_configs['width'] = "100%";
 		$description_configs['height'] = "400px";
 		$ele['description'] = new XoopsFormEditor(_FRM_SONGLIST_FORM_CATEGORY_DESCRIPTION, $GLOBALS['songlistModuleConfig']['editor'], $description_configs);
-		$ele['description']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_CATEGORY_DESCRIPTION_DESC:''));
-		$ele['image'] = new XoopsFormFile(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER:''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
-		$ele['image']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER_DESC:''));
-		if (strlen($object->getVar('image'))>0&&file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('image')))) {
-			$ele['image_preview'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_POSTER:''), '<img src="'.$object->getImage('image').'" width="340px" />' );
-			$ele['image_preview']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_POSTER_DESC:''));
-		}
-		$ele['artists'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_ARTISTS:''), $object->getVar('artists'));
-		$ele['songs'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_SONGS:''), $object->getVar('songs'));
-		$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_HITS:''), $object->getVar('hits'));
-		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+		$ele['description']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_CATEGORY_DESCRIPTION_DESC:''));
+		$ele['image'] = new XoopsFormFile(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER:''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
+		$ele['image']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER_DESC:''));
+		if (strlen($object->getVar('image'))>0 && file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('image')))) {
+			$ele['image_preview'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_POSTER:''), '<img src="'.$object->getImage('image').'" width="340px" />');
+			$ele['image_preview']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_POSTER_DESC:''));
+		}
+		$ele['artists'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_ARTISTS:''), $object->getVar('artists'));
+		$ele['songs'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_SONGS:''), $object->getVar('songs'));
+		$ele['hits'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_HITS:''), $object->getVar('hits'));
+		$ele['rank'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'), 2).' of 10');
 		if ($object->getVar('created')>0) {
-			$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
+			$ele['created'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
 		}
 		if ($object->getVar('updated')>0) {
-			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
+			$ele['updated'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_ALBUMS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 		
 		if ($as_array==true)
@@ -621,7 +621,7 @@ 
 		
 		$required = array('name', 'id', 'source');
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -631,7 +631,7 @@ 
 		
 	}
 	
-	function songlist_songs_get_form($object, $as_array=false) {
+	function songlist_songs_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('songs', 'songlist');
@@ -649,7 +649,7 @@ 
 			$ele['mode'] = new XoopsFormHidden('mode', 'edit');
 		}
 		
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$id = $object->getVar('sid');
 		if (empty($id)) $id = '0';
@@ -660,26 +660,26 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
-		$ele['cid'] = new SonglistFormSelectCategory(($as_array==false?_FRM_SONGLIST_FORM_SONGS_CATEGORY:''), $id.'[cid]', (isset($_REQUEST['cid'])?$_REQUEST['cid']:$object->getVar('cid')), 1, false);
-		$ele['cid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_CATEGORY_DESC:''));
+		$ele['cid'] = new SonglistFormSelectCategory(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_CATEGORY:''), $id.'[cid]', (isset($_REQUEST['cid']) ? $_REQUEST['cid'] : $object->getVar('cid')), 1, false);
+		$ele['cid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_CATEGORY_DESC:''));
 		if ($GLOBALS['songlistModuleConfig']['genre']) {
-			$ele['gid'] = new SonglistFormSelectGenre(($as_array==false?_FRM_SONGLIST_FORM_SONGS_GENRE:''), $id.'[gid]', (isset($_REQUEST['gid'])?$_REQUEST['gid']:$object->getVar('gid')), 1, false);
-			$ele['gid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_GENRE_DESC:''));
+			$ele['gid'] = new SonglistFormSelectGenre(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_GENRE:''), $id.'[gid]', (isset($_REQUEST['gid']) ? $_REQUEST['gid'] : $object->getVar('gid')), 1, false);
+			$ele['gid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_GENRE_DESC:''));
 		}
 		if ($GLOBALS['songlistModuleConfig']['album']) {
-			$ele['abid'] = new SonglistFormSelectAlbum(($as_array==false?_FRM_SONGLIST_FORM_SONGS_ALBUM:''), $id.'[abid]', $object->getVar('abid'), 1, false);
-			$ele['abid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_ALBUM_DESC:''));
+			$ele['abid'] = new SonglistFormSelectAlbum(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_ALBUM:''), $id.'[abid]', $object->getVar('abid'), 1, false);
+			$ele['abid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_ALBUM_DESC:''));
 		}
-		$ele['songid'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_SONGS_SONGID:''), $id.'[songid]', ($as_array==false?25:15),32, $object->getVar('songid'));
-		$ele['songid']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_SONGID_DESC:''));
-		$ele['title'] = new XoopsFormText(($as_array==false?_FRM_SONGLIST_FORM_SONGS_TITLE:''), $id.'[title]', ($as_array==false?55:21),128, $object->getVar('title'));
-		$ele['title']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_TITLE_DESC:''));
+		$ele['songid'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_SONGID:''), $id.'[songid]', ($as_array==false ? 25 : 15), 32, $object->getVar('songid'));
+		$ele['songid']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_SONGID_DESC:''));
+		$ele['title'] = new XoopsFormText(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_TITLE:''), $id.'[title]', ($as_array==false ? 55 : 21), 128, $object->getVar('title'));
+		$ele['title']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_TITLE_DESC:''));
 		$description_configs = array();
 		$description_configs['name'] = $id.'[lyrics]';
 		$description_configs['value'] = $object->getVar('lyrics');
@@ -688,10 +688,10 @@ 
 		$description_configs['width'] = "100%";
 		$description_configs['height'] = "400px";
 		$ele['lyrics'] = new XoopsFormEditor(_FRM_SONGLIST_FORM_SONGS_LYRICS, $GLOBALS['songlistModuleConfig']['editor'], $description_configs);
-		$ele['lyrics']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_SONGS_LYRICS_DESC:''));
+		$ele['lyrics']->setDescription(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_LYRICS_DESC:''));
 		
 		$category_handler = xoops_getmodulehandler('category', 'songlist');
-		$criteria = new CriteriaCompo(new Criteria('cid', (!empty($_REQUEST['cid']))?intval($_REQUEST['cid']):$object->getVar('cid')));
+		$criteria = new CriteriaCompo(new Criteria('cid', (!empty($_REQUEST['cid'])) ?intval($_REQUEST['cid']) : $object->getVar('cid')));
 		$all_categories = $category_handler->getObjects($criteria, true, false);
 
 		// Dynamic fields
@@ -715,19 +715,19 @@ 
 			$extra = $extras_handler->create();
 		$allnames = array();
 		foreach (array_keys($fields) as $i) {
-			if (($object->getVar('sid')<>0&&$gperm_handler->checkRight('songlist_edit',$fields[$i]->getVar('field_id'),$groups, $modid)) ||
-				($object->getVar('sid')==0&&$gperm_handler->checkRight('songlist_post',$fields[$i]->getVar('field_id'),$groups, $modid))) {
+			if (($object->getVar('sid')<>0 && $gperm_handler->checkRight('songlist_edit', $fields[$i]->getVar('field_id'), $groups, $modid)) ||
+				($object->getVar('sid')==0 && $gperm_handler->checkRight('songlist_post', $fields[$i]->getVar('field_id'), $groups, $modid))) {
 				$fieldinfo['element'] = $fields[$i]->getEditElement($post, $extra);
 				$fieldinfo['required'] = $fields[$i]->getVar('field_required');
-				foreach($fields[$i]->getVar('cids') as $catidid => $cid) {
+				foreach ($fields[$i]->getVar('cids') as $catidid => $cid) {
 					if (!in_array($fields[$i]->getVar('field_name'), $allnames)) {
 						$allnames[] = $fields[$i]->getVar('field_name');
-						if (in_array($cid, array_keys($all_categories))||$cid==((!empty($_REQUEST['cid']))?intval($_REQUEST['cid']):$forum_obj->getVar('cid'))) {
-							$key = $all_categories[$cid]['weight'] * $count_fields + $object->getVar('cid');
+						if (in_array($cid, array_keys($all_categories)) || $cid==((!empty($_REQUEST['cid'])) ?intval($_REQUEST['cid']) : $forum_obj->getVar('cid'))) {
+							$key = $all_categories[$cid]['weight']*$count_fields+$object->getVar('cid');
 							$elements[$key][] = $fieldinfo;
 							$weights[$key][] = $fields[$i]->getVar('field_weight');
 						} elseif (in_array(0, $fields[$i]->getVar('cids'))) {
-							$key = $all_categories[$cid]['weight'] * $count_fields + $object->getVar('cid');
+							$key = $all_categories[$cid]['weight']*$count_fields+$object->getVar('cid');
 							$elements[$key][] = $fieldinfo;
 							$weights[$key][] = $fields[$i]->getVar('field_weight');
 						}
@@ -750,13 +750,13 @@ 
 			$ele['tags'] = new XoopsFormTag('tags', 60, 255, $object->getVar('sid'));
 		}
 		
-		$ele['hits'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_HITS:''), $object->getVar('hits'));
-		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'),2). ' of 10');
+		$ele['hits'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_HITS:''), $object->getVar('hits'));
+		$ele['rank'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_RANK:''), number_format($object->getVar('rank')/$object->getVar('votes'), 2).' of 10');
 		if ($object->getVar('created')>0) {
-			$ele['created'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
+			$ele['created'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_CREATED:''), date(_DATESTRING, $object->getVar('created')));
 		}
 		if ($object->getVar('updated')>0) {
-			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
+			$ele['updated'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_SONGS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 		if ($as_array==true)
 			return $ele;
@@ -765,7 +765,7 @@ 
 		
 		$required = array();
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else
@@ -775,7 +775,7 @@ 
 		
 	}
 	
-	function songlist_votes_get_form($object, $as_array=false) {
+	function songlist_votes_get_form($object, $as_array = false) {
 		
 		if (!is_object($object)) {
 			$handler = xoops_getmodulehandler('votes', 'songlist');
@@ -793,7 +793,7 @@ 
 			$ele['mode'] = new XoopsFormHidden('mode', 'edit');
 		}
 		
-		$sform->setExtra( "enctype='multipart/form-data'" ) ;
+		$sform->setExtra("enctype='multipart/form-data'");
 		
 		$id = $object->getVar('cid');
 		if (empty($id)) $id = '0';
@@ -804,29 +804,29 @@ 
 			$ele['id'] = new XoopsFormHidden('id', $id);
 		else 
 			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
-		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
-		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
-		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
-		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit'])?intval($_REQUEST['limit']):0);
-		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter'])?$_REQUEST['filter']:'1,1');
+		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'created');
+		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC');
+		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0);
+		$ele['limit'] = new XoopsFormHidden('limit', isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 0);
+		$ele['filter'] = new XoopsFormHidden('filter', isset($_REQUEST['filter']) ? $_REQUEST['filter'] : '1,1');
 
 		$songs_handler = xoops_getmodulehandler('songs', 'songlist');
 		$user_handler = xoops_gethandler('user');
 		$song = $songs_handler->get($object->getVar('sid'));
 		$user = $user_handler->get($object->getVar('uid'));
 		if (is_object($song)) {
-			$ele['sid'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_SONG:''), $song->getVar('title'));
+			$ele['sid'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_SONG:''), $song->getVar('title'));
 		} else {
-			$ele['sid'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_SONG:''), $object->getVar('sid'));
+			$ele['sid'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_SONG:''), $object->getVar('sid'));
 		}
 		if (is_object($user)) {
-			$ele['uid'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_USER:''), $user->getVar('uname'));
+			$ele['uid'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_USER:''), $user->getVar('uname'));
 		} else {
-			$ele['uid'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_USER:''), _GUESTS);
+			$ele['uid'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_USER:''), _GUESTS);
 		}
-		$ele['ip'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_IP:''), $object->getVar('ip'));
-		$ele['netaddy'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_NETADDY:''), $object->getVar('netaddy'));
-		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_RANK:''), $object->getVar('rank'). ' of 10');
+		$ele['ip'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_IP:''), $object->getVar('ip'));
+		$ele['netaddy'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_NETADDY:''), $object->getVar('netaddy'));
+		$ele['rank'] = new XoopsFormLabel(($as_array==false ?_FRM_SONGLIST_FORM_VOTES_RANK:''), $object->getVar('rank').' of 10');
 		
 		if ($as_array==true)
 			return $ele;
@@ -835,7 +835,7 @@ 
 		
 		$required = array();
 		
-		foreach($ele as $id => $obj)			
+		foreach ($ele as $id => $obj)			
 			if (in_array($id, $required))
 				$sform->addElement($ele[$id], true);			
 			else

Braces +117 added lines, -80 removed lines

@@ -32,8 +32,9 @@ 
 		$category_handler = xoops_getmodulehandler('category');
 		$cat_select = new XoopsFormSelect(_AM_SONGLIST_CATEGORY, 'cids', $fieldcid, 7, true);
 		$cat_select->addOption(0, _AM_SONGLIST_DEFAULT);
-		foreach($category_handler->getObjects(NULL, true) as $cid => $category)
-			$cat_select->addOption($cid, $category->getVar('name'));
+		foreach($category_handler->getObjects(NULL, true) as $cid => $category) {
+					$cat_select->addOption($cid, $category->getVar('name'));
+		}
 		$form->addElement($cat_select);
 		$form->addElement(new XoopsFormText(_AM_SONGLIST_WEIGHT, 'field_weight', 10, 10, $field->getVar('field_weight', 'e')));
 		if ($field->getVar('field_config') || $field->isNew()) {
@@ -340,11 +341,13 @@ 
 		
 		$required = array('xmlfile');
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -399,11 +402,13 @@ 
 		
 		$required = array();
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -430,14 +435,17 @@ 
 		$sform->setExtra( "enctype='multipart/form-data'" ) ;
 		
 		$id = $object->getVar('abid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'albums');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -465,18 +473,21 @@ 
 			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array('name', 'id', 'source');
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -501,14 +512,17 @@ 
 		}
 		
 		$id = $object->getVar('aid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'artists');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -532,18 +546,21 @@ 
 			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 				
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array('name', 'mimetype', 'support');
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -570,14 +587,17 @@ 
 		$sform->setExtra( "enctype='multipart/form-data'" ) ;
 		
 		$id = $object->getVar('cid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'category');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -614,18 +634,21 @@ 
 			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_ALBUMS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
 		
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array('name', 'id', 'source');
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -652,14 +675,17 @@ 
 		$sform->setExtra( "enctype='multipart/form-data'" ) ;
 		
 		$id = $object->getVar('sid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'songs');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -701,18 +727,20 @@ 
 		$xoModule = $module_handler->getByDirname('songlist');
 		$modid = $xoModule->getVar('mid');
 		
-		if (is_object($GLOBALS['xoopsUser']))
-			$groups = $GLOBALS['xoopsUser']->getGroups();
-		else
-			$groups = array(XOOPS_GROUP_ANONYMOUS=>XOOPS_GROUP_ANONYMOUS);
+		if (is_object($GLOBALS['xoopsUser'])) {
+					$groups = $GLOBALS['xoopsUser']->getGroups();
+		} else {
+					$groups = array(XOOPS_GROUP_ANONYMOUS=>XOOPS_GROUP_ANONYMOUS);
+		}
 		
 		$count_fields = 0;
 		$fields = $extras_handler->loadFields();
 		
-		if ($object->getVar('sid')>0)
-			$extra = $extras_handler->get($object->getVar('sid'));
-		else
-			$extra = $extras_handler->create();
+		if ($object->getVar('sid')>0) {
+					$extra = $extras_handler->get($object->getVar('sid'));
+		} else {
+					$extra = $extras_handler->create();
+		}
 		$allnames = array();
 		foreach (array_keys($fields) as $i) {
 			if (($object->getVar('sid')<>0&&$gperm_handler->checkRight('songlist_edit',$fields[$i]->getVar('field_id'),$groups, $modid)) ||
@@ -758,18 +786,21 @@ 
 		if ($object->getVar('updated')>0) {
 			$ele['updated'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_SONGS_UPDATED:''), date(_DATESTRING, $object->getVar('updated')));
 		}
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array();
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();
 		
@@ -796,14 +827,17 @@ 
 		$sform->setExtra( "enctype='multipart/form-data'" ) ;
 		
 		$id = $object->getVar('cid');
-		if (empty($id)) $id = '0';
+		if (empty($id)) {
+			$id = '0';
+		}
 		
 		$ele['op'] = new XoopsFormHidden('op', 'votes');
 		$ele['fct'] = new XoopsFormHidden('fct', 'save');
-		if ($as_array==false)
-			$ele['id'] = new XoopsFormHidden('id', $id);
-		else 
-			$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		if ($as_array==false) {
+					$ele['id'] = new XoopsFormHidden('id', $id);
+		} else {
+					$ele['id'] = new XoopsFormHidden('id['.$id.']', $id);
+		}
 		$ele['sort'] = new XoopsFormHidden('sort', isset($_REQUEST['sort'])?$_REQUEST['sort']:'created');
 		$ele['order'] = new XoopsFormHidden('order', isset($_REQUEST['order'])?$_REQUEST['order']:'DESC');
 		$ele['start'] = new XoopsFormHidden('start', isset($_REQUEST['start'])?intval($_REQUEST['start']):0);
@@ -828,18 +862,21 @@ 
 		$ele['netaddy'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_NETADDY:''), $object->getVar('netaddy'));
 		$ele['rank'] = new XoopsFormLabel(($as_array==false?_FRM_SONGLIST_FORM_VOTES_RANK:''), $object->getVar('rank'). ' of 10');
 		
-		if ($as_array==true)
-			return $ele;
+		if ($as_array==true) {
+					return $ele;
+		}
 		
 		$ele['submit'] = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 		
 		$required = array();
 		
-		foreach($ele as $id => $obj)			
-			if (in_array($id, $required))
-				$sform->addElement($ele[$id], true);			
-			else
-				$sform->addElement($ele[$id], false);
+		foreach($ele as $id => $obj) {
+					if (in_array($id, $required))
+				$sform->addElement($ele[$id], true);
+		}
+			else {
+							$sform->addElement($ele[$id], false);
+			}
 		
 		return $sform->render();