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

Passed

Push — master ( c30da6...834a16 )

by Michael

created 2020-04-30 10:48 UTC

Status

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

@@ -27,9 +27,9 @@  discard block
 block discarded – undo
 require __DIR__ . '/header.php';
 $tfId = Request::getInt('tf_id');
 if (file_exists($tcpdf = XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php')) {
-	require_once $tcpdf;
+    require_once $tcpdf;
 } else {
-	redirect_header('testfields.php', 2, _MA_MYMODULE2_NO_PDF_LIBRARY);
+    redirect_header('testfields.php', 2, _MA_MYMODULE2_NO_PDF_LIBRARY);
 }
 // Get Instance of Handler
 $testfieldsHandler = $helper->getHandler('testfields');
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
 $pdfData['fontsize'] = 12;
 // For schinese
 if (_LANGCODE == 'cn') {
-	$pdf->SetFont('gbsn00lp', '', $pdfData['fontsize']);
+    $pdf->SetFont('gbsn00lp', '', $pdfData['fontsize']);
 } else {
-	$pdf->SetFont($pdfData['fontname'], '', $pdfData['fontsize']);
+    $pdf->SetFont($pdfData['fontname'], '', $pdfData['fontsize']);
 }
 // Set document information
 $pdf->SetCreator($pdfData['creator']);
@@ -80,16 +80,16 @@  discard block
 block discarded – undo
 $pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
 $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); //set image scale factor
 if (_LANGCODE == 'cn') {
-	$pdf->setHeaderFont(array('gbsn00lp', '', $pdfData['fontsize']));
-	$pdf->setFooterFont(array('gbsn00lp', '', $pdfData['fontsize']));
+    $pdf->setHeaderFont(array('gbsn00lp', '', $pdfData['fontsize']));
+    $pdf->setFooterFont(array('gbsn00lp', '', $pdfData['fontsize']));
 } else {
-	$pdf->setHeaderFont(array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
-	$pdf->setFooterFont(array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
+    $pdf->setHeaderFont(array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
+    $pdf->setFooterFont(array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
 }
 // Set some language-dependent strings (optional)
 if (@file_exists($lang = XOOPS_ROOT_PATH.'/Frameworks/tcpdf/lang/eng.php')) {
-	require_once $lang . '/.php';
-	$pdf->setLanguageArray($l);
+    require_once $lang . '/.php';
+    $pdf->setLanguageArray($l);
 }
 // Initialize document
 $pdf->AliasNbPages();

Please login to merge, or discard this patch.

testdata/mymodule2/xoops_version.php 1 patch

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

@@ -25,94 +25,94 @@  discard block
 block discarded – undo
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 // ------------------- Informations ------------------- //
 $modversion = [
-	'name'                => _MI_MYMODULE2_NAME,
-	'version'             => 1.0,
-	'description'         => _MI_MYMODULE2_DESC,
-	'author'              => 'TDM XOOPS',
-	'author_mail'         => '[email protected]',
-	'author_website_url'  => 'http://xoops.org',
-	'author_website_name' => 'XOOPS Project',
-	'credits'             => 'XOOPS Development Team',
-	'license'             => 'GPL 2.0 or later',
-	'license_url'         => 'http://www.gnu.org/licenses/gpl-3.0.en.html',
-	'help'                => 'page=help',
-	'release_info'        => 'release_info',
-	'release_file'        => XOOPS_URL . '/modules/mymodule2/docs/release_info file',
-	'release_date'        => '2020/04/16',
-	'manual'              => 'link to manual file',
-	'manual_file'         => XOOPS_URL . '/modules/mymodule2/docs/install.txt',
-	'min_php'             => '7.0',
-	'min_xoops'           => '2.5.9',
-	'min_admin'           => '1.2',
-	'min_db'              => array('mysql' => '5.6', 'mysqli' => '5.6'),
-	'image'               => 'assets/images/logoModule.png',
-	'dirname'             => basename(__DIR__),
-	'dirmoduleadmin'      => 'Frameworks/moduleclasses/moduleadmin',
-	'sysicons16'          => '../../Frameworks/moduleclasses/icons/16',
-	'sysicons32'          => '../../Frameworks/moduleclasses/icons/32',
-	'modicons16'          => 'assets/icons/16',
-	'modicons32'          => 'assets/icons/32',
-	'demo_site_url'       => 'https://xoops.org',
-	'demo_site_name'      => 'XOOPS Demo Site',
-	'support_url'         => 'https://xoops.org/modules/newbb',
-	'support_name'        => 'Support Forum',
-	'module_website_url'  => 'www.xoops.org',
-	'module_website_name' => 'XOOPS Project',
-	'release'             => '2017-12-02',
-	'module_status'       => 'Beta 1',
-	'system_menu'         => 1,
-	'hasAdmin'            => 1,
-	'hasMain'             => 1,
-	'adminindex'          => 'admin/index.php',
-	'adminmenu'           => 'admin/menu.php',
-	'onInstall'           => 'include/install.php',
-	'onUninstall'         => 'include/uninstall.php',
-	'onUpdate'            => 'include/update.php',
+    'name'                => _MI_MYMODULE2_NAME,
+    'version'             => 1.0,
+    'description'         => _MI_MYMODULE2_DESC,
+    'author'              => 'TDM XOOPS',
+    'author_mail'         => '[email protected]',
+    'author_website_url'  => 'http://xoops.org',
+    'author_website_name' => 'XOOPS Project',
+    'credits'             => 'XOOPS Development Team',
+    'license'             => 'GPL 2.0 or later',
+    'license_url'         => 'http://www.gnu.org/licenses/gpl-3.0.en.html',
+    'help'                => 'page=help',
+    'release_info'        => 'release_info',
+    'release_file'        => XOOPS_URL . '/modules/mymodule2/docs/release_info file',
+    'release_date'        => '2020/04/16',
+    'manual'              => 'link to manual file',
+    'manual_file'         => XOOPS_URL . '/modules/mymodule2/docs/install.txt',
+    'min_php'             => '7.0',
+    'min_xoops'           => '2.5.9',
+    'min_admin'           => '1.2',
+    'min_db'              => array('mysql' => '5.6', 'mysqli' => '5.6'),
+    'image'               => 'assets/images/logoModule.png',
+    'dirname'             => basename(__DIR__),
+    'dirmoduleadmin'      => 'Frameworks/moduleclasses/moduleadmin',
+    'sysicons16'          => '../../Frameworks/moduleclasses/icons/16',
+    'sysicons32'          => '../../Frameworks/moduleclasses/icons/32',
+    'modicons16'          => 'assets/icons/16',
+    'modicons32'          => 'assets/icons/32',
+    'demo_site_url'       => 'https://xoops.org',
+    'demo_site_name'      => 'XOOPS Demo Site',
+    'support_url'         => 'https://xoops.org/modules/newbb',
+    'support_name'        => 'Support Forum',
+    'module_website_url'  => 'www.xoops.org',
+    'module_website_name' => 'XOOPS Project',
+    'release'             => '2017-12-02',
+    'module_status'       => 'Beta 1',
+    'system_menu'         => 1,
+    'hasAdmin'            => 1,
+    'hasMain'             => 1,
+    'adminindex'          => 'admin/index.php',
+    'adminmenu'           => 'admin/menu.php',
+    'onInstall'           => 'include/install.php',
+    'onUninstall'         => 'include/uninstall.php',
+    'onUpdate'            => 'include/update.php',
 ];
 // ------------------- Templates ------------------- //
 $modversion['templates'] = [
-	// Admin templates
-	['file' => 'mymodule2_admin_about.tpl', 'description' => '', 'type' => 'admin'],
-	['file' => 'mymodule2_admin_header.tpl', 'description' => '', 'type' => 'admin'],
-	['file' => 'mymodule2_admin_index.tpl', 'description' => '', 'type' => 'admin'],
-	['file' => 'mymodule2_admin_categories.tpl', 'description' => '', 'type' => 'admin'],
-	['file' => 'mymodule2_admin_articles.tpl', 'description' => '', 'type' => 'admin'],
-	['file' => 'mymodule2_admin_testfields.tpl', 'description' => '', 'type' => 'admin'],
-	['file' => 'mymodule2_admin_permissions.tpl', 'description' => '', 'type' => 'admin'],
-	['file' => 'mymodule2_admin_footer.tpl', 'description' => '', 'type' => 'admin'],
-	// User templates
-	['file' => 'mymodule2_header.tpl', 'description' => ''],
-	['file' => 'mymodule2_index.tpl', 'description' => ''],
-	['file' => 'mymodule2_categories.tpl', 'description' => ''],
-	['file' => 'mymodule2_categories_list.tpl', 'description' => ''],
-	['file' => 'mymodule2_articles.tpl', 'description' => ''],
-	['file' => 'mymodule2_articles_list.tpl', 'description' => ''],
-	['file' => 'mymodule2_testfields.tpl', 'description' => ''],
-	['file' => 'mymodule2_testfields_list.tpl', 'description' => ''],
-	['file' => 'mymodule2_breadcrumbs.tpl', 'description' => ''],
-	['file' => 'mymodule2_broken.tpl', 'description' => ''],
-	['file' => 'mymodule2_pdf.tpl', 'description' => ''],
-	['file' => 'mymodule2_print.tpl', 'description' => ''],
-	['file' => 'mymodule2_rate.tpl', 'description' => ''],
-	['file' => 'mymodule2_rss.tpl', 'description' => ''],
-	['file' => 'mymodule2_search.tpl', 'description' => ''],
-	['file' => 'mymodule2_single.tpl', 'description' => ''],
-	['file' => 'mymodule2_submit.tpl', 'description' => ''],
-	['file' => 'mymodule2_footer.tpl', 'description' => ''],
+    // Admin templates
+    ['file' => 'mymodule2_admin_about.tpl', 'description' => '', 'type' => 'admin'],
+    ['file' => 'mymodule2_admin_header.tpl', 'description' => '', 'type' => 'admin'],
+    ['file' => 'mymodule2_admin_index.tpl', 'description' => '', 'type' => 'admin'],
+    ['file' => 'mymodule2_admin_categories.tpl', 'description' => '', 'type' => 'admin'],
+    ['file' => 'mymodule2_admin_articles.tpl', 'description' => '', 'type' => 'admin'],
+    ['file' => 'mymodule2_admin_testfields.tpl', 'description' => '', 'type' => 'admin'],
+    ['file' => 'mymodule2_admin_permissions.tpl', 'description' => '', 'type' => 'admin'],
+    ['file' => 'mymodule2_admin_footer.tpl', 'description' => '', 'type' => 'admin'],
+    // User templates
+    ['file' => 'mymodule2_header.tpl', 'description' => ''],
+    ['file' => 'mymodule2_index.tpl', 'description' => ''],
+    ['file' => 'mymodule2_categories.tpl', 'description' => ''],
+    ['file' => 'mymodule2_categories_list.tpl', 'description' => ''],
+    ['file' => 'mymodule2_articles.tpl', 'description' => ''],
+    ['file' => 'mymodule2_articles_list.tpl', 'description' => ''],
+    ['file' => 'mymodule2_testfields.tpl', 'description' => ''],
+    ['file' => 'mymodule2_testfields_list.tpl', 'description' => ''],
+    ['file' => 'mymodule2_breadcrumbs.tpl', 'description' => ''],
+    ['file' => 'mymodule2_broken.tpl', 'description' => ''],
+    ['file' => 'mymodule2_pdf.tpl', 'description' => ''],
+    ['file' => 'mymodule2_print.tpl', 'description' => ''],
+    ['file' => 'mymodule2_rate.tpl', 'description' => ''],
+    ['file' => 'mymodule2_rss.tpl', 'description' => ''],
+    ['file' => 'mymodule2_search.tpl', 'description' => ''],
+    ['file' => 'mymodule2_single.tpl', 'description' => ''],
+    ['file' => 'mymodule2_submit.tpl', 'description' => ''],
+    ['file' => 'mymodule2_footer.tpl', 'description' => ''],
 ];
 // ------------------- Mysql ------------------- //
 $modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
 // Tables
 $modversion['tables'] = [
-	'mymodule2_categories',
-	'mymodule2_articles',
-	'mymodule2_testfields',
+    'mymodule2_categories',
+    'mymodule2_articles',
+    'mymodule2_testfields',
 ];
 // ------------------- Search ------------------- //
 $modversion['hasSearch'] = 1;
 $modversion['search'] = [
-	'file' => 'include/search.inc.php',
-	'func' => 'mymodule2_search',
+    'file' => 'include/search.inc.php',
+    'func' => 'mymodule2_search',
 ];
 // ------------------- Comments ------------------- //
 $modversion['comments']['pageName'] = 'comments.php';
@@ -120,200 +120,200 @@  discard block
 block discarded – undo
 // Comment callback functions
 $modversion['comments']['callbackFile'] = 'include/comment_functions.php';
 $modversion['comments']['callback'] = [
-	'approve' => 'mymodule2CommentsApprove',
-	'update'  => 'mymodule2CommentsUpdate',
+    'approve' => 'mymodule2CommentsApprove',
+    'update'  => 'mymodule2CommentsUpdate',
 ];
 // ------------------- Menu ------------------- //
 $currdirname  = isset($GLOBALS['xoopsModule']) && is_object($GLOBALS['xoopsModule']) ? $GLOBALS['xoopsModule']->getVar('dirname') : 'system';
 if ($moduleDirName == $currdirname) {
-	$modversion['sub'][] = [
-		'name' => _MI_MYMODULE2_SMNAME1,
-		'url'  => 'index.php',
-	];
-	// Sub articles
-	$modversion['sub'][] = [
-		'name' => _MI_MYMODULE2_SMNAME2,
-		'url'  => 'articles.php',
-	];
-	// Sub testfields
-	$modversion['sub'][] = [
-		'name' => _MI_MYMODULE2_SMNAME3,
-		'url'  => 'testfields.php',
-	];
-	// Sub Submit
-	$modversion['sub'][] = [
-		'name' => _MI_MYMODULE2_SMNAME4,
-		'url'  => 'submit.php',
-	];
-	// Sub Search
-	$modversion['sub'][] = [
-		'name' => _MI_MYMODULE2_SMNAME5,
-		'url'  => 'search.php',
-	];
+    $modversion['sub'][] = [
+        'name' => _MI_MYMODULE2_SMNAME1,
+        'url'  => 'index.php',
+    ];
+    // Sub articles
+    $modversion['sub'][] = [
+        'name' => _MI_MYMODULE2_SMNAME2,
+        'url'  => 'articles.php',
+    ];
+    // Sub testfields
+    $modversion['sub'][] = [
+        'name' => _MI_MYMODULE2_SMNAME3,
+        'url'  => 'testfields.php',
+    ];
+    // Sub Submit
+    $modversion['sub'][] = [
+        'name' => _MI_MYMODULE2_SMNAME4,
+        'url'  => 'submit.php',
+    ];
+    // Sub Search
+    $modversion['sub'][] = [
+        'name' => _MI_MYMODULE2_SMNAME5,
+        'url'  => 'search.php',
+    ];
 }
 // ------------------- Blocks ------------------- //
 // Articles last
 $modversion['blocks'][] = [
-	'file'        => 'articles.php',
-	'name'        => _MI_MYMODULE2_ARTICLES_BLOCK_LAST,
-	'description' => _MI_MYMODULE2_ARTICLES_BLOCK_LAST_DESC,
-	'show_func'   => 'b_mymodule2_articles_show',
-	'edit_func'   => 'b_mymodule2_articles_edit',
-	'template'    => 'mymodule2_block_articles.tpl',
-	'options'     => 'last|5|25|0',
+    'file'        => 'articles.php',
+    'name'        => _MI_MYMODULE2_ARTICLES_BLOCK_LAST,
+    'description' => _MI_MYMODULE2_ARTICLES_BLOCK_LAST_DESC,
+    'show_func'   => 'b_mymodule2_articles_show',
+    'edit_func'   => 'b_mymodule2_articles_edit',
+    'template'    => 'mymodule2_block_articles.tpl',
+    'options'     => 'last|5|25|0',
 ];
 // Articles new
 $modversion['blocks'][] = [
-	'file'        => 'articles.php',
-	'name'        => _MI_MYMODULE2_ARTICLES_BLOCK_NEW,
-	'description' => _MI_MYMODULE2_ARTICLES_BLOCK_NEW_DESC,
-	'show_func'   => 'b_mymodule2_articles_show',
-	'edit_func'   => 'b_mymodule2_articles_edit',
-	'template'    => 'mymodule2_block_articles.tpl',
-	'options'     => 'new|5|25|0',
+    'file'        => 'articles.php',
+    'name'        => _MI_MYMODULE2_ARTICLES_BLOCK_NEW,
+    'description' => _MI_MYMODULE2_ARTICLES_BLOCK_NEW_DESC,
+    'show_func'   => 'b_mymodule2_articles_show',
+    'edit_func'   => 'b_mymodule2_articles_edit',
+    'template'    => 'mymodule2_block_articles.tpl',
+    'options'     => 'new|5|25|0',
 ];
 // Articles hits
 $modversion['blocks'][] = [
-	'file'        => 'articles.php',
-	'name'        => _MI_MYMODULE2_ARTICLES_BLOCK_HITS,
-	'description' => _MI_MYMODULE2_ARTICLES_BLOCK_HITS_DESC,
-	'show_func'   => 'b_mymodule2_articles_show',
-	'edit_func'   => 'b_mymodule2_articles_edit',
-	'template'    => 'mymodule2_block_articles.tpl',
-	'options'     => 'hits|5|25|0',
+    'file'        => 'articles.php',
+    'name'        => _MI_MYMODULE2_ARTICLES_BLOCK_HITS,
+    'description' => _MI_MYMODULE2_ARTICLES_BLOCK_HITS_DESC,
+    'show_func'   => 'b_mymodule2_articles_show',
+    'edit_func'   => 'b_mymodule2_articles_edit',
+    'template'    => 'mymodule2_block_articles.tpl',
+    'options'     => 'hits|5|25|0',
 ];
 // Articles top
 $modversion['blocks'][] = [
-	'file'        => 'articles.php',
-	'name'        => _MI_MYMODULE2_ARTICLES_BLOCK_TOP,
-	'description' => _MI_MYMODULE2_ARTICLES_BLOCK_TOP_DESC,
-	'show_func'   => 'b_mymodule2_articles_show',
-	'edit_func'   => 'b_mymodule2_articles_edit',
-	'template'    => 'mymodule2_block_articles.tpl',
-	'options'     => 'top|5|25|0',
+    'file'        => 'articles.php',
+    'name'        => _MI_MYMODULE2_ARTICLES_BLOCK_TOP,
+    'description' => _MI_MYMODULE2_ARTICLES_BLOCK_TOP_DESC,
+    'show_func'   => 'b_mymodule2_articles_show',
+    'edit_func'   => 'b_mymodule2_articles_edit',
+    'template'    => 'mymodule2_block_articles.tpl',
+    'options'     => 'top|5|25|0',
 ];
 // Articles random
 $modversion['blocks'][] = [
-	'file'        => 'articles.php',
-	'name'        => _MI_MYMODULE2_ARTICLES_BLOCK_RANDOM,
-	'description' => _MI_MYMODULE2_ARTICLES_BLOCK_RANDOM_DESC,
-	'show_func'   => 'b_mymodule2_articles_show',
-	'edit_func'   => 'b_mymodule2_articles_edit',
-	'template'    => 'mymodule2_block_articles.tpl',
-	'options'     => 'random|5|25|0',
+    'file'        => 'articles.php',
+    'name'        => _MI_MYMODULE2_ARTICLES_BLOCK_RANDOM,
+    'description' => _MI_MYMODULE2_ARTICLES_BLOCK_RANDOM_DESC,
+    'show_func'   => 'b_mymodule2_articles_show',
+    'edit_func'   => 'b_mymodule2_articles_edit',
+    'template'    => 'mymodule2_block_articles.tpl',
+    'options'     => 'random|5|25|0',
 ];
 // Testfields last
 $modversion['blocks'][] = [
-	'file'        => 'testfields.php',
-	'name'        => _MI_MYMODULE2_TESTFIELDS_BLOCK_LAST,
-	'description' => _MI_MYMODULE2_TESTFIELDS_BLOCK_LAST_DESC,
-	'show_func'   => 'b_mymodule2_testfields_show',
-	'edit_func'   => 'b_mymodule2_testfields_edit',
-	'template'    => 'mymodule2_block_testfields.tpl',
-	'options'     => 'last|5|25|0',
+    'file'        => 'testfields.php',
+    'name'        => _MI_MYMODULE2_TESTFIELDS_BLOCK_LAST,
+    'description' => _MI_MYMODULE2_TESTFIELDS_BLOCK_LAST_DESC,
+    'show_func'   => 'b_mymodule2_testfields_show',
+    'edit_func'   => 'b_mymodule2_testfields_edit',
+    'template'    => 'mymodule2_block_testfields.tpl',
+    'options'     => 'last|5|25|0',
 ];
 // Testfields new
 $modversion['blocks'][] = [
-	'file'        => 'testfields.php',
-	'name'        => _MI_MYMODULE2_TESTFIELDS_BLOCK_NEW,
-	'description' => _MI_MYMODULE2_TESTFIELDS_BLOCK_NEW_DESC,
-	'show_func'   => 'b_mymodule2_testfields_show',
-	'edit_func'   => 'b_mymodule2_testfields_edit',
-	'template'    => 'mymodule2_block_testfields.tpl',
-	'options'     => 'new|5|25|0',
+    'file'        => 'testfields.php',
+    'name'        => _MI_MYMODULE2_TESTFIELDS_BLOCK_NEW,
+    'description' => _MI_MYMODULE2_TESTFIELDS_BLOCK_NEW_DESC,
+    'show_func'   => 'b_mymodule2_testfields_show',
+    'edit_func'   => 'b_mymodule2_testfields_edit',
+    'template'    => 'mymodule2_block_testfields.tpl',
+    'options'     => 'new|5|25|0',
 ];
 // Testfields hits
 $modversion['blocks'][] = [
-	'file'        => 'testfields.php',
-	'name'        => _MI_MYMODULE2_TESTFIELDS_BLOCK_HITS,
-	'description' => _MI_MYMODULE2_TESTFIELDS_BLOCK_HITS_DESC,
-	'show_func'   => 'b_mymodule2_testfields_show',
-	'edit_func'   => 'b_mymodule2_testfields_edit',
-	'template'    => 'mymodule2_block_testfields.tpl',
-	'options'     => 'hits|5|25|0',
+    'file'        => 'testfields.php',
+    'name'        => _MI_MYMODULE2_TESTFIELDS_BLOCK_HITS,
+    'description' => _MI_MYMODULE2_TESTFIELDS_BLOCK_HITS_DESC,
+    'show_func'   => 'b_mymodule2_testfields_show',
+    'edit_func'   => 'b_mymodule2_testfields_edit',
+    'template'    => 'mymodule2_block_testfields.tpl',
+    'options'     => 'hits|5|25|0',
 ];
 // Testfields top
 $modversion['blocks'][] = [
-	'file'        => 'testfields.php',
-	'name'        => _MI_MYMODULE2_TESTFIELDS_BLOCK_TOP,
-	'description' => _MI_MYMODULE2_TESTFIELDS_BLOCK_TOP_DESC,
-	'show_func'   => 'b_mymodule2_testfields_show',
-	'edit_func'   => 'b_mymodule2_testfields_edit',
-	'template'    => 'mymodule2_block_testfields.tpl',
-	'options'     => 'top|5|25|0',
+    'file'        => 'testfields.php',
+    'name'        => _MI_MYMODULE2_TESTFIELDS_BLOCK_TOP,
+    'description' => _MI_MYMODULE2_TESTFIELDS_BLOCK_TOP_DESC,
+    'show_func'   => 'b_mymodule2_testfields_show',
+    'edit_func'   => 'b_mymodule2_testfields_edit',
+    'template'    => 'mymodule2_block_testfields.tpl',
+    'options'     => 'top|5|25|0',
 ];
 // Testfields random
 $modversion['blocks'][] = [
-	'file'        => 'testfields.php',
-	'name'        => _MI_MYMODULE2_TESTFIELDS_BLOCK_RANDOM,
-	'description' => _MI_MYMODULE2_TESTFIELDS_BLOCK_RANDOM_DESC,
-	'show_func'   => 'b_mymodule2_testfields_show',
-	'edit_func'   => 'b_mymodule2_testfields_edit',
-	'template'    => 'mymodule2_block_testfields.tpl',
-	'options'     => 'random|5|25|0',
+    'file'        => 'testfields.php',
+    'name'        => _MI_MYMODULE2_TESTFIELDS_BLOCK_RANDOM,
+    'description' => _MI_MYMODULE2_TESTFIELDS_BLOCK_RANDOM_DESC,
+    'show_func'   => 'b_mymodule2_testfields_show',
+    'edit_func'   => 'b_mymodule2_testfields_edit',
+    'template'    => 'mymodule2_block_testfields.tpl',
+    'options'     => 'random|5|25|0',
 ];
 // ------------------- Config ------------------- //
 // Editor descr
 xoops_load('xoopseditorhandler');
 $editorHandlerDescr = XoopsEditorHandler::getInstance();
 $modversion['config'][] = [
-	'name'        => 'editor_descr',
-	'title'       => '_MI_MYMODULE2_EDITOR_DESCR',
-	'description' => '_MI_MYMODULE2_EDITOR_DESCR_DESC',
-	'formtype'    => 'select',
-	'valuetype'   => 'text',
-	'default'     => 'dhtml',
-	'options'     => array_flip($editorHandlerDescr->getList()),
+    'name'        => 'editor_descr',
+    'title'       => '_MI_MYMODULE2_EDITOR_DESCR',
+    'description' => '_MI_MYMODULE2_EDITOR_DESCR_DESC',
+    'formtype'    => 'select',
+    'valuetype'   => 'text',
+    'default'     => 'dhtml',
+    'options'     => array_flip($editorHandlerDescr->getList()),
 ];
 // Editor textarea
 xoops_load('xoopseditorhandler');
 $editorHandlerTextarea = XoopsEditorHandler::getInstance();
 $modversion['config'][] = [
-	'name'        => 'editor_textarea',
-	'title'       => '_MI_MYMODULE2_EDITOR_TEXTAREA',
-	'description' => '_MI_MYMODULE2_EDITOR_TEXTAREA_DESC',
-	'formtype'    => 'select',
-	'valuetype'   => 'text',
-	'default'     => 'dhtml',
-	'options'     => array_flip($editorHandlerTextarea->getList()),
+    'name'        => 'editor_textarea',
+    'title'       => '_MI_MYMODULE2_EDITOR_TEXTAREA',
+    'description' => '_MI_MYMODULE2_EDITOR_TEXTAREA_DESC',
+    'formtype'    => 'select',
+    'valuetype'   => 'text',
+    'default'     => 'dhtml',
+    'options'     => array_flip($editorHandlerTextarea->getList()),
 ];
 // Editor dhtml
 xoops_load('xoopseditorhandler');
 $editorHandlerDhtml = XoopsEditorHandler::getInstance();
 $modversion['config'][] = [
-	'name'        => 'editor_dhtml',
-	'title'       => '_MI_MYMODULE2_EDITOR_DHTML',
-	'description' => '_MI_MYMODULE2_EDITOR_DHTML_DESC',
-	'formtype'    => 'select',
-	'valuetype'   => 'text',
-	'default'     => 'dhtml',
-	'options'     => array_flip($editorHandlerDhtml->getList()),
+    'name'        => 'editor_dhtml',
+    'title'       => '_MI_MYMODULE2_EDITOR_DHTML',
+    'description' => '_MI_MYMODULE2_EDITOR_DHTML_DESC',
+    'formtype'    => 'select',
+    'valuetype'   => 'text',
+    'default'     => 'dhtml',
+    'options'     => array_flip($editorHandlerDhtml->getList()),
 ];
 // Get groups
 $memberHandler  = xoops_getHandler('member');
 $xoopsGroups  = $memberHandler->getGroupList();
 foreach($xoopsGroups as $key => $group) {
-	$groups[$group]  = $key;
+    $groups[$group]  = $key;
 }
 // General access groups
 $modversion['config'][] = [
-	'name'        => 'groups',
-	'title'       => '_MI_MYMODULE2_GROUPS',
-	'description' => '_MI_MYMODULE2_GROUPS_DESC',
-	'formtype'    => 'select_multi',
-	'valuetype'   => 'array',
-	'default'     => $groups,
-	'options'     => $groups,
+    'name'        => 'groups',
+    'title'       => '_MI_MYMODULE2_GROUPS',
+    'description' => '_MI_MYMODULE2_GROUPS_DESC',
+    'formtype'    => 'select_multi',
+    'valuetype'   => 'array',
+    'default'     => $groups,
+    'options'     => $groups,
 ];
 // Upload groups
 $modversion['config'][] = [
-	'name'        => 'upload_groups',
-	'title'       => '_MI_MYMODULE2_UPLOAD_GROUPS',
-	'description' => '_MI_MYMODULE2_UPLOAD_GROUPS_DESC',
-	'formtype'    => 'select_multi',
-	'valuetype'   => 'array',
-	'default'     => $groups,
-	'options'     => $groups,
+    'name'        => 'upload_groups',
+    'title'       => '_MI_MYMODULE2_UPLOAD_GROUPS',
+    'description' => '_MI_MYMODULE2_UPLOAD_GROUPS_DESC',
+    'formtype'    => 'select_multi',
+    'valuetype'   => 'array',
+    'default'     => $groups,
+    'options'     => $groups,
 ];
 // Get Admin groups
 $criteria  = new \CriteriaCompo();
@@ -321,25 +321,25 @@  discard block
 block discarded – undo
 $memberHandler  = xoops_getHandler('member');
 $adminXoopsGroups  = $memberHandler->getGroupList($criteria);
 foreach($adminXoopsGroups as $key => $adminGroup) {
-	$adminGroups[$adminGroup]  = $key;
+    $adminGroups[$adminGroup]  = $key;
 }
 $modversion['config'][] = [
-	'name'        => 'admin_groups',
-	'title'       => '_MI_MYMODULE2_ADMIN_GROUPS',
-	'description' => '_MI_MYMODULE2_ADMIN_GROUPS_DESC',
-	'formtype'    => 'select_multi',
-	'valuetype'   => 'array',
-	'default'     => $adminGroups,
-	'options'     => $adminGroups,
+    'name'        => 'admin_groups',
+    'title'       => '_MI_MYMODULE2_ADMIN_GROUPS',
+    'description' => '_MI_MYMODULE2_ADMIN_GROUPS_DESC',
+    'formtype'    => 'select_multi',
+    'valuetype'   => 'array',
+    'default'     => $adminGroups,
+    'options'     => $adminGroups,
 ];
 // Keywords
 $modversion['config'][] = [
-	'name'        => 'keywords',
-	'title'       => '_MI_MYMODULE2_KEYWORDS',
-	'description' => '_MI_MYMODULE2_KEYWORDS_DESC',
-	'formtype'    => 'textbox',
-	'valuetype'   => 'text',
-	'default'     => 'mymodule2, categories, articles, testfields',
+    'name'        => 'keywords',
+    'title'       => '_MI_MYMODULE2_KEYWORDS',
+    'description' => '_MI_MYMODULE2_KEYWORDS_DESC',
+    'formtype'    => 'textbox',
+    'valuetype'   => 'text',
+    'default'     => 'mymodule2, categories, articles, testfields',
 ];
 // create increment steps for file size
 include_once __DIR__ . '/include/xoops_version.inc.php';
@@ -347,313 +347,313 @@  discard block
 block discarded – undo
 $iniUploadMaxFileSize = mymodule2ReturnBytes(ini_get('upload_max_filesize'));
 $maxSize              = min($iniPostMaxSize, $iniUploadMaxFileSize);
 if ($maxSize > 10000 * 1048576) {
-	$increment = 500;
+    $increment = 500;
 }
 if ($maxSize <= 10000 * 1048576) {
-	$increment = 200;
+    $increment = 200;
 }
 if ($maxSize <= 5000 * 1048576) {
-	$increment = 100;
+    $increment = 100;
 }
 if ($maxSize <= 2500 * 1048576) {
-	$increment = 50;
+    $increment = 50;
 }
 if ($maxSize <= 1000 * 1048576) {
-	$increment = 10;
+    $increment = 10;
 }
 if ($maxSize <= 500 * 1048576) {
-	$increment = 5;
+    $increment = 5;
 }
 if ($maxSize <= 100 * 1048576) {
-	$increment = 2;
+    $increment = 2;
 }
 if ($maxSize <= 50 * 1048576) {
-	$increment = 1;
+    $increment = 1;
 }
 if ($maxSize <= 25 * 1048576) {
-	$increment = 0.5;
+    $increment = 0.5;
 }
 $optionMaxsize = [];
 $i = $increment;
 while ($i * 1048576  <=  $maxSize) {
-	$optionMaxsize[$i . ' ' . _MI_MYMODULE2_SIZE_MB] = $i * 1048576;
-	$i += $increment;
+    $optionMaxsize[$i . ' ' . _MI_MYMODULE2_SIZE_MB] = $i * 1048576;
+    $i += $increment;
 }
 // Uploads : maxsize of image
 $modversion['config'][] = [
-	'name'        => 'maxsize_image',
-	'title'       => '_MI_MYMODULE2_MAXSIZE_IMAGE',
-	'description' => '_MI_MYMODULE2_MAXSIZE_IMAGE_DESC',
-	'formtype'    => 'select',
-	'valuetype'   => 'int',
-	'default'     => 3145728,
-	'options'     => $optionMaxsize,
+    'name'        => 'maxsize_image',
+    'title'       => '_MI_MYMODULE2_MAXSIZE_IMAGE',
+    'description' => '_MI_MYMODULE2_MAXSIZE_IMAGE_DESC',
+    'formtype'    => 'select',
+    'valuetype'   => 'int',
+    'default'     => 3145728,
+    'options'     => $optionMaxsize,
 ];
 // Uploads : mimetypes of image
 $modversion['config'][] = [
-	'name'        => 'mimetypes_image',
-	'title'       => '_MI_MYMODULE2_MIMETYPES_IMAGE',
-	'description' => '_MI_MYMODULE2_MIMETYPES_IMAGE_DESC',
-	'formtype'    => 'select_multi',
-	'valuetype'   => 'array',
-	'default'     => ['image/gif', 'image/jpeg', 'image/png'],
-	'options'     => ['bmp' => 'image/bmp','gif' => 'image/gif','pjpeg' => 'image/pjpeg', 'jpeg' => 'image/jpeg','jpg' => 'image/jpg','jpe' => 'image/jpe', 'png' => 'image/png'],
+    'name'        => 'mimetypes_image',
+    'title'       => '_MI_MYMODULE2_MIMETYPES_IMAGE',
+    'description' => '_MI_MYMODULE2_MIMETYPES_IMAGE_DESC',
+    'formtype'    => 'select_multi',
+    'valuetype'   => 'array',
+    'default'     => ['image/gif', 'image/jpeg', 'image/png'],
+    'options'     => ['bmp' => 'image/bmp','gif' => 'image/gif','pjpeg' => 'image/pjpeg', 'jpeg' => 'image/jpeg','jpg' => 'image/jpg','jpe' => 'image/jpe', 'png' => 'image/png'],
 ];
 $modversion['config'][] = [
-	'name'        => 'maxwidth_image',
-	'title'       => '_MI_MYMODULE2_MAXWIDTH_IMAGE',
-	'description' => '_MI_MYMODULE2_MAXWIDTH_IMAGE_DESC',
-	'formtype'    => 'textbox',
-	'valuetype'   => 'int',
-	'default'     => 8000,
+    'name'        => 'maxwidth_image',
+    'title'       => '_MI_MYMODULE2_MAXWIDTH_IMAGE',
+    'description' => '_MI_MYMODULE2_MAXWIDTH_IMAGE_DESC',
+    'formtype'    => 'textbox',
+    'valuetype'   => 'int',
+    'default'     => 8000,
 ];
 $modversion['config'][] = [
-	'name'        => 'maxheight_image',
-	'title'       => '_MI_MYMODULE2_MAXHEIGHT_IMAGE',
-	'description' => '_MI_MYMODULE2_MAXHEIGHT_IMAGE_DESC',
-	'formtype'    => 'textbox',
-	'valuetype'   => 'int',
-	'default'     => 8000,
+    'name'        => 'maxheight_image',
+    'title'       => '_MI_MYMODULE2_MAXHEIGHT_IMAGE',
+    'description' => '_MI_MYMODULE2_MAXHEIGHT_IMAGE_DESC',
+    'formtype'    => 'textbox',
+    'valuetype'   => 'int',
+    'default'     => 8000,
 ];
 // Uploads : maxsize of file
 $modversion['config'][] = [
-	'name'        => 'maxsize_file',
-	'title'       => '_MI_MYMODULE2_MAXSIZE_FILE',
-	'description' => '_MI_MYMODULE2_MAXSIZE_FILE_DESC',
-	'formtype'    => 'select',
-	'valuetype'   => 'int',
-	'default'     => 3145728,
-	'options'     => $optionMaxsize,
+    'name'        => 'maxsize_file',
+    'title'       => '_MI_MYMODULE2_MAXSIZE_FILE',
+    'description' => '_MI_MYMODULE2_MAXSIZE_FILE_DESC',
+    'formtype'    => 'select',
+    'valuetype'   => 'int',
+    'default'     => 3145728,
+    'options'     => $optionMaxsize,
 ];
 // Uploads : mimetypes of file
 $modversion['config'][] = [
-	'name'        => 'mimetypes_file',
-	'title'       => '_MI_MYMODULE2_MIMETYPES_FILE',
-	'description' => '_MI_MYMODULE2_MIMETYPES_FILE_DESC',
-	'formtype'    => 'select_multi',
-	'valuetype'   => 'array',
-	'default'     => ['application/pdf', 'application/zip', 'text/comma-separated-values', 'text/plain', 'image/gif', 'image/jpeg', 'image/png'],
-	'options'     => ['gif' => 'image/gif','pjpeg' => 'image/pjpeg', 'jpeg' => 'image/jpeg','jpg' => 'image/jpg','jpe' => 'image/jpe', 'png' => 'image/png', 'pdf' => 'application/pdf','zip' => 'application/zip','csv' => 'text/comma-separated-values', 'txt' => 'text/plain', 'xml' => 'application/xml', 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'],
+    'name'        => 'mimetypes_file',
+    'title'       => '_MI_MYMODULE2_MIMETYPES_FILE',
+    'description' => '_MI_MYMODULE2_MIMETYPES_FILE_DESC',
+    'formtype'    => 'select_multi',
+    'valuetype'   => 'array',
+    'default'     => ['application/pdf', 'application/zip', 'text/comma-separated-values', 'text/plain', 'image/gif', 'image/jpeg', 'image/png'],
+    'options'     => ['gif' => 'image/gif','pjpeg' => 'image/pjpeg', 'jpeg' => 'image/jpeg','jpg' => 'image/jpg','jpe' => 'image/jpe', 'png' => 'image/png', 'pdf' => 'application/pdf','zip' => 'application/zip','csv' => 'text/comma-separated-values', 'txt' => 'text/plain', 'xml' => 'application/xml', 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'],
 ];
 // Admin pager
 $modversion['config'][] = [
-	'name'        => 'adminpager',
-	'title'       => '_MI_MYMODULE2_ADMIN_PAGER',
-	'description' => '_MI_MYMODULE2_ADMIN_PAGER_DESC',
-	'formtype'    => 'textbox',
-	'valuetype'   => 'int',
-	'default'     => 10,
+    'name'        => 'adminpager',
+    'title'       => '_MI_MYMODULE2_ADMIN_PAGER',
+    'description' => '_MI_MYMODULE2_ADMIN_PAGER_DESC',
+    'formtype'    => 'textbox',
+    'valuetype'   => 'int',
+    'default'     => 10,
 ];
 // User pager
 $modversion['config'][] = [
-	'name'        => 'userpager',
-	'title'       => '_MI_MYMODULE2_USER_PAGER',
-	'description' => '_MI_MYMODULE2_USER_PAGER_DESC',
-	'formtype'    => 'textbox',
-	'valuetype'   => 'int',
-	'default'     => 10,
+    'name'        => 'userpager',
+    'title'       => '_MI_MYMODULE2_USER_PAGER',
+    'description' => '_MI_MYMODULE2_USER_PAGER_DESC',
+    'formtype'    => 'textbox',
+    'valuetype'   => 'int',
+    'default'     => 10,
 ];
 // Use tag
 $modversion['config'][] = [
-	'name'        => 'usetag',
-	'title'       => '_MI_MYMODULE2_USE_TAG',
-	'description' => '_MI_MYMODULE2_USE_TAG_DESC',
-	'formtype'    => 'yesno',
-	'valuetype'   => 'int',
-	'default'     => 0,
+    'name'        => 'usetag',
+    'title'       => '_MI_MYMODULE2_USE_TAG',
+    'description' => '_MI_MYMODULE2_USE_TAG_DESC',
+    'formtype'    => 'yesno',
+    'valuetype'   => 'int',
+    'default'     => 0,
 ];
 // Number column
 $modversion['config'][] = [
-	'name'        => 'numb_col',
-	'title'       => '_MI_MYMODULE2_NUMB_COL',
-	'description' => '_MI_MYMODULE2_NUMB_COL_DESC',
-	'formtype'    => 'select',
-	'valuetype'   => 'int',
-	'default'     => 1,
-	'options'     => [1 => '1', 2 => '2', 3 => '3', 4 => '4'],
+    'name'        => 'numb_col',
+    'title'       => '_MI_MYMODULE2_NUMB_COL',
+    'description' => '_MI_MYMODULE2_NUMB_COL_DESC',
+    'formtype'    => 'select',
+    'valuetype'   => 'int',
+    'default'     => 1,
+    'options'     => [1 => '1', 2 => '2', 3 => '3', 4 => '4'],
 ];
 // Divide by
 $modversion['config'][] = [
-	'name'        => 'divideby',
-	'title'       => '_MI_MYMODULE2_DIVIDEBY',
-	'description' => '_MI_MYMODULE2_DIVIDEBY_DESC',
-	'formtype'    => 'select',
-	'valuetype'   => 'int',
-	'default'     => 1,
-	'options'     => [1 => '1', 2 => '2', 3 => '3', 4 => '4'],
+    'name'        => 'divideby',
+    'title'       => '_MI_MYMODULE2_DIVIDEBY',
+    'description' => '_MI_MYMODULE2_DIVIDEBY_DESC',
+    'formtype'    => 'select',
+    'valuetype'   => 'int',
+    'default'     => 1,
+    'options'     => [1 => '1', 2 => '2', 3 => '3', 4 => '4'],
 ];
 // Table type
 $modversion['config'][] = [
-	'name'        => 'table_type',
-	'title'       => '_MI_MYMODULE2_TABLE_TYPE',
-	'description' => '_MI_MYMODULE2_DIVIDEBY_DESC',
-	'formtype'    => 'select',
-	'valuetype'   => 'int',
-	'default'     => 'bordered',
-	'options'     => ['bordered' => 'bordered', 'striped' => 'striped', 'hover' => 'hover', 'condensed' => 'condensed'],
+    'name'        => 'table_type',
+    'title'       => '_MI_MYMODULE2_TABLE_TYPE',
+    'description' => '_MI_MYMODULE2_DIVIDEBY_DESC',
+    'formtype'    => 'select',
+    'valuetype'   => 'int',
+    'default'     => 'bordered',
+    'options'     => ['bordered' => 'bordered', 'striped' => 'striped', 'hover' => 'hover', 'condensed' => 'condensed'],
 ];
 // Panel by
 $modversion['config'][] = [
-	'name'        => 'panel_type',
-	'title'       => '_MI_MYMODULE2_PANEL_TYPE',
-	'description' => '_MI_MYMODULE2_PANEL_TYPE_DESC',
-	'formtype'    => 'select',
-	'valuetype'   => 'text',
-	'default'     => 'default',
-	'options'     => ['default' => 'default', 'primary' => 'primary', 'success' => 'success', 'info' => 'info', 'warning' => 'warning', 'danger' => 'danger'],
+    'name'        => 'panel_type',
+    'title'       => '_MI_MYMODULE2_PANEL_TYPE',
+    'description' => '_MI_MYMODULE2_PANEL_TYPE_DESC',
+    'formtype'    => 'select',
+    'valuetype'   => 'text',
+    'default'     => 'default',
+    'options'     => ['default' => 'default', 'primary' => 'primary', 'success' => 'success', 'info' => 'info', 'warning' => 'warning', 'danger' => 'danger'],
 ];
 // Advertise
 $modversion['config'][] = [
-	'name'        => 'advertise',
-	'title'       => '_MI_MYMODULE2_ADVERTISE',
-	'description' => '_MI_MYMODULE2_ADVERTISE_DESC',
-	'formtype'    => 'textarea',
-	'valuetype'   => 'text',
-	'default'     => '',
+    'name'        => 'advertise',
+    'title'       => '_MI_MYMODULE2_ADVERTISE',
+    'description' => '_MI_MYMODULE2_ADVERTISE_DESC',
+    'formtype'    => 'textarea',
+    'valuetype'   => 'text',
+    'default'     => '',
 ];
 // Bookmarks
 $modversion['config'][] = [
-	'name'        => 'bookmarks',
-	'title'       => '_MI_MYMODULE2_BOOKMARKS',
-	'description' => '_MI_MYMODULE2_BOOKMARKS_DESC',
-	'formtype'    => 'yesno',
-	'valuetype'   => 'int',
-	'default'     => 0,
+    'name'        => 'bookmarks',
+    'title'       => '_MI_MYMODULE2_BOOKMARKS',
+    'description' => '_MI_MYMODULE2_BOOKMARKS_DESC',
+    'formtype'    => 'yesno',
+    'valuetype'   => 'int',
+    'default'     => 0,
 ];
 // Make Sample button visible?
 $modversion['config'][] = [
-	'name'        => 'displaySampleButton',
-	'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',
-	'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',
-	'formtype'    => 'yesno',
-	'valuetype'   => 'int',
-	'default'     => 1,
+    'name'        => 'displaySampleButton',
+    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',
+    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',
+    'formtype'    => 'yesno',
+    'valuetype'   => 'int',
+    'default'     => 1,
 ];
 // Maintained by
 $modversion['config'][] = [
-	'name'        => 'maintainedby',
-	'title'       => '_MI_MYMODULE2_MAINTAINEDBY',
-	'description' => '_MI_MYMODULE2_MAINTAINEDBY_DESC',
-	'formtype'    => 'textbox',
-	'valuetype'   => 'text',
-	'default'     => 'https://xoops.org/modules/newbb',
+    'name'        => 'maintainedby',
+    'title'       => '_MI_MYMODULE2_MAINTAINEDBY',
+    'description' => '_MI_MYMODULE2_MAINTAINEDBY_DESC',
+    'formtype'    => 'textbox',
+    'valuetype'   => 'text',
+    'default'     => 'https://xoops.org/modules/newbb',
 ];
 // ------------------- Notifications ------------------- //
 $modversion['hasNotification'] = 1;
 $modversion['notification'] = [
-	'lookup_file' => 'include/notification.inc.php',
-	'lookup_func' => 'mymodule2_notify_iteminfo',
+    'lookup_file' => 'include/notification.inc.php',
+    'lookup_func' => 'mymodule2_notify_iteminfo',
 ];
 // Global Notify
 $modversion['notification']['category'][1] = [
-	'name'           => 'global',
-	'title'          => _MI_MYMODULE2_GLOBAL_NOTIFY,
-	'description'    => _MI_MYMODULE2_GLOBAL_NOTIFY_DESC,
-	'subscribe_from' => ['index.php', 'articles.php', 'testfields.php'],
+    'name'           => 'global',
+    'title'          => _MI_MYMODULE2_GLOBAL_NOTIFY,
+    'description'    => _MI_MYMODULE2_GLOBAL_NOTIFY_DESC,
+    'subscribe_from' => ['index.php', 'articles.php', 'testfields.php'],
 ];
 // Category Notify
 $modversion['notification']['category'][2] = [
-	'name'           => 'category',
-	'title'          => _MI_MYMODULE2_CATEGORY_NOTIFY,
-	'description'    => _MI_MYMODULE2_CATEGORY_NOTIFY_DESC,
-	'subscribe_from' => ['articles.php', 'testfields.php'],
-	'item_name'      => '',
-	'allow_bookmark' => 1,
+    'name'           => 'category',
+    'title'          => _MI_MYMODULE2_CATEGORY_NOTIFY,
+    'description'    => _MI_MYMODULE2_CATEGORY_NOTIFY_DESC,
+    'subscribe_from' => ['articles.php', 'testfields.php'],
+    'item_name'      => '',
+    'allow_bookmark' => 1,
 ];
 // Testfield Notify
 $modversion['notification']['category'][3] = [
-	'name'           => 'testfield',
-	'title'          => _MI_MYMODULE2_TESTFIELD_NOTIFY,
-	'description'    => _MI_MYMODULE2_TESTFIELD_NOTIFY_DESC,
-	'subscribe_from' => 'testfields.php',
-	'item_name'      => 'tf_id',
-	'allow_bookmark' => 1,
+    'name'           => 'testfield',
+    'title'          => _MI_MYMODULE2_TESTFIELD_NOTIFY,
+    'description'    => _MI_MYMODULE2_TESTFIELD_NOTIFY_DESC,
+    'subscribe_from' => 'testfields.php',
+    'item_name'      => 'tf_id',
+    'allow_bookmark' => 1,
 ];
 // GLOBAL_NEW_CATEGORY Notify
 $modversion['notification']['event'][1] = [
-	'name'          => 'new_category',
-	'category'      => 'global',
-	'admin_only'    => 0,
-	'title'         => _MI_MYMODULE2_GLOBAL_NEW_CATEGORY_NOTIFY,
-	'caption'       => _MI_MYMODULE2_GLOBAL_NEW_CATEGORY_NOTIFY_CAPTION,
-	'description'   => _MI_MYMODULE2_GLOBAL_NEW_CATEGORY_NOTIFY_DESC,
-	'mail_template' => 'global_newcategory_notify',
-	'mail_subject'  => _MI_MYMODULE2_GLOBAL_NEW_CATEGORY_NOTIFY_SUBJECT,
+    'name'          => 'new_category',
+    'category'      => 'global',
+    'admin_only'    => 0,
+    'title'         => _MI_MYMODULE2_GLOBAL_NEW_CATEGORY_NOTIFY,
+    'caption'       => _MI_MYMODULE2_GLOBAL_NEW_CATEGORY_NOTIFY_CAPTION,
+    'description'   => _MI_MYMODULE2_GLOBAL_NEW_CATEGORY_NOTIFY_DESC,
+    'mail_template' => 'global_newcategory_notify',
+    'mail_subject'  => _MI_MYMODULE2_GLOBAL_NEW_CATEGORY_NOTIFY_SUBJECT,
 ];
 // GLOBAL_MODIFY Notify
 $modversion['notification']['event'][2] = [
-	'name'          => 'modify',
-	'category'      => 'global',
-	'admin_only'    => 1,
-	'title'         => _MI_MYMODULE2_GLOBAL_MODIFY_NOTIFY,
-	'caption'       => _MI_MYMODULE2_GLOBAL_MODIFY_NOTIFY_CAPTION,
-	'description'   => _MI_MYMODULE2_GLOBAL_MODIFY_NOTIFY_DESC,
-	'mail_template' => 'global_modify_notify',
-	'mail_subject'  => _MI_MYMODULE2_GLOBAL_MODIFY_NOTIFY_SUBJECT,
+    'name'          => 'modify',
+    'category'      => 'global',
+    'admin_only'    => 1,
+    'title'         => _MI_MYMODULE2_GLOBAL_MODIFY_NOTIFY,
+    'caption'       => _MI_MYMODULE2_GLOBAL_MODIFY_NOTIFY_CAPTION,
+    'description'   => _MI_MYMODULE2_GLOBAL_MODIFY_NOTIFY_DESC,
+    'mail_template' => 'global_modify_notify',
+    'mail_subject'  => _MI_MYMODULE2_GLOBAL_MODIFY_NOTIFY_SUBJECT,
 ];
 // GLOBAL_BROKEN Notify
 $modversion['notification']['event'][3] = [
-	'name'          => 'broken',
-	'category'      => 'global',
-	'admin_only'    => 1,
-	'title'         => _MI_MYMODULE2_GLOBAL_BROKEN_NOTIFY,
-	'caption'       => _MI_MYMODULE2_GLOBAL_BROKEN_NOTIFY_CAPTION,
-	'description'   => _MI_MYMODULE2_GLOBAL_BROKEN_NOTIFY_DESC,
-	'mail_template' => 'global_broken_notify',
-	'mail_subject'  => _MI_MYMODULE2_GLOBAL_BROKEN_NOTIFY_SUBJECT,
+    'name'          => 'broken',
+    'category'      => 'global',
+    'admin_only'    => 1,
+    'title'         => _MI_MYMODULE2_GLOBAL_BROKEN_NOTIFY,
+    'caption'       => _MI_MYMODULE2_GLOBAL_BROKEN_NOTIFY_CAPTION,
+    'description'   => _MI_MYMODULE2_GLOBAL_BROKEN_NOTIFY_DESC,
+    'mail_template' => 'global_broken_notify',
+    'mail_subject'  => _MI_MYMODULE2_GLOBAL_BROKEN_NOTIFY_SUBJECT,
 ];
 // GLOBAL_SUBMIT Notify
 $modversion['notification']['event'][4] = [
-	'name'          => 'submit',
-	'category'      => 'global',
-	'admin_only'    => 1,
-	'title'         => _MI_MYMODULE2_GLOBAL_SUBMIT_NOTIFY,
-	'caption'       => _MI_MYMODULE2_GLOBAL_SUBMIT_NOTIFY_CAPTION,
-	'description'   => _MI_MYMODULE2_GLOBAL_SUBMIT_NOTIFY_DESC,
-	'mail_template' => 'global_submit_notify',
-	'mail_subject'  => _MI_MYMODULE2_GLOBAL_SUBMIT_NOTIFY_SUBJECT,
+    'name'          => 'submit',
+    'category'      => 'global',
+    'admin_only'    => 1,
+    'title'         => _MI_MYMODULE2_GLOBAL_SUBMIT_NOTIFY,
+    'caption'       => _MI_MYMODULE2_GLOBAL_SUBMIT_NOTIFY_CAPTION,
+    'description'   => _MI_MYMODULE2_GLOBAL_SUBMIT_NOTIFY_DESC,
+    'mail_template' => 'global_submit_notify',
+    'mail_subject'  => _MI_MYMODULE2_GLOBAL_SUBMIT_NOTIFY_SUBJECT,
 ];
 // GLOBAL_NEW Notify
 $modversion['notification']['event'][5] = [
-	'name'          => 'new_testfield',
-	'category'      => 'global',
-	'admin_only'    => 0,
-	'title'         => _MI_MYMODULE2_GLOBAL_NEW_NOTIFY,
-	'caption'       => _MI_MYMODULE2_GLOBAL_NEW_NOTIFY_CAPTION,
-	'description'   => _MI_MYMODULE2_GLOBAL_NEW_NOTIFY_DESC,
-	'mail_template' => 'global_newtestfield_notify',
-	'mail_subject'  => _MI_MYMODULE2_GLOBAL_NEW_NOTIFY_SUBJECT,
+    'name'          => 'new_testfield',
+    'category'      => 'global',
+    'admin_only'    => 0,
+    'title'         => _MI_MYMODULE2_GLOBAL_NEW_NOTIFY,
+    'caption'       => _MI_MYMODULE2_GLOBAL_NEW_NOTIFY_CAPTION,
+    'description'   => _MI_MYMODULE2_GLOBAL_NEW_NOTIFY_DESC,
+    'mail_template' => 'global_newtestfield_notify',
+    'mail_subject'  => _MI_MYMODULE2_GLOBAL_NEW_NOTIFY_SUBJECT,
 ];
 // CATEGORY_SUBMIT Notify
 $modversion['notification']['event'][6] = [
-	'name'          => 'submit',
-	'category'      => 'category',
-	'admin_only'    => 1,
-	'title'         => _MI_MYMODULE2_CATEGORY_SUBMIT_NOTIFY,
-	'caption'       => _MI_MYMODULE2_CATEGORY_SUBMIT_NOTIFY_CAPTION,
-	'description'   => _MI_MYMODULE2_CATEGORY_SUBMIT_NOTIFY_DESC,
-	'mail_template' => 'category_testfieldsubmit_notify',
-	'mail_subject'  => _MI_MYMODULE2_CATEGORY_SUBMIT_NOTIFY_SUBJECT,
+    'name'          => 'submit',
+    'category'      => 'category',
+    'admin_only'    => 1,
+    'title'         => _MI_MYMODULE2_CATEGORY_SUBMIT_NOTIFY,
+    'caption'       => _MI_MYMODULE2_CATEGORY_SUBMIT_NOTIFY_CAPTION,
+    'description'   => _MI_MYMODULE2_CATEGORY_SUBMIT_NOTIFY_DESC,
+    'mail_template' => 'category_testfieldsubmit_notify',
+    'mail_subject'  => _MI_MYMODULE2_CATEGORY_SUBMIT_NOTIFY_SUBJECT,
 ];
 // CATEGORY Notify
 $modversion['notification']['event'][7] = [
-	'name'          => 'new_category',
-	'category'      => 'category',
-	'admin_only'    => 0,
-	'title'         => _MI_MYMODULE2_CATEGORY_NOTIFY,
-	'caption'       => _MI_MYMODULE2_CATEGORY_NOTIFY_CAPTION,
-	'description'   => _MI_MYMODULE2_CATEGORY_NOTIFY_DESC,
-	'mail_template' => 'category_newtestfield_notify',
-	'mail_subject'  => _MI_MYMODULE2_CATEGORY_NOTIFY_SUBJECT,
+    'name'          => 'new_category',
+    'category'      => 'category',
+    'admin_only'    => 0,
+    'title'         => _MI_MYMODULE2_CATEGORY_NOTIFY,
+    'caption'       => _MI_MYMODULE2_CATEGORY_NOTIFY_CAPTION,
+    'description'   => _MI_MYMODULE2_CATEGORY_NOTIFY_DESC,
+    'mail_template' => 'category_newtestfield_notify',
+    'mail_subject'  => _MI_MYMODULE2_CATEGORY_NOTIFY_SUBJECT,
 ];
 // TESTFIELD Notify
 $modversion['notification']['event'][8] = [
-	'name'          => 'approve',
-	'category'      => 'testfield',
-	'admin_only'    => 1,
-	'title'         => _MI_MYMODULE2_TESTFIELD_NOTIFY,
-	'caption'       => _MI_MYMODULE2_TESTFIELD_NOTIFY_CAPTION,
-	'description'   => _MI_MYMODULE2_TESTFIELD_NOTIFY_DESC,
-	'mail_template' => 'testfield_approve_notify',
-	'mail_subject'  => _MI_MYMODULE2_TESTFIELD_NOTIFY_SUBJECT,
+    'name'          => 'approve',
+    'category'      => 'testfield',
+    'admin_only'    => 1,
+    'title'         => _MI_MYMODULE2_TESTFIELD_NOTIFY,
+    'caption'       => _MI_MYMODULE2_TESTFIELD_NOTIFY_CAPTION,
+    'description'   => _MI_MYMODULE2_TESTFIELD_NOTIFY_DESC,
+    'mail_template' => 'testfield_approve_notify',
+    'mail_subject'  => _MI_MYMODULE2_TESTFIELD_NOTIFY_SUBJECT,
 ];

Please login to merge, or discard this patch.

testdata/mymodule2/testfields.php 1 patch

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

@@ -42,23 +42,23 @@
 block discarded – undo
 $testfieldsAll = $testfieldsHandler->getAllTestfields($start, $limit);
 $keywords = [];
 if ($testfieldsCount > 0) {
-	$testfields = [];
-	// Get All Testfields
-	foreach(array_keys($testfieldsAll) as $i) {
-		$testfields[] = $testfieldsAll[$i]->getValuesTestfields();
-		$keywords[] = $testfieldsAll[$i]->getVar('tf_text');
-	}
-	$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('type', $helper->getConfig('table_type'));
-	$GLOBALS['xoopsTpl']->assign('divideby', $helper->getConfig('divideby'));
-	$GLOBALS['xoopsTpl']->assign('numb_col', $helper->getConfig('numb_col'));
+    $testfields = [];
+    // Get All Testfields
+    foreach(array_keys($testfieldsAll) as $i) {
+        $testfields[] = $testfieldsAll[$i]->getValuesTestfields();
+        $keywords[] = $testfieldsAll[$i]->getVar('tf_text');
+    }
+    $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('type', $helper->getConfig('table_type'));
+    $GLOBALS['xoopsTpl']->assign('divideby', $helper->getConfig('divideby'));
+    $GLOBALS['xoopsTpl']->assign('numb_col', $helper->getConfig('numb_col'));
 }
 
 // Breadcrumbs

Please login to merge, or discard this patch.

testdata/mymodule2/admin/testfields.php 1 patch

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

@@ -30,263 +30,263 @@
 block discarded – undo
 // Request tf_id
 $tfId = Request::getInt('tf_id');
 switch($op) {
-	case 'list':
-	default:
-		// Define Stylesheet
-		$GLOBALS['xoTheme']->addStylesheet( $style, null );
-		$start = Request::getInt('start', 0);
-		$limit = Request::getInt('limit', $helper->getConfig('adminpager'));
-		$templateMain = 'mymodule2_admin_testfields.tpl';
-		$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('testfields.php'));
-		$adminObject->addItemButton(_AM_MYMODULE2_ADD_TESTFIELD, 'testfields.php?op=new', 'add');
-		$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
-		$testfieldsCount = $testfieldsHandler->getCountTestfields();
-		$testfieldsAll = $testfieldsHandler->getAllTestfields($start, $limit);
-		$GLOBALS['xoopsTpl']->assign('testfields_count', $testfieldsCount);
-		$GLOBALS['xoopsTpl']->assign('mymodule2_url', MYMODULE2_URL);
-		$GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
-		// Table view testfields
-		if ($testfieldsCount > 0) {
-			foreach(array_keys($testfieldsAll) as $i) {
-				$testfield = $testfieldsAll[$i]->getValuesTestfields();
-				$GLOBALS['xoopsTpl']->append('testfields_list', $testfield);
-				unset($testfield);
-			}
-			// 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));
-			}
-		} else {
-			$GLOBALS['xoopsTpl']->assign('error', _AM_MYMODULE2_THEREARENT_TESTFIELDS);
-		}
+    case 'list':
+    default:
+        // Define Stylesheet
+        $GLOBALS['xoTheme']->addStylesheet( $style, null );
+        $start = Request::getInt('start', 0);
+        $limit = Request::getInt('limit', $helper->getConfig('adminpager'));
+        $templateMain = 'mymodule2_admin_testfields.tpl';
+        $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('testfields.php'));
+        $adminObject->addItemButton(_AM_MYMODULE2_ADD_TESTFIELD, 'testfields.php?op=new', 'add');
+        $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
+        $testfieldsCount = $testfieldsHandler->getCountTestfields();
+        $testfieldsAll = $testfieldsHandler->getAllTestfields($start, $limit);
+        $GLOBALS['xoopsTpl']->assign('testfields_count', $testfieldsCount);
+        $GLOBALS['xoopsTpl']->assign('mymodule2_url', MYMODULE2_URL);
+        $GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
+        // Table view testfields
+        if ($testfieldsCount > 0) {
+            foreach(array_keys($testfieldsAll) as $i) {
+                $testfield = $testfieldsAll[$i]->getValuesTestfields();
+                $GLOBALS['xoopsTpl']->append('testfields_list', $testfield);
+                unset($testfield);
+            }
+            // 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));
+            }
+        } else {
+            $GLOBALS['xoopsTpl']->assign('error', _AM_MYMODULE2_THEREARENT_TESTFIELDS);
+        }
 
-	break;
-	case 'new':
-		$templateMain = 'mymodule2_admin_testfields.tpl';
-		$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('testfields.php'));
-		$adminObject->addItemButton(_AM_MYMODULE2_TESTFIELDS_LIST, 'testfields.php', 'list');
-		$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
-		// Get Form
-		$testfieldsObj = $testfieldsHandler->create();
-		$form = $testfieldsObj->getFormTestfields();
-		$GLOBALS['xoopsTpl']->assign('form', $form->render());
+    break;
+    case 'new':
+        $templateMain = 'mymodule2_admin_testfields.tpl';
+        $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('testfields.php'));
+        $adminObject->addItemButton(_AM_MYMODULE2_TESTFIELDS_LIST, 'testfields.php', 'list');
+        $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
+        // Get Form
+        $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()));
-		}
-		if (isset($tfId)) {
-			$testfieldsObj = $testfieldsHandler->get($tfId);
-		} else {
-			$testfieldsObj = $testfieldsHandler->create();
-		}
-		// Set Vars
-		$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 ($testfieldsHandler->insert($testfieldsObj)) {
-			$newTfId = $testfieldsObj->getNewInsertedIdTestfields();
-			$permId = isset($_REQUEST['tf_id']) ? $tfId : $newTfId;
-			$grouppermHandler = xoops_getHandler('groupperm');
-			$mid = $GLOBALS['xoopsModule']->getVar('mid');
-			// Permission to view_testfields
-			$grouppermHandler->deleteByModule($mid, 'mymodule2_view_testfields', $permId);
-			if (isset($_POST['groups_view_testfields'])) {
-				foreach($_POST['groups_view_testfields'] as $onegroupId) {
-					$grouppermHandler->addRight('mymodule2_view_testfields', $permId, $onegroupId, $mid);
-				}
-			}
-			// Permission to submit_testfields
-			$grouppermHandler->deleteByModule($mid, 'mymodule2_submit_testfields', $permId);
-			if (isset($_POST['groups_submit_testfields'])) {
-				foreach($_POST['groups_submit_testfields'] as $onegroupId) {
-					$grouppermHandler->addRight('mymodule2_submit_testfields', $permId, $onegroupId, $mid);
-				}
-			}
-			// Permission to approve_testfields
-			$grouppermHandler->deleteByModule($mid, 'mymodule2_approve_testfields', $permId);
-			if (isset($_POST['groups_approve_testfields'])) {
-				foreach($_POST['groups_approve_testfields'] as $onegroupId) {
-					$grouppermHandler->addRight('mymodule2_approve_testfields', $permId, $onegroupId, $mid);
-				}
-			}
-			if ('' !== $uploaderErrors) {
-				redirect_header('testfields.php?op=edit&tf_id=' . $tfId, 5, $uploaderErrors);
-			} else {
-				redirect_header('testfields.php?op=list', 2, _AM_MYMODULE2_FORM_OK);
-			}
-		}
-		// Get Form
-		$GLOBALS['xoopsTpl']->assign('error', $testfieldsObj->getHtmlErrors());
-		$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()));
+        }
+        if (isset($tfId)) {
+            $testfieldsObj = $testfieldsHandler->get($tfId);
+        } else {
+            $testfieldsObj = $testfieldsHandler->create();
+        }
+        // Set Vars
+        $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 ($testfieldsHandler->insert($testfieldsObj)) {
+            $newTfId = $testfieldsObj->getNewInsertedIdTestfields();
+            $permId = isset($_REQUEST['tf_id']) ? $tfId : $newTfId;
+            $grouppermHandler = xoops_getHandler('groupperm');
+            $mid = $GLOBALS['xoopsModule']->getVar('mid');
+            // Permission to view_testfields
+            $grouppermHandler->deleteByModule($mid, 'mymodule2_view_testfields', $permId);
+            if (isset($_POST['groups_view_testfields'])) {
+                foreach($_POST['groups_view_testfields'] as $onegroupId) {
+                    $grouppermHandler->addRight('mymodule2_view_testfields', $permId, $onegroupId, $mid);
+                }
+            }
+            // Permission to submit_testfields
+            $grouppermHandler->deleteByModule($mid, 'mymodule2_submit_testfields', $permId);
+            if (isset($_POST['groups_submit_testfields'])) {
+                foreach($_POST['groups_submit_testfields'] as $onegroupId) {
+                    $grouppermHandler->addRight('mymodule2_submit_testfields', $permId, $onegroupId, $mid);
+                }
+            }
+            // Permission to approve_testfields
+            $grouppermHandler->deleteByModule($mid, 'mymodule2_approve_testfields', $permId);
+            if (isset($_POST['groups_approve_testfields'])) {
+                foreach($_POST['groups_approve_testfields'] as $onegroupId) {
+                    $grouppermHandler->addRight('mymodule2_approve_testfields', $permId, $onegroupId, $mid);
+                }
+            }
+            if ('' !== $uploaderErrors) {
+                redirect_header('testfields.php?op=edit&tf_id=' . $tfId, 5, $uploaderErrors);
+            } else {
+                redirect_header('testfields.php?op=list', 2, _AM_MYMODULE2_FORM_OK);
+            }
+        }
+        // Get Form
+        $GLOBALS['xoopsTpl']->assign('error', $testfieldsObj->getHtmlErrors());
+        $form = $testfieldsObj->getFormTestfields();
+        $GLOBALS['xoopsTpl']->assign('form', $form->render());
 
-	break;
-	case 'edit':
-		$templateMain = 'mymodule2_admin_testfields.tpl';
-		$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('testfields.php'));
-		$adminObject->addItemButton(_AM_MYMODULE2_ADD_TESTFIELD, 'testfields.php?op=new', 'add');
-		$adminObject->addItemButton(_AM_MYMODULE2_TESTFIELDS_LIST, 'testfields.php', 'list');
-		$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
-		// Get Form
-		$testfieldsObj = $testfieldsHandler->get($tfId);
-		$form = $testfieldsObj->getFormTestfields();
-		$GLOBALS['xoopsTpl']->assign('form', $form->render());
+    break;
+    case 'edit':
+        $templateMain = 'mymodule2_admin_testfields.tpl';
+        $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('testfields.php'));
+        $adminObject->addItemButton(_AM_MYMODULE2_ADD_TESTFIELD, 'testfields.php?op=new', 'add');
+        $adminObject->addItemButton(_AM_MYMODULE2_TESTFIELDS_LIST, 'testfields.php', 'list');
+        $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
+        // Get Form
+        $testfieldsObj = $testfieldsHandler->get($tfId);
+        $form = $testfieldsObj->getFormTestfields();
+        $GLOBALS['xoopsTpl']->assign('form', $form->render());
 
-	break;
-	case 'delete':
-		$testfieldsObj = $testfieldsHandler->get($tfId);
-		if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
-			if (!$GLOBALS['xoopsSecurity']->check()) {
-				redirect_header('testfields.php', 3, implode(', ', $GLOBALS['xoopsSecurity']->getErrors()));
-			}
-			if ($testfieldsHandler->delete($testfieldsObj)) {
-				redirect_header('testfields.php', 3, _AM_MYMODULE2_FORM_DELETE_OK);
-			} else {
-				$GLOBALS['xoopsTpl']->assign('error', $testfieldsObj->getHtmlErrors());
-			}
-		} else {
-			xoops_confirm(array('ok' => 1, 'tf_id' => $tfId, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_MYMODULE2_FORM_SURE_DELETE, $testfieldsObj->getVar('tf_text')));
-		}
+    break;
+    case 'delete':
+        $testfieldsObj = $testfieldsHandler->get($tfId);
+        if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header('testfields.php', 3, implode(', ', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
+            if ($testfieldsHandler->delete($testfieldsObj)) {
+                redirect_header('testfields.php', 3, _AM_MYMODULE2_FORM_DELETE_OK);
+            } else {
+                $GLOBALS['xoopsTpl']->assign('error', $testfieldsObj->getHtmlErrors());
+            }
+        } else {
+            xoops_confirm(array('ok' => 1, 'tf_id' => $tfId, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_MYMODULE2_FORM_SURE_DELETE, $testfieldsObj->getVar('tf_text')));
+        }
 
-	break;
+    break;
 }
 require __DIR__ . '/footer.php';

Please login to merge, or discard this patch.

testdata/mymodule2/admin/articles.php 1 patch

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

@@ -30,195 +30,195 @@
 block discarded – undo
 // Request art_id
 $artId = Request::getInt('art_id');
 switch($op) {
-	case 'list':
-	default:
-		// Define Stylesheet
-		$GLOBALS['xoTheme']->addStylesheet( $style, null );
-		$start = Request::getInt('start', 0);
-		$limit = Request::getInt('limit', $helper->getConfig('adminpager'));
-		$templateMain = 'mymodule2_admin_articles.tpl';
-		$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('articles.php'));
-		$adminObject->addItemButton(_AM_MYMODULE2_ADD_ARTICLE, 'articles.php?op=new', 'add');
-		$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
-		$articlesCount = $articlesHandler->getCountArticles();
-		$articlesAll = $articlesHandler->getAllArticles($start, $limit);
-		$GLOBALS['xoopsTpl']->assign('articles_count', $articlesCount);
-		$GLOBALS['xoopsTpl']->assign('mymodule2_url', MYMODULE2_URL);
-		$GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
-		// Table view articles
-		if ($articlesCount > 0) {
-			foreach(array_keys($articlesAll) as $i) {
-				$article = $articlesAll[$i]->getValuesArticles();
-				$GLOBALS['xoopsTpl']->append('articles_list', $article);
-				unset($article);
-			}
-			// 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));
-			}
-		} else {
-			$GLOBALS['xoopsTpl']->assign('error', _AM_MYMODULE2_THEREARENT_ARTICLES);
-		}
+    case 'list':
+    default:
+        // Define Stylesheet
+        $GLOBALS['xoTheme']->addStylesheet( $style, null );
+        $start = Request::getInt('start', 0);
+        $limit = Request::getInt('limit', $helper->getConfig('adminpager'));
+        $templateMain = 'mymodule2_admin_articles.tpl';
+        $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('articles.php'));
+        $adminObject->addItemButton(_AM_MYMODULE2_ADD_ARTICLE, 'articles.php?op=new', 'add');
+        $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
+        $articlesCount = $articlesHandler->getCountArticles();
+        $articlesAll = $articlesHandler->getAllArticles($start, $limit);
+        $GLOBALS['xoopsTpl']->assign('articles_count', $articlesCount);
+        $GLOBALS['xoopsTpl']->assign('mymodule2_url', MYMODULE2_URL);
+        $GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
+        // Table view articles
+        if ($articlesCount > 0) {
+            foreach(array_keys($articlesAll) as $i) {
+                $article = $articlesAll[$i]->getValuesArticles();
+                $GLOBALS['xoopsTpl']->append('articles_list', $article);
+                unset($article);
+            }
+            // 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));
+            }
+        } else {
+            $GLOBALS['xoopsTpl']->assign('error', _AM_MYMODULE2_THEREARENT_ARTICLES);
+        }
 
-	break;
-	case 'new':
-		$templateMain = 'mymodule2_admin_articles.tpl';
-		$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('articles.php'));
-		$adminObject->addItemButton(_AM_MYMODULE2_ARTICLES_LIST, 'articles.php', 'list');
-		$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
-		// Get Form
-		$articlesObj = $articlesHandler->create();
-		$form = $articlesObj->getFormArticles();
-		$GLOBALS['xoopsTpl']->assign('form', $form->render());
+    break;
+    case 'new':
+        $templateMain = 'mymodule2_admin_articles.tpl';
+        $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('articles.php'));
+        $adminObject->addItemButton(_AM_MYMODULE2_ARTICLES_LIST, 'articles.php', 'list');
+        $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
+        // Get Form
+        $articlesObj = $articlesHandler->create();
+        $form = $articlesObj->getFormArticles();
+        $GLOBALS['xoopsTpl']->assign('form', $form->render());
 
-	break;
-	case 'save':
-		// Security Check
-		if (!$GLOBALS['xoopsSecurity']->check()) {
-			redirect_header('articles.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-		}
-		if (isset($artId)) {
-			$articlesObj = $articlesHandler->get($artId);
-		} else {
-			$articlesObj = $articlesHandler->create();
-		}
-		// Set Vars
-		$articlesObj->setVar('art_cat', Request::getInt('art_cat', 0));
-		$articlesObj->setVar('art_title', Request::getString('art_title', ''));
-		$articlesObj->setVar('art_descr', Request::getString('art_descr', ''));
-		// Set Var art_img
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['art_img']['name'];
-		$imgMimetype    = $_FILES['art_img']['type'];
-		$imgNameDef     = Request::getString('art_title');
-		$uploaderErrors = '';
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/articles/', 
-													$helper->getConfig('mimetypes_image'), 
-													$helper->getConfig('maxsize_image'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
-			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 . '/articles/' . $savedFilename;
-					$imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH . '/articles/' . $savedFilename;
-					$imgHandler->imageMimetype = $imgMimetype;
-					$imgHandler->maxWidth      = $maxwidth;
-					$imgHandler->maxHeight     = $maxheight;
-					$result                    = $imgHandler->resizeImage();
-				}
-				$articlesObj->setVar('art_img', $savedFilename);
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$articlesObj->setVar('art_img', Request::getString('art_img'));
-		}
-		$articlesObj->setVar('art_status', Request::getInt('art_status', 0));
-		// Set Var art_file
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['art_file']['name'];
-		$imgNameDef     = Request::getString('art_title');
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/articles/', 
-													$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 {
-				$articlesObj->setVar('art_file', $uploader->getSavedFileName());
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$articlesObj->setVar('art_file', Request::getString('art_file'));
-		}
-		$articleCreated = date_create_from_format(_SHORTDATESTRING, Request::getString('art_created'));
-		$articlesObj->setVar('art_created', $articleCreated->getTimestamp());
-		$articlesObj->setVar('art_submitter', Request::getInt('art_submitter', 0));
-		// Insert Data
-		if ($articlesHandler->insert($articlesObj)) {
-			$newArtId = $articlesObj->getNewInsertedIdArticles();
-			$permId = isset($_REQUEST['art_id']) ? $artId : $newArtId;
-			$grouppermHandler = xoops_getHandler('groupperm');
-			$mid = $GLOBALS['xoopsModule']->getVar('mid');
-			// Permission to view_articles
-			$grouppermHandler->deleteByModule($mid, 'mymodule2_view_articles', $permId);
-			if (isset($_POST['groups_view_articles'])) {
-				foreach($_POST['groups_view_articles'] as $onegroupId) {
-					$grouppermHandler->addRight('mymodule2_view_articles', $permId, $onegroupId, $mid);
-				}
-			}
-			// Permission to submit_articles
-			$grouppermHandler->deleteByModule($mid, 'mymodule2_submit_articles', $permId);
-			if (isset($_POST['groups_submit_articles'])) {
-				foreach($_POST['groups_submit_articles'] as $onegroupId) {
-					$grouppermHandler->addRight('mymodule2_submit_articles', $permId, $onegroupId, $mid);
-				}
-			}
-			// Permission to approve_articles
-			$grouppermHandler->deleteByModule($mid, 'mymodule2_approve_articles', $permId);
-			if (isset($_POST['groups_approve_articles'])) {
-				foreach($_POST['groups_approve_articles'] as $onegroupId) {
-					$grouppermHandler->addRight('mymodule2_approve_articles', $permId, $onegroupId, $mid);
-				}
-			}
-			if ('' !== $uploaderErrors) {
-				redirect_header('articles.php?op=edit&art_id=' . $artId, 5, $uploaderErrors);
-			} else {
-				redirect_header('articles.php?op=list', 2, _AM_MYMODULE2_FORM_OK);
-			}
-		}
-		// Get Form
-		$GLOBALS['xoopsTpl']->assign('error', $articlesObj->getHtmlErrors());
-		$form = $articlesObj->getFormArticles();
-		$GLOBALS['xoopsTpl']->assign('form', $form->render());
+    break;
+    case 'save':
+        // Security Check
+        if (!$GLOBALS['xoopsSecurity']->check()) {
+            redirect_header('articles.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+        }
+        if (isset($artId)) {
+            $articlesObj = $articlesHandler->get($artId);
+        } else {
+            $articlesObj = $articlesHandler->create();
+        }
+        // Set Vars
+        $articlesObj->setVar('art_cat', Request::getInt('art_cat', 0));
+        $articlesObj->setVar('art_title', Request::getString('art_title', ''));
+        $articlesObj->setVar('art_descr', Request::getString('art_descr', ''));
+        // Set Var art_img
+        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        $filename       = $_FILES['art_img']['name'];
+        $imgMimetype    = $_FILES['art_img']['type'];
+        $imgNameDef     = Request::getString('art_title');
+        $uploaderErrors = '';
+        $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/articles/', 
+                                                    $helper->getConfig('mimetypes_image'), 
+                                                    $helper->getConfig('maxsize_image'), null, null);
+        if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+            $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+            $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+            $uploader->setPrefix($imgName);
+            $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+            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 . '/articles/' . $savedFilename;
+                    $imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH . '/articles/' . $savedFilename;
+                    $imgHandler->imageMimetype = $imgMimetype;
+                    $imgHandler->maxWidth      = $maxwidth;
+                    $imgHandler->maxHeight     = $maxheight;
+                    $result                    = $imgHandler->resizeImage();
+                }
+                $articlesObj->setVar('art_img', $savedFilename);
+            }
+        } else {
+            if ($filename > '') {
+                $uploaderErrors = $uploader->getErrors();
+            }
+            $articlesObj->setVar('art_img', Request::getString('art_img'));
+        }
+        $articlesObj->setVar('art_status', Request::getInt('art_status', 0));
+        // Set Var art_file
+        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        $filename       = $_FILES['art_file']['name'];
+        $imgNameDef     = Request::getString('art_title');
+        $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/articles/', 
+                                                    $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 {
+                $articlesObj->setVar('art_file', $uploader->getSavedFileName());
+            }
+        } else {
+            if ($filename > '') {
+                $uploaderErrors = $uploader->getErrors();
+            }
+            $articlesObj->setVar('art_file', Request::getString('art_file'));
+        }
+        $articleCreated = date_create_from_format(_SHORTDATESTRING, Request::getString('art_created'));
+        $articlesObj->setVar('art_created', $articleCreated->getTimestamp());
+        $articlesObj->setVar('art_submitter', Request::getInt('art_submitter', 0));
+        // Insert Data
+        if ($articlesHandler->insert($articlesObj)) {
+            $newArtId = $articlesObj->getNewInsertedIdArticles();
+            $permId = isset($_REQUEST['art_id']) ? $artId : $newArtId;
+            $grouppermHandler = xoops_getHandler('groupperm');
+            $mid = $GLOBALS['xoopsModule']->getVar('mid');
+            // Permission to view_articles
+            $grouppermHandler->deleteByModule($mid, 'mymodule2_view_articles', $permId);
+            if (isset($_POST['groups_view_articles'])) {
+                foreach($_POST['groups_view_articles'] as $onegroupId) {
+                    $grouppermHandler->addRight('mymodule2_view_articles', $permId, $onegroupId, $mid);
+                }
+            }
+            // Permission to submit_articles
+            $grouppermHandler->deleteByModule($mid, 'mymodule2_submit_articles', $permId);
+            if (isset($_POST['groups_submit_articles'])) {
+                foreach($_POST['groups_submit_articles'] as $onegroupId) {
+                    $grouppermHandler->addRight('mymodule2_submit_articles', $permId, $onegroupId, $mid);
+                }
+            }
+            // Permission to approve_articles
+            $grouppermHandler->deleteByModule($mid, 'mymodule2_approve_articles', $permId);
+            if (isset($_POST['groups_approve_articles'])) {
+                foreach($_POST['groups_approve_articles'] as $onegroupId) {
+                    $grouppermHandler->addRight('mymodule2_approve_articles', $permId, $onegroupId, $mid);
+                }
+            }
+            if ('' !== $uploaderErrors) {
+                redirect_header('articles.php?op=edit&art_id=' . $artId, 5, $uploaderErrors);
+            } else {
+                redirect_header('articles.php?op=list', 2, _AM_MYMODULE2_FORM_OK);
+            }
+        }
+        // Get Form
+        $GLOBALS['xoopsTpl']->assign('error', $articlesObj->getHtmlErrors());
+        $form = $articlesObj->getFormArticles();
+        $GLOBALS['xoopsTpl']->assign('form', $form->render());
 
-	break;
-	case 'edit':
-		$templateMain = 'mymodule2_admin_articles.tpl';
-		$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('articles.php'));
-		$adminObject->addItemButton(_AM_MYMODULE2_ADD_ARTICLE, 'articles.php?op=new', 'add');
-		$adminObject->addItemButton(_AM_MYMODULE2_ARTICLES_LIST, 'articles.php', 'list');
-		$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
-		// Get Form
-		$articlesObj = $articlesHandler->get($artId);
-		$form = $articlesObj->getFormArticles();
-		$GLOBALS['xoopsTpl']->assign('form', $form->render());
+    break;
+    case 'edit':
+        $templateMain = 'mymodule2_admin_articles.tpl';
+        $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('articles.php'));
+        $adminObject->addItemButton(_AM_MYMODULE2_ADD_ARTICLE, 'articles.php?op=new', 'add');
+        $adminObject->addItemButton(_AM_MYMODULE2_ARTICLES_LIST, 'articles.php', 'list');
+        $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
+        // Get Form
+        $articlesObj = $articlesHandler->get($artId);
+        $form = $articlesObj->getFormArticles();
+        $GLOBALS['xoopsTpl']->assign('form', $form->render());
 
-	break;
-	case 'delete':
-		$articlesObj = $articlesHandler->get($artId);
-		if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
-			if (!$GLOBALS['xoopsSecurity']->check()) {
-				redirect_header('articles.php', 3, implode(', ', $GLOBALS['xoopsSecurity']->getErrors()));
-			}
-			if ($articlesHandler->delete($articlesObj)) {
-				redirect_header('articles.php', 3, _AM_MYMODULE2_FORM_DELETE_OK);
-			} else {
-				$GLOBALS['xoopsTpl']->assign('error', $articlesObj->getHtmlErrors());
-			}
-		} else {
-			xoops_confirm(array('ok' => 1, 'art_id' => $artId, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_MYMODULE2_FORM_SURE_DELETE, $articlesObj->getVar('art_title')));
-		}
+    break;
+    case 'delete':
+        $articlesObj = $articlesHandler->get($artId);
+        if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header('articles.php', 3, implode(', ', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
+            if ($articlesHandler->delete($articlesObj)) {
+                redirect_header('articles.php', 3, _AM_MYMODULE2_FORM_DELETE_OK);
+            } else {
+                $GLOBALS['xoopsTpl']->assign('error', $articlesObj->getHtmlErrors());
+            }
+        } else {
+            xoops_confirm(array('ok' => 1, 'art_id' => $artId, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_MYMODULE2_FORM_SURE_DELETE, $articlesObj->getVar('art_title')));
+        }
 
-	break;
+    break;
 }
 require __DIR__ . '/footer.php';

Please login to merge, or discard this patch.

testdata/mymodule2/admin/categories.php 1 patch

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

@@ -30,144 +30,144 @@
 block discarded – undo
 // Request cat_id
 $catId = Request::getInt('cat_id');
 switch($op) {
-	case 'list':
-	default:
-		// Define Stylesheet
-		$GLOBALS['xoTheme']->addStylesheet( $style, null );
-		$start = Request::getInt('start', 0);
-		$limit = Request::getInt('limit', $helper->getConfig('adminpager'));
-		$templateMain = 'mymodule2_admin_categories.tpl';
-		$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('categories.php'));
-		$adminObject->addItemButton(_AM_MYMODULE2_ADD_CATEGORY, 'categories.php?op=new', 'add');
-		$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
-		$categoriesCount = $categoriesHandler->getCountCategories();
-		$categoriesAll = $categoriesHandler->getAllCategories($start, $limit);
-		$GLOBALS['xoopsTpl']->assign('categories_count', $categoriesCount);
-		$GLOBALS['xoopsTpl']->assign('mymodule2_url', MYMODULE2_URL);
-		$GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
-		// Table view categories
-		if ($categoriesCount > 0) {
-			foreach(array_keys($categoriesAll) as $i) {
-				$category = $categoriesAll[$i]->getValuesCategories();
-				$GLOBALS['xoopsTpl']->append('categories_list', $category);
-				unset($category);
-			}
-			// Display Navigation
-			if ($categoriesCount > $limit) {
-				include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-				$pagenav = new \XoopsPageNav($categoriesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
-				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
-			}
-		} else {
-			$GLOBALS['xoopsTpl']->assign('error', _AM_MYMODULE2_THEREARENT_CATEGORIES);
-		}
+    case 'list':
+    default:
+        // Define Stylesheet
+        $GLOBALS['xoTheme']->addStylesheet( $style, null );
+        $start = Request::getInt('start', 0);
+        $limit = Request::getInt('limit', $helper->getConfig('adminpager'));
+        $templateMain = 'mymodule2_admin_categories.tpl';
+        $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('categories.php'));
+        $adminObject->addItemButton(_AM_MYMODULE2_ADD_CATEGORY, 'categories.php?op=new', 'add');
+        $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
+        $categoriesCount = $categoriesHandler->getCountCategories();
+        $categoriesAll = $categoriesHandler->getAllCategories($start, $limit);
+        $GLOBALS['xoopsTpl']->assign('categories_count', $categoriesCount);
+        $GLOBALS['xoopsTpl']->assign('mymodule2_url', MYMODULE2_URL);
+        $GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
+        // Table view categories
+        if ($categoriesCount > 0) {
+            foreach(array_keys($categoriesAll) as $i) {
+                $category = $categoriesAll[$i]->getValuesCategories();
+                $GLOBALS['xoopsTpl']->append('categories_list', $category);
+                unset($category);
+            }
+            // Display Navigation
+            if ($categoriesCount > $limit) {
+                include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+                $pagenav = new \XoopsPageNav($categoriesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+                $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
+            }
+        } else {
+            $GLOBALS['xoopsTpl']->assign('error', _AM_MYMODULE2_THEREARENT_CATEGORIES);
+        }
 
-	break;
-	case 'new':
-		$templateMain = 'mymodule2_admin_categories.tpl';
-		$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('categories.php'));
-		$adminObject->addItemButton(_AM_MYMODULE2_CATEGORIES_LIST, 'categories.php', 'list');
-		$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
-		// Get Form
-		$categoriesObj = $categoriesHandler->create();
-		$form = $categoriesObj->getFormCategories();
-		$GLOBALS['xoopsTpl']->assign('form', $form->render());
+    break;
+    case 'new':
+        $templateMain = 'mymodule2_admin_categories.tpl';
+        $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('categories.php'));
+        $adminObject->addItemButton(_AM_MYMODULE2_CATEGORIES_LIST, 'categories.php', 'list');
+        $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
+        // Get Form
+        $categoriesObj = $categoriesHandler->create();
+        $form = $categoriesObj->getFormCategories();
+        $GLOBALS['xoopsTpl']->assign('form', $form->render());
 
-	break;
-	case 'save':
-		// Security Check
-		if (!$GLOBALS['xoopsSecurity']->check()) {
-			redirect_header('categories.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-		}
-		if (isset($catId)) {
-			$categoriesObj = $categoriesHandler->get($catId);
-		} else {
-			$categoriesObj = $categoriesHandler->create();
-		}
-		// Set Vars
-		$categoriesObj->setVar('cat_name', Request::getString('cat_name', ''));
-		// Set Var cat_logo
-		include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-		$filename       = $_FILES['cat_logo']['name'];
-		$imgMimetype    = $_FILES['cat_logo']['type'];
-		$imgNameDef     = Request::getString('cat_name');
-		$uploaderErrors = '';
-		$uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/categories/', 
-													$helper->getConfig('mimetypes_image'), 
-													$helper->getConfig('maxsize_image'), null, null);
-		if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
-			$extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
-			$imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
-			$uploader->setPrefix($imgName);
-			$uploader->fetchMedia($_POST['xoops_upload_file'][0]);
-			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 . '/categories/' . $savedFilename;
-					$imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH . '/categories/' . $savedFilename;
-					$imgHandler->imageMimetype = $imgMimetype;
-					$imgHandler->maxWidth      = $maxwidth;
-					$imgHandler->maxHeight     = $maxheight;
-					$result                    = $imgHandler->resizeImage();
-				}
-				$categoriesObj->setVar('cat_logo', $savedFilename);
-			}
-		} else {
-			if ($filename > '') {
-				$uploaderErrors = $uploader->getErrors();
-			}
-			$categoriesObj->setVar('cat_logo', Request::getString('cat_logo'));
-		}
-		$categoryCreated = date_create_from_format(_SHORTDATESTRING, Request::getString('cat_created'));
-		$categoriesObj->setVar('cat_created', $categoryCreated->getTimestamp());
-		$categoriesObj->setVar('cat_submitter', Request::getInt('cat_submitter', 0));
-		// Insert Data
-		if ($categoriesHandler->insert($categoriesObj)) {
-			if ('' !== $uploaderErrors) {
-				redirect_header('categories.php?op=edit&cat_id=' . $catId, 5, $uploaderErrors);
-			} else {
-				redirect_header('categories.php?op=list', 2, _AM_MYMODULE2_FORM_OK);
-			}
-		}
-		// Get Form
-		$GLOBALS['xoopsTpl']->assign('error', $categoriesObj->getHtmlErrors());
-		$form = $categoriesObj->getFormCategories();
-		$GLOBALS['xoopsTpl']->assign('form', $form->render());
+    break;
+    case 'save':
+        // Security Check
+        if (!$GLOBALS['xoopsSecurity']->check()) {
+            redirect_header('categories.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+        }
+        if (isset($catId)) {
+            $categoriesObj = $categoriesHandler->get($catId);
+        } else {
+            $categoriesObj = $categoriesHandler->create();
+        }
+        // Set Vars
+        $categoriesObj->setVar('cat_name', Request::getString('cat_name', ''));
+        // Set Var cat_logo
+        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        $filename       = $_FILES['cat_logo']['name'];
+        $imgMimetype    = $_FILES['cat_logo']['type'];
+        $imgNameDef     = Request::getString('cat_name');
+        $uploaderErrors = '';
+        $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/categories/', 
+                                                    $helper->getConfig('mimetypes_image'), 
+                                                    $helper->getConfig('maxsize_image'), null, null);
+        if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
+            $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
+            $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
+            $uploader->setPrefix($imgName);
+            $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
+            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 . '/categories/' . $savedFilename;
+                    $imgHandler->endFile       = MYMODULE2_UPLOAD_IMAGE_PATH . '/categories/' . $savedFilename;
+                    $imgHandler->imageMimetype = $imgMimetype;
+                    $imgHandler->maxWidth      = $maxwidth;
+                    $imgHandler->maxHeight     = $maxheight;
+                    $result                    = $imgHandler->resizeImage();
+                }
+                $categoriesObj->setVar('cat_logo', $savedFilename);
+            }
+        } else {
+            if ($filename > '') {
+                $uploaderErrors = $uploader->getErrors();
+            }
+            $categoriesObj->setVar('cat_logo', Request::getString('cat_logo'));
+        }
+        $categoryCreated = date_create_from_format(_SHORTDATESTRING, Request::getString('cat_created'));
+        $categoriesObj->setVar('cat_created', $categoryCreated->getTimestamp());
+        $categoriesObj->setVar('cat_submitter', Request::getInt('cat_submitter', 0));
+        // Insert Data
+        if ($categoriesHandler->insert($categoriesObj)) {
+            if ('' !== $uploaderErrors) {
+                redirect_header('categories.php?op=edit&cat_id=' . $catId, 5, $uploaderErrors);
+            } else {
+                redirect_header('categories.php?op=list', 2, _AM_MYMODULE2_FORM_OK);
+            }
+        }
+        // Get Form
+        $GLOBALS['xoopsTpl']->assign('error', $categoriesObj->getHtmlErrors());
+        $form = $categoriesObj->getFormCategories();
+        $GLOBALS['xoopsTpl']->assign('form', $form->render());
 
-	break;
-	case 'edit':
-		$templateMain = 'mymodule2_admin_categories.tpl';
-		$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('categories.php'));
-		$adminObject->addItemButton(_AM_MYMODULE2_ADD_CATEGORY, 'categories.php?op=new', 'add');
-		$adminObject->addItemButton(_AM_MYMODULE2_CATEGORIES_LIST, 'categories.php', 'list');
-		$GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
-		// Get Form
-		$categoriesObj = $categoriesHandler->get($catId);
-		$form = $categoriesObj->getFormCategories();
-		$GLOBALS['xoopsTpl']->assign('form', $form->render());
+    break;
+    case 'edit':
+        $templateMain = 'mymodule2_admin_categories.tpl';
+        $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('categories.php'));
+        $adminObject->addItemButton(_AM_MYMODULE2_ADD_CATEGORY, 'categories.php?op=new', 'add');
+        $adminObject->addItemButton(_AM_MYMODULE2_CATEGORIES_LIST, 'categories.php', 'list');
+        $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
+        // Get Form
+        $categoriesObj = $categoriesHandler->get($catId);
+        $form = $categoriesObj->getFormCategories();
+        $GLOBALS['xoopsTpl']->assign('form', $form->render());
 
-	break;
-	case 'delete':
-		$categoriesObj = $categoriesHandler->get($catId);
-		if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
-			if (!$GLOBALS['xoopsSecurity']->check()) {
-				redirect_header('categories.php', 3, implode(', ', $GLOBALS['xoopsSecurity']->getErrors()));
-			}
-			if ($categoriesHandler->delete($categoriesObj)) {
-				redirect_header('categories.php', 3, _AM_MYMODULE2_FORM_DELETE_OK);
-			} else {
-				$GLOBALS['xoopsTpl']->assign('error', $categoriesObj->getHtmlErrors());
-			}
-		} else {
-			xoops_confirm(array('ok' => 1, 'cat_id' => $catId, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_MYMODULE2_FORM_SURE_DELETE, $categoriesObj->getVar('cat_name')));
-		}
+    break;
+    case 'delete':
+        $categoriesObj = $categoriesHandler->get($catId);
+        if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header('categories.php', 3, implode(', ', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
+            if ($categoriesHandler->delete($categoriesObj)) {
+                redirect_header('categories.php', 3, _AM_MYMODULE2_FORM_DELETE_OK);
+            } else {
+                $GLOBALS['xoopsTpl']->assign('error', $categoriesObj->getHtmlErrors());
+            }
+        } else {
+            xoops_confirm(array('ok' => 1, 'cat_id' => $catId, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_MYMODULE2_FORM_SURE_DELETE, $categoriesObj->getVar('cat_name')));
+        }
 
-	break;
+    break;
 }
 require __DIR__ . '/footer.php';

Please login to merge, or discard this patch.

testdata/mymodule2/admin/menu.php 1 patch

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

@@ -27,37 +27,37 @@
 block discarded – undo
 $sysPathIcon32 = $moduleInfo->getInfo('sysicons32');
 
 $adminmenu[] = [
-	'title' => _MI_MYMODULE2_ADMENU1,
-	'link' => 'admin/index.php',
-	'icon' => $sysPathIcon32.'/dashboard.png',
+    'title' => _MI_MYMODULE2_ADMENU1,
+    'link' => 'admin/index.php',
+    'icon' => $sysPathIcon32.'/dashboard.png',
 ];
 $adminmenu[] = [
-	'title' => _MI_MYMODULE2_ADMENU2,
-	'link' => 'admin/categories.php',
-	'icon' => 'assets/icons/32/category.png',
+    'title' => _MI_MYMODULE2_ADMENU2,
+    'link' => 'admin/categories.php',
+    'icon' => 'assets/icons/32/category.png',
 ];
 $adminmenu[] = [
-	'title' => _MI_MYMODULE2_ADMENU3,
-	'link' => 'admin/articles.php',
-	'icon' => 'assets/icons/32/penguin.png',
+    'title' => _MI_MYMODULE2_ADMENU3,
+    'link' => 'admin/articles.php',
+    'icon' => 'assets/icons/32/penguin.png',
 ];
 $adminmenu[] = [
-	'title' => _MI_MYMODULE2_ADMENU4,
-	'link' => 'admin/testfields.php',
-	'icon' => 'assets/icons/32/alert.png',
+    'title' => _MI_MYMODULE2_ADMENU4,
+    'link' => 'admin/testfields.php',
+    'icon' => 'assets/icons/32/alert.png',
 ];
 $adminmenu[] = [
-	'title' => _MI_MYMODULE2_ADMENU5,
-	'link' => 'admin/permissions.php',
-	'icon' => $sysPathIcon32.'/permissions.png',
+    'title' => _MI_MYMODULE2_ADMENU5,
+    'link' => 'admin/permissions.php',
+    'icon' => $sysPathIcon32.'/permissions.png',
 ];
 $adminmenu[] = [
-	'title' => _MI_MYMODULE2_ADMENU6,
-	'link' => 'admin/feedback.php',
-	'icon' => $sysPathIcon32.'/mail_foward.png',
+    'title' => _MI_MYMODULE2_ADMENU6,
+    'link' => 'admin/feedback.php',
+    'icon' => $sysPathIcon32.'/mail_foward.png',
 ];
 $adminmenu[] = [
-	'title' => _MI_MYMODULE2_ABOUT,
-	'link' => 'admin/about.php',
-	'icon' => $sysPathIcon32.'/about.png',
+    'title' => _MI_MYMODULE2_ABOUT,
+    'link' => 'admin/about.php',
+    'icon' => $sysPathIcon32.'/about.png',
 ];

Please login to merge, or discard this patch.

testdata/mymodule2/admin/index.php 1 patch

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

@@ -44,26 +44,26 @@
 block discarded – undo
 // Upload Folders
 $configurator = new Common\Configurator();
 if ($configurator->uploadFolders && is_array($configurator->uploadFolders)) {
-	foreach(array_keys($configurator->uploadFolders) as $i) {
-		$folder[] = $configurator->uploadFolders[$i];
-	}
+    foreach(array_keys($configurator->uploadFolders) as $i) {
+        $folder[] = $configurator->uploadFolders[$i];
+    }
 }
 // Uploads Folders Created
 foreach(array_keys($folder) as $i) {
-	$adminObject->addConfigBoxLine($folder[$i], 'folder');
-	$adminObject->addConfigBoxLine(array($folder[$i], '777'), 'chmod');
+    $adminObject->addConfigBoxLine($folder[$i], 'folder');
+    $adminObject->addConfigBoxLine(array($folder[$i], '777'), 'chmod');
 }
 
 // Render Index
 $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('index.php'));
 // Test Data
 if ($helper->getConfig('displaySampleButton')) {
-	xoops_loadLanguage('admin/modulesadmin', 'system');
-	include_once dirname(__DIR__) . '/testdata/index.php';
-	$adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
-	$adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
+    xoops_loadLanguage('admin/modulesadmin', 'system');
+    include_once dirname(__DIR__) . '/testdata/index.php';
+    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
+    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
 //	$adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_EXPORT_SCHEMA'), '__DIR__ . /../../testdata/index.php?op=exportschema', 'add');
-	$adminObject->displayButton('left');
+    $adminObject->displayButton('left');
 }
 $GLOBALS['xoopsTpl']->assign('index', $adminObject->displayIndex());
 // End Test Data

Please login to merge, or discard this patch.

testdata/mymodule2/admin/permissions.php 1 patch

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

@@ -48,85 +48,85 @@
 block discarded – undo
 $permTableForm->addElement($formSelect);
 $permTableForm->display();
 switch($op) {
-	case 'global':
-	default:
-		$formTitle = _AM_MYMODULE2_PERMISSIONS_GLOBAL;
-		$permName = 'mymodule2_ac';
-		$permDesc = _AM_MYMODULE2_PERMISSIONS_GLOBAL_DESC;
-		$globalPerms = array( '4' => _AM_MYMODULE2_PERMISSIONS_GLOBAL_4, '8' => _AM_MYMODULE2_PERMISSIONS_GLOBAL_8, '16' => _AM_MYMODULE2_PERMISSIONS_GLOBAL_16 );
-	break;
-	case 'approve_articles':
-		$formTitle = _AM_MYMODULE2_PERMISSIONS_APPROVE;
-		$permName = 'mymodule2_approve_articles';
-		$permDesc = _AM_MYMODULE2_PERMISSIONS_APPROVE_DESC . ' Articles';
-		$handler = $helper->getHandler('articles');
-	break;
-	case 'submit_articles':
-		$formTitle = _AM_MYMODULE2_PERMISSIONS_SUBMIT;
-		$permName = 'mymodule2_submit_articles';
-		$permDesc = _AM_MYMODULE2_PERMISSIONS_SUBMIT_DESC . ' Articles';
-		$handler = $helper->getHandler('articles');
-	break;
-	case 'view_articles':
-		$formTitle = _AM_MYMODULE2_PERMISSIONS_VIEW;
-		$permName = 'mymodule2_view_articles';
-		$permDesc = _AM_MYMODULE2_PERMISSIONS_VIEW_DESC . ' Articles';
-		$handler = $helper->getHandler('articles');
-	break;
-	case 'approve_testfields':
-		$formTitle = _AM_MYMODULE2_PERMISSIONS_APPROVE;
-		$permName = 'mymodule2_approve_testfields';
-		$permDesc = _AM_MYMODULE2_PERMISSIONS_APPROVE_DESC . ' Testfields';
-		$handler = $helper->getHandler('testfields');
-	break;
-	case 'submit_testfields':
-		$formTitle = _AM_MYMODULE2_PERMISSIONS_SUBMIT;
-		$permName = 'mymodule2_submit_testfields';
-		$permDesc = _AM_MYMODULE2_PERMISSIONS_SUBMIT_DESC . ' Testfields';
-		$handler = $helper->getHandler('testfields');
-	break;
-	case 'view_testfields':
-		$formTitle = _AM_MYMODULE2_PERMISSIONS_VIEW;
-		$permName = 'mymodule2_view_testfields';
-		$permDesc = _AM_MYMODULE2_PERMISSIONS_VIEW_DESC . ' Testfields';
-		$handler = $helper->getHandler('testfields');
-	break;
+    case 'global':
+    default:
+        $formTitle = _AM_MYMODULE2_PERMISSIONS_GLOBAL;
+        $permName = 'mymodule2_ac';
+        $permDesc = _AM_MYMODULE2_PERMISSIONS_GLOBAL_DESC;
+        $globalPerms = array( '4' => _AM_MYMODULE2_PERMISSIONS_GLOBAL_4, '8' => _AM_MYMODULE2_PERMISSIONS_GLOBAL_8, '16' => _AM_MYMODULE2_PERMISSIONS_GLOBAL_16 );
+    break;
+    case 'approve_articles':
+        $formTitle = _AM_MYMODULE2_PERMISSIONS_APPROVE;
+        $permName = 'mymodule2_approve_articles';
+        $permDesc = _AM_MYMODULE2_PERMISSIONS_APPROVE_DESC . ' Articles';
+        $handler = $helper->getHandler('articles');
+    break;
+    case 'submit_articles':
+        $formTitle = _AM_MYMODULE2_PERMISSIONS_SUBMIT;
+        $permName = 'mymodule2_submit_articles';
+        $permDesc = _AM_MYMODULE2_PERMISSIONS_SUBMIT_DESC . ' Articles';
+        $handler = $helper->getHandler('articles');
+    break;
+    case 'view_articles':
+        $formTitle = _AM_MYMODULE2_PERMISSIONS_VIEW;
+        $permName = 'mymodule2_view_articles';
+        $permDesc = _AM_MYMODULE2_PERMISSIONS_VIEW_DESC . ' Articles';
+        $handler = $helper->getHandler('articles');
+    break;
+    case 'approve_testfields':
+        $formTitle = _AM_MYMODULE2_PERMISSIONS_APPROVE;
+        $permName = 'mymodule2_approve_testfields';
+        $permDesc = _AM_MYMODULE2_PERMISSIONS_APPROVE_DESC . ' Testfields';
+        $handler = $helper->getHandler('testfields');
+    break;
+    case 'submit_testfields':
+        $formTitle = _AM_MYMODULE2_PERMISSIONS_SUBMIT;
+        $permName = 'mymodule2_submit_testfields';
+        $permDesc = _AM_MYMODULE2_PERMISSIONS_SUBMIT_DESC . ' Testfields';
+        $handler = $helper->getHandler('testfields');
+    break;
+    case 'view_testfields':
+        $formTitle = _AM_MYMODULE2_PERMISSIONS_VIEW;
+        $permName = 'mymodule2_view_testfields';
+        $permDesc = _AM_MYMODULE2_PERMISSIONS_VIEW_DESC . ' Testfields';
+        $handler = $helper->getHandler('testfields');
+    break;
 }
 $moduleId = $xoopsModule->getVar('mid');
 $permform = new \XoopsGroupPermForm($formTitle, $moduleId, $permName, $permDesc, 'admin/permissions.php');
 $permFound = false;
 if ($op === 'global') {
-	foreach($globalPerms as $gPermId => $gPermName) {
-		$permform->addItem($gPermId, $gPermName);
-	}
-	$GLOBALS['xoopsTpl']->assign('form', $permform->render());
-	$permFound = true;
+    foreach($globalPerms as $gPermId => $gPermName) {
+        $permform->addItem($gPermId, $gPermName);
+    }
+    $GLOBALS['xoopsTpl']->assign('form', $permform->render());
+    $permFound = true;
 }
 if ($op === 'approve_articles' || $op === 'submit_articles' || $op === 'view_articles') {
-	$articlesCount = $articlesHandler->getCountArticles();
-	if ($articlesCount > 0) {
-		$articlesAll = $articlesHandler->getAllArticles(0, 'art_title');
-		foreach(array_keys($articlesAll) as $i) {
-			$permform->addItem($articlesAll[$i]->getVar('art_id'), $articlesAll[$i]->getVar('art_title'));
-		}
-		$GLOBALS['xoopsTpl']->assign('form', $permform->render());
-	}
-	$permFound = true;
+    $articlesCount = $articlesHandler->getCountArticles();
+    if ($articlesCount > 0) {
+        $articlesAll = $articlesHandler->getAllArticles(0, 'art_title');
+        foreach(array_keys($articlesAll) as $i) {
+            $permform->addItem($articlesAll[$i]->getVar('art_id'), $articlesAll[$i]->getVar('art_title'));
+        }
+        $GLOBALS['xoopsTpl']->assign('form', $permform->render());
+    }
+    $permFound = true;
 }
 if ($op === 'approve_testfields' || $op === 'submit_testfields' || $op === 'view_testfields') {
-	$testfieldsCount = $testfieldsHandler->getCountTestfields();
-	if ($testfieldsCount > 0) {
-		$testfieldsAll = $testfieldsHandler->getAllTestfields(0, 'tf_text');
-		foreach(array_keys($testfieldsAll) as $i) {
-			$permform->addItem($testfieldsAll[$i]->getVar('tf_id'), $testfieldsAll[$i]->getVar('tf_text'));
-		}
-		$GLOBALS['xoopsTpl']->assign('form', $permform->render());
-	}
-	$permFound = true;
+    $testfieldsCount = $testfieldsHandler->getCountTestfields();
+    if ($testfieldsCount > 0) {
+        $testfieldsAll = $testfieldsHandler->getAllTestfields(0, 'tf_text');
+        foreach(array_keys($testfieldsAll) as $i) {
+            $permform->addItem($testfieldsAll[$i]->getVar('tf_id'), $testfieldsAll[$i]->getVar('tf_text'));
+        }
+        $GLOBALS['xoopsTpl']->assign('form', $permform->render());
+    }
+    $permFound = true;
 }
 unset($permform);
 if ($permFound !== true) {
-	redirect_header('permissions.php', 3, _AM_MYMODULE2_NO_PERMISSIONS_SET);
-	exit();
+    redirect_header('permissions.php', 3, _AM_MYMODULE2_NO_PERMISSIONS_SET);
+    exit();
 }
 require __DIR__ . '/footer.php';

Please login to merge, or discard this patch.

		@@ -27,9 +27,9 @@ discard block
		block discarded – undo
27	27	require __DIR__ . '/header.php';
28	28	$tfId = Request::getInt('tf_id');
29	29	if (file_exists($tcpdf = XOOPS_ROOT_PATH.'/Frameworks/tcpdf/tcpdf.php')) {
30		- require_once $tcpdf;
	30	+ require_once $tcpdf;
31	31	} else {
32		- redirect_header('testfields.php', 2, _MA_MYMODULE2_NO_PDF_LIBRARY);
	32	+ redirect_header('testfields.php', 2, _MA_MYMODULE2_NO_PDF_LIBRARY);
33	33	}
34	34	// Get Instance of Handler
35	35	$testfieldsHandler = $helper->getHandler('testfields');
		@@ -61,9 +61,9 @@ discard block
		block discarded – undo
61	61	$pdfData['fontsize'] = 12;
62	62	// For schinese
63	63	if (_LANGCODE == 'cn') {
64		- $pdf->SetFont('gbsn00lp', '', $pdfData['fontsize']);
	64	+ $pdf->SetFont('gbsn00lp', '', $pdfData['fontsize']);
65	65	} else {
66		- $pdf->SetFont($pdfData['fontname'], '', $pdfData['fontsize']);
	66	+ $pdf->SetFont($pdfData['fontname'], '', $pdfData['fontsize']);
67	67	}
68	68	// Set document information
69	69	$pdf->SetCreator($pdfData['creator']);
		@@ -80,16 +80,16 @@ discard block
		block discarded – undo
80	80	$pdf->SetFooterMargin(PDF_MARGIN_FOOTER);
81	81	$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); //set image scale factor
82	82	if (_LANGCODE == 'cn') {
83		- $pdf->setHeaderFont(array('gbsn00lp', '', $pdfData['fontsize']));
84		- $pdf->setFooterFont(array('gbsn00lp', '', $pdfData['fontsize']));
	83	+ $pdf->setHeaderFont(array('gbsn00lp', '', $pdfData['fontsize']));
	84	+ $pdf->setFooterFont(array('gbsn00lp', '', $pdfData['fontsize']));
85	85	} else {
86		- $pdf->setHeaderFont(array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
87		- $pdf->setFooterFont(array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
	86	+ $pdf->setHeaderFont(array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
	87	+ $pdf->setFooterFont(array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
88	88	}
89	89	// Set some language-dependent strings (optional)
90	90	if (@file_exists($lang = XOOPS_ROOT_PATH.'/Frameworks/tcpdf/lang/eng.php')) {
91		- require_once $lang . '/.php';
92		- $pdf->setLanguageArray($l);
	91	+ require_once $lang . '/.php';
	92	+ $pdf->setLanguageArray($l);
93	93	}
94	94	// Initialize document
95	95	$pdf->AliasNbPages();

		@@ -42,23 +42,23 @@
		block discarded – undo
42	42	$testfieldsAll = $testfieldsHandler->getAllTestfields($start, $limit);
43	43	$keywords = [];
44	44	if ($testfieldsCount > 0) {
45		- $testfields = [];
46		- // Get All Testfields
47		- foreach(array_keys($testfieldsAll) as $i) {
48		- $testfields[] = $testfieldsAll[$i]->getValuesTestfields();
49		- $keywords[] = $testfieldsAll[$i]->getVar('tf_text');
50		- }
51		- $GLOBALS['xoopsTpl']->assign('testfields', $testfields);
52		- unset($testfields);
53		- // Display Navigation
54		- if ($testfieldsCount > $limit) {
55		- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
56		- $pagenav = new \XoopsPageNav($testfieldsCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
57		- $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
58		- }
59		- $GLOBALS['xoopsTpl']->assign('type', $helper->getConfig('table_type'));
60		- $GLOBALS['xoopsTpl']->assign('divideby', $helper->getConfig('divideby'));
61		- $GLOBALS['xoopsTpl']->assign('numb_col', $helper->getConfig('numb_col'));
	45	+ $testfields = [];
	46	+ // Get All Testfields
	47	+ foreach(array_keys($testfieldsAll) as $i) {
	48	+ $testfields[] = $testfieldsAll[$i]->getValuesTestfields();
	49	+ $keywords[] = $testfieldsAll[$i]->getVar('tf_text');
	50	+ }
	51	+ $GLOBALS['xoopsTpl']->assign('testfields', $testfields);
	52	+ unset($testfields);
	53	+ // Display Navigation
	54	+ if ($testfieldsCount > $limit) {
	55	+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
	56	+ $pagenav = new \XoopsPageNav($testfieldsCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
	57	+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
	58	+ }
	59	+ $GLOBALS['xoopsTpl']->assign('type', $helper->getConfig('table_type'));
	60	+ $GLOBALS['xoopsTpl']->assign('divideby', $helper->getConfig('divideby'));
	61	+ $GLOBALS['xoopsTpl']->assign('numb_col', $helper->getConfig('numb_col'));
62	62	}
63	63
64	64	// Breadcrumbs

		@@ -30,195 +30,195 @@
		block discarded – undo
30	30	// Request art_id
31	31	$artId = Request::getInt('art_id');
32	32	switch($op) {
33		- case 'list':
34		- default:
35		- // Define Stylesheet
36		- $GLOBALS['xoTheme']->addStylesheet( $style, null );
37		- $start = Request::getInt('start', 0);
38		- $limit = Request::getInt('limit', $helper->getConfig('adminpager'));
39		- $templateMain = 'mymodule2_admin_articles.tpl';
40		- $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('articles.php'));
41		- $adminObject->addItemButton(_AM_MYMODULE2_ADD_ARTICLE, 'articles.php?op=new', 'add');
42		- $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
43		- $articlesCount = $articlesHandler->getCountArticles();
44		- $articlesAll = $articlesHandler->getAllArticles($start, $limit);
45		- $GLOBALS['xoopsTpl']->assign('articles_count', $articlesCount);
46		- $GLOBALS['xoopsTpl']->assign('mymodule2_url', MYMODULE2_URL);
47		- $GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
48		- // Table view articles
49		- if ($articlesCount > 0) {
50		- foreach(array_keys($articlesAll) as $i) {
51		- $article = $articlesAll[$i]->getValuesArticles();
52		- $GLOBALS['xoopsTpl']->append('articles_list', $article);
53		- unset($article);
54		- }
55		- // Display Navigation
56		- if ($articlesCount > $limit) {
57		- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
58		- $pagenav = new \XoopsPageNav($articlesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
59		- $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
60		- }
61		- } else {
62		- $GLOBALS['xoopsTpl']->assign('error', _AM_MYMODULE2_THEREARENT_ARTICLES);
63		- }
	33	+ case 'list':
	34	+ default:
	35	+ // Define Stylesheet
	36	+ $GLOBALS['xoTheme']->addStylesheet( $style, null );
	37	+ $start = Request::getInt('start', 0);
	38	+ $limit = Request::getInt('limit', $helper->getConfig('adminpager'));
	39	+ $templateMain = 'mymodule2_admin_articles.tpl';
	40	+ $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('articles.php'));
	41	+ $adminObject->addItemButton(_AM_MYMODULE2_ADD_ARTICLE, 'articles.php?op=new', 'add');
	42	+ $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
	43	+ $articlesCount = $articlesHandler->getCountArticles();
	44	+ $articlesAll = $articlesHandler->getAllArticles($start, $limit);
	45	+ $GLOBALS['xoopsTpl']->assign('articles_count', $articlesCount);
	46	+ $GLOBALS['xoopsTpl']->assign('mymodule2_url', MYMODULE2_URL);
	47	+ $GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
	48	+ // Table view articles
	49	+ if ($articlesCount > 0) {
	50	+ foreach(array_keys($articlesAll) as $i) {
	51	+ $article = $articlesAll[$i]->getValuesArticles();
	52	+ $GLOBALS['xoopsTpl']->append('articles_list', $article);
	53	+ unset($article);
	54	+ }
	55	+ // Display Navigation
	56	+ if ($articlesCount > $limit) {
	57	+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
	58	+ $pagenav = new \XoopsPageNav($articlesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
	59	+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
	60	+ }
	61	+ } else {
	62	+ $GLOBALS['xoopsTpl']->assign('error', _AM_MYMODULE2_THEREARENT_ARTICLES);
	63	+ }
64	64
65		- break;
66		- case 'new':
67		- $templateMain = 'mymodule2_admin_articles.tpl';
68		- $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('articles.php'));
69		- $adminObject->addItemButton(_AM_MYMODULE2_ARTICLES_LIST, 'articles.php', 'list');
70		- $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
71		- // Get Form
72		- $articlesObj = $articlesHandler->create();
73		- $form = $articlesObj->getFormArticles();
74		- $GLOBALS['xoopsTpl']->assign('form', $form->render());
	65	+ break;
	66	+ case 'new':
	67	+ $templateMain = 'mymodule2_admin_articles.tpl';
	68	+ $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('articles.php'));
	69	+ $adminObject->addItemButton(_AM_MYMODULE2_ARTICLES_LIST, 'articles.php', 'list');
	70	+ $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
	71	+ // Get Form
	72	+ $articlesObj = $articlesHandler->create();
	73	+ $form = $articlesObj->getFormArticles();
	74	+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
75	75
76		- break;
77		- case 'save':
78		- // Security Check
79		- if (!$GLOBALS['xoopsSecurity']->check()) {
80		- redirect_header('articles.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
81		- }
82		- if (isset($artId)) {
83		- $articlesObj = $articlesHandler->get($artId);
84		- } else {
85		- $articlesObj = $articlesHandler->create();
86		- }
87		- // Set Vars
88		- $articlesObj->setVar('art_cat', Request::getInt('art_cat', 0));
89		- $articlesObj->setVar('art_title', Request::getString('art_title', ''));
90		- $articlesObj->setVar('art_descr', Request::getString('art_descr', ''));
91		- // Set Var art_img
92		- include_once XOOPS_ROOT_PATH . '/class/uploader.php';
93		- $filename = $_FILES['art_img']['name'];
94		- $imgMimetype = $_FILES['art_img']['type'];
95		- $imgNameDef = Request::getString('art_title');
96		- $uploaderErrors = '';
97		- $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/articles/',
98		- $helper->getConfig('mimetypes_image'),
99		- $helper->getConfig('maxsize_image'), null, null);
100		- if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
101		- $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
102		- $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
103		- $uploader->setPrefix($imgName);
104		- $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
105		- if (!$uploader->upload()) {
106		- $uploaderErrors = $uploader->getErrors();
107		- } else {
108		- $savedFilename = $uploader->getSavedFileName();
109		- $maxwidth = (int)$helper->getConfig('maxwidth_image');
110		- $maxheight = (int)$helper->getConfig('maxheight_image');
111		- if ($maxwidth > 0 && $maxheight > 0) {
112		- // Resize image
113		- $imgHandler = new Mymodule2\Common\Resizer();
114		- $imgHandler->sourceFile = MYMODULE2_UPLOAD_IMAGE_PATH . '/articles/' . $savedFilename;
115		- $imgHandler->endFile = MYMODULE2_UPLOAD_IMAGE_PATH . '/articles/' . $savedFilename;
116		- $imgHandler->imageMimetype = $imgMimetype;
117		- $imgHandler->maxWidth = $maxwidth;
118		- $imgHandler->maxHeight = $maxheight;
119		- $result = $imgHandler->resizeImage();
120		- }
121		- $articlesObj->setVar('art_img', $savedFilename);
122		- }
123		- } else {
124		- if ($filename > '') {
125		- $uploaderErrors = $uploader->getErrors();
126		- }
127		- $articlesObj->setVar('art_img', Request::getString('art_img'));
128		- }
129		- $articlesObj->setVar('art_status', Request::getInt('art_status', 0));
130		- // Set Var art_file
131		- include_once XOOPS_ROOT_PATH . '/class/uploader.php';
132		- $filename = $_FILES['art_file']['name'];
133		- $imgNameDef = Request::getString('art_title');
134		- $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/articles/',
135		- $helper->getConfig('mimetypes_file'),
136		- $helper->getConfig('maxsize_file'), null, null);
137		- if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) {
138		- $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
139		- $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
140		- $uploader->setPrefix($imgName);
141		- $uploader->fetchMedia($_POST['xoops_upload_file'][1]);
142		- if (!$uploader->upload()) {
143		- $errors = $uploader->getErrors();
144		- } else {
145		- $articlesObj->setVar('art_file', $uploader->getSavedFileName());
146		- }
147		- } else {
148		- if ($filename > '') {
149		- $uploaderErrors = $uploader->getErrors();
150		- }
151		- $articlesObj->setVar('art_file', Request::getString('art_file'));
152		- }
153		- $articleCreated = date_create_from_format(_SHORTDATESTRING, Request::getString('art_created'));
154		- $articlesObj->setVar('art_created', $articleCreated->getTimestamp());
155		- $articlesObj->setVar('art_submitter', Request::getInt('art_submitter', 0));
156		- // Insert Data
157		- if ($articlesHandler->insert($articlesObj)) {
158		- $newArtId = $articlesObj->getNewInsertedIdArticles();
159		- $permId = isset($_REQUEST['art_id']) ? $artId : $newArtId;
160		- $grouppermHandler = xoops_getHandler('groupperm');
161		- $mid = $GLOBALS['xoopsModule']->getVar('mid');
162		- // Permission to view_articles
163		- $grouppermHandler->deleteByModule($mid, 'mymodule2_view_articles', $permId);
164		- if (isset($_POST['groups_view_articles'])) {
165		- foreach($_POST['groups_view_articles'] as $onegroupId) {
166		- $grouppermHandler->addRight('mymodule2_view_articles', $permId, $onegroupId, $mid);
167		- }
168		- }
169		- // Permission to submit_articles
170		- $grouppermHandler->deleteByModule($mid, 'mymodule2_submit_articles', $permId);
171		- if (isset($_POST['groups_submit_articles'])) {
172		- foreach($_POST['groups_submit_articles'] as $onegroupId) {
173		- $grouppermHandler->addRight('mymodule2_submit_articles', $permId, $onegroupId, $mid);
174		- }
175		- }
176		- // Permission to approve_articles
177		- $grouppermHandler->deleteByModule($mid, 'mymodule2_approve_articles', $permId);
178		- if (isset($_POST['groups_approve_articles'])) {
179		- foreach($_POST['groups_approve_articles'] as $onegroupId) {
180		- $grouppermHandler->addRight('mymodule2_approve_articles', $permId, $onegroupId, $mid);
181		- }
182		- }
183		- if ('' !== $uploaderErrors) {
184		- redirect_header('articles.php?op=edit&art_id=' . $artId, 5, $uploaderErrors);
185		- } else {
186		- redirect_header('articles.php?op=list', 2, _AM_MYMODULE2_FORM_OK);
187		- }
188		- }
189		- // Get Form
190		- $GLOBALS['xoopsTpl']->assign('error', $articlesObj->getHtmlErrors());
191		- $form = $articlesObj->getFormArticles();
192		- $GLOBALS['xoopsTpl']->assign('form', $form->render());
	76	+ break;
	77	+ case 'save':
	78	+ // Security Check
	79	+ if (!$GLOBALS['xoopsSecurity']->check()) {
	80	+ redirect_header('articles.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
	81	+ }
	82	+ if (isset($artId)) {
	83	+ $articlesObj = $articlesHandler->get($artId);
	84	+ } else {
	85	+ $articlesObj = $articlesHandler->create();
	86	+ }
	87	+ // Set Vars
	88	+ $articlesObj->setVar('art_cat', Request::getInt('art_cat', 0));
	89	+ $articlesObj->setVar('art_title', Request::getString('art_title', ''));
	90	+ $articlesObj->setVar('art_descr', Request::getString('art_descr', ''));
	91	+ // Set Var art_img
	92	+ include_once XOOPS_ROOT_PATH . '/class/uploader.php';
	93	+ $filename = $_FILES['art_img']['name'];
	94	+ $imgMimetype = $_FILES['art_img']['type'];
	95	+ $imgNameDef = Request::getString('art_title');
	96	+ $uploaderErrors = '';
	97	+ $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/articles/',
	98	+ $helper->getConfig('mimetypes_image'),
	99	+ $helper->getConfig('maxsize_image'), null, null);
	100	+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
	101	+ $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
	102	+ $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
	103	+ $uploader->setPrefix($imgName);
	104	+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
	105	+ if (!$uploader->upload()) {
	106	+ $uploaderErrors = $uploader->getErrors();
	107	+ } else {
	108	+ $savedFilename = $uploader->getSavedFileName();
	109	+ $maxwidth = (int)$helper->getConfig('maxwidth_image');
	110	+ $maxheight = (int)$helper->getConfig('maxheight_image');
	111	+ if ($maxwidth > 0 && $maxheight > 0) {
	112	+ // Resize image
	113	+ $imgHandler = new Mymodule2\Common\Resizer();
	114	+ $imgHandler->sourceFile = MYMODULE2_UPLOAD_IMAGE_PATH . '/articles/' . $savedFilename;
	115	+ $imgHandler->endFile = MYMODULE2_UPLOAD_IMAGE_PATH . '/articles/' . $savedFilename;
	116	+ $imgHandler->imageMimetype = $imgMimetype;
	117	+ $imgHandler->maxWidth = $maxwidth;
	118	+ $imgHandler->maxHeight = $maxheight;
	119	+ $result = $imgHandler->resizeImage();
	120	+ }
	121	+ $articlesObj->setVar('art_img', $savedFilename);
	122	+ }
	123	+ } else {
	124	+ if ($filename > '') {
	125	+ $uploaderErrors = $uploader->getErrors();
	126	+ }
	127	+ $articlesObj->setVar('art_img', Request::getString('art_img'));
	128	+ }
	129	+ $articlesObj->setVar('art_status', Request::getInt('art_status', 0));
	130	+ // Set Var art_file
	131	+ include_once XOOPS_ROOT_PATH . '/class/uploader.php';
	132	+ $filename = $_FILES['art_file']['name'];
	133	+ $imgNameDef = Request::getString('art_title');
	134	+ $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_FILES_PATH . '/articles/',
	135	+ $helper->getConfig('mimetypes_file'),
	136	+ $helper->getConfig('maxsize_file'), null, null);
	137	+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][1])) {
	138	+ $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
	139	+ $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
	140	+ $uploader->setPrefix($imgName);
	141	+ $uploader->fetchMedia($_POST['xoops_upload_file'][1]);
	142	+ if (!$uploader->upload()) {
	143	+ $errors = $uploader->getErrors();
	144	+ } else {
	145	+ $articlesObj->setVar('art_file', $uploader->getSavedFileName());
	146	+ }
	147	+ } else {
	148	+ if ($filename > '') {
	149	+ $uploaderErrors = $uploader->getErrors();
	150	+ }
	151	+ $articlesObj->setVar('art_file', Request::getString('art_file'));
	152	+ }
	153	+ $articleCreated = date_create_from_format(_SHORTDATESTRING, Request::getString('art_created'));
	154	+ $articlesObj->setVar('art_created', $articleCreated->getTimestamp());
	155	+ $articlesObj->setVar('art_submitter', Request::getInt('art_submitter', 0));
	156	+ // Insert Data
	157	+ if ($articlesHandler->insert($articlesObj)) {
	158	+ $newArtId = $articlesObj->getNewInsertedIdArticles();
	159	+ $permId = isset($_REQUEST['art_id']) ? $artId : $newArtId;
	160	+ $grouppermHandler = xoops_getHandler('groupperm');
	161	+ $mid = $GLOBALS['xoopsModule']->getVar('mid');
	162	+ // Permission to view_articles
	163	+ $grouppermHandler->deleteByModule($mid, 'mymodule2_view_articles', $permId);
	164	+ if (isset($_POST['groups_view_articles'])) {
	165	+ foreach($_POST['groups_view_articles'] as $onegroupId) {
	166	+ $grouppermHandler->addRight('mymodule2_view_articles', $permId, $onegroupId, $mid);
	167	+ }
	168	+ }
	169	+ // Permission to submit_articles
	170	+ $grouppermHandler->deleteByModule($mid, 'mymodule2_submit_articles', $permId);
	171	+ if (isset($_POST['groups_submit_articles'])) {
	172	+ foreach($_POST['groups_submit_articles'] as $onegroupId) {
	173	+ $grouppermHandler->addRight('mymodule2_submit_articles', $permId, $onegroupId, $mid);
	174	+ }
	175	+ }
	176	+ // Permission to approve_articles
	177	+ $grouppermHandler->deleteByModule($mid, 'mymodule2_approve_articles', $permId);
	178	+ if (isset($_POST['groups_approve_articles'])) {
	179	+ foreach($_POST['groups_approve_articles'] as $onegroupId) {
	180	+ $grouppermHandler->addRight('mymodule2_approve_articles', $permId, $onegroupId, $mid);
	181	+ }
	182	+ }
	183	+ if ('' !== $uploaderErrors) {
	184	+ redirect_header('articles.php?op=edit&art_id=' . $artId, 5, $uploaderErrors);
	185	+ } else {
	186	+ redirect_header('articles.php?op=list', 2, _AM_MYMODULE2_FORM_OK);
	187	+ }
	188	+ }
	189	+ // Get Form
	190	+ $GLOBALS['xoopsTpl']->assign('error', $articlesObj->getHtmlErrors());
	191	+ $form = $articlesObj->getFormArticles();
	192	+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
193	193
194		- break;
195		- case 'edit':
196		- $templateMain = 'mymodule2_admin_articles.tpl';
197		- $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('articles.php'));
198		- $adminObject->addItemButton(_AM_MYMODULE2_ADD_ARTICLE, 'articles.php?op=new', 'add');
199		- $adminObject->addItemButton(_AM_MYMODULE2_ARTICLES_LIST, 'articles.php', 'list');
200		- $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
201		- // Get Form
202		- $articlesObj = $articlesHandler->get($artId);
203		- $form = $articlesObj->getFormArticles();
204		- $GLOBALS['xoopsTpl']->assign('form', $form->render());
	194	+ break;
	195	+ case 'edit':
	196	+ $templateMain = 'mymodule2_admin_articles.tpl';
	197	+ $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('articles.php'));
	198	+ $adminObject->addItemButton(_AM_MYMODULE2_ADD_ARTICLE, 'articles.php?op=new', 'add');
	199	+ $adminObject->addItemButton(_AM_MYMODULE2_ARTICLES_LIST, 'articles.php', 'list');
	200	+ $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
	201	+ // Get Form
	202	+ $articlesObj = $articlesHandler->get($artId);
	203	+ $form = $articlesObj->getFormArticles();
	204	+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
205	205
206		- break;
207		- case 'delete':
208		- $articlesObj = $articlesHandler->get($artId);
209		- if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
210		- if (!$GLOBALS['xoopsSecurity']->check()) {
211		- redirect_header('articles.php', 3, implode(', ', $GLOBALS['xoopsSecurity']->getErrors()));
212		- }
213		- if ($articlesHandler->delete($articlesObj)) {
214		- redirect_header('articles.php', 3, _AM_MYMODULE2_FORM_DELETE_OK);
215		- } else {
216		- $GLOBALS['xoopsTpl']->assign('error', $articlesObj->getHtmlErrors());
217		- }
218		- } else {
219		- xoops_confirm(array('ok' => 1, 'art_id' => $artId, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_MYMODULE2_FORM_SURE_DELETE, $articlesObj->getVar('art_title')));
220		- }
	206	+ break;
	207	+ case 'delete':
	208	+ $articlesObj = $articlesHandler->get($artId);
	209	+ if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
	210	+ if (!$GLOBALS['xoopsSecurity']->check()) {
	211	+ redirect_header('articles.php', 3, implode(', ', $GLOBALS['xoopsSecurity']->getErrors()));
	212	+ }
	213	+ if ($articlesHandler->delete($articlesObj)) {
	214	+ redirect_header('articles.php', 3, _AM_MYMODULE2_FORM_DELETE_OK);
	215	+ } else {
	216	+ $GLOBALS['xoopsTpl']->assign('error', $articlesObj->getHtmlErrors());
	217	+ }
	218	+ } else {
	219	+ xoops_confirm(array('ok' => 1, 'art_id' => $artId, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_MYMODULE2_FORM_SURE_DELETE, $articlesObj->getVar('art_title')));
	220	+ }
221	221
222		- break;
	222	+ break;
223	223	}
224	224	require __DIR__ . '/footer.php';

		@@ -30,144 +30,144 @@
		block discarded – undo
30	30	// Request cat_id
31	31	$catId = Request::getInt('cat_id');
32	32	switch($op) {
33		- case 'list':
34		- default:
35		- // Define Stylesheet
36		- $GLOBALS['xoTheme']->addStylesheet( $style, null );
37		- $start = Request::getInt('start', 0);
38		- $limit = Request::getInt('limit', $helper->getConfig('adminpager'));
39		- $templateMain = 'mymodule2_admin_categories.tpl';
40		- $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('categories.php'));
41		- $adminObject->addItemButton(_AM_MYMODULE2_ADD_CATEGORY, 'categories.php?op=new', 'add');
42		- $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
43		- $categoriesCount = $categoriesHandler->getCountCategories();
44		- $categoriesAll = $categoriesHandler->getAllCategories($start, $limit);
45		- $GLOBALS['xoopsTpl']->assign('categories_count', $categoriesCount);
46		- $GLOBALS['xoopsTpl']->assign('mymodule2_url', MYMODULE2_URL);
47		- $GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
48		- // Table view categories
49		- if ($categoriesCount > 0) {
50		- foreach(array_keys($categoriesAll) as $i) {
51		- $category = $categoriesAll[$i]->getValuesCategories();
52		- $GLOBALS['xoopsTpl']->append('categories_list', $category);
53		- unset($category);
54		- }
55		- // Display Navigation
56		- if ($categoriesCount > $limit) {
57		- include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
58		- $pagenav = new \XoopsPageNav($categoriesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
59		- $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
60		- }
61		- } else {
62		- $GLOBALS['xoopsTpl']->assign('error', _AM_MYMODULE2_THEREARENT_CATEGORIES);
63		- }
	33	+ case 'list':
	34	+ default:
	35	+ // Define Stylesheet
	36	+ $GLOBALS['xoTheme']->addStylesheet( $style, null );
	37	+ $start = Request::getInt('start', 0);
	38	+ $limit = Request::getInt('limit', $helper->getConfig('adminpager'));
	39	+ $templateMain = 'mymodule2_admin_categories.tpl';
	40	+ $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('categories.php'));
	41	+ $adminObject->addItemButton(_AM_MYMODULE2_ADD_CATEGORY, 'categories.php?op=new', 'add');
	42	+ $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
	43	+ $categoriesCount = $categoriesHandler->getCountCategories();
	44	+ $categoriesAll = $categoriesHandler->getAllCategories($start, $limit);
	45	+ $GLOBALS['xoopsTpl']->assign('categories_count', $categoriesCount);
	46	+ $GLOBALS['xoopsTpl']->assign('mymodule2_url', MYMODULE2_URL);
	47	+ $GLOBALS['xoopsTpl']->assign('mymodule2_upload_url', MYMODULE2_UPLOAD_URL);
	48	+ // Table view categories
	49	+ if ($categoriesCount > 0) {
	50	+ foreach(array_keys($categoriesAll) as $i) {
	51	+ $category = $categoriesAll[$i]->getValuesCategories();
	52	+ $GLOBALS['xoopsTpl']->append('categories_list', $category);
	53	+ unset($category);
	54	+ }
	55	+ // Display Navigation
	56	+ if ($categoriesCount > $limit) {
	57	+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
	58	+ $pagenav = new \XoopsPageNav($categoriesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
	59	+ $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
	60	+ }
	61	+ } else {
	62	+ $GLOBALS['xoopsTpl']->assign('error', _AM_MYMODULE2_THEREARENT_CATEGORIES);
	63	+ }
64	64
65		- break;
66		- case 'new':
67		- $templateMain = 'mymodule2_admin_categories.tpl';
68		- $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('categories.php'));
69		- $adminObject->addItemButton(_AM_MYMODULE2_CATEGORIES_LIST, 'categories.php', 'list');
70		- $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
71		- // Get Form
72		- $categoriesObj = $categoriesHandler->create();
73		- $form = $categoriesObj->getFormCategories();
74		- $GLOBALS['xoopsTpl']->assign('form', $form->render());
	65	+ break;
	66	+ case 'new':
	67	+ $templateMain = 'mymodule2_admin_categories.tpl';
	68	+ $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('categories.php'));
	69	+ $adminObject->addItemButton(_AM_MYMODULE2_CATEGORIES_LIST, 'categories.php', 'list');
	70	+ $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
	71	+ // Get Form
	72	+ $categoriesObj = $categoriesHandler->create();
	73	+ $form = $categoriesObj->getFormCategories();
	74	+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
75	75
76		- break;
77		- case 'save':
78		- // Security Check
79		- if (!$GLOBALS['xoopsSecurity']->check()) {
80		- redirect_header('categories.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
81		- }
82		- if (isset($catId)) {
83		- $categoriesObj = $categoriesHandler->get($catId);
84		- } else {
85		- $categoriesObj = $categoriesHandler->create();
86		- }
87		- // Set Vars
88		- $categoriesObj->setVar('cat_name', Request::getString('cat_name', ''));
89		- // Set Var cat_logo
90		- include_once XOOPS_ROOT_PATH . '/class/uploader.php';
91		- $filename = $_FILES['cat_logo']['name'];
92		- $imgMimetype = $_FILES['cat_logo']['type'];
93		- $imgNameDef = Request::getString('cat_name');
94		- $uploaderErrors = '';
95		- $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/categories/',
96		- $helper->getConfig('mimetypes_image'),
97		- $helper->getConfig('maxsize_image'), null, null);
98		- if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
99		- $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
100		- $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
101		- $uploader->setPrefix($imgName);
102		- $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
103		- if (!$uploader->upload()) {
104		- $uploaderErrors = $uploader->getErrors();
105		- } else {
106		- $savedFilename = $uploader->getSavedFileName();
107		- $maxwidth = (int)$helper->getConfig('maxwidth_image');
108		- $maxheight = (int)$helper->getConfig('maxheight_image');
109		- if ($maxwidth > 0 && $maxheight > 0) {
110		- // Resize image
111		- $imgHandler = new Mymodule2\Common\Resizer();
112		- $imgHandler->sourceFile = MYMODULE2_UPLOAD_IMAGE_PATH . '/categories/' . $savedFilename;
113		- $imgHandler->endFile = MYMODULE2_UPLOAD_IMAGE_PATH . '/categories/' . $savedFilename;
114		- $imgHandler->imageMimetype = $imgMimetype;
115		- $imgHandler->maxWidth = $maxwidth;
116		- $imgHandler->maxHeight = $maxheight;
117		- $result = $imgHandler->resizeImage();
118		- }
119		- $categoriesObj->setVar('cat_logo', $savedFilename);
120		- }
121		- } else {
122		- if ($filename > '') {
123		- $uploaderErrors = $uploader->getErrors();
124		- }
125		- $categoriesObj->setVar('cat_logo', Request::getString('cat_logo'));
126		- }
127		- $categoryCreated = date_create_from_format(_SHORTDATESTRING, Request::getString('cat_created'));
128		- $categoriesObj->setVar('cat_created', $categoryCreated->getTimestamp());
129		- $categoriesObj->setVar('cat_submitter', Request::getInt('cat_submitter', 0));
130		- // Insert Data
131		- if ($categoriesHandler->insert($categoriesObj)) {
132		- if ('' !== $uploaderErrors) {
133		- redirect_header('categories.php?op=edit&cat_id=' . $catId, 5, $uploaderErrors);
134		- } else {
135		- redirect_header('categories.php?op=list', 2, _AM_MYMODULE2_FORM_OK);
136		- }
137		- }
138		- // Get Form
139		- $GLOBALS['xoopsTpl']->assign('error', $categoriesObj->getHtmlErrors());
140		- $form = $categoriesObj->getFormCategories();
141		- $GLOBALS['xoopsTpl']->assign('form', $form->render());
	76	+ break;
	77	+ case 'save':
	78	+ // Security Check
	79	+ if (!$GLOBALS['xoopsSecurity']->check()) {
	80	+ redirect_header('categories.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
	81	+ }
	82	+ if (isset($catId)) {
	83	+ $categoriesObj = $categoriesHandler->get($catId);
	84	+ } else {
	85	+ $categoriesObj = $categoriesHandler->create();
	86	+ }
	87	+ // Set Vars
	88	+ $categoriesObj->setVar('cat_name', Request::getString('cat_name', ''));
	89	+ // Set Var cat_logo
	90	+ include_once XOOPS_ROOT_PATH . '/class/uploader.php';
	91	+ $filename = $_FILES['cat_logo']['name'];
	92	+ $imgMimetype = $_FILES['cat_logo']['type'];
	93	+ $imgNameDef = Request::getString('cat_name');
	94	+ $uploaderErrors = '';
	95	+ $uploader = new \XoopsMediaUploader(MYMODULE2_UPLOAD_IMAGE_PATH . '/categories/',
	96	+ $helper->getConfig('mimetypes_image'),
	97	+ $helper->getConfig('maxsize_image'), null, null);
	98	+ if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
	99	+ $extension = preg_replace('/^.+\.([^.]+)$/sU', '', $filename);
	100	+ $imgName = str_replace(' ', '', $imgNameDef) . '.' . $extension;
	101	+ $uploader->setPrefix($imgName);
	102	+ $uploader->fetchMedia($_POST['xoops_upload_file'][0]);
	103	+ if (!$uploader->upload()) {
	104	+ $uploaderErrors = $uploader->getErrors();
	105	+ } else {
	106	+ $savedFilename = $uploader->getSavedFileName();
	107	+ $maxwidth = (int)$helper->getConfig('maxwidth_image');
	108	+ $maxheight = (int)$helper->getConfig('maxheight_image');
	109	+ if ($maxwidth > 0 && $maxheight > 0) {
	110	+ // Resize image
	111	+ $imgHandler = new Mymodule2\Common\Resizer();
	112	+ $imgHandler->sourceFile = MYMODULE2_UPLOAD_IMAGE_PATH . '/categories/' . $savedFilename;
	113	+ $imgHandler->endFile = MYMODULE2_UPLOAD_IMAGE_PATH . '/categories/' . $savedFilename;
	114	+ $imgHandler->imageMimetype = $imgMimetype;
	115	+ $imgHandler->maxWidth = $maxwidth;
	116	+ $imgHandler->maxHeight = $maxheight;
	117	+ $result = $imgHandler->resizeImage();
	118	+ }
	119	+ $categoriesObj->setVar('cat_logo', $savedFilename);
	120	+ }
	121	+ } else {
	122	+ if ($filename > '') {
	123	+ $uploaderErrors = $uploader->getErrors();
	124	+ }
	125	+ $categoriesObj->setVar('cat_logo', Request::getString('cat_logo'));
	126	+ }
	127	+ $categoryCreated = date_create_from_format(_SHORTDATESTRING, Request::getString('cat_created'));
	128	+ $categoriesObj->setVar('cat_created', $categoryCreated->getTimestamp());
	129	+ $categoriesObj->setVar('cat_submitter', Request::getInt('cat_submitter', 0));
	130	+ // Insert Data
	131	+ if ($categoriesHandler->insert($categoriesObj)) {
	132	+ if ('' !== $uploaderErrors) {
	133	+ redirect_header('categories.php?op=edit&cat_id=' . $catId, 5, $uploaderErrors);
	134	+ } else {
	135	+ redirect_header('categories.php?op=list', 2, _AM_MYMODULE2_FORM_OK);
	136	+ }
	137	+ }
	138	+ // Get Form
	139	+ $GLOBALS['xoopsTpl']->assign('error', $categoriesObj->getHtmlErrors());
	140	+ $form = $categoriesObj->getFormCategories();
	141	+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
142	142
143		- break;
144		- case 'edit':
145		- $templateMain = 'mymodule2_admin_categories.tpl';
146		- $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('categories.php'));
147		- $adminObject->addItemButton(_AM_MYMODULE2_ADD_CATEGORY, 'categories.php?op=new', 'add');
148		- $adminObject->addItemButton(_AM_MYMODULE2_CATEGORIES_LIST, 'categories.php', 'list');
149		- $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
150		- // Get Form
151		- $categoriesObj = $categoriesHandler->get($catId);
152		- $form = $categoriesObj->getFormCategories();
153		- $GLOBALS['xoopsTpl']->assign('form', $form->render());
	143	+ break;
	144	+ case 'edit':
	145	+ $templateMain = 'mymodule2_admin_categories.tpl';
	146	+ $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('categories.php'));
	147	+ $adminObject->addItemButton(_AM_MYMODULE2_ADD_CATEGORY, 'categories.php?op=new', 'add');
	148	+ $adminObject->addItemButton(_AM_MYMODULE2_CATEGORIES_LIST, 'categories.php', 'list');
	149	+ $GLOBALS['xoopsTpl']->assign('buttons', $adminObject->displayButton('left'));
	150	+ // Get Form
	151	+ $categoriesObj = $categoriesHandler->get($catId);
	152	+ $form = $categoriesObj->getFormCategories();
	153	+ $GLOBALS['xoopsTpl']->assign('form', $form->render());
154	154
155		- break;
156		- case 'delete':
157		- $categoriesObj = $categoriesHandler->get($catId);
158		- if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
159		- if (!$GLOBALS['xoopsSecurity']->check()) {
160		- redirect_header('categories.php', 3, implode(', ', $GLOBALS['xoopsSecurity']->getErrors()));
161		- }
162		- if ($categoriesHandler->delete($categoriesObj)) {
163		- redirect_header('categories.php', 3, _AM_MYMODULE2_FORM_DELETE_OK);
164		- } else {
165		- $GLOBALS['xoopsTpl']->assign('error', $categoriesObj->getHtmlErrors());
166		- }
167		- } else {
168		- xoops_confirm(array('ok' => 1, 'cat_id' => $catId, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_MYMODULE2_FORM_SURE_DELETE, $categoriesObj->getVar('cat_name')));
169		- }
	155	+ break;
	156	+ case 'delete':
	157	+ $categoriesObj = $categoriesHandler->get($catId);
	158	+ if (isset($_REQUEST['ok']) && 1 == $_REQUEST['ok']) {
	159	+ if (!$GLOBALS['xoopsSecurity']->check()) {
	160	+ redirect_header('categories.php', 3, implode(', ', $GLOBALS['xoopsSecurity']->getErrors()));
	161	+ }
	162	+ if ($categoriesHandler->delete($categoriesObj)) {
	163	+ redirect_header('categories.php', 3, _AM_MYMODULE2_FORM_DELETE_OK);
	164	+ } else {
	165	+ $GLOBALS['xoopsTpl']->assign('error', $categoriesObj->getHtmlErrors());
	166	+ }
	167	+ } else {
	168	+ xoops_confirm(array('ok' => 1, 'cat_id' => $catId, 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_MYMODULE2_FORM_SURE_DELETE, $categoriesObj->getVar('cat_name')));
	169	+ }
170	170
171		- break;
	171	+ break;
172	172	}
173	173	require __DIR__ . '/footer.php';

		@@ -27,37 +27,37 @@
		block discarded – undo
27	27	$sysPathIcon32 = $moduleInfo->getInfo('sysicons32');
28	28
29	29	$adminmenu[] = [
30		- 'title' => _MI_MYMODULE2_ADMENU1,
31		- 'link' => 'admin/index.php',
32		- 'icon' => $sysPathIcon32.'/dashboard.png',
	30	+ 'title' => _MI_MYMODULE2_ADMENU1,
	31	+ 'link' => 'admin/index.php',
	32	+ 'icon' => $sysPathIcon32.'/dashboard.png',
33	33	];
34	34	$adminmenu[] = [
35		- 'title' => _MI_MYMODULE2_ADMENU2,
36		- 'link' => 'admin/categories.php',
37		- 'icon' => 'assets/icons/32/category.png',
	35	+ 'title' => _MI_MYMODULE2_ADMENU2,
	36	+ 'link' => 'admin/categories.php',
	37	+ 'icon' => 'assets/icons/32/category.png',
38	38	];
39	39	$adminmenu[] = [
40		- 'title' => _MI_MYMODULE2_ADMENU3,
41		- 'link' => 'admin/articles.php',
42		- 'icon' => 'assets/icons/32/penguin.png',
	40	+ 'title' => _MI_MYMODULE2_ADMENU3,
	41	+ 'link' => 'admin/articles.php',
	42	+ 'icon' => 'assets/icons/32/penguin.png',
43	43	];
44	44	$adminmenu[] = [
45		- 'title' => _MI_MYMODULE2_ADMENU4,
46		- 'link' => 'admin/testfields.php',
47		- 'icon' => 'assets/icons/32/alert.png',
	45	+ 'title' => _MI_MYMODULE2_ADMENU4,
	46	+ 'link' => 'admin/testfields.php',
	47	+ 'icon' => 'assets/icons/32/alert.png',
48	48	];
49	49	$adminmenu[] = [
50		- 'title' => _MI_MYMODULE2_ADMENU5,
51		- 'link' => 'admin/permissions.php',
52		- 'icon' => $sysPathIcon32.'/permissions.png',
	50	+ 'title' => _MI_MYMODULE2_ADMENU5,
	51	+ 'link' => 'admin/permissions.php',
	52	+ 'icon' => $sysPathIcon32.'/permissions.png',
53	53	];
54	54	$adminmenu[] = [
55		- 'title' => _MI_MYMODULE2_ADMENU6,
56		- 'link' => 'admin/feedback.php',
57		- 'icon' => $sysPathIcon32.'/mail_foward.png',
	55	+ 'title' => _MI_MYMODULE2_ADMENU6,
	56	+ 'link' => 'admin/feedback.php',
	57	+ 'icon' => $sysPathIcon32.'/mail_foward.png',
58	58	];
59	59	$adminmenu[] = [
60		- 'title' => _MI_MYMODULE2_ABOUT,
61		- 'link' => 'admin/about.php',
62		- 'icon' => $sysPathIcon32.'/about.png',
	60	+ 'title' => _MI_MYMODULE2_ABOUT,
	61	+ 'link' => 'admin/about.php',
	62	+ 'icon' => $sysPathIcon32.'/about.png',
63	63	];

		@@ -44,26 +44,26 @@
		block discarded – undo
44	44	// Upload Folders
45	45	$configurator = new Common\Configurator();
46	46	if ($configurator->uploadFolders && is_array($configurator->uploadFolders)) {
47		- foreach(array_keys($configurator->uploadFolders) as $i) {
48		- $folder[] = $configurator->uploadFolders[$i];
49		- }
	47	+ foreach(array_keys($configurator->uploadFolders) as $i) {
	48	+ $folder[] = $configurator->uploadFolders[$i];
	49	+ }
50	50	}
51	51	// Uploads Folders Created
52	52	foreach(array_keys($folder) as $i) {
53		- $adminObject->addConfigBoxLine($folder[$i], 'folder');
54		- $adminObject->addConfigBoxLine(array($folder[$i], '777'), 'chmod');
	53	+ $adminObject->addConfigBoxLine($folder[$i], 'folder');
	54	+ $adminObject->addConfigBoxLine(array($folder[$i], '777'), 'chmod');
55	55	}
56	56
57	57	// Render Index
58	58	$GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('index.php'));
59	59	// Test Data
60	60	if ($helper->getConfig('displaySampleButton')) {
61		- xoops_loadLanguage('admin/modulesadmin', 'system');
62		- include_once dirname(__DIR__) . '/testdata/index.php';
63		- $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
64		- $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
	61	+ xoops_loadLanguage('admin/modulesadmin', 'system');
	62	+ include_once dirname(__DIR__) . '/testdata/index.php';
	63	+ $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
	64	+ $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
65	65	// $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_EXPORT_SCHEMA'), '__DIR__ . /../../testdata/index.php?op=exportschema', 'add');
66		- $adminObject->displayButton('left');
	66	+ $adminObject->displayButton('left');
67	67	}
68	68	$GLOBALS['xoopsTpl']->assign('index', $adminObject->displayIndex());
69	69	// End Test Data

		@@ -48,85 +48,85 @@
		block discarded – undo
48	48	$permTableForm->addElement($formSelect);
49	49	$permTableForm->display();
50	50	switch($op) {
51		- case 'global':
52		- default:
53		- $formTitle = _AM_MYMODULE2_PERMISSIONS_GLOBAL;
54		- $permName = 'mymodule2_ac';
55		- $permDesc = _AM_MYMODULE2_PERMISSIONS_GLOBAL_DESC;
56		- $globalPerms = array( '4' => _AM_MYMODULE2_PERMISSIONS_GLOBAL_4, '8' => _AM_MYMODULE2_PERMISSIONS_GLOBAL_8, '16' => _AM_MYMODULE2_PERMISSIONS_GLOBAL_16 );
57		- break;
58		- case 'approve_articles':
59		- $formTitle = _AM_MYMODULE2_PERMISSIONS_APPROVE;
60		- $permName = 'mymodule2_approve_articles';
61		- $permDesc = _AM_MYMODULE2_PERMISSIONS_APPROVE_DESC . ' Articles';
62		- $handler = $helper->getHandler('articles');
63		- break;
64		- case 'submit_articles':
65		- $formTitle = _AM_MYMODULE2_PERMISSIONS_SUBMIT;
66		- $permName = 'mymodule2_submit_articles';
67		- $permDesc = _AM_MYMODULE2_PERMISSIONS_SUBMIT_DESC . ' Articles';
68		- $handler = $helper->getHandler('articles');
69		- break;
70		- case 'view_articles':
71		- $formTitle = _AM_MYMODULE2_PERMISSIONS_VIEW;
72		- $permName = 'mymodule2_view_articles';
73		- $permDesc = _AM_MYMODULE2_PERMISSIONS_VIEW_DESC . ' Articles';
74		- $handler = $helper->getHandler('articles');
75		- break;
76		- case 'approve_testfields':
77		- $formTitle = _AM_MYMODULE2_PERMISSIONS_APPROVE;
78		- $permName = 'mymodule2_approve_testfields';
79		- $permDesc = _AM_MYMODULE2_PERMISSIONS_APPROVE_DESC . ' Testfields';
80		- $handler = $helper->getHandler('testfields');
81		- break;
82		- case 'submit_testfields':
83		- $formTitle = _AM_MYMODULE2_PERMISSIONS_SUBMIT;
84		- $permName = 'mymodule2_submit_testfields';
85		- $permDesc = _AM_MYMODULE2_PERMISSIONS_SUBMIT_DESC . ' Testfields';
86		- $handler = $helper->getHandler('testfields');
87		- break;
88		- case 'view_testfields':
89		- $formTitle = _AM_MYMODULE2_PERMISSIONS_VIEW;
90		- $permName = 'mymodule2_view_testfields';
91		- $permDesc = _AM_MYMODULE2_PERMISSIONS_VIEW_DESC . ' Testfields';
92		- $handler = $helper->getHandler('testfields');
93		- break;
	51	+ case 'global':
	52	+ default:
	53	+ $formTitle = _AM_MYMODULE2_PERMISSIONS_GLOBAL;
	54	+ $permName = 'mymodule2_ac';
	55	+ $permDesc = _AM_MYMODULE2_PERMISSIONS_GLOBAL_DESC;
	56	+ $globalPerms = array( '4' => _AM_MYMODULE2_PERMISSIONS_GLOBAL_4, '8' => _AM_MYMODULE2_PERMISSIONS_GLOBAL_8, '16' => _AM_MYMODULE2_PERMISSIONS_GLOBAL_16 );
	57	+ break;
	58	+ case 'approve_articles':
	59	+ $formTitle = _AM_MYMODULE2_PERMISSIONS_APPROVE;
	60	+ $permName = 'mymodule2_approve_articles';
	61	+ $permDesc = _AM_MYMODULE2_PERMISSIONS_APPROVE_DESC . ' Articles';
	62	+ $handler = $helper->getHandler('articles');
	63	+ break;
	64	+ case 'submit_articles':
	65	+ $formTitle = _AM_MYMODULE2_PERMISSIONS_SUBMIT;
	66	+ $permName = 'mymodule2_submit_articles';
	67	+ $permDesc = _AM_MYMODULE2_PERMISSIONS_SUBMIT_DESC . ' Articles';
	68	+ $handler = $helper->getHandler('articles');
	69	+ break;
	70	+ case 'view_articles':
	71	+ $formTitle = _AM_MYMODULE2_PERMISSIONS_VIEW;
	72	+ $permName = 'mymodule2_view_articles';
	73	+ $permDesc = _AM_MYMODULE2_PERMISSIONS_VIEW_DESC . ' Articles';
	74	+ $handler = $helper->getHandler('articles');
	75	+ break;
	76	+ case 'approve_testfields':
	77	+ $formTitle = _AM_MYMODULE2_PERMISSIONS_APPROVE;
	78	+ $permName = 'mymodule2_approve_testfields';
	79	+ $permDesc = _AM_MYMODULE2_PERMISSIONS_APPROVE_DESC . ' Testfields';
	80	+ $handler = $helper->getHandler('testfields');
	81	+ break;
	82	+ case 'submit_testfields':
	83	+ $formTitle = _AM_MYMODULE2_PERMISSIONS_SUBMIT;
	84	+ $permName = 'mymodule2_submit_testfields';
	85	+ $permDesc = _AM_MYMODULE2_PERMISSIONS_SUBMIT_DESC . ' Testfields';
	86	+ $handler = $helper->getHandler('testfields');
	87	+ break;
	88	+ case 'view_testfields':
	89	+ $formTitle = _AM_MYMODULE2_PERMISSIONS_VIEW;
	90	+ $permName = 'mymodule2_view_testfields';
	91	+ $permDesc = _AM_MYMODULE2_PERMISSIONS_VIEW_DESC . ' Testfields';
	92	+ $handler = $helper->getHandler('testfields');
	93	+ break;
94	94	}
95	95	$moduleId = $xoopsModule->getVar('mid');
96	96	$permform = new \XoopsGroupPermForm($formTitle, $moduleId, $permName, $permDesc, 'admin/permissions.php');
97	97	$permFound = false;
98	98	if ($op === 'global') {
99		- foreach($globalPerms as $gPermId => $gPermName) {
100		- $permform->addItem($gPermId, $gPermName);
101		- }
102		- $GLOBALS['xoopsTpl']->assign('form', $permform->render());
103		- $permFound = true;
	99	+ foreach($globalPerms as $gPermId => $gPermName) {
	100	+ $permform->addItem($gPermId, $gPermName);
	101	+ }
	102	+ $GLOBALS['xoopsTpl']->assign('form', $permform->render());
	103	+ $permFound = true;
104	104	}
105	105	if ($op === 'approve_articles' \|\| $op === 'submit_articles' \|\| $op === 'view_articles') {
106		- $articlesCount = $articlesHandler->getCountArticles();
107		- if ($articlesCount > 0) {
108		- $articlesAll = $articlesHandler->getAllArticles(0, 'art_title');
109		- foreach(array_keys($articlesAll) as $i) {
110		- $permform->addItem($articlesAll[$i]->getVar('art_id'), $articlesAll[$i]->getVar('art_title'));
111		- }
112		- $GLOBALS['xoopsTpl']->assign('form', $permform->render());
113		- }
114		- $permFound = true;
	106	+ $articlesCount = $articlesHandler->getCountArticles();
	107	+ if ($articlesCount > 0) {
	108	+ $articlesAll = $articlesHandler->getAllArticles(0, 'art_title');
	109	+ foreach(array_keys($articlesAll) as $i) {
	110	+ $permform->addItem($articlesAll[$i]->getVar('art_id'), $articlesAll[$i]->getVar('art_title'));
	111	+ }
	112	+ $GLOBALS['xoopsTpl']->assign('form', $permform->render());
	113	+ }
	114	+ $permFound = true;
115	115	}
116	116	if ($op === 'approve_testfields' \|\| $op === 'submit_testfields' \|\| $op === 'view_testfields') {
117		- $testfieldsCount = $testfieldsHandler->getCountTestfields();
118		- if ($testfieldsCount > 0) {
119		- $testfieldsAll = $testfieldsHandler->getAllTestfields(0, 'tf_text');
120		- foreach(array_keys($testfieldsAll) as $i) {
121		- $permform->addItem($testfieldsAll[$i]->getVar('tf_id'), $testfieldsAll[$i]->getVar('tf_text'));
122		- }
123		- $GLOBALS['xoopsTpl']->assign('form', $permform->render());
124		- }
125		- $permFound = true;
	117	+ $testfieldsCount = $testfieldsHandler->getCountTestfields();
	118	+ if ($testfieldsCount > 0) {
	119	+ $testfieldsAll = $testfieldsHandler->getAllTestfields(0, 'tf_text');
	120	+ foreach(array_keys($testfieldsAll) as $i) {
	121	+ $permform->addItem($testfieldsAll[$i]->getVar('tf_id'), $testfieldsAll[$i]->getVar('tf_text'));
	122	+ }
	123	+ $GLOBALS['xoopsTpl']->assign('form', $permform->render());
	124	+ }
	125	+ $permFound = true;
126	126	}
127	127	unset($permform);
128	128	if ($permFound !== true) {
129		- redirect_header('permissions.php', 3, _AM_MYMODULE2_NO_PERMISSIONS_SET);
130		- exit();
	129	+ redirect_header('permissions.php', 3, _AM_MYMODULE2_NO_PERMISSIONS_SET);
	130	+ exit();
131	131	}
132	132	require __DIR__ . '/footer.php';

txmodxoops / tdmcreate

Push — master ( c30da6...834a16 )

Status

Category

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

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

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

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

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

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

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

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

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