txmodxoops / tdmcreate

testdata/mymodule2/include/search.inc.php

Spacing +6 added lines, -6 removed lines

@@ -32,14 +32,14 @@ 
 function mymodule2_search($queryarray, $andor, $limit, $offset, $userid)
 {
     global $xoopsDB;
-    $sql = "SELECT 'tf_id', 'tf_text' FROM " . $xoopsDB->prefix('mymodule2_testfields') . ' WHERE tf_id != 0';
-    if ( $userid != 0 ) {
+    $sql = "SELECT 'tf_id', 'tf_text' FROM ".$xoopsDB->prefix('mymodule2_testfields').' WHERE tf_id != 0';
+    if ($userid != 0) {
         $sql .= ' AND tf_submitter='.(int)$userid;
     }
-    if ( is_array($queryarray) && $count = count($queryarray) )
+    if (is_array($queryarray) && $count = count($queryarray))
     {
         $sql .= " AND (()";
-        for($i = 1; $i < $count; ++$i)
+        for ($i = 1; $i < $count; ++$i)
         {
             $sql .= " $andor ";
             $sql .= "()";
@@ -47,10 +47,10 @@ 
         $sql .= ')';
     }
     $sql .= " ORDER BY 'tf_id' DESC";
-    $result = $xoopsDB->query($sql,$limit,$offset);
+    $result = $xoopsDB->query($sql, $limit, $offset);
     $ret = array();
     $i = 0;
-    while($myrow = $xoopsDB->fetchArray($result))
+    while ($myrow = $xoopsDB->fetchArray($result))
     {
         $ret[$i]['image'] = 'assets/icons/32/blank.gif';
         $ret[$i]['link'] = 'testfields.php?tf_id='.$myrow['tf_id'];

testdata/mymodule2/include/update.php

Indentation +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
     $ret = mymodule2_check_db($module);
 
     //check upload directory
-	include_once __DIR__ . '/install.php';
+    include_once __DIR__ . '/install.php';
     $ret = xoops_module_install_mymodule2($module);
 
     $errors = $module->getErrors();
@@ -113,7 +113,7 @@ 
 function mymodule2_check_db($module)
 {
     $ret = true;
-	//insert here code for database check
+    //insert here code for database check
 
     /*
     // Example: update table (add new field)

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
     $ret = mymodule2_check_db($module);
 
     //check upload directory
-	include_once __DIR__ . '/install.php';
+	include_once __DIR__.'/install.php';
     $ret = xoops_module_install_mymodule2($module);
 
     $errors = $module->getErrors();
@@ -61,7 +61,7 @@ 
 {
     global $xoopsDB;
     $result = $xoopsDB->query(
-        'SELECT t1.tpl_id FROM ' . $xoopsDB->prefix('tplfile') . ' t1, ' . $xoopsDB->prefix('tplfile') . ' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id'
+        'SELECT t1.tpl_id FROM '.$xoopsDB->prefix('tplfile').' t1, '.$xoopsDB->prefix('tplfile').' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id'
     );
     $tplids = [];
     while (false !== (list($tplid) = $xoopsDB->fetchRow($result))) {
@@ -69,7 +69,7 @@ 
     }
     if (count($tplids) > 0) {
         $tplfileHandler  = xoops_getHandler('tplfile');
-        $duplicate_files = $tplfileHandler->getObjects(new \Criteria('tpl_id', '(' . implode(',', $tplids) . ')', 'IN'));
+        $duplicate_files = $tplfileHandler->getObjects(new \Criteria('tpl_id', '('.implode(',', $tplids).')', 'IN'));
 
         if (count($duplicate_files) > 0) {
             foreach (array_keys($duplicate_files) as $i) {
@@ -77,9 +77,9 @@ 
             }
         }
     }
-    $sql = 'SHOW INDEX FROM ' . $xoopsDB->prefix('tplfile') . " WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
+    $sql = 'SHOW INDEX FROM '.$xoopsDB->prefix('tplfile')." WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
     if (!$result = $xoopsDB->queryF($sql)) {
-        xoops_error($xoopsDB->error() . '<br>' . $sql);
+        xoops_error($xoopsDB->error().'<br>'.$sql);
 
         return false;
     }
@@ -92,9 +92,9 @@ 
 
         return true;
     }
-    $sql = 'ALTER TABLE ' . $xoopsDB->prefix('tplfile') . ' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )';
+    $sql = 'ALTER TABLE '.$xoopsDB->prefix('tplfile').' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )';
     if (!$result = $xoopsDB->queryF($sql)) {
-        xoops_error($xoopsDB->error() . '<br>' . $sql);
+        xoops_error($xoopsDB->error().'<br>'.$sql);
         $module->setErrors("'tpl_refid_module_set_file_type' unique index is not added to 'tplfile' table. Warning: do not use XOOPS until you add this unique index.");
 
         return false;

testdata/mymodule2/list.tag.php

Spacing +2 added lines, -2 removed lines

@@ -19,5 +19,5 @@
  * @min_xoops      2.5.9
  * @author         TDM XOOPS - Email:<info@email.com> - Website:<http://xoops.org>
  */
-require __DIR__ . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/tag/list.tag.php';
+require __DIR__.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/tag/list.tag.php';

testdata/mymodule2/articles.php

Indentation +17 added lines, -17 removed lines

@@ -42,23 +42,23 @@
 $articlesAll = $articlesHandler->getAllArticles($start, $limit);
 $keywords = [];
 if ($articlesCount > 0) {
-	$articles = [];
-	// Get All Articles
-	foreach(array_keys($articlesAll) as $i) {
-		$articles[] = $articlesAll[$i]->getValuesArticles();
-		$keywords[] = $articlesAll[$i]->getVar('art_title');
-	}
-	$GLOBALS['xoopsTpl']->assign('articles', $articles);
-	unset($articles);
-	// Display Navigation
-	if ($articlesCount > $limit) {
-		include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-		$pagenav = new \XoopsPageNav($articlesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
-		$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
-	}
-	$GLOBALS['xoopsTpl']->assign('type', $helper->getConfig('table_type'));
-	$GLOBALS['xoopsTpl']->assign('divideby', $helper->getConfig('divideby'));
-	$GLOBALS['xoopsTpl']->assign('numb_col', $helper->getConfig('numb_col'));
+    $articles = [];
+    // Get All Articles
+    foreach(array_keys($articlesAll) as $i) {
+        $articles[] = $articlesAll[$i]->getValuesArticles();
+        $keywords[] = $articlesAll[$i]->getVar('art_title');
+    }
+    $GLOBALS['xoopsTpl']->assign('articles', $articles);
+    unset($articles);
+    // Display Navigation
+    if ($articlesCount > $limit) {
+        include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        $pagenav = new \XoopsPageNav($articlesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+        $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
+    }
+    $GLOBALS['xoopsTpl']->assign('type', $helper->getConfig('table_type'));
+    $GLOBALS['xoopsTpl']->assign('divideby', $helper->getConfig('divideby'));
+    $GLOBALS['xoopsTpl']->assign('numb_col', $helper->getConfig('numb_col'));
 }
 
 // Breadcrumbs

Spacing +8 added lines, -8 removed lines

@@ -24,15 +24,15 @@ 
 use XoopsModules\Mymodule2;
 use XoopsModules\Mymodule2\Constants;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 $GLOBALS['xoopsOption']['template_main'] = 'mymodule2_articles.tpl';
-include_once XOOPS_ROOT_PATH . '/header.php';
+include_once XOOPS_ROOT_PATH.'/header.php';
 
 $start = Request::getInt('start', 0);
 $limit = Request::getInt('limit', $helper->getConfig('userpager'));
 
 // Define Stylesheet
-$GLOBALS['xoTheme']->addStylesheet( $style, null );
+$GLOBALS['xoTheme']->addStylesheet($style, null);
 
 $GLOBALS['xoopsTpl']->assign('xoops_icons32_url', XOOPS_ICONS32_URL);
 $GLOBALS['xoopsTpl']->assign('mymodule2_url', MYMODULE2_URL);
@@ -44,7 +44,7 @@ 
 if ($articlesCount > 0) {
 	$articles = [];
 	// Get All Articles
-	foreach(array_keys($articlesAll) as $i) {
+	foreach (array_keys($articlesAll) as $i) {
 		$articles[] = $articlesAll[$i]->getValuesArticles();
 		$keywords[] = $articlesAll[$i]->getVar('art_title');
 	}
@@ -52,8 +52,8 @@ 
 	unset($articles);
 	// Display Navigation
 	if ($articlesCount > $limit) {
-		include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-		$pagenav = new \XoopsPageNav($articlesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+		include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+		$pagenav = new \XoopsPageNav($articlesCount, $limit, $start, 'start', 'op=list&limit='.$limit);
 		$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
 	}
 	$GLOBALS['xoopsTpl']->assign('type', $helper->getConfig('table_type'));
@@ -65,11 +65,11 @@ 
 $xoBreadcrumbs[] = ['title' => _MA_MYMODULE2_ARTICLES];
 
 // Keywords
-mymodule2MetaKeywords($helper->getConfig('keywords').', '. implode(',', $keywords));
+mymodule2MetaKeywords($helper->getConfig('keywords').', '.implode(',', $keywords));
 unset($keywords);
 
 // Description
 mymodule2MetaDescription(_MA_MYMODULE2_ARTICLES_DESC);
 $GLOBALS['xoopsTpl']->assign('xoops_mpageurl', MYMODULE2_URL.'/articles.php');
 $GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
-require __DIR__ . '/footer.php';
+require __DIR__.'/footer.php';

testdata/mymodule2/single.php

Spacing +5 added lines, -5 removed lines

@@ -24,21 +24,21 @@
 use XoopsModules\Mymodule2;
 use XoopsModules\Mymodule2\Constants;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 $tfId = Request::getInt('tf_id', 0);
 $GLOBALS['xoopsOption']['template_main'] = 'mymodule2_single.tpl';
-include_once XOOPS_ROOT_PATH . '/header.php';
+include_once XOOPS_ROOT_PATH.'/header.php';
 // Define Stylesheet
-$GLOBALS['xoTheme']->addStylesheet( $style, null );
+$GLOBALS['xoTheme']->addStylesheet($style, null);
 $keywords = array();
 // Breadcrumbs
 $xoBreadcrumbs[] = ['title' => _MA_MYMODULE2_TESTFIELDS];
 // Keywords
-mymodule2MetaKeywords($helper->getConfig('keywords').', '. implode(',', $keywords));
+mymodule2MetaKeywords($helper->getConfig('keywords').', '.implode(',', $keywords));
 unset($keywords);
 // Description
 mymodule2MetaDescription(_MA_MYMODULE2_TESTFIELDS_DESC);
 $GLOBALS['xoopsTpl']->assign('xoops_mpageurl', MYMODULE2_URL.'/index.php');
 $GLOBALS['xoopsTpl']->assign('xoops_icons32_url', XOOPS_ICONS32_URL);
 $GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
-require __DIR__ . '/footer.php';
+require __DIR__.'/footer.php';

testdata/mymodule2/rate.php

Indentation +168 added lines, -168 removed lines

@@ -31,176 +31,176 @@
 include_once XOOPS_ROOT_PATH . '/header.php';
 // Define Stylesheet
 $GLOBALS['xoTheme']->addStylesheet( $style, null );
-	switch($op) {
-		case 'form':
-		default:
-				// Navigation
-		$navigation = _MA_MYMODULE2_RATE;
-		$GLOBALS['xoopsTpl']->assign('navigation', $navigation);
-		// Title of page
-		$title = _MA_MYMODULE2_RATE . ' - ';
-		$title .= $GLOBALS['xoopsModule']->name();
-		$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', $title);
-		// Description
-		$GLOBALS['xoTheme']->addMeta( 'meta', 'description', strip_tags(_MA_MYMODULE2_RATE));
-		// Form Create
-		$testfieldsObj = $testfieldsHandler->create();
-		$form = $testfieldsObj->getFormTestfields();
-		$GLOBALS['xoopsTpl']->assign('form', $form->render());
+    switch($op) {
+        case 'form':
+        default:
+                // Navigation
+        $navigation = _MA_MYMODULE2_RATE;
+        $GLOBALS['xoopsTpl']->assign('navigation', $navigation);
+        // Title of page
+        $title = _MA_MYMODULE2_RATE . ' - ';
+        $title .= $GLOBALS['xoopsModule']->name();
+        $GLOBALS['xoopsTpl']->assign('xoops_pagetitle', $title);
+        // Description
+        $GLOBALS['xoTheme']->addMeta( 'meta', 'description', strip_tags(_MA_MYMODULE2_RATE));
+        // Form Create
+        $testfieldsObj = $testfieldsHandler->create();
+        $form = $testfieldsObj->getFormTestfields();
+        $GLOBALS['xoopsTpl']->assign('form', $form->render());
 
-		break;
-		case 'save':
-				// Security Check
-		if ($GLOBALS['xoopsSecurity']->check()) {
-			redirect_header('testfields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-		}
-		$testfieldsObj = $testfieldsHandler->create();
-		$testfieldsObj->setVar('tf_text', Request::getString('tf_text', ''));
-		$testfieldsObj->setVar('tf_textarea', Request::getString('tf_textarea', ''));
-		$testfieldsObj->setVar('tf_dhtml', Request::getString('tf_dhtml', ''));
-		$testfieldsObj->setVar('tf_checkbox', Request::getInt('tf_checkbox', 0));
-		$testfieldsObj->setVar('tf_yesno', Request::getInt('tf_yesno', 0));
-		$testfieldsObj->setVar('tf_selectbox', Request::getString('tf_selectbox', ''));
-		$testfieldsObj->setVar('tf_user', Request::getInt('tf_user', 0));
-		$testfieldsObj->setVar('tf_color', Request::getString('tf_color', ''));
-		// Set Var tf_imagelist
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32', 
-													$helper->getConfig('mimetypes_image'), 
-													$helper->getConfig('maxsize_image'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
-			//$uploader->setPrefix(tf_imagelist_);
-			//$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
-			if (!$uploader->upload()) {
-				$errors = $uploader->getErrors();
-				redirect_header('javascript:history.go(-1).php', 3, $errors);
-			} else {
-				$testfieldsObj->setVar('tf_imagelist', $uploader->getSavedFileName());
-			}
-		} else {
-			$testfieldsObj->setVar('tf_imagelist', Request::getString('tf_imagelist'));
-		}
-		$testfieldsObj->setVar('tf_urlfile', formatUrl($_REQUEST['tf_urlfile']));
-		// Set Var tf_urlfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['tf_urlfile']['name'];
-		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
-													$helper->getConfig('mimetypes_file'), 
-													$helper->getConfig('maxsize_file'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][1]);
-			if (!$uploader->upload()) {
-				$errors = $uploader->getErrors();
-			} else {
-				$testfieldsObj->setVar('tf_urlfile', $uploader->getSavedFileName());
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$testfieldsObj->setVar('tf_urlfile', Request::getString('tf_urlfile'));
-		}
-		// Set Var tf_uplimage
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['tf_uplimage']['name'];
-		$imgMimetype    = $_FILES['tf_uplimage']['type'];
-		$imgNameDef     = Request::getString('tf_text');
-		$uploaderErrors = '';
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/', 
-													$helper->getConfig('mimetypes_image'), 
-													$helper->getConfig('maxsize_image'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][2])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][2]);
-			if (!$uploader->upload()) {
-				$uploaderErrors = $uploader->getErrors();
-			} else {
-				$savedFilename = $uploader->getSavedFileName();
-				$maxwidth  = (int)$helper->getConfig('maxwidth_image');
-				$maxheight = (int)$helper->getConfig('maxheight_image');
-				if ($maxwidth > 0 && $maxheight > 0) {
-					// Resize image
-					$imgHandler                = new Mymodule2\Common\Resizer();
-					$imgHandler->sourceFile    = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
-					$imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
-					$imgHandler->imageMimetype = $imgMimetype;
-					$imgHandler->maxWidth      = $maxwidth;
-					$imgHandler->maxHeight     = $maxheight;
-					$result                    = $imgHandler->resizeImage();
-				}
-				$testfieldsObj->setVar('tf_uplimage', $savedFilename);
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$testfieldsObj->setVar('tf_uplimage', Request::getString('tf_uplimage'));
-		}
-		// Set Var tf_uplfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['tf_uplfile']['name'];
-		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
-													$helper->getConfig('mimetypes_file'), 
-													$helper->getConfig('maxsize_file'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][3])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][3]);
-			if (!$uploader->upload()) {
-				$errors = $uploader->getErrors();
-			} else {
-				$testfieldsObj->setVar('tf_uplfile', $uploader->getSavedFileName());
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$testfieldsObj->setVar('tf_uplfile', Request::getString('tf_uplfile'));
-		}
-		$testfieldTextdateselect = date_create_from_format(_SHORTDATESTRING, Request::getString('tf_textdateselect'));
-		$testfieldsObj->setVar('tf_textdateselect', $testfieldTextdateselect->getTimestamp());
-		// Set Var tf_selectfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['tf_selectfile']['name'];
-		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
-													$helper->getConfig('mimetypes_file'), 
-													$helper->getConfig('maxsize_file'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][4])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][4]);
-			if (!$uploader->upload()) {
-				$errors = $uploader->getErrors();
-			} else {
-				$testfieldsObj->setVar('tf_selectfile', $uploader->getSavedFileName());
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$testfieldsObj->setVar('tf_selectfile', Request::getString('tf_selectfile'));
-		}
-		$testfieldsObj->setVar('tf_status', Request::getInt('tf_status', 0));
-		// Insert Data
-		if ($testfields1->insert($testfieldsObj)) {
-			redirect_header('index.php', 2, _MA_MYMODULE2_FORM_OK);
-		}
-		// Get Form Error
-		$GLOBALS['xoopsTpl']->assign('error', $testfieldsObj->getHtmlErrors());
-		$form = $testfieldsObj->getFormTestfields();
-		$GLOBALS['xoopsTpl']->assign('form', $form->display());
+        break;
+        case 'save':
+                // Security Check
+        if ($GLOBALS['xoopsSecurity']->check()) {
+            redirect_header('testfields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+        }
+        $testfieldsObj = $testfieldsHandler->create();
+        $testfieldsObj->setVar('tf_text', Request::getString('tf_text', ''));
+        $testfieldsObj->setVar('tf_textarea', Request::getString('tf_textarea', ''));
+        $testfieldsObj->setVar('tf_dhtml', Request::getString('tf_dhtml', ''));
+        $testfieldsObj->setVar('tf_checkbox', Request::getInt('tf_checkbox', 0));
+        $testfieldsObj->setVar('tf_yesno', Request::getInt('tf_yesno', 0));
+        $testfieldsObj->setVar('tf_selectbox', Request::getString('tf_selectbox', ''));
+        $testfieldsObj->setVar('tf_user', Request::getInt('tf_user', 0));
+        $testfieldsObj->setVar('tf_color', Request::getString('tf_color', ''));
+        // Set Var tf_imagelist
+        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        $uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32', 
+                                                    $helper->getConfig('mimetypes_image'), 
+                                                    $helper->getConfig('maxsize_image'), null, null);
+        if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+            //$uploader->setPrefix(tf_imagelist_);
+            //$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+            if (!$uploader->upload()) {
+                $errors = $uploader->getErrors();
+                redirect_header('javascript:history.go(-1).php', 3, $errors);
+            } else {
+                $testfieldsObj->setVar('tf_imagelist', $uploader->getSavedFileName());
+            }
+        } else {
+            $testfieldsObj->setVar('tf_imagelist', Request::getString('tf_imagelist'));
+        }
+        $testfieldsObj->setVar('tf_urlfile', formatUrl($_REQUEST['tf_urlfile']));
+        // Set Var tf_urlfile
+        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        $filename       = $_FILES['tf_urlfile']['name'];
+        $imgNameDef     = Request::getString('tf_text');
+        $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+                                                    $helper->getConfig('mimetypes_file'), 
+                                                    $helper->getConfig('maxsize_file'), null, null);
+        if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) {
+            $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+            $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+            $uploader->setPrefix($imgName);
+            $uploader->fetchMedia($_POST['xoops_upload_file'][1]);
+            if (!$uploader->upload()) {
+                $errors = $uploader->getErrors();
+            } else {
+                $testfieldsObj->setVar('tf_urlfile', $uploader->getSavedFileName());
+            }
+        } else {
+            if ($filename > '') {
+                $uploaderErrors = $uploader->getErrors();
+            }
+            $testfieldsObj->setVar('tf_urlfile', Request::getString('tf_urlfile'));
+        }
+        // Set Var tf_uplimage
+        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        $filename       = $_FILES['tf_uplimage']['name'];
+        $imgMimetype    = $_FILES['tf_uplimage']['type'];
+        $imgNameDef     = Request::getString('tf_text');
+        $uploaderErrors = '';
+        $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/', 
+                                                    $helper->getConfig('mimetypes_image'), 
+                                                    $helper->getConfig('maxsize_image'), null, null);
+        if ($uploader->fetchMedia($_POST['xoops_upload_file'][2])) {
+            $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+            $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+            $uploader->setPrefix($imgName);
+            $uploader->fetchMedia($_POST['xoops_upload_file'][2]);
+            if (!$uploader->upload()) {
+                $uploaderErrors = $uploader->getErrors();
+            } else {
+                $savedFilename = $uploader->getSavedFileName();
+                $maxwidth  = (int)$helper->getConfig('maxwidth_image');
+                $maxheight = (int)$helper->getConfig('maxheight_image');
+                if ($maxwidth > 0 && $maxheight > 0) {
+                    // Resize image
+                    $imgHandler                = new Mymodule2\Common\Resizer();
+                    $imgHandler->sourceFile    = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
+                    $imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
+                    $imgHandler->imageMimetype = $imgMimetype;
+                    $imgHandler->maxWidth      = $maxwidth;
+                    $imgHandler->maxHeight     = $maxheight;
+                    $result                    = $imgHandler->resizeImage();
+                }
+                $testfieldsObj->setVar('tf_uplimage', $savedFilename);
+            }
+        } else {
+            if ($filename > '') {
+                $uploaderErrors = $uploader->getErrors();
+            }
+            $testfieldsObj->setVar('tf_uplimage', Request::getString('tf_uplimage'));
+        }
+        // Set Var tf_uplfile
+        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        $filename       = $_FILES['tf_uplfile']['name'];
+        $imgNameDef     = Request::getString('tf_text');
+        $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+                                                    $helper->getConfig('mimetypes_file'), 
+                                                    $helper->getConfig('maxsize_file'), null, null);
+        if ($uploader->fetchMedia($_POST['xoops_upload_file'][3])) {
+            $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+            $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+            $uploader->setPrefix($imgName);
+            $uploader->fetchMedia($_POST['xoops_upload_file'][3]);
+            if (!$uploader->upload()) {
+                $errors = $uploader->getErrors();
+            } else {
+                $testfieldsObj->setVar('tf_uplfile', $uploader->getSavedFileName());
+            }
+        } else {
+            if ($filename > '') {
+                $uploaderErrors = $uploader->getErrors();
+            }
+            $testfieldsObj->setVar('tf_uplfile', Request::getString('tf_uplfile'));
+        }
+        $testfieldTextdateselect = date_create_from_format(_SHORTDATESTRING, Request::getString('tf_textdateselect'));
+        $testfieldsObj->setVar('tf_textdateselect', $testfieldTextdateselect->getTimestamp());
+        // Set Var tf_selectfile
+        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        $filename       = $_FILES['tf_selectfile']['name'];
+        $imgNameDef     = Request::getString('tf_text');
+        $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+                                                    $helper->getConfig('mimetypes_file'), 
+                                                    $helper->getConfig('maxsize_file'), null, null);
+        if ($uploader->fetchMedia($_POST['xoops_upload_file'][4])) {
+            $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+            $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+            $uploader->setPrefix($imgName);
+            $uploader->fetchMedia($_POST['xoops_upload_file'][4]);
+            if (!$uploader->upload()) {
+                $errors = $uploader->getErrors();
+            } else {
+                $testfieldsObj->setVar('tf_selectfile', $uploader->getSavedFileName());
+            }
+        } else {
+            if ($filename > '') {
+                $uploaderErrors = $uploader->getErrors();
+            }
+            $testfieldsObj->setVar('tf_selectfile', Request::getString('tf_selectfile'));
+        }
+        $testfieldsObj->setVar('tf_status', Request::getInt('tf_status', 0));
+        // Insert Data
+        if ($testfields1->insert($testfieldsObj)) {
+            redirect_header('index.php', 2, _MA_MYMODULE2_FORM_OK);
+        }
+        // Get Form Error
+        $GLOBALS['xoopsTpl']->assign('error', $testfieldsObj->getHtmlErrors());
+        $form = $testfieldsObj->getFormTestfields();
+        $GLOBALS['xoopsTpl']->assign('form', $form->display());
 
-		break;
+        break;
 }
 // Breadcrumbs
 $xoBreadcrumbs[] = ['title' => RATE_MA_MYMODULE2_];

Spacing +23 added lines, -23 removed lines

@@ -24,25 +24,25 @@ 
 use XoopsModules\Mymodule2;
 use XoopsModules\Mymodule2\Constants;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 $op = Request::getString('op', 'form');
 $lid = Request::getInt('lid');
 $GLOBALS['xoopsOption']['template_main'] = 'mymodule2_testfields.tpl';
-include_once XOOPS_ROOT_PATH . '/header.php';
+include_once XOOPS_ROOT_PATH.'/header.php';
 // Define Stylesheet
-$GLOBALS['xoTheme']->addStylesheet( $style, null );
-	switch($op) {
+$GLOBALS['xoTheme']->addStylesheet($style, null);
+	switch ($op) {
 		case 'form':
 		default:
 				// Navigation
 		$navigation = _MA_MYMODULE2_RATE;
 		$GLOBALS['xoopsTpl']->assign('navigation', $navigation);
 		// Title of page
-		$title = _MA_MYMODULE2_RATE . ' - ';
+		$title = _MA_MYMODULE2_RATE.' - ';
 		$title .= $GLOBALS['xoopsModule']->name();
 		$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', $title);
 		// Description
-		$GLOBALS['xoTheme']->addMeta( 'meta', 'description', strip_tags(_MA_MYMODULE2_RATE));
+		$GLOBALS['xoTheme']->addMeta('meta', 'description', strip_tags(_MA_MYMODULE2_RATE));
 		// Form Create
 		$testfieldsObj = $testfieldsHandler->create();
 		$form = $testfieldsObj->getFormTestfields();
@@ -64,8 +64,8 @@ 
 		$testfieldsObj->setVar('tf_user', Request::getInt('tf_user', 0));
 		$testfieldsObj->setVar('tf_color', Request::getString('tf_color', ''));
 		// Set Var tf_imagelist
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32', 
+		include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+		$uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH.'/Frameworks/moduleclasses/icons/32', 
 													$helper->getConfig('mimetypes_image'), 
 													$helper->getConfig('maxsize_image'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
@@ -82,15 +82,15 @@ 
 		}
 		$testfieldsObj->setVar('tf_urlfile', formatUrl($_REQUEST['tf_urlfile']));
 		// Set Var tf_urlfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		include_once XOOPS_ROOT_PATH.'/class/uploader.php';
 		$filename       = $_FILES['tf_urlfile']['name'];
 		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH.'/testfields/', 
 													$helper->getConfig('mimetypes_file'), 
 													$helper->getConfig('maxsize_file'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) {
 			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+			$imgName = str_replace(' ', '', $imgNameDef).'.'.$extension;
 			$uploader->setPrefix($imgName);
 			$uploader->fetchMedia($_POST['xoops_upload_file'][1]);
 			if (!$uploader->upload()) {
@@ -105,17 +105,17 @@ 
 			$testfieldsObj->setVar('tf_urlfile', Request::getString('tf_urlfile'));
 		}
 		// Set Var tf_uplimage
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		include_once XOOPS_ROOT_PATH.'/class/uploader.php';
 		$filename       = $_FILES['tf_uplimage']['name'];
 		$imgMimetype    = $_FILES['tf_uplimage']['type'];
 		$imgNameDef     = Request::getString('tf_text');
 		$uploaderErrors = '';
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/', 
+		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH.'/testfields/', 
 													$helper->getConfig('mimetypes_image'), 
 													$helper->getConfig('maxsize_image'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][2])) {
 			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+			$imgName = str_replace(' ', '', $imgNameDef).'.'.$extension;
 			$uploader->setPrefix($imgName);
 			$uploader->fetchMedia($_POST['xoops_upload_file'][2]);
 			if (!$uploader->upload()) {
@@ -127,8 +127,8 @@ 
 				if ($maxwidth > 0 && $maxheight > 0) {
 					// Resize image
 					$imgHandler                = new Mymodule2\Common\Resizer();
-					$imgHandler->sourceFile    = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
-					$imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
+					$imgHandler->sourceFile    = MYMODULE2_UPLOAD_IMAGE_PATH.'/testfields/'.$savedFilename;
+					$imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH.'/testfields/'.$savedFilename;
 					$imgHandler->imageMimetype = $imgMimetype;
 					$imgHandler->maxWidth      = $maxwidth;
 					$imgHandler->maxHeight     = $maxheight;
@@ -143,15 +143,15 @@ 
 			$testfieldsObj->setVar('tf_uplimage', Request::getString('tf_uplimage'));
 		}
 		// Set Var tf_uplfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		include_once XOOPS_ROOT_PATH.'/class/uploader.php';
 		$filename       = $_FILES['tf_uplfile']['name'];
 		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH.'/testfields/', 
 													$helper->getConfig('mimetypes_file'), 
 													$helper->getConfig('maxsize_file'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][3])) {
 			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+			$imgName = str_replace(' ', '', $imgNameDef).'.'.$extension;
 			$uploader->setPrefix($imgName);
 			$uploader->fetchMedia($_POST['xoops_upload_file'][3]);
 			if (!$uploader->upload()) {
@@ -168,15 +168,15 @@ 
 		$testfieldTextdateselect = date_create_from_format(_SHORTDATESTRING, Request::getString('tf_textdateselect'));
 		$testfieldsObj->setVar('tf_textdateselect', $testfieldTextdateselect->getTimestamp());
 		// Set Var tf_selectfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		include_once XOOPS_ROOT_PATH.'/class/uploader.php';
 		$filename       = $_FILES['tf_selectfile']['name'];
 		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH.'/testfields/', 
 													$helper->getConfig('mimetypes_file'), 
 													$helper->getConfig('maxsize_file'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][4])) {
 			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+			$imgName = str_replace(' ', '', $imgNameDef).'.'.$extension;
 			$uploader->setPrefix($imgName);
 			$uploader->fetchMedia($_POST['xoops_upload_file'][4]);
 			if (!$uploader->upload()) {
@@ -204,4 +204,4 @@ 
 }
 // Breadcrumbs
 $xoBreadcrumbs[] = ['title' => RATE_MA_MYMODULE2_];
-require __DIR__ . '/footer.php';
+require __DIR__.'/footer.php';

testdata/mymodule2/broken.php

Indentation +182 added lines, -182 removed lines

@@ -33,191 +33,191 @@
 $GLOBALS['xoTheme']->addStylesheet( $style, null );
 // Redirection if not permissions
 if ($permSubmit === false) {
-	redirect_header('index.php', 2, _NOPERM);
-	exit();
+    redirect_header('index.php', 2, _NOPERM);
+    exit();
 }
 switch($op) {
-	case 'form':
-	default:
-		// Navigation
-		$navigation = _MA_MYMODULE2_SUBMIT_PROPOSER;
-		$GLOBALS['xoopsTpl']->assign('navigation', $navigation);
-		// Title of page
-		$title = _MA_MYMODULE2_SUBMIT_PROPOSER . ' - ';
-		$title .= $GLOBALS['xoopsModule']->name();
-		$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', $title);
-		// Description
-		$GLOBALS['xoTheme']->addMeta( 'meta', 'description', strip_tags(_MA_MYMODULE2_SUBMIT_PROPOSER));
-		// Form Create
-		$testfieldsObj = $testfieldsHandler->create();
-		$form = $testfieldsObj->getFormTestfields();
-		$GLOBALS['xoopsTpl']->assign('form', $form->render());
+    case 'form':
+    default:
+        // Navigation
+        $navigation = _MA_MYMODULE2_SUBMIT_PROPOSER;
+        $GLOBALS['xoopsTpl']->assign('navigation', $navigation);
+        // Title of page
+        $title = _MA_MYMODULE2_SUBMIT_PROPOSER . ' - ';
+        $title .= $GLOBALS['xoopsModule']->name();
+        $GLOBALS['xoopsTpl']->assign('xoops_pagetitle', $title);
+        // Description
+        $GLOBALS['xoTheme']->addMeta( 'meta', 'description', strip_tags(_MA_MYMODULE2_SUBMIT_PROPOSER));
+        // Form Create
+        $testfieldsObj = $testfieldsHandler->create();
+        $form = $testfieldsObj->getFormTestfields();
+        $GLOBALS['xoopsTpl']->assign('form', $form->render());
 
-	break;
-	case 'save':
-		// Security Check
-		if ($GLOBALS['xoopsSecurity']->check()) {
-			redirect_header('testfields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-		}
-		$testfieldsObj = $testfieldsHandler->create();
-		$error = false;
-		$errorMessage = '';
-		// Test first the validation
-		xoops_load('captcha');
-		$xoopsCaptcha = \XoopsCaptcha::getInstance();
-		if (!$xoopsCaptcha->verify()) {
-			$errorMessage .= $xoopsCaptcha->getMessage().'<br>';
-			$error = true;
-		}
-		$testfieldsObj->setVar('tf_text', Request::getString('tf_text', ''));
-		$testfieldsObj->setVar('tf_textarea', Request::getString('tf_textarea', ''));
-		$testfieldsObj->setVar('tf_dhtml', Request::getString('tf_dhtml', ''));
-		$testfieldsObj->setVar('tf_checkbox', Request::getInt('tf_checkbox', 0));
-		$testfieldsObj->setVar('tf_yesno', Request::getInt('tf_yesno', 0));
-		$testfieldsObj->setVar('tf_selectbox', Request::getString('tf_selectbox', ''));
-		$testfieldsObj->setVar('tf_user', Request::getInt('tf_user', 0));
-		$testfieldsObj->setVar('tf_color', Request::getString('tf_color', ''));
-		// Set Var tf_imagelist
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32', 
-													$helper->getConfig('mimetypes_image'), 
-													$helper->getConfig('maxsize_image'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
-			//$uploader->setPrefix(tf_imagelist_);
-			//$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
-			if (!$uploader->upload()) {
-				$errors = $uploader->getErrors();
-				redirect_header('javascript:history.go(-1).php', 3, $errors);
-			} else {
-				$testfieldsObj->setVar('tf_imagelist', $uploader->getSavedFileName());
-			}
-		} else {
-			$testfieldsObj->setVar('tf_imagelist', Request::getString('tf_imagelist'));
-		}
-		$testfieldsObj->setVar('tf_urlfile', formatUrl($_REQUEST['tf_urlfile']));
-		// Set Var tf_urlfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['tf_urlfile']['name'];
-		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
-													$helper->getConfig('mimetypes_file'), 
-													$helper->getConfig('maxsize_file'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][1]);
-			if (!$uploader->upload()) {
-				$errors = $uploader->getErrors();
-			} else {
-				$testfieldsObj->setVar('tf_urlfile', $uploader->getSavedFileName());
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$testfieldsObj->setVar('tf_urlfile', Request::getString('tf_urlfile'));
-		}
-		// Set Var tf_uplimage
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['tf_uplimage']['name'];
-		$imgMimetype    = $_FILES['tf_uplimage']['type'];
-		$imgNameDef     = Request::getString('tf_text');
-		$uploaderErrors = '';
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/', 
-													$helper->getConfig('mimetypes_image'), 
-													$helper->getConfig('maxsize_image'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][2])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][2]);
-			if (!$uploader->upload()) {
-				$uploaderErrors = $uploader->getErrors();
-			} else {
-				$savedFilename = $uploader->getSavedFileName();
-				$maxwidth  = (int)$helper->getConfig('maxwidth_image');
-				$maxheight = (int)$helper->getConfig('maxheight_image');
-				if ($maxwidth > 0 && $maxheight > 0) {
-					// Resize image
-					$imgHandler                = new Mymodule2\Common\Resizer();
-					$imgHandler->sourceFile    = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
-					$imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
-					$imgHandler->imageMimetype = $imgMimetype;
-					$imgHandler->maxWidth      = $maxwidth;
-					$imgHandler->maxHeight     = $maxheight;
-					$result                    = $imgHandler->resizeImage();
-				}
-				$testfieldsObj->setVar('tf_uplimage', $savedFilename);
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$testfieldsObj->setVar('tf_uplimage', Request::getString('tf_uplimage'));
-		}
-		// Set Var tf_uplfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['tf_uplfile']['name'];
-		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
-													$helper->getConfig('mimetypes_file'), 
-													$helper->getConfig('maxsize_file'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][3])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][3]);
-			if (!$uploader->upload()) {
-				$errors = $uploader->getErrors();
-			} else {
-				$testfieldsObj->setVar('tf_uplfile', $uploader->getSavedFileName());
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$testfieldsObj->setVar('tf_uplfile', Request::getString('tf_uplfile'));
-		}
-		$testfieldTextdateselect = date_create_from_format(_SHORTDATESTRING, Request::getString('tf_textdateselect'));
-		$testfieldsObj->setVar('tf_textdateselect', $testfieldTextdateselect->getTimestamp());
-		// Set Var tf_selectfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['tf_selectfile']['name'];
-		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
-													$helper->getConfig('mimetypes_file'), 
-													$helper->getConfig('maxsize_file'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][4])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][4]);
-			if (!$uploader->upload()) {
-				$errors = $uploader->getErrors();
-			} else {
-				$testfieldsObj->setVar('tf_selectfile', $uploader->getSavedFileName());
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$testfieldsObj->setVar('tf_selectfile', Request::getString('tf_selectfile'));
-		}
-		$testfieldsObj->setVar('tf_status', Request::getInt('tf_status', 0));
-		if ($error === true) {
-			$GLOBALS['xoopsTpl']->assign('error_message', $errorMessage);
-		} else {
-			// Insert Data
-			if ($testfields1->insert($testfieldsObj)) {
-				redirect_header('index.php', 2, _MA_MYMODULE2_FORM_OK);
-			}
-		}
-		// Get Form Error
-		$GLOBALS['xoopsTpl']->assign('error', $testfieldsObj->getHtmlErrors());
-		$form = $testfieldsObj->getFormTestfields();
-		$GLOBALS['xoopsTpl']->assign('form', $form->display());
+    break;
+    case 'save':
+        // Security Check
+        if ($GLOBALS['xoopsSecurity']->check()) {
+            redirect_header('testfields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+        }
+        $testfieldsObj = $testfieldsHandler->create();
+        $error = false;
+        $errorMessage = '';
+        // Test first the validation
+        xoops_load('captcha');
+        $xoopsCaptcha = \XoopsCaptcha::getInstance();
+        if (!$xoopsCaptcha->verify()) {
+            $errorMessage .= $xoopsCaptcha->getMessage().'<br>';
+            $error = true;
+        }
+        $testfieldsObj->setVar('tf_text', Request::getString('tf_text', ''));
+        $testfieldsObj->setVar('tf_textarea', Request::getString('tf_textarea', ''));
+        $testfieldsObj->setVar('tf_dhtml', Request::getString('tf_dhtml', ''));
+        $testfieldsObj->setVar('tf_checkbox', Request::getInt('tf_checkbox', 0));
+        $testfieldsObj->setVar('tf_yesno', Request::getInt('tf_yesno', 0));
+        $testfieldsObj->setVar('tf_selectbox', Request::getString('tf_selectbox', ''));
+        $testfieldsObj->setVar('tf_user', Request::getInt('tf_user', 0));
+        $testfieldsObj->setVar('tf_color', Request::getString('tf_color', ''));
+        // Set Var tf_imagelist
+        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        $uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32', 
+                                                    $helper->getConfig('mimetypes_image'), 
+                                                    $helper->getConfig('maxsize_image'), null, null);
+        if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+            //$uploader->setPrefix(tf_imagelist_);
+            //$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+            if (!$uploader->upload()) {
+                $errors = $uploader->getErrors();
+                redirect_header('javascript:history.go(-1).php', 3, $errors);
+            } else {
+                $testfieldsObj->setVar('tf_imagelist', $uploader->getSavedFileName());
+            }
+        } else {
+            $testfieldsObj->setVar('tf_imagelist', Request::getString('tf_imagelist'));
+        }
+        $testfieldsObj->setVar('tf_urlfile', formatUrl($_REQUEST['tf_urlfile']));
+        // Set Var tf_urlfile
+        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        $filename       = $_FILES['tf_urlfile']['name'];
+        $imgNameDef     = Request::getString('tf_text');
+        $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+                                                    $helper->getConfig('mimetypes_file'), 
+                                                    $helper->getConfig('maxsize_file'), null, null);
+        if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) {
+            $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+            $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+            $uploader->setPrefix($imgName);
+            $uploader->fetchMedia($_POST['xoops_upload_file'][1]);
+            if (!$uploader->upload()) {
+                $errors = $uploader->getErrors();
+            } else {
+                $testfieldsObj->setVar('tf_urlfile', $uploader->getSavedFileName());
+            }
+        } else {
+            if ($filename > '') {
+                $uploaderErrors = $uploader->getErrors();
+            }
+            $testfieldsObj->setVar('tf_urlfile', Request::getString('tf_urlfile'));
+        }
+        // Set Var tf_uplimage
+        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        $filename       = $_FILES['tf_uplimage']['name'];
+        $imgMimetype    = $_FILES['tf_uplimage']['type'];
+        $imgNameDef     = Request::getString('tf_text');
+        $uploaderErrors = '';
+        $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/', 
+                                                    $helper->getConfig('mimetypes_image'), 
+                                                    $helper->getConfig('maxsize_image'), null, null);
+        if ($uploader->fetchMedia($_POST['xoops_upload_file'][2])) {
+            $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+            $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+            $uploader->setPrefix($imgName);
+            $uploader->fetchMedia($_POST['xoops_upload_file'][2]);
+            if (!$uploader->upload()) {
+                $uploaderErrors = $uploader->getErrors();
+            } else {
+                $savedFilename = $uploader->getSavedFileName();
+                $maxwidth  = (int)$helper->getConfig('maxwidth_image');
+                $maxheight = (int)$helper->getConfig('maxheight_image');
+                if ($maxwidth > 0 && $maxheight > 0) {
+                    // Resize image
+                    $imgHandler                = new Mymodule2\Common\Resizer();
+                    $imgHandler->sourceFile    = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
+                    $imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
+                    $imgHandler->imageMimetype = $imgMimetype;
+                    $imgHandler->maxWidth      = $maxwidth;
+                    $imgHandler->maxHeight     = $maxheight;
+                    $result                    = $imgHandler->resizeImage();
+                }
+                $testfieldsObj->setVar('tf_uplimage', $savedFilename);
+            }
+        } else {
+            if ($filename > '') {
+                $uploaderErrors = $uploader->getErrors();
+            }
+            $testfieldsObj->setVar('tf_uplimage', Request::getString('tf_uplimage'));
+        }
+        // Set Var tf_uplfile
+        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        $filename       = $_FILES['tf_uplfile']['name'];
+        $imgNameDef     = Request::getString('tf_text');
+        $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+                                                    $helper->getConfig('mimetypes_file'), 
+                                                    $helper->getConfig('maxsize_file'), null, null);
+        if ($uploader->fetchMedia($_POST['xoops_upload_file'][3])) {
+            $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+            $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+            $uploader->setPrefix($imgName);
+            $uploader->fetchMedia($_POST['xoops_upload_file'][3]);
+            if (!$uploader->upload()) {
+                $errors = $uploader->getErrors();
+            } else {
+                $testfieldsObj->setVar('tf_uplfile', $uploader->getSavedFileName());
+            }
+        } else {
+            if ($filename > '') {
+                $uploaderErrors = $uploader->getErrors();
+            }
+            $testfieldsObj->setVar('tf_uplfile', Request::getString('tf_uplfile'));
+        }
+        $testfieldTextdateselect = date_create_from_format(_SHORTDATESTRING, Request::getString('tf_textdateselect'));
+        $testfieldsObj->setVar('tf_textdateselect', $testfieldTextdateselect->getTimestamp());
+        // Set Var tf_selectfile
+        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        $filename       = $_FILES['tf_selectfile']['name'];
+        $imgNameDef     = Request::getString('tf_text');
+        $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+                                                    $helper->getConfig('mimetypes_file'), 
+                                                    $helper->getConfig('maxsize_file'), null, null);
+        if ($uploader->fetchMedia($_POST['xoops_upload_file'][4])) {
+            $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+            $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+            $uploader->setPrefix($imgName);
+            $uploader->fetchMedia($_POST['xoops_upload_file'][4]);
+            if (!$uploader->upload()) {
+                $errors = $uploader->getErrors();
+            } else {
+                $testfieldsObj->setVar('tf_selectfile', $uploader->getSavedFileName());
+            }
+        } else {
+            if ($filename > '') {
+                $uploaderErrors = $uploader->getErrors();
+            }
+            $testfieldsObj->setVar('tf_selectfile', Request::getString('tf_selectfile'));
+        }
+        $testfieldsObj->setVar('tf_status', Request::getInt('tf_status', 0));
+        if ($error === true) {
+            $GLOBALS['xoopsTpl']->assign('error_message', $errorMessage);
+        } else {
+            // Insert Data
+            if ($testfields1->insert($testfieldsObj)) {
+                redirect_header('index.php', 2, _MA_MYMODULE2_FORM_OK);
+            }
+        }
+        // Get Form Error
+        $GLOBALS['xoopsTpl']->assign('error', $testfieldsObj->getHtmlErrors());
+        $form = $testfieldsObj->getFormTestfields();
+        $GLOBALS['xoopsTpl']->assign('form', $form->display());
 
-	break;
+    break;
 }
 require __DIR__ . '/footer.php';

Switch Indentation +180 added lines, -180 removed lines

@@ -37,187 +37,187 @@
 	exit();
 }
 switch($op) {
-	case 'form':
-	default:
-		// Navigation
-		$navigation = _MA_MYMODULE2_SUBMIT_PROPOSER;
-		$GLOBALS['xoopsTpl']->assign('navigation', $navigation);
-		// Title of page
-		$title = _MA_MYMODULE2_SUBMIT_PROPOSER . ' - ';
-		$title .= $GLOBALS['xoopsModule']->name();
-		$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', $title);
-		// Description
-		$GLOBALS['xoTheme']->addMeta( 'meta', 'description', strip_tags(_MA_MYMODULE2_SUBMIT_PROPOSER));
-		// Form Create
-		$testfieldsObj = $testfieldsHandler->create();
-		$form = $testfieldsObj->getFormTestfields();
-		$GLOBALS['xoopsTpl']->assign('form', $form->render());
+	    case 'form':
+	    default:
+		    // Navigation
+		    $navigation = _MA_MYMODULE2_SUBMIT_PROPOSER;
+		    $GLOBALS['xoopsTpl']->assign('navigation', $navigation);
+		    // Title of page
+		    $title = _MA_MYMODULE2_SUBMIT_PROPOSER . ' - ';
+		    $title .= $GLOBALS['xoopsModule']->name();
+		    $GLOBALS['xoopsTpl']->assign('xoops_pagetitle', $title);
+		    // Description
+		    $GLOBALS['xoTheme']->addMeta( 'meta', 'description', strip_tags(_MA_MYMODULE2_SUBMIT_PROPOSER));
+		    // Form Create
+		    $testfieldsObj = $testfieldsHandler->create();
+		    $form = $testfieldsObj->getFormTestfields();
+		    $GLOBALS['xoopsTpl']->assign('form', $form->render());
 
-	break;
-	case 'save':
-		// Security Check
-		if ($GLOBALS['xoopsSecurity']->check()) {
-			redirect_header('testfields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-		}
-		$testfieldsObj = $testfieldsHandler->create();
-		$error = false;
-		$errorMessage = '';
-		// Test first the validation
-		xoops_load('captcha');
-		$xoopsCaptcha = \XoopsCaptcha::getInstance();
-		if (!$xoopsCaptcha->verify()) {
-			$errorMessage .= $xoopsCaptcha->getMessage().'<br>';
-			$error = true;
-		}
-		$testfieldsObj->setVar('tf_text', Request::getString('tf_text', ''));
-		$testfieldsObj->setVar('tf_textarea', Request::getString('tf_textarea', ''));
-		$testfieldsObj->setVar('tf_dhtml', Request::getString('tf_dhtml', ''));
-		$testfieldsObj->setVar('tf_checkbox', Request::getInt('tf_checkbox', 0));
-		$testfieldsObj->setVar('tf_yesno', Request::getInt('tf_yesno', 0));
-		$testfieldsObj->setVar('tf_selectbox', Request::getString('tf_selectbox', ''));
-		$testfieldsObj->setVar('tf_user', Request::getInt('tf_user', 0));
-		$testfieldsObj->setVar('tf_color', Request::getString('tf_color', ''));
-		// Set Var tf_imagelist
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32', 
-													$helper->getConfig('mimetypes_image'), 
-													$helper->getConfig('maxsize_image'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
-			//$uploader->setPrefix(tf_imagelist_);
-			//$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
-			if (!$uploader->upload()) {
-				$errors = $uploader->getErrors();
-				redirect_header('javascript:history.go(-1).php', 3, $errors);
-			} else {
-				$testfieldsObj->setVar('tf_imagelist', $uploader->getSavedFileName());
-			}
-		} else {
-			$testfieldsObj->setVar('tf_imagelist', Request::getString('tf_imagelist'));
-		}
-		$testfieldsObj->setVar('tf_urlfile', formatUrl($_REQUEST['tf_urlfile']));
-		// Set Var tf_urlfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['tf_urlfile']['name'];
-		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
-													$helper->getConfig('mimetypes_file'), 
-													$helper->getConfig('maxsize_file'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][1]);
-			if (!$uploader->upload()) {
-				$errors = $uploader->getErrors();
-			} else {
-				$testfieldsObj->setVar('tf_urlfile', $uploader->getSavedFileName());
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$testfieldsObj->setVar('tf_urlfile', Request::getString('tf_urlfile'));
-		}
-		// Set Var tf_uplimage
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['tf_uplimage']['name'];
-		$imgMimetype    = $_FILES['tf_uplimage']['type'];
-		$imgNameDef     = Request::getString('tf_text');
-		$uploaderErrors = '';
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/', 
-													$helper->getConfig('mimetypes_image'), 
-													$helper->getConfig('maxsize_image'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][2])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][2]);
-			if (!$uploader->upload()) {
-				$uploaderErrors = $uploader->getErrors();
-			} else {
-				$savedFilename = $uploader->getSavedFileName();
-				$maxwidth  = (int)$helper->getConfig('maxwidth_image');
-				$maxheight = (int)$helper->getConfig('maxheight_image');
-				if ($maxwidth > 0 && $maxheight > 0) {
-					// Resize image
-					$imgHandler                = new Mymodule2\Common\Resizer();
-					$imgHandler->sourceFile    = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
-					$imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
-					$imgHandler->imageMimetype = $imgMimetype;
-					$imgHandler->maxWidth      = $maxwidth;
-					$imgHandler->maxHeight     = $maxheight;
-					$result                    = $imgHandler->resizeImage();
-				}
-				$testfieldsObj->setVar('tf_uplimage', $savedFilename);
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$testfieldsObj->setVar('tf_uplimage', Request::getString('tf_uplimage'));
-		}
-		// Set Var tf_uplfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['tf_uplfile']['name'];
-		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
-													$helper->getConfig('mimetypes_file'), 
-													$helper->getConfig('maxsize_file'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][3])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][3]);
-			if (!$uploader->upload()) {
-				$errors = $uploader->getErrors();
-			} else {
-				$testfieldsObj->setVar('tf_uplfile', $uploader->getSavedFileName());
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$testfieldsObj->setVar('tf_uplfile', Request::getString('tf_uplfile'));
-		}
-		$testfieldTextdateselect = date_create_from_format(_SHORTDATESTRING, Request::getString('tf_textdateselect'));
-		$testfieldsObj->setVar('tf_textdateselect', $testfieldTextdateselect->getTimestamp());
-		// Set Var tf_selectfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['tf_selectfile']['name'];
-		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
-													$helper->getConfig('mimetypes_file'), 
-													$helper->getConfig('maxsize_file'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][4])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][4]);
-			if (!$uploader->upload()) {
-				$errors = $uploader->getErrors();
-			} else {
-				$testfieldsObj->setVar('tf_selectfile', $uploader->getSavedFileName());
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$testfieldsObj->setVar('tf_selectfile', Request::getString('tf_selectfile'));
-		}
-		$testfieldsObj->setVar('tf_status', Request::getInt('tf_status', 0));
-		if ($error === true) {
-			$GLOBALS['xoopsTpl']->assign('error_message', $errorMessage);
-		} else {
-			// Insert Data
-			if ($testfields1->insert($testfieldsObj)) {
-				redirect_header('index.php', 2, _MA_MYMODULE2_FORM_OK);
-			}
-		}
-		// Get Form Error
-		$GLOBALS['xoopsTpl']->assign('error', $testfieldsObj->getHtmlErrors());
-		$form = $testfieldsObj->getFormTestfields();
-		$GLOBALS['xoopsTpl']->assign('form', $form->display());
+	    break;
+	    case 'save':
+		    // Security Check
+		    if ($GLOBALS['xoopsSecurity']->check()) {
+			    redirect_header('testfields.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+		    }
+		    $testfieldsObj = $testfieldsHandler->create();
+		    $error = false;
+		    $errorMessage = '';
+		    // Test first the validation
+		    xoops_load('captcha');
+		    $xoopsCaptcha = \XoopsCaptcha::getInstance();
+		    if (!$xoopsCaptcha->verify()) {
+			    $errorMessage .= $xoopsCaptcha->getMessage().'<br>';
+			    $error = true;
+		    }
+		    $testfieldsObj->setVar('tf_text', Request::getString('tf_text', ''));
+		    $testfieldsObj->setVar('tf_textarea', Request::getString('tf_textarea', ''));
+		    $testfieldsObj->setVar('tf_dhtml', Request::getString('tf_dhtml', ''));
+		    $testfieldsObj->setVar('tf_checkbox', Request::getInt('tf_checkbox', 0));
+		    $testfieldsObj->setVar('tf_yesno', Request::getInt('tf_yesno', 0));
+		    $testfieldsObj->setVar('tf_selectbox', Request::getString('tf_selectbox', ''));
+		    $testfieldsObj->setVar('tf_user', Request::getInt('tf_user', 0));
+		    $testfieldsObj->setVar('tf_color', Request::getString('tf_color', ''));
+		    // Set Var tf_imagelist
+		    include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		    $uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32', 
+													    $helper->getConfig('mimetypes_image'), 
+													    $helper->getConfig('maxsize_image'), null, null);
+		    if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+			    //$uploader->setPrefix(tf_imagelist_);
+			    //$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+			    if (!$uploader->upload()) {
+				    $errors = $uploader->getErrors();
+				    redirect_header('javascript:history.go(-1).php', 3, $errors);
+			    } else {
+				    $testfieldsObj->setVar('tf_imagelist', $uploader->getSavedFileName());
+			    }
+		    } else {
+			    $testfieldsObj->setVar('tf_imagelist', Request::getString('tf_imagelist'));
+		    }
+		    $testfieldsObj->setVar('tf_urlfile', formatUrl($_REQUEST['tf_urlfile']));
+		    // Set Var tf_urlfile
+		    include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		    $filename       = $_FILES['tf_urlfile']['name'];
+		    $imgNameDef     = Request::getString('tf_text');
+		    $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+													    $helper->getConfig('mimetypes_file'), 
+													    $helper->getConfig('maxsize_file'), null, null);
+		    if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) {
+			    $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+			    $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+			    $uploader->setPrefix($imgName);
+			    $uploader->fetchMedia($_POST['xoops_upload_file'][1]);
+			    if (!$uploader->upload()) {
+				    $errors = $uploader->getErrors();
+			    } else {
+				    $testfieldsObj->setVar('tf_urlfile', $uploader->getSavedFileName());
+			    }
+		    } else {
+			    if ($filename > '') {
+				    $uploaderErrors = $uploader->getErrors();
+			    }
+			    $testfieldsObj->setVar('tf_urlfile', Request::getString('tf_urlfile'));
+		    }
+		    // Set Var tf_uplimage
+		    include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		    $filename       = $_FILES['tf_uplimage']['name'];
+		    $imgMimetype    = $_FILES['tf_uplimage']['type'];
+		    $imgNameDef     = Request::getString('tf_text');
+		    $uploaderErrors = '';
+		    $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/', 
+													    $helper->getConfig('mimetypes_image'), 
+													    $helper->getConfig('maxsize_image'), null, null);
+		    if ($uploader->fetchMedia($_POST['xoops_upload_file'][2])) {
+			    $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+			    $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+			    $uploader->setPrefix($imgName);
+			    $uploader->fetchMedia($_POST['xoops_upload_file'][2]);
+			    if (!$uploader->upload()) {
+				    $uploaderErrors = $uploader->getErrors();
+			    } else {
+				    $savedFilename = $uploader->getSavedFileName();
+				    $maxwidth  = (int)$helper->getConfig('maxwidth_image');
+				    $maxheight = (int)$helper->getConfig('maxheight_image');
+				    if ($maxwidth > 0 && $maxheight > 0) {
+					    // Resize image
+					    $imgHandler                = new Mymodule2\Common\Resizer();
+					    $imgHandler->sourceFile    = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
+					    $imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
+					    $imgHandler->imageMimetype = $imgMimetype;
+					    $imgHandler->maxWidth      = $maxwidth;
+					    $imgHandler->maxHeight     = $maxheight;
+					    $result                    = $imgHandler->resizeImage();
+				    }
+				    $testfieldsObj->setVar('tf_uplimage', $savedFilename);
+			    }
+		    } else {
+			    if ($filename > '') {
+				    $uploaderErrors = $uploader->getErrors();
+			    }
+			    $testfieldsObj->setVar('tf_uplimage', Request::getString('tf_uplimage'));
+		    }
+		    // Set Var tf_uplfile
+		    include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		    $filename       = $_FILES['tf_uplfile']['name'];
+		    $imgNameDef     = Request::getString('tf_text');
+		    $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+													    $helper->getConfig('mimetypes_file'), 
+													    $helper->getConfig('maxsize_file'), null, null);
+		    if ($uploader->fetchMedia($_POST['xoops_upload_file'][3])) {
+			    $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+			    $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+			    $uploader->setPrefix($imgName);
+			    $uploader->fetchMedia($_POST['xoops_upload_file'][3]);
+			    if (!$uploader->upload()) {
+				    $errors = $uploader->getErrors();
+			    } else {
+				    $testfieldsObj->setVar('tf_uplfile', $uploader->getSavedFileName());
+			    }
+		    } else {
+			    if ($filename > '') {
+				    $uploaderErrors = $uploader->getErrors();
+			    }
+			    $testfieldsObj->setVar('tf_uplfile', Request::getString('tf_uplfile'));
+		    }
+		    $testfieldTextdateselect = date_create_from_format(_SHORTDATESTRING, Request::getString('tf_textdateselect'));
+		    $testfieldsObj->setVar('tf_textdateselect', $testfieldTextdateselect->getTimestamp());
+		    // Set Var tf_selectfile
+		    include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		    $filename       = $_FILES['tf_selectfile']['name'];
+		    $imgNameDef     = Request::getString('tf_text');
+		    $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+													    $helper->getConfig('mimetypes_file'), 
+													    $helper->getConfig('maxsize_file'), null, null);
+		    if ($uploader->fetchMedia($_POST['xoops_upload_file'][4])) {
+			    $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+			    $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+			    $uploader->setPrefix($imgName);
+			    $uploader->fetchMedia($_POST['xoops_upload_file'][4]);
+			    if (!$uploader->upload()) {
+				    $errors = $uploader->getErrors();
+			    } else {
+				    $testfieldsObj->setVar('tf_selectfile', $uploader->getSavedFileName());
+			    }
+		    } else {
+			    if ($filename > '') {
+				    $uploaderErrors = $uploader->getErrors();
+			    }
+			    $testfieldsObj->setVar('tf_selectfile', Request::getString('tf_selectfile'));
+		    }
+		    $testfieldsObj->setVar('tf_status', Request::getInt('tf_status', 0));
+		    if ($error === true) {
+			    $GLOBALS['xoopsTpl']->assign('error_message', $errorMessage);
+		    } else {
+			    // Insert Data
+			    if ($testfields1->insert($testfieldsObj)) {
+				    redirect_header('index.php', 2, _MA_MYMODULE2_FORM_OK);
+			    }
+		    }
+		    // Get Form Error
+		    $GLOBALS['xoopsTpl']->assign('error', $testfieldsObj->getHtmlErrors());
+		    $form = $testfieldsObj->getFormTestfields();
+		    $GLOBALS['xoopsTpl']->assign('form', $form->display());
 
-	break;
+	    break;
 }
 require __DIR__ . '/footer.php';

Spacing +23 added lines, -23 removed lines

@@ -24,30 +24,30 @@ 
 use XoopsModules\Mymodule2;
 use XoopsModules\Mymodule2\Constants;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 $op = Request::getString('op', 'list');
 $tfId = Request::getInt('tf_id');
 // Template
 $GLOBALS['xoopsOption']['template_main'] = 'mymodule2_broken.tpl';
-include_once XOOPS_ROOT_PATH . '/header.php';
-$GLOBALS['xoTheme']->addStylesheet( $style, null );
+include_once XOOPS_ROOT_PATH.'/header.php';
+$GLOBALS['xoTheme']->addStylesheet($style, null);
 // Redirection if not permissions
 if ($permSubmit === false) {
 	redirect_header('index.php', 2, _NOPERM);
 	exit();
 }
-switch($op) {
+switch ($op) {
 	case 'form':
 	default:
 		// Navigation
 		$navigation = _MA_MYMODULE2_SUBMIT_PROPOSER;
 		$GLOBALS['xoopsTpl']->assign('navigation', $navigation);
 		// Title of page
-		$title = _MA_MYMODULE2_SUBMIT_PROPOSER . ' - ';
+		$title = _MA_MYMODULE2_SUBMIT_PROPOSER.' - ';
 		$title .= $GLOBALS['xoopsModule']->name();
 		$GLOBALS['xoopsTpl']->assign('xoops_pagetitle', $title);
 		// Description
-		$GLOBALS['xoTheme']->addMeta( 'meta', 'description', strip_tags(_MA_MYMODULE2_SUBMIT_PROPOSER));
+		$GLOBALS['xoTheme']->addMeta('meta', 'description', strip_tags(_MA_MYMODULE2_SUBMIT_PROPOSER));
 		// Form Create
 		$testfieldsObj = $testfieldsHandler->create();
 		$form = $testfieldsObj->getFormTestfields();
@@ -78,8 +78,8 @@ 
 		$testfieldsObj->setVar('tf_user', Request::getInt('tf_user', 0));
 		$testfieldsObj->setVar('tf_color', Request::getString('tf_color', ''));
 		// Set Var tf_imagelist
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32', 
+		include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+		$uploader = new \XoopsMediaUploader(XOOPS_ROOT_PATH.'/Frameworks/moduleclasses/icons/32', 
 													$helper->getConfig('mimetypes_image'), 
 													$helper->getConfig('maxsize_image'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
@@ -96,15 +96,15 @@ 
 		}
 		$testfieldsObj->setVar('tf_urlfile', formatUrl($_REQUEST['tf_urlfile']));
 		// Set Var tf_urlfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		include_once XOOPS_ROOT_PATH.'/class/uploader.php';
 		$filename       = $_FILES['tf_urlfile']['name'];
 		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH.'/testfields/', 
 													$helper->getConfig('mimetypes_file'), 
 													$helper->getConfig('maxsize_file'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) {
 			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+			$imgName = str_replace(' ', '', $imgNameDef).'.'.$extension;
 			$uploader->setPrefix($imgName);
 			$uploader->fetchMedia($_POST['xoops_upload_file'][1]);
 			if (!$uploader->upload()) {
@@ -119,17 +119,17 @@ 
 			$testfieldsObj->setVar('tf_urlfile', Request::getString('tf_urlfile'));
 		}
 		// Set Var tf_uplimage
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		include_once XOOPS_ROOT_PATH.'/class/uploader.php';
 		$filename       = $_FILES['tf_uplimage']['name'];
 		$imgMimetype    = $_FILES['tf_uplimage']['type'];
 		$imgNameDef     = Request::getString('tf_text');
 		$uploaderErrors = '';
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/', 
+		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH.'/testfields/', 
 													$helper->getConfig('mimetypes_image'), 
 													$helper->getConfig('maxsize_image'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][2])) {
 			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+			$imgName = str_replace(' ', '', $imgNameDef).'.'.$extension;
 			$uploader->setPrefix($imgName);
 			$uploader->fetchMedia($_POST['xoops_upload_file'][2]);
 			if (!$uploader->upload()) {
@@ -141,8 +141,8 @@ 
 				if ($maxwidth > 0 && $maxheight > 0) {
 					// Resize image
 					$imgHandler                = new Mymodule2\Common\Resizer();
-					$imgHandler->sourceFile    = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
-					$imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH . '/testfields/' . $savedFilename;
+					$imgHandler->sourceFile    = MYMODULE2_UPLOAD_IMAGE_PATH.'/testfields/'.$savedFilename;
+					$imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH.'/testfields/'.$savedFilename;
 					$imgHandler->imageMimetype = $imgMimetype;
 					$imgHandler->maxWidth      = $maxwidth;
 					$imgHandler->maxHeight     = $maxheight;
@@ -157,15 +157,15 @@ 
 			$testfieldsObj->setVar('tf_uplimage', Request::getString('tf_uplimage'));
 		}
 		// Set Var tf_uplfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		include_once XOOPS_ROOT_PATH.'/class/uploader.php';
 		$filename       = $_FILES['tf_uplfile']['name'];
 		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH.'/testfields/', 
 													$helper->getConfig('mimetypes_file'), 
 													$helper->getConfig('maxsize_file'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][3])) {
 			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+			$imgName = str_replace(' ', '', $imgNameDef).'.'.$extension;
 			$uploader->setPrefix($imgName);
 			$uploader->fetchMedia($_POST['xoops_upload_file'][3]);
 			if (!$uploader->upload()) {
@@ -182,15 +182,15 @@ 
 		$testfieldTextdateselect = date_create_from_format(_SHORTDATESTRING, Request::getString('tf_textdateselect'));
 		$testfieldsObj->setVar('tf_textdateselect', $testfieldTextdateselect->getTimestamp());
 		// Set Var tf_selectfile
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+		include_once XOOPS_ROOT_PATH.'/class/uploader.php';
 		$filename       = $_FILES['tf_selectfile']['name'];
 		$imgNameDef     = Request::getString('tf_text');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/testfields/', 
+		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH.'/testfields/', 
 													$helper->getConfig('mimetypes_file'), 
 													$helper->getConfig('maxsize_file'), null, null);
 		if ($uploader->fetchMedia($_POST['xoops_upload_file'][4])) {
 			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+			$imgName = str_replace(' ', '', $imgNameDef).'.'.$extension;
 			$uploader->setPrefix($imgName);
 			$uploader->fetchMedia($_POST['xoops_upload_file'][4]);
 			if (!$uploader->upload()) {
@@ -220,4 +220,4 @@ 
 
 	break;
 }
-require __DIR__ . '/footer.php';
+require __DIR__.'/footer.php';

testdata/mymodule2/testdata/index.php

Spacing +19 added lines, -19 removed lines

@@ -18,8 +18,8 @@ 
 use XoopsModules\Mymodule2\Common;
 use XoopsModules\Mymodule2\Utility;
 
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-require dirname(__DIR__) . '/preloads/autoloader.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+require dirname(__DIR__).'/preloads/autoloader.php';
 
 $op = \Xmf\Request::getCmd('op', '');
 
@@ -39,7 +39,7 @@ 
             loadSampleData();
         } else {
             xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA_OK')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA_OK')), constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'), true);
             xoops_cp_footer();
         }
         break;
@@ -63,20 +63,20 @@ 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
 
     $language = 'english/';
-    if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
-        $language = $xoopsConfig['language'] . '/';
+    if (is_dir(__DIR__.'/'.$xoopsConfig['language'])) {
+        $language = $xoopsConfig['language'].'/';
     }
 
 	// load module tables
     foreach ($tables as $table) {
-        $tabledata = \Xmf\Yaml::readWrapped($language . $table . '.yml');
+        $tabledata = \Xmf\Yaml::readWrapped($language.$table.'.yml');
         \Xmf\Database\TableLoad::truncateTable($table);
         \Xmf\Database\TableLoad::loadTableFromArray($table, $tabledata);
     }
 	
 	// load permissions
     $table     = 'group_permission';
-    $tabledata = \Xmf\Yaml::readWrapped($language . $table . '.yml');
+    $tabledata = \Xmf\Yaml::readWrapped($language.$table.'.yml');
     $mid       = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getVar('mid');
     loadTableFromArrayWithReplace($table, $tabledata, 'gperm_modid', $mid);
 
@@ -89,7 +89,7 @@ 
             $utility::rcopy($src, $dest);
         }
     }
-    redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS'));
+    redirect_header('../admin/index.php', 1, constant('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS'));
 }
 
 function saveSampleData()
@@ -103,23 +103,23 @@ 
 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
 
-    $languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
-    if (!file_exists($languageFolder . '/')) {
-       Utility::createFolder($languageFolder . '/');
+    $languageFolder = __DIR__.'/'.$xoopsConfig['language'];
+    if (!file_exists($languageFolder.'/')) {
+       Utility::createFolder($languageFolder.'/');
     }
-    $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
+    $exportFolder = $languageFolder.'/Exports-'.date('Y-m-d-H-i-s').'/';
     Utility::createFolder($exportFolder);
 
 	// save module tables
     foreach ($tables as $table) {
-        \Xmf\Database\TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
+        \Xmf\Database\TableLoad::saveTableToYamlFile($table, $exportFolder.$table.'.yml');
     }
 	
 	// save permissions
 	$criteria = new \CriteriaCompo();
     $criteria->add(new \Criteria('gperm_modid', \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getVar('mid')));
     $skipColumns[] = 'gperm_id';
-    \Xmf\Database\TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns);
+    \Xmf\Database\TableLoad::saveTableToYamlFile('group_permission', $exportFolder.'group_permission.yml', $criteria, $skipColumns);
     unset($criteria);
     
     //  ---  COPY test folder files ---------------
@@ -130,7 +130,7 @@ 
             Utility::rcopy($src, $dest);
         }
     }
-    redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS'));
+    redirect_header('../admin/index.php', 1, constant('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS'));
 }
 
 function exportSchema()
@@ -146,7 +146,7 @@ 
         //        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
     }
     catch (\Exception $e) {
-        exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
+        exit(constant('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR'));
     }
 
 }
@@ -171,12 +171,12 @@ 
     $prefixedTable = $db->prefix($table);
     $count         = 0;
 
-    $sql = 'DELETE FROM ' . $prefixedTable . ' WHERE `' . $search . '`=' . $db->quote($replace);
+    $sql = 'DELETE FROM '.$prefixedTable.' WHERE `'.$search.'`='.$db->quote($replace);
 
     $result = $db->queryF($sql);
 
     foreach ($data as $row) {
-        $insertInto  = 'INSERT INTO ' . $prefixedTable . ' (';
+        $insertInto  = 'INSERT INTO '.$prefixedTable.' (';
         $valueClause = ' VALUES (';
         $first       = true;
         foreach ($row as $column => $value) {
@@ -195,7 +195,7 @@ 
             }
         }
 
-        $sql = $insertInto . ') ' . $valueClause . ')';
+        $sql = $insertInto.') '.$valueClause.')';
 
         $result = $db->queryF($sql);
         if (false !== $result) {

Braces +1 added lines, -2 removed lines

@@ -119,8 +119,7 @@
         //        $migrate->saveCurrentSchema();
         //
         //        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
-    }
-    catch (\Exception $e) {
+    } catch (\Exception $e) {
         exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
     }
 

Indentation +6 added lines, -6 removed lines

@@ -67,14 +67,14 @@ 
         $language = $xoopsConfig['language'] . '/';
     }
 
-	// load module tables
+    // load module tables
     foreach ($tables as $table) {
         $tabledata = \Xmf\Yaml::readWrapped($language . $table . '.yml');
         \Xmf\Database\TableLoad::truncateTable($table);
         \Xmf\Database\TableLoad::loadTableFromArray($table, $tabledata);
     }
 	
-	// load permissions
+    // load permissions
     $table     = 'group_permission';
     $tabledata = \Xmf\Yaml::readWrapped($language . $table . '.yml');
     $mid       = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getVar('mid');
@@ -105,18 +105,18 @@ 
 
     $languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
     if (!file_exists($languageFolder . '/')) {
-       Utility::createFolder($languageFolder . '/');
+        Utility::createFolder($languageFolder . '/');
     }
     $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
     Utility::createFolder($exportFolder);
 
-	// save module tables
+    // save module tables
     foreach ($tables as $table) {
         \Xmf\Database\TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
     }
 	
-	// save permissions
-	$criteria = new \CriteriaCompo();
+    // save permissions
+    $criteria = new \CriteriaCompo();
     $criteria->add(new \Criteria('gperm_modid', \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getVar('mid')));
     $skipColumns[] = 'gperm_id';
     \Xmf\Database\TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns);

testdata/mymodule2/index.php

Indentation +46 added lines, -46 removed lines

@@ -38,29 +38,29 @@ 
 $GLOBALS['xoopsTpl']->assign('articlesCount', $articlesCount);
 $count = 1;
 if ($articlesCount > 0) {
-	$start = Request::getInt('start', 0);
-	$limit = Request::getInt('limit', $helper->getConfig('userpager'));
-	$articlesAll = $articlesHandler->getAllArticles($start, $limit);
-	// Get All Articles
-	$articles = [];
-	foreach(array_keys($articlesAll) as $i) {
-		$article = $articlesAll[$i]->getValuesArticles();
-		$acount = ['count', $count];
-		$articles[] = array_merge($article, $acount);
-		$keywords[] = $articlesAll[$i]->getVar('tf_text');
-		++$count;
-	}
-	$GLOBALS['xoopsTpl']->assign('articles', $articles);
-	unset($articles);
-	// Display Navigation
-	if ($articlesCount > $limit) {
-		include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-		$pagenav = new \XoopsPageNav($articlesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
-		$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
-	}
-	$GLOBALS['xoopsTpl']->assign('lang_thereare', sprintf(_MA_MYMODULE2_INDEX_THEREARE, $articlesCount));
-	$GLOBALS['xoopsTpl']->assign('divideby', $helper->getConfig('divideby'));
-	$GLOBALS['xoopsTpl']->assign('numb_col', $helper->getConfig('numb_col'));
+    $start = Request::getInt('start', 0);
+    $limit = Request::getInt('limit', $helper->getConfig('userpager'));
+    $articlesAll = $articlesHandler->getAllArticles($start, $limit);
+    // Get All Articles
+    $articles = [];
+    foreach(array_keys($articlesAll) as $i) {
+        $article = $articlesAll[$i]->getValuesArticles();
+        $acount = ['count', $count];
+        $articles[] = array_merge($article, $acount);
+        $keywords[] = $articlesAll[$i]->getVar('tf_text');
+        ++$count;
+    }
+    $GLOBALS['xoopsTpl']->assign('articles', $articles);
+    unset($articles);
+    // Display Navigation
+    if ($articlesCount > $limit) {
+        include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        $pagenav = new \XoopsPageNav($articlesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+        $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
+    }
+    $GLOBALS['xoopsTpl']->assign('lang_thereare', sprintf(_MA_MYMODULE2_INDEX_THEREARE, $articlesCount));
+    $GLOBALS['xoopsTpl']->assign('divideby', $helper->getConfig('divideby'));
+    $GLOBALS['xoopsTpl']->assign('numb_col', $helper->getConfig('numb_col'));
 }
 unset($count);
 $GLOBALS['xoopsTpl']->assign('table_type', $helper->getConfig('table_type'));
@@ -72,29 +72,29 @@ 
 $GLOBALS['xoopsTpl']->assign('testfieldsCount', $testfieldsCount);
 $count = 1;
 if ($testfieldsCount > 0) {
-	$start = Request::getInt('start', 0);
-	$limit = Request::getInt('limit', $helper->getConfig('userpager'));
-	$testfieldsAll = $testfieldsHandler->getAllTestfields($start, $limit);
-	// Get All Testfields
-	$testfields = [];
-	foreach(array_keys($testfieldsAll) as $i) {
-		$testfield = $testfieldsAll[$i]->getValuesTestfields();
-		$acount = ['count', $count];
-		$testfields[] = array_merge($testfield, $acount);
-		$keywords[] = $testfieldsAll[$i]->getVar('tf_text');
-		++$count;
-	}
-	$GLOBALS['xoopsTpl']->assign('testfields', $testfields);
-	unset($testfields);
-	// Display Navigation
-	if ($testfieldsCount > $limit) {
-		include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-		$pagenav = new \XoopsPageNav($testfieldsCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
-		$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
-	}
-	$GLOBALS['xoopsTpl']->assign('lang_thereare', sprintf(_MA_MYMODULE2_INDEX_THEREARE, $testfieldsCount));
-	$GLOBALS['xoopsTpl']->assign('divideby', $helper->getConfig('divideby'));
-	$GLOBALS['xoopsTpl']->assign('numb_col', $helper->getConfig('numb_col'));
+    $start = Request::getInt('start', 0);
+    $limit = Request::getInt('limit', $helper->getConfig('userpager'));
+    $testfieldsAll = $testfieldsHandler->getAllTestfields($start, $limit);
+    // Get All Testfields
+    $testfields = [];
+    foreach(array_keys($testfieldsAll) as $i) {
+        $testfield = $testfieldsAll[$i]->getValuesTestfields();
+        $acount = ['count', $count];
+        $testfields[] = array_merge($testfield, $acount);
+        $keywords[] = $testfieldsAll[$i]->getVar('tf_text');
+        ++$count;
+    }
+    $GLOBALS['xoopsTpl']->assign('testfields', $testfields);
+    unset($testfields);
+    // Display Navigation
+    if ($testfieldsCount > $limit) {
+        include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        $pagenav = new \XoopsPageNav($testfieldsCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+        $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
+    }
+    $GLOBALS['xoopsTpl']->assign('lang_thereare', sprintf(_MA_MYMODULE2_INDEX_THEREARE, $testfieldsCount));
+    $GLOBALS['xoopsTpl']->assign('divideby', $helper->getConfig('divideby'));
+    $GLOBALS['xoopsTpl']->assign('numb_col', $helper->getConfig('numb_col'));
 }
 unset($count);
 $GLOBALS['xoopsTpl']->assign('table_type', $helper->getConfig('table_type'));

Spacing +11 added lines, -11 removed lines

@@ -24,11 +24,11 @@ 
 use XoopsModules\Mymodule2;
 use XoopsModules\Mymodule2\Constants;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 $GLOBALS['xoopsOption']['template_main'] = 'mymodule2_index.tpl';
-include_once XOOPS_ROOT_PATH . '/header.php';
+include_once XOOPS_ROOT_PATH.'/header.php';
 // Define Stylesheet
-$GLOBALS['xoTheme']->addStylesheet( $style, null );
+$GLOBALS['xoTheme']->addStylesheet($style, null);
 $keywords = [];
 // 
 $GLOBALS['xoopsTpl']->assign('xoops_icons32_url', XOOPS_ICONS32_URL);
@@ -43,7 +43,7 @@ 
 	$articlesAll = $articlesHandler->getAllArticles($start, $limit);
 	// Get All Articles
 	$articles = [];
-	foreach(array_keys($articlesAll) as $i) {
+	foreach (array_keys($articlesAll) as $i) {
 		$article = $articlesAll[$i]->getValuesArticles();
 		$acount = ['count', $count];
 		$articles[] = array_merge($article, $acount);
@@ -54,8 +54,8 @@ 
 	unset($articles);
 	// Display Navigation
 	if ($articlesCount > $limit) {
-		include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-		$pagenav = new \XoopsPageNav($articlesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+		include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+		$pagenav = new \XoopsPageNav($articlesCount, $limit, $start, 'start', 'op=list&limit='.$limit);
 		$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
 	}
 	$GLOBALS['xoopsTpl']->assign('lang_thereare', sprintf(_MA_MYMODULE2_INDEX_THEREARE, $articlesCount));
@@ -77,7 +77,7 @@ 
 	$testfieldsAll = $testfieldsHandler->getAllTestfields($start, $limit);
 	// Get All Testfields
 	$testfields = [];
-	foreach(array_keys($testfieldsAll) as $i) {
+	foreach (array_keys($testfieldsAll) as $i) {
 		$testfield = $testfieldsAll[$i]->getValuesTestfields();
 		$acount = ['count', $count];
 		$testfields[] = array_merge($testfield, $acount);
@@ -88,8 +88,8 @@ 
 	unset($testfields);
 	// Display Navigation
 	if ($testfieldsCount > $limit) {
-		include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-		$pagenav = new \XoopsPageNav($testfieldsCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+		include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+		$pagenav = new \XoopsPageNav($testfieldsCount, $limit, $start, 'start', 'op=list&limit='.$limit);
 		$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
 	}
 	$GLOBALS['xoopsTpl']->assign('lang_thereare', sprintf(_MA_MYMODULE2_INDEX_THEREARE, $testfieldsCount));
@@ -101,11 +101,11 @@ 
 // Breadcrumbs
 $xoBreadcrumbs[] = ['title' => _MA_MYMODULE2_INDEX];
 // Keywords
-mymodule2MetaKeywords($helper->getConfig('keywords').', '. implode(',', $keywords));
+mymodule2MetaKeywords($helper->getConfig('keywords').', '.implode(',', $keywords));
 unset($keywords);
 // Description
 mymodule2MetaDescription(_MA_MYMODULE2_INDEX_DESC);
 $GLOBALS['xoopsTpl']->assign('xoops_mpageurl', MYMODULE2_URL.'/index.php');
 $GLOBALS['xoopsTpl']->assign('xoops_icons32_url', XOOPS_ICONS32_URL);
 $GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
-require __DIR__ . '/footer.php';
+require __DIR__.'/footer.php';