XoopsModules25x / songlist

htdocs/modules/songlist/admin/artists.php

Switch Indentation +5 added lines, -5 removed lines

@@ -15,10 +15,10 @@ 
 	$filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
 	
 	switch($op) {
-	default:
-	case "artists":
-		switch ($fct)
-		{
+		default:
+		case "artists":
+			switch ($fct)
+			{
 			default:
 			case "list":				
 				$indexAdmin = new ModuleAdmin();
@@ -131,7 +131,7 @@ 
 					xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_ARTISTS_DELETE, $artists->getVar('name')));
 				}
 				break;
-		}
+			}
 		break;
 				
 	}

Spacing +24 added lines, -24 removed lines

@@ -6,15 +6,15 @@ 
 	
 	xoops_cp_header();
 	
-	$op = isset($_REQUEST['op'])?$_REQUEST['op']:"artists";
-	$fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list";
-	$limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
-	$start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0;
-	$order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC';
-	$sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
-	$filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
+	$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : "artists";
+	$fct = isset($_REQUEST['fct']) ? $_REQUEST['fct'] : "list";
+	$limit = !empty($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 30;
+	$start = !empty($_REQUEST['start']) ?intval($_REQUEST['start']) : 0;
+	$order = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
+	$sort = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
+	$filter = !empty($_REQUEST['filter']) ? ''.$_REQUEST['filter'].'' : '1,1';
 	
-	switch($op) {
+	switch ($op) {
 	default:
 	case "artists":
 		switch ($fct)
@@ -24,18 +24,18 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 				
-				$artists_handler =& xoops_getmodulehandler('artists', 'songlist');
+				$artists_handler = & xoops_getmodulehandler('artists', 'songlist');
 					
 				$criteria = $artists_handler->getFilterCriteria($GLOBALS['filter']);
 				$ttl = $artists_handler->getCount($criteria);
-				$GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
+				$GLOBALS['sort'] = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
 									
 				$pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']);
 				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
 		
 				foreach ($artists_handler->filterFields() as $id => $key) {
-					$GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
-					$GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $artists_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+					$GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-', '_', $key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort']) ? ($GLOBALS['order']=='DESC' ? 'ASC' : 'DESC') : $GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-', '_', $key))) ?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_'.strtoupper(str_replace('-', '_', $key))).'</a>');
+					$GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-', '_', $key)).'_th', $artists_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
 				}
 				
 				$GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
@@ -51,7 +51,7 @@ 
 				$criteria->setOrder($GLOBALS['order']);
 					
 				$artists = $artists_handler->getObjects($criteria, true);
-				foreach($artists as $cid => $artist) {
+				foreach ($artists as $cid => $artist) {
 					if (is_object($artist))					
 						$GLOBALS['xoopsTpl']->append('artists', $artist->toArray());
 				}
@@ -66,7 +66,7 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 											
-				$artists_handler =& xoops_getmodulehandler('artists', 'songlist');
+				$artists_handler = & xoops_getmodulehandler('artists', 'songlist');
 				if (isset($_REQUEST['id'])) {
 					$artists = $artists_handler->get(intval($_REQUEST['id']));
 				} else {
@@ -79,21 +79,21 @@ 
 				break;
 			case "save":
 				
-				$artists_handler =& xoops_getmodulehandler('artists', 'songlist');
-				$id=0;
-				if ($id=intval($_REQUEST['id'])) {
+				$artists_handler = & xoops_getmodulehandler('artists', 'songlist');
+				$id = 0;
+				if ($id = intval($_REQUEST['id'])) {
 					$artists = $artists_handler->get($id);
 				} else {
 					$artists = $artists_handler->create();
 				}
 				$artists->setVars($_POST[$id]);
 				
-				if (!$id=$artists_handler->insert($artists)) {
+				if (!$id = $artists_handler->insert($artists)) {
 					redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE);
 					exit(0);
 				} else {
 					if ($_REQUEST['state'][$_REQUEST['id']]=='new')
-						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
+						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'].'&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
 					else 
 						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
 					exit(0);
@@ -101,8 +101,8 @@ 
 				break;
 			case "savelist":
 				
-				$artists_handler =& xoops_getmodulehandler('artists', 'songlist');
-				foreach($_REQUEST['id'] as $id) {
+				$artists_handler = & xoops_getmodulehandler('artists', 'songlist');
+				foreach ($_REQUEST['id'] as $id) {
 					$artists = $artists_handler->get($id);
 					$artists->setVars($_POST[$id]);
 					if (!$artists_handler->insert($artists)) {
@@ -115,9 +115,9 @@ 
 				break;				
 			case "delete":	
 							
-				$artists_handler =& xoops_getmodulehandler('artists', 'songlist');
-				$id=0;
-				if (isset($_POST['id'])&&$id=intval($_POST['id'])) {
+				$artists_handler = & xoops_getmodulehandler('artists', 'songlist');
+				$id = 0;
+				if (isset($_POST['id']) && $id = intval($_POST['id'])) {
 					$artists = $artists_handler->get($id);
 					if (!$artists_handler->delete($artists)) {
 						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTODELETE);

Braces +8 added lines, -6 removed lines

@@ -52,8 +52,9 @@ 
 					
 				$artists = $artists_handler->getObjects($criteria, true);
 				foreach($artists as $cid => $artist) {
-					if (is_object($artist))					
-						$GLOBALS['xoopsTpl']->append('artists', $artist->toArray());
+					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']);
@@ -92,10 +93,11 @@ 
 					redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE);
 					exit(0);
 				} else {
-					if ($_REQUEST['state'][$_REQUEST['id']]=='new')
-						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
-					else 
-						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
+					if ($_REQUEST['state'][$_REQUEST['id']]=='new') {
+											redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
+					} else {
+											redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
+					}
 					exit(0);
 				}
 				break;

htdocs/modules/songlist/admin/category.php

Indentation +10 added lines, -10 removed lines

@@ -111,26 +111,26 @@
 						if ($uploader->fetchMedia('image')) {
 						  	if (!$uploader->upload()) {
 						  		
-						    	songlist_adminMenu(1);
-						    	echo $uploader->getErrors();
+								songlist_adminMenu(1);
+								echo $uploader->getErrors();
 								songlist_footer_adminMenu();
 								xoops_cp_footer();
 								exit(0);
-					  	    } else {
+					  		} else {
 					  	    	
-						      	if (strlen($category->getVar('image')))
-						      		unlink($GLOBALS['xoops']->path($category->getVar('path')).$category->getVar('image'));
+							  	if (strlen($category->getVar('image')))
+							  		unlink($GLOBALS['xoops']->path($category->getVar('path')).$category->getVar('image'));
 						      	
-						      	$category->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
-						      	$category->setVar('image', $uploader->getSavedFileName());
-						      	@$category_handler->insert($category);
+							  	$category->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
+							  	$category->setVar('image', $uploader->getSavedFileName());
+							  	@$category_handler->insert($category);
 						      	
-						    }      	
+							}      	
 					  	} else {
 					  		
 							$indexAdmin = new ModuleAdmin();
 							echo $indexAdmin->addNavigation(basename(__FILE__));
-					       	echo $uploader->getErrors();
+						   	echo $uploader->getErrors();
 							songlist_footer_adminMenu();
 							xoops_cp_footer();
 							exit(0);

Switch Indentation +5 added lines, -5 removed lines

@@ -15,10 +15,10 @@ 
 	$filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
 	
 	switch($op) {
-	default:
-	case "category":
-		switch ($fct)
-		{
+		default:
+		case "category":
+			switch ($fct)
+			{
 			default:
 			case "list":				
 				$indexAdmin = new ModuleAdmin();
@@ -176,7 +176,7 @@ 
 					xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_CATEGORY_DELETE, $category->getVar('name')));
 				}
 				break;
-		}
+			}
 		break;
 				
 	}

Spacing +29 added lines, -29 removed lines

@@ -6,15 +6,15 @@ 
 	
 	xoops_cp_header();
 	
-	$op = isset($_REQUEST['op'])?$_REQUEST['op']:"category";
-	$fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list";
-	$limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
-	$start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0;
-	$order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC';
-	$sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
-	$filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
+	$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : "category";
+	$fct = isset($_REQUEST['fct']) ? $_REQUEST['fct'] : "list";
+	$limit = !empty($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 30;
+	$start = !empty($_REQUEST['start']) ?intval($_REQUEST['start']) : 0;
+	$order = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
+	$sort = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
+	$filter = !empty($_REQUEST['filter']) ? ''.$_REQUEST['filter'].'' : '1,1';
 	
-	switch($op) {
+	switch ($op) {
 	default:
 	case "category":
 		switch ($fct)
@@ -24,18 +24,18 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 				
-				$category_handler =& xoops_getmodulehandler('category', 'songlist');
+				$category_handler = & xoops_getmodulehandler('category', 'songlist');
 					
 				$criteria = $category_handler->getFilterCriteria($GLOBALS['filter']);
 				$ttl = $category_handler->getCount($criteria);
-				$GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
+				$GLOBALS['sort'] = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
 									
 				$pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']);
 				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
 		
 				foreach ($category_handler->filterFields() as $id => $key) {
-					$GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
-					$GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $category_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+					$GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-', '_', $key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort']) ? ($GLOBALS['order']=='DESC' ? 'ASC' : 'DESC') : $GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-', '_', $key))) ?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_'.strtoupper(str_replace('-', '_', $key))).'</a>');
+					$GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-', '_', $key)).'_th', $category_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
 				}
 				
 				$GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
@@ -51,7 +51,7 @@ 
 				$criteria->setOrder($GLOBALS['order']);
 					
 				$categorys = $category_handler->getObjects($criteria, true);
-				foreach($categorys as $cid => $category) {
+				foreach ($categorys as $cid => $category) {
 					if (is_object($category))					
 						$GLOBALS['xoopsTpl']->append('categories', $category->toArray());
 				}
@@ -66,7 +66,7 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 								
-				$category_handler =& xoops_getmodulehandler('category', 'songlist');
+				$category_handler = & xoops_getmodulehandler('category', 'songlist');
 				if (isset($_REQUEST['id'])) {
 					$category = $category_handler->get(intval($_REQUEST['id']));
 				} else {
@@ -79,26 +79,26 @@ 
 				break;
 			case "save":
 				
-				$category_handler =& xoops_getmodulehandler('category', 'songlist');
-				$id=0;
-				if ($id=intval($_REQUEST['id'])) {
+				$category_handler = & xoops_getmodulehandler('category', 'songlist');
+				$id = 0;
+				if ($id = intval($_REQUEST['id'])) {
 					$category = $category_handler->get($id);
 				} else {
 					$category = $category_handler->create();
 				}
 				$category->setVars($_POST[$id]);
 				
-				if (!$id=$category_handler->insert($category)) {
+				if (!$id = $category_handler->insert($category)) {
 					redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTOSAVE);
 					exit(0);
 				} else {
 					
-					if (isset($_FILES['image'])&&!empty($_FILES['image']['name'])) {
+					if (isset($_FILES['image']) && !empty($_FILES['image']['name'])) {
 						
 						if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) {
-							foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders)
-								foreach(explode('/', $folders) as $folder) {
-									$path .= DS . $folder;
+							foreach (explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders)
+								foreach (explode('/', $folders) as $folder) {
+									$path .= DS.$folder;
 									mkdir($path, 0777);
 								}
 						}
@@ -106,7 +106,7 @@ 
 						include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php'));
 						$category = $category_handler->get($id);
 						$uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']), $GLOBALS['songlistModuleConfig']['filesize_upload'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions']));
-						$uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13));
+						$uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0, 20), 13));
 						
 						if ($uploader->fetchMedia('image')) {
 						  	if (!$uploader->upload()) {
@@ -138,7 +138,7 @@ 
 					}
 					
 					if ($_REQUEST['state'][$_REQUEST['id']]=='new')
-						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY);
+						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'].'&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY);
 					else 
 						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY);
 					exit(0);
@@ -146,8 +146,8 @@ 
 				break;
 			case "savelist":
 				
-				$category_handler =& xoops_getmodulehandler('category', 'songlist');
-				foreach($_REQUEST['id'] as $id) {
+				$category_handler = & xoops_getmodulehandler('category', 'songlist');
+				foreach ($_REQUEST['id'] as $id) {
 					$category = $category_handler->get($id);
 					$category->setVars($_POST[$id]);
 					if (!$category_handler->insert($category)) {
@@ -160,9 +160,9 @@ 
 				break;				
 			case "delete":	
 							
-				$category_handler =& xoops_getmodulehandler('category', 'songlist');
-				$id=0;
-				if (isset($_POST['id'])&&$id=intval($_POST['id'])) {
+				$category_handler = & xoops_getmodulehandler('category', 'songlist');
+				$id = 0;
+				if (isset($_POST['id']) && $id = intval($_POST['id'])) {
 					$category = $category_handler->get($id);
 					if (!$category_handler->delete($category)) {
 						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_FAILEDTODELETE);

Braces +14 added lines, -10 removed lines

@@ -52,8 +52,9 @@ 
 					
 				$categorys = $category_handler->getObjects($criteria, true);
 				foreach($categorys as $cid => $category) {
-					if (is_object($category))					
-						$GLOBALS['xoopsTpl']->append('categories', $category->toArray());
+					if (is_object($category)) {
+											$GLOBALS['xoopsTpl']->append('categories', $category->toArray());
+					}
 				}
 				$GLOBALS['xoopsTpl']->assign('form', songlist_category_get_form(false));
 				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
@@ -96,9 +97,10 @@ 
 					if (isset($_FILES['image'])&&!empty($_FILES['image']['name'])) {
 						
 						if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) {
-							foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders)
-								foreach(explode('/', $folders) as $folder) {
+							foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) {
+															foreach(explode('/', $folders) as $folder) {
 									$path .= DS . $folder;
+							}
 									mkdir($path, 0777);
 								}
 						}
@@ -118,8 +120,9 @@ 
 								exit(0);
 					  	    } else {
 					  	    	
-						      	if (strlen($category->getVar('image')))
-						      		unlink($GLOBALS['xoops']->path($category->getVar('path')).$category->getVar('image'));
+						      	if (strlen($category->getVar('image'))) {
+						      							      		unlink($GLOBALS['xoops']->path($category->getVar('path')).$category->getVar('image'));
+						      	}
 						      	
 						      	$category->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
 						      	$category->setVar('image', $uploader->getSavedFileName());
@@ -137,10 +140,11 @@ 
 					   	}
 					}
 					
-					if ($_REQUEST['state'][$_REQUEST['id']]=='new')
-						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY);
-					else 
-						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY);
+					if ($_REQUEST['state'][$_REQUEST['id']]=='new') {
+											redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY);
+					} else {
+											redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_CATEGORY_SAVEDOKEY);
+					}
 					exit(0);
 				}
 				break;

htdocs/modules/songlist/admin/about.php

Spacing +6 added lines, -6 removed lines

@@ -37,12 +37,12 @@ 
 	$indexAdmin = new ModuleAdmin();
 	echo $indexAdmin->addNavigation(basename(__FILE__));
 	$aboutAdmin = new ModuleAdmin();
-	$paypalitemno='SONGLIST';
+	$paypalitemno = 'SONGLIST';
 	$aboutAdmin = new ModuleAdmin();
 	$about = $aboutAdmin->renderabout($paypalitemno, false);
-	$donationform = array(	0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">',
+	$donationform = array(0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">',
 								1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_AM_SONGLIST_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>',
-								2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>',																'D'=>'',
+								2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>', 'D'=>'',
 								3 => '',
 								4 => '<!-- Start Form Validation JavaScript //-->
 <script type="text/javascript">
@@ -52,16 +52,16 @@ 
 }
 //--></script>
 <!-- End Form Validation JavaScript //-->');
-	$paypalform = array(	0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">',
+	$paypalform = array(0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">',
 							1 => '<input name="cmd" value="_s-xclick" type="hidden">',
 							2 => '<input name="hosted_button_id" value="%s" type="hidden">',
 							3 => '<img alt="" src="https://www.paypal.com/fr_FR/i/scr/pixel.gif" height="1" border="0" width="1">',
 							4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="image">',
 							5 => '</form>');
-	for($key=0;$key<=4;$key++) {
+	for ($key = 0; $key<=4; $key++) {
 		switch ($key) {
 			case 2:
-				$donationform[$key] =  sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['songlistModule']->getVar('dirname')),  strtoupper($GLOBALS['songlistModule']->getVar('dirname')). ' '.$GLOBALS['songlistModule']->getVar('name'));
+				$donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'].' - '.(strlen($GLOBALS['xoopsUser']->getVar('name'))>0 ? $GLOBALS['xoopsUser']->getVar('name').' ['.$GLOBALS['xoopsUser']->getVar('uname').']' : $GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['songlistModule']->getVar('dirname')), strtoupper($GLOBALS['songlistModule']->getVar('dirname')).' '.$GLOBALS['songlistModule']->getVar('name'));
 				break;
 		}
 	}

htdocs/modules/songlist/admin/votes.php

Indentation +10 added lines, -10 removed lines

@@ -111,25 +111,25 @@
 						if ($uploader->fetchMedia('image')) {
 						  	if (!$uploader->upload()) {
 						  		
-						    	songlist_adminMenu(1);
-						    	echo $uploader->getErrors();
+								songlist_adminMenu(1);
+								echo $uploader->getErrors();
 								songlist_footer_adminMenu();
 								xoops_cp_footer();
 								exit(0);
-					  	    } else {
+					  		} else {
 					  	    	
-						      	if (strlen($votes->getVar('image')))
-						      		unlink($GLOBALS['xoops']->path($votes->getVar('path')).$votes->getVar('image'));
+							  	if (strlen($votes->getVar('image')))
+							  		unlink($GLOBALS['xoops']->path($votes->getVar('path')).$votes->getVar('image'));
 						      	
-						      	$votes->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
-						      	$votes->setVar('image', $uploader->getSavedFileName());
-						      	@$votes_handler->insert($votes);
+							  	$votes->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
+							  	$votes->setVar('image', $uploader->getSavedFileName());
+							  	@$votes_handler->insert($votes);
 						      	
-						    }      	
+							}      	
 					  	} else {
 					  		
 					  		songlist_adminMenu(1);
-					       	echo $uploader->getErrors();
+						   	echo $uploader->getErrors();
 							songlist_footer_adminMenu();
 							xoops_cp_footer();
 							exit(0);

Switch Indentation +5 added lines, -5 removed lines

@@ -15,10 +15,10 @@ 
 	$filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
 	
 	switch($op) {
-	default:
-	case "votes":
-		switch ($fct)
-		{
+		default:
+		case "votes":
+			switch ($fct)
+			{
 			default:
 			case "list":				
 				$indexAdmin = new ModuleAdmin();
@@ -175,7 +175,7 @@ 
 					xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_VOTES_DELETE, $votes->getVar('name')));
 				}
 				break;
-		}
+			}
 		break;
 				
 	}

Spacing +29 added lines, -29 removed lines

@@ -6,15 +6,15 @@ 
 	
 	xoops_cp_header();
 	
-	$op = isset($_REQUEST['op'])?$_REQUEST['op']:"votes";
-	$fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"";
-	$limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
-	$start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0;
-	$order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC';
-	$sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
-	$filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
+	$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : "votes";
+	$fct = isset($_REQUEST['fct']) ? $_REQUEST['fct'] : "";
+	$limit = !empty($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 30;
+	$start = !empty($_REQUEST['start']) ?intval($_REQUEST['start']) : 0;
+	$order = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
+	$sort = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
+	$filter = !empty($_REQUEST['filter']) ? ''.$_REQUEST['filter'].'' : '1,1';
 	
-	switch($op) {
+	switch ($op) {
 	default:
 	case "votes":
 		switch ($fct)
@@ -24,18 +24,18 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 				
-				$votes_handler =& xoops_getmodulehandler('votes', 'songlist');
+				$votes_handler = & xoops_getmodulehandler('votes', 'songlist');
 					
 				$criteria = $votes_handler->getFilterCriteria($GLOBALS['filter']);
 				$ttl = $votes_handler->getCount($criteria);
-				$GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
+				$GLOBALS['sort'] = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
 									
 				$pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']);
 				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
 		
 				foreach ($votes_handler->filterFields() as $id => $key) {
-					$GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
-					$GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $votes_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+					$GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-', '_', $key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort']) ? ($GLOBALS['order']=='DESC' ? 'ASC' : 'DESC') : $GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-', '_', $key))) ?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_'.strtoupper(str_replace('-', '_', $key))).'</a>');
+					$GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-', '_', $key)).'_th', $votes_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
 				}
 				
 				$GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
@@ -51,7 +51,7 @@ 
 				$criteria->setOrder($GLOBALS['order']);
 					
 				$votess = $votes_handler->getObjects($criteria, true);
-				foreach($votess as $cid => $votes) {
+				foreach ($votess as $cid => $votes) {
 					if (is_object($votes))					
 						$GLOBALS['xoopsTpl']->append('categories', $votes->toArray());
 				}
@@ -66,7 +66,7 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 								
-				$votes_handler =& xoops_getmodulehandler('votes', 'songlist');
+				$votes_handler = & xoops_getmodulehandler('votes', 'songlist');
 				if (isset($_REQUEST['id'])) {
 					$votes = $votes_handler->get(intval($_REQUEST['id']));
 				} else {
@@ -79,26 +79,26 @@ 
 				break;
 			case "save":
 				
-				$votes_handler =& xoops_getmodulehandler('votes', 'songlist');
-				$id=0;
-				if ($id=intval($_REQUEST['id'])) {
+				$votes_handler = & xoops_getmodulehandler('votes', 'songlist');
+				$id = 0;
+				if ($id = intval($_REQUEST['id'])) {
 					$votes = $votes_handler->get($id);
 				} else {
 					$votes = $votes_handler->create();
 				}
 				$votes->setVars($_POST[$id]);
 				
-				if (!$id=$votes_handler->insert($votes)) {
+				if (!$id = $votes_handler->insert($votes)) {
 					redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_VOTES_FAILEDTOSAVE);
 					exit(0);
 				} else {
 					
-					if (isset($_FILES['image'])&&!empty($_FILES['image']['name'])) {
+					if (isset($_FILES['image']) && !empty($_FILES['image']['name'])) {
 						
 						if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) {
-							foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders)
-								foreach(explode('/', $folders) as $folder) {
-									$path .= DS . $folder;
+							foreach (explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders)
+								foreach (explode('/', $folders) as $folder) {
+									$path .= DS.$folder;
 									mkdir($path, 0777);
 								}
 						}
@@ -106,7 +106,7 @@ 
 						include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php'));
 						$votes = $votes_handler->get($id);
 						$uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']), $GLOBALS['songlistModuleConfig']['filesize_upload'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions']));
-						$uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13));
+						$uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0, 20), 13));
 						
 						if ($uploader->fetchMedia('image')) {
 						  	if (!$uploader->upload()) {
@@ -137,7 +137,7 @@ 
 					}
 					
 					if ($_REQUEST['state'][$_REQUEST['id']]=='new')
-						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_VOTES_SAVEDOKEY);
+						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'].'&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_VOTES_SAVEDOKEY);
 					else 
 						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_VOTES_SAVEDOKEY);
 					exit(0);
@@ -145,8 +145,8 @@ 
 				break;
 			case "savelist":
 				
-				$votes_handler =& xoops_getmodulehandler('votes', 'songlist');
-				foreach($_REQUEST['id'] as $id) {
+				$votes_handler = & xoops_getmodulehandler('votes', 'songlist');
+				foreach ($_REQUEST['id'] as $id) {
 					$votes = $votes_handler->get($id);
 					$votes->setVars($_POST[$id]);
 					if (!$votes_handler->insert($votes)) {
@@ -159,9 +159,9 @@ 
 				break;				
 			case "delete":	
 							
-				$votes_handler =& xoops_getmodulehandler('votes', 'songlist');
-				$id=0;
-				if (isset($_POST['id'])&&$id=intval($_POST['id'])) {
+				$votes_handler = & xoops_getmodulehandler('votes', 'songlist');
+				$id = 0;
+				if (isset($_POST['id']) && $id = intval($_POST['id'])) {
 					$votes = $votes_handler->get($id);
 					if (!$votes_handler->delete($votes)) {
 						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_VOTES_FAILEDTODELETE);

Braces +14 added lines, -10 removed lines

@@ -52,8 +52,9 @@ 
 					
 				$votess = $votes_handler->getObjects($criteria, true);
 				foreach($votess as $cid => $votes) {
-					if (is_object($votes))					
-						$GLOBALS['xoopsTpl']->append('categories', $votes->toArray());
+					if (is_object($votes)) {
+											$GLOBALS['xoopsTpl']->append('categories', $votes->toArray());
+					}
 				}
 				//$GLOBALS['xoopsTpl']->assign('form', songlist_votes_get_form(false));
 				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
@@ -96,9 +97,10 @@ 
 					if (isset($_FILES['image'])&&!empty($_FILES['image']['name'])) {
 						
 						if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) {
-							foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders)
-								foreach(explode('/', $folders) as $folder) {
+							foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) {
+															foreach(explode('/', $folders) as $folder) {
 									$path .= DS . $folder;
+							}
 									mkdir($path, 0777);
 								}
 						}
@@ -118,8 +120,9 @@ 
 								exit(0);
 					  	    } else {
 					  	    	
-						      	if (strlen($votes->getVar('image')))
-						      		unlink($GLOBALS['xoops']->path($votes->getVar('path')).$votes->getVar('image'));
+						      	if (strlen($votes->getVar('image'))) {
+						      							      		unlink($GLOBALS['xoops']->path($votes->getVar('path')).$votes->getVar('image'));
+						      	}
 						      	
 						      	$votes->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
 						      	$votes->setVar('image', $uploader->getSavedFileName());
@@ -136,10 +139,11 @@ 
 					   	}
 					}
 					
-					if ($_REQUEST['state'][$_REQUEST['id']]=='new')
-						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_VOTES_SAVEDOKEY);
-					else 
-						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_VOTES_SAVEDOKEY);
+					if ($_REQUEST['state'][$_REQUEST['id']]=='new') {
+											redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_VOTES_SAVEDOKEY);
+					} else {
+											redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_VOTES_SAVEDOKEY);
+					}
 					exit(0);
 				}
 				break;

htdocs/modules/songlist/admin/import.php

Indentation +13 added lines, -13 removed lines

@@ -23,8 +23,8 @@ 
 			case "actiona":	
 
 				if (isset($_SESSION['xmlfile'])) {
-			      	redirect_header($_SERVER['PHP_SELF'].'?file='.$_SESSION['xmlfile'].'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
-			      	exit;
+				  	redirect_header($_SERVER['PHP_SELF'].'?file='.$_SESSION['xmlfile'].'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
+				  	exit;
 				}
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
@@ -38,9 +38,9 @@ 
 				if ($_POST['file']!='') {
 					$file = substr(md5(microtime(true)), mt_rand(0,20), 13).'.xml';
 					copy($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']).$_POST['file'], $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']).$file);
-				    $_SESSION['xmlfile'] = $file;
-			      	redirect_header($_SERVER['PHP_SELF'].'?file='.$file.'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_COPIED);
-			      	exit;
+					$_SESSION['xmlfile'] = $file;
+				  	redirect_header($_SERVER['PHP_SELF'].'?file='.$file.'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_COPIED);
+				  	exit;
 				} elseif (isset($_FILES['xmlfile'])&&strlen($_FILES['xmlfile']['name'])) {
 						
 					if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) {
@@ -59,25 +59,25 @@ 
 					  	if (!$uploader->upload()) {
 							$indexAdmin = new ModuleAdmin();
 							echo $indexAdmin->addNavigation(basename(__FILE__));
-					    	echo $uploader->getErrors();
+							echo $uploader->getErrors();
 							xoops_cp_footer();
 							exit(0);
-				  	    } else {
-					      	$_SESSION['xmlfile'] = $uploader->getSavedFileName();
-					      	redirect_header($_SERVER['PHP_SELF'].'?file='.$uploader->getSavedFileName().'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
-					      	exit;
-					    }      	
+				  		} else {
+						  	$_SESSION['xmlfile'] = $uploader->getSavedFileName();
+						  	redirect_header($_SERVER['PHP_SELF'].'?file='.$uploader->getSavedFileName().'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
+						  	exit;
+						}      	
 				  	} else {
 						$indexAdmin = new ModuleAdmin();
 						echo $indexAdmin->addNavigation(basename(__FILE__));
-				       	echo $uploader->getErrors();
+					   	echo $uploader->getErrors();
 						xoops_cp_footer();
 						exit(0);
 				   	}
 				} else {
 					$indexAdmin = new ModuleAdmin();
 					echo $indexAdmin->addNavigation(basename(__FILE__));
-			       	echo _AM_SONGLIST_IMPORT_NOFILE;
+				   	echo _AM_SONGLIST_IMPORT_NOFILE;
 					xoops_cp_footer();
 					exit(0);
 				}

Switch Indentation +5 added lines, -5 removed lines

@@ -15,10 +15,10 @@ 
 	$filter = isset($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
 	
 	switch($op) {
-	default:
-	case "import":
-		switch ($fct)
-		{
+		default:
+		case "import":
+			switch ($fct)
+			{
 			default:
 			case "actiona":	
 
@@ -578,7 +578,7 @@ 
 				unset($_SESSION['xmlfile']);
 				redirect_header($_SERVER['PHP_SELF'].'?op=import&fct=actiona', 10, _AM_SONGLIST_XMLFILE_COMPLETE);
 				break;
-		}
+			}
 		break;
 				
 	}

Spacing +105 added lines, -105 removed lines

@@ -6,15 +6,15 @@ 
 	
 	xoops_cp_header();
 	
-	$op = isset($_REQUEST['op'])?$_REQUEST['op']:"import";
-	$fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"actiona";
-	$limit = isset($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
-	$start = isset($_REQUEST['start'])?intval($_REQUEST['start']):0;
-	$order = isset($_REQUEST['order'])?$_REQUEST['order']:'DESC';
-	$sort = isset($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
-	$filter = isset($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
+	$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : "import";
+	$fct = isset($_REQUEST['fct']) ? $_REQUEST['fct'] : "actiona";
+	$limit = isset($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 30;
+	$start = isset($_REQUEST['start']) ?intval($_REQUEST['start']) : 0;
+	$order = isset($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
+	$sort = isset($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
+	$filter = isset($_REQUEST['filter']) ? ''.$_REQUEST['filter'].'' : '1,1';
 	
-	switch($op) {
+	switch ($op) {
 	default:
 	case "import":
 		switch ($fct)
@@ -36,24 +36,24 @@ 
 				
 			case "upload":
 				if ($_POST['file']!='') {
-					$file = substr(md5(microtime(true)), mt_rand(0,20), 13).'.xml';
+					$file = substr(md5(microtime(true)), mt_rand(0, 20), 13).'.xml';
 					copy($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']).$_POST['file'], $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']).$file);
 				    $_SESSION['xmlfile'] = $file;
 			      	redirect_header($_SERVER['PHP_SELF'].'?file='.$file.'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_COPIED);
 			      	exit;
-				} elseif (isset($_FILES['xmlfile'])&&strlen($_FILES['xmlfile']['name'])) {
+				} elseif (isset($_FILES['xmlfile']) && strlen($_FILES['xmlfile']['name'])) {
 						
 					if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) {
-						foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders)
-							foreach(explode('/', $folders) as $folder) {
-								$path .= DS . $folder;
+						foreach (explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders)
+							foreach (explode('/', $folders) as $folder) {
+								$path .= DS.$folder;
 								mkdir($path, 0777);
 							}
 					}
 					
 					include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php'));
 					$uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), array('application/xml', 'text/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity', 'text/xml xml xsl', 'text/xml-external-parsed-entity'), 1024*1024*1024*32, 0, 0, array('xml'));
-					$uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0,20), 13));
+					$uploader->setPrefix(substr(md5(microtime(true)), mt_rand(0, 20), 13));
 					
 					if ($uploader->fetchMedia('xmlfile')) {
 					  	if (!$uploader->upload()) {
@@ -103,7 +103,7 @@ 
 				
 				
 				$filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile']));
-				$mb = floor($filesize / 1024 / 1024);
+				$mb = floor($filesize/1024/1024);
 				if ($mb>32) {
 					set_ini('memory_limit', ($mb+128).'M');	
 				}
@@ -114,15 +114,15 @@ 
 								
 				$xmlarray = songlist_xml2array(file_get_contents($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile'])), false, 'tag');
 
-				if (!empty($_POST['collection'])&&strlen($_POST['collection'])>0) {
-					if (!empty($_POST['record'])&&strlen($_POST['record'])>0) {
-						foreach($xmlarray[$_POST['collection']][$_POST['record']] as $recid => $data) {
+				if (!empty($_POST['collection']) && strlen($_POST['collection'])>0) {
+					if (!empty($_POST['record']) && strlen($_POST['record'])>0) {
+						foreach ($xmlarray[$_POST['collection']][$_POST['record']] as $recid => $data) {
 							if (isset($_POST['limiting'])) {
 								if (intval($_POST['limiting'])==true) {
 									$record++;
 									if ($record>intval($_POST['records'])) {
 										$start = time();
-										while(time()-$start<intval($_POST['wait'])) {
+										while (time()-$start<intval($_POST['wait'])) {
 											
 										}
 										$records = 0;
@@ -131,10 +131,10 @@ 
 							}
 							$gid = 0;
 							$gids = array();
-							if (!empty($_POST['genre'])&&strlen($_POST['genre'])>1) {
-								if (isset($data[$_POST['genre']])&&trim($_POST['genre'])!='') {
-									foreach(explode(',', trim($data[$_POST['genre']])) as $genre) {
-										$criteria = new Criteria('`name`',  trim($genre));
+							if (!empty($_POST['genre']) && strlen($_POST['genre'])>1) {
+								if (isset($data[$_POST['genre']]) && trim($_POST['genre'])!='') {
+									foreach (explode(',', trim($data[$_POST['genre']])) as $genre) {
+										$criteria = new Criteria('`name`', trim($genre));
 										if ($genre_handler->getCount($criteria)>0) {
 											$objects = $genre_handler->getObjects($criteria, false);
 											$gid = $objects[0]->getVar('gid');
@@ -148,9 +148,9 @@ 
 								}
 							}	
 							$vcid = 0;
-							if (!empty($_POST['voice'])&&strlen($_POST['voice'])>1) {
-								if (isset($data[$_POST['voice']])&&trim($_POST['voice'])!='') {
-									$criteria = new Criteria('`name`',  trim($data[$_POST['voice']]));
+							if (!empty($_POST['voice']) && strlen($_POST['voice'])>1) {
+								if (isset($data[$_POST['voice']]) && trim($_POST['voice'])!='') {
+									$criteria = new Criteria('`name`', trim($data[$_POST['voice']]));
 									if ($voice_handler->getCount($criteria)>0) {
 										$objects = $voice_handler->getObjects($criteria, false);
 										$vcid = $objects[0]->getVar('vcid');
@@ -163,9 +163,9 @@ 
 							}	
 							
 							$cid = 0;
-							if (!empty($_POST['category'])&&strlen($_POST['category'])>1) {
-								if (isset($data[$_POST['category']])&&trim($_POST['category'])!='') {
-									$criteria = new Criteria('`name`',  trim($data[$_POST['category']]));
+							if (!empty($_POST['category']) && strlen($_POST['category'])>1) {
+								if (isset($data[$_POST['category']]) && trim($_POST['category'])!='') {
+									$criteria = new Criteria('`name`', trim($data[$_POST['category']]));
 									if ($category_handler->getCount($criteria)>0) {
 										$objects = $category_handler->getObjects($criteria, false);
 										$cid = $objects[0]->getVar('cid');
@@ -177,10 +177,10 @@ 
 								}
 							}
 							$aids = array();
-							if (!empty($_POST['artist'])&&strlen($_POST['artist'])>1) {
-								if (isset($data[$_POST['artist']])&&$_POST['artist']!='') {
-									foreach(explode(',', trim($data[$_POST['artist']])) as $artist) {
-										$criteria = new Criteria('`name`',  trim($artist));
+							if (!empty($_POST['artist']) && strlen($_POST['artist'])>1) {
+								if (isset($data[$_POST['artist']]) && $_POST['artist']!='') {
+									foreach (explode(',', trim($data[$_POST['artist']])) as $artist) {
+										$criteria = new Criteria('`name`', trim($artist));
 										if ($artists_handler->getCount($criteria)>0) {
 											$objects = $artists_handler->getObjects($criteria, false);
 											$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
@@ -194,9 +194,9 @@ 
 								}
 							}
 							$abid = 0;
-							if (!empty($_POST['album'])&&strlen($_POST['album'])>1) {
-								if (isset($data[$_POST['album']])&&trim($_POST['album'])!='') {
-									$criteria = new Criteria('`title`',  trim($data[$_POST['album']]));
+							if (!empty($_POST['album']) && strlen($_POST['album'])>1) {
+								if (isset($data[$_POST['album']]) && trim($_POST['album'])!='') {
+									$criteria = new Criteria('`title`', trim($data[$_POST['album']]));
 									if ($albums_handler->getCount($criteria)>0) {
 										$objects = $albums_handler->getObjects($criteria, false);
 										$abid = $objects[0]->getVar('abid');
@@ -210,13 +210,13 @@ 
 								}
 							}
 							$sid = 0;
-							if ((!empty($_POST['songid'])&&strlen($_POST['songid'])>1)||(!empty($_POST['title'])&&strlen($_POST['title'])>1)) {
-								if ((isset($data[$_POST['songid']])&&$_POST['songid']!='')||(isset($data[$_POST['title']])&&$_POST['title']!='')) {
+							if ((!empty($_POST['songid']) && strlen($_POST['songid'])>1) || (!empty($_POST['title']) && strlen($_POST['title'])>1)) {
+								if ((isset($data[$_POST['songid']]) && $_POST['songid']!='') || (isset($data[$_POST['title']]) && $_POST['title']!='')) {
 									$criteria = new CriteriaCompo();
 									if (trim($data[$_POST['songid']])!='')
-										$criteria->add(new Criteria('`songid`',  trim($data[$_POST['songid']])));
+										$criteria->add(new Criteria('`songid`', trim($data[$_POST['songid']])));
 									if (trim($data[$_POST['title']])!='')
-										$criteria->add(new Criteria('`title`',  trim($data[$_POST['title']])));
+										$criteria->add(new Criteria('`title`', trim($data[$_POST['title']])));
 									if ($songs_handler->getCount($criteria)>0) {
 										$objects = $songs_handler->getObjects($criteria, false);
 										$object = $objects[0];
@@ -236,7 +236,7 @@ 
 									$object->setVar('lyrics', str_replace("\n", "<br/>\n", trim($data[$_POST['lyrics']])));
 									$sid = $songs_handler->insert($object);
 									
-									if ($GLOBALS['songlistModuleConfig']['tags']&&file_exists(XOOPS_ROOT_PATH . '/modules/tag/class/tag.php')) {
+									if ($GLOBALS['songlistModuleConfig']['tags'] && file_exists(XOOPS_ROOT_PATH.'/modules/tag/class/tag.php')) {
 										$tag_handler = xoops_getmodulehandler('tag', 'tag');
 										$tag_handler->updateByItem(trim($data[$_POST['tags']]), $sid, $GLOBALS['songlistModule']->getVar("dirname"), $cid);
 									}
@@ -251,14 +251,14 @@ 
 										$extra = $extras_handler->create();
 									}
 									$extra->setVar('sid', $sid);
-									foreach($fields as $field) {
-										if (!empty($_POST[$field->getVar('field_name')])&&strlen($_POST[$field->getVar('field_name')])>1) {
-											if (isset($data[$_POST[$field->getVar('field_name')]])&&trim($_POST[$field->getVar('field_name')])!='') {
+									foreach ($fields as $field) {
+										if (!empty($_POST[$field->getVar('field_name')]) && strlen($_POST[$field->getVar('field_name')])>1) {
+											if (isset($data[$_POST[$field->getVar('field_name')]]) && trim($_POST[$field->getVar('field_name')])!='') {
 												$extra->setVar($field->getVar('field_name'), trim($data[$_POST[$field->getVar('field_name')]]));
 											}
 										}
 									}									
-									foreach($artists_handler->getObjects(new Criteria('aid', '('.implode(',', $aids).')', 'IN'), true) as $aid => $artist) {
+									foreach ($artists_handler->getObjects(new Criteria('aid', '('.implode(',', $aids).')', 'IN'), true) as $aid => $artist) {
 										$artist->setVar('sids', array_merge($artist->getVar('sids'), array($sid=>$sid)));
 										$artists_handler->insert($artist, true);
 									} 								
@@ -266,13 +266,13 @@ 
 							}
 						}
 					} else {
-						foreach($xmlarray[$_POST['collection']] as $id => $records) {
+						foreach ($xmlarray[$_POST['collection']] as $id => $records) {
 							if (isset($_POST['limiting'])) {
 								if (intval($_POST['limiting'])==true) {
 									$record++;
 									if ($record>intval($_POST['records'])) {
 										$start = time();
-										while(time()-$start<intval($_POST['wait'])) {
+										while (time()-$start<intval($_POST['wait'])) {
 											
 										}
 										$records = 0;
@@ -281,10 +281,10 @@ 
 							}
 							$gid = 0;
 							$gids = array();
-							if (!empty($_POST['genre'])&&strlen($_POST['genre'])>1) {
-								if (isset($data[$_POST['genre']])&&trim($_POST['genre'])!='') {
-									foreach(explode(',', trim($data[$_POST['genre']])) as $genre) {
-										$criteria = new Criteria('`name`',  trim($genre));
+							if (!empty($_POST['genre']) && strlen($_POST['genre'])>1) {
+								if (isset($data[$_POST['genre']]) && trim($_POST['genre'])!='') {
+									foreach (explode(',', trim($data[$_POST['genre']])) as $genre) {
+										$criteria = new Criteria('`name`', trim($genre));
 										if ($genre_handler->getCount($criteria)>0) {
 											$objects = $genre_handler->getObjects($criteria, false);
 											$gid = $objects[0]->getVar('gid');
@@ -297,9 +297,9 @@ 
 									}
 								}
 							}	
-							if (!empty($_POST['voice'])&&strlen($_POST['voice'])>1) {
-								if (isset($data[$_POST['voice']])&&trim($_POST['voice'])!='') {
-									$criteria = new Criteria('`name`',  trim($data[$_POST['voice']]));
+							if (!empty($_POST['voice']) && strlen($_POST['voice'])>1) {
+								if (isset($data[$_POST['voice']]) && trim($_POST['voice'])!='') {
+									$criteria = new Criteria('`name`', trim($data[$_POST['voice']]));
 									if ($voice_handler->getCount($criteria)>0) {
 										$objects = $voice_handler->getObjects($criteria, false);
 										$vcid = $objects[0]->getVar('vcid');
@@ -311,9 +311,9 @@ 
 								}
 							}							
 							$cid = 0;
-							if (!empty($_POST['category'])&&strlen($_POST['category'])>1) {
-								if (isset($data[$_POST['category']])&&trim($_POST['category'])!='') {
-									$criteria = new Criteria('`name`',  trim($data[$_POST['category']]));
+							if (!empty($_POST['category']) && strlen($_POST['category'])>1) {
+								if (isset($data[$_POST['category']]) && trim($_POST['category'])!='') {
+									$criteria = new Criteria('`name`', trim($data[$_POST['category']]));
 									if ($category_handler->getCount($criteria)>0) {
 										$objects = $category_handler->getObjects($criteria, false);
 										$cid = $objects[0]->getVar('cid');
@@ -325,10 +325,10 @@ 
 								}
 							}
 							$aids = array();
-							if (!empty($_POST['artist'])&&strlen($_POST['artist'])>1) {
-								if (isset($data[$_POST['artist']])&&$_POST['artist']!='') {
-									foreach(explode(',', trim($data[$_POST['artist']])) as $artist) {
-										$criteria = new Criteria('`name`',  trim($artist));
+							if (!empty($_POST['artist']) && strlen($_POST['artist'])>1) {
+								if (isset($data[$_POST['artist']]) && $_POST['artist']!='') {
+									foreach (explode(',', trim($data[$_POST['artist']])) as $artist) {
+										$criteria = new Criteria('`name`', trim($artist));
 										if ($artists_handler->getCount($criteria)>0) {
 											$objects = $artists_handler->getObjects($criteria, false);
 											$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
@@ -343,9 +343,9 @@ 
 								}
 							}
 							$abid = 0;
-							if (!empty($_POST['album'])&&strlen($_POST['album'])>1) {
-								if (isset($data[$_POST['album']])&&trim($_POST['album'])!='') {
-									$criteria = new Criteria('`title`',  trim($data[$_POST['album']]));
+							if (!empty($_POST['album']) && strlen($_POST['album'])>1) {
+								if (isset($data[$_POST['album']]) && trim($_POST['album'])!='') {
+									$criteria = new Criteria('`title`', trim($data[$_POST['album']]));
 									if ($albums_handler->getCount($criteria)>0) {
 										$objects = $albums_handler->getObjects($criteria, false);
 										$abid = $objects[0]->getVar('abid');
@@ -359,13 +359,13 @@ 
 								}
 							}
 							$sid = 0;
-							if ((!empty($_POST['songid'])&&strlen($_POST['songid'])>1)||(!empty($_POST['title'])&&strlen($_POST['title'])>1)) {
-								if ((isset($data[$_POST['songid']])&&$_POST['songid']!='')||(isset($data[$_POST['title']])&&$_POST['title']!='')) {
+							if ((!empty($_POST['songid']) && strlen($_POST['songid'])>1) || (!empty($_POST['title']) && strlen($_POST['title'])>1)) {
+								if ((isset($data[$_POST['songid']]) && $_POST['songid']!='') || (isset($data[$_POST['title']]) && $_POST['title']!='')) {
 									$criteria = new CriteriaCompo();
 									if (trim($data[$_POST['songid']])!='')
-										$criteria->add(new Criteria('`songid`',  trim($data[$_POST['songid']])));
+										$criteria->add(new Criteria('`songid`', trim($data[$_POST['songid']])));
 									if (trim($data[$_POST['title']])!='')
-										$criteria->add(new Criteria('`title`',  trim($data[$_POST['title']])));
+										$criteria->add(new Criteria('`title`', trim($data[$_POST['title']])));
 									if ($songs_handler->getCount($criteria)>0) {
 										$objects = $songs_handler->getObjects($criteria, false);
 										$object = $objects[0];
@@ -385,7 +385,7 @@ 
 									$object->setVar('lyrics', str_replace("\n", "<br/>\n", trim($data[$_POST['lyrics']])));
 									$sid = $songs_handler->insert($object);
 									
-									if ($GLOBALS['songlistModuleConfig']['tags']&&file_exists(XOOPS_ROOT_PATH . '/modules/tag/class/tag.php')) {
+									if ($GLOBALS['songlistModuleConfig']['tags'] && file_exists(XOOPS_ROOT_PATH.'/modules/tag/class/tag.php')) {
 										$tag_handler = xoops_getmodulehandler('tag', 'tag');
 										$tag_handler->updateByItem(trim($data[$_POST['tags']]), $sid, $GLOBALS['songlistModule']->getVar("dirname"), $cid);
 									}
@@ -400,15 +400,15 @@ 
 										$extra = $extras_handler->create();
 									}
 									$extra->setVar('sid', $sid);
-									foreach($fields as $field) {
-										if (!empty($_POST[$field->getVar('field_name')])&&strlen($_POST[$field->getVar('field_name')])>1) {
-											if (isset($data[$_POST[$field->getVar('field_name')]])&&trim($_POST[$field->getVar('field_name')])!='') {
+									foreach ($fields as $field) {
+										if (!empty($_POST[$field->getVar('field_name')]) && strlen($_POST[$field->getVar('field_name')])>1) {
+											if (isset($data[$_POST[$field->getVar('field_name')]]) && trim($_POST[$field->getVar('field_name')])!='') {
 												$extra->setVar($field->getVar('field_name'), trim($data[$_POST[$field->getVar('field_name')]]));
 											}
 										}
 									}
 									$extras_handler->insert($extra, true);
-									foreach($artists_handler->getObjects(new Criteria('aid', '('.implode(',', $aids).')', 'IN'), true) as $aid => $artist) {
+									foreach ($artists_handler->getObjects(new Criteria('aid', '('.implode(',', $aids).')', 'IN'), true) as $aid => $artist) {
 										$artist->setVar('sids', array_merge($artist->getVar('sids'), array($sid=>$sid)));
 										$artists_handler->insert($artist, true);
 									} 								
@@ -419,17 +419,17 @@ 
 				} else {
 					
 					foreach ($xmlarray as $recid => $data) {
-						$cid=0;
-						$gid=0; 
-						$vcid=0;
-						$aids=array(); 
-						$abid=array(); 
+						$cid = 0;
+						$gid = 0; 
+						$vcid = 0;
+						$aids = array(); 
+						$abid = array(); 
 						if (isset($_POST['limiting'])) {
 							if (intval($_POST['limiting'])==true) {
 								$record++;
 								if ($record>intval($_POST['records'])) {
 									$start = time();
-									while(time()-$start<intval($_POST['wait'])) {
+									while (time()-$start<intval($_POST['wait'])) {
 										
 									}
 									$records = 0;
@@ -438,10 +438,10 @@ 
 						}
 						$gid = 0;
 						$gids = array();
-						if (!empty($_POST['genre'])&&strlen($_POST['genre'])>1) {
-							if (isset($data[$_POST['genre']])&&trim($_POST['genre'])!='') {
-								foreach(explode(',', trim($data[$_POST['genre']])) as $genre) {
-									$criteria = new Criteria('`name`',  trim($genre));
+						if (!empty($_POST['genre']) && strlen($_POST['genre'])>1) {
+							if (isset($data[$_POST['genre']]) && trim($_POST['genre'])!='') {
+								foreach (explode(',', trim($data[$_POST['genre']])) as $genre) {
+									$criteria = new Criteria('`name`', trim($genre));
 									if ($genre_handler->getCount($criteria)>0) {
 										$objects = $genre_handler->getObjects($criteria, false);
 										$gid = $objects[0]->getVar('gid');
@@ -456,9 +456,9 @@ 
 						}	
 					
 						$vcid = 0;
-						if (!empty($_POST['voice'])&&strlen($_POST['voice'])>1) {
-							if (isset($data[$_POST['voice']])&&trim($_POST['voice'])!='') {
-								$criteria = new Criteria('`name`',  trim($data[$_POST['voice']]));
+						if (!empty($_POST['voice']) && strlen($_POST['voice'])>1) {
+							if (isset($data[$_POST['voice']]) && trim($_POST['voice'])!='') {
+								$criteria = new Criteria('`name`', trim($data[$_POST['voice']]));
 								if ($voice_handler->getCount($criteria)>0) {
 									$objects = $voice_handler->getObjects($criteria, false);
 									$vcid = $objects[0]->getVar('vcid');
@@ -470,9 +470,9 @@ 
 							}
 						}						
 						$cid = 0;
-						if (!empty($_POST['category'])&&strlen($_POST['category'])>1) {
-							if (isset($data[$_POST['category']])&&trim($_POST['category'])!='') {
-								$criteria = new Criteria('`name`',  trim($data[$_POST['category']]));
+						if (!empty($_POST['category']) && strlen($_POST['category'])>1) {
+							if (isset($data[$_POST['category']]) && trim($_POST['category'])!='') {
+								$criteria = new Criteria('`name`', trim($data[$_POST['category']]));
 								if ($category_handler->getCount($criteria)>0) {
 									$objects = $category_handler->getObjects($criteria, false);
 									$cid = $objects[0]->getVar('cid');
@@ -484,10 +484,10 @@ 
 							}
 						}
 						$aids = array();
-						if (!empty($_POST['artist'])&&strlen($_POST['artist'])>1) {
-							if (isset($data[$_POST['artist']])&&$_POST['artist']!='') {
-								foreach(explode(',', trim($data[$_POST['artist']])) as $artist) {
-									$criteria = new Criteria('`name`',  trim($artist));
+						if (!empty($_POST['artist']) && strlen($_POST['artist'])>1) {
+							if (isset($data[$_POST['artist']]) && $_POST['artist']!='') {
+								foreach (explode(',', trim($data[$_POST['artist']])) as $artist) {
+									$criteria = new Criteria('`name`', trim($artist));
 									if ($artists_handler->getCount($criteria)>0) {
 										$objects = $artists_handler->getObjects($criteria, false);
 										$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
@@ -502,9 +502,9 @@ 
 							}
 						}
 						$abid = 0;
-						if (!empty($_POST['album'])&&strlen($_POST['album'])>1) {
-							if (isset($data[$_POST['album']])&&trim($_POST['album'])!='') {
-								$criteria = new Criteria('`title`',  trim($data[$_POST['album']]));
+						if (!empty($_POST['album']) && strlen($_POST['album'])>1) {
+							if (isset($data[$_POST['album']]) && trim($_POST['album'])!='') {
+								$criteria = new Criteria('`title`', trim($data[$_POST['album']]));
 								if ($albums_handler->getCount($criteria)>0) {
 									$objects = $albums_handler->getObjects($criteria, false);
 									$abid = $objects[0]->getVar('abid');
@@ -518,13 +518,13 @@ 
 							}
 						}
 						$sid = 0;
-						if ((!empty($_POST['songid'])&&strlen($_POST['songid'])>1)||(!empty($_POST['title'])&&strlen($_POST['title'])>1)) {
-							if ((isset($data[$_POST['songid']])&&$_POST['songid']!='')||(isset($data[$_POST['title']])&&$_POST['title']!='')) {
+						if ((!empty($_POST['songid']) && strlen($_POST['songid'])>1) || (!empty($_POST['title']) && strlen($_POST['title'])>1)) {
+							if ((isset($data[$_POST['songid']]) && $_POST['songid']!='') || (isset($data[$_POST['title']]) && $_POST['title']!='')) {
 								$criteria = new CriteriaCompo();
 								if (trim($data[$_POST['songid']])!='')
-									$criteria->add(new Criteria('`songid`',  trim($data[$_POST['songid']])));
+									$criteria->add(new Criteria('`songid`', trim($data[$_POST['songid']])));
 								if (trim($data[$_POST['title']])!='')
-									$criteria->add(new Criteria('`title`',  trim($data[$_POST['title']])));
+									$criteria->add(new Criteria('`title`', trim($data[$_POST['title']])));
 								if ($songs_handler->getCount($criteria)>0) {
 									$objects = $songs_handler->getObjects($criteria, false);
 									$object = $objects[0];
@@ -544,7 +544,7 @@ 
 								$object->setVar('lyrics', str_replace("\n", "<br/>\n", trim($data[$_POST['lyrics']])));
 								$sid = $songs_handler->insert($object);
 								
-								if ($GLOBALS['songlistModuleConfig']['tags']&&file_exists(XOOPS_ROOT_PATH . '/modules/tag/class/tag.php')) {
+								if ($GLOBALS['songlistModuleConfig']['tags'] && file_exists(XOOPS_ROOT_PATH.'/modules/tag/class/tag.php')) {
 									$tag_handler = xoops_getmodulehandler('tag', 'tag');
 									$tag_handler->updateByItem(trim($data[$_POST['tags']]), $sid, $GLOBALS['songlistModule']->getVar("dirname"), $cid);
 								}
@@ -559,14 +559,14 @@ 
 									$extra = $extras_handler->create();
 								}
 								$extra->setVar('sid', $sid);
-								foreach($fields as $field) {
-									if (!empty($_POST[$field->getVar('field_name')])&&strlen($_POST[$field->getVar('field_name')])>1) {
-										if (isset($data[$_POST[$field->getVar('field_name')]])&&trim($_POST[$field->getVar('field_name')])!='') {
+								foreach ($fields as $field) {
+									if (!empty($_POST[$field->getVar('field_name')]) && strlen($_POST[$field->getVar('field_name')])>1) {
+										if (isset($data[$_POST[$field->getVar('field_name')]]) && trim($_POST[$field->getVar('field_name')])!='') {
 											$extra->setVar($field->getVar('field_name'), trim($data[$_POST[$field->getVar('field_name')]]));
 										}
 									}
 								}
-								foreach($artists_handler->getObjects(new Criteria('aid', '('.implode(',', $aids).')', 'IN'), true) as $aid => $artist) {
+								foreach ($artists_handler->getObjects(new Criteria('aid', '('.implode(',', $aids).')', 'IN'), true) as $aid => $artist) {
 									$artist->setVar('sids', array_merge($artist->getVar('sids'), array($sid=>$sid)));
 									$artists_handler->insert($artist, true);
 								} 								

Braces +21 added lines, -14 removed lines

@@ -44,9 +44,10 @@ 
 				} elseif (isset($_FILES['xmlfile'])&&strlen($_FILES['xmlfile']['name'])) {
 						
 					if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) {
-						foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders)
-							foreach(explode('/', $folders) as $folder) {
+						foreach(explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) {
+													foreach(explode('/', $folders) as $folder) {
 								$path .= DS . $folder;
+						}
 								mkdir($path, 0777);
 							}
 					}
@@ -213,10 +214,12 @@ 
 							if ((!empty($_POST['songid'])&&strlen($_POST['songid'])>1)||(!empty($_POST['title'])&&strlen($_POST['title'])>1)) {
 								if ((isset($data[$_POST['songid']])&&$_POST['songid']!='')||(isset($data[$_POST['title']])&&$_POST['title']!='')) {
 									$criteria = new CriteriaCompo();
-									if (trim($data[$_POST['songid']])!='')
-										$criteria->add(new Criteria('`songid`',  trim($data[$_POST['songid']])));
-									if (trim($data[$_POST['title']])!='')
-										$criteria->add(new Criteria('`title`',  trim($data[$_POST['title']])));
+									if (trim($data[$_POST['songid']])!='') {
+																			$criteria->add(new Criteria('`songid`',  trim($data[$_POST['songid']])));
+									}
+									if (trim($data[$_POST['title']])!='') {
+																			$criteria->add(new Criteria('`title`',  trim($data[$_POST['title']])));
+									}
 									if ($songs_handler->getCount($criteria)>0) {
 										$objects = $songs_handler->getObjects($criteria, false);
 										$object = $objects[0];
@@ -362,10 +365,12 @@ 
 							if ((!empty($_POST['songid'])&&strlen($_POST['songid'])>1)||(!empty($_POST['title'])&&strlen($_POST['title'])>1)) {
 								if ((isset($data[$_POST['songid']])&&$_POST['songid']!='')||(isset($data[$_POST['title']])&&$_POST['title']!='')) {
 									$criteria = new CriteriaCompo();
-									if (trim($data[$_POST['songid']])!='')
-										$criteria->add(new Criteria('`songid`',  trim($data[$_POST['songid']])));
-									if (trim($data[$_POST['title']])!='')
-										$criteria->add(new Criteria('`title`',  trim($data[$_POST['title']])));
+									if (trim($data[$_POST['songid']])!='') {
+																			$criteria->add(new Criteria('`songid`',  trim($data[$_POST['songid']])));
+									}
+									if (trim($data[$_POST['title']])!='') {
+																			$criteria->add(new Criteria('`title`',  trim($data[$_POST['title']])));
+									}
 									if ($songs_handler->getCount($criteria)>0) {
 										$objects = $songs_handler->getObjects($criteria, false);
 										$object = $objects[0];
@@ -521,10 +526,12 @@ 
 						if ((!empty($_POST['songid'])&&strlen($_POST['songid'])>1)||(!empty($_POST['title'])&&strlen($_POST['title'])>1)) {
 							if ((isset($data[$_POST['songid']])&&$_POST['songid']!='')||(isset($data[$_POST['title']])&&$_POST['title']!='')) {
 								$criteria = new CriteriaCompo();
-								if (trim($data[$_POST['songid']])!='')
-									$criteria->add(new Criteria('`songid`',  trim($data[$_POST['songid']])));
-								if (trim($data[$_POST['title']])!='')
-									$criteria->add(new Criteria('`title`',  trim($data[$_POST['title']])));
+								if (trim($data[$_POST['songid']])!='') {
+																	$criteria->add(new Criteria('`songid`',  trim($data[$_POST['songid']])));
+								}
+								if (trim($data[$_POST['title']])!='') {
+																	$criteria->add(new Criteria('`title`',  trim($data[$_POST['title']])));
+								}
 								if ($songs_handler->getCount($criteria)>0) {
 									$objects = $songs_handler->getObjects($criteria, false);
 									$object = $objects[0];

htdocs/modules/songlist/admin/dashboard.php

Indentation +13 added lines, -13 removed lines

@@ -37,8 +37,8 @@ 
 	$op = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : "default"));
 	
 	switch ($op) {
-	    case "default":
-	    default:
+		case "default":
+		default:
     	
 			$indexAdmin = new ModuleAdmin();
 			echo $indexAdmin->addNavigation(basename(__FILE__));
@@ -54,19 +54,19 @@ 
 			$requests_handler = xoops_getmodulehandler('requests', 'songlist');
 			$votes_handler = xoops_getmodulehandler('votes', 'songlist');
 			
-		    $indexAdmin->addInfoBox(_AM_SONGLIST_COUNT);
-		    $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_CATEGORY."</label>", $category_handler->getCount(NULL, true), 'green');
-		    $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_ARTISTS."</label>", $artists_handler->getCount(NULL, true), 'green');
-		    $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_ALBUMS."</label>", $albums_handler->getCount(NULL, true), 'green');
-		    $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_GENRE."</label>", $genre_handler->getCount(NULL, true), 'green');
+			$indexAdmin->addInfoBox(_AM_SONGLIST_COUNT);
+			$indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_CATEGORY."</label>", $category_handler->getCount(NULL, true), 'green');
+			$indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_ARTISTS."</label>", $artists_handler->getCount(NULL, true), 'green');
+			$indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_ALBUMS."</label>", $albums_handler->getCount(NULL, true), 'green');
+			$indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_GENRE."</label>", $genre_handler->getCount(NULL, true), 'green');
 			$indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_VOICE."</label>", $voice_handler->getCount(NULL, true), 'green');
-		    $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_SONGS."</label>", $songs_handler->getCount(NULL, true), 'green');
-		    $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_REQUESTS."</label>", $requests_handler->getCount(NULL, true), 'green');
-		    $indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_VOTES."</label>", $votes_handler->getCount(NULL, true), 'green');
-    		echo $indexAdmin->renderIndex();
+			$indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_SONGS."</label>", $songs_handler->getCount(NULL, true), 'green');
+			$indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_REQUESTS."</label>", $requests_handler->getCount(NULL, true), 'green');
+			$indexAdmin->addInfoBoxLine(_AM_SONGLIST_COUNT, "<label>"._AM_SONGLIST_NUMBER_OF_VOTES."</label>", $votes_handler->getCount(NULL, true), 'green');
+			echo $indexAdmin->renderIndex();
 
-	        xoops_cp_footer();
-	        break;
+			xoops_cp_footer();
+			break;
 	}
 
 ?>
\ No newline at end of file

htdocs/modules/songlist/admin/permissions.php

Indentation +131 added lines, -131 removed lines

@@ -45,71 +45,71 @@ 
   
 class forum_XoopsGroupPermForm extends XoopsGroupPermForm
 {
-    function forum_XoopsGroupPermForm($title, $modid, $permname, $permdesc, $url = "")
-    {
-	    $this->XoopsGroupPermForm($title, $modid, $permname, $permdesc, $url);
-    } 
+	function forum_XoopsGroupPermForm($title, $modid, $permname, $permdesc, $url = "")
+	{
+		$this->XoopsGroupPermForm($title, $modid, $permname, $permdesc, $url);
+	} 
     
-    function render()
-    { 
-        // load all child ids for javascript codes
-        foreach (array_keys($this->_itemTree)as $item_id) {
-            $this->_itemTree[$item_id]['allchild'] = array();
-            $this->_loadAllChildItemIds($item_id, $this->_itemTree[$item_id]['allchild']);
-        }
-        $gperm_handler = xoops_gethandler('groupperm');
-        $member_handler = xoops_gethandler('member');
-        $glist = $member_handler->getGroupList();
-        foreach (array_keys($glist) as $i) {
-            // get selected item id(s) for each group
-            $selected = $gperm_handler->getItemIds($this->_permName, $i, $this->_modid);
-            $ele = new forum_XoopsGroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
-            $ele->setOptionTree($this->_itemTree);
-            $this->addElement($ele);
-            unset($ele);
-        } 
-        $tray = new XoopsFormElementTray('');
-        $tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $tray->addElement(new XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $this->addElement($tray);
-        $ret = '<h4>' . $this->getTitle() . '</h4>' . $this->_permDesc . '<br />';
-        $ret .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
-        $elements = $this->getElements();
-        $hidden = '';
-        foreach (array_keys($elements) as $i) {
-            if (!is_object($elements[$i])) {
-                $ret .= $elements[$i];
-            } elseif (!$elements[$i]->isHidden()) {
-                $ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
-                if ($elements[$i]->getDescription() != '') {
-                    $ret .= '<br /><br /><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
-                }
-                $ret .= "</td>\n<td class='even'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
-            } else {
-                $hidden .= $elements[$i]->render();
-            }
-        }
-        $ret .= "</table>$hidden</form>";
-        $ret .= $this->renderValidationJS( true );
-        return $ret;
-    }
+	function render()
+	{ 
+		// load all child ids for javascript codes
+		foreach (array_keys($this->_itemTree)as $item_id) {
+			$this->_itemTree[$item_id]['allchild'] = array();
+			$this->_loadAllChildItemIds($item_id, $this->_itemTree[$item_id]['allchild']);
+		}
+		$gperm_handler = xoops_gethandler('groupperm');
+		$member_handler = xoops_gethandler('member');
+		$glist = $member_handler->getGroupList();
+		foreach (array_keys($glist) as $i) {
+			// get selected item id(s) for each group
+			$selected = $gperm_handler->getItemIds($this->_permName, $i, $this->_modid);
+			$ele = new forum_XoopsGroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
+			$ele->setOptionTree($this->_itemTree);
+			$this->addElement($ele);
+			unset($ele);
+		} 
+		$tray = new XoopsFormElementTray('');
+		$tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$tray->addElement(new XoopsFormButton('', 'reset', _CANCEL, 'reset'));
+		$this->addElement($tray);
+		$ret = '<h4>' . $this->getTitle() . '</h4>' . $this->_permDesc . '<br />';
+		$ret .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
+		$elements = $this->getElements();
+		$hidden = '';
+		foreach (array_keys($elements) as $i) {
+			if (!is_object($elements[$i])) {
+				$ret .= $elements[$i];
+			} elseif (!$elements[$i]->isHidden()) {
+				$ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
+				if ($elements[$i]->getDescription() != '') {
+					$ret .= '<br /><br /><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
+				}
+				$ret .= "</td>\n<td class='even'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
+			} else {
+				$hidden .= $elements[$i]->render();
+			}
+		}
+		$ret .= "</table>$hidden</form>";
+		$ret .= $this->renderValidationJS( true );
+		return $ret;
+	}
 }
 
 class forum_XoopsGroupFormCheckBox extends XoopsGroupFormCheckBox
 {
-    function forum_XoopsGroupFormCheckBox($caption, $name, $groupId, $values = null)
-    {
-	    $this->XoopsGroupFormCheckBox($caption, $name, $groupId, $values);
-    }
+	function forum_XoopsGroupFormCheckBox($caption, $name, $groupId, $values = null)
+	{
+		$this->XoopsGroupFormCheckBox($caption, $name, $groupId, $values);
+	}
 
-    /**
-     * Renders checkbox options for this group
-     * 
-     * @return string 
-     * @access public 
-     */
-    function render()
-    {
+	/**
+	 * Renders checkbox options for this group
+	 * 
+	 * @return string 
+	 * @access public 
+	 */
+	function render()
+	{
 		$ret = '<table class="outer"><tr><td class="odd"><table><tr>';
 		$cols = 1;
 		foreach ($this->_optionTree[0]['children'] as $topitem) {
@@ -134,38 +134,38 @@ 
 		$ret .= _ALL." <input id=\"".$checkallbtn_id."\" type=\"checkbox\" value=\"\" onclick=\"var optionids = new Array(".$option_ids_str."); xoopsCheckAllElements(optionids, '".$checkallbtn_id."');\" />";
 		$ret .= '</td></tr></table>';
 		return $ret;
-    } 
+	} 
     
-    function _renderOptionTree(&$tree, $option, $prefix, $parentIds = array())
-    {
-	    if($option['id'] > 0):
-        $tree .= $prefix . "<input type=\"checkbox\" name=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" id=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" onclick=\""; 
-        foreach ($parentIds as $pid) {
-	        if($pid <= 0) continue;
-            $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
-            $tree .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if(ele.checked != true) {ele.checked = this.checked;}";
-        } 
-        foreach ($option['allchild'] as $cid) {
-            $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
-            $tree .= "var ele = xoopsGetElementById('" . $child_ele . "'); if(this.checked != true) {ele.checked = false;}";
-        } 
-        $tree .= '" value="1"';
-        if (in_array($option['id'], $this->_value)) {
-            $tree .= ' checked="checked"';
-        } 
-        $tree .= " />" . $option['name'] . "<input type=\"hidden\" name=\"" . $this->getName() . "[parents][" . $option['id'] . "]\" value=\"" . implode(':', $parentIds). "\" /><input type=\"hidden\" name=\"" . $this->getName() . "[itemname][" . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']). "\" /><br />\n";
-        else:
-        $tree .= $prefix . $option['name'] . "<input type=\"hidden\" id=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" /><br />\n";
-        endif;
-        if (isset($option['children'])) {
-            foreach ($option['children'] as $child) {
-	            if($option['id'] > 0){
-	                array_push($parentIds, $option['id']);
-                }
-                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
-            }
-        }
-    }
+	function _renderOptionTree(&$tree, $option, $prefix, $parentIds = array())
+	{
+		if($option['id'] > 0):
+		$tree .= $prefix . "<input type=\"checkbox\" name=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" id=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" onclick=\""; 
+		foreach ($parentIds as $pid) {
+			if($pid <= 0) continue;
+			$parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
+			$tree .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if(ele.checked != true) {ele.checked = this.checked;}";
+		} 
+		foreach ($option['allchild'] as $cid) {
+			$child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
+			$tree .= "var ele = xoopsGetElementById('" . $child_ele . "'); if(this.checked != true) {ele.checked = false;}";
+		} 
+		$tree .= '" value="1"';
+		if (in_array($option['id'], $this->_value)) {
+			$tree .= ' checked="checked"';
+		} 
+		$tree .= " />" . $option['name'] . "<input type=\"hidden\" name=\"" . $this->getName() . "[parents][" . $option['id'] . "]\" value=\"" . implode(':', $parentIds). "\" /><input type=\"hidden\" name=\"" . $this->getName() . "[itemname][" . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']). "\" /><br />\n";
+		else:
+		$tree .= $prefix . $option['name'] . "<input type=\"hidden\" id=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" /><br />\n";
+		endif;
+		if (isset($option['children'])) {
+			foreach ($option['children'] as $child) {
+				if($option['id'] > 0){
+					array_push($parentIds, $option['id']);
+				}
+				$this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
+			}
+		}
+	}
 }
 
 xoops_cp_header();
@@ -190,14 +190,14 @@ 
 		$opform->addElement($op_select);
 		$opform->display();
 		
-        $member_handler = xoops_gethandler('member');
-        $glist = $member_handler->getGroupList();
-        $elements = array();
-        $songlistperm_handler = xoops_getmodulehandler('permission', 'songlist');
-        $perm_template = $songlistperm_handler->getTemplate($groupid = 0);
-        foreach (array_keys($glist) as $i) {
-            $selected = !empty($perm_template[$i]) ? array_keys($perm_template[$i]) : array();
-            $ret_ele  = '<tr align="left" valign="top"><td class="head">'.$glist[$i].'</td>';
+		$member_handler = xoops_gethandler('member');
+		$glist = $member_handler->getGroupList();
+		$elements = array();
+		$songlistperm_handler = xoops_getmodulehandler('permission', 'songlist');
+		$perm_template = $songlistperm_handler->getTemplate($groupid = 0);
+		foreach (array_keys($glist) as $i) {
+			$selected = !empty($perm_template[$i]) ? array_keys($perm_template[$i]) : array();
+			$ret_ele  = '<tr align="left" valign="top"><td class="head">'.$glist[$i].'</td>';
 			$ret_ele .= '<td class="even">';
 			$ret_ele .= '<table class="outer"><tr><td class="odd"><table><tr>';
 			$ii = 0;
@@ -216,37 +216,37 @@ 
 			$ret_ele .= _ALL.' <input id="checkall['.$i.']" type="checkbox" value="" onclick="var optionids = new Array('.implode(", ", $option_ids).'); xoopsCheckAllElements(optionids, \'checkall['.$i.']\')" />';
 			$ret_ele .= '</td></tr></table>';
 			$ret_ele .= '</td></tr>';
-            $elements[] = $ret_ele;
-        }
-        $tray = new XoopsFormElementTray('');
-        $tray->addElement(new XoopsFormHidden('action', 'template_save'));
-        $tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $tray->addElement(new XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-     	$ret = '<h4>' . _AM_SONGLIST_PERM_TEMPLATE . '</h4>' . _AM_SONGLIST_PERM_TEMPLATE_DESC . '<br /><br /><br />';
-        $ret .= "<form name='template' id='template' method='post'>\n<table width='100%' class='outer' cellspacing='1'>\n";
-        $ret .= implode("\n",$elements);
+			$elements[] = $ret_ele;
+		}
+		$tray = new XoopsFormElementTray('');
+		$tray->addElement(new XoopsFormHidden('action', 'template_save'));
+		$tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$tray->addElement(new XoopsFormButton('', 'reset', _CANCEL, 'reset'));
+	 	$ret = '<h4>' . _AM_SONGLIST_PERM_TEMPLATE . '</h4>' . _AM_SONGLIST_PERM_TEMPLATE_DESC . '<br /><br /><br />';
+		$ret .= "<form name='template' id='template' method='post'>\n<table width='100%' class='outer' cellspacing='1'>\n";
+		$ret .= implode("\n",$elements);
 		$ret .= '<tr align="left" valign="top"><td class="head"></td><td class="even">';
-        $ret .= $tray->render();
+		$ret .= $tray->render();
 		$ret .= '</td></tr>';
-        $ret .= '</table></form>';
-        echo $ret;
-        break;	
+		$ret .= '</table></form>';
+		echo $ret;
+		break;	
         
 	case "template_save":
-        $songlistperm_handler = xoops_getmodulehandler('permission', 'songlist');
-        $res = $songlistperm_handler->setTemplate($_POST['perms'], $groupid = 0);
-        if($res){
-	    	redirect_header("permissions.php?action=template", 2, _AM_SONGLIST_PERM_TEMPLATE_CREATED);
-        }else{
-	    	redirect_header("permissions.php?action=template", 2, _AM_SONGLIST_PERM_TEMPLATE_ERROR);
-        }
+		$songlistperm_handler = xoops_getmodulehandler('permission', 'songlist');
+		$res = $songlistperm_handler->setTemplate($_POST['perms'], $groupid = 0);
+		if($res){
+			redirect_header("permissions.php?action=template", 2, _AM_SONGLIST_PERM_TEMPLATE_CREATED);
+		}else{
+			redirect_header("permissions.php?action=template", 2, _AM_SONGLIST_PERM_TEMPLATE_ERROR);
+		}
 		break;
 		
 	case "apply":
-        $songlistperm_handler = xoops_getmodulehandler('permission', 'songlist');
-	    $perm_template = $songlistperm_handler->getTemplate();
+		$songlistperm_handler = xoops_getmodulehandler('permission', 'songlist');
+		$perm_template = $songlistperm_handler->getTemplate();
 		if($perm_template===null){
-	    	redirect_header("permissions.php?action=template", 2, _AM_SONGLIST_PERM_TEMPLATE);
+			redirect_header("permissions.php?action=template", 2, _AM_SONGLIST_PERM_TEMPLATE);
 		}
 		
 		$opform = new XoopsSimpleForm(_AM_SONGLIST_PERM_ACTION, 'actionform', 'permissions.php', "get");
@@ -266,7 +266,7 @@ 
 			$fm_options[-1*$c] = "[".$categories[$c]->getVar('cat_title')."]";
 			foreach(array_keys($songlists[$c]) as $f){
 				$fm_options[$f] = $songlists[$c][$f]["title"];
-		        if(!isset($songlists[$c][$f]["sub"])) continue;
+				if(!isset($songlists[$c][$f]["sub"])) continue;
 				foreach(array_keys($songlists[$c][$f]["sub"]) as $s){
 					$fm_options[$s] = "-- ".$songlists[$c][$f]["sub"][$s]["title"];
 				}
@@ -277,22 +277,22 @@ 
 		$fm_select = new XoopsFormSelect(_AM_SONGLIST_PERM_FORUMS, 'forums', null, 10, true);
 		$fm_select->addOptionArray($fm_options);
 		$fmform->addElement($fm_select);
-        $tray = new XoopsFormElementTray('');
-        $tray->addElement(new XoopsFormHidden('action', 'apply_save'));
-        $tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $tray->addElement(new XoopsFormButton('', 'reset', _CANCEL, 'reset'));
+		$tray = new XoopsFormElementTray('');
+		$tray->addElement(new XoopsFormHidden('action', 'apply_save'));
+		$tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$tray->addElement(new XoopsFormButton('', 'reset', _CANCEL, 'reset'));
 		$fmform->addElement($tray);
 		$fmform->display();
 		break;
 		
 	case "apply_save":
 		if(empty($_POST["forums"])) break;
-	    $songlistperm_handler = xoops_getmodulehandler('permission', 'songlist');
+		$songlistperm_handler = xoops_getmodulehandler('permission', 'songlist');
 		foreach($_POST["forums"] as $songlist){
 			if($songlist < 1) continue;
 			$songlistperm_handler->applyTemplate($songlist, $module_id);
 		}
-	    redirect_header("permissions.php", 2, _AM_SONGLIST_PERM_TEMPLATE_APPLIED);
+		redirect_header("permissions.php", 2, _AM_SONGLIST_PERM_TEMPLATE_APPLIED);
 		break;
 		
 	default:
@@ -353,10 +353,10 @@ 
 				$key_c = -1 * $c;
 				$form->addItem($key_c, "<strong>[".$categories[$c]->getVar('cat_title')."]</strong>");
 				foreach(array_keys($songlists[$c]) as $f){
-			        $form->addItem($f, $songlists[$c][$f]["title"], $key_c);
-			        if(!isset($songlists[$c][$f]["sub"])) continue;
+					$form->addItem($f, $songlists[$c][$f]["title"], $key_c);
+					if(!isset($songlists[$c][$f]["sub"])) continue;
 					foreach(array_keys($songlists[$c][$f]["sub"]) as $s){
-			        	$form->addItem($s, "&rarr;".$songlists[$c][$f]["sub"][$s]["title"], $f);
+						$form->addItem($s, "&rarr;".$songlists[$c][$f]["sub"][$s]["title"], $f);
 					}
 				}
 			}

Spacing +51 added lines, -51 removed lines

@@ -31,7 +31,7 @@ 
 // ------------------------------------------------------------------------- //
 include 'header.php';
 include_once XOOPS_ROOT_PATH."/modules/".$GLOBALS['songlistModule']->getVar("dirname")."/class/xoopsformloader.php";
-include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';
 
 /**
  * Add category navigation to forum casscade structure
@@ -63,7 +63,7 @@ 
         foreach (array_keys($glist) as $i) {
             // get selected item id(s) for each group
             $selected = $gperm_handler->getItemIds($this->_permName, $i, $this->_modid);
-            $ele = new forum_XoopsGroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
+            $ele = new forum_XoopsGroupFormCheckBox($glist[$i], 'perms['.$this->_permName.']', $i, $selected);
             $ele->setOptionTree($this->_itemTree);
             $this->addElement($ele);
             unset($ele);
@@ -72,25 +72,25 @@ 
         $tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $tray->addElement(new XoopsFormButton('', 'reset', _CANCEL, 'reset'));
         $this->addElement($tray);
-        $ret = '<h4>' . $this->getTitle() . '</h4>' . $this->_permDesc . '<br />';
-        $ret .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
+        $ret = '<h4>'.$this->getTitle().'</h4>'.$this->_permDesc.'<br />';
+        $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
         $elements = $this->getElements();
         $hidden = '';
         foreach (array_keys($elements) as $i) {
             if (!is_object($elements[$i])) {
                 $ret .= $elements[$i];
             } elseif (!$elements[$i]->isHidden()) {
-                $ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
-                if ($elements[$i]->getDescription() != '') {
-                    $ret .= '<br /><br /><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
+                $ret .= "<tr valign='top' align='left'><td class='head'>".$elements[$i]->getCaption();
+                if ($elements[$i]->getDescription()!='') {
+                    $ret .= '<br /><br /><span style="font-weight: normal;">'.$elements[$i]->getDescription().'</span>';
                 }
-                $ret .= "</td>\n<td class='even'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
+                $ret .= "</td>\n<td class='even'>\n".$elements[$i]->render()."\n</td></tr>\n";
             } else {
                 $hidden .= $elements[$i]->render();
             }
         }
         $ret .= "</table>$hidden</form>";
-        $ret .= $this->renderValidationJS( true );
+        $ret .= $this->renderValidationJS(true);
         return $ret;
     }
 }
@@ -113,7 +113,7 @@ 
 		$ret = '<table class="outer"><tr><td class="odd"><table><tr>';
 		$cols = 1;
 		foreach ($this->_optionTree[0]['children'] as $topitem) {
-			if ($cols > 4) {
+			if ($cols>4) {
 				$ret .= '</tr><tr>';
 				$cols = 1;
 			}
@@ -138,31 +138,31 @@ 
     
     function _renderOptionTree(&$tree, $option, $prefix, $parentIds = array())
     {
-	    if($option['id'] > 0):
-        $tree .= $prefix . "<input type=\"checkbox\" name=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" id=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" onclick=\""; 
+	    if ($option['id']>0):
+        $tree .= $prefix."<input type=\"checkbox\" name=\"".$this->getName()."[groups][".$this->_groupId."][".$option['id']."]\" id=\"".$this->getName()."[groups][".$this->_groupId."][".$option['id']."]\" onclick=\""; 
         foreach ($parentIds as $pid) {
-	        if($pid <= 0) continue;
-            $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
-            $tree .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if(ele.checked != true) {ele.checked = this.checked;}";
+	        if ($pid<=0) continue;
+            $parent_ele = $this->getName().'[groups]['.$this->_groupId.']['.$pid.']';
+            $tree .= "var ele = xoopsGetElementById('".$parent_ele."'); if(ele.checked != true) {ele.checked = this.checked;}";
         } 
         foreach ($option['allchild'] as $cid) {
-            $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
-            $tree .= "var ele = xoopsGetElementById('" . $child_ele . "'); if(this.checked != true) {ele.checked = false;}";
+            $child_ele = $this->getName().'[groups]['.$this->_groupId.']['.$cid.']';
+            $tree .= "var ele = xoopsGetElementById('".$child_ele."'); if(this.checked != true) {ele.checked = false;}";
         } 
         $tree .= '" value="1"';
         if (in_array($option['id'], $this->_value)) {
             $tree .= ' checked="checked"';
         } 
-        $tree .= " />" . $option['name'] . "<input type=\"hidden\" name=\"" . $this->getName() . "[parents][" . $option['id'] . "]\" value=\"" . implode(':', $parentIds). "\" /><input type=\"hidden\" name=\"" . $this->getName() . "[itemname][" . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']). "\" /><br />\n";
+        $tree .= " />".$option['name']."<input type=\"hidden\" name=\"".$this->getName()."[parents][".$option['id']."]\" value=\"".implode(':', $parentIds)."\" /><input type=\"hidden\" name=\"".$this->getName()."[itemname][".$option['id']."]\" value=\"".htmlspecialchars($option['name'])."\" /><br />\n";
         else:
-        $tree .= $prefix . $option['name'] . "<input type=\"hidden\" id=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" /><br />\n";
+        $tree .= $prefix.$option['name']."<input type=\"hidden\" id=\"".$this->getName()."[groups][".$this->_groupId."][".$option['id']."]\" /><br />\n";
         endif;
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
-	            if($option['id'] > 0){
+	            if ($option['id']>0) {
 	                array_push($parentIds, $option['id']);
                 }
-                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
+                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix.'&nbsp;-', $parentIds);
             }
         }
     }
@@ -174,9 +174,9 @@ 
 echo $indexAdmin->addNavigation(basename(__FILE__));
 $action = isset($_REQUEST['action']) ? strtolower($_REQUEST['action']) : "";
 $module_id = $GLOBALS['songlistModule']->getVar('mid');
-$perms = array_map("trim",explode(',', FORUM_PERM_ITEMS));
+$perms = array_map("trim", explode(',', FORUM_PERM_ITEMS));
 
-switch($action){
+switch ($action) {
 	case "template":
 		$opform = new XoopsSimpleForm(_AM_SONGLIST_PERM_ACTION, 'actionform', 'permissions.php', "get");
 		$op_select = new XoopsFormSelect("", 'action');
@@ -204,13 +204,13 @@ 
 			$option_ids = array();
 			foreach ($perms as $perm) {
 				$ii++;
-				if($ii % 5 ==0 ){
+				if ($ii%5==0) {
 					$ret_ele .= '</tr><tr>';
 				}
-				$checked = in_array("forum_".$perm, $selected)?" checked='checked'":"";
+				$checked = in_array("forum_".$perm, $selected) ? " checked='checked'" : "";
 				$option_id = $perm.'_'.$i;
 				$option_ids[] = $option_id;
-				$ret_ele .='<td><input name="perms['.$i.']['."forum_".$perm.']" id="'.$option_id.'" onclick="" value="1" type="checkbox"'.$checked.'>'.CONSTANT("_AM_SONGLIST_CAN_".strtoupper($perm)).'<br></td>';
+				$ret_ele .= '<td><input name="perms['.$i.']['."forum_".$perm.']" id="'.$option_id.'" onclick="" value="1" type="checkbox"'.$checked.'>'.CONSTANT("_AM_SONGLIST_CAN_".strtoupper($perm)).'<br></td>';
 			}
 			$ret_ele .= '</tr></table></td><td class="even">';
 			$ret_ele .= _ALL.' <input id="checkall['.$i.']" type="checkbox" value="" onclick="var optionids = new Array('.implode(", ", $option_ids).'); xoopsCheckAllElements(optionids, \'checkall['.$i.']\')" />';
@@ -222,9 +222,9 @@ 
         $tray->addElement(new XoopsFormHidden('action', 'template_save'));
         $tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $tray->addElement(new XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-     	$ret = '<h4>' . _AM_SONGLIST_PERM_TEMPLATE . '</h4>' . _AM_SONGLIST_PERM_TEMPLATE_DESC . '<br /><br /><br />';
+     	$ret = '<h4>'._AM_SONGLIST_PERM_TEMPLATE.'</h4>'._AM_SONGLIST_PERM_TEMPLATE_DESC.'<br /><br /><br />';
         $ret .= "<form name='template' id='template' method='post'>\n<table width='100%' class='outer' cellspacing='1'>\n";
-        $ret .= implode("\n",$elements);
+        $ret .= implode("\n", $elements);
 		$ret .= '<tr align="left" valign="top"><td class="head"></td><td class="even">';
         $ret .= $tray->render();
 		$ret .= '</td></tr>';
@@ -235,9 +235,9 @@ 
 	case "template_save":
         $songlistperm_handler = xoops_getmodulehandler('permission', 'songlist');
         $res = $songlistperm_handler->setTemplate($_POST['perms'], $groupid = 0);
-        if($res){
+        if ($res) {
 	    	redirect_header("permissions.php?action=template", 2, _AM_SONGLIST_PERM_TEMPLATE_CREATED);
-        }else{
+        } else {
 	    	redirect_header("permissions.php?action=template", 2, _AM_SONGLIST_PERM_TEMPLATE_ERROR);
         }
 		break;
@@ -245,7 +245,7 @@ 
 	case "apply":
         $songlistperm_handler = xoops_getmodulehandler('permission', 'songlist');
 	    $perm_template = $songlistperm_handler->getTemplate();
-		if($perm_template===null){
+		if ($perm_template===null) {
 	    	redirect_header("permissions.php?action=template", 2, _AM_SONGLIST_PERM_TEMPLATE);
 		}
 		
@@ -264,10 +264,10 @@ 
 		$fm_options = array();
 		foreach (array_keys($categories) as $c) {
 			$fm_options[-1*$c] = "[".$categories[$c]->getVar('cat_title')."]";
-			foreach(array_keys($songlists[$c]) as $f){
+			foreach (array_keys($songlists[$c]) as $f) {
 				$fm_options[$f] = $songlists[$c][$f]["title"];
-		        if(!isset($songlists[$c][$f]["sub"])) continue;
-				foreach(array_keys($songlists[$c][$f]["sub"]) as $s){
+		        if (!isset($songlists[$c][$f]["sub"])) continue;
+				foreach (array_keys($songlists[$c][$f]["sub"]) as $s) {
 					$fm_options[$s] = "-- ".$songlists[$c][$f]["sub"][$s]["title"];
 				}
 			}
@@ -286,10 +286,10 @@ 
 		break;
 		
 	case "apply_save":
-		if(empty($_POST["forums"])) break;
+		if (empty($_POST["forums"])) break;
 	    $songlistperm_handler = xoops_getmodulehandler('permission', 'songlist');
-		foreach($_POST["forums"] as $songlist){
-			if($songlist < 1) continue;
+		foreach ($_POST["forums"] as $songlist) {
+			if ($songlist<1) continue;
 			$songlistperm_handler->applyTemplate($songlist, $module_id);
 		}
 	    redirect_header("permissions.php", 2, _AM_SONGLIST_PERM_TEMPLATE_APPLIED);
@@ -313,21 +313,21 @@ 
 		$songlists = $GLOBALS['forum_handler']->getForumsByCategory(0, '', false, false, true);
 		$op_options = array("category"=>_AM_SONGLIST_CAT_ACCESS);
 		$fm_options = array("category"=>array("title"=>_AM_SONGLIST_CAT_ACCESS, "item"=>"category_access", "desc"=>"", "anonymous"=>true));
-		foreach($perms as $perm){
+		foreach ($perms as $perm) {
 			$op_options[$perm] = CONSTANT("_AM_SONGLIST_CAN_".strtoupper($perm));
 			$fm_options[$perm] = array("title"=>CONSTANT("_AM_SONGLIST_CAN_".strtoupper($perm)), "item"=>"forum_".$perm, "desc"=>"", "anonymous"=>true);
 		}
 		
 		$op_keys = array_keys($op_options);
-		$op = isset($_GET['op']) ? strtolower($_GET['op']) : (isset($_COOKIE['op']) ? strtolower($_COOKIE['op']):"");
-		if(empty($op)){
+		$op = isset($_GET['op']) ? strtolower($_GET['op']) : (isset($_COOKIE['op']) ? strtolower($_COOKIE['op']) : "");
+		if (empty($op)) {
 			$op = $op_keys[0];
-			setCookie("op", isset($op_keys[1])?$op_keys[1]:"");
-		}else{
-			for($i=0;$i<count($op_keys);$i++){
-				if($op_keys[$i]==$op) break;
+			setCookie("op", isset($op_keys[1]) ? $op_keys[1] : "");
+		} else {
+			for ($i = 0; $i<count($op_keys); $i++) {
+				if ($op_keys[$i]==$op) break;
 			}
-			setCookie("op", isset($op_keys[$i+1])?$op_keys[$i+1]:"");
+			setCookie("op", isset($op_keys[$i+1]) ? $op_keys[$i+1] : "");
 		}
 		
 		$opform = new XoopsSimpleForm('', 'opform', 'permissions.php', "get");
@@ -343,19 +343,19 @@ 
 		
 		$category_handler = xoops_getmodulehandler('category', 'songlist');
 		$categories = $category_handler->getObjects(NULL, true);
-		if($op=="category"){
+		if ($op=="category") {
 			foreach (array_keys($categories) as $c) {
 				$form->addItem($c, $categories[$c]->getVar('cat_title'));
 			}
 			unset($categories);
-		}else{
+		} else {
 			foreach (array_keys($categories) as $c) {
-				$key_c = -1 * $c;
+				$key_c = -1*$c;
 				$form->addItem($key_c, "<strong>[".$categories[$c]->getVar('cat_title')."]</strong>");
-				foreach(array_keys($songlists[$c]) as $f){
+				foreach (array_keys($songlists[$c]) as $f) {
 			        $form->addItem($f, $songlists[$c][$f]["title"], $key_c);
-			        if(!isset($songlists[$c][$f]["sub"])) continue;
-					foreach(array_keys($songlists[$c][$f]["sub"]) as $s){
+			        if (!isset($songlists[$c][$f]["sub"])) continue;
+					foreach (array_keys($songlists[$c][$f]["sub"]) as $s) {
 			        	$form->addItem($s, "&rarr;".$songlists[$c][$f]["sub"][$s]["title"], $f);
 					}
 				}

Braces +24 added lines, -10 removed lines

@@ -141,7 +141,9 @@ 
 	    if($option['id'] > 0):
         $tree .= $prefix . "<input type=\"checkbox\" name=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" id=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" onclick=\""; 
         foreach ($parentIds as $pid) {
-	        if($pid <= 0) continue;
+	        if($pid <= 0) {
+	        	continue;
+	        }
             $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
             $tree .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if(ele.checked != true) {ele.checked = this.checked;}";
         } 
@@ -154,8 +156,10 @@ 
             $tree .= ' checked="checked"';
         } 
         $tree .= " />" . $option['name'] . "<input type=\"hidden\" name=\"" . $this->getName() . "[parents][" . $option['id'] . "]\" value=\"" . implode(':', $parentIds). "\" /><input type=\"hidden\" name=\"" . $this->getName() . "[itemname][" . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']). "\" /><br />\n";
-        else:
+        else {
+        	:
         $tree .= $prefix . $option['name'] . "<input type=\"hidden\" id=\"" . $this->getName() . "[groups][" . $this->_groupId . "][" . $option['id'] . "]\" /><br />\n";
+        }
         endif;
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
@@ -237,7 +241,7 @@ 
         $res = $songlistperm_handler->setTemplate($_POST['perms'], $groupid = 0);
         if($res){
 	    	redirect_header("permissions.php?action=template", 2, _AM_SONGLIST_PERM_TEMPLATE_CREATED);
-        }else{
+        } else{
 	    	redirect_header("permissions.php?action=template", 2, _AM_SONGLIST_PERM_TEMPLATE_ERROR);
         }
 		break;
@@ -266,7 +270,9 @@ 
 			$fm_options[-1*$c] = "[".$categories[$c]->getVar('cat_title')."]";
 			foreach(array_keys($songlists[$c]) as $f){
 				$fm_options[$f] = $songlists[$c][$f]["title"];
-		        if(!isset($songlists[$c][$f]["sub"])) continue;
+		        if(!isset($songlists[$c][$f]["sub"])) {
+		        	continue;
+		        }
 				foreach(array_keys($songlists[$c][$f]["sub"]) as $s){
 					$fm_options[$s] = "-- ".$songlists[$c][$f]["sub"][$s]["title"];
 				}
@@ -286,10 +292,14 @@ 
 		break;
 		
 	case "apply_save":
-		if(empty($_POST["forums"])) break;
+		if(empty($_POST["forums"])) {
+			break;
+		}
 	    $songlistperm_handler = xoops_getmodulehandler('permission', 'songlist');
 		foreach($_POST["forums"] as $songlist){
-			if($songlist < 1) continue;
+			if($songlist < 1) {
+				continue;
+			}
 			$songlistperm_handler->applyTemplate($songlist, $module_id);
 		}
 	    redirect_header("permissions.php", 2, _AM_SONGLIST_PERM_TEMPLATE_APPLIED);
@@ -323,9 +333,11 @@ 
 		if(empty($op)){
 			$op = $op_keys[0];
 			setCookie("op", isset($op_keys[1])?$op_keys[1]:"");
-		}else{
+		} else{
 			for($i=0;$i<count($op_keys);$i++){
-				if($op_keys[$i]==$op) break;
+				if($op_keys[$i]==$op) {
+					break;
+				}
 			}
 			setCookie("op", isset($op_keys[$i+1])?$op_keys[$i+1]:"");
 		}
@@ -348,13 +360,15 @@ 
 				$form->addItem($c, $categories[$c]->getVar('cat_title'));
 			}
 			unset($categories);
-		}else{
+		} else{
 			foreach (array_keys($categories) as $c) {
 				$key_c = -1 * $c;
 				$form->addItem($key_c, "<strong>[".$categories[$c]->getVar('cat_title')."]</strong>");
 				foreach(array_keys($songlists[$c]) as $f){
 			        $form->addItem($f, $songlists[$c][$f]["title"], $key_c);
-			        if(!isset($songlists[$c][$f]["sub"])) continue;
+			        if(!isset($songlists[$c][$f]["sub"])) {
+			        	continue;
+			        }
 					foreach(array_keys($songlists[$c][$f]["sub"]) as $s){
 			        	$form->addItem($s, "&rarr;".$songlists[$c][$f]["sub"][$s]["title"], $f);
 					}

htdocs/modules/songlist/admin/utf8map.php

Switch Indentation +5 added lines, -5 removed lines

@@ -15,10 +15,10 @@ 
 	$filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
 	
 	switch($op) {
-	default:
-	case "utf8map":
-		switch ($fct)
-		{
+		default:
+		case "utf8map":
+			switch ($fct)
+			{
 			default:
 			case "list":				
 				$indexAdmin = new ModuleAdmin();
@@ -131,7 +131,7 @@ 
 					xoops_confirm(array('id'=>$_REQUEST['id'], 'op'=>$_REQUEST['op'], 'fct'=>$_REQUEST['fct'], 'limit'=>$_REQUEST['limit'], 'start'=>$_REQUEST['start'], 'order'=>$_REQUEST['order'], 'sort'=>$_REQUEST['sort'], 'filter'=>$_REQUEST['filter']), $_SERVER['PHP_SELF'], sprintf(_AM_SONGLIST_MSG_UTF8MAP_DELETE, $utf8map->getVar('from'), $utf8map->getVar('to')));
 				}
 				break;
-		}
+			}
 		break;
 				
 	}

Spacing +24 added lines, -24 removed lines

@@ -6,15 +6,15 @@ 
 	
 	xoops_cp_header();
 	
-	$op = isset($_REQUEST['op'])?$_REQUEST['op']:"utf8map";
-	$fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list";
-	$limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
-	$start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0;
-	$order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC';
-	$sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
-	$filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
+	$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : "utf8map";
+	$fct = isset($_REQUEST['fct']) ? $_REQUEST['fct'] : "list";
+	$limit = !empty($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 30;
+	$start = !empty($_REQUEST['start']) ?intval($_REQUEST['start']) : 0;
+	$order = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
+	$sort = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
+	$filter = !empty($_REQUEST['filter']) ? ''.$_REQUEST['filter'].'' : '1,1';
 	
-	switch($op) {
+	switch ($op) {
 	default:
 	case "utf8map":
 		switch ($fct)
@@ -24,18 +24,18 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 				
-				$utf8map_handler =& xoops_getmodulehandler('utf8map', 'songlist');
+				$utf8map_handler = & xoops_getmodulehandler('utf8map', 'songlist');
 					
 				$criteria = $utf8map_handler->getFilterCriteria($GLOBALS['filter']);
 				$ttl = $utf8map_handler->getCount($criteria);
-				$GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
+				$GLOBALS['sort'] = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
 									
 				$pagenav = new XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']);
 				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
 		
 				foreach ($utf8map_handler->filterFields() as $id => $key) {
-					$GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-','_',$key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort'])?($GLOBALS['order']=='DESC'?'ASC':'DESC'):$GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key)))?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))):'_AM_SONGLIST_TH_'.strtoupper(str_replace('-','_',$key))).'</a>');
-					$GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $utf8map_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+					$GLOBALS['xoopsTpl']->assign(strtolower(str_replace('-', '_', $key).'_th'), '<a href="'.$_SERVER['PHP_SELF'].'?start='.$GLOBALS['start'].'&limit='.$GLOBALS['limit'].'&sort='.$key.'&order='.(($key==$GLOBALS['sort']) ? ($GLOBALS['order']=='DESC' ? 'ASC' : 'DESC') : $GLOBALS['order']).'&op='.$GLOBALS['op'].'&filter='.$GLOBALS['filter'].'">'.(defined('_AM_SONGLIST_TH_'.strtoupper(str_replace('-', '_', $key))) ?constant('_AM_SONGLIST_TH_'.strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_'.strtoupper(str_replace('-', '_', $key))).'</a>');
+					$GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-', '_', $key)).'_th', $utf8map_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
 				}
 				
 				$GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
@@ -51,7 +51,7 @@ 
 				$criteria->setOrder($GLOBALS['order']);
 					
 				$utf8maps = $utf8map_handler->getObjects($criteria, true);
-				foreach($utf8maps as $cid => $utf8map) {
+				foreach ($utf8maps as $cid => $utf8map) {
 					if (is_object($utf8map))					
 						$GLOBALS['xoopsTpl']->append('utf8map', $utf8map->toArray());
 				}
@@ -66,7 +66,7 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 											
-				$utf8map_handler =& xoops_getmodulehandler('utf8map', 'songlist');
+				$utf8map_handler = & xoops_getmodulehandler('utf8map', 'songlist');
 				if (isset($_REQUEST['id'])) {
 					$utf8map = $utf8map_handler->get(intval($_REQUEST['id']));
 				} else {
@@ -79,21 +79,21 @@ 
 				break;
 			case "save":
 				
-				$utf8map_handler =& xoops_getmodulehandler('utf8map', 'songlist');
-				$id=0;
-				if ($id=intval($_REQUEST['id'])) {
+				$utf8map_handler = & xoops_getmodulehandler('utf8map', 'songlist');
+				$id = 0;
+				if ($id = intval($_REQUEST['id'])) {
 					$utf8map = $utf8map_handler->get($id);
 				} else {
 					$utf8map = $utf8map_handler->create();
 				}
 				$utf8map->setVars($_POST[$id]);
 				
-				if (!$id=$utf8map_handler->insert($utf8map)) {
+				if (!$id = $utf8map_handler->insert($utf8map)) {
 					redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_FAILEDTOSAVE);
 					exit(0);
 				} else {
 					if ($_REQUEST['state'][$_REQUEST['id']]=='new')
-						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
+						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'].'&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
 					else 
 						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
 					exit(0);
@@ -101,8 +101,8 @@ 
 				break;
 			case "savelist":
 				
-				$utf8map_handler =& xoops_getmodulehandler('utf8map', 'songlist');
-				foreach($_REQUEST['id'] as $id) {
+				$utf8map_handler = & xoops_getmodulehandler('utf8map', 'songlist');
+				foreach ($_REQUEST['id'] as $id) {
 					$utf8map = $utf8map_handler->get($id);
 					$utf8map->setVars($_POST[$id]);
 					if (!$utf8map_handler->insert($utf8map)) {
@@ -115,9 +115,9 @@ 
 				break;				
 			case "delete":	
 							
-				$utf8map_handler =& xoops_getmodulehandler('utf8map', 'songlist');
-				$id=0;
-				if (isset($_POST['id'])&&$id=intval($_POST['id'])) {
+				$utf8map_handler = & xoops_getmodulehandler('utf8map', 'songlist');
+				$id = 0;
+				if (isset($_POST['id']) && $id = intval($_POST['id'])) {
 					$utf8map = $utf8map_handler->get($id);
 					if (!$utf8map_handler->delete($utf8map)) {
 						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_FAILEDTODELETE);

Braces +8 added lines, -6 removed lines

@@ -52,8 +52,9 @@ 
 					
 				$utf8maps = $utf8map_handler->getObjects($criteria, true);
 				foreach($utf8maps as $cid => $utf8map) {
-					if (is_object($utf8map))					
-						$GLOBALS['xoopsTpl']->append('utf8map', $utf8map->toArray());
+					if (is_object($utf8map)) {
+											$GLOBALS['xoopsTpl']->append('utf8map', $utf8map->toArray());
+					}
 				}
 				$GLOBALS['xoopsTpl']->assign('form', songlist_utf8map_get_form(false));
 				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
@@ -92,10 +93,11 @@ 
 					redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_FAILEDTOSAVE);
 					exit(0);
 				} else {
-					if ($_REQUEST['state'][$_REQUEST['id']]=='new')
-						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
-					else 
-						redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
+					if ($_REQUEST['state'][$_REQUEST['id']]=='new') {
+											redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'] . '&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
+					} else {
+											redirect_header($_SERVER['PHP_SELF'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
+					}
 					exit(0);
 				}
 				break;

htdocs/modules/songlist/admin/field_visibility.php

Spacing +9 added lines, -9 removed lines

@@ -17,9 +17,9 @@ 
 include 'header.php';
 xoops_cp_header();
 
- $op = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] :  "visibility"));
+ $op = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : "visibility"));
 
-include_once $GLOBALS['xoops']->path( "/class/xoopsformloader.php" );
+include_once $GLOBALS['xoops']->path("/class/xoopsformloader.php");
 $opform = new XoopsSimpleForm('', 'opform', 'field_permissions.php', "post");
 $op_select = new XoopsFormSelect("", 'op', $op);
 $op_select->setExtra('onchange="document.forms.opform.submit()"');
@@ -34,19 +34,19 @@ 
 $field_handler = xoops_getmodulehandler('field');
 $fields = $field_handler->getList();
 
-if ( isset($_REQUEST['submit'])  ) {
+if (isset($_REQUEST['submit'])) {
 	$visibility = $visibility_handler->create();
 	$visibility->setVar('field_id', $_REQUEST['field_id']);
 	$visibility->setVar('user_group', $_REQUEST['ug']);
 	$visibility->setVar('profile_group', $_REQUEST['pg']);
 	$visibility_handler->insert($visibility, true);
 }
-if ( $op == "del" ) {
-	$criteria = new CriteriaCompo(new Criteria('field_id', intval($_REQUEST['field_id']) ));
-	$criteria->add(new Criteria('user_group', intval($_REQUEST['ug']) ));
-	$criteria->add(new Criteria('profile_group', intval($_REQUEST['pg']) ));
+if ($op=="del") {
+	$criteria = new CriteriaCompo(new Criteria('field_id', intval($_REQUEST['field_id'])));
+	$criteria->add(new Criteria('user_group', intval($_REQUEST['ug'])));
+	$criteria->add(new Criteria('profile_group', intval($_REQUEST['pg'])));
 	$visibility_handler->deleteAll($criteria, true);
-	redirect_header("field_visibility.php", 2, sprintf(_AM_SONGLIST_DELETEDSUCCESS, _AM_SONGLIST_PROF_VISIBLE) );
+	redirect_header("field_visibility.php", 2, sprintf(_AM_SONGLIST_DELETEDSUCCESS, _AM_SONGLIST_PROF_VISIBLE));
 	exit();
 }
 
@@ -79,7 +79,7 @@ 
 $sel_pg->addOptionArray($groups);
 $add_form->addElement($sel_pg);
 
-$add_form->addElement(new XoopsFormButton('', 'submit', _ADD, 'submit') );
+$add_form->addElement(new XoopsFormButton('', 'submit', _ADD, 'submit'));
 $add_form->assign($GLOBALS['xoopsTpl']);
 
 $GLOBALS['xoopsTpl']->display("db:songlist_cpanel_visibility.html");