Inspection of "Merge branch 'master' of https://github.com/mambax..." - XoopsModules25x/songlist - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( ed55b2...84c1d9 )

by Michael

created 2022-07-03 19:24 UTC

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 
 $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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 }
 
 $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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 		'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));
 				}
 			}
 	}

Please login to merge, or discard this patch.

htdocs/modules/songlist/admin/genre.php 1 patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -6,15 +6,15 @@  discard block
 block discarded – undo
 	
 	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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 				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);

Please login to merge, or discard this patch.

htdocs/modules/songlist/admin/header.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -33,9 +33,9 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	
 	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();
 	}
 

Please login to merge, or discard this patch.

htdocs/modules/songlist/admin/albums.php 1 patch

Spacing +29 added lines, -29 removed lines patch added patch discarded remove patch

@@ -6,15 +6,15 @@  discard block
 block discarded – undo
 	
 	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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 						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 @@  discard block
 block discarded – undo
 					}
 					
 					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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 				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);

Please login to merge, or discard this patch.

htdocs/modules/songlist/admin/export.php 1 patch

Spacing +51 added lines, -51 removed lines patch added patch discarded remove patch

@@ -6,15 +6,15 @@  discard block
 block discarded – undo
 	
 	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 @@  discard block
 block discarded – undo
 				
 			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 @@  discard block
 block discarded – undo
 					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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 							}	
 
 							$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 @@  discard block
 block discarded – undo
 							}								
 							
 							$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 @@  discard block
 block discarded – undo
 								} 								
 							}
 							$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 @@  discard block
 block discarded – undo
 								} 								
 							}
 							$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 @@  discard block
 block discarded – undo
 								} 								
 							}
 							$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 @@  discard block
 block discarded – undo
 				} 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 @@  discard block
 block discarded – undo
 							} 								
 						}	
 						$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 @@  discard block
 block discarded – undo
 							} 								
 						}						
 						$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 @@  discard block
 block discarded – undo
 							} 								
 						}
 						$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 @@  discard block
 block discarded – undo
 							} 								
 						}
 						$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 @@  discard block
 block discarded – undo
 							} 								
 						}
 						$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']]));

Please login to merge, or discard this patch.

htdocs/modules/songlist/admin/menu.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@
 block discarded – undo
 $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';

Please login to merge, or discard this patch.

htdocs/modules/songlist/admin/songs.php 1 patch

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch

@@ -6,15 +6,15 @@  discard block
 block discarded – undo
 	
 	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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 						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 @@  discard block
 block discarded – undo
 					$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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 				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);

Please login to merge, or discard this patch.

htdocs/modules/songlist/admin/field.php 1 patch

Spacing +68 added lines, -68 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@  discard block
 block discarded – undo
 
 $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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 							'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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
 	}
 	$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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 
 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}");
 }
 

Please login to merge, or discard this patch.

htdocs/modules/songlist/admin/voice.php 1 patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -6,15 +6,15 @@  discard block
 block discarded – undo
 	
 	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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 				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);

Please login to merge, or discard this patch.

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21
22	22	$op = $op = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : "edit"));
23	23
24		-include_once $GLOBALS['xoops']->path( "/class/xoopsformloader.php" );
	24	+include_once $GLOBALS['xoops']->path("/class/xoopsformloader.php");
25	25	$opform = new XoopsSimpleForm('', 'opform', 'field_permissions.php', "post");
26	26	$op_select = new XoopsFormSelect("", 'op', $op);
27	27	$op_select->setExtra('onchange="document.forms.opform.submit()"');
		@@ -33,7 +33,7 @@ discard block
		block discarded – undo
33	33	$opform->display();
34	34
35	35	$perm_desc = "";
36		-switch ($op ) {
	36	+switch ($op) {
37	37	case "visibility":
38	38	redirect_header("field_visibility.php", 0, _AM_SONGLIST_PROF_VISIBLE);
39	39	//header("Location: visibility.php");
		@@ -62,14 +62,14 @@ discard block
		block discarded – undo
62	62	}
63	63
64	64	$module_id = $GLOBALS['songlistModule']->getVar('mid');
65		-include_once $GLOBALS['xoops']->path( '/class/xoopsform/grouppermform.php' );
	65	+include_once $GLOBALS['xoops']->path('/class/xoopsform/grouppermform.php');
66	66	$form = new XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/field_permissions.php', $anonymous);
67	67
68		-if ( $op == "access" ) {
	68	+if ($op=="access") {
69	69	$member_handler = xoops_gethandler('member');
70	70	$glist = $member_handler->getGroupList();
71		- foreach (array_keys($glist) as $i ) {
72		- if ( $i != XOOPS_GROUP_ANONYMOUS ) {
	71	+ foreach (array_keys($glist) as $i) {
	72	+ if ($i!=XOOPS_GROUP_ANONYMOUS) {
73	73	$form->addItem($i, $glist[$i]);
74	74	}
75	75	}
		@@ -78,11 +78,11 @@ discard block
		block discarded – undo
78	78	$extras_handler = xoops_getmodulehandler('extras');
79	79	$fields = array_merge(array(), $extras_handler->loadFields());
80	80
81		- if ( $op != "search" ) {
82		- if (is_array($fields)&&count($fields)>0)
83		- foreach (array_keys($fields) as $i ) {
84		- if ( $restriction == "" \|\| $fields[$i]->getVar($restriction) ) {
85		- $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
	81	+ if ($op!="search") {
	82	+ if (is_array($fields) && count($fields)>0)
	83	+ foreach (array_keys($fields) as $i) {
	84	+ if ($restriction=="" \|\| $fields[$i]->getVar($restriction)) {
	85	+ $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
86	86	}
87	87	}
88	88	} else {
		@@ -94,10 +94,10 @@ discard block
		block discarded – undo
94	94	'datetime',
95	95	'timezone',
96	96	'language');
97		- if (is_array($fields)&&count($fields)>0)
98		- foreach (array_keys($fields) as $i ) {
99		- if ( in_array($fields[$i]->getVar('field_type'), $searchable_types) ) {
100		- $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) );
	97	+ if (is_array($fields) && count($fields)>0)
	98	+ foreach (array_keys($fields) as $i) {
	99	+ if (in_array($fields[$i]->getVar('field_type'), $searchable_types)) {
	100	+ $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
101	101	}
102	102	}
103	103	}

		@@ -6,15 +6,15 @@ discard block
		block discarded – undo
6	6
7	7	xoops_cp_header();
8	8
9		- $op = isset($_REQUEST['op'])?$_REQUEST['op']:"genre";
10		- $fct = isset($_REQUEST['fct'])?$_REQUEST['fct']:"list";
11		- $limit = !empty($_REQUEST['limit'])?intval($_REQUEST['limit']):30;
12		- $start = !empty($_REQUEST['start'])?intval($_REQUEST['start']):0;
13		- $order = !empty($_REQUEST['order'])?$_REQUEST['order']:'DESC';
14		- $sort = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
15		- $filter = !empty($_REQUEST['filter'])?''.$_REQUEST['filter'].'':'1,1';
	9	+ $op = isset($_REQUEST['op']) ? $_REQUEST['op'] : "genre";
	10	+ $fct = isset($_REQUEST['fct']) ? $_REQUEST['fct'] : "list";
	11	+ $limit = !empty($_REQUEST['limit']) ?intval($_REQUEST['limit']) : 30;
	12	+ $start = !empty($_REQUEST['start']) ?intval($_REQUEST['start']) : 0;
	13	+ $order = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
	14	+ $sort = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
	15	+ $filter = !empty($_REQUEST['filter']) ? ''.$_REQUEST['filter'].'' : '1,1';
16	16
17		- switch($op) {
	17	+ switch ($op) {
18	18	default:
19	19	case "genre":
20	20	switch ($fct)
		@@ -24,18 +24,18 @@ discard block
		block discarded – undo
24	24	$indexAdmin = new ModuleAdmin();
25	25	echo $indexAdmin->addNavigation(basename(__FILE__));
26	26
27		- $genre_handler =& xoops_getmodulehandler('genre', 'songlist');
	27	+ $genre_handler = & xoops_getmodulehandler('genre', 'songlist');
28	28
29	29	$criteria = $genre_handler->getFilterCriteria($GLOBALS['filter']);
30	30	$ttl = $genre_handler->getCount($criteria);
31		- $GLOBALS['sort'] = !empty($_REQUEST['sort'])?''.$_REQUEST['sort'].'':'created';
	31	+ $GLOBALS['sort'] = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
32	32
33	33	$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']);
34	34	$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
35	35
36	36	foreach ($genre_handler->filterFields() as $id => $key) {
37		- $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>');
38		- $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-','_',$key)).'_th', $genre_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
	37	+ $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>');
	38	+ $GLOBALS['xoopsTpl']->assign('filter_'.strtolower(str_replace('-', '_', $key)).'_th', $genre_handler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
39	39	}
40	40
41	41	$GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
		@@ -51,7 +51,7 @@ discard block
		block discarded – undo
51	51	$criteria->setOrder($GLOBALS['order']);
52	52
53	53	$genres = $genre_handler->getObjects($criteria, true);
54		- foreach($genres as $cid => $genre) {
	54	+ foreach ($genres as $cid => $genre) {
55	55	if (is_object($genre))
56	56	$GLOBALS['xoopsTpl']->append('genre', $genre->toArray());
57	57	}
		@@ -66,7 +66,7 @@ discard block
		block discarded – undo
66	66	$indexAdmin = new ModuleAdmin();
67	67	echo $indexAdmin->addNavigation(basename(__FILE__));
68	68
69		- $genre_handler =& xoops_getmodulehandler('genre', 'songlist');
	69	+ $genre_handler = & xoops_getmodulehandler('genre', 'songlist');
70	70	if (isset($_REQUEST['id'])) {
71	71	$genre = $genre_handler->get(intval($_REQUEST['id']));
72	72	} else {
		@@ -79,21 +79,21 @@ discard block
		block discarded – undo
79	79	break;
80	80	case "save":
81	81
82		- $genre_handler =& xoops_getmodulehandler('genre', 'songlist');
83		- $id=0;
84		- if ($id=intval($_REQUEST['id'])) {
	82	+ $genre_handler = & xoops_getmodulehandler('genre', 'songlist');
	83	+ $id = 0;
	84	+ if ($id = intval($_REQUEST['id'])) {
85	85	$genre = $genre_handler->get($id);
86	86	} else {
87	87	$genre = $genre_handler->create();
88	88	}
89	89	$genre->setVars($_POST[$id]);
90	90
91		- if (!$id=$genre_handler->insert($genre)) {
	91	+ if (!$id = $genre_handler->insert($genre)) {
92	92	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);
93	93	exit(0);
94	94	} else {
95	95	if ($_REQUEST['state'][$_REQUEST['id']]=='new')
96		- 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);
	96	+ 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);
97	97	else
98	98	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);
99	99	exit(0);
		@@ -101,8 +101,8 @@ discard block
		block discarded – undo
101	101	break;
102	102	case "savelist":
103	103
104		- $genre_handler =& xoops_getmodulehandler('genre', 'songlist');
105		- foreach($_REQUEST['id'] as $id) {
	104	+ $genre_handler = & xoops_getmodulehandler('genre', 'songlist');
	105	+ foreach ($_REQUEST['id'] as $id) {
106	106	$genre = $genre_handler->get($id);
107	107	$genre->setVars($_POST[$id]);
108	108	if (!$genre_handler->insert($genre)) {
		@@ -115,9 +115,9 @@ discard block
		block discarded – undo
115	115	break;
116	116	case "delete":
117	117
118		- $genre_handler =& xoops_getmodulehandler('genre', 'songlist');
119		- $id=0;
120		- if (isset($_POST['id'])&&$id=intval($_POST['id'])) {
	118	+ $genre_handler = & xoops_getmodulehandler('genre', 'songlist');
	119	+ $id = 0;
	120	+ if (isset($_POST['id']) && $id = intval($_POST['id'])) {
121	121	$genre = $genre_handler->get($id);
122	122	if (!$genre_handler->delete($genre)) {
123	123	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);

		@@ -33,9 +33,9 @@ discard block
		block discarded – undo
33	33	require_once (dirname(dirname(dirname(dirname(__FILE__)))).'/include/cp_header.php');
34	34
35	35	if (!defined('_CHARSET'))
36		- define ("_CHARSET","UTF-8");
	36	+ define("_CHARSET", "UTF-8");
37	37	if (!defined('_CHARSET_ISO'))
38		- define ("_CHARSET_ISO","ISO-8859-1");
	38	+ define("_CHARSET_ISO", "ISO-8859-1");
39	39
40	40	$GLOBALS['songlistAdmin'] = true;
41	41
		@@ -55,23 +55,23 @@ discard block
		block discarded – undo
55	55
56	56	include_once $GLOBALS['xoops']->path('class'.DS.'xoopsmailer.php');
57	57
58		- if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
	58	+ if (file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))) {
59	59	include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
60		- }else{
	60	+ } else {
61	61	echo xoops_error("Error: You don't use the Frameworks \"admin module\". Please install this Frameworks");
62	62	}
63	63
64		- $GLOBALS['songlistImageIcon'] = XOOPS_URL .'/'. $GLOBALS['songlistModule']->getInfo('icons16');
65		- $GLOBALS['songlistImageAdmin'] = XOOPS_URL .'/'. $GLOBALS['songlistModule']->getInfo('icons32');
	64	+ $GLOBALS['songlistImageIcon'] = XOOPS_URL.'/'.$GLOBALS['songlistModule']->getInfo('icons16');
	65	+ $GLOBALS['songlistImageAdmin'] = XOOPS_URL.'/'.$GLOBALS['songlistModule']->getInfo('icons32');
66	66
67	67	if ($GLOBALS['xoopsUser']) {
68	68	$moduleperm_handler = xoops_gethandler('groupperm');
69		- if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['songlistModule']->getVar( 'mid' ), $GLOBALS['xoopsUser']->getGroups())) {
	69	+ if (!$moduleperm_handler->checkRight('module_admin', $GLOBALS['songlistModule']->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
70	70	redirect_header(XOOPS_URL, 1, _NOPERM);
71	71	exit();
72	72	}
73	73	} else {
74		- redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
	74	+ redirect_header(XOOPS_URL."/user.php", 1, _NOPERM);
75	75	exit();
76	76	}
77	77

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

		@@ -7,7 +7,7 @@ discard block
		block discarded – undo
7	7
8	8	$op = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : (!empty($_REQUEST['id']) ? "edit" : 'list')));
9	9	$field_handler = xoops_getmodulehandler('field', 'songlist');
10		-switch( $op ) {
	10	+switch ($op) {
11	11	default:
12	12	case "list":
13	13	$indexAdmin = new ModuleAdmin();
		@@ -28,8 +28,8 @@ discard block
		block discarded – undo
28	28	unset($criteria);
29	29
30	30	$categories[0] = array('cid' => 0, 'name' => _AM_SONGLIST_FIELDS_DEFAULT);
31		- if ( count($categorys) > 0 ) {
32		- foreach (array_keys($categorys) as $i ) {
	31	+ if (count($categorys)>0) {
	32	+ foreach (array_keys($categorys) as $i) {
33	33	$categories[$categorys[$i]->getVar('cid')] = array('cid' => $categorys[$i]->getVar('cid'), 'name' => $categorys[$i]->getVar('name'));
34	34	}
35	35	}
		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	'autotext' => _AM_SONGLIST_FIELDS_AUTOTEXT,
66	66	'rank' => _AM_SONGLIST_FIELDS_RANK);
67	67
68		- foreach (array_keys($fields) as $i ) {
	68	+ foreach (array_keys($fields) as $i) {
69	69	$fields[$i]['canEdit'] = $fields[$i]['field_config'] \|\| $fields[$i]['field_show'] \|\| $fields[$i]['field_edit'];
70	70	$fields[$i]['canDelete'] = $fields[$i]['field_config'];
71	71	$fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']];
		@@ -74,12 +74,12 @@ discard block
		block discarded – undo
74	74	$weights[$i] = $fields[$i]['field_weight'];
75	75	}
76	76	//sort fields order in categories
77		- foreach (array_keys($fields) as $i ) {
	77	+ foreach (array_keys($fields) as $i) {
78	78	array_multisort($weights[$i], SORT_ASC, array_keys($fieldcategories[$i]), SORT_ASC, $categories[$i]);
79	79	}
80	80	ksort($categories);
81	81	$GLOBALS['xoopsTpl']->assign('fieldcategories', $fieldcategories);
82		- $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
	82	+ $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML());
83	83	$template_main = "songlist_cpanel_fieldlist.html";
84	84	break;
85	85
		@@ -97,7 +97,7 @@ discard block
		block discarded – undo
97	97	$indexAdmin = new ModuleAdmin();
98	98	echo $indexAdmin->addNavigation(basename(__FILE__));
99	99	$obj = $field_handler->get($_REQUEST['id']);
100		- if ( !$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit') ) { //If no configs exist
	100	+ if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
101	101	redirect_header('field.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
102	102	}
103	103	$form = songlist_getFieldForm($obj);
		@@ -106,60 +106,60 @@ discard block
		block discarded – undo
106	106
107	107	case "reorder":
108	108
109		- if ( !$GLOBALS['xoopsSecurity']->check() ) {
110		- redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
	109	+ if (!$GLOBALS['xoopsSecurity']->check()) {
	110	+ redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
111	111	}
112	112
113		- if ( isset($_POST['field_ids']) && count($_POST['field_ids']) > 0 ) {
	113	+ if (isset($_POST['field_ids']) && count($_POST['field_ids'])>0) {
114	114	$oldweight = $_POST['oldweight'];
115	115	$oldcat = $_POST['oldcat'];
116	116	$oldcategories = $_POST['oldcategories'];
117	117	$categories = $_POST['categories'];
118	118	$weight = $_POST['weight'];
119	119	$ids = array();
120		- foreach ($_POST['field_ids'] as $field_id ) {
121		- 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]))) ) {
	120	+ foreach ($_POST['field_ids'] as $field_id) {
	121	+ 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])))) {
122	122	//if field has changed
123	123	$ids[] = intval($field_id);
124	124	}
125	125	}
126		- if ( count($ids) > 0 ) {
	126	+ if (count($ids)>0) {
127	127	$errors = array();
128	128	//if there are changed fields, fetch the fieldcategory objects
129	129	$field_handler = xoops_getmodulehandler('field');
130		- $fields = $field_handler->getObjects(new Criteria('field_id', "(" . implode(',', $ids) . ")", "IN"), true);
131		- foreach ($ids as $i ) {
132		- $fields[$i]->setVar('field_weight', intval($weight[$i]) );
133		- $fields[$i]->setVar('cids', $categories[$i] );
134		- if ( !$field_handler->insert($fields[$i]) ) {
135		- $errors = array_merge($errors, $fields[$i]->getErrors() );
	130	+ $fields = $field_handler->getObjects(new Criteria('field_id', "(".implode(',', $ids).")", "IN"), true);
	131	+ foreach ($ids as $i) {
	132	+ $fields[$i]->setVar('field_weight', intval($weight[$i]));
	133	+ $fields[$i]->setVar('cids', $categories[$i]);
	134	+ if (!$field_handler->insert($fields[$i])) {
	135	+ $errors = array_merge($errors, $fields[$i]->getErrors());
136	136	}
137	137	}
138		- if ( count($errors) == 0 ) {
	138	+ if (count($errors)==0) {
139	139	//no errors
140		- redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS) );
	140	+ redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
141	141	} else {
142		- redirect_header('field.php', 3, implode('<br />', $errors) );
	142	+ redirect_header('field.php', 3, implode('<br />', $errors));
143	143	}
144	144	}
145	145	}
146		- redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS) );
	146	+ redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
147	147	break;
148	148
149	149	case "save":
150		- if ( !$GLOBALS['xoopsSecurity']->check() ) {
151		- redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
	150	+ if (!$GLOBALS['xoopsSecurity']->check()) {
	151	+ redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
152	152	}
153	153	$redirect_to_edit = false;
154		- if ( isset($_REQUEST['id']) ) {
	154	+ if (isset($_REQUEST['id'])) {
155	155	$obj = $field_handler->get($_REQUEST['id']);
156		- if ( !$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit') ) { //If no configs exist
	156	+ if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
157	157	redirect_header('fields.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
158	158	}
159	159	} else {
160	160	$obj = $field_handler->create();
161	161	$obj->setVar('field_name', $_REQUEST['field_name']);
162		- $obj->setVar('field_moduleid', $GLOBALS['songlistModule']->getVar('mid') );
	162	+ $obj->setVar('field_moduleid', $GLOBALS['songlistModule']->getVar('mid'));
163	163	$obj->setVar('field_show', 1);
164	164	$obj->setVar('field_edit', 1);
165	165	$obj->setVar('field_config', 1);
		@@ -167,40 +167,40 @@ discard block
		block discarded – undo
167	167	}
168	168	$obj->setVar('field_title', $_REQUEST['field_title']);
169	169	$obj->setVar('field_description', $_REQUEST['field_description']);
170		- if ( $obj->getVar('field_config') ) {
	170	+ if ($obj->getVar('field_config')) {
171	171	$obj->setVar('field_type', $_REQUEST['field_type']);
172		- if ( isset($_REQUEST['field_valuetype']) ) {
	172	+ if (isset($_REQUEST['field_valuetype'])) {
173	173	$obj->setVar('field_valuetype', $_REQUEST['field_valuetype']);
174	174	}
175	175	$options = $obj->getVar('field_options');
176	176
177		- if ( isset($_REQUEST['removeOptions']) && is_array($_REQUEST['removeOptions']) ) {
178		- foreach ($_REQUEST['removeOptions'] as $index ) {
	177	+ if (isset($_REQUEST['removeOptions']) && is_array($_REQUEST['removeOptions'])) {
	178	+ foreach ($_REQUEST['removeOptions'] as $index) {
179	179	unset($options[$index]);
180	180	}
181	181	$redirect_to_edit = true;
182	182	}
183	183
184		- if ( !empty($_REQUEST['addOption']) ) {
185		- foreach ($_REQUEST['addOption'] as $option ) {
186		- if ( empty($option['value']) ) continue;
	184	+ if (!empty($_REQUEST['addOption'])) {
	185	+ foreach ($_REQUEST['addOption'] as $option) {
	186	+ if (empty($option['value'])) continue;
187	187	$options[$option['key']] = $option['value'];
188	188	$redirect_to_edit = true;
189	189	}
190	190	}
191	191	$obj->setVar('field_options', $options);
192	192	}
193		- if ( $obj->getVar('field_edit') ) {
	193	+ if ($obj->getVar('field_edit')) {
194	194	$required = isset($_REQUEST['field_required']) ? $_REQUEST['field_required'] : 0;
195	195	$obj->setVar('field_required', $required); //0 = no, 1 = yes
196		- if ( isset($_REQUEST['field_maxlength']) ) {
	196	+ if (isset($_REQUEST['field_maxlength'])) {
197	197	$obj->setVar('field_maxlength', $_REQUEST['field_maxlength']);
198	198	}
199		- if ( isset($_REQUEST['field_default']) ) {
	199	+ if (isset($_REQUEST['field_default'])) {
200	200	$field_default = $obj->getValueForSave($_REQUEST['field_default']);
201	201	//Check for multiple selections
202		- if ( is_array($field_default) ) {
203		- $obj->setVar('field_default', serialize($field_default) );
	202	+ if (is_array($field_default)) {
	203	+ $obj->setVar('field_default', serialize($field_default));
204	204	} else {
205	205	$obj->setVar('field_default', $field_default);
206	206	}
		@@ -210,50 +210,50 @@ discard block
		block discarded – undo
210	210	$obj->setVar('field_weight', $_REQUEST['field_weight']);
211	211	$obj->setVar('cids', $_REQUEST['cids']);
212	212
213		- if ( $field_handler->insert($obj) ) {
	213	+ if ($field_handler->insert($obj)) {
214	214
215	215	$groupperm_handler = xoops_gethandler('groupperm');
216	216
217	217	$perm_arr = array();
218		- if ( $obj->getVar('field_show') ) {
	218	+ if ($obj->getVar('field_show')) {
219	219	$perm_arr[] = 'songlist_show';
220	220	$perm_arr[] = 'songlist_visible';
221	221	}
222		- if ( $obj->getVar('field_edit') ) {
	222	+ if ($obj->getVar('field_edit')) {
223	223	$perm_arr[] = 'songlist_edit';
224	224	}
225		- if ( $obj->getVar('field_edit') \|\| $obj->getVar('field_show') ) {
	225	+ if ($obj->getVar('field_edit') \|\| $obj->getVar('field_show')) {
226	226	$perm_arr[] = 'songlist_search';
227	227	}
228		- if ( count($perm_arr) > 0 ) {
229		- foreach ($perm_arr as $perm ) {
230		- $criteria = new CriteriaCompo(new Criteria('gperm_name', $perm) );
231		- $criteria->add(new Criteria('gperm_itemid', intval($obj->getVar('field_id') )) );
232		- $criteria->add(new Criteria('gperm_modid', intval($GLOBALS['songlistModule']->getVar('mid') )) );
233		- if ( isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm]) ) {
	228	+ if (count($perm_arr)>0) {
	229	+ foreach ($perm_arr as $perm) {
	230	+ $criteria = new CriteriaCompo(new Criteria('gperm_name', $perm));
	231	+ $criteria->add(new Criteria('gperm_itemid', intval($obj->getVar('field_id'))));
	232	+ $criteria->add(new Criteria('gperm_modid', intval($GLOBALS['songlistModule']->getVar('mid'))));
	233	+ if (isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm])) {
234	234	$perms = $groupperm_handler->getObjects($criteria);
235		- if ( count($perms) > 0 ) {
236		- foreach (array_keys($perms) as $i ) {
	235	+ if (count($perms)>0) {
	236	+ foreach (array_keys($perms) as $i) {
237	237	$groups[$perms[$i]->getVar('gperm_groupid')] = $perms[$i];
238	238	}
239	239	} else {
240	240	$groups = array();
241	241	}
242		- foreach ($_REQUEST[$perm] as $grouoid ) {
	242	+ foreach ($_REQUEST[$perm] as $grouoid) {
243	243	$grouoid = intval($grouoid);
244		- if ( !isset($groups[$grouoid]) ) {
	244	+ if (!isset($groups[$grouoid])) {
245	245	$perm_obj = $groupperm_handler->create();
246	246	$perm_obj->setVar('gperm_name', $perm);
247		- $perm_obj->setVar('gperm_itemid', intval($obj->getVar('field_id') ));
248		- $perm_obj->setVar('gperm_modid', $GLOBALS['songlistModule']->getVar('mid') );
	247	+ $perm_obj->setVar('gperm_itemid', intval($obj->getVar('field_id')));
	248	+ $perm_obj->setVar('gperm_modid', $GLOBALS['songlistModule']->getVar('mid'));
249	249	$perm_obj->setVar('gperm_groupid', $grouoid);
250	250	$groupperm_handler->insert($perm_obj);
251	251	unset($perm_obj);
252	252	}
253	253	}
254	254	$removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]);
255		- if ( count($removed_groups) > 0 ) {
256		- $criteria->add(new Criteria('gperm_groupid', "(".implode(',', $removed_groups).")", "IN") );
	255	+ if (count($removed_groups)>0) {
	256	+ $criteria->add(new Criteria('gperm_groupid', "(".implode(',', $removed_groups).")", "IN"));
257	257	$groupperm_handler->deleteAll($criteria);
258	258	}
259	259	unset($groups);
		@@ -264,8 +264,8 @@ discard block
		block discarded – undo
264	264	unset($criteria);
265	265	}
266	266	}
267		- $url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php';
268		- redirect_header($url, 3, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD) );
	267	+ $url = $redirect_to_edit ? 'field.php?op=edit&id='.$obj->getVar('field_id') : 'field.php';
	268	+ redirect_header($url, 3, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
269	269	}
270	270
271	271	echo $obj->getHtmlErrors();
		@@ -275,25 +275,25 @@ discard block
		block discarded – undo
275	275
276	276	case "delete":
277	277	$obj = $field_handler->get($_REQUEST['id']);
278		- if ( !$obj->getVar('field_config') ) {
	278	+ if (!$obj->getVar('field_config')) {
279	279	redirect_header('index.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
280	280	}
281		- if ( isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1 ) {
282		- if ( !$GLOBALS['xoopsSecurity']->check() ) {
283		- redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
	281	+ if (isset($_REQUEST['ok']) && $_REQUEST['ok']==1) {
	282	+ if (!$GLOBALS['xoopsSecurity']->check()) {
	283	+ redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
284	284	}
285		- if ( $field_handler->delete($obj) ) {
286		- redirect_header('field.php', 3, sprintf(_AM_SONGLIST_FIELDS_DELETEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD) );
	285	+ if ($field_handler->delete($obj)) {
	286	+ redirect_header('field.php', 3, sprintf(_AM_SONGLIST_FIELDS_DELETEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
287	287	} else {
288	288	echo $obj->getHtmlErrors();
289	289	}
290	290	} else {
291		- xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_SONGLIST_FIELDS_RUSUREDEL, $obj->getVar('field_title') ));
	291	+ xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_SONGLIST_FIELDS_RUSUREDEL, $obj->getVar('field_title')));
292	292	}
293	293	break;
294	294	}
295	295
296		-if ( isset($template_main) ) {
	296	+if (isset($template_main)) {
297	297	$GLOBALS['xoopsTpl']->display("db:{$template_main}");
298	298	}
299	299

XoopsModules25x / songlist

Push — master ( ed55b2...84c1d9 )

Category

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +29 added lines, -29 removed lines patch added patch discarded remove patch

Spacing +51 added lines, -51 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch

Spacing +68 added lines, -68 removed lines patch added patch discarded remove patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch