XoopsModules25x / songlist

admin/field.php

Indentation +282 added lines, -282 removed lines

@@ -10,84 +10,84 @@ 
 
 $op           = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : (!empty($_REQUEST['id']) ? 'edit' : 'list')));
 $fieldHandler = Helper::getInstance()
-                      ->getHandler('Field');
+					  ->getHandler('Field');
 switch ($op) {
-    default:
-    case 'list':
-        $adminObject = Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
+	default:
+	case 'list':
+		$adminObject = Admin::getInstance();
+		$adminObject->displayNavigation(basename(__FILE__));
 
-        $fields = $fieldHandler->getObjects(null, false, false);
+		$fields = $fieldHandler->getObjects(null, false, false);
 
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = xoops_getHandler('module');
-        $modules       = $moduleHandler->getObjects(null, true);
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = xoops_getHandler('module');
+		$modules       = $moduleHandler->getObjects(null, true);
 
-        $categories = [];
-        $weights    = [];
+		$categories = [];
+		$weights    = [];
 
-        $GLOBALS['categoryHandler'] = Helper::getInstance()
-                                            ->getHandler('Category');
-        $criteria                   = new \CriteriaCompo();
-        $criteria->setSort('weight');
-        $category        = $GLOBALS['categoryHandler']->getObjects($criteria, true);
-        $fieldcategories = [];
-        if ($category) {
-            unset($criteria);
+		$GLOBALS['categoryHandler'] = Helper::getInstance()
+											->getHandler('Category');
+		$criteria                   = new \CriteriaCompo();
+		$criteria->setSort('weight');
+		$category        = $GLOBALS['categoryHandler']->getObjects($criteria, true);
+		$fieldcategories = [];
+		if ($category) {
+			unset($criteria);
 
-            $categories[0] = ['cid' => 0, 'name' => _AM_SONGLIST_FIELDS_DEFAULT];
-            if (count($category) > 0) {
-                foreach (array_keys($category) as $i) {
-                    $categories[$category[$i]->getVar('cid')] = ['cid' => $category[$i]->getVar('cid'), 'name' => $category[$i]->getVar('name')];
-                }
-            }
-            $GLOBALS['xoopsTpl']->assign('categories', $categories);
-        }
+			$categories[0] = ['cid' => 0, 'name' => _AM_SONGLIST_FIELDS_DEFAULT];
+			if (count($category) > 0) {
+				foreach (array_keys($category) as $i) {
+					$categories[$category[$i]->getVar('cid')] = ['cid' => $category[$i]->getVar('cid'), 'name' => $category[$i]->getVar('name')];
+				}
+			}
+			$GLOBALS['xoopsTpl']->assign('categories', $categories);
+		}
 
-        $valuetypes = [
-            XOBJ_DTYPE_ARRAY   => _AM_SONGLIST_FIELDS_ARRAY,
-            XOBJ_DTYPE_EMAIL   => _AM_SONGLIST_FIELDS_EMAIL,
-            XOBJ_DTYPE_INT     => _AM_SONGLIST_FIELDS_INT,
-            XOBJ_DTYPE_TXTAREA => _AM_SONGLIST_FIELDS_TXTAREA,
-            XOBJ_DTYPE_TXTBOX  => _AM_SONGLIST_FIELDS_TXTBOX,
-            XOBJ_DTYPE_URL     => _AM_SONGLIST_FIELDS_URL,
-            XOBJ_DTYPE_OTHER   => _AM_SONGLIST_FIELDS_OTHER,
-            XOBJ_DTYPE_MTIME   => _AM_SONGLIST_FIELDS_DATE,
-        ];
+		$valuetypes = [
+			XOBJ_DTYPE_ARRAY   => _AM_SONGLIST_FIELDS_ARRAY,
+			XOBJ_DTYPE_EMAIL   => _AM_SONGLIST_FIELDS_EMAIL,
+			XOBJ_DTYPE_INT     => _AM_SONGLIST_FIELDS_INT,
+			XOBJ_DTYPE_TXTAREA => _AM_SONGLIST_FIELDS_TXTAREA,
+			XOBJ_DTYPE_TXTBOX  => _AM_SONGLIST_FIELDS_TXTBOX,
+			XOBJ_DTYPE_URL     => _AM_SONGLIST_FIELDS_URL,
+			XOBJ_DTYPE_OTHER   => _AM_SONGLIST_FIELDS_OTHER,
+			XOBJ_DTYPE_MTIME   => _AM_SONGLIST_FIELDS_DATE,
+		];
 
-        $fieldtypes = [
-            'checkbox'     => _AM_SONGLIST_FIELDS_CHECKBOX,
-            'group'        => _AM_SONGLIST_FIELDS_GROUP,
-            'group_multi'  => _AM_SONGLIST_FIELDS_GROUPMULTI,
-            'language'     => _AM_SONGLIST_FIELDS_LANGUAGE,
-            'radio'        => _AM_SONGLIST_FIELDS_RADIO,
-            'select'       => _AM_SONGLIST_FIELDS_SELECT,
-            'select_multi' => _AM_SONGLIST_FIELDS_SELECTMULTI,
-            'textarea'     => _AM_SONGLIST_FIELDS_TEXTAREA,
-            'dhtml'        => _AM_SONGLIST_FIELDS_DHTMLTEXTAREA,
-            'editor'       => _AM_SONGLIST_FIELDS_EDITOR,
-            'textbox'      => _AM_SONGLIST_FIELDS_TEXTBOX,
-            'timezone'     => _AM_SONGLIST_FIELDS_TIMEZONE,
-            'yesno'        => _AM_SONGLIST_FIELDS_YESNO,
-            'date'         => _AM_SONGLIST_FIELDS_DATE,
-            'datetime'     => _AM_SONGLIST_FIELDS_DATETIME,
-            'longdate'     => _AM_SONGLIST_FIELDS_LONGDATE,
-            'theme'        => _AM_SONGLIST_FIELDS_THEME,
-            'autotext'     => _AM_SONGLIST_FIELDS_AUTOTEXT,
-            'rank'         => _AM_SONGLIST_FIELDS_RANK,
-        ];
+		$fieldtypes = [
+			'checkbox'     => _AM_SONGLIST_FIELDS_CHECKBOX,
+			'group'        => _AM_SONGLIST_FIELDS_GROUP,
+			'group_multi'  => _AM_SONGLIST_FIELDS_GROUPMULTI,
+			'language'     => _AM_SONGLIST_FIELDS_LANGUAGE,
+			'radio'        => _AM_SONGLIST_FIELDS_RADIO,
+			'select'       => _AM_SONGLIST_FIELDS_SELECT,
+			'select_multi' => _AM_SONGLIST_FIELDS_SELECTMULTI,
+			'textarea'     => _AM_SONGLIST_FIELDS_TEXTAREA,
+			'dhtml'        => _AM_SONGLIST_FIELDS_DHTMLTEXTAREA,
+			'editor'       => _AM_SONGLIST_FIELDS_EDITOR,
+			'textbox'      => _AM_SONGLIST_FIELDS_TEXTBOX,
+			'timezone'     => _AM_SONGLIST_FIELDS_TIMEZONE,
+			'yesno'        => _AM_SONGLIST_FIELDS_YESNO,
+			'date'         => _AM_SONGLIST_FIELDS_DATE,
+			'datetime'     => _AM_SONGLIST_FIELDS_DATETIME,
+			'longdate'     => _AM_SONGLIST_FIELDS_LONGDATE,
+			'theme'        => _AM_SONGLIST_FIELDS_THEME,
+			'autotext'     => _AM_SONGLIST_FIELDS_AUTOTEXT,
+			'rank'         => _AM_SONGLIST_FIELDS_RANK,
+		];
 
-        foreach (array_keys($fields) as $i) {
-            $fields[$i]['canEdit']   = $fields[$i]['field_config'] || $fields[$i]['field_show'] || $fields[$i]['field_edit'];
-            $fields[$i]['canDelete'] = $fields[$i]['field_config'];
-            $fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']];
-            $fields[$i]['valuetype'] = $valuetypes[$fields[$i]['field_valuetype']];
-            $fieldcategories[$i][]   = $fields[$i];
-            $weights[$i]             = $fields[$i]['field_weight'];
-        }
-        //sort fields order in categories
+		foreach (array_keys($fields) as $i) {
+			$fields[$i]['canEdit']   = $fields[$i]['field_config'] || $fields[$i]['field_show'] || $fields[$i]['field_edit'];
+			$fields[$i]['canDelete'] = $fields[$i]['field_config'];
+			$fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']];
+			$fields[$i]['valuetype'] = $valuetypes[$fields[$i]['field_valuetype']];
+			$fieldcategories[$i][]   = $fields[$i];
+			$weights[$i]             = $fields[$i]['field_weight'];
+		}
+		//sort fields order in categories
 //        ray('$fields', $fields);
-        foreach (array_keys($fields) as $i) {
+		foreach (array_keys($fields) as $i) {
 //            ray('$i = ' . $i)->red();
 //            ray('$weights: <br>' , $weights)->red();
 //            ray('$fieldcategories: <br>' , $fieldcategories)->red();
@@ -95,237 +95,237 @@ 
 //            ray('$categories: <br>', $categories)->red();
 //            ray('$categories[$i]: <br>', $categories[$i])->red();
 
-            array_multisort(
-                $weights
-                ,
-                SORT_ASC
-                ,
-                array_keys($fieldcategories)
-                ,
-                SORT_ASC
-                ,
-                $categories[$i]
-            );
+			array_multisort(
+				$weights
+				,
+				SORT_ASC
+				,
+				array_keys($fieldcategories)
+				,
+				SORT_ASC
+				,
+				$categories[$i]
+			);
 //            ray($i)->blue();
 //            ray('$weights: <br>', $weights)->blue();
 //            ray('$fieldcategories: <br>', $fieldcategories)->blue();
 //            ray(array_keys($fieldcategories))->blue();
 //            ray('Categories: <br>', $categories)->blue();
 //            ray('$categories[$i]: <br>', $categories[$i])->blue();
-        }
+		}
 
-        ksort($categories);
-        $GLOBALS['xoopsTpl']->assign('fieldcategories', $fieldcategories);
-        $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML());
-        $template_main = 'songlist_cpanel_fieldlist.tpl';
-        break;
-    case 'new':
-        $adminObject = Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        $obj  = $fieldHandler->create();
-        $form = FormController::getFieldForm($obj);
-        $form->display();
-        break;
-    case 'edit':
-        $adminObject = Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        $obj = $fieldHandler->get($_REQUEST['id']);
-        if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
-            redirect_header('field.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
-        }
-        $form = FormController::getFieldForm($obj);
-        $form->display();
-        break;
-    case 'reorder':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
+		ksort($categories);
+		$GLOBALS['xoopsTpl']->assign('fieldcategories', $fieldcategories);
+		$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML());
+		$template_main = 'songlist_cpanel_fieldlist.tpl';
+		break;
+	case 'new':
+		$adminObject = Admin::getInstance();
+		$adminObject->displayNavigation(basename(__FILE__));
+		$obj  = $fieldHandler->create();
+		$form = FormController::getFieldForm($obj);
+		$form->display();
+		break;
+	case 'edit':
+		$adminObject = Admin::getInstance();
+		$adminObject->displayNavigation(basename(__FILE__));
+		$obj = $fieldHandler->get($_REQUEST['id']);
+		if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
+			redirect_header('field.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
+		}
+		$form = FormController::getFieldForm($obj);
+		$form->display();
+		break;
+	case 'reorder':
+		if (!$GLOBALS['xoopsSecurity']->check()) {
+			redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+		}
 
-        if (Request::hasVar('field_ids', 'POST') && count($_POST['field_ids']) > 0) {
-            $oldweight     = $_POST['oldweight'];
-            $oldcat        = $_POST['oldcat'];
-            $oldcategories = $_POST['oldcategories'];
-            $categories    = $_POST['categories'];
-            $weight        = $_POST['weight'];
-            $ids           = [];
-            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[] = (int)$field_id;
-                }
-            }
-            if (count($ids) > 0) {
-                $errors = [];
-                //if there are changed fields, fetch the fieldcategory objects
-                $fieldHandler = Helper::getInstance()
-                                      ->getHandler('Field');
-                $fields       = $fieldHandler->getObjects(new \Criteria('field_id', '(' . implode(',', $ids) . ')', 'IN'), true);
-                foreach ($ids as $i) {
-                    $fields[$i]->setVar('field_weight', (int)$weight[$i]);
-                    $fields[$i]->setVar('cids', $categories[$i]);
-                    if (!$fieldHandler->insert($fields[$i])) {
-                        $errors = array_merge($errors, $fields[$i]->getErrors());
-                    }
-                }
-                if (0 == count($errors)) {
-                    //no errors
-                    redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
-                } else {
-                    redirect_header('field.php', 3, implode('<br>', $errors));
-                }
-            }
-        }
-        redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
-        break;
-    case 'save':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        $redirect_to_edit = false;
-        if (Request::hasVar('id', 'REQUEST')) {
-            $obj = $fieldHandler->get($_REQUEST['id']);
-            if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
-                redirect_header('fields.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
-            }
-        } else {
-            $obj = $fieldHandler->create();
-            $obj->setVar('field_name', $_REQUEST['field_name']);
-            $obj->setVar('field_moduleid', $GLOBALS['songlistModule']->getVar('mid'));
-            $obj->setVar('field_show', 1);
-            $obj->setVar('field_edit', 1);
-            $obj->setVar('field_config', 1);
-            $redirect_to_edit = true;
-        }
-        $obj->setVar('field_title', $_REQUEST['field_title']);
-        $obj->setVar('field_description', $_REQUEST['field_description']);
-        if ($obj->getVar('field_config')) {
-            $obj->setVar('field_type', $_REQUEST['field_type']);
-            if (Request::hasVar('field_valuetype', 'REQUEST')) {
-                $obj->setVar('field_valuetype', $_REQUEST['field_valuetype']);
-            }
-            $options = $obj->getVar('field_options');
+		if (Request::hasVar('field_ids', 'POST') && count($_POST['field_ids']) > 0) {
+			$oldweight     = $_POST['oldweight'];
+			$oldcat        = $_POST['oldcat'];
+			$oldcategories = $_POST['oldcategories'];
+			$categories    = $_POST['categories'];
+			$weight        = $_POST['weight'];
+			$ids           = [];
+			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[] = (int)$field_id;
+				}
+			}
+			if (count($ids) > 0) {
+				$errors = [];
+				//if there are changed fields, fetch the fieldcategory objects
+				$fieldHandler = Helper::getInstance()
+									  ->getHandler('Field');
+				$fields       = $fieldHandler->getObjects(new \Criteria('field_id', '(' . implode(',', $ids) . ')', 'IN'), true);
+				foreach ($ids as $i) {
+					$fields[$i]->setVar('field_weight', (int)$weight[$i]);
+					$fields[$i]->setVar('cids', $categories[$i]);
+					if (!$fieldHandler->insert($fields[$i])) {
+						$errors = array_merge($errors, $fields[$i]->getErrors());
+					}
+				}
+				if (0 == count($errors)) {
+					//no errors
+					redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
+				} else {
+					redirect_header('field.php', 3, implode('<br>', $errors));
+				}
+			}
+		}
+		redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
+		break;
+	case 'save':
+		if (!$GLOBALS['xoopsSecurity']->check()) {
+			redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+		}
+		$redirect_to_edit = false;
+		if (Request::hasVar('id', 'REQUEST')) {
+			$obj = $fieldHandler->get($_REQUEST['id']);
+			if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
+				redirect_header('fields.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
+			}
+		} else {
+			$obj = $fieldHandler->create();
+			$obj->setVar('field_name', $_REQUEST['field_name']);
+			$obj->setVar('field_moduleid', $GLOBALS['songlistModule']->getVar('mid'));
+			$obj->setVar('field_show', 1);
+			$obj->setVar('field_edit', 1);
+			$obj->setVar('field_config', 1);
+			$redirect_to_edit = true;
+		}
+		$obj->setVar('field_title', $_REQUEST['field_title']);
+		$obj->setVar('field_description', $_REQUEST['field_description']);
+		if ($obj->getVar('field_config')) {
+			$obj->setVar('field_type', $_REQUEST['field_type']);
+			if (Request::hasVar('field_valuetype', 'REQUEST')) {
+				$obj->setVar('field_valuetype', $_REQUEST['field_valuetype']);
+			}
+			$options = $obj->getVar('field_options');
 
-            if (Request::hasVar('removeOptions', 'REQUEST') && is_array($_REQUEST['removeOptions'])) {
-                foreach ($_REQUEST['removeOptions'] as $index) {
-                    unset($options[$index]);
-                }
-                $redirect_to_edit = true;
-            }
+			if (Request::hasVar('removeOptions', 'REQUEST') && is_array($_REQUEST['removeOptions'])) {
+				foreach ($_REQUEST['removeOptions'] as $index) {
+					unset($options[$index]);
+				}
+				$redirect_to_edit = true;
+			}
 
-            if (Request::hasVar('addOption', 'REQUEST')) {
-                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')) {
-            $required = Request::getInt('field_required', 0, 'REQUEST');
-            $obj->setVar('field_required', $required); //0 = no, 1 = yes
-            if (Request::hasVar('field_maxlength', 'REQUEST')) {
-                $obj->setVar('field_maxlength', $_REQUEST['field_maxlength']);
-            }
-            if (Request::hasVar('field_default', 'REQUEST')) {
-                $field_default = $obj->getValueForSave($_REQUEST['field_default']);
-                //Check for multiple selections
-                if (is_array($field_default)) {
-                    $obj->setVar('field_default', serialize($field_default));
-                } else {
-                    $obj->setVar('field_default', $field_default);
-                }
-            }
-        }
+			if (Request::hasVar('addOption', 'REQUEST')) {
+				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')) {
+			$required = Request::getInt('field_required', 0, 'REQUEST');
+			$obj->setVar('field_required', $required); //0 = no, 1 = yes
+			if (Request::hasVar('field_maxlength', 'REQUEST')) {
+				$obj->setVar('field_maxlength', $_REQUEST['field_maxlength']);
+			}
+			if (Request::hasVar('field_default', 'REQUEST')) {
+				$field_default = $obj->getValueForSave($_REQUEST['field_default']);
+				//Check for multiple selections
+				if (is_array($field_default)) {
+					$obj->setVar('field_default', serialize($field_default));
+				} else {
+					$obj->setVar('field_default', $field_default);
+				}
+			}
+		}
 
-        $obj->setVar('field_weight', $_REQUEST['field_weight']);
-        $obj->setVar('cids', $_REQUEST['cids']);
+		$obj->setVar('field_weight', $_REQUEST['field_weight']);
+		$obj->setVar('cids', $_REQUEST['cids']);
 
-        if ($fieldHandler->insert($obj)) {
-            /** @var \XoopsGroupPermHandler $grouppermHandler */
-            $grouppermHandler = xoops_getHandler('groupperm');
+		if ($fieldHandler->insert($obj)) {
+			/** @var \XoopsGroupPermHandler $grouppermHandler */
+			$grouppermHandler = xoops_getHandler('groupperm');
 
-            $perm_arr = [];
-            if ($obj->getVar('field_show')) {
-                $perm_arr[] = 'songlist_show';
-                $perm_arr[] = 'songlist_visible';
-            }
-            if ($obj->getVar('field_edit')) {
-                $perm_arr[] = 'songlist_edit';
-            }
-            if ($obj->getVar('field_edit') || $obj->getVar('field_show')) {
-                $perm_arr[] = 'songlist_search';
-            }
-            if (count($perm_arr) > 0) {
-                foreach ($perm_arr as $perm) {
-                    $criteria = new \CriteriaCompo(new \Criteria('gperm_name', $perm));
-                    $criteria->add(new \Criteria('gperm_itemid', (int)$obj->getVar('field_id')));
-                    $criteria->add(new \Criteria('gperm_modid', (int)$GLOBALS['songlistModule']->getVar('mid')));
-                    if (isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm])) {
-                        $perms = $grouppermHandler->getObjects($criteria);
-                        if (count($perms) > 0) {
-                            foreach (array_keys($perms) as $i) {
-                                $groups[$perms[$i]->getVar('gperm_groupid')] = $perms[$i];
-                            }
-                        } else {
-                            $groups = [];
-                        }
-                        foreach ($_REQUEST[$perm] as $grouoid) {
-                            $grouoid = (int)$grouoid;
-                            if (!isset($groups[$grouoid])) {
-                                $perm_obj = $grouppermHandler->create();
-                                $perm_obj->setVar('gperm_name', $perm);
-                                $perm_obj->setVar('gperm_itemid', (int)$obj->getVar('field_id'));
-                                $perm_obj->setVar('gperm_modid', $GLOBALS['songlistModule']->getVar('mid'));
-                                $perm_obj->setVar('gperm_groupid', $grouoid);
-                                $grouppermHandler->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'));
-                            $grouppermHandler->deleteAll($criteria);
-                        }
-                        unset($groups);
-                    } else {
-                        $grouppermHandler->deleteAll($criteria);
-                    }
-                    unset($criteria);
-                }
-            }
-            $url = $redirect_to_edit ? 'field.php?op=edit&amp;id=' . $obj->getVar('field_id') : 'field.php';
-            redirect_header($url, 3, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
-        }
+			$perm_arr = [];
+			if ($obj->getVar('field_show')) {
+				$perm_arr[] = 'songlist_show';
+				$perm_arr[] = 'songlist_visible';
+			}
+			if ($obj->getVar('field_edit')) {
+				$perm_arr[] = 'songlist_edit';
+			}
+			if ($obj->getVar('field_edit') || $obj->getVar('field_show')) {
+				$perm_arr[] = 'songlist_search';
+			}
+			if (count($perm_arr) > 0) {
+				foreach ($perm_arr as $perm) {
+					$criteria = new \CriteriaCompo(new \Criteria('gperm_name', $perm));
+					$criteria->add(new \Criteria('gperm_itemid', (int)$obj->getVar('field_id')));
+					$criteria->add(new \Criteria('gperm_modid', (int)$GLOBALS['songlistModule']->getVar('mid')));
+					if (isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm])) {
+						$perms = $grouppermHandler->getObjects($criteria);
+						if (count($perms) > 0) {
+							foreach (array_keys($perms) as $i) {
+								$groups[$perms[$i]->getVar('gperm_groupid')] = $perms[$i];
+							}
+						} else {
+							$groups = [];
+						}
+						foreach ($_REQUEST[$perm] as $grouoid) {
+							$grouoid = (int)$grouoid;
+							if (!isset($groups[$grouoid])) {
+								$perm_obj = $grouppermHandler->create();
+								$perm_obj->setVar('gperm_name', $perm);
+								$perm_obj->setVar('gperm_itemid', (int)$obj->getVar('field_id'));
+								$perm_obj->setVar('gperm_modid', $GLOBALS['songlistModule']->getVar('mid'));
+								$perm_obj->setVar('gperm_groupid', $grouoid);
+								$grouppermHandler->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'));
+							$grouppermHandler->deleteAll($criteria);
+						}
+						unset($groups);
+					} else {
+						$grouppermHandler->deleteAll($criteria);
+					}
+					unset($criteria);
+				}
+			}
+			$url = $redirect_to_edit ? 'field.php?op=edit&amp;id=' . $obj->getVar('field_id') : 'field.php';
+			redirect_header($url, 3, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
+		}
 
-        echo $obj->getHtmlErrors();
-        $form = FormController::getFieldForm($obj);
-        $form->display();
-        break;
-    case 'delete':
-        $obj = $fieldHandler->get($_REQUEST['id']);
-        if (!$obj->getVar('field_config')) {
-            redirect_header('index.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
-        }
-        if (Request::hasVar('ok', 'REQUEST') && 1 == $_REQUEST['ok']) {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-            }
-            if ($fieldHandler->delete($obj)) {
-                redirect_header('field.php', 3, sprintf(_AM_SONGLIST_FIELDS_DELETEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
-            } else {
-                echo $obj->getHtmlErrors();
-            }
-        } else {
-            xoops_confirm(['ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'], $_SERVER['REQUEST_URI'], sprintf(_AM_SONGLIST_FIELDS_RUSUREDEL, $obj->getVar('field_title')));
-        }
-        break;
+		echo $obj->getHtmlErrors();
+		$form = FormController::getFieldForm($obj);
+		$form->display();
+		break;
+	case 'delete':
+		$obj = $fieldHandler->get($_REQUEST['id']);
+		if (!$obj->getVar('field_config')) {
+			redirect_header('index.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
+		}
+		if (Request::hasVar('ok', 'REQUEST') && 1 == $_REQUEST['ok']) {
+			if (!$GLOBALS['xoopsSecurity']->check()) {
+				redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+			}
+			if ($fieldHandler->delete($obj)) {
+				redirect_header('field.php', 3, sprintf(_AM_SONGLIST_FIELDS_DELETEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
+			} else {
+				echo $obj->getHtmlErrors();
+			}
+		} else {
+			xoops_confirm(['ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'], $_SERVER['REQUEST_URI'], sprintf(_AM_SONGLIST_FIELDS_RUSUREDEL, $obj->getVar('field_title')));
+		}
+		break;
 }
 
 if (isset($template_main)) {
-    $GLOBALS['xoopsTpl']->display("db:{$template_main}");
+	$GLOBALS['xoopsTpl']->display("db:{$template_main}");
 }
 
 xoops_cp_footer();

Spacing +19 added lines, -19 removed lines

@@ -5,7 +5,7 @@ 
 use XoopsModules\Songlist\Helper;
 use XoopsModules\Songlist\Form\FormController;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 xoops_cp_header();
 
 $op           = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : (!empty($_REQUEST['id']) ? 'edit' : 'list')));
@@ -36,7 +36,7 @@ 
             unset($criteria);
 
             $categories[0] = ['cid' => 0, 'name' => _AM_SONGLIST_FIELDS_DEFAULT];
-            if (count($category) > 0) {
+            if (count($category)>0) {
                 foreach (array_keys($category) as $i) {
                     $categories[$category[$i]->getVar('cid')] = ['cid' => $category[$i]->getVar('cid'), 'name' => $category[$i]->getVar('name')];
                 }
@@ -141,7 +141,7 @@ 
             redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
         }
 
-        if (Request::hasVar('field_ids', 'POST') && count($_POST['field_ids']) > 0) {
+        if (Request::hasVar('field_ids', 'POST') && count($_POST['field_ids'])>0) {
             $oldweight     = $_POST['oldweight'];
             $oldcat        = $_POST['oldcat'];
             $oldcategories = $_POST['oldcategories'];
@@ -149,25 +149,25 @@ 
             $weight        = $_POST['weight'];
             $ids           = [];
             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 ($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[] = (int)$field_id;
+                    $ids[] = (int) $field_id;
                 }
             }
-            if (count($ids) > 0) {
+            if (count($ids)>0) {
                 $errors = [];
                 //if there are changed fields, fetch the fieldcategory objects
                 $fieldHandler = Helper::getInstance()
                                       ->getHandler('Field');
-                $fields       = $fieldHandler->getObjects(new \Criteria('field_id', '(' . implode(',', $ids) . ')', 'IN'), true);
+                $fields       = $fieldHandler->getObjects(new \Criteria('field_id', '('.implode(',', $ids).')', 'IN'), true);
                 foreach ($ids as $i) {
-                    $fields[$i]->setVar('field_weight', (int)$weight[$i]);
+                    $fields[$i]->setVar('field_weight', (int) $weight[$i]);
                     $fields[$i]->setVar('cids', $categories[$i]);
                     if (!$fieldHandler->insert($fields[$i])) {
                         $errors = array_merge($errors, $fields[$i]->getErrors());
                     }
                 }
-                if (0 == count($errors)) {
+                if (0==count($errors)) {
                     //no errors
                     redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
                 } else {
@@ -258,14 +258,14 @@ 
             if ($obj->getVar('field_edit') || $obj->getVar('field_show')) {
                 $perm_arr[] = 'songlist_search';
             }
-            if (count($perm_arr) > 0) {
+            if (count($perm_arr)>0) {
                 foreach ($perm_arr as $perm) {
                     $criteria = new \CriteriaCompo(new \Criteria('gperm_name', $perm));
-                    $criteria->add(new \Criteria('gperm_itemid', (int)$obj->getVar('field_id')));
-                    $criteria->add(new \Criteria('gperm_modid', (int)$GLOBALS['songlistModule']->getVar('mid')));
+                    $criteria->add(new \Criteria('gperm_itemid', (int) $obj->getVar('field_id')));
+                    $criteria->add(new \Criteria('gperm_modid', (int) $GLOBALS['songlistModule']->getVar('mid')));
                     if (isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm])) {
                         $perms = $grouppermHandler->getObjects($criteria);
-                        if (count($perms) > 0) {
+                        if (count($perms)>0) {
                             foreach (array_keys($perms) as $i) {
                                 $groups[$perms[$i]->getVar('gperm_groupid')] = $perms[$i];
                             }
@@ -273,11 +273,11 @@ 
                             $groups = [];
                         }
                         foreach ($_REQUEST[$perm] as $grouoid) {
-                            $grouoid = (int)$grouoid;
+                            $grouoid = (int) $grouoid;
                             if (!isset($groups[$grouoid])) {
                                 $perm_obj = $grouppermHandler->create();
                                 $perm_obj->setVar('gperm_name', $perm);
-                                $perm_obj->setVar('gperm_itemid', (int)$obj->getVar('field_id'));
+                                $perm_obj->setVar('gperm_itemid', (int) $obj->getVar('field_id'));
                                 $perm_obj->setVar('gperm_modid', $GLOBALS['songlistModule']->getVar('mid'));
                                 $perm_obj->setVar('gperm_groupid', $grouoid);
                                 $grouppermHandler->insert($perm_obj);
@@ -285,8 +285,8 @@ 
                             }
                         }
                         $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'));
                             $grouppermHandler->deleteAll($criteria);
                         }
                         unset($groups);
@@ -296,7 +296,7 @@ 
                     unset($criteria);
                 }
             }
-            $url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php';
+            $url = $redirect_to_edit ? 'field.php?op=edit&id='.$obj->getVar('field_id') : 'field.php';
             redirect_header($url, 3, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
         }
 
@@ -309,7 +309,7 @@ 
         if (!$obj->getVar('field_config')) {
             redirect_header('index.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
         }
-        if (Request::hasVar('ok', 'REQUEST') && 1 == $_REQUEST['ok']) {
+        if (Request::hasVar('ok', 'REQUEST') && 1==$_REQUEST['ok']) {
             if (!$GLOBALS['xoopsSecurity']->check()) {
                 redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
             }

admin/migrate.php

Indentation +28 added lines, -28 removed lines

@@ -23,9 +23,9 @@ 
 use Xmf\Request;
 use Xmf\Module\Admin;
 use XoopsModules\Songlist\{
-    Common\Configurator,
-    Common\Migrate,
-    Helper
+	Common\Configurator,
+	Common\Migrate,
+	Helper
 };
 
 /** @var Admin $adminObject */
@@ -68,31 +68,31 @@ 
 $message = '';
 
 switch ($op) {
-    case 'show':
-    default:
-        $queue = $migrator->getSynchronizeDDL();
-        if (!empty($queue)) {
-            echo "<pre>\n";
-            foreach ($queue as $line) {
-                echo $line . ";\n";
-            }
-            echo "</pre>\n";
-        }
-        break;
-    case 'migrate':
-        $migrator->synchronizeSchema();
-        $message = constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_OK');
-        break;
-    case 'schema':
-        xoops_confirm(['op' => 'confirmwrite'], 'migrate.php', constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_WARNING'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'));
-        break;
-    case 'confirmwrite':
-        if ($GLOBALS['xoopsSecurity']->check()) {
-            $migrator->saveCurrentSchema();
-
-            $message = constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_SCHEMA_OK');
-        }
-        break;
+	case 'show':
+	default:
+		$queue = $migrator->getSynchronizeDDL();
+		if (!empty($queue)) {
+			echo "<pre>\n";
+			foreach ($queue as $line) {
+				echo $line . ";\n";
+			}
+			echo "</pre>\n";
+		}
+		break;
+	case 'migrate':
+		$migrator->synchronizeSchema();
+		$message = constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_OK');
+		break;
+	case 'schema':
+		xoops_confirm(['op' => 'confirmwrite'], 'migrate.php', constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_WARNING'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'));
+		break;
+	case 'confirmwrite':
+		if ($GLOBALS['xoopsSecurity']->check()) {
+			$migrator->saveCurrentSchema();
+
+			$message = constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_SCHEMA_OK');
+		}
+		break;
 }
 
 echo "<div>$message</div>";

Spacing +6 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
 /** @var Configurator $configurator */
 /** @var Migrate $migrator */
 
-require __DIR__ . '/admin_header.php';
+require __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 $adminObject->displayNavigation(basename(__FILE__));
@@ -74,27 +74,27 @@ 
         if (!empty($queue)) {
             echo "<pre>\n";
             foreach ($queue as $line) {
-                echo $line . ";\n";
+                echo $line.";\n";
             }
             echo "</pre>\n";
         }
         break;
     case 'migrate':
         $migrator->synchronizeSchema();
-        $message = constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_OK');
+        $message = constant('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_OK');
         break;
     case 'schema':
-        xoops_confirm(['op' => 'confirmwrite'], 'migrate.php', constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_WARNING'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'));
+        xoops_confirm(['op' => 'confirmwrite'], 'migrate.php', constant('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_WARNING'), constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'));
         break;
     case 'confirmwrite':
         if ($GLOBALS['xoopsSecurity']->check()) {
             $migrator->saveCurrentSchema();
 
-            $message = constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_SCHEMA_OK');
+            $message = constant('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_SCHEMA_OK');
         }
         break;
 }
 
 echo "<div>$message</div>";
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/artists.php

Indentation +150 added lines, -150 removed lines

@@ -21,156 +21,156 @@
 $filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
 
 switch ($op) {
-    default:
-    case 'artists':
-        switch ($fct) {
-            default:
-            case 'list':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                /** @var ArtistsHandler $artistsHandler */
-                $artistsHandler = Helper::getInstance()->getHandler('Artists');
-
-                $criteria        = $artistsHandler->getFilterCriteria($GLOBALS['filter']);
-                $ttl             = $artistsHandler->getCount($criteria);
-                $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 ($artistsHandler->filterFields() as $id => $key) {
-                    $GLOBALS['xoopsTpl']->assign(
-                        \mb_strtolower(str_replace('-', '_', $key) . '_th'),
-                        '<a href="'
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?start='
-                        . $GLOBALS['start']
-                        . '&limit='
-                        . $GLOBALS['limit']
-                        . '&sort='
-                        . $key
-                        . '&order='
-                        . (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
-                        . '&op='
-                        . $GLOBALS['op']
-                        . '&filter='
-                        . $GLOBALS['filter']
-                        . '">'
-                        . (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
-                        . '</a>'
-                    );
-                    $GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $artistsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
-                }
-
-                $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
-                $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
-                $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
-                $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
-                $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-
-                $criteria->setStart($GLOBALS['start']);
-                $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
-                $criteria->setOrder($GLOBALS['order']);
-
-                $artistsArray = $artistsHandler->getObjects($criteria, true);
-                foreach ($artistsArray as $cid => $artist) {
-                    if (is_object($artist)) {
-                        $GLOBALS['xoopsTpl']->append('artists', $artist->toArray());
-                    }
-                }
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormArtists(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_list.tpl');
-                break;
-            case 'new':
-            case 'edit':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                $artistsHandler = Helper::getInstance()->getHandler('Artists');
-                if (Request::hasVar('id', 'REQUEST')) {
-                    $artist = $artistsHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                } else {
-                    $artist = $artistsHandler->create();
-                }
-
-                $GLOBALS['xoopsTpl']->assign('form', $artist->getForm());
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_edit.tpl');
-                break;
-            case 'save':
-                $artistsHandler = Helper::getInstance()->getHandler('Artists');
-                $id             = 0;
-                $id             = Request::getInt('id', 0, 'REQUEST');
-                if ($id) {
-                    $artist = $artistsHandler->get($id);
-                } else {
-                    $artist = $artistsHandler->create();
-                }
-                $artist->setVars($_POST[$id]);
-
-                if (!$id = $artistsHandler->insert($artist)) {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE);
-                    exit(0);
-                }
-                if ('new' === isset($_REQUEST['state']) ? $_REQUEST['state'][$_REQUEST['id']]:'') {
-                    redirect_header(
-                        $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=edit&id=' . $_REQUEST['id'] . '&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
-                        10,
-                        _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY
-                    );
-                } else {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
-                }
-                exit(0);
-
-                break;
-            case 'savelist':
-                $artistsHandler = Helper::getInstance()->getHandler('Artists');
-                foreach ($_REQUEST['id'] as $id) {
-                    $artist = $artistsHandler->get($id);
-                    $artist->setVars($_POST[$id]);
-                    if (!$artistsHandler->insert($artist)) {
-                        redirect_header(
-                            $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
-                            10,
-                            _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE
-                        );
-                        exit(0);
-                    }
-                }
-                redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
-                exit(0);
-                break;
-            case 'delete':
-                $artistsHandler = Helper::getInstance()->getHandler('Artists');
-                $id             = 0;
-                if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
-                    $artist = $artistsHandler->get($id);
-                    if (!$artistsHandler->delete($artist)) {
-                        redirect_header(
-                            $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
-                            10,
-                            _AM_SONGLIST_MSG_ARTISTS_FAILEDTODELETE
-                        );
-                        exit(0);
-                    }
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_DELETED);
-                    exit(0);
-                }
-                $artist = $artistsHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                xoops_confirm(
-                    ['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
-                    $_SERVER['SCRIPT_NAME'],
-                    sprintf(_AM_SONGLIST_MSG_ARTISTS_DELETE, $artist->getVar('name'))
-                );
-
-                break;
-        }
-        break;
+	default:
+	case 'artists':
+		switch ($fct) {
+			default:
+			case 'list':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				/** @var ArtistsHandler $artistsHandler */
+				$artistsHandler = Helper::getInstance()->getHandler('Artists');
+
+				$criteria        = $artistsHandler->getFilterCriteria($GLOBALS['filter']);
+				$ttl             = $artistsHandler->getCount($criteria);
+				$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 ($artistsHandler->filterFields() as $id => $key) {
+					$GLOBALS['xoopsTpl']->assign(
+						\mb_strtolower(str_replace('-', '_', $key) . '_th'),
+						'<a href="'
+						. $_SERVER['SCRIPT_NAME']
+						. '?start='
+						. $GLOBALS['start']
+						. '&limit='
+						. $GLOBALS['limit']
+						. '&sort='
+						. $key
+						. '&order='
+						. (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
+						. '&op='
+						. $GLOBALS['op']
+						. '&filter='
+						. $GLOBALS['filter']
+						. '">'
+						. (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
+						. '</a>'
+					);
+					$GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $artistsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+				}
+
+				$GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
+				$GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
+				$GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
+				$GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
+				$GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+
+				$criteria->setStart($GLOBALS['start']);
+				$criteria->setLimit($GLOBALS['limit']);
+				$criteria->setSort('`' . $GLOBALS['sort'] . '`');
+				$criteria->setOrder($GLOBALS['order']);
+
+				$artistsArray = $artistsHandler->getObjects($criteria, true);
+				foreach ($artistsArray as $cid => $artist) {
+					if (is_object($artist)) {
+						$GLOBALS['xoopsTpl']->append('artists', $artist->toArray());
+					}
+				}
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormArtists(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_list.tpl');
+				break;
+			case 'new':
+			case 'edit':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				$artistsHandler = Helper::getInstance()->getHandler('Artists');
+				if (Request::hasVar('id', 'REQUEST')) {
+					$artist = $artistsHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				} else {
+					$artist = $artistsHandler->create();
+				}
+
+				$GLOBALS['xoopsTpl']->assign('form', $artist->getForm());
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_edit.tpl');
+				break;
+			case 'save':
+				$artistsHandler = Helper::getInstance()->getHandler('Artists');
+				$id             = 0;
+				$id             = Request::getInt('id', 0, 'REQUEST');
+				if ($id) {
+					$artist = $artistsHandler->get($id);
+				} else {
+					$artist = $artistsHandler->create();
+				}
+				$artist->setVars($_POST[$id]);
+
+				if (!$id = $artistsHandler->insert($artist)) {
+					redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE);
+					exit(0);
+				}
+				if ('new' === isset($_REQUEST['state']) ? $_REQUEST['state'][$_REQUEST['id']]:'') {
+					redirect_header(
+						$_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=edit&id=' . $_REQUEST['id'] . '&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+						10,
+						_AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY
+					);
+				} else {
+					redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
+				}
+				exit(0);
+
+				break;
+			case 'savelist':
+				$artistsHandler = Helper::getInstance()->getHandler('Artists');
+				foreach ($_REQUEST['id'] as $id) {
+					$artist = $artistsHandler->get($id);
+					$artist->setVars($_POST[$id]);
+					if (!$artistsHandler->insert($artist)) {
+						redirect_header(
+							$_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+							10,
+							_AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE
+						);
+						exit(0);
+					}
+				}
+				redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
+				exit(0);
+				break;
+			case 'delete':
+				$artistsHandler = Helper::getInstance()->getHandler('Artists');
+				$id             = 0;
+				if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
+					$artist = $artistsHandler->get($id);
+					if (!$artistsHandler->delete($artist)) {
+						redirect_header(
+							$_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+							10,
+							_AM_SONGLIST_MSG_ARTISTS_FAILEDTODELETE
+						);
+						exit(0);
+					}
+					redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_DELETED);
+					exit(0);
+				}
+				$artist = $artistsHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				xoops_confirm(
+					['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
+					$_SERVER['SCRIPT_NAME'],
+					sprintf(_AM_SONGLIST_MSG_ARTISTS_DELETE, $artist->getVar('name'))
+				);
+
+				break;
+		}
+		break;
 }
 
 xoops_cp_footer();

Spacing +18 added lines, -18 removed lines

@@ -6,7 +6,7 @@ 
 use XoopsModules\Songlist\ArtistsHandler;
 use XoopsModules\Songlist\Form\FormController;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -17,8 +17,8 @@ 
 $limit  = Request::getInt('limit', 30, 'REQUEST');
 $start  = Request::getInt('start', 0, 'REQUEST');
 $order  = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
-$sort   = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-$filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
+$sort   = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
+$filter = !empty($_REQUEST['filter']) ? ''.$_REQUEST['filter'].'' : '1,1';
 
 switch ($op) {
     default:
@@ -34,14 +34,14 @@ 
 
                 $criteria        = $artistsHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $artistsHandler->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']);
+                $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 ($artistsHandler->filterFields() as $id => $key) {
                     $GLOBALS['xoopsTpl']->assign(
-                        \mb_strtolower(str_replace('-', '_', $key) . '_th'),
+                        \mb_strtolower(str_replace('-', '_', $key).'_th'),
                         '<a href="'
                         . $_SERVER['SCRIPT_NAME']
                         . '?start='
@@ -51,16 +51,16 @@ 
                         . '&sort='
                         . $key
                         . '&order='
-                        . (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
+                        . (($key==$GLOBALS['sort']) ? ('DESC'===$GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
                         . '&op='
                         . $GLOBALS['op']
                         . '&filter='
                         . $GLOBALS['filter']
                         . '">'
-                        . (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
+                        . (defined('_AM_SONGLIST_TH_'.\mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_'.\mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_'.\mb_strtoupper(str_replace('-', '_', $key)))
                         . '</a>'
                     );
-                    $GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $artistsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+                    $GLOBALS['xoopsTpl']->assign('filter_'.\mb_strtolower(str_replace('-', '_', $key)).'_th', $artistsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
                 }
 
                 $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
@@ -72,7 +72,7 @@ 
 
                 $criteria->setStart($GLOBALS['start']);
                 $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
+                $criteria->setSort('`'.$GLOBALS['sort'].'`');
                 $criteria->setOrder($GLOBALS['order']);
 
                 $artistsArray = $artistsHandler->getObjects($criteria, true);
@@ -113,17 +113,17 @@ 
                 $artist->setVars($_POST[$id]);
 
                 if (!$id = $artistsHandler->insert($artist)) {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE);
+                    redirect_header($_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE);
                     exit(0);
                 }
-                if ('new' === isset($_REQUEST['state']) ? $_REQUEST['state'][$_REQUEST['id']]:'') {
+                if ('new'===isset($_REQUEST['state']) ? $_REQUEST['state'][$_REQUEST['id']] : '') {
                     redirect_header(
-                        $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=edit&id=' . $_REQUEST['id'] . '&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+                        $_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'].'&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'],
                         10,
                         _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY
                     );
                 } else {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
+                    redirect_header($_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
                 }
                 exit(0);
 
@@ -135,14 +135,14 @@ 
                     $artist->setVars($_POST[$id]);
                     if (!$artistsHandler->insert($artist)) {
                         redirect_header(
-                            $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+                            $_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'],
                             10,
                             _AM_SONGLIST_MSG_ARTISTS_FAILEDTOSAVE
                         );
                         exit(0);
                     }
                 }
-                redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
+                redirect_header($_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_SAVEDOKEY);
                 exit(0);
                 break;
             case 'delete':
@@ -152,13 +152,13 @@ 
                     $artist = $artistsHandler->get($id);
                     if (!$artistsHandler->delete($artist)) {
                         redirect_header(
-                            $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+                            $_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'],
                             10,
                             _AM_SONGLIST_MSG_ARTISTS_FAILEDTODELETE
                         );
                         exit(0);
                     }
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_DELETED);
+                    redirect_header($_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_ARTISTS_DELETED);
                     exit(0);
                 }
                 $artist = $artistsHandler->get(Request::getInt('id', 0, 'REQUEST'));

admin/about.php

Spacing +2 added lines, -2 removed lines

@@ -16,11 +16,11 @@
  */
 /** @var \Xmf\Module\Admin $adminObject */
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 $adminObject->displayNavigation(basename(__FILE__));
 $adminObject::setPaypal('xoopsfoundation@gmail.com');
 $adminObject->displayAbout(false);
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/utf8map.php

Indentation +150 added lines, -150 removed lines

@@ -21,156 +21,156 @@
 $filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
 
 switch ($op) {
-    default:
-    case 'utf8map':
-        switch ($fct) {
-            default:
-            case 'list':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                /** @var Utf8mapHandler $utf8mapHandler */
-                $utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
-
-                $criteria        = $utf8mapHandler->getFilterCriteria($GLOBALS['filter']);
-                $ttl             = $utf8mapHandler->getCount($criteria);
-                $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 ($utf8mapHandler->filterFields() as $id => $key) {
-                    $GLOBALS['xoopsTpl']->assign(
-                        \mb_strtolower(str_replace('-', '_', $key) . '_th'),
-                        '<a href="'
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?start='
-                        . $GLOBALS['start']
-                        . '&limit='
-                        . $GLOBALS['limit']
-                        . '&sort='
-                        . $key
-                        . '&order='
-                        . (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
-                        . '&op='
-                        . $GLOBALS['op']
-                        . '&filter='
-                        . $GLOBALS['filter']
-                        . '">'
-                        . (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
-                        . '</a>'
-                    );
-                    $GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $utf8mapHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
-                }
-
-                $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
-                $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
-                $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
-                $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
-                $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-
-                $criteria->setStart($GLOBALS['start']);
-                $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
-                $criteria->setOrder($GLOBALS['order']);
-
-                $utf8maps = $utf8mapHandler->getObjects($criteria, true);
-                foreach ($utf8maps as $cid => $utf8map) {
-                    if (is_object($utf8map)) {
-                        $GLOBALS['xoopsTpl']->append('utf8map', $utf8map->toArray());
-                    }
-                }
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormUtf8map(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_utf8map_list.tpl');
-                break;
-            case 'new':
-            case 'edit':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                $utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
-                if (Request::hasVar('id', 'REQUEST')) {
-                    $utf8map = $utf8mapHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                } else {
-                    $utf8map = $utf8mapHandler->create();
-                }
-
-                $GLOBALS['xoopsTpl']->assign('form', $utf8map->getForm());
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_utf8map_edit.tpl');
-                break;
-            case 'save':
-                $utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
-                $id             = 0;
-                $id             = Request::getInt('id', 0, 'REQUEST');
-                if ($id) {
-                    $utf8map = $utf8mapHandler->get($id);
-                } else {
-                    $utf8map = $utf8mapHandler->create();
-                }
-                $utf8map->setVars($_POST[$id]);
-
-                if (!$id = $utf8mapHandler->insert($utf8map)) {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_FAILEDTOSAVE);
-                    exit(0);
-                }
-                if ('new' === $_REQUEST['state'][$_REQUEST['id']]) {
-                    redirect_header(
-                        $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=edit&id=' . $_REQUEST['id'] . '&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
-                        10,
-                        _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY
-                    );
-                } else {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
-                }
-                exit(0);
-
-                break;
-            case 'savelist':
-                $utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
-                foreach ($_REQUEST['id'] as $id) {
-                    $utf8map = $utf8mapHandler->get($id);
-                    $utf8map->setVars($_POST[$id]);
-                    if (!$utf8mapHandler->insert($utf8map)) {
-                        redirect_header(
-                            $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
-                            10,
-                            _AM_SONGLIST_MSG_UTF8MAP_FAILEDTOSAVE
-                        );
-                        exit(0);
-                    }
-                }
-                redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
-                exit(0);
-                break;
-            case 'delete':
-                $utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
-                $id             = 0;
-                if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
-                    $utf8map = $utf8mapHandler->get($id);
-                    if (!$utf8mapHandler->delete($utf8map)) {
-                        redirect_header(
-                            $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
-                            10,
-                            _AM_SONGLIST_MSG_UTF8MAP_FAILEDTODELETE
-                        );
-                        exit(0);
-                    }
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_DELETED);
-                    exit(0);
-                }
-                $utf8map = $utf8mapHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                xoops_confirm(
-                    ['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
-                    $_SERVER['SCRIPT_NAME'],
-                    sprintf(_AM_SONGLIST_MSG_UTF8MAP_DELETE, $utf8map->getVar('from'), $utf8map->getVar('to'))
-                );
-
-                break;
-        }
-        break;
+	default:
+	case 'utf8map':
+		switch ($fct) {
+			default:
+			case 'list':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				/** @var Utf8mapHandler $utf8mapHandler */
+				$utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
+
+				$criteria        = $utf8mapHandler->getFilterCriteria($GLOBALS['filter']);
+				$ttl             = $utf8mapHandler->getCount($criteria);
+				$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 ($utf8mapHandler->filterFields() as $id => $key) {
+					$GLOBALS['xoopsTpl']->assign(
+						\mb_strtolower(str_replace('-', '_', $key) . '_th'),
+						'<a href="'
+						. $_SERVER['SCRIPT_NAME']
+						. '?start='
+						. $GLOBALS['start']
+						. '&limit='
+						. $GLOBALS['limit']
+						. '&sort='
+						. $key
+						. '&order='
+						. (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
+						. '&op='
+						. $GLOBALS['op']
+						. '&filter='
+						. $GLOBALS['filter']
+						. '">'
+						. (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
+						. '</a>'
+					);
+					$GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $utf8mapHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+				}
+
+				$GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
+				$GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
+				$GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
+				$GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
+				$GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+
+				$criteria->setStart($GLOBALS['start']);
+				$criteria->setLimit($GLOBALS['limit']);
+				$criteria->setSort('`' . $GLOBALS['sort'] . '`');
+				$criteria->setOrder($GLOBALS['order']);
+
+				$utf8maps = $utf8mapHandler->getObjects($criteria, true);
+				foreach ($utf8maps as $cid => $utf8map) {
+					if (is_object($utf8map)) {
+						$GLOBALS['xoopsTpl']->append('utf8map', $utf8map->toArray());
+					}
+				}
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormUtf8map(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_utf8map_list.tpl');
+				break;
+			case 'new':
+			case 'edit':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				$utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
+				if (Request::hasVar('id', 'REQUEST')) {
+					$utf8map = $utf8mapHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				} else {
+					$utf8map = $utf8mapHandler->create();
+				}
+
+				$GLOBALS['xoopsTpl']->assign('form', $utf8map->getForm());
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_utf8map_edit.tpl');
+				break;
+			case 'save':
+				$utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
+				$id             = 0;
+				$id             = Request::getInt('id', 0, 'REQUEST');
+				if ($id) {
+					$utf8map = $utf8mapHandler->get($id);
+				} else {
+					$utf8map = $utf8mapHandler->create();
+				}
+				$utf8map->setVars($_POST[$id]);
+
+				if (!$id = $utf8mapHandler->insert($utf8map)) {
+					redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_FAILEDTOSAVE);
+					exit(0);
+				}
+				if ('new' === $_REQUEST['state'][$_REQUEST['id']]) {
+					redirect_header(
+						$_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=edit&id=' . $_REQUEST['id'] . '&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+						10,
+						_AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY
+					);
+				} else {
+					redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
+				}
+				exit(0);
+
+				break;
+			case 'savelist':
+				$utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
+				foreach ($_REQUEST['id'] as $id) {
+					$utf8map = $utf8mapHandler->get($id);
+					$utf8map->setVars($_POST[$id]);
+					if (!$utf8mapHandler->insert($utf8map)) {
+						redirect_header(
+							$_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+							10,
+							_AM_SONGLIST_MSG_UTF8MAP_FAILEDTOSAVE
+						);
+						exit(0);
+					}
+				}
+				redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
+				exit(0);
+				break;
+			case 'delete':
+				$utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
+				$id             = 0;
+				if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
+					$utf8map = $utf8mapHandler->get($id);
+					if (!$utf8mapHandler->delete($utf8map)) {
+						redirect_header(
+							$_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+							10,
+							_AM_SONGLIST_MSG_UTF8MAP_FAILEDTODELETE
+						);
+						exit(0);
+					}
+					redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_DELETED);
+					exit(0);
+				}
+				$utf8map = $utf8mapHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				xoops_confirm(
+					['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
+					$_SERVER['SCRIPT_NAME'],
+					sprintf(_AM_SONGLIST_MSG_UTF8MAP_DELETE, $utf8map->getVar('from'), $utf8map->getVar('to'))
+				);
+
+				break;
+		}
+		break;
 }
 
 xoops_cp_footer();

Spacing +18 added lines, -18 removed lines

@@ -6,7 +6,7 @@ 
 use XoopsModules\Songlist\Utf8mapHandler;
 use XoopsModules\Songlist\Form\FormController;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -17,8 +17,8 @@ 
 $limit  = Request::getInt('limit', 30, 'REQUEST');
 $start  = Request::getInt('start', 0, 'REQUEST');
 $order  = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
-$sort   = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-$filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
+$sort   = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
+$filter = !empty($_REQUEST['filter']) ? ''.$_REQUEST['filter'].'' : '1,1';
 
 switch ($op) {
     default:
@@ -34,14 +34,14 @@ 
 
                 $criteria        = $utf8mapHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $utf8mapHandler->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']);
+                $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 ($utf8mapHandler->filterFields() as $id => $key) {
                     $GLOBALS['xoopsTpl']->assign(
-                        \mb_strtolower(str_replace('-', '_', $key) . '_th'),
+                        \mb_strtolower(str_replace('-', '_', $key).'_th'),
                         '<a href="'
                         . $_SERVER['SCRIPT_NAME']
                         . '?start='
@@ -51,16 +51,16 @@ 
                         . '&sort='
                         . $key
                         . '&order='
-                        . (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
+                        . (($key==$GLOBALS['sort']) ? ('DESC'===$GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
                         . '&op='
                         . $GLOBALS['op']
                         . '&filter='
                         . $GLOBALS['filter']
                         . '">'
-                        . (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
+                        . (defined('_AM_SONGLIST_TH_'.\mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_'.\mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_'.\mb_strtoupper(str_replace('-', '_', $key)))
                         . '</a>'
                     );
-                    $GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $utf8mapHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+                    $GLOBALS['xoopsTpl']->assign('filter_'.\mb_strtolower(str_replace('-', '_', $key)).'_th', $utf8mapHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
                 }
 
                 $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
@@ -72,7 +72,7 @@ 
 
                 $criteria->setStart($GLOBALS['start']);
                 $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
+                $criteria->setSort('`'.$GLOBALS['sort'].'`');
                 $criteria->setOrder($GLOBALS['order']);
 
                 $utf8maps = $utf8mapHandler->getObjects($criteria, true);
@@ -113,17 +113,17 @@ 
                 $utf8map->setVars($_POST[$id]);
 
                 if (!$id = $utf8mapHandler->insert($utf8map)) {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_FAILEDTOSAVE);
+                    redirect_header($_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_FAILEDTOSAVE);
                     exit(0);
                 }
-                if ('new' === $_REQUEST['state'][$_REQUEST['id']]) {
+                if ('new'===$_REQUEST['state'][$_REQUEST['id']]) {
                     redirect_header(
-                        $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=edit&id=' . $_REQUEST['id'] . '&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+                        $_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'].'&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'],
                         10,
                         _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY
                     );
                 } else {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
+                    redirect_header($_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
                 }
                 exit(0);
 
@@ -135,14 +135,14 @@ 
                     $utf8map->setVars($_POST[$id]);
                     if (!$utf8mapHandler->insert($utf8map)) {
                         redirect_header(
-                            $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+                            $_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'],
                             10,
                             _AM_SONGLIST_MSG_UTF8MAP_FAILEDTOSAVE
                         );
                         exit(0);
                     }
                 }
-                redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
+                redirect_header($_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_SAVEDOKEY);
                 exit(0);
                 break;
             case 'delete':
@@ -152,13 +152,13 @@ 
                     $utf8map = $utf8mapHandler->get($id);
                     if (!$utf8mapHandler->delete($utf8map)) {
                         redirect_header(
-                            $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+                            $_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'],
                             10,
                             _AM_SONGLIST_MSG_UTF8MAP_FAILEDTODELETE
                         );
                         exit(0);
                     }
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_DELETED);
+                    redirect_header($_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_UTF8MAP_DELETED);
                     exit(0);
                 }
                 $utf8map = $utf8mapHandler->get(Request::getInt('id', 0, 'REQUEST'));

admin/permissions.php

Indentation +331 added lines, -331 removed lines

@@ -33,68 +33,68 @@ 
  */
 class forum_XoopsGroupPermForm extends \XoopsGroupPermForm
 {
-    /**
-     * forum_XoopsGroupPermForm constructor.
-     * @param        $title
-     * @param        $modid
-     * @param        $permname
-     * @param        $permdesc
-     * @param string $url
-     */
-    public function __construct($title, $modid, $permname, $permdesc, $url = '')
-    {
-        parent::__construct($title, $modid, $permname, $permdesc, $url);
-    }
+	/**
+	 * forum_XoopsGroupPermForm constructor.
+	 * @param        $title
+	 * @param        $modid
+	 * @param        $permname
+	 * @param        $permdesc
+	 * @param string $url
+	 */
+	public function __construct($title, $modid, $permname, $permdesc, $url = '')
+	{
+		parent::__construct($title, $modid, $permname, $permdesc, $url);
+	}
 
-    /**
-     * @return string
-     */
-    public function render(): string
-    {
-        // load all child ids for javascript codes
-        foreach (array_keys($this->_itemTree) as $item_id) {
-            $this->_itemTree[$item_id]['allchild'] = [];
-            $this->_loadAllChildItemIds($item_id, $this->_itemTree[$item_id]['allchild']);
-        }
-        /** @var \XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = xoops_getHandler('groupperm');
-        /** @var \XoopsMemberHandler $memberHandler */
-        $memberHandler = xoops_getHandler('member');
-        $glist         = $memberHandler->getGroupList();
-        foreach (array_keys($glist) as $i) {
-            // get selected item id(s) for each group
-            $selected = $grouppermHandler->getItemIds($this->_permName, $i, $this->_modid);
-            $ele      = new forum_XoopsGroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
-            $ele->setOptionTree($this->_itemTree);
-            $this->addElement($ele);
-            unset($ele);
-        }
-        $tray = new \XoopsFormElementTray('');
-        $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $this->addElement($tray);
-        $ret      = '<h4>' . $this->getTitle() . '</h4>' . $this->_permDesc . '<br>';
-        $ret      .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
-        $elements = $this->getElements();
-        $hidden   = '';
-        foreach (array_keys($elements) as $i) {
-            if (!is_object($elements[$i])) {
-                $ret .= $elements[$i];
-            } elseif ($elements[$i]->isHidden()) {
-                $hidden .= $elements[$i]->render();
-            } else {
-                $ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
-                if ('' != $elements[$i]->getDescription()) {
-                    $ret .= '<br><br><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
-                }
-                $ret .= "</td>\n<td class='even'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
-            }
-        }
-        $ret .= "</table>$hidden</form>";
-        $ret .= $this->renderValidationJS(true);
+	/**
+	 * @return string
+	 */
+	public function render(): string
+	{
+		// load all child ids for javascript codes
+		foreach (array_keys($this->_itemTree) as $item_id) {
+			$this->_itemTree[$item_id]['allchild'] = [];
+			$this->_loadAllChildItemIds($item_id, $this->_itemTree[$item_id]['allchild']);
+		}
+		/** @var \XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = xoops_getHandler('groupperm');
+		/** @var \XoopsMemberHandler $memberHandler */
+		$memberHandler = xoops_getHandler('member');
+		$glist         = $memberHandler->getGroupList();
+		foreach (array_keys($glist) as $i) {
+			// get selected item id(s) for each group
+			$selected = $grouppermHandler->getItemIds($this->_permName, $i, $this->_modid);
+			$ele      = new forum_XoopsGroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
+			$ele->setOptionTree($this->_itemTree);
+			$this->addElement($ele);
+			unset($ele);
+		}
+		$tray = new \XoopsFormElementTray('');
+		$tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
+		$this->addElement($tray);
+		$ret      = '<h4>' . $this->getTitle() . '</h4>' . $this->_permDesc . '<br>';
+		$ret      .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
+		$elements = $this->getElements();
+		$hidden   = '';
+		foreach (array_keys($elements) as $i) {
+			if (!is_object($elements[$i])) {
+				$ret .= $elements[$i];
+			} elseif ($elements[$i]->isHidden()) {
+				$hidden .= $elements[$i]->render();
+			} else {
+				$ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
+				if ('' != $elements[$i]->getDescription()) {
+					$ret .= '<br><br><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
+				}
+				$ret .= "</td>\n<td class='even'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
+			}
+		}
+		$ret .= "</table>$hidden</form>";
+		$ret .= $this->renderValidationJS(true);
 
-        return $ret;
-    }
+		return $ret;
+	}
 }
 
 /**
@@ -102,93 +102,93 @@ 
  */
 class forum_XoopsGroupFormCheckBox extends \XoopsGroupFormCheckBox
 {
-    /**
-     * forum_XoopsGroupFormCheckBox constructor.
-     * @param      $caption
-     * @param      $name
-     * @param      $groupId
-     * @param null $values
-     */
-    public function __construct($caption, $name, $groupId, $values = null)
-    {
-        parent::__construct($caption, $name, $groupId, $values);
-    }
+	/**
+	 * forum_XoopsGroupFormCheckBox constructor.
+	 * @param      $caption
+	 * @param      $name
+	 * @param      $groupId
+	 * @param null $values
+	 */
+	public function __construct($caption, $name, $groupId, $values = null)
+	{
+		parent::__construct($caption, $name, $groupId, $values);
+	}
 
-    /**
-     * Renders checkbox options for this group
-     *
-     * @return string
-     */
-    public function render(): string
-    {
-        $ret  = '<table class="outer"><tr><td class="odd"><table><tr>';
-        $cols = 1;
-        foreach ($this->_optionTree[0]['children'] as $topitem) {
-            if ($cols > 4) {
-                $ret  .= '</tr><tr>';
-                $cols = 1;
-            }
-            $tree   = '<td valign="top">';
-            $prefix = '';
-            $this->_renderOptionTree($tree, $this->_optionTree[$topitem], $prefix);
-            $ret .= $tree . '</td>';
-            ++$cols;
-        }
-        $ret .= '</tr></table></td><td class="even">';
-        foreach (array_keys($this->_optionTree) as $id) {
-            if (!empty($id)) {
-                $option_ids[] = "'" . $this->getName() . '[groups][' . $this->_groupId . '][' . $id . ']' . "'";
-            }
-        }
-        $checkallbtn_id = $this->getName() . '[checkallbtn][' . $this->_groupId . ']';
-        $option_ids_str = implode(', ', $option_ids);
-        $ret            .= _ALL . ' <input id="' . $checkallbtn_id . '" type="checkbox" value="" onclick="var optionids = new Array(' . $option_ids_str . "); xoopsCheckAllElements(optionids, '" . $checkallbtn_id . "');\">";
-        $ret            .= '</td></tr></table>';
+	/**
+	 * Renders checkbox options for this group
+	 *
+	 * @return string
+	 */
+	public function render(): string
+	{
+		$ret  = '<table class="outer"><tr><td class="odd"><table><tr>';
+		$cols = 1;
+		foreach ($this->_optionTree[0]['children'] as $topitem) {
+			if ($cols > 4) {
+				$ret  .= '</tr><tr>';
+				$cols = 1;
+			}
+			$tree   = '<td valign="top">';
+			$prefix = '';
+			$this->_renderOptionTree($tree, $this->_optionTree[$topitem], $prefix);
+			$ret .= $tree . '</td>';
+			++$cols;
+		}
+		$ret .= '</tr></table></td><td class="even">';
+		foreach (array_keys($this->_optionTree) as $id) {
+			if (!empty($id)) {
+				$option_ids[] = "'" . $this->getName() . '[groups][' . $this->_groupId . '][' . $id . ']' . "'";
+			}
+		}
+		$checkallbtn_id = $this->getName() . '[checkallbtn][' . $this->_groupId . ']';
+		$option_ids_str = implode(', ', $option_ids);
+		$ret            .= _ALL . ' <input id="' . $checkallbtn_id . '" type="checkbox" value="" onclick="var optionids = new Array(' . $option_ids_str . "); xoopsCheckAllElements(optionids, '" . $checkallbtn_id . "');\">";
+		$ret            .= '</td></tr></table>';
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * @param string $tree
-     * @param array  $option
-     * @param string $prefix
-     * @param array  $parentIds
-     */
-    public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = []): void
-    {
-        if ($option['id'] > 0) :
-            $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
-            foreach ($parentIds as $pid) {
-                if ($pid <= 0) {
-                    continue;
-                }
-                $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
-                $tree       .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if(ele.checked !== true) {ele.checked = this.checked;}";
-            }
-            foreach ($option['allchild'] as $cid) {
-                $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
-                $tree      .= "var ele = xoopsGetElementById('" . $child_ele . "'); if(this.checked !== true) {ele.checked = false;}";
-            }
-            $tree .= '" value="1"';
-            if (in_array($option['id'], $this->_value, true)) {
-                $tree .= ' checked';
-            }
-            $tree .= '>' . $option['name'] . '<input type="hidden" name="' . $this->getName() . '[parents][' . $option['id'] . ']" value="' . implode(':', $parentIds) . '"><input type="hidden" name="' . $this->getName() . '[itemname][' . $option['id'] . ']" value="' . htmlspecialchars(
-                    $option['name'],
-                    ENT_QUOTES | ENT_HTML5
-                ) . "\"><br>\n";
-        else :
-            $tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\"><br>\n";
-        endif;
-        if (isset($option['children'])) {
-            foreach ($option['children'] as $child) {
-                if ($option['id'] > 0) {
-                    $parentIds[] = $option['id'];
-                }
-                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
-            }
-        }
-    }
+	/**
+	 * @param string $tree
+	 * @param array  $option
+	 * @param string $prefix
+	 * @param array  $parentIds
+	 */
+	public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = []): void
+	{
+		if ($option['id'] > 0) :
+			$tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
+			foreach ($parentIds as $pid) {
+				if ($pid <= 0) {
+					continue;
+				}
+				$parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
+				$tree       .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if(ele.checked !== true) {ele.checked = this.checked;}";
+			}
+			foreach ($option['allchild'] as $cid) {
+				$child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
+				$tree      .= "var ele = xoopsGetElementById('" . $child_ele . "'); if(this.checked !== true) {ele.checked = false;}";
+			}
+			$tree .= '" value="1"';
+			if (in_array($option['id'], $this->_value, true)) {
+				$tree .= ' checked';
+			}
+			$tree .= '>' . $option['name'] . '<input type="hidden" name="' . $this->getName() . '[parents][' . $option['id'] . ']" value="' . implode(':', $parentIds) . '"><input type="hidden" name="' . $this->getName() . '[itemname][' . $option['id'] . ']" value="' . htmlspecialchars(
+					$option['name'],
+					ENT_QUOTES | ENT_HTML5
+				) . "\"><br>\n";
+		else :
+			$tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\"><br>\n";
+		endif;
+		if (isset($option['children'])) {
+			foreach ($option['children'] as $child) {
+				if ($option['id'] > 0) {
+					$parentIds[] = $option['id'];
+				}
+				$this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
+			}
+		}
+	}
 }
 
 xoops_cp_header();
@@ -200,204 +200,204 @@ 
 $perms     = array_map('\trim', explode(',', FORUM_PERM_ITEMS));
 
 switch ($action) {
-    case 'template':
-        $opform    = new \XoopsSimpleForm(_AM_SONGLIST_PERM_ACTION, 'actionform', 'permissions.php', 'get');
-        $op_select = new \XoopsFormSelect('', 'action');
-        $op_select->setExtra('onchange="document.forms.actionform.submit()"');
-        $op_select->addOptionArray(
-            [
-                'no'       => _SELECT,
-                'template' => _AM_SONGLIST_PERM_TEMPLATE,
-                'apply'    => _AM_SONGLIST_PERM_TEMPLATEAPP,
-                'default'  => _AM_SONGLIST_PERM_SETBYGROUP,
-            ]
-        );
-        $opform->addElement($op_select);
-        $opform->display();
+	case 'template':
+		$opform    = new \XoopsSimpleForm(_AM_SONGLIST_PERM_ACTION, 'actionform', 'permissions.php', 'get');
+		$op_select = new \XoopsFormSelect('', 'action');
+		$op_select->setExtra('onchange="document.forms.actionform.submit()"');
+		$op_select->addOptionArray(
+			[
+				'no'       => _SELECT,
+				'template' => _AM_SONGLIST_PERM_TEMPLATE,
+				'apply'    => _AM_SONGLIST_PERM_TEMPLATEAPP,
+				'default'  => _AM_SONGLIST_PERM_SETBYGROUP,
+			]
+		);
+		$opform->addElement($op_select);
+		$opform->display();
 
-        /** @var \XoopsMemberHandler $memberHandler */
-        $memberHandler       = xoops_getHandler('member');
-        $glist               = $memberHandler->getGroupList();
-        $elements            = [];
-        $songlistpermHandler = Helper::getInstance()->getHandler('Permission');
-        $perm_template       = $songlistpermHandler->getTemplate($groupid = 0);
-        foreach (array_keys($glist) as $i) {
-            $selected   = !empty($perm_template[$i]) ? array_keys($perm_template[$i]) : [];
-            $ret_ele    = '<tr align="left" valign="top"><td class="head">' . $glist[$i] . '</td>';
-            $ret_ele    .= '<td class="even">';
-            $ret_ele    .= '<table class="outer"><tr><td class="odd"><table><tr>';
-            $ii         = 0;
-            $option_ids = [];
-            foreach ($perms as $perm) {
-                ++$ii;
-                if (0 == $ii % 5) {
-                    $ret_ele .= '</tr><tr>';
-                }
-                $checked      = in_array('forum_' . $perm, $selected, true) ? ' checked' : '';
-                $option_id    = $perm . '_' . $i;
-                $option_ids[] = $option_id;
-                $ret_ele      .= '<td><input name="perms[' . $i . '][' . 'forum_' . $perm . ']" id="' . $option_id . '" onclick="" value="1" type="checkbox"' . $checked . '>' . constant('_AM_SONGLIST_CAN_' . \mb_strtoupper($perm)) . '<br></td>';
-            }
-            $ret_ele    .= '</tr></table></td><td class="even">';
-            $ret_ele    .= _ALL . ' <input id="checkall[' . $i . ']" type="checkbox" value="" onclick="var optionids = new Array(' . implode(', ', $option_ids) . '); xoopsCheckAllElements(optionids, \'checkall[' . $i . ']\')">';
-            $ret_ele    .= '</td></tr></table>';
-            $ret_ele    .= '</td></tr>';
-            $elements[] = $ret_ele;
-        }
-        $tray = new \XoopsFormElementTray('');
-        $tray->addElement(new \XoopsFormHidden('action', 'template_save'));
-        $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $ret = '<h4>' . _AM_SONGLIST_PERM_TEMPLATE . '</h4>' . _AM_SONGLIST_PERM_TEMPLATE_DESC . '<br><br><br>';
-        $ret .= "<form name='template' id='template' method='post'>\n<table width='100%' class='outer' cellspacing='1'>\n";
-        $ret .= implode("\n", $elements);
-        $ret .= '<tr align="left" valign="top"><td class="head"></td><td class="even">';
-        $ret .= $tray->render();
-        $ret .= '</td></tr>';
-        $ret .= '</table></form>';
-        echo $ret;
-        break;
-    case 'template_save':
-        $songlistpermHandler = Helper::getInstance()->getHandler('Permission');
-        $res                 = $songlistpermHandler->setTemplate($_POST['perms'], $groupid = 0);
-        if ($res) {
-            redirect_header('permissions.php?action=template', 2, _AM_SONGLIST_PERM_TEMPLATE_CREATED);
-        } else {
-            redirect_header('permissions.php?action=template', 2, _AM_SONGLIST_PERM_TEMPLATE_ERROR);
-        }
-        break;
-    case 'apply':
-        $songlistpermHandler = Helper::getInstance()->getHandler('Permission');
-        $perm_template       = $songlistpermHandler->getTemplate();
-        if (null === $perm_template) {
-            redirect_header('permissions.php?action=template', 2, _AM_SONGLIST_PERM_TEMPLATE);
-        }
+		/** @var \XoopsMemberHandler $memberHandler */
+		$memberHandler       = xoops_getHandler('member');
+		$glist               = $memberHandler->getGroupList();
+		$elements            = [];
+		$songlistpermHandler = Helper::getInstance()->getHandler('Permission');
+		$perm_template       = $songlistpermHandler->getTemplate($groupid = 0);
+		foreach (array_keys($glist) as $i) {
+			$selected   = !empty($perm_template[$i]) ? array_keys($perm_template[$i]) : [];
+			$ret_ele    = '<tr align="left" valign="top"><td class="head">' . $glist[$i] . '</td>';
+			$ret_ele    .= '<td class="even">';
+			$ret_ele    .= '<table class="outer"><tr><td class="odd"><table><tr>';
+			$ii         = 0;
+			$option_ids = [];
+			foreach ($perms as $perm) {
+				++$ii;
+				if (0 == $ii % 5) {
+					$ret_ele .= '</tr><tr>';
+				}
+				$checked      = in_array('forum_' . $perm, $selected, true) ? ' checked' : '';
+				$option_id    = $perm . '_' . $i;
+				$option_ids[] = $option_id;
+				$ret_ele      .= '<td><input name="perms[' . $i . '][' . 'forum_' . $perm . ']" id="' . $option_id . '" onclick="" value="1" type="checkbox"' . $checked . '>' . constant('_AM_SONGLIST_CAN_' . \mb_strtoupper($perm)) . '<br></td>';
+			}
+			$ret_ele    .= '</tr></table></td><td class="even">';
+			$ret_ele    .= _ALL . ' <input id="checkall[' . $i . ']" type="checkbox" value="" onclick="var optionids = new Array(' . implode(', ', $option_ids) . '); xoopsCheckAllElements(optionids, \'checkall[' . $i . ']\')">';
+			$ret_ele    .= '</td></tr></table>';
+			$ret_ele    .= '</td></tr>';
+			$elements[] = $ret_ele;
+		}
+		$tray = new \XoopsFormElementTray('');
+		$tray->addElement(new \XoopsFormHidden('action', 'template_save'));
+		$tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
+		$ret = '<h4>' . _AM_SONGLIST_PERM_TEMPLATE . '</h4>' . _AM_SONGLIST_PERM_TEMPLATE_DESC . '<br><br><br>';
+		$ret .= "<form name='template' id='template' method='post'>\n<table width='100%' class='outer' cellspacing='1'>\n";
+		$ret .= implode("\n", $elements);
+		$ret .= '<tr align="left" valign="top"><td class="head"></td><td class="even">';
+		$ret .= $tray->render();
+		$ret .= '</td></tr>';
+		$ret .= '</table></form>';
+		echo $ret;
+		break;
+	case 'template_save':
+		$songlistpermHandler = Helper::getInstance()->getHandler('Permission');
+		$res                 = $songlistpermHandler->setTemplate($_POST['perms'], $groupid = 0);
+		if ($res) {
+			redirect_header('permissions.php?action=template', 2, _AM_SONGLIST_PERM_TEMPLATE_CREATED);
+		} else {
+			redirect_header('permissions.php?action=template', 2, _AM_SONGLIST_PERM_TEMPLATE_ERROR);
+		}
+		break;
+	case 'apply':
+		$songlistpermHandler = Helper::getInstance()->getHandler('Permission');
+		$perm_template       = $songlistpermHandler->getTemplate();
+		if (null === $perm_template) {
+			redirect_header('permissions.php?action=template', 2, _AM_SONGLIST_PERM_TEMPLATE);
+		}
 
-        $opform    = new \XoopsSimpleForm(_AM_SONGLIST_PERM_ACTION, 'actionform', 'permissions.php', 'get');
-        $op_select = new \XoopsFormSelect('', 'action');
-        $op_select->setExtra('onchange="document.forms.actionform.submit()"');
-        $op_select->addOptionArray(['no' => _SELECT, 'template' => _AM_SONGLIST_PERM_TEMPLATE, 'apply' => _AM_SONGLIST_PERM_TEMPLATEAPP]);
-        $opform->addElement($op_select);
-        $opform->display();
+		$opform    = new \XoopsSimpleForm(_AM_SONGLIST_PERM_ACTION, 'actionform', 'permissions.php', 'get');
+		$op_select = new \XoopsFormSelect('', 'action');
+		$op_select->setExtra('onchange="document.forms.actionform.submit()"');
+		$op_select->addOptionArray(['no' => _SELECT, 'template' => _AM_SONGLIST_PERM_TEMPLATE, 'apply' => _AM_SONGLIST_PERM_TEMPLATEAPP]);
+		$opform->addElement($op_select);
+		$opform->display();
 
-        $categoryHandler = Helper::getInstance()->getHandler('Category');
-        $categories      = $categoryHandler->getAllCats('', true, false, true);
+		$categoryHandler = Helper::getInstance()->getHandler('Category');
+		$categories      = $categoryHandler->getAllCats('', true, false, true);
 
-        $GLOBALS['forumHandler'] = Helper::getInstance()->getHandler('Forum');
-        $songlists               = $GLOBALS['forumHandler']->getForumsByCategory(0, '', false, false, true);
-        $fm_options              = [];
-        foreach (array_keys($categories) as $c) {
-            $fm_options[-1 * $c] = '[' . $categories[$c]->getVar('cat_title') . ']';
-            foreach (array_keys($songlists[$c]) as $f) {
-                $fm_options[$f] = $songlists[$c][$f]['title'];
-                if (!isset($songlists[$c][$f]['sub'])) {
-                    continue;
-                }
-                foreach (array_keys($songlists[$c][$f]['sub']) as $s) {
-                    $fm_options[$s] = '-- ' . $songlists[$c][$f]['sub'][$s]['title'];
-                }
-            }
-        }
-        unset($songlists, $categories);
-        $fmform    = new \XoopsThemeForm(_AM_SONGLIST_PERM_TEMPLATEAPP, 'fmform', 'permissions.php', 'post', true);
-        $fm_select = new \XoopsFormSelect(_AM_SONGLIST_PERM_FORUMS, 'forums', null, 10, true);
-        $fm_select->addOptionArray($fm_options);
-        $fmform->addElement($fm_select);
-        $tray = new \XoopsFormElementTray('');
-        $tray->addElement(new \XoopsFormHidden('action', 'apply_save'));
-        $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $fmform->addElement($tray);
-        $fmform->display();
-        break;
-    case 'apply_save':
-        if (empty($_POST['forums'])) {
-            break;
-        }
-        $songlistpermHandler = Helper::getInstance()->getHandler('Permission');
-        foreach ($_POST['forums'] as $songlist) {
-            if ($songlist < 1) {
-                continue;
-            }
-            $songlistpermHandler->applyTemplate($songlist, $module_id);
-        }
-        redirect_header('permissions.php', 2, _AM_SONGLIST_PERM_TEMPLATE_APPLIED);
-        break;
-    default:
-        $opform    = new \XoopsSimpleForm(_AM_SONGLIST_PERM_ACTION, 'actionform', 'permissions.php', 'get');
-        $op_select = new \XoopsFormSelect('', 'action');
-        $op_select->setExtra('onchange="document.forms.actionform.submit()"');
-        $op_select->addOptionArray(
-            [
-                'no'       => _SELECT,
-                'template' => _AM_SONGLIST_PERM_TEMPLATE,
-                'apply'    => _AM_SONGLIST_PERM_TEMPLATEAPP,
-                'default'  => _AM_SONGLIST_PERM_SETBYGROUP,
-            ]
-        );
-        $opform->addElement($op_select);
-        $opform->display();
+		$GLOBALS['forumHandler'] = Helper::getInstance()->getHandler('Forum');
+		$songlists               = $GLOBALS['forumHandler']->getForumsByCategory(0, '', false, false, true);
+		$fm_options              = [];
+		foreach (array_keys($categories) as $c) {
+			$fm_options[-1 * $c] = '[' . $categories[$c]->getVar('cat_title') . ']';
+			foreach (array_keys($songlists[$c]) as $f) {
+				$fm_options[$f] = $songlists[$c][$f]['title'];
+				if (!isset($songlists[$c][$f]['sub'])) {
+					continue;
+				}
+				foreach (array_keys($songlists[$c][$f]['sub']) as $s) {
+					$fm_options[$s] = '-- ' . $songlists[$c][$f]['sub'][$s]['title'];
+				}
+			}
+		}
+		unset($songlists, $categories);
+		$fmform    = new \XoopsThemeForm(_AM_SONGLIST_PERM_TEMPLATEAPP, 'fmform', 'permissions.php', 'post', true);
+		$fm_select = new \XoopsFormSelect(_AM_SONGLIST_PERM_FORUMS, 'forums', null, 10, true);
+		$fm_select->addOptionArray($fm_options);
+		$fmform->addElement($fm_select);
+		$tray = new \XoopsFormElementTray('');
+		$tray->addElement(new \XoopsFormHidden('action', 'apply_save'));
+		$tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
+		$fmform->addElement($tray);
+		$fmform->display();
+		break;
+	case 'apply_save':
+		if (empty($_POST['forums'])) {
+			break;
+		}
+		$songlistpermHandler = Helper::getInstance()->getHandler('Permission');
+		foreach ($_POST['forums'] as $songlist) {
+			if ($songlist < 1) {
+				continue;
+			}
+			$songlistpermHandler->applyTemplate($songlist, $module_id);
+		}
+		redirect_header('permissions.php', 2, _AM_SONGLIST_PERM_TEMPLATE_APPLIED);
+		break;
+	default:
+		$opform    = new \XoopsSimpleForm(_AM_SONGLIST_PERM_ACTION, 'actionform', 'permissions.php', 'get');
+		$op_select = new \XoopsFormSelect('', 'action');
+		$op_select->setExtra('onchange="document.forms.actionform.submit()"');
+		$op_select->addOptionArray(
+			[
+				'no'       => _SELECT,
+				'template' => _AM_SONGLIST_PERM_TEMPLATE,
+				'apply'    => _AM_SONGLIST_PERM_TEMPLATEAPP,
+				'default'  => _AM_SONGLIST_PERM_SETBYGROUP,
+			]
+		);
+		$opform->addElement($op_select);
+		$opform->display();
 
-        $GLOBALS['forumHandler'] = Helper::getInstance()->getHandler('Forum');
-        $songlists               = $GLOBALS['forumHandler']->getForumsByCategory(0, '', false, false, true);
-        $op_options              = ['category' => _AM_SONGLIST_CAT_ACCESS];
-        $fm_options              = ['category' => ['title' => _AM_SONGLIST_CAT_ACCESS, 'item' => 'category_access', 'desc' => '', 'anonymous' => true]];
-        foreach ($perms as $perm) {
-            $op_options[$perm] = constant('_AM_SONGLIST_CAN_' . \mb_strtoupper($perm));
-            $fm_options[$perm] = ['title' => constant('_AM_SONGLIST_CAN_' . \mb_strtoupper($perm)), 'item' => 'forum_' . $perm, 'desc' => '', 'anonymous' => true];
-        }
+		$GLOBALS['forumHandler'] = Helper::getInstance()->getHandler('Forum');
+		$songlists               = $GLOBALS['forumHandler']->getForumsByCategory(0, '', false, false, true);
+		$op_options              = ['category' => _AM_SONGLIST_CAT_ACCESS];
+		$fm_options              = ['category' => ['title' => _AM_SONGLIST_CAT_ACCESS, 'item' => 'category_access', 'desc' => '', 'anonymous' => true]];
+		foreach ($perms as $perm) {
+			$op_options[$perm] = constant('_AM_SONGLIST_CAN_' . \mb_strtoupper($perm));
+			$fm_options[$perm] = ['title' => constant('_AM_SONGLIST_CAN_' . \mb_strtoupper($perm)), 'item' => 'forum_' . $perm, 'desc' => '', 'anonymous' => true];
+		}
 
-        $op_keys = array_keys($op_options);
-        $op      = isset($_GET['op']) ? \mb_strtolower($_GET['op']) : (isset($_COOKIE['op']) ? \mb_strtolower($_COOKIE['op']) : '');
-        if (empty($op)) {
-            $op = $op_keys[0];
-            setcookie('op', $op_keys[1] ?? '');
-        } else {
-            for ($i = 0, $iMax = count($op_keys); $i < $iMax; ++$i) {
-                if ($op_keys[$i] == $op) {
-                    break;
-                }
-            }
-            setcookie('op', $op_keys[$i + 1] ?? '');
-        }
+		$op_keys = array_keys($op_options);
+		$op      = isset($_GET['op']) ? \mb_strtolower($_GET['op']) : (isset($_COOKIE['op']) ? \mb_strtolower($_COOKIE['op']) : '');
+		if (empty($op)) {
+			$op = $op_keys[0];
+			setcookie('op', $op_keys[1] ?? '');
+		} else {
+			for ($i = 0, $iMax = count($op_keys); $i < $iMax; ++$i) {
+				if ($op_keys[$i] == $op) {
+					break;
+				}
+			}
+			setcookie('op', $op_keys[$i + 1] ?? '');
+		}
 
-        $opform    = new \XoopsSimpleForm('', 'opform', 'permissions.php', 'get');
-        $op_select = new \XoopsFormSelect('', 'op', $op);
-        $op_select->setExtra('onchange="document.forms.opform.submit()"');
-        $op_select->addOptionArray($op_options);
-        $opform->addElement($op_select);
-        $opform->display();
+		$opform    = new \XoopsSimpleForm('', 'opform', 'permissions.php', 'get');
+		$op_select = new \XoopsFormSelect('', 'op', $op);
+		$op_select->setExtra('onchange="document.forms.opform.submit()"');
+		$op_select->addOptionArray($op_options);
+		$opform->addElement($op_select);
+		$opform->display();
 
-        $perm_desc = '';
+		$perm_desc = '';
 
-        $form = new forum_XoopsGroupPermForm($fm_options[$op]['title'], $module_id, $fm_options[$op]['item'], $fm_options[$op]['desc'], 'admin/permissions.php', $fm_options[$op]['anonymous']);
+		$form = new forum_XoopsGroupPermForm($fm_options[$op]['title'], $module_id, $fm_options[$op]['item'], $fm_options[$op]['desc'], 'admin/permissions.php', $fm_options[$op]['anonymous']);
 
-        $categoryHandler = Helper::getInstance()->getHandler('Category');
-        $categories      = $categoryHandler->getObjects(null, true);
-        if ('category' === $op) {
-            foreach (array_keys($categories) as $c) {
-                $form->addItem($c, $categories[$c]->getVar('cat_title'));
-            }
-            unset($categories);
-        } else {
-            foreach (array_keys($categories) as $c) {
-                $key_c = -1 * $c;
-                $form->addItem($key_c, '<strong>[' . $categories[$c]->getVar('cat_title') . ']</strong>');
-                foreach (array_keys($songlists[$c]) as $f) {
-                    $form->addItem($f, $songlists[$c][$f]['title'], $key_c);
-                    if (!isset($songlists[$c][$f]['sub'])) {
-                        continue;
-                    }
-                    foreach (array_keys($songlists[$c][$f]['sub']) as $s) {
-                        $form->addItem($s, '&rarr;' . $songlists[$c][$f]['sub'][$s]['title'], $f);
-                    }
-                }
-            }
-            unset($songlists, $categories);
-        }
-        $form->display();
+		$categoryHandler = Helper::getInstance()->getHandler('Category');
+		$categories      = $categoryHandler->getObjects(null, true);
+		if ('category' === $op) {
+			foreach (array_keys($categories) as $c) {
+				$form->addItem($c, $categories[$c]->getVar('cat_title'));
+			}
+			unset($categories);
+		} else {
+			foreach (array_keys($categories) as $c) {
+				$key_c = -1 * $c;
+				$form->addItem($key_c, '<strong>[' . $categories[$c]->getVar('cat_title') . ']</strong>');
+				foreach (array_keys($songlists[$c]) as $f) {
+					$form->addItem($f, $songlists[$c][$f]['title'], $key_c);
+					if (!isset($songlists[$c][$f]['sub'])) {
+						continue;
+					}
+					foreach (array_keys($songlists[$c][$f]['sub']) as $s) {
+						$form->addItem($s, '&rarr;' . $songlists[$c][$f]['sub'][$s]['title'], $f);
+					}
+				}
+			}
+			unset($songlists, $categories);
+		}
+		$form->display();
 
-        break;
+		break;
 }
 
 echo chronolabs_inline(false);

Spacing +48 added lines, -48 removed lines

@@ -18,9 +18,9 @@ 
 use Xmf\Module\Admin;
 use XoopsModules\Songlist\Helper;
 
-require_once __DIR__ . '/header.php';
-require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['songlistModule']->getVar('dirname') . '/class/xoopsformloader.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+require_once __DIR__.'/header.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['songlistModule']->getVar('dirname').'/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';
 
 /**
  * Add category navigation to forum casscade structure
@@ -64,7 +64,7 @@ 
         foreach (array_keys($glist) as $i) {
             // get selected item id(s) for each group
             $selected = $grouppermHandler->getItemIds($this->_permName, $i, $this->_modid);
-            $ele      = new forum_XoopsGroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
+            $ele      = new forum_XoopsGroupFormCheckBox($glist[$i], 'perms['.$this->_permName.']', $i, $selected);
             $ele->setOptionTree($this->_itemTree);
             $this->addElement($ele);
             unset($ele);
@@ -73,8 +73,8 @@ 
         $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
         $this->addElement($tray);
-        $ret      = '<h4>' . $this->getTitle() . '</h4>' . $this->_permDesc . '<br>';
-        $ret      .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
+        $ret      = '<h4>'.$this->getTitle().'</h4>'.$this->_permDesc.'<br>';
+        $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
         $elements = $this->getElements();
         $hidden   = '';
         foreach (array_keys($elements) as $i) {
@@ -83,11 +83,11 @@ 
             } elseif ($elements[$i]->isHidden()) {
                 $hidden .= $elements[$i]->render();
             } else {
-                $ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
-                if ('' != $elements[$i]->getDescription()) {
-                    $ret .= '<br><br><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
+                $ret .= "<tr valign='top' align='left'><td class='head'>".$elements[$i]->getCaption();
+                if (''!=$elements[$i]->getDescription()) {
+                    $ret .= '<br><br><span style="font-weight: normal;">'.$elements[$i]->getDescription().'</span>';
                 }
-                $ret .= "</td>\n<td class='even'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
+                $ret .= "</td>\n<td class='even'>\n".$elements[$i]->render()."\n</td></tr>\n";
             }
         }
         $ret .= "</table>$hidden</form>";
@@ -124,25 +124,25 @@ 
         $ret  = '<table class="outer"><tr><td class="odd"><table><tr>';
         $cols = 1;
         foreach ($this->_optionTree[0]['children'] as $topitem) {
-            if ($cols > 4) {
-                $ret  .= '</tr><tr>';
+            if ($cols>4) {
+                $ret .= '</tr><tr>';
                 $cols = 1;
             }
             $tree   = '<td valign="top">';
             $prefix = '';
             $this->_renderOptionTree($tree, $this->_optionTree[$topitem], $prefix);
-            $ret .= $tree . '</td>';
+            $ret .= $tree.'</td>';
             ++$cols;
         }
         $ret .= '</tr></table></td><td class="even">';
         foreach (array_keys($this->_optionTree) as $id) {
             if (!empty($id)) {
-                $option_ids[] = "'" . $this->getName() . '[groups][' . $this->_groupId . '][' . $id . ']' . "'";
+                $option_ids[] = "'".$this->getName().'[groups]['.$this->_groupId.']['.$id.']'."'";
             }
         }
-        $checkallbtn_id = $this->getName() . '[checkallbtn][' . $this->_groupId . ']';
+        $checkallbtn_id = $this->getName().'[checkallbtn]['.$this->_groupId.']';
         $option_ids_str = implode(', ', $option_ids);
-        $ret            .= _ALL . ' <input id="' . $checkallbtn_id . '" type="checkbox" value="" onclick="var optionids = new Array(' . $option_ids_str . "); xoopsCheckAllElements(optionids, '" . $checkallbtn_id . "');\">";
+        $ret            .= _ALL.' <input id="'.$checkallbtn_id.'" type="checkbox" value="" onclick="var optionids = new Array('.$option_ids_str."); xoopsCheckAllElements(optionids, '".$checkallbtn_id."');\">";
         $ret            .= '</td></tr></table>';
 
         return $ret;
@@ -156,36 +156,36 @@ 
      */
     public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = []): void
     {
-        if ($option['id'] > 0) :
-            $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
+        if ($option['id']>0) :
+            $tree .= $prefix.'<input type="checkbox" name="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" onclick="';
             foreach ($parentIds as $pid) {
-                if ($pid <= 0) {
+                if ($pid<=0) {
                     continue;
                 }
-                $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
-                $tree       .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if(ele.checked !== true) {ele.checked = this.checked;}";
+                $parent_ele = $this->getName().'[groups]['.$this->_groupId.']['.$pid.']';
+                $tree .= "var ele = xoopsGetElementById('".$parent_ele."'); if(ele.checked !== true) {ele.checked = this.checked;}";
             }
             foreach ($option['allchild'] as $cid) {
-                $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
-                $tree      .= "var ele = xoopsGetElementById('" . $child_ele . "'); if(this.checked !== true) {ele.checked = false;}";
+                $child_ele = $this->getName().'[groups]['.$this->_groupId.']['.$cid.']';
+                $tree .= "var ele = xoopsGetElementById('".$child_ele."'); if(this.checked !== true) {ele.checked = false;}";
             }
             $tree .= '" value="1"';
             if (in_array($option['id'], $this->_value, true)) {
                 $tree .= ' checked';
             }
-            $tree .= '>' . $option['name'] . '<input type="hidden" name="' . $this->getName() . '[parents][' . $option['id'] . ']" value="' . implode(':', $parentIds) . '"><input type="hidden" name="' . $this->getName() . '[itemname][' . $option['id'] . ']" value="' . htmlspecialchars(
+            $tree .= '>'.$option['name'].'<input type="hidden" name="'.$this->getName().'[parents]['.$option['id'].']" value="'.implode(':', $parentIds).'"><input type="hidden" name="'.$this->getName().'[itemname]['.$option['id'].']" value="'.htmlspecialchars(
                     $option['name'],
                     ENT_QUOTES | ENT_HTML5
-                ) . "\"><br>\n";
+                )."\"><br>\n";
         else :
-            $tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\"><br>\n";
+            $tree .= $prefix.$option['name'].'<input type="hidden" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id']."]\"><br>\n";
         endif;
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
-                if ($option['id'] > 0) {
+                if ($option['id']>0) {
                     $parentIds[] = $option['id'];
                 }
-                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
+                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix.'&nbsp;-', $parentIds);
             }
         }
     }
@@ -223,23 +223,23 @@ 
         $perm_template       = $songlistpermHandler->getTemplate($groupid = 0);
         foreach (array_keys($glist) as $i) {
             $selected   = !empty($perm_template[$i]) ? array_keys($perm_template[$i]) : [];
-            $ret_ele    = '<tr align="left" valign="top"><td class="head">' . $glist[$i] . '</td>';
+            $ret_ele    = '<tr align="left" valign="top"><td class="head">'.$glist[$i].'</td>';
             $ret_ele    .= '<td class="even">';
             $ret_ele    .= '<table class="outer"><tr><td class="odd"><table><tr>';
             $ii         = 0;
             $option_ids = [];
             foreach ($perms as $perm) {
                 ++$ii;
-                if (0 == $ii % 5) {
+                if (0==$ii%5) {
                     $ret_ele .= '</tr><tr>';
                 }
-                $checked      = in_array('forum_' . $perm, $selected, true) ? ' checked' : '';
-                $option_id    = $perm . '_' . $i;
+                $checked      = in_array('forum_'.$perm, $selected, true) ? ' checked' : '';
+                $option_id    = $perm.'_'.$i;
                 $option_ids[] = $option_id;
-                $ret_ele      .= '<td><input name="perms[' . $i . '][' . 'forum_' . $perm . ']" id="' . $option_id . '" onclick="" value="1" type="checkbox"' . $checked . '>' . constant('_AM_SONGLIST_CAN_' . \mb_strtoupper($perm)) . '<br></td>';
+                $ret_ele .= '<td><input name="perms['.$i.']['.'forum_'.$perm.']" id="'.$option_id.'" onclick="" value="1" type="checkbox"'.$checked.'>'.constant('_AM_SONGLIST_CAN_'.\mb_strtoupper($perm)).'<br></td>';
             }
             $ret_ele    .= '</tr></table></td><td class="even">';
-            $ret_ele    .= _ALL . ' <input id="checkall[' . $i . ']" type="checkbox" value="" onclick="var optionids = new Array(' . implode(', ', $option_ids) . '); xoopsCheckAllElements(optionids, \'checkall[' . $i . ']\')">';
+            $ret_ele    .= _ALL.' <input id="checkall['.$i.']" type="checkbox" value="" onclick="var optionids = new Array('.implode(', ', $option_ids).'); xoopsCheckAllElements(optionids, \'checkall['.$i.']\')">';
             $ret_ele    .= '</td></tr></table>';
             $ret_ele    .= '</td></tr>';
             $elements[] = $ret_ele;
@@ -248,7 +248,7 @@ 
         $tray->addElement(new \XoopsFormHidden('action', 'template_save'));
         $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $ret = '<h4>' . _AM_SONGLIST_PERM_TEMPLATE . '</h4>' . _AM_SONGLIST_PERM_TEMPLATE_DESC . '<br><br><br>';
+        $ret = '<h4>'._AM_SONGLIST_PERM_TEMPLATE.'</h4>'._AM_SONGLIST_PERM_TEMPLATE_DESC.'<br><br><br>';
         $ret .= "<form name='template' id='template' method='post'>\n<table width='100%' class='outer' cellspacing='1'>\n";
         $ret .= implode("\n", $elements);
         $ret .= '<tr align="left" valign="top"><td class="head"></td><td class="even">';
@@ -269,7 +269,7 @@ 
     case 'apply':
         $songlistpermHandler = Helper::getInstance()->getHandler('Permission');
         $perm_template       = $songlistpermHandler->getTemplate();
-        if (null === $perm_template) {
+        if (null===$perm_template) {
             redirect_header('permissions.php?action=template', 2, _AM_SONGLIST_PERM_TEMPLATE);
         }
 
@@ -287,14 +287,14 @@ 
         $songlists               = $GLOBALS['forumHandler']->getForumsByCategory(0, '', false, false, true);
         $fm_options              = [];
         foreach (array_keys($categories) as $c) {
-            $fm_options[-1 * $c] = '[' . $categories[$c]->getVar('cat_title') . ']';
+            $fm_options[-1*$c] = '['.$categories[$c]->getVar('cat_title').']';
             foreach (array_keys($songlists[$c]) as $f) {
                 $fm_options[$f] = $songlists[$c][$f]['title'];
                 if (!isset($songlists[$c][$f]['sub'])) {
                     continue;
                 }
                 foreach (array_keys($songlists[$c][$f]['sub']) as $s) {
-                    $fm_options[$s] = '-- ' . $songlists[$c][$f]['sub'][$s]['title'];
+                    $fm_options[$s] = '-- '.$songlists[$c][$f]['sub'][$s]['title'];
                 }
             }
         }
@@ -316,7 +316,7 @@ 
         }
         $songlistpermHandler = Helper::getInstance()->getHandler('Permission');
         foreach ($_POST['forums'] as $songlist) {
-            if ($songlist < 1) {
+            if ($songlist<1) {
                 continue;
             }
             $songlistpermHandler->applyTemplate($songlist, $module_id);
@@ -343,8 +343,8 @@ 
         $op_options              = ['category' => _AM_SONGLIST_CAT_ACCESS];
         $fm_options              = ['category' => ['title' => _AM_SONGLIST_CAT_ACCESS, 'item' => 'category_access', 'desc' => '', 'anonymous' => true]];
         foreach ($perms as $perm) {
-            $op_options[$perm] = constant('_AM_SONGLIST_CAN_' . \mb_strtoupper($perm));
-            $fm_options[$perm] = ['title' => constant('_AM_SONGLIST_CAN_' . \mb_strtoupper($perm)), 'item' => 'forum_' . $perm, 'desc' => '', 'anonymous' => true];
+            $op_options[$perm] = constant('_AM_SONGLIST_CAN_'.\mb_strtoupper($perm));
+            $fm_options[$perm] = ['title' => constant('_AM_SONGLIST_CAN_'.\mb_strtoupper($perm)), 'item' => 'forum_'.$perm, 'desc' => '', 'anonymous' => true];
         }
 
         $op_keys = array_keys($op_options);
@@ -353,12 +353,12 @@ 
             $op = $op_keys[0];
             setcookie('op', $op_keys[1] ?? '');
         } else {
-            for ($i = 0, $iMax = count($op_keys); $i < $iMax; ++$i) {
-                if ($op_keys[$i] == $op) {
+            for ($i = 0, $iMax = count($op_keys); $i<$iMax; ++$i) {
+                if ($op_keys[$i]==$op) {
                     break;
                 }
             }
-            setcookie('op', $op_keys[$i + 1] ?? '');
+            setcookie('op', $op_keys[$i+1] ?? '');
         }
 
         $opform    = new \XoopsSimpleForm('', 'opform', 'permissions.php', 'get');
@@ -374,22 +374,22 @@ 
 
         $categoryHandler = Helper::getInstance()->getHandler('Category');
         $categories      = $categoryHandler->getObjects(null, true);
-        if ('category' === $op) {
+        if ('category'===$op) {
             foreach (array_keys($categories) as $c) {
                 $form->addItem($c, $categories[$c]->getVar('cat_title'));
             }
             unset($categories);
         } else {
             foreach (array_keys($categories) as $c) {
-                $key_c = -1 * $c;
-                $form->addItem($key_c, '<strong>[' . $categories[$c]->getVar('cat_title') . ']</strong>');
+                $key_c = -1*$c;
+                $form->addItem($key_c, '<strong>['.$categories[$c]->getVar('cat_title').']</strong>');
                 foreach (array_keys($songlists[$c]) as $f) {
                     $form->addItem($f, $songlists[$c][$f]['title'], $key_c);
                     if (!isset($songlists[$c][$f]['sub'])) {
                         continue;
                     }
                     foreach (array_keys($songlists[$c][$f]['sub']) as $s) {
-                        $form->addItem($s, '&rarr;' . $songlists[$c][$f]['sub'][$s]['title'], $f);
+                        $form->addItem($s, '&rarr;'.$songlists[$c][$f]['sub'][$s]['title'], $f);
                     }
                 }
             }

Braces +3 added lines, -1 removed lines

@@ -177,8 +177,10 @@
                     $option['name'],
                     ENT_QUOTES | ENT_HTML5
                 ) . "\"><br>\n";
-        else :
+        else {
+        	:
             $tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\"><br>\n";
+        }
         endif;
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {

admin/menu.php

Indentation +69 added lines, -69 removed lines

@@ -15,7 +15,7 @@ 
 $pathIcon32    = Admin::menuIconPath('');
 $pathModIcon32 = XOOPS_URL . '/modules/' . $moduleDirName . '/assets/images/icons/32/';
 if (is_object($helper->getModule()) && false !== $helper->getModule()->getInfo('modicons32')) {
-    $pathModIcon32 = $helper->url($helper->getModule()->getInfo('modicons32'));
+	$pathModIcon32 = $helper->url($helper->getModule()->getInfo('modicons32'));
 }
 
 /** @var \XoopsModuleHandler $moduleHandler */
@@ -26,65 +26,65 @@ 
 $GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
 
 $adminmenu[] = [
-    'title' => _MI_SONGLIST_ADMENU_DASHBOARD,
-    'icon'  => $pathIcon32 . '/home.png',
-    'image' => $pathIcon32 . '/home.png',
-    'link'  => 'admin/index.php',
+	'title' => _MI_SONGLIST_ADMENU_DASHBOARD,
+	'icon'  => $pathIcon32 . '/home.png',
+	'image' => $pathIcon32 . '/home.png',
+	'link'  => 'admin/index.php',
 ];
 
 $adminmenu[] = [
-    'title' => _MI_SONGLIST_ADMENU_CATEGORY,
-    'icon'  => 'assets/images/icons/32/songlist.category.png',
-    'image' => 'assets/images/icons/32/songlist.category.png',
-    'link'  => 'admin/category.php',
+	'title' => _MI_SONGLIST_ADMENU_CATEGORY,
+	'icon'  => 'assets/images/icons/32/songlist.category.png',
+	'image' => 'assets/images/icons/32/songlist.category.png',
+	'link'  => 'admin/category.php',
 ];
 
 if ($GLOBALS['songlistModuleConfig']['voice']) {
-    $adminmenu[] = [
-        'title' => _MI_SONGLIST_ADMENU_VOICE,
-        'icon'  => 'assets/images/icons/32/songlist.voice.png',
-        'image' => 'assets/images/icons/32/songlist.voice.png',
-        'link'  => 'admin/voice.php',
-    ];
+	$adminmenu[] = [
+		'title' => _MI_SONGLIST_ADMENU_VOICE,
+		'icon'  => 'assets/images/icons/32/songlist.voice.png',
+		'image' => 'assets/images/icons/32/songlist.voice.png',
+		'link'  => 'admin/voice.php',
+	];
 }
 
 if ($GLOBALS['songlistModuleConfig']['album']) {
-    $adminmenu[] = [
-        'title' => _MI_SONGLIST_ADMENU_ALBUMS,
-        'icon'  => 'assets/images/icons/32/songlist.albums.png',
-        'image' => 'assets/images/icons/32/songlist.albums.png',
-        'link'  => 'admin/albums.php',
-    ];
+	$adminmenu[] = [
+		'title' => _MI_SONGLIST_ADMENU_ALBUMS,
+		'icon'  => 'assets/images/icons/32/songlist.albums.png',
+		'image' => 'assets/images/icons/32/songlist.albums.png',
+		'link'  => 'admin/albums.php',
+	];
 }
 
 if ($GLOBALS['songlistModuleConfig']['genre']) {
-    $adminmenu[] = [
-        'title' => _MI_SONGLIST_ADMENU_GENRE,
-        'icon'  => 'assets/images/icons/32/songlist.genre.png',
-        'image' => 'assets/images/icons/32/songlist.genre.png',
-        'link'  => 'admin/genre.php',
-    ];
+	$adminmenu[] = [
+		'title' => _MI_SONGLIST_ADMENU_GENRE,
+		'icon'  => 'assets/images/icons/32/songlist.genre.png',
+		'image' => 'assets/images/icons/32/songlist.genre.png',
+		'link'  => 'admin/genre.php',
+	];
 }
 
 $adminmenu[] = [
-    'title' => _MI_SONGLIST_ADMENU_ARTISTS,
-    'icon'  => 'assets/images/icons/32/songlist.artists.png',
-    'image' => 'assets/images/icons/32/songlist.artists.png',
-    'link'  => 'admin/artists.php',
+	'title' => _MI_SONGLIST_ADMENU_ARTISTS,
+	'icon'  => 'assets/images/icons/32/songlist.artists.png',
+	'image' => 'assets/images/icons/32/songlist.artists.png',
+	'link'  => 'admin/artists.php',
 ];
 
 $adminmenu[] = [
-    'title' => _MI_SONGLIST_ADMENU_SONGS,
-    'icon'  => 'assets/images/icons/32/songlist.songs.png',
-    'image' => 'assets/images/icons/32/songlist.songs.png',
-    'link'  => 'admin/songs.php',
+	'title' => _MI_SONGLIST_ADMENU_SONGS,
+	'icon'  => 'assets/images/icons/32/songlist.songs.png',
+	'image' => 'assets/images/icons/32/songlist.songs.png',
+	'link'  => 'admin/songs.php',
 ];
 
 $adminmenu[] = [
-    'title' => _MI_SONGLIST_ADMENU_VOTE,
-    'icon'  => 'assets/images/icons/32/songlist.votes.png',
-    'image' => 'assets/images/icons/32/songlist.votes.png',
-    'link'  => 'admin/votes.php',
+	'title' => _MI_SONGLIST_ADMENU_VOTE,
+	'icon'  => 'assets/images/icons/32/songlist.votes.png',
+	'image' => 'assets/images/icons/32/songlist.votes.png',
+	'link'  => 'admin/votes.php',
 ];
 
 //$adminmenu[] = [
@@ -95,57 +95,57 @@ 
 //];
 
 $adminmenu[] = [
-    'title' => _MI_SONGLIST_ADMENU_REQUESTS,
-    'icon'  => 'assets/images/icons/32/songlist.requests.png',
-    'image' => 'assets/images/icons/32/songlist.requests.png',
-    'link'  => 'admin/requests.php',
+	'title' => _MI_SONGLIST_ADMENU_REQUESTS,
+	'icon'  => 'assets/images/icons/32/songlist.requests.png',
+	'image' => 'assets/images/icons/32/songlist.requests.png',
+	'link'  => 'admin/requests.php',
 ];
 
 $adminmenu[] = [
-    'title' => _MI_SONGLIST_ADMENU_UTF8MAP,
-    'icon'  => 'assets/images/icons/32/songlist.utf8map.png',
-    'image' => 'assets/images/icons/32/songlist.utf8map.png',
-    'link'  => 'admin/utf8map.php',
+	'title' => _MI_SONGLIST_ADMENU_UTF8MAP,
+	'icon'  => 'assets/images/icons/32/songlist.utf8map.png',
+	'image' => 'assets/images/icons/32/songlist.utf8map.png',
+	'link'  => 'admin/utf8map.php',
 ];
 
 $adminmenu[] = [
-    'title' => _MI_SONGLIST_ADMENU_IMPORT,
-    'icon'  => 'assets/images/icons/32/songlist.import.png',
-    'image' => 'assets/images/icons/32/songlist.import.png',
-    'link'  => 'admin/import.php',
+	'title' => _MI_SONGLIST_ADMENU_IMPORT,
+	'icon'  => 'assets/images/icons/32/songlist.import.png',
+	'image' => 'assets/images/icons/32/songlist.import.png',
+	'link'  => 'admin/import.php',
 ];
 
 $adminmenu[] = [
-    'title' => _MI_SONGLIST_ADMENU_FIELDS,
-    'icon'  => 'assets/images/icons/32/songlist.fields.png',
-    'image' => 'assets/images/icons/32/songlist.fields.png',
-    'link'  => 'admin/field.php',
+	'title' => _MI_SONGLIST_ADMENU_FIELDS,
+	'icon'  => 'assets/images/icons/32/songlist.fields.png',
+	'image' => 'assets/images/icons/32/songlist.fields.png',
+	'link'  => 'admin/field.php',
 ];
 
 $adminmenu[] = [
-    'title' => _MI_SONGLIST_ADMENU_FIELDSPERMS,
-    'icon'  => 'assets/images/icons/32/songlist.field.permissions.png',
-    'image' => 'assets/images/icons/32/songlist.field.permissions.png',
-    'link'  => 'admin/field_permissions.php',
+	'title' => _MI_SONGLIST_ADMENU_FIELDSPERMS,
+	'icon'  => 'assets/images/icons/32/songlist.field.permissions.png',
+	'image' => 'assets/images/icons/32/songlist.field.permissions.png',
+	'link'  => 'admin/field_permissions.php',
 ];
 
 // Blocks Admin
 $adminmenu[] = [
-    'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS'),
-    'link'  => 'admin/blocksadmin.php',
-    'icon'  => $pathIcon32 . '/block.png',
+	'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS'),
+	'link'  => 'admin/blocksadmin.php',
+	'icon'  => $pathIcon32 . '/block.png',
 ];
 
 //Clone
 $adminmenu[] = [
-    'title' => _CLONE,
-    'link'  => 'admin/clone.php',
-    'icon'  => $pathIcon32 . '/page_copy.png',
+	'title' => _CLONE,
+	'link'  => 'admin/clone.php',
+	'icon'  => $pathIcon32 . '/page_copy.png',
 ];
 
 $adminmenu[] = [
-    'title' => _MI_SONGLIST_ADMENU_ABOUT,
-    'icon'  => $pathIcon32 . '/about.png',
-    'image' => $pathIcon32 . '/about.png',
-    'link'  => 'admin/about.php',
+	'title' => _MI_SONGLIST_ADMENU_ABOUT,
+	'icon'  => $pathIcon32 . '/about.png',
+	'image' => $pathIcon32 . '/about.png',
+	'link'  => 'admin/about.php',
 ];

Spacing +10 added lines, -10 removed lines

@@ -3,7 +3,7 @@ 
 use Xmf\Module\Admin;
 use XoopsModules\Songlist\Helper;
 
-require \dirname(__DIR__) . '/preloads/autoloader.php';
+require \dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
@@ -13,8 +13,8 @@ 
 $helper->loadLanguage('feedback');
 
 $pathIcon32    = Admin::menuIconPath('');
-$pathModIcon32 = XOOPS_URL . '/modules/' . $moduleDirName . '/assets/images/icons/32/';
-if (is_object($helper->getModule()) && false !== $helper->getModule()->getInfo('modicons32')) {
+$pathModIcon32 = XOOPS_URL.'/modules/'.$moduleDirName.'/assets/images/icons/32/';
+if (is_object($helper->getModule()) && false!==$helper->getModule()->getInfo('modicons32')) {
     $pathModIcon32 = $helper->url($helper->getModule()->getInfo('modicons32'));
 }
 
@@ -27,8 +27,8 @@ 
 
 $adminmenu[] = [
     'title' => _MI_SONGLIST_ADMENU_DASHBOARD,
-    'icon'  => $pathIcon32 . '/home.png',
-    'image' => $pathIcon32 . '/home.png',
+    'icon'  => $pathIcon32.'/home.png',
+    'image' => $pathIcon32.'/home.png',
     'link'  => 'admin/index.php',
 ];
 
@@ -131,21 +131,21 @@ 
 
 // Blocks Admin
 $adminmenu[] = [
-    'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS'),
+    'title' => constant('CO_'.$moduleDirNameUpper.'_'.'BLOCKS'),
     'link'  => 'admin/blocksadmin.php',
-    'icon'  => $pathIcon32 . '/block.png',
+    'icon'  => $pathIcon32.'/block.png',
 ];
 
 //Clone
 $adminmenu[] = [
     'title' => _CLONE,
     'link'  => 'admin/clone.php',
-    'icon'  => $pathIcon32 . '/page_copy.png',
+    'icon'  => $pathIcon32.'/page_copy.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_SONGLIST_ADMENU_ABOUT,
-    'icon'  => $pathIcon32 . '/about.png',
-    'image' => $pathIcon32 . '/about.png',
+    'icon'  => $pathIcon32.'/about.png',
+    'image' => $pathIcon32.'/about.png',
     'link'  => 'admin/about.php',
 ];

admin/export.php

Indentation +289 added lines, -289 removed lines

@@ -29,22 +29,22 @@ 
 $categoryHandler = Helper::getInstance()->getHandler('Category');
 
 switch ($op) {
-    case 'import':
-        switch ($fct) {
-            default:
-            case 'actiona':
-                if (Request::hasVar('xmlfile', 'SESSION')) {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?file=' . $_SESSION['xmlfile'] . '&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
-                }
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
+	case 'import':
+		switch ($fct) {
+			default:
+			case 'actiona':
+				if (Request::hasVar('xmlfile', 'SESSION')) {
+					redirect_header($_SERVER['SCRIPT_NAME'] . '?file=' . $_SESSION['xmlfile'] . '&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
+				}
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
 
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormImport(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_import_actiona.tpl');
-                break;
-            case 'upload':
-                if (Request::hasVar('xmlfile', 'FILES') && !empty($_FILES['xmlfile']['title'])) {
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormImport(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_import_actiona.tpl');
+				break;
+			case 'upload':
+				if (Request::hasVar('xmlfile', 'FILES') && !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) {
@@ -57,287 +57,287 @@ 
 //                    }
 
 //                    require_once $GLOBALS['xoops']->path('modules/songlist/include/uploader.php');
-                    $albums   = $albumsHandler->get($id);
-                    $uploader = new Uploader(
-                        $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']),
-                        ['application/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity', 'text/xml xml xsl', 'text/xml-external-parsed-entity'],
-                        1024 * 1024 * 32,
-                        0,
-                        0,
-                        ['xml']
-                    );
-                    try {
-                        $uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
-                    } catch (Exception $e) {
-                    }
+					$albums   = $albumsHandler->get($id);
+					$uploader = new Uploader(
+						$GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']),
+						['application/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity', 'text/xml xml xsl', 'text/xml-external-parsed-entity'],
+						1024 * 1024 * 32,
+						0,
+						0,
+						['xml']
+					);
+					try {
+						$uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
+					} catch (Exception $e) {
+					}
 
-                    if ($uploader->fetchMedia('xmlfile')) {
-                        if (!$uploader->upload()) {
-                            echo $uploader->getErrors();
-                            require __DIR__ . '/admin_footer.php';
-                            exit(0);
-                        }
-                        $_SESSION['xmlfile'] = $uploader->getSavedFileName();
-                        redirect_header($_SERVER['SCRIPT_NAME'] . '?file=' . $uploader->getSavedFileName() . '&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
-                    } else {
-                        echo $uploader->getErrors();
-                        require __DIR__ . '/admin_footer.php';
-                        exit(0);
-                    }
-                }
-                break;
-            case 'actionb':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
+					if ($uploader->fetchMedia('xmlfile')) {
+						if (!$uploader->upload()) {
+							echo $uploader->getErrors();
+							require __DIR__ . '/admin_footer.php';
+							exit(0);
+						}
+						$_SESSION['xmlfile'] = $uploader->getSavedFileName();
+						redirect_header($_SERVER['SCRIPT_NAME'] . '?file=' . $uploader->getSavedFileName() . '&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
+					} else {
+						echo $uploader->getErrors();
+						require __DIR__ . '/admin_footer.php';
+						exit(0);
+					}
+				}
+				break;
+			case 'actionb':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
 
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormImportb($_SESSION['xmlfile']));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_import_actionb.tpl');
-                break;
-            case 'import':
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormImportb($_SESSION['xmlfile']));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_import_actionb.tpl');
+				break;
+			case 'import':
 
-                $filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile']));
-                $mb       = floor($filesize / 1024 / 1024);
-                if ($mb > 32) {
-                    set_ini('memory_limit', ($mb + 128) . 'M');
-                }
-                set_time_limit(3600);
+				$filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile']));
+				$mb       = floor($filesize / 1024 / 1024);
+				if ($mb > 32) {
+					set_ini('memory_limit', ($mb + 128) . 'M');
+				}
+				set_time_limit(3600);
 
-                $xmlarray = Utility::xml2array(file_get_contents($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile'])), false, 'tag');
+				$xmlarray = Utility::xml2array(file_get_contents($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile'])), false, 'tag');
 
-                if (mb_strlen($_POST['collection']) > 0) {
-                    foreach ($xmlarray[$_POST['collection']] as $id => $record) {
-                        foreach ($record as $recid => $data) {
-                            $gid = 0;
-                            if (mb_strlen($_POST['genre']) > 0 && !empty($data[$_POST['genre']])) {
-                                $criteria = new \Criteria('name', $data[$_POST['genre']]);
-                                if ($genreHandler->getCount($criteria) > 0) {
-                                    $objects = $genreHandler->getObjects($criteria, false);
-                                    $gid     = $objects[0]->getVar('gid');
-                                } else {
-                                    $object = $genreHandler->create();
-                                    $object->setVar('name', $data[$_POST['genre']]);
-                                    $gid = $genreHandler->insert($object);
-                                }
-                            }
+				if (mb_strlen($_POST['collection']) > 0) {
+					foreach ($xmlarray[$_POST['collection']] as $id => $record) {
+						foreach ($record as $recid => $data) {
+							$gid = 0;
+							if (mb_strlen($_POST['genre']) > 0 && !empty($data[$_POST['genre']])) {
+								$criteria = new \Criteria('name', $data[$_POST['genre']]);
+								if ($genreHandler->getCount($criteria) > 0) {
+									$objects = $genreHandler->getObjects($criteria, false);
+									$gid     = $objects[0]->getVar('gid');
+								} else {
+									$object = $genreHandler->create();
+									$object->setVar('name', $data[$_POST['genre']]);
+									$gid = $genreHandler->insert($object);
+								}
+							}
 
-                            $vid = 0;
-                            if (mb_strlen($_POST['voice']) > 0 && !empty($data[$_POST['voice']])) {
-                                $criteria = new \Criteria('name', $data[$_POST['voice']]);
-                                if ($voiceHandler->getCount($criteria) > 0) {
-                                    $objects = $voiceHandler->getObjects($criteria, false);
-                                    $gid     = $objects[0]->getVar('vid');
-                                } else {
-                                    $object = $voiceHandler->create();
-                                    $object->setVar('name', $data[$_POST['voice']]);
-                                    $gid = $voiceHandler->insert($object);
-                                }
-                            }
+							$vid = 0;
+							if (mb_strlen($_POST['voice']) > 0 && !empty($data[$_POST['voice']])) {
+								$criteria = new \Criteria('name', $data[$_POST['voice']]);
+								if ($voiceHandler->getCount($criteria) > 0) {
+									$objects = $voiceHandler->getObjects($criteria, false);
+									$gid     = $objects[0]->getVar('vid');
+								} else {
+									$object = $voiceHandler->create();
+									$object->setVar('name', $data[$_POST['voice']]);
+									$gid = $voiceHandler->insert($object);
+								}
+							}
 
-                            $cid = 0;
-                            if (mb_strlen($_POST['category']) > 0 && !empty($data[$_POST['category']])) {
-                                $criteria = new \Criteria('name', $data[$_POST['category']]);
-                                if ($categoryHandler->getCount($criteria) > 0) {
-                                    $objects = $categoryHandler->getObjects($criteria, false);
-                                    $cid     = $objects[0]->getVar('cid');
-                                } else {
-                                    $object = $categoryHandler->create();
-                                    $object->setVar('name', $data[$_POST['category']]);
-                                    $cid = $categoryHandler->insert($object);
-                                }
-                            }
-                            $aids = [];
-                            if (mb_strlen($_POST['artist']) > 0 && !empty($data[$_POST['artist']])) {
-                                foreach (explode(',', $data[$_POST['artist']]) as $artist) {
-                                    $criteria = new \Criteria('name', $artist);
-                                    if ($artistsHandler->getCount($criteria) > 0) {
-                                        $objects                          = $artistsHandler->getObjects($criteria, false);
-                                        $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
-                                    } else {
-                                        $object = $artistsHandler->create();
-                                        $object->setVar('cid', $cid);
-                                        switch ($data[$_POST['singer']]) {
-                                            case $_POST['duet']:
-                                                $object->setVar('singer', '_ENUM_SONGLIST_DUET');
-                                                break;
-                                            case $_POST['solo']:
-                                                $object->setVar('singer', '_ENUM_SONGLIST_SOLO');
-                                                break;
-                                        }
-                                        $object->setVar('name', $data[$_POST['artist']]);
-                                        $aid        = $artistsHandler->insert($object);
-                                        $aids[$aid] = $aid;
-                                    }
-                                }
-                            }
-                            $abid = 0;
-                            if (mb_strlen($_POST['album']) > 0 && !empty($data[$_POST['album']])) {
-                                $criteria = new \Criteria('name', $data[$_POST['album']]);
-                                if ($albumsHandler->getCount($criteria) > 0) {
-                                    $objects = $albumsHandler->getObjects($criteria, false);
-                                    $abid    = $objects[0]->getVar('aid');
-                                } else {
-                                    $object = $albumsHandler->create();
-                                    $object->setVar('cid', $cid);
-                                    $object->setVar('aids', $aids);
-                                    $object->setVar('name', $data[$_POST['album']]);
-                                    $abid = $albumsHandler->insert($object);
-                                }
-                            }
-                            $sid = 0;
-                            if (mb_strlen($_POST['songid']) > 0 && !empty($data[$_POST['songid']])) {
-                                $criteria = new \Criteria('songid', $data[$_POST['songid']]);
-                                if ($songsHandler->getCount($criteria) > 0) {
-                                    $objects = $songsHandler->getObjects($criteria, false);
-                                    $object  = $objects[0]->getVar('sid');
-                                } else {
-                                    $object = $songsHandler->create();
-                                }
-                                if ($object->getVar('cid') > 0 && $cid > 0) {
-                                    $object->setVar('cid', $cid);
-                                } else {
-                                    $object->setVar('cid', $cid);
-                                }
-                                if ($object->getVar('gid') > 0 && $gid > 0) {
-                                    $object->setVar('gid', $gid);
-                                } else {
-                                    $object->setVar('gid', $gid);
-                                }
-                                if (count($object->getVar('aids')) > 0 && count($aids) > 0) {
-                                    $object->setVar('aids', $aids);
-                                } else {
-                                    $object->setVar('aids', $aids);
-                                }
-                                if ($object->getVar('abid') > 0 && $abid > 0) {
-                                    $object->setVar('abid', $abid);
-                                } else {
-                                    $object->setVar('abid', $abid);
-                                }
-                                $object->setVar('songid', $data[$_POST['songid']]);
-                                $object->setVar('title', $data[$_POST['title']]);
-                                $object->setVar('lyrics', str_replace("\n", "<br>\n", $data[$_POST['lyrics']]));
-                                $sid = $songsHandler->insert($object);
-                            }
-                        }
-                    }
-                } else {
-                    foreach ($xmlarray as $recid => $data) {
-                        $gid = 0;
-                        if (mb_strlen($_POST['genre']) > 0 && !empty($data[$_POST['genre']])) {
-                            $criteria = new \Criteria('name', $data[$_POST['genre']]);
-                            if ($genreHandler->getCount($criteria) > 0) {
-                                $objects = $genreHandler->getObjects($criteria, false);
-                                $gid     = $objects[0]->getVar('gid');
-                            } else {
-                                $object = $genreHandler->create();
-                                $object->setVar('name', $data[$_POST['genre']]);
-                                $gid = $genreHandler->insert($object);
-                            }
-                        }
-                        $vid = 0;
-                        if (mb_strlen($_POST['voice']) > 0 && !empty($data[$_POST['voice']])) {
-                            $criteria = new \Criteria('name', $data[$_POST['voice']]);
-                            if ($voiceHandler->getCount($criteria) > 0) {
-                                $objects = $voiceHandler->getObjects($criteria, false);
-                                $gid     = $objects[0]->getVar('vid');
-                            } else {
-                                $object = $voiceHandler->create();
-                                $object->setVar('name', $data[$_POST['voice']]);
-                                $gid = $voiceHandler->insert($object);
-                            }
-                        }
-                        $cid = 0;
-                        if (mb_strlen($_POST['category']) > 0 && !empty($data[$_POST['category']])) {
-                            $criteria = new \Criteria('name', $data[$_POST['category']]);
-                            if ($categoryHandler->getCount($criteria) > 0) {
-                                $objects = $categoryHandler->getObjects($criteria, false);
-                                $cid     = $objects[0]->getVar('cid');
-                            } else {
-                                $object = $categoryHandler->create();
-                                $object->setVar('name', $data[$_POST['category']]);
-                                $cid = $categoryHandler->insert($object);
-                            }
-                        }
-                        $aids = [];
-                        if (mb_strlen($_POST['artist']) > 0 && !empty($data[$_POST['artist']])) {
-                            foreach (explode(',', $data[$_POST['artist']]) as $artist) {
-                                $criteria = new \Criteria('name', $artist);
-                                if ($artistsHandler->getCount($criteria) > 0) {
-                                    $objects                          = $artistsHandler->getObjects($criteria, false);
-                                    $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
-                                } else {
-                                    $object = $artistsHandler->create();
-                                    switch ($data[$_POST['singer']]) {
-                                        case $_POST['duet']:
-                                            $object->setVar('singer', '_ENUM_SONGLIST_DUET');
-                                            break;
-                                        case $_POST['solo']:
-                                            $object->setVar('singer', '_ENUM_SONGLIST_SOLO');
-                                            break;
-                                    }
-                                    $object->setVar('cid', $cid);
-                                    $object->setVar('name', $data[$_POST['artist']]);
-                                    $aid        = $artistsHandler->insert($object);
-                                    $aids[$aid] = $aid;
-                                }
-                            }
-                        }
-                        $abid = 0;
-                        if (mb_strlen($_POST['album']) > 0 && !empty($data[$_POST['album']])) {
-                            $criteria = new \Criteria('name', $data[$_POST['album']]);
-                            if ($albumsHandler->getCount($criteria) > 0) {
-                                $objects = $albumsHandler->getObjects($criteria, false);
-                                $abid    = $objects[0]->getVar('aid');
-                            } else {
-                                $object = $albumsHandler->create();
-                                $object->setVar('cid', $cid);
-                                $object->setVar('aids', $aids);
-                                $object->setVar('name', $data[$_POST['album']]);
-                                $abid = $albumsHandler->insert($object);
-                            }
-                        }
-                        $sid = 0;
-                        if (mb_strlen($_POST['songid']) > 0 && !empty($data[$_POST['songid']])) {
-                            $criteria = new \Criteria('songid', $data[$_POST['songid']]);
-                            if ($songsHandler->getCount($criteria) > 0) {
-                                $objects = $songsHandler->getObjects($criteria, false);
-                                $object  = $objects[0]->getVar('sid');
-                            } else {
-                                $object = $songsHandler->create();
-                            }
-                            if ($object->getVar('cid') > 0 && $cid > 0) {
-                                $object->setVar('cid', $cid);
-                            } else {
-                                $object->setVar('cid', $cid);
-                            }
-                            if ($object->getVar('gid') > 0 && $gid > 0) {
-                                $object->setVar('gid', $gid);
-                            } else {
-                                $object->setVar('gid', $gid);
-                            }
-                            if (count($object->getVar('aids')) > 0 && count($aids) > 0) {
-                                $object->setVar('aids', $aids);
-                            } else {
-                                $object->setVar('aids', $aids);
-                            }
-                            if ($object->getVar('abid') > 0 && $abid > 0) {
-                                $object->setVar('abid', $abid);
-                            } else {
-                                $object->setVar('abid', $abid);
-                            }
-                            $object->setVar('songid', $data[$_POST['songid']]);
-                            $object->setVar('title', $data[$_POST['title']]);
-                            $object->setVar('lyrics', str_replace("\n", "<br>\n", $data[$_POST['lyrics']]));
-                            $sid = $songsHandler->insert($object);
-                        }
-                    }
-                }
-                unlink($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile']));
-                unset($_SESSION['xmlfile']);
-                redirect_header($_SERVER['SCRIPT_NAME'] . '&op=import&fct=actiona', 10, _AM_SONGLIST_XMLFILE_COMPLETE);
-                break;
-        }
-        break;
+							$cid = 0;
+							if (mb_strlen($_POST['category']) > 0 && !empty($data[$_POST['category']])) {
+								$criteria = new \Criteria('name', $data[$_POST['category']]);
+								if ($categoryHandler->getCount($criteria) > 0) {
+									$objects = $categoryHandler->getObjects($criteria, false);
+									$cid     = $objects[0]->getVar('cid');
+								} else {
+									$object = $categoryHandler->create();
+									$object->setVar('name', $data[$_POST['category']]);
+									$cid = $categoryHandler->insert($object);
+								}
+							}
+							$aids = [];
+							if (mb_strlen($_POST['artist']) > 0 && !empty($data[$_POST['artist']])) {
+								foreach (explode(',', $data[$_POST['artist']]) as $artist) {
+									$criteria = new \Criteria('name', $artist);
+									if ($artistsHandler->getCount($criteria) > 0) {
+										$objects                          = $artistsHandler->getObjects($criteria, false);
+										$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
+									} else {
+										$object = $artistsHandler->create();
+										$object->setVar('cid', $cid);
+										switch ($data[$_POST['singer']]) {
+											case $_POST['duet']:
+												$object->setVar('singer', '_ENUM_SONGLIST_DUET');
+												break;
+											case $_POST['solo']:
+												$object->setVar('singer', '_ENUM_SONGLIST_SOLO');
+												break;
+										}
+										$object->setVar('name', $data[$_POST['artist']]);
+										$aid        = $artistsHandler->insert($object);
+										$aids[$aid] = $aid;
+									}
+								}
+							}
+							$abid = 0;
+							if (mb_strlen($_POST['album']) > 0 && !empty($data[$_POST['album']])) {
+								$criteria = new \Criteria('name', $data[$_POST['album']]);
+								if ($albumsHandler->getCount($criteria) > 0) {
+									$objects = $albumsHandler->getObjects($criteria, false);
+									$abid    = $objects[0]->getVar('aid');
+								} else {
+									$object = $albumsHandler->create();
+									$object->setVar('cid', $cid);
+									$object->setVar('aids', $aids);
+									$object->setVar('name', $data[$_POST['album']]);
+									$abid = $albumsHandler->insert($object);
+								}
+							}
+							$sid = 0;
+							if (mb_strlen($_POST['songid']) > 0 && !empty($data[$_POST['songid']])) {
+								$criteria = new \Criteria('songid', $data[$_POST['songid']]);
+								if ($songsHandler->getCount($criteria) > 0) {
+									$objects = $songsHandler->getObjects($criteria, false);
+									$object  = $objects[0]->getVar('sid');
+								} else {
+									$object = $songsHandler->create();
+								}
+								if ($object->getVar('cid') > 0 && $cid > 0) {
+									$object->setVar('cid', $cid);
+								} else {
+									$object->setVar('cid', $cid);
+								}
+								if ($object->getVar('gid') > 0 && $gid > 0) {
+									$object->setVar('gid', $gid);
+								} else {
+									$object->setVar('gid', $gid);
+								}
+								if (count($object->getVar('aids')) > 0 && count($aids) > 0) {
+									$object->setVar('aids', $aids);
+								} else {
+									$object->setVar('aids', $aids);
+								}
+								if ($object->getVar('abid') > 0 && $abid > 0) {
+									$object->setVar('abid', $abid);
+								} else {
+									$object->setVar('abid', $abid);
+								}
+								$object->setVar('songid', $data[$_POST['songid']]);
+								$object->setVar('title', $data[$_POST['title']]);
+								$object->setVar('lyrics', str_replace("\n", "<br>\n", $data[$_POST['lyrics']]));
+								$sid = $songsHandler->insert($object);
+							}
+						}
+					}
+				} else {
+					foreach ($xmlarray as $recid => $data) {
+						$gid = 0;
+						if (mb_strlen($_POST['genre']) > 0 && !empty($data[$_POST['genre']])) {
+							$criteria = new \Criteria('name', $data[$_POST['genre']]);
+							if ($genreHandler->getCount($criteria) > 0) {
+								$objects = $genreHandler->getObjects($criteria, false);
+								$gid     = $objects[0]->getVar('gid');
+							} else {
+								$object = $genreHandler->create();
+								$object->setVar('name', $data[$_POST['genre']]);
+								$gid = $genreHandler->insert($object);
+							}
+						}
+						$vid = 0;
+						if (mb_strlen($_POST['voice']) > 0 && !empty($data[$_POST['voice']])) {
+							$criteria = new \Criteria('name', $data[$_POST['voice']]);
+							if ($voiceHandler->getCount($criteria) > 0) {
+								$objects = $voiceHandler->getObjects($criteria, false);
+								$gid     = $objects[0]->getVar('vid');
+							} else {
+								$object = $voiceHandler->create();
+								$object->setVar('name', $data[$_POST['voice']]);
+								$gid = $voiceHandler->insert($object);
+							}
+						}
+						$cid = 0;
+						if (mb_strlen($_POST['category']) > 0 && !empty($data[$_POST['category']])) {
+							$criteria = new \Criteria('name', $data[$_POST['category']]);
+							if ($categoryHandler->getCount($criteria) > 0) {
+								$objects = $categoryHandler->getObjects($criteria, false);
+								$cid     = $objects[0]->getVar('cid');
+							} else {
+								$object = $categoryHandler->create();
+								$object->setVar('name', $data[$_POST['category']]);
+								$cid = $categoryHandler->insert($object);
+							}
+						}
+						$aids = [];
+						if (mb_strlen($_POST['artist']) > 0 && !empty($data[$_POST['artist']])) {
+							foreach (explode(',', $data[$_POST['artist']]) as $artist) {
+								$criteria = new \Criteria('name', $artist);
+								if ($artistsHandler->getCount($criteria) > 0) {
+									$objects                          = $artistsHandler->getObjects($criteria, false);
+									$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
+								} else {
+									$object = $artistsHandler->create();
+									switch ($data[$_POST['singer']]) {
+										case $_POST['duet']:
+											$object->setVar('singer', '_ENUM_SONGLIST_DUET');
+											break;
+										case $_POST['solo']:
+											$object->setVar('singer', '_ENUM_SONGLIST_SOLO');
+											break;
+									}
+									$object->setVar('cid', $cid);
+									$object->setVar('name', $data[$_POST['artist']]);
+									$aid        = $artistsHandler->insert($object);
+									$aids[$aid] = $aid;
+								}
+							}
+						}
+						$abid = 0;
+						if (mb_strlen($_POST['album']) > 0 && !empty($data[$_POST['album']])) {
+							$criteria = new \Criteria('name', $data[$_POST['album']]);
+							if ($albumsHandler->getCount($criteria) > 0) {
+								$objects = $albumsHandler->getObjects($criteria, false);
+								$abid    = $objects[0]->getVar('aid');
+							} else {
+								$object = $albumsHandler->create();
+								$object->setVar('cid', $cid);
+								$object->setVar('aids', $aids);
+								$object->setVar('name', $data[$_POST['album']]);
+								$abid = $albumsHandler->insert($object);
+							}
+						}
+						$sid = 0;
+						if (mb_strlen($_POST['songid']) > 0 && !empty($data[$_POST['songid']])) {
+							$criteria = new \Criteria('songid', $data[$_POST['songid']]);
+							if ($songsHandler->getCount($criteria) > 0) {
+								$objects = $songsHandler->getObjects($criteria, false);
+								$object  = $objects[0]->getVar('sid');
+							} else {
+								$object = $songsHandler->create();
+							}
+							if ($object->getVar('cid') > 0 && $cid > 0) {
+								$object->setVar('cid', $cid);
+							} else {
+								$object->setVar('cid', $cid);
+							}
+							if ($object->getVar('gid') > 0 && $gid > 0) {
+								$object->setVar('gid', $gid);
+							} else {
+								$object->setVar('gid', $gid);
+							}
+							if (count($object->getVar('aids')) > 0 && count($aids) > 0) {
+								$object->setVar('aids', $aids);
+							} else {
+								$object->setVar('aids', $aids);
+							}
+							if ($object->getVar('abid') > 0 && $abid > 0) {
+								$object->setVar('abid', $abid);
+							} else {
+								$object->setVar('abid', $abid);
+							}
+							$object->setVar('songid', $data[$_POST['songid']]);
+							$object->setVar('title', $data[$_POST['title']]);
+							$object->setVar('lyrics', str_replace("\n", "<br>\n", $data[$_POST['lyrics']]));
+							$sid = $songsHandler->insert($object);
+						}
+					}
+				}
+				unlink($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile']));
+				unset($_SESSION['xmlfile']);
+				redirect_header($_SERVER['SCRIPT_NAME'] . '&op=import&fct=actiona', 10, _AM_SONGLIST_XMLFILE_COMPLETE);
+				break;
+		}
+		break;
 }
 
 xoops_cp_footer();

Spacing +49 added lines, -49 removed lines

@@ -7,7 +7,7 @@ 
 use XoopsModules\Songlist\AlbumsHandler;
 use XoopsModules\Songlist\Form\FormController;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -18,8 +18,8 @@ 
 $limit  = Request::getInt('limit', 30, 'REQUEST');
 $start  = Request::getInt('start', 0, 'REQUEST');
 $order  = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
-$sort   = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-$filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
+$sort   = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
+$filter = !empty($_REQUEST['filter']) ? ''.$_REQUEST['filter'].'' : '1,1';
 
 $albumsHandler = Helper::getInstance()->getHandler('Albums');
 $songsHandler    = Helper::getInstance()->getHandler('Songs');
@@ -34,7 +34,7 @@ 
             default:
             case 'actiona':
                 if (Request::hasVar('xmlfile', 'SESSION')) {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?file=' . $_SESSION['xmlfile'] . '&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
+                    redirect_header($_SERVER['SCRIPT_NAME'].'?file='.$_SESSION['xmlfile'].'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
                 }
                 $adminObject = Admin::getInstance();
                 $adminObject->displayNavigation(basename(__FILE__));
@@ -61,27 +61,27 @@ 
                     $uploader = new Uploader(
                         $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']),
                         ['application/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity', 'text/xml xml xsl', 'text/xml-external-parsed-entity'],
-                        1024 * 1024 * 32,
+                        1024*1024*32,
                         0,
                         0,
                         ['xml']
                     );
                     try {
-                        $uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
+                        $uploader->setPrefix(mb_substr(md5((string) microtime(true)), random_int(0, 20), 13));
                     } catch (Exception $e) {
                     }
 
                     if ($uploader->fetchMedia('xmlfile')) {
                         if (!$uploader->upload()) {
                             echo $uploader->getErrors();
-                            require __DIR__ . '/admin_footer.php';
+                            require __DIR__.'/admin_footer.php';
                             exit(0);
                         }
                         $_SESSION['xmlfile'] = $uploader->getSavedFileName();
-                        redirect_header($_SERVER['SCRIPT_NAME'] . '?file=' . $uploader->getSavedFileName() . '&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
+                        redirect_header($_SERVER['SCRIPT_NAME'].'?file='.$uploader->getSavedFileName().'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
                     } else {
                         echo $uploader->getErrors();
-                        require __DIR__ . '/admin_footer.php';
+                        require __DIR__.'/admin_footer.php';
                         exit(0);
                     }
                 }
@@ -96,22 +96,22 @@ 
                 break;
             case 'import':
 
-                $filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile']));
-                $mb       = floor($filesize / 1024 / 1024);
-                if ($mb > 32) {
-                    set_ini('memory_limit', ($mb + 128) . 'M');
+                $filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile']));
+                $mb       = floor($filesize/1024/1024);
+                if ($mb>32) {
+                    set_ini('memory_limit', ($mb+128).'M');
                 }
                 set_time_limit(3600);
 
-                $xmlarray = Utility::xml2array(file_get_contents($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile'])), false, 'tag');
+                $xmlarray = Utility::xml2array(file_get_contents($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile'])), false, 'tag');
 
-                if (mb_strlen($_POST['collection']) > 0) {
+                if (mb_strlen($_POST['collection'])>0) {
                     foreach ($xmlarray[$_POST['collection']] as $id => $record) {
                         foreach ($record as $recid => $data) {
                             $gid = 0;
-                            if (mb_strlen($_POST['genre']) > 0 && !empty($data[$_POST['genre']])) {
+                            if (mb_strlen($_POST['genre'])>0 && !empty($data[$_POST['genre']])) {
                                 $criteria = new \Criteria('name', $data[$_POST['genre']]);
-                                if ($genreHandler->getCount($criteria) > 0) {
+                                if ($genreHandler->getCount($criteria)>0) {
                                     $objects = $genreHandler->getObjects($criteria, false);
                                     $gid     = $objects[0]->getVar('gid');
                                 } else {
@@ -122,9 +122,9 @@ 
                             }
 
                             $vid = 0;
-                            if (mb_strlen($_POST['voice']) > 0 && !empty($data[$_POST['voice']])) {
+                            if (mb_strlen($_POST['voice'])>0 && !empty($data[$_POST['voice']])) {
                                 $criteria = new \Criteria('name', $data[$_POST['voice']]);
-                                if ($voiceHandler->getCount($criteria) > 0) {
+                                if ($voiceHandler->getCount($criteria)>0) {
                                     $objects = $voiceHandler->getObjects($criteria, false);
                                     $gid     = $objects[0]->getVar('vid');
                                 } else {
@@ -135,9 +135,9 @@ 
                             }
 
                             $cid = 0;
-                            if (mb_strlen($_POST['category']) > 0 && !empty($data[$_POST['category']])) {
+                            if (mb_strlen($_POST['category'])>0 && !empty($data[$_POST['category']])) {
                                 $criteria = new \Criteria('name', $data[$_POST['category']]);
-                                if ($categoryHandler->getCount($criteria) > 0) {
+                                if ($categoryHandler->getCount($criteria)>0) {
                                     $objects = $categoryHandler->getObjects($criteria, false);
                                     $cid     = $objects[0]->getVar('cid');
                                 } else {
@@ -147,10 +147,10 @@ 
                                 }
                             }
                             $aids = [];
-                            if (mb_strlen($_POST['artist']) > 0 && !empty($data[$_POST['artist']])) {
+                            if (mb_strlen($_POST['artist'])>0 && !empty($data[$_POST['artist']])) {
                                 foreach (explode(',', $data[$_POST['artist']]) as $artist) {
                                     $criteria = new \Criteria('name', $artist);
-                                    if ($artistsHandler->getCount($criteria) > 0) {
+                                    if ($artistsHandler->getCount($criteria)>0) {
                                         $objects                          = $artistsHandler->getObjects($criteria, false);
                                         $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
                                     } else {
@@ -171,9 +171,9 @@ 
                                 }
                             }
                             $abid = 0;
-                            if (mb_strlen($_POST['album']) > 0 && !empty($data[$_POST['album']])) {
+                            if (mb_strlen($_POST['album'])>0 && !empty($data[$_POST['album']])) {
                                 $criteria = new \Criteria('name', $data[$_POST['album']]);
-                                if ($albumsHandler->getCount($criteria) > 0) {
+                                if ($albumsHandler->getCount($criteria)>0) {
                                     $objects = $albumsHandler->getObjects($criteria, false);
                                     $abid    = $objects[0]->getVar('aid');
                                 } else {
@@ -185,30 +185,30 @@ 
                                 }
                             }
                             $sid = 0;
-                            if (mb_strlen($_POST['songid']) > 0 && !empty($data[$_POST['songid']])) {
+                            if (mb_strlen($_POST['songid'])>0 && !empty($data[$_POST['songid']])) {
                                 $criteria = new \Criteria('songid', $data[$_POST['songid']]);
-                                if ($songsHandler->getCount($criteria) > 0) {
+                                if ($songsHandler->getCount($criteria)>0) {
                                     $objects = $songsHandler->getObjects($criteria, false);
                                     $object  = $objects[0]->getVar('sid');
                                 } else {
                                     $object = $songsHandler->create();
                                 }
-                                if ($object->getVar('cid') > 0 && $cid > 0) {
+                                if ($object->getVar('cid')>0 && $cid>0) {
                                     $object->setVar('cid', $cid);
                                 } else {
                                     $object->setVar('cid', $cid);
                                 }
-                                if ($object->getVar('gid') > 0 && $gid > 0) {
+                                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) {
+                                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) {
+                                if ($object->getVar('abid')>0 && $abid>0) {
                                     $object->setVar('abid', $abid);
                                 } else {
                                     $object->setVar('abid', $abid);
@@ -223,9 +223,9 @@ 
                 } else {
                     foreach ($xmlarray as $recid => $data) {
                         $gid = 0;
-                        if (mb_strlen($_POST['genre']) > 0 && !empty($data[$_POST['genre']])) {
+                        if (mb_strlen($_POST['genre'])>0 && !empty($data[$_POST['genre']])) {
                             $criteria = new \Criteria('name', $data[$_POST['genre']]);
-                            if ($genreHandler->getCount($criteria) > 0) {
+                            if ($genreHandler->getCount($criteria)>0) {
                                 $objects = $genreHandler->getObjects($criteria, false);
                                 $gid     = $objects[0]->getVar('gid');
                             } else {
@@ -235,9 +235,9 @@ 
                             }
                         }
                         $vid = 0;
-                        if (mb_strlen($_POST['voice']) > 0 && !empty($data[$_POST['voice']])) {
+                        if (mb_strlen($_POST['voice'])>0 && !empty($data[$_POST['voice']])) {
                             $criteria = new \Criteria('name', $data[$_POST['voice']]);
-                            if ($voiceHandler->getCount($criteria) > 0) {
+                            if ($voiceHandler->getCount($criteria)>0) {
                                 $objects = $voiceHandler->getObjects($criteria, false);
                                 $gid     = $objects[0]->getVar('vid');
                             } else {
@@ -247,9 +247,9 @@ 
                             }
                         }
                         $cid = 0;
-                        if (mb_strlen($_POST['category']) > 0 && !empty($data[$_POST['category']])) {
+                        if (mb_strlen($_POST['category'])>0 && !empty($data[$_POST['category']])) {
                             $criteria = new \Criteria('name', $data[$_POST['category']]);
-                            if ($categoryHandler->getCount($criteria) > 0) {
+                            if ($categoryHandler->getCount($criteria)>0) {
                                 $objects = $categoryHandler->getObjects($criteria, false);
                                 $cid     = $objects[0]->getVar('cid');
                             } else {
@@ -259,10 +259,10 @@ 
                             }
                         }
                         $aids = [];
-                        if (mb_strlen($_POST['artist']) > 0 && !empty($data[$_POST['artist']])) {
+                        if (mb_strlen($_POST['artist'])>0 && !empty($data[$_POST['artist']])) {
                             foreach (explode(',', $data[$_POST['artist']]) as $artist) {
                                 $criteria = new \Criteria('name', $artist);
-                                if ($artistsHandler->getCount($criteria) > 0) {
+                                if ($artistsHandler->getCount($criteria)>0) {
                                     $objects                          = $artistsHandler->getObjects($criteria, false);
                                     $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
                                 } else {
@@ -283,9 +283,9 @@ 
                             }
                         }
                         $abid = 0;
-                        if (mb_strlen($_POST['album']) > 0 && !empty($data[$_POST['album']])) {
+                        if (mb_strlen($_POST['album'])>0 && !empty($data[$_POST['album']])) {
                             $criteria = new \Criteria('name', $data[$_POST['album']]);
-                            if ($albumsHandler->getCount($criteria) > 0) {
+                            if ($albumsHandler->getCount($criteria)>0) {
                                 $objects = $albumsHandler->getObjects($criteria, false);
                                 $abid    = $objects[0]->getVar('aid');
                             } else {
@@ -297,30 +297,30 @@ 
                             }
                         }
                         $sid = 0;
-                        if (mb_strlen($_POST['songid']) > 0 && !empty($data[$_POST['songid']])) {
+                        if (mb_strlen($_POST['songid'])>0 && !empty($data[$_POST['songid']])) {
                             $criteria = new \Criteria('songid', $data[$_POST['songid']]);
-                            if ($songsHandler->getCount($criteria) > 0) {
+                            if ($songsHandler->getCount($criteria)>0) {
                                 $objects = $songsHandler->getObjects($criteria, false);
                                 $object  = $objects[0]->getVar('sid');
                             } else {
                                 $object = $songsHandler->create();
                             }
-                            if ($object->getVar('cid') > 0 && $cid > 0) {
+                            if ($object->getVar('cid')>0 && $cid>0) {
                                 $object->setVar('cid', $cid);
                             } else {
                                 $object->setVar('cid', $cid);
                             }
-                            if ($object->getVar('gid') > 0 && $gid > 0) {
+                            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) {
+                            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) {
+                            if ($object->getVar('abid')>0 && $abid>0) {
                                 $object->setVar('abid', $abid);
                             } else {
                                 $object->setVar('abid', $abid);
@@ -332,9 +332,9 @@ 
                         }
                     }
                 }
-                unlink($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile']));
+                unlink($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile']));
                 unset($_SESSION['xmlfile']);
-                redirect_header($_SERVER['SCRIPT_NAME'] . '&op=import&fct=actiona', 10, _AM_SONGLIST_XMLFILE_COMPLETE);
+                redirect_header($_SERVER['SCRIPT_NAME'].'&op=import&fct=actiona', 10, _AM_SONGLIST_XMLFILE_COMPLETE);
                 break;
         }
         break;

admin/admin_header.php

Spacing +3 added lines, -3 removed lines

@@ -19,11 +19,11 @@
 use Xmf\Module\Admin;
 use XoopsModules\Songlist\Helper;
 
-require \dirname(__DIR__) . '/preloads/autoloader.php';
+require \dirname(__DIR__).'/preloads/autoloader.php';
 
-require \dirname(__DIR__, 3) . '/include/cp_header.php';
+require \dirname(__DIR__, 3).'/include/cp_header.php';
 //require $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
-require \dirname(__DIR__) . '/include/common.php';
+require \dirname(__DIR__).'/include/common.php';
 
 $moduleDirName = \basename(\dirname(__DIR__));