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');

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;
 				
 	}

htdocs/modules/songlist/admin/albums.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 "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;
 				
 	}

htdocs/modules/songlist/admin/export.php

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

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;
 				
 	}

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

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;
 				
 	}

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

htdocs/modules/songlist/admin/artists.php

Switch Indentation +5 added lines, -5 removed lines

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