XoopsModules25x / songlist

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

admin/admin_footer.php

Spacing +1 added lines, -1 removed lines

@@ -16,6 +16,6 @@
  */
 $pathIcon32 = Xmf\Module\Admin::iconUrl('', '32');
 
-echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
+echo "<div class='adminfooter'>\n"."  <div style='text-align: center;'>\n"."    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"."  </div>\n".'  '._AM_MODULEADMIN_ADMIN_FOOTER."\n".'</div>';
 
 xoops_cp_footer();

admin/header.php

Indentation +10 added lines, -10 removed lines

@@ -23,10 +23,10 @@ 
 require \dirname(__DIR__, 3) . '/include/cp_header.php';
 
 if (!defined('_CHARSET')) {
-    define('_CHARSET', 'UTF-8');
+	define('_CHARSET', 'UTF-8');
 }
 if (!defined('_CHARSET_ISO')) {
-    define('_CHARSET_ISO', 'ISO-8859-1');
+	define('_CHARSET_ISO', 'ISO-8859-1');
 }
 
 $GLOBALS['songlistAdmin'] = true;
@@ -59,20 +59,20 @@ 
 $GLOBALS['songlistImageAdmin'] = Admin::iconUrl('', '32');
 
 if ($GLOBALS['xoopsUser']) {
-    /** @var \XoopsGroupPermHandler $grouppermHandler */
-    $grouppermHandler = xoops_getHandler('groupperm');
-    if (!$grouppermHandler->checkRight('module_admin', $GLOBALS['songlistModule']->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
-        redirect_header(XOOPS_URL, 1, _NOPERM);
-    }
+	/** @var \XoopsGroupPermHandler $grouppermHandler */
+	$grouppermHandler = xoops_getHandler('groupperm');
+	if (!$grouppermHandler->checkRight('module_admin', $GLOBALS['songlistModule']->getVar('mid'), $GLOBALS['xoopsUser']->getGroups())) {
+		redirect_header(XOOPS_URL, 1, _NOPERM);
+	}
 } else {
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
+	redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
 }
 
 xoops_loadLanguage('user');
 
 if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
-    $GLOBALS['xoopsTpl'] = new \XoopsTpl();
+	require_once XOOPS_ROOT_PATH . '/class/template.php';
+	$GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
 $GLOBALS['xoopsTpl']->assign('pathImageIcon', $GLOBALS['songlistImageIcon']);

Spacing +5 added lines, -5 removed lines

@@ -18,9 +18,9 @@ 
 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';
 
 if (!defined('_CHARSET')) {
     define('_CHARSET', 'UTF-8');
@@ -65,13 +65,13 @@ 
         redirect_header(XOOPS_URL, 1, _NOPERM);
     }
 } else {
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 xoops_loadLanguage('user');
 
 if (!isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl'])) {
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
     $GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
@@ -79,7 +79,7 @@ 
 $GLOBALS['xoopsTpl']->assign('pathImageAdmin', $GLOBALS['songlistImageAdmin']);
 
 //require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['songlistModule']->getVar('dirname') . '/include/functions.php';
-require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['songlistModule']->getVar('dirname') . '/include/songlist.object.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['songlistModule']->getVar('dirname').'/include/songlist.object.php';
 //require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['songlistModule']->getVar('dirname') . '/include/songlist.form.php';
 
 xoops_loadLanguage('admin', 'songlist');

admin/about0.php

Indentation +30 added lines, -30 removed lines

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

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
 
 use Xmf\Module\Admin;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 xoops_loadLanguage('admin', 'songlist');
 
 xoops_cp_header();
@@ -49,7 +49,7 @@ 
 //--></script>
 <!-- End Form Validation JavaScript //-->',
 ];
-$paypalform   = [
+$paypalform = [
     0 => '<form action="https://www.paypal.com/cgi-bin/webscr" method="post">',
     1 => '<input name="cmd" value="_s-xclick" type="hidden">',
     2 => '<input name="hosted_button_id" value="%s" type="hidden">',
@@ -57,25 +57,25 @@ 
     4 => '<input src="https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif" name="submit" alt="PayPal - The safer, easier way to pay online!" border="0" type="image">',
     5 => '</form>',
 ];
-for ($key = 0; $key <= 4; ++$key) {
+for ($key = 0; $key<=4; ++$key) {
     switch ($key) {
         case 2:
             $donationform[$key] = sprintf(
                 $donationform[$key],
-                $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (mb_strlen($GLOBALS['xoopsUser']->getVar('name')) > 0 ? $GLOBALS['xoopsUser']->getVar('name') . ' [' . $GLOBALS['xoopsUser']->getVar('uname') . ']' : $GLOBALS['xoopsUser']->getVar('uname')),
+                $GLOBALS['xoopsConfig']['sitename'].' - '.(mb_strlen($GLOBALS['xoopsUser']->getVar('name'))>0 ? $GLOBALS['xoopsUser']->getVar('name').' ['.$GLOBALS['xoopsUser']->getVar('uname').']' : $GLOBALS['xoopsUser']->getVar('uname')),
                 $GLOBALS['xoopsUser']->getVar('email'),
                 XOOPS_LICENSE_KEY,
                 \mb_strtoupper($GLOBALS['songlistModule']->getVar('dirname')),
-                \mb_strtoupper($GLOBALS['songlistModule']->getVar('dirname')) . ' ' . $GLOBALS['songlistModule']->getVar('name')
+                \mb_strtoupper($GLOBALS['songlistModule']->getVar('dirname')).' '.$GLOBALS['songlistModule']->getVar('name')
             );
             break;
     }
 }
 
 $istart = mb_strpos($about, $paypalform[0], 1);
-$iend   = mb_strpos($about, $paypalform[5], $istart + 1) + mb_strlen($paypalform[5]) - 1;
-echo(mb_substr($about, 0, $istart - 1));
+$iend   = mb_strpos($about, $paypalform[5], $istart+1)+mb_strlen($paypalform[5])-1;
+echo(mb_substr($about, 0, $istart-1));
 echo implode("\n", $donationform);
-echo(mb_substr($about, $iend + 1, mb_strlen($about) - $iend - 1));
+echo(mb_substr($about, $iend+1, mb_strlen($about)-$iend-1));
 
 xoops_cp_footer();

admin/index.php

Indentation +42 added lines, -42 removed lines

@@ -34,57 +34,57 @@
 //check for upload folders, create if needed

 $configurator = new Configurator();

 foreach (array_keys($configurator->uploadFolders) as $i) {

-    $utility::createFolder($configurator->uploadFolders[$i]);

-    $adminObject->addConfigBoxLine($configurator->uploadFolders[$i], 'folder');

+	$utility::createFolder($configurator->uploadFolders[$i]);

+	$adminObject->addConfigBoxLine($configurator->uploadFolders[$i], 'folder');

 }

 

 $op = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : 'default'));

 

 switch ($op) {

-    case 'default':

-    default:

-        $adminObject = Admin::getInstance();

-        $adminObject->displayNavigation(basename(__FILE__));

+	case 'default':

+	default:

+		$adminObject = Admin::getInstance();

+		$adminObject->displayNavigation(basename(__FILE__));

 

-        $adminObject = Admin::getInstance();

+		$adminObject = Admin::getInstance();

 

-        $categoryHandler = Helper::getInstance()->getHandler('Category');

-        $artistsHandler  = Helper::getInstance()->getHandler('Artists');

-        $albumsHandler   = Helper::getInstance()->getHandler('Albums');

-        $genreHandler    = Helper::getInstance()->getHandler('Genre');

-        $voiceHandler    = Helper::getInstance()->getHandler('Voice');

-        $songsHandler    = Helper::getInstance()->getHandler('Songs');

-        $requestsHandler = Helper::getInstance()->getHandler('Requests');

-        $votesHandler    = Helper::getInstance()->getHandler('Votes');

+		$categoryHandler = Helper::getInstance()->getHandler('Category');

+		$artistsHandler  = Helper::getInstance()->getHandler('Artists');

+		$albumsHandler   = Helper::getInstance()->getHandler('Albums');

+		$genreHandler    = Helper::getInstance()->getHandler('Genre');

+		$voiceHandler    = Helper::getInstance()->getHandler('Voice');

+		$songsHandler    = Helper::getInstance()->getHandler('Songs');

+		$requestsHandler = Helper::getInstance()->getHandler('Requests');

+		$votesHandler    = Helper::getInstance()->getHandler('Votes');

 

-        $adminObject->addInfoBox(_AM_SONGLIST_COUNT);

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_CATEGORY . '</label>', $categoryHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_ARTISTS . '</label>', $artistsHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_ALBUMS . '</label>', $albumsHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_GENRE . '</label>', $genreHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_VOICE . '</label>', $voiceHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_SONGS . '</label>', $songsHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_REQUESTS . '</label>', $requestsHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_VOTES . '</label>', $votesHandler->getCount(null, true)), '', 'green');

+		$adminObject->addInfoBox(_AM_SONGLIST_COUNT);

+		$adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_CATEGORY . '</label>', $categoryHandler->getCount(null, true)), '', 'green');

+		$adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_ARTISTS . '</label>', $artistsHandler->getCount(null, true)), '', 'green');

+		$adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_ALBUMS . '</label>', $albumsHandler->getCount(null, true)), '', 'green');

+		$adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_GENRE . '</label>', $genreHandler->getCount(null, true)), '', 'green');

+		$adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_VOICE . '</label>', $voiceHandler->getCount(null, true)), '', 'green');

+		$adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_SONGS . '</label>', $songsHandler->getCount(null, true)), '', 'green');

+		$adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_REQUESTS . '</label>', $requestsHandler->getCount(null, true)), '', 'green');

+		$adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_VOTES . '</label>', $votesHandler->getCount(null, true)), '', 'green');

 

-        //------------- Test Data Buttons ----------------------------

-        if ($helper->getConfig('displaySampleButton')) {

-            TestdataButtons::loadButtonConfig($adminObject);

-            $adminObject->displayButton('left', '');

-        }

-        $op = Request::getString('op', 0, 'GET');

-        switch ($op) {

-            case 'hide_buttons':

-                TestdataButtons::hideButtons();

-                break;

-            case 'show_buttons':

-                TestdataButtons::showButtons();

-                break;

-        }

-        //------------- End Test Data Buttons ----------------------------

+		//------------- Test Data Buttons ----------------------------

+		if ($helper->getConfig('displaySampleButton')) {

+			TestdataButtons::loadButtonConfig($adminObject);

+			$adminObject->displayButton('left', '');

+		}

+		$op = Request::getString('op', 0, 'GET');

+		switch ($op) {

+			case 'hide_buttons':

+				TestdataButtons::hideButtons();

+				break;

+			case 'show_buttons':

+				TestdataButtons::showButtons();

+				break;

+		}

+		//------------- End Test Data Buttons ----------------------------

 

-        $adminObject->displayIndex();

+		$adminObject->displayIndex();

 

-        xoops_cp_footer();

-        break;

+		xoops_cp_footer();

+		break;

 }

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
 /** @var Helper $helper */

 /** @var Utility $utility */

 

-require __DIR__ . '/header.php';

+require __DIR__.'/header.php';

 xoops_loadLanguage('admin', 'songlist');

 

 xoops_cp_header();

@@ -58,14 +58,14 @@ 
         $votesHandler    = Helper::getInstance()->getHandler('Votes');

 

         $adminObject->addInfoBox(_AM_SONGLIST_COUNT);

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_CATEGORY . '</label>', $categoryHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_ARTISTS . '</label>', $artistsHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_ALBUMS . '</label>', $albumsHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_GENRE . '</label>', $genreHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_VOICE . '</label>', $voiceHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_SONGS . '</label>', $songsHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_REQUESTS . '</label>', $requestsHandler->getCount(null, true)), '', 'green');

-        $adminObject->addInfoBoxLine(sprintf('<label>' . _AM_SONGLIST_NUMBER_OF_VOTES . '</label>', $votesHandler->getCount(null, true)), '', 'green');

+        $adminObject->addInfoBoxLine(sprintf('<label>'._AM_SONGLIST_NUMBER_OF_CATEGORY.'</label>', $categoryHandler->getCount(null, true)), '', 'green');

+        $adminObject->addInfoBoxLine(sprintf('<label>'._AM_SONGLIST_NUMBER_OF_ARTISTS.'</label>', $artistsHandler->getCount(null, true)), '', 'green');

+        $adminObject->addInfoBoxLine(sprintf('<label>'._AM_SONGLIST_NUMBER_OF_ALBUMS.'</label>', $albumsHandler->getCount(null, true)), '', 'green');

+        $adminObject->addInfoBoxLine(sprintf('<label>'._AM_SONGLIST_NUMBER_OF_GENRE.'</label>', $genreHandler->getCount(null, true)), '', 'green');

+        $adminObject->addInfoBoxLine(sprintf('<label>'._AM_SONGLIST_NUMBER_OF_VOICE.'</label>', $voiceHandler->getCount(null, true)), '', 'green');

+        $adminObject->addInfoBoxLine(sprintf('<label>'._AM_SONGLIST_NUMBER_OF_SONGS.'</label>', $songsHandler->getCount(null, true)), '', 'green');

+        $adminObject->addInfoBoxLine(sprintf('<label>'._AM_SONGLIST_NUMBER_OF_REQUESTS.'</label>', $requestsHandler->getCount(null, true)), '', 'green');

+        $adminObject->addInfoBoxLine(sprintf('<label>'._AM_SONGLIST_NUMBER_OF_VOTES.'</label>', $votesHandler->getCount(null, true)), '', 'green');

 

         //------------- Test Data Buttons ----------------------------

         if ($helper->getConfig('displaySampleButton')) {