XoopsModules25x / songlist

htdocs/modules/songlist/class/genre.php

Indentation +91 added lines, -91 removed lines

@@ -10,9 +10,9 @@ 
 class SonglistGenre extends XoopsObject
 {
 
-    function SonglistGenre($fid = null)
-    {
-        $this->initVar('gid', XOBJ_DTYPE_INT, 0, false);
+	function SonglistGenre($fid = null)
+	{
+		$this->initVar('gid', XOBJ_DTYPE_INT, 0, false);
 		$this->initVar('name', XOBJ_DTYPE_TXTBOX, null, false, 128);
 		$this->initVar('artists', XOBJ_DTYPE_INT, 0, false);
 		$this->initVar('albums', XOBJ_DTYPE_INT, 0, false);
@@ -46,13 +46,13 @@ 
 	}
 	
 	function getURL() {
-    	global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
-    	if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-    		return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('name'))).'/'.$op.'-'.$fct.'-'.$this->getVar('gid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl'];
-    	} else {
-    		return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$this->getVar('gid').'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid;
-    	}
-    }
+		global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('name'))).'/'.$op.'-'.$fct.'-'.$this->getVar('gid').'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl'];
+		} else {
+			return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$this->getVar('gid').'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid;
+		}
+	}
 	
 	
 	
@@ -61,76 +61,76 @@ 
 
 class SonglistGenreHandler extends XoopsPersistableObjectHandler
 {
-    function __construct(&$db) 
-    {
-        parent::__construct($db, "songlist_genre", 'SonglistGenre', "gid", "name");
-    }
+	function __construct(&$db) 
+	{
+		parent::__construct($db, "songlist_genre", 'SonglistGenre', "gid", "name");
+	}
 
 	function filterFields() {
 		return array('gid', 'name', 'artists', 'albums', 'songs', 'hits', 'rank', 'votes', 'created', 'updated');
 	}
 	
-    function getFilterCriteria($filter) {
-    	$parts = explode('|', $filter);
-    	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
-    		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
-    			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
+	function getFilterCriteria($filter) {
+		$parts = explode('|', $filter);
+		$criteria = new CriteriaCompo();
+		foreach($parts as $part) {
+			$var = explode(',', $part);
+			if (!empty($var[1])&&!is_numeric($var[0])) {
+				$object = $this->create();
+				if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
+				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
-    			$criteria->add(new Criteria($var[0], $var[1]));
-    		}
-    	}
-    	return $criteria;
-    }
+			} elseif (!empty($var[1])&&is_numeric($var[0])) {
+				$criteria->add(new Criteria($var[0], $var[1]));
+			}
+		}
+		return $criteria;
+	}
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
-    	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
-    }
+	function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+		$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
+		if (is_object($ele))
+			return $ele->render();
+		else 
+			return ' ';
+	}
     
 	function insert($obj, $force=true) {
-    	if ($obj->isNew()) {
-    		$obj->setVar('created', time());	
-    	} else {
-    		$obj->setVar('updated', time());
-    	}
-    	if (strlen($obj->getVar('name'))==0)
-    		return false;
-    	return parent::insert($obj, $force);
-    }
+		if ($obj->isNew()) {
+			$obj->setVar('created', time());	
+		} else {
+			$obj->setVar('updated', time());
+		}
+		if (strlen($obj->getVar('name'))==0)
+			return false;
+		return parent::insert($obj, $force);
+	}
      
 	var $_objects = array('object'=>array(), 'array'=>array());
     
-    function get($id, $fields = '*') {
-    	if (!isset($this->_objects['object'][$id])) {
-	    	$this->_objects['object'][$id] = parent::get($id, $fields);
-	    	if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
-		    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
-		    	$GLOBALS['xoopsDB']->queryF($sql);
-	    	}
-    	}
-    	return $this->_objects['object'][$id];
-    }
+	function get($id, $fields = '*') {
+		if (!isset($this->_objects['object'][$id])) {
+			$this->_objects['object'][$id] = parent::get($id, $fields);
+			if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
+				$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
+				$GLOBALS['xoopsDB']->queryF($sql);
+			}
+		}
+		return $this->_objects['object'][$id];
+	}
     
-    function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
-    	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	/*if (!isset($GLOBALS['songlistAdmin'])) {
+	function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
+		$ret = parent::getObjects($criteria, $id_as_key, $as_object);
+		/*if (!isset($GLOBALS['songlistAdmin'])) {
 	    	$id = array();
 	    	foreach($ret as $data) {
 	    		if ($as_object==true) {
@@ -150,36 +150,36 @@ 
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';
 	    	$GLOBALS['xoopsDB']->queryF($sql);
     	}*/
-    	return $ret;
-    }
+		return $ret;
+	}
 
-    function getURL() {
-    	global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
-    	if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-    		return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl'];
-    	} else {
-    		return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid.'&start='.$start;
-    	}
-    }
+	function getURL() {
+		global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl'];
+		} else {
+			return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid.'&start='.$start;
+		}
+	}
     
 	function getTop($limit=1) {
-    	$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
-    	$results = $GLOBALS['xoopsDB']->queryF($sql);
-    	$ret = array();
-    	$i=0;
-    	while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
-    		$ret[$i] = $this->create();
-    		$ret[$i]->assignVars($row);
-    		$i++;
-    	}
-    	return $ret;
-    }
+		$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
+		$results = $GLOBALS['xoopsDB']->queryF($sql);
+		$ret = array();
+		$i=0;
+		while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
+			$ret[$i] = $this->create();
+			$ret[$i]->assignVars($row);
+			$i++;
+		}
+		return $ret;
+	}
     
-    function delete($object, $force=true) {
-    	parent::delete($object, $force);
-    	$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `gid` = 0 WHERE `gid` = ' . $object->getVar('gid');
-    	return $GLOBALS['xoopsDB']->queryF($sql);	
-    }
+	function delete($object, $force=true) {
+		parent::delete($object, $force);
+		$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `gid` = 0 WHERE `gid` = ' . $object->getVar('gid');
+		return $GLOBALS['xoopsDB']->queryF($sql);	
+	}
     
 }
 ?>
\ No newline at end of file

Spacing +23 added lines, -23 removed lines

@@ -31,16 +31,16 @@ 
 	function toArray() {
 		$ret = parent::toArray();
 		$form = $this->getForm(true);
-		foreach($form as $key => $element) {
+		foreach ($form as $key => $element) {
 			$ret['form'][$key] = $form[$key]->render();	
 		}
-		foreach(array('created', 'updated') as $key) {
+		foreach (array('created', 'updated') as $key) {
 			if ($this->getVar($key)>0) {
 				$ret['form'][$key] = date(_DATESTRING, $this->getVar($key)); 
 				$ret[$key] = date(_DATESTRING, $this->getVar($key));
 			}
 		}
-		$ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN;
+		$ret['rank'] = number_format(($this->getVar('rank')>0 && $this->getVar('votes')>0 ? $this->getVar('rank')/$this->getVar('votes') : 0), 2)._MI_SONGLIST_OFTEN;
     		
 		return $ret;
 	}
@@ -73,30 +73,30 @@ 
     function getFilterCriteria($filter) {
     	$parts = explode('|', $filter);
     	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
+    	foreach ($parts as $part) {
     		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
+    		if (!empty($var[1]) && !is_numeric($var[0])) {
     			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+    			if ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2]) ? $var[2] : 'LIKE')));
+    			} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
     						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));			
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));    				
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2]) ? $var[2] : 'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
+    		} elseif (!empty($var[1]) && is_numeric($var[0])) {
     			$criteria->add(new Criteria($var[0], $var[1]));
     		}
     	}
     	return $criteria;
     }
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+    function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
     	if (is_object($ele))
     		return $ele->render();
@@ -104,7 +104,7 @@ 
     		return ' ';
     }
     
-	function insert($obj, $force=true) {
+	function insert($obj, $force = true) {
     	if ($obj->isNew()) {
     		$obj->setVar('created', time());	
     	} else {
@@ -120,7 +120,7 @@ 
     function get($id, $fields = '*') {
     	if (!isset($this->_objects['object'][$id])) {
 	    	$this->_objects['object'][$id] = parent::get($id, $fields);
-	    	if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
+	    	if (!isset($GLOBALS['songlistAdmin']) && is_object($this->_objects['object'][$id])) {
 		    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
 		    	$GLOBALS['xoopsDB']->queryF($sql);
 	    	}
@@ -162,11 +162,11 @@ 
     	}
     }
     
-	function getTop($limit=1) {
+	function getTop($limit = 1) {
     	$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
     	$results = $GLOBALS['xoopsDB']->queryF($sql);
     	$ret = array();
-    	$i=0;
+    	$i = 0;
     	while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
     		$ret[$i] = $this->create();
     		$ret[$i]->assignVars($row);
@@ -175,9 +175,9 @@ 
     	return $ret;
     }
     
-    function delete($object, $force=true) {
+    function delete($object, $force = true) {
     	parent::delete($object, $force);
-    	$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `gid` = 0 WHERE `gid` = ' . $object->getVar('gid');
+    	$sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('songlist_songs').' SET `gid` = 0 WHERE `gid` = '.$object->getVar('gid');
     	return $GLOBALS['xoopsDB']->queryF($sql);	
     }
     

Braces +8 added lines, -6 removed lines

@@ -98,10 +98,11 @@ 
         
     function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
+    	if (is_object($ele)) {
+    	    		return $ele->render();
+    	} else {
+    	    		return ' ';
+    	}
     }
     
 	function insert($obj, $force=true) {
@@ -110,8 +111,9 @@ 
     	} else {
     		$obj->setVar('updated', time());
     	}
-    	if (strlen($obj->getVar('name'))==0)
-    		return false;
+    	if (strlen($obj->getVar('name'))==0) {
+    	    		return false;
+    	}
     	return parent::insert($obj, $force);
     }
      

htdocs/modules/songlist/class/albums.php

Indentation +183 added lines, -183 removed lines

@@ -10,10 +10,10 @@ 
 class SonglistAlbums extends XoopsObject
 {
 
-    function SonglistAlbums($fid = null)
-    {
-        $this->initVar('abid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('cid', XOBJ_DTYPE_INT, 0, false);
+	function SonglistAlbums($fid = null)
+	{
+		$this->initVar('abid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('cid', XOBJ_DTYPE_INT, 0, false);
 		$this->initVar('aids', XOBJ_DTYPE_ARRAY, array(), false);
 		$this->initVar('sids', XOBJ_DTYPE_ARRAY, array(), false);
 		$this->initVar('title', XOBJ_DTYPE_TXTBOX, null, false, 128);
@@ -46,41 +46,41 @@ 
 		}
 		$ret['picture'] = $this->getImage('image', false);
 		$ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN;
-    	$ret['url'] = $this->getURL(true);
+		$ret['url'] = $this->getURL(true);
     	
 		if ($extra==false)
-    		return $ret;
+			return $ret;
     		
-    	if ($this->getVar('cid')!=0) {
-    		$category_handler = xoops_getmodulehandler('category', 'songlist');
-    		$category = $category_handler->get($this->getVar('cid'));
-    		if (is_object($category))
-    			$ret['category'] = $category->toArray(false); 	
-    	}
+		if ($this->getVar('cid')!=0) {
+			$category_handler = xoops_getmodulehandler('category', 'songlist');
+			$category = $category_handler->get($this->getVar('cid'));
+			if (is_object($category))
+				$ret['category'] = $category->toArray(false); 	
+		}
 
     	
 		if (count($this->getVar('aids'))!=0) {
-    		$artists_handler = xoops_getmodulehandler('artists', 'songlist');
-    		foreach($this->getVar('aids') as $aid) {
-    			$artist = $artists_handler->get($aid);
-    			if (is_object($artist)) 
-    				$ret['artists_array'][$aid] = $artist->toArray(false);
-    		} 	
-    	}
+			$artists_handler = xoops_getmodulehandler('artists', 'songlist');
+			foreach($this->getVar('aids') as $aid) {
+				$artist = $artists_handler->get($aid);
+				if (is_object($artist)) 
+					$ret['artists_array'][$aid] = $artist->toArray(false);
+			} 	
+		}
     	
 		
 		if (count($this->getVar('sids'))!=0) {
-    		$songs_handler = xoops_getmodulehandler('songs', 'songlist');
-    		$criteria = new Criteria('sid', '('.implode(',', $this->getVar('sids')).')', 'IN');
-    		$criteria->setSort('`traxid`');
-    		$criteria->setOrder('ASC');
-    		foreach($songs_handler->getObjects($criteria, true) as $sid=>$song) {
-    			if (is_object($song))
-    				$ret['songs_array'][$sid] = $song->toArray(false);
-    		} 	
-    	}
+			$songs_handler = xoops_getmodulehandler('songs', 'songlist');
+			$criteria = new Criteria('sid', '('.implode(',', $this->getVar('sids')).')', 'IN');
+			$criteria->setSort('`traxid`');
+			$criteria->setOrder('ASC');
+			foreach($songs_handler->getObjects($criteria, true) as $sid=>$song) {
+				if (is_object($song))
+					$ret['songs_array'][$sid] = $song->toArray(false);
+			} 	
+		}
     	
-    	return $ret;
+		return $ret;
 		
 	}
     
@@ -90,88 +90,88 @@ 
 		if (!file_exists($GLOBALS['xoops']->path($this->getVar('path').$this->getVar($field))))
 			return false;
 		if ($local==false)
-    		return XOOPS_URL.'/'.str_replace(DS, '/', $this->getVar('path')).$this->getVar($field);
-    	else 
-    		return XOOPS_ROOT_PATH.DS.$this->getVar('path').$this->getVar($field);
-    }
+			return XOOPS_URL.'/'.str_replace(DS, '/', $this->getVar('path')).$this->getVar($field);
+		else 
+			return XOOPS_ROOT_PATH.DS.$this->getVar('path').$this->getVar($field);
+	}
 	
-    function getURL() {
-    	global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
-    	if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-    	    if ($id!=0) {
-    			$artist_handler = xoops_getmodulehandler('albums', 'songlist');
-    			$artist = $artist_handler->get($id);
-    			if (is_object($artist)&&!$artist->isNew()) {
-    				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/albums/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('title'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    			} else {
-    				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/albums/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    			}
-    		} else {
-    			return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/albums/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    		}
-    	} else {
-    		return XOOPS_URL.'/modules/songlist/albums.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
-    	}
-    }
+	function getURL() {
+		global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			if ($id!=0) {
+				$artist_handler = xoops_getmodulehandler('albums', 'songlist');
+				$artist = $artist_handler->get($id);
+				if (is_object($artist)&&!$artist->isNew()) {
+					return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/albums/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('title'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+				} else {
+					return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/albums/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+				}
+			} else {
+				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/albums/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+			}
+		} else {
+			return XOOPS_URL.'/modules/songlist/albums.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
+		}
+	}
         
 }
 
 
 class SonglistAlbumsHandler extends XoopsPersistableObjectHandler
 {
-    function __construct(&$db) 
-    {
-        parent::__construct($db, "songlist_albums", 'SonglistAlbums', "abid", "title");
-    }
+	function __construct(&$db) 
+	{
+		parent::__construct($db, "songlist_albums", 'SonglistAlbums', "abid", "title");
+	}
     
 	function filterFields() {
 		return array('abid', 'cid', 'aids', 'sids', 'title', 'image', 'path', 'artists', 'songs', 'hits', 'rank', 'votes', 'created', 'updated');
 	}
 	
-    function getFilterCriteria($filter) {
-    	$parts = explode('|', $filter);
-    	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
-    		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
-    			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
+	function getFilterCriteria($filter) {
+		$parts = explode('|', $filter);
+		$criteria = new CriteriaCompo();
+		foreach($parts as $part) {
+			$var = explode(',', $part);
+			if (!empty($var[1])&&!is_numeric($var[0])) {
+				$object = $this->create();
+				if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
+				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
-    			$criteria->add(new Criteria($var[0], $var[1]));
-    		}
-    	}
-    	return $criteria;
-    }
+			} elseif (!empty($var[1])&&is_numeric($var[0])) {
+				$criteria->add(new Criteria($var[0], $var[1]));
+			}
+		}
+		return $criteria;
+	}
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
-    	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
-    }
+	function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+		$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
+		if (is_object($ele))
+			return $ele->render();
+		else 
+			return ' ';
+	}
     
 	function insert($obj, $force=true, $object = null) {
-    	if ($obj->isNew()) {
-    		$new = true;
-    		$old = $this->create();
-    		$obj->setVar('created', time());	
-    	} else {
-    		$new = false;
-    		$old = $this->get($obj->getVar('abid'));
-    		$obj->setVar('updated', time());
-    	}
+		if ($obj->isNew()) {
+			$new = true;
+			$old = $this->create();
+			$obj->setVar('created', time());	
+		} else {
+			$new = false;
+			$old = $this->get($obj->getVar('abid'));
+			$obj->setVar('updated', time());
+		}
 		
 		$artists_handler = xoops_getmodulehandler('artists', 'songlist');
 		$genre_handler = xoops_getmodulehandler('genre', 'songlist');
@@ -183,79 +183,79 @@ 
 				if ($obj->vars['cid']['value'] != $old->vars['cid']['value']) {
 					$category = $category_handler->get($obj->vars['cid']['value']);
 					if (is_object($category)) {
-			    		$category->setVar('albums', $category->getVar('albums')+1);
-			    		$category_handler->insert($category, true, $obj);
-			    		if (!$old->isNew()&&$old->vars['cid']['value']>0) {
-				    		$category = $category_handler->get($old->vars['cid']['value']);
-				    		if (is_object($category)) {
-					    		$category->setVar('albums', $category->getVar('albums')-1);
-					    		$category_handler->insert($category, true, $obj);
-				    		}
-			    		}
+						$category->setVar('albums', $category->getVar('albums')+1);
+						$category_handler->insert($category, true, $obj);
+						if (!$old->isNew()&&$old->vars['cid']['value']>0) {
+							$category = $category_handler->get($old->vars['cid']['value']);
+							if (is_object($category)) {
+								$category->setVar('albums', $category->getVar('albums')-1);
+								$category_handler->insert($category, true, $obj);
+							}
+						}
 					}	
 				}
 			}
 		    	
-	    	if (count($obj->vars['aids']['value'])!=0&&$obj->vars['aids']['changed']==true) {
-	    		foreach($obj->vars['aids']['value'] as $aid) {
-	    			if (!is_array($aid, $old->getVar('aids'))&&$aid!=0) {
-		    			$artists = $artists_handler->get($aid);
-		    			if (is_object($artists)) {
-			    			$artists->setVar('albums', $artists->getVar('albums')+1);
-			    			$artists_handler->insert($artists, true, $obj);
-		    			}
-	    			}
-	    		}
-	    		if (!$old->isNew()) {
-		    		foreach($old->getVar('aids') as $aid) {
-		    			if (!is_array($aid, $obj->vars['aids']['value'])&&$aid!=0) {
-			    			$artists = $artists_handler->get($aid);
-			    			if (is_object($artists)) {
-				    			$artists->setVar('albums', $artists->getVar('albums')-1);
-				    			$artists_handler->insert($artists, true, $obj);
-			    			}
-		    			}
-		    		}
-	    		}
-	       	}
+			if (count($obj->vars['aids']['value'])!=0&&$obj->vars['aids']['changed']==true) {
+				foreach($obj->vars['aids']['value'] as $aid) {
+					if (!is_array($aid, $old->getVar('aids'))&&$aid!=0) {
+						$artists = $artists_handler->get($aid);
+						if (is_object($artists)) {
+							$artists->setVar('albums', $artists->getVar('albums')+1);
+							$artists_handler->insert($artists, true, $obj);
+						}
+					}
+				}
+				if (!$old->isNew()) {
+					foreach($old->getVar('aids') as $aid) {
+						if (!is_array($aid, $obj->vars['aids']['value'])&&$aid!=0) {
+							$artists = $artists_handler->get($aid);
+							if (is_object($artists)) {
+								$artists->setVar('albums', $artists->getVar('albums')-1);
+								$artists_handler->insert($artists, true, $obj);
+							}
+						}
+					}
+				}
+		   	}
 	    	
 			if ($object->vars['gid']['value']!=0&&$object->vars['gid']['changed']==true) {
-    			$genre = $genre_handler->get($object->vars['gid']['value']);
-    			if (is_object($genre)) {
-	    			$genre->setVar('albums', $genre->getVar('albums')+1);
-	    			$genre_handler->insert($genre, true, $obj);
-    			}
-	       	}
+				$genre = $genre_handler->get($object->vars['gid']['value']);
+				if (is_object($genre)) {
+					$genre->setVar('albums', $genre->getVar('albums')+1);
+					$genre_handler->insert($genre, true, $obj);
+				}
+		   	}
 			if ($object->vars['vid']['value']!=0&&$object->vars['vid']['changed']==true) {
-    			$voice = $voice_handler->get($object->vars['vid']['value']);
-    			if (is_object($voice)) {
-	    			$voice->setVar('albums', $voice->getVar('albums')+1);
-	    			$voice_handler->insert($voice, true, $obj);
-    			}
-	       	}
+				$voice = $voice_handler->get($object->vars['vid']['value']);
+				if (is_object($voice)) {
+					$voice->setVar('albums', $voice->getVar('albums')+1);
+					$voice_handler->insert($voice, true, $obj);
+				}
+		   	}
 			
 		}
 		if (strlen($obj->getVar('title'))==0)
-    		return false;
+			return false;
     	
-    	return parent::insert($obj, $force);
-    }
+		return parent::insert($obj, $force);
+	}
      
 	var $_objects = array('object'=>array(), 'array'=>array());
     
-    function get($id, $fields = '*') {
-    	if (!isset($this->_objects['object'][$id])) {
-	    	$this->_objects['object'][$id] = parent::get($id, $fields);
-	    	if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
-		    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
-		    	$GLOBALS['xoopsDB']->queryF($sql);
-	    	}
-    	}
-    	return $this->_objects['object'][$id];
-    }
+	function get($id, $fields = '*') {
+		if (!isset($this->_objects['object'][$id])) {
+			$this->_objects['object'][$id] = parent::get($id, $fields);
+			if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
+				$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
+				$GLOBALS['xoopsDB']->queryF($sql);
+			}
+		}
+		return $this->_objects['object'][$id];
+	}
     
-    function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
-    	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
+	function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
+		$ret = parent::getObjects($criteria, $id_as_key, $as_object);
    		/* if (!isset($GLOBALS['songlistAdmin'])) {
 	    	$id = array();
 	    	foreach($ret as $data) {
@@ -276,39 +276,39 @@ 
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';
 	    	$GLOBALS['xoopsDB']->queryF($sql);
     	}*/
-    	return $ret;
-    }
+		return $ret;
+	}
     
-    function getURL() {
-    	global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
-    	if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-    	    if ($cid!=0) {
-    			$artist_handler = xoops_getmodulehandler('artists', 'songlist');
-    			$artist = $artist_handler->get($cid);
-    			if (is_object($artist)&&!$artist->isNew()) {
-    				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('name'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    			} else {
-    				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    			}
-    		} else {
-    			return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    		}
-    	} else {
-    		return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
-    	}
-    }
+	function getURL() {
+		global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			if ($cid!=0) {
+				$artist_handler = xoops_getmodulehandler('artists', 'songlist');
+				$artist = $artist_handler->get($cid);
+				if (is_object($artist)&&!$artist->isNew()) {
+					return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('name'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+				} else {
+					return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+				}
+			} else {
+				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+			}
+		} else {
+			return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
+		}
+	}
     
-    function getTop($limit=1) {
-    	$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
-    	$results = $GLOBALS['xoopsDB']->queryF($sql);
-    	$ret = array();
-    	$i=0;
-    	while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
-    		$ret[$i] = $this->create();
-    		$ret[$i]->assignVars($row);
-    		$i++;
-    	}
-    	return $ret;
-    }
+	function getTop($limit=1) {
+		$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
+		$results = $GLOBALS['xoopsDB']->queryF($sql);
+		$ret = array();
+		$i=0;
+		while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
+			$ret[$i] = $this->create();
+			$ret[$i]->assignVars($row);
+			$i++;
+		}
+		return $ret;
+	}
 }
 ?>
\ No newline at end of file

Spacing +34 added lines, -34 removed lines

@@ -35,17 +35,17 @@ 
 	function toArray($extra = true) {
 		$ret = parent::toArray();
 		$form = $this->getForm(true);
-		foreach($form as $key => $element) {
+		foreach ($form as $key => $element) {
 			$ret['form'][$key] = $form[$key]->render();	
 		}
-		foreach(array('created', 'updated') as $key) {
+		foreach (array('created', 'updated') as $key) {
 			if ($this->getVar($key)>0) {
 				$ret['form'][$key] = date(_DATESTRING, $this->getVar($key)); 
 				$ret[$key] = date(_DATESTRING, $this->getVar($key));
 			}
 		}
 		$ret['picture'] = $this->getImage('image', false);
-		$ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN;
+		$ret['rank'] = number_format(($this->getVar('rank')>0 && $this->getVar('votes')>0 ? $this->getVar('rank')/$this->getVar('votes') : 0), 2)._MI_SONGLIST_OFTEN;
     	$ret['url'] = $this->getURL(true);
     	
 		if ($extra==false)
@@ -61,7 +61,7 @@ 
     	
 		if (count($this->getVar('aids'))!=0) {
     		$artists_handler = xoops_getmodulehandler('artists', 'songlist');
-    		foreach($this->getVar('aids') as $aid) {
+    		foreach ($this->getVar('aids') as $aid) {
     			$artist = $artists_handler->get($aid);
     			if (is_object($artist)) 
     				$ret['artists_array'][$aid] = $artist->toArray(false);
@@ -74,7 +74,7 @@ 
     		$criteria = new Criteria('sid', '('.implode(',', $this->getVar('sids')).')', 'IN');
     		$criteria->setSort('`traxid`');
     		$criteria->setOrder('ASC');
-    		foreach($songs_handler->getObjects($criteria, true) as $sid=>$song) {
+    		foreach ($songs_handler->getObjects($criteria, true) as $sid=>$song) {
     			if (is_object($song))
     				$ret['songs_array'][$sid] = $song->toArray(false);
     		} 	
@@ -101,7 +101,7 @@ 
     	    if ($id!=0) {
     			$artist_handler = xoops_getmodulehandler('albums', 'songlist');
     			$artist = $artist_handler->get($id);
-    			if (is_object($artist)&&!$artist->isNew()) {
+    			if (is_object($artist) && !$artist->isNew()) {
     				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/albums/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('title'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
     			} else {
     				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/albums/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
@@ -131,30 +131,30 @@ 
     function getFilterCriteria($filter) {
     	$parts = explode('|', $filter);
     	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
+    	foreach ($parts as $part) {
     		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
+    		if (!empty($var[1]) && !is_numeric($var[0])) {
     			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+    			if ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2]) ? $var[2] : 'LIKE')));
+    			} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
     						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));			
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));    				
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2]) ? $var[2] : 'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
+    		} elseif (!empty($var[1]) && is_numeric($var[0])) {
     			$criteria->add(new Criteria($var[0], $var[1]));
     		}
     	}
     	return $criteria;
     }
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+    function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
     	if (is_object($ele))
     		return $ele->render();
@@ -162,7 +162,7 @@ 
     		return ' ';
     }
     
-	function insert($obj, $force=true, $object = null) {
+	function insert($obj, $force = true, $object = null) {
     	if ($obj->isNew()) {
     		$new = true;
     		$old = $this->create();
@@ -180,12 +180,12 @@ 
    	
 		if (is_a($object, 'SonglistSongs')) {
 			if ($obj->vars['cid']['changed']==true) {
-				if ($obj->vars['cid']['value'] != $old->vars['cid']['value']) {
+				if ($obj->vars['cid']['value']!=$old->vars['cid']['value']) {
 					$category = $category_handler->get($obj->vars['cid']['value']);
 					if (is_object($category)) {
 			    		$category->setVar('albums', $category->getVar('albums')+1);
 			    		$category_handler->insert($category, true, $obj);
-			    		if (!$old->isNew()&&$old->vars['cid']['value']>0) {
+			    		if (!$old->isNew() && $old->vars['cid']['value']>0) {
 				    		$category = $category_handler->get($old->vars['cid']['value']);
 				    		if (is_object($category)) {
 					    		$category->setVar('albums', $category->getVar('albums')-1);
@@ -196,9 +196,9 @@ 
 				}
 			}
 		    	
-	    	if (count($obj->vars['aids']['value'])!=0&&$obj->vars['aids']['changed']==true) {
-	    		foreach($obj->vars['aids']['value'] as $aid) {
-	    			if (!is_array($aid, $old->getVar('aids'))&&$aid!=0) {
+	    	if (count($obj->vars['aids']['value'])!=0 && $obj->vars['aids']['changed']==true) {
+	    		foreach ($obj->vars['aids']['value'] as $aid) {
+	    			if (!is_array($aid, $old->getVar('aids')) && $aid!=0) {
 		    			$artists = $artists_handler->get($aid);
 		    			if (is_object($artists)) {
 			    			$artists->setVar('albums', $artists->getVar('albums')+1);
@@ -207,8 +207,8 @@ 
 	    			}
 	    		}
 	    		if (!$old->isNew()) {
-		    		foreach($old->getVar('aids') as $aid) {
-		    			if (!is_array($aid, $obj->vars['aids']['value'])&&$aid!=0) {
+		    		foreach ($old->getVar('aids') as $aid) {
+		    			if (!is_array($aid, $obj->vars['aids']['value']) && $aid!=0) {
 			    			$artists = $artists_handler->get($aid);
 			    			if (is_object($artists)) {
 				    			$artists->setVar('albums', $artists->getVar('albums')-1);
@@ -219,14 +219,14 @@ 
 	    		}
 	       	}
 	    	
-			if ($object->vars['gid']['value']!=0&&$object->vars['gid']['changed']==true) {
+			if ($object->vars['gid']['value']!=0 && $object->vars['gid']['changed']==true) {
     			$genre = $genre_handler->get($object->vars['gid']['value']);
     			if (is_object($genre)) {
 	    			$genre->setVar('albums', $genre->getVar('albums')+1);
 	    			$genre_handler->insert($genre, true, $obj);
     			}
 	       	}
-			if ($object->vars['vid']['value']!=0&&$object->vars['vid']['changed']==true) {
+			if ($object->vars['vid']['value']!=0 && $object->vars['vid']['changed']==true) {
     			$voice = $voice_handler->get($object->vars['vid']['value']);
     			if (is_object($voice)) {
 	    			$voice->setVar('albums', $voice->getVar('albums')+1);
@@ -246,7 +246,7 @@ 
     function get($id, $fields = '*') {
     	if (!isset($this->_objects['object'][$id])) {
 	    	$this->_objects['object'][$id] = parent::get($id, $fields);
-	    	if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
+	    	if (!isset($GLOBALS['songlistAdmin']) && is_object($this->_objects['object'][$id])) {
 		    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
 		    	$GLOBALS['xoopsDB']->queryF($sql);
 	    	}
@@ -285,7 +285,7 @@ 
     	    if ($cid!=0) {
     			$artist_handler = xoops_getmodulehandler('artists', 'songlist');
     			$artist = $artist_handler->get($cid);
-    			if (is_object($artist)&&!$artist->isNew()) {
+    			if (is_object($artist) && !$artist->isNew()) {
     				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('name'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
     			} else {
     				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
@@ -298,11 +298,11 @@ 
     	}
     }
     
-    function getTop($limit=1) {
+    function getTop($limit = 1) {
     	$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
     	$results = $GLOBALS['xoopsDB']->queryF($sql);
     	$ret = array();
-    	$i=0;
+    	$i = 0;
     	while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
     		$ret[$i] = $this->create();
     		$ret[$i]->assignVars($row);

Braces +31 added lines, -22 removed lines

@@ -48,14 +48,16 @@ 
 		$ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN;
     	$ret['url'] = $this->getURL(true);
     	
-		if ($extra==false)
-    		return $ret;
+		if ($extra==false) {
+		    		return $ret;
+		}
     		
     	if ($this->getVar('cid')!=0) {
     		$category_handler = xoops_getmodulehandler('category', 'songlist');
     		$category = $category_handler->get($this->getVar('cid'));
-    		if (is_object($category))
-    			$ret['category'] = $category->toArray(false); 	
+    		if (is_object($category)) {
+    		    			$ret['category'] = $category->toArray(false);
+    		}
     	}
 
     	
@@ -63,8 +65,9 @@ 
     		$artists_handler = xoops_getmodulehandler('artists', 'songlist');
     		foreach($this->getVar('aids') as $aid) {
     			$artist = $artists_handler->get($aid);
-    			if (is_object($artist)) 
-    				$ret['artists_array'][$aid] = $artist->toArray(false);
+    			if (is_object($artist)) {
+    			    				$ret['artists_array'][$aid] = $artist->toArray(false);
+    			}
     		} 	
     	}
     	
@@ -75,8 +78,9 @@ 
     		$criteria->setSort('`traxid`');
     		$criteria->setOrder('ASC');
     		foreach($songs_handler->getObjects($criteria, true) as $sid=>$song) {
-    			if (is_object($song))
-    				$ret['songs_array'][$sid] = $song->toArray(false);
+    			if (is_object($song)) {
+    			    				$ret['songs_array'][$sid] = $song->toArray(false);
+    			}
     		} 	
     	}
     	
@@ -85,14 +89,17 @@ 
 	}
     
 	function getImage($field = 'image', $local = false) {
-		if (strlen($this->getVar($field))==0)
-			return false;
-		if (!file_exists($GLOBALS['xoops']->path($this->getVar('path').$this->getVar($field))))
-			return false;
-		if ($local==false)
-    		return XOOPS_URL.'/'.str_replace(DS, '/', $this->getVar('path')).$this->getVar($field);
-    	else 
-    		return XOOPS_ROOT_PATH.DS.$this->getVar('path').$this->getVar($field);
+		if (strlen($this->getVar($field))==0) {
+					return false;
+		}
+		if (!file_exists($GLOBALS['xoops']->path($this->getVar('path').$this->getVar($field)))) {
+					return false;
+		}
+		if ($local==false) {
+		    		return XOOPS_URL.'/'.str_replace(DS, '/', $this->getVar('path')).$this->getVar($field);
+		} else {
+    	    		return XOOPS_ROOT_PATH.DS.$this->getVar('path').$this->getVar($field);
+    	}
     }
 	
     function getURL() {
@@ -156,10 +163,11 @@ 
         
     function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
+    	if (is_object($ele)) {
+    	    		return $ele->render();
+    	} else {
+    	    		return ' ';
+    	}
     }
     
 	function insert($obj, $force=true, $object = null) {
@@ -235,8 +243,9 @@ 
 	       	}
 			
 		}
-		if (strlen($obj->getVar('title'))==0)
-    		return false;
+		if (strlen($obj->getVar('title'))==0) {
+		    		return false;
+		}
     	
     	return parent::insert($obj, $force);
     }

htdocs/modules/songlist/class/songs.php

Indentation +295 added lines, -295 removed lines

@@ -10,14 +10,14 @@ 
 class SonglistSongs extends XoopsObject
 {
 
-    function SonglistSongs($fid = null)
-    {
-        $this->initVar('sid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('cid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('gids', XOBJ_DTYPE_ARRAY, 0, false);
+	function SonglistSongs($fid = null)
+	{
+		$this->initVar('sid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('cid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('gids', XOBJ_DTYPE_ARRAY, 0, false);
 		$this->initVar('vcid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('aids', XOBJ_DTYPE_ARRAY, array(), false);
-        $this->initVar('abid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('aids', XOBJ_DTYPE_ARRAY, array(), false);
+		$this->initVar('abid', XOBJ_DTYPE_INT, 0, false);
 		$this->initVar('songid', XOBJ_DTYPE_TXTBOX, null, false, 32);
 		$this->initVar('traxid', XOBJ_DTYPE_TXTBOX, null, false, 32);
 		$this->initVar('title', XOBJ_DTYPE_TXTBOX, null, false, 128);
@@ -31,7 +31,7 @@ 
 		$this->initVar('updated', XOBJ_DTYPE_INT, 0, false);
 	}
 	
-    function getForm($as_array = false) {
+	function getForm($as_array = false) {
 		return songlist_songs_get_form($this, $as_array);
 	}
 
@@ -93,312 +93,312 @@ 
 			}
 		}
 				
-    	if ($extra==false)
-    		return $ret;
+		if ($extra==false)
+			return $ret;
     		
-    	if ($this->getVar('cid')!=0) {
-    		$category_handler = xoops_getmodulehandler('category', 'songlist');
-    		$category = $category_handler->get($this->getVar('cid'));
-    		$ret['category'] = $category->toArray(false); 	
-    	}
+		if ($this->getVar('cid')!=0) {
+			$category_handler = xoops_getmodulehandler('category', 'songlist');
+			$category = $category_handler->get($this->getVar('cid'));
+			$ret['category'] = $category->toArray(false); 	
+		}
 
-    	if (count($this->getVar('gids'))!=0) {
-    		$i=0;
-    		$genre_handler = xoops_getmodulehandler('genre', 'songlist');
-    		$ret['genre'] = '';
-    		$genres = $genre_handler->getObjects(new Criteria('gid', '('.implode(',',$this->getVar('gids')).')', 'IN'), true);
-    		foreach($genres as $gid => $genre) {
-    			$ret['genre_array'][$gid] = $genre->toArray(false);
-    			$i++;
-    			$ret['genre'] .= $genre->getVar('name') . ($i<count($genres)?', ':'');
-    		}
-    	}
-    	if ($this->getVar('vcid')!=0) {
-    		$voice_handler = xoops_getmodulehandler('voice', 'songlist');
-    		$voice = $voice_handler->get($this->getVar('vcid'));
-    		$ret['voice'] = $voice->toArray(false); 	
-    	}		
+		if (count($this->getVar('gids'))!=0) {
+			$i=0;
+			$genre_handler = xoops_getmodulehandler('genre', 'songlist');
+			$ret['genre'] = '';
+			$genres = $genre_handler->getObjects(new Criteria('gid', '('.implode(',',$this->getVar('gids')).')', 'IN'), true);
+			foreach($genres as $gid => $genre) {
+				$ret['genre_array'][$gid] = $genre->toArray(false);
+				$i++;
+				$ret['genre'] .= $genre->getVar('name') . ($i<count($genres)?', ':'');
+			}
+		}
+		if ($this->getVar('vcid')!=0) {
+			$voice_handler = xoops_getmodulehandler('voice', 'songlist');
+			$voice = $voice_handler->get($this->getVar('vcid'));
+			$ret['voice'] = $voice->toArray(false); 	
+		}		
     	
 		if (count($this->getVar('aids'))!=0) {
-    		$artists_handler = xoops_getmodulehandler('artists', 'songlist');
-    		foreach($this->getVar('aids') as $aid) {
-    			$artist = $artists_handler->get($aid);
-    			$ret['artists_array'][$aid] = $artist->toArray(false);
-    		} 	
-    	}
+			$artists_handler = xoops_getmodulehandler('artists', 'songlist');
+			foreach($this->getVar('aids') as $aid) {
+				$artist = $artists_handler->get($aid);
+				$ret['artists_array'][$aid] = $artist->toArray(false);
+			} 	
+		}
     	
 		if ($this->getVar('abid')!=0) {
-    		$albums_handler = xoops_getmodulehandler('albums', 'songlist');
-    		$albums = $albums_handler->get($this->getVar('abid'));
-    		$ret['album'] = $albums->toArray(false); 	
-    	}
-    	return $ret;
+			$albums_handler = xoops_getmodulehandler('albums', 'songlist');
+			$albums = $albums_handler->get($this->getVar('abid'));
+			$ret['album'] = $albums->toArray(false); 	
+		}
+		return $ret;
 	}
 	
 	function getURL() {
-    	global $file, $op, $fct, $id, $value, $vcid, $gid, $cid, $start, $limit;
-    	if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-    		return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/index/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('title'))).'/item-item-'.$this->getVar('sid').$GLOBALS['songlistModuleConfig']['endofurl'];
-    	} else {
-    		return XOOPS_URL.'/modules/songlist/index.php?op=item&fct=item&id='.$this->getVar('sid').'&value='.urlencode($value).'&vcid='.$vcid.'&gid='.$gid.'&cid='.$cid;
-    	}
-    }
+		global $file, $op, $fct, $id, $value, $vcid, $gid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/index/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('title'))).'/item-item-'.$this->getVar('sid').$GLOBALS['songlistModuleConfig']['endofurl'];
+		} else {
+			return XOOPS_URL.'/modules/songlist/index.php?op=item&fct=item&id='.$this->getVar('sid').'&value='.urlencode($value).'&vcid='.$vcid.'&gid='.$gid.'&cid='.$cid;
+		}
+	}
 	
 }
 
 
 class SonglistSongsHandler extends XoopsPersistableObjectHandler
 {
-    function __construct(&$db) 
-    {
-    	$module_handler = xoops_gethandler('module');
+	function __construct(&$db) 
+	{
+		$module_handler = xoops_gethandler('module');
 		$config_handler = xoops_gethandler('config');
 		$GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist');
 		$GLOBALS['songlistModuleConfig'] = $config_handler->getConfigList($GLOBALS['songlistModule']->getVar('mid')); 
 			
-        parent::__construct($db, "songlist_songs", 'SonglistSongs', "sid", "title");
-    }
+		parent::__construct($db, "songlist_songs", 'SonglistSongs', "sid", "title");
+	}
 
 	function filterFields() {
 		return array('sid', 'cid', 'mp3', 'gid', 'vcid', 'aids', 'abid', 'songid', 'title', 'lyrics', 'hits', 'rank', 'votes', 'tags', 'created', 'updated');
 	}
 	
-    function getFilterCriteria($filter) {
-    	$parts = explode('|', $filter);
-    	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
-    		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
-    			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
+	function getFilterCriteria($filter) {
+		$parts = explode('|', $filter);
+		$criteria = new CriteriaCompo();
+		foreach($parts as $part) {
+			$var = explode(',', $part);
+			if (!empty($var[1])&&!is_numeric($var[0])) {
+				$object = $this->create();
+				if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
+				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
-    			$criteria->add(new Criteria($var[0], $var[1]));
-    		}
-    	}
-    	return $criteria;
-    }
+			} elseif (!empty($var[1])&&is_numeric($var[0])) {
+				$criteria->add(new Criteria($var[0], $var[1]));
+			}
+		}
+		return $criteria;
+	}
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
-    	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return '&nbsp;';
-    }
+	function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+		$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
+		if (is_object($ele))
+			return $ele->render();
+		else 
+			return '&nbsp;';
+	}
     
 	function insert($obj, $force=true, $object = null) {
-    	if ($obj->isNew()) {
-    		$new = true;
-    		$old = $this->create();
-    		$obj->setVar('created', time());	
-    	} else {
-    		$new = false;
-    		$old = $this->get($obj->getVar('sid'));
-    		$obj->setVar('updated', time());
-    	}
+		if ($obj->isNew()) {
+			$new = true;
+			$old = $this->create();
+			$obj->setVar('created', time());	
+		} else {
+			$new = false;
+			$old = $this->get($obj->getVar('sid'));
+			$obj->setVar('updated', time());
+		}
 		
-    	$albums_handler = xoops_getmodulehandler('albums', 'songlist');
+		$albums_handler = xoops_getmodulehandler('albums', 'songlist');
 		$artists_handler = xoops_getmodulehandler('artists', 'songlist');
 		$genre_handler = xoops_getmodulehandler('genre', 'songlist');
 		$voice_handler = xoops_getmodulehandler('voice', 'songlist');		
 		$category_handler = xoops_getmodulehandler('category', 'songlist');
 
 		if ($obj->vars['gid']['changed']==true) {
-    		if ($new==true||($obj->vars['gid']['value']!=0)) {
-    			$genre = $genre_handler->get($obj->vars['gid']['value']);
-    			if (is_object($genre)) {
-	    			$genre->setVar('songs', $genre->getVar('songs')+1);
-	    			$genre_handler->insert($genre, true, $obj);
-    			}
-    		} 
-    		if (!$old->isNew()&&$old->getVar('gid')>0) {
-    			$genre = $genre_handler->get($old->vars['gid']['value']);
-    			if (is_object($genre)) {
-	    			$genre->setVar('songs', $genre->getVar('songs')-1);
-	    			$genre_handler->insert($genre, true, null);
-    			}
-    		}
-    	}
+			if ($new==true||($obj->vars['gid']['value']!=0)) {
+				$genre = $genre_handler->get($obj->vars['gid']['value']);
+				if (is_object($genre)) {
+					$genre->setVar('songs', $genre->getVar('songs')+1);
+					$genre_handler->insert($genre, true, $obj);
+				}
+			} 
+			if (!$old->isNew()&&$old->getVar('gid')>0) {
+				$genre = $genre_handler->get($old->vars['gid']['value']);
+				if (is_object($genre)) {
+					$genre->setVar('songs', $genre->getVar('songs')-1);
+					$genre_handler->insert($genre, true, null);
+				}
+			}
+		}
 
 		if ($obj->vars['vcid']['changed']==true) {
-    		if ($new==true||($obj->vars['vcid']['value']!=0)) {
-    			$voice = $voice_handler->get($obj->vars['vcid']['value']);
-    			if (is_object($voice)) {
-	    			$voice->setVar('songs', $voice->getVar('songs')+1);
-	    			$voice_handler->insert($voice, true, $obj);
-    			}
-    		} 
-    		if (!$old->isNew()&&$old->getVar('vcid')>0) {
-    			$voice = $voice_handler->get($old->vars['vcid']['value']);
-    			if (is_object($voice)) {
-	    			$voice->setVar('songs', $voice->getVar('songs')-1);
-	    			$voice_handler->insert($voice, true, null);
-    			}
-    		}
-    	}
+			if ($new==true||($obj->vars['vcid']['value']!=0)) {
+				$voice = $voice_handler->get($obj->vars['vcid']['value']);
+				if (is_object($voice)) {
+					$voice->setVar('songs', $voice->getVar('songs')+1);
+					$voice_handler->insert($voice, true, $obj);
+				}
+			} 
+			if (!$old->isNew()&&$old->getVar('vcid')>0) {
+				$voice = $voice_handler->get($old->vars['vcid']['value']);
+				if (is_object($voice)) {
+					$voice->setVar('songs', $voice->getVar('songs')-1);
+					$voice_handler->insert($voice, true, null);
+				}
+			}
+		}
     	
 		if ($obj->vars['cid']['changed']==true) {
-    		if ($new==true||($obj->vars['cid']['value']!=0)) {
-    			$category = $category_handler->get($obj->vars['cid']['value']);
-    			if (is_object($category)) {
-	    			$category->setVar('songs', $category->getVar('songs')+1);
-	    			$category_handler->insert($category, true, $obj);
-	    		    foreach($obj->getVar('aids') as $aid) {
-		    			$artists = $artists_handler->get($aid);
-		    			$cids = $artists->getVar('cids');
-		    			$cids[$obj->getVar('cid')] = $obj->getVar('cid');
-		    			if (is_object($artists)) {
-			    			$artists->setVar('cids', $cids);
-			    			$artists_handler->insert($artists, true, null);
-		    			}
-	    			}
-    			}
-    		}
+			if ($new==true||($obj->vars['cid']['value']!=0)) {
+				$category = $category_handler->get($obj->vars['cid']['value']);
+				if (is_object($category)) {
+					$category->setVar('songs', $category->getVar('songs')+1);
+					$category_handler->insert($category, true, $obj);
+					foreach($obj->getVar('aids') as $aid) {
+						$artists = $artists_handler->get($aid);
+						$cids = $artists->getVar('cids');
+						$cids[$obj->getVar('cid')] = $obj->getVar('cid');
+						if (is_object($artists)) {
+							$artists->setVar('cids', $cids);
+							$artists_handler->insert($artists, true, null);
+						}
+					}
+				}
+			}
 			if (!$old->isNew()&&$old->getVar('cid')>0) {
 				$category = $category_handler->get($old->vars['cid']['value']);
 				if (is_object($category)) {
-	    			$category->setVar('songs', $category->getVar('songs')-1);
-	    			$category_handler->insert($category, true, null);
+					$category->setVar('songs', $category->getVar('songs')-1);
+					$category_handler->insert($category, true, null);
 					foreach($obj->getVar('aids') as $aid) {
-		    			$artists = $artists_handler->get($aid);
-		    			$cids=array();
-		    			foreach($artists->getVar('cids') as $cid) {
-		    				if($cid!=$old->getVar('cid')||$cid==$obj->getVar('cid'))
-		    					$cids[$cid] = $cid;
-		    			}
-		    			if (is_object($artists)) {
-			    			$artists->setVar('cids', $cids);
-			    			$artists_handler->insert($artists, true, null);
-		    			}
-	    			}
+						$artists = $artists_handler->get($aid);
+						$cids=array();
+						foreach($artists->getVar('cids') as $cid) {
+							if($cid!=$old->getVar('cid')||$cid==$obj->getVar('cid'))
+								$cids[$cid] = $cid;
+						}
+						if (is_object($artists)) {
+							$artists->setVar('cids', $cids);
+							$artists_handler->insert($artists, true, null);
+						}
+					}
 				}
-    		}
-    	}
+			}
+		}
     	
-    	if ($obj->vars['aids']['changed']==true&&count($obj->vars['aids']['value'])!=0) {
-    		if ($new==true||count($obj->vars['aids']['value'])!=0) {
-    			foreach($obj->vars['aids']['value'] as $aid) {
-    				if (!in_array($aid, $old->vars['aids']['value'])) {
-		    			$artists = $artists_handler->get($aid);
-		    			if (is_object($artists)) {
-			    			$artists->setVar('songs', $artists->getVar('songs')+1);
-			    			$artists_handler->insert($artists, true, $obj);
-				    		if ($new==true||($obj->vars['vcid']['value']!=0)) {
-				    			$voice = $voice_handler->get($obj->vars['vcid']['value']);
-				    			if (is_object($voice)) {
-					    			$voice->setVar('artists', $voice->getVar('artists')+1);
-					    			$voice_handler->insert($voice, true, $obj);
-				    			}
-				    		} 
-		    			}
-    				}
-    			}
-    		}
-    		if (!$old->isNew()&&count($old->getVar('aids'))==0) {
-    			foreach($old->getVar('aids') as $aid) {
-    				if (!in_array($aid, $obj->vars['aids']['value'])) {
-	    				$artists = $artists_handler->get($aid);
-	    				if (is_object($artists)) {
-			    			$artists->setVar('songs', $artists->getVar('songs')-1);
-			    			$artists_handler->insert($artists, true, null);
-			    			if (!$old->isNew()&&$old->getVar('vcid')>0) {
-				    			$voice = $voice_handler->get($old->vars['vcid']['value']);
-				    			if (is_object($voice)) {
-					    			$voice->setVar('artists', $voice->getVar('artists')-1);
-					    			$voice_handler->insert($voice, true, null);
-				    			}
-				    		}
-	    				}	
-    				}
-    			}
-    		}
-    	}
+		if ($obj->vars['aids']['changed']==true&&count($obj->vars['aids']['value'])!=0) {
+			if ($new==true||count($obj->vars['aids']['value'])!=0) {
+				foreach($obj->vars['aids']['value'] as $aid) {
+					if (!in_array($aid, $old->vars['aids']['value'])) {
+						$artists = $artists_handler->get($aid);
+						if (is_object($artists)) {
+							$artists->setVar('songs', $artists->getVar('songs')+1);
+							$artists_handler->insert($artists, true, $obj);
+							if ($new==true||($obj->vars['vcid']['value']!=0)) {
+								$voice = $voice_handler->get($obj->vars['vcid']['value']);
+								if (is_object($voice)) {
+									$voice->setVar('artists', $voice->getVar('artists')+1);
+									$voice_handler->insert($voice, true, $obj);
+								}
+							} 
+						}
+					}
+				}
+			}
+			if (!$old->isNew()&&count($old->getVar('aids'))==0) {
+				foreach($old->getVar('aids') as $aid) {
+					if (!in_array($aid, $obj->vars['aids']['value'])) {
+						$artists = $artists_handler->get($aid);
+						if (is_object($artists)) {
+							$artists->setVar('songs', $artists->getVar('songs')-1);
+							$artists_handler->insert($artists, true, null);
+							if (!$old->isNew()&&$old->getVar('vcid')>0) {
+								$voice = $voice_handler->get($old->vars['vcid']['value']);
+								if (is_object($voice)) {
+									$voice->setVar('artists', $voice->getVar('artists')-1);
+									$voice_handler->insert($voice, true, null);
+								}
+							}
+						}	
+					}
+				}
+			}
+		}
     	
-    	if ($obj->vars['abid']['changed']==true) {
-    		if ($new==true||($obj->vars['abid']['value']!=0)) {
-    			$album = $albums_handler->get($obj->vars['abid']['value']);
-    			if (is_object($album)) {
-	    			$album->setVar('songs', $album->getVar('songs')+1);
-	    			$albums_handler->insert($album, true, $obj);
-		    		if ($new==true||($obj->vars['vcid']['value']!=0)) {
-		    			$voice = $voice_handler->get($obj->vars['vcid']['value']);
-		    			if (is_object($voice)) {
-			    			$voice->setVar('albums', $voice->getVar('albums')+1);
-			    			$voice_handler->insert($voice, true, $obj);
-		    			}
-		    		} 
-    			}
-    		}
-    		if (!$old->isNew()&&$old->getVar('abid')>0) {
-    			$album = $albums_handler->get($obj->vars['abid']['value']);
-    			if (is_object($album)) {
-	    			$album->setVar('songs', $album->getVar('songs')-1);
-	    			$albums_handler->insert($album, true, null);
-    				if (!$old->isNew()&&$old->getVar('vcid')>0) {
-			    		$voice = $voice_handler->get($old->vars['vcid']['value']);
-			    		if (is_object($voice)) {
+		if ($obj->vars['abid']['changed']==true) {
+			if ($new==true||($obj->vars['abid']['value']!=0)) {
+				$album = $albums_handler->get($obj->vars['abid']['value']);
+				if (is_object($album)) {
+					$album->setVar('songs', $album->getVar('songs')+1);
+					$albums_handler->insert($album, true, $obj);
+					if ($new==true||($obj->vars['vcid']['value']!=0)) {
+						$voice = $voice_handler->get($obj->vars['vcid']['value']);
+						if (is_object($voice)) {
+							$voice->setVar('albums', $voice->getVar('albums')+1);
+							$voice_handler->insert($voice, true, $obj);
+						}
+					} 
+				}
+			}
+			if (!$old->isNew()&&$old->getVar('abid')>0) {
+				$album = $albums_handler->get($obj->vars['abid']['value']);
+				if (is_object($album)) {
+					$album->setVar('songs', $album->getVar('songs')-1);
+					$albums_handler->insert($album, true, null);
+					if (!$old->isNew()&&$old->getVar('vcid')>0) {
+						$voice = $voice_handler->get($old->vars['vcid']['value']);
+						if (is_object($voice)) {
 				   			$voice->setVar('albums', $voice->getVar('albums')-1);
 				   			$voice_handler->insert($voice, true, null);
-			    		}
-			    	}
-    			}
-    		}
-    	}
+						}
+					}
+				}
+			}
+		}
     	
-    	if (strlen($obj->getVar('title'))==0)
-    		return false;
+		if (strlen($obj->getVar('title'))==0)
+			return false;
     	
-    	$sid = parent::insert($obj, $force);
-    	if ($obj->vars['abid']['value']>0) {
-    		$album = $albums_handler->get($obj->vars['abid']['value']);
-    		$arry = $album->getVar('sids');
-    		$arry[$sid] = $sid;
-    		if (is_object($album)) {
-	    		$album->setVar('sids', $arry);
-	    		$albums_handler->insert($album);
-    		}
-    	}
+		$sid = parent::insert($obj, $force);
+		if ($obj->vars['abid']['value']>0) {
+			$album = $albums_handler->get($obj->vars['abid']['value']);
+			$arry = $album->getVar('sids');
+			$arry[$sid] = $sid;
+			if (is_object($album)) {
+				$album->setVar('sids', $arry);
+				$albums_handler->insert($album);
+			}
+		}
 		if (count($obj->getVar('aids'))>0) {
-    		foreach($obj->getVar('aids') as $aid) {
+			foreach($obj->getVar('aids') as $aid) {
 				$artist = $artists_handler->get($aid);
-	    		$arry = $artist->getVar('sids');
-	    		$arry[$sid] = $sid;
-	    		if (is_object($artists)) {
-		    		$artist->setVar('sids', $arry);
-		    		$artists_handler->insert($artist);
-	    		}
-    		}
-    	}
-    	return $sid;
-    }
+				$arry = $artist->getVar('sids');
+				$arry[$sid] = $sid;
+				if (is_object($artists)) {
+					$artist->setVar('sids', $arry);
+					$artists_handler->insert($artist);
+				}
+			}
+		}
+		return $sid;
+	}
      
 	var $_objects = array('object'=>array(), 'array'=>array());
     
-    function get($id, $fields = '*') {
-    	if (!isset($this->_objects['object'][$id])) {
-	    	$this->_objects['object'][$id] = parent::get($id, $fields);
-	    	if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
-		    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
-		    	$GLOBALS['xoopsDB']->queryF($sql);
-	    	}
-    	}
-    	return $this->_objects['object'][$id];
-    }
+	function get($id, $fields = '*') {
+		if (!isset($this->_objects['object'][$id])) {
+			$this->_objects['object'][$id] = parent::get($id, $fields);
+			if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
+				$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
+				$GLOBALS['xoopsDB']->queryF($sql);
+			}
+		}
+		return $this->_objects['object'][$id];
+	}
     
-    function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
-    	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	/*if (!isset($GLOBALS['songlistAdmin'])) {
+	function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
+		$ret = parent::getObjects($criteria, $id_as_key, $as_object);
+		/*if (!isset($GLOBALS['songlistAdmin'])) {
 	    	foreach($ret as $data) {
 	    		$id = array();
 	    		if ($as_object==true) {
@@ -418,49 +418,49 @@ 
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';
 	    	$GLOBALS['xoopsDB']->queryF($sql);
     	}*/
-    	return $ret;
-    }   
+		return $ret;
+	}   
     
-    function getURL() {
-    	global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
-    	if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-    	    if ($cid!=0) {
-    			$artist_handler = xoops_getmodulehandler('artists', 'songlist');
-    			$artist = $artist_handler->get($cid);
-    			if (is_object($artist)&&!$artist->isNew()) {
-    				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('name'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    			} else {
-    				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    			}
-    		} else {
-    			return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    		}
-    	} else {
-    		return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
-    	}
-    }
+	function getURL() {
+		global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			if ($cid!=0) {
+				$artist_handler = xoops_getmodulehandler('artists', 'songlist');
+				$artist = $artist_handler->get($cid);
+				if (is_object($artist)&&!$artist->isNew()) {
+					return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('name'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+				} else {
+					return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+				}
+			} else {
+				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+			}
+		} else {
+			return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
+		}
+	}
 	
 
-    function getSearchURL() {
-    	global $file, $op, $fct, $id, $value, $gid, $vcid, $cid, $start, $limit;
-    	if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-    		return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$gid.'-'.(isset($_GET['cid'])?($_GET['cid']):$cid).'-'.$vcid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    	} else {
-    		return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&value='.urlencode($value).'&cid='.$cid.'&gid='.$gid.'&vcid='.$vcid.'&start='.$start;
-    	}
-    }
+	function getSearchURL() {
+		global $file, $op, $fct, $id, $value, $gid, $vcid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$gid.'-'.(isset($_GET['cid'])?($_GET['cid']):$cid).'-'.$vcid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+		} else {
+			return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&value='.urlencode($value).'&cid='.$cid.'&gid='.$gid.'&vcid='.$vcid.'&start='.$start;
+		}
+	}
 
 	function getTop($limit=1) {
-    	$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
-    	$results = $GLOBALS['xoopsDB']->queryF($sql);
-    	$ret = array();
-    	$i=0;
-    	while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
-    		$ret[$i] = $this->create();
-    		$ret[$i]->assignVars($row);
-    		$i++;
-    	}
-    	return $ret;
-    }
+		$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
+		$results = $GLOBALS['xoopsDB']->queryF($sql);
+		$ret = array();
+		$i=0;
+		while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
+			$ret[$i] = $this->create();
+			$ret[$i]->assignVars($row);
+			$i++;
+		}
+		return $ret;
+	}
 }
 ?>
\ No newline at end of file

Spacing +55 added lines, -55 removed lines

@@ -43,10 +43,10 @@ 
 		$ret['lyrics'] = $GLOBALS['myts']->displayTarea($this->getVar('lyrics'), true, true, true, true, true);
 		
 		$form = $this->getForm(true);
-		foreach($form as $key => $element) {
+		foreach ($form as $key => $element) {
 			$ret['form'][$key] = $form[$key]->render();	
 		}
-		foreach(array('created', 'updated') as $key) {
+		foreach (array('created', 'updated') as $key) {
 			if ($this->getVar($key)>0) {
 				$ret['form'][$key] = date(_DATESTRING, $this->getVar($key)); 
 				$ret[$key] = date(_DATESTRING, $this->getVar($key));
@@ -55,13 +55,13 @@ 
 		
 		$ret['url'] = $this->getURL();
 		
-		$ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN;
+		$ret['rank'] = number_format(($this->getVar('rank')>0 && $this->getVar('votes')>0 ? $this->getVar('rank')/$this->getVar('votes') : 0), 2)._MI_SONGLIST_OFTEN;
 		
 		if (!empty($ret['mp3'])) {
-			$ret['mp3'] = "<embed flashvars=\"playerID=1&amp;bg=0xf8f8f8&amp;leftbg=0x3786b3&amp;lefticon=0x78bee3&amp;rightbg=0x3786b3&amp;rightbghover=0x78bee3&amp;righticon=0x78bee3&amp;righticonhover=0x3786b3&amp;text=0x666666&amp;slider=0x3786b3&amp;track=0xcccccc&amp;border=0x666666&amp;loader=0x78bee3&amp;loop=no&amp;soundFile=".$ret['mp3']."\" quality='high' menu='false' wmode='transparent' pluginspage='http://www.macromedia.com/go/getflashplayer' src='" . XOOPS_URL . "/images/form/player.swf'  width=290 height=24 type='application/x-shockwave-flash'></embed>";
+			$ret['mp3'] = "<embed flashvars=\"playerID=1&amp;bg=0xf8f8f8&amp;leftbg=0x3786b3&amp;lefticon=0x78bee3&amp;rightbg=0x3786b3&amp;rightbghover=0x78bee3&amp;righticon=0x78bee3&amp;righticonhover=0x3786b3&amp;text=0x666666&amp;slider=0x3786b3&amp;track=0xcccccc&amp;border=0x666666&amp;loader=0x78bee3&amp;loop=no&amp;soundFile=".$ret['mp3']."\" quality='high' menu='false' wmode='transparent' pluginspage='http://www.macromedia.com/go/getflashplayer' src='".XOOPS_URL."/images/form/player.swf'  width=290 height=24 type='application/x-shockwave-flash'></embed>";
 		}
 		
-		if (file_exists($GLOBALS['xoops']->path("/modules/tag/include/tagbar.php"))&&$GLOBALS['songlistModuleConfig']['tags']) {
+		if (file_exists($GLOBALS['xoops']->path("/modules/tag/include/tagbar.php")) && $GLOBALS['songlistModuleConfig']['tags']) {
 			include_once XOOPS_ROOT_PATH."/modules/tag/include/tagbar.php";
 			$ret['tagbar'] = tagBar($this->getVar('sid'), $this->getVar('cid'));
 		}
@@ -78,10 +78,10 @@ 
 				$fields_id = $visibility_handler->getVisibleFields(array(), array());
 	
 			if (count($fields_id)>0) {
-				$criteria = new Criteria('field_id', '('.implode(',',$fields_id).')', 'IN');
+				$criteria = new Criteria('field_id', '('.implode(',', $fields_id).')', 'IN');
 				$criteria->setSort('field_weight');
 				$fields = $field_handler->getObjects($criteria, true);
-				foreach($fields as $id => $field) {
+				foreach ($fields as $id => $field) {
 					if (in_array($this->getVar('cid'), $field->getVar('cids'))) {
 						$ret['fields'][$id]['title'] = $field->getVar('field_title');
 						if (is_object($GLOBALS['xoopsUser']))
@@ -103,14 +103,14 @@ 
     	}
 
     	if (count($this->getVar('gids'))!=0) {
-    		$i=0;
+    		$i = 0;
     		$genre_handler = xoops_getmodulehandler('genre', 'songlist');
     		$ret['genre'] = '';
-    		$genres = $genre_handler->getObjects(new Criteria('gid', '('.implode(',',$this->getVar('gids')).')', 'IN'), true);
-    		foreach($genres as $gid => $genre) {
+    		$genres = $genre_handler->getObjects(new Criteria('gid', '('.implode(',', $this->getVar('gids')).')', 'IN'), true);
+    		foreach ($genres as $gid => $genre) {
     			$ret['genre_array'][$gid] = $genre->toArray(false);
     			$i++;
-    			$ret['genre'] .= $genre->getVar('name') . ($i<count($genres)?', ':'');
+    			$ret['genre'] .= $genre->getVar('name').($i<count($genres) ? ', ' : '');
     		}
     	}
     	if ($this->getVar('vcid')!=0) {
@@ -121,7 +121,7 @@ 
     	
 		if (count($this->getVar('aids'))!=0) {
     		$artists_handler = xoops_getmodulehandler('artists', 'songlist');
-    		foreach($this->getVar('aids') as $aid) {
+    		foreach ($this->getVar('aids') as $aid) {
     			$artist = $artists_handler->get($aid);
     			$ret['artists_array'][$aid] = $artist->toArray(false);
     		} 	
@@ -166,30 +166,30 @@ 
     function getFilterCriteria($filter) {
     	$parts = explode('|', $filter);
     	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
+    	foreach ($parts as $part) {
     		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
+    		if (!empty($var[1]) && !is_numeric($var[0])) {
     			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+    			if ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2]) ? $var[2] : 'LIKE')));
+    			} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
     						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));			
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));    				
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2]) ? $var[2] : 'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
+    		} elseif (!empty($var[1]) && is_numeric($var[0])) {
     			$criteria->add(new Criteria($var[0], $var[1]));
     		}
     	}
     	return $criteria;
     }
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+    function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
     	if (is_object($ele))
     		return $ele->render();
@@ -197,7 +197,7 @@ 
     		return '&nbsp;';
     }
     
-	function insert($obj, $force=true, $object = null) {
+	function insert($obj, $force = true, $object = null) {
     	if ($obj->isNew()) {
     		$new = true;
     		$old = $this->create();
@@ -215,14 +215,14 @@ 
 		$category_handler = xoops_getmodulehandler('category', 'songlist');
 
 		if ($obj->vars['gid']['changed']==true) {
-    		if ($new==true||($obj->vars['gid']['value']!=0)) {
+    		if ($new==true || ($obj->vars['gid']['value']!=0)) {
     			$genre = $genre_handler->get($obj->vars['gid']['value']);
     			if (is_object($genre)) {
 	    			$genre->setVar('songs', $genre->getVar('songs')+1);
 	    			$genre_handler->insert($genre, true, $obj);
     			}
     		} 
-    		if (!$old->isNew()&&$old->getVar('gid')>0) {
+    		if (!$old->isNew() && $old->getVar('gid')>0) {
     			$genre = $genre_handler->get($old->vars['gid']['value']);
     			if (is_object($genre)) {
 	    			$genre->setVar('songs', $genre->getVar('songs')-1);
@@ -232,14 +232,14 @@ 
     	}
 
 		if ($obj->vars['vcid']['changed']==true) {
-    		if ($new==true||($obj->vars['vcid']['value']!=0)) {
+    		if ($new==true || ($obj->vars['vcid']['value']!=0)) {
     			$voice = $voice_handler->get($obj->vars['vcid']['value']);
     			if (is_object($voice)) {
 	    			$voice->setVar('songs', $voice->getVar('songs')+1);
 	    			$voice_handler->insert($voice, true, $obj);
     			}
     		} 
-    		if (!$old->isNew()&&$old->getVar('vcid')>0) {
+    		if (!$old->isNew() && $old->getVar('vcid')>0) {
     			$voice = $voice_handler->get($old->vars['vcid']['value']);
     			if (is_object($voice)) {
 	    			$voice->setVar('songs', $voice->getVar('songs')-1);
@@ -249,12 +249,12 @@ 
     	}
     	
 		if ($obj->vars['cid']['changed']==true) {
-    		if ($new==true||($obj->vars['cid']['value']!=0)) {
+    		if ($new==true || ($obj->vars['cid']['value']!=0)) {
     			$category = $category_handler->get($obj->vars['cid']['value']);
     			if (is_object($category)) {
 	    			$category->setVar('songs', $category->getVar('songs')+1);
 	    			$category_handler->insert($category, true, $obj);
-	    		    foreach($obj->getVar('aids') as $aid) {
+	    		    foreach ($obj->getVar('aids') as $aid) {
 		    			$artists = $artists_handler->get($aid);
 		    			$cids = $artists->getVar('cids');
 		    			$cids[$obj->getVar('cid')] = $obj->getVar('cid');
@@ -265,16 +265,16 @@ 
 	    			}
     			}
     		}
-			if (!$old->isNew()&&$old->getVar('cid')>0) {
+			if (!$old->isNew() && $old->getVar('cid')>0) {
 				$category = $category_handler->get($old->vars['cid']['value']);
 				if (is_object($category)) {
 	    			$category->setVar('songs', $category->getVar('songs')-1);
 	    			$category_handler->insert($category, true, null);
-					foreach($obj->getVar('aids') as $aid) {
+					foreach ($obj->getVar('aids') as $aid) {
 		    			$artists = $artists_handler->get($aid);
-		    			$cids=array();
-		    			foreach($artists->getVar('cids') as $cid) {
-		    				if($cid!=$old->getVar('cid')||$cid==$obj->getVar('cid'))
+		    			$cids = array();
+		    			foreach ($artists->getVar('cids') as $cid) {
+		    				if ($cid!=$old->getVar('cid') || $cid==$obj->getVar('cid'))
 		    					$cids[$cid] = $cid;
 		    			}
 		    			if (is_object($artists)) {
@@ -286,15 +286,15 @@ 
     		}
     	}
     	
-    	if ($obj->vars['aids']['changed']==true&&count($obj->vars['aids']['value'])!=0) {
-    		if ($new==true||count($obj->vars['aids']['value'])!=0) {
-    			foreach($obj->vars['aids']['value'] as $aid) {
+    	if ($obj->vars['aids']['changed']==true && count($obj->vars['aids']['value'])!=0) {
+    		if ($new==true || count($obj->vars['aids']['value'])!=0) {
+    			foreach ($obj->vars['aids']['value'] as $aid) {
     				if (!in_array($aid, $old->vars['aids']['value'])) {
 		    			$artists = $artists_handler->get($aid);
 		    			if (is_object($artists)) {
 			    			$artists->setVar('songs', $artists->getVar('songs')+1);
 			    			$artists_handler->insert($artists, true, $obj);
-				    		if ($new==true||($obj->vars['vcid']['value']!=0)) {
+				    		if ($new==true || ($obj->vars['vcid']['value']!=0)) {
 				    			$voice = $voice_handler->get($obj->vars['vcid']['value']);
 				    			if (is_object($voice)) {
 					    			$voice->setVar('artists', $voice->getVar('artists')+1);
@@ -305,14 +305,14 @@ 
     				}
     			}
     		}
-    		if (!$old->isNew()&&count($old->getVar('aids'))==0) {
-    			foreach($old->getVar('aids') as $aid) {
+    		if (!$old->isNew() && count($old->getVar('aids'))==0) {
+    			foreach ($old->getVar('aids') as $aid) {
     				if (!in_array($aid, $obj->vars['aids']['value'])) {
 	    				$artists = $artists_handler->get($aid);
 	    				if (is_object($artists)) {
 			    			$artists->setVar('songs', $artists->getVar('songs')-1);
 			    			$artists_handler->insert($artists, true, null);
-			    			if (!$old->isNew()&&$old->getVar('vcid')>0) {
+			    			if (!$old->isNew() && $old->getVar('vcid')>0) {
 				    			$voice = $voice_handler->get($old->vars['vcid']['value']);
 				    			if (is_object($voice)) {
 					    			$voice->setVar('artists', $voice->getVar('artists')-1);
@@ -326,12 +326,12 @@ 
     	}
     	
     	if ($obj->vars['abid']['changed']==true) {
-    		if ($new==true||($obj->vars['abid']['value']!=0)) {
+    		if ($new==true || ($obj->vars['abid']['value']!=0)) {
     			$album = $albums_handler->get($obj->vars['abid']['value']);
     			if (is_object($album)) {
 	    			$album->setVar('songs', $album->getVar('songs')+1);
 	    			$albums_handler->insert($album, true, $obj);
-		    		if ($new==true||($obj->vars['vcid']['value']!=0)) {
+		    		if ($new==true || ($obj->vars['vcid']['value']!=0)) {
 		    			$voice = $voice_handler->get($obj->vars['vcid']['value']);
 		    			if (is_object($voice)) {
 			    			$voice->setVar('albums', $voice->getVar('albums')+1);
@@ -340,12 +340,12 @@ 
 		    		} 
     			}
     		}
-    		if (!$old->isNew()&&$old->getVar('abid')>0) {
+    		if (!$old->isNew() && $old->getVar('abid')>0) {
     			$album = $albums_handler->get($obj->vars['abid']['value']);
     			if (is_object($album)) {
 	    			$album->setVar('songs', $album->getVar('songs')-1);
 	    			$albums_handler->insert($album, true, null);
-    				if (!$old->isNew()&&$old->getVar('vcid')>0) {
+    				if (!$old->isNew() && $old->getVar('vcid')>0) {
 			    		$voice = $voice_handler->get($old->vars['vcid']['value']);
 			    		if (is_object($voice)) {
 				   			$voice->setVar('albums', $voice->getVar('albums')-1);
@@ -370,7 +370,7 @@ 
     		}
     	}
 		if (count($obj->getVar('aids'))>0) {
-    		foreach($obj->getVar('aids') as $aid) {
+    		foreach ($obj->getVar('aids') as $aid) {
 				$artist = $artists_handler->get($aid);
 	    		$arry = $artist->getVar('sids');
 	    		$arry[$sid] = $sid;
@@ -388,7 +388,7 @@ 
     function get($id, $fields = '*') {
     	if (!isset($this->_objects['object'][$id])) {
 	    	$this->_objects['object'][$id] = parent::get($id, $fields);
-	    	if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
+	    	if (!isset($GLOBALS['songlistAdmin']) && is_object($this->_objects['object'][$id])) {
 		    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
 		    	$GLOBALS['xoopsDB']->queryF($sql);
 	    	}
@@ -427,7 +427,7 @@ 
     	    if ($cid!=0) {
     			$artist_handler = xoops_getmodulehandler('artists', 'songlist');
     			$artist = $artist_handler->get($cid);
-    			if (is_object($artist)&&!$artist->isNew()) {
+    			if (is_object($artist) && !$artist->isNew()) {
     				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('name'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
     			} else {
     				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
@@ -444,17 +444,17 @@ 
     function getSearchURL() {
     	global $file, $op, $fct, $id, $value, $gid, $vcid, $cid, $start, $limit;
     	if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-    		return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$gid.'-'.(isset($_GET['cid'])?($_GET['cid']):$cid).'-'.$vcid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+    		return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$gid.'-'.(isset($_GET['cid']) ? ($_GET['cid']) : $cid).'-'.$vcid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
     	} else {
     		return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&value='.urlencode($value).'&cid='.$cid.'&gid='.$gid.'&vcid='.$vcid.'&start='.$start;
     	}
     }
 
-	function getTop($limit=1) {
+	function getTop($limit = 1) {
     	$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
     	$results = $GLOBALS['xoopsDB']->queryF($sql);
     	$ret = array();
-    	$i=0;
+    	$i = 0;
     	while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
     		$ret[$i] = $this->create();
     		$ret[$i]->assignVars($row);

Braces +24 added lines, -18 removed lines

@@ -72,10 +72,11 @@ 
 
 		if ($extras = $extras_handler->get($this->getVar('sid'))) {
 	
-			if (is_object($GLOBALS['xoopsUser']))
-				$fields_id = $visibility_handler->getVisibleFields(array(), $GLOBALS['xoopsUser']->getGroups());
-			elseif (!is_object($GLOBALS['xoopsUser']))
-				$fields_id = $visibility_handler->getVisibleFields(array(), array());
+			if (is_object($GLOBALS['xoopsUser'])) {
+							$fields_id = $visibility_handler->getVisibleFields(array(), $GLOBALS['xoopsUser']->getGroups());
+			} elseif (!is_object($GLOBALS['xoopsUser'])) {
+							$fields_id = $visibility_handler->getVisibleFields(array(), array());
+			}
 	
 			if (count($fields_id)>0) {
 				$criteria = new Criteria('field_id', '('.implode(',',$fields_id).')', 'IN');
@@ -84,17 +85,19 @@ 
 				foreach($fields as $id => $field) {
 					if (in_array($this->getVar('cid'), $field->getVar('cids'))) {
 						$ret['fields'][$id]['title'] = $field->getVar('field_title');
-						if (is_object($GLOBALS['xoopsUser']))
-							$ret['fields'][$id]['value'] = htmlspecialchars_decode($field->getOutputValue($GLOBALS['xoopsUser'], $extras));
-						elseif (!is_object($GLOBALS['xoopsUser']))
-							$ret['fields'][$id]['value'] = htmlspecialchars_decode($extras->getVar($field->getVar('field_name')));			
+						if (is_object($GLOBALS['xoopsUser'])) {
+													$ret['fields'][$id]['value'] = htmlspecialchars_decode($field->getOutputValue($GLOBALS['xoopsUser'], $extras));
+						} elseif (!is_object($GLOBALS['xoopsUser'])) {
+													$ret['fields'][$id]['value'] = htmlspecialchars_decode($extras->getVar($field->getVar('field_name')));
+						}
 					}
 				}
 			}
 		}
 				
-    	if ($extra==false)
-    		return $ret;
+    	if ($extra==false) {
+    	    		return $ret;
+    	}
     		
     	if ($this->getVar('cid')!=0) {
     		$category_handler = xoops_getmodulehandler('category', 'songlist');
@@ -191,10 +194,11 @@ 
         
     function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
+    	if (is_object($ele)) {
+    	    		return $ele->render();
+    	} else {
+    	    		return ' ';
+    	}
     }
     
 	function insert($obj, $force=true, $object = null) {
@@ -274,8 +278,9 @@ 
 		    			$artists = $artists_handler->get($aid);
 		    			$cids=array();
 		    			foreach($artists->getVar('cids') as $cid) {
-		    				if($cid!=$old->getVar('cid')||$cid==$obj->getVar('cid'))
-		    					$cids[$cid] = $cid;
+		    				if($cid!=$old->getVar('cid')||$cid==$obj->getVar('cid')) {
+		    						    					$cids[$cid] = $cid;
+		    				}
 		    			}
 		    			if (is_object($artists)) {
 			    			$artists->setVar('cids', $cids);
@@ -356,8 +361,9 @@ 
     		}
     	}
     	
-    	if (strlen($obj->getVar('title'))==0)
-    		return false;
+    	if (strlen($obj->getVar('title'))==0) {
+    	    		return false;
+    	}
     	
     	$sid = parent::insert($obj, $force);
     	if ($obj->vars['abid']['value']>0) {

htdocs/modules/songlist/class/field.php

Indentation +751 added lines, -751 removed lines

@@ -9,107 +9,107 @@ 
  */
 class SonglistField extends XoopsObject
 {
-    function __construct()
-    {
-        $this->initVar('field_id', XOBJ_DTYPE_INT, null);
-        $this->initVar('cids', XOBJ_DTYPE_ARRAY, array(0=>'0'), true);
-        $this->initVar('field_type', XOBJ_DTYPE_TXTBOX);
-        $this->initVar('field_valuetype', XOBJ_DTYPE_INT, null, true);
-        $this->initVar('field_name', XOBJ_DTYPE_TXTBOX, null, true);
-        $this->initVar('field_title', XOBJ_DTYPE_TXTBOX);
-        $this->initVar('field_description', XOBJ_DTYPE_TXTAREA);
-        $this->initVar('field_required', XOBJ_DTYPE_INT, 0); //0 = no, 1 = yes
-        $this->initVar('field_maxlength', XOBJ_DTYPE_INT, 0);
-        $this->initVar('field_weight', XOBJ_DTYPE_INT, 0);
-        $this->initVar('field_default', XOBJ_DTYPE_TXTAREA, "");
-        $this->initVar('field_notnull', XOBJ_DTYPE_INT, 1);
-        $this->initVar('field_edit', XOBJ_DTYPE_INT, 0);
-        $this->initVar('field_show', XOBJ_DTYPE_INT, 0);
-        $this->initVar('field_config', XOBJ_DTYPE_INT, 0);
-        $this->initVar('field_options', XOBJ_DTYPE_ARRAY, array() );
-    }
+	function __construct()
+	{
+		$this->initVar('field_id', XOBJ_DTYPE_INT, null);
+		$this->initVar('cids', XOBJ_DTYPE_ARRAY, array(0=>'0'), true);
+		$this->initVar('field_type', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('field_valuetype', XOBJ_DTYPE_INT, null, true);
+		$this->initVar('field_name', XOBJ_DTYPE_TXTBOX, null, true);
+		$this->initVar('field_title', XOBJ_DTYPE_TXTBOX);
+		$this->initVar('field_description', XOBJ_DTYPE_TXTAREA);
+		$this->initVar('field_required', XOBJ_DTYPE_INT, 0); //0 = no, 1 = yes
+		$this->initVar('field_maxlength', XOBJ_DTYPE_INT, 0);
+		$this->initVar('field_weight', XOBJ_DTYPE_INT, 0);
+		$this->initVar('field_default', XOBJ_DTYPE_TXTAREA, "");
+		$this->initVar('field_notnull', XOBJ_DTYPE_INT, 1);
+		$this->initVar('field_edit', XOBJ_DTYPE_INT, 0);
+		$this->initVar('field_show', XOBJ_DTYPE_INT, 0);
+		$this->initVar('field_config', XOBJ_DTYPE_INT, 0);
+		$this->initVar('field_options', XOBJ_DTYPE_ARRAY, array() );
+	}
 
 
 	
-    function SonglistField()
-    {
-        $this->__construct();
-    }
-
-    /**
-     * Extra treatment dealing with non latin encoding
-     * Tricky solution
-     */
-    function setVar($key, $value, $not_gpc = false)
-    {
-        if ($key == 'field_options' && is_array($value)) {
-            foreach (array_keys($value) as $idx ) {
-                $value[$idx] = base64_encode($value[$idx]);
-            }
-        }
-        parent::setVar($key, $value, $not_gpc);
-    }
-
-    function getVar($key, $format = 's')
-    {
-        $value = parent::getVar($key, $format);
-        if ($key == 'field_options' && !empty($value)) {
-            foreach (array_keys($value) as $idx) {
-                $value[$idx] = base64_decode($value[$idx]);
-            }
-        }
-        return $value;
-    }
-
-    /**
-    * Returns a {@link XoopsFormElement} for editing the value of this field
-    *
-    * @param XoopsUser $user {@link XoopsUser} object to edit the value of
-    * @param ObjectsProfile $profile {@link ObjectsProfile} object to edit the value of
-    *
-    * @return XoopsFormElement
-    **/
-    function getEditElement($user, $profile)
-    {
-        $value = in_array($this->getVar('field_name'), $this->getPostVars() ) ? $user->getVar($this->getVar('field_name'), 'e') : $profile->getVar($this->getVar('field_name'), 'e');
-        if (is_null($value)) {
-            $value = $this->getVar('field_default');
-        }
-        $caption = $this->getVar('field_title');
-        $caption = defined($caption) ? constant($caption) : $caption;
-        $name = $this->getVar('field_name', 'e');
-        $options = $this->getVar('field_options');
-        if (is_array($options)) {
-            //asort($options);
-
-            foreach (array_keys($options) as $key) {
-                $optval = defined($options[$key]) ? constant($options[$key]) : $options[$key];
-                $optkey = defined($key) ? constant($key) : $key;
-                unset($options[$key]);
-                $options[$optkey] = $optval;
-            }
-        }
-        include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-        switch ($this->getVar('field_type')  ) {
-            default:
-            case "autotext":
-                //autotext is not for editing
-                $element = new XoopsFormLabel($caption, $this->getOutputValue($user, $profile));
-                break;
-
-            case "textbox":
-                $element = new XoopsFormText($caption, $name, 35, $this->getVar('field_maxlength'), $value);
-                break;
-
-            case "textarea":
-                $element = new XoopsFormTextArea($caption, $name, $value, 4, 30);
-                break;
-
-            case "dhtml":
-                $element = new XoopsFormDhtmlTextArea($caption, $name, $value, 10, 30);
-                break;
-
-            case "editor":
+	function SonglistField()
+	{
+		$this->__construct();
+	}
+
+	/**
+	 * Extra treatment dealing with non latin encoding
+	 * Tricky solution
+	 */
+	function setVar($key, $value, $not_gpc = false)
+	{
+		if ($key == 'field_options' && is_array($value)) {
+			foreach (array_keys($value) as $idx ) {
+				$value[$idx] = base64_encode($value[$idx]);
+			}
+		}
+		parent::setVar($key, $value, $not_gpc);
+	}
+
+	function getVar($key, $format = 's')
+	{
+		$value = parent::getVar($key, $format);
+		if ($key == 'field_options' && !empty($value)) {
+			foreach (array_keys($value) as $idx) {
+				$value[$idx] = base64_decode($value[$idx]);
+			}
+		}
+		return $value;
+	}
+
+	/**
+	 * Returns a {@link XoopsFormElement} for editing the value of this field
+	 *
+	 * @param XoopsUser $user {@link XoopsUser} object to edit the value of
+	 * @param ObjectsProfile $profile {@link ObjectsProfile} object to edit the value of
+	 *
+	 * @return XoopsFormElement
+	 **/
+	function getEditElement($user, $profile)
+	{
+		$value = in_array($this->getVar('field_name'), $this->getPostVars() ) ? $user->getVar($this->getVar('field_name'), 'e') : $profile->getVar($this->getVar('field_name'), 'e');
+		if (is_null($value)) {
+			$value = $this->getVar('field_default');
+		}
+		$caption = $this->getVar('field_title');
+		$caption = defined($caption) ? constant($caption) : $caption;
+		$name = $this->getVar('field_name', 'e');
+		$options = $this->getVar('field_options');
+		if (is_array($options)) {
+			//asort($options);
+
+			foreach (array_keys($options) as $key) {
+				$optval = defined($options[$key]) ? constant($options[$key]) : $options[$key];
+				$optkey = defined($key) ? constant($key) : $key;
+				unset($options[$key]);
+				$options[$optkey] = $optval;
+			}
+		}
+		include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+		switch ($this->getVar('field_type')  ) {
+			default:
+			case "autotext":
+				//autotext is not for editing
+				$element = new XoopsFormLabel($caption, $this->getOutputValue($user, $profile));
+				break;
+
+			case "textbox":
+				$element = new XoopsFormText($caption, $name, 35, $this->getVar('field_maxlength'), $value);
+				break;
+
+			case "textarea":
+				$element = new XoopsFormTextArea($caption, $name, $value, 4, 30);
+				break;
+
+			case "dhtml":
+				$element = new XoopsFormDhtmlTextArea($caption, $name, $value, 10, 30);
+				break;
+
+			case "editor":
 
 				$editor_config['name'] = $name;
 				$editor_config['editor'] = $GLOBALS['songlistModuleConfig']['editor'];
@@ -117,437 +117,437 @@ 
 				$editor_config['width'] = $GLOBALS['songlistModuleConfig']['editor_width'];
 				$editor_config['height'] = $GLOBALS['songlistModuleConfig']['editor_height'];
 				$element = new XoopsFormEditor($caption, $name, $editor_config);
-                break;
-
-            case "select":
-                $element = new XoopsFormSelect($caption, $name, $value);
-                // If options do not include an empty element, then add a blank option to prevent any default selection
-                if (!in_array('', array_keys($options))) {
-                    $element->addOption('', _NONE);
-                    //trabis
-                    if ($this->getVar('field_required') == 1) {
-                        $eltmsg = empty($caption) ? sprintf(_FORM_ENTER, $name) : sprintf( _FORM_ENTER, $caption);
-                        $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
-                        $element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};" .
-                            "for (i = 0; i < selectBox.options.length; i++  ) { if ( selectBox.options[i].selected == true && selectBox.options[i].value != '' ) { hasSelected = true; break; } }" .
-                            "if ( !hasSelected ) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
-                    }
-                }
-                $element->addOptionArray($options);
-                break;
-
-            case "select_multi":
-                $element = new XoopsFormSelect($caption, $name, $value, 5, true);
-                $element->addOptionArray($options);
-                break;
-
-            case "radio":
-                $element = new XoopsFormRadio($caption, $name, $value);
-                $element->addOptionArray($options);
-                break;
-
-            case "checkbox":
-                $element = new XoopsFormCheckBox($caption, $name, $value);
-                $element->addOptionArray($options);
-                break;
-
-            case "yesno":
-                $element = new XoopsFormRadioYN($caption, $name, $value);
-                break;
-
-            case "group":
-                $element = new XoopsFormSelectGroup($caption, $name, true, $value);
-                break;
-
-            case "group_multi":
-                $element = new XoopsFormSelectGroup($caption, $name, true, $value, 5, true);
-                break;
-
-            case "language":
-                $element = new XoopsFormSelectLang($caption, $name, $value);
-                break;
-
-            case "date":
-                $element = new XoopsFormTextDateSelect($caption, $name, 15, $value);
-                break;
-
-            case "longdate":
-                $element = new XoopsFormTextDateSelect($caption, $name, 15, str_replace("-", "/", $value) );
-                break;
-
-            case "datetime":
-                $element = new XoopsFormDatetime($caption, $name, 15, $value);
-                break;
-
-            case "list":
-                $element = new XoopsFormSelectList($caption, $name, $value, 1, $options[0]);
-                break;
-
-            case "timezone":
-                $element = new XoopsFormSelectTimezone($caption, $name, $value);
-                $element->setExtra("style='width: 280px;'");
-                break;
-
-            case "rank":
-                $element = new XoopsFormSelect($caption, $name, $value);
-
-                include_once $GLOBALS['xoops']->path('class/xoopslists.php');
-                $ranks = XoopsLists::getUserRankList();
-                $element->addOption(0, "--------------");
-                $element->addOptionArray($ranks);
-                break;
-
-            case 'theme':
-                $element = new XoopsFormSelect($caption, $name, $value);
-                $element->addOption("0", _OBJS_MF_SITEDEFAULT);
-                $handle = opendir(XOOPS_THEME_PATH . '/');
-                $dirlist = array();
-                while (false !== ($file = readdir($handle) ) ) {
-                    if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match("/^[.]{1,2}$/", $file) && strtolower($file) != 'cvs' ) {
-                        if (file_exists(XOOPS_THEME_PATH . "/" . $file . "/theme.html") && in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'])) {
-                            $dirlist[$file] = $file;
-                        }
-                    }
-                }
-                closedir($handle);
-                if (!empty($dirlist)) {
-                    asort($dirlist);
-                    $element->addOptionArray($dirlist);
-                }
-                break;
-        }
-        if ($this->getVar('field_description') != "") {
-            $element->setDescription($this->getVar('field_description') );
-        }
-        return $element;
-    }
-
-    /**
-    * Returns a {@link XoopsFormElement} for editing the value of this field
-    *
-    * @param XoopsUser $user {@link XoopsUser} object to edit the value of
-    * @param ObjectsProfile $profile {@link ObjectsProfile} object to edit the value of
-    *
-    * @return XoopsFormElement
-    **/
-    function getSearchElement()
-    {
-        $caption = $this->getVar('field_title');
-        $caption = defined($caption) ? constant($caption) : $caption;
-        $name = $this->getVar('field_name', 'e');
-        $options = $this->getVar('field_options');
-        if (is_array($options)) {
-            //asort($options);
-
-            foreach (array_keys($options) as $key) {
-                $optval = defined($options[$key]) ? constant($options[$key]) : $options[$key];
-                $optkey = defined($key) ? constant($key) : $key;
-                unset($options[$key]);
-                $options[$optkey] = $optval;
-            }
-        }
-        include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-        switch ($this->getVar('field_type')  ) {
-            default:
-            case "autotext":
-                //autotext is not for editing
-                $element = new XoopsFormLabel($caption, $this->getOutputValue($user, $profile));
-                break;
-
-            case "textbox":
-                $element = new XoopsFormText($caption, $name, 35, $this->getVar('field_maxlength'), $value);
-                break;
-
-            case "textarea":
-                $element = new XoopsFormTextArea($caption, $name, $value, 4, 30);
-                break;
-
-            case "dhtml":
-                $element = new XoopsFormText($caption, $name, 35, 255, $value);
-                break;
-
-            case "select":
-                $element = new XoopsFormSelect($caption, $name, $value);
-                // If options do not include an empty element, then add a blank option to prevent any default selection
-                if (!in_array('', array_keys($options))) {
-                    $element->addOption('', _NONE);
-                    //trabis
-                    if ($this->getVar('field_required') == 1) {
-                        $eltmsg = empty($caption) ? sprintf(_FORM_ENTER, $name) : sprintf( _FORM_ENTER, $caption);
-                        $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
-                        $element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};" .
-                            "for (i = 0; i < selectBox.options.length; i++  ) { if ( selectBox.options[i].selected == true && selectBox.options[i].value != '' ) { hasSelected = true; break; } }" .
-                            "if ( !hasSelected ) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
-                    }
-                    //end
-                }
-                $element->addOptionArray($options);
-                break;
-
-
-            case "editor":
-
-                $element = new XoopsFormText($caption, $name, 35, 255, $value);
-                break;
-
-            case "select_multi":
-                $element = new XoopsFormSelect($caption, $name, $value, 5, true);
-                $element->addOptionArray($options);
-                break;
-
-            case "radio":
-                $element = new XoopsFormRadio($caption, $name, $value);
-                $element->addOptionArray($options);
-                break;
-
-            case "checkbox":
-                $element = new XoopsFormCheckBox($caption, $name, $value);
-                $element->addOptionArray($options);
-                break;
-
-            case "yesno":
-                $element = new XoopsFormRadioYN($caption, $name, $value);
-                break;
-
-            case "group":
-                $element = new XoopsFormSelectGroup($caption, $name, true, $value);
-                break;
-
-            case "group_multi":
-                $element = new XoopsFormSelectGroup($caption, $name, true, $value, 5, true);
-                break;
-
-            case "language":
-                $element = new XoopsFormSelectLang($caption, $name, $value);
-                break;
-
-            case "date":
-                $element = new XoopsFormTextDateSelect($caption, $name, 15, $value);
-                break;
-
-            case "longdate":
-                $element = new XoopsFormTextDateSelect($caption, $name, 15, str_replace("-", "/", $value) );
-                break;
-
-            case "datetime":
-                $element = new XoopsFormDatetime($caption, $name, 15, $value);
-                break;
-
-            case "list":
-                $element = new XoopsFormSelectList($caption, $name, $value, 1, $options[0]);
-                break;
-
-            case "timezone":
-                $element = new XoopsFormSelectTimezone($caption, $name, $value);
-                $element->setExtra("style='width: 280px;'");
-                break;
-
-            case "rank":
-                $element = new XoopsFormSelect($caption, $name, $value);
-
-                include_once $GLOBALS['xoops']->path('class/xoopslists.php');
-                $ranks = XoopsLists::getUserRankList();
-                $element->addOption(0, "--------------");
-                $element->addOptionArray($ranks);
-                break;
-
-            case 'theme':
-                $element = new XoopsFormSelect($caption, $name, $value);
-                $element->addOption("0", _OBJS_MF_SITEDEFAULT);
-                $handle = opendir(XOOPS_THEME_PATH . '/');
-                $dirlist = array();
-                while (false !== ($file = readdir($handle) ) ) {
-                    if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match("/^[.]{1,2}$/", $file) && strtolower($file) != 'cvs' ) {
-                        if (file_exists(XOOPS_THEME_PATH . "/" . $file . "/theme.html") && in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'])) {
-                            $dirlist[$file] = $file;
-                        }
-                    }
-                }
-                closedir($handle);
-                if (!empty($dirlist)) {
-                    asort($dirlist);
-                    $element->addOptionArray($dirlist);
-                }
-                break;
-        }
-        if ($this->getVar('field_description') != "") {
-            $element->setDescription($this->getVar('field_description') );
-        }
-        return $element;
-    }
-
-    /**
-    * Returns a value for output of this field
-    *
-    * @param XoopsUser $user {@link XoopsUser} object to get the value of
-    * @param ObjectsProfile $profile object to get the value of
-    *
-    * @return mixed
-    **/
-    function getOutputValue($user, $profile)
-    {
-        if (file_exists($file = $GLOBALS['xoops']->path('modules/objects/language/' . $GLOBALS['xoopsConfig']['language'] . '/modinfo.php'))) {
-            include_once $file;
-        } else {
-            include_once $GLOBALS['xoops']->path('modules/objects/language/english/modinfo.php');
-        }
-
-        $value = in_array($this->getVar('field_name'), $this->getPostVars() ) ? $user->getVar($this->getVar('field_name') ) : $profile->getVar($this->getVar('field_name'));
-
-        switch ($this->getVar('field_type')  ) {
-            default:
-            case "textbox":
-                if ( $this->getVar('field_name') == 'url' && $value != '') {
-                     return '<a href="' . formatURL($value) . '" rel="external">' . $value . '</a>';
-                   } else {
-                     return $value;
-                }
-                break;
+				break;
+
+			case "select":
+				$element = new XoopsFormSelect($caption, $name, $value);
+				// If options do not include an empty element, then add a blank option to prevent any default selection
+				if (!in_array('', array_keys($options))) {
+					$element->addOption('', _NONE);
+					//trabis
+					if ($this->getVar('field_required') == 1) {
+						$eltmsg = empty($caption) ? sprintf(_FORM_ENTER, $name) : sprintf( _FORM_ENTER, $caption);
+						$eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
+						$element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};" .
+							"for (i = 0; i < selectBox.options.length; i++  ) { if ( selectBox.options[i].selected == true && selectBox.options[i].value != '' ) { hasSelected = true; break; } }" .
+							"if ( !hasSelected ) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
+					}
+				}
+				$element->addOptionArray($options);
+				break;
+
+			case "select_multi":
+				$element = new XoopsFormSelect($caption, $name, $value, 5, true);
+				$element->addOptionArray($options);
+				break;
+
+			case "radio":
+				$element = new XoopsFormRadio($caption, $name, $value);
+				$element->addOptionArray($options);
+				break;
+
+			case "checkbox":
+				$element = new XoopsFormCheckBox($caption, $name, $value);
+				$element->addOptionArray($options);
+				break;
+
+			case "yesno":
+				$element = new XoopsFormRadioYN($caption, $name, $value);
+				break;
+
+			case "group":
+				$element = new XoopsFormSelectGroup($caption, $name, true, $value);
+				break;
+
+			case "group_multi":
+				$element = new XoopsFormSelectGroup($caption, $name, true, $value, 5, true);
+				break;
+
+			case "language":
+				$element = new XoopsFormSelectLang($caption, $name, $value);
+				break;
+
+			case "date":
+				$element = new XoopsFormTextDateSelect($caption, $name, 15, $value);
+				break;
+
+			case "longdate":
+				$element = new XoopsFormTextDateSelect($caption, $name, 15, str_replace("-", "/", $value) );
+				break;
+
+			case "datetime":
+				$element = new XoopsFormDatetime($caption, $name, 15, $value);
+				break;
+
+			case "list":
+				$element = new XoopsFormSelectList($caption, $name, $value, 1, $options[0]);
+				break;
+
+			case "timezone":
+				$element = new XoopsFormSelectTimezone($caption, $name, $value);
+				$element->setExtra("style='width: 280px;'");
+				break;
+
+			case "rank":
+				$element = new XoopsFormSelect($caption, $name, $value);
+
+				include_once $GLOBALS['xoops']->path('class/xoopslists.php');
+				$ranks = XoopsLists::getUserRankList();
+				$element->addOption(0, "--------------");
+				$element->addOptionArray($ranks);
+				break;
+
+			case 'theme':
+				$element = new XoopsFormSelect($caption, $name, $value);
+				$element->addOption("0", _OBJS_MF_SITEDEFAULT);
+				$handle = opendir(XOOPS_THEME_PATH . '/');
+				$dirlist = array();
+				while (false !== ($file = readdir($handle) ) ) {
+					if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match("/^[.]{1,2}$/", $file) && strtolower($file) != 'cvs' ) {
+						if (file_exists(XOOPS_THEME_PATH . "/" . $file . "/theme.html") && in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'])) {
+							$dirlist[$file] = $file;
+						}
+					}
+				}
+				closedir($handle);
+				if (!empty($dirlist)) {
+					asort($dirlist);
+					$element->addOptionArray($dirlist);
+				}
+				break;
+		}
+		if ($this->getVar('field_description') != "") {
+			$element->setDescription($this->getVar('field_description') );
+		}
+		return $element;
+	}
+
+	/**
+	 * Returns a {@link XoopsFormElement} for editing the value of this field
+	 *
+	 * @param XoopsUser $user {@link XoopsUser} object to edit the value of
+	 * @param ObjectsProfile $profile {@link ObjectsProfile} object to edit the value of
+	 *
+	 * @return XoopsFormElement
+	 **/
+	function getSearchElement()
+	{
+		$caption = $this->getVar('field_title');
+		$caption = defined($caption) ? constant($caption) : $caption;
+		$name = $this->getVar('field_name', 'e');
+		$options = $this->getVar('field_options');
+		if (is_array($options)) {
+			//asort($options);
+
+			foreach (array_keys($options) as $key) {
+				$optval = defined($options[$key]) ? constant($options[$key]) : $options[$key];
+				$optkey = defined($key) ? constant($key) : $key;
+				unset($options[$key]);
+				$options[$optkey] = $optval;
+			}
+		}
+		include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+		switch ($this->getVar('field_type')  ) {
+			default:
+			case "autotext":
+				//autotext is not for editing
+				$element = new XoopsFormLabel($caption, $this->getOutputValue($user, $profile));
+				break;
+
+			case "textbox":
+				$element = new XoopsFormText($caption, $name, 35, $this->getVar('field_maxlength'), $value);
+				break;
+
+			case "textarea":
+				$element = new XoopsFormTextArea($caption, $name, $value, 4, 30);
+				break;
+
+			case "dhtml":
+				$element = new XoopsFormText($caption, $name, 35, 255, $value);
+				break;
+
+			case "select":
+				$element = new XoopsFormSelect($caption, $name, $value);
+				// If options do not include an empty element, then add a blank option to prevent any default selection
+				if (!in_array('', array_keys($options))) {
+					$element->addOption('', _NONE);
+					//trabis
+					if ($this->getVar('field_required') == 1) {
+						$eltmsg = empty($caption) ? sprintf(_FORM_ENTER, $name) : sprintf( _FORM_ENTER, $caption);
+						$eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
+						$element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};" .
+							"for (i = 0; i < selectBox.options.length; i++  ) { if ( selectBox.options[i].selected == true && selectBox.options[i].value != '' ) { hasSelected = true; break; } }" .
+							"if ( !hasSelected ) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
+					}
+					//end
+				}
+				$element->addOptionArray($options);
+				break;
+
+
+			case "editor":
+
+				$element = new XoopsFormText($caption, $name, 35, 255, $value);
+				break;
+
+			case "select_multi":
+				$element = new XoopsFormSelect($caption, $name, $value, 5, true);
+				$element->addOptionArray($options);
+				break;
+
+			case "radio":
+				$element = new XoopsFormRadio($caption, $name, $value);
+				$element->addOptionArray($options);
+				break;
+
+			case "checkbox":
+				$element = new XoopsFormCheckBox($caption, $name, $value);
+				$element->addOptionArray($options);
+				break;
+
+			case "yesno":
+				$element = new XoopsFormRadioYN($caption, $name, $value);
+				break;
+
+			case "group":
+				$element = new XoopsFormSelectGroup($caption, $name, true, $value);
+				break;
+
+			case "group_multi":
+				$element = new XoopsFormSelectGroup($caption, $name, true, $value, 5, true);
+				break;
+
+			case "language":
+				$element = new XoopsFormSelectLang($caption, $name, $value);
+				break;
+
+			case "date":
+				$element = new XoopsFormTextDateSelect($caption, $name, 15, $value);
+				break;
+
+			case "longdate":
+				$element = new XoopsFormTextDateSelect($caption, $name, 15, str_replace("-", "/", $value) );
+				break;
+
+			case "datetime":
+				$element = new XoopsFormDatetime($caption, $name, 15, $value);
+				break;
+
+			case "list":
+				$element = new XoopsFormSelectList($caption, $name, $value, 1, $options[0]);
+				break;
+
+			case "timezone":
+				$element = new XoopsFormSelectTimezone($caption, $name, $value);
+				$element->setExtra("style='width: 280px;'");
+				break;
+
+			case "rank":
+				$element = new XoopsFormSelect($caption, $name, $value);
+
+				include_once $GLOBALS['xoops']->path('class/xoopslists.php');
+				$ranks = XoopsLists::getUserRankList();
+				$element->addOption(0, "--------------");
+				$element->addOptionArray($ranks);
+				break;
+
+			case 'theme':
+				$element = new XoopsFormSelect($caption, $name, $value);
+				$element->addOption("0", _OBJS_MF_SITEDEFAULT);
+				$handle = opendir(XOOPS_THEME_PATH . '/');
+				$dirlist = array();
+				while (false !== ($file = readdir($handle) ) ) {
+					if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match("/^[.]{1,2}$/", $file) && strtolower($file) != 'cvs' ) {
+						if (file_exists(XOOPS_THEME_PATH . "/" . $file . "/theme.html") && in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'])) {
+							$dirlist[$file] = $file;
+						}
+					}
+				}
+				closedir($handle);
+				if (!empty($dirlist)) {
+					asort($dirlist);
+					$element->addOptionArray($dirlist);
+				}
+				break;
+		}
+		if ($this->getVar('field_description') != "") {
+			$element->setDescription($this->getVar('field_description') );
+		}
+		return $element;
+	}
+
+	/**
+	 * Returns a value for output of this field
+	 *
+	 * @param XoopsUser $user {@link XoopsUser} object to get the value of
+	 * @param ObjectsProfile $profile object to get the value of
+	 *
+	 * @return mixed
+	 **/
+	function getOutputValue($user, $profile)
+	{
+		if (file_exists($file = $GLOBALS['xoops']->path('modules/objects/language/' . $GLOBALS['xoopsConfig']['language'] . '/modinfo.php'))) {
+			include_once $file;
+		} else {
+			include_once $GLOBALS['xoops']->path('modules/objects/language/english/modinfo.php');
+		}
+
+		$value = in_array($this->getVar('field_name'), $this->getPostVars() ) ? $user->getVar($this->getVar('field_name') ) : $profile->getVar($this->getVar('field_name'));
+
+		switch ($this->getVar('field_type')  ) {
+			default:
+			case "textbox":
+				if ( $this->getVar('field_name') == 'url' && $value != '') {
+					 return '<a href="' . formatURL($value) . '" rel="external">' . $value . '</a>';
+				   } else {
+					 return $value;
+				}
+				break;
 			case "editor":
-            case "textarea":
-            case "dhtml":
-            case 'theme':
-            case "language":
-            case "list":
-                return $value;
-                break;
-
-            case "select":
-            case "radio":
-                $options = $this->getVar('field_options');
-                if (isset($options[$value])) {
-                    $value = htmlspecialchars( defined($options[$value]) ? constant($options[$value]) : $options[$value]);
-                } else {
-                    $value = "";
-                }
-                return $value;
-                break;
-
-            case "select_multi":
-            case "checkbox":
-                $options = $this->getVar('field_options');
-                $ret = array();
-                if (count($options) > 0) {
-                    foreach (array_keys($options) as $key) {
-                        if (in_array($key, $value)) {
-                            $$ret[$key] = htmlspecialchars( defined($options[$key]) ? constant($options[$key]) : $options[$key]);
-                        }
-                    }
-                }
-                return $ret;
-                break;
-
-            case "group":
-                //change to retrieve groups and return name of group
-                return $value;
-                break;
-
-            case "group_multi":
-                //change to retrieve groups and return array of group names
-                return "";
-                break;
-
-            case "longdate":
-                //return YYYY/MM/DD format - not optimal as it is not using local date format, but how do we do that
-                //when we cannot convert it to a UNIX timestamp?
-                return str_replace("-", "/", $value);
-
-            case "date":
-                return formatTimestamp($value, 's');
-                break;
-
-            case "datetime":
-                if (!empty($value)) {
-                       return formatTimestamp($value, 'm');
-                   } else {
-                       return $value = _XFORUM_MI_DATENOTSET;
-                   }
-                break;
-
-            case "autotext":
-                $value = $user->getVar($this->getVar('field_name'), 'n'); //autotext can have HTML in it
-                $value = str_replace("{X_UID}", $user->getVar("uid"), $value);
-                $value = str_replace("{X_URL}", XOOPS_URL, $value );
-                $value = str_replace("{X_UNAME}", $user->getVar("uname"), $value);
-                return $value;
-                break;
-
-            case "rank":
-                $userrank = $user->rank();
-                $user_rankimage = "";
-                if (isset($userrank['image']) && $userrank['image'] != "") {
-                    $user_rankimage = '<img src="'.XOOPS_UPLOAD_URL . '/' . $userrank['image'] . '" alt="' . $userrank['title'] . '" /><br />';
-                }
-                return $user_rankimage.$userrank['title'];
-                break;
-
-            case "yesno":
-                return $value ? _YES : _NO;
-                break;
-
-            case "timezone":
-                include_once $GLOBALS['xoops']->path('class/xoopslists.php');
-                $timezones = XoopsLists::getTimeZoneList();
-                $value = empty($value) ? "0" : strval($value);
-                return $timezones[str_replace('.0', '', $value)];
-                break;
-        }
-    }
-
-    /**
-    * Returns a value ready to be saved in the database
-    *
-    * @param mixed $value Value to format
-    *
-    * @return mixed
-    */
-    function getValueForSave($value)
-    {
-        switch ($this->getVar('field_type')) {
-            default:
-            case "textbox":
-            case "textarea":
-            case "dhtml":
-            case "yesno":
-            case "timezone":
-            case 'theme':
-            case "language":
-            case "list":
-            case "select":
-            case "radio":
-            case "select_multi":
-            case "checkbox":
-            case "group":
-            case "group_multi":
-            case "longdate":
-                return $value;
-
-            case "date":
-                if ($value != "") {
-                    return strtotime($value);
-                }
-                return $value;
-                break;
-
-            case "datetime":
-                if (!empty($value)) {
-                    return strtotime($value['date']) + intval($value['time']);
-                }
-                return $value;
-                break;
-        }
-    }
-
-    /**
-     * Get names of user variables
-     *
-     * @return array
-     */
-    function getPostVars()
-    {
-        $objects_handler = xoops_getmodulehandler('extras', 'songlist');
-        return $objects_handler->getPostVars();
-    }
+			case "textarea":
+			case "dhtml":
+			case 'theme':
+			case "language":
+			case "list":
+				return $value;
+				break;
+
+			case "select":
+			case "radio":
+				$options = $this->getVar('field_options');
+				if (isset($options[$value])) {
+					$value = htmlspecialchars( defined($options[$value]) ? constant($options[$value]) : $options[$value]);
+				} else {
+					$value = "";
+				}
+				return $value;
+				break;
+
+			case "select_multi":
+			case "checkbox":
+				$options = $this->getVar('field_options');
+				$ret = array();
+				if (count($options) > 0) {
+					foreach (array_keys($options) as $key) {
+						if (in_array($key, $value)) {
+							$$ret[$key] = htmlspecialchars( defined($options[$key]) ? constant($options[$key]) : $options[$key]);
+						}
+					}
+				}
+				return $ret;
+				break;
+
+			case "group":
+				//change to retrieve groups and return name of group
+				return $value;
+				break;
+
+			case "group_multi":
+				//change to retrieve groups and return array of group names
+				return "";
+				break;
+
+			case "longdate":
+				//return YYYY/MM/DD format - not optimal as it is not using local date format, but how do we do that
+				//when we cannot convert it to a UNIX timestamp?
+				return str_replace("-", "/", $value);
+
+			case "date":
+				return formatTimestamp($value, 's');
+				break;
+
+			case "datetime":
+				if (!empty($value)) {
+					   return formatTimestamp($value, 'm');
+				   } else {
+					   return $value = _XFORUM_MI_DATENOTSET;
+				   }
+				break;
+
+			case "autotext":
+				$value = $user->getVar($this->getVar('field_name'), 'n'); //autotext can have HTML in it
+				$value = str_replace("{X_UID}", $user->getVar("uid"), $value);
+				$value = str_replace("{X_URL}", XOOPS_URL, $value );
+				$value = str_replace("{X_UNAME}", $user->getVar("uname"), $value);
+				return $value;
+				break;
+
+			case "rank":
+				$userrank = $user->rank();
+				$user_rankimage = "";
+				if (isset($userrank['image']) && $userrank['image'] != "") {
+					$user_rankimage = '<img src="'.XOOPS_UPLOAD_URL . '/' . $userrank['image'] . '" alt="' . $userrank['title'] . '" /><br />';
+				}
+				return $user_rankimage.$userrank['title'];
+				break;
+
+			case "yesno":
+				return $value ? _YES : _NO;
+				break;
+
+			case "timezone":
+				include_once $GLOBALS['xoops']->path('class/xoopslists.php');
+				$timezones = XoopsLists::getTimeZoneList();
+				$value = empty($value) ? "0" : strval($value);
+				return $timezones[str_replace('.0', '', $value)];
+				break;
+		}
+	}
+
+	/**
+	 * Returns a value ready to be saved in the database
+	 *
+	 * @param mixed $value Value to format
+	 *
+	 * @return mixed
+	 */
+	function getValueForSave($value)
+	{
+		switch ($this->getVar('field_type')) {
+			default:
+			case "textbox":
+			case "textarea":
+			case "dhtml":
+			case "yesno":
+			case "timezone":
+			case 'theme':
+			case "language":
+			case "list":
+			case "select":
+			case "radio":
+			case "select_multi":
+			case "checkbox":
+			case "group":
+			case "group_multi":
+			case "longdate":
+				return $value;
+
+			case "date":
+				if ($value != "") {
+					return strtotime($value);
+				}
+				return $value;
+				break;
+
+			case "datetime":
+				if (!empty($value)) {
+					return strtotime($value['date']) + intval($value['time']);
+				}
+				return $value;
+				break;
+		}
+	}
+
+	/**
+	 * Get names of user variables
+	 *
+	 * @return array
+	 */
+	function getPostVars()
+	{
+		$objects_handler = xoops_getmodulehandler('extras', 'songlist');
+		return $objects_handler->getPostVars();
+	}
 }
 
 /**
@@ -556,229 +556,229 @@ 
  */
 class SonglistFieldHandler extends XoopsPersistableObjectHandler
 {
-    function __construct($db)
-    {
-        parent::__construct($db, 'songlist_field', "SonglistField", "field_id", 'field_title');
-    }
-
-    /**
-    * Read field information from cached storage
-    *
-    * @param bool   $force_update   read fields from database and not cached storage
-    *
-    * @return array
-    */
-    function loadFields($force_update = false)
-    {
-        static $fields = array();
-        if (!empty($force_update) || count($fields) == 0) {
-            $criteria = new Criteria('field_id', 0, "!=");
-            $criteria->setSort('field_weight');
-            if ($this->getCount($criteria)==0)
-            	return false;
-            $field_objs = $this->getObjects($criteria);
-            foreach (array_keys($field_objs) as $i ) {
-                $fields[$field_objs[$i]->getVar('field_name')] = $field_objs[$i];
-            }
-        }
-        return $fields;
-    }
-
-    /**
-    * save a profile field in the database
-    *
-    * @param object $obj reference to the object
-    * @param bool $force whether to force the query execution despite security settings
-    * @param bool $checkObject check if the object is dirty and clean the attributes
-    * @return bool FALSE if failed, TRUE if already present and unchanged or successful
-    */
-    function insert($obj, $force = false)
-    {
-        $objects_handler = xoops_getmodulehandler('extras', 'songlist');
-        $obj->setVar('field_name', str_replace(' ', '_', $obj->getVar('field_name')));
-        $obj->cleanVars();
-        $defaultstring = "";
-        switch ($obj->getVar('field_type')  ) {
-            case "datetime":
-            case "date":
-                $obj->setVar('field_valuetype', XOBJ_DTYPE_INT);
-                $obj->setVar('field_maxlength', 10);
-                break;
-
-            case "longdate":
-                $obj->setVar('field_valuetype', XOBJ_DTYPE_MTIME);
-                break;
-
-            case "yesno":
-                $obj->setVar('field_valuetype', XOBJ_DTYPE_INT);
-                $obj->setVar('field_maxlength', 1);
-                break;
-
-            case "textbox":
-                if ($obj->getVar('field_valuetype') != XOBJ_DTYPE_INT) {
-                    $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
-                }
-                break;
-
-            case "autotext":
-                if ($obj->getVar('field_valuetype') != XOBJ_DTYPE_INT) {
-                    $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTAREA);
-                }
-                break;
-
-            case "group_multi":
-            case "select_multi":
-            case "checkbox":
-                $obj->setVar('field_valuetype', XOBJ_DTYPE_ARRAY);
-                break;
-
-            case "language":
-            case "timezone":
-            case "theme":
-                $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
-                break;
-
-            case "dhtml":
-            case "textarea":
-                $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTAREA);
-                break;
-        }
-
-        if ($obj->getVar('field_valuetype') == "") {
-            $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
-        }
-
-        if (!in_array($obj->getVar('field_name'), $this->getPostVars())) {
-            if ($obj->isNew()) {
-                //add column to table
-                $changetype = "ADD";
-            } else {
-                //update column information
-                $changetype = "CHANGE `" . $obj->getVar('field_name', 'n') . "`";
-            }
-            $maxlengthstring = $obj->getVar('field_maxlength') > 0 ? "(" . $obj->getVar('field_maxlength') . ")" : "";
-            $notnullstring = " NOT NULL";
-            //set type
-            switch ($obj->getVar('field_valuetype')) {
-                default:
-                case XOBJ_DTYPE_ARRAY:
-                case XOBJ_DTYPE_UNICODE_ARRAY:
-                    $type = "mediumtext";
-                    break;
-                case XOBJ_DTYPE_UNICODE_EMAIL:
-                case XOBJ_DTYPE_UNICODE_TXTBOX:
-                case XOBJ_DTYPE_UNICODE_URL:
-                case XOBJ_DTYPE_EMAIL:
-                case XOBJ_DTYPE_TXTBOX:
-                case XOBJ_DTYPE_URL:
-                    $type = "varchar";
-                    // varchars must have a maxlength
-                    if (!$maxlengthstring) {
-                        //so set it to max if maxlength is not set - or should it fail?
-                        $maxlengthstring = "(255)";
-                        $obj->setVar('field_maxlength', 255);
-                    }
-                    //if ( $obj->getVar('field_default')  ) {
-                        $defaultstring = " DEFAULT " . $this->db->quote($obj->cleanVars['field_default']);
-                    //}
-                    break;
-
-                case XOBJ_DTYPE_INT:
-                    $type = "int";
-                    if ($obj->getVar('field_default') || $obj->getVar('field_default') !== '') {
-                        $defaultstring = " DEFAULT '" . intval($obj->cleanVars['field_default']) . "'";
-                        $obj->setVar('field_default', intval($obj->cleanVars['field_default']));
-                    }
-                    break;
-
-                case XOBJ_DTYPE_DECIMAL:
-                    $type = "decimal(14,6)";
-                    if ($obj->getVar('field_default') || $obj->getVar('field_default') !== '') {
-                        $defaultstring = " DEFAULT '" . doubleval($obj->cleanVars['field_default']) . "'";
-                        $obj->setVar('field_default', doubleval($obj->cleanVars['field_default']));
-                    }
-                    break;
-
-                case XOBJ_DTYPE_FLOAT:
-                    $type = "float(15,9)";
-                    if ($obj->getVar('field_default') || $obj->getVar('field_default') !== '') {
-                        $defaultstring = " DEFAULT '" . floatval($obj->cleanVars['field_default']) . "'";
-                        $obj->setVar('field_default', floatval($obj->cleanVars['field_default']));
-                    }
-                    break;
-
-                case XOBJ_DTYPE_OTHER:
-                case XOBJ_DTYPE_UNICODE_TXTAREA:
-                case XOBJ_DTYPE_TXTAREA:
-                    $type = "text";
-                    $maxlengthstring = "";
-                    $notnullstring = "";
-                    break;
-
-                case XOBJ_DTYPE_MTIME:
-                    $type = "date";
-                    $maxlengthstring = "";
-                    break;
-            }
-
-            $sql = "ALTER TABLE `" . $objects_handler->table . "` " .
-            $changetype . " `" . $obj->cleanVars['field_name'] . "` " . $type . $maxlengthstring . $notnullstring . $defaultstring;
-            if (!$this->db->query($sql)) {
-                return false;
-            }
-        }
-
-        //change this to also update the cached field information storage
-        $obj->setDirty();
-        if (!parent::insert($obj, $force)) {
-            return false;
-        }
-        return $obj->getVar('field_id');
-
-    }
-
-    /**
-    * delete a profile field from the database
-    *
-    * @param object $obj reference to the object to delete
-    * @param bool $force
-    * @return bool FALSE if failed.
-    **/
-    function delete($obj, $force = false)
-    {
-        $objects_handler = xoops_getmodulehandler('extras', 'songlist');
-        // remove column from table
-        $sql = "ALTER TABLE " . $objects_handler->table . " DROP `" . $obj->getVar('field_name', 'n') . "`";
-        if ($this->db->query($sql)) {
-            //change this to update the cached field information storage
-            if (!parent::delete($obj, $force)) {
-                return false;
-            }
-
-            if ($obj->getVar('field_show') || $obj->getVar('field_edit')) {
-                $module_handler = xoops_gethandler('module');
-                $objects_module = $module_handler->getByDirname('profile');
-                if (is_object($objects_module)) {
-                    // Remove group permissions
-                    $groupperm_handler = xoops_gethandler('groupperm');
-                    $criteria = new CriteriaCompo(new Criteria('gperm_modid', $objects_module->getVar('mid')));
-                    $criteria->add(new Criteria('gperm_itemid', $obj->getVar('field_id')));
-                    return $groupperm_handler->deleteAll($criteria);
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Get array of standard variable names (song table)
-     *
-     * @return array
-     */
-    function getPostVars()
-    {
-        return array('sid', 'cid', 'gid', 'aids', 'abid', 'songid', 'traxid', 'title', 'lyrics', 'hits', 'rank', 'votes', 'tags',
+	function __construct($db)
+	{
+		parent::__construct($db, 'songlist_field', "SonglistField", "field_id", 'field_title');
+	}
+
+	/**
+	 * Read field information from cached storage
+	 *
+	 * @param bool   $force_update   read fields from database and not cached storage
+	 *
+	 * @return array
+	 */
+	function loadFields($force_update = false)
+	{
+		static $fields = array();
+		if (!empty($force_update) || count($fields) == 0) {
+			$criteria = new Criteria('field_id', 0, "!=");
+			$criteria->setSort('field_weight');
+			if ($this->getCount($criteria)==0)
+				return false;
+			$field_objs = $this->getObjects($criteria);
+			foreach (array_keys($field_objs) as $i ) {
+				$fields[$field_objs[$i]->getVar('field_name')] = $field_objs[$i];
+			}
+		}
+		return $fields;
+	}
+
+	/**
+	 * save a profile field in the database
+	 *
+	 * @param object $obj reference to the object
+	 * @param bool $force whether to force the query execution despite security settings
+	 * @param bool $checkObject check if the object is dirty and clean the attributes
+	 * @return bool FALSE if failed, TRUE if already present and unchanged or successful
+	 */
+	function insert($obj, $force = false)
+	{
+		$objects_handler = xoops_getmodulehandler('extras', 'songlist');
+		$obj->setVar('field_name', str_replace(' ', '_', $obj->getVar('field_name')));
+		$obj->cleanVars();
+		$defaultstring = "";
+		switch ($obj->getVar('field_type')  ) {
+			case "datetime":
+			case "date":
+				$obj->setVar('field_valuetype', XOBJ_DTYPE_INT);
+				$obj->setVar('field_maxlength', 10);
+				break;
+
+			case "longdate":
+				$obj->setVar('field_valuetype', XOBJ_DTYPE_MTIME);
+				break;
+
+			case "yesno":
+				$obj->setVar('field_valuetype', XOBJ_DTYPE_INT);
+				$obj->setVar('field_maxlength', 1);
+				break;
+
+			case "textbox":
+				if ($obj->getVar('field_valuetype') != XOBJ_DTYPE_INT) {
+					$obj->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
+				}
+				break;
+
+			case "autotext":
+				if ($obj->getVar('field_valuetype') != XOBJ_DTYPE_INT) {
+					$obj->setVar('field_valuetype', XOBJ_DTYPE_TXTAREA);
+				}
+				break;
+
+			case "group_multi":
+			case "select_multi":
+			case "checkbox":
+				$obj->setVar('field_valuetype', XOBJ_DTYPE_ARRAY);
+				break;
+
+			case "language":
+			case "timezone":
+			case "theme":
+				$obj->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
+				break;
+
+			case "dhtml":
+			case "textarea":
+				$obj->setVar('field_valuetype', XOBJ_DTYPE_TXTAREA);
+				break;
+		}
+
+		if ($obj->getVar('field_valuetype') == "") {
+			$obj->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
+		}
+
+		if (!in_array($obj->getVar('field_name'), $this->getPostVars())) {
+			if ($obj->isNew()) {
+				//add column to table
+				$changetype = "ADD";
+			} else {
+				//update column information
+				$changetype = "CHANGE `" . $obj->getVar('field_name', 'n') . "`";
+			}
+			$maxlengthstring = $obj->getVar('field_maxlength') > 0 ? "(" . $obj->getVar('field_maxlength') . ")" : "";
+			$notnullstring = " NOT NULL";
+			//set type
+			switch ($obj->getVar('field_valuetype')) {
+				default:
+				case XOBJ_DTYPE_ARRAY:
+				case XOBJ_DTYPE_UNICODE_ARRAY:
+					$type = "mediumtext";
+					break;
+				case XOBJ_DTYPE_UNICODE_EMAIL:
+				case XOBJ_DTYPE_UNICODE_TXTBOX:
+				case XOBJ_DTYPE_UNICODE_URL:
+				case XOBJ_DTYPE_EMAIL:
+				case XOBJ_DTYPE_TXTBOX:
+				case XOBJ_DTYPE_URL:
+					$type = "varchar";
+					// varchars must have a maxlength
+					if (!$maxlengthstring) {
+						//so set it to max if maxlength is not set - or should it fail?
+						$maxlengthstring = "(255)";
+						$obj->setVar('field_maxlength', 255);
+					}
+					//if ( $obj->getVar('field_default')  ) {
+						$defaultstring = " DEFAULT " . $this->db->quote($obj->cleanVars['field_default']);
+					//}
+					break;
+
+				case XOBJ_DTYPE_INT:
+					$type = "int";
+					if ($obj->getVar('field_default') || $obj->getVar('field_default') !== '') {
+						$defaultstring = " DEFAULT '" . intval($obj->cleanVars['field_default']) . "'";
+						$obj->setVar('field_default', intval($obj->cleanVars['field_default']));
+					}
+					break;
+
+				case XOBJ_DTYPE_DECIMAL:
+					$type = "decimal(14,6)";
+					if ($obj->getVar('field_default') || $obj->getVar('field_default') !== '') {
+						$defaultstring = " DEFAULT '" . doubleval($obj->cleanVars['field_default']) . "'";
+						$obj->setVar('field_default', doubleval($obj->cleanVars['field_default']));
+					}
+					break;
+
+				case XOBJ_DTYPE_FLOAT:
+					$type = "float(15,9)";
+					if ($obj->getVar('field_default') || $obj->getVar('field_default') !== '') {
+						$defaultstring = " DEFAULT '" . floatval($obj->cleanVars['field_default']) . "'";
+						$obj->setVar('field_default', floatval($obj->cleanVars['field_default']));
+					}
+					break;
+
+				case XOBJ_DTYPE_OTHER:
+				case XOBJ_DTYPE_UNICODE_TXTAREA:
+				case XOBJ_DTYPE_TXTAREA:
+					$type = "text";
+					$maxlengthstring = "";
+					$notnullstring = "";
+					break;
+
+				case XOBJ_DTYPE_MTIME:
+					$type = "date";
+					$maxlengthstring = "";
+					break;
+			}
+
+			$sql = "ALTER TABLE `" . $objects_handler->table . "` " .
+			$changetype . " `" . $obj->cleanVars['field_name'] . "` " . $type . $maxlengthstring . $notnullstring . $defaultstring;
+			if (!$this->db->query($sql)) {
+				return false;
+			}
+		}
+
+		//change this to also update the cached field information storage
+		$obj->setDirty();
+		if (!parent::insert($obj, $force)) {
+			return false;
+		}
+		return $obj->getVar('field_id');
+
+	}
+
+	/**
+	 * delete a profile field from the database
+	 *
+	 * @param object $obj reference to the object to delete
+	 * @param bool $force
+	 * @return bool FALSE if failed.
+	 **/
+	function delete($obj, $force = false)
+	{
+		$objects_handler = xoops_getmodulehandler('extras', 'songlist');
+		// remove column from table
+		$sql = "ALTER TABLE " . $objects_handler->table . " DROP `" . $obj->getVar('field_name', 'n') . "`";
+		if ($this->db->query($sql)) {
+			//change this to update the cached field information storage
+			if (!parent::delete($obj, $force)) {
+				return false;
+			}
+
+			if ($obj->getVar('field_show') || $obj->getVar('field_edit')) {
+				$module_handler = xoops_gethandler('module');
+				$objects_module = $module_handler->getByDirname('profile');
+				if (is_object($objects_module)) {
+					// Remove group permissions
+					$groupperm_handler = xoops_gethandler('groupperm');
+					$criteria = new CriteriaCompo(new Criteria('gperm_modid', $objects_module->getVar('mid')));
+					$criteria->add(new Criteria('gperm_itemid', $obj->getVar('field_id')));
+					return $groupperm_handler->deleteAll($criteria);
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Get array of standard variable names (song table)
+	 *
+	 * @return array
+	 */
+	function getPostVars()
+	{
+		return array('sid', 'cid', 'gid', 'aids', 'abid', 'songid', 'traxid', 'title', 'lyrics', 'hits', 'rank', 'votes', 'tags',
  					 'created', 'updated');
-    }
+	}
 }
 ?>
\ No newline at end of file

Spacing +60 added lines, -60 removed lines

@@ -26,7 +26,7 @@ 
         $this->initVar('field_edit', XOBJ_DTYPE_INT, 0);
         $this->initVar('field_show', XOBJ_DTYPE_INT, 0);
         $this->initVar('field_config', XOBJ_DTYPE_INT, 0);
-        $this->initVar('field_options', XOBJ_DTYPE_ARRAY, array() );
+        $this->initVar('field_options', XOBJ_DTYPE_ARRAY, array());
     }
 
 
@@ -42,8 +42,8 @@ 
      */
     function setVar($key, $value, $not_gpc = false)
     {
-        if ($key == 'field_options' && is_array($value)) {
-            foreach (array_keys($value) as $idx ) {
+        if ($key=='field_options' && is_array($value)) {
+            foreach (array_keys($value) as $idx) {
                 $value[$idx] = base64_encode($value[$idx]);
             }
         }
@@ -53,7 +53,7 @@ 
     function getVar($key, $format = 's')
     {
         $value = parent::getVar($key, $format);
-        if ($key == 'field_options' && !empty($value)) {
+        if ($key=='field_options' && !empty($value)) {
             foreach (array_keys($value) as $idx) {
                 $value[$idx] = base64_decode($value[$idx]);
             }
@@ -71,7 +71,7 @@ 
     **/
     function getEditElement($user, $profile)
     {
-        $value = in_array($this->getVar('field_name'), $this->getPostVars() ) ? $user->getVar($this->getVar('field_name'), 'e') : $profile->getVar($this->getVar('field_name'), 'e');
+        $value = in_array($this->getVar('field_name'), $this->getPostVars()) ? $user->getVar($this->getVar('field_name'), 'e') : $profile->getVar($this->getVar('field_name'), 'e');
         if (is_null($value)) {
             $value = $this->getVar('field_default');
         }
@@ -90,7 +90,7 @@ 
             }
         }
         include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-        switch ($this->getVar('field_type')  ) {
+        switch ($this->getVar('field_type')) {
             default:
             case "autotext":
                 //autotext is not for editing
@@ -125,11 +125,11 @@ 
                 if (!in_array('', array_keys($options))) {
                     $element->addOption('', _NONE);
                     //trabis
-                    if ($this->getVar('field_required') == 1) {
-                        $eltmsg = empty($caption) ? sprintf(_FORM_ENTER, $name) : sprintf( _FORM_ENTER, $caption);
+                    if ($this->getVar('field_required')==1) {
+                        $eltmsg = empty($caption) ? sprintf(_FORM_ENTER, $name) : sprintf(_FORM_ENTER, $caption);
                         $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
-                        $element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};" .
-                            "for (i = 0; i < selectBox.options.length; i++  ) { if ( selectBox.options[i].selected == true && selectBox.options[i].value != '' ) { hasSelected = true; break; } }" .
+                        $element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};".
+                            "for (i = 0; i < selectBox.options.length; i++  ) { if ( selectBox.options[i].selected == true && selectBox.options[i].value != '' ) { hasSelected = true; break; } }".
                             "if ( !hasSelected ) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
                     }
                 }
@@ -172,7 +172,7 @@ 
                 break;
 
             case "longdate":
-                $element = new XoopsFormTextDateSelect($caption, $name, 15, str_replace("-", "/", $value) );
+                $element = new XoopsFormTextDateSelect($caption, $name, 15, str_replace("-", "/", $value));
                 break;
 
             case "datetime":
@@ -200,11 +200,11 @@ 
             case 'theme':
                 $element = new XoopsFormSelect($caption, $name, $value);
                 $element->addOption("0", _OBJS_MF_SITEDEFAULT);
-                $handle = opendir(XOOPS_THEME_PATH . '/');
+                $handle = opendir(XOOPS_THEME_PATH.'/');
                 $dirlist = array();
-                while (false !== ($file = readdir($handle) ) ) {
-                    if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match("/^[.]{1,2}$/", $file) && strtolower($file) != 'cvs' ) {
-                        if (file_exists(XOOPS_THEME_PATH . "/" . $file . "/theme.html") && in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'])) {
+                while (false!==($file = readdir($handle))) {
+                    if (is_dir(XOOPS_THEME_PATH.'/'.$file) && !preg_match("/^[.]{1,2}$/", $file) && strtolower($file)!='cvs') {
+                        if (file_exists(XOOPS_THEME_PATH."/".$file."/theme.html") && in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'])) {
                             $dirlist[$file] = $file;
                         }
                     }
@@ -216,8 +216,8 @@ 
                 }
                 break;
         }
-        if ($this->getVar('field_description') != "") {
-            $element->setDescription($this->getVar('field_description') );
+        if ($this->getVar('field_description')!="") {
+            $element->setDescription($this->getVar('field_description'));
         }
         return $element;
     }
@@ -247,7 +247,7 @@ 
             }
         }
         include_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-        switch ($this->getVar('field_type')  ) {
+        switch ($this->getVar('field_type')) {
             default:
             case "autotext":
                 //autotext is not for editing
@@ -272,11 +272,11 @@ 
                 if (!in_array('', array_keys($options))) {
                     $element->addOption('', _NONE);
                     //trabis
-                    if ($this->getVar('field_required') == 1) {
-                        $eltmsg = empty($caption) ? sprintf(_FORM_ENTER, $name) : sprintf( _FORM_ENTER, $caption);
+                    if ($this->getVar('field_required')==1) {
+                        $eltmsg = empty($caption) ? sprintf(_FORM_ENTER, $name) : sprintf(_FORM_ENTER, $caption);
                         $eltmsg = str_replace('"', '\"', stripslashes($eltmsg));
-                        $element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};" .
-                            "for (i = 0; i < selectBox.options.length; i++  ) { if ( selectBox.options[i].selected == true && selectBox.options[i].value != '' ) { hasSelected = true; break; } }" .
+                        $element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};".
+                            "for (i = 0; i < selectBox.options.length; i++  ) { if ( selectBox.options[i].selected == true && selectBox.options[i].value != '' ) { hasSelected = true; break; } }".
                             "if ( !hasSelected ) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
                     }
                     //end
@@ -326,7 +326,7 @@ 
                 break;
 
             case "longdate":
-                $element = new XoopsFormTextDateSelect($caption, $name, 15, str_replace("-", "/", $value) );
+                $element = new XoopsFormTextDateSelect($caption, $name, 15, str_replace("-", "/", $value));
                 break;
 
             case "datetime":
@@ -354,11 +354,11 @@ 
             case 'theme':
                 $element = new XoopsFormSelect($caption, $name, $value);
                 $element->addOption("0", _OBJS_MF_SITEDEFAULT);
-                $handle = opendir(XOOPS_THEME_PATH . '/');
+                $handle = opendir(XOOPS_THEME_PATH.'/');
                 $dirlist = array();
-                while (false !== ($file = readdir($handle) ) ) {
-                    if (is_dir(XOOPS_THEME_PATH . '/' . $file) && !preg_match("/^[.]{1,2}$/", $file) && strtolower($file) != 'cvs' ) {
-                        if (file_exists(XOOPS_THEME_PATH . "/" . $file . "/theme.html") && in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'])) {
+                while (false!==($file = readdir($handle))) {
+                    if (is_dir(XOOPS_THEME_PATH.'/'.$file) && !preg_match("/^[.]{1,2}$/", $file) && strtolower($file)!='cvs') {
+                        if (file_exists(XOOPS_THEME_PATH."/".$file."/theme.html") && in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'])) {
                             $dirlist[$file] = $file;
                         }
                     }
@@ -370,8 +370,8 @@ 
                 }
                 break;
         }
-        if ($this->getVar('field_description') != "") {
-            $element->setDescription($this->getVar('field_description') );
+        if ($this->getVar('field_description')!="") {
+            $element->setDescription($this->getVar('field_description'));
         }
         return $element;
     }
@@ -386,19 +386,19 @@ 
     **/
     function getOutputValue($user, $profile)
     {
-        if (file_exists($file = $GLOBALS['xoops']->path('modules/objects/language/' . $GLOBALS['xoopsConfig']['language'] . '/modinfo.php'))) {
+        if (file_exists($file = $GLOBALS['xoops']->path('modules/objects/language/'.$GLOBALS['xoopsConfig']['language'].'/modinfo.php'))) {
             include_once $file;
         } else {
             include_once $GLOBALS['xoops']->path('modules/objects/language/english/modinfo.php');
         }
 
-        $value = in_array($this->getVar('field_name'), $this->getPostVars() ) ? $user->getVar($this->getVar('field_name') ) : $profile->getVar($this->getVar('field_name'));
+        $value = in_array($this->getVar('field_name'), $this->getPostVars()) ? $user->getVar($this->getVar('field_name')) : $profile->getVar($this->getVar('field_name'));
 
-        switch ($this->getVar('field_type')  ) {
+        switch ($this->getVar('field_type')) {
             default:
             case "textbox":
-                if ( $this->getVar('field_name') == 'url' && $value != '') {
-                     return '<a href="' . formatURL($value) . '" rel="external">' . $value . '</a>';
+                if ($this->getVar('field_name')=='url' && $value!='') {
+                     return '<a href="'.formatURL($value).'" rel="external">'.$value.'</a>';
                    } else {
                      return $value;
                 }
@@ -416,7 +416,7 @@ 
             case "radio":
                 $options = $this->getVar('field_options');
                 if (isset($options[$value])) {
-                    $value = htmlspecialchars( defined($options[$value]) ? constant($options[$value]) : $options[$value]);
+                    $value = htmlspecialchars(defined($options[$value]) ? constant($options[$value]) : $options[$value]);
                 } else {
                     $value = "";
                 }
@@ -427,10 +427,10 @@ 
             case "checkbox":
                 $options = $this->getVar('field_options');
                 $ret = array();
-                if (count($options) > 0) {
+                if (count($options)>0) {
                     foreach (array_keys($options) as $key) {
                         if (in_array($key, $value)) {
-                            $$ret[$key] = htmlspecialchars( defined($options[$key]) ? constant($options[$key]) : $options[$key]);
+                            $$ret[$key] = htmlspecialchars(defined($options[$key]) ? constant($options[$key]) : $options[$key]);
                         }
                     }
                 }
@@ -467,7 +467,7 @@ 
             case "autotext":
                 $value = $user->getVar($this->getVar('field_name'), 'n'); //autotext can have HTML in it
                 $value = str_replace("{X_UID}", $user->getVar("uid"), $value);
-                $value = str_replace("{X_URL}", XOOPS_URL, $value );
+                $value = str_replace("{X_URL}", XOOPS_URL, $value);
                 $value = str_replace("{X_UNAME}", $user->getVar("uname"), $value);
                 return $value;
                 break;
@@ -475,8 +475,8 @@ 
             case "rank":
                 $userrank = $user->rank();
                 $user_rankimage = "";
-                if (isset($userrank['image']) && $userrank['image'] != "") {
-                    $user_rankimage = '<img src="'.XOOPS_UPLOAD_URL . '/' . $userrank['image'] . '" alt="' . $userrank['title'] . '" /><br />';
+                if (isset($userrank['image']) && $userrank['image']!="") {
+                    $user_rankimage = '<img src="'.XOOPS_UPLOAD_URL.'/'.$userrank['image'].'" alt="'.$userrank['title'].'" /><br />';
                 }
                 return $user_rankimage.$userrank['title'];
                 break;
@@ -523,7 +523,7 @@ 
                 return $value;
 
             case "date":
-                if ($value != "") {
+                if ($value!="") {
                     return strtotime($value);
                 }
                 return $value;
@@ -531,7 +531,7 @@ 
 
             case "datetime":
                 if (!empty($value)) {
-                    return strtotime($value['date']) + intval($value['time']);
+                    return strtotime($value['date'])+intval($value['time']);
                 }
                 return $value;
                 break;
@@ -571,13 +571,13 @@ 
     function loadFields($force_update = false)
     {
         static $fields = array();
-        if (!empty($force_update) || count($fields) == 0) {
+        if (!empty($force_update) || count($fields)==0) {
             $criteria = new Criteria('field_id', 0, "!=");
             $criteria->setSort('field_weight');
             if ($this->getCount($criteria)==0)
             	return false;
             $field_objs = $this->getObjects($criteria);
-            foreach (array_keys($field_objs) as $i ) {
+            foreach (array_keys($field_objs) as $i) {
                 $fields[$field_objs[$i]->getVar('field_name')] = $field_objs[$i];
             }
         }
@@ -598,7 +598,7 @@ 
         $obj->setVar('field_name', str_replace(' ', '_', $obj->getVar('field_name')));
         $obj->cleanVars();
         $defaultstring = "";
-        switch ($obj->getVar('field_type')  ) {
+        switch ($obj->getVar('field_type')) {
             case "datetime":
             case "date":
                 $obj->setVar('field_valuetype', XOBJ_DTYPE_INT);
@@ -615,13 +615,13 @@ 
                 break;
 
             case "textbox":
-                if ($obj->getVar('field_valuetype') != XOBJ_DTYPE_INT) {
+                if ($obj->getVar('field_valuetype')!=XOBJ_DTYPE_INT) {
                     $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
                 }
                 break;
 
             case "autotext":
-                if ($obj->getVar('field_valuetype') != XOBJ_DTYPE_INT) {
+                if ($obj->getVar('field_valuetype')!=XOBJ_DTYPE_INT) {
                     $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTAREA);
                 }
                 break;
@@ -644,7 +644,7 @@ 
                 break;
         }
 
-        if ($obj->getVar('field_valuetype') == "") {
+        if ($obj->getVar('field_valuetype')=="") {
             $obj->setVar('field_valuetype', XOBJ_DTYPE_TXTBOX);
         }
 
@@ -654,9 +654,9 @@ 
                 $changetype = "ADD";
             } else {
                 //update column information
-                $changetype = "CHANGE `" . $obj->getVar('field_name', 'n') . "`";
+                $changetype = "CHANGE `".$obj->getVar('field_name', 'n')."`";
             }
-            $maxlengthstring = $obj->getVar('field_maxlength') > 0 ? "(" . $obj->getVar('field_maxlength') . ")" : "";
+            $maxlengthstring = $obj->getVar('field_maxlength')>0 ? "(".$obj->getVar('field_maxlength').")" : "";
             $notnullstring = " NOT NULL";
             //set type
             switch ($obj->getVar('field_valuetype')) {
@@ -679,30 +679,30 @@ 
                         $obj->setVar('field_maxlength', 255);
                     }
                     //if ( $obj->getVar('field_default')  ) {
-                        $defaultstring = " DEFAULT " . $this->db->quote($obj->cleanVars['field_default']);
+                        $defaultstring = " DEFAULT ".$this->db->quote($obj->cleanVars['field_default']);
                     //}
                     break;
 
                 case XOBJ_DTYPE_INT:
                     $type = "int";
-                    if ($obj->getVar('field_default') || $obj->getVar('field_default') !== '') {
-                        $defaultstring = " DEFAULT '" . intval($obj->cleanVars['field_default']) . "'";
+                    if ($obj->getVar('field_default') || $obj->getVar('field_default')!=='') {
+                        $defaultstring = " DEFAULT '".intval($obj->cleanVars['field_default'])."'";
                         $obj->setVar('field_default', intval($obj->cleanVars['field_default']));
                     }
                     break;
 
                 case XOBJ_DTYPE_DECIMAL:
                     $type = "decimal(14,6)";
-                    if ($obj->getVar('field_default') || $obj->getVar('field_default') !== '') {
-                        $defaultstring = " DEFAULT '" . doubleval($obj->cleanVars['field_default']) . "'";
+                    if ($obj->getVar('field_default') || $obj->getVar('field_default')!=='') {
+                        $defaultstring = " DEFAULT '".doubleval($obj->cleanVars['field_default'])."'";
                         $obj->setVar('field_default', doubleval($obj->cleanVars['field_default']));
                     }
                     break;
 
                 case XOBJ_DTYPE_FLOAT:
                     $type = "float(15,9)";
-                    if ($obj->getVar('field_default') || $obj->getVar('field_default') !== '') {
-                        $defaultstring = " DEFAULT '" . floatval($obj->cleanVars['field_default']) . "'";
+                    if ($obj->getVar('field_default') || $obj->getVar('field_default')!=='') {
+                        $defaultstring = " DEFAULT '".floatval($obj->cleanVars['field_default'])."'";
                         $obj->setVar('field_default', floatval($obj->cleanVars['field_default']));
                     }
                     break;
@@ -721,8 +721,8 @@ 
                     break;
             }
 
-            $sql = "ALTER TABLE `" . $objects_handler->table . "` " .
-            $changetype . " `" . $obj->cleanVars['field_name'] . "` " . $type . $maxlengthstring . $notnullstring . $defaultstring;
+            $sql = "ALTER TABLE `".$objects_handler->table."` ".
+            $changetype." `".$obj->cleanVars['field_name']."` ".$type.$maxlengthstring.$notnullstring.$defaultstring;
             if (!$this->db->query($sql)) {
                 return false;
             }
@@ -748,7 +748,7 @@ 
     {
         $objects_handler = xoops_getmodulehandler('extras', 'songlist');
         // remove column from table
-        $sql = "ALTER TABLE " . $objects_handler->table . " DROP `" . $obj->getVar('field_name', 'n') . "`";
+        $sql = "ALTER TABLE ".$objects_handler->table." DROP `".$obj->getVar('field_name', 'n')."`";
         if ($this->db->query($sql)) {
             //change this to update the cached field information storage
             if (!parent::delete($obj, $force)) {

Braces +3 added lines, -2 removed lines

@@ -574,8 +574,9 @@
         if (!empty($force_update) || count($fields) == 0) {
             $criteria = new Criteria('field_id', 0, "!=");
             $criteria->setSort('field_weight');
-            if ($this->getCount($criteria)==0)
-            	return false;
+            if ($this->getCount($criteria)==0) {
+                        	return false;
+            }
             $field_objs = $this->getObjects($criteria);
             foreach (array_keys($field_objs) as $i ) {
                 $fields[$field_objs[$i]->getVar('field_name')] = $field_objs[$i];

htdocs/modules/songlist/class/voice.php

Indentation +90 added lines, -90 removed lines

@@ -10,9 +10,9 @@ 
 class SonglistVoice extends XoopsObject
 {
 
-    function SonglistVoice($fid = null)
-    {
-        $this->initVar('vcid', XOBJ_DTYPE_INT, 0, false);
+	function SonglistVoice($fid = null)
+	{
+		$this->initVar('vcid', XOBJ_DTYPE_INT, 0, false);
 		$this->initVar('name', XOBJ_DTYPE_TXTBOX, null, false, 128);
 		$this->initVar('artists', XOBJ_DTYPE_INT, 0, false);
 		$this->initVar('albums', XOBJ_DTYPE_INT, 0, false);
@@ -46,13 +46,13 @@ 
 	}
 	
 	function getURL() {
-    	global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
-    	if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-    		return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('name'))).'/'.$op.'-'.$fct.'-'.$this->getVar('gid').'-'.urlencode($value).'-'.$gid.'-'.$vid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl'];
-    	} else {
-    		return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$this->getVar('gid').'&value='.urlencode($value).'&gid='.$gid.'&vid='.$vid.'&cid='.$cid;
-    	}
-    }
+		global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $this->getVar('name'))).'/'.$op.'-'.$fct.'-'.$this->getVar('gid').'-'.urlencode($value).'-'.$gid.'-'.$vid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl'];
+		} else {
+			return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$this->getVar('gid').'&value='.urlencode($value).'&gid='.$gid.'&vid='.$vid.'&cid='.$cid;
+		}
+	}
 	
 	
 	
@@ -61,76 +61,76 @@ 
 
 class SonglistVoiceHandler extends XoopsPersistableObjectHandler
 {
-    function __construct(&$db) 
-    {
-        parent::__construct($db, "songlist_voice", 'SonglistVoice', "vcid", "name");
-    }
+	function __construct(&$db) 
+	{
+		parent::__construct($db, "songlist_voice", 'SonglistVoice', "vcid", "name");
+	}
 
 	function filterFields() {
 		return array('vcid', 'name', 'artists', 'albums', 'songs', 'hits', 'rank', 'votes', 'created', 'updated');
 	}
 	
-    function getFilterCriteria($filter) {
-    	$parts = explode('|', $filter);
-    	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
-    		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
-    			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
+	function getFilterCriteria($filter) {
+		$parts = explode('|', $filter);
+		$criteria = new CriteriaCompo();
+		foreach($parts as $part) {
+			$var = explode(',', $part);
+			if (!empty($var[1])&&!is_numeric($var[0])) {
+				$object = $this->create();
+				if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
+				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
-    			$criteria->add(new Criteria($var[0], $var[1]));
-    		}
-    	}
-    	return $criteria;
-    }
+			} elseif (!empty($var[1])&&is_numeric($var[0])) {
+				$criteria->add(new Criteria($var[0], $var[1]));
+			}
+		}
+		return $criteria;
+	}
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
-    	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
-    }
+	function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+		$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
+		if (is_object($ele))
+			return $ele->render();
+		else 
+			return ' ';
+	}
     
 	function insert($obj, $force=true) {
-    	if ($obj->isNew()) {
-    		$obj->setVar('created', time());	
-    	} else {
-    		$obj->setVar('updated', time());
-    	}
-    	if (strlen($obj->getVar('name'))==0)
-    		return false;
-    	return parent::insert($obj, $force);
-    }
+		if ($obj->isNew()) {
+			$obj->setVar('created', time());	
+		} else {
+			$obj->setVar('updated', time());
+		}
+		if (strlen($obj->getVar('name'))==0)
+			return false;
+		return parent::insert($obj, $force);
+	}
      
 	var $_objects = array('object'=>array(), 'array'=>array());
     
-    function get($id, $fields = '*') {
-    	if (!isset($this->_objects['object'][$id])) {
-	    	$this->_objects['object'][$id] = parent::get($id, $fields);
-	    	if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
-		    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
-		    	$GLOBALS['xoopsDB']->queryF($sql);
-	    	}
-    	}
-    	return $this->_objects['object'][$id];
-    }
+	function get($id, $fields = '*') {
+		if (!isset($this->_objects['object'][$id])) {
+			$this->_objects['object'][$id] = parent::get($id, $fields);
+			if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
+				$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
+				$GLOBALS['xoopsDB']->queryF($sql);
+			}
+		}
+		return $this->_objects['object'][$id];
+	}
     
-    function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
-    	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	/*if (!isset($GLOBALS['songlistAdmin'])) {
+	function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
+		$ret = parent::getObjects($criteria, $id_as_key, $as_object);
+		/*if (!isset($GLOBALS['songlistAdmin'])) {
 	    	$id = array();
 	    	foreach($ret as $data) {
 	    		if ($as_object==true) {
@@ -150,35 +150,35 @@ 
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';
 	    	$GLOBALS['xoopsDB']->queryF($sql);
     	}*/
-    	return $ret;
-    }
+		return $ret;
+	}
 
-    function getURL() {
-    	global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
-    	if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-    		return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl'];
-    	} else {
-    		return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid.'&start='.$start;
-    	}
-    }
+	function getURL() {
+		global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl'];
+		} else {
+			return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&cid='.$cid.'&start='.$start;
+		}
+	}
     
 	function getTop($limit=1) {
-    	$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
-    	$results = $GLOBALS['xoopsDB']->queryF($sql);
-    	$ret = array();
-    	$i=0;
-    	while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
-    		$ret[$i] = $this->create();
-    		$ret[$i]->assignVars($row);
-    		$i++;
-    	}
-    	return $ret;
-    }
+		$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
+		$results = $GLOBALS['xoopsDB']->queryF($sql);
+		$ret = array();
+		$i=0;
+		while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
+			$ret[$i] = $this->create();
+			$ret[$i]->assignVars($row);
+			$i++;
+		}
+		return $ret;
+	}
     
 	function delete($object, $force=true) {
-    	parent::delete($object, $force);
-    	$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `vcid` = 0 WHERE `vcid` = ' . $object->getVar('vcid');
-    	return $GLOBALS['xoopsDB']->queryF($sql);	
-    }
+		parent::delete($object, $force);
+		$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `vcid` = 0 WHERE `vcid` = ' . $object->getVar('vcid');
+		return $GLOBALS['xoopsDB']->queryF($sql);	
+	}
 }
 ?>
\ No newline at end of file

Spacing +23 added lines, -23 removed lines

@@ -31,16 +31,16 @@ 
 	function toArray() {
 		$ret = parent::toArray();
 		$form = $this->getForm(true);
-		foreach($form as $key => $element) {
+		foreach ($form as $key => $element) {
 			$ret['form'][$key] = $form[$key]->render();	
 		}
-		foreach(array('created', 'updated') as $key) {
+		foreach (array('created', 'updated') as $key) {
 			if ($this->getVar($key)>0) {
 				$ret['form'][$key] = date(_DATESTRING, $this->getVar($key)); 
 				$ret[$key] = date(_DATESTRING, $this->getVar($key));
 			}
 		}
-		$ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN;
+		$ret['rank'] = number_format(($this->getVar('rank')>0 && $this->getVar('votes')>0 ? $this->getVar('rank')/$this->getVar('votes') : 0), 2)._MI_SONGLIST_OFTEN;
     		
 		return $ret;
 	}
@@ -73,30 +73,30 @@ 
     function getFilterCriteria($filter) {
     	$parts = explode('|', $filter);
     	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
+    	foreach ($parts as $part) {
     		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
+    		if (!empty($var[1]) && !is_numeric($var[0])) {
     			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+    			if ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2]) ? $var[2] : 'LIKE')));
+    			} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
     						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));			
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));    				
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2]) ? $var[2] : 'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
+    		} elseif (!empty($var[1]) && is_numeric($var[0])) {
     			$criteria->add(new Criteria($var[0], $var[1]));
     		}
     	}
     	return $criteria;
     }
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+    function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
     	if (is_object($ele))
     		return $ele->render();
@@ -104,7 +104,7 @@ 
     		return ' ';
     }
     
-	function insert($obj, $force=true) {
+	function insert($obj, $force = true) {
     	if ($obj->isNew()) {
     		$obj->setVar('created', time());	
     	} else {
@@ -120,7 +120,7 @@ 
     function get($id, $fields = '*') {
     	if (!isset($this->_objects['object'][$id])) {
 	    	$this->_objects['object'][$id] = parent::get($id, $fields);
-	    	if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
+	    	if (!isset($GLOBALS['songlistAdmin']) && is_object($this->_objects['object'][$id])) {
 		    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
 		    	$GLOBALS['xoopsDB']->queryF($sql);
 	    	}
@@ -162,11 +162,11 @@ 
     	}
     }
     
-	function getTop($limit=1) {
+	function getTop($limit = 1) {
     	$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
     	$results = $GLOBALS['xoopsDB']->queryF($sql);
     	$ret = array();
-    	$i=0;
+    	$i = 0;
     	while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
     		$ret[$i] = $this->create();
     		$ret[$i]->assignVars($row);
@@ -175,9 +175,9 @@ 
     	return $ret;
     }
     
-	function delete($object, $force=true) {
+	function delete($object, $force = true) {
     	parent::delete($object, $force);
-    	$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `vcid` = 0 WHERE `vcid` = ' . $object->getVar('vcid');
+    	$sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('songlist_songs').' SET `vcid` = 0 WHERE `vcid` = '.$object->getVar('vcid');
     	return $GLOBALS['xoopsDB']->queryF($sql);	
     }
 }

Braces +8 added lines, -6 removed lines

@@ -98,10 +98,11 @@ 
         
     function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
+    	if (is_object($ele)) {
+    	    		return $ele->render();
+    	} else {
+    	    		return ' ';
+    	}
     }
     
 	function insert($obj, $force=true) {
@@ -110,8 +111,9 @@ 
     	} else {
     		$obj->setVar('updated', time());
     	}
-    	if (strlen($obj->getVar('name'))==0)
-    		return false;
+    	if (strlen($obj->getVar('name'))==0) {
+    	    		return false;
+    	}
     	return parent::insert($obj, $force);
     }
      

htdocs/modules/songlist/class/requests.php

Indentation +100 added lines, -100 removed lines

@@ -10,10 +10,10 @@ 
 class SonglistRequests extends XoopsObject
 {
 
-    function SonglistRequests($fid = null)
-    {
-        $this->initVar('rid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('aid', XOBJ_DTYPE_INT, 0, false);
+	function SonglistRequests($fid = null)
+	{
+		$this->initVar('rid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('aid', XOBJ_DTYPE_INT, 0, false);
 		$this->initVar('artist', XOBJ_DTYPE_TXTBOX, null, false, 128);
 		$this->initVar('album', XOBJ_DTYPE_TXTBOX, null, false, 128);
 		$this->initVar('title', XOBJ_DTYPE_TXTBOX, null, false, 128);
@@ -52,75 +52,75 @@ 
 
 class SonglistRequestsHandler extends XoopsPersistableObjectHandler
 {
-    function __construct(&$db) 
-    {
-        parent::__construct($db, "songlist_requests", 'SonglistRequests', "rid", "name");
-    }
+	function __construct(&$db) 
+	{
+		parent::__construct($db, "songlist_requests", 'SonglistRequests', "rid", "name");
+	}
 
 	function filterFields() {
 		return array('rid', 'artist', 'album', 'title', 'lyrics', 'uid', 'name', 'email', 'songid', 'sid', 'created', 'updated');
 	}
 	
-    function getFilterCriteria($filter) {
-    	$parts = explode('|', $filter);
-    	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
-    		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
-    			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
+	function getFilterCriteria($filter) {
+		$parts = explode('|', $filter);
+		$criteria = new CriteriaCompo();
+		foreach($parts as $part) {
+			$var = explode(',', $part);
+			if (!empty($var[1])&&!is_numeric($var[0])) {
+				$object = $this->create();
+				if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
+				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
-    			$criteria->add(new Criteria($var[0], $var[1]));
-    		}
-    	}
-    	return $criteria;
-    }
+			} elseif (!empty($var[1])&&is_numeric($var[0])) {
+				$criteria->add(new Criteria($var[0], $var[1]));
+			}
+		}
+		return $criteria;
+	}
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
-    	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
-    }
+	function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+		$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
+		if (is_object($ele))
+			return $ele->render();
+		else 
+			return ' ';
+	}
     
 	function insert($obj, $force=true) {
-    	if ($obj->isNew()) {
-    		$obj->setVar('created', time());	
-    		$new = true;
-    		$sendmail = true;
-       	} else {
-    		$obj->setVar('updated', time());
-    		$new = false;
-    		if ($obj->vars['songid']['changed']==true) {
-    			$songs_handler = xoops_getmodulehandler('songs', 'songlist');
-    			$criteria = new Criteria('songid', $obj->getVar('songid'));
-    			$songs = $songs_handler->getObjects($criteria, false);
-    			if (is_object($songs[0])) {
-    				foreach($songs[0]->getVar('aids') as $aid)
-    					$ad[] = $aid;
-    				$obj->setVar('sid', $songs[0]->getVar('sid'));
-    				$obj->setVar('aid', $ad[0]);
-    				$sendmail = true;
-    			}
-    		}
-    	}
-    	if ($rid = parent::insert($obj, $force)) {
-    		if ($sendmail==true) {
-    			if ($new==true) {
-    				xoops_loadLanguage('email', 'songlist');
-    				$xoopsMailer =& getMailer();
+		if ($obj->isNew()) {
+			$obj->setVar('created', time());	
+			$new = true;
+			$sendmail = true;
+	   	} else {
+			$obj->setVar('updated', time());
+			$new = false;
+			if ($obj->vars['songid']['changed']==true) {
+				$songs_handler = xoops_getmodulehandler('songs', 'songlist');
+				$criteria = new Criteria('songid', $obj->getVar('songid'));
+				$songs = $songs_handler->getObjects($criteria, false);
+				if (is_object($songs[0])) {
+					foreach($songs[0]->getVar('aids') as $aid)
+						$ad[] = $aid;
+					$obj->setVar('sid', $songs[0]->getVar('sid'));
+					$obj->setVar('aid', $ad[0]);
+					$sendmail = true;
+				}
+			}
+		}
+		if ($rid = parent::insert($obj, $force)) {
+			if ($sendmail==true) {
+				if ($new==true) {
+					xoops_loadLanguage('email', 'songlist');
+					$xoopsMailer =& getMailer();
 					$xoopsMailer->setHTML(true);
 					$xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/'.$GLOBALS['xoopsConfig']['language'].'/mail_templates/'));
 					$xoopsMailer->setTemplate('songlist_request_created.html');
@@ -143,32 +143,32 @@ 
 					if(!$xoopsMailer->send() ){
 						xoops_error($xoopsMailer->getErrors(true), 'Email Send Error');
 					}
-    			} else {
-    				xoops_loadLanguage('email', 'songlist');
-    				$songs_handler = xoops_getmodulehandler('songs', 'songlist');
-    				$artists_handler = xoops_getmodulehandler('artists', 'songlist');
-    				$albums_handler = xoops_getmodulehandler('albums', 'songlist');
-    				$genre_handler = xoops_getmodulehandler('genre', 'songlist');
+				} else {
+					xoops_loadLanguage('email', 'songlist');
+					$songs_handler = xoops_getmodulehandler('songs', 'songlist');
+					$artists_handler = xoops_getmodulehandler('artists', 'songlist');
+					$albums_handler = xoops_getmodulehandler('albums', 'songlist');
+					$genre_handler = xoops_getmodulehandler('genre', 'songlist');
     				
-    				$song = $songs_handler->get($obj->getVar('sid'));
-    				if (is_object($song)) {
-    					$sng = $genre->getVar('title');
-    				}
-    				$album = $album_handler->get($song->getVar('abid'));
-    				if (is_object($album)) {
-    					$alb = $genre->getVar('title');
-    					$alb_img = $genre->getImage();
-    				}
-    				$genre = $genre_handler->get($song->getVar('abid'));
-    				if (is_object($genre)) {
-    					$gen = $genre->getVar('name');
-    				}
-    				$artists = $artists_handler->getObjects(new Criteria('aid', '('.implode(',', $song->getVar('aid')).')', 'IN'), false);
-    				$art = '';
-    				foreach($artists as $id => $artist) {
-    					$art .= $artist->getVar('name') . ($id<sizeof($artists)-1?', ':'');
-    				}
-    				$xoopsMailer =& getMailer();
+					$song = $songs_handler->get($obj->getVar('sid'));
+					if (is_object($song)) {
+						$sng = $genre->getVar('title');
+					}
+					$album = $album_handler->get($song->getVar('abid'));
+					if (is_object($album)) {
+						$alb = $genre->getVar('title');
+						$alb_img = $genre->getImage();
+					}
+					$genre = $genre_handler->get($song->getVar('abid'));
+					if (is_object($genre)) {
+						$gen = $genre->getVar('name');
+					}
+					$artists = $artists_handler->getObjects(new Criteria('aid', '('.implode(',', $song->getVar('aid')).')', 'IN'), false);
+					$art = '';
+					foreach($artists as $id => $artist) {
+						$art .= $artist->getVar('name') . ($id<sizeof($artists)-1?', ':'');
+					}
+					$xoopsMailer =& getMailer();
 					$xoopsMailer->setHTML(true);
 					$xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/'.$GLOBALS['xoopsConfig']['language'].'/mail_templates/'));
 					$xoopsMailer->setTemplate('songlist_request_updated.html');
@@ -196,19 +196,19 @@ 
 					if(!$xoopsMailer->send() ){
 						xoops_error($xoopsMailer->getErrors(true), 'Email Send Error');
 					}
-    			}		
-    		}
-    	}
-    	return $rid;
-    }
+				}		
+			}
+		}
+		return $rid;
+	}
     
-    function getURL() {
-    	global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
-    	if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-    		return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$op.'-'.$fct.$GLOBALS['songlistModuleConfig']['endofurl'];
-    	} else {
-    		return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct;
-    	}
-    }
+	function getURL() {
+		global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$op.'-'.$fct.$GLOBALS['songlistModuleConfig']['endofurl'];
+		} else {
+			return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct;
+		}
+	}
 }
 ?>
\ No newline at end of file

Spacing +25 added lines, -25 removed lines

@@ -35,10 +35,10 @@ 
 		$ret = parent::toArray();
 		$form = $this->getForm(true);
 		$form['songid'] = new XoopsFormText('', $this->getVar('rid').'[songid]', 11, 32);
-		foreach($form as $key => $element) {
+		foreach ($form as $key => $element) {
 			$ret['form'][$key] = $form[$key]->render();	
 		}
-		foreach(array('created', 'updated') as $key) {
+		foreach (array('created', 'updated') as $key) {
 			if ($this->getVar($key)>0) {
 				$ret['form'][$key] = date(_DATESTRING, $this->getVar($key)); 
 				$ret[$key] = date(_DATESTRING, $this->getVar($key));
@@ -64,30 +64,30 @@ 
     function getFilterCriteria($filter) {
     	$parts = explode('|', $filter);
     	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
+    	foreach ($parts as $part) {
     		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
+    		if (!empty($var[1]) && !is_numeric($var[0])) {
     			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+    			if ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2]) ? $var[2] : 'LIKE')));
+    			} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
     						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));			
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));    				
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2]) ? $var[2] : 'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
+    		} elseif (!empty($var[1]) && is_numeric($var[0])) {
     			$criteria->add(new Criteria($var[0], $var[1]));
     		}
     	}
     	return $criteria;
     }
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+    function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
     	if (is_object($ele))
     		return $ele->render();
@@ -95,7 +95,7 @@ 
     		return ' ';
     }
     
-	function insert($obj, $force=true) {
+	function insert($obj, $force = true) {
     	if ($obj->isNew()) {
     		$obj->setVar('created', time());	
     		$new = true;
@@ -108,7 +108,7 @@ 
     			$criteria = new Criteria('songid', $obj->getVar('songid'));
     			$songs = $songs_handler->getObjects($criteria, false);
     			if (is_object($songs[0])) {
-    				foreach($songs[0]->getVar('aids') as $aid)
+    				foreach ($songs[0]->getVar('aids') as $aid)
     					$ad[] = $aid;
     				$obj->setVar('sid', $songs[0]->getVar('sid'));
     				$obj->setVar('aid', $ad[0]);
@@ -120,13 +120,13 @@ 
     		if ($sendmail==true) {
     			if ($new==true) {
     				xoops_loadLanguage('email', 'songlist');
-    				$xoopsMailer =& getMailer();
+    				$xoopsMailer = & getMailer();
 					$xoopsMailer->setHTML(true);
 					$xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/'.$GLOBALS['xoopsConfig']['language'].'/mail_templates/'));
 					$xoopsMailer->setTemplate('songlist_request_created.html');
 					$xoopsMailer->setSubject(sprintf(_MN_SONGLIST_SUBJECT_REQUESTMADE, $rid));
 					
-					foreach(explode('|', $GLOBALS['songlistModuleConfig']['email']) as $email)
+					foreach (explode('|', $GLOBALS['songlistModuleConfig']['email']) as $email)
 						$xoopsMailer->setToEmails($email);
 					
 					$xoopsMailer->setToEmails($obj->getVar('email'));
@@ -140,7 +140,7 @@ 
 					$xoopsMailer->assign("EMAIL", $obj->getVar('email'));	
 					$xoopsMailer->assign("NAME", $obj->getVar('name'));
 					
-					if(!$xoopsMailer->send() ){
+					if (!$xoopsMailer->send()) {
 						xoops_error($xoopsMailer->getErrors(true), 'Email Send Error');
 					}
     			} else {
@@ -165,10 +165,10 @@ 
     				}
     				$artists = $artists_handler->getObjects(new Criteria('aid', '('.implode(',', $song->getVar('aid')).')', 'IN'), false);
     				$art = '';
-    				foreach($artists as $id => $artist) {
-    					$art .= $artist->getVar('name') . ($id<sizeof($artists)-1?', ':'');
+    				foreach ($artists as $id => $artist) {
+    					$art .= $artist->getVar('name').($id<sizeof($artists)-1 ? ', ' : '');
     				}
-    				$xoopsMailer =& getMailer();
+    				$xoopsMailer = & getMailer();
 					$xoopsMailer->setHTML(true);
 					$xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/'.$GLOBALS['xoopsConfig']['language'].'/mail_templates/'));
 					$xoopsMailer->setTemplate('songlist_request_updated.html');
@@ -193,7 +193,7 @@ 
 					$xoopsMailer->assign("EMAIL", $obj->getVar('email'));	
 					$xoopsMailer->assign("NAME", $obj->getVar('name'));
 					
-					if(!$xoopsMailer->send() ){
+					if (!$xoopsMailer->send()) {
 						xoops_error($xoopsMailer->getErrors(true), 'Email Send Error');
 					}
     			}		

Braces +11 added lines, -8 removed lines

@@ -89,10 +89,11 @@ 
         
     function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
+    	if (is_object($ele)) {
+    	    		return $ele->render();
+    	} else {
+    	    		return ' ';
+    	}
     }
     
 	function insert($obj, $force=true) {
@@ -108,8 +109,9 @@ 
     			$criteria = new Criteria('songid', $obj->getVar('songid'));
     			$songs = $songs_handler->getObjects($criteria, false);
     			if (is_object($songs[0])) {
-    				foreach($songs[0]->getVar('aids') as $aid)
-    					$ad[] = $aid;
+    				foreach($songs[0]->getVar('aids') as $aid) {
+    				    					$ad[] = $aid;
+    				}
     				$obj->setVar('sid', $songs[0]->getVar('sid'));
     				$obj->setVar('aid', $ad[0]);
     				$sendmail = true;
@@ -126,8 +128,9 @@ 
 					$xoopsMailer->setTemplate('songlist_request_created.html');
 					$xoopsMailer->setSubject(sprintf(_MN_SONGLIST_SUBJECT_REQUESTMADE, $rid));
 					
-					foreach(explode('|', $GLOBALS['songlistModuleConfig']['email']) as $email)
-						$xoopsMailer->setToEmails($email);
+					foreach(explode('|', $GLOBALS['songlistModuleConfig']['email']) as $email) {
+											$xoopsMailer->setToEmails($email);
+					}
 					
 					$xoopsMailer->setToEmails($obj->getVar('email'));
 					

htdocs/modules/songlist/class/artists.php

Indentation +174 added lines, -174 removed lines

@@ -10,11 +10,11 @@ 
 class SonglistArtists extends XoopsObject
 {
 
-    function SonglistArtists($fid = null)
-    {
-        $this->initVar('aid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('cids', XOBJ_DTYPE_ARRAY, array(), false);
-        $this->initVar('sids', XOBJ_DTYPE_ARRAY, array(), false);
+	function SonglistArtists($fid = null)
+	{
+		$this->initVar('aid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('cids', XOBJ_DTYPE_ARRAY, array(), false);
+		$this->initVar('sids', XOBJ_DTYPE_ARRAY, array(), false);
 		$this->initVar('name', XOBJ_DTYPE_TXTBOX, null, false, 128);
 		$this->initVar('albums', XOBJ_DTYPE_INT, 0, false);
 		$this->initVar('songs', XOBJ_DTYPE_INT, 0, false);
@@ -50,124 +50,124 @@ 
 			$ret['singer'] = constant($ret['singer']); 
 		
 		if ($extra==false)
-    		return $ret;
+			return $ret;
     		
 		if (count($this->getVar('cids'))!=0) {
-    		$categories_handler = xoops_getmodulehandler('category', 'songlist');
-    		foreach($this->getVar('cids') as $aid) {
-    			$category = $categories_handler->get($aid);
-    			if (is_object($category)) {
-    				$ret['categories_array'][$aid] = $category->toArray(false);
-    			}
-    		} 	
-    	}
+			$categories_handler = xoops_getmodulehandler('category', 'songlist');
+			foreach($this->getVar('cids') as $aid) {
+				$category = $categories_handler->get($aid);
+				if (is_object($category)) {
+					$ret['categories_array'][$aid] = $category->toArray(false);
+				}
+			} 	
+		}
     		
     	
 		if (count($this->getVar('aids'))!=0) {
-    		$artists_handler = xoops_getmodulehandler('artists', 'songlist');
-    		foreach($this->getVar('aids') as $aid) {
-    			$artist = $artists_handler->get($aid);
-    			if (is_object($artist)) {
-    				$ret['artists_array'][$aid] = $artist->toArray(false);
-    			}
-    		} 	
-    	}
+			$artists_handler = xoops_getmodulehandler('artists', 'songlist');
+			foreach($this->getVar('aids') as $aid) {
+				$artist = $artists_handler->get($aid);
+				if (is_object($artist)) {
+					$ret['artists_array'][$aid] = $artist->toArray(false);
+				}
+			} 	
+		}
     	
 		
 		if (count($this->getVar('sids'))!=0) {
-    		$songs_handler = xoops_getmodulehandler('songs', 'songlist');
-    		$criteria = new Criteria('`aids`', '%"'.$this->getVar('aid').'"%', 'LIKE');
-    		$criteria->setSort('`songid`');
-    		$criteria->setOrder('ASC');
-    		foreach($songs_handler->getObjects($criteria, true) as $sid => $song) {
-    			if (is_object($song)) {
-    				$ret['songs_array'][$sid] = $song->toArray(false);
-    			}
-    		} 	
-    	}
+			$songs_handler = xoops_getmodulehandler('songs', 'songlist');
+			$criteria = new Criteria('`aids`', '%"'.$this->getVar('aid').'"%', 'LIKE');
+			$criteria->setSort('`songid`');
+			$criteria->setOrder('ASC');
+			foreach($songs_handler->getObjects($criteria, true) as $sid => $song) {
+				if (is_object($song)) {
+					$ret['songs_array'][$sid] = $song->toArray(false);
+				}
+			} 	
+		}
     	
 		return $ret;
 	}
 	
-    function getURL() {
-    	global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
-    	if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-    	    if ($id!=0) {
-    			$artist_handler = xoops_getmodulehandler('artists', 'songlist');
-    			$artist = $artist_handler->get($id);
-    			if (is_object($artist)&&!$artist->isNew()) {
-    				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/artists/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('name'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    			} else {
-    				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/artists/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'-'.$vcid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    			}
-    		} else {
-    			return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/artists/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'-'.$vcid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    		}
-    	} else {
-    		return XOOPS_URL.'/modules/songlist/artists.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
-    	}
-    }
+	function getURL() {
+		global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			if ($id!=0) {
+				$artist_handler = xoops_getmodulehandler('artists', 'songlist');
+				$artist = $artist_handler->get($id);
+				if (is_object($artist)&&!$artist->isNew()) {
+					return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/artists/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('name'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+				} else {
+					return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/artists/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'-'.$vcid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+				}
+			} else {
+				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/artists/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'-'.$vcid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+			}
+		} else {
+			return XOOPS_URL.'/modules/songlist/artists.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
+		}
+	}
 		
 }
 
 
 class SonglistArtistsHandler extends XoopsPersistableObjectHandler
 {
-    function __construct(&$db) 
-    {
-        parent::__construct($db, "songlist_artists", 'SonglistArtists', "aid", "name");
-    }
+	function __construct(&$db) 
+	{
+		parent::__construct($db, "songlist_artists", 'SonglistArtists', "aid", "name");
+	}
 
 	function filterFields() {
 		return array('aid', 'cids', 'singer', 'name', 'albums', 'songs', 'hits', 'rank', 'votes', 'created', 'updated');
 	}
 	
-    function getFilterCriteria($filter) {
-    	$parts = explode('|', $filter);
-    	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
-    		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
-    			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
+	function getFilterCriteria($filter) {
+		$parts = explode('|', $filter);
+		$criteria = new CriteriaCompo();
+		foreach($parts as $part) {
+			$var = explode(',', $part);
+			if (!empty($var[1])&&!is_numeric($var[0])) {
+				$object = $this->create();
+				if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
+				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
-    			$criteria->add(new Criteria($var[0], $var[1]));
-    		}
-    	}
-    	return $criteria;
-    }
+			} elseif (!empty($var[1])&&is_numeric($var[0])) {
+				$criteria->add(new Criteria($var[0], $var[1]));
+			}
+		}
+		return $criteria;
+	}
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
-    	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
-    }
+	function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+		$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
+		if (is_object($ele))
+			return $ele->render();
+		else 
+			return ' ';
+	}
     
 	function insert($obj, $force=true, $object = null) {
-    	if ($obj->isNew()) {
-    		$new = true;
-    		$old = $this->create();
-    		$obj->setVar('created', time());	
-    	} else {
-    		$new = false;
-    		$old = $this->get($obj->getVar('aid'));
-    		$obj->setVar('updated', time());
-    	}
+		if ($obj->isNew()) {
+			$new = true;
+			$old = $this->create();
+			$obj->setVar('created', time());	
+		} else {
+			$new = false;
+			$old = $this->get($obj->getVar('aid'));
+			$obj->setVar('updated', time());
+		}
 		
-    	$albums_handler = xoops_getmodulehandler('albums', 'songlist');
+		$albums_handler = xoops_getmodulehandler('albums', 'songlist');
 		$songs_handler = xoops_getmodulehandler('songs', 'songlist');
 		$genre_handler = xoops_getmodulehandler('genre', 'songlist');
 		$voice_handler = xoops_getmodulehandler('voice', 'songlist');		
@@ -180,8 +180,8 @@ 
 						$obj->setVar('cids', array_merge($obj->getVar('cids'), array($object->getVar('cid')=>$object->getVar('cid'))));
 						$category = $category_handler->get($cid);
 						if (is_object($category)) {
-			    			$category->setVar('artists', $category->getVar('artists')+1);
-			    			$category_handler->insert($category, true, $obj);
+							$category->setVar('artists', $category->getVar('artists')+1);
+							$category_handler->insert($category, true, $obj);
 						}	
 					}
 				}
@@ -190,61 +190,61 @@ 
 						if (!in_array($cid, $obj->vars['cids']['value'])&&$cid!=0) {
 							$category = $category_handler->get($cid);
 							if (is_object($category)) {
-				    			$category->setVar('artists', $category->getVar('artists')-1);
-				    			$category_handler->insert($category, true, $obj);
+								$category->setVar('artists', $category->getVar('artists')-1);
+								$category_handler->insert($category, true, $obj);
 							}	
 						}
 					}
 				}
 			}
 		    	
-	    	if ($object->vars['abid']['value']!=0&&$object->vars['aids']['changed']==true) {
-    			$album = $albums_handler->get($object->vars['abid']['value']);
-    			if (is_object($album)) {
-    				$album->setVar('artists', $album->getVar('artists')+1);
-    				$albums_handler->insert($album, true, $obj);
-    			}
-	       	}
+			if ($object->vars['abid']['value']!=0&&$object->vars['aids']['changed']==true) {
+				$album = $albums_handler->get($object->vars['abid']['value']);
+				if (is_object($album)) {
+					$album->setVar('artists', $album->getVar('artists')+1);
+					$albums_handler->insert($album, true, $obj);
+				}
+		   	}
 	    	
 			if ($object->vars['gid']['value']!=0&&$object->vars['gid']['changed']==true) {
-    			$genre = $genre_handler->get($object->vars['gid']['value']);
-    			if (is_object($genre)) {
-	    			$genre->setVar('artists', $genre->getVar('artists')+1);
-	    			$genre_handler->insert($genre, true, $obj);
-    			}
-	       	}
+				$genre = $genre_handler->get($object->vars['gid']['value']);
+				if (is_object($genre)) {
+					$genre->setVar('artists', $genre->getVar('artists')+1);
+					$genre_handler->insert($genre, true, $obj);
+				}
+		   	}
 			if ($object->vars['vid']['value']!=0&&$object->vars['vid']['changed']==true) {
-    			$voice = $voice_handler->get($object->vars['vid']['value']);
-    			if (is_object($voice)) {
-	    			$voice->setVar('artists', $voice->getVar('artists')+1);
-	    			$voice_handler->insert($voice, true, $obj);
-    			}
-	       	}
+				$voice = $voice_handler->get($object->vars['vid']['value']);
+				if (is_object($voice)) {
+					$voice->setVar('artists', $voice->getVar('artists')+1);
+					$voice_handler->insert($voice, true, $obj);
+				}
+		   	}
 			
 		}
     	
 		if (strlen($obj->getVar('name'))==0)
-    		return false;
+			return false;
     		
-    	return parent::insert($obj, $force);
-    }
+		return parent::insert($obj, $force);
+	}
      
 	var $_objects = array('object'=>array(), 'array'=>array());
     
-    function get($id, $fields = '*') {
-    	if (!isset($this->_objects['object'][$id])) {
-	    	$this->_objects['object'][$id] = parent::get($id, $fields);
-	    	if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
-		    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
-		    	$GLOBALS['xoopsDB']->queryF($sql);
-	    	}
-    	}
-    	return $this->_objects['object'][$id];
-    }
+	function get($id, $fields = '*') {
+		if (!isset($this->_objects['object'][$id])) {
+			$this->_objects['object'][$id] = parent::get($id, $fields);
+			if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
+				$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
+				$GLOBALS['xoopsDB']->queryF($sql);
+			}
+		}
+		return $this->_objects['object'][$id];
+	}
     
-    function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
-    	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	/*if (!isset($GLOBALS['songlistAdmin'])) {
+	function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
+		$ret = parent::getObjects($criteria, $id_as_key, $as_object);
+		/*if (!isset($GLOBALS['songlistAdmin'])) {
 	    	$id = array();
 	    	foreach($ret as $data) {
 	    		if ($as_object==true) {
@@ -264,52 +264,52 @@ 
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';
 	    	$GLOBALS['xoopsDB']->queryF($sql);
     	}*/
-    	return $ret;
-    }
+		return $ret;
+	}
     
-    function getURL() {
-    	global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
-    	if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-    	    if ($cid!=0) {
-    			$artist_handler = xoops_getmodulehandler('artists', 'songlist');
-    			$artist = $artist_handler->get($cid);
-    			if (is_object($artist)&&!$artist->isNew()) {
-    				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('name'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    			} else {
-    				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    			}
-    		} else {
-    			return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
-    		}
-    	} else {
-    		return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
-    	}
-    }
+	function getURL() {
+		global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			if ($cid!=0) {
+				$artist_handler = xoops_getmodulehandler('artists', 'songlist');
+				$artist = $artist_handler->get($cid);
+				if (is_object($artist)&&!$artist->isNew()) {
+					return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('name'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+				} else {
+					return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+				}
+			} else {
+				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
+			}
+		} else {
+			return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.urlencode($value).'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
+		}
+	}
     
     
-    function getSIDs($criteria = NULL) {
-    	$ret = array();
-    	$song_handler = xoops_getmodulehandler('songs', 'songlist');
-    	foreach($this->getObjects($criteria, true) as $aid => $object) {
-    		$crita = new Criteria('`aids`', '%"'.$aid.'"%', 'LIKE');
-    		foreach($song_handler->getObjects($crita, true) as $sid => $song) {
-    			$ret[$sid] = $sid;
-    		}
-    	}
-    	return $ret;
-    }
+	function getSIDs($criteria = NULL) {
+		$ret = array();
+		$song_handler = xoops_getmodulehandler('songs', 'songlist');
+		foreach($this->getObjects($criteria, true) as $aid => $object) {
+			$crita = new Criteria('`aids`', '%"'.$aid.'"%', 'LIKE');
+			foreach($song_handler->getObjects($crita, true) as $sid => $song) {
+				$ret[$sid] = $sid;
+			}
+		}
+		return $ret;
+	}
     
 	function getTop($limit=1) {
-    	$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
-    	$results = $GLOBALS['xoopsDB']->queryF($sql);
-    	$ret = array();
-    	$i=0;
-    	while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
-    		$ret[$i] = $this->create();
-    		$ret[$i]->assignVars($row);
-    		$i++;
-    	}
-    	return $ret;
-    }
+		$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
+		$results = $GLOBALS['xoopsDB']->queryF($sql);
+		$ret = array();
+		$i=0;
+		while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
+			$ret[$i] = $this->create();
+			$ret[$i]->assignVars($row);
+			$i++;
+		}
+		return $ret;
+	}
 }
 ?>
\ No newline at end of file

Spacing +35 added lines, -35 removed lines

@@ -32,17 +32,17 @@ 
 	function toArray($extra = false) {
 		$ret = parent::toArray();
 		$form = $this->getForm(true);
-		foreach($form as $key => $element) {
+		foreach ($form as $key => $element) {
 			$ret['form'][$key] = $form[$key]->render();	
 		}
-		foreach(array('created', 'updated') as $key) {
+		foreach (array('created', 'updated') as $key) {
 			if ($this->getVar($key)>0) {
 				$ret['form'][$key] = date(_DATESTRING, $this->getVar($key)); 
 				$ret[$key] = date(_DATESTRING, $this->getVar($key));
 			}
 		}
 
-		$ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN;
+		$ret['rank'] = number_format(($this->getVar('rank')>0 && $this->getVar('votes')>0 ? $this->getVar('rank')/$this->getVar('votes') : 0), 2)._MI_SONGLIST_OFTEN;
 		$ret['url'] = $this->getURL(true);
 		
 		xoops_loadLanguage('enum', 'songlist');
@@ -54,7 +54,7 @@ 
     		
 		if (count($this->getVar('cids'))!=0) {
     		$categories_handler = xoops_getmodulehandler('category', 'songlist');
-    		foreach($this->getVar('cids') as $aid) {
+    		foreach ($this->getVar('cids') as $aid) {
     			$category = $categories_handler->get($aid);
     			if (is_object($category)) {
     				$ret['categories_array'][$aid] = $category->toArray(false);
@@ -65,7 +65,7 @@ 
     	
 		if (count($this->getVar('aids'))!=0) {
     		$artists_handler = xoops_getmodulehandler('artists', 'songlist');
-    		foreach($this->getVar('aids') as $aid) {
+    		foreach ($this->getVar('aids') as $aid) {
     			$artist = $artists_handler->get($aid);
     			if (is_object($artist)) {
     				$ret['artists_array'][$aid] = $artist->toArray(false);
@@ -79,7 +79,7 @@ 
     		$criteria = new Criteria('`aids`', '%"'.$this->getVar('aid').'"%', 'LIKE');
     		$criteria->setSort('`songid`');
     		$criteria->setOrder('ASC');
-    		foreach($songs_handler->getObjects($criteria, true) as $sid => $song) {
+    		foreach ($songs_handler->getObjects($criteria, true) as $sid => $song) {
     			if (is_object($song)) {
     				$ret['songs_array'][$sid] = $song->toArray(false);
     			}
@@ -95,7 +95,7 @@ 
     	    if ($id!=0) {
     			$artist_handler = xoops_getmodulehandler('artists', 'songlist');
     			$artist = $artist_handler->get($id);
-    			if (is_object($artist)&&!$artist->isNew()) {
+    			if (is_object($artist) && !$artist->isNew()) {
     				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/artists/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('name'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
     			} else {
     				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/artists/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'-'.$vcid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
@@ -125,30 +125,30 @@ 
     function getFilterCriteria($filter) {
     	$parts = explode('|', $filter);
     	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
+    	foreach ($parts as $part) {
     		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
+    		if (!empty($var[1]) && !is_numeric($var[0])) {
     			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+    			if ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2]) ? $var[2] : 'LIKE')));
+    			} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
     						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));			
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));    				
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2]) ? $var[2] : 'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
+    		} elseif (!empty($var[1]) && is_numeric($var[0])) {
     			$criteria->add(new Criteria($var[0], $var[1]));
     		}
     	}
     	return $criteria;
     }
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+    function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
     	if (is_object($ele))
     		return $ele->render();
@@ -156,7 +156,7 @@ 
     		return ' ';
     }
     
-	function insert($obj, $force=true, $object = null) {
+	function insert($obj, $force = true, $object = null) {
     	if ($obj->isNew()) {
     		$new = true;
     		$old = $this->create();
@@ -175,8 +175,8 @@ 
    	
 		if (is_a($object, 'SonglistSongs')) {
 			if ($object->vars['cid']['changed']==true) {
-				foreach($obj->vars['cids']['value'] as $cid) {
-					if (!in_array($cid, $object->getVar('cid'))&&$cid!=0) {
+				foreach ($obj->vars['cids']['value'] as $cid) {
+					if (!in_array($cid, $object->getVar('cid')) && $cid!=0) {
 						$obj->setVar('cids', array_merge($obj->getVar('cids'), array($object->getVar('cid')=>$object->getVar('cid'))));
 						$category = $category_handler->get($cid);
 						if (is_object($category)) {
@@ -186,8 +186,8 @@ 
 					}
 				}
 				if (!$old->isNew()) {
-					foreach($old->getVar('cids') as $cid) {
-						if (!in_array($cid, $obj->vars['cids']['value'])&&$cid!=0) {
+					foreach ($old->getVar('cids') as $cid) {
+						if (!in_array($cid, $obj->vars['cids']['value']) && $cid!=0) {
 							$category = $category_handler->get($cid);
 							if (is_object($category)) {
 				    			$category->setVar('artists', $category->getVar('artists')-1);
@@ -198,7 +198,7 @@ 
 				}
 			}
 		    	
-	    	if ($object->vars['abid']['value']!=0&&$object->vars['aids']['changed']==true) {
+	    	if ($object->vars['abid']['value']!=0 && $object->vars['aids']['changed']==true) {
     			$album = $albums_handler->get($object->vars['abid']['value']);
     			if (is_object($album)) {
     				$album->setVar('artists', $album->getVar('artists')+1);
@@ -206,14 +206,14 @@ 
     			}
 	       	}
 	    	
-			if ($object->vars['gid']['value']!=0&&$object->vars['gid']['changed']==true) {
+			if ($object->vars['gid']['value']!=0 && $object->vars['gid']['changed']==true) {
     			$genre = $genre_handler->get($object->vars['gid']['value']);
     			if (is_object($genre)) {
 	    			$genre->setVar('artists', $genre->getVar('artists')+1);
 	    			$genre_handler->insert($genre, true, $obj);
     			}
 	       	}
-			if ($object->vars['vid']['value']!=0&&$object->vars['vid']['changed']==true) {
+			if ($object->vars['vid']['value']!=0 && $object->vars['vid']['changed']==true) {
     			$voice = $voice_handler->get($object->vars['vid']['value']);
     			if (is_object($voice)) {
 	    			$voice->setVar('artists', $voice->getVar('artists')+1);
@@ -234,7 +234,7 @@ 
     function get($id, $fields = '*') {
     	if (!isset($this->_objects['object'][$id])) {
 	    	$this->_objects['object'][$id] = parent::get($id, $fields);
-	    	if (!isset($GLOBALS['songlistAdmin'])&&is_object($this->_objects['object'][$id])) {
+	    	if (!isset($GLOBALS['songlistAdmin']) && is_object($this->_objects['object'][$id])) {
 		    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
 		    	$GLOBALS['xoopsDB']->queryF($sql);
 	    	}
@@ -273,7 +273,7 @@ 
     	    if ($cid!=0) {
     			$artist_handler = xoops_getmodulehandler('artists', 'songlist');
     			$artist = $artist_handler->get($cid);
-    			if (is_object($artist)&&!$artist->isNew()) {
+    			if (is_object($artist) && !$artist->isNew()) {
     				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.urlencode(str_replace(array(' ', chr(9)), '-', $artist->getVar('name'))).'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
     			} else {
     				return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
@@ -290,20 +290,20 @@ 
     function getSIDs($criteria = NULL) {
     	$ret = array();
     	$song_handler = xoops_getmodulehandler('songs', 'songlist');
-    	foreach($this->getObjects($criteria, true) as $aid => $object) {
+    	foreach ($this->getObjects($criteria, true) as $aid => $object) {
     		$crita = new Criteria('`aids`', '%"'.$aid.'"%', 'LIKE');
-    		foreach($song_handler->getObjects($crita, true) as $sid => $song) {
+    		foreach ($song_handler->getObjects($crita, true) as $sid => $song) {
     			$ret[$sid] = $sid;
     		}
     	}
     	return $ret;
     }
     
-	function getTop($limit=1) {
+	function getTop($limit = 1) {
     	$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
     	$results = $GLOBALS['xoopsDB']->queryF($sql);
     	$ret = array();
-    	$i=0;
+    	$i = 0;
     	while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
     		$ret[$i] = $this->create();
     		$ret[$i]->assignVars($row);

Braces +14 added lines, -10 removed lines

@@ -46,11 +46,13 @@ 
 		$ret['url'] = $this->getURL(true);
 		
 		xoops_loadLanguage('enum', 'songlist');
-		if (!empty($ret['singer']))
-			$ret['singer'] = constant($ret['singer']); 
+		if (!empty($ret['singer'])) {
+					$ret['singer'] = constant($ret['singer']);
+		}
 		
-		if ($extra==false)
-    		return $ret;
+		if ($extra==false) {
+		    		return $ret;
+		}
     		
 		if (count($this->getVar('cids'))!=0) {
     		$categories_handler = xoops_getmodulehandler('category', 'songlist');
@@ -150,10 +152,11 @@ 
         
     function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
+    	if (is_object($ele)) {
+    	    		return $ele->render();
+    	} else {
+    	    		return ' ';
+    	}
     }
     
 	function insert($obj, $force=true, $object = null) {
@@ -223,8 +226,9 @@ 
 			
 		}
     	
-		if (strlen($obj->getVar('name'))==0)
-    		return false;
+		if (strlen($obj->getVar('name'))==0) {
+		    		return false;
+		}
     		
     	return parent::insert($obj, $force);
     }

htdocs/modules/songlist/class/category.php

Indentation +86 added lines, -86 removed lines

@@ -7,10 +7,10 @@ 
 class SonglistCategory extends XoopsObject
 {
 
-    function SonglistCategory($fid = null)
-    {
-        $this->initVar('cid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('pid', XOBJ_DTYPE_INT, 0, false);
+	function SonglistCategory($fid = null)
+	{
+		$this->initVar('cid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('pid', XOBJ_DTYPE_INT, 0, false);
 		$this->initVar('weight', XOBJ_DTYPE_INT, 1, false);
 		$this->initVar('name', XOBJ_DTYPE_TXTBOX, null, false, 128);
 		$this->initVar('description', XOBJ_DTYPE_OTHER, null, false);
@@ -44,7 +44,7 @@ 
 		}
 		$ret['picture'] = $this->getImage('image', false);
 		$ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN;
-    	$ret['url'] = $this->getURL();
+		$ret['url'] = $this->getURL();
 		$category_handler = xoops_getmodulehandler('category', 'songlist');
 		if ($category_handler->getCount(new Criteria('pid', $this->getVar('cid')))) {
 			foreach($category_handler->getObjects(new Criteria('pid', $this->getVar('cid')), true) as $cid => $cat) {
@@ -60,15 +60,15 @@ 
 		if (!file_exists($GLOBALS['xoops']->path($this->getVar('path').$this->getVar($field))))
 			return false;
 		if ($local==false)
-    		return XOOPS_URL.'/'.str_replace(DS, '/', $this->getVar('path')).$this->getVar($field);
-    	else 
-    		return XOOPS_ROOT_PATH.DS.$this->getVar('path').$this->getVar($field);
-    }
+			return XOOPS_URL.'/'.str_replace(DS, '/', $this->getVar('path')).$this->getVar($field);
+		else 
+			return XOOPS_ROOT_PATH.DS.$this->getVar('path').$this->getVar($field);
+	}
     
-    function getURL() {
-    	global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
+	function getURL() {
+		global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
    		return XOOPS_URL.'/modules/songlist/'.$file.'.php?op=category&fct=set&id='.$this->getVar('cid').'&value='.urlencode($file).'&gid='.$gid.'&cid='.$cid;
-    }
+	}
     
 }
 
@@ -76,48 +76,48 @@ 
 class SonglistCategoryHandler extends XoopsPersistableObjectHandler
 {
 	
-    function __construct(&$db) 
-    {
-        parent::__construct($db, "songlist_category", 'SonglistCategory', "cid", "name");
-    }
+	function __construct(&$db) 
+	{
+		parent::__construct($db, "songlist_category", 'SonglistCategory', "cid", "name");
+	}
 
 	function filterFields() {
 		return array('cid', 'pid', 'weight', 'name', 'image', 'path', 'artists', 'albums', 'songs', 'hits', 'rank', 'votes', 'created', 'updated');
 	}
 	
-    function getFilterCriteria($filter) {
-    	$parts = explode('|', $filter);
-    	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
-    		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
-    			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
+	function getFilterCriteria($filter) {
+		$parts = explode('|', $filter);
+		$criteria = new CriteriaCompo();
+		foreach($parts as $part) {
+			$var = explode(',', $part);
+			if (!empty($var[1])&&!is_numeric($var[0])) {
+				$object = $this->create();
+				if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
+				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
-    			$criteria->add(new Criteria($var[0], $var[1]));
-    		}
-    	}
-    	return $criteria;
-    }
+			} elseif (!empty($var[1])&&is_numeric($var[0])) {
+				$criteria->add(new Criteria($var[0], $var[1]));
+			}
+		}
+		return $criteria;
+	}
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
-    	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
-    }
+	function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+		$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
+		if (is_object($ele))
+			return $ele->render();
+		else 
+			return ' ';
+	}
     
 	function GetCatAndSubCat($pid=0){
 		$categories = $this->getObjects(new Criteria('pid', $pid), true);
@@ -136,38 +136,38 @@ 
 	}
 	
 	function insert($obj, $force=true) {
-    	if ($obj->isNew()) {
-    		$obj->setVar('created', time());	
-    	} else {
-    		$obj->setVar('updated', time());
-    	}
-    	if (strlen($obj->getVar('name'))==0)
-    		return false;
-    	return parent::insert($obj, $force);
-    }
+		if ($obj->isNew()) {
+			$obj->setVar('created', time());	
+		} else {
+			$obj->setVar('updated', time());
+		}
+		if (strlen($obj->getVar('name'))==0)
+			return false;
+		return parent::insert($obj, $force);
+	}
 
-    var $_objects = array('object'=>array(), 'array'=>array());
+	var $_objects = array('object'=>array(), 'array'=>array());
     
-    function get($id, $fields = '*') {
-    	if (!isset($this->_objects['object'][$id])) {
-	    	$this->_objects['object'][$id] = parent::get($id, $fields);
-	    	if (!isset($GLOBALS['songlistAdmin'])) {
-		    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$id;
-		    	$GLOBALS['xoopsDB']->queryF($sql);
-	    	}
-    	}
-    	return $this->_objects['object'][$id];
-    }
+	function get($id, $fields = '*') {
+		if (!isset($this->_objects['object'][$id])) {
+			$this->_objects['object'][$id] = parent::get($id, $fields);
+			if (!isset($GLOBALS['songlistAdmin'])) {
+				$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$id;
+				$GLOBALS['xoopsDB']->queryF($sql);
+			}
+		}
+		return $this->_objects['object'][$id];
+	}
     
-    function delete($object, $force=true) {
-    	parent::delete($object, $force);
-    	$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `cid` = 0 WHERE `cid` = ' . $object->getVar('cid');
-    	return $GLOBALS['xoopsDB']->queryF($sql);	
-    }
+	function delete($object, $force=true) {
+		parent::delete($object, $force);
+		$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `cid` = 0 WHERE `cid` = ' . $object->getVar('cid');
+		return $GLOBALS['xoopsDB']->queryF($sql);	
+	}
     
-    function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
-    	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	/*if (!isset($GLOBALS['songlistAdmin'])) {
+	function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
+		$ret = parent::getObjects($criteria, $id_as_key, $as_object);
+		/*if (!isset($GLOBALS['songlistAdmin'])) {
 	    	$id = array();
 	    	foreach($ret as $data) {
 	    		if ($as_object==true) {
@@ -187,20 +187,20 @@ 
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';
 	    	$GLOBALS['xoopsDB']->queryF($sql);
     	}*/
-    	return $ret;
-    }
+		return $ret;
+	}
     
 	function getTop($limit=1) {
-    	$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
-    	$results = $GLOBALS['xoopsDB']->queryF($sql);
-    	$ret = array();
-    	$i=0;
-    	while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
-    		$ret[$i] = $this->create();
-    		$ret[$i]->assignVars($row);
-    		$i++;
-    	}
-    	return $ret;
-    }
+		$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
+		$results = $GLOBALS['xoopsDB']->queryF($sql);
+		$ret = array();
+		$i=0;
+		while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
+			$ret[$i] = $this->create();
+			$ret[$i]->assignVars($row);
+			$i++;
+		}
+		return $ret;
+	}
 }
 ?>
\ No newline at end of file

Spacing +26 added lines, -26 removed lines

@@ -33,21 +33,21 @@ 
 	function toArray() {
 		$ret = parent::toArray();
 		$form = $this->getForm(true);
-		foreach($form as $key => $element) {
+		foreach ($form as $key => $element) {
 			$ret['form'][$key] = $form[$key]->render();	
 		}
-		foreach(array('created', 'updated') as $key) {
+		foreach (array('created', 'updated') as $key) {
 			if ($this->getVar($key)>0) {
 				$ret['form'][$key] = date(_DATESTRING, $this->getVar($key)); 
 				$ret[$key] = date(_DATESTRING, $this->getVar($key));
 			}
 		}
 		$ret['picture'] = $this->getImage('image', false);
-		$ret['rank'] = number_format(($this->getVar('rank')>0&&$this->getVar('votes')>0?$this->getVar('rank')/$this->getVar('votes'):0),2)._MI_SONGLIST_OFTEN;
+		$ret['rank'] = number_format(($this->getVar('rank')>0 && $this->getVar('votes')>0 ? $this->getVar('rank')/$this->getVar('votes') : 0), 2)._MI_SONGLIST_OFTEN;
     	$ret['url'] = $this->getURL();
 		$category_handler = xoops_getmodulehandler('category', 'songlist');
 		if ($category_handler->getCount(new Criteria('pid', $this->getVar('cid')))) {
-			foreach($category_handler->getObjects(new Criteria('pid', $this->getVar('cid')), true) as $cid => $cat) {
+			foreach ($category_handler->getObjects(new Criteria('pid', $this->getVar('cid')), true) as $cid => $cat) {
 				$ret['subcategories'][$cid] = $cat->toArray();
 			}
 		}
@@ -88,30 +88,30 @@ 
     function getFilterCriteria($filter) {
     	$parts = explode('|', $filter);
     	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
+    	foreach ($parts as $part) {
     		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
+    		if (!empty($var[1]) && !is_numeric($var[0])) {
     			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+    			if ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2]) ? $var[2] : 'LIKE')));
+    			} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
     						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));			
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));    				
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2]) ? $var[2] : 'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
+    		} elseif (!empty($var[1]) && is_numeric($var[0])) {
     			$criteria->add(new Criteria($var[0], $var[1]));
     		}
     	}
     	return $criteria;
     }
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+    function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
     	if (is_object($ele))
     		return $ele->render();
@@ -119,23 +119,23 @@ 
     		return ' ';
     }
     
-	function GetCatAndSubCat($pid=0){
+	function GetCatAndSubCat($pid = 0) {
 		$categories = $this->getObjects(new Criteria('pid', $pid), true);
 		$langs_array = $this->TreeIDs(array(), $categories, -1);
 		return $langs_array;
 	}
 	
 	private function TreeIDs($langs_array, $categories, $level) {
-		foreach($categories as $catid => $category) {
+		foreach ($categories as $catid => $category) {
 			$langs_array[$catid] = $catid;
-			if ($categoriesb = $this->getObjects(new Criteria('pid', $catid), true)){
+			if ($categoriesb = $this->getObjects(new Criteria('pid', $catid), true)) {
 				$langs_array = $this->TreeIDs($langs_array, $categoriesb, $level);
 			}
 		}
 		return ($langs_array);
 	}
 	
-	function insert($obj, $force=true) {
+	function insert($obj, $force = true) {
     	if ($obj->isNew()) {
     		$obj->setVar('created', time());	
     	} else {
@@ -159,9 +159,9 @@ 
     	return $this->_objects['object'][$id];
     }
     
-    function delete($object, $force=true) {
+    function delete($object, $force = true) {
     	parent::delete($object, $force);
-    	$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `cid` = 0 WHERE `cid` = ' . $object->getVar('cid');
+    	$sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('songlist_songs').' SET `cid` = 0 WHERE `cid` = '.$object->getVar('cid');
     	return $GLOBALS['xoopsDB']->queryF($sql);	
     }
     
@@ -190,11 +190,11 @@ 
     	return $ret;
     }
     
-	function getTop($limit=1) {
+	function getTop($limit = 1) {
     	$sql = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
     	$results = $GLOBALS['xoopsDB']->queryF($sql);
     	$ret = array();
-    	$i=0;
+    	$i = 0;
     	while ($row = $GLOBALS['xoopsDB']->fetchArray($results)) {
     		$ret[$i] = $this->create();
     		$ret[$i]->assignVars($row);

Braces +19 added lines, -14 removed lines

@@ -55,14 +55,17 @@ 
 	}
     
 	function getImage($field = 'image', $local = false) {
-		if (strlen($this->getVar($field))==0)
-			return false;
-		if (!file_exists($GLOBALS['xoops']->path($this->getVar('path').$this->getVar($field))))
-			return false;
-		if ($local==false)
-    		return XOOPS_URL.'/'.str_replace(DS, '/', $this->getVar('path')).$this->getVar($field);
-    	else 
-    		return XOOPS_ROOT_PATH.DS.$this->getVar('path').$this->getVar($field);
+		if (strlen($this->getVar($field))==0) {
+					return false;
+		}
+		if (!file_exists($GLOBALS['xoops']->path($this->getVar('path').$this->getVar($field)))) {
+					return false;
+		}
+		if ($local==false) {
+		    		return XOOPS_URL.'/'.str_replace(DS, '/', $this->getVar('path')).$this->getVar($field);
+		} else {
+    	    		return XOOPS_ROOT_PATH.DS.$this->getVar('path').$this->getVar($field);
+    	}
     }
     
     function getURL() {
@@ -113,10 +116,11 @@ 
         
     function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
+    	if (is_object($ele)) {
+    	    		return $ele->render();
+    	} else {
+    	    		return ' ';
+    	}
     }
     
 	function GetCatAndSubCat($pid=0){
@@ -141,8 +145,9 @@ 
     	} else {
     		$obj->setVar('updated', time());
     	}
-    	if (strlen($obj->getVar('name'))==0)
-    		return false;
+    	if (strlen($obj->getVar('name'))==0) {
+    	    		return false;
+    	}
     	return parent::insert($obj, $force);
     }
 

htdocs/modules/songlist/class/votes.php

Indentation +91 added lines, -91 removed lines

@@ -10,11 +10,11 @@ 
 class SonglistVotes extends XoopsObject
 {
 
-    function SonglistVotes($fid = null)
-    {
-        $this->initVar('vid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('sid', XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('uid', XOBJ_DTYPE_INT, 0, false);
+	function SonglistVotes($fid = null)
+	{
+		$this->initVar('vid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('sid', XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('uid', XOBJ_DTYPE_INT, 0, false);
 		$this->initVar('ip', XOBJ_DTYPE_TXTBOX, null, false, 64);
 		$this->initVar('netaddy', XOBJ_DTYPE_TXTBOX, null, false, 255);
 		$this->initVar('rank', XOBJ_DTYPE_DECIMAL, 0, false);
@@ -40,109 +40,109 @@ 
 
 class SonglistVotesHandler extends XoopsPersistableObjectHandler
 {
-    function __construct(&$db) 
-    {
-        parent::__construct($db, "songlist_votes", 'SonglistVotes', "vid", "ip");
-    }
+	function __construct(&$db) 
+	{
+		parent::__construct($db, "songlist_votes", 'SonglistVotes', "vid", "ip");
+	}
 
 	function filterFields() {
 		return array('vid', 'sid', 'uid', 'ip', 'netaddy', 'rank');
 	}
 	
-    function getFilterCriteria($filter) {
-    	$parts = explode('|', $filter);
-    	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
-    		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
-    			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
+	function getFilterCriteria($filter) {
+		$parts = explode('|', $filter);
+		$criteria = new CriteriaCompo();
+		foreach($parts as $part) {
+			$var = explode(',', $part);
+			if (!empty($var[1])&&!is_numeric($var[0])) {
+				$object = $this->create();
+				if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
+				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
+							$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
 				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+					$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
-    			$criteria->add(new Criteria($var[0], $var[1]));
-    		}
-    	}
-    	return $criteria;
-    }
+			} elseif (!empty($var[1])&&is_numeric($var[0])) {
+				$criteria->add(new Criteria($var[0], $var[1]));
+			}
+		}
+		return $criteria;
+	}
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
-    	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
-    }
+	function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+		$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
+		if (is_object($ele))
+			return $ele->render();
+		else 
+			return ' ';
+	}
     
 	function insert($obj, $force=true) {
-    	if ($obj->isNew()) {
-    		$obj->setVar('created', time());	
-    	} else {
-    		$obj->setVar('updated', time());
-    	}
-    	return parent::insert($obj, $force);
-    }
+		if ($obj->isNew()) {
+			$obj->setVar('created', time());	
+		} else {
+			$obj->setVar('updated', time());
+		}
+		return parent::insert($obj, $force);
+	}
 
-    function addVote($sid, $value) {
+	function addVote($sid, $value) {
     	
-    	$criteria = new CriteriaCompo(new Criteria('sid', $sid));
+		$criteria = new CriteriaCompo(new Criteria('sid', $sid));
     	
-    	$ip = songlist_getIPData(false);
-    	if ($ip['uid']>0) {
-    		$criteria->add(new Criteria('uid', $ip['uid']));
-    	} else {
-    		$criteria->add(new Criteria('ip', $ip['ip']));
-    		$criteria->add(new Criteria('netaddy', $ip['network-addy']));
-    	}
+		$ip = songlist_getIPData(false);
+		if ($ip['uid']>0) {
+			$criteria->add(new Criteria('uid', $ip['uid']));
+		} else {
+			$criteria->add(new Criteria('ip', $ip['ip']));
+			$criteria->add(new Criteria('netaddy', $ip['network-addy']));
+		}
     	
-    	if ($this->getCount($criteria)==0&&$sid>0&&$value>0) {
-    		$vote = $this->create();
-    		$vote->setVar('sid', $sid);
-    		$vote->setVar('uid', $ip['uid']);
-    		$vote->setVar('ip', $ip['ip']);
-    		$vote->setVar('netaddy', $ip['network-addy']);
-    		$vote->setVar('rank', $value);
-    		if ($this->insert($vote)) {
-    			$songs_handler = xoops_getmodulehandler('songs', 'songlist');
-    			$albums_handler = xoops_getmodulehandler('albums', 'songlist');
-    			$artists_handler = xoops_getmodulehandler('artists', 'songlist');
-    			$category_handler = xoops_getmodulehandler('category', 'songlist');
-    			$genre_handler = xoops_getmodulehandler('genre', 'songlist');
+		if ($this->getCount($criteria)==0&&$sid>0&&$value>0) {
+			$vote = $this->create();
+			$vote->setVar('sid', $sid);
+			$vote->setVar('uid', $ip['uid']);
+			$vote->setVar('ip', $ip['ip']);
+			$vote->setVar('netaddy', $ip['network-addy']);
+			$vote->setVar('rank', $value);
+			if ($this->insert($vote)) {
+				$songs_handler = xoops_getmodulehandler('songs', 'songlist');
+				$albums_handler = xoops_getmodulehandler('albums', 'songlist');
+				$artists_handler = xoops_getmodulehandler('artists', 'songlist');
+				$category_handler = xoops_getmodulehandler('category', 'songlist');
+				$genre_handler = xoops_getmodulehandler('genre', 'songlist');
 				$voice_handler = xoops_getmodulehandler('voice', 'songlist');				
     			
-    			$song = $songs_handler->get($sid);
-    			$sql = array();
-    			$sql[] = "UPDATE `" . $songs_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $songs_handler->keyName . "` = " . $sid;
-    			$sql[] = "UPDATE `" . $category_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $category_handler->keyName . "` = " . $song->getVar($category_handler->keyName);
-    			$sql[] = "UPDATE `" . $genre_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $genre_handler->keyName . "` = " . $song->getVar($genre_handler->keyName);
+				$song = $songs_handler->get($sid);
+				$sql = array();
+				$sql[] = "UPDATE `" . $songs_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $songs_handler->keyName . "` = " . $sid;
+				$sql[] = "UPDATE `" . $category_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $category_handler->keyName . "` = " . $song->getVar($category_handler->keyName);
+				$sql[] = "UPDATE `" . $genre_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $genre_handler->keyName . "` = " . $song->getVar($genre_handler->keyName);
 				$sql[] = "UPDATE `" . $voice_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $voice_handler->keyName . "` = " . $song->getVar($voice_handler->keyName);
-    			$sql[] = "UPDATE `" . $albums_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $albums_handler->keyName . "` = " . $song->getVar($albums_handler->keyName);
-    			foreach($song->getVar('aids') as $aid) {
-    				$sql[] = "UPDATE `" . $artists_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $artists_handler->keyName . "` = " . $aid;
-    			}
-    			foreach($sql as $question) { 
-    				$GLOBALS['xoopsDB']->queryF($question);
-    			}
-    			redirect_header($_POST['uri'], 10, _MN_SONGLIST_MSG_VOTED_FINISHED);
-    			exit(0);
-    		} else {
-	    		redirect_header($_POST['uri'], 10, _MN_SONGLIST_MSG_VOTED_ALREADY);
-	    		exit(0);
-	    	}
-    	} else {
-    		redirect_header($_POST['uri'], 10, _MN_SONGLIST_MSG_VOTED_SOMETHINGWRONG);
-    		exit(0);
-    	}
-    	return false;
-    }
+				$sql[] = "UPDATE `" . $albums_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $albums_handler->keyName . "` = " . $song->getVar($albums_handler->keyName);
+				foreach($song->getVar('aids') as $aid) {
+					$sql[] = "UPDATE `" . $artists_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $artists_handler->keyName . "` = " . $aid;
+				}
+				foreach($sql as $question) { 
+					$GLOBALS['xoopsDB']->queryF($question);
+				}
+				redirect_header($_POST['uri'], 10, _MN_SONGLIST_MSG_VOTED_FINISHED);
+				exit(0);
+			} else {
+				redirect_header($_POST['uri'], 10, _MN_SONGLIST_MSG_VOTED_ALREADY);
+				exit(0);
+			}
+		} else {
+			redirect_header($_POST['uri'], 10, _MN_SONGLIST_MSG_VOTED_SOMETHINGWRONG);
+			exit(0);
+		}
+		return false;
+	}
 }
 ?>
\ No newline at end of file

Spacing +26 added lines, -26 removed lines

@@ -27,11 +27,11 @@ 
 	function toArray() {
 		$ret = parent::toArray();
 		$form = $this->getForm(true);
-		foreach($form as $key => $element) {
+		foreach ($form as $key => $element) {
 			$ret['form'][$key] = $form[$key]->render();	
 		}
 		
-		$ret['rank'] = number_format($this->getVar('rank'),2)._MI_SONGLIST_OFTEN;
+		$ret['rank'] = number_format($this->getVar('rank'), 2)._MI_SONGLIST_OFTEN;
     		
 		return $ret;
 	}
@@ -52,30 +52,30 @@ 
     function getFilterCriteria($filter) {
     	$parts = explode('|', $filter);
     	$criteria = new CriteriaCompo();
-    	foreach($parts as $part) {
+    	foreach ($parts as $part) {
     		$var = explode(',', $part);
-    		if (!empty($var[1])&&!is_numeric($var[0])) {
+    		if (!empty($var[1]) && !is_numeric($var[0])) {
     			$object = $this->create();
-    			if (		$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2])?$var[2]:'LIKE')));
-    			} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
+    			if ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTBOX || 
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_TXTAREA) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', (isset($var[2]) ? $var[2] : 'LIKE')));
+    			} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_INT || 
     						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_DECIMAL || 
-    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));			
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2])?$var[2]:'=')));    				
-				} elseif (	$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY ) 	{
-    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2])?$var[2]:'LIKE')));    				
+    						$object->vars[$var[0]]['data_type']==XOBJ_DTYPE_FLOAT) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));			
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ENUM) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', $var[1], (isset($var[2]) ? $var[2] : '=')));    				
+				} elseif ($object->vars[$var[0]]['data_type']==XOBJ_DTYPE_ARRAY) {
+    				$criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', (isset($var[2]) ? $var[2] : 'LIKE')));    				
 				}
-    		} elseif (!empty($var[1])&&is_numeric($var[0])) {
+    		} elseif (!empty($var[1]) && is_numeric($var[0])) {
     			$criteria->add(new Criteria($var[0], $var[1]));
     		}
     	}
     	return $criteria;
     }
         
-    function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
+    function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
     	if (is_object($ele))
     		return $ele->render();
@@ -83,7 +83,7 @@ 
     		return ' ';
     }
     
-	function insert($obj, $force=true) {
+	function insert($obj, $force = true) {
     	if ($obj->isNew()) {
     		$obj->setVar('created', time());	
     	} else {
@@ -104,7 +104,7 @@ 
     		$criteria->add(new Criteria('netaddy', $ip['network-addy']));
     	}
     	
-    	if ($this->getCount($criteria)==0&&$sid>0&&$value>0) {
+    	if ($this->getCount($criteria)==0 && $sid>0 && $value>0) {
     		$vote = $this->create();
     		$vote->setVar('sid', $sid);
     		$vote->setVar('uid', $ip['uid']);
@@ -121,15 +121,15 @@ 
     			
     			$song = $songs_handler->get($sid);
     			$sql = array();
-    			$sql[] = "UPDATE `" . $songs_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $songs_handler->keyName . "` = " . $sid;
-    			$sql[] = "UPDATE `" . $category_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $category_handler->keyName . "` = " . $song->getVar($category_handler->keyName);
-    			$sql[] = "UPDATE `" . $genre_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $genre_handler->keyName . "` = " . $song->getVar($genre_handler->keyName);
-				$sql[] = "UPDATE `" . $voice_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $voice_handler->keyName . "` = " . $song->getVar($voice_handler->keyName);
-    			$sql[] = "UPDATE `" . $albums_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $albums_handler->keyName . "` = " . $song->getVar($albums_handler->keyName);
-    			foreach($song->getVar('aids') as $aid) {
-    				$sql[] = "UPDATE `" . $artists_handler->table . "` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `". $artists_handler->keyName . "` = " . $aid;
+    			$sql[] = "UPDATE `".$songs_handler->table."` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `".$songs_handler->keyName."` = ".$sid;
+    			$sql[] = "UPDATE `".$category_handler->table."` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `".$category_handler->keyName."` = ".$song->getVar($category_handler->keyName);
+    			$sql[] = "UPDATE `".$genre_handler->table."` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `".$genre_handler->keyName."` = ".$song->getVar($genre_handler->keyName);
+				$sql[] = "UPDATE `".$voice_handler->table."` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `".$voice_handler->keyName."` = ".$song->getVar($voice_handler->keyName);
+    			$sql[] = "UPDATE `".$albums_handler->table."` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `".$albums_handler->keyName."` = ".$song->getVar($albums_handler->keyName);
+    			foreach ($song->getVar('aids') as $aid) {
+    				$sql[] = "UPDATE `".$artists_handler->table."` SET `rank` = `rank` + ".$value.", `votes` = `votes` + 1 WHERE `".$artists_handler->keyName."` = ".$aid;
     			}
-    			foreach($sql as $question) { 
+    			foreach ($sql as $question) { 
     				$GLOBALS['xoopsDB']->queryF($question);
     			}
     			redirect_header($_POST['uri'], 10, _MN_SONGLIST_MSG_VOTED_FINISHED);

Braces +5 added lines, -4 removed lines

@@ -77,10 +77,11 @@
         
     function getFilterForm($filter, $field, $sort='created', $op = 'dashboard', $fct='list') {
     	$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
-    	if (is_object($ele))
-    		return $ele->render();
-    	else 
-    		return ' ';
+    	if (is_object($ele)) {
+    	    		return $ele->render();
+    	} else {
+    	    		return ' ';
+    	}
     }
     
 	function insert($obj, $force=true) {