Inspection of "Merge pull request #150 from ggoffy/master" - txmodxoops/tdmcreate - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 834a16...1c3825 )

by Goffy

created 2020-05-01 07:28 UTC

Status

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -29,7 +29,7 @@  discard block
 block discarded – undo
 // Define Stylesheet
 $GLOBALS['xoTheme']->addStylesheet( $style, null );
 if (empty($tfId)) {
-	redirect_header(MYMODULE2_URL . '/index.php', 2, _MA_MYMODULE2_NOTFID);
+    redirect_header(MYMODULE2_URL . '/index.php', 2, _MA_MYMODULE2_NOTFID);
 }
 // Get Instance of Handler
 $testfieldsHandler = $helper->getHandler('testfields');
@@ -37,12 +37,12 @@  discard block
 block discarded – undo
 $testfields = $testfieldsHandler->get($tfId);
 // Verify permissions
 if (!$grouppermHandler->checkRight('mymodule2_view', $tfId->getVar('tf_id'), $groups, $GLOBALS['xoopsModule']->getVar('mid'))) {
-	redirect_header(MYMODULE2_URL . '/index.php', 3, _NOPERM);
-	exit();
+    redirect_header(MYMODULE2_URL . '/index.php', 3, _NOPERM);
+    exit();
 }
 $testfield = $testfields->getValuesTestfields();
 foreach($testfield as $k => $v) {
-	$GLOBALS['xoopsTpl']->append('"{$k}"', $v);
+    $GLOBALS['xoopsTpl']->append('"{$k}"', $v);
 }
 $GLOBALS['xoopsTpl']->assign('xoops_sitename', $GLOBALS['xoopsConfig']['sitename']);
 $GLOBALS['xoopsTpl']->assign('xoops_pagetitle', strip_tags($testfield->getVar('tf_text') - _MA_MYMODULE2_PRINT - $GLOBALS['xoopsModule']->name()));

Please login to merge, or discard this patch.

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

@@ -24,12 +24,12 @@  discard block
 block discarded – undo
 use XoopsModules\Mymodule2;
 use XoopsModules\Mymodule2\Constants;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 $tfId = Request::getInt('tf_id');
 // Define Stylesheet
-$GLOBALS['xoTheme']->addStylesheet( $style, null );
+$GLOBALS['xoTheme']->addStylesheet($style, null);
 if (empty($tfId)) {
-	redirect_header(MYMODULE2_URL . '/index.php', 2, _MA_MYMODULE2_NOTFID);
+	redirect_header(MYMODULE2_URL.'/index.php', 2, _MA_MYMODULE2_NOTFID);
 }
 // Get Instance of Handler
 $testfieldsHandler = $helper->getHandler('testfields');
@@ -37,11 +37,11 @@  discard block
 block discarded – undo
 $testfields = $testfieldsHandler->get($tfId);
 // Verify permissions
 if (!$grouppermHandler->checkRight('mymodule2_view', $tfId->getVar('tf_id'), $groups, $GLOBALS['xoopsModule']->getVar('mid'))) {
-	redirect_header(MYMODULE2_URL . '/index.php', 3, _NOPERM);
+	redirect_header(MYMODULE2_URL.'/index.php', 3, _NOPERM);
 	exit();
 }
 $testfield = $testfields->getValuesTestfields();
-foreach($testfield as $k => $v) {
+foreach ($testfield as $k => $v) {
 	$GLOBALS['xoopsTpl']->append('"{$k}"', $v);
 }
 $GLOBALS['xoopsTpl']->assign('xoops_sitename', $GLOBALS['xoopsConfig']['sitename']);

Please login to merge, or discard this patch.

testdata/mymodule2/config/icons.php 1 patch

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

@@ -6,17 +6,17 @@
 block discarded – undo
     $moduleDirName = basename(dirname(__DIR__));
 
     return (object)[
-        'name'  => mb_strtoupper($moduleDirName) . ' IconConfigurator',
+        'name'  => mb_strtoupper($moduleDirName).' IconConfigurator',
         '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'>",
         ],
     ];
 }

Please login to merge, or discard this patch.

testdata/mymodule2/config/config.php 2 patches

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

@@ -23,50 +23,50 @@
 block discarded – undo
 $moduleDirName  = basename(dirname(__DIR__));
 $moduleDirNameUpper  = mb_strtoupper($moduleDirName);
 return (object)[
-	'name'           => mb_strtoupper($moduleDirName) . ' Module Configurator',
-	'paths'          => [
-		'dirname'    => $moduleDirName,
-		'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-		'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-		'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-		'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-		'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
-	],
-	'uploadFolders'  => [
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/categories',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/articles',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/testfields',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/categories',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/articles',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/testfields',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/temp',
-	],
-	'copyBlankFiles'  => [
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
-	],
-	'copyTestFolders'  => [
-		XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-	],
-	'templateFolders'  => [
-		'/templates/',
-	],
-	'oldFiles'  => [
-	],
-	'oldFolders'  => [
-	],
-	'renameTables'  => [
-	],
-	'moduleStats'  => [
-	],
-	'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'><img src='" . XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . "/assets/images/logo/logoModule.png' alt='XOOPS Project'></a>",
+    'name'           => mb_strtoupper($moduleDirName) . ' Module Configurator',
+    'paths'          => [
+        'dirname'    => $moduleDirName,
+        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
+        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
+        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
+        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+    ],
+    'uploadFolders'  => [
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/categories',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/articles',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/testfields',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/categories',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/articles',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/testfields',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/temp',
+    ],
+    'copyBlankFiles'  => [
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
+    ],
+    'copyTestFolders'  => [
+        XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
+        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+    ],
+    'templateFolders'  => [
+        '/templates/',
+    ],
+    'oldFiles'  => [
+    ],
+    'oldFolders'  => [
+    ],
+    'renameTables'  => [
+    ],
+    'moduleStats'  => [
+    ],
+    'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'><img src='" . XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . "/assets/images/logo/logoModule.png' alt='XOOPS Project'></a>",
 ];

Please login to merge, or discard this patch.

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

@@ -20,42 +20,42 @@  discard block
 block discarded – undo
  * @author         TDM XOOPS - Email:<[email protected]> - Website:<http://xoops.org>
  */
 
-$moduleDirName  = basename(dirname(__DIR__));
-$moduleDirNameUpper  = mb_strtoupper($moduleDirName);
+$moduleDirName = basename(dirname(__DIR__));
+$moduleDirNameUpper = mb_strtoupper($moduleDirName);
 return (object)[
-	'name'           => mb_strtoupper($moduleDirName) . ' Module Configurator',
+	'name'           => mb_strtoupper($moduleDirName).' Module Configurator',
 	'paths'          => [
 		'dirname'    => $moduleDirName,
-		'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-		'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-		'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-		'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-		'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+		'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+		'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+		'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+		'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+		'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
 	],
 	'uploadFolders'  => [
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/categories',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/articles',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/testfields',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/categories',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/articles',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/testfields',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/temp',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/categories',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/articles',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/testfields',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/categories',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/articles',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/testfields',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/files',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/files/categories',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/files/articles',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/files/testfields',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/temp',
 	],
 	'copyBlankFiles'  => [
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/categories',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/articles',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/testfields',
 	],
 	'copyTestFolders'  => [
-		XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
-		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/uploads',
+		XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
 	],
 	'templateFolders'  => [
 		'/templates/',
@@ -68,5 +68,5 @@  discard block
 block discarded – undo
 	],
 	'moduleStats'  => [
 	],
-	'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'><img src='" . XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . "/assets/images/logo/logoModule.png' alt='XOOPS Project'></a>",
+	'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'><img src='".XOOPS_ROOT_PATH.'/modules/'.$moduleDirName."/assets/images/logo/logoModule.png' alt='XOOPS Project'></a>",
 ];

Please login to merge, or discard this patch.

testdata/mymodule2/config/paths.php 1 patch

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

@@ -6,19 +6,19 @@
 block discarded – undo
     $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 
     return (object)[
-        'name'          => mb_strtoupper($moduleDirName) . ' PathConfigurator',
+        'name'          => mb_strtoupper($moduleDirName).' PathConfigurator',
         'paths'         => [
             'dirname'    => $moduleDirName,
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+            'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+            'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+            'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+            'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+            'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
         ],
         'uploadFolders' => [
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
             //XOOPS_UPLOAD_PATH . '/flags'
         ],
     ];

Please login to merge, or discard this patch.

testdata/mymodule2/view.tag.php 1 patch

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

@@ -19,5 +19,5 @@
 block discarded – undo
  * @min_xoops      2.5.9
  * @author         TDM XOOPS - Email:<[email protected]> - Website:<http://xoops.org>
  */
-require __DIR__ . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/tag/view.tag.php';
+require __DIR__.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/tag/view.tag.php';

Please login to merge, or discard this patch.

testdata/mymodule2/blocks/testfields.php 2 patches

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -41,42 +41,42 @@
 block discarded – undo
     array_shift($options);
     array_shift($options);
     array_shift($options);
-	switch($typeBlock)
-	{
-		// For the block: testfields last
-		case 'last':
-			//$criteria->add(new \Criteria('tf_display', 1));
-			$criteria->setSort('tf_created');
-			$criteria->setOrder('DESC');
-		break;
-		// For the block: testfields new
-		case 'new':
-			//$criteria->add(new \Criteria('tf_display', 1));
-			$criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING)), '>='));
-			$criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
-			$criteria->setSort('tf_created');
-			$criteria->setOrder('ASC');
-		break;
-		// For the block: testfields hits
-		case 'hits':
+    switch($typeBlock)
+    {
+        // For the block: testfields last
+        case 'last':
+            //$criteria->add(new \Criteria('tf_display', 1));
+            $criteria->setSort('tf_created');
+            $criteria->setOrder('DESC');
+        break;
+        // For the block: testfields new
+        case 'new':
+            //$criteria->add(new \Criteria('tf_display', 1));
+            $criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING)), '>='));
+            $criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
+            $criteria->setSort('tf_created');
+            $criteria->setOrder('ASC');
+        break;
+        // For the block: testfields hits
+        case 'hits':
             $criteria->setSort('tf_hits');
             $criteria->setOrder('DESC');
         break;
-		// For the block: testfields top
-		case 'top':
+        // For the block: testfields top
+        case 'top':
             $criteria->setSort('tf_top');
             $criteria->setOrder('ASC');
         break;
-		// For the block: testfields random
-		case 'random':
-			//$criteria->add(new \Criteria('tf_display', 1));
-			$criteria->setSort('RAND()');
-		break;
-	}
+        // For the block: testfields random
+        case 'random':
+            //$criteria->add(new \Criteria('tf_display', 1));
+            $criteria->setSort('RAND()');
+        break;
+    }
     $criteria->setLimit($limit);
     $testfieldsAll = $testfieldsHandler->getAll($criteria);
-	unset($criteria);
-	if (count($testfieldsAll) > 0) {
+    unset($criteria);
+    if (count($testfieldsAll) > 0) {
         foreach(array_keys($testfieldsAll) as $i)
         {
         }

Please login to merge, or discard this patch.

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

@@ -41,7 +41,7 @@  discard block
 block discarded – undo
     array_shift($options);
     array_shift($options);
     array_shift($options);
-	switch($typeBlock)
+	switch ($typeBlock)
 	{
 		// For the block: testfields last
 		case 'last':
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
 		case 'new':
 			//$criteria->add(new \Criteria('tf_display', 1));
 			$criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING)), '>='));
-			$criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
+			$criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING)) + 86400, '<='));
 			$criteria->setSort('tf_created');
 			$criteria->setOrder('ASC');
 		break;
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
     $testfieldsAll = $testfieldsHandler->getAll($criteria);
 	unset($criteria);
 	if (count($testfieldsAll) > 0) {
-        foreach(array_keys($testfieldsAll) as $i)
+        foreach (array_keys($testfieldsAll) as $i)
         {
         }
     }
@@ -93,8 +93,8 @@  discard block
 block discarded – undo
     $GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
     $form  = _MB_MYMODULE2_DISPLAY;
     $form .= "<input type='hidden' name='options[0]' value='".$options[0]."' />";
-    $form .= "<input type='text' name='options[1]' size='5' maxlength='255' value='" . $options[1] . "' />&nbsp;<br>";
-    $form .= _MB_MYMODULE2_TITLE_LENGTH." : <input type='text' name='options[2]' size='5' maxlength='255' value='" . $options[2] . "' /><br><br>";
+    $form .= "<input type='text' name='options[1]' size='5' maxlength='255' value='".$options[1]."' />&nbsp;<br>";
+    $form .= _MB_MYMODULE2_TITLE_LENGTH." : <input type='text' name='options[2]' size='5' maxlength='255' value='".$options[2]."' /><br><br>";
     array_shift($options);
     array_shift($options);
     array_shift($options);
@@ -105,10 +105,10 @@  discard block
 block discarded – undo
     $testfieldsAll = $testfieldsHandler->getAll($criteria);
     unset($criteria);
     $form .= _MB_MYMODULE2_TESTFIELDS_TO_DISPLAY."<br><select name='options[]' multiple='multiple' size='5'>";
-    $form .= "<option value='0' " . (in_array(0, $options) === false ? '' : "selected='selected'") . '>' . _MB_MYMODULE2_ALL_TESTFIELDS . '</option>';
+    $form .= "<option value='0' ".(in_array(0, $options) === false ? '' : "selected='selected'").'>'._MB_MYMODULE2_ALL_TESTFIELDS.'</option>';
     foreach (array_keys($testfieldsAll) as $i) {
         $tf_id = $testfieldsAll[$i]->getVar('tf_id');
-        $form .= "<option value='" . $tf_id . "' " . (in_array($tf_id, $options) === false ? '' : "selected='selected'") . '>' . $testfieldsAll[$i]->getVar('tf_text') . '</option>';
+        $form .= "<option value='".$tf_id."' ".(in_array($tf_id, $options) === false ? '' : "selected='selected'").'>'.$testfieldsAll[$i]->getVar('tf_text').'</option>';
     }
     $form .= '</select>';
     return $form;

Please login to merge, or discard this patch.

testdata/mymodule2/blocks/articles.php 2 patches

Indentation +30 added lines, -30 removed lines patch added patch discarded remove patch

@@ -41,51 +41,51 @@
 block discarded – undo
     array_shift($options);
     array_shift($options);
     array_shift($options);
-	switch($typeBlock)
-	{
-		// For the block: articles last
-		case 'last':
-			//$criteria->add(new \Criteria('art_display', 1));
-			$criteria->setSort('art_created');
-			$criteria->setOrder('DESC');
-		break;
-		// For the block: articles new
-		case 'new':
-			//$criteria->add(new \Criteria('art_display', 1));
-			$criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING)), '>='));
-			$criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
-			$criteria->setSort('art_created');
-			$criteria->setOrder('ASC');
-		break;
-		// For the block: articles hits
-		case 'hits':
+    switch($typeBlock)
+    {
+        // For the block: articles last
+        case 'last':
+            //$criteria->add(new \Criteria('art_display', 1));
+            $criteria->setSort('art_created');
+            $criteria->setOrder('DESC');
+        break;
+        // For the block: articles new
+        case 'new':
+            //$criteria->add(new \Criteria('art_display', 1));
+            $criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING)), '>='));
+            $criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
+            $criteria->setSort('art_created');
+            $criteria->setOrder('ASC');
+        break;
+        // For the block: articles hits
+        case 'hits':
             $criteria->setSort('art_hits');
             $criteria->setOrder('DESC');
         break;
-		// For the block: articles top
-		case 'top':
+        // For the block: articles top
+        case 'top':
             $criteria->setSort('art_top');
             $criteria->setOrder('ASC');
         break;
-		// For the block: articles random
-		case 'random':
-			//$criteria->add(new \Criteria('art_display', 1));
-			$criteria->setSort('RAND()');
-		break;
-	}
+        // For the block: articles random
+        case 'random':
+            //$criteria->add(new \Criteria('art_display', 1));
+            $criteria->setSort('RAND()');
+        break;
+    }
     $criteria->setLimit($limit);
     $articlesAll = $articlesHandler->getAll($criteria);
-	unset($criteria);
-	if (count($articlesAll) > 0) {
+    unset($criteria);
+    if (count($articlesAll) > 0) {
         foreach(array_keys($articlesAll) as $i)
         {
             $block[$i]['cat'] = $articlesAll[$i]->getVar('art_cat');
             $block[$i]['title'] = $myts->htmlSpecialChars($articlesAll[$i]->getVar('art_title'));
-		    $block[$i]['descr'] = strip_tags($articlesAll[$i]->getVar('art_descr'));
+            $block[$i]['descr'] = strip_tags($articlesAll[$i]->getVar('art_descr'));
             $block[$i]['img'] = $articlesAll[$i]->getVar('art_img');
             $block[$i]['file'] = $articlesAll[$i]->getVar('art_file');
             $block[$i]['created'] = formatTimeStamp($articlesAll[$i]->getVar('art_created'));
-		    $block[$i]['submitter'] = \XoopsUser::getUnameFromId($articlesAll[$i]->getVar('art_submitter'));
+            $block[$i]['submitter'] = \XoopsUser::getUnameFromId($articlesAll[$i]->getVar('art_submitter'));
         }
     }
     return $block;

Please login to merge, or discard this patch.

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

@@ -41,7 +41,7 @@  discard block
 block discarded – undo
     array_shift($options);
     array_shift($options);
     array_shift($options);
-	switch($typeBlock)
+	switch ($typeBlock)
 	{
 		// For the block: articles last
 		case 'last':
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
 		case 'new':
 			//$criteria->add(new \Criteria('art_display', 1));
 			$criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING)), '>='));
-			$criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
+			$criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING)) + 86400, '<='));
 			$criteria->setSort('art_created');
 			$criteria->setOrder('ASC');
 		break;
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
     $articlesAll = $articlesHandler->getAll($criteria);
 	unset($criteria);
 	if (count($articlesAll) > 0) {
-        foreach(array_keys($articlesAll) as $i)
+        foreach (array_keys($articlesAll) as $i)
         {
             $block[$i]['cat'] = $articlesAll[$i]->getVar('art_cat');
             $block[$i]['title'] = $myts->htmlSpecialChars($articlesAll[$i]->getVar('art_title'));
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
     $GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
     $form  = _MB_MYMODULE2_DISPLAY;
     $form .= "<input type='hidden' name='options[0]' value='".$options[0]."' />";
-    $form .= "<input type='text' name='options[1]' size='5' maxlength='255' value='" . $options[1] . "' />&nbsp;<br>";
-    $form .= _MB_MYMODULE2_TITLE_LENGTH." : <input type='text' name='options[2]' size='5' maxlength='255' value='" . $options[2] . "' /><br><br>";
+    $form .= "<input type='text' name='options[1]' size='5' maxlength='255' value='".$options[1]."' />&nbsp;<br>";
+    $form .= _MB_MYMODULE2_TITLE_LENGTH." : <input type='text' name='options[2]' size='5' maxlength='255' value='".$options[2]."' /><br><br>";
     array_shift($options);
     array_shift($options);
     array_shift($options);
@@ -112,10 +112,10 @@  discard block
 block discarded – undo
     $articlesAll = $articlesHandler->getAll($criteria);
     unset($criteria);
     $form .= _MB_MYMODULE2_ARTICLES_TO_DISPLAY."<br><select name='options[]' multiple='multiple' size='5'>";
-    $form .= "<option value='0' " . (in_array(0, $options) === false ? '' : "selected='selected'") . '>' . _MB_MYMODULE2_ALL_ARTICLES . '</option>';
+    $form .= "<option value='0' ".(in_array(0, $options) === false ? '' : "selected='selected'").'>'._MB_MYMODULE2_ALL_ARTICLES.'</option>';
     foreach (array_keys($articlesAll) as $i) {
         $art_id = $articlesAll[$i]->getVar('art_id');
-        $form .= "<option value='" . $art_id . "' " . (in_array($art_id, $options) === false ? '' : "selected='selected'") . '>' . $articlesAll[$i]->getVar('art_title') . '</option>';
+        $form .= "<option value='".$art_id."' ".(in_array($art_id, $options) === false ? '' : "selected='selected'").'>'.$articlesAll[$i]->getVar('art_title').'</option>';
     }
     $form .= '</select>';
     return $form;

Please login to merge, or discard this patch.

testdata/mymodule2/class/Permissions.php 1 patch

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -32,25 +32,25 @@
 block discarded – undo
  */
 class Permissions extends \XoopsObject
 {
-	/**
-	 * Constructor 
-	 *
-	 * @param null
-	 */
-	public function __construct()
-	{
-	}
-
-	/**
-	 * @static function &getInstance
-	 *
-	 * @param null
-	 */
-	public static function getInstance()
-	{
-		static $instance = false;
-		if (!$instance) {
-			$instance = new self();
-		}
-	}
+    /**
+     * Constructor 
+     *
+     * @param null
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * @static function &getInstance
+     *
+     * @param null
+     */
+    public static function getInstance()
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self();
+        }
+    }
 }

Please login to merge, or discard this patch.

testdata/mymodule2/class/Categories.php 2 patches

Indentation +93 added lines, -93 removed lines patch added patch discarded remove patch

@@ -32,102 +32,102 @@
 block discarded – undo
  */
 class Categories extends \XoopsObject
 {
-	/**
-	 * Constructor 
-	 *
-	 * @param null
-	 */
-	public function __construct()
-	{
-		$this->initVar('cat_id', XOBJ_DTYPE_INT);
-		$this->initVar('cat_name', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('cat_logo', XOBJ_DTYPE_TXTBOX);
-		$this->initVar('cat_created', XOBJ_DTYPE_INT);
-		$this->initVar('cat_submitter', XOBJ_DTYPE_INT);
-	}
+    /**
+     * Constructor 
+     *
+     * @param null
+     */
+    public function __construct()
+    {
+        $this->initVar('cat_id', XOBJ_DTYPE_INT);
+        $this->initVar('cat_name', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('cat_logo', XOBJ_DTYPE_TXTBOX);
+        $this->initVar('cat_created', XOBJ_DTYPE_INT);
+        $this->initVar('cat_submitter', XOBJ_DTYPE_INT);
+    }
 
-	/**
-	 * @static function &getInstance
-	 *
-	 * @param null
-	 */
-	public static function getInstance()
-	{
-		static $instance = false;
-		if (!$instance) {
-			$instance = new self();
-		}
-	}
+    /**
+     * @static function &getInstance
+     *
+     * @param null
+     */
+    public static function getInstance()
+    {
+        static $instance = false;
+        if (!$instance) {
+            $instance = new self();
+        }
+    }
 
-	/**
-	 * The new inserted $Id
-	 * @return inserted id
-	 */
-	public function getNewInsertedIdCategories()
-	{
-		$newInsertedId = $GLOBALS['xoopsDB']->getInsertId();
-		return $newInsertedId;
-	}
+    /**
+     * The new inserted $Id
+     * @return inserted id
+     */
+    public function getNewInsertedIdCategories()
+    {
+        $newInsertedId = $GLOBALS['xoopsDB']->getInsertId();
+        return $newInsertedId;
+    }
 
-	/**
-	 * @public function getForm
-	 * @param bool $action
-	 * @return XoopsThemeForm
-	 */
-	public function getFormCategories($action = false)
-	{
-		$helper = \XoopsModules\Mymodule2\Helper::getInstance();
-		if (false === $action) {
-			$action = $_SERVER['REQUEST_URI'];
-		}
-		// Title
-		$title = $this->isNew() ? sprintf(_AM_MYMODULE2_CATEGORY_ADD) : sprintf(_AM_MYMODULE2_CATEGORY_EDIT);
-		// Get Theme Form
-		xoops_load('XoopsFormLoader');
-		$form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
-		$form->setExtra('enctype="multipart/form-data"');
-		// Form Text CatName
-		$form->addElement(new \XoopsFormText( _AM_MYMODULE2_CATEGORY_NAME, 'cat_name', 50, 255, $this->getVar('cat_name') ), true);
-		// Form Text Date Select CatCreated
-		$catCreated = $this->isNew() ? 0 : $this->getVar('cat_created');
-		$form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_CATEGORY_CREATED, 'cat_created', '', $catCreated ), true);
-		// To Save
-		$form->addElement(new \XoopsFormHidden('op', 'save'));
-		$form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false));
-		return $form;
-	}
+    /**
+     * @public function getForm
+     * @param bool $action
+     * @return XoopsThemeForm
+     */
+    public function getFormCategories($action = false)
+    {
+        $helper = \XoopsModules\Mymodule2\Helper::getInstance();
+        if (false === $action) {
+            $action = $_SERVER['REQUEST_URI'];
+        }
+        // Title
+        $title = $this->isNew() ? sprintf(_AM_MYMODULE2_CATEGORY_ADD) : sprintf(_AM_MYMODULE2_CATEGORY_EDIT);
+        // Get Theme Form
+        xoops_load('XoopsFormLoader');
+        $form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
+        $form->setExtra('enctype="multipart/form-data"');
+        // Form Text CatName
+        $form->addElement(new \XoopsFormText( _AM_MYMODULE2_CATEGORY_NAME, 'cat_name', 50, 255, $this->getVar('cat_name') ), true);
+        // Form Text Date Select CatCreated
+        $catCreated = $this->isNew() ? 0 : $this->getVar('cat_created');
+        $form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_CATEGORY_CREATED, 'cat_created', '', $catCreated ), true);
+        // To Save
+        $form->addElement(new \XoopsFormHidden('op', 'save'));
+        $form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false));
+        return $form;
+    }
 
-	/**
-	 * Get Values
-	 * @param null $keys 
-	 * @param null $format 
-	 * @param null$maxDepth 
-	 * @return array
-	 */
-	public function getValuesCategories($keys = null, $format = null, $maxDepth = null)
-	{
-		$helper = \XoopsModules\Mymodule2\Helper::getInstance();
-		$ret = $this->getValues($keys, $format, $maxDepth);
-		$ret['id'] = $this->getVar('cat_id');
-		$ret['name'] = $this->getVar('cat_name');
-		$ret['logo'] = $this->getVar('cat_logo');
-		$ret['created'] = formatTimeStamp($this->getVar('cat_created'), 's');
-		$ret['submitter'] = \XoopsUser::getUnameFromId($this->getVar('cat_submitter'));
-		return $ret;
-	}
+    /**
+     * Get Values
+     * @param null $keys 
+     * @param null $format 
+     * @param null$maxDepth 
+     * @return array
+     */
+    public function getValuesCategories($keys = null, $format = null, $maxDepth = null)
+    {
+        $helper = \XoopsModules\Mymodule2\Helper::getInstance();
+        $ret = $this->getValues($keys, $format, $maxDepth);
+        $ret['id'] = $this->getVar('cat_id');
+        $ret['name'] = $this->getVar('cat_name');
+        $ret['logo'] = $this->getVar('cat_logo');
+        $ret['created'] = formatTimeStamp($this->getVar('cat_created'), 's');
+        $ret['submitter'] = \XoopsUser::getUnameFromId($this->getVar('cat_submitter'));
+        return $ret;
+    }
 
-	/**
-	 * Returns an array representation of the object
-	 *
-	 * @return array
-	 */
-	public function toArrayCategories()
-	{
-		$ret = [];
-		$vars = $this->getVars();
-		foreach(array_keys($vars) as $var) {
-			$ret[$var] = $this->getVar('"{$var}"');
-		}
-		return $ret;
-	}
+    /**
+     * Returns an array representation of the object
+     *
+     * @return array
+     */
+    public function toArrayCategories()
+    {
+        $ret = [];
+        $vars = $this->getVars();
+        foreach(array_keys($vars) as $var) {
+            $ret[$var] = $this->getVar('"{$var}"');
+        }
+        return $ret;
+    }
 }

Please login to merge, or discard this patch.

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

@@ -87,10 +87,10 @@  discard block
 block discarded – undo
 		$form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
 		$form->setExtra('enctype="multipart/form-data"');
 		// Form Text CatName
-		$form->addElement(new \XoopsFormText( _AM_MYMODULE2_CATEGORY_NAME, 'cat_name', 50, 255, $this->getVar('cat_name') ), true);
+		$form->addElement(new \XoopsFormText(_AM_MYMODULE2_CATEGORY_NAME, 'cat_name', 50, 255, $this->getVar('cat_name')), true);
 		// Form Text Date Select CatCreated
 		$catCreated = $this->isNew() ? 0 : $this->getVar('cat_created');
-		$form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_CATEGORY_CREATED, 'cat_created', '', $catCreated ), true);
+		$form->addElement(new \XoopsFormTextDateSelect(_AM_MYMODULE2_CATEGORY_CREATED, 'cat_created', '', $catCreated), true);
 		// To Save
 		$form->addElement(new \XoopsFormHidden('op', 'save'));
 		$form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false));
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
 	{
 		$ret = [];
 		$vars = $this->getVars();
-		foreach(array_keys($vars) as $var) {
+		foreach (array_keys($vars) as $var) {
 			$ret[$var] = $this->getVar('"{$var}"');
 		}
 		return $ret;

Please login to merge, or discard this patch.

		@@ -29,7 +29,7 @@ discard block
		block discarded – undo
29	29	// Define Stylesheet
30	30	$GLOBALS['xoTheme']->addStylesheet( $style, null );
31	31	if (empty($tfId)) {
32		- redirect_header(MYMODULE2_URL . '/index.php', 2, _MA_MYMODULE2_NOTFID);
	32	+ redirect_header(MYMODULE2_URL . '/index.php', 2, _MA_MYMODULE2_NOTFID);
33	33	}
34	34	// Get Instance of Handler
35	35	$testfieldsHandler = $helper->getHandler('testfields');
		@@ -37,12 +37,12 @@ discard block
		block discarded – undo
37	37	$testfields = $testfieldsHandler->get($tfId);
38	38	// Verify permissions
39	39	if (!$grouppermHandler->checkRight('mymodule2_view', $tfId->getVar('tf_id'), $groups, $GLOBALS['xoopsModule']->getVar('mid'))) {
40		- redirect_header(MYMODULE2_URL . '/index.php', 3, _NOPERM);
41		- exit();
	40	+ redirect_header(MYMODULE2_URL . '/index.php', 3, _NOPERM);
	41	+ exit();
42	42	}
43	43	$testfield = $testfields->getValuesTestfields();
44	44	foreach($testfield as $k => $v) {
45		- $GLOBALS['xoopsTpl']->append('"{$k}"', $v);
	45	+ $GLOBALS['xoopsTpl']->append('"{$k}"', $v);
46	46	}
47	47	$GLOBALS['xoopsTpl']->assign('xoops_sitename', $GLOBALS['xoopsConfig']['sitename']);
48	48	$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', strip_tags($testfield->getVar('tf_text') - _MA_MYMODULE2_PRINT - $GLOBALS['xoopsModule']->name()));

		@@ -24,12 +24,12 @@ discard block
		block discarded – undo
24	24	use XoopsModules\Mymodule2;
25	25	use XoopsModules\Mymodule2\Constants;
26	26
27		-require __DIR__ . '/header.php';
	27	+require __DIR__.'/header.php';
28	28	$tfId = Request::getInt('tf_id');
29	29	// Define Stylesheet
30		-$GLOBALS['xoTheme']->addStylesheet( $style, null );
	30	+$GLOBALS['xoTheme']->addStylesheet($style, null);
31	31	if (empty($tfId)) {
32		- redirect_header(MYMODULE2_URL . '/index.php', 2, _MA_MYMODULE2_NOTFID);
	32	+ redirect_header(MYMODULE2_URL.'/index.php', 2, _MA_MYMODULE2_NOTFID);
33	33	}
34	34	// Get Instance of Handler
35	35	$testfieldsHandler = $helper->getHandler('testfields');
		@@ -37,11 +37,11 @@ discard block
		block discarded – undo
37	37	$testfields = $testfieldsHandler->get($tfId);
38	38	// Verify permissions
39	39	if (!$grouppermHandler->checkRight('mymodule2_view', $tfId->getVar('tf_id'), $groups, $GLOBALS['xoopsModule']->getVar('mid'))) {
40		- redirect_header(MYMODULE2_URL . '/index.php', 3, _NOPERM);
	40	+ redirect_header(MYMODULE2_URL.'/index.php', 3, _NOPERM);
41	41	exit();
42	42	}
43	43	$testfield = $testfields->getValuesTestfields();
44		-foreach($testfield as $k => $v) {
	44	+foreach ($testfield as $k => $v) {
45	45	$GLOBALS['xoopsTpl']->append('"{$k}"', $v);
46	46	}
47	47	$GLOBALS['xoopsTpl']->assign('xoops_sitename', $GLOBALS['xoopsConfig']['sitename']);

		@@ -6,17 +6,17 @@
		block discarded – undo
6	6	$moduleDirName = basename(dirname(__DIR__));
7	7
8	8	return (object)[
9		- 'name' => mb_strtoupper($moduleDirName) . ' IconConfigurator',
	9	+ 'name' => mb_strtoupper($moduleDirName).' IconConfigurator',
10	10	'icons' => [
11		- 'edit' => "<img src='" . $pathIcon16 . "/edit.png' alt=" . _EDIT . "' align='middle'>",
12		- 'delete' => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
13		- 'clone' => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
14		- 'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
15		- 'print' => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
16		- 'pdf' => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
17		- 'add' => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
18		- '0' => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
19		- '1' => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
	11	+ 'edit' => "<img src='".$pathIcon16."/edit.png' alt="._EDIT."' align='middle'>",
	12	+ 'delete' => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
	13	+ 'clone' => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
	14	+ 'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
	15	+ 'print' => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
	16	+ 'pdf' => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
	17	+ 'add' => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
	18	+ '0' => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
	19	+ '1' => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
20	20	],
21	21	];
22	22	}

		@@ -23,50 +23,50 @@
		block discarded – undo
23	23	$moduleDirName = basename(dirname(__DIR__));
24	24	$moduleDirNameUpper = mb_strtoupper($moduleDirName);
25	25	return (object)[
26		- 'name' => mb_strtoupper($moduleDirName) . ' Module Configurator',
27		- 'paths' => [
28		- 'dirname' => $moduleDirName,
29		- 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
30		- 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
31		- 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
32		- 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
33		- 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
34		- ],
35		- 'uploadFolders' => [
36		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
37		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/categories',
38		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/articles',
39		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/testfields',
40		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
41		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
42		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
43		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
44		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files',
45		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/categories',
46		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/articles',
47		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/testfields',
48		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/temp',
49		- ],
50		- 'copyBlankFiles' => [
51		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
52		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
53		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
54		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
55		- ],
56		- 'copyTestFolders' => [
57		- XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
58		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
59		- ],
60		- 'templateFolders' => [
61		- '/templates/',
62		- ],
63		- 'oldFiles' => [
64		- ],
65		- 'oldFolders' => [
66		- ],
67		- 'renameTables' => [
68		- ],
69		- 'moduleStats' => [
70		- ],
71		- 'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'><img src='" . XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . "/assets/images/logo/logoModule.png' alt='XOOPS Project'></a>",
	26	+ 'name' => mb_strtoupper($moduleDirName) . ' Module Configurator',
	27	+ 'paths' => [
	28	+ 'dirname' => $moduleDirName,
	29	+ 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
	30	+ 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
	31	+ 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
	32	+ 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
	33	+ 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
	34	+ ],
	35	+ 'uploadFolders' => [
	36	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
	37	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/categories',
	38	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/articles',
	39	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/testfields',
	40	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
	41	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
	42	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
	43	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
	44	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files',
	45	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/categories',
	46	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/articles',
	47	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/testfields',
	48	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/temp',
	49	+ ],
	50	+ 'copyBlankFiles' => [
	51	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
	52	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
	53	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
	54	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
	55	+ ],
	56	+ 'copyTestFolders' => [
	57	+ XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
	58	+ XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
	59	+ ],
	60	+ 'templateFolders' => [
	61	+ '/templates/',
	62	+ ],
	63	+ 'oldFiles' => [
	64	+ ],
	65	+ 'oldFolders' => [
	66	+ ],
	67	+ 'renameTables' => [
	68	+ ],
	69	+ 'moduleStats' => [
	70	+ ],
	71	+ 'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'><img src='" . XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . "/assets/images/logo/logoModule.png' alt='XOOPS Project'></a>",
72	72	];

		@@ -20,42 +20,42 @@ discard block
		block discarded – undo
20	20	* @author TDM XOOPS - Email:<[email protected]> - Website:<http://xoops.org>
21	21	*/
22	22
23		-$moduleDirName = basename(dirname(__DIR__));
24		-$moduleDirNameUpper = mb_strtoupper($moduleDirName);
	23	+$moduleDirName = basename(dirname(__DIR__));
	24	+$moduleDirNameUpper = mb_strtoupper($moduleDirName);
25	25	return (object)[
26		- 'name' => mb_strtoupper($moduleDirName) . ' Module Configurator',
	26	+ 'name' => mb_strtoupper($moduleDirName).' Module Configurator',
27	27	'paths' => [
28	28	'dirname' => $moduleDirName,
29		- 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
30		- 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
31		- 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
32		- 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
33		- 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
	29	+ 'admin' => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
	30	+ 'modPath' => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
	31	+ 'modUrl' => XOOPS_URL.'/modules/'.$moduleDirName,
	32	+ 'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
	33	+ 'uploadUrl' => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
34	34	],
35	35	'uploadFolders' => [
36		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
37		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/categories',
38		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/articles',
39		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/testfields',
40		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
41		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
42		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
43		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
44		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files',
45		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/categories',
46		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/articles',
47		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/files/testfields',
48		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/temp',
	36	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
	37	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/categories',
	38	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/articles',
	39	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/testfields',
	40	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images',
	41	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/categories',
	42	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/articles',
	43	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/testfields',
	44	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/files',
	45	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/files/categories',
	46	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/files/articles',
	47	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/files/testfields',
	48	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/temp',
49	49	],
50	50	'copyBlankFiles' => [
51		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
52		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/categories',
53		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/articles',
54		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/testfields',
	51	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images',
	52	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/categories',
	53	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/articles',
	54	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/testfields',
55	55	],
56	56	'copyTestFolders' => [
57		- XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
58		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
	57	+ XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/uploads',
	58	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
59	59	],
60	60	'templateFolders' => [
61	61	'/templates/',
		@@ -68,5 +68,5 @@ discard block
		block discarded – undo
68	68	],
69	69	'moduleStats' => [
70	70	],
71		- 'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'><img src='" . XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . "/assets/images/logo/logoModule.png' alt='XOOPS Project'></a>",
	71	+ 'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'><img src='".XOOPS_ROOT_PATH.'/modules/'.$moduleDirName."/assets/images/logo/logoModule.png' alt='XOOPS Project'></a>",
72	72	];

		@@ -6,19 +6,19 @@
		block discarded – undo
6	6	$moduleDirNameUpper = mb_strtoupper($moduleDirName);
7	7
8	8	return (object)[
9		- 'name' => mb_strtoupper($moduleDirName) . ' PathConfigurator',
	9	+ 'name' => mb_strtoupper($moduleDirName).' PathConfigurator',
10	10	'paths' => [
11	11	'dirname' => $moduleDirName,
12		- 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
13		- 'modPath' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
14		- 'modUrl' => XOOPS_URL . '/modules/' . $moduleDirName,
15		- 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
16		- 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
	12	+ 'admin' => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
	13	+ 'modPath' => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
	14	+ 'modUrl' => XOOPS_URL.'/modules/'.$moduleDirName,
	15	+ 'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
	16	+ 'uploadUrl' => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
17	17	],
18	18	'uploadFolders' => [
19		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
20		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
21		- XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
	19	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
	20	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
	21	+ XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
22	22	//XOOPS_UPLOAD_PATH . '/flags'
23	23	],
24	24	];

		@@ -19,5 +19,5 @@
		block discarded – undo
19	19	* @min_xoops 2.5.9
20	20	* @author TDM XOOPS - Email:<[email protected]> - Website:<http://xoops.org>
21	21	*/
22		-require __DIR__ . '/header.php';
23		-include XOOPS_ROOT_PATH . '/modules/tag/view.tag.php';
	22	+require __DIR__.'/header.php';
	23	+include XOOPS_ROOT_PATH.'/modules/tag/view.tag.php';

		@@ -41,42 +41,42 @@
		block discarded – undo
41	41	array_shift($options);
42	42	array_shift($options);
43	43	array_shift($options);
44		- switch($typeBlock)
45		- {
46		- // For the block: testfields last
47		- case 'last':
48		- //$criteria->add(new \Criteria('tf_display', 1));
49		- $criteria->setSort('tf_created');
50		- $criteria->setOrder('DESC');
51		- break;
52		- // For the block: testfields new
53		- case 'new':
54		- //$criteria->add(new \Criteria('tf_display', 1));
55		- $criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING)), '>='));
56		- $criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
57		- $criteria->setSort('tf_created');
58		- $criteria->setOrder('ASC');
59		- break;
60		- // For the block: testfields hits
61		- case 'hits':
	44	+ switch($typeBlock)
	45	+ {
	46	+ // For the block: testfields last
	47	+ case 'last':
	48	+ //$criteria->add(new \Criteria('tf_display', 1));
	49	+ $criteria->setSort('tf_created');
	50	+ $criteria->setOrder('DESC');
	51	+ break;
	52	+ // For the block: testfields new
	53	+ case 'new':
	54	+ //$criteria->add(new \Criteria('tf_display', 1));
	55	+ $criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING)), '>='));
	56	+ $criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
	57	+ $criteria->setSort('tf_created');
	58	+ $criteria->setOrder('ASC');
	59	+ break;
	60	+ // For the block: testfields hits
	61	+ case 'hits':
62	62	$criteria->setSort('tf_hits');
63	63	$criteria->setOrder('DESC');
64	64	break;
65		- // For the block: testfields top
66		- case 'top':
	65	+ // For the block: testfields top
	66	+ case 'top':
67	67	$criteria->setSort('tf_top');
68	68	$criteria->setOrder('ASC');
69	69	break;
70		- // For the block: testfields random
71		- case 'random':
72		- //$criteria->add(new \Criteria('tf_display', 1));
73		- $criteria->setSort('RAND()');
74		- break;
75		- }
	70	+ // For the block: testfields random
	71	+ case 'random':
	72	+ //$criteria->add(new \Criteria('tf_display', 1));
	73	+ $criteria->setSort('RAND()');
	74	+ break;
	75	+ }
76	76	$criteria->setLimit($limit);
77	77	$testfieldsAll = $testfieldsHandler->getAll($criteria);
78		- unset($criteria);
79		- if (count($testfieldsAll) > 0) {
	78	+ unset($criteria);
	79	+ if (count($testfieldsAll) > 0) {
80	80	foreach(array_keys($testfieldsAll) as $i)
81	81	{
82	82	}

		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41	array_shift($options);
42	42	array_shift($options);
43	43	array_shift($options);
44		- switch($typeBlock)
	44	+ switch ($typeBlock)
45	45	{
46	46	// For the block: testfields last
47	47	case 'last':
		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53	case 'new':
54	54	//$criteria->add(new \Criteria('tf_display', 1));
55	55	$criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING)), '>='));
56		- $criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
	56	+ $criteria->add(new \Criteria('tf_created', strtotime(date(_SHORTDATESTRING)) + 86400, '<='));
57	57	$criteria->setSort('tf_created');
58	58	$criteria->setOrder('ASC');
59	59	break;
		@@ -77,7 +77,7 @@ discard block
		block discarded – undo
77	77	$testfieldsAll = $testfieldsHandler->getAll($criteria);
78	78	unset($criteria);
79	79	if (count($testfieldsAll) > 0) {
80		- foreach(array_keys($testfieldsAll) as $i)
	80	+ foreach (array_keys($testfieldsAll) as $i)
81	81	{
82	82	}
83	83	}
		@@ -93,8 +93,8 @@ discard block
		block discarded – undo
93	93	$GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
94	94	$form = _MB_MYMODULE2_DISPLAY;
95	95	$form .= "<input type='hidden' name='options[0]' value='".$options[0]."' />";
96		- $form .= "<input type='text' name='options[1]' size='5' maxlength='255' value='" . $options[1] . "' /> <br>";
97		- $form .= _MB_MYMODULE2_TITLE_LENGTH." : <input type='text' name='options[2]' size='5' maxlength='255' value='" . $options[2] . "' /><br><br>";
	96	+ $form .= "<input type='text' name='options[1]' size='5' maxlength='255' value='".$options[1]."' /> <br>";
	97	+ $form .= _MB_MYMODULE2_TITLE_LENGTH." : <input type='text' name='options[2]' size='5' maxlength='255' value='".$options[2]."' /><br><br>";
98	98	array_shift($options);
99	99	array_shift($options);
100	100	array_shift($options);
		@@ -105,10 +105,10 @@ discard block
		block discarded – undo
105	105	$testfieldsAll = $testfieldsHandler->getAll($criteria);
106	106	unset($criteria);
107	107	$form .= _MB_MYMODULE2_TESTFIELDS_TO_DISPLAY."<br><select name='options[]' multiple='multiple' size='5'>";
108		- $form .= "<option value='0' " . (in_array(0, $options) === false ? '' : "selected='selected'") . '>' . _MB_MYMODULE2_ALL_TESTFIELDS . '</option>';
	108	+ $form .= "<option value='0' ".(in_array(0, $options) === false ? '' : "selected='selected'").'>'._MB_MYMODULE2_ALL_TESTFIELDS.'</option>';
109	109	foreach (array_keys($testfieldsAll) as $i) {
110	110	$tf_id = $testfieldsAll[$i]->getVar('tf_id');
111		- $form .= "<option value='" . $tf_id . "' " . (in_array($tf_id, $options) === false ? '' : "selected='selected'") . '>' . $testfieldsAll[$i]->getVar('tf_text') . '</option>';
	111	+ $form .= "<option value='".$tf_id."' ".(in_array($tf_id, $options) === false ? '' : "selected='selected'").'>'.$testfieldsAll[$i]->getVar('tf_text').'</option>';
112	112	}
113	113	$form .= '</select>';
114	114	return $form;

		@@ -41,51 +41,51 @@
		block discarded – undo
41	41	array_shift($options);
42	42	array_shift($options);
43	43	array_shift($options);
44		- switch($typeBlock)
45		- {
46		- // For the block: articles last
47		- case 'last':
48		- //$criteria->add(new \Criteria('art_display', 1));
49		- $criteria->setSort('art_created');
50		- $criteria->setOrder('DESC');
51		- break;
52		- // For the block: articles new
53		- case 'new':
54		- //$criteria->add(new \Criteria('art_display', 1));
55		- $criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING)), '>='));
56		- $criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
57		- $criteria->setSort('art_created');
58		- $criteria->setOrder('ASC');
59		- break;
60		- // For the block: articles hits
61		- case 'hits':
	44	+ switch($typeBlock)
	45	+ {
	46	+ // For the block: articles last
	47	+ case 'last':
	48	+ //$criteria->add(new \Criteria('art_display', 1));
	49	+ $criteria->setSort('art_created');
	50	+ $criteria->setOrder('DESC');
	51	+ break;
	52	+ // For the block: articles new
	53	+ case 'new':
	54	+ //$criteria->add(new \Criteria('art_display', 1));
	55	+ $criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING)), '>='));
	56	+ $criteria->add(new \Criteria('art_created', strtotime(date(_SHORTDATESTRING))+86400, '<='));
	57	+ $criteria->setSort('art_created');
	58	+ $criteria->setOrder('ASC');
	59	+ break;
	60	+ // For the block: articles hits
	61	+ case 'hits':
62	62	$criteria->setSort('art_hits');
63	63	$criteria->setOrder('DESC');
64	64	break;
65		- // For the block: articles top
66		- case 'top':
	65	+ // For the block: articles top
	66	+ case 'top':
67	67	$criteria->setSort('art_top');
68	68	$criteria->setOrder('ASC');
69	69	break;
70		- // For the block: articles random
71		- case 'random':
72		- //$criteria->add(new \Criteria('art_display', 1));
73		- $criteria->setSort('RAND()');
74		- break;
75		- }
	70	+ // For the block: articles random
	71	+ case 'random':
	72	+ //$criteria->add(new \Criteria('art_display', 1));
	73	+ $criteria->setSort('RAND()');
	74	+ break;
	75	+ }
76	76	$criteria->setLimit($limit);
77	77	$articlesAll = $articlesHandler->getAll($criteria);
78		- unset($criteria);
79		- if (count($articlesAll) > 0) {
	78	+ unset($criteria);
	79	+ if (count($articlesAll) > 0) {
80	80	foreach(array_keys($articlesAll) as $i)
81	81	{
82	82	$block[$i]['cat'] = $articlesAll[$i]->getVar('art_cat');
83	83	$block[$i]['title'] = $myts->htmlSpecialChars($articlesAll[$i]->getVar('art_title'));
84		- $block[$i]['descr'] = strip_tags($articlesAll[$i]->getVar('art_descr'));
	84	+ $block[$i]['descr'] = strip_tags($articlesAll[$i]->getVar('art_descr'));
85	85	$block[$i]['img'] = $articlesAll[$i]->getVar('art_img');
86	86	$block[$i]['file'] = $articlesAll[$i]->getVar('art_file');
87	87	$block[$i]['created'] = formatTimeStamp($articlesAll[$i]->getVar('art_created'));
88		- $block[$i]['submitter'] = \XoopsUser::getUnameFromId($articlesAll[$i]->getVar('art_submitter'));
	88	+ $block[$i]['submitter'] = \XoopsUser::getUnameFromId($articlesAll[$i]->getVar('art_submitter'));
89	89	}
90	90	}
91	91	return $block;

		@@ -32,25 +32,25 @@
		block discarded – undo
32	32	*/
33	33	class Permissions extends \XoopsObject
34	34	{
35		- /**
36		- * Constructor
37		- *
38		- * @param null
39		- */
40		- public function __construct()
41		- {
42		- }
43		-
44		- /**
45		- * @static function &getInstance
46		- *
47		- * @param null
48		- */
49		- public static function getInstance()
50		- {
51		- static $instance = false;
52		- if (!$instance) {
53		- $instance = new self();
54		- }
55		- }
	35	+ /**
	36	+ * Constructor
	37	+ *
	38	+ * @param null
	39	+ */
	40	+ public function __construct()
	41	+ {
	42	+ }
	43	+
	44	+ /**
	45	+ * @static function &getInstance
	46	+ *
	47	+ * @param null
	48	+ */
	49	+ public static function getInstance()
	50	+ {
	51	+ static $instance = false;
	52	+ if (!$instance) {
	53	+ $instance = new self();
	54	+ }
	55	+ }
56	56	}

		@@ -32,102 +32,102 @@
		block discarded – undo
32	32	*/
33	33	class Categories extends \XoopsObject
34	34	{
35		- /**
36		- * Constructor
37		- *
38		- * @param null
39		- */
40		- public function __construct()
41		- {
42		- $this->initVar('cat_id', XOBJ_DTYPE_INT);
43		- $this->initVar('cat_name', XOBJ_DTYPE_TXTBOX);
44		- $this->initVar('cat_logo', XOBJ_DTYPE_TXTBOX);
45		- $this->initVar('cat_created', XOBJ_DTYPE_INT);
46		- $this->initVar('cat_submitter', XOBJ_DTYPE_INT);
47		- }
	35	+ /**
	36	+ * Constructor
	37	+ *
	38	+ * @param null
	39	+ */
	40	+ public function __construct()
	41	+ {
	42	+ $this->initVar('cat_id', XOBJ_DTYPE_INT);
	43	+ $this->initVar('cat_name', XOBJ_DTYPE_TXTBOX);
	44	+ $this->initVar('cat_logo', XOBJ_DTYPE_TXTBOX);
	45	+ $this->initVar('cat_created', XOBJ_DTYPE_INT);
	46	+ $this->initVar('cat_submitter', XOBJ_DTYPE_INT);
	47	+ }
48	48
49		- /**
50		- * @static function &getInstance
51		- *
52		- * @param null
53		- */
54		- public static function getInstance()
55		- {
56		- static $instance = false;
57		- if (!$instance) {
58		- $instance = new self();
59		- }
60		- }
	49	+ /**
	50	+ * @static function &getInstance
	51	+ *
	52	+ * @param null
	53	+ */
	54	+ public static function getInstance()
	55	+ {
	56	+ static $instance = false;
	57	+ if (!$instance) {
	58	+ $instance = new self();
	59	+ }
	60	+ }
61	61
62		- /**
63		- * The new inserted $Id
64		- * @return inserted id
65		- */
66		- public function getNewInsertedIdCategories()
67		- {
68		- $newInsertedId = $GLOBALS['xoopsDB']->getInsertId();
69		- return $newInsertedId;
70		- }
	62	+ /**
	63	+ * The new inserted $Id
	64	+ * @return inserted id
	65	+ */
	66	+ public function getNewInsertedIdCategories()
	67	+ {
	68	+ $newInsertedId = $GLOBALS['xoopsDB']->getInsertId();
	69	+ return $newInsertedId;
	70	+ }
71	71
72		- /**
73		- * @public function getForm
74		- * @param bool $action
75		- * @return XoopsThemeForm
76		- */
77		- public function getFormCategories($action = false)
78		- {
79		- $helper = \XoopsModules\Mymodule2\Helper::getInstance();
80		- if (false === $action) {
81		- $action = $_SERVER['REQUEST_URI'];
82		- }
83		- // Title
84		- $title = $this->isNew() ? sprintf(_AM_MYMODULE2_CATEGORY_ADD) : sprintf(_AM_MYMODULE2_CATEGORY_EDIT);
85		- // Get Theme Form
86		- xoops_load('XoopsFormLoader');
87		- $form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
88		- $form->setExtra('enctype="multipart/form-data"');
89		- // Form Text CatName
90		- $form->addElement(new \XoopsFormText( _AM_MYMODULE2_CATEGORY_NAME, 'cat_name', 50, 255, $this->getVar('cat_name') ), true);
91		- // Form Text Date Select CatCreated
92		- $catCreated = $this->isNew() ? 0 : $this->getVar('cat_created');
93		- $form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_CATEGORY_CREATED, 'cat_created', '', $catCreated ), true);
94		- // To Save
95		- $form->addElement(new \XoopsFormHidden('op', 'save'));
96		- $form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false));
97		- return $form;
98		- }
	72	+ /**
	73	+ * @public function getForm
	74	+ * @param bool $action
	75	+ * @return XoopsThemeForm
	76	+ */
	77	+ public function getFormCategories($action = false)
	78	+ {
	79	+ $helper = \XoopsModules\Mymodule2\Helper::getInstance();
	80	+ if (false === $action) {
	81	+ $action = $_SERVER['REQUEST_URI'];
	82	+ }
	83	+ // Title
	84	+ $title = $this->isNew() ? sprintf(_AM_MYMODULE2_CATEGORY_ADD) : sprintf(_AM_MYMODULE2_CATEGORY_EDIT);
	85	+ // Get Theme Form
	86	+ xoops_load('XoopsFormLoader');
	87	+ $form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
	88	+ $form->setExtra('enctype="multipart/form-data"');
	89	+ // Form Text CatName
	90	+ $form->addElement(new \XoopsFormText( _AM_MYMODULE2_CATEGORY_NAME, 'cat_name', 50, 255, $this->getVar('cat_name') ), true);
	91	+ // Form Text Date Select CatCreated
	92	+ $catCreated = $this->isNew() ? 0 : $this->getVar('cat_created');
	93	+ $form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_CATEGORY_CREATED, 'cat_created', '', $catCreated ), true);
	94	+ // To Save
	95	+ $form->addElement(new \XoopsFormHidden('op', 'save'));
	96	+ $form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false));
	97	+ return $form;
	98	+ }
99	99
100		- /**
101		- * Get Values
102		- * @param null $keys
103		- * @param null $format
104		- * @param null$maxDepth
105		- * @return array
106		- */
107		- public function getValuesCategories($keys = null, $format = null, $maxDepth = null)
108		- {
109		- $helper = \XoopsModules\Mymodule2\Helper::getInstance();
110		- $ret = $this->getValues($keys, $format, $maxDepth);
111		- $ret['id'] = $this->getVar('cat_id');
112		- $ret['name'] = $this->getVar('cat_name');
113		- $ret['logo'] = $this->getVar('cat_logo');
114		- $ret['created'] = formatTimeStamp($this->getVar('cat_created'), 's');
115		- $ret['submitter'] = \XoopsUser::getUnameFromId($this->getVar('cat_submitter'));
116		- return $ret;
117		- }
	100	+ /**
	101	+ * Get Values
	102	+ * @param null $keys
	103	+ * @param null $format
	104	+ * @param null$maxDepth
	105	+ * @return array
	106	+ */
	107	+ public function getValuesCategories($keys = null, $format = null, $maxDepth = null)
	108	+ {
	109	+ $helper = \XoopsModules\Mymodule2\Helper::getInstance();
	110	+ $ret = $this->getValues($keys, $format, $maxDepth);
	111	+ $ret['id'] = $this->getVar('cat_id');
	112	+ $ret['name'] = $this->getVar('cat_name');
	113	+ $ret['logo'] = $this->getVar('cat_logo');
	114	+ $ret['created'] = formatTimeStamp($this->getVar('cat_created'), 's');
	115	+ $ret['submitter'] = \XoopsUser::getUnameFromId($this->getVar('cat_submitter'));
	116	+ return $ret;
	117	+ }
118	118
119		- /**
120		- * Returns an array representation of the object
121		- *
122		- * @return array
123		- */
124		- public function toArrayCategories()
125		- {
126		- $ret = [];
127		- $vars = $this->getVars();
128		- foreach(array_keys($vars) as $var) {
129		- $ret[$var] = $this->getVar('"{$var}"');
130		- }
131		- return $ret;
132		- }
	119	+ /**
	120	+ * Returns an array representation of the object
	121	+ *
	122	+ * @return array
	123	+ */
	124	+ public function toArrayCategories()
	125	+ {
	126	+ $ret = [];
	127	+ $vars = $this->getVars();
	128	+ foreach(array_keys($vars) as $var) {
	129	+ $ret[$var] = $this->getVar('"{$var}"');
	130	+ }
	131	+ return $ret;
	132	+ }
133	133	}

		@@ -87,10 +87,10 @@ discard block
		block discarded – undo
87	87	$form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
88	88	$form->setExtra('enctype="multipart/form-data"');
89	89	// Form Text CatName
90		- $form->addElement(new \XoopsFormText( _AM_MYMODULE2_CATEGORY_NAME, 'cat_name', 50, 255, $this->getVar('cat_name') ), true);
	90	+ $form->addElement(new \XoopsFormText(_AM_MYMODULE2_CATEGORY_NAME, 'cat_name', 50, 255, $this->getVar('cat_name')), true);
91	91	// Form Text Date Select CatCreated
92	92	$catCreated = $this->isNew() ? 0 : $this->getVar('cat_created');
93		- $form->addElement(new \XoopsFormTextDateSelect( _AM_MYMODULE2_CATEGORY_CREATED, 'cat_created', '', $catCreated ), true);
	93	+ $form->addElement(new \XoopsFormTextDateSelect(_AM_MYMODULE2_CATEGORY_CREATED, 'cat_created', '', $catCreated), true);
94	94	// To Save
95	95	$form->addElement(new \XoopsFormHidden('op', 'save'));
96	96	$form->addElement(new \XoopsFormButtonTray('', _SUBMIT, 'submit', '', false));
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125	{
126	126	$ret = [];
127	127	$vars = $this->getVars();
128		- foreach(array_keys($vars) as $var) {
	128	+ foreach (array_keys($vars) as $var) {
129	129	$ret[$var] = $this->getVar('"{$var}"');
130	130	}
131	131	return $ret;

txmodxoops / tdmcreate

Push — master ( 834a16...1c3825 )

Status

Category

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

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

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

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

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

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

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

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

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

Indentation +30 added lines, -30 removed lines patch added patch discarded remove patch

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

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

Indentation +93 added lines, -93 removed lines patch added patch discarded remove patch

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