Inspection of "updates from aerograf" - XoopsModules25x/myiframe - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#6)

by Michael

created 2017-08-29 09:57 UTC

Status

Switch Indentation +160 added lines, -160 removed lines patch added patch discarded remove patch

@@ -103,172 +103,172 @@
 block discarded – undo
 }
 
 switch ($op) {
-    case 'verifybeforeedit':
-        if (isset($_POST['submit']) && $_POST['submit'] !== '') {
-            if ($_POST['longdesc'] === '') {
-                xoops_cp_header();
-                $adminObject = \Xmf\Module\Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-                echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-                echo '<tr><td class="odd">';
-                echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-                echo _AM_MYIFRAME_ERROR_ADD_INDEX;
-                echo '</td></tr></table>';
-                include_once __DIR__ . '/admin_footer.php';
-                xoops_cp_footer();
-                exit();
-            }
+    	case 'verifybeforeedit':
+        	if (isset($_POST['submit']) && $_POST['submit'] !== '') {
+            	if ($_POST['longdesc'] === '') {
+                	xoops_cp_header();
+                	$adminObject = \Xmf\Module\Admin::getInstance();
+                	$adminObject->displayNavigation(basename(__FILE__));
+                	echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+                	echo '<tr><td class="odd">';
+                	echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+                	echo _AM_MYIFRAME_ERROR_ADD_INDEX;
+                	echo '</td></tr></table>';
+                	include_once __DIR__ . '/admin_footer.php';
+                	xoops_cp_footer();
+                	exit();
+            	}
 
-            $frameid = $_POST['frameid'];
-            $frame   = $iframeHandler->get($frameid);
-            $frame->unsetNew();
-            $frame->setVar('frame_description', $_POST['longdesc']);
-            $frame->setVar('frame_width', $_POST['width']);
-            $frame->setVar('frame_height', $_POST['height']);
-            $frame->setVar('frame_align', $_POST['align']);
-            $frame->setVar('frame_frameborder', $_POST['frameborder']);
-            $frame->setVar('frame_marginwidth', $_POST['marginwidth']);
-            $frame->setVar('frame_marginheight', $_POST['marginheight']);
-            $frame->setVar('frame_scrolling', $_POST['scrolling']);
-            $frame->setVar('frame_url', $_POST['url']);
-            $frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
-            $res = $iframeHandler->insert($frame);
-            if (!$res) {
-                redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_MODIFY_DB);
-                exit();
-            }
-            redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
-            exit();
-        }
-        break;
+            	$frameid = $_POST['frameid'];
+            	$frame   = $iframeHandler->get($frameid);
+            	$frame->unsetNew();
+            	$frame->setVar('frame_description', $_POST['longdesc']);
+            	$frame->setVar('frame_width', $_POST['width']);
+            	$frame->setVar('frame_height', $_POST['height']);
+            	$frame->setVar('frame_align', $_POST['align']);
+            	$frame->setVar('frame_frameborder', $_POST['frameborder']);
+            	$frame->setVar('frame_marginwidth', $_POST['marginwidth']);
+            	$frame->setVar('frame_marginheight', $_POST['marginheight']);
+            	$frame->setVar('frame_scrolling', $_POST['scrolling']);
+            	$frame->setVar('frame_url', $_POST['url']);
+            	$frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
+            	$res = $iframeHandler->insert($frame);
+            	if (!$res) {
+                	redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_MODIFY_DB);
+                	exit();
+            	}
+            	redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
+            	exit();
+        	}
+        	break;
 
-    case 'edit':
-        xoops_cp_header();
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        if (isset($_GET['frameid'])) {
-            $frameid = (int)$_GET['frameid'];
-            $frame   = $iframeHandler->get($frameid);
-            AddEditForm($frameid, 'verifybeforeedit', _AM_MYIFRAME_CONFIG, $frame->getVar('frame_description', 'e'), $frame->getVar('frame_width', 'e'), $frame->getVar('frame_height', 'e'), $frame->getVar('frame_align', 'e'),
-                        $frame->getVar('frame_frameborder', 'e'), $frame->getVar('frame_marginwidth', 'e'), $frame->getVar('frame_marginheight', 'e'), $frame->getVar('frame_scrolling', 'e'), $frame->getVar('frame_url', 'e'), _AM_MYIFRAME_UPDATE);
-        } else {
-            xoops_cp_header();
-            $adminObject = \Xmf\Module\Admin::getInstance();
-            $adminObject->displayNavigation(basename(__FILE__));
-            echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-            echo '<tr><td class="odd">';
-            echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-            echo _AM_MYIFRAME_ERROR_ADD_INDEX;
-            echo "</td></tr></table>\n";
-            include_once __DIR__ . '/admin_footer.php';
-            xoops_cp_footer();
-            exit();
-        }
-        break;
+    	case 'edit':
+        	xoops_cp_header();
+        	$adminObject = \Xmf\Module\Admin::getInstance();
+        	$adminObject->displayNavigation(basename(__FILE__));
+        	if (isset($_GET['frameid'])) {
+            	$frameid = (int)$_GET['frameid'];
+            	$frame   = $iframeHandler->get($frameid);
+            	AddEditForm($frameid, 'verifybeforeedit', _AM_MYIFRAME_CONFIG, $frame->getVar('frame_description', 'e'), $frame->getVar('frame_width', 'e'), $frame->getVar('frame_height', 'e'), $frame->getVar('frame_align', 'e'),
+                        	$frame->getVar('frame_frameborder', 'e'), $frame->getVar('frame_marginwidth', 'e'), $frame->getVar('frame_marginheight', 'e'), $frame->getVar('frame_scrolling', 'e'), $frame->getVar('frame_url', 'e'), _AM_MYIFRAME_UPDATE);
+        	} else {
+            	xoops_cp_header();
+            	$adminObject = \Xmf\Module\Admin::getInstance();
+            	$adminObject->displayNavigation(basename(__FILE__));
+            	echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+            	echo '<tr><td class="odd">';
+            	echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+            	echo _AM_MYIFRAME_ERROR_ADD_INDEX;
+            	echo "</td></tr></table>\n";
+            	include_once __DIR__ . '/admin_footer.php';
+            	xoops_cp_footer();
+            	exit();
+        	}
+        	break;
 
-    case 'delete':
-        if (!isset($_POST['ok'])) {
-            xoops_cp_header();
-            $adminObject = \Xmf\Module\Admin::getInstance();
-            $adminObject->displayNavigation(basename(__FILE__));
-            echo '<h4>' . _AM_MYIFRAME_CONFIG . '</h4>';
-            xoops_confirm(array(
-                              'op'      => 'delete',
-                              'frameid' => (int)$_GET['frameid'],
-                              'ok'      => 1
-                          ), 'manage.php', _AM_MYIFRAME_RUSUREDEL);
-            include_once __DIR__ . '/admin_footer.php';
-        } else {
-            if (empty($_POST['frameid'])) {
-                redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX);
-                exit();
-            }
-            $frameid = (int)$_POST['frameid'];
-            $critere = new Criteria('frame_frameid', $frameid, '=');
-            $iframeHandler->deleteAll($critere);
-            redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
-            exit();
-        }
-        break;
+    	case 'delete':
+        	if (!isset($_POST['ok'])) {
+            	xoops_cp_header();
+            	$adminObject = \Xmf\Module\Admin::getInstance();
+            	$adminObject->displayNavigation(basename(__FILE__));
+            	echo '<h4>' . _AM_MYIFRAME_CONFIG . '</h4>';
+            	xoops_confirm(array(
+                              	'op'      => 'delete',
+                              	'frameid' => (int)$_GET['frameid'],
+                              	'ok'      => 1
+                          	), 'manage.php', _AM_MYIFRAME_RUSUREDEL);
+            	include_once __DIR__ . '/admin_footer.php';
+        	} else {
+            	if (empty($_POST['frameid'])) {
+                	redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX);
+                	exit();
+            	}
+            	$frameid = (int)$_POST['frameid'];
+            	$critere = new Criteria('frame_frameid', $frameid, '=');
+            	$iframeHandler->deleteAll($critere);
+            	redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
+            	exit();
+        	}
+        	break;
 
-    case 'verifytoadd':
-        if (isset($_POST['submit']) && $_POST['submit'] !== '') {
-            if ($_POST['url'] === '') {
-                xoops_cp_header();
-                $adminObject = \Xmf\Module\Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-                echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-                echo '<tr><td class="odd">';
-                echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
-                echo _AM_MYIFRAME_ERROR_ADD_INDEX;
-                echo "</td></tr></table>\n";
-                include_once __DIR__ . '/admin_footer.php';
-                xoops_cp_footer();
-                $adminObject = \Xmf\Module\Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-                exit();
-            }
-            $frame = $iframeHandler->create(true);
-            $frame->setVar('frame_description', $_POST['longdesc']);
-            $frame->setVar('frame_width', $_POST['width']);
-            $frame->setVar('frame_height', $_POST['height']);
-            $frame->setVar('frame_align', $_POST['align']);
-            $frame->setVar('frame_frameborder', $_POST['frameborder']);
-            $frame->setVar('frame_marginwidth', $_POST['marginwidth']);
-            $frame->setVar('frame_marginheight', $_POST['marginheight']);
-            $frame->setVar('frame_scrolling', $_POST['scrolling']);
-            $frame->setVar('frame_url', $_POST['url']);
-            $frame->setVar('frame_created', time());
-            $frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
-            $res = $iframeHandler->insert($frame);
-            if (!$res) {
-                redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_ADD_INDEX);
-                exit();
-            }
-            redirect_header('manage.php', 1, _AM_MYIFRAME_ADDED_OK);
-        }
-        break;
+    	case 'verifytoadd':
+        	if (isset($_POST['submit']) && $_POST['submit'] !== '') {
+            	if ($_POST['url'] === '') {
+                	xoops_cp_header();
+                	$adminObject = \Xmf\Module\Admin::getInstance();
+                	$adminObject->displayNavigation(basename(__FILE__));
+                	echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+                	echo '<tr><td class="odd">';
+                	echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
+                	echo _AM_MYIFRAME_ERROR_ADD_INDEX;
+                	echo "</td></tr></table>\n";
+                	include_once __DIR__ . '/admin_footer.php';
+                	xoops_cp_footer();
+                	$adminObject = \Xmf\Module\Admin::getInstance();
+                	$adminObject->displayNavigation(basename(__FILE__));
+                	exit();
+            	}
+            	$frame = $iframeHandler->create(true);
+            	$frame->setVar('frame_description', $_POST['longdesc']);
+            	$frame->setVar('frame_width', $_POST['width']);
+            	$frame->setVar('frame_height', $_POST['height']);
+            	$frame->setVar('frame_align', $_POST['align']);
+            	$frame->setVar('frame_frameborder', $_POST['frameborder']);
+            	$frame->setVar('frame_marginwidth', $_POST['marginwidth']);
+            	$frame->setVar('frame_marginheight', $_POST['marginheight']);
+            	$frame->setVar('frame_scrolling', $_POST['scrolling']);
+            	$frame->setVar('frame_url', $_POST['url']);
+            	$frame->setVar('frame_created', time());
+            	$frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
+            	$res = $iframeHandler->insert($frame);
+            	if (!$res) {
+                	redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_ADD_INDEX);
+                	exit();
+            	}
+            	redirect_header('manage.php', 1, _AM_MYIFRAME_ADDED_OK);
+        	}
+        	break;
 
-    case 'addframe':
-        xoops_cp_header();
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        AddEditForm(0, 'verifytoadd', _AM_MYIFRAME_CONFIG, '', '100%', '', '', '0', '0', '0', 1, '', _AM_MYIFRAME_ADDBUTTON);
-        break;
+    	case 'addframe':
+        	xoops_cp_header();
+        	$adminObject = \Xmf\Module\Admin::getInstance();
+        	$adminObject->displayNavigation(basename(__FILE__));
+        	AddEditForm(0, 'verifytoadd', _AM_MYIFRAME_CONFIG, '', '100%', '', '', '0', '0', '0', 1, '', _AM_MYIFRAME_ADDBUTTON);
+        	break;
 
-    case 'default':
-    default:
-        xoops_cp_header();
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        echo '<h4>' . _AM_MYIFRAME_CONFIG . "</h4><br />\n";
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
-        echo "<tr><th align='center'>" . _AM_MYIFRAME_ID . "</th><th align='center'>" . _AM_MYIFRAME_DESC . "</th><th align='center'>" . _AM_MYIFRAME_CREATED . "</th><th align='center'>" . _AM_MYIFRAME_HITS . "</th><th align='center'>"
-             . _AM_MYIFRAME_ACTION . "</th></tr>\n";
-        $critere = new Criteria('1', '1', '=');
-        $critere->setSort('frame_description');
-        $frarray = $iframeHandler->getObjects($critere);
-        $class   = 'even';
-        $baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php';
-        if (count($frarray) > 0) {
-            foreach ($frarray as $frame) {
-                $action_edit   = "<a href='" . $baseurl . '?op=edit&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/edit.png' alt='" . _AM_MYIFRAME_EDIT . "'></a>";
-                $action_delete = "<a href='" . $baseurl . '?op=delete&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/delete.png' alt='" . _AM_MYIFRAME_DELETE . "'></a>";
-                if (xoops_trim($frame->getVar('frame_description') === '')) {
-                    $liendesc = $frame->getVar('frame_url');
-                } else {
-                    $liendesc = "<a href='" . XOOPS_URL . '/modules/myiframe/index.php?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
-                }
-                echo "<tr class='" . $class . "'><td align='center'>" . $frame->getVar('frame_frameid') . "</td><td align='center'>" . $liendesc . "</td><td align='center'>" . formatTimestamp($frame->getVar('frame_created'))
-                     . "</td><td align='center'>" . $frame->getVar('frame_hits') . "</td><td align='center'>" . $action_edit . '&nbsp;-&nbsp;' . $action_delete . "</td></tr>\n";
-                $class = ($class === 'even') ? 'odd' : 'even';
-            }
-        }
-        echo "<tr class='" . $class . "'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='" . _AM_MYIFRAME_ADD
-             . "'></td></tr>";
-        echo '</table>';
-        include_once __DIR__ . '/admin_footer.php';
-        break;
+    	case 'default':
+    	default:
+        	xoops_cp_header();
+        	$adminObject = \Xmf\Module\Admin::getInstance();
+        	$adminObject->displayNavigation(basename(__FILE__));
+        	echo '<h4>' . _AM_MYIFRAME_CONFIG . "</h4><br />\n";
+        	echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
+        	echo "<tr><th align='center'>" . _AM_MYIFRAME_ID . "</th><th align='center'>" . _AM_MYIFRAME_DESC . "</th><th align='center'>" . _AM_MYIFRAME_CREATED . "</th><th align='center'>" . _AM_MYIFRAME_HITS . "</th><th align='center'>"
+             	. _AM_MYIFRAME_ACTION . "</th></tr>\n";
+        	$critere = new Criteria('1', '1', '=');
+        	$critere->setSort('frame_description');
+        	$frarray = $iframeHandler->getObjects($critere);
+        	$class   = 'even';
+        	$baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php';
+        	if (count($frarray) > 0) {
+            	foreach ($frarray as $frame) {
+                	$action_edit   = "<a href='" . $baseurl . '?op=edit&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/edit.png' alt='" . _AM_MYIFRAME_EDIT . "'></a>";
+                	$action_delete = "<a href='" . $baseurl . '?op=delete&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/delete.png' alt='" . _AM_MYIFRAME_DELETE . "'></a>";
+                	if (xoops_trim($frame->getVar('frame_description') === '')) {
+                    	$liendesc = $frame->getVar('frame_url');
+                	} else {
+                    	$liendesc = "<a href='" . XOOPS_URL . '/modules/myiframe/index.php?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
+                	}
+                	echo "<tr class='" . $class . "'><td align='center'>" . $frame->getVar('frame_frameid') . "</td><td align='center'>" . $liendesc . "</td><td align='center'>" . formatTimestamp($frame->getVar('frame_created'))
+                     	. "</td><td align='center'>" . $frame->getVar('frame_hits') . "</td><td align='center'>" . $action_edit . '&nbsp;-&nbsp;' . $action_delete . "</td></tr>\n";
+                	$class = ($class === 'even') ? 'odd' : 'even';
+            	}
+        	}
+        	echo "<tr class='" . $class . "'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='" . _AM_MYIFRAME_ADD
+             	. "'></td></tr>";
+        	echo '</table>';
+        	include_once __DIR__ . '/admin_footer.php';
+        	break;
 }
 
 xoops_cp_footer();

Please login to merge, or discard this patch.

		@@ -103,172 +103,172 @@
		block discarded – undo
103	103	}
104	104
105	105	switch ($op) {
106		- case 'verifybeforeedit':
107		- if (isset($_POST['submit']) && $_POST['submit'] !== '') {
108		- if ($_POST['longdesc'] === '') {
109		- xoops_cp_header();
110		- $adminObject = \Xmf\Module\Admin::getInstance();
111		- $adminObject->displayNavigation(basename(__FILE__));
112		- echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
113		- echo '<tr><td class="odd">';
114		- echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
115		- echo _AM_MYIFRAME_ERROR_ADD_INDEX;
116		- echo '</td></tr></table>';
117		- include_once __DIR__ . '/admin_footer.php';
118		- xoops_cp_footer();
119		- exit();
120		- }
	106	+ case 'verifybeforeedit':
	107	+ if (isset($_POST['submit']) && $_POST['submit'] !== '') {
	108	+ if ($_POST['longdesc'] === '') {
	109	+ xoops_cp_header();
	110	+ $adminObject = \Xmf\Module\Admin::getInstance();
	111	+ $adminObject->displayNavigation(basename(__FILE__));
	112	+ echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
	113	+ echo '<tr><td class="odd">';
	114	+ echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
	115	+ echo _AM_MYIFRAME_ERROR_ADD_INDEX;
	116	+ echo '</td></tr></table>';
	117	+ include_once __DIR__ . '/admin_footer.php';
	118	+ xoops_cp_footer();
	119	+ exit();
	120	+ }
121	121
122		- $frameid = $_POST['frameid'];
123		- $frame = $iframeHandler->get($frameid);
124		- $frame->unsetNew();
125		- $frame->setVar('frame_description', $_POST['longdesc']);
126		- $frame->setVar('frame_width', $_POST['width']);
127		- $frame->setVar('frame_height', $_POST['height']);
128		- $frame->setVar('frame_align', $_POST['align']);
129		- $frame->setVar('frame_frameborder', $_POST['frameborder']);
130		- $frame->setVar('frame_marginwidth', $_POST['marginwidth']);
131		- $frame->setVar('frame_marginheight', $_POST['marginheight']);
132		- $frame->setVar('frame_scrolling', $_POST['scrolling']);
133		- $frame->setVar('frame_url', $_POST['url']);
134		- $frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
135		- $res = $iframeHandler->insert($frame);
136		- if (!$res) {
137		- redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_MODIFY_DB);
138		- exit();
139		- }
140		- redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
141		- exit();
142		- }
143		- break;
	122	+ $frameid = $_POST['frameid'];
	123	+ $frame = $iframeHandler->get($frameid);
	124	+ $frame->unsetNew();
	125	+ $frame->setVar('frame_description', $_POST['longdesc']);
	126	+ $frame->setVar('frame_width', $_POST['width']);
	127	+ $frame->setVar('frame_height', $_POST['height']);
	128	+ $frame->setVar('frame_align', $_POST['align']);
	129	+ $frame->setVar('frame_frameborder', $_POST['frameborder']);
	130	+ $frame->setVar('frame_marginwidth', $_POST['marginwidth']);
	131	+ $frame->setVar('frame_marginheight', $_POST['marginheight']);
	132	+ $frame->setVar('frame_scrolling', $_POST['scrolling']);
	133	+ $frame->setVar('frame_url', $_POST['url']);
	134	+ $frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
	135	+ $res = $iframeHandler->insert($frame);
	136	+ if (!$res) {
	137	+ redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_MODIFY_DB);
	138	+ exit();
	139	+ }
	140	+ redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
	141	+ exit();
	142	+ }
	143	+ break;
144	144
145		- case 'edit':
146		- xoops_cp_header();
147		- $adminObject = \Xmf\Module\Admin::getInstance();
148		- $adminObject->displayNavigation(basename(__FILE__));
149		- if (isset($_GET['frameid'])) {
150		- $frameid = (int)$_GET['frameid'];
151		- $frame = $iframeHandler->get($frameid);
152		- AddEditForm($frameid, 'verifybeforeedit', _AM_MYIFRAME_CONFIG, $frame->getVar('frame_description', 'e'), $frame->getVar('frame_width', 'e'), $frame->getVar('frame_height', 'e'), $frame->getVar('frame_align', 'e'),
153		- $frame->getVar('frame_frameborder', 'e'), $frame->getVar('frame_marginwidth', 'e'), $frame->getVar('frame_marginheight', 'e'), $frame->getVar('frame_scrolling', 'e'), $frame->getVar('frame_url', 'e'), _AM_MYIFRAME_UPDATE);
154		- } else {
155		- xoops_cp_header();
156		- $adminObject = \Xmf\Module\Admin::getInstance();
157		- $adminObject->displayNavigation(basename(__FILE__));
158		- echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
159		- echo '<tr><td class="odd">';
160		- echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
161		- echo _AM_MYIFRAME_ERROR_ADD_INDEX;
162		- echo "</td></tr></table>\n";
163		- include_once __DIR__ . '/admin_footer.php';
164		- xoops_cp_footer();
165		- exit();
166		- }
167		- break;
	145	+ case 'edit':
	146	+ xoops_cp_header();
	147	+ $adminObject = \Xmf\Module\Admin::getInstance();
	148	+ $adminObject->displayNavigation(basename(__FILE__));
	149	+ if (isset($_GET['frameid'])) {
	150	+ $frameid = (int)$_GET['frameid'];
	151	+ $frame = $iframeHandler->get($frameid);
	152	+ AddEditForm($frameid, 'verifybeforeedit', _AM_MYIFRAME_CONFIG, $frame->getVar('frame_description', 'e'), $frame->getVar('frame_width', 'e'), $frame->getVar('frame_height', 'e'), $frame->getVar('frame_align', 'e'),
	153	+ $frame->getVar('frame_frameborder', 'e'), $frame->getVar('frame_marginwidth', 'e'), $frame->getVar('frame_marginheight', 'e'), $frame->getVar('frame_scrolling', 'e'), $frame->getVar('frame_url', 'e'), _AM_MYIFRAME_UPDATE);
	154	+ } else {
	155	+ xoops_cp_header();
	156	+ $adminObject = \Xmf\Module\Admin::getInstance();
	157	+ $adminObject->displayNavigation(basename(__FILE__));
	158	+ echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
	159	+ echo '<tr><td class="odd">';
	160	+ echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
	161	+ echo _AM_MYIFRAME_ERROR_ADD_INDEX;
	162	+ echo "</td></tr></table>\n";
	163	+ include_once __DIR__ . '/admin_footer.php';
	164	+ xoops_cp_footer();
	165	+ exit();
	166	+ }
	167	+ break;
168	168
169		- case 'delete':
170		- if (!isset($_POST['ok'])) {
171		- xoops_cp_header();
172		- $adminObject = \Xmf\Module\Admin::getInstance();
173		- $adminObject->displayNavigation(basename(__FILE__));
174		- echo '<h4>' . _AM_MYIFRAME_CONFIG . '</h4>';
175		- xoops_confirm(array(
176		- 'op' => 'delete',
177		- 'frameid' => (int)$_GET['frameid'],
178		- 'ok' => 1
179		- ), 'manage.php', _AM_MYIFRAME_RUSUREDEL);
180		- include_once __DIR__ . '/admin_footer.php';
181		- } else {
182		- if (empty($_POST['frameid'])) {
183		- redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX);
184		- exit();
185		- }
186		- $frameid = (int)$_POST['frameid'];
187		- $critere = new Criteria('frame_frameid', $frameid, '=');
188		- $iframeHandler->deleteAll($critere);
189		- redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
190		- exit();
191		- }
192		- break;
	169	+ case 'delete':
	170	+ if (!isset($_POST['ok'])) {
	171	+ xoops_cp_header();
	172	+ $adminObject = \Xmf\Module\Admin::getInstance();
	173	+ $adminObject->displayNavigation(basename(__FILE__));
	174	+ echo '<h4>' . _AM_MYIFRAME_CONFIG . '</h4>';
	175	+ xoops_confirm(array(
	176	+ 'op' => 'delete',
	177	+ 'frameid' => (int)$_GET['frameid'],
	178	+ 'ok' => 1
	179	+ ), 'manage.php', _AM_MYIFRAME_RUSUREDEL);
	180	+ include_once __DIR__ . '/admin_footer.php';
	181	+ } else {
	182	+ if (empty($_POST['frameid'])) {
	183	+ redirect_header('manage.php', 2, _AM_MYIFRAME_ERROR_ADD_INDEX);
	184	+ exit();
	185	+ }
	186	+ $frameid = (int)$_POST['frameid'];
	187	+ $critere = new Criteria('frame_frameid', $frameid, '=');
	188	+ $iframeHandler->deleteAll($critere);
	189	+ redirect_header('manage.php', 1, _AM_MYIFRAME_DBUPDATED);
	190	+ exit();
	191	+ }
	192	+ break;
193	193
194		- case 'verifytoadd':
195		- if (isset($_POST['submit']) && $_POST['submit'] !== '') {
196		- if ($_POST['url'] === '') {
197		- xoops_cp_header();
198		- $adminObject = \Xmf\Module\Admin::getInstance();
199		- $adminObject->displayNavigation(basename(__FILE__));
200		- echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
201		- echo '<tr><td class="odd">';
202		- echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
203		- echo _AM_MYIFRAME_ERROR_ADD_INDEX;
204		- echo "</td></tr></table>\n";
205		- include_once __DIR__ . '/admin_footer.php';
206		- xoops_cp_footer();
207		- $adminObject = \Xmf\Module\Admin::getInstance();
208		- $adminObject->displayNavigation(basename(__FILE__));
209		- exit();
210		- }
211		- $frame = $iframeHandler->create(true);
212		- $frame->setVar('frame_description', $_POST['longdesc']);
213		- $frame->setVar('frame_width', $_POST['width']);
214		- $frame->setVar('frame_height', $_POST['height']);
215		- $frame->setVar('frame_align', $_POST['align']);
216		- $frame->setVar('frame_frameborder', $_POST['frameborder']);
217		- $frame->setVar('frame_marginwidth', $_POST['marginwidth']);
218		- $frame->setVar('frame_marginheight', $_POST['marginheight']);
219		- $frame->setVar('frame_scrolling', $_POST['scrolling']);
220		- $frame->setVar('frame_url', $_POST['url']);
221		- $frame->setVar('frame_created', time());
222		- $frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
223		- $res = $iframeHandler->insert($frame);
224		- if (!$res) {
225		- redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_ADD_INDEX);
226		- exit();
227		- }
228		- redirect_header('manage.php', 1, _AM_MYIFRAME_ADDED_OK);
229		- }
230		- break;
	194	+ case 'verifytoadd':
	195	+ if (isset($_POST['submit']) && $_POST['submit'] !== '') {
	196	+ if ($_POST['url'] === '') {
	197	+ xoops_cp_header();
	198	+ $adminObject = \Xmf\Module\Admin::getInstance();
	199	+ $adminObject->displayNavigation(basename(__FILE__));
	200	+ echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
	201	+ echo '<tr><td class="odd">';
	202	+ echo "<a href='manage.php'><h4>" . _AM_MYIFRAME_CONFIG . '</h4></a>';
	203	+ echo _AM_MYIFRAME_ERROR_ADD_INDEX;
	204	+ echo "</td></tr></table>\n";
	205	+ include_once __DIR__ . '/admin_footer.php';
	206	+ xoops_cp_footer();
	207	+ $adminObject = \Xmf\Module\Admin::getInstance();
	208	+ $adminObject->displayNavigation(basename(__FILE__));
	209	+ exit();
	210	+ }
	211	+ $frame = $iframeHandler->create(true);
	212	+ $frame->setVar('frame_description', $_POST['longdesc']);
	213	+ $frame->setVar('frame_width', $_POST['width']);
	214	+ $frame->setVar('frame_height', $_POST['height']);
	215	+ $frame->setVar('frame_align', $_POST['align']);
	216	+ $frame->setVar('frame_frameborder', $_POST['frameborder']);
	217	+ $frame->setVar('frame_marginwidth', $_POST['marginwidth']);
	218	+ $frame->setVar('frame_marginheight', $_POST['marginheight']);
	219	+ $frame->setVar('frame_scrolling', $_POST['scrolling']);
	220	+ $frame->setVar('frame_url', $_POST['url']);
	221	+ $frame->setVar('frame_created', time());
	222	+ $frame->setVar('frame_uid', $xoopsUser->getVar('uid'));
	223	+ $res = $iframeHandler->insert($frame);
	224	+ if (!$res) {
	225	+ redirect_header('manage.php', 1, _AM_MYIFRAME_ERROR_ADD_INDEX);
	226	+ exit();
	227	+ }
	228	+ redirect_header('manage.php', 1, _AM_MYIFRAME_ADDED_OK);
	229	+ }
	230	+ break;
231	231
232		- case 'addframe':
233		- xoops_cp_header();
234		- $adminObject = \Xmf\Module\Admin::getInstance();
235		- $adminObject->displayNavigation(basename(__FILE__));
236		- AddEditForm(0, 'verifytoadd', _AM_MYIFRAME_CONFIG, '', '100%', '', '', '0', '0', '0', 1, '', _AM_MYIFRAME_ADDBUTTON);
237		- break;
	232	+ case 'addframe':
	233	+ xoops_cp_header();
	234	+ $adminObject = \Xmf\Module\Admin::getInstance();
	235	+ $adminObject->displayNavigation(basename(__FILE__));
	236	+ AddEditForm(0, 'verifytoadd', _AM_MYIFRAME_CONFIG, '', '100%', '', '', '0', '0', '0', 1, '', _AM_MYIFRAME_ADDBUTTON);
	237	+ break;
238	238
239		- case 'default':
240		- default:
241		- xoops_cp_header();
242		- $adminObject = \Xmf\Module\Admin::getInstance();
243		- $adminObject->displayNavigation(basename(__FILE__));
244		- echo '<h4>' . _AM_MYIFRAME_CONFIG . "</h4><br />\n";
245		- echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
246		- echo "<tr><th align='center'>" . _AM_MYIFRAME_ID . "</th><th align='center'>" . _AM_MYIFRAME_DESC . "</th><th align='center'>" . _AM_MYIFRAME_CREATED . "</th><th align='center'>" . _AM_MYIFRAME_HITS . "</th><th align='center'>"
247		- . _AM_MYIFRAME_ACTION . "</th></tr>\n";
248		- $critere = new Criteria('1', '1', '=');
249		- $critere->setSort('frame_description');
250		- $frarray = $iframeHandler->getObjects($critere);
251		- $class = 'even';
252		- $baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php';
253		- if (count($frarray) > 0) {
254		- foreach ($frarray as $frame) {
255		- $action_edit = "<a href='" . $baseurl . '?op=edit&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/edit.png' alt='" . _AM_MYIFRAME_EDIT . "'></a>";
256		- $action_delete = "<a href='" . $baseurl . '?op=delete&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/delete.png' alt='" . _AM_MYIFRAME_DELETE . "'></a>";
257		- if (xoops_trim($frame->getVar('frame_description') === '')) {
258		- $liendesc = $frame->getVar('frame_url');
259		- } else {
260		- $liendesc = "<a href='" . XOOPS_URL . '/modules/myiframe/index.php?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
261		- }
262		- echo "<tr class='" . $class . "'><td align='center'>" . $frame->getVar('frame_frameid') . "</td><td align='center'>" . $liendesc . "</td><td align='center'>" . formatTimestamp($frame->getVar('frame_created'))
263		- . "</td><td align='center'>" . $frame->getVar('frame_hits') . "</td><td align='center'>" . $action_edit . ' - ' . $action_delete . "</td></tr>\n";
264		- $class = ($class === 'even') ? 'odd' : 'even';
265		- }
266		- }
267		- echo "<tr class='" . $class . "'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='" . _AM_MYIFRAME_ADD
268		- . "'></td></tr>";
269		- echo '</table>';
270		- include_once __DIR__ . '/admin_footer.php';
271		- break;
	239	+ case 'default':
	240	+ default:
	241	+ xoops_cp_header();
	242	+ $adminObject = \Xmf\Module\Admin::getInstance();
	243	+ $adminObject->displayNavigation(basename(__FILE__));
	244	+ echo '<h4>' . _AM_MYIFRAME_CONFIG . "</h4><br />\n";
	245	+ echo "<table width='100%' border='0' cellspacing='1' class='outer'>\n";
	246	+ echo "<tr><th align='center'>" . _AM_MYIFRAME_ID . "</th><th align='center'>" . _AM_MYIFRAME_DESC . "</th><th align='center'>" . _AM_MYIFRAME_CREATED . "</th><th align='center'>" . _AM_MYIFRAME_HITS . "</th><th align='center'>"
	247	+ . _AM_MYIFRAME_ACTION . "</th></tr>\n";
	248	+ $critere = new Criteria('1', '1', '=');
	249	+ $critere->setSort('frame_description');
	250	+ $frarray = $iframeHandler->getObjects($critere);
	251	+ $class = 'even';
	252	+ $baseurl = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/manage.php';
	253	+ if (count($frarray) > 0) {
	254	+ foreach ($frarray as $frame) {
	255	+ $action_edit = "<a href='" . $baseurl . '?op=edit&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/edit.png' alt='" . _AM_MYIFRAME_EDIT . "'></a>";
	256	+ $action_delete = "<a href='" . $baseurl . '?op=delete&frameid=' . $frame->getVar('frame_frameid') . "'><img src='../assets/images/delete.png' alt='" . _AM_MYIFRAME_DELETE . "'></a>";
	257	+ if (xoops_trim($frame->getVar('frame_description') === '')) {
	258	+ $liendesc = $frame->getVar('frame_url');
	259	+ } else {
	260	+ $liendesc = "<a href='" . XOOPS_URL . '/modules/myiframe/index.php?iframeid=' . $frame->getVar('frame_frameid') . "'>" . $frame->getVar('frame_description') . '</a>';
	261	+ }
	262	+ echo "<tr class='" . $class . "'><td align='center'>" . $frame->getVar('frame_frameid') . "</td><td align='center'>" . $liendesc . "</td><td align='center'>" . formatTimestamp($frame->getVar('frame_created'))
	263	+ . "</td><td align='center'>" . $frame->getVar('frame_hits') . "</td><td align='center'>" . $action_edit . ' - ' . $action_delete . "</td></tr>\n";
	264	+ $class = ($class === 'even') ? 'odd' : 'even';
	265	+ }
	266	+ }
	267	+ echo "<tr class='" . $class . "'><td colspan='5' align='center'><form name='faddframe' method='post' action='manage.php'><input type='hidden' name='op' value='addframe'><input type='submit' name='submit' value='" . _AM_MYIFRAME_ADD
	268	+ . "'></td></tr>";
	269	+ echo '</table>';
	270	+ include_once __DIR__ . '/admin_footer.php';
	271	+ break;
272	272	}
273	273
274	274	xoops_cp_footer();

XoopsModules25x / myiframe

Pull Request — master (#6)

Status

Category

Switch Indentation +160 added lines, -160 removed lines patch added patch discarded remove patch