XoopsModules25x / songlist

htdocs/modules/songlist/admin/field_permissions.php

Switch Indentation +22 added lines, -22 removed lines

@@ -34,31 +34,31 @@
 
 $perm_desc = "";
 switch ($op ) {
-case "visibility":
-	redirect_header("field_visibility.php", 0, _AM_SONGLIST_PROF_VISIBLE);
-	//header("Location: visibility.php");
-	break;
+	case "visibility":
+		redirect_header("field_visibility.php", 0, _AM_SONGLIST_PROF_VISIBLE);
+		//header("Location: visibility.php");
+		break;
 	
-case "edit":
-	$title_of_form = _AM_SONGLIST_PROF_EDITABLE;
-	$perm_name = "songlist_edit";
-	$restriction = "field_edit";
-	$anonymous = false;
-	break;
+	case "edit":
+		$title_of_form = _AM_SONGLIST_PROF_EDITABLE;
+		$perm_name = "songlist_edit";
+		$restriction = "field_edit";
+		$anonymous = false;
+		break;
 	
-case "post":
-	$title_of_form = _AM_SONGLIST_PROF_POST;
-	$perm_name = "songlist_post";
-	$restriction = "";
-	$anonymous = true;
-	break;		
+	case "post":
+		$title_of_form = _AM_SONGLIST_PROF_POST;
+		$perm_name = "songlist_post";
+		$restriction = "";
+		$anonymous = true;
+		break;		
 	
-case "search":
-	$title_of_form = _AM_SONGLIST_PROF_SEARCH;
-	$perm_name = "songlist_search";
-	$restriction = "";
-	$anonymous = true;
-	break;
+	case "search":
+		$title_of_form = _AM_SONGLIST_PROF_SEARCH;
+		$perm_name = "songlist_search";
+		$restriction = "";
+		$anonymous = true;
+		break;
 }
 
 $module_id = $GLOBALS['songlistModule']->getVar('mid');

Spacing +15 added lines, -15 removed lines

@@ -21,7 +21,7 @@ 
 
 $op = $op = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : "edit"));
 
-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()"');
@@ -33,7 +33,7 @@ 
 $opform->display();
 
 $perm_desc = "";
-switch ($op ) {
+switch ($op) {
 case "visibility":
 	redirect_header("field_visibility.php", 0, _AM_SONGLIST_PROF_VISIBLE);
 	//header("Location: visibility.php");
@@ -62,14 +62,14 @@ 
 }
 
 $module_id = $GLOBALS['songlistModule']->getVar('mid');
-include_once $GLOBALS['xoops']->path( '/class/xoopsform/grouppermform.php' );
+include_once $GLOBALS['xoops']->path('/class/xoopsform/grouppermform.php');
 $form = new XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/field_permissions.php', $anonymous);
 
-if ( $op == "access" ) {
+if ($op=="access") {
 	$member_handler = xoops_gethandler('member');
 	$glist = $member_handler->getGroupList();
-	foreach (array_keys($glist) as $i ) {
-		if ( $i != XOOPS_GROUP_ANONYMOUS ) {
+	foreach (array_keys($glist) as $i) {
+		if ($i!=XOOPS_GROUP_ANONYMOUS) {
 			$form->addItem($i, $glist[$i]);
 		}
 	}
@@ -78,11 +78,11 @@ 
 	$extras_handler = xoops_getmodulehandler('extras');
 	$fields = array_merge(array(), $extras_handler->loadFields());
 	
-	if ( $op != "search" ) {
-		if (is_array($fields)&&count($fields)>0)
-			foreach (array_keys($fields) as $i ) {
-				if ( $restriction == "" || $fields[$i]->getVar($restriction)  ) {
-					$form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
+	if ($op!="search") {
+		if (is_array($fields) && count($fields)>0)
+			foreach (array_keys($fields) as $i) {
+				if ($restriction=="" || $fields[$i]->getVar($restriction)) {
+					$form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
 				}
 			}
 	} else {
@@ -94,10 +94,10 @@ 
 		'datetime',
 		'timezone',
 		'language');
-		if (is_array($fields)&&count($fields)>0)
-			foreach (array_keys($fields) as $i ) {
-				if ( in_array($fields[$i]->getVar('field_type'), $searchable_types)  ) {
-					$form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
+		if (is_array($fields) && count($fields)>0)
+			foreach (array_keys($fields) as $i) {
+				if (in_array($fields[$i]->getVar('field_type'), $searchable_types)) {
+					$form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
 				}
 			}
 	}

Braces +6 added lines, -4 removed lines

@@ -79,10 +79,11 @@ 
 	$fields = array_merge(array(), $extras_handler->loadFields());
 	
 	if ( $op != "search" ) {
-		if (is_array($fields)&&count($fields)>0)
-			foreach (array_keys($fields) as $i ) {
+		if (is_array($fields)&&count($fields)>0) {
+					foreach (array_keys($fields) as $i ) {
 				if ( $restriction == "" || $fields[$i]->getVar($restriction)  ) {
 					$form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
+		}
 				}
 			}
 	} else {
@@ -94,10 +95,11 @@ 
 		'datetime',
 		'timezone',
 		'language');
-		if (is_array($fields)&&count($fields)>0)
-			foreach (array_keys($fields) as $i ) {
+		if (is_array($fields)&&count($fields)>0) {
+					foreach (array_keys($fields) as $i ) {
 				if ( in_array($fields[$i]->getVar('field_type'), $searchable_types)  ) {
 					$form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
+		}
 				}
 			}
 	}

htdocs/modules/songlist/admin/genre.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 "genre":
-		switch ($fct)
-		{
+		default:
+		case "genre":
+			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_GENRE_DELETE, $genre->getVar('name')));
 				}
 				break;
-		}
+			}
 		break;
 				
 	}

Spacing +24 added lines, -24 removed lines

@@ -6,15 +6,15 @@ 
 	
 	xoops_cp_header();
 	
-	$op = isset($_REQUEST['op'])?$_REQUEST['op']:"genre";
-	$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'] : "genre";
+	$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 "genre":
 		switch ($fct)
@@ -24,18 +24,18 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 				
-				$genre_handler =& xoops_getmodulehandler('genre', 'songlist');
+				$genre_handler = & xoops_getmodulehandler('genre', 'songlist');
 					
 				$criteria = $genre_handler->getFilterCriteria($GLOBALS['filter']);
 				$ttl = $genre_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 ($genre_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', $genre_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', $genre_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']);
 					
 				$genres = $genre_handler->getObjects($criteria, true);
-				foreach($genres as $cid => $genre) {
+				foreach ($genres as $cid => $genre) {
 					if (is_object($genre))					
 						$GLOBALS['xoopsTpl']->append('genre', $genre->toArray());
 				}
@@ -66,7 +66,7 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 											
-				$genre_handler =& xoops_getmodulehandler('genre', 'songlist');
+				$genre_handler = & xoops_getmodulehandler('genre', 'songlist');
 				if (isset($_REQUEST['id'])) {
 					$genre = $genre_handler->get(intval($_REQUEST['id']));
 				} else {
@@ -79,21 +79,21 @@ 
 				break;
 			case "save":
 				
-				$genre_handler =& xoops_getmodulehandler('genre', 'songlist');
-				$id=0;
-				if ($id=intval($_REQUEST['id'])) {
+				$genre_handler = & xoops_getmodulehandler('genre', 'songlist');
+				$id = 0;
+				if ($id = intval($_REQUEST['id'])) {
 					$genre = $genre_handler->get($id);
 				} else {
 					$genre = $genre_handler->create();
 				}
 				$genre->setVars($_POST[$id]);
 				
-				if (!$id=$genre_handler->insert($genre)) {
+				if (!$id = $genre_handler->insert($genre)) {
 					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_GENRE_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_GENRE_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_GENRE_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_GENRE_SAVEDOKEY);
 					exit(0);
@@ -101,8 +101,8 @@ 
 				break;
 			case "savelist":
 				
-				$genre_handler =& xoops_getmodulehandler('genre', 'songlist');
-				foreach($_REQUEST['id'] as $id) {
+				$genre_handler = & xoops_getmodulehandler('genre', 'songlist');
+				foreach ($_REQUEST['id'] as $id) {
 					$genre = $genre_handler->get($id);
 					$genre->setVars($_POST[$id]);
 					if (!$genre_handler->insert($genre)) {
@@ -115,9 +115,9 @@ 
 				break;				
 			case "delete":	
 							
-				$genre_handler =& xoops_getmodulehandler('genre', 'songlist');
-				$id=0;
-				if (isset($_POST['id'])&&$id=intval($_POST['id'])) {
+				$genre_handler = & xoops_getmodulehandler('genre', 'songlist');
+				$id = 0;
+				if (isset($_POST['id']) && $id = intval($_POST['id'])) {
 					$genre = $genre_handler->get($id);
 					if (!$genre_handler->delete($genre)) {
 						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_GENRE_FAILEDTODELETE);

Braces +8 added lines, -6 removed lines

@@ -52,8 +52,9 @@ 
 					
 				$genres = $genre_handler->getObjects($criteria, true);
 				foreach($genres as $cid => $genre) {
-					if (is_object($genre))					
-						$GLOBALS['xoopsTpl']->append('genre', $genre->toArray());
+					if (is_object($genre)) {
+											$GLOBALS['xoopsTpl']->append('genre', $genre->toArray());
+					}
 				}
 				$GLOBALS['xoopsTpl']->assign('form', songlist_genre_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_GENRE_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_GENRE_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_GENRE_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_GENRE_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_GENRE_SAVEDOKEY);
+					}
 					exit(0);
 				}
 				break;

htdocs/modules/songlist/admin/header.php

Indentation +11 added lines, -11 removed lines

@@ -56,23 +56,23 @@
 	include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
 	
 	if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
-        include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
-    }else{
-        echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
-    }
+		include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
+	}else{
+		echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
+	}
     
 	$GLOBALS['songlistImageIcon'] = XOOPS_URL .'/'. $GLOBALS['songlistModule']->getInfo('icons16');
 	$GLOBALS['songlistImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['songlistModule']->getInfo('icons32');
 	
 	if ($GLOBALS['xoopsUser']) {
-	    $moduleperm_handler = xoops_gethandler('groupperm');
-	    if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['songlistModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
-	        redirect_header(XOOPS_URL, 1, _NOPERM);
-	        exit();
-	    }
+		$moduleperm_handler = xoops_gethandler('groupperm');
+		if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['songlistModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
+			redirect_header(XOOPS_URL, 1, _NOPERM);
+			exit();
+		}
 	} else {
-	    redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
-	    exit();
+		redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+		exit();
 	}
 
 	xoops_loadLanguage('user');

Spacing +8 added lines, -8 removed lines

@@ -33,9 +33,9 @@ 
 	require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
 	
 	if (!defined('_CHARSET'))
-		define ("_CHARSET","UTF-8");
+		define("_CHARSET", "UTF-8");
 	if (!defined('_CHARSET_ISO'))
-		define ("_CHARSET_ISO","ISO-8859-1");
+		define("_CHARSET_ISO", "ISO-8859-1");
 	
 	$GLOBALS['songlistAdmin'] = true;
 	
@@ -55,23 +55,23 @@ 
 	
 	include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
 	
-	if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
+	if (file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))) {
         include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
-    }else{
+    } else {
         echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
     }
     
-	$GLOBALS['songlistImageIcon'] = XOOPS_URL .'/'. $GLOBALS['songlistModule']->getInfo('icons16');
-	$GLOBALS['songlistImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['songlistModule']->getInfo('icons32');
+	$GLOBALS['songlistImageIcon'] = XOOPS_URL.'/'.$GLOBALS['songlistModule']->getInfo('icons16');
+	$GLOBALS['songlistImageAdmin'] = XOOPS_URL.'/'.$GLOBALS['songlistModule']->getInfo('icons32');
 	
 	if ($GLOBALS['xoopsUser']) {
 	    $moduleperm_handler = xoops_gethandler('groupperm');
-	    if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['songlistModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
+	    if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['songlistModule']->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
 	        redirect_header(XOOPS_URL, 1, _NOPERM);
 	        exit();
 	    }
 	} else {
-	    redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
+	    redirect_header(XOOPS_URL."/user.php", 1, _NOPERM);
 	    exit();
 	}
 

Braces +7 added lines, -5 removed lines

@@ -32,10 +32,12 @@ 
 	
 	require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
 	
-	if (!defined('_CHARSET'))
-		define ("_CHARSET","UTF-8");
-	if (!defined('_CHARSET_ISO'))
-		define ("_CHARSET_ISO","ISO-8859-1");
+	if (!defined('_CHARSET')) {
+			define ("_CHARSET","UTF-8");
+	}
+	if (!defined('_CHARSET_ISO')) {
+			define ("_CHARSET_ISO","ISO-8859-1");
+	}
 	
 	$GLOBALS['songlistAdmin'] = true;
 	
@@ -57,7 +59,7 @@ 
 	
 	if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
         include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
-    }else{
+    } else{
         echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
     }
     

htdocs/modules/songlist/admin/albums.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($albums->getVar('image')))
-						      		unlink($GLOBALS['xoops']->path($albums->getVar('path')).$albums->getVar('image'));
+							  	if (strlen($albums->getVar('image')))
+							  		unlink($GLOBALS['xoops']->path($albums->getVar('path')).$albums->getVar('image'));
 						      	
-						      	$albums->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
-						      	$albums->setVar('image', $uploader->getSavedFileName());
-						      	@$albums_handler->insert($albums);
+							  	$albums->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
+							  	$albums->setVar('image', $uploader->getSavedFileName());
+							  	@$albums_handler->insert($albums);
 						      	
-						    }      	
+							}      	
 					  	} 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 "albums":
-		switch ($fct)
-		{
+		default:
+		case "albums":
+			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_ALBUMS_DELETE, $albums->getVar('title')));
 				}
 				break;
-		}
+			}
 		break;
 				
 	}

Spacing +29 added lines, -29 removed lines

@@ -6,15 +6,15 @@ 
 	
 	xoops_cp_header();
 	
-	$op = isset($_REQUEST['op'])?$_REQUEST['op']:"albums";
-	$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'] : "albums";
+	$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 "albums":
 		switch ($fct)
@@ -24,18 +24,18 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 				
-				$albums_handler =& xoops_getmodulehandler('albums', 'songlist');
+				$albums_handler = & xoops_getmodulehandler('albums', 'songlist');
 					
 				$criteria = $albums_handler->getFilterCriteria($GLOBALS['filter']);
 				$ttl = $albums_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 ($albums_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', $albums_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', $albums_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']);
 					
 				$albumss = $albums_handler->getObjects($criteria, true);
-				foreach($albumss as $cid => $albums) {
+				foreach ($albumss as $cid => $albums) {
 					if (is_object($albums))					
 						$GLOBALS['xoopsTpl']->append('albums', $albums->toArray());
 				}
@@ -66,7 +66,7 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 								
-				$albums_handler =& xoops_getmodulehandler('albums', 'songlist');
+				$albums_handler = & xoops_getmodulehandler('albums', 'songlist');
 				if (isset($_REQUEST['id'])) {
 					$albums = $albums_handler->get(intval($_REQUEST['id']));
 				} else {
@@ -79,26 +79,26 @@ 
 				break;
 			case "save":
 				
-				$albums_handler =& xoops_getmodulehandler('albums', 'songlist');
-				$id=0;
-				if ($id=intval($_REQUEST['id'])) {
+				$albums_handler = & xoops_getmodulehandler('albums', 'songlist');
+				$id = 0;
+				if ($id = intval($_REQUEST['id'])) {
 					$albums = $albums_handler->get($id);
 				} else {
 					$albums = $albums_handler->create();
 				}
 				$albums->setVars($_POST[$id]);
 				
-				if (!$id=$albums_handler->insert($albums)) {
+				if (!$id = $albums_handler->insert($albums)) {
 					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_ALBUMS_FAILEDTOSAVE);
 					exit(0);
 				} else {
 					
-					if (isset($_FILES['image'])&&!empty($_FILES['image']['title'])) {
+					if (isset($_FILES['image']) && !empty($_FILES['image']['title'])) {
 						
 						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'));
 						$albums = $albums_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_ALBUMS_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_ALBUMS_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_ALBUMS_SAVEDOKEY);
 					exit(0);
@@ -145,8 +145,8 @@ 
 				break;
 			case "savelist":
 				
-				$albums_handler =& xoops_getmodulehandler('albums', 'songlist');
-				foreach($_REQUEST['id'] as $id) {
+				$albums_handler = & xoops_getmodulehandler('albums', 'songlist');
+				foreach ($_REQUEST['id'] as $id) {
 					$albums = $albums_handler->get($id);
 					$albums->setVars($_POST[$id]);
 					if (!$albums_handler->insert($albums)) {
@@ -159,9 +159,9 @@ 
 				break;				
 			case "delete":	
 							
-				$albums_handler =& xoops_getmodulehandler('albums', 'songlist');
-				$id=0;
-				if (isset($_POST['id'])&&$id=intval($_POST['id'])) {
+				$albums_handler = & xoops_getmodulehandler('albums', 'songlist');
+				$id = 0;
+				if (isset($_POST['id']) && $id = intval($_POST['id'])) {
 					$albums = $albums_handler->get($id);
 					if (!$albums_handler->delete($albums)) {
 						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_ALBUMS_FAILEDTODELETE);

Braces +14 added lines, -10 removed lines

@@ -52,8 +52,9 @@ 
 					
 				$albumss = $albums_handler->getObjects($criteria, true);
 				foreach($albumss as $cid => $albums) {
-					if (is_object($albums))					
-						$GLOBALS['xoopsTpl']->append('albums', $albums->toArray());
+					if (is_object($albums)) {
+											$GLOBALS['xoopsTpl']->append('albums', $albums->toArray());
+					}
 				}
 				$GLOBALS['xoopsTpl']->assign('form', songlist_albums_get_form(false));
 				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
@@ -96,9 +97,10 @@ 
 					if (isset($_FILES['image'])&&!empty($_FILES['image']['title'])) {
 						
 						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($albums->getVar('image')))
-						      		unlink($GLOBALS['xoops']->path($albums->getVar('path')).$albums->getVar('image'));
+						      	if (strlen($albums->getVar('image'))) {
+						      							      		unlink($GLOBALS['xoops']->path($albums->getVar('path')).$albums->getVar('image'));
+						      	}
 						      	
 						      	$albums->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
 						      	$albums->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_ALBUMS_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_ALBUMS_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_ALBUMS_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_ALBUMS_SAVEDOKEY);
+					}
 					exit(0);
 				}
 				break;

htdocs/modules/songlist/admin/export.php

Indentation +9 added lines, -9 removed lines

@@ -22,8 +22,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__));
@@ -53,18 +53,18 @@ 
 					if ($uploader->fetchMedia('xmlfile')) {
 					  	if (!$uploader->upload()) {
 					  		
-					    	echo $uploader->getErrors();
+							echo $uploader->getErrors();
 							songlist_footer_adminMenu();
 							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 {
 				  		
-				       	echo $uploader->getErrors();
+					   	echo $uploader->getErrors();
 						songlist_footer_adminMenu();
 						xoops_cp_footer();
 						exit(0);

Switch Indentation +86 added lines, -86 removed lines

@@ -15,9 +15,9 @@ 
 	$filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
 	
 	switch($op) {
-	case "import":
-		switch ($fct)
-		{
+		case "import":
+			switch ($fct)
+			{
 			default:
 			case "actiona":	
 
@@ -158,101 +158,101 @@ 
 												$object->setVar('singer', '_ENUM_SONGLIST_SOLO');
 												break;
 										}
-										$object->setVar('name', $data[$_POST['artist']]);
-										$aid = $artists_handler->insert($object);
-										$aids[$aid] = $aid;
+											$object->setVar('name', $data[$_POST['artist']]);
+											$aid = $artists_handler->insert($object);
+											$aids[$aid] = $aid;
+										}
+									} 								
+								}
+								$abid = 0;
+								if (strlen($_POST['album'])>0&&!empty($data[$_POST['album']])) {
+									$criteria = new Criteria('`name`',  $data[$_POST['album']]);
+									if ($albums_handler->getCount($criteria)>0) {
+										$objects = $albums_handler->getObjects($criteria, false);
+										$abid = $objects[0]->getVar('aid');
+									} else {
+										$object = $albums_handler->create();
+										$object->setVar('cid', $cid);
+										$object->setVar('aids', $aids);
+										$object->setVar('name', $data[$_POST['album']]);
+										$abid = $albums_handler->insert($object);
+									} 								
+								}
+								$sid = 0;
+								if (strlen($_POST['songid'])>0&&!empty($data[$_POST['songid']])) {
+									$criteria = new Criteria('`songid`',  $data[$_POST['songid']]);
+									if ($songs_handler->getCount($criteria)>0) {
+										$objects = $songs_handler->getObjects($criteria, false);
+										$object = $objects[0]->getVar('sid');
+									} else {
+										$object = $songs_handler->create();
 									}
+									if ($object->getVar('cid')>0&&$cid>0) { $object->setVar('cid', $cid); } else { $object->setVar('cid', $cid); }
+									if ($object->getVar('gid')>0&&$gid>0) { $object->setVar('gid', $gid); } else { $object->setVar('gid', $gid); }
+									if (count($object->getVar('aids'))>0&&count($aids)>0) { $object->setVar('aids', $aids); } else { $object->setVar('aids', $aids); }
+									if ($object->getVar('abid')>0&&$abid>0) { $object->setVar('abid', $abid); } else { $object->setVar('abid', $abid); }
+									$object->setVar('songid', $data[$_POST['songid']]);
+									$object->setVar('title', $data[$_POST['title']]);
+									$object->setVar('lyrics', str_replace("\n", "<br/>\n", $data[$_POST['lyrics']]));
+									$sid = $songs_handler->insert($object); 								
+								}
+							}			
+						}
+					} else {
+						foreach ($xmlarray as $recid => $data) {
+							$gid = 0;
+							if (strlen($_POST['genre'])>0&&!empty($data[$_POST['genre']])) {
+								$criteria = new Criteria('`name`',  $data[$_POST['genre']]);
+								if ($genre_handler->getCount($criteria)>0) {
+									$objects = $genre_handler->getObjects($criteria, false);
+									$gid = $objects[0]->getVar('gid');
+								} else {
+									$object = $genre_handler->create();
+									$object->setVar('name', $data[$_POST['genre']]);
+									$gid = $genre_handler->insert($object);
 								} 								
-							}
-							$abid = 0;
-							if (strlen($_POST['album'])>0&&!empty($data[$_POST['album']])) {
-								$criteria = new Criteria('`name`',  $data[$_POST['album']]);
-								if ($albums_handler->getCount($criteria)>0) {
-									$objects = $albums_handler->getObjects($criteria, false);
-									$abid = $objects[0]->getVar('aid');
+							}	
+							$vid = 0;
+							if (strlen($_POST['voice'])>0&&!empty($data[$_POST['voice']])) {
+								$criteria = new Criteria('`name`',  $data[$_POST['voice']]);
+								if ($voice_handler->getCount($criteria)>0) {
+									$objects = $voice_handler->getObjects($criteria, false);
+									$gid = $objects[0]->getVar('vid');
 								} else {
-									$object = $albums_handler->create();
-									$object->setVar('cid', $cid);
-									$object->setVar('aids', $aids);
-									$object->setVar('name', $data[$_POST['album']]);
-									$abid = $albums_handler->insert($object);
+									$object = $voice_handler->create();
+									$object->setVar('name', $data[$_POST['voice']]);
+									$gid = $voice_handler->insert($object);
 								} 								
-							}
-							$sid = 0;
-							if (strlen($_POST['songid'])>0&&!empty($data[$_POST['songid']])) {
-								$criteria = new Criteria('`songid`',  $data[$_POST['songid']]);
-								if ($songs_handler->getCount($criteria)>0) {
-									$objects = $songs_handler->getObjects($criteria, false);
-									$object = $objects[0]->getVar('sid');
+							}						
+							$cid = 0;
+							if (strlen($_POST['category'])>0&&!empty($data[$_POST['category']])) {
+								$criteria = new Criteria('`name`',  $data[$_POST['category']]);
+								if ($category_handler->getCount($criteria)>0) {
+									$objects = $category_handler->getObjects($criteria, false);
+									$cid = $objects[0]->getVar('cid');
 								} else {
-									$object = $songs_handler->create();
-								}
-								if ($object->getVar('cid')>0&&$cid>0) { $object->setVar('cid', $cid); } else { $object->setVar('cid', $cid); }
-								if ($object->getVar('gid')>0&&$gid>0) { $object->setVar('gid', $gid); } else { $object->setVar('gid', $gid); }
-								if (count($object->getVar('aids'))>0&&count($aids)>0) { $object->setVar('aids', $aids); } else { $object->setVar('aids', $aids); }
-								if ($object->getVar('abid')>0&&$abid>0) { $object->setVar('abid', $abid); } else { $object->setVar('abid', $abid); }
-								$object->setVar('songid', $data[$_POST['songid']]);
-								$object->setVar('title', $data[$_POST['title']]);
-								$object->setVar('lyrics', str_replace("\n", "<br/>\n", $data[$_POST['lyrics']]));
-								$sid = $songs_handler->insert($object); 								
+									$object = $category_handler->create();
+									$object->setVar('name', $data[$_POST['category']]);
+									$cid = $category_handler->insert($object);
+								} 								
 							}
-						}			
-					}
-				} else {
-					foreach ($xmlarray as $recid => $data) {
-						$gid = 0;
-						if (strlen($_POST['genre'])>0&&!empty($data[$_POST['genre']])) {
-							$criteria = new Criteria('`name`',  $data[$_POST['genre']]);
-							if ($genre_handler->getCount($criteria)>0) {
-								$objects = $genre_handler->getObjects($criteria, false);
-								$gid = $objects[0]->getVar('gid');
-							} else {
-								$object = $genre_handler->create();
-								$object->setVar('name', $data[$_POST['genre']]);
-								$gid = $genre_handler->insert($object);
-							} 								
-						}	
-						$vid = 0;
-						if (strlen($_POST['voice'])>0&&!empty($data[$_POST['voice']])) {
-							$criteria = new Criteria('`name`',  $data[$_POST['voice']]);
-							if ($voice_handler->getCount($criteria)>0) {
-								$objects = $voice_handler->getObjects($criteria, false);
-								$gid = $objects[0]->getVar('vid');
-							} else {
-								$object = $voice_handler->create();
-								$object->setVar('name', $data[$_POST['voice']]);
-								$gid = $voice_handler->insert($object);
-							} 								
-						}						
-						$cid = 0;
-						if (strlen($_POST['category'])>0&&!empty($data[$_POST['category']])) {
-							$criteria = new Criteria('`name`',  $data[$_POST['category']]);
-							if ($category_handler->getCount($criteria)>0) {
-								$objects = $category_handler->getObjects($criteria, false);
-								$cid = $objects[0]->getVar('cid');
-							} else {
-								$object = $category_handler->create();
-								$object->setVar('name', $data[$_POST['category']]);
-								$cid = $category_handler->insert($object);
-							} 								
-						}
-						$aids = array();
-						if (strlen($_POST['artist'])>0&&!empty($data[$_POST['artist']])) {
-							foreach(explode(',', $data[$_POST['artist']]) as $artist) {
-								$criteria = new Criteria('`name`',  $artist);
-								if ($artists_handler->getCount($criteria)>0) {
-									$objects = $artists_handler->getObjects($criteria, false);
-									$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
-								} else {
-									$object = $artists_handler->create();
-									switch($data[$_POST['singer']]) {
+							$aids = array();
+							if (strlen($_POST['artist'])>0&&!empty($data[$_POST['artist']])) {
+								foreach(explode(',', $data[$_POST['artist']]) as $artist) {
+									$criteria = new Criteria('`name`',  $artist);
+									if ($artists_handler->getCount($criteria)>0) {
+										$objects = $artists_handler->getObjects($criteria, false);
+										$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
+									} else {
+										$object = $artists_handler->create();
+										switch($data[$_POST['singer']]) {
 										case $_POST['duet']:
 											$object->setVar('singer', '_ENUM_SONGLIST_DUET');
 											break;
 										case $_POST['solo']:
 											$object->setVar('singer', '_ENUM_SONGLIST_SOLO');
 											break;
-									}
+										}
 									$object->setVar('cid', $cid);
 									$object->setVar('name', $data[$_POST['artist']]);
 									$aid = $artists_handler->insert($object);

Spacing +51 added lines, -51 removed lines

@@ -6,15 +6,15 @@ 
 	
 	xoops_cp_header();
 	
-	$op = isset($_REQUEST['op'])?$_REQUEST['op']:"dashboard";
-	$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'] : "dashboard";
+	$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) {
 	case "import":
 		switch ($fct)
 		{
@@ -35,12 +35,12 @@ 
 				
 			case "upload":
 							
-				if (isset($_FILES['xmlfile'])&&!empty($_FILES['xmlfile']['title'])) {
+				if (isset($_FILES['xmlfile']) && !empty($_FILES['xmlfile']['title'])) {
 						
 					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);
 							}
 					}
@@ -48,7 +48,7 @@ 
 					include_once($GLOBALS['xoops']->path('modules/songlist/include/uploader.php'));
 					$albums = $albums_handler->get($id);
 					$uploader = new SonglistMediaUploader($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']), array('application/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity', 'text/xml xml xsl', 'text/xml-external-parsed-entity'), 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()) {
@@ -91,7 +91,7 @@ 
 				$category_handler = xoops_getmodulehandler('category', 'songlist');
 				
 				$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');	
 				}
@@ -100,11 +100,11 @@ 
 				$xmlarray = songlist_xml2array(file_get_contents($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile'])), false, 'tag');
 
 				if (strlen($_POST['collection'])>0) {
-					foreach($xmlarray[$_POST['collection']] as $id => $record) {
+					foreach ($xmlarray[$_POST['collection']] as $id => $record) {
 						foreach ($record as $recid => $data) {
 							$gid = 0;
-							if (strlen($_POST['genre'])>0&&!empty($data[$_POST['genre']])) {
-								$criteria = new Criteria('`name`',  $data[$_POST['genre']]);
+							if (strlen($_POST['genre'])>0 && !empty($data[$_POST['genre']])) {
+								$criteria = new Criteria('`name`', $data[$_POST['genre']]);
 								if ($genre_handler->getCount($criteria)>0) {
 									$objects = $genre_handler->getObjects($criteria, false);
 									$gid = $objects[0]->getVar('gid');
@@ -116,8 +116,8 @@ 
 							}	
 
 							$vid = 0;
-							if (strlen($_POST['voice'])>0&&!empty($data[$_POST['voice']])) {
-								$criteria = new Criteria('`name`',  $data[$_POST['voice']]);
+							if (strlen($_POST['voice'])>0 && !empty($data[$_POST['voice']])) {
+								$criteria = new Criteria('`name`', $data[$_POST['voice']]);
 								if ($voice_handler->getCount($criteria)>0) {
 									$objects = $voice_handler->getObjects($criteria, false);
 									$gid = $objects[0]->getVar('vid');
@@ -129,8 +129,8 @@ 
 							}								
 							
 							$cid = 0;
-							if (strlen($_POST['category'])>0&&!empty($data[$_POST['category']])) {
-								$criteria = new Criteria('`name`',  $data[$_POST['category']]);
+							if (strlen($_POST['category'])>0 && !empty($data[$_POST['category']])) {
+								$criteria = new Criteria('`name`', $data[$_POST['category']]);
 								if ($category_handler->getCount($criteria)>0) {
 									$objects = $category_handler->getObjects($criteria, false);
 									$cid = $objects[0]->getVar('cid');
@@ -141,16 +141,16 @@ 
 								} 								
 							}
 							$aids = array();
-							if (strlen($_POST['artist'])>0&&!empty($data[$_POST['artist']])) {
-								foreach(explode(',', $data[$_POST['artist']]) as $artist) {
-									$criteria = new Criteria('`name`',  $artist);
+							if (strlen($_POST['artist'])>0 && !empty($data[$_POST['artist']])) {
+								foreach (explode(',', $data[$_POST['artist']]) as $artist) {
+									$criteria = new Criteria('`name`', $artist);
 									if ($artists_handler->getCount($criteria)>0) {
 										$objects = $artists_handler->getObjects($criteria, false);
 										$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
 									} else {
 										$object = $artists_handler->create();
 										$object->setVar('cid', $cid);
-										switch($data[$_POST['singer']]) {
+										switch ($data[$_POST['singer']]) {
 											case $_POST['duet']:
 												$object->setVar('singer', '_ENUM_SONGLIST_DUET');
 												break;
@@ -165,8 +165,8 @@ 
 								} 								
 							}
 							$abid = 0;
-							if (strlen($_POST['album'])>0&&!empty($data[$_POST['album']])) {
-								$criteria = new Criteria('`name`',  $data[$_POST['album']]);
+							if (strlen($_POST['album'])>0 && !empty($data[$_POST['album']])) {
+								$criteria = new Criteria('`name`', $data[$_POST['album']]);
 								if ($albums_handler->getCount($criteria)>0) {
 									$objects = $albums_handler->getObjects($criteria, false);
 									$abid = $objects[0]->getVar('aid');
@@ -179,18 +179,18 @@ 
 								} 								
 							}
 							$sid = 0;
-							if (strlen($_POST['songid'])>0&&!empty($data[$_POST['songid']])) {
-								$criteria = new Criteria('`songid`',  $data[$_POST['songid']]);
+							if (strlen($_POST['songid'])>0 && !empty($data[$_POST['songid']])) {
+								$criteria = new Criteria('`songid`', $data[$_POST['songid']]);
 								if ($songs_handler->getCount($criteria)>0) {
 									$objects = $songs_handler->getObjects($criteria, false);
 									$object = $objects[0]->getVar('sid');
 								} else {
 									$object = $songs_handler->create();
 								}
-								if ($object->getVar('cid')>0&&$cid>0) { $object->setVar('cid', $cid); } else { $object->setVar('cid', $cid); }
-								if ($object->getVar('gid')>0&&$gid>0) { $object->setVar('gid', $gid); } else { $object->setVar('gid', $gid); }
-								if (count($object->getVar('aids'))>0&&count($aids)>0) { $object->setVar('aids', $aids); } else { $object->setVar('aids', $aids); }
-								if ($object->getVar('abid')>0&&$abid>0) { $object->setVar('abid', $abid); } else { $object->setVar('abid', $abid); }
+								if ($object->getVar('cid')>0 && $cid>0) { $object->setVar('cid', $cid); } else { $object->setVar('cid', $cid); }
+								if ($object->getVar('gid')>0 && $gid>0) { $object->setVar('gid', $gid); } else { $object->setVar('gid', $gid); }
+								if (count($object->getVar('aids'))>0 && count($aids)>0) { $object->setVar('aids', $aids); } else { $object->setVar('aids', $aids); }
+								if ($object->getVar('abid')>0 && $abid>0) { $object->setVar('abid', $abid); } else { $object->setVar('abid', $abid); }
 								$object->setVar('songid', $data[$_POST['songid']]);
 								$object->setVar('title', $data[$_POST['title']]);
 								$object->setVar('lyrics', str_replace("\n", "<br/>\n", $data[$_POST['lyrics']]));
@@ -201,8 +201,8 @@ 
 				} else {
 					foreach ($xmlarray as $recid => $data) {
 						$gid = 0;
-						if (strlen($_POST['genre'])>0&&!empty($data[$_POST['genre']])) {
-							$criteria = new Criteria('`name`',  $data[$_POST['genre']]);
+						if (strlen($_POST['genre'])>0 && !empty($data[$_POST['genre']])) {
+							$criteria = new Criteria('`name`', $data[$_POST['genre']]);
 							if ($genre_handler->getCount($criteria)>0) {
 								$objects = $genre_handler->getObjects($criteria, false);
 								$gid = $objects[0]->getVar('gid');
@@ -213,8 +213,8 @@ 
 							} 								
 						}	
 						$vid = 0;
-						if (strlen($_POST['voice'])>0&&!empty($data[$_POST['voice']])) {
-							$criteria = new Criteria('`name`',  $data[$_POST['voice']]);
+						if (strlen($_POST['voice'])>0 && !empty($data[$_POST['voice']])) {
+							$criteria = new Criteria('`name`', $data[$_POST['voice']]);
 							if ($voice_handler->getCount($criteria)>0) {
 								$objects = $voice_handler->getObjects($criteria, false);
 								$gid = $objects[0]->getVar('vid');
@@ -225,8 +225,8 @@ 
 							} 								
 						}						
 						$cid = 0;
-						if (strlen($_POST['category'])>0&&!empty($data[$_POST['category']])) {
-							$criteria = new Criteria('`name`',  $data[$_POST['category']]);
+						if (strlen($_POST['category'])>0 && !empty($data[$_POST['category']])) {
+							$criteria = new Criteria('`name`', $data[$_POST['category']]);
 							if ($category_handler->getCount($criteria)>0) {
 								$objects = $category_handler->getObjects($criteria, false);
 								$cid = $objects[0]->getVar('cid');
@@ -237,15 +237,15 @@ 
 							} 								
 						}
 						$aids = array();
-						if (strlen($_POST['artist'])>0&&!empty($data[$_POST['artist']])) {
-							foreach(explode(',', $data[$_POST['artist']]) as $artist) {
-								$criteria = new Criteria('`name`',  $artist);
+						if (strlen($_POST['artist'])>0 && !empty($data[$_POST['artist']])) {
+							foreach (explode(',', $data[$_POST['artist']]) as $artist) {
+								$criteria = new Criteria('`name`', $artist);
 								if ($artists_handler->getCount($criteria)>0) {
 									$objects = $artists_handler->getObjects($criteria, false);
 									$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
 								} else {
 									$object = $artists_handler->create();
-									switch($data[$_POST['singer']]) {
+									switch ($data[$_POST['singer']]) {
 										case $_POST['duet']:
 											$object->setVar('singer', '_ENUM_SONGLIST_DUET');
 											break;
@@ -261,8 +261,8 @@ 
 							} 								
 						}
 						$abid = 0;
-						if (strlen($_POST['album'])>0&&!empty($data[$_POST['album']])) {
-							$criteria = new Criteria('`name`',  $data[$_POST['album']]);
+						if (strlen($_POST['album'])>0 && !empty($data[$_POST['album']])) {
+							$criteria = new Criteria('`name`', $data[$_POST['album']]);
 							if ($albums_handler->getCount($criteria)>0) {
 								$objects = $albums_handler->getObjects($criteria, false);
 								$abid = $objects[0]->getVar('aid');
@@ -275,18 +275,18 @@ 
 							} 								
 						}
 						$sid = 0;
-						if (strlen($_POST['songid'])>0&&!empty($data[$_POST['songid']])) {
-							$criteria = new Criteria('`songid`',  $data[$_POST['songid']]);
+						if (strlen($_POST['songid'])>0 && !empty($data[$_POST['songid']])) {
+							$criteria = new Criteria('`songid`', $data[$_POST['songid']]);
 							if ($songs_handler->getCount($criteria)>0) {
 								$objects = $songs_handler->getObjects($criteria, false);
 								$object = $objects[0]->getVar('sid');
 							} else {
 								$object = $songs_handler->create();
 							}
-							if ($object->getVar('cid')>0&&$cid>0) { $object->setVar('cid', $cid); } else { $object->setVar('cid', $cid); }
-							if ($object->getVar('gid')>0&&$gid>0) { $object->setVar('gid', $gid); } else { $object->setVar('gid', $gid); }
-							if (count($object->getVar('aids'))>0&&count($aids)>0) { $object->setVar('aids', $aids); } else { $object->setVar('aids', $aids); }
-							if ($object->getVar('abid')>0&&$abid>0) { $object->setVar('abid', $abid); } else { $object->setVar('abid', $abid); }
+							if ($object->getVar('cid')>0 && $cid>0) { $object->setVar('cid', $cid); } else { $object->setVar('cid', $cid); }
+							if ($object->getVar('gid')>0 && $gid>0) { $object->setVar('gid', $gid); } else { $object->setVar('gid', $gid); }
+							if (count($object->getVar('aids'))>0 && count($aids)>0) { $object->setVar('aids', $aids); } else { $object->setVar('aids', $aids); }
+							if ($object->getVar('abid')>0 && $abid>0) { $object->setVar('abid', $abid); } else { $object->setVar('abid', $abid); }
 							$object->setVar('songid', $data[$_POST['songid']]);
 							$object->setVar('title', $data[$_POST['title']]);
 							$object->setVar('lyrics', str_replace("\n", "<br/>\n", $data[$_POST['lyrics']]));

Braces +3 added lines, -2 removed lines

@@ -38,9 +38,10 @@
 				if (isset($_FILES['xmlfile'])&&!empty($_FILES['xmlfile']['title'])) {
 						
 					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);
 							}
 					}

htdocs/modules/songlist/admin/menu.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 $GLOBALS['songlistModule'] = $module_handler->getByDirname('songlist');
 $GLOBALS['songlistModuleConfig'] = $config_handler->getConfigList($GLOBALS['songlistModule']->getVar('mid')); 
 
-$i=0;
+$i = 0;
 $adminmenu[$i]['title'] = _MI_SONGLIST_ADMENU_DASHBOARD;
 $adminmenu[$i]['icon'] = '../../'.$GLOBALS['songlistModule']->getInfo('icons32').'/home.png';
 $adminmenu[$i]['image'] = '../../'.$GLOBALS['songlistModule']->getInfo('icons32').'/home.png';

htdocs/modules/songlist/admin/songs.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 "songs":
-		switch ($fct)
-		{
+		default:
+		case "songs":
+			switch ($fct)
+			{
 			default:
 			case "list":				
 				$indexAdmin = new ModuleAdmin();
@@ -224,7 +224,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_SONGS_DELETE, $songs->getVar('name')));
 				}
 				break;
-		}
+			}
 		break;
 				
 	}

Spacing +36 added lines, -36 removed lines

@@ -6,15 +6,15 @@ 
 	
 	xoops_cp_header();
 	
-	$op = isset($_REQUEST['op'])?$_REQUEST['op']:"songs";
-	$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'] : "songs";
+	$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 "songs":
 		switch ($fct)
@@ -24,18 +24,18 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 				
-				$songs_handler =& xoops_getmodulehandler('songs', 'songlist');
+				$songs_handler = & xoops_getmodulehandler('songs', 'songlist');
 					
 				$criteria = $songs_handler->getFilterCriteria($GLOBALS['filter']);
 				$ttl = $songs_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 ($songs_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', $songs_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', $songs_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']);
 					
 				$songss = $songs_handler->getObjects($criteria, true);
-				foreach($songss as $cid => $songs) {
+				foreach ($songss as $cid => $songs) {
 					if (is_object($songs))					
 						$GLOBALS['xoopsTpl']->append('songs', $songs->toArray());
 				}
@@ -66,9 +66,9 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 								
-				include_once $GLOBALS['xoops']->path( "/class/pagenav.php" );
+				include_once $GLOBALS['xoops']->path("/class/pagenav.php");
 				
-				$songs_handler =& xoops_getmodulehandler('songs', 'songlist');
+				$songs_handler = & xoops_getmodulehandler('songs', 'songlist');
 				if (isset($_REQUEST['id'])) {
 					$songs = $songs_handler->get(intval($_REQUEST['id']));
 				} else {
@@ -81,29 +81,29 @@ 
 				break;
 			case "save":
 
-				$songs_handler =& xoops_getmodulehandler('songs', 'songlist');
+				$songs_handler = & xoops_getmodulehandler('songs', 'songlist');
 				$extras_handler = xoops_getmodulehandler('extras', 'songlist');
-				$id=0;
-				if ($id=intval($_REQUEST['id'])) {
+				$id = 0;
+				if ($id = intval($_REQUEST['id'])) {
 					$songs = $songs_handler->get($id);
 				} else {
 					$songs = $songs_handler->create();
 				}
 				$songs->setVars($_POST[$id]);
 				
-				if (isset($_FILES['mp3'.$id])&&!empty($_FILES['mp3'.$id]['title'])) {
+				if (isset($_FILES['mp3'.$id]) && !empty($_FILES['mp3'.$id]['title'])) {
 						
 					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']), explode('|', $GLOBALS['songlistModuleConfig']['mp3_mimetype']), $GLOBALS['songlistModuleConfig']['mp3_filesize'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['mp3_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('mp3'.$id)) {
 						if (!$uploader->upload()) {
@@ -130,7 +130,7 @@ 
 						exit(0);
 					}
 				}
-				if (!$id=$songs_handler->insert($songs)) {
+				if (!$id = $songs_handler->insert($songs)) {
 					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_SONGS_FAILEDTOSAVE);
 					exit(0);
 				} else {
@@ -139,14 +139,14 @@ 
 					$extra->setVar('sid', $id);
 					$extras_handler->insert($extra);
 					
-					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($_POST['tags'], $id, $GLOBALS['songlistModule']->getVar("dirname"), $songs->getVar('cid'));
 					}
 					
 					
 					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_SONGS_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_SONGS_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_SONGS_SAVEDOKEY);
 					exit(0);
@@ -155,23 +155,23 @@ 
 			case "savelist":
 				print_r($_FILES);
 				exit;
-				$songs_handler =& xoops_getmodulehandler('songs', 'songlist');
-				foreach($_REQUEST['id'] as $id) {
+				$songs_handler = & xoops_getmodulehandler('songs', 'songlist');
+				foreach ($_REQUEST['id'] as $id) {
 					$songs = $songs_handler->get($id);
 					$songs->setVars($_POST[$id]);
-					if (isset($_FILES['mp3'.$id])&&!empty($_FILES['mp3'.$id]['title'])) {
+					if (isset($_FILES['mp3'.$id]) && !empty($_FILES['mp3'.$id]['title'])) {
 					
 						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']), explode('|', $GLOBALS['songlistModuleConfig']['mp3_mimetype']), $GLOBALS['songlistModuleConfig']['mp3_filesize'], 0, 0, explode('|', $GLOBALS['songlistModuleConfig']['mp3_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('mp3'.$id)) {
 							if (!$uploader->upload()) {
@@ -208,9 +208,9 @@ 
 				break;				
 			case "delete":	
 							
-				$songs_handler =& xoops_getmodulehandler('songs', 'songlist');
-				$id=0;
-				if (isset($_POST['id'])&&$id=intval($_POST['id'])) {
+				$songs_handler = & xoops_getmodulehandler('songs', 'songlist');
+				$id = 0;
+				if (isset($_POST['id']) && $id = intval($_POST['id'])) {
 					$songs = $songs_handler->get($id);
 					if (!$songs_handler->delete($songs)) {
 						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_SONGS_FAILEDTODELETE);

Braces +20 added lines, -14 removed lines

@@ -52,8 +52,9 @@ 
 					
 				$songss = $songs_handler->getObjects($criteria, true);
 				foreach($songss as $cid => $songs) {
-					if (is_object($songs))					
-						$GLOBALS['xoopsTpl']->append('songs', $songs->toArray());
+					if (is_object($songs)) {
+											$GLOBALS['xoopsTpl']->append('songs', $songs->toArray());
+					}
 				}
 				$GLOBALS['xoopsTpl']->assign('form', songlist_songs_get_form(false));
 				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['PHP_SELF']);
@@ -94,9 +95,10 @@ 
 				if (isset($_FILES['mp3'.$id])&&!empty($_FILES['mp3'.$id]['title'])) {
 						
 					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);
 						}
 					}
@@ -115,8 +117,9 @@ 
 							exit(0);
 						} else {
 								
-							if (strlen($songs->getVar('mp3')))
-								unlink($GLOBALS['xoops']->path($songs->getVar('path')).basename($songs->getVar('mp3')));
+							if (strlen($songs->getVar('mp3'))) {
+															unlink($GLOBALS['xoops']->path($songs->getVar('path')).basename($songs->getVar('mp3')));
+							}
 								
 							$songs->setVar('mp3', XOOPS_URL.'/'.str_replace(DS, '/', $GLOBALS['songlistModuleConfig']['upload_areas']).$uploader->getSavedFileName());
 								
@@ -145,10 +148,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_SONGS_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_SONGS_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_SONGS_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_SONGS_SAVEDOKEY);
+					}
 					exit(0);
 				}
 				break;
@@ -162,9 +166,10 @@ 
 					if (isset($_FILES['mp3'.$id])&&!empty($_FILES['mp3'.$id]['title'])) {
 					
 						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);
 							}
 						}
@@ -183,8 +188,9 @@ 
 								exit(0);
 							} else {
 					
-								if (strlen($songs->getVar('mp3')))
-									unlink($GLOBALS['xoops']->path($songs->getVar('path')).basename($songs->getVar('mp3')));
+								if (strlen($songs->getVar('mp3'))) {
+																	unlink($GLOBALS['xoops']->path($songs->getVar('path')).basename($songs->getVar('mp3')));
+								}
 					
 								$songs->setVar('mp3', XOOPS_URL.'/'.str_replace(DS, '/', $GLOBALS['songlistModuleConfig']['upload_areas']).$uploader->getSavedFileName());
 					

htdocs/modules/songlist/admin/field.php

Switch Indentation +235 added lines, -235 removed lines

@@ -8,289 +8,289 @@
 $op = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : (!empty($_REQUEST['id']) ? "edit" : 'list')));
 $field_handler = xoops_getmodulehandler('field', 'songlist');
 switch( $op ) {
-default:
-case "list":
-	$indexAdmin = new ModuleAdmin();
-	echo $indexAdmin->addNavigation(basename(__FILE__));
+	default:
+	case "list":
+		$indexAdmin = new ModuleAdmin();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
 
-	$fields = $field_handler->getObjects(NULL, false, false);
+		$fields = $field_handler->getObjects(NULL, false, false);
 
-	$module_handler = xoops_gethandler('module');
-	$modules = $module_handler->getObjects(null, true);
+		$module_handler = xoops_gethandler('module');
+		$modules = $module_handler->getObjects(null, true);
 
-	$categories = array();
-	$weights = array();
+		$categories = array();
+		$weights = array();
 	
-	$GLOBALS['categoryHandler'] = xoops_getmodulehandler('category');
-	$criteria = new CriteriaCompo();
-	$criteria->setSort('weight');
-	if ($categorys = $GLOBALS['categoryHandler']->getObjects($criteria, true)) {
-		unset($criteria);
+		$GLOBALS['categoryHandler'] = xoops_getmodulehandler('category');
+		$criteria = new CriteriaCompo();
+		$criteria->setSort('weight');
+		if ($categorys = $GLOBALS['categoryHandler']->getObjects($criteria, true)) {
+			unset($criteria);
 	
-		$categories[0] = array('cid' => 0, 'name' => _AM_SONGLIST_FIELDS_DEFAULT);
-		if ( count($categorys) > 0 ) {
-			foreach (array_keys($categorys) as $i ) {
-				$categories[$categorys[$i]->getVar('cid')] = array('cid' => $categorys[$i]->getVar('cid'), 'name' => $categorys[$i]->getVar('name'));
+			$categories[0] = array('cid' => 0, 'name' => _AM_SONGLIST_FIELDS_DEFAULT);
+			if ( count($categorys) > 0 ) {
+				foreach (array_keys($categorys) as $i ) {
+					$categories[$categorys[$i]->getVar('cid')] = array('cid' => $categorys[$i]->getVar('cid'), 'name' => $categorys[$i]->getVar('name'));
+				}
 			}
+			$GLOBALS['xoopsTpl']->assign('categories', $categories);
 		}
-		$GLOBALS['xoopsTpl']->assign('categories', $categories);
-	}
 	
-	$valuetypes = array(XOBJ_DTYPE_ARRAY => _AM_SONGLIST_FIELDS_ARRAY,
-						XOBJ_DTYPE_EMAIL => _AM_SONGLIST_FIELDS_EMAIL,
-						XOBJ_DTYPE_INT => _AM_SONGLIST_FIELDS_INT,
-						XOBJ_DTYPE_TXTAREA => _AM_SONGLIST_FIELDS_TXTAREA,
-						XOBJ_DTYPE_TXTBOX => _AM_SONGLIST_FIELDS_TXTBOX,
-						XOBJ_DTYPE_URL => _AM_SONGLIST_FIELDS_URL,
-						XOBJ_DTYPE_OTHER => _AM_SONGLIST_FIELDS_OTHER,
-						XOBJ_DTYPE_MTIME => _AM_SONGLIST_FIELDS_DATE);
+		$valuetypes = array(XOBJ_DTYPE_ARRAY => _AM_SONGLIST_FIELDS_ARRAY,
+							XOBJ_DTYPE_EMAIL => _AM_SONGLIST_FIELDS_EMAIL,
+							XOBJ_DTYPE_INT => _AM_SONGLIST_FIELDS_INT,
+							XOBJ_DTYPE_TXTAREA => _AM_SONGLIST_FIELDS_TXTAREA,
+							XOBJ_DTYPE_TXTBOX => _AM_SONGLIST_FIELDS_TXTBOX,
+							XOBJ_DTYPE_URL => _AM_SONGLIST_FIELDS_URL,
+							XOBJ_DTYPE_OTHER => _AM_SONGLIST_FIELDS_OTHER,
+							XOBJ_DTYPE_MTIME => _AM_SONGLIST_FIELDS_DATE);
 
-	$fieldtypes = array('checkbox' => _AM_SONGLIST_FIELDS_CHECKBOX,
-							'group' => _AM_SONGLIST_FIELDS_GROUP,
-							'group_multi' => _AM_SONGLIST_FIELDS_GROUPMULTI,
-							'language' => _AM_SONGLIST_FIELDS_LANGUAGE,
-							'radio' => _AM_SONGLIST_FIELDS_RADIO,
-							'select' => _AM_SONGLIST_FIELDS_SELECT,
-							'select_multi' => _AM_SONGLIST_FIELDS_SELECTMULTI,
-							'textarea' => _AM_SONGLIST_FIELDS_TEXTAREA,
-							'dhtml' => _AM_SONGLIST_FIELDS_DHTMLTEXTAREA,
-							'editor' => _AM_SONGLIST_FIELDS_EDITOR,
-							'textbox' => _AM_SONGLIST_FIELDS_TEXTBOX,
-							'timezone' => _AM_SONGLIST_FIELDS_TIMEZONE,
-							'yesno' => _AM_SONGLIST_FIELDS_YESNO,
-							'date' => _AM_SONGLIST_FIELDS_DATE,
-							'datetime' => _AM_SONGLIST_FIELDS_DATETIME,
-							'longdate' => _AM_SONGLIST_FIELDS_LONGDATE,
-							'theme' => _AM_SONGLIST_FIELDS_THEME,
-							'autotext' => _AM_SONGLIST_FIELDS_AUTOTEXT,
-							'rank' => _AM_SONGLIST_FIELDS_RANK);
+		$fieldtypes = array('checkbox' => _AM_SONGLIST_FIELDS_CHECKBOX,
+								'group' => _AM_SONGLIST_FIELDS_GROUP,
+								'group_multi' => _AM_SONGLIST_FIELDS_GROUPMULTI,
+								'language' => _AM_SONGLIST_FIELDS_LANGUAGE,
+								'radio' => _AM_SONGLIST_FIELDS_RADIO,
+								'select' => _AM_SONGLIST_FIELDS_SELECT,
+								'select_multi' => _AM_SONGLIST_FIELDS_SELECTMULTI,
+								'textarea' => _AM_SONGLIST_FIELDS_TEXTAREA,
+								'dhtml' => _AM_SONGLIST_FIELDS_DHTMLTEXTAREA,
+								'editor' => _AM_SONGLIST_FIELDS_EDITOR,
+								'textbox' => _AM_SONGLIST_FIELDS_TEXTBOX,
+								'timezone' => _AM_SONGLIST_FIELDS_TIMEZONE,
+								'yesno' => _AM_SONGLIST_FIELDS_YESNO,
+								'date' => _AM_SONGLIST_FIELDS_DATE,
+								'datetime' => _AM_SONGLIST_FIELDS_DATETIME,
+								'longdate' => _AM_SONGLIST_FIELDS_LONGDATE,
+								'theme' => _AM_SONGLIST_FIELDS_THEME,
+								'autotext' => _AM_SONGLIST_FIELDS_AUTOTEXT,
+								'rank' => _AM_SONGLIST_FIELDS_RANK);
 
-	foreach (array_keys($fields) as $i ) {
-		$fields[$i]['canEdit'] = $fields[$i]['field_config'] || $fields[$i]['field_show'] || $fields[$i]['field_edit'];
-		$fields[$i]['canDelete'] = $fields[$i]['field_config'];
-		$fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']];
-		$fields[$i]['valuetype'] = $valuetypes[$fields[$i]['field_valuetype']];
-		$fieldcategories[$i][] = $fields[$i];
-		$weights[$i] = $fields[$i]['field_weight'];
-	}
-	//sort fields order in categories
-	foreach (array_keys($fields) as $i ) {
-		array_multisort($weights[$i], SORT_ASC, array_keys($fieldcategories[$i]), SORT_ASC, $categories[$i]);
-	}
-	ksort($categories);
-	$GLOBALS['xoopsTpl']->assign('fieldcategories', $fieldcategories);
-	$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
-	$template_main = "songlist_cpanel_fieldlist.html";
-	break;
+		foreach (array_keys($fields) as $i ) {
+			$fields[$i]['canEdit'] = $fields[$i]['field_config'] || $fields[$i]['field_show'] || $fields[$i]['field_edit'];
+			$fields[$i]['canDelete'] = $fields[$i]['field_config'];
+			$fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']];
+			$fields[$i]['valuetype'] = $valuetypes[$fields[$i]['field_valuetype']];
+			$fieldcategories[$i][] = $fields[$i];
+			$weights[$i] = $fields[$i]['field_weight'];
+		}
+		//sort fields order in categories
+		foreach (array_keys($fields) as $i ) {
+			array_multisort($weights[$i], SORT_ASC, array_keys($fieldcategories[$i]), SORT_ASC, $categories[$i]);
+		}
+		ksort($categories);
+		$GLOBALS['xoopsTpl']->assign('fieldcategories', $fieldcategories);
+		$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
+		$template_main = "songlist_cpanel_fieldlist.html";
+		break;
 
-case "new":
+	case "new":
 
-	$indexAdmin = new ModuleAdmin();
-	echo $indexAdmin->addNavigation(basename(__FILE__));
-	$obj = $field_handler->create();
-	$form = songlist_getFieldForm($obj);
-	$form->display();
-	break;
+		$indexAdmin = new ModuleAdmin();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
+		$obj = $field_handler->create();
+		$form = songlist_getFieldForm($obj);
+		$form->display();
+		break;
 
-case "edit":
+	case "edit":
 
-	$indexAdmin = new ModuleAdmin();
-	echo $indexAdmin->addNavigation(basename(__FILE__));
-	$obj = $field_handler->get($_REQUEST['id']);
-	if ( !$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')  ) { //If no configs exist
-		redirect_header('field.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
-	}
-	$form = songlist_getFieldForm($obj);
-	$form->display();
-	break;
+		$indexAdmin = new ModuleAdmin();
+		echo $indexAdmin->addNavigation(basename(__FILE__));
+		$obj = $field_handler->get($_REQUEST['id']);
+		if ( !$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')  ) { //If no configs exist
+			redirect_header('field.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
+		}
+		$form = songlist_getFieldForm($obj);
+		$form->display();
+		break;
 
-case "reorder":
+	case "reorder":
 	
-	if ( !$GLOBALS['xoopsSecurity']->check()  ) {
-		redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
-	}
-
-	if ( isset($_POST['field_ids']) && count($_POST['field_ids']) > 0 ) {
-		$oldweight = $_POST['oldweight'];
-		$oldcat = $_POST['oldcat'];
-		$oldcategories = $_POST['oldcategories'];
-		$categories = $_POST['categories'];
-		$weight = $_POST['weight'];
-		$ids = array();
-		foreach ($_POST['field_ids'] as $field_id ) {
-			if ( $oldweight[$field_id] != $weight[$field_id] || $oldcat[$field_id] != $category[$field_id]  || count($oldcategories[$field_id]) != count(array_unique(array_merge($categories[$field_id], $oldcategories[$field_id]))) ) {
-				//if field has changed
-				$ids[] = intval($field_id);
-			}
+		if ( !$GLOBALS['xoopsSecurity']->check()  ) {
+			redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
 		}
-		if ( count($ids) > 0 ) {
-			$errors = array();
-			//if there are changed fields, fetch the fieldcategory objects
-			$field_handler = xoops_getmodulehandler('field');
-			$fields = $field_handler->getObjects(new Criteria('field_id', "(" . implode(',', $ids) . ")", "IN"), true);
-			foreach ($ids as $i ) {
-				$fields[$i]->setVar('field_weight', intval($weight[$i]) );
-				$fields[$i]->setVar('cids', $categories[$i] );
-				if ( !$field_handler->insert($fields[$i])  ) {
-					$errors = array_merge($errors, $fields[$i]->getErrors() );
+
+		if ( isset($_POST['field_ids']) && count($_POST['field_ids']) > 0 ) {
+			$oldweight = $_POST['oldweight'];
+			$oldcat = $_POST['oldcat'];
+			$oldcategories = $_POST['oldcategories'];
+			$categories = $_POST['categories'];
+			$weight = $_POST['weight'];
+			$ids = array();
+			foreach ($_POST['field_ids'] as $field_id ) {
+				if ( $oldweight[$field_id] != $weight[$field_id] || $oldcat[$field_id] != $category[$field_id]  || count($oldcategories[$field_id]) != count(array_unique(array_merge($categories[$field_id], $oldcategories[$field_id]))) ) {
+					//if field has changed
+					$ids[] = intval($field_id);
 				}
 			}
-			if ( count($errors) == 0 ) {
-				//no errors
-				redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS) );
-			} else {
-				redirect_header('field.php', 3, implode('<br />', $errors) );
+			if ( count($ids) > 0 ) {
+				$errors = array();
+				//if there are changed fields, fetch the fieldcategory objects
+				$field_handler = xoops_getmodulehandler('field');
+				$fields = $field_handler->getObjects(new Criteria('field_id', "(" . implode(',', $ids) . ")", "IN"), true);
+				foreach ($ids as $i ) {
+					$fields[$i]->setVar('field_weight', intval($weight[$i]) );
+					$fields[$i]->setVar('cids', $categories[$i] );
+					if ( !$field_handler->insert($fields[$i])  ) {
+						$errors = array_merge($errors, $fields[$i]->getErrors() );
+					}
+				}
+				if ( count($errors) == 0 ) {
+					//no errors
+					redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS) );
+				} else {
+					redirect_header('field.php', 3, implode('<br />', $errors) );
+				}
 			}
 		}
-	}
-	redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS) );
-	break;
+		redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS) );
+		break;
 
-case "save":
-	if ( !$GLOBALS['xoopsSecurity']->check()  ) {
-		redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
-	}
-	$redirect_to_edit = false;
-	if ( isset($_REQUEST['id'])  ) {
-		$obj = $field_handler->get($_REQUEST['id']);
-		if ( !$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')  ) { //If no configs exist
-			redirect_header('fields.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
-		}
-	} else {
-		$obj = $field_handler->create();
-		$obj->setVar('field_name', $_REQUEST['field_name']);
-		$obj->setVar('field_moduleid', $GLOBALS['songlistModule']->getVar('mid') );
-		$obj->setVar('field_show', 1);
-		$obj->setVar('field_edit', 1);
-		$obj->setVar('field_config', 1);
-		$redirect_to_edit = true;
-	}
-	$obj->setVar('field_title', $_REQUEST['field_title']);
-	$obj->setVar('field_description', $_REQUEST['field_description']);
-	if ( $obj->getVar('field_config')  ) {
-		$obj->setVar('field_type', $_REQUEST['field_type']);
-		if ( isset($_REQUEST['field_valuetype'])  ) {
-			$obj->setVar('field_valuetype', $_REQUEST['field_valuetype']);
+	case "save":
+		if ( !$GLOBALS['xoopsSecurity']->check()  ) {
+			redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
 		}
-		$options = $obj->getVar('field_options');
-		
-		if ( isset($_REQUEST['removeOptions']) && is_array($_REQUEST['removeOptions'])  ) {
-			foreach ($_REQUEST['removeOptions'] as $index ) {
-				unset($options[$index]);
+		$redirect_to_edit = false;
+		if ( isset($_REQUEST['id'])  ) {
+			$obj = $field_handler->get($_REQUEST['id']);
+			if ( !$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')  ) { //If no configs exist
+				redirect_header('fields.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
 			}
+		} else {
+			$obj = $field_handler->create();
+			$obj->setVar('field_name', $_REQUEST['field_name']);
+			$obj->setVar('field_moduleid', $GLOBALS['songlistModule']->getVar('mid') );
+			$obj->setVar('field_show', 1);
+			$obj->setVar('field_edit', 1);
+			$obj->setVar('field_config', 1);
 			$redirect_to_edit = true;
 		}
+		$obj->setVar('field_title', $_REQUEST['field_title']);
+		$obj->setVar('field_description', $_REQUEST['field_description']);
+		if ( $obj->getVar('field_config')  ) {
+			$obj->setVar('field_type', $_REQUEST['field_type']);
+			if ( isset($_REQUEST['field_valuetype'])  ) {
+				$obj->setVar('field_valuetype', $_REQUEST['field_valuetype']);
+			}
+			$options = $obj->getVar('field_options');
 		
-		if ( !empty($_REQUEST['addOption'])  ) {
-			foreach ($_REQUEST['addOption'] as $option ) {
-				if ( empty($option['value']) ) continue;
-				$options[$option['key']] = $option['value'];
+			if ( isset($_REQUEST['removeOptions']) && is_array($_REQUEST['removeOptions'])  ) {
+				foreach ($_REQUEST['removeOptions'] as $index ) {
+					unset($options[$index]);
+				}
 				$redirect_to_edit = true;
 			}
+		
+			if ( !empty($_REQUEST['addOption'])  ) {
+				foreach ($_REQUEST['addOption'] as $option ) {
+					if ( empty($option['value']) ) continue;
+					$options[$option['key']] = $option['value'];
+					$redirect_to_edit = true;
+				}
+			}
+			$obj->setVar('field_options', $options);
 		}
-		$obj->setVar('field_options', $options);
-	}
-	if ( $obj->getVar('field_edit')  ) {
-		$required = isset($_REQUEST['field_required']) ? $_REQUEST['field_required'] : 0;
-		$obj->setVar('field_required', $required); //0 = no, 1 = yes
-		if ( isset($_REQUEST['field_maxlength'])  ) {
-			$obj->setVar('field_maxlength', $_REQUEST['field_maxlength']);
-		}
-		if ( isset($_REQUEST['field_default'])  ) {
-			$field_default = $obj->getValueForSave($_REQUEST['field_default']);
-			//Check for multiple selections
-			if ( is_array($field_default)  ) {
-				$obj->setVar('field_default', serialize($field_default) );
-			} else {
-				$obj->setVar('field_default', $field_default);
+		if ( $obj->getVar('field_edit')  ) {
+			$required = isset($_REQUEST['field_required']) ? $_REQUEST['field_required'] : 0;
+			$obj->setVar('field_required', $required); //0 = no, 1 = yes
+			if ( isset($_REQUEST['field_maxlength'])  ) {
+				$obj->setVar('field_maxlength', $_REQUEST['field_maxlength']);
+			}
+			if ( isset($_REQUEST['field_default'])  ) {
+				$field_default = $obj->getValueForSave($_REQUEST['field_default']);
+				//Check for multiple selections
+				if ( is_array($field_default)  ) {
+					$obj->setVar('field_default', serialize($field_default) );
+				} else {
+					$obj->setVar('field_default', $field_default);
+				}
 			}
 		}
-	}
 
-	$obj->setVar('field_weight', $_REQUEST['field_weight']);
-	$obj->setVar('cids', $_REQUEST['cids']);
+		$obj->setVar('field_weight', $_REQUEST['field_weight']);
+		$obj->setVar('cids', $_REQUEST['cids']);
 
-	if ( $field_handler->insert($obj)  ) {
+		if ( $field_handler->insert($obj)  ) {
 	
-		$groupperm_handler = xoops_gethandler('groupperm');
+			$groupperm_handler = xoops_gethandler('groupperm');
 
-		$perm_arr = array();
-		if ( $obj->getVar('field_show')  ) {
-			$perm_arr[] = 'songlist_show';
-			$perm_arr[] = 'songlist_visible';
-		}
-		if ( $obj->getVar('field_edit')  ) {
-			$perm_arr[] = 'songlist_edit';
-		}
-		if ( $obj->getVar('field_edit') || $obj->getVar('field_show')  ) {
-			$perm_arr[] = 'songlist_search';
-		}
-		if ( count($perm_arr) > 0 ) {
-			foreach ($perm_arr as $perm ) {
-				$criteria = new CriteriaCompo(new Criteria('gperm_name', $perm) );
-				$criteria->add(new Criteria('gperm_itemid', intval($obj->getVar('field_id') )) );
-				$criteria->add(new Criteria('gperm_modid', intval($GLOBALS['songlistModule']->getVar('mid') )) );
-				if ( isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm])  ) {
-					$perms = $groupperm_handler->getObjects($criteria);
-					if ( count($perms) > 0 ) {
-						foreach (array_keys($perms) as $i ) {
-							$groups[$perms[$i]->getVar('gperm_groupid')] = $perms[$i];
+			$perm_arr = array();
+			if ( $obj->getVar('field_show')  ) {
+				$perm_arr[] = 'songlist_show';
+				$perm_arr[] = 'songlist_visible';
+			}
+			if ( $obj->getVar('field_edit')  ) {
+				$perm_arr[] = 'songlist_edit';
+			}
+			if ( $obj->getVar('field_edit') || $obj->getVar('field_show')  ) {
+				$perm_arr[] = 'songlist_search';
+			}
+			if ( count($perm_arr) > 0 ) {
+				foreach ($perm_arr as $perm ) {
+					$criteria = new CriteriaCompo(new Criteria('gperm_name', $perm) );
+					$criteria->add(new Criteria('gperm_itemid', intval($obj->getVar('field_id') )) );
+					$criteria->add(new Criteria('gperm_modid', intval($GLOBALS['songlistModule']->getVar('mid') )) );
+					if ( isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm])  ) {
+						$perms = $groupperm_handler->getObjects($criteria);
+						if ( count($perms) > 0 ) {
+							foreach (array_keys($perms) as $i ) {
+								$groups[$perms[$i]->getVar('gperm_groupid')] = $perms[$i];
+							}
+						} else {
+							$groups = array();
 						}
-					} else {
-						$groups = array();
-					}
-					foreach ($_REQUEST[$perm] as $grouoid ) {
-						$grouoid = intval($grouoid);
-						if ( !isset($groups[$grouoid])  ) {
-							$perm_obj = $groupperm_handler->create();
-							$perm_obj->setVar('gperm_name', $perm);
-							$perm_obj->setVar('gperm_itemid', intval($obj->getVar('field_id') ));
-							$perm_obj->setVar('gperm_modid', $GLOBALS['songlistModule']->getVar('mid') );
-							$perm_obj->setVar('gperm_groupid', $grouoid);
-							$groupperm_handler->insert($perm_obj);
-							unset($perm_obj);
+						foreach ($_REQUEST[$perm] as $grouoid ) {
+							$grouoid = intval($grouoid);
+							if ( !isset($groups[$grouoid])  ) {
+								$perm_obj = $groupperm_handler->create();
+								$perm_obj->setVar('gperm_name', $perm);
+								$perm_obj->setVar('gperm_itemid', intval($obj->getVar('field_id') ));
+								$perm_obj->setVar('gperm_modid', $GLOBALS['songlistModule']->getVar('mid') );
+								$perm_obj->setVar('gperm_groupid', $grouoid);
+								$groupperm_handler->insert($perm_obj);
+								unset($perm_obj);
+							}
 						}
-					}
-					$removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]);
-					if ( count($removed_groups) > 0 ) {
-						$criteria->add(new Criteria('gperm_groupid', "(".implode(',', $removed_groups).")", "IN") );
+						$removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]);
+						if ( count($removed_groups) > 0 ) {
+							$criteria->add(new Criteria('gperm_groupid', "(".implode(',', $removed_groups).")", "IN") );
+							$groupperm_handler->deleteAll($criteria);
+						}
+						unset($groups);
+
+					} else {
 						$groupperm_handler->deleteAll($criteria);
 					}
-					unset($groups);
-
-				} else {
-					$groupperm_handler->deleteAll($criteria);
+					unset($criteria);
 				}
-				unset($criteria);
 			}
+			$url = $redirect_to_edit ? 'field.php?op=edit&amp;id=' . $obj->getVar('field_id') : 'field.php';
+			redirect_header($url, 3, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD) );
 		}
-		$url = $redirect_to_edit ? 'field.php?op=edit&amp;id=' . $obj->getVar('field_id') : 'field.php';
-		redirect_header($url, 3, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD) );
-	}
 	
-	echo $obj->getHtmlErrors();
-	$form = songlist_getFieldForm($obj);
-	$form->display();
-	break;
+		echo $obj->getHtmlErrors();
+		$form = songlist_getFieldForm($obj);
+		$form->display();
+		break;
 
-case "delete":
-	$obj = $field_handler->get($_REQUEST['id']);
-	if ( !$obj->getVar('field_config')  ) {
-		redirect_header('index.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
-	}
-	if ( isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1 ) {
-		if ( !$GLOBALS['xoopsSecurity']->check()  ) {
-			redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+	case "delete":
+		$obj = $field_handler->get($_REQUEST['id']);
+		if ( !$obj->getVar('field_config')  ) {
+			redirect_header('index.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
 		}
-		if ( $field_handler->delete($obj)  ) {
-			redirect_header('field.php', 3, sprintf(_AM_SONGLIST_FIELDS_DELETEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD) );
+		if ( isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1 ) {
+			if ( !$GLOBALS['xoopsSecurity']->check()  ) {
+				redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+			}
+			if ( $field_handler->delete($obj)  ) {
+				redirect_header('field.php', 3, sprintf(_AM_SONGLIST_FIELDS_DELETEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD) );
+			} else {
+				echo $obj->getHtmlErrors();
+			}
 		} else {
-			echo $obj->getHtmlErrors();
+			xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_SONGLIST_FIELDS_RUSUREDEL, $obj->getVar('field_title') ));
 		}
-	} else {
-		xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_SONGLIST_FIELDS_RUSUREDEL, $obj->getVar('field_title') ));
-	}
-	break;
+		break;
 }
 
 if ( isset($template_main)  ) {

Spacing +68 added lines, -68 removed lines

@@ -7,7 +7,7 @@ 
 
 $op = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : (!empty($_REQUEST['id']) ? "edit" : 'list')));
 $field_handler = xoops_getmodulehandler('field', 'songlist');
-switch( $op ) {
+switch ($op) {
 default:
 case "list":
 	$indexAdmin = new ModuleAdmin();
@@ -28,8 +28,8 @@ 
 		unset($criteria);
 	
 		$categories[0] = array('cid' => 0, 'name' => _AM_SONGLIST_FIELDS_DEFAULT);
-		if ( count($categorys) > 0 ) {
-			foreach (array_keys($categorys) as $i ) {
+		if (count($categorys)>0) {
+			foreach (array_keys($categorys) as $i) {
 				$categories[$categorys[$i]->getVar('cid')] = array('cid' => $categorys[$i]->getVar('cid'), 'name' => $categorys[$i]->getVar('name'));
 			}
 		}
@@ -65,7 +65,7 @@ 
 							'autotext' => _AM_SONGLIST_FIELDS_AUTOTEXT,
 							'rank' => _AM_SONGLIST_FIELDS_RANK);
 
-	foreach (array_keys($fields) as $i ) {
+	foreach (array_keys($fields) as $i) {
 		$fields[$i]['canEdit'] = $fields[$i]['field_config'] || $fields[$i]['field_show'] || $fields[$i]['field_edit'];
 		$fields[$i]['canDelete'] = $fields[$i]['field_config'];
 		$fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']];
@@ -74,12 +74,12 @@ 
 		$weights[$i] = $fields[$i]['field_weight'];
 	}
 	//sort fields order in categories
-	foreach (array_keys($fields) as $i ) {
+	foreach (array_keys($fields) as $i) {
 		array_multisort($weights[$i], SORT_ASC, array_keys($fieldcategories[$i]), SORT_ASC, $categories[$i]);
 	}
 	ksort($categories);
 	$GLOBALS['xoopsTpl']->assign('fieldcategories', $fieldcategories);
-	$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
+	$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML());
 	$template_main = "songlist_cpanel_fieldlist.html";
 	break;
 
@@ -97,7 +97,7 @@ 
 	$indexAdmin = new ModuleAdmin();
 	echo $indexAdmin->addNavigation(basename(__FILE__));
 	$obj = $field_handler->get($_REQUEST['id']);
-	if ( !$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')  ) { //If no configs exist
+	if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
 		redirect_header('field.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
 	}
 	$form = songlist_getFieldForm($obj);
@@ -106,60 +106,60 @@ 
 
 case "reorder":
 	
-	if ( !$GLOBALS['xoopsSecurity']->check()  ) {
-		redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+	if (!$GLOBALS['xoopsSecurity']->check()) {
+		redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
 	}
 
-	if ( isset($_POST['field_ids']) && count($_POST['field_ids']) > 0 ) {
+	if (isset($_POST['field_ids']) && count($_POST['field_ids'])>0) {
 		$oldweight = $_POST['oldweight'];
 		$oldcat = $_POST['oldcat'];
 		$oldcategories = $_POST['oldcategories'];
 		$categories = $_POST['categories'];
 		$weight = $_POST['weight'];
 		$ids = array();
-		foreach ($_POST['field_ids'] as $field_id ) {
-			if ( $oldweight[$field_id] != $weight[$field_id] || $oldcat[$field_id] != $category[$field_id]  || count($oldcategories[$field_id]) != count(array_unique(array_merge($categories[$field_id], $oldcategories[$field_id]))) ) {
+		foreach ($_POST['field_ids'] as $field_id) {
+			if ($oldweight[$field_id]!=$weight[$field_id] || $oldcat[$field_id]!=$category[$field_id] || count($oldcategories[$field_id])!=count(array_unique(array_merge($categories[$field_id], $oldcategories[$field_id])))) {
 				//if field has changed
 				$ids[] = intval($field_id);
 			}
 		}
-		if ( count($ids) > 0 ) {
+		if (count($ids)>0) {
 			$errors = array();
 			//if there are changed fields, fetch the fieldcategory objects
 			$field_handler = xoops_getmodulehandler('field');
-			$fields = $field_handler->getObjects(new Criteria('field_id', "(" . implode(',', $ids) . ")", "IN"), true);
-			foreach ($ids as $i ) {
-				$fields[$i]->setVar('field_weight', intval($weight[$i]) );
-				$fields[$i]->setVar('cids', $categories[$i] );
-				if ( !$field_handler->insert($fields[$i])  ) {
-					$errors = array_merge($errors, $fields[$i]->getErrors() );
+			$fields = $field_handler->getObjects(new Criteria('field_id', "(".implode(',', $ids).")", "IN"), true);
+			foreach ($ids as $i) {
+				$fields[$i]->setVar('field_weight', intval($weight[$i]));
+				$fields[$i]->setVar('cids', $categories[$i]);
+				if (!$field_handler->insert($fields[$i])) {
+					$errors = array_merge($errors, $fields[$i]->getErrors());
 				}
 			}
-			if ( count($errors) == 0 ) {
+			if (count($errors)==0) {
 				//no errors
-				redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS) );
+				redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
 			} else {
-				redirect_header('field.php', 3, implode('<br />', $errors) );
+				redirect_header('field.php', 3, implode('<br />', $errors));
 			}
 		}
 	}
-	redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS) );
+	redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
 	break;
 
 case "save":
-	if ( !$GLOBALS['xoopsSecurity']->check()  ) {
-		redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+	if (!$GLOBALS['xoopsSecurity']->check()) {
+		redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
 	}
 	$redirect_to_edit = false;
-	if ( isset($_REQUEST['id'])  ) {
+	if (isset($_REQUEST['id'])) {
 		$obj = $field_handler->get($_REQUEST['id']);
-		if ( !$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')  ) { //If no configs exist
+		if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
 			redirect_header('fields.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
 		}
 	} else {
 		$obj = $field_handler->create();
 		$obj->setVar('field_name', $_REQUEST['field_name']);
-		$obj->setVar('field_moduleid', $GLOBALS['songlistModule']->getVar('mid') );
+		$obj->setVar('field_moduleid', $GLOBALS['songlistModule']->getVar('mid'));
 		$obj->setVar('field_show', 1);
 		$obj->setVar('field_edit', 1);
 		$obj->setVar('field_config', 1);
@@ -167,40 +167,40 @@ 
 	}
 	$obj->setVar('field_title', $_REQUEST['field_title']);
 	$obj->setVar('field_description', $_REQUEST['field_description']);
-	if ( $obj->getVar('field_config')  ) {
+	if ($obj->getVar('field_config')) {
 		$obj->setVar('field_type', $_REQUEST['field_type']);
-		if ( isset($_REQUEST['field_valuetype'])  ) {
+		if (isset($_REQUEST['field_valuetype'])) {
 			$obj->setVar('field_valuetype', $_REQUEST['field_valuetype']);
 		}
 		$options = $obj->getVar('field_options');
 		
-		if ( isset($_REQUEST['removeOptions']) && is_array($_REQUEST['removeOptions'])  ) {
-			foreach ($_REQUEST['removeOptions'] as $index ) {
+		if (isset($_REQUEST['removeOptions']) && is_array($_REQUEST['removeOptions'])) {
+			foreach ($_REQUEST['removeOptions'] as $index) {
 				unset($options[$index]);
 			}
 			$redirect_to_edit = true;
 		}
 		
-		if ( !empty($_REQUEST['addOption'])  ) {
-			foreach ($_REQUEST['addOption'] as $option ) {
-				if ( empty($option['value']) ) continue;
+		if (!empty($_REQUEST['addOption'])) {
+			foreach ($_REQUEST['addOption'] as $option) {
+				if (empty($option['value'])) continue;
 				$options[$option['key']] = $option['value'];
 				$redirect_to_edit = true;
 			}
 		}
 		$obj->setVar('field_options', $options);
 	}
-	if ( $obj->getVar('field_edit')  ) {
+	if ($obj->getVar('field_edit')) {
 		$required = isset($_REQUEST['field_required']) ? $_REQUEST['field_required'] : 0;
 		$obj->setVar('field_required', $required); //0 = no, 1 = yes
-		if ( isset($_REQUEST['field_maxlength'])  ) {
+		if (isset($_REQUEST['field_maxlength'])) {
 			$obj->setVar('field_maxlength', $_REQUEST['field_maxlength']);
 		}
-		if ( isset($_REQUEST['field_default'])  ) {
+		if (isset($_REQUEST['field_default'])) {
 			$field_default = $obj->getValueForSave($_REQUEST['field_default']);
 			//Check for multiple selections
-			if ( is_array($field_default)  ) {
-				$obj->setVar('field_default', serialize($field_default) );
+			if (is_array($field_default)) {
+				$obj->setVar('field_default', serialize($field_default));
 			} else {
 				$obj->setVar('field_default', $field_default);
 			}
@@ -210,50 +210,50 @@ 
 	$obj->setVar('field_weight', $_REQUEST['field_weight']);
 	$obj->setVar('cids', $_REQUEST['cids']);
 
-	if ( $field_handler->insert($obj)  ) {
+	if ($field_handler->insert($obj)) {
 	
 		$groupperm_handler = xoops_gethandler('groupperm');
 
 		$perm_arr = array();
-		if ( $obj->getVar('field_show')  ) {
+		if ($obj->getVar('field_show')) {
 			$perm_arr[] = 'songlist_show';
 			$perm_arr[] = 'songlist_visible';
 		}
-		if ( $obj->getVar('field_edit')  ) {
+		if ($obj->getVar('field_edit')) {
 			$perm_arr[] = 'songlist_edit';
 		}
-		if ( $obj->getVar('field_edit') || $obj->getVar('field_show')  ) {
+		if ($obj->getVar('field_edit') || $obj->getVar('field_show')) {
 			$perm_arr[] = 'songlist_search';
 		}
-		if ( count($perm_arr) > 0 ) {
-			foreach ($perm_arr as $perm ) {
-				$criteria = new CriteriaCompo(new Criteria('gperm_name', $perm) );
-				$criteria->add(new Criteria('gperm_itemid', intval($obj->getVar('field_id') )) );
-				$criteria->add(new Criteria('gperm_modid', intval($GLOBALS['songlistModule']->getVar('mid') )) );
-				if ( isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm])  ) {
+		if (count($perm_arr)>0) {
+			foreach ($perm_arr as $perm) {
+				$criteria = new CriteriaCompo(new Criteria('gperm_name', $perm));
+				$criteria->add(new Criteria('gperm_itemid', intval($obj->getVar('field_id'))));
+				$criteria->add(new Criteria('gperm_modid', intval($GLOBALS['songlistModule']->getVar('mid'))));
+				if (isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm])) {
 					$perms = $groupperm_handler->getObjects($criteria);
-					if ( count($perms) > 0 ) {
-						foreach (array_keys($perms) as $i ) {
+					if (count($perms)>0) {
+						foreach (array_keys($perms) as $i) {
 							$groups[$perms[$i]->getVar('gperm_groupid')] = $perms[$i];
 						}
 					} else {
 						$groups = array();
 					}
-					foreach ($_REQUEST[$perm] as $grouoid ) {
+					foreach ($_REQUEST[$perm] as $grouoid) {
 						$grouoid = intval($grouoid);
-						if ( !isset($groups[$grouoid])  ) {
+						if (!isset($groups[$grouoid])) {
 							$perm_obj = $groupperm_handler->create();
 							$perm_obj->setVar('gperm_name', $perm);
-							$perm_obj->setVar('gperm_itemid', intval($obj->getVar('field_id') ));
-							$perm_obj->setVar('gperm_modid', $GLOBALS['songlistModule']->getVar('mid') );
+							$perm_obj->setVar('gperm_itemid', intval($obj->getVar('field_id')));
+							$perm_obj->setVar('gperm_modid', $GLOBALS['songlistModule']->getVar('mid'));
 							$perm_obj->setVar('gperm_groupid', $grouoid);
 							$groupperm_handler->insert($perm_obj);
 							unset($perm_obj);
 						}
 					}
 					$removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]);
-					if ( count($removed_groups) > 0 ) {
-						$criteria->add(new Criteria('gperm_groupid', "(".implode(',', $removed_groups).")", "IN") );
+					if (count($removed_groups)>0) {
+						$criteria->add(new Criteria('gperm_groupid', "(".implode(',', $removed_groups).")", "IN"));
 						$groupperm_handler->deleteAll($criteria);
 					}
 					unset($groups);
@@ -264,8 +264,8 @@ 
 				unset($criteria);
 			}
 		}
-		$url = $redirect_to_edit ? 'field.php?op=edit&amp;id=' . $obj->getVar('field_id') : 'field.php';
-		redirect_header($url, 3, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD) );
+		$url = $redirect_to_edit ? 'field.php?op=edit&amp;id='.$obj->getVar('field_id') : 'field.php';
+		redirect_header($url, 3, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
 	}
 	
 	echo $obj->getHtmlErrors();
@@ -275,25 +275,25 @@ 
 
 case "delete":
 	$obj = $field_handler->get($_REQUEST['id']);
-	if ( !$obj->getVar('field_config')  ) {
+	if (!$obj->getVar('field_config')) {
 		redirect_header('index.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
 	}
-	if ( isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1 ) {
-		if ( !$GLOBALS['xoopsSecurity']->check()  ) {
-			redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+	if (isset($_REQUEST['ok']) && $_REQUEST['ok']==1) {
+		if (!$GLOBALS['xoopsSecurity']->check()) {
+			redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
 		}
-		if ( $field_handler->delete($obj)  ) {
-			redirect_header('field.php', 3, sprintf(_AM_SONGLIST_FIELDS_DELETEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD) );
+		if ($field_handler->delete($obj)) {
+			redirect_header('field.php', 3, sprintf(_AM_SONGLIST_FIELDS_DELETEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
 		} else {
 			echo $obj->getHtmlErrors();
 		}
 	} else {
-		xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_SONGLIST_FIELDS_RUSUREDEL, $obj->getVar('field_title') ));
+		xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_SONGLIST_FIELDS_RUSUREDEL, $obj->getVar('field_title')));
 	}
 	break;
 }
 
-if ( isset($template_main)  ) {
+if (isset($template_main)) {
 	$GLOBALS['xoopsTpl']->display("db:{$template_main}");
 }
 

Braces +3 added lines, -1 removed lines

@@ -183,7 +183,9 @@
 		
 		if ( !empty($_REQUEST['addOption'])  ) {
 			foreach ($_REQUEST['addOption'] as $option ) {
-				if ( empty($option['value']) ) continue;
+				if ( empty($option['value']) ) {
+					continue;
+				}
 				$options[$option['key']] = $option['value'];
 				$redirect_to_edit = true;
 			}

htdocs/modules/songlist/admin/voice.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 "voice":
-		switch ($fct)
-		{
+		default:
+		case "voice":
+			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_VOICE_DELETE, $voice->getVar('name')));
 				}
 				break;
-		}
+			}
 		break;
 				
 	}

Spacing +24 added lines, -24 removed lines

@@ -6,15 +6,15 @@ 
 	
 	xoops_cp_header();
 	
-	$op = isset($_REQUEST['op'])?$_REQUEST['op']:"voice";
-	$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'] : "voice";
+	$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 "voice":
 		switch ($fct)
@@ -24,18 +24,18 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 				
-				$voice_handler =& xoops_getmodulehandler('voice', 'songlist');
+				$voice_handler = & xoops_getmodulehandler('voice', 'songlist');
 					
 				$criteria = $voice_handler->getFilterCriteria($GLOBALS['filter']);
 				$ttl = $voice_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 ($voice_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', $voice_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', $voice_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']);
 					
 				$voices = $voice_handler->getObjects($criteria, true);
-				foreach($voices as $cid => $voice) {
+				foreach ($voices as $cid => $voice) {
 					if (is_object($voice))					
 						$GLOBALS['xoopsTpl']->append('voice', $voice->toArray());
 				}
@@ -66,7 +66,7 @@ 
 				$indexAdmin = new ModuleAdmin();
 				echo $indexAdmin->addNavigation(basename(__FILE__));
 											
-				$voice_handler =& xoops_getmodulehandler('voice', 'songlist');
+				$voice_handler = & xoops_getmodulehandler('voice', 'songlist');
 				if (isset($_REQUEST['id'])) {
 					$voice = $voice_handler->get(intval($_REQUEST['id']));
 				} else {
@@ -79,21 +79,21 @@ 
 				break;
 			case "save":
 				
-				$voice_handler =& xoops_getmodulehandler('voice', 'songlist');
-				$id=0;
-				if ($id=intval($_REQUEST['id'])) {
+				$voice_handler = & xoops_getmodulehandler('voice', 'songlist');
+				$id = 0;
+				if ($id = intval($_REQUEST['id'])) {
 					$voice = $voice_handler->get($id);
 				} else {
 					$voice = $voice_handler->create();
 				}
 				$voice->setVars($_POST[$id]);
 				
-				if (!$id=$voice_handler->insert($voice)) {
+				if (!$id = $voice_handler->insert($voice)) {
 					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_VOICE_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_VOICE_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_VOICE_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_VOICE_SAVEDOKEY);
 					exit(0);
@@ -101,8 +101,8 @@ 
 				break;
 			case "savelist":
 				
-				$voice_handler =& xoops_getmodulehandler('voice', 'songlist');
-				foreach($_REQUEST['id'] as $id) {
+				$voice_handler = & xoops_getmodulehandler('voice', 'songlist');
+				foreach ($_REQUEST['id'] as $id) {
 					$voice = $voice_handler->get($id);
 					$voice->setVars($_POST[$id]);
 					if (!$voice_handler->insert($voice)) {
@@ -115,9 +115,9 @@ 
 				break;				
 			case "delete":	
 							
-				$voice_handler =& xoops_getmodulehandler('voice', 'songlist');
-				$id=0;
-				if (isset($_POST['id'])&&$id=intval($_POST['id'])) {
+				$voice_handler = & xoops_getmodulehandler('voice', 'songlist');
+				$id = 0;
+				if (isset($_POST['id']) && $id = intval($_POST['id'])) {
 					$voice = $voice_handler->get($id);
 					if (!$voice_handler->delete($voice)) {
 						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_VOICE_FAILEDTODELETE);

Braces +8 added lines, -6 removed lines

@@ -52,8 +52,9 @@ 
 					
 				$voices = $voice_handler->getObjects($criteria, true);
 				foreach($voices as $cid => $voice) {
-					if (is_object($voice))					
-						$GLOBALS['xoopsTpl']->append('voice', $voice->toArray());
+					if (is_object($voice)) {
+											$GLOBALS['xoopsTpl']->append('voice', $voice->toArray());
+					}
 				}
 				$GLOBALS['xoopsTpl']->assign('form', songlist_voice_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_VOICE_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_VOICE_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_VOICE_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_VOICE_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_VOICE_SAVEDOKEY);
+					}
 					exit(0);
 				}
 				break;