Inspection of "fix access to Handler" - mambax7/instruction - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 251d30...e23147 )

by Michael

created 2017-10-17 14:52 UTC

Status

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

@@ -1,6 +1,6 @@
 block discarded – undo
 <?php
 // Типы страницы
 return [
-    0 => _AM_INSTR_PT_0,
-    1 => _AM_INSTR_PT_1
+	0 => _AM_INSTR_PT_0,
+	1 => _AM_INSTR_PT_1
 ];

Please login to merge, or discard this patch.

comment_new.php 1 patch

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

@@ -7,12 +7,12 @@
 block discarded – undo
 
 $com_itemid = Request::getInt('com_itemid', 0, 'GET');
 if ($com_itemid > 0) {
-    $itemObj       = $publisher->getHandler('item')->get($com_itemid);
-    $com_replytext = _POSTEDBY . '&nbsp;<strong>' . $itemObj->getLinkedPosterName() . '</strong>&nbsp;' . _DATE . '&nbsp;<strong>' . $itemObj->dateSub() . '</strong><br><br>' . $itemObj->summary();
-    $bodytext      = $itemObj->body();
-    if ('' != $bodytext) {
-        $com_replytext .= '<br><br>' . $bodytext . '';
-    }
-    $com_replytitle = $itemObj->getTitle();
-    include_once $GLOBALS['xoops']->path('include/comment_new.php');
+	$itemObj       = $publisher->getHandler('item')->get($com_itemid);
+	$com_replytext = _POSTEDBY . '&nbsp;<strong>' . $itemObj->getLinkedPosterName() . '</strong>&nbsp;' . _DATE . '&nbsp;<strong>' . $itemObj->dateSub() . '</strong><br><br>' . $itemObj->summary();
+	$bodytext      = $itemObj->body();
+	if ('' != $bodytext) {
+		$com_replytext .= '<br><br>' . $bodytext . '';
+	}
+	$com_replytitle = $itemObj->getTitle();
+	include_once $GLOBALS['xoops']->path('include/comment_new.php');
 }

Please login to merge, or discard this patch.

admin/perm.php 1 patch

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

@@ -36,24 +36,24 @@  discard block
 block discarded – undo
 $moduleId = $GLOBALS['xoopsModule']->getVar('mid');
 
 switch ($permission) {
-    // Права на просмотр
-    case 1:
-        $formTitle             = _AM_INSTRUCTION_PERM_VIEW;
-        $permissionName        = 'instruction_view';
-        $permissionDescription = _AM_INSTRUCTION_PERM_VIEW_DSC;
-        break;
-    // Права на добавление
-    case 2:
-        $formTitle             = _AM_INSTRUCTION_PERM_SUBMIT;
-        $permissionName        = 'instruction_submit';
-        $permissionDescription = _AM_INSTRUCTION_PERM_SUBMIT_DSC;
-        break;
-    // Права на редактирование
-    case 3:
-        $formTitle             = _AM_INSTRUCTION_PERM_EDIT;
-        $permissionName        = 'instruction_edit';
-        $permissionDescription = _AM_INSTRUCTION_PERM_EDIT_DSC;
-        break;
+	// Права на просмотр
+	case 1:
+		$formTitle             = _AM_INSTRUCTION_PERM_VIEW;
+		$permissionName        = 'instruction_view';
+		$permissionDescription = _AM_INSTRUCTION_PERM_VIEW_DSC;
+		break;
+	// Права на добавление
+	case 2:
+		$formTitle             = _AM_INSTRUCTION_PERM_SUBMIT;
+		$permissionName        = 'instruction_submit';
+		$permissionDescription = _AM_INSTRUCTION_PERM_SUBMIT_DSC;
+		break;
+	// Права на редактирование
+	case 3:
+		$formTitle             = _AM_INSTRUCTION_PERM_EDIT;
+		$permissionName        = 'instruction_edit';
+		$permissionDescription = _AM_INSTRUCTION_PERM_EDIT_DSC;
+		break;
 }
 
 // Права
@@ -62,9 +62,9 @@  discard block
 block discarded – undo
 $sql    = 'SELECT cid, pid, title FROM ' . $xoopsDB->prefix('instruction_cat') . ' ORDER BY title';
 $result = $xoopsDB->query($sql);
 if ($result) {
-    while ($row = $xoopsDB->fetchArray($result)) {
-        $permissionsForm->addItem($row['cid'], $row['title'], $row['pid']);
-    }
+	while ($row = $xoopsDB->fetchArray($result)) {
+		$permissionsForm->addItem($row['cid'], $row['title'], $row['pid']);
+	}
 }
 
 echo $permissionsForm->render();

Please login to merge, or discard this patch.

blocks/instr_lastinstr.php 1 patch

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

@@ -13,59 +13,59 @@  discard block
 block discarded – undo
 function b_instr_lastinstr_show($options = [])
 {
 
-    // Подключаем функции
-    //    $moduleDirName = dirname(__DIR__);
-    $moduleDirName = basename(dirname(__DIR__));
-    //    include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php');
-    include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/common.php');
-    //
-    $myts = MyTextSanitizer::getInstance();
-    //
-    //mb    $instructionHandler = xoops_getModuleHandler('instruction', 'instruction');
-    $db                 = \XoopsDatabaseFactory::getDatabase();
-    $instructionHandler = new \Xoopsmodules\instruction\InstructionHandler($db);
+	// Подключаем функции
+	//    $moduleDirName = dirname(__DIR__);
+	$moduleDirName = basename(dirname(__DIR__));
+	//    include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php');
+	include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/common.php');
+	//
+	$myts = MyTextSanitizer::getInstance();
+	//
+	//mb    $instructionHandler = xoops_getModuleHandler('instruction', 'instruction');
+	$db                 = \XoopsDatabaseFactory::getDatabase();
+	$instructionHandler = new \Xoopsmodules\instruction\InstructionHandler($db);
 
-    // Добавляем стили
-    //global $xoTheme;
-    //$xoTheme->addStylesheet( XOOPS_URL . '/modules/instruction/css/blocks.css' );
+	// Добавляем стили
+	//global $xoTheme;
+	//$xoTheme->addStylesheet( XOOPS_URL . '/modules/instruction/css/blocks.css' );
 
-    // Опции
-    // Количество страниц
-    $limit = $options[0];
-    // Количество символов
-    $numchars = $options[1];
+	// Опции
+	// Количество страниц
+	$limit = $options[0];
+	// Количество символов
+	$numchars = $options[1];
 
-    // Права на просмотр
-    $cat_view = Xoopsmodules\instruction\Utility::getItemIds();
-    // Массив выходных данных
-    $block = [];
+	// Права на просмотр
+	$cat_view = Xoopsmodules\instruction\Utility::getItemIds();
+	// Массив выходных данных
+	$block = [];
 
-    // Если есть категории для прасмотра
-    if (is_array($cat_view) && count($cat_view) > 0) {
+	// Если есть категории для прасмотра
+	if (is_array($cat_view) && count($cat_view) > 0) {
 
-        // Находим последние инструкции
-        $sql = "SELECT `instrid`, `cid`, `title`, `pages`, `dateupdated` FROM {$instructionHandler->table} WHERE `cid` IN (" . implode(', ', $cat_view) . ') AND `status` > 0 ORDER BY `dateupdated` DESC';
-        // Лимит запроса
-        $result = $GLOBALS['xoopsDB']->query($sql, $limit);
-        // Перебираем все значения
-        $i = 0;
-        while (list($instrid, $cid, $ititle, $pages, $dateupdated) = $GLOBALS['xoopsDB']->fetchRow($result)) {
-            // ID инструкции
-            $block[$i]['instrid'] = $instrid;
-            // ID категории
-            $block[$i]['cid'] = $cid;
-            // Название инструкции
-            $block[$i]['ititle'] = $myts->htmlSpecialChars($ititle);
-            // Число страниц
-            $block[$i]['pages'] = $pages;
-            // Дата обновления инструкции
-            $block[$i]['dateupdated'] = formatTimeStamp($dateupdated, 's');
-            // Инкримент
-            $i++;
-        }
-    }
-    // Возвращаем массив
-    return $block;
+		// Находим последние инструкции
+		$sql = "SELECT `instrid`, `cid`, `title`, `pages`, `dateupdated` FROM {$instructionHandler->table} WHERE `cid` IN (" . implode(', ', $cat_view) . ') AND `status` > 0 ORDER BY `dateupdated` DESC';
+		// Лимит запроса
+		$result = $GLOBALS['xoopsDB']->query($sql, $limit);
+		// Перебираем все значения
+		$i = 0;
+		while (list($instrid, $cid, $ititle, $pages, $dateupdated) = $GLOBALS['xoopsDB']->fetchRow($result)) {
+			// ID инструкции
+			$block[$i]['instrid'] = $instrid;
+			// ID категории
+			$block[$i]['cid'] = $cid;
+			// Название инструкции
+			$block[$i]['ititle'] = $myts->htmlSpecialChars($ititle);
+			// Число страниц
+			$block[$i]['pages'] = $pages;
+			// Дата обновления инструкции
+			$block[$i]['dateupdated'] = formatTimeStamp($dateupdated, 's');
+			// Инкримент
+			$i++;
+		}
+	}
+	// Возвращаем массив
+	return $block;
 }
 
 // Редактирование последних инструкций
@@ -75,10 +75,10 @@  discard block
 block discarded – undo
  */
 function b_instr_lastinstr_edit($options = [])
 {
-    $form = '';
-    $form .= _MB_INSTR_DISPLAYINSTRC . ' <input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text" /><br>' . "\n";
-    $form .= _MB_INSTR_NUMCHARSC . ' <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text" /><br>' . "\n";
+	$form = '';
+	$form .= _MB_INSTR_DISPLAYINSTRC . ' <input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text" /><br>' . "\n";
+	$form .= _MB_INSTR_NUMCHARSC . ' <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text" /><br>' . "\n";
 
-    // Возвращаем форму
-    return $form;
+	// Возвращаем форму
+	return $form;
 }

Please login to merge, or discard this patch.

xoops_version.php 1 patch

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

@@ -10,60 +10,60 @@  discard block
 block discarded – undo
 $xoops_url     = parse_url(XOOPS_URL);
 
 $modversion = [
-    'version'             => 1.07,
-    'module_status'       => 'RC1',
-    'release_date'        => '2017/10/04',
-    'name'                => _MI_INSTRUCTION_NAME,
-    'description'         => _MI_INSTRUCTION_DESC,
-    'credits'             => 'radio-hobby.org, www.shmel.org',
-    'author'              => 'andrey3761, Mamba, Aerograf',
-    'nickname'            => '',
-    'help'                => 'page=help',
-    'license'             => 'GNU GPL 2.0',
-    'license_url'         => 'www.gnu.org/licenses/gpl-2.0.html/',
-    'official'            => 0,
-    'image'               => 'assets/images/logoModule.png',
-    'dirname'             => $moduleDirName,
-    'modicons16'          => 'assets/images/icons/16',
-    'modicons32'          => 'assets/images/icons/32',
-    // О модуле
-    'module_website_url'  => 'radio-hobby.org',
-    'module_website_name' => 'radio-hobby.org',
+	'version'             => 1.07,
+	'module_status'       => 'RC1',
+	'release_date'        => '2017/10/04',
+	'name'                => _MI_INSTRUCTION_NAME,
+	'description'         => _MI_INSTRUCTION_DESC,
+	'credits'             => 'radio-hobby.org, www.shmel.org',
+	'author'              => 'andrey3761, Mamba, Aerograf',
+	'nickname'            => '',
+	'help'                => 'page=help',
+	'license'             => 'GNU GPL 2.0',
+	'license_url'         => 'www.gnu.org/licenses/gpl-2.0.html/',
+	'official'            => 0,
+	'image'               => 'assets/images/logoModule.png',
+	'dirname'             => $moduleDirName,
+	'modicons16'          => 'assets/images/icons/16',
+	'modicons32'          => 'assets/images/icons/32',
+	// О модуле
+	'module_website_url'  => 'radio-hobby.org',
+	'module_website_name' => 'radio-hobby.org',
 
-    'author_website_url'  => 'radio-hobby.org',
-    'author_website_name' => 'andrey3761',
-    'min_php'             => '5.5',
-    'min_xoops'           => '2.5.8',
-    'min_admin'           => '1.1',
-    'min_db'              => ['mysql' => '5.5'],
-    // Файл базы данных
-    'sqlfile'             => ['mysql' => 'sql/mysql.sql'],
-    // Таблицы
-    'tables'              => [
-        $moduleDirName . '_cat',
-        $moduleDirName . '_instr',
-        $moduleDirName . '_page'
-    ],
-    // Имеет админку
-    'hasAdmin'            => 1,
-    'adminindex'          => 'admin/index.php',
-    'adminmenu'           => 'admin/menu.php',
-    'system_menu'         => 1,
-    // Меню
-    'hasMain'             => 1,
-    // Search
-    'hasSearch'           => 1,
-    'search'              => [
-        'file' => 'include/search.inc.php',
-        'func' => $moduleDirName . '_search',
-    ],
+	'author_website_url'  => 'radio-hobby.org',
+	'author_website_name' => 'andrey3761',
+	'min_php'             => '5.5',
+	'min_xoops'           => '2.5.8',
+	'min_admin'           => '1.1',
+	'min_db'              => ['mysql' => '5.5'],
+	// Файл базы данных
+	'sqlfile'             => ['mysql' => 'sql/mysql.sql'],
+	// Таблицы
+	'tables'              => [
+		$moduleDirName . '_cat',
+		$moduleDirName . '_instr',
+		$moduleDirName . '_page'
+	],
+	// Имеет админку
+	'hasAdmin'            => 1,
+	'adminindex'          => 'admin/index.php',
+	'adminmenu'           => 'admin/menu.php',
+	'system_menu'         => 1,
+	// Меню
+	'hasMain'             => 1,
+	// Search
+	'hasSearch'           => 1,
+	'search'              => [
+		'file' => 'include/search.inc.php',
+		'func' => $moduleDirName . '_search',
+	],
 ];
 //  Help files
 $modversion['helpsection'] = [
-    ['name' => _MI_INSTRUCTION_HELP_OVERVIEW, 'link' => 'page=help'],
-    ['name' => _MI_INSTRUCTION_DISCLAIMER, 'link' => 'page=disclaimer'],
-    ['name' => _MI_INSTRUCTION_LICENSE, 'link' => 'page=license'],
-    ['name' => _MI_INSTRUCTION_SUPPORT, 'link' => 'page=support'],
+	['name' => _MI_INSTRUCTION_HELP_OVERVIEW, 'link' => 'page=help'],
+	['name' => _MI_INSTRUCTION_DISCLAIMER, 'link' => 'page=disclaimer'],
+	['name' => _MI_INSTRUCTION_LICENSE, 'link' => 'page=license'],
+	['name' => _MI_INSTRUCTION_SUPPORT, 'link' => 'page=support'],
 ];
 
 // Comments
@@ -76,144 +76,144 @@  discard block
 block discarded – undo
 
 // Templates
 $modversion['templates'] = [
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_index.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_cat.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_editcat.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_savecat.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_viewcat.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_instr.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_editinstr.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_saveinstr.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_viewinstr.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_editpage.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_savepage.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_perm.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => 'admin/' . $moduleDirName . '_admin_about.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => $moduleDirName . '_page.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => $moduleDirName . '_instr.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => $moduleDirName . '_index.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => $moduleDirName . '_editpage.tpl',
-        'description' => ''
-    ],
-    [
-        'file'        => $moduleDirName . '_savepage.tpl',
-        'description' => ''
-    ],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_index.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_cat.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_editcat.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_savecat.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_viewcat.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_instr.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_editinstr.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_saveinstr.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_viewinstr.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_editpage.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_savepage.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_perm.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => 'admin/' . $moduleDirName . '_admin_about.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => $moduleDirName . '_page.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => $moduleDirName . '_instr.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => $moduleDirName . '_index.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => $moduleDirName . '_editpage.tpl',
+		'description' => ''
+	],
+	[
+		'file'        => $moduleDirName . '_savepage.tpl',
+		'description' => ''
+	],
 ];
 // Конфигурация
 $modversion['config'][] = [
-    'name'        => 'form_options',
-    'title'       => '_MI_INSTRUCTION_FORM_OPTIONS',
-    'description' => '_MI_INSTRUCTION_FORM_OPTIONS_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'text',
-    'default'     => 'dhtml',
-    'options'     => array_flip($editorHandler->getList())
+	'name'        => 'form_options',
+	'title'       => '_MI_INSTRUCTION_FORM_OPTIONS',
+	'description' => '_MI_INSTRUCTION_FORM_OPTIONS_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'text',
+	'default'     => 'dhtml',
+	'options'     => array_flip($editorHandler->getList())
 ];
 $modversion['config'][] = [
-    'name'        => 'perpageadmin',
-    'title'       => '_MI_INSTRUCTION_PERPAGEADMIN',
-    'description' => '_MI_INSTRUCTION_PERPAGEADMINDSC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 20
+	'name'        => 'perpageadmin',
+	'title'       => '_MI_INSTRUCTION_PERPAGEADMIN',
+	'description' => '_MI_INSTRUCTION_PERPAGEADMINDSC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 20
 ];
 $modversion['config'][] = [
-    'name'        => 'perpagemain',
-    'title'       => '_MI_INSTRUCTION_PERPAGEMAIN',
-    'description' => '_MI_INSTRUCTION_PERPAGEMAINDSC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 20
+	'name'        => 'perpagemain',
+	'title'       => '_MI_INSTRUCTION_PERPAGEMAIN',
+	'description' => '_MI_INSTRUCTION_PERPAGEMAINDSC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 20
 ];
 // Теги
 $modversion['config'][] = [
-    'name'        => 'usetag',
-    'title'       => '_MI_INSTRUCTION_USETAG',
-    'description' => '_MI_INSTRUCTION_USETAGDSC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
+	'name'        => 'usetag',
+	'title'       => '_MI_INSTRUCTION_USETAG',
+	'description' => '_MI_INSTRUCTION_USETAGDSC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
 ];
 // Оценки
 $modversion['config'][] = [
-    'name'        => 'userat',
-    'title'       => '_MI_INSTRUCTION_USERAT',
-    'description' => '_MI_INSTRUCTION_USERATDSC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
+	'name'        => 'userat',
+	'title'       => '_MI_INSTRUCTION_USERAT',
+	'description' => '_MI_INSTRUCTION_USERATDSC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
 ];
 
 // Блоки
 // Блок последних страниц
 $modversion['blocks'][] = [
-    'file'        => 'instr_lastpage.php',
-    'name'        => _MI_INSTR_BLOCK_LASTPAGE,
-    'description' => _MI_INSTR_BLOCK_LASTPAGE_DESC,
-    'show_func'   => 'b_instr_lastpage_show',
-    'edit_func'   => 'b_instr_lastpage_edit',
-    'options'     => '10|20',
-    'template'    => $moduleDirName . '_block_lastpage.tpl'
+	'file'        => 'instr_lastpage.php',
+	'name'        => _MI_INSTR_BLOCK_LASTPAGE,
+	'description' => _MI_INSTR_BLOCK_LASTPAGE_DESC,
+	'show_func'   => 'b_instr_lastpage_show',
+	'edit_func'   => 'b_instr_lastpage_edit',
+	'options'     => '10|20',
+	'template'    => $moduleDirName . '_block_lastpage.tpl'
 ];
 // Блок последних инструкций
 $modversion['blocks'][] = [
-    'file'        => 'instr_lastinstr.php',
-    'name'        => _MI_INSTR_BLOCK_LASTINSTR,
-    'description' => _MI_INSTR_BLOCK_LASTINSTR_DESC,
-    'show_func'   => 'b_instr_lastinstr_show',
-    'edit_func'   => 'b_instr_lastinstr_edit',
-    'options'     => '10|20',
-    'template'    => $moduleDirName . '_block_lastinstr.tpl'
+	'file'        => 'instr_lastinstr.php',
+	'name'        => _MI_INSTR_BLOCK_LASTINSTR,
+	'description' => _MI_INSTR_BLOCK_LASTINSTR_DESC,
+	'show_func'   => 'b_instr_lastinstr_show',
+	'edit_func'   => 'b_instr_lastinstr_edit',
+	'options'     => '10|20',
+	'template'    => $moduleDirName . '_block_lastinstr.tpl'
 ];
 
 // Notification

Please login to merge, or discard this patch.

admin/index.php 1 patch

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

@@ -11,8 +11,8 @@
 block discarded – undo
 
 $configurator = include __DIR__ . '/../include/config.php';
 foreach (array_keys($configurator->uploadFolders) as $i) {
-    $utility::createFolder($configurator->uploadFolders[$i]);
-    $adminObject->addConfigBoxLine($configurator->uploadFolders[$i], 'folder');
+	$utility::createFolder($configurator->uploadFolders[$i]);
+	$adminObject->addConfigBoxLine($configurator->uploadFolders[$i], 'folder');
 }
 
 //$instructionHandler = xoops_getModuleHandler('instruction', 'instruction');

Please login to merge, or discard this patch.

admin/menu.php 1 patch

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

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
 use Xoopsmodules\instruction;
 
 if (!isset($moduleDirName)) {
-    $moduleDirName = basename(dirname(__DIR__));
+	$moduleDirName = basename(dirname(__DIR__));
 }
 
 /** @var Xmf\Module\Helper $moduleHelper */
@@ -17,34 +17,34 @@  discard block
 block discarded – undo
 
 // Административное меню
 $adminmenu = [
-    [
-        'title' => _MI_INSTRUCTION_ADMIN_HOME,
-        'link'  => 'admin/index.php',
-        'desc'  => _MI_INSTRUCTION_ADMIN_HOME_DESC,
-        'icon'  => $pathIcon32 . '/home.png'
-    ],
-    [
-        'title' => _MI_INSTRUCTION_ADMIN_CAT,
-        'link'  => 'admin/cat.php',
-        'desc'  => _MI_INSTRUCTION_ADMIN_CAT_DESC,
-        'icon'  => $pathIcon32 . '/category.png'
-    ],
-    [
-        'title' => _MI_INSTRUCTION_ADMIN_INSTR,
-        'link'  => 'admin/instr.php',
-        'desc'  => _MI_INSTRUCTION_ADMIN_INSTR_DESC,
-        'icon'  => $pathModIcon32 . '/nav_book.png'
-    ],
-    [
-        'title' => _MI_INSTRUCTION_ADMIN_PERM,
-        'link'  => 'admin/perm.php',
-        'desc'  => _MI_INSTRUCTION_ADMIN_PERM_DESC,
-        'icon'  => $pathIcon32 . '/permissions.png'
-    ],
-    [
-        'title' => _MI_INSTRUCTION_ADMIN_ABOUT,
-        'link'  => 'admin/about.php',
-        'desc'  => _MI_INSTRUCTION_ADMIN_ABOUT_DESC,
-        'icon'  => $pathIcon32 . '/about.png'
-    ]
+	[
+		'title' => _MI_INSTRUCTION_ADMIN_HOME,
+		'link'  => 'admin/index.php',
+		'desc'  => _MI_INSTRUCTION_ADMIN_HOME_DESC,
+		'icon'  => $pathIcon32 . '/home.png'
+	],
+	[
+		'title' => _MI_INSTRUCTION_ADMIN_CAT,
+		'link'  => 'admin/cat.php',
+		'desc'  => _MI_INSTRUCTION_ADMIN_CAT_DESC,
+		'icon'  => $pathIcon32 . '/category.png'
+	],
+	[
+		'title' => _MI_INSTRUCTION_ADMIN_INSTR,
+		'link'  => 'admin/instr.php',
+		'desc'  => _MI_INSTRUCTION_ADMIN_INSTR_DESC,
+		'icon'  => $pathModIcon32 . '/nav_book.png'
+	],
+	[
+		'title' => _MI_INSTRUCTION_ADMIN_PERM,
+		'link'  => 'admin/perm.php',
+		'desc'  => _MI_INSTRUCTION_ADMIN_PERM_DESC,
+		'icon'  => $pathIcon32 . '/permissions.png'
+	],
+	[
+		'title' => _MI_INSTRUCTION_ADMIN_ABOUT,
+		'link'  => 'admin/about.php',
+		'desc'  => _MI_INSTRUCTION_ADMIN_ABOUT_DESC,
+		'icon'  => $pathIcon32 . '/about.png'
+	]
 ];

Please login to merge, or discard this patch.

preloads/core.php 1 patch

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

@@ -22,12 +22,12 @@
 block discarded – undo
  */
 class InstructionCorePreload extends XoopsPreloadItem
 {
-    // to add PSR-4 autoloader
-    /**
-     * @param $args
-     */
-    public static function eventCoreIncludeCommonEnd($args)
-    {
-        include __DIR__ . '/autoloader.php';
-    }
+	// to add PSR-4 autoloader
+	/**
+	 * @param $args
+	 */
+	public static function eventCoreIncludeCommonEnd($args)
+	{
+		include __DIR__ . '/autoloader.php';
+	}
 }

Please login to merge, or discard this patch.

preloads/autoloader.php 1 patch

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

@@ -4,29 +4,29 @@
 block discarded – undo
  * @see http://www.php-fig.org/psr/psr-4/examples/
  */
 spl_autoload_register(function ($class) {
-    // project-specific namespace prefix
-    $prefix = 'Xoopsmodules\\instruction\\';
+	// project-specific namespace prefix
+	$prefix = 'Xoopsmodules\\instruction\\';
 
-    // base directory for the namespace prefix
-    $base_dir = __DIR__ . '/../class/';
+	// base directory for the namespace prefix
+	$base_dir = __DIR__ . '/../class/';
 
-    // does the class use the namespace prefix?
-    $len = strlen($prefix);
+	// does the class use the namespace prefix?
+	$len = strlen($prefix);
 
-    if (0 !== strncmp($prefix, $class, $len)) {
-        return;
-    }
+	if (0 !== strncmp($prefix, $class, $len)) {
+		return;
+	}
 
-    // get the relative class name
-    $relative_class = substr($class, $len);
+	// get the relative class name
+	$relative_class = substr($class, $len);
 
-    // replace the namespace prefix with the base directory, replace namespace
-    // separators with directory separators in the relative class name, append
-    // with .php
-    $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+	// replace the namespace prefix with the base directory, replace namespace
+	// separators with directory separators in the relative class name, append
+	// with .php
+	$file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
 
-    // if the file exists, require it
-    if (file_exists($file)) {
-        require $file;
-    }
+	// if the file exists, require it
+	if (file_exists($file)) {
+		require $file;
+	}
 });

Please login to merge, or discard this patch.

		@@ -1,6 +1,6 @@
		block discarded – undo
1	1	<?php
2	2	// Типы страницы
3	3	return [
4		- 0 => _AM_INSTR_PT_0,
5		- 1 => _AM_INSTR_PT_1
	4	+ 0 => _AM_INSTR_PT_0,
	5	+ 1 => _AM_INSTR_PT_1
6	6	];

		@@ -7,12 +7,12 @@
		block discarded – undo
7	7
8	8	$com_itemid = Request::getInt('com_itemid', 0, 'GET');
9	9	if ($com_itemid > 0) {
10		- $itemObj = $publisher->getHandler('item')->get($com_itemid);
11		- $com_replytext = _POSTEDBY . ' <strong>' . $itemObj->getLinkedPosterName() . '</strong> ' . _DATE . ' <strong>' . $itemObj->dateSub() . '</strong><br><br>' . $itemObj->summary();
12		- $bodytext = $itemObj->body();
13		- if ('' != $bodytext) {
14		- $com_replytext .= '<br><br>' . $bodytext . '';
15		- }
16		- $com_replytitle = $itemObj->getTitle();
17		- include_once $GLOBALS['xoops']->path('include/comment_new.php');
	10	+ $itemObj = $publisher->getHandler('item')->get($com_itemid);
	11	+ $com_replytext = _POSTEDBY . ' <strong>' . $itemObj->getLinkedPosterName() . '</strong> ' . _DATE . ' <strong>' . $itemObj->dateSub() . '</strong><br><br>' . $itemObj->summary();
	12	+ $bodytext = $itemObj->body();
	13	+ if ('' != $bodytext) {
	14	+ $com_replytext .= '<br><br>' . $bodytext . '';
	15	+ }
	16	+ $com_replytitle = $itemObj->getTitle();
	17	+ include_once $GLOBALS['xoops']->path('include/comment_new.php');
18	18	}

		@@ -36,24 +36,24 @@ discard block
		block discarded – undo
36	36	$moduleId = $GLOBALS['xoopsModule']->getVar('mid');
37	37
38	38	switch ($permission) {
39		- // Права на просмотр
40		- case 1:
41		- $formTitle = _AM_INSTRUCTION_PERM_VIEW;
42		- $permissionName = 'instruction_view';
43		- $permissionDescription = _AM_INSTRUCTION_PERM_VIEW_DSC;
44		- break;
45		- // Права на добавление
46		- case 2:
47		- $formTitle = _AM_INSTRUCTION_PERM_SUBMIT;
48		- $permissionName = 'instruction_submit';
49		- $permissionDescription = _AM_INSTRUCTION_PERM_SUBMIT_DSC;
50		- break;
51		- // Права на редактирование
52		- case 3:
53		- $formTitle = _AM_INSTRUCTION_PERM_EDIT;
54		- $permissionName = 'instruction_edit';
55		- $permissionDescription = _AM_INSTRUCTION_PERM_EDIT_DSC;
56		- break;
	39	+ // Права на просмотр
	40	+ case 1:
	41	+ $formTitle = _AM_INSTRUCTION_PERM_VIEW;
	42	+ $permissionName = 'instruction_view';
	43	+ $permissionDescription = _AM_INSTRUCTION_PERM_VIEW_DSC;
	44	+ break;
	45	+ // Права на добавление
	46	+ case 2:
	47	+ $formTitle = _AM_INSTRUCTION_PERM_SUBMIT;
	48	+ $permissionName = 'instruction_submit';
	49	+ $permissionDescription = _AM_INSTRUCTION_PERM_SUBMIT_DSC;
	50	+ break;
	51	+ // Права на редактирование
	52	+ case 3:
	53	+ $formTitle = _AM_INSTRUCTION_PERM_EDIT;
	54	+ $permissionName = 'instruction_edit';
	55	+ $permissionDescription = _AM_INSTRUCTION_PERM_EDIT_DSC;
	56	+ break;
57	57	}
58	58
59	59	// Права
		@@ -62,9 +62,9 @@ discard block
		block discarded – undo
62	62	$sql = 'SELECT cid, pid, title FROM ' . $xoopsDB->prefix('instruction_cat') . ' ORDER BY title';
63	63	$result = $xoopsDB->query($sql);
64	64	if ($result) {
65		- while ($row = $xoopsDB->fetchArray($result)) {
66		- $permissionsForm->addItem($row['cid'], $row['title'], $row['pid']);
67		- }
	65	+ while ($row = $xoopsDB->fetchArray($result)) {
	66	+ $permissionsForm->addItem($row['cid'], $row['title'], $row['pid']);
	67	+ }
68	68	}
69	69
70	70	echo $permissionsForm->render();

		@@ -13,59 +13,59 @@ discard block
		block discarded – undo
13	13	function b_instr_lastinstr_show($options = [])
14	14	{
15	15
16		- // Подключаем функции
17		- // $moduleDirName = dirname(__DIR__);
18		- $moduleDirName = basename(dirname(__DIR__));
19		- // include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php');
20		- include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/common.php');
21		- //
22		- $myts = MyTextSanitizer::getInstance();
23		- //
24		- //mb $instructionHandler = xoops_getModuleHandler('instruction', 'instruction');
25		- $db = \XoopsDatabaseFactory::getDatabase();
26		- $instructionHandler = new \Xoopsmodules\instruction\InstructionHandler($db);
	16	+ // Подключаем функции
	17	+ // $moduleDirName = dirname(__DIR__);
	18	+ $moduleDirName = basename(dirname(__DIR__));
	19	+ // include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php');
	20	+ include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/common.php');
	21	+ //
	22	+ $myts = MyTextSanitizer::getInstance();
	23	+ //
	24	+ //mb $instructionHandler = xoops_getModuleHandler('instruction', 'instruction');
	25	+ $db = \XoopsDatabaseFactory::getDatabase();
	26	+ $instructionHandler = new \Xoopsmodules\instruction\InstructionHandler($db);
27	27
28		- // Добавляем стили
29		- //global $xoTheme;
30		- //$xoTheme->addStylesheet( XOOPS_URL . '/modules/instruction/css/blocks.css' );
	28	+ // Добавляем стили
	29	+ //global $xoTheme;
	30	+ //$xoTheme->addStylesheet( XOOPS_URL . '/modules/instruction/css/blocks.css' );
31	31
32		- // Опции
33		- // Количество страниц
34		- $limit = $options[0];
35		- // Количество символов
36		- $numchars = $options[1];
	32	+ // Опции
	33	+ // Количество страниц
	34	+ $limit = $options[0];
	35	+ // Количество символов
	36	+ $numchars = $options[1];
37	37
38		- // Права на просмотр
39		- $cat_view = Xoopsmodules\instruction\Utility::getItemIds();
40		- // Массив выходных данных
41		- $block = [];
	38	+ // Права на просмотр
	39	+ $cat_view = Xoopsmodules\instruction\Utility::getItemIds();
	40	+ // Массив выходных данных
	41	+ $block = [];
42	42
43		- // Если есть категории для прасмотра
44		- if (is_array($cat_view) && count($cat_view) > 0) {
	43	+ // Если есть категории для прасмотра
	44	+ if (is_array($cat_view) && count($cat_view) > 0) {
45	45
46		- // Находим последние инструкции
47		- $sql = "SELECT `instrid`, `cid`, `title`, `pages`, `dateupdated` FROM {$instructionHandler->table} WHERE `cid` IN (" . implode(', ', $cat_view) . ') AND `status` > 0 ORDER BY `dateupdated` DESC';
48		- // Лимит запроса
49		- $result = $GLOBALS['xoopsDB']->query($sql, $limit);
50		- // Перебираем все значения
51		- $i = 0;
52		- while (list($instrid, $cid, $ititle, $pages, $dateupdated) = $GLOBALS['xoopsDB']->fetchRow($result)) {
53		- // ID инструкции
54		- $block[$i]['instrid'] = $instrid;
55		- // ID категории
56		- $block[$i]['cid'] = $cid;
57		- // Название инструкции
58		- $block[$i]['ititle'] = $myts->htmlSpecialChars($ititle);
59		- // Число страниц
60		- $block[$i]['pages'] = $pages;
61		- // Дата обновления инструкции
62		- $block[$i]['dateupdated'] = formatTimeStamp($dateupdated, 's');
63		- // Инкримент
64		- $i++;
65		- }
66		- }
67		- // Возвращаем массив
68		- return $block;
	46	+ // Находим последние инструкции
	47	+ $sql = "SELECT `instrid`, `cid`, `title`, `pages`, `dateupdated` FROM {$instructionHandler->table} WHERE `cid` IN (" . implode(', ', $cat_view) . ') AND `status` > 0 ORDER BY `dateupdated` DESC';
	48	+ // Лимит запроса
	49	+ $result = $GLOBALS['xoopsDB']->query($sql, $limit);
	50	+ // Перебираем все значения
	51	+ $i = 0;
	52	+ while (list($instrid, $cid, $ititle, $pages, $dateupdated) = $GLOBALS['xoopsDB']->fetchRow($result)) {
	53	+ // ID инструкции
	54	+ $block[$i]['instrid'] = $instrid;
	55	+ // ID категории
	56	+ $block[$i]['cid'] = $cid;
	57	+ // Название инструкции
	58	+ $block[$i]['ititle'] = $myts->htmlSpecialChars($ititle);
	59	+ // Число страниц
	60	+ $block[$i]['pages'] = $pages;
	61	+ // Дата обновления инструкции
	62	+ $block[$i]['dateupdated'] = formatTimeStamp($dateupdated, 's');
	63	+ // Инкримент
	64	+ $i++;
	65	+ }
	66	+ }
	67	+ // Возвращаем массив
	68	+ return $block;
69	69	}
70	70
71	71	// Редактирование последних инструкций
		@@ -75,10 +75,10 @@ discard block
		block discarded – undo
75	75	*/
76	76	function b_instr_lastinstr_edit($options = [])
77	77	{
78		- $form = '';
79		- $form .= _MB_INSTR_DISPLAYINSTRC . ' <input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text" /><br>' . "\n";
80		- $form .= _MB_INSTR_NUMCHARSC . ' <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text" /><br>' . "\n";
	78	+ $form = '';
	79	+ $form .= _MB_INSTR_DISPLAYINSTRC . ' <input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text" /><br>' . "\n";
	80	+ $form .= _MB_INSTR_NUMCHARSC . ' <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text" /><br>' . "\n";
81	81
82		- // Возвращаем форму
83		- return $form;
	82	+ // Возвращаем форму
	83	+ return $form;
84	84	}

		@@ -10,60 +10,60 @@ discard block
		block discarded – undo
10	10	$xoops_url = parse_url(XOOPS_URL);
11	11
12	12	$modversion = [
13		- 'version' => 1.07,
14		- 'module_status' => 'RC1',
15		- 'release_date' => '2017/10/04',
16		- 'name' => _MI_INSTRUCTION_NAME,
17		- 'description' => _MI_INSTRUCTION_DESC,
18		- 'credits' => 'radio-hobby.org, www.shmel.org',
19		- 'author' => 'andrey3761, Mamba, Aerograf',
20		- 'nickname' => '',
21		- 'help' => 'page=help',
22		- 'license' => 'GNU GPL 2.0',
23		- 'license_url' => 'www.gnu.org/licenses/gpl-2.0.html/',
24		- 'official' => 0,
25		- 'image' => 'assets/images/logoModule.png',
26		- 'dirname' => $moduleDirName,
27		- 'modicons16' => 'assets/images/icons/16',
28		- 'modicons32' => 'assets/images/icons/32',
29		- // О модуле
30		- 'module_website_url' => 'radio-hobby.org',
31		- 'module_website_name' => 'radio-hobby.org',
	13	+ 'version' => 1.07,
	14	+ 'module_status' => 'RC1',
	15	+ 'release_date' => '2017/10/04',
	16	+ 'name' => _MI_INSTRUCTION_NAME,
	17	+ 'description' => _MI_INSTRUCTION_DESC,
	18	+ 'credits' => 'radio-hobby.org, www.shmel.org',
	19	+ 'author' => 'andrey3761, Mamba, Aerograf',
	20	+ 'nickname' => '',
	21	+ 'help' => 'page=help',
	22	+ 'license' => 'GNU GPL 2.0',
	23	+ 'license_url' => 'www.gnu.org/licenses/gpl-2.0.html/',
	24	+ 'official' => 0,
	25	+ 'image' => 'assets/images/logoModule.png',
	26	+ 'dirname' => $moduleDirName,
	27	+ 'modicons16' => 'assets/images/icons/16',
	28	+ 'modicons32' => 'assets/images/icons/32',
	29	+ // О модуле
	30	+ 'module_website_url' => 'radio-hobby.org',
	31	+ 'module_website_name' => 'radio-hobby.org',
32	32
33		- 'author_website_url' => 'radio-hobby.org',
34		- 'author_website_name' => 'andrey3761',
35		- 'min_php' => '5.5',
36		- 'min_xoops' => '2.5.8',
37		- 'min_admin' => '1.1',
38		- 'min_db' => ['mysql' => '5.5'],
39		- // Файл базы данных
40		- 'sqlfile' => ['mysql' => 'sql/mysql.sql'],
41		- // Таблицы
42		- 'tables' => [
43		- $moduleDirName . '_cat',
44		- $moduleDirName . '_instr',
45		- $moduleDirName . '_page'
46		- ],
47		- // Имеет админку
48		- 'hasAdmin' => 1,
49		- 'adminindex' => 'admin/index.php',
50		- 'adminmenu' => 'admin/menu.php',
51		- 'system_menu' => 1,
52		- // Меню
53		- 'hasMain' => 1,
54		- // Search
55		- 'hasSearch' => 1,
56		- 'search' => [
57		- 'file' => 'include/search.inc.php',
58		- 'func' => $moduleDirName . '_search',
59		- ],
	33	+ 'author_website_url' => 'radio-hobby.org',
	34	+ 'author_website_name' => 'andrey3761',
	35	+ 'min_php' => '5.5',
	36	+ 'min_xoops' => '2.5.8',
	37	+ 'min_admin' => '1.1',
	38	+ 'min_db' => ['mysql' => '5.5'],
	39	+ // Файл базы данных
	40	+ 'sqlfile' => ['mysql' => 'sql/mysql.sql'],
	41	+ // Таблицы
	42	+ 'tables' => [
	43	+ $moduleDirName . '_cat',
	44	+ $moduleDirName . '_instr',
	45	+ $moduleDirName . '_page'
	46	+ ],
	47	+ // Имеет админку
	48	+ 'hasAdmin' => 1,
	49	+ 'adminindex' => 'admin/index.php',
	50	+ 'adminmenu' => 'admin/menu.php',
	51	+ 'system_menu' => 1,
	52	+ // Меню
	53	+ 'hasMain' => 1,
	54	+ // Search
	55	+ 'hasSearch' => 1,
	56	+ 'search' => [
	57	+ 'file' => 'include/search.inc.php',
	58	+ 'func' => $moduleDirName . '_search',
	59	+ ],
60	60	];
61	61	// Help files
62	62	$modversion['helpsection'] = [
63		- ['name' => _MI_INSTRUCTION_HELP_OVERVIEW, 'link' => 'page=help'],
64		- ['name' => _MI_INSTRUCTION_DISCLAIMER, 'link' => 'page=disclaimer'],
65		- ['name' => _MI_INSTRUCTION_LICENSE, 'link' => 'page=license'],
66		- ['name' => _MI_INSTRUCTION_SUPPORT, 'link' => 'page=support'],
	63	+ ['name' => _MI_INSTRUCTION_HELP_OVERVIEW, 'link' => 'page=help'],
	64	+ ['name' => _MI_INSTRUCTION_DISCLAIMER, 'link' => 'page=disclaimer'],
	65	+ ['name' => _MI_INSTRUCTION_LICENSE, 'link' => 'page=license'],
	66	+ ['name' => _MI_INSTRUCTION_SUPPORT, 'link' => 'page=support'],
67	67	];
68	68
69	69	// Comments
		@@ -76,144 +76,144 @@ discard block
		block discarded – undo
76	76
77	77	// Templates
78	78	$modversion['templates'] = [
79		- [
80		- 'file' => 'admin/' . $moduleDirName . '_admin_index.tpl',
81		- 'description' => ''
82		- ],
83		- [
84		- 'file' => 'admin/' . $moduleDirName . '_admin_cat.tpl',
85		- 'description' => ''
86		- ],
87		- [
88		- 'file' => 'admin/' . $moduleDirName . '_admin_editcat.tpl',
89		- 'description' => ''
90		- ],
91		- [
92		- 'file' => 'admin/' . $moduleDirName . '_admin_savecat.tpl',
93		- 'description' => ''
94		- ],
95		- [
96		- 'file' => 'admin/' . $moduleDirName . '_admin_viewcat.tpl',
97		- 'description' => ''
98		- ],
99		- [
100		- 'file' => 'admin/' . $moduleDirName . '_admin_instr.tpl',
101		- 'description' => ''
102		- ],
103		- [
104		- 'file' => 'admin/' . $moduleDirName . '_admin_editinstr.tpl',
105		- 'description' => ''
106		- ],
107		- [
108		- 'file' => 'admin/' . $moduleDirName . '_admin_saveinstr.tpl',
109		- 'description' => ''
110		- ],
111		- [
112		- 'file' => 'admin/' . $moduleDirName . '_admin_viewinstr.tpl',
113		- 'description' => ''
114		- ],
115		- [
116		- 'file' => 'admin/' . $moduleDirName . '_admin_editpage.tpl',
117		- 'description' => ''
118		- ],
119		- [
120		- 'file' => 'admin/' . $moduleDirName . '_admin_savepage.tpl',
121		- 'description' => ''
122		- ],
123		- [
124		- 'file' => 'admin/' . $moduleDirName . '_admin_perm.tpl',
125		- 'description' => ''
126		- ],
127		- [
128		- 'file' => 'admin/' . $moduleDirName . '_admin_about.tpl',
129		- 'description' => ''
130		- ],
131		- [
132		- 'file' => $moduleDirName . '_page.tpl',
133		- 'description' => ''
134		- ],
135		- [
136		- 'file' => $moduleDirName . '_instr.tpl',
137		- 'description' => ''
138		- ],
139		- [
140		- 'file' => $moduleDirName . '_index.tpl',
141		- 'description' => ''
142		- ],
143		- [
144		- 'file' => $moduleDirName . '_editpage.tpl',
145		- 'description' => ''
146		- ],
147		- [
148		- 'file' => $moduleDirName . '_savepage.tpl',
149		- 'description' => ''
150		- ],
	79	+ [
	80	+ 'file' => 'admin/' . $moduleDirName . '_admin_index.tpl',
	81	+ 'description' => ''
	82	+ ],
	83	+ [
	84	+ 'file' => 'admin/' . $moduleDirName . '_admin_cat.tpl',
	85	+ 'description' => ''
	86	+ ],
	87	+ [
	88	+ 'file' => 'admin/' . $moduleDirName . '_admin_editcat.tpl',
	89	+ 'description' => ''
	90	+ ],
	91	+ [
	92	+ 'file' => 'admin/' . $moduleDirName . '_admin_savecat.tpl',
	93	+ 'description' => ''
	94	+ ],
	95	+ [
	96	+ 'file' => 'admin/' . $moduleDirName . '_admin_viewcat.tpl',
	97	+ 'description' => ''
	98	+ ],
	99	+ [
	100	+ 'file' => 'admin/' . $moduleDirName . '_admin_instr.tpl',
	101	+ 'description' => ''
	102	+ ],
	103	+ [
	104	+ 'file' => 'admin/' . $moduleDirName . '_admin_editinstr.tpl',
	105	+ 'description' => ''
	106	+ ],
	107	+ [
	108	+ 'file' => 'admin/' . $moduleDirName . '_admin_saveinstr.tpl',
	109	+ 'description' => ''
	110	+ ],
	111	+ [
	112	+ 'file' => 'admin/' . $moduleDirName . '_admin_viewinstr.tpl',
	113	+ 'description' => ''
	114	+ ],
	115	+ [
	116	+ 'file' => 'admin/' . $moduleDirName . '_admin_editpage.tpl',
	117	+ 'description' => ''
	118	+ ],
	119	+ [
	120	+ 'file' => 'admin/' . $moduleDirName . '_admin_savepage.tpl',
	121	+ 'description' => ''
	122	+ ],
	123	+ [
	124	+ 'file' => 'admin/' . $moduleDirName . '_admin_perm.tpl',
	125	+ 'description' => ''
	126	+ ],
	127	+ [
	128	+ 'file' => 'admin/' . $moduleDirName . '_admin_about.tpl',
	129	+ 'description' => ''
	130	+ ],
	131	+ [
	132	+ 'file' => $moduleDirName . '_page.tpl',
	133	+ 'description' => ''
	134	+ ],
	135	+ [
	136	+ 'file' => $moduleDirName . '_instr.tpl',
	137	+ 'description' => ''
	138	+ ],
	139	+ [
	140	+ 'file' => $moduleDirName . '_index.tpl',
	141	+ 'description' => ''
	142	+ ],
	143	+ [
	144	+ 'file' => $moduleDirName . '_editpage.tpl',
	145	+ 'description' => ''
	146	+ ],
	147	+ [
	148	+ 'file' => $moduleDirName . '_savepage.tpl',
	149	+ 'description' => ''
	150	+ ],
151	151	];
152	152	// Конфигурация
153	153	$modversion['config'][] = [
154		- 'name' => 'form_options',
155		- 'title' => '_MI_INSTRUCTION_FORM_OPTIONS',
156		- 'description' => '_MI_INSTRUCTION_FORM_OPTIONS_DESC',
157		- 'formtype' => 'select',
158		- 'valuetype' => 'text',
159		- 'default' => 'dhtml',
160		- 'options' => array_flip($editorHandler->getList())
	154	+ 'name' => 'form_options',
	155	+ 'title' => '_MI_INSTRUCTION_FORM_OPTIONS',
	156	+ 'description' => '_MI_INSTRUCTION_FORM_OPTIONS_DESC',
	157	+ 'formtype' => 'select',
	158	+ 'valuetype' => 'text',
	159	+ 'default' => 'dhtml',
	160	+ 'options' => array_flip($editorHandler->getList())
161	161	];
162	162	$modversion['config'][] = [
163		- 'name' => 'perpageadmin',
164		- 'title' => '_MI_INSTRUCTION_PERPAGEADMIN',
165		- 'description' => '_MI_INSTRUCTION_PERPAGEADMINDSC',
166		- 'formtype' => 'textbox',
167		- 'valuetype' => 'int',
168		- 'default' => 20
	163	+ 'name' => 'perpageadmin',
	164	+ 'title' => '_MI_INSTRUCTION_PERPAGEADMIN',
	165	+ 'description' => '_MI_INSTRUCTION_PERPAGEADMINDSC',
	166	+ 'formtype' => 'textbox',
	167	+ 'valuetype' => 'int',
	168	+ 'default' => 20
169	169	];
170	170	$modversion['config'][] = [
171		- 'name' => 'perpagemain',
172		- 'title' => '_MI_INSTRUCTION_PERPAGEMAIN',
173		- 'description' => '_MI_INSTRUCTION_PERPAGEMAINDSC',
174		- 'formtype' => 'textbox',
175		- 'valuetype' => 'int',
176		- 'default' => 20
	171	+ 'name' => 'perpagemain',
	172	+ 'title' => '_MI_INSTRUCTION_PERPAGEMAIN',
	173	+ 'description' => '_MI_INSTRUCTION_PERPAGEMAINDSC',
	174	+ 'formtype' => 'textbox',
	175	+ 'valuetype' => 'int',
	176	+ 'default' => 20
177	177	];
178	178	// Теги
179	179	$modversion['config'][] = [
180		- 'name' => 'usetag',
181		- 'title' => '_MI_INSTRUCTION_USETAG',
182		- 'description' => '_MI_INSTRUCTION_USETAGDSC',
183		- 'formtype' => 'yesno',
184		- 'valuetype' => 'int',
185		- 'default' => 0
	180	+ 'name' => 'usetag',
	181	+ 'title' => '_MI_INSTRUCTION_USETAG',
	182	+ 'description' => '_MI_INSTRUCTION_USETAGDSC',
	183	+ 'formtype' => 'yesno',
	184	+ 'valuetype' => 'int',
	185	+ 'default' => 0
186	186	];
187	187	// Оценки
188	188	$modversion['config'][] = [
189		- 'name' => 'userat',
190		- 'title' => '_MI_INSTRUCTION_USERAT',
191		- 'description' => '_MI_INSTRUCTION_USERATDSC',
192		- 'formtype' => 'yesno',
193		- 'valuetype' => 'int',
194		- 'default' => 0
	189	+ 'name' => 'userat',
	190	+ 'title' => '_MI_INSTRUCTION_USERAT',
	191	+ 'description' => '_MI_INSTRUCTION_USERATDSC',
	192	+ 'formtype' => 'yesno',
	193	+ 'valuetype' => 'int',
	194	+ 'default' => 0
195	195	];
196	196
197	197	// Блоки
198	198	// Блок последних страниц
199	199	$modversion['blocks'][] = [
200		- 'file' => 'instr_lastpage.php',
201		- 'name' => _MI_INSTR_BLOCK_LASTPAGE,
202		- 'description' => _MI_INSTR_BLOCK_LASTPAGE_DESC,
203		- 'show_func' => 'b_instr_lastpage_show',
204		- 'edit_func' => 'b_instr_lastpage_edit',
205		- 'options' => '10\|20',
206		- 'template' => $moduleDirName . '_block_lastpage.tpl'
	200	+ 'file' => 'instr_lastpage.php',
	201	+ 'name' => _MI_INSTR_BLOCK_LASTPAGE,
	202	+ 'description' => _MI_INSTR_BLOCK_LASTPAGE_DESC,
	203	+ 'show_func' => 'b_instr_lastpage_show',
	204	+ 'edit_func' => 'b_instr_lastpage_edit',
	205	+ 'options' => '10\|20',
	206	+ 'template' => $moduleDirName . '_block_lastpage.tpl'
207	207	];
208	208	// Блок последних инструкций
209	209	$modversion['blocks'][] = [
210		- 'file' => 'instr_lastinstr.php',
211		- 'name' => _MI_INSTR_BLOCK_LASTINSTR,
212		- 'description' => _MI_INSTR_BLOCK_LASTINSTR_DESC,
213		- 'show_func' => 'b_instr_lastinstr_show',
214		- 'edit_func' => 'b_instr_lastinstr_edit',
215		- 'options' => '10\|20',
216		- 'template' => $moduleDirName . '_block_lastinstr.tpl'
	210	+ 'file' => 'instr_lastinstr.php',
	211	+ 'name' => _MI_INSTR_BLOCK_LASTINSTR,
	212	+ 'description' => _MI_INSTR_BLOCK_LASTINSTR_DESC,
	213	+ 'show_func' => 'b_instr_lastinstr_show',
	214	+ 'edit_func' => 'b_instr_lastinstr_edit',
	215	+ 'options' => '10\|20',
	216	+ 'template' => $moduleDirName . '_block_lastinstr.tpl'
217	217	];
218	218
219	219	// Notification

		@@ -11,8 +11,8 @@
		block discarded – undo
11	11
12	12	$configurator = include __DIR__ . '/../include/config.php';
13	13	foreach (array_keys($configurator->uploadFolders) as $i) {
14		- $utility::createFolder($configurator->uploadFolders[$i]);
15		- $adminObject->addConfigBoxLine($configurator->uploadFolders[$i], 'folder');
	14	+ $utility::createFolder($configurator->uploadFolders[$i]);
	15	+ $adminObject->addConfigBoxLine($configurator->uploadFolders[$i], 'folder');
16	16	}
17	17
18	18	//$instructionHandler = xoops_getModuleHandler('instruction', 'instruction');

		@@ -3,7 +3,7 @@ discard block
		block discarded – undo
3	3	use Xoopsmodules\instruction;
4	4
5	5	if (!isset($moduleDirName)) {
6		- $moduleDirName = basename(dirname(__DIR__));
	6	+ $moduleDirName = basename(dirname(__DIR__));
7	7	}
8	8
9	9	/** @var Xmf\Module\Helper $moduleHelper */
		@@ -17,34 +17,34 @@ discard block
		block discarded – undo
17	17
18	18	// Административное меню
19	19	$adminmenu = [
20		- [
21		- 'title' => _MI_INSTRUCTION_ADMIN_HOME,
22		- 'link' => 'admin/index.php',
23		- 'desc' => _MI_INSTRUCTION_ADMIN_HOME_DESC,
24		- 'icon' => $pathIcon32 . '/home.png'
25		- ],
26		- [
27		- 'title' => _MI_INSTRUCTION_ADMIN_CAT,
28		- 'link' => 'admin/cat.php',
29		- 'desc' => _MI_INSTRUCTION_ADMIN_CAT_DESC,
30		- 'icon' => $pathIcon32 . '/category.png'
31		- ],
32		- [
33		- 'title' => _MI_INSTRUCTION_ADMIN_INSTR,
34		- 'link' => 'admin/instr.php',
35		- 'desc' => _MI_INSTRUCTION_ADMIN_INSTR_DESC,
36		- 'icon' => $pathModIcon32 . '/nav_book.png'
37		- ],
38		- [
39		- 'title' => _MI_INSTRUCTION_ADMIN_PERM,
40		- 'link' => 'admin/perm.php',
41		- 'desc' => _MI_INSTRUCTION_ADMIN_PERM_DESC,
42		- 'icon' => $pathIcon32 . '/permissions.png'
43		- ],
44		- [
45		- 'title' => _MI_INSTRUCTION_ADMIN_ABOUT,
46		- 'link' => 'admin/about.php',
47		- 'desc' => _MI_INSTRUCTION_ADMIN_ABOUT_DESC,
48		- 'icon' => $pathIcon32 . '/about.png'
49		- ]
	20	+ [
	21	+ 'title' => _MI_INSTRUCTION_ADMIN_HOME,
	22	+ 'link' => 'admin/index.php',
	23	+ 'desc' => _MI_INSTRUCTION_ADMIN_HOME_DESC,
	24	+ 'icon' => $pathIcon32 . '/home.png'
	25	+ ],
	26	+ [
	27	+ 'title' => _MI_INSTRUCTION_ADMIN_CAT,
	28	+ 'link' => 'admin/cat.php',
	29	+ 'desc' => _MI_INSTRUCTION_ADMIN_CAT_DESC,
	30	+ 'icon' => $pathIcon32 . '/category.png'
	31	+ ],
	32	+ [
	33	+ 'title' => _MI_INSTRUCTION_ADMIN_INSTR,
	34	+ 'link' => 'admin/instr.php',
	35	+ 'desc' => _MI_INSTRUCTION_ADMIN_INSTR_DESC,
	36	+ 'icon' => $pathModIcon32 . '/nav_book.png'
	37	+ ],
	38	+ [
	39	+ 'title' => _MI_INSTRUCTION_ADMIN_PERM,
	40	+ 'link' => 'admin/perm.php',
	41	+ 'desc' => _MI_INSTRUCTION_ADMIN_PERM_DESC,
	42	+ 'icon' => $pathIcon32 . '/permissions.png'
	43	+ ],
	44	+ [
	45	+ 'title' => _MI_INSTRUCTION_ADMIN_ABOUT,
	46	+ 'link' => 'admin/about.php',
	47	+ 'desc' => _MI_INSTRUCTION_ADMIN_ABOUT_DESC,
	48	+ 'icon' => $pathIcon32 . '/about.png'
	49	+ ]
50	50	];

		@@ -22,12 +22,12 @@
		block discarded – undo
22	22	*/
23	23	class InstructionCorePreload extends XoopsPreloadItem
24	24	{
25		- // to add PSR-4 autoloader
26		- /**
27		- * @param $args
28		- */
29		- public static function eventCoreIncludeCommonEnd($args)
30		- {
31		- include __DIR__ . '/autoloader.php';
32		- }
	25	+ // to add PSR-4 autoloader
	26	+ /**
	27	+ * @param $args
	28	+ */
	29	+ public static function eventCoreIncludeCommonEnd($args)
	30	+ {
	31	+ include __DIR__ . '/autoloader.php';
	32	+ }
33	33	}

		@@ -4,29 +4,29 @@
		block discarded – undo
4	4	* @see http://www.php-fig.org/psr/psr-4/examples/
5	5	*/
6	6	spl_autoload_register(function ($class) {
7		- // project-specific namespace prefix
8		- $prefix = 'Xoopsmodules\\instruction\\';
	7	+ // project-specific namespace prefix
	8	+ $prefix = 'Xoopsmodules\\instruction\\';
9	9
10		- // base directory for the namespace prefix
11		- $base_dir = __DIR__ . '/../class/';
	10	+ // base directory for the namespace prefix
	11	+ $base_dir = __DIR__ . '/../class/';
12	12
13		- // does the class use the namespace prefix?
14		- $len = strlen($prefix);
	13	+ // does the class use the namespace prefix?
	14	+ $len = strlen($prefix);
15	15
16		- if (0 !== strncmp($prefix, $class, $len)) {
17		- return;
18		- }
	16	+ if (0 !== strncmp($prefix, $class, $len)) {
	17	+ return;
	18	+ }
19	19
20		- // get the relative class name
21		- $relative_class = substr($class, $len);
	20	+ // get the relative class name
	21	+ $relative_class = substr($class, $len);
22	22
23		- // replace the namespace prefix with the base directory, replace namespace
24		- // separators with directory separators in the relative class name, append
25		- // with .php
26		- $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
	23	+ // replace the namespace prefix with the base directory, replace namespace
	24	+ // separators with directory separators in the relative class name, append
	25	+ // with .php
	26	+ $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
27	27
28		- // if the file exists, require it
29		- if (file_exists($file)) {
30		- require $file;
31		- }
	28	+ // if the file exists, require it
	29	+ if (file_exists($file)) {
	30	+ require $file;
	31	+ }
32	32	});

mambax7 / instruction

Push — master ( 251d30...e23147 )

Status

Category

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

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

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

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

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

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

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

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

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