XoopsModules25x / songlist

htdocs/modules/songlist/class/extras.php

Indentation +202 added lines, -202 removed lines

@@ -9,25 +9,25 @@ 
 
 	var $handler;
 	
-    function __construct($fields)
-    {
-    	$this->initVar('sid', XOBJ_DTYPE_INT, null, true);
+	function __construct($fields)
+	{
+		$this->initVar('sid', XOBJ_DTYPE_INT, null, true);
 		$this->init($fields);
-    }
-
-
-    /**
-    * Initiate variables
-    * @param array $fields field information array of {@link XoopsObjectsField} objects
-    */
-    function init($fields)
-    {
-        if (is_array($fields) && count($fields) > 0) {
-            foreach (array_keys($fields) as $key ) {
-                $this->initVar($key, $fields[$key]->getVar('field_valuetype'), $fields[$key]->getVar('field_default', 'n'), $fields[$key]->getVar('field_required'), $fields[$key]->getVar('field_maxlength'));
-            }
-        }
-    }
+	}
+
+
+	/**
+	 * Initiate variables
+	 * @param array $fields field information array of {@link XoopsObjectsField} objects
+	 */
+	function init($fields)
+	{
+		if (is_array($fields) && count($fields) > 0) {
+			foreach (array_keys($fields) as $key ) {
+				$this->initVar($key, $fields[$key]->getVar('field_valuetype'), $fields[$key]->getVar('field_default', 'n'), $fields[$key]->getVar('field_required'), $fields[$key]->getVar('field_maxlength'));
+			}
+		}
+	}
 }
 /**
  * @package kernel
@@ -35,79 +35,79 @@ 
  */
 class SonglistExtrasHandler extends XoopsPersistableObjectHandler
 {
-    /**
-    * holds reference to {@link ObjectsFieldHandler} object
-    */
-    var $_fHandler;
-
-    /**
-    * Array of {@link XoopsObjectsField} objects
-    * @var array
-    */
-    var $_fields = array();
-
-    function __construct($db)
-    {
-        parent::__construct($db, "songlist_extra", 'SonglistExtras', "sid");
-        $this->_fHandler = xoops_getmodulehandler('field', 'songlist');
-    }
-
-    /**
-     * create a new {@link SonglistExtras}
-     *
-     * @param bool $isNew Flag the new objects as "new"?
-     *
-     * @return object {@link SonglistExtras}
-     */
-    function &create($isNew = true)
-    {
-        $obj = new $this->className( $this->loadFields() );
-        $obj->handler = $this;
-        $obj->setNew();
-        return $obj;
-    }
-
-    /**
-     * Get a {@link SonglistExtras}
-     *
-     * @param   boolean $createOnFailure create a new {@link SonglistExtras} if none is feteched
-     *
-     * @return  object {@link SonglistExtras}
-     */
-    function &get($uid, $createOnFailure = true)
-    {
-        $obj = parent::get($uid);
-        if (!is_object($obj) && $createOnFailure) {
-            $obj = $this->create();
-        }
-        return $obj;
-    }
-
-    /**
-    * Create new {@link ObjectsField} object
-    *
-    * @param bool $isNew
-    *
-    * @return object
-    */
-    function &createField($isNew = true)
-    {
-        $return = $this->_fHandler->create($isNew);
-        return $return;
-    }
-
-    /**
-    * Load field information
-    *
-    * @return array
-    */
-    function loadFields()
-    {
-        if (count($this->_fields) == 0) {
-            $this->_fields = $this->_fHandler->loadFields();
-        }
-        return ($this->_fields==0||empty($this->_fields)?false:$this->_fields);
-    }
+	/**
+	 * holds reference to {@link ObjectsFieldHandler} object
+	 */
+	var $_fHandler;
+
+	/**
+	 * Array of {@link XoopsObjectsField} objects
+	 * @var array
+	 */
+	var $_fields = array();
+
+	function __construct($db)
+	{
+		parent::__construct($db, "songlist_extra", 'SonglistExtras', "sid");
+		$this->_fHandler = xoops_getmodulehandler('field', 'songlist');
+	}
+
+	/**
+	 * create a new {@link SonglistExtras}
+	 *
+	 * @param bool $isNew Flag the new objects as "new"?
+	 *
+	 * @return object {@link SonglistExtras}
+	 */
+	function &create($isNew = true)
+	{
+		$obj = new $this->className( $this->loadFields() );
+		$obj->handler = $this;
+		$obj->setNew();
+		return $obj;
+	}
+
+	/**
+	 * Get a {@link SonglistExtras}
+	 *
+	 * @param   boolean $createOnFailure create a new {@link SonglistExtras} if none is feteched
+	 *
+	 * @return  object {@link SonglistExtras}
+	 */
+	function &get($uid, $createOnFailure = true)
+	{
+		$obj = parent::get($uid);
+		if (!is_object($obj) && $createOnFailure) {
+			$obj = $this->create();
+		}
+		return $obj;
+	}
+
+	/**
+	 * Create new {@link ObjectsField} object
+	 *
+	 * @param bool $isNew
+	 *
+	 * @return object
+	 */
+	function &createField($isNew = true)
+	{
+		$return = $this->_fHandler->create($isNew);
+		return $return;
+	}
+
+	/**
+	 * Load field information
+	 *
+	 * @return array
+	 */
+	function loadFields()
+	{
+		if (count($this->_fields) == 0) {
+			$this->_fields = $this->_fHandler->loadFields();
+		}
+		return ($this->_fields==0||empty($this->_fields)?false:$this->_fields);
+	}
 	
 	function getPostVars()
 	{
@@ -115,118 +115,118 @@ 
 	}
 
 
-    function getFields($criteria, $id_as_key = true, $as_object = true)
-    {
-        return $this->_fHandler->getObjects($criteria, $id_as_key, $as_object);
-    }
-
-    /**
-    * Insert a field in the database
-    *
-    * @param object $field
-    * @param bool $force
-    *
-    * @return bool
-    */
-    function insertField($field, $force = false)
-    {
-        return $this->_fHandler->insert($field, $force);
-    }
-
-    /**
-    * Delete a field from the database
-    *
-    * @param object $field
-    * @param bool $force
-    *
-    * @return bool
-    */
-    function deleteField($field, $force = false)
-    {
-        return $this->_fHandler->delete($field, $force);
-    }
-
-    /**
-    * Save a new field in the database
-    *
-    * @param array $vars array of variables, taken from $module->loadInfo('Extras')['field']
-    * @param int $categoryid ID of the category to add it to
-    * @param int $type valuetype of the field
-    * @param int $moduleid ID of the module, this field belongs to
-    * @param int $weight
-    *
-    * @return string
-    **/
-    function saveField($vars, $weight = 0)
-    {
-        $field = $this->createField();
-        $field->setVar('field_name', $vars['name']);
-        $field->setVar('field_valuetype', $vars['valuetype']);
-        $field->setVar('field_type', $vars['type']);
-        $field->setVar('field_weight', $weight);
-        if (isset($vars['title'])) {
-            $field->setVar('field_title', $vars['title']);
-        }
-        if (isset($vars['description'])) {
-            $field->setVar('field_description', $vars['description']);
-        }
-        if (isset($vars['required'])) {
-            $field->setVar('field_required', $vars['required']); //0 = no, 1 = yes
-        }
-        if (isset($vars['maxlength'])) {
-            $field->setVar('field_maxlength', $vars['maxlength']);
-        }
-        if (isset($vars['default'])) {
-            $field->setVar('field_default', $vars['default']);
-        }
-        if (isset($vars['notnull'])) {
-            $field->setVar('field_notnull', $vars['notnull']);
-        }
-        if (isset($vars['show'])) {
-            $field->setVar('field_show', $vars['show']);
-        }
-        if (isset($vars['edit'])) {
-            $field->setVar('field_edit', $vars['edit']);
-        }
-        if (isset($vars['config'])) {
-            $field->setVar('field_config', $vars['config']);
-        }
-        if (isset($vars['options'])) {
-            $field->setVar('field_options', $vars['options']);
-        } else {
-            $field->setVar('field_options', array() );
-        }
-        if ($this->insertField($field)) {
-            $msg = '&nbsp;&nbsp;Field <b>' . $vars['name'] . '</b> added to the database';
-        } else {
-            $msg = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert field <b>' . $vars['name'] . '</b> into the database. '.implode(' ', $field->getErrors()) . $this->db->error() . '</span>';
-        }
-        unset($field);
-        return $msg;
-    }
-
-    /**
-     * insert a new object 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, $checkObject = true)
-    {
-        $uservars = $this->getPostVars();
-        foreach ($uservars as $var) {
+	function getFields($criteria, $id_as_key = true, $as_object = true)
+	{
+		return $this->_fHandler->getObjects($criteria, $id_as_key, $as_object);
+	}
+
+	/**
+	 * Insert a field in the database
+	 *
+	 * @param object $field
+	 * @param bool $force
+	 *
+	 * @return bool
+	 */
+	function insertField($field, $force = false)
+	{
+		return $this->_fHandler->insert($field, $force);
+	}
+
+	/**
+	 * Delete a field from the database
+	 *
+	 * @param object $field
+	 * @param bool $force
+	 *
+	 * @return bool
+	 */
+	function deleteField($field, $force = false)
+	{
+		return $this->_fHandler->delete($field, $force);
+	}
+
+	/**
+	 * Save a new field in the database
+	 *
+	 * @param array $vars array of variables, taken from $module->loadInfo('Extras')['field']
+	 * @param int $categoryid ID of the category to add it to
+	 * @param int $type valuetype of the field
+	 * @param int $moduleid ID of the module, this field belongs to
+	 * @param int $weight
+	 *
+	 * @return string
+	 **/
+	function saveField($vars, $weight = 0)
+	{
+		$field = $this->createField();
+		$field->setVar('field_name', $vars['name']);
+		$field->setVar('field_valuetype', $vars['valuetype']);
+		$field->setVar('field_type', $vars['type']);
+		$field->setVar('field_weight', $weight);
+		if (isset($vars['title'])) {
+			$field->setVar('field_title', $vars['title']);
+		}
+		if (isset($vars['description'])) {
+			$field->setVar('field_description', $vars['description']);
+		}
+		if (isset($vars['required'])) {
+			$field->setVar('field_required', $vars['required']); //0 = no, 1 = yes
+		}
+		if (isset($vars['maxlength'])) {
+			$field->setVar('field_maxlength', $vars['maxlength']);
+		}
+		if (isset($vars['default'])) {
+			$field->setVar('field_default', $vars['default']);
+		}
+		if (isset($vars['notnull'])) {
+			$field->setVar('field_notnull', $vars['notnull']);
+		}
+		if (isset($vars['show'])) {
+			$field->setVar('field_show', $vars['show']);
+		}
+		if (isset($vars['edit'])) {
+			$field->setVar('field_edit', $vars['edit']);
+		}
+		if (isset($vars['config'])) {
+			$field->setVar('field_config', $vars['config']);
+		}
+		if (isset($vars['options'])) {
+			$field->setVar('field_options', $vars['options']);
+		} else {
+			$field->setVar('field_options', array() );
+		}
+		if ($this->insertField($field)) {
+			$msg = '&nbsp;&nbsp;Field <b>' . $vars['name'] . '</b> added to the database';
+		} else {
+			$msg = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert field <b>' . $vars['name'] . '</b> into the database. '.implode(' ', $field->getErrors()) . $this->db->error() . '</span>';
+		}
+		unset($field);
+		return $msg;
+	}
+
+	/**
+	 * insert a new object 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, $checkObject = true)
+	{
+		$uservars = $this->getPostVars();
+		foreach ($uservars as $var) {
 			if ($var!='sid')
-	            unset($obj->vars[$var]);
-        }
-        if (count($obj->vars) == 0) {
-            return true;
-        }
-        return parent::insert($obj, $force, $checkObject);
-    }
+				unset($obj->vars[$var]);
+		}
+		if (count($obj->vars) == 0) {
+			return true;
+		}
+		return parent::insert($obj, $force, $checkObject);
+	}
 
 }
 ?>
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -22,8 +22,8 @@ 
     */
     function init($fields)
     {
-        if (is_array($fields) && count($fields) > 0) {
-            foreach (array_keys($fields) as $key ) {
+        if (is_array($fields) && count($fields)>0) {
+            foreach (array_keys($fields) as $key) {
                 $this->initVar($key, $fields[$key]->getVar('field_valuetype'), $fields[$key]->getVar('field_default', 'n'), $fields[$key]->getVar('field_required'), $fields[$key]->getVar('field_maxlength'));
             }
         }
@@ -61,7 +61,7 @@ 
      */
     function &create($isNew = true)
     {
-        $obj = new $this->className( $this->loadFields() );
+        $obj = new $this->className($this->loadFields());
         $obj->handler = $this;
         $obj->setNew();
         return $obj;
@@ -103,10 +103,10 @@ 
     */
     function loadFields()
     {
-        if (count($this->_fields) == 0) {
+        if (count($this->_fields)==0) {
             $this->_fields = $this->_fHandler->loadFields();
         }
-        return ($this->_fields==0||empty($this->_fields)?false:$this->_fields);
+        return ($this->_fields==0 || empty($this->_fields) ?false:$this->_fields);
     }
 	
 	function getPostVars()
@@ -194,12 +194,12 @@ 
         if (isset($vars['options'])) {
             $field->setVar('field_options', $vars['options']);
         } else {
-            $field->setVar('field_options', array() );
+            $field->setVar('field_options', array());
         }
         if ($this->insertField($field)) {
-            $msg = '&nbsp;&nbsp;Field <b>' . $vars['name'] . '</b> added to the database';
+            $msg = '&nbsp;&nbsp;Field <b>'.$vars['name'].'</b> added to the database';
         } else {
-            $msg = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert field <b>' . $vars['name'] . '</b> into the database. '.implode(' ', $field->getErrors()) . $this->db->error() . '</span>';
+            $msg = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert field <b>'.$vars['name'].'</b> into the database. '.implode(' ', $field->getErrors()).$this->db->error().'</span>';
         }
         unset($field);
         return $msg;
@@ -222,7 +222,7 @@ 
 			if ($var!='sid')
 	            unset($obj->vars[$var]);
         }
-        if (count($obj->vars) == 0) {
+        if (count($obj->vars)==0) {
             return true;
         }
         return parent::insert($obj, $force, $checkObject);

Braces +3 added lines, -2 removed lines

@@ -219,8 +219,9 @@
     {
         $uservars = $this->getPostVars();
         foreach ($uservars as $var) {
-			if ($var!='sid')
-	            unset($obj->vars[$var]);
+			if ($var!='sid') {
+				            unset($obj->vars[$var]);
+			}
         }
         if (count($obj->vars) == 0) {
             return true;

htdocs/modules/songlist/class/utf8map.php

Indentation +43 added lines, -43 removed lines

@@ -10,9 +10,9 @@ 
 class SonglistUtf8map extends XoopsObject
 {
 
-    function SonglistUtf8map($fid = null)
-    {
-        $this->initVar('utfid', XOBJ_DTYPE_INT, 0, false);
+	function SonglistUtf8map($fid = null)
+	{
+		$this->initVar('utfid', XOBJ_DTYPE_INT, 0, false);
 		$this->initVar('from', XOBJ_DTYPE_TXTBOX, null, false, 2);
 		$this->initVar('to', XOBJ_DTYPE_TXTBOX, null, false, 2);
 		$this->initVar('created', XOBJ_DTYPE_INT, 0, false);
@@ -43,57 +43,57 @@ 
 
 class SonglistUtf8mapHandler extends XoopsPersistableObjectHandler
 {
-    function __construct(&$db) 
-    {
-        parent::__construct($db, "songlist_utf8map", 'SonglistUtf8map', "utfid", "from");
-    }
+	function __construct(&$db) 
+	{
+		parent::__construct($db, "songlist_utf8map", 'SonglistUtf8map', "utfid", "from");
+	}
 
 	function filterFields() {
 		return array('utfid', 'from', 'to', '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());
-    	}
-    	return parent::insert($obj, $force);
-    }
+		if ($obj->isNew()) {
+			$obj->setVar('created', time());	
+		} else {
+			$obj->setVar('updated', time());
+		}
+		return parent::insert($obj, $force);
+	}
      
  	function convert($phrase = '', $criteria = NULL) {
  		foreach($this->getObjects($criteria, true) as $utfid => $utf8) {

Spacing +18 added lines, -18 removed lines

@@ -26,10 +26,10 @@ 
 	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));
@@ -55,30 +55,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();
@@ -86,7 +86,7 @@ 
     		return ' ';
     }
     
-	function insert($obj, $force=true) {
+	function insert($obj, $force = true) {
     	if ($obj->isNew()) {
     		$obj->setVar('created', time());	
     	} else {
@@ -96,7 +96,7 @@ 
     }
      
  	function convert($phrase = '', $criteria = NULL) {
- 		foreach($this->getObjects($criteria, true) as $utfid => $utf8) {
+ 		foreach ($this->getObjects($criteria, true) as $utfid => $utf8) {
  			$phrase = str_replace(strtolower($utf8->getVar('from')), strtolower($utf8->getVar('to')), $phrase);
  			$phrase = str_replace(strtoupper($utf8->getVar('from')), strtoupper($utf8->getVar('to')), $phrase);
  		}

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) {

htdocs/modules/songlist/index.php

Switch Indentation +88 added lines, -88 removed lines

@@ -56,86 +56,86 @@ 
 		default:
 		case "item":
 			switch ($fct) {
-			default:
-			case "list":
+				default:
+				case "list":
 				
-				$pagenav = new XoopsPageNav($songs_handler->getCount($criteria_cat), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
+					$pagenav = new XoopsPageNav($songs_handler->getCount($criteria_cat), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
 
-				$criteria_cat->setLimit($limit);
-				$criteria_cat->setStart($start);
+					$criteria_cat->setLimit($limit);
+					$criteria_cat->setStart($start);
 				
-				$songs = $songs_handler->getObjects($criteria_cat, false);
+					$songs = $songs_handler->getObjects($criteria_cat, false);
 				
-				$url = $songs_handler->getURL();
-				if (!strpos($url, $_SERVER['REQUEST_URI'])) {
-					header( "HTTP/1.1 301 Moved Permanently" ); 
-					header('Location: '.$url);
-					exit(0);
-				}
+					$url = $songs_handler->getURL();
+					if (!strpos($url, $_SERVER['REQUEST_URI'])) {
+						header( "HTTP/1.1 301 Moved Permanently" ); 
+						header('Location: '.$url);
+						exit(0);
+					}
 
-				$xoopsOption['template_main'] = 'songlist_songs_index.html';
-				include($GLOBALS['xoops']->path('/header.php'));
-				if ($GLOBALS['songlistModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
-					$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, array('type'=>'text/javascript'));
-					$GLOBALS['loaded_jquery']=true;
-				}
-				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
-				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);			
-				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
-				foreach($songs as $song)
-					$GLOBALS['xoopsTpl']->append('results', $song->toArray(true));
-				$GLOBALS['xoopsTpl']->assign('songs', true);			
-				$GLOBALS['xoopsTpl']->assign('categories', $cat);
-				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-				$GLOBALS['xoopsTpl']->assign('category_element', $category_element->render());
-				$GLOBALS['xoopsTpl']->assign('genre_element', $genre_element->render());
-				$GLOBALS['xoopsTpl']->assign('voice_element', $voice_element->render());
-				$GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
-				if ($_SESSION['cid']!=0) {
-					$category = $category_handler->get($_SESSION['cid']);
-					if (is_object($category))
-						$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
-				}				
-				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-				include($GLOBALS['xoops']->path('/footer.php'));
-				break;
-			case "item":
-				$song = $songs_handler->get($id);
+					$xoopsOption['template_main'] = 'songlist_songs_index.html';
+					include($GLOBALS['xoops']->path('/header.php'));
+					if ($GLOBALS['songlistModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
+						$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, array('type'=>'text/javascript'));
+						$GLOBALS['loaded_jquery']=true;
+					}
+					$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
+					$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);			
+					$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+					foreach($songs as $song)
+						$GLOBALS['xoopsTpl']->append('results', $song->toArray(true));
+					$GLOBALS['xoopsTpl']->assign('songs', true);			
+					$GLOBALS['xoopsTpl']->assign('categories', $cat);
+					$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+					$GLOBALS['xoopsTpl']->assign('category_element', $category_element->render());
+					$GLOBALS['xoopsTpl']->assign('genre_element', $genre_element->render());
+					$GLOBALS['xoopsTpl']->assign('voice_element', $voice_element->render());
+					$GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
+					if ($_SESSION['cid']!=0) {
+						$category = $category_handler->get($_SESSION['cid']);
+						if (is_object($category))
+							$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+					}				
+					$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+					include($GLOBALS['xoops']->path('/footer.php'));
+					break;
+				case "item":
+					$song = $songs_handler->get($id);
 
-				$url = $song->getURL(true);
-				if (!strpos($url, $_SERVER['REQUEST_URI'])) {
-					header( "HTTP/1.1 301 Moved Permanently" ); 
-					header('Location: '.$url);
-					exit(0);
-				}
+					$url = $song->getURL(true);
+					if (!strpos($url, $_SERVER['REQUEST_URI'])) {
+						header( "HTTP/1.1 301 Moved Permanently" ); 
+						header('Location: '.$url);
+						exit(0);
+					}
 				
-				$xoopsOption['template_main'] = 'songlist_songs_item.html';
-				include($GLOBALS['xoops']->path('/header.php'));
-				if ($GLOBALS['songlistModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
-					$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, array('type'=>'text/javascript'));
-					$GLOBALS['loaded_jquery']=true;
-				}			
-				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
-				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
-				$GLOBALS['xoopsTpl']->assign('songs', false);
-				$GLOBALS['xoopsTpl']->assign('song', $song->toArray(true));
-				$GLOBALS['xoopsTpl']->assign('categories', $cat);
-				$GLOBALS['xoopsTpl']->assign('category_element', $category_element->render());
-				$GLOBALS['xoopsTpl']->assign('genre_element', $genre_element->render());
-				$GLOBALS['xoopsTpl']->assign('voice_element', $voice_element->render());
-				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);				
-				include($GLOBALS['xoops']->path('/footer.php'));
-				break;	
+					$xoopsOption['template_main'] = 'songlist_songs_item.html';
+					include($GLOBALS['xoops']->path('/header.php'));
+					if ($GLOBALS['songlistModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
+						$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, array('type'=>'text/javascript'));
+						$GLOBALS['loaded_jquery']=true;
+					}			
+					$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
+					$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+					$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+					$GLOBALS['xoopsTpl']->assign('songs', false);
+					$GLOBALS['xoopsTpl']->assign('song', $song->toArray(true));
+					$GLOBALS['xoopsTpl']->assign('categories', $cat);
+					$GLOBALS['xoopsTpl']->assign('category_element', $category_element->render());
+					$GLOBALS['xoopsTpl']->assign('genre_element', $genre_element->render());
+					$GLOBALS['xoopsTpl']->assign('voice_element', $voice_element->render());
+					$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);				
+					include($GLOBALS['xoops']->path('/footer.php'));
+					break;	
 			}
 			break;
 		case "browseby":
 			switch ($fct) {
-			default:
-			case "title":
+				default:
+				case "title":
 				
-				$browse_criteria = new CriteriaCompo();
-				switch ($value) {
+					$browse_criteria = new CriteriaCompo();
+					switch ($value) {
 					case '0':
 						for($u=0;$u<10;$u++) {
 							$browse_criteria->add(new Criteria('`title`', $u.'%', 'LIKE'), 'OR');							
@@ -145,15 +145,15 @@ 
 						$browse_criteria->add(new Criteria('`title`', strtoupper($value).'%', 'LIKE'), 'OR');
 						$browse_criteria->add(new Criteria('`title`', strtolower($value).'%', 'LIKE'), 'OR');
 						break;
-				}
+					}
 				$criteria = new CriteriaCompo($criteria_cat, 'AND');
 				$criteria->add($browse_criteria);
 				break;
 				
-			case "lyrics":
+				case "lyrics":
 				
-				$browse_criteria = new CriteriaCompo();
-				switch ($value) {
+					$browse_criteria = new CriteriaCompo();
+					switch ($value) {
 					case '0':
 						for($u=0;$u<10;$u++) {
 							$browse_criteria->add(new Criteria('`lyrics`', $u.'%', 'LIKE'), 'OR');							
@@ -163,15 +163,15 @@ 
 						$browse_criteria->add(new Criteria('`lyrics`', strtoupper($value).'%', 'LIKE'), 'OR');
 						$browse_criteria->add(new Criteria('`lyrics`', strtolower($value).'%', 'LIKE'), 'OR');
 						break;
-				}
+					}
 				$criteria = new CriteriaCompo($criteria_cat, 'AND');
 				$criteria->add($browse_criteria);
 				break;
 				
-			case "artist":
+				case "artist":
 				
-				$browse_criteria = new CriteriaCompo();
-				switch ($value) {
+					$browse_criteria = new CriteriaCompo();
+					switch ($value) {
 					case '0':
 						for($u=0;$u<10;$u++) {
 							$browse_criteria->add(new Criteria('`name`', $u.'%', 'LIKE'), 'OR');							
@@ -181,7 +181,7 @@ 
 						$browse_criteria->add(new Criteria('`name`', strtoupper($value).'%', 'LIKE'), 'OR');
 						$browse_criteria->add(new Criteria('`name`', strtolower($value).'%', 'LIKE'), 'OR');
 						break;
-				}
+					}
 				$artists_handler = xoops_getmodulehandler('artists', 'songlist');
 				$browse_criteriab = new CriteriaCompo();
 				foreach($artists_handler->getObjects($browse_criteria, true) as $aid => $obj) {
@@ -192,10 +192,10 @@ 
 				$criteria->add($browse_criteriab);
 				break;
 				
-			case "album":
+				case "album":
 				
-				$browse_criteria = new CriteriaCompo();
-				switch ($value) {
+					$browse_criteria = new CriteriaCompo();
+					switch ($value) {
 					case '0':
 						for($u=0;$u<10;$u++) {
 							$browse_criteria->add(new Criteria('`title`', $u.'%', 'LIKE'), 'OR');							
@@ -205,7 +205,7 @@ 
 						$browse_criteria->add(new Criteria('`title`', strtoupper($value).'%', 'LIKE'), 'OR');
 						$browse_criteria->add(new Criteria('`title`', strtolower($value).'%', 'LIKE'), 'OR');
 						break;
-				}
+					}
 				$ids=array();
 				$albums_handler = xoops_getmodulehandler('albums', 'songlist');
 				foreach($albums_handler->getObjects($browse_criteria, true) as $id => $obj) {
@@ -365,13 +365,13 @@ 
 			
 		case "category":
 			switch ($fct) {
-			default:
-			case "set":
-				$_SESSION['cid'] = $id;
-				break;
-			case "home":
-				unset($_SESSION['cid']);
-				break;
+				default:
+				case "set":
+					$_SESSION['cid'] = $id;
+					break;
+				case "home":
+					unset($_SESSION['cid']);
+					break;
 			}
 			redirect_header($_SERVER["PHP_SELF"]."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit&cid=".$_SESSION['cid'], 10, _MN_SONGLIST_MSG_CATEGORYCHANGED);
 			exit;

Spacing +40 added lines, -40 removed lines

@@ -2,15 +2,15 @@ 
 
 	include (dirname(__FILE__).'/header.php');
 	
-	global $file, $op, $fct, $id, $value, $gid, $cid, $vcid,$start, $limit, $singer;
+	global $file, $op, $fct, $id, $value, $gid, $cid, $vcid, $start, $limit, $singer;
 	
 	$category_handler = xoops_getmodulehandler('category', 'songlist');
 	$criteria_cat = new CriteriaCompo();
 	$cids = $category_handler->GetCatAndSubCat($_SESSION['cid']);
 	if ($_SESSION['cid']>0)
 		$cids[$_SESSION['cid']] = $_SESSION['cid'];
-	if (count($cids)>0&&$_SESSION['cid']!=0) {
-		$criteria_cat->add(new Criteria('`cid`', '('.implode(',',  $cids).')', 'IN'), 'OR');	
+	if (count($cids)>0 && $_SESSION['cid']!=0) {
+		$criteria_cat->add(new Criteria('`cid`', '('.implode(',', $cids).')', 'IN'), 'OR');	
 	} else { 
 		$criteria_cat->add(new Criteria('1', '1'), 'OR');
 	}
@@ -25,24 +25,24 @@ 
 	$cat = array();
 	$col = 1;
 	$row = 1;
-	foreach($categories as $category) {
+	foreach ($categories as $category) {
 		$cat[$row][$col] = $category->toArray(true);
 		$cat[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
 		$col++;
 		if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
 			$row++;
-			$col=1;
+			$col = 1;
 		}
 	}
 	if ($col!=1) {
 		$col--;
-		for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) {
+		for ($j = $col; $j<=$GLOBALS['songlistModuleConfig']['cols']; $j++) {
 			$cat[$row][$j][$category_handler->keyName] = 0;
 			$cat[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
 		}
 	}
 	
-	$category_element = new SonglistFormSelectCategory('', 'cid', (isset($_GET['cid'])?($_GET['cid']):$cid));
+	$category_element = new SonglistFormSelectCategory('', 'cid', (isset($_GET['cid']) ? ($_GET['cid']) : $cid));
 	$genre_element = new SonglistFormSelectGenre('', 'gid', $gid);
 	$voice_element = new SonglistFormSelectVoice('', 'vcid', $vcid);
 	
@@ -68,21 +68,21 @@ 
 				
 				$url = $songs_handler->getURL();
 				if (!strpos($url, $_SERVER['REQUEST_URI'])) {
-					header( "HTTP/1.1 301 Moved Permanently" ); 
+					header("HTTP/1.1 301 Moved Permanently"); 
 					header('Location: '.$url);
 					exit(0);
 				}
 
 				$xoopsOption['template_main'] = 'songlist_songs_index.html';
 				include($GLOBALS['xoops']->path('/header.php'));
-				if ($GLOBALS['songlistModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
+				if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
 					$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, array('type'=>'text/javascript'));
-					$GLOBALS['loaded_jquery']=true;
+					$GLOBALS['loaded_jquery'] = true;
 				}
 				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
 				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);			
 				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
-				foreach($songs as $song)
+				foreach ($songs as $song)
 					$GLOBALS['xoopsTpl']->append('results', $song->toArray(true));
 				$GLOBALS['xoopsTpl']->assign('songs', true);			
 				$GLOBALS['xoopsTpl']->assign('categories', $cat);
@@ -104,16 +104,16 @@ 
 
 				$url = $song->getURL(true);
 				if (!strpos($url, $_SERVER['REQUEST_URI'])) {
-					header( "HTTP/1.1 301 Moved Permanently" ); 
+					header("HTTP/1.1 301 Moved Permanently"); 
 					header('Location: '.$url);
 					exit(0);
 				}
 				
 				$xoopsOption['template_main'] = 'songlist_songs_item.html';
 				include($GLOBALS['xoops']->path('/header.php'));
-				if ($GLOBALS['songlistModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
+				if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
 					$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, array('type'=>'text/javascript'));
-					$GLOBALS['loaded_jquery']=true;
+					$GLOBALS['loaded_jquery'] = true;
 				}			
 				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
 				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
@@ -137,7 +137,7 @@ 
 				$browse_criteria = new CriteriaCompo();
 				switch ($value) {
 					case '0':
-						for($u=0;$u<10;$u++) {
+						for ($u = 0; $u<10; $u++) {
 							$browse_criteria->add(new Criteria('`title`', $u.'%', 'LIKE'), 'OR');							
 						}
 						break;
@@ -155,7 +155,7 @@ 
 				$browse_criteria = new CriteriaCompo();
 				switch ($value) {
 					case '0':
-						for($u=0;$u<10;$u++) {
+						for ($u = 0; $u<10; $u++) {
 							$browse_criteria->add(new Criteria('`lyrics`', $u.'%', 'LIKE'), 'OR');							
 						}
 						break;
@@ -173,7 +173,7 @@ 
 				$browse_criteria = new CriteriaCompo();
 				switch ($value) {
 					case '0':
-						for($u=0;$u<10;$u++) {
+						for ($u = 0; $u<10; $u++) {
 							$browse_criteria->add(new Criteria('`name`', $u.'%', 'LIKE'), 'OR');							
 						}
 						break;
@@ -184,7 +184,7 @@ 
 				}
 				$artists_handler = xoops_getmodulehandler('artists', 'songlist');
 				$browse_criteriab = new CriteriaCompo();
-				foreach($artists_handler->getObjects($browse_criteria, true) as $aid => $obj) {
+				foreach ($artists_handler->getObjects($browse_criteria, true) as $aid => $obj) {
 					$browse_criteriab->add(new Criteria('`aids`', '%"'.$aid.'"%', 'LIKE'), 'OR'); 
 					
 				}
@@ -197,7 +197,7 @@ 
 				$browse_criteria = new CriteriaCompo();
 				switch ($value) {
 					case '0':
-						for($u=0;$u<10;$u++) {
+						for ($u = 0; $u<10; $u++) {
 							$browse_criteria->add(new Criteria('`title`', $u.'%', 'LIKE'), 'OR');							
 						}
 						break;
@@ -206,9 +206,9 @@ 
 						$browse_criteria->add(new Criteria('`title`', strtolower($value).'%', 'LIKE'), 'OR');
 						break;
 				}
-				$ids=array();
+				$ids = array();
 				$albums_handler = xoops_getmodulehandler('albums', 'songlist');
-				foreach($albums_handler->getObjects($browse_criteria, true) as $id => $obj) {
+				foreach ($albums_handler->getObjects($browse_criteria, true) as $id => $obj) {
 					$ids[$id] = $id; 
 					
 				}
@@ -227,21 +227,21 @@ 
 			
 			$url = $songs_handler->getURL();
 			if (!strpos($url, $_SERVER['REQUEST_URI'])) {
-				header( "HTTP/1.1 301 Moved Permanently" ); 
+				header("HTTP/1.1 301 Moved Permanently"); 
 				header('Location: '.$url);
 				exit(0);
 			}
 		
 			$xoopsOption['template_main'] = 'songlist_songs_index.html';
 			include($GLOBALS['xoops']->path('/header.php'));
-			if ($GLOBALS['songlistModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
+			if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
 				$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, array('type'=>'text/javascript'));
-				$GLOBALS['loaded_jquery']=true;
+				$GLOBALS['loaded_jquery'] = true;
 			}			
 			$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
 			$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
 			$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
-			foreach($songs as $song)
+			foreach ($songs as $song)
 				$GLOBALS['xoopsTpl']->append('results', $song->toArray(true));
 			$GLOBALS['xoopsTpl']->assign('songs', true);
 			$GLOBALS['xoopsTpl']->assign('categories', $cat);
@@ -269,7 +269,7 @@ 
 			
 			$url = $songs_handler->getSearchURL();
 			if (!strpos($url, $_SERVER['REQUEST_URI'])) {
-				header( "HTTP/1.1 301 Moved Permanently" ); 
+				header("HTTP/1.1 301 Moved Permanently"); 
 				header('Location: '.$url);
 				exit(0);
 			}
@@ -278,7 +278,7 @@ 
 				default:
 				case "titleandlyrics":
 					$criteria = new CriteriaCompo();
-					foreach(explode(' ' , $value) as $keyword) {
+					foreach (explode(' ', $value) as $keyword) {
 						$criteria->add(new Criteria('`title`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE'));
 						$criteria->add(new Criteria('`lyrics`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE'));
 					}
@@ -286,52 +286,52 @@ 
 					
 				case "albums":
 					$criteria = new CriteriaCompo();
-					foreach(explode(' ' , $value) as $keyword) {
+					foreach (explode(' ', $value) as $keyword) {
 						$criteria->add(new Criteria('`title`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE'));
 					}
 					$albums = $albums_handler->getObject($criteria, true);
 					$criteria = new CriteriaCompo();
-					foreach($albums as $abid=> $album) {
+					foreach ($albums as $abid=> $album) {
 						$criteria->add(new Criteria('`abid`', $abid), 'OR');
 					}
 					break;
 				
 				case "artists":
 					$criteria = new CriteriaCompo();
-					foreach(explode(' ' , $value) as $keyword) {
+					foreach (explode(' ', $value) as $keyword) {
 						$criteria->add(new Criteria('`name`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE'));
 					}
 					$artists = $artists_handler->getObject($criteria, true);
 					$criteria = new CriteriaCompo();
-					foreach($artists as $aid=> $artist) {
+					foreach ($artists as $aid=> $artist) {
 						$criteria->add(new Criteria('`aids`', '%"'.$aid.'"%', 'LIKE'), 'OR');
 					}
 					break;				
 				
 				case "lyrics":
 					$criteria = new CriteriaCompo();
-					foreach(explode(' ' , $value) as $keyword) {
+					foreach (explode(' ', $value) as $keyword) {
 						$criteria->add(new Criteria('`lyrics`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE'));
 					}
 					break;
 				case "title":
 					$criteria = new CriteriaCompo();
-					foreach(explode(' ' , $value) as $keyword) {
+					foreach (explode(' ', $value) as $keyword) {
 						$criteria->add(new Criteria('`title`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE'));
 					}
 					break;
 			}
 			
-			if ($gid != 0 && $GLOBALS['songlistModuleConfig']['genre']) {
+			if ($gid!=0 && $GLOBALS['songlistModuleConfig']['genre']) {
 				$criteria->add(new Criteria('`gids`', '%"'.$gid.'"%', 'LIKE'));
 			}
 			
-			if ($vcid != 0 && $GLOBALS['songlistModuleConfig']['voice']) {
+			if ($vcid!=0 && $GLOBALS['songlistModuleConfig']['voice']) {
 				$criteria->add(new Criteria('`vcid`', $vcid));
 			}			
 
-			if ((isset($_GET['cid'])?($_GET['cid']):$cid) != 0) {
-				$criteria->add(new Criteria('`cid`',  (isset($_GET['cid'])?($_GET['cid']):$cid)));
+			if ((isset($_GET['cid']) ? ($_GET['cid']) : $cid)!=0) {
+				$criteria->add(new Criteria('`cid`', (isset($_GET['cid']) ? ($_GET['cid']) : $cid)));
 			}
 			
 			$pagenav = new XoopsPageNav($songs_handler->getCount($criteria), $limit, $start, 'start', "op=$op&fct=$fct&gid=$gid&vcid=$vcid&value=$value&limit=$limit");
@@ -343,14 +343,14 @@ 
 			
 			$xoopsOption['template_main'] = 'songlist_search_index.html';
 			include($GLOBALS['xoops']->path('/header.php'));
-			if ($GLOBALS['songlistModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
+			if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
 				$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, array('type'=>'text/javascript'));
-				$GLOBALS['loaded_jquery']=true;
+				$GLOBALS['loaded_jquery'] = true;
 			}
 			$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
 			$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);			
 			$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
-			foreach($songs as $song) {
+			foreach ($songs as $song) {
 				$GLOBALS['xoopsTpl']->append('results', $song->toArray(true));
 			}
 			$GLOBALS['xoopsTpl']->assign('songs', true);			

Braces +18 added lines, -12 removed lines

@@ -7,8 +7,9 @@ 
 	$category_handler = xoops_getmodulehandler('category', 'songlist');
 	$criteria_cat = new CriteriaCompo();
 	$cids = $category_handler->GetCatAndSubCat($_SESSION['cid']);
-	if ($_SESSION['cid']>0)
-		$cids[$_SESSION['cid']] = $_SESSION['cid'];
+	if ($_SESSION['cid']>0) {
+			$cids[$_SESSION['cid']] = $_SESSION['cid'];
+	}
 	if (count($cids)>0&&$_SESSION['cid']!=0) {
 		$criteria_cat->add(new Criteria('`cid`', '('.implode(',',  $cids).')', 'IN'), 'OR');	
 	} else { 
@@ -82,8 +83,9 @@ 
 				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
 				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);			
 				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
-				foreach($songs as $song)
-					$GLOBALS['xoopsTpl']->append('results', $song->toArray(true));
+				foreach($songs as $song) {
+									$GLOBALS['xoopsTpl']->append('results', $song->toArray(true));
+				}
 				$GLOBALS['xoopsTpl']->assign('songs', true);			
 				$GLOBALS['xoopsTpl']->assign('categories', $cat);
 				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
@@ -93,8 +95,9 @@ 
 				$GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
 				if ($_SESSION['cid']!=0) {
 					$category = $category_handler->get($_SESSION['cid']);
-					if (is_object($category))
-						$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+					if (is_object($category)) {
+											$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+					}
 				}				
 				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
 				include($GLOBALS['xoops']->path('/footer.php'));
@@ -213,8 +216,9 @@ 
 					
 				}
 				$criteria = new CriteriaCompo($criteria_cat, 'AND');
-				if (count($ids)>0)
-					$criteria->add(new Criteria('abid', '('.implode(',', $ids).')', 'IN'));
+				if (count($ids)>0) {
+									$criteria->add(new Criteria('abid', '('.implode(',', $ids).')', 'IN'));
+				}
 				break;
 			}
 			
@@ -241,8 +245,9 @@ 
 			$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
 			$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
 			$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
-			foreach($songs as $song)
-				$GLOBALS['xoopsTpl']->append('results', $song->toArray(true));
+			foreach($songs as $song) {
+							$GLOBALS['xoopsTpl']->append('results', $song->toArray(true));
+			}
 			$GLOBALS['xoopsTpl']->assign('songs', true);
 			$GLOBALS['xoopsTpl']->assign('categories', $cat);
 			$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
@@ -252,8 +257,9 @@ 
 			$GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
 			if ($_SESSION['cid']!=0) {
 				$category = $category_handler->get($_SESSION['cid']);
-				if (is_object($category))
-					$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+				if (is_object($category)) {
+									$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+				}
 			}
 			$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
 			include($GLOBALS['xoops']->path('/footer.php'));

htdocs/modules/songlist/language/english/modinfo.php

Spacing +81 added lines, -81 removed lines

@@ -1,103 +1,103 @@
 <?php
 
 	// XOOPS Version
-	define('_MI_SONGLIST_NAME','Songlist');
-	define('_MI_SONGLIST_DESC','Karioki Songlist - a module for keeping karioki song lists and ranking of them.');
-	define('_MI_SONGLIST_DIRNAME','songlist');
+	define('_MI_SONGLIST_NAME', 'Songlist');
+	define('_MI_SONGLIST_DESC', 'Karioki Songlist - a module for keeping karioki song lists and ranking of them.');
+	define('_MI_SONGLIST_DIRNAME', 'songlist');
 	
 	// Form langauges
-	define('_MI_SONGLIST_NONE','None');
-	define('_MI_SONGLIST_ALL','All');
-	define('_MI_SONGLIST_OFTEN',' of 10.00');
+	define('_MI_SONGLIST_NONE', 'None');
+	define('_MI_SONGLIST_ALL', 'All');
+	define('_MI_SONGLIST_OFTEN', ' of 10.00');
 	
 	// Javascripts and style sheets
-	define('_MI_SONGLIST_JQUERY','/browse.php?Frameworks/jquery/jquery.js');
-	define('_MI_SONGLIST_STYLESHEET','/modules/songlist/css/songlist.css');
+	define('_MI_SONGLIST_JQUERY', '/browse.php?Frameworks/jquery/jquery.js');
+	define('_MI_SONGLIST_STYLESHEET', '/modules/songlist/css/songlist.css');
 	
 	// Admin Menus
-	define('_MI_SONGLIST_ADMENU_DASHBOARD','Dashboard');
-	define('_MI_SONGLIST_ADMENU_CATEGORY','Category\'s');
-	define('_MI_SONGLIST_ADMENU_ALBUMS','Albums');
-	define('_MI_SONGLIST_ADMENU_ARTISTS','Artists');
-	define('_MI_SONGLIST_ADMENU_SONGS','Songs');
-	define('_MI_SONGLIST_ADMENU_GENRE','Genre');
-	define('_MI_SONGLIST_ADMENU_VOICE','Voice');
-	define('_MI_SONGLIST_ADMENU_VOTE','Votes');
-	define('_MI_SONGLIST_ADMENU_PERMISSIONS','Permissions');
-	define('_MI_SONGLIST_ADMENU_REQUESTS','Requests');
-	define('_MI_SONGLIST_ADMENU_UTF8MAP','UTF8 Map');
-	define('_MI_SONGLIST_ADMENU_IMPORT','Import');
-	define('_MI_SONGLIST_ADMENU_FIELDS','Fields');
-	define('_MI_SONGLIST_ADMENU_FIELDSPERMS','Field Permissions');
-	define('_MI_SONGLIST_ADMENU_ABOUT','About Songlist');
+	define('_MI_SONGLIST_ADMENU_DASHBOARD', 'Dashboard');
+	define('_MI_SONGLIST_ADMENU_CATEGORY', 'Category\'s');
+	define('_MI_SONGLIST_ADMENU_ALBUMS', 'Albums');
+	define('_MI_SONGLIST_ADMENU_ARTISTS', 'Artists');
+	define('_MI_SONGLIST_ADMENU_SONGS', 'Songs');
+	define('_MI_SONGLIST_ADMENU_GENRE', 'Genre');
+	define('_MI_SONGLIST_ADMENU_VOICE', 'Voice');
+	define('_MI_SONGLIST_ADMENU_VOTE', 'Votes');
+	define('_MI_SONGLIST_ADMENU_PERMISSIONS', 'Permissions');
+	define('_MI_SONGLIST_ADMENU_REQUESTS', 'Requests');
+	define('_MI_SONGLIST_ADMENU_UTF8MAP', 'UTF8 Map');
+	define('_MI_SONGLIST_ADMENU_IMPORT', 'Import');
+	define('_MI_SONGLIST_ADMENU_FIELDS', 'Fields');
+	define('_MI_SONGLIST_ADMENU_FIELDSPERMS', 'Field Permissions');
+	define('_MI_SONGLIST_ADMENU_ABOUT', 'About Songlist');
 	
 	//User Menus
-	define('_MI_SONGLIST_MENU_ARTISTS','Browse Artists');
-	define('_MI_SONGLIST_MENU_ALBUMS','Browse Albums');
-	define('_MI_SONGLIST_MENU_SEARCH','Search for a song');
-	define('_MI_SONGLIST_MENU_REQUEST','Request a Listing');
+	define('_MI_SONGLIST_MENU_ARTISTS', 'Browse Artists');
+	define('_MI_SONGLIST_MENU_ALBUMS', 'Browse Albums');
+	define('_MI_SONGLIST_MENU_SEARCH', 'Search for a song');
+	define('_MI_SONGLIST_MENU_REQUEST', 'Request a Listing');
 	
 	// Blocks
-	define('_MI_SONGLIST_BLOCK_TOP_ARTIST','Top Artist');
-	define('_MI_SONGLIST_BLOCK_POPULAR_ARTISTS','Top Popular Artists');
-	define('_MI_SONGLIST_BLOCK_TOP_ALBUM','Top Album');
-	define('_MI_SONGLIST_BLOCK_POPULAR_ALBUMS','Top Popular Albums');
-	define('_MI_SONGLIST_BLOCK_TOP_GENRE','Top Genre');
-	define('_MI_SONGLIST_BLOCK_POPULAR_GENRES','Top Popular Genre\'s');
-	define('_MI_SONGLIST_BLOCK_TOP_SONG','Top Song');
-	define('_MI_SONGLIST_BLOCK_POPULAR_SONGS','Top Popular Songs');
+	define('_MI_SONGLIST_BLOCK_TOP_ARTIST', 'Top Artist');
+	define('_MI_SONGLIST_BLOCK_POPULAR_ARTISTS', 'Top Popular Artists');
+	define('_MI_SONGLIST_BLOCK_TOP_ALBUM', 'Top Album');
+	define('_MI_SONGLIST_BLOCK_POPULAR_ALBUMS', 'Top Popular Albums');
+	define('_MI_SONGLIST_BLOCK_TOP_GENRE', 'Top Genre');
+	define('_MI_SONGLIST_BLOCK_POPULAR_GENRES', 'Top Popular Genre\'s');
+	define('_MI_SONGLIST_BLOCK_TOP_SONG', 'Top Song');
+	define('_MI_SONGLIST_BLOCK_POPULAR_SONGS', 'Top Popular Songs');
 	
 	// Preferences
-	define('_MI_SONGLIST_EDITORS','Editor to Use');
-	define('_MI_SONGLIST_EDITORS_DESC','');
-	define('_MI_SONGLIST_SALT','Encryption Salt');
-	define('_MI_SONGLIST_SALT_DESC','');
-	define('_MI_SONGLIST_EMAIL','Email to send requests to');
-	define('_MI_SONGLIST_EMAIL_DESC','Seperated with a pipe symbol ie. <em>email@address1.com|email@address2.com|email@address3.com</em>');
-	define('_MI_SONGLIST_FILESIZEUPLD','Filesize Upload Allowed');
-	define('_MI_SONGLIST_FILESIZEUPLD_DESC','');
-	define('_MI_SONGLIST_ALLOWEDMIMETYPE','File mimetypes Allowed');
-	define('_MI_SONGLIST_ALLOWEDMIMETYPE_DESC','');
-	define('_MI_SONGLIST_ALLOWEDEXTENSIONS','File Extensions Allowed');
-	define('_MI_SONGLIST_ALLOWEDEXTENSIONS_DESC','');
-	define('_MI_SONGLIST_UPLOADAREAS','Upload path');
-	define('_MI_SONGLIST_UPLOADAREAS_DESC','');
-	define('_MI_SONGLIST_ALBUM','Support Albums?');
-	define('_MI_SONGLIST_ALBUM_DESC','');
-	define('_MI_SONGLIST_GENRE','Support Genre?');
-	define('_MI_SONGLIST_GENRE_DESC','');
-	define('_MI_SONGLIST_VOICE','Support Voice?');
-	define('_MI_SONGLIST_VOICE_DESC','');	
-	define('_MI_SONGLIST_SINGER','Allow Singer Type in Search?');
-	define('_MI_SONGLIST_SINGER_DESC','');
-	define('_MI_SONGLIST_HTACCESS','SEO Supported (see doc/.htaccess)');
-	define('_MI_SONGLIST_HTACCESS_DESC','');
-	define('_MI_SONGLIST_HTACCESS_BASEOFURL','Base of SEO URL');
-	define('_MI_SONGLIST_HTACCESS_BASEOFURL_DESC','');
-	define('_MI_SONGLIST_HTACCESS_ENDOFURL','End of SEO URL');
-	define('_MI_SONGLIST_HTACCESS_ENDOFURL_DESC','');
-	define('_MI_SONGLIST_TAGS','Support Tag 2.3 Module?');
-	define('_MI_SONGLIST_TAGS_DESC','');
-	define('_MI_SONGLIST_FORCE_JQUERY','For JQuery Loading');
-	define('_MI_SONGLIST_FORCE_JQUERY_DESC','For themes without JQuery!');
-	define('_MI_SONGLIST_COLS','Columns in table');
-	define('_MI_SONGLIST_COLS_DESC','Columns in table before pagination.');
-	define('_MI_SONGLIST_ROWS','Rows in table');
-	define('_MI_SONGLIST_ROWS_DESC','Rows in table before pagination.');
+	define('_MI_SONGLIST_EDITORS', 'Editor to Use');
+	define('_MI_SONGLIST_EDITORS_DESC', '');
+	define('_MI_SONGLIST_SALT', 'Encryption Salt');
+	define('_MI_SONGLIST_SALT_DESC', '');
+	define('_MI_SONGLIST_EMAIL', 'Email to send requests to');
+	define('_MI_SONGLIST_EMAIL_DESC', 'Seperated with a pipe symbol ie. <em>email@address1.com|email@address2.com|email@address3.com</em>');
+	define('_MI_SONGLIST_FILESIZEUPLD', 'Filesize Upload Allowed');
+	define('_MI_SONGLIST_FILESIZEUPLD_DESC', '');
+	define('_MI_SONGLIST_ALLOWEDMIMETYPE', 'File mimetypes Allowed');
+	define('_MI_SONGLIST_ALLOWEDMIMETYPE_DESC', '');
+	define('_MI_SONGLIST_ALLOWEDEXTENSIONS', 'File Extensions Allowed');
+	define('_MI_SONGLIST_ALLOWEDEXTENSIONS_DESC', '');
+	define('_MI_SONGLIST_UPLOADAREAS', 'Upload path');
+	define('_MI_SONGLIST_UPLOADAREAS_DESC', '');
+	define('_MI_SONGLIST_ALBUM', 'Support Albums?');
+	define('_MI_SONGLIST_ALBUM_DESC', '');
+	define('_MI_SONGLIST_GENRE', 'Support Genre?');
+	define('_MI_SONGLIST_GENRE_DESC', '');
+	define('_MI_SONGLIST_VOICE', 'Support Voice?');
+	define('_MI_SONGLIST_VOICE_DESC', '');	
+	define('_MI_SONGLIST_SINGER', 'Allow Singer Type in Search?');
+	define('_MI_SONGLIST_SINGER_DESC', '');
+	define('_MI_SONGLIST_HTACCESS', 'SEO Supported (see doc/.htaccess)');
+	define('_MI_SONGLIST_HTACCESS_DESC', '');
+	define('_MI_SONGLIST_HTACCESS_BASEOFURL', 'Base of SEO URL');
+	define('_MI_SONGLIST_HTACCESS_BASEOFURL_DESC', '');
+	define('_MI_SONGLIST_HTACCESS_ENDOFURL', 'End of SEO URL');
+	define('_MI_SONGLIST_HTACCESS_ENDOFURL_DESC', '');
+	define('_MI_SONGLIST_TAGS', 'Support Tag 2.3 Module?');
+	define('_MI_SONGLIST_TAGS_DESC', '');
+	define('_MI_SONGLIST_FORCE_JQUERY', 'For JQuery Loading');
+	define('_MI_SONGLIST_FORCE_JQUERY_DESC', 'For themes without JQuery!');
+	define('_MI_SONGLIST_COLS', 'Columns in table');
+	define('_MI_SONGLIST_COLS_DESC', 'Columns in table before pagination.');
+	define('_MI_SONGLIST_ROWS', 'Rows in table');
+	define('_MI_SONGLIST_ROWS_DESC', 'Rows in table before pagination.');
 	
 	// Version 1.11
 	// Preferences
-	define('_MI_SONGLIST_MEMORY_ADMIN','Memory Limit for Admin');
-	define('_MI_SONGLIST_MEMORY_ADMIN_DESC','This is the memory limit in megabytes for the admin of songlist, you may have to increase this over a certain amount of records.');
-	define('_MI_SONGLIST_MEMORY_USER','Memory Limit for User Interface');
-	define('_MI_SONGLIST_MEMORY_USER_DESC','This is the memory limit in megabytes for the user interface of songlist, you may have to increase this over a certain amount of records.');
-	define('_MI_SONGLIST_TIME_ADMIN','Second Limit of Execution for Admin');
-	define('_MI_SONGLIST_TIME_ADMIN_DESC','This is the time limit in megabytes for the admin of songlist, you may have to increase this over a certain amount of records.');
-	define('_MI_SONGLIST_TIME_USER','Second Limit of Execution for User Interface');
-	define('_MI_SONGLIST_TIME_USER_DESC','This is the time limit in megabytes for the user interface of songlist, you may have to increase this over a certain amount of records.');
+	define('_MI_SONGLIST_MEMORY_ADMIN', 'Memory Limit for Admin');
+	define('_MI_SONGLIST_MEMORY_ADMIN_DESC', 'This is the memory limit in megabytes for the admin of songlist, you may have to increase this over a certain amount of records.');
+	define('_MI_SONGLIST_MEMORY_USER', 'Memory Limit for User Interface');
+	define('_MI_SONGLIST_MEMORY_USER_DESC', 'This is the memory limit in megabytes for the user interface of songlist, you may have to increase this over a certain amount of records.');
+	define('_MI_SONGLIST_TIME_ADMIN', 'Second Limit of Execution for Admin');
+	define('_MI_SONGLIST_TIME_ADMIN_DESC', 'This is the time limit in megabytes for the admin of songlist, you may have to increase this over a certain amount of records.');
+	define('_MI_SONGLIST_TIME_USER', 'Second Limit of Execution for User Interface');
+	define('_MI_SONGLIST_TIME_USER_DESC', 'This is the time limit in megabytes for the user interface of songlist, you may have to increase this over a certain amount of records.');
 	
 	// version 1.12
-	define('_MI_SONGLIST_LYRICS','Display Lyrics in Results?');
-	define('_MI_SONGLIST_LYRICS_DESC','If you enable this the lyrics will be displayed in the search results!');
+	define('_MI_SONGLIST_LYRICS', 'Display Lyrics in Results?');
+	define('_MI_SONGLIST_LYRICS_DESC', 'If you enable this the lyrics will be displayed in the search results!');
 
 ?>

htdocs/modules/songlist/list.tag.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php
 include "header.php";
-include XOOPS_ROOT_PATH . "/modules/tag/list.tag.php";
+include XOOPS_ROOT_PATH."/modules/tag/list.tag.php";
 ?>
\ No newline at end of file

htdocs/modules/songlist/search.php

Switch Indentation +7 added lines, -7 removed lines

@@ -116,13 +116,13 @@
 			
 		case "category":
 			switch ($fct) {
-			default:
-			case "set":
-				$_SESSION['cid'] = $id;
-				break;
-			case "home":
-				unset($_SESSION['cid']);
-				break;
+				default:
+				case "set":
+					$_SESSION['cid'] = $id;
+					break;
+				case "home":
+					unset($_SESSION['cid']);
+					break;
 			}
 			redirect_header($_SERVER["PHP_SELF"]."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MN_SONGLIST_MSG_CATEGORYCHANGED);
 			exit;

Spacing +16 added lines, -16 removed lines

@@ -4,7 +4,7 @@ 
 	
 	global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit, $singer;
 	
-	$category_element = new SonglistFormSelectCategory('', 'cid', (isset($_GET['cid'])?($_GET['cid']):$cid));
+	$category_element = new SonglistFormSelectCategory('', 'cid', (isset($_GET['cid']) ? ($_GET['cid']) : $cid));
 	$genre_element = new SonglistFormSelectGenre('', 'gid', $gid);
 	$voice_element = new SonglistFormSelectVoice('', 'vcid', $vcid);
 			
@@ -19,7 +19,7 @@ 
 			
 			$url = $songs_handler->getSearchURL();
 			if (!strpos($url, $_SERVER['REQUEST_URI'])) {
-				header( "HTTP/1.1 301 Moved Permanently" ); 
+				header("HTTP/1.1 301 Moved Permanently"); 
 				header('Location: '.$url);
 				exit(0);
 			}
@@ -28,7 +28,7 @@ 
 				default:
 				case "titleandlyrics":
 					$criteria = new CriteriaCompo();
-					foreach(explode(' ' , $value) as $keyword) {
+					foreach (explode(' ', $value) as $keyword) {
 						$criteria->add(new Criteria('`title`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE'));
 						$criteria->add(new Criteria('`lyrics`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE'));
 					}
@@ -36,52 +36,52 @@ 
 					
 				case "albums":
 					$criteria = new CriteriaCompo();
-					foreach(explode(' ' , $value) as $keyword) {
+					foreach (explode(' ', $value) as $keyword) {
 						$criteria->add(new Criteria('`title`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE'));
 					}
 					$albums = $albums_handler->getObject($criteria, true);
 					$criteria = new CriteriaCompo();
-					foreach($albums as $abid=> $album) {
+					foreach ($albums as $abid=> $album) {
 						$criteria->add(new Criteria('`abid`', $abid), 'OR');
 					}
 					break;
 				
 				case "artists":
 					$criteria = new CriteriaCompo();
-					foreach(explode(' ' , $value) as $keyword) {
+					foreach (explode(' ', $value) as $keyword) {
 						$criteria->add(new Criteria('`name`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE'));
 					}
 					$artists = $artists_handler->getObject($criteria, true);
 					$criteria = new CriteriaCompo();
-					foreach($artists as $aid=> $artist) {
+					foreach ($artists as $aid=> $artist) {
 						$criteria->add(new Criteria('`aids`', '%"'.$aid.'"%', 'LIKE'), 'OR');
 					}
 					break;				
 				
 				case "lyrics":
 					$criteria = new CriteriaCompo();
-					foreach(explode(' ' , $value) as $keyword) {
+					foreach (explode(' ', $value) as $keyword) {
 						$criteria->add(new Criteria('`lyrics`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE'));
 					}
 					break;
 				case "title":
 					$criteria = new CriteriaCompo();
-					foreach(explode(' ' , $value) as $keyword) {
+					foreach (explode(' ', $value) as $keyword) {
 						$criteria->add(new Criteria('`title`', '%'.$utf8map_handler->convert($keyword).'%', 'LIKE'));
 					}
 					break;
 			}
 			
-			if ($gid != 0 && $GLOBALS['songlistModuleConfig']['genre']) {
+			if ($gid!=0 && $GLOBALS['songlistModuleConfig']['genre']) {
 				$criteria->add(new Criteria('`gids`', '%"'.$gid.'"%', 'LIKE'));
 			}
 			
-			if ($vcid != 0 && $GLOBALS['songlistModuleConfig']['voice']) {
+			if ($vcid!=0 && $GLOBALS['songlistModuleConfig']['voice']) {
 				$criteria->add(new Criteria('`vcid`', $vcid));
 			}			
 
-			if ((isset($_GET['cid'])?($_GET['cid']):$cid) != 0) {
-				$criteria->add(new Criteria('`cid`',  (isset($_GET['cid'])?($_GET['cid']):$cid)));
+			if ((isset($_GET['cid']) ? ($_GET['cid']) : $cid)!=0) {
+				$criteria->add(new Criteria('`cid`', (isset($_GET['cid']) ? ($_GET['cid']) : $cid)));
 			}
 			
 			$pagenav = new XoopsPageNav($songs_handler->getCount($criteria), $limit, $start, 'start', "?op=$op&fct=$fct&gid=$gid&vcid=$vcid&value=$value&limit=$limit");
@@ -93,14 +93,14 @@ 
 			
 			$xoopsOption['template_main'] = 'songlist_search_index.html';
 			include($GLOBALS['xoops']->path('/header.php'));
-			if ($GLOBALS['songlistModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
+			if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
 				$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, array('type'=>'text/javascript'));
-				$GLOBALS['loaded_jquery']=true;
+				$GLOBALS['loaded_jquery'] = true;
 			}
 			$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
 			$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);			
 			$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
-			foreach($songs as $song) {
+			foreach ($songs as $song) {
 				$GLOBALS['xoopsTpl']->append('results', $song->toArray(true));
 			}
 			$GLOBALS['xoopsTpl']->assign('songs', true);			

htdocs/modules/songlist/request.php

Switch Indentation +28 added lines, -28 removed lines

@@ -23,37 +23,37 @@
 			}
 			
 			switch ($fct) {
-			case "save":
-				if (checkEmail($_POST[0]['email'], true)&&!empty($_POST[0]['email'])) {
-					$request = $requests_handler->create();
-					$request->setVars($_POST[0]);
-					if ($rid = $requests_handler->insert($request)) {
-						redirect_header($_SERVER["PHP_SELF"]."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MN_SONGLIST_MSG_REQUESTSENT);
+				case "save":
+					if (checkEmail($_POST[0]['email'], true)&&!empty($_POST[0]['email'])) {
+						$request = $requests_handler->create();
+						$request->setVars($_POST[0]);
+						if ($rid = $requests_handler->insert($request)) {
+							redirect_header($_SERVER["PHP_SELF"]."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MN_SONGLIST_MSG_REQUESTSENT);
+						} else {
+							redirect_header($_SERVER["PHP_SELF"]."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MN_SONGLIST_MSG_REQUESTNOTSENT);
+						}
+						exit;
+						break;
 					} else {
-						redirect_header($_SERVER["PHP_SELF"]."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MN_SONGLIST_MSG_REQUESTNOTSENT);
+						$error = _MN_SONGLIST_MSG_EMAILNOTSET;
 					}
-					exit;
-					break;
-				} else {
-					$error = _MN_SONGLIST_MSG_EMAILNOTSET;
-				}
-			default:
-			case "list":
+				default:
+				case "list":
 							
-				$xoopsOption['template_main'] = 'songlist_requests_index.html';
-				include($GLOBALS['xoops']->path('/header.php'));
-				if ($GLOBALS['songlistModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
-					$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, array('type'=>'text/javascript'));
-					$GLOBALS['loaded_jquery']=true;
-				}
-				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
-				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);			
-				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
-				$GLOBALS['xoopsTpl']->assign('form', songlist_requests_get_form(false, false));			
-				if (strlen($error))
-					xoops_error($error);
-				include($GLOBALS['xoops']->path('/footer.php'));
-				break;
+					$xoopsOption['template_main'] = 'songlist_requests_index.html';
+					include($GLOBALS['xoops']->path('/header.php'));
+					if ($GLOBALS['songlistModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
+						$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, array('type'=>'text/javascript'));
+						$GLOBALS['loaded_jquery']=true;
+					}
+					$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
+					$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);			
+					$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
+					$GLOBALS['xoopsTpl']->assign('form', songlist_requests_get_form(false, false));			
+					if (strlen($error))
+						xoops_error($error);
+					include($GLOBALS['xoops']->path('/footer.php'));
+					break;
 
 			
 			}

Spacing +6 added lines, -6 removed lines

@@ -4,7 +4,7 @@ 
 	
 	global $file, $op, $fct, $id, $value, $gid, $cid, $singer, $start, $limit;
 	
-	$category_element = new SonglistFormSelectCategory('', 'cid', (isset($_GET['cid'])?($_GET['cid']):$cid));
+	$category_element = new SonglistFormSelectCategory('', 'cid', (isset($_GET['cid']) ? ($_GET['cid']) : $cid));
 	$genre_element = new SonglistFormSelectGenre('', 'gid', $gid);
 	$genre_element = new SonglistFormSelectGenre('', 'vid', $vid);	
 	//$singer_element = new SonglistFormSelectSinger('', 'singer', $singer);
@@ -16,15 +16,15 @@ 
 		case "request":
 			
 			$url = $requests_handler->getURL();
-			if (!strpos($url, $_SERVER['REQUEST_URI'])&&empty($_POST)) {
-				header( "HTTP/1.1 301 Moved Permanently" ); 
+			if (!strpos($url, $_SERVER['REQUEST_URI']) && empty($_POST)) {
+				header("HTTP/1.1 301 Moved Permanently"); 
 				header('Location: '.$url);
 				exit(0);
 			}
 			
 			switch ($fct) {
 			case "save":
-				if (checkEmail($_POST[0]['email'], true)&&!empty($_POST[0]['email'])) {
+				if (checkEmail($_POST[0]['email'], true) && !empty($_POST[0]['email'])) {
 					$request = $requests_handler->create();
 					$request->setVars($_POST[0]);
 					if ($rid = $requests_handler->insert($request)) {
@@ -42,9 +42,9 @@ 
 							
 				$xoopsOption['template_main'] = 'songlist_requests_index.html';
 				include($GLOBALS['xoops']->path('/header.php'));
-				if ($GLOBALS['songlistModuleConfig']['force_jquery']&&!isset($GLOBALS['loaded_jquery'])) {
+				if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
 					$GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, array('type'=>'text/javascript'));
-					$GLOBALS['loaded_jquery']=true;
+					$GLOBALS['loaded_jquery'] = true;
 				}
 				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
 				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);			

Braces +3 added lines, -2 removed lines

@@ -50,8 +50,9 @@
 				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);			
 				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
 				$GLOBALS['xoopsTpl']->assign('form', songlist_requests_get_form(false, false));			
-				if (strlen($error))
-					xoops_error($error);
+				if (strlen($error)) {
+									xoops_error($error);
+				}
 				include($GLOBALS['xoops']->path('/footer.php'));
 				break;
 

htdocs/modules/tag/plugin/songlist.php

Indentation +56 added lines, -56 removed lines

@@ -3,37 +3,37 @@ 
 
 function songlist_tag_iteminfo(&$items)
 {
-    if (empty($items) || !is_array($items)) {
-        return false;
-    }
+	if (empty($items) || !is_array($items)) {
+		return false;
+	}
     
-    $items_id = array();
-    foreach (array_keys($items) as $cat_id) {
-        // Some handling here to build the link upon catid
-        // catid is not used in songlist, so just skip it
-        foreach (array_keys($items[$cat_id]) as $item_id) {
-            // In songlist, the item_id is "topic_id"
-            $items_id[] = intval($item_id);
-        }
-    }
-    $item_handler =& xoops_getmodulehandler('songs', 'songlist');
-    $items_obj = $item_handler->getObjects(new Criteria("sid", "(" . implode(", ", $items_id) . ")", "IN"), true);
-    $myts = MyTextSanitizer::getInstance();
-    foreach (array_keys($items) as $cat_id) {
-        foreach (array_keys($items[$cat_id]) as $item_id) {
-            $item_obj =& $items_obj[$item_id];
-            if (is_object($item_obj))
+	$items_id = array();
+	foreach (array_keys($items) as $cat_id) {
+		// Some handling here to build the link upon catid
+		// catid is not used in songlist, so just skip it
+		foreach (array_keys($items[$cat_id]) as $item_id) {
+			// In songlist, the item_id is "topic_id"
+			$items_id[] = intval($item_id);
+		}
+	}
+	$item_handler =& xoops_getmodulehandler('songs', 'songlist');
+	$items_obj = $item_handler->getObjects(new Criteria("sid", "(" . implode(", ", $items_id) . ")", "IN"), true);
+	$myts = MyTextSanitizer::getInstance();
+	foreach (array_keys($items) as $cat_id) {
+		foreach (array_keys($items[$cat_id]) as $item_id) {
+			$item_obj =& $items_obj[$item_id];
+			if (is_object($item_obj))
 			$items[$cat_id][$item_id] = array(
-                "title"     => $item_obj->getVar("title"),
-                "uid"       => $item_obj->getVar("uid"),
-                "link"      => 'index.php?op=item&fct=item&id='.$item_obj->getVar("sid").'&cid='.$item_obj->getVar("cid"),
-                "time"      => $item_obj->getVar("date"),
-                "tags"      => tag_parse_tag($item_obj->getVar("tags", "n")),
-                "content"   => $myts->displayTarea($item_obj->getVar("lyrics"),true,true,true,true,true,true)
-                );
-        }
-    }
-    unset($items_obj);    
+				"title"     => $item_obj->getVar("title"),
+				"uid"       => $item_obj->getVar("uid"),
+				"link"      => 'index.php?op=item&fct=item&id='.$item_obj->getVar("sid").'&cid='.$item_obj->getVar("cid"),
+				"time"      => $item_obj->getVar("date"),
+				"tags"      => tag_parse_tag($item_obj->getVar("tags", "n")),
+				"content"   => $myts->displayTarea($item_obj->getVar("lyrics"),true,true,true,true,true,true)
+				);
+		}
+	}
+	unset($items_obj);    
 }
 
 /**
@@ -44,33 +44,33 @@ 
  */
 function songlist_tag_synchronization($mid)
 {
-    $item_handler =& xoops_getmodulehandler('songs', 'songlist');
-    $link_handler =& xoops_getmodulehandler("link", "tag");
+	$item_handler =& xoops_getmodulehandler('songs', 'songlist');
+	$link_handler =& xoops_getmodulehandler("link", "tag");
         
-    /* clear tag-item links */
-    if (version_compare( mysql_get_server_info(), "4.1.0", "ge" )):
-    $sql =  "    DELETE FROM {$link_handler->table}" .
-            "    WHERE " .
-            "        tag_modid = {$mid}" .
-            "        AND " .
-            "        ( tag_itemid NOT IN " .
-            "            ( SELECT DISTINCT {$item_handler->keyName} " .
-            "                FROM {$item_handler->table} " .
-            "                WHERE {$item_handler->table}.approved > 0" .
-            "            ) " .
-            "        )";
-    else:
-    $sql =  "    DELETE {$link_handler->table} FROM {$link_handler->table}" .
-            "    LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} " .
-            "    WHERE " .
-            "        tag_modid = {$mid}" .
-            "        AND " .
-            "        ( aa.{$item_handler->keyName} IS NULL" .
-            "            OR aa.approved < 1" .
-            "        )";
-    endif;
-    if (!$result = $link_handler->db->queryF($sql)) {
-        //xoops_error($link_handler->db->error());
-    }
+	/* clear tag-item links */
+	if (version_compare( mysql_get_server_info(), "4.1.0", "ge" )):
+	$sql =  "    DELETE FROM {$link_handler->table}" .
+			"    WHERE " .
+			"        tag_modid = {$mid}" .
+			"        AND " .
+			"        ( tag_itemid NOT IN " .
+			"            ( SELECT DISTINCT {$item_handler->keyName} " .
+			"                FROM {$item_handler->table} " .
+			"                WHERE {$item_handler->table}.approved > 0" .
+			"            ) " .
+			"        )";
+	else:
+	$sql =  "    DELETE {$link_handler->table} FROM {$link_handler->table}" .
+			"    LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} " .
+			"    WHERE " .
+			"        tag_modid = {$mid}" .
+			"        AND " .
+			"        ( aa.{$item_handler->keyName} IS NULL" .
+			"            OR aa.approved < 1" .
+			"        )";
+	endif;
+	if (!$result = $link_handler->db->queryF($sql)) {
+		//xoops_error($link_handler->db->error());
+	}
 }
 ?>
\ No newline at end of file

Spacing +23 added lines, -23 removed lines

@@ -16,12 +16,12 @@ 
             $items_id[] = intval($item_id);
         }
     }
-    $item_handler =& xoops_getmodulehandler('songs', 'songlist');
-    $items_obj = $item_handler->getObjects(new Criteria("sid", "(" . implode(", ", $items_id) . ")", "IN"), true);
+    $item_handler = & xoops_getmodulehandler('songs', 'songlist');
+    $items_obj = $item_handler->getObjects(new Criteria("sid", "(".implode(", ", $items_id).")", "IN"), true);
     $myts = MyTextSanitizer::getInstance();
     foreach (array_keys($items) as $cat_id) {
         foreach (array_keys($items[$cat_id]) as $item_id) {
-            $item_obj =& $items_obj[$item_id];
+            $item_obj = & $items_obj[$item_id];
             if (is_object($item_obj))
 			$items[$cat_id][$item_id] = array(
                 "title"     => $item_obj->getVar("title"),
@@ -29,7 +29,7 @@ 
                 "link"      => 'index.php?op=item&fct=item&id='.$item_obj->getVar("sid").'&cid='.$item_obj->getVar("cid"),
                 "time"      => $item_obj->getVar("date"),
                 "tags"      => tag_parse_tag($item_obj->getVar("tags", "n")),
-                "content"   => $myts->displayTarea($item_obj->getVar("lyrics"),true,true,true,true,true,true)
+                "content"   => $myts->displayTarea($item_obj->getVar("lyrics"), true, true, true, true, true, true)
                 );
         }
     }
@@ -44,29 +44,29 @@ 
  */
 function songlist_tag_synchronization($mid)
 {
-    $item_handler =& xoops_getmodulehandler('songs', 'songlist');
-    $link_handler =& xoops_getmodulehandler("link", "tag");
+    $item_handler = & xoops_getmodulehandler('songs', 'songlist');
+    $link_handler = & xoops_getmodulehandler("link", "tag");
         
     /* clear tag-item links */
-    if (version_compare( mysql_get_server_info(), "4.1.0", "ge" )):
-    $sql =  "    DELETE FROM {$link_handler->table}" .
-            "    WHERE " .
-            "        tag_modid = {$mid}" .
-            "        AND " .
-            "        ( tag_itemid NOT IN " .
-            "            ( SELECT DISTINCT {$item_handler->keyName} " .
-            "                FROM {$item_handler->table} " .
-            "                WHERE {$item_handler->table}.approved > 0" .
-            "            ) " .
+    if (version_compare(mysql_get_server_info(), "4.1.0", "ge")):
+    $sql = "    DELETE FROM {$link_handler->table}".
+            "    WHERE ".
+            "        tag_modid = {$mid}".
+            "        AND ".
+            "        ( tag_itemid NOT IN ".
+            "            ( SELECT DISTINCT {$item_handler->keyName} ".
+            "                FROM {$item_handler->table} ".
+            "                WHERE {$item_handler->table}.approved > 0".
+            "            ) ".
             "        )";
     else:
-    $sql =  "    DELETE {$link_handler->table} FROM {$link_handler->table}" .
-            "    LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} " .
-            "    WHERE " .
-            "        tag_modid = {$mid}" .
-            "        AND " .
-            "        ( aa.{$item_handler->keyName} IS NULL" .
-            "            OR aa.approved < 1" .
+    $sql = "    DELETE {$link_handler->table} FROM {$link_handler->table}".
+            "    LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} ".
+            "    WHERE ".
+            "        tag_modid = {$mid}".
+            "        AND ".
+            "        ( aa.{$item_handler->keyName} IS NULL".
+            "            OR aa.approved < 1".
             "        )";
     endif;
     if (!$result = $link_handler->db->queryF($sql)) {

Braces +6 added lines, -3 removed lines

@@ -22,8 +22,8 @@ 
     foreach (array_keys($items) as $cat_id) {
         foreach (array_keys($items[$cat_id]) as $item_id) {
             $item_obj =& $items_obj[$item_id];
-            if (is_object($item_obj))
-			$items[$cat_id][$item_id] = array(
+            if (is_object($item_obj)) {
+            			$items[$cat_id][$item_id] = array(
                 "title"     => $item_obj->getVar("title"),
                 "uid"       => $item_obj->getVar("uid"),
                 "link"      => 'index.php?op=item&fct=item&id='.$item_obj->getVar("sid").'&cid='.$item_obj->getVar("cid"),
@@ -31,6 +31,7 @@ 
                 "tags"      => tag_parse_tag($item_obj->getVar("tags", "n")),
                 "content"   => $myts->displayTarea($item_obj->getVar("lyrics"),true,true,true,true,true,true)
                 );
+            }
         }
     }
     unset($items_obj);    
@@ -59,7 +60,8 @@ 
             "                WHERE {$item_handler->table}.approved > 0" .
             "            ) " .
             "        )";
-    else:
+    else {
+    	:
     $sql =  "    DELETE {$link_handler->table} FROM {$link_handler->table}" .
             "    LEFT JOIN {$item_handler->table} AS aa ON {$link_handler->table}.tag_itemid = aa.{$item_handler->keyName} " .
             "    WHERE " .
@@ -68,6 +70,7 @@ 
             "        ( aa.{$item_handler->keyName} IS NULL" .
             "            OR aa.approved < 1" .
             "        )";
+    }
     endif;
     if (!$result = $link_handler->db->queryF($sql)) {
         //xoops_error($link_handler->db->error());

blocks/songlist_popular_albums.php

Indentation +15 added lines, -15 removed lines

@@ -8,19 +8,19 @@ 
  */
 function b_songlist_popular_albums_show($options): ?array
 {
-    xoops_loadLanguage('blocks', 'songlist');
-    $handler = Helper::getInstance()->getHandler('Albums');
-    $objects = $handler->getTop($options[0]);
-    if (count($objects) > 0) {
-        $ret = [];
-        foreach ($objects as $id => $object) {
-            $ret[$id] = $object->toArray(true);
-        }
+	xoops_loadLanguage('blocks', 'songlist');
+	$handler = Helper::getInstance()->getHandler('Albums');
+	$objects = $handler->getTop($options[0]);
+	if (count($objects) > 0) {
+		$ret = [];
+		foreach ($objects as $id => $object) {
+			$ret[$id] = $object->toArray(true);
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    return null;
+	return null;
 }
 
 /**
@@ -29,9 +29,9 @@ 
  */
 function b_songlist_popular_albums_edit($options): string
 {
-    xoops_load('XoopsFormLoader');
-    xoops_loadLanguage('blocks', 'songlist');
-    $num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
+	xoops_load('XoopsFormLoader');
+	xoops_loadLanguage('blocks', 'songlist');
+	$num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
 
-    return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
+	return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
 }

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $handler = Helper::getInstance()->getHandler('Albums');
     $objects = $handler->getTop($options[0]);
-    if (count($objects) > 0) {
+    if (count($objects)>0) {
         $ret = [];
         foreach ($objects as $id => $object) {
             $ret[$id] = $object->toArray(true);
@@ -33,5 +33,5 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
 
-    return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
+    return _BL_SONGLIST_NUMBEROFITEMS.$num->render();
 }