XoopsModules25x / songlist

htdocs/modules/songlist/header.php

Spacing +13 added lines, -13 removed lines

@@ -33,9 +33,9 @@ 
 	require_once (dirname(dirname(dirname(__FILE__))).'/mainfile.php');
 	
 	if (!defined('_CHARSET'))
-		define ("_CHARSET","UTF-8");
+		define("_CHARSET", "UTF-8");
 	if (!defined('_CHARSET_ISO'))
-		define ("_CHARSET_ISO","ISO-8859-1");
+		define("_CHARSET_ISO", "ISO-8859-1");
 	
 	$GLOBALS['myts'] = MyTextSanitizer::getInstance();
 	
@@ -60,17 +60,17 @@ 
 
 	xoops_loadLanguage('main', 'songlist');
 	
-	$GLOBALS['file']=isset($_REQUEST['file'])?$_REQUEST['file']:substr(basename($_SERVER['PHP_SELF']),0,strlen(basename($_SERVER['PHP_SELF']))-4);
-	$GLOBALS['op']=isset($_REQUEST['op'])?$_REQUEST['op']:'item';
-	$GLOBALS['fct']=isset($_REQUEST['fct'])?$_REQUEST['fct']:'list';
-	$GLOBALS['id']=isset($_REQUEST['id'])?$_REQUEST['id']:0;
-	$GLOBALS['value']=isset($_REQUEST['value'])?$_REQUEST['value']:'%';
-	$GLOBALS['gid']=isset($_REQUEST['gid'])?$_REQUEST['gid']:0;
-	$GLOBALS['vid']=isset($_REQUEST['vid'])?$_REQUEST['vid']:0;
-	$GLOBALS['vcid']=isset($_REQUEST['vcid'])?$_REQUEST['vcid']:0;
-	$GLOBALS['cid']=(((isset($_POST['cid'])?$_POST['cid']:isset($_GET['cid']))?$_GET['cid']:isset($_SESSION['cid']))?$_SESSION['cid']:0);
-	$GLOBALS['start']=isset($_REQUEST['start'])?$_REQUEST['start']:0;
-	$GLOBALS['limit']=isset($_REQUEST['limit'])?$_REQUEST['limit']:$GLOBALS['songlistModuleConfig']['cols']*$GLOBALS['songlistModuleConfig']['rows'];
+	$GLOBALS['file'] = isset($_REQUEST['file']) ? $_REQUEST['file'] : substr(basename($_SERVER['PHP_SELF']), 0, strlen(basename($_SERVER['PHP_SELF']))-4);
+	$GLOBALS['op'] = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'item';
+	$GLOBALS['fct'] = isset($_REQUEST['fct']) ? $_REQUEST['fct'] : 'list';
+	$GLOBALS['id'] = isset($_REQUEST['id']) ? $_REQUEST['id'] : 0;
+	$GLOBALS['value'] = isset($_REQUEST['value']) ? $_REQUEST['value'] : '%';
+	$GLOBALS['gid'] = isset($_REQUEST['gid']) ? $_REQUEST['gid'] : 0;
+	$GLOBALS['vid'] = isset($_REQUEST['vid']) ? $_REQUEST['vid'] : 0;
+	$GLOBALS['vcid'] = isset($_REQUEST['vcid']) ? $_REQUEST['vcid'] : 0;
+	$GLOBALS['cid'] = (((isset($_POST['cid']) ? $_POST['cid'] : isset($_GET['cid'])) ? $_GET['cid'] : isset($_SESSION['cid'])) ? $_SESSION['cid'] : 0);
+	$GLOBALS['start'] = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
+	$GLOBALS['limit'] = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $GLOBALS['songlistModuleConfig']['cols']*$GLOBALS['songlistModuleConfig']['rows'];
 	
 	if (!isset($_SESSION['cid']))
 		$_SESSION['cid'] = $GLOBALS['cid'];

Braces +9 added lines, -6 removed lines

@@ -32,10 +32,12 @@ 
 	
 	require_once (dirname(dirname(dirname(__FILE__))).'/mainfile.php');
 	
-	if (!defined('_CHARSET'))
-		define ("_CHARSET","UTF-8");
-	if (!defined('_CHARSET_ISO'))
-		define ("_CHARSET_ISO","ISO-8859-1");
+	if (!defined('_CHARSET')) {
+			define ("_CHARSET","UTF-8");
+	}
+	if (!defined('_CHARSET_ISO')) {
+			define ("_CHARSET_ISO","ISO-8859-1");
+	}
 	
 	$GLOBALS['myts'] = MyTextSanitizer::getInstance();
 	
@@ -72,7 +74,8 @@ 
 	$GLOBALS['start']=isset($_REQUEST['start'])?$_REQUEST['start']:0;
 	$GLOBALS['limit']=isset($_REQUEST['limit'])?$_REQUEST['limit']:$GLOBALS['songlistModuleConfig']['cols']*$GLOBALS['songlistModuleConfig']['rows'];
 	
-	if (!isset($_SESSION['cid']))
-		$_SESSION['cid'] = $GLOBALS['cid'];
+	if (!isset($_SESSION['cid'])) {
+			$_SESSION['cid'] = $GLOBALS['cid'];
+	}
 		
 ?>
\ No newline at end of file

htdocs/modules/songlist/albums.php

Switch Indentation +87 added lines, -87 removed lines

@@ -47,99 +47,99 @@ 
 		default:
 		case "item":
 			switch ($fct) {
-			default:
-			case "list":
-				$pagenav = new XoopsPageNav($albums_handler->getCount($criteria_cat), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
+				default:
+				case "list":
+					$pagenav = new XoopsPageNav($albums_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);
 				
-				$albums = $albums_handler->getObjects($criteria_cat, false);
+					$albums = $albums_handler->getObjects($criteria_cat, false);
 				
-				$ret = array();
-				$col = 1;
-				$row = 1;
-				foreach($albums as $album) {
-					$ret[$row][$col] = $album->toArray(true);
-					$ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
-					$col++;
-					if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
-						$row++;
-						$col=1;
+					$ret = array();
+					$col = 1;
+					$row = 1;
+					foreach($albums as $album) {
+						$ret[$row][$col] = $album->toArray(true);
+						$ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
+						$col++;
+						if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
+							$row++;
+							$col=1;
+						}
 					}
-				}
-				if ($col!=1) {
-					for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) {
-						$ret[$row][$j][$albums_handler->keyName] = 0;
-						$ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
+					if ($col!=1) {
+						for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) {
+							$ret[$row][$j][$albums_handler->keyName] = 0;
+							$ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
+						}
 					}
-				}
 				
-				$url = $albums_handler->getURL();
-				if (!strpos($url, $_SERVER['REQUEST_URI'])) {
-					header( "HTTP/1.1 301 Moved Permanently" ); 
-					header('Location: '.$url);
-					exit(0);
-				}
+					$url = $albums_handler->getURL();
+					if (!strpos($url, $_SERVER['REQUEST_URI'])) {
+						header( "HTTP/1.1 301 Moved Permanently" ); 
+						header('Location: '.$url);
+						exit(0);
+					}
 
-				$xoopsOption['template_main'] = 'songlist_albums_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('results', $ret);
-				$GLOBALS['xoopsTpl']->assign('categories', $cat);
-				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-				if ($_SESSION['cid']!=0) {
-					$category = $category_handler->get($_SESSION['cid']);
-					$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
-				}				
-				include($GLOBALS['xoops']->path('/footer.php'));
-				break;
-			case "item":
-				$album = $albums_handler->get($id);
+					$xoopsOption['template_main'] = 'songlist_albums_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('results', $ret);
+					$GLOBALS['xoopsTpl']->assign('categories', $cat);
+					$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+					$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+					if ($_SESSION['cid']!=0) {
+						$category = $category_handler->get($_SESSION['cid']);
+						$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+					}				
+					include($GLOBALS['xoops']->path('/footer.php'));
+					break;
+				case "item":
+					$album = $albums_handler->get($id);
 
-				$url = $album->getURL(true);
-				if (!strpos($url, $_SERVER['REQUEST_URI'])) {
-					header( "HTTP/1.1 301 Moved Permanently" ); 
-					header('Location: '.$url);
-					exit(0);
-				}
+					$url = $album->getURL(true);
+					if (!strpos($url, $_SERVER['REQUEST_URI'])) {
+						header( "HTTP/1.1 301 Moved Permanently" ); 
+						header('Location: '.$url);
+						exit(0);
+					}
 				
-				$xoopsOption['template_main'] = 'songlist_albums_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['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
-				$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('album', $album->toArray(true));
-				$GLOBALS['xoopsTpl']->assign('categories', $cat);
-				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']); 				
-				include($GLOBALS['xoops']->path('/footer.php'));
-				break;	
+					$xoopsOption['template_main'] = 'songlist_albums_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['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
+					$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('album', $album->toArray(true));
+					$GLOBALS['xoopsTpl']->assign('categories', $cat);
+					$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']); 				
+					include($GLOBALS['xoops']->path('/footer.php'));
+					break;	
 			}
 			break;
 		case "browseby":
 			switch ($fct) {
-			default:
-			case "title":
-			case "lyrics":
-			case "artist":
-			case "album":
+				default:
+				case "title":
+				case "lyrics":
+				case "artist":
+				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');							
@@ -149,7 +149,7 @@ 
 						$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);
 				
@@ -214,13 +214,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=0&value=%&start=$start&limit=$limit&cid=".$_SESSION['cid'], 10, _MN_SONGLIST_MSG_CATEGORYCHANGED);
 			exit;

Spacing +21 added lines, -21 removed lines

@@ -9,8 +9,8 @@ 
 	$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,18 +25,18 @@ 
 	$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']).'%';
 		}
@@ -59,17 +59,17 @@ 
 				$ret = array();
 				$col = 1;
 				$row = 1;
-				foreach($albums as $album) {
+				foreach ($albums as $album) {
 					$ret[$row][$col] = $album->toArray(true);
 					$ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
 					$col++;
 					if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
 						$row++;
-						$col=1;
+						$col = 1;
 					}
 				}
 				if ($col!=1) {
-					for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) {
+					for ($j = $col; $j<=$GLOBALS['songlistModuleConfig']['cols']; $j++) {
 						$ret[$row][$j][$albums_handler->keyName] = 0;
 						$ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
 					}
@@ -77,16 +77,16 @@ 
 				
 				$url = $albums_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_albums_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']);			
@@ -106,16 +106,16 @@ 
 
 				$url = $album->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_albums_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['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, array('type'=>'text/css'));
@@ -141,7 +141,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;
@@ -165,18 +165,18 @@ 
 			$ret = array();
 			$col = 1;
 			$row = 1;
-			foreach($albums as $album) {
+			foreach ($albums as $album) {
 				$ret[$row][$col] = $album->toArray(true);
 				$ret[$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++) {
 					$ret[$row][$j][$albums_handler->keyName] = 0;
 					$ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
 				}
@@ -184,16 +184,16 @@ 
 			
 			$url = $albums_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_albums_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

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

htdocs/modules/songlist/artists.php

Switch Indentation +86 added lines, -86 removed lines

@@ -50,98 +50,98 @@ 
 		default:
 		case "item":
 			switch ($fct) {
-			default:
-			case "list":
-				$pagenav = new XoopsPageNav($artists_handler->getCount($criteria_cat), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
+				default:
+				case "list":
+					$pagenav = new XoopsPageNav($artists_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);
 				
-				$artists = $artists_handler->getObjects($criteria_cat, false);
+					$artists = $artists_handler->getObjects($criteria_cat, false);
 				
-				$ret = array();
-				$col = 1;
-				$row = 1;
-				foreach($artists as $artist) {
-					$ret[$row][$col] = $artist->toArray(true);
-					$ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
-					$col++;
-					if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
-						$row++;
-						$col=1;
+					$ret = array();
+					$col = 1;
+					$row = 1;
+					foreach($artists as $artist) {
+						$ret[$row][$col] = $artist->toArray(true);
+						$ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
+						$col++;
+						if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
+							$row++;
+							$col=1;
+						}
 					}
-				}
-				if ($col!=1) {
-					for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) {
-						$ret[$row][$j][$artists_handler->keyName] = 0;
-						$ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
+					if ($col!=1) {
+						for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) {
+							$ret[$row][$j][$artists_handler->keyName] = 0;
+							$ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
+						}
 					}
-				}
 				
-				$url = $artists_handler->getURL(false);
-				if (!strpos($url, $_SERVER['REQUEST_URI'])) {
-					header( "HTTP/1.1 301 Moved Permanently" ); 
-					header('Location: '.$url);
-					exit(0);
-				}
+					$url = $artists_handler->getURL(false);
+					if (!strpos($url, $_SERVER['REQUEST_URI'])) {
+						header( "HTTP/1.1 301 Moved Permanently" ); 
+						header('Location: '.$url);
+						exit(0);
+					}
 
-				$xoopsOption['template_main'] = 'songlist_artists_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('results', $ret);
-				$GLOBALS['xoopsTpl']->assign('categories', $cat);
-				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-				$GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
-				if ($_SESSION['cid']!=0) {
-					$category = $category_handler->get($_SESSION['cid']);
-					$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
-				}				
-				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-				include($GLOBALS['xoops']->path('/footer.php'));
-				break;
-			case "item":
-				$artist = $artists_handler->get($id);
+					$xoopsOption['template_main'] = 'songlist_artists_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('results', $ret);
+					$GLOBALS['xoopsTpl']->assign('categories', $cat);
+					$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+					$GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
+					if ($_SESSION['cid']!=0) {
+						$category = $category_handler->get($_SESSION['cid']);
+						$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+					}				
+					$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+					include($GLOBALS['xoops']->path('/footer.php'));
+					break;
+				case "item":
+					$artist = $artists_handler->get($id);
 
-				$url = $artist->getURL(true);
-				if (!strpos($url, $_SERVER['REQUEST_URI'])) {
-					header( "HTTP/1.1 301 Moved Permanently" ); 
-					header('Location: '.$url);
-					exit(0);
-				}
+					$url = $artist->getURL(true);
+					if (!strpos($url, $_SERVER['REQUEST_URI'])) {
+						header( "HTTP/1.1 301 Moved Permanently" ); 
+						header('Location: '.$url);
+						exit(0);
+					}
 				
-				$xoopsOption['template_main'] = 'songlist_artists_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('artist', $artist->toArray(true));
-				$GLOBALS['xoopsTpl']->assign('categories', $cat);
-				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-				include($GLOBALS['xoops']->path('/footer.php'));
-				break;	
+					$xoopsOption['template_main'] = 'songlist_artists_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('artist', $artist->toArray(true));
+					$GLOBALS['xoopsTpl']->assign('categories', $cat);
+					$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+					include($GLOBALS['xoops']->path('/footer.php'));
+					break;	
 			}
 			break;
 		case "browseby":
 			switch ($fct) {
-			default:
-			case "title":
-			case "lyrics":
-			case "artist":
-			case "album":
+				default:
+				case "title":
+				case "lyrics":
+				case "artist":
+				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('`name`', $u.'%', 'LIKE'), 'OR');							
@@ -151,7 +151,7 @@ 
 						$browse_criteria->add(new Criteria('`name`', strtoupper($value).'%', 'LIKE'), 'OR');
 						$browse_criteria->add(new Criteria('`name`', strtolower($value).'%', 'LIKE'), 'OR');
 						break;
-				}
+					}
 				$criteria = new CriteriaCompo($criteria_cat, 'AND');
 				$criteria->add($browse_criteria);
 				
@@ -215,13 +215,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=0&value=%&start=0&limit=$limit&cid=".$_SESSION['cid'], 10, _MN_SONGLIST_MSG_CATEGORYCHANGED);
 			exit;

Spacing +21 added lines, -21 removed lines

@@ -9,8 +9,8 @@ 
 	$cids = $category_handler->GetCatAndSubCat($_SESSION['cid']);
 	if ($_SESSION['cid']>0)
 		$cids[$_SESSION['cid']] = $_SESSION['cid'];
-	if (count($cids)>0&&$_SESSION['cid']!=0) {
-		foreach($cids as $cid) {
+	if (count($cids)>0 && $_SESSION['cid']!=0) {
+		foreach ($cids as $cid) {
 			$criteria_cat->add(new Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR');	
 		}	
 	} else { 
@@ -28,18 +28,18 @@ 
 	$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']).'%';
 		}
@@ -62,17 +62,17 @@ 
 				$ret = array();
 				$col = 1;
 				$row = 1;
-				foreach($artists as $artist) {
+				foreach ($artists as $artist) {
 					$ret[$row][$col] = $artist->toArray(true);
 					$ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
 					$col++;
 					if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
 						$row++;
-						$col=1;
+						$col = 1;
 					}
 				}
 				if ($col!=1) {
-					for($j=$col;$j<=$GLOBALS['songlistModuleConfig']['cols'];$j++) {
+					for ($j = $col; $j<=$GLOBALS['songlistModuleConfig']['cols']; $j++) {
 						$ret[$row][$j][$artists_handler->keyName] = 0;
 						$ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
 					}
@@ -80,16 +80,16 @@ 
 				
 				$url = $artists_handler->getURL(false);
 				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_artists_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']);
@@ -110,16 +110,16 @@ 
 
 				$url = $artist->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_artists_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']);
@@ -143,7 +143,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;
@@ -167,18 +167,18 @@ 
 			$ret = array();
 			$col = 1;
 			$row = 1;
-			foreach($artists as $artist) {
+			foreach ($artists as $artist) {
 				$ret[$row][$col] = $artist->toArray(true);
 				$ret[$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++) {
 					$ret[$row][$j][$artists_handler->keyName] = 0;
 					$ret[$row][$j]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
 				}
@@ -186,16 +186,16 @@ 
 			
 			$url = $artists_handler->getURL(false);
 			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_artists_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

@@ -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) {
 		foreach($cids as $cid) {
 			$criteria_cat->add(new Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR');	

htdocs/modules/songlist/view.tag.php

Spacing +1 added lines, -1 removed lines

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

htdocs/modules/songlist/xoops_version.php

Spacing +5 added lines, -5 removed lines

@@ -90,7 +90,7 @@ 
 $modversion['use_smarty'] = 1;
 
 // Templates
-$i=0;
+$i = 0;
 $modversion['templates'][$i]['file'] = 'songlist_category_list.html';
 $modversion['templates'][$i]['description'] = '';
 $i++;
@@ -206,7 +206,7 @@ 
 $modversion['templates'][$i]['description'] = '';
 
 // Submenus
-$i=0;
+$i = 0;
 $modversion['sub'][$i]['name'] = _MI_SONGLIST_MENU_ARTISTS;
 $modversion['sub'][$i]['url'] = "artists.php";
 $i++;
@@ -224,7 +224,7 @@ 
 $modversion['sub'][$i]['url'] = "request.php";
 $i++;
 
-$i=0;
+$i = 0;
 // Blocks
 $modversion['blocks'][$i] = array(
 	'file' => "songlist_popular_artist.php",
@@ -305,7 +305,7 @@ 
 	'edit_func' => "b_songlist_popular_songs_edit",
 	'template' => 'songlist_popular_songs.html');
 
-$i=0;
+$i = 0;
 xoops_load('XoopsEditorHandler');
 $editor_handler = XoopsEditorHandler::getInstance();
 foreach ($editor_handler->getList(false) as $id => $val)
@@ -327,7 +327,7 @@ 
 $modversion['config'][$i]['formtype'] = 'text';
 $modversion['config'][$i]['valuetype'] = 'text';
 mt_srand(microtime(true));
-$modversion['config'][$i]['default'] = (mt_rand(0,4)!=2?chr(mt_rand(32,190)):'').(mt_rand(0,4)!=2?chr(mt_rand(32,190)):'').(mt_rand(0,4)!=2?chr(mt_rand(32,190)):'').(mt_rand(0,4)!=2?chr(mt_rand(32,190)):'').(mt_rand(0,4)!=2?chr(mt_rand(32,190)):'').(mt_rand(0,4)!=2?chr(mt_rand(32,190)):'').(mt_rand(0,4)!=2?chr(mt_rand(32,190)):'').(mt_rand(0,4)!=2?chr(mt_rand(32,190)):'').(mt_rand(0,4)!=2?chr(mt_rand(32,190)):'').(mt_rand(0,4)!=2?chr(mt_rand(32,190)):'').(mt_rand(0,4)!=2?chr(mt_rand(32,190)):'').(mt_rand(0,4)!=2?chr(mt_rand(32,190)):'').(mt_rand(0,4)!=2?chr(mt_rand(32,190)):'').(mt_rand(0,4)!=2?chr(mt_rand(32,190)):'');
+$modversion['config'][$i]['default'] = (mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '').(mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '').(mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '').(mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '').(mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '').(mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '').(mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '').(mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '').(mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '').(mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '').(mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '').(mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '').(mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '').(mt_rand(0, 4)!=2 ?chr(mt_rand(32, 190)) : '');
 $modversion['config'][$i]['options'] = array();
 
 $i++;

Braces +5 added lines, -3 removed lines

@@ -4,8 +4,9 @@ 
 $module_handler = xoops_gethandler('module');
 $config_handler = xoops_gethandler('config');
 $GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist');
-if (is_object($GLOBALS['songlistModule']))
-	$GLOBALS['songlistModuleConfig'] = $config_handler->getConfigList($GLOBALS['songlistModule']->getVar('mid')); 
+if (is_object($GLOBALS['songlistModule'])) {
+	$GLOBALS['songlistModuleConfig'] = $config_handler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
+}
 
 // $Id: xoops_version.php,v 4.04 2008/06/05 15:35:59 wishcraft Exp $
 
@@ -308,8 +309,9 @@ 
 $i=0;
 xoops_load('XoopsEditorHandler');
 $editor_handler = XoopsEditorHandler::getInstance();
-foreach ($editor_handler->getList(false) as $id => $val)
+foreach ($editor_handler->getList(false) as $id => $val) {
 	$options[$val] = $id;
+}
 	
 $i++;
 $modversion['config'][$i]['name'] = 'editor';

htdocs/modules/songlist/include/formselectalbum.php

Indentation +191 added lines, -191 removed lines

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

Spacing +19 added lines, -19 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -118,8 +118,9 @@
 			}
 		} 
 		if (isset($_form_object_options['albums'])) {
-			foreach($_form_object_options['albums'] as $id => $value)
-				$this->addOption($id, $value);
+			foreach($_form_object_options['albums'] as $id => $value) {
+							$this->addOption($id, $value);
+			}
 		}
     }
 

htdocs/modules/songlist/include/formselectgenre.php

Indentation +191 added lines, -191 removed lines

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

Spacing +18 added lines, -18 removed lines

@@ -109,16 +109,16 @@ 
         }
 		$this->addOption('0', _MI_SONGLIST_ALL);
 		if (!isset($_form_object_options['genre'])) {
-			$genre_handler =& xoops_getmodulehandler('genre', 'songlist');
+			$genre_handler = & xoops_getmodulehandler('genre', 'songlist');
 			$criteria = new Criteria('1', '1');
 			$criteria->setSort('`name`');
 			$criteria->setOrder('ASC');
-			foreach($genre_handler->getObjects($criteria, true) as $id => $obj) {
+			foreach ($genre_handler->getObjects($criteria, true) as $id => $obj) {
 				$_form_object_options['genre'][$id] = $obj->getVar('name'); 
 			}
 		}
 		if (isset($_form_object_options['genre']))
-			foreach($_form_object_options['genre'] as $id => $value)
+			foreach ($_form_object_options['genre'] as $id => $value)
 				$this->addOption($id, $value);
 		
 
@@ -152,11 +152,11 @@ 
      */
     function getValue($encode = false)
     {
-        if (! $encode) {
+        if (!$encode) {
             return $this->_value;
         }
         $value = array();
-        foreach($this->_value as $val) {
+        foreach ($this->_value as $val) {
             $value[] = $val ? htmlspecialchars($val, ENT_QUOTES) : $val;
         }
         return $value;
@@ -170,7 +170,7 @@ 
     function setValue($value)
     {
         if (is_array($value)) {
-            foreach($value as $v) {
+            foreach ($value as $v) {
                 $this->_value[] = $v;
             }
         } elseif (isset($value)) {
@@ -186,7 +186,7 @@ 
      */
     function addOption($value, $name = '')
     {
-        if ($name != '') {
+        if ($name!='') {
             $this->_options[$value] = $name;
         } else {
             $this->_options[$value] = $value;
@@ -201,7 +201,7 @@ 
     function addOptionArray($options)
     {
         if (is_array($options)) {
-            foreach($options as $k => $v) {
+            foreach ($options as $k => $v) {
                 $this->addOption($k, $v);
             }
         }
@@ -217,12 +217,12 @@ 
      */
     function getOptions($encode = false)
     {
-        if (! $encode) {
+        if (!$encode) {
             return $this->_options;
         }
         $value = array();
-        foreach($this->_options as $val => $name) {
-            $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode > 1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
+        foreach ($this->_options as $val => $name) {
+            $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode>1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
         }
         return $value;
     }
@@ -239,17 +239,17 @@ 
         $ele_value = $this->getValue();
         $ele_options = $this->getOptions();
         $ret = '<select size="'.$this->getSize().'"'.$this->getExtra();
-        if ($this->isMultiple() != false) {
-            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'. $ele_title. '" multiple="multiple">' ;
+        if ($this->isMultiple()!=false) {
+            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'.$ele_title.'" multiple="multiple">';
         } else {
-            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'. $ele_title. '">' ;
+            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'.$ele_title.'">';
         }
-        foreach($ele_options as $value => $name) {
+        foreach ($ele_options as $value => $name) {
             $ret .= '<option value="'.htmlspecialchars($value, ENT_QUOTES).'"';
-            if (count($ele_value) > 0 && in_array($value, $ele_value)) {
+            if (count($ele_value)>0 && in_array($value, $ele_value)) {
                 $ret .= ' selected="selected"';
             }
-            $ret .= '>'.$name.'</option>' ;
+            $ret .= '>'.$name.'</option>';
         }
         $ret .= '</select>';
         return $ret;
@@ -263,7 +263,7 @@ 
     function renderValidationJS()
     {
         // render custom validation code if any
-        if (! empty($this->customValidationCode)) {
+        if (!empty($this->customValidationCode)) {
             return implode("\n", $this->customValidationCode);
             // generate validation code if required
         } elseif ($this->isRequired()) {

Braces +3 added lines, -2 removed lines

@@ -117,9 +117,10 @@
 				$_form_object_options['genre'][$id] = $obj->getVar('name'); 
 			}
 		}
-		if (isset($_form_object_options['genre']))
-			foreach($_form_object_options['genre'] as $id => $value)
+		if (isset($_form_object_options['genre'])) {
+					foreach($_form_object_options['genre'] as $id => $value)
 				$this->addOption($id, $value);
+		}
 		
 
     }

htdocs/modules/songlist/include/uploader.php

Spacing +30 added lines, -30 removed lines

@@ -38,27 +38,27 @@ 
 	 * @param   int	 $cmodvalue
 	 * @param   array   $allowedExtensions
 	 **/
-	function SonglistMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth=null, $maxHeight=null, $allowedExtensions=null )
+	function SonglistMediaUploader($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth = null, $maxHeight = null, $allowedExtensions = null)
 	{
 		if (is_array($allowedMimeTypes)) {
-			$this->allowedMimeTypes =& $allowedMimeTypes;
+			$this->allowedMimeTypes = & $allowedMimeTypes;
 		}
-		$this->uploadDir = $uploadDir.(substr($uploadDir, strlen($uploadDir)-1,1)!=DS?DS:'');
+		$this->uploadDir = $uploadDir.(substr($uploadDir, strlen($uploadDir)-1, 1)!=DS ?DS:'');
 		if (is_dir($uploadDir)) {
-			foreach(explode(DS, $uploadDir) as $folder) {
-				$path .= DS . $folder;
+			foreach (explode(DS, $uploadDir) as $folder) {
+				$path .= DS.$folder;
 				mkdir($path, 0777);
 			}
 		}
 		$this->maxFileSize = intval($maxFileSize);
-		if(isset($maxWidth)) {
+		if (isset($maxWidth)) {
 			$this->maxWidth = intval($maxWidth);
 		}
-		if(isset($maxHeight)) {
+		if (isset($maxHeight)) {
 			$this->maxHeight = intval($maxHeight);
 		}
-		if( isset( $allowedExtensions ) && is_array( $allowedExtensions ) ) {
-			$this->allowedExtensions =& $allowedExtensions ;
+		if (isset($allowedExtensions) && is_array($allowedExtensions)) {
+			$this->allowedExtensions = & $allowedExtensions;
 		}
 	}
 
@@ -88,19 +88,19 @@ 
 			$this->mediaError = !empty($_FILES[$index_name]['error']) ? $_FILES[$index_name]['error'] : 0;
 		}
 		$this->errors = array();
-		if (intval($this->mediaSize) < 0) {
+		if (intval($this->mediaSize)<0) {
 			$this->setErrors('Invalid File Size');
 			return false;
 		}
-		if ($this->mediaName == '') {
+		if ($this->mediaName=='') {
 			$this->setErrors('Filename Is Empty');
 			return false;
 		}
-		if ($this->mediaTmpName == 'none' || !is_uploaded_file($this->mediaTmpName) || $this->mediaSize == 0 ) {
+		if ($this->mediaTmpName=='none' || !is_uploaded_file($this->mediaTmpName) || $this->mediaSize==0) {
 			$this->setErrors('No file uploaded');
 			return false;
 		}
-		if ($this->mediaError > 0) {
+		if ($this->mediaError>0) {
 			$this->setErrors('Error occurred: Error #'.$this->mediaError);
 			return false;
 		}
@@ -112,7 +112,7 @@ 
 	 * 
 	 * @param   string  $value
 	 **/
-	function setTargetFileName($value){
+	function setTargetFileName($value) {
 		$this->targetFileName = strval(trim($value));
 	}
 
@@ -121,7 +121,7 @@ 
 	 * 
 	 * @param   string  $value
 	 **/
-	function setPrefix($value){
+	function setPrefix($value) {
 		$this->prefix = strval(trim($value));
 	}
 
@@ -170,7 +170,7 @@ 
 	 * 
 	 * @return  string 
 	 **/
-	function getSavedFileName(){
+	function getSavedFileName() {
 		return $this->savedFileName;
 	}
 
@@ -179,7 +179,7 @@ 
 	 * 
 	 * @return  string
 	 **/
-	function getSavedDestination(){
+	function getSavedDestination() {
 		return $this->savedDestination;
 	}
 
@@ -190,7 +190,7 @@ 
 	 **/
 	function upload($chmod = 0644)
 	{
-		if ($this->uploadDir == '') {
+		if ($this->uploadDir=='') {
 			$this->setErrors('Upload directory not set');
 			return false;
 		}
@@ -219,7 +219,7 @@ 
 		if (!$this->checkMaxHeight()) {
 			$this->setErrors(sprintf('File height must be smaller than %u', $this->maxHeight));
 		}
-		if (count($this->errors) > 0) {
+		if (count($this->errors)>0) {
 			return false;
 		}
 		if (!$this->_copyFile($chmod)) {
@@ -262,7 +262,7 @@ 
 	 **/
 	function checkMaxFileSize()
 	{
-		if ($this->mediaSize > $this->maxFileSize) {
+		if ($this->mediaSize>$this->maxFileSize) {
 			return false;
 		}
 		return true;
@@ -275,11 +275,11 @@ 
 	 **/
 	function checkMaxWidth()
 	{
-		if (!isset($this->maxWidth)||$this->maxWidth<1) {
+		if (!isset($this->maxWidth) || $this->maxWidth<1) {
 			return true;
 		}
-		if (false !== $dimension = getimagesize($this->mediaTmpName)) {
-			if ($dimension[0] > $this->maxWidth) {
+		if (false!==$dimension = getimagesize($this->mediaTmpName)) {
+			if ($dimension[0]>$this->maxWidth) {
 				return false;
 			}
 		} else {
@@ -295,11 +295,11 @@ 
 	 **/
 	function checkMaxHeight()
 	{
-		if (!isset($this->maxHeight)||$this->maxHeight<1) {
+		if (!isset($this->maxHeight) || $this->maxHeight<1) {
 			return true;
 		}
-		if (false !== $dimension = getimagesize($this->mediaTmpName)) {
-			if ($dimension[1] > $this->maxHeight) {
+		if (false!==$dimension = getimagesize($this->mediaTmpName)) {
+			if ($dimension[1]>$this->maxHeight) {
 				return false;
 			}
 		} else {
@@ -317,7 +317,7 @@ 
 	 **/
 	function checkMimeType()
 	{
-		if (count($this->allowedMimeTypes) > 0 && !in_array($this->mediaType, $this->allowedMimeTypes)) {
+		if (count($this->allowedMimeTypes)>0 && !in_array($this->mediaType, $this->allowedMimeTypes)) {
 			return false;
 		} else {
 			return true;
@@ -331,8 +331,8 @@ 
 	 **/
 	function checkExtension()
 	{
-		$ext = substr( strrchr( $this->mediaName , '.' ) , 1 ) ;
-		if( ! empty( $this->allowedExtensions ) && ! in_array( strtolower( $ext ) , $this->allowedExtensions ) ) {
+		$ext = substr(strrchr($this->mediaName, '.'), 1);
+		if (!empty($this->allowedExtensions) && !in_array(strtolower($ext), $this->allowedExtensions)) {
 			return false;
 		} else {
 			return true;
@@ -362,7 +362,7 @@ 
 			return $this->errors;
 		} else {
 			$ret = '';
-			if (count($this->errors) > 0) {
+			if (count($this->errors)>0) {
 				$ret = '<h4>Errors Returned While Uploading</h4>';
 				foreach ($this->errors as $error) {
 					$ret .= $error.'<br />';

htdocs/modules/songlist/include/formselectvoice.php

Indentation +191 added lines, -191 removed lines

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

Spacing +18 added lines, -18 removed lines

@@ -109,16 +109,16 @@ 
         }
 		$this->addOption('0', _MI_SONGLIST_ALL);
 		if (!isset($_form_object_options['voice'])) {
-			$voice_handler =& xoops_getmodulehandler('voice', 'songlist');
+			$voice_handler = & xoops_getmodulehandler('voice', 'songlist');
 			$criteria = new Criteria('1', '1');
 			$criteria->setSort('`name`');
 			$criteria->setOrder('ASC');
-			foreach($voice_handler->getObjects($criteria, true) as $id => $obj) {
+			foreach ($voice_handler->getObjects($criteria, true) as $id => $obj) {
 				$_form_object_options['voice'][$id] = $obj->getVar('name'); 
 			}
 		}
 		if (isset($_form_object_options['voice']))
-			foreach($_form_object_options['voice'] as $id => $value)
+			foreach ($_form_object_options['voice'] as $id => $value)
 				$this->addOption($id, $value);
 		
 
@@ -152,11 +152,11 @@ 
      */
     function getValue($encode = false)
     {
-        if (! $encode) {
+        if (!$encode) {
             return $this->_value;
         }
         $value = array();
-        foreach($this->_value as $val) {
+        foreach ($this->_value as $val) {
             $value[] = $val ? htmlspecialchars($val, ENT_QUOTES) : $val;
         }
         return $value;
@@ -170,7 +170,7 @@ 
     function setValue($value)
     {
         if (is_array($value)) {
-            foreach($value as $v) {
+            foreach ($value as $v) {
                 $this->_value[] = $v;
             }
         } elseif (isset($value)) {
@@ -186,7 +186,7 @@ 
      */
     function addOption($value, $name = '')
     {
-        if ($name != '') {
+        if ($name!='') {
             $this->_options[$value] = $name;
         } else {
             $this->_options[$value] = $value;
@@ -201,7 +201,7 @@ 
     function addOptionArray($options)
     {
         if (is_array($options)) {
-            foreach($options as $k => $v) {
+            foreach ($options as $k => $v) {
                 $this->addOption($k, $v);
             }
         }
@@ -217,12 +217,12 @@ 
      */
     function getOptions($encode = false)
     {
-        if (! $encode) {
+        if (!$encode) {
             return $this->_options;
         }
         $value = array();
-        foreach($this->_options as $val => $name) {
-            $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode > 1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
+        foreach ($this->_options as $val => $name) {
+            $value[$encode ? htmlspecialchars($val, ENT_QUOTES) : $val] = ($encode>1) ? htmlspecialchars($name, ENT_QUOTES) : $name;
         }
         return $value;
     }
@@ -239,17 +239,17 @@ 
         $ele_value = $this->getValue();
         $ele_options = $this->getOptions();
         $ret = '<select size="'.$this->getSize().'"'.$this->getExtra();
-        if ($this->isMultiple() != false) {
-            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'. $ele_title. '" multiple="multiple">' ;
+        if ($this->isMultiple()!=false) {
+            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'.$ele_title.'" multiple="multiple">';
         } else {
-            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'. $ele_title. '">' ;
+            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'.$ele_title.'">';
         }
-        foreach($ele_options as $value => $name) {
+        foreach ($ele_options as $value => $name) {
             $ret .= '<option value="'.htmlspecialchars($value, ENT_QUOTES).'"';
-            if (count($ele_value) > 0 && in_array($value, $ele_value)) {
+            if (count($ele_value)>0 && in_array($value, $ele_value)) {
                 $ret .= ' selected="selected"';
             }
-            $ret .= '>'.$name.'</option>' ;
+            $ret .= '>'.$name.'</option>';
         }
         $ret .= '</select>';
         return $ret;
@@ -263,7 +263,7 @@ 
     function renderValidationJS()
     {
         // render custom validation code if any
-        if (! empty($this->customValidationCode)) {
+        if (!empty($this->customValidationCode)) {
             return implode("\n", $this->customValidationCode);
             // generate validation code if required
         } elseif ($this->isRequired()) {

Braces +3 added lines, -2 removed lines

@@ -117,9 +117,10 @@
 				$_form_object_options['voice'][$id] = $obj->getVar('name'); 
 			}
 		}
-		if (isset($_form_object_options['voice']))
-			foreach($_form_object_options['voice'] as $id => $value)
+		if (isset($_form_object_options['voice'])) {
+					foreach($_form_object_options['voice'] as $id => $value)
 				$this->addOption($id, $value);
+		}
 		
 
     }