Inspection of "Merge pull request #5 from mambax7/master" - XoopsModules25x/myiframe - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( c009df...8c936a )

by Michael

created 2017-08-05 13:46 UTC

Status

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

@@ -9,97 +9,97 @@
 block discarded – undo
 use Xmf\Request;
 
 if (!defined('XOOPS_ROOT_PATH')) {
-    die('XOOPS root path not defined');
+	die('XOOPS root path not defined');
 }
 
 $modversion = array(
-    'version'             => 1.66,
-    'module_status'       => 'Beta 1',
-    'release_date'        => '2017/08/04',
-    'name'                => _MI_MYIFRAME_NAME,
-    'description'         => _MI_MYIFRAME_DESC,
-    'credits'             => '',
-    'author'              => 'Instant Zero - http://xoops.instant-zero.com',
-    'help'                => '',
-    'license'             => 'GPL see LICENSE',
-    'official'            => 0,
-    'image'               => 'assets/images/logoModule.png',
-    'dirname'             => basename(__DIR__),
-    'min_php'             => '5.5',
-    'min_db'              => array('mysql' => '5.5'),
-    'min_xoops'           => '2.5.8+',
-    'min_admin'           => '1.2',
-    'module_website_url'  => 'www.xoops.org',
-    'module_website_name' => 'XOOPS',
-    'module_release'      => '05/07/2017',
-    'system_menu'         => 1,
-    //sql tables
-    'sqlfile'             => array('mysql' => 'sql/mysql.sql'),
-    'tables'              => array(
-        'myiframe'
-    ),
-    // Admin
-    'hasAdmin'            => 1,
-    'adminindex'          => 'admin/index.php',
-    'adminmenu'           => 'admin/menu.php',
-    // Menu
-    'hasMain'             => 1
+	'version'             => 1.66,
+	'module_status'       => 'Beta 1',
+	'release_date'        => '2017/08/04',
+	'name'                => _MI_MYIFRAME_NAME,
+	'description'         => _MI_MYIFRAME_DESC,
+	'credits'             => '',
+	'author'              => 'Instant Zero - http://xoops.instant-zero.com',
+	'help'                => '',
+	'license'             => 'GPL see LICENSE',
+	'official'            => 0,
+	'image'               => 'assets/images/logoModule.png',
+	'dirname'             => basename(__DIR__),
+	'min_php'             => '5.5',
+	'min_db'              => array('mysql' => '5.5'),
+	'min_xoops'           => '2.5.8+',
+	'min_admin'           => '1.2',
+	'module_website_url'  => 'www.xoops.org',
+	'module_website_name' => 'XOOPS',
+	'module_release'      => '05/07/2017',
+	'system_menu'         => 1,
+	//sql tables
+	'sqlfile'             => array('mysql' => 'sql/mysql.sql'),
+	'tables'              => array(
+		'myiframe'
+	),
+	// Admin
+	'hasAdmin'            => 1,
+	'adminindex'          => 'admin/index.php',
+	'adminmenu'           => 'admin/menu.php',
+	// Menu
+	'hasMain'             => 1
 );
 
 // Templates
 $modversion['templates'] = array(
-    array(
-        'file'        => 'myiframe.tpl',
-        'description' => 'Default template'
-    ),
+	array(
+		'file'        => 'myiframe.tpl',
+		'description' => 'Default template'
+	),
 );
 
 //Blocks
 $modversion['blocks'][] = array(
-    'file'        => 'myiframe_iframe.php',
-    'name'        => _MI_MYIFAME_BNAME1,
-    'description' => 'Shows an iframe in a block',
-    'show_func'   => 'b_myiframe_iframe_show',
-    'edit_func'   => 'b_myiframe_iframe_edit',
-    'options'     => '0',
-    'template'    => 'myiframe_block_show.tpl'
+	'file'        => 'myiframe_iframe.php',
+	'name'        => _MI_MYIFAME_BNAME1,
+	'description' => 'Shows an iframe in a block',
+	'show_func'   => 'b_myiframe_iframe_show',
+	'edit_func'   => 'b_myiframe_iframe_edit',
+	'options'     => '0',
+	'template'    => 'myiframe_block_show.tpl'
 );
 
 global $xoopsDB, $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
 
 if (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $modversion['dirname'] && $xoopsModule->getVar('isactive')) {
-    $i = 0;
-    include_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
-    $myts = MyTextSanitizer::getInstance();
-    if (myiframe_getmoduleoption('showinmenu')) {
-        $sql    = 'SELECT * FROM ' . $xoopsDB->prefix('myiframe') . ' ORDER BY frame_description';
-        $result = $xoopsDB->query($sql);
-        while ($myrow = $xoopsDB->fetchArray($result)) {
-            if (xoops_trim($myrow['frame_description']) !== '') {
-                $modversion['sub'][$i]['name'] = $myts->htmlSpecialChars($myrow['frame_description']);
-                $modversion['sub'][$i]['url']  = 'index.php?iframeid=' . (int)$myrow['frame_frameid'];
-                $i++;
-            }
-        }
-    }
+	$i = 0;
+	include_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
+	$myts = MyTextSanitizer::getInstance();
+	if (myiframe_getmoduleoption('showinmenu')) {
+		$sql    = 'SELECT * FROM ' . $xoopsDB->prefix('myiframe') . ' ORDER BY frame_description';
+		$result = $xoopsDB->query($sql);
+		while ($myrow = $xoopsDB->fetchArray($result)) {
+			if (xoops_trim($myrow['frame_description']) !== '') {
+				$modversion['sub'][$i]['name'] = $myts->htmlSpecialChars($myrow['frame_description']);
+				$modversion['sub'][$i]['url']  = 'index.php?iframeid=' . (int)$myrow['frame_frameid'];
+				$i++;
+			}
+		}
+	}
 }
 
 // Options
 $modversion['config'][] = [
-    'name'        => 'showinmenu',
-    'title'       => '_MI_MYIFRAME_OPT0',
-    'description' => '_MI_MYIFRAME_OPT0_DSC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0,
+	'name'        => 'showinmenu',
+	'title'       => '_MI_MYIFRAME_OPT0',
+	'description' => '_MI_MYIFRAME_OPT0_DSC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0,
 ];
 $modversion['config'][] = [
-    'name'        => 'showlist',
-    'title'       => '_MI_MYIFRAME_OPT1',
-    'description' => '_MI_MYIFRAME_OPT1_DSC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1,
+	'name'        => 'showlist',
+	'title'       => '_MI_MYIFRAME_OPT1',
+	'description' => '_MI_MYIFRAME_OPT1_DSC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1,
 ];
 // Search
 $modversion['hasSearch'] = 0;

Please login to merge, or discard this patch.

		@@ -9,97 +9,97 @@
		block discarded – undo
9	9	use Xmf\Request;
10	10
11	11	if (!defined('XOOPS_ROOT_PATH')) {
12		- die('XOOPS root path not defined');
	12	+ die('XOOPS root path not defined');
13	13	}
14	14
15	15	$modversion = array(
16		- 'version' => 1.66,
17		- 'module_status' => 'Beta 1',
18		- 'release_date' => '2017/08/04',
19		- 'name' => _MI_MYIFRAME_NAME,
20		- 'description' => _MI_MYIFRAME_DESC,
21		- 'credits' => '',
22		- 'author' => 'Instant Zero - http://xoops.instant-zero.com',
23		- 'help' => '',
24		- 'license' => 'GPL see LICENSE',
25		- 'official' => 0,
26		- 'image' => 'assets/images/logoModule.png',
27		- 'dirname' => basename(__DIR__),
28		- 'min_php' => '5.5',
29		- 'min_db' => array('mysql' => '5.5'),
30		- 'min_xoops' => '2.5.8+',
31		- 'min_admin' => '1.2',
32		- 'module_website_url' => 'www.xoops.org',
33		- 'module_website_name' => 'XOOPS',
34		- 'module_release' => '05/07/2017',
35		- 'system_menu' => 1,
36		- //sql tables
37		- 'sqlfile' => array('mysql' => 'sql/mysql.sql'),
38		- 'tables' => array(
39		- 'myiframe'
40		- ),
41		- // Admin
42		- 'hasAdmin' => 1,
43		- 'adminindex' => 'admin/index.php',
44		- 'adminmenu' => 'admin/menu.php',
45		- // Menu
46		- 'hasMain' => 1
	16	+ 'version' => 1.66,
	17	+ 'module_status' => 'Beta 1',
	18	+ 'release_date' => '2017/08/04',
	19	+ 'name' => _MI_MYIFRAME_NAME,
	20	+ 'description' => _MI_MYIFRAME_DESC,
	21	+ 'credits' => '',
	22	+ 'author' => 'Instant Zero - http://xoops.instant-zero.com',
	23	+ 'help' => '',
	24	+ 'license' => 'GPL see LICENSE',
	25	+ 'official' => 0,
	26	+ 'image' => 'assets/images/logoModule.png',
	27	+ 'dirname' => basename(__DIR__),
	28	+ 'min_php' => '5.5',
	29	+ 'min_db' => array('mysql' => '5.5'),
	30	+ 'min_xoops' => '2.5.8+',
	31	+ 'min_admin' => '1.2',
	32	+ 'module_website_url' => 'www.xoops.org',
	33	+ 'module_website_name' => 'XOOPS',
	34	+ 'module_release' => '05/07/2017',
	35	+ 'system_menu' => 1,
	36	+ //sql tables
	37	+ 'sqlfile' => array('mysql' => 'sql/mysql.sql'),
	38	+ 'tables' => array(
	39	+ 'myiframe'
	40	+ ),
	41	+ // Admin
	42	+ 'hasAdmin' => 1,
	43	+ 'adminindex' => 'admin/index.php',
	44	+ 'adminmenu' => 'admin/menu.php',
	45	+ // Menu
	46	+ 'hasMain' => 1
47	47	);
48	48
49	49	// Templates
50	50	$modversion['templates'] = array(
51		- array(
52		- 'file' => 'myiframe.tpl',
53		- 'description' => 'Default template'
54		- ),
	51	+ array(
	52	+ 'file' => 'myiframe.tpl',
	53	+ 'description' => 'Default template'
	54	+ ),
55	55	);
56	56
57	57	//Blocks
58	58	$modversion['blocks'][] = array(
59		- 'file' => 'myiframe_iframe.php',
60		- 'name' => _MI_MYIFAME_BNAME1,
61		- 'description' => 'Shows an iframe in a block',
62		- 'show_func' => 'b_myiframe_iframe_show',
63		- 'edit_func' => 'b_myiframe_iframe_edit',
64		- 'options' => '0',
65		- 'template' => 'myiframe_block_show.tpl'
	59	+ 'file' => 'myiframe_iframe.php',
	60	+ 'name' => _MI_MYIFAME_BNAME1,
	61	+ 'description' => 'Shows an iframe in a block',
	62	+ 'show_func' => 'b_myiframe_iframe_show',
	63	+ 'edit_func' => 'b_myiframe_iframe_edit',
	64	+ 'options' => '0',
	65	+ 'template' => 'myiframe_block_show.tpl'
66	66	);
67	67
68	68	global $xoopsDB, $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
69	69
70	70	if (is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $modversion['dirname'] && $xoopsModule->getVar('isactive')) {
71		- $i = 0;
72		- include_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
73		- $myts = MyTextSanitizer::getInstance();
74		- if (myiframe_getmoduleoption('showinmenu')) {
75		- $sql = 'SELECT * FROM ' . $xoopsDB->prefix('myiframe') . ' ORDER BY frame_description';
76		- $result = $xoopsDB->query($sql);
77		- while ($myrow = $xoopsDB->fetchArray($result)) {
78		- if (xoops_trim($myrow['frame_description']) !== '') {
79		- $modversion['sub'][$i]['name'] = $myts->htmlSpecialChars($myrow['frame_description']);
80		- $modversion['sub'][$i]['url'] = 'index.php?iframeid=' . (int)$myrow['frame_frameid'];
81		- $i++;
82		- }
83		- }
84		- }
	71	+ $i = 0;
	72	+ include_once XOOPS_ROOT_PATH . '/modules/myiframe/include/functions.php';
	73	+ $myts = MyTextSanitizer::getInstance();
	74	+ if (myiframe_getmoduleoption('showinmenu')) {
	75	+ $sql = 'SELECT * FROM ' . $xoopsDB->prefix('myiframe') . ' ORDER BY frame_description';
	76	+ $result = $xoopsDB->query($sql);
	77	+ while ($myrow = $xoopsDB->fetchArray($result)) {
	78	+ if (xoops_trim($myrow['frame_description']) !== '') {
	79	+ $modversion['sub'][$i]['name'] = $myts->htmlSpecialChars($myrow['frame_description']);
	80	+ $modversion['sub'][$i]['url'] = 'index.php?iframeid=' . (int)$myrow['frame_frameid'];
	81	+ $i++;
	82	+ }
	83	+ }
	84	+ }
85	85	}
86	86
87	87	// Options
88	88	$modversion['config'][] = [
89		- 'name' => 'showinmenu',
90		- 'title' => '_MI_MYIFRAME_OPT0',
91		- 'description' => '_MI_MYIFRAME_OPT0_DSC',
92		- 'formtype' => 'yesno',
93		- 'valuetype' => 'int',
94		- 'default' => 0,
	89	+ 'name' => 'showinmenu',
	90	+ 'title' => '_MI_MYIFRAME_OPT0',
	91	+ 'description' => '_MI_MYIFRAME_OPT0_DSC',
	92	+ 'formtype' => 'yesno',
	93	+ 'valuetype' => 'int',
	94	+ 'default' => 0,
95	95	];
96	96	$modversion['config'][] = [
97		- 'name' => 'showlist',
98		- 'title' => '_MI_MYIFRAME_OPT1',
99		- 'description' => '_MI_MYIFRAME_OPT1_DSC',
100		- 'formtype' => 'yesno',
101		- 'valuetype' => 'int',
102		- 'default' => 1,
	97	+ 'name' => 'showlist',
	98	+ 'title' => '_MI_MYIFRAME_OPT1',
	99	+ 'description' => '_MI_MYIFRAME_OPT1_DSC',
	100	+ 'formtype' => 'yesno',
	101	+ 'valuetype' => 'int',
	102	+ 'default' => 1,
103	103	];
104	104	// Search
105	105	$modversion['hasSearch'] = 0;

XoopsModules25x / myiframe

Push — master ( c009df...8c936a )

Status

Category

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