[xoops-svn] SF.net SVN: xoops:[9191] XoopsModules/songlist

[<wis...@us...>]

Revision: 9191
          http://xoops.svn.sourceforge.net/xoops/?rev=9191&view=rev
Author:   wishcraft
Date:     2012-03-26 01:33:52 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
Karioki Song List 1.07 - complete first release final (sql/mysql.sql patch 2)

Modified Paths:
--------------
    XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/artists.php
    XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/header.php
    XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/albums.php
    XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/artists.php
    XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/albums.php
    XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/artists.php
    XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/category.php
    XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/genre.php
    XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/songs.php
    XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/header.php
    XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/index.php
    XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.sql
    XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/artists.php
    XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php
    XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php
    XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php
    XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php
    XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php
    XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php
    XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php
    XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php
    XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php
    XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php
    XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql

Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/artists.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/artists.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/artists.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -50,10 +50,10 @@
 				$criteria->setSort('`'.$GLOBALS['sort'].'`');
 				$criteria->setOrder($GLOBALS['order']);
 					
-				$artistss = $artists_handler->getObjects($criteria, true);
-				foreach($artistss as $cid => $artists) {
-					if (is_object($artists))					
-						$GLOBALS['xoopsTpl']->append('artists', $artists->toArray());
+				$artists = $artists_handler->getObjects($criteria, true);
+				foreach($artists as $cid => $artist) {
+					if (is_object($artist))					
+						$GLOBALS['xoopsTpl']->append('artists', $artist->toArray());
 				}
 				$GLOBALS['xoopsTpl']->assign('form', songlist_artists_get_form(false));
 				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);

Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/header.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/header.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/admin/header.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -89,4 +89,7 @@
 	xoops_loadLanguage('admin', 'songlist');
 
 	$GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist');	
+	
+	set_time_limit('320');
+	ini_set('memory_limit', '196M');
 ?>
\ No newline at end of file

Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/albums.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/albums.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/albums.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -6,8 +6,11 @@
 	
 	$category_handler = xoops_getmodulehandler('category', 'songlist');
 	$criteria_cat = new CriteriaCompo();
-	foreach($category_handler->GetCatAndSubCat($_SESSION['cid']) as $cid) {
-		$criteria_cat->add(new Criteria('`cid`', $cid, '='), 'OR');	
+	$cids = $category_handler->GetCatAndSubCat($_SESSION['cid']);
+	if (count($cids)>0) {
+		$criteria_cat->add(new Criteria('`cid`', '('.implode(',',  $cids).')', 'IN'), 'OR');	
+	} else { 
+		$criteria_cat->add(new Criteria('1', '1'), 'OR');
 	}
 	$criteria_cat->setSort('`created`');
 	$criteria_cat->setOrder('ASC');

Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/artists.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/artists.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/artists.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -6,9 +6,15 @@
 	
 	$category_handler = xoops_getmodulehandler('category', 'songlist');
 	$criteria_cat = new CriteriaCompo();
-	foreach($category_handler->GetCatAndSubCat($_SESSION['cid']) as $cid) {
-		$criteria_cat->add(new Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR');	
+	$cids = $category_handler->GetCatAndSubCat($_SESSION['cid']);
+	if (count($cids)>0) {
+		foreach($cids as $cid) {
+			$criteria_cat->add(new Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR');	
+		}	
+	} else { 
+		$criteria_cat->add(new Criteria('1', '1'), 'OR');
 	}
+	
 	$criteria_cat->setSort('`created`');
 	$criteria_cat->setOrder('ASC');
 	

Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/albums.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/albums.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/albums.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -219,19 +219,21 @@
     
     function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
     	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	$id = array();
-    	foreach($ret as $data) {
-    		if ($as_object==true) {
-    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
-    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
-    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
-    			}
-    		} else {
-    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
-    				$this->_objects['array'][$data[$this->keyName]] = $data;
-    				$id[$data[$this->keyName]] = $data[$this->keyName];;
-    			}
-    		}
+   		 if (!isset($GLOBALS['songlistAdmin'])) {
+	    	$id = array();
+	    	foreach($ret as $data) {
+	    		if ($as_object==true) {
+	    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
+	    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
+	    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
+	    			}
+	    		} else {
+	    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
+	    				$this->_objects['array'][$data[$this->keyName]] = $data;
+	    				$id[$data[$this->keyName]] = $data[$this->keyName];;
+	    			}
+	    		}
+	    	}
     	}
     	if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) {
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';

Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/artists.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/artists.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/artists.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -201,19 +201,21 @@
     
     function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
     	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	$id = array();
-    	foreach($ret as $data) {
-    		if ($as_object==true) {
-    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
-    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
-    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
-    			}
-    		} else {
-    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
-    				$this->_objects['array'][$data[$this->keyName]] = $data;
-    				$id[$data[$this->keyName]] = $data[$this->keyName];;
-    			}
-    		}
+    	if (!isset($GLOBALS['songlistAdmin'])) {
+	    	$id = array();
+	    	foreach($ret as $data) {
+	    		if ($as_object==true) {
+	    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
+	    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
+	    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
+	    			}
+	    		} else {
+	    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
+	    				$this->_objects['array'][$data[$this->keyName]] = $data;
+	    				$id[$data[$this->keyName]] = $data[$this->keyName];;
+	    			}
+	    		}
+	    	}
     	}
     	if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) {
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';

Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/category.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/category.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/category.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -162,19 +162,21 @@
     
     function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
     	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	$id = array();
-    	foreach($ret as $data) {
-    		if ($as_object==true) {
-    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
-    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
-    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
-    			}
-    		} else {
-    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
-    				$this->_objects['array'][$data[$this->keyName]] = $data;
-    				$id[$data[$this->keyName]] = $data[$this->keyName];;
-    			}
-    		}
+    	if (!isset($GLOBALS['songlistAdmin'])) {
+	    	$id = array();
+	    	foreach($ret as $data) {
+	    		if ($as_object==true) {
+	    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
+	    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
+	    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
+	    			}
+	    		} else {
+	    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
+	    				$this->_objects['array'][$data[$this->keyName]] = $data;
+	    				$id[$data[$this->keyName]] = $data[$this->keyName];;
+	    			}
+	    		}
+	    	}
     	}
     	if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) {
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';

Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/genre.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/genre.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/genre.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -127,19 +127,21 @@
     
     function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
     	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	$id = array();
-    	foreach($ret as $data) {
-    		if ($as_object==true) {
-    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
-    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
-    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
-    			}
-    		} else {
-    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
-    				$this->_objects['array'][$data[$this->keyName]] = $data;
-    				$id[$data[$this->keyName]] = $data[$this->keyName];;
-    			}
-    		}
+    	if (!isset($GLOBALS['songlistAdmin'])) {
+	    	$id = array();
+	    	foreach($ret as $data) {
+	    		if ($as_object==true) {
+	    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
+	    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
+	    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
+	    			}
+	    		} else {
+	    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
+	    				$this->_objects['array'][$data[$this->keyName]] = $data;
+	    				$id[$data[$this->keyName]] = $data[$this->keyName];;
+	    			}
+	    		}
+	    	}
     	}
     	if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) {
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';

Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/songs.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/songs.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/class/songs.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -275,19 +275,21 @@
     
     function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
     	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	$id = array();
-    	foreach($ret as $data) {
-    		if ($as_object==true) {
-    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
-    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
-    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
-    			}
-    		} else {
-    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
-    				$this->_objects['array'][$data[$this->keyName]] = $data;
-    				$id[$data[$this->keyName]] = $data[$this->keyName];;
-    			}
-    		}
+    	if (!isset($GLOBALS['songlistAdmin'])) {
+	    	foreach($ret as $data) {
+	    		$id = array();
+	    		if ($as_object==true) {
+	    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
+	    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
+	    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
+	    			}
+	    		} else {
+	    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
+	    				$this->_objects['array'][$data[$this->keyName]] = $data;
+	    				$id[$data[$this->keyName]] = $data[$this->keyName];;
+	    			}
+	    		}
+	    	}
     	}
     	if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) {
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';

Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/header.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/header.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/header.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -68,8 +68,8 @@
 	$GLOBALS['start']=isset($_REQUEST['start'])?$_REQUEST['start']:0;
 	$GLOBALS['limit']=isset($_REQUEST['limit'])?$_REQUEST['limit']:$GLOBALS['songlistModuleConfig']['cols']*$GLOBALS['songlistModuleConfig']['rows'];
 	
-	print_r($_POST);
-	print_r($_GET);
+	set_time_limit('320');
+	ini_set('memory_limit', '128M');
 	
 	if (!isset($_SESSION['cid']))
 		$_SESSION['cid'] = $GLOBALS['cid'];

Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/index.php
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/index.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/index.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -6,7 +6,12 @@
 	
 	$category_handler = xoops_getmodulehandler('category', 'songlist');
 	$criteria_cat = new CriteriaCompo();
-	$criteria_cat->add(new Criteria('`cid`', '('.implode(',',  $category_handler->GetCatAndSubCat($_SESSION['cid'])).')', 'IN'), 'OR');	
+	$cids = $category_handler->GetCatAndSubCat($_SESSION['cid']);
+	if (count($cids)>0) {
+		$criteria_cat->add(new Criteria('`cid`', '('.implode(',',  $cids).')', 'IN'), 'OR');	
+	} else { 
+		$criteria_cat->add(new Criteria('1', '1'), 'OR');
+	}
 	$criteria_cat->setSort('`created`');
 	$criteria_cat->setOrder('ASC');
 	

Modified: XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.sql
===================================================================
--- XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.sql	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/releases/1.07/htdocs/modules/songlist/sql/mysql.sql	2012-03-26 01:33:52 UTC (rev 9191)
@@ -12,7 +12,7 @@
   `rank` decimal(10,3) unsigned DEFAULT '0.000',
   `votes` int(10) unsigned DEFAULT '0',  
   `created` int(12) unsigned DEFAULT '0',
-  `updated` int(12) unsigned DEFAULT '0'
+  `updated` int(12) unsigned DEFAULT '0',
   PRIMARY KEY (`abid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -28,7 +28,7 @@
   `votes` int(10) unsigned DEFAULT '0',  
   `hits` int(12) unsigned DEFAULT '0',
   `created` int(12) unsigned DEFAULT '0',
-  `updated` int(12) unsigned DEFAULT '0'
+  `updated` int(12) unsigned DEFAULT '0',
   PRIMARY KEY (`aid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 

Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/artists.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/artists.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/artists.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -50,10 +50,10 @@
 				$criteria->setSort('`'.$GLOBALS['sort'].'`');
 				$criteria->setOrder($GLOBALS['order']);
 					
-				$artistss = $artists_handler->getObjects($criteria, true);
-				foreach($artistss as $cid => $artists) {
-					if (is_object($artists))					
-						$GLOBALS['xoopsTpl']->append('artists', $artists->toArray());
+				$artists = $artists_handler->getObjects($criteria, true);
+				foreach($artists as $cid => $artist) {
+					if (is_object($artist))					
+						$GLOBALS['xoopsTpl']->append('artists', $artist->toArray());
 				}
 				$GLOBALS['xoopsTpl']->assign('form', songlist_artists_get_form(false));
 				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);

Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/admin/header.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -89,4 +89,7 @@
 	xoops_loadLanguage('admin', 'songlist');
 
 	$GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist');	
+	
+	set_time_limit('320');
+	ini_set('memory_limit', '196M');
 ?>
\ No newline at end of file

Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/albums.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -6,8 +6,11 @@
 	
 	$category_handler = xoops_getmodulehandler('category', 'songlist');
 	$criteria_cat = new CriteriaCompo();
-	foreach($category_handler->GetCatAndSubCat($_SESSION['cid']) as $cid) {
-		$criteria_cat->add(new Criteria('`cid`', $cid, '='), 'OR');	
+	$cids = $category_handler->GetCatAndSubCat($_SESSION['cid']);
+	if (count($cids)>0) {
+		$criteria_cat->add(new Criteria('`cid`', '('.implode(',',  $cids).')', 'IN'), 'OR');	
+	} else { 
+		$criteria_cat->add(new Criteria('1', '1'), 'OR');
 	}
 	$criteria_cat->setSort('`created`');
 	$criteria_cat->setOrder('ASC');

Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/artists.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -6,9 +6,15 @@
 	
 	$category_handler = xoops_getmodulehandler('category', 'songlist');
 	$criteria_cat = new CriteriaCompo();
-	foreach($category_handler->GetCatAndSubCat($_SESSION['cid']) as $cid) {
-		$criteria_cat->add(new Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR');	
+	$cids = $category_handler->GetCatAndSubCat($_SESSION['cid']);
+	if (count($cids)>0) {
+		foreach($cids as $cid) {
+			$criteria_cat->add(new Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR');	
+		}	
+	} else { 
+		$criteria_cat->add(new Criteria('1', '1'), 'OR');
 	}
+	
 	$criteria_cat->setSort('`created`');
 	$criteria_cat->setOrder('ASC');
 	

Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/albums.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -219,19 +219,21 @@
     
     function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
     	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	$id = array();
-    	foreach($ret as $data) {
-    		if ($as_object==true) {
-    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
-    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
-    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
-    			}
-    		} else {
-    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
-    				$this->_objects['array'][$data[$this->keyName]] = $data;
-    				$id[$data[$this->keyName]] = $data[$this->keyName];;
-    			}
-    		}
+   		 if (!isset($GLOBALS['songlistAdmin'])) {
+	    	$id = array();
+	    	foreach($ret as $data) {
+	    		if ($as_object==true) {
+	    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
+	    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
+	    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
+	    			}
+	    		} else {
+	    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
+	    				$this->_objects['array'][$data[$this->keyName]] = $data;
+	    				$id[$data[$this->keyName]] = $data[$this->keyName];;
+	    			}
+	    		}
+	    	}
     	}
     	if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) {
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';

Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/artists.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -201,19 +201,21 @@
     
     function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
     	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	$id = array();
-    	foreach($ret as $data) {
-    		if ($as_object==true) {
-    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
-    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
-    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
-    			}
-    		} else {
-    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
-    				$this->_objects['array'][$data[$this->keyName]] = $data;
-    				$id[$data[$this->keyName]] = $data[$this->keyName];;
-    			}
-    		}
+    	if (!isset($GLOBALS['songlistAdmin'])) {
+	    	$id = array();
+	    	foreach($ret as $data) {
+	    		if ($as_object==true) {
+	    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
+	    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
+	    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
+	    			}
+	    		} else {
+	    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
+	    				$this->_objects['array'][$data[$this->keyName]] = $data;
+	    				$id[$data[$this->keyName]] = $data[$this->keyName];;
+	    			}
+	    		}
+	    	}
     	}
     	if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) {
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';

Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/category.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -162,19 +162,21 @@
     
     function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
     	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	$id = array();
-    	foreach($ret as $data) {
-    		if ($as_object==true) {
-    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
-    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
-    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
-    			}
-    		} else {
-    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
-    				$this->_objects['array'][$data[$this->keyName]] = $data;
-    				$id[$data[$this->keyName]] = $data[$this->keyName];;
-    			}
-    		}
+    	if (!isset($GLOBALS['songlistAdmin'])) {
+	    	$id = array();
+	    	foreach($ret as $data) {
+	    		if ($as_object==true) {
+	    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
+	    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
+	    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
+	    			}
+	    		} else {
+	    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
+	    				$this->_objects['array'][$data[$this->keyName]] = $data;
+	    				$id[$data[$this->keyName]] = $data[$this->keyName];;
+	    			}
+	    		}
+	    	}
     	}
     	if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) {
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';

Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/genre.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -127,19 +127,21 @@
     
     function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
     	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	$id = array();
-    	foreach($ret as $data) {
-    		if ($as_object==true) {
-    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
-    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
-    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
-    			}
-    		} else {
-    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
-    				$this->_objects['array'][$data[$this->keyName]] = $data;
-    				$id[$data[$this->keyName]] = $data[$this->keyName];;
-    			}
-    		}
+    	if (!isset($GLOBALS['songlistAdmin'])) {
+	    	$id = array();
+	    	foreach($ret as $data) {
+	    		if ($as_object==true) {
+	    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
+	    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
+	    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
+	    			}
+	    		} else {
+	    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
+	    				$this->_objects['array'][$data[$this->keyName]] = $data;
+	    				$id[$data[$this->keyName]] = $data[$this->keyName];;
+	    			}
+	    		}
+	    	}
     	}
     	if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) {
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';

Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/class/songs.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -275,19 +275,21 @@
     
     function getObjects($criteria = NULL, $id_as_key = false, $as_object = true) {
     	$ret = parent::getObjects($criteria, $id_as_key, $as_object);
-    	$id = array();
-    	foreach($ret as $data) {
-    		if ($as_object==true) {
-    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
-    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
-    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
-    			}
-    		} else {
-    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
-    				$this->_objects['array'][$data[$this->keyName]] = $data;
-    				$id[$data[$this->keyName]] = $data[$this->keyName];;
-    			}
-    		}
+    	if (!isset($GLOBALS['songlistAdmin'])) {
+	    	foreach($ret as $data) {
+	    		$id = array();
+	    		if ($as_object==true) {
+	    			if (!in_array($data->getVar($this->keyName), array_keys($this->_objects['object']))) {
+	    				$this->_objects['object'][$data->getVar($this->keyName)] = $data;
+	    				$id[$data->getVar($this->keyName)] = $data->getVar($this->keyName);
+	    			}
+	    		} else {
+	    			if (!in_array($data[$this->keyName], array_keys($this->_objects['array']))) {
+	    				$this->_objects['array'][$data[$this->keyName]] = $data;
+	    				$id[$data[$this->keyName]] = $data[$this->keyName];;
+	    			}
+	    		}
+	    	}
     	}
     	if (!isset($GLOBALS['songlistAdmin'])&&count($id)>0) {
 	    	$sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` IN ('.implode(',', $id).')';

Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/header.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -68,8 +68,8 @@
 	$GLOBALS['start']=isset($_REQUEST['start'])?$_REQUEST['start']:0;
 	$GLOBALS['limit']=isset($_REQUEST['limit'])?$_REQUEST['limit']:$GLOBALS['songlistModuleConfig']['cols']*$GLOBALS['songlistModuleConfig']['rows'];
 	
-	print_r($_POST);
-	print_r($_GET);
+	set_time_limit('320');
+	ini_set('memory_limit', '128M');
 	
 	if (!isset($_SESSION['cid']))
 		$_SESSION['cid'] = $GLOBALS['cid'];

Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/index.php	2012-03-26 01:33:52 UTC (rev 9191)
@@ -6,7 +6,12 @@
 	
 	$category_handler = xoops_getmodulehandler('category', 'songlist');
 	$criteria_cat = new CriteriaCompo();
-	$criteria_cat->add(new Criteria('`cid`', '('.implode(',',  $category_handler->GetCatAndSubCat($_SESSION['cid'])).')', 'IN'), 'OR');	
+	$cids = $category_handler->GetCatAndSubCat($_SESSION['cid']);
+	if (count($cids)>0) {
+		$criteria_cat->add(new Criteria('`cid`', '('.implode(',',  $cids).')', 'IN'), 'OR');	
+	} else { 
+		$criteria_cat->add(new Criteria('1', '1'), 'OR');
+	}
 	$criteria_cat->setSort('`created`');
 	$criteria_cat->setOrder('ASC');
 	

Modified: XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql
===================================================================
--- XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql	2012-03-26 01:05:55 UTC (rev 9190)
+++ XoopsModules/songlist/trunk/htdocs/modules/songlist/sql/mysql.sql	2012-03-26 01:33:52 UTC (rev 9191)
@@ -12,7 +12,7 @@
   `rank` decimal(10,3) unsigned DEFAULT '0.000',
   `votes` int(10) unsigned DEFAULT '0',  
   `created` int(12) unsigned DEFAULT '0',
-  `updated` int(12) unsigned DEFAULT '0'
+  `updated` int(12) unsigned DEFAULT '0',
   PRIMARY KEY (`abid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
@@ -28,7 +28,7 @@
   `votes` int(10) unsigned DEFAULT '0',  
   `hits` int(12) unsigned DEFAULT '0',
   `created` int(12) unsigned DEFAULT '0',
-  `updated` int(12) unsigned DEFAULT '0'
+  `updated` int(12) unsigned DEFAULT '0',
   PRIMARY KEY (`aid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.