XoopsModules25x / songlist

blocks/songlist_popular_albums.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $handler = Helper::getInstance()->getHandler('Albums');
     $objects = $handler->getTop($options[0]);
-    if (count($objects) > 0) {
+    if (count($objects)>0) {
         $ret = [];
         foreach ($objects as $id => $object) {
             $ret[$id] = $object->toArray(true);
@@ -33,5 +33,5 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
 
-    return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
+    return _BL_SONGLIST_NUMBEROFITEMS.$num->render();
 }

blocks/songlist_popular_genres.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $handler = Helper::getInstance()->getHandler('Genre');
     $objects = $handler->getTop($options[0]);
-    if (count($objects) > 0) {
+    if (count($objects)>0) {
         $ret = [];
         foreach ($objects as $id => $object) {
             $ret[$id] = $object->toArray(true);
@@ -33,5 +33,5 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
 
-    return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
+    return _BL_SONGLIST_NUMBEROFITEMS.$num->render();
 }

blocks/songlist_popular_songs.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $handler = Helper::getInstance()->getHandler('Songs');
     $objects = $handler->getTop($options[0]);
-    if (count($objects) > 0) {
+    if (count($objects)>0) {
         $ret = [];
         foreach ($objects as $id => $object) {
             $ret[$id] = $object->toArray(true);
@@ -33,5 +33,5 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
 
-    return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
+    return _BL_SONGLIST_NUMBEROFITEMS.$num->render();
 }

blocks/songlist_popular_artists.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $handler = Helper::getInstance()->getHandler('Artists');
     $objects = $handler->getTop($options[0]);
-    if (count($objects) > 0) {
+    if (count($objects)>0) {
         $ret = [];
         foreach ($objects as $id => $object) {
             $ret[$id] = $object->toArray(true); //TODO mb why do we need toArray()?
@@ -33,5 +33,5 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
 
-    return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
+    return _BL_SONGLIST_NUMBEROFITEMS.$num->render();
 }

artists.php

Spacing +36 added lines, -36 removed lines

@@ -4,7 +4,7 @@ 
 use XoopsModules\Songlist\CategoryHandler;
 use XoopsModules\Songlist\ArtistsHandler;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
 
@@ -12,12 +12,12 @@ 
 $categoryHandler = Helper::getInstance()->getHandler('Category');
 $criteria_cat    = new \CriteriaCompo();
 $cids            = $categoryHandler->GetCatAndSubCat($_SESSION['cid']);
-if ($_SESSION['cid'] > 0) {
+if ($_SESSION['cid']>0) {
     $cids[$_SESSION['cid']] = $_SESSION['cid'];
 }
-if (count($cids) > 0 && 0 != $_SESSION['cid']) {
+if (count($cids)>0 && 0!=$_SESSION['cid']) {
     foreach ($cids as $cid) {
-        $criteria_cat->add(new \Criteria('`cids`', '%"' . $cid . '"%', 'LIKE'), 'OR');
+        $criteria_cat->add(new \Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR');
     }
 } else {
     $criteria_cat->add(new \Criteria(''), 'OR');
@@ -36,24 +36,24 @@ 
 $row = 1;
 foreach ($categories as $category) {
     $cat[$row][$col]          = $category->toArray(true);
-    $cat[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+    $cat[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
     ++$col;
-    if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+    if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
         ++$row;
         $col = 1;
     }
 }
-if (1 != $col) {
+if (1!=$col) {
     $col--;
-    for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+    for ($j = $col; $j<=$GLOBALS['songlistModuleConfig']['cols']; ++$j) {
         $cat[$row][$j][$categoryHandler->keyName] = 0;
-        $cat[$row][$j]['width']                   = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+        $cat[$row][$j]['width']                   = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
     }
 }
 
 /** @var ArtistsHandler $artistsHandler */
 $artistsHandler = Helper::getInstance()->getHandler('Artists');
-switch ((string)$GLOBALS['op']) {
+switch ((string) $GLOBALS['op']) {
     default:
     case 'item':
         switch ($fct) {
@@ -71,41 +71,41 @@ 
                 $row = 1;
                 foreach ($artists as $artist) {
                     $ret[$row][$col]          = $artist->toArray(true);
-                    $ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+                    $ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
                     ++$col;
-                    if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+                    if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
                         ++$row;
                         $col = 1;
                     }
                 }
-                if (1 != $col) {
-                    for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+                if (1!=$col) {
+                    for ($j = $col; $j<=$GLOBALS['songlistModuleConfig']['cols']; ++$j) {
                         $ret[$row][$j][$artistsHandler->keyName] = 0;
-                        $ret[$row][$j]['width']                  = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+                        $ret[$row][$j]['width']                  = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
                     }
                 }
 
                 $url = $artistsHandler->getURL(false);
                 if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
                     header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
+                    header('Location: '.$url);
                     exit(0);
                 }
 
                 $GLOBALS['xoopsOption']['template_main'] = 'songlist_artists_index.tpl';
                 require $GLOBALS['xoops']->path('/header.php');
                 if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-                    $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+                    $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
                     $GLOBALS['loaded_jquery'] = true;
                 }
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
                 $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
                 $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
                 $GLOBALS['xoopsTpl']->assign('results', $ret);
                 $GLOBALS['xoopsTpl']->assign('categories', $cat);
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
                 $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
-                if (0 != $_SESSION['cid']) {
+                if (0!=$_SESSION['cid']) {
                     $category = $categoryHandler->get($_SESSION['cid']);
                     $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
                 }
@@ -118,17 +118,17 @@ 
                 $url = $artist->getURL(true);
                 if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
                     header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
+                    header('Location: '.$url);
                     exit(0);
                 }
 
                 $GLOBALS['xoopsOption']['template_main'] = 'songlist_artists_item.tpl';
                 require $GLOBALS['xoops']->path('/header.php');
                 if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-                    $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+                    $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
                     $GLOBALS['loaded_jquery'] = true;
                 }
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
                 $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
                 $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
                 $GLOBALS['xoopsTpl']->assign('songs', false);
@@ -149,13 +149,13 @@ 
                 $browse_criteria = new \CriteriaCompo();
                 switch ($value) {
                     case '0':
-                        for ($u = 0; $u < 10; ++$u) {
-                            $browse_criteria->add(new \Criteria('name', $u . '%', 'LIKE'), 'OR');
+                        for ($u = 0; $u<10; ++$u) {
+                            $browse_criteria->add(new \Criteria('name', $u.'%', 'LIKE'), 'OR');
                         }
                         break;
                     default:
-                        $browse_criteria->add(new \Criteria('name', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
-                        $browse_criteria->add(new \Criteria('name', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('name', \mb_strtoupper($value).'%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('name', \mb_strtolower($value).'%', 'LIKE'), 'OR');
                         break;
                 }
                 $criteria = new \CriteriaCompo($criteria_cat, 'AND');
@@ -174,42 +174,42 @@ 
         $row = 1;
         foreach ($artists as $artist) {
             $ret[$row][$col]          = $artist->toArray(true);
-            $ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+            $ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
             ++$col;
-            if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+            if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
                 ++$row;
                 $col = 1;
             }
         }
-        if (1 != $col) {
+        if (1!=$col) {
             $col--;
-            for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+            for ($j = $col; $j<=$GLOBALS['songlistModuleConfig']['cols']; ++$j) {
                 $ret[$row][$j][$artistsHandler->keyName] = 0;
-                $ret[$row][$j]['width']                  = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+                $ret[$row][$j]['width']                  = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
             }
         }
 
         $url = $artistsHandler->getURL(false);
         if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
             header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
+            header('Location: '.$url);
             exit(0);
         }
 
         $GLOBALS['xoopsOption']['template_main'] = 'songlist_artists_index.tpl';
         require $GLOBALS['xoops']->path('/header.php');
         if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-            $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+            $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
             $GLOBALS['loaded_jquery'] = true;
         }
-        $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+        $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
         $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
         $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
         $GLOBALS['xoopsTpl']->assign('results', $ret);
         $GLOBALS['xoopsTpl']->assign('categories', $cat);
         $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
         $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
-        if (0 != $_SESSION['cid']) {
+        if (0!=$_SESSION['cid']) {
             $category = $categoryHandler->get($_SESSION['cid']);
             $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
         }
@@ -227,5 +227,5 @@ 
                 unset($_SESSION['cid']);
                 break;
         }
-        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=0&value=%&start=0&limit=$limit&cid=" . $_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
+        redirect_header($_SERVER['SCRIPT_NAME']."?op=item&fct=list&id=0&value=%&start=0&limit=$limit&cid=".$_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
 }

admin/field.php

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

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

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