XoopsModules25x / songlist

admin/blocksadmin.php

Indentation +103 added lines, -103 removed lines

@@ -33,112 +33,112 @@
 $xoopsModule = XoopsModule::getByDirname($moduleDirName);
 
 if (!is_object($GLOBALS['xoopsUser']) || !is_object($xoopsModule)
-    || !$GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
-    exit(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403'));
+	|| !$GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
+	exit(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403'));
 }
 if ($GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
-
-    $op = Request::getCmd('op', 'list');
-    if (!empty($_POST)) {
-        $ok             = Request::getInt('ok', 0, 'POST');
-        $confirm_submit = Request::getCmd('confirm_submit', '', 'POST');
-        $submit         = Request::getString('submit', '', 'POST');
-        $bside          = Request::getString('bside', '0', 'POST');
-        $bweight        = Request::getString('bweight', '0', 'POST');
-        $bvisible       = Request::getString('bvisible', '0', 'POST');
-        $bmodule        = Request::getArray('bmodule', [], 'POST');
-        $btitle         = Request::getString('btitle', '', 'POST');
-        $bcachetime     = Request::getString('bcachetime', '0', 'POST');
-        $groups         = Request::getArray('groups', [], 'POST');
-        $options        = Request::getArray('options', [], 'POST');
-        $submitblock    = Request::getString('submitblock', '', 'POST');
-        $fct            = Request::getString('fct', '', 'POST');
-        $title          = Request::getString('title', '', 'POST');
-        $side           = Request::getString('side', '0', 'POST');
-        $weight         = Request::getString('weight', '0', 'POST');
-        $visible        = Request::getString('visible', '0', 'POST');
-    }
-
-    if ('list' === $op) {
-        //        xoops_cp_header();
-        $blocksadmin->listBlocks();
-        require_once __DIR__ . '/admin_footer.php';
-        exit();
-    }
-
-    if (\in_array($op, ['edit', 'edit_ok', 'delete', 'delete_ok', 'clone', 'clone_ok'], true)) {
-        $bid = Request::getInt('bid', 0);
-        $ok  = Request::getInt('ok', 0);
-
-        if ('clone' === $op) {
-            $blocksadmin->cloneBlock($bid);
-        }
-
-        if ('delete' === $op) {
-            if (1 === $ok) {
-                //            if (!$GLOBALS['xoopsSecurity']->check()) {
-                //                redirect_header($helper->url('admin/blocksadmin.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-                //            }
-                $blocksadmin->deleteBlock($bid);
-            } else {
-                //            xoops_cp_header();
-                xoops_confirm(['ok' => 1, 'op' => 'delete', 'bid' => $bid], 'blocksadmin.php', constant('CO_' . $moduleDirNameUpper . '_' . 'DELETE_BLOCK_CONFIRM'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
-                xoops_cp_footer();
-            }
-        }
-
-        if ('edit' === $op) {
-            $blocksadmin->editBlock($bid);
-        }
-
-        if ('edit_ok' === $op) {
-            $blocksadmin->updateBlock($bid, $btitle, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
-        }
-
-        if ('clone_ok' === $op) {
-            $blocksadmin->isBlockCloned($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
-        }
-    }
-
-    if ('order' === $op) {
-        $bid = Request::getArray('bid', []);
-
-        $title      = Request::getArray('title', [], 'POST');
-        $side       = Request::getArray('side', [], 'POST');
-        $weight     = Request::getArray('weight', [], 'POST');
-        $visible    = Request::getArray('visible', [], 'POST');
-        $bcachetime = Request::getArray('bcachetime', [], 'POST');
-        $bmodule    = Request::getArray('bmodule', [], 'POST'); //mb
-
-        $oldtitle      = Request::getArray('oldtitle', [], 'POST');
-        $oldside       = Request::getArray('oldside', [], 'POST');
-        $oldweight     = Request::getArray('oldweight', [], 'POST');
-        $oldvisible    = Request::getArray('oldvisible', [], 'POST');
-        $oldgroups     = Request::getArray('oldgroups', [], 'POST');
-        $oldbcachetime = Request::getArray('oldcachetime', [], 'POST');
-        $oldbmodule    = Request::getArray('oldbmodule', [], 'POST'); //mb
-
-        $blocksadmin->orderBlock(
-            $bid,
-            $oldtitle,
-            $oldside,
-            $oldweight,
-            $oldvisible,
-            $oldgroups,
-            $oldbcachetime,
-            $oldbmodule,
-            $title,
-            $weight,
-            $visible,
-            $side,
-            $bcachetime,
-            $groups,
-            $bmodule
-        );
-    }
+	require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
+
+	$op = Request::getCmd('op', 'list');
+	if (!empty($_POST)) {
+		$ok             = Request::getInt('ok', 0, 'POST');
+		$confirm_submit = Request::getCmd('confirm_submit', '', 'POST');
+		$submit         = Request::getString('submit', '', 'POST');
+		$bside          = Request::getString('bside', '0', 'POST');
+		$bweight        = Request::getString('bweight', '0', 'POST');
+		$bvisible       = Request::getString('bvisible', '0', 'POST');
+		$bmodule        = Request::getArray('bmodule', [], 'POST');
+		$btitle         = Request::getString('btitle', '', 'POST');
+		$bcachetime     = Request::getString('bcachetime', '0', 'POST');
+		$groups         = Request::getArray('groups', [], 'POST');
+		$options        = Request::getArray('options', [], 'POST');
+		$submitblock    = Request::getString('submitblock', '', 'POST');
+		$fct            = Request::getString('fct', '', 'POST');
+		$title          = Request::getString('title', '', 'POST');
+		$side           = Request::getString('side', '0', 'POST');
+		$weight         = Request::getString('weight', '0', 'POST');
+		$visible        = Request::getString('visible', '0', 'POST');
+	}
+
+	if ('list' === $op) {
+		//        xoops_cp_header();
+		$blocksadmin->listBlocks();
+		require_once __DIR__ . '/admin_footer.php';
+		exit();
+	}
+
+	if (\in_array($op, ['edit', 'edit_ok', 'delete', 'delete_ok', 'clone', 'clone_ok'], true)) {
+		$bid = Request::getInt('bid', 0);
+		$ok  = Request::getInt('ok', 0);
+
+		if ('clone' === $op) {
+			$blocksadmin->cloneBlock($bid);
+		}
+
+		if ('delete' === $op) {
+			if (1 === $ok) {
+				//            if (!$GLOBALS['xoopsSecurity']->check()) {
+				//                redirect_header($helper->url('admin/blocksadmin.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+				//            }
+				$blocksadmin->deleteBlock($bid);
+			} else {
+				//            xoops_cp_header();
+				xoops_confirm(['ok' => 1, 'op' => 'delete', 'bid' => $bid], 'blocksadmin.php', constant('CO_' . $moduleDirNameUpper . '_' . 'DELETE_BLOCK_CONFIRM'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+				xoops_cp_footer();
+			}
+		}
+
+		if ('edit' === $op) {
+			$blocksadmin->editBlock($bid);
+		}
+
+		if ('edit_ok' === $op) {
+			$blocksadmin->updateBlock($bid, $btitle, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
+		}
+
+		if ('clone_ok' === $op) {
+			$blocksadmin->isBlockCloned($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
+		}
+	}
+
+	if ('order' === $op) {
+		$bid = Request::getArray('bid', []);
+
+		$title      = Request::getArray('title', [], 'POST');
+		$side       = Request::getArray('side', [], 'POST');
+		$weight     = Request::getArray('weight', [], 'POST');
+		$visible    = Request::getArray('visible', [], 'POST');
+		$bcachetime = Request::getArray('bcachetime', [], 'POST');
+		$bmodule    = Request::getArray('bmodule', [], 'POST'); //mb
+
+		$oldtitle      = Request::getArray('oldtitle', [], 'POST');
+		$oldside       = Request::getArray('oldside', [], 'POST');
+		$oldweight     = Request::getArray('oldweight', [], 'POST');
+		$oldvisible    = Request::getArray('oldvisible', [], 'POST');
+		$oldgroups     = Request::getArray('oldgroups', [], 'POST');
+		$oldbcachetime = Request::getArray('oldcachetime', [], 'POST');
+		$oldbmodule    = Request::getArray('oldbmodule', [], 'POST'); //mb
+
+		$blocksadmin->orderBlock(
+			$bid,
+			$oldtitle,
+			$oldside,
+			$oldweight,
+			$oldvisible,
+			$oldgroups,
+			$oldbcachetime,
+			$oldbmodule,
+			$title,
+			$weight,
+			$visible,
+			$side,
+			$bcachetime,
+			$groups,
+			$bmodule
+		);
+	}
 } else {
-    echo constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403');
+	echo constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403');
 }
 
 require __DIR__ . '/admin_footer.php';

Spacing +15 added lines, -15 removed lines

@@ -20,7 +20,7 @@ 
 
 /** @var Admin $adminObject */
 /** @var Helper $helper */
-require __DIR__ . '/admin_header.php';
+require __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 $moduleDirName      = $helper->getDirname();
@@ -34,10 +34,10 @@ 
 
 if (!is_object($GLOBALS['xoopsUser']) || !is_object($xoopsModule)
     || !$GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
-    exit(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403'));
+    exit(constant('CO_'.$moduleDirNameUpper.'_'.'ERROR403'));
 }
 if ($GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
 
     $op = Request::getCmd('op', 'list');
     if (!empty($_POST)) {
@@ -60,10 +60,10 @@ 
         $visible        = Request::getString('visible', '0', 'POST');
     }
 
-    if ('list' === $op) {
+    if ('list'===$op) {
         //        xoops_cp_header();
         $blocksadmin->listBlocks();
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         exit();
     }
 
@@ -71,37 +71,37 @@ 
         $bid = Request::getInt('bid', 0);
         $ok  = Request::getInt('ok', 0);
 
-        if ('clone' === $op) {
+        if ('clone'===$op) {
             $blocksadmin->cloneBlock($bid);
         }
 
-        if ('delete' === $op) {
-            if (1 === $ok) {
+        if ('delete'===$op) {
+            if (1===$ok) {
                 //            if (!$GLOBALS['xoopsSecurity']->check()) {
                 //                redirect_header($helper->url('admin/blocksadmin.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
                 //            }
                 $blocksadmin->deleteBlock($bid);
             } else {
                 //            xoops_cp_header();
-                xoops_confirm(['ok' => 1, 'op' => 'delete', 'bid' => $bid], 'blocksadmin.php', constant('CO_' . $moduleDirNameUpper . '_' . 'DELETE_BLOCK_CONFIRM'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+                xoops_confirm(['ok' => 1, 'op' => 'delete', 'bid' => $bid], 'blocksadmin.php', constant('CO_'.$moduleDirNameUpper.'_'.'DELETE_BLOCK_CONFIRM'), constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'), true);
                 xoops_cp_footer();
             }
         }
 
-        if ('edit' === $op) {
+        if ('edit'===$op) {
             $blocksadmin->editBlock($bid);
         }
 
-        if ('edit_ok' === $op) {
+        if ('edit_ok'===$op) {
             $blocksadmin->updateBlock($bid, $btitle, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
         }
 
-        if ('clone_ok' === $op) {
+        if ('clone_ok'===$op) {
             $blocksadmin->isBlockCloned($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options, $groups);
         }
     }
 
-    if ('order' === $op) {
+    if ('order'===$op) {
         $bid = Request::getArray('bid', []);
 
         $title      = Request::getArray('title', [], 'POST');
@@ -138,7 +138,7 @@ 
         );
     }
 } else {
-    echo constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403');
+    echo constant('CO_'.$moduleDirNameUpper.'_'.'ERROR403');
 }
 
-require __DIR__ . '/admin_footer.php';
+require __DIR__.'/admin_footer.php';

admin/field_permissions.php

Indentation +58 added lines, -58 removed lines

@@ -38,28 +38,28 @@ 
 
 $perm_desc = '';
 switch ($op) {
-    case 'visibility':
-        //header("Location: visibility.php");
-        redirect_header('field_visibility.php', 0, _AM_SONGLIST_PROF_VISIBLE);
-        break;
-    case 'edit':
-        $title_of_form = _AM_SONGLIST_PROF_EDITABLE;
-        $perm_name     = 'songlist_edit';
-        $restriction   = 'field_edit';
-        $anonymous     = false;
-        break;
-    case 'post':
-        $title_of_form = _AM_SONGLIST_PROF_POST;
-        $perm_name     = 'songlist_post';
-        $restriction   = '';
-        $anonymous     = true;
-        break;
-    case 'search':
-        $title_of_form = _AM_SONGLIST_PROF_SEARCH;
-        $perm_name     = 'songlist_search';
-        $restriction   = '';
-        $anonymous     = true;
-        break;
+	case 'visibility':
+		//header("Location: visibility.php");
+		redirect_header('field_visibility.php', 0, _AM_SONGLIST_PROF_VISIBLE);
+		break;
+	case 'edit':
+		$title_of_form = _AM_SONGLIST_PROF_EDITABLE;
+		$perm_name     = 'songlist_edit';
+		$restriction   = 'field_edit';
+		$anonymous     = false;
+		break;
+	case 'post':
+		$title_of_form = _AM_SONGLIST_PROF_POST;
+		$perm_name     = 'songlist_post';
+		$restriction   = '';
+		$anonymous     = true;
+		break;
+	case 'search':
+		$title_of_form = _AM_SONGLIST_PROF_SEARCH;
+		$perm_name     = 'songlist_search';
+		$restriction   = '';
+		$anonymous     = true;
+		break;
 }
 
 $module_id = $GLOBALS['songlistModule']->getVar('mid');
@@ -67,43 +67,43 @@ 
 $form = new \XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/field_permissions.php', $anonymous);
 
 if ('access' === $op) {
-    /** @var \XoopsMemberHandler $memberHandler */
-    $memberHandler = xoops_getHandler('member');
-    $glist         = $memberHandler->getGroupList();
-    foreach (array_keys($glist) as $i) {
-        if (XOOPS_GROUP_ANONYMOUS != $i) {
-            $form->addItem($i, $glist[$i]);
-        }
-    }
+	/** @var \XoopsMemberHandler $memberHandler */
+	$memberHandler = xoops_getHandler('member');
+	$glist         = $memberHandler->getGroupList();
+	foreach (array_keys($glist) as $i) {
+		if (XOOPS_GROUP_ANONYMOUS != $i) {
+			$form->addItem($i, $glist[$i]);
+		}
+	}
 } else {
-    $extrasHandler = Helper::getInstance()->getHandler('Extras');
-    $tempFields    = $extrasHandler->loadFields();
-    if ($tempFields && is_array($tempFields)) {
-        $fields = array_merge([], $tempFields);
-        if ('search' !== $op) {
-            foreach (array_keys($fields) as $i) {
-                if ('' == $restriction || $fields[$i]->getVar($restriction)) {
-                    $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
-                }
-            }
-        } else {
-            $searchable_types = [
-                'textbox',
-                'select',
-                'radio',
-                'yesno',
-                'date',
-                'datetime',
-                'timezone',
-                'language',
-            ];
-            foreach (array_keys($fields) as $i) {
-                if (in_array($fields[$i]->getVar('field_type'), $searchable_types, true)) {
-                    $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
-                }
-            }
-        }
-    }
+	$extrasHandler = Helper::getInstance()->getHandler('Extras');
+	$tempFields    = $extrasHandler->loadFields();
+	if ($tempFields && is_array($tempFields)) {
+		$fields = array_merge([], $tempFields);
+		if ('search' !== $op) {
+			foreach (array_keys($fields) as $i) {
+				if ('' == $restriction || $fields[$i]->getVar($restriction)) {
+					$form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
+				}
+			}
+		} else {
+			$searchable_types = [
+				'textbox',
+				'select',
+				'radio',
+				'yesno',
+				'date',
+				'datetime',
+				'timezone',
+				'language',
+			];
+			foreach (array_keys($fields) as $i) {
+				if (in_array($fields[$i]->getVar('field_type'), $searchable_types, true)) {
+					$form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
+				}
+			}
+		}
+	}
 }
 $form->display();
 

Spacing +5 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
 use Xmf\Module\Admin;
 use XoopsModules\Songlist\Helper;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 xoops_cp_header();
 
 $adminObject = Admin::getInstance();
@@ -66,12 +66,12 @@ 
 require_once $GLOBALS['xoops']->path('/class/xoopsform/grouppermform.php');
 $form = new \XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/field_permissions.php', $anonymous);
 
-if ('access' === $op) {
+if ('access'===$op) {
     /** @var \XoopsMemberHandler $memberHandler */
     $memberHandler = xoops_getHandler('member');
     $glist         = $memberHandler->getGroupList();
     foreach (array_keys($glist) as $i) {
-        if (XOOPS_GROUP_ANONYMOUS != $i) {
+        if (XOOPS_GROUP_ANONYMOUS!=$i) {
             $form->addItem($i, $glist[$i]);
         }
     }
@@ -80,9 +80,9 @@ 
     $tempFields    = $extrasHandler->loadFields();
     if ($tempFields && is_array($tempFields)) {
         $fields = array_merge([], $tempFields);
-        if ('search' !== $op) {
+        if ('search'!==$op) {
             foreach (array_keys($fields) as $i) {
-                if ('' == $restriction || $fields[$i]->getVar($restriction)) {
+                if (''==$restriction || $fields[$i]->getVar($restriction)) {
                     $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
                 }
             }

admin/clone.php

Indentation +43 added lines, -43 removed lines

@@ -20,9 +20,9 @@ 
 
 use Xmf\Request;
 use XoopsModules\Songlist\{
-    Common\Cloner,
-    Helper,
-    Utility
+	Common\Cloner,
+	Helper,
+	Utility
 };
 
 require_once __DIR__ . '/admin_header.php';
@@ -32,53 +32,53 @@ 
 $helper = Helper::getInstance();
 
 if ('submit' === Request::getString('op', '', 'POST')) {
-    if (!$GLOBALS['xoopsSecurity']->check()) {
-        redirect_header('clone.php', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-    }
+	if (!$GLOBALS['xoopsSecurity']->check()) {
+		redirect_header('clone.php', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+	}
 
-    //    $clone = $_POST['clone'];
-    $clone = Request::getString('clone', '', 'POST');
+	//    $clone = $_POST['clone'];
+	$clone = Request::getString('clone', '', 'POST');
 
-    //check if name is valid
-    if (empty($clone) || preg_match('/[^a-zA-Z0-9\_\-]/', $clone)) {
-        redirect_header('clone.php', 3, sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_INVALIDNAME'), $clone));
-    }
+	//check if name is valid
+	if (empty($clone) || preg_match('/[^a-zA-Z0-9\_\-]/', $clone)) {
+		redirect_header('clone.php', 3, sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_INVALIDNAME'), $clone));
+	}
 
-    // Check wether the cloned module exists or not
-    if ($clone && is_dir($GLOBALS['xoops']->path('modules/' . $clone))) {
-        redirect_header('clone.php', 3, sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_EXISTS'), $clone));
-    }
+	// Check wether the cloned module exists or not
+	if ($clone && is_dir($GLOBALS['xoops']->path('modules/' . $clone))) {
+		redirect_header('clone.php', 3, sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_EXISTS'), $clone));
+	}
 
-    $patterns = [
-        \mb_strtolower($helper->dirname())          => \mb_strtolower($clone),
-        \mb_strtoupper($helper->dirname())          => \mb_strtoupper($clone),
-        ucfirst(mb_strtolower($helper->dirname())) => ucfirst(mb_strtolower($clone)),
-    ];
+	$patterns = [
+		\mb_strtolower($helper->dirname())          => \mb_strtolower($clone),
+		\mb_strtoupper($helper->dirname())          => \mb_strtoupper($clone),
+		ucfirst(mb_strtolower($helper->dirname())) => ucfirst(mb_strtolower($clone)),
+	];
 
-    $patKeys   = array_keys($patterns);
-    $patValues = array_values($patterns);
-    Cloner::cloneFileFolder($helper->path());
-    $logocreated = Cloner::createLogo(mb_strtolower($clone));
+	$patKeys   = array_keys($patterns);
+	$patValues = array_values($patterns);
+	Cloner::cloneFileFolder($helper->path());
+	$logocreated = Cloner::createLogo(mb_strtolower($clone));
 
-    $msg = '';
-    if (is_dir($GLOBALS['xoops']->path('modules/' . \mb_strtolower($clone)))) {
-        $msg .= sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_CONGRAT'), "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin'>" . ucfirst(mb_strtolower($clone)) . '</a>') . "<br>\n";
-        if (!$logocreated) {
-            $msg .= constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_IMAGEFAIL');
-        }
-    } else {
-        $msg .= constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_FAIL');
-    }
-    echo $msg;
+	$msg = '';
+	if (is_dir($GLOBALS['xoops']->path('modules/' . \mb_strtolower($clone)))) {
+		$msg .= sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_CONGRAT'), "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin'>" . ucfirst(mb_strtolower($clone)) . '</a>') . "<br>\n";
+		if (!$logocreated) {
+			$msg .= constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_IMAGEFAIL');
+		}
+	} else {
+		$msg .= constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_FAIL');
+	}
+	echo $msg;
 } else {
-    require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-    $form  = new \XoopsThemeForm(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_TITLE'), (string)$helper->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true);
-    $clone = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME'), 'clone', 20, 20, '');
-    $clone->setDescription(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME_DSC'));
-    $form->addElement($clone, true);
-    $form->addElement(new \XoopsFormHidden('op', 'submit'));
-    $form->addElement(new \XoopsFormButton('', '', _SUBMIT, 'submit'));
-    $form->display();
+	require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+	$form  = new \XoopsThemeForm(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_TITLE'), (string)$helper->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true);
+	$clone = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME'), 'clone', 20, 20, '');
+	$clone->setDescription(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME_DSC'));
+	$form->addElement($clone, true);
+	$form->addElement(new \XoopsFormHidden('op', 'submit'));
+	$form->addElement(new \XoopsFormButton('', '', _SUBMIT, 'submit'));
+	$form->display();
 }
 
 require_once __DIR__ . '/admin_footer.php';

Spacing +13 added lines, -13 removed lines

@@ -25,13 +25,13 @@ 
     Utility
 };
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 xoops_cp_header();
 
 $helper = Helper::getInstance();
 
-if ('submit' === Request::getString('op', '', 'POST')) {
+if ('submit'===Request::getString('op', '', 'POST')) {
     if (!$GLOBALS['xoopsSecurity']->check()) {
         redirect_header('clone.php', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
     }
@@ -41,12 +41,12 @@ 
 
     //check if name is valid
     if (empty($clone) || preg_match('/[^a-zA-Z0-9\_\-]/', $clone)) {
-        redirect_header('clone.php', 3, sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_INVALIDNAME'), $clone));
+        redirect_header('clone.php', 3, sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_INVALIDNAME'), $clone));
     }
 
     // Check wether the cloned module exists or not
-    if ($clone && is_dir($GLOBALS['xoops']->path('modules/' . $clone))) {
-        redirect_header('clone.php', 3, sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_EXISTS'), $clone));
+    if ($clone && is_dir($GLOBALS['xoops']->path('modules/'.$clone))) {
+        redirect_header('clone.php', 3, sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_EXISTS'), $clone));
     }
 
     $patterns = [
@@ -61,24 +61,24 @@ 
     $logocreated = Cloner::createLogo(mb_strtolower($clone));
 
     $msg = '';
-    if (is_dir($GLOBALS['xoops']->path('modules/' . \mb_strtolower($clone)))) {
-        $msg .= sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_CONGRAT'), "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin'>" . ucfirst(mb_strtolower($clone)) . '</a>') . "<br>\n";
+    if (is_dir($GLOBALS['xoops']->path('modules/'.\mb_strtolower($clone)))) {
+        $msg .= sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_CONGRAT'), "<a href='".XOOPS_URL."/modules/system/admin.php?fct=modulesadmin'>".ucfirst(mb_strtolower($clone)).'</a>')."<br>\n";
         if (!$logocreated) {
-            $msg .= constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_IMAGEFAIL');
+            $msg .= constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_IMAGEFAIL');
         }
     } else {
-        $msg .= constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_FAIL');
+        $msg .= constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_FAIL');
     }
     echo $msg;
 } else {
     require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-    $form  = new \XoopsThemeForm(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_TITLE'), (string)$helper->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true);
-    $clone = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME'), 'clone', 20, 20, '');
-    $clone->setDescription(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME_DSC'));
+    $form  = new \XoopsThemeForm(sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_TITLE'), (string) $helper->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true);
+    $clone = new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_NAME'), 'clone', 20, 20, '');
+    $clone->setDescription(constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_NAME_DSC'));
     $form->addElement($clone, true);
     $form->addElement(new \XoopsFormHidden('op', 'submit'));
     $form->addElement(new \XoopsFormButton('', '', _SUBMIT, 'submit'));
     $form->display();
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

list.tag.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php declare(strict_types=1);
 
-require_once __DIR__ . '/header.php';
-require_once XOOPS_ROOT_PATH . '/modules/tag/list.tag.php';
+require_once __DIR__.'/header.php';
+require_once XOOPS_ROOT_PATH.'/modules/tag/list.tag.php';

include/oninstall.php

Indentation +50 added lines, -50 removed lines

@@ -29,19 +29,19 @@ 
  */
 function xoops_module_pre_install_songlist(\XoopsModule $module): bool
 {
-    require_once \dirname(__DIR__) . '/preloads/autoloader.php';
-    $utility      = new Utility();
-    $xoopsSuccess = $utility::checkVerXoops($module);
-    $phpSuccess   = $utility::checkVerPhp($module);
+	require_once \dirname(__DIR__) . '/preloads/autoloader.php';
+	$utility      = new Utility();
+	$xoopsSuccess = $utility::checkVerXoops($module);
+	$phpSuccess   = $utility::checkVerPhp($module);
 
-    if ($xoopsSuccess && $phpSuccess) {
-        $moduleTables = &$module->getInfo('tables');
-        foreach ($moduleTables as $table) {
-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
-        }
-    }
+	if ($xoopsSuccess && $phpSuccess) {
+		$moduleTables = &$module->getInfo('tables');
+		foreach ($moduleTables as $table) {
+			$GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+		}
+	}
 
-    return $xoopsSuccess && $phpSuccess;
+	return $xoopsSuccess && $phpSuccess;
 }
 
 /**
@@ -52,48 +52,48 @@ 
  */
 function xoops_module_install_songlist(\XoopsModule $module): bool
 {
-    require \dirname(__DIR__, 3) . '/mainfile.php';
+	require \dirname(__DIR__, 3) . '/mainfile.php';
 
-    $moduleDirName = \basename(\dirname(__DIR__));
-    $helper        = Helper::getInstance();
-    $utility       = new Utility();
-    $configurator  = new Songlist\Common\Configurator();
-    // Load language files
-    $helper->loadLanguage('admin');
-    $helper->loadLanguage('modinfo');
+	$moduleDirName = \basename(\dirname(__DIR__));
+	$helper        = Helper::getInstance();
+	$utility       = new Utility();
+	$configurator  = new Songlist\Common\Configurator();
+	// Load language files
+	$helper->loadLanguage('admin');
+	$helper->loadLanguage('modinfo');
 
-    // default Permission Settings ----------------------
-    global $xoopsModule;
-    $moduleId = $xoopsModule->getVar('mid');
-    // $moduleId2        = \XoopsModules\Songlist\Helper::getInstance()->getModule()->mid();
-    /** @var \XoopsGroupPermHandler $grouppermHandler */
-    $grouppermHandler = xoops_getHandler('groupperm');
-    // access rights ------------------------------------------
-    $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+	// default Permission Settings ----------------------
+	global $xoopsModule;
+	$moduleId = $xoopsModule->getVar('mid');
+	// $moduleId2        = \XoopsModules\Songlist\Helper::getInstance()->getModule()->mid();
+	/** @var \XoopsGroupPermHandler $grouppermHandler */
+	$grouppermHandler = xoops_getHandler('groupperm');
+	// access rights ------------------------------------------
+	$grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
 
-    //  ---  CREATE FOLDERS ---------------
-    if (count($configurator->uploadFolders) > 0) {
-        //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-        foreach (array_keys($configurator->uploadFolders) as $i) {
-            $utility::createFolder($configurator->uploadFolders[$i]);
-        }
-    }
+	//  ---  CREATE FOLDERS ---------------
+	if (count($configurator->uploadFolders) > 0) {
+		//    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+		foreach (array_keys($configurator->uploadFolders) as $i) {
+			$utility::createFolder($configurator->uploadFolders[$i]);
+		}
+	}
 
-    //  ---  COPY blank.png FILES ---------------
-    if (count($configurator->copyBlankFiles) > 0) {
-        $file = \dirname(__DIR__) . '/assets/images/blank.png';
-        foreach (array_keys($configurator->copyBlankFiles) as $i) {
-            $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
-            $utility::copyFile($file, $dest);
-        }
-    }
-    //delete .html entries from the tpl table
-    $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.tpl%'";
-    $GLOBALS['xoopsDB']->queryF($sql);
+	//  ---  COPY blank.png FILES ---------------
+	if (count($configurator->copyBlankFiles) > 0) {
+		$file = \dirname(__DIR__) . '/assets/images/blank.png';
+		foreach (array_keys($configurator->copyBlankFiles) as $i) {
+			$dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+			$utility::copyFile($file, $dest);
+		}
+	}
+	//delete .html entries from the tpl table
+	$sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.tpl%'";
+	$GLOBALS['xoopsDB']->queryF($sql);
 
-    return true;
+	return true;
 }

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
  */
 function xoops_module_pre_install_songlist(\XoopsModule $module): bool
 {
-    require_once \dirname(__DIR__) . '/preloads/autoloader.php';
+    require_once \dirname(__DIR__).'/preloads/autoloader.php';
     $utility      = new Utility();
     $xoopsSuccess = $utility::checkVerXoops($module);
     $phpSuccess   = $utility::checkVerPhp($module);
@@ -37,7 +37,7 @@ 
     if ($xoopsSuccess && $phpSuccess) {
         $moduleTables = &$module->getInfo('tables');
         foreach ($moduleTables as $table) {
-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
         }
     }
 
@@ -52,7 +52,7 @@ 
  */
 function xoops_module_install_songlist(\XoopsModule $module): bool
 {
-    require \dirname(__DIR__, 3) . '/mainfile.php';
+    require \dirname(__DIR__, 3).'/mainfile.php';
 
     $moduleDirName = \basename(\dirname(__DIR__));
     $helper        = Helper::getInstance();
@@ -69,14 +69,14 @@ 
     /** @var \XoopsGroupPermHandler $grouppermHandler */
     $grouppermHandler = xoops_getHandler('groupperm');
     // access rights ------------------------------------------
-    $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_USERS, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
 
     //  ---  CREATE FOLDERS ---------------
-    if (count($configurator->uploadFolders) > 0) {
+    if (count($configurator->uploadFolders)>0) {
         //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
         foreach (array_keys($configurator->uploadFolders) as $i) {
             $utility::createFolder($configurator->uploadFolders[$i]);
@@ -84,15 +84,15 @@ 
     }
 
     //  ---  COPY blank.png FILES ---------------
-    if (count($configurator->copyBlankFiles) > 0) {
-        $file = \dirname(__DIR__) . '/assets/images/blank.png';
+    if (count($configurator->copyBlankFiles)>0) {
+        $file = \dirname(__DIR__).'/assets/images/blank.png';
         foreach (array_keys($configurator->copyBlankFiles) as $i) {
-            $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+            $dest = $configurator->copyBlankFiles[$i].'/blank.png';
             $utility::copyFile($file, $dest);
         }
     }
     //delete .html entries from the tpl table
-    $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.tpl%'";
+    $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('tplfile')." WHERE `tpl_module` = '".$xoopsModule->getVar('dirname', 'n')."' AND `tpl_file` LIKE '%.tpl%'";
     $GLOBALS['xoopsDB']->queryF($sql);
 
     return true;

include/songlist.object.php

Indentation +4 added lines, -4 removed lines

@@ -5,12 +5,12 @@
 /** @var \XoopsConfigHandler $configHandler */
 $configHandler = xoops_getHandler('config');
 if (!isset($GLOBALS['songlistModule'])) {
-    $GLOBALS['songlistModule'] = $moduleHandler->getByDirname('songlist');
+	$GLOBALS['songlistModule'] = $moduleHandler->getByDirname('songlist');
 }
 if (is_object($GLOBALS['songlistModule'])) {
-    if (!isset($GLOBALS['songlistModuleConfig'])) {
-        $GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
-    }
+	if (!isset($GLOBALS['songlistModuleConfig'])) {
+		$GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
+	}
 }
 
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');

include/update.php

Indentation +35 added lines, -35 removed lines

@@ -6,17 +6,17 @@ 
  */
 function xoops_module_update_songlist(&$module): bool
 {
-    $sql = [];
+	$sql = [];
 
-    $sql[] = 'CREATE TABLE `'
-             . $GLOBALS['xoopsDB']->prefix('songlist_voice')
-             . "` (  `vcid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,  `name` VARCHAR(128) DEFAULT NULL,  `artists` INT(12) UNSIGNED DEFAULT '0',  `albums` INT(12) UNSIGNED DEFAULT '0',  `songs` INT(12) UNSIGNED DEFAULT '0',  `rank` DECIMAL(10,3) UNSIGNED DEFAULT '0.000',  `votes` INT(10) UNSIGNED DEFAULT '0',  `created` INT(12) UNSIGNED DEFAULT '0',  `updated` INT(12) UNSIGNED DEFAULT '0',  PRIMARY KEY (`vcid`),  KEY `SORT` (`name`(32),`rank`,`votes`,`created`)) ENGINE=InnoDB DEFAULT CHARSET=utf8";
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . "` ADD COLUMN `vcid` INT(12) UNSIGNED DEFAULT '0'";
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . '` CHANGE COLUMN `lyrics` `lyrics` LONGTEXT';
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . "` ADD COLUMN `mp3` VARCHAR(500) DEFAULT ''";
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . '` CHANGE COLUMN `traxid` `traxid` INT(4) UNSIGNED ZEROFILL DEFAULT NULL';
+	$sql[] = 'CREATE TABLE `'
+			 . $GLOBALS['xoopsDB']->prefix('songlist_voice')
+			 . "` (  `vcid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,  `name` VARCHAR(128) DEFAULT NULL,  `artists` INT(12) UNSIGNED DEFAULT '0',  `albums` INT(12) UNSIGNED DEFAULT '0',  `songs` INT(12) UNSIGNED DEFAULT '0',  `rank` DECIMAL(10,3) UNSIGNED DEFAULT '0.000',  `votes` INT(10) UNSIGNED DEFAULT '0',  `created` INT(12) UNSIGNED DEFAULT '0',  `updated` INT(12) UNSIGNED DEFAULT '0',  PRIMARY KEY (`vcid`),  KEY `SORT` (`name`(32),`rank`,`votes`,`created`)) ENGINE=InnoDB DEFAULT CHARSET=utf8";
+	$sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . "` ADD COLUMN `vcid` INT(12) UNSIGNED DEFAULT '0'";
+	$sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . '` CHANGE COLUMN `lyrics` `lyrics` LONGTEXT';
+	$sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . "` ADD COLUMN `mp3` VARCHAR(500) DEFAULT ''";
+	$sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . '` CHANGE COLUMN `traxid` `traxid` INT(4) UNSIGNED ZEROFILL DEFAULT NULL';
 
-    return xoops_module_update_vs_executesql($sql);
+	return xoops_module_update_vs_executesql($sql);
 }
 
 /**
@@ -25,31 +25,31 @@ 
  */
 function xoops_module_update_vs_executesql($sql): bool
 {
-    if (is_string($sql)) {
-        if ($GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($sql, 'SQL Executed Successfully!!!');
-        }
-    } elseif (is_array($sql)) {
-        foreach ($sql as $id => $question) {
-            if (is_array($question)) {
-                foreach ($question as $kquestion => $questionb) {
-                    if ($GLOBALS['xoopsDB']->queryF($kquestion)) {
-                        xoops_error($kquestion, 'SQL Executed Successfully!!!');
-                        xoops_module_update_vs_executesql($questionb);
-                    }
-                }
-            } elseif ($GLOBALS['xoopsDB']->queryF($id)) {
-                    xoops_error($id, 'SQL Executed Successfully!!!');
-                    if ($GLOBALS['xoopsDB']->queryF($question)) {
-                        xoops_error($question, 'SQL Executed Successfully!!!');
-                    }
-                } elseif ($GLOBALS['xoopsDB']->queryF($question)) {
-                    xoops_error($question, 'SQL Executed Successfully!!!');
-            }
-        }
-    } else {
-        return false;
-    }
+	if (is_string($sql)) {
+		if ($GLOBALS['xoopsDB']->queryF($sql)) {
+			xoops_error($sql, 'SQL Executed Successfully!!!');
+		}
+	} elseif (is_array($sql)) {
+		foreach ($sql as $id => $question) {
+			if (is_array($question)) {
+				foreach ($question as $kquestion => $questionb) {
+					if ($GLOBALS['xoopsDB']->queryF($kquestion)) {
+						xoops_error($kquestion, 'SQL Executed Successfully!!!');
+						xoops_module_update_vs_executesql($questionb);
+					}
+				}
+			} elseif ($GLOBALS['xoopsDB']->queryF($id)) {
+					xoops_error($id, 'SQL Executed Successfully!!!');
+					if ($GLOBALS['xoopsDB']->queryF($question)) {
+						xoops_error($question, 'SQL Executed Successfully!!!');
+					}
+				} elseif ($GLOBALS['xoopsDB']->queryF($question)) {
+					xoops_error($question, 'SQL Executed Successfully!!!');
+			}
+		}
+	} else {
+		return false;
+	}
 
-    return true;
+	return true;
 }

Spacing +4 added lines, -4 removed lines

@@ -11,10 +11,10 @@
     $sql[] = 'CREATE TABLE `'
              . $GLOBALS['xoopsDB']->prefix('songlist_voice')
              . "` (  `vcid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,  `name` VARCHAR(128) DEFAULT NULL,  `artists` INT(12) UNSIGNED DEFAULT '0',  `albums` INT(12) UNSIGNED DEFAULT '0',  `songs` INT(12) UNSIGNED DEFAULT '0',  `rank` DECIMAL(10,3) UNSIGNED DEFAULT '0.000',  `votes` INT(10) UNSIGNED DEFAULT '0',  `created` INT(12) UNSIGNED DEFAULT '0',  `updated` INT(12) UNSIGNED DEFAULT '0',  PRIMARY KEY (`vcid`),  KEY `SORT` (`name`(32),`rank`,`votes`,`created`)) ENGINE=InnoDB DEFAULT CHARSET=utf8";
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . "` ADD COLUMN `vcid` INT(12) UNSIGNED DEFAULT '0'";
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . '` CHANGE COLUMN `lyrics` `lyrics` LONGTEXT';
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . "` ADD COLUMN `mp3` VARCHAR(500) DEFAULT ''";
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . '` CHANGE COLUMN `traxid` `traxid` INT(4) UNSIGNED ZEROFILL DEFAULT NULL';
+    $sql[] = 'ALTER TABLE `'.$GLOBALS['xoopsDB']->prefix('songlist_songs')."` ADD COLUMN `vcid` INT(12) UNSIGNED DEFAULT '0'";
+    $sql[] = 'ALTER TABLE `'.$GLOBALS['xoopsDB']->prefix('songlist_songs').'` CHANGE COLUMN `lyrics` `lyrics` LONGTEXT';
+    $sql[] = 'ALTER TABLE `'.$GLOBALS['xoopsDB']->prefix('songlist_songs')."` ADD COLUMN `mp3` VARCHAR(500) DEFAULT ''";
+    $sql[] = 'ALTER TABLE `'.$GLOBALS['xoopsDB']->prefix('songlist_songs').'` CHANGE COLUMN `traxid` `traxid` INT(4) UNSIGNED ZEROFILL DEFAULT NULL';
 
     return xoops_module_update_vs_executesql($sql);
 }

include/onuninstall.php

Indentation +22 added lines, -22 removed lines

@@ -20,8 +20,8 @@ 
  */
 function xoops_module_pre_uninstall_songlist(\XoopsModule $module): bool
 {
-    // Do some synchronization
-    return true;
+	// Do some synchronization
+	return true;
 }
 
 /**
@@ -32,26 +32,26 @@ 
  */
 function xoops_module_uninstall_songlist(\XoopsModule $module): bool
 {
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-    $helper             = Helper::getInstance();
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+	$helper             = Helper::getInstance();
 
-    $success = true;
-    $helper->loadLanguage('admin');
+	$success = true;
+	$helper->loadLanguage('admin');
 
-    // Rename uploads folder to BAK and add date to name
-    $uploadDirectory = $GLOBALS['xoops']->path("uploads/$moduleDirName");
-    $dirInfo = new \SplFileInfo($uploadDirectory);
-    if ($dirInfo->isDir()) {
-        // The directory exists so rename it
-        $date = date('Y-m-d');
-        if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR_FOLDER_RENAME_FAILED'), $uploadDirectory));
-            $success = false;
-        }
-    }
-    unset($dirInfo);
-    /*
+	// Rename uploads folder to BAK and add date to name
+	$uploadDirectory = $GLOBALS['xoops']->path("uploads/$moduleDirName");
+	$dirInfo = new \SplFileInfo($uploadDirectory);
+	if ($dirInfo->isDir()) {
+		// The directory exists so rename it
+		$date = date('Y-m-d');
+		if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {
+			$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR_FOLDER_RENAME_FAILED'), $uploadDirectory));
+			$success = false;
+		}
+	}
+	unset($dirInfo);
+	/*
     //------------ START ----------------
     //------------------------------------------------------------------
     // Remove xsitemap.xml from XOOPS root folder if it exists
@@ -65,6 +65,6 @@ 
 //    return $success && $delOk; // use this if you're using this routine
 */
 
-    return $success;
-    //------------ END  ----------------
+	return $success;
+	//------------ END  ----------------
 }

Spacing +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
     if ($dirInfo->isDir()) {
         // The directory exists so rename it
         $date = date('Y-m-d');
-        if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR_FOLDER_RENAME_FAILED'), $uploadDirectory));
+        if (!rename($uploadDirectory, $uploadDirectory."_bak_$date")) {
+            $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'ERROR_FOLDER_RENAME_FAILED'), $uploadDirectory));
             $success = false;
         }
     }

include/common.php

Indentation +31 added lines, -31 removed lines

@@ -39,19 +39,19 @@ 
 //$downloadHandler     = new Songlist\DownloadHandler($db);
 
 if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+	define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
+	define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
+	define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
+	define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
+	define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
+	define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
+	define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
+	define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
 }
 
 $pathIcon16 = Admin::iconUrl('', '16');
@@ -60,15 +60,15 @@ 
 //$pathModIcon32 = \XoopsModules\Songlist\Helper::getInstance()->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+	'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
+	'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
+	'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
+	'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
+	'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
+	'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
+	'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
+	'0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
+	'1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
 ];
 
 $debug = false;
@@ -77,23 +77,23 @@ 
 $myts = \MyTextSanitizer::getInstance();
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof \XoopsTpl)) {
-    require_once $GLOBALS['xoops']->path('class/template.php');
-    $GLOBALS['xoopsTpl'] = new \XoopsTpl();
+	require_once $GLOBALS['xoops']->path('class/template.php');
+	$GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
 $GLOBALS['xoopsTpl']->assign('mod_url', $helper->url());
 // Local icons path
 if (is_object($helper->getModule())) {
-    $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
-    $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
+	$pathModIcon16 = $helper->getModule()->getInfo('modicons16');
+	$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
-    $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
+	$GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+	$GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }
 
 xoops_loadLanguage('main', $moduleDirName);
 if (class_exists('D3LanguageManager')) {
-    require_once XOOPS_TRUST_PATH . "/libs/altsys/class/D3LanguageManager.class.php";
-    $langman = D3LanguageManager::getInstance();
-    $langman->read('main.php', $moduleDirName);
+	require_once XOOPS_TRUST_PATH . "/libs/altsys/class/D3LanguageManager.class.php";
+	$langman = D3LanguageManager::getInstance();
+	$langman->read('main.php', $moduleDirName);
 }

Spacing +26 added lines, -26 removed lines

@@ -19,7 +19,7 @@ 
 use XoopsModules\Songlist;
 use XoopsModules\Songlist\Helper;
 
-require_once \dirname(__DIR__) . '/preloads/autoloader.php';
+require_once \dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
@@ -38,20 +38,20 @@ 
 //$categoryHandler     = new Songlist\CategoryHandler($db);
 //$downloadHandler     = new Songlist\DownloadHandler($db);
 
-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
+    define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
+    define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
+    define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images');
+    define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
+    define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');
+    define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
 }
 
 $pathIcon16 = Admin::iconUrl('', '16');
@@ -60,15 +60,15 @@ 
 //$pathModIcon32 = \XoopsModules\Songlist\Helper::getInstance()->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+    'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+    'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+    'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+    '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+    '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
 ];
 
 $debug = false;
@@ -87,13 +87,13 @@ 
     $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
     $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }
 
 xoops_loadLanguage('main', $moduleDirName);
 if (class_exists('D3LanguageManager')) {
-    require_once XOOPS_TRUST_PATH . "/libs/altsys/class/D3LanguageManager.class.php";
+    require_once XOOPS_TRUST_PATH."/libs/altsys/class/D3LanguageManager.class.php";
     $langman = D3LanguageManager::getInstance();
     $langman->read('main.php', $moduleDirName);
 }