Inspection of "updates" - mambax7/instruction - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 825da9...adb11b )

by Michael

created 2017-10-09 08:42 UTC

Status

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

@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 $moduleDirName = basename(dirname(__DIR__));
 $capsDirName   = strtoupper($moduleDirName);
 
-if (!defined($capsDirName . '_DIRNAME')) {
+if ( ! defined($capsDirName . '_DIRNAME')) {
     //if (!defined(constant($capsDirName . '_DIRNAME'))) {
     define($capsDirName . '_DIRNAME', $GLOBALS['xoopsModule']->dirname());
     define($capsDirName . '_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
 }
 
 //Configurator
-return (object)[
+return (object) [
     'name'          => strtoupper($moduleDirName) . ' Module Configurator',
     'paths'         => [
         'dirname'    => $moduleDirName,

Please login to merge, or discard this patch.

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

@@ -23,57 +23,57 @@
 block discarded – undo
 $capsDirName   = strtoupper($moduleDirName);
 
 if (!defined($capsDirName . '_DIRNAME')) {
-    //if (!defined(constant($capsDirName . '_DIRNAME'))) {
-    define($capsDirName . '_DIRNAME', $GLOBALS['xoopsModule']->dirname());
-    define($capsDirName . '_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
-    define($capsDirName . '_URL', XOOPS_URL . '/modules/' . constant($capsDirName . '_DIRNAME'));
-    define($capsDirName . '_ADMIN', constant($capsDirName . '_URL') . '/admin/index.php');
-    define($capsDirName . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
-    define($capsDirName . '_AUTHOR_LOGOIMG', constant($capsDirName . '_URL') . '/assets/images/logoModule.png');
-    define($capsDirName . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($capsDirName . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
+	//if (!defined(constant($capsDirName . '_DIRNAME'))) {
+	define($capsDirName . '_DIRNAME', $GLOBALS['xoopsModule']->dirname());
+	define($capsDirName . '_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
+	define($capsDirName . '_URL', XOOPS_URL . '/modules/' . constant($capsDirName . '_DIRNAME'));
+	define($capsDirName . '_ADMIN', constant($capsDirName . '_URL') . '/admin/index.php');
+	define($capsDirName . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
+	define($capsDirName . '_AUTHOR_LOGOIMG', constant($capsDirName . '_URL') . '/assets/images/logoModule.png');
+	define($capsDirName . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($capsDirName . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
 }
 
 //Configurator
 return (object)[
-    'name'          => strtoupper($moduleDirName) . ' Module Configurator',
-    'paths'         => [
-        'dirname'    => $moduleDirName,
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-        //        'path'       => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-        //        'url'        => XOOPS_URL . '/modules/' . $moduleDirName,
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
-    ],
-    'uploadFolders' => [
-        constant($capsDirName . '_UPLOAD_PATH'),
-        //constant($capsDirName . '_UPLOAD_PATH') . '/category',
-        //constant($capsDirName . '_UPLOAD_PATH') . '/screenshots',
-        //XOOPS_UPLOAD_PATH . '/flags'
-    ],
-    'blankFiles'    => [
-        constant($capsDirName . '_UPLOAD_PATH'),
-        //constant($capsDirName . '_UPLOAD_PATH') . '/category',
-        //constant($capsDirName . '_UPLOAD_PATH') . '/screenshots',
-        //XOOPS_UPLOAD_PATH . '/flags'
-    ],
+	'name'          => strtoupper($moduleDirName) . ' Module Configurator',
+	'paths'         => [
+		'dirname'    => $moduleDirName,
+		'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
+		//        'path'       => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
+		//        'url'        => XOOPS_URL . '/modules/' . $moduleDirName,
+		'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+	],
+	'uploadFolders' => [
+		constant($capsDirName . '_UPLOAD_PATH'),
+		//constant($capsDirName . '_UPLOAD_PATH') . '/category',
+		//constant($capsDirName . '_UPLOAD_PATH') . '/screenshots',
+		//XOOPS_UPLOAD_PATH . '/flags'
+	],
+	'blankFiles'    => [
+		constant($capsDirName . '_UPLOAD_PATH'),
+		//constant($capsDirName . '_UPLOAD_PATH') . '/category',
+		//constant($capsDirName . '_UPLOAD_PATH') . '/screenshots',
+		//XOOPS_UPLOAD_PATH . '/flags'
+	],
 
-    'templateFolders' => [
-        '/templates/',
-        '/templates/blocks/',
-        '/templates/admin/'
+	'templateFolders' => [
+		'/templates/',
+		'/templates/blocks/',
+		'/templates/admin/'
 
-    ],
-    'oldFiles'        => [//        '/sql/mysql.sql',
-    ],
-    'oldFolders'      => [
-        '/images',
-        '/css',
-        '/js',
-        '/tree',
-        '/images/icons/16',
-        '/images/icons/32',
-    ],
-    'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
+	],
+	'oldFiles'        => [//        '/sql/mysql.sql',
+	],
+	'oldFolders'      => [
+		'/images',
+		'/css',
+		'/js',
+		'/tree',
+		'/images/icons/16',
+		'/images/icons/32',
+	],
+	'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
                      <img src='" . $capsDirName . '_AUTHOR_LOGOIMG' . '\' alt=\'XOOPS Project\' /></a>',
 ];

Please login to merge, or discard this patch.

include/pagetypes.inc.php 1 patch

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.

include/search.inc.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -9,7 +9,7 @@
 block discarded – undo
 
     $sql = 'SELECT p.pageid, p.title, p.uid, p.datecreated, i.title FROM ' . $GLOBALS['xoopsDB']->prefix('instruction_page') . ' p, ' . $GLOBALS['xoopsDB']->prefix('instruction_instr') . ' i WHERE i.instrid = p.instrid AND i.status > 0 AND p.status > 0 AND p.type > 0';
     if (0 != $userid) {
-        $sql .= ' AND p.uid = ' . (int)$userid . ' ';
+        $sql .= ' AND p.uid = ' . (int) $userid . ' ';
         //return NULL;
     }
 

Please login to merge, or discard this patch.

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

@@ -13,45 +13,45 @@
 block discarded – undo
  */
 function instruction_search($queryarray, $andor, $limit, $offset, $userid)
 {
-    // Подключаем функции
-    include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php');
+	// Подключаем функции
+	include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php');
 
-    $sql = 'SELECT p.pageid, p.title, p.uid, p.datecreated, i.title FROM ' . $GLOBALS['xoopsDB']->prefix('instruction_page') . ' p, ' . $GLOBALS['xoopsDB']->prefix('instruction_instr') . ' i WHERE i.instrid = p.instrid AND i.status > 0 AND p.status > 0 AND p.type > 0';
-    if (0 != $userid) {
-        $sql .= ' AND p.uid = ' . (int)$userid . ' ';
-        //return NULL;
-    }
+	$sql = 'SELECT p.pageid, p.title, p.uid, p.datecreated, i.title FROM ' . $GLOBALS['xoopsDB']->prefix('instruction_page') . ' p, ' . $GLOBALS['xoopsDB']->prefix('instruction_instr') . ' i WHERE i.instrid = p.instrid AND i.status > 0 AND p.status > 0 AND p.type > 0';
+	if (0 != $userid) {
+		$sql .= ' AND p.uid = ' . (int)$userid . ' ';
+		//return NULL;
+	}
 
-    // Права на просмотр
-    $categories = Xoopsmodules\instruction\Utility::getItemIds();
-    if (is_array($categories) && count($categories) > 0) {
-        $sql .= ' AND i.cid IN ( ' . implode(', ', $categories) . ' ) ';
-        // Если пользователь не имеет прав просмотра ни одной категории
-    } else {
-        return null;
-    }
+	// Права на просмотр
+	$categories = Xoopsmodules\instruction\Utility::getItemIds();
+	if (is_array($categories) && count($categories) > 0) {
+		$sql .= ' AND i.cid IN ( ' . implode(', ', $categories) . ' ) ';
+		// Если пользователь не имеет прав просмотра ни одной категории
+	} else {
+		return null;
+	}
 
-    // Добавляем в условие ключевые слова поиска
-    if (is_array($queryarray) && $count = count($queryarray)) {
-        $sql .= " AND ( ( p.title LIKE '%$queryarray[0]%' OR p.hometext LIKE '%$queryarray[0]%' )";
-        for ($i = 1; $i < $count; $i++) {
-            $sql .= " $andor ";
-            $sql .= "( p.title LIKE '%$queryarray[$i]%' OR p.hometext LIKE '%$queryarray[$i]%' )";
-        }
-        $sql .= ' ) ';
-    }
-    //$sql .= "ORDER BY date DESC";
-    $result = $GLOBALS['xoopsDB']->query($sql, $limit, $offset);
-    $ret    = [];
-    $i      = 0;
-    // Перебираем все результаты
-    while (list($pageid, $ptitle, $puid, $pdatecreated, $ititle) = $GLOBALS['xoopsDB']->fetchRow($result)) {
-        $ret[$i]['image'] = 'assets/images/size2.gif';
-        $ret[$i]['link']  = 'page.php?id=' . $pageid;
-        $ret[$i]['title'] = $ititle . ': ' . $ptitle;
-        $ret[$i]['time']  = $pdatecreated;
-        $ret[$i]['uid']   = $puid;
-        $i++;
-    }
-    return $ret;
+	// Добавляем в условие ключевые слова поиска
+	if (is_array($queryarray) && $count = count($queryarray)) {
+		$sql .= " AND ( ( p.title LIKE '%$queryarray[0]%' OR p.hometext LIKE '%$queryarray[0]%' )";
+		for ($i = 1; $i < $count; $i++) {
+			$sql .= " $andor ";
+			$sql .= "( p.title LIKE '%$queryarray[$i]%' OR p.hometext LIKE '%$queryarray[$i]%' )";
+		}
+		$sql .= ' ) ';
+	}
+	//$sql .= "ORDER BY date DESC";
+	$result = $GLOBALS['xoopsDB']->query($sql, $limit, $offset);
+	$ret    = [];
+	$i      = 0;
+	// Перебираем все результаты
+	while (list($pageid, $ptitle, $puid, $pdatecreated, $ititle) = $GLOBALS['xoopsDB']->fetchRow($result)) {
+		$ret[$i]['image'] = 'assets/images/size2.gif';
+		$ret[$i]['link']  = 'page.php?id=' . $pageid;
+		$ret[$i]['title'] = $ititle . ': ' . $ptitle;
+		$ret[$i]['time']  = $pdatecreated;
+		$ret[$i]['uid']   = $puid;
+		$i++;
+	}
+	return $ret;
 }

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_lastpage.php 1 patch

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

@@ -12,63 +12,63 @@  discard block
 block discarded – undo
 function b_instr_lastpage_show($options = [])
 {
 
-    // Подключаем функции
-    $moduleDirName = basename(dirname(__DIR__));
-    include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php');
-    //
-    $myts = MyTextSanitizer::getInstance();
-    //
-    //mb    $instructionHandler = xoops_getModuleHandler('instruction', 'instruction');
-    //mb    $pageHandler  = xoops_getModuleHandler('page', 'instruction');
+	// Подключаем функции
+	$moduleDirName = basename(dirname(__DIR__));
+	include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php');
+	//
+	$myts = MyTextSanitizer::getInstance();
+	//
+	//mb    $instructionHandler = xoops_getModuleHandler('instruction', 'instruction');
+	//mb    $pageHandler  = xoops_getModuleHandler('page', 'instruction');
 
-    $db                 = \XoopsDatabaseFactory::getDatabase();
-    $instructionHandler = new \Xoopsmodules\instruction\InstructionHandler($db);
-    $pageHandler        = new \Xoopsmodules\instruction\PageHandler($db);
+	$db                 = \XoopsDatabaseFactory::getDatabase();
+	$instructionHandler = new \Xoopsmodules\instruction\InstructionHandler($db);
+	$pageHandler        = new \Xoopsmodules\instruction\PageHandler($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 p.pageid, p.instrid, p.title, p.dateupdated, i.title, i.cid FROM {$pageHandler->table} p, {$instructionHandler->table} i WHERE p.instrid = i.instrid AND i.cid IN (" . implode(', ', $cat_view) . ') AND p.status > 0 AND i.status > 0 ORDER BY p.dateupdated DESC';
-        // Лимит запроса
-        $result = $GLOBALS['xoopsDB']->query($sql, $limit);
-        // Перебираем все значения
-        $i = 0;
-        while (list($pageid, $instrid, $ptitle, $dateupdated, $ititle, $cid) = $GLOBALS['xoopsDB']->fetchRow($result)) {
-            // ID страницы
-            $block[$i]['pageid'] = $pageid;
-            // ID инструкции
-            $block[$i]['instrid'] = $instrid;
-            // Название страницы
-            $block[$i]['ptitle'] = $myts->htmlSpecialChars($ptitle);
-            // Название инструкции
-            $block[$i]['ititle'] = $myts->htmlSpecialChars($ititle);
-            // Дата обновления страницы
-            $block[$i]['dateupdated'] = formatTimeStamp($dateupdated, 's');
-            // Категория инстркции
-            $block[$i]['cid'] = $cid;
-            // Инкримент
-            $i++;
-        }
-    }
+		// Находим последние страницы
+		$sql = "SELECT p.pageid, p.instrid, p.title, p.dateupdated, i.title, i.cid FROM {$pageHandler->table} p, {$instructionHandler->table} i WHERE p.instrid = i.instrid AND i.cid IN (" . implode(', ', $cat_view) . ') AND p.status > 0 AND i.status > 0 ORDER BY p.dateupdated DESC';
+		// Лимит запроса
+		$result = $GLOBALS['xoopsDB']->query($sql, $limit);
+		// Перебираем все значения
+		$i = 0;
+		while (list($pageid, $instrid, $ptitle, $dateupdated, $ititle, $cid) = $GLOBALS['xoopsDB']->fetchRow($result)) {
+			// ID страницы
+			$block[$i]['pageid'] = $pageid;
+			// ID инструкции
+			$block[$i]['instrid'] = $instrid;
+			// Название страницы
+			$block[$i]['ptitle'] = $myts->htmlSpecialChars($ptitle);
+			// Название инструкции
+			$block[$i]['ititle'] = $myts->htmlSpecialChars($ititle);
+			// Дата обновления страницы
+			$block[$i]['dateupdated'] = formatTimeStamp($dateupdated, 's');
+			// Категория инстркции
+			$block[$i]['cid'] = $cid;
+			// Инкримент
+			$i++;
+		}
+	}
 
-    // Возвращаем массив
-    return $block;
+	// Возвращаем массив
+	return $block;
 }
 
 // Редактирование последних страниц
@@ -78,10 +78,10 @@  discard block
 block discarded – undo
  */
 function b_instr_lastpage_edit($options = [])
 {
-    $form = '';
-    $form .= _MB_INSTR_DISPLAYPAGESC . ' <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_DISPLAYPAGESC . ' <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.

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.

instr.php 2 patches

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

@@ -19,8 +19,8 @@  discard block
 block discarded – undo
 $criteria->add(new \Criteria('instrid', $instrid));
 $criteria->add(new \Criteria('status ', '0', '>'));
 if (0 == $instructionHandler->getCount($criteria)) {
-    redirect_header('index.php', 3, _MD_INSTRUCTION_INSTRNOTEXIST);
-    exit();
+	redirect_header('index.php', 3, _MD_INSTRUCTION_INSTRNOTEXIST);
+	exit();
 }
 //
 unset($criteria);
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
 // Права на просмотр инструкции
 $categories = Xoopsmodules\instruction\Utility::getItemIds();
 if (!in_array($objInsinstr->getVar('cid'), $categories)) {
-    redirect_header(XOOPS_URL . '/modules/' . $moduleDirName . '/', 3, _NOPERM);
-    exit();
+	redirect_header(XOOPS_URL . '/modules/' . $moduleDirName . '/', 3, _NOPERM);
+	exit();
 }
 
 // Массив данных об инструкции
@@ -56,29 +56,29 @@  discard block
 block discarded – undo
 $instrs['description'] = $objInsinstr->getVar('description');
 // Если админ, рисуем админлинк
 if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isAdmin($GLOBALS['xoopsModule']->mid())) {
-    $instrs['adminlink'] = '&nbsp;<a href="'
-                           . XOOPS_URL
-                           . '/modules/'
-                           . $moduleDirName
-                           . '/admin/instr.php?op=editinstr&instrid='
-                           . $instrid
-                           . '"><img style="width:16px;" src="./assets/icons/edit_mini.png" alt='
-                           . _EDIT
-                           . ' title='
-                           . _EDIT
-                           . '></a>&nbsp;<a href="'
-                           . XOOPS_URL
-                           . '/modules/'
-                           . $moduleDirName
-                           . '/admin/instr.php?op=delinstr&instrid='
-                           . $instrid
-                           . '"><img style="width:16px;" src="./assets/icons/delete_mini.png" alt='
-                           . _DELETE
-                           . ' title='
-                           . _DELETE
-                           . '></a>&nbsp;';
+	$instrs['adminlink'] = '&nbsp;<a href="'
+						   . XOOPS_URL
+						   . '/modules/'
+						   . $moduleDirName
+						   . '/admin/instr.php?op=editinstr&instrid='
+						   . $instrid
+						   . '"><img style="width:16px;" src="./assets/icons/edit_mini.png" alt='
+						   . _EDIT
+						   . ' title='
+						   . _EDIT
+						   . '></a>&nbsp;<a href="'
+						   . XOOPS_URL
+						   . '/modules/'
+						   . $moduleDirName
+						   . '/admin/instr.php?op=delinstr&instrid='
+						   . $instrid
+						   . '"><img style="width:16px;" src="./assets/icons/delete_mini.png" alt='
+						   . _DELETE
+						   . ' title='
+						   . _DELETE
+						   . '></a>&nbsp;';
 } else {
-    $instrs['adminlink'] = '';
+	$instrs['adminlink'] = '';
 }
 
 // Выводим в шаблон
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
 $nav_parent_id = array_reverse($nav_parent_id);
 $navigation    = '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/">' . $GLOBALS['xoopsModule']->name() . '</a>&nbsp;:&nbsp;';
 foreach (array_keys($nav_parent_id) as $i) {
-    $navigation .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/index.php?cid=' . $nav_parent_id[$i]->getVar('cid') . '">' . $nav_parent_id[$i]->getVar('title') . '</a>&nbsp;:&nbsp;';
+	$navigation .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/index.php?cid=' . $nav_parent_id[$i]->getVar('cid') . '">' . $nav_parent_id[$i]->getVar('title') . '</a>&nbsp;:&nbsp;';
 }
 $navigation .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/index.php?cid=' . $objInscat->getVar('cid') . '">' . $objInscat->getVar('title') . '</a>&nbsp;:&nbsp;';
 $navigation .= $objInsinstr->getVar('title');
@@ -129,18 +129,18 @@  discard block
 block discarded – undo
 
 // Теги
 if (xoops_getModuleOption('usetag', 'instruction')) {
-    include_once $GLOBALS['xoops']->path('modules/tag/include/tagbar.php');
-    $xoopsTpl->assign('tags', true);
-    $xoopsTpl->assign('tagbar', tagBar($instrid, 0));
+	include_once $GLOBALS['xoops']->path('modules/tag/include/tagbar.php');
+	$xoopsTpl->assign('tags', true);
+	$xoopsTpl->assign('tagbar', tagBar($instrid, 0));
 } else {
-    $xoopsTpl->assign('tags', false);
+	$xoopsTpl->assign('tags', false);
 }
 
 // Рейтинг
 if (xoops_getModuleOption('userat', 'instruction')) {
-    $xoopsTpl->assign('insUserat', true);
+	$xoopsTpl->assign('insUserat', true);
 } else {
-    $xoopsTpl->assign('insUserat', false);
+	$xoopsTpl->assign('insUserat', false);
 }
 
 // Подвал

Please login to merge, or discard this patch.

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

@@ -12,7 +12,7 @@  discard block
 block discarded – undo
 //$categoryHandler   = xoops_getModuleHandler('category', 'instruction');
 //$pageHandler  = xoops_getModuleHandler('page', 'instruction');
 
-$instrid = isset($_GET['id']) ? (int)$_GET['id'] : 0;
+$instrid = isset($_GET['id']) ? (int) $_GET['id'] : 0;
 
 // Существует ли такая инструкция
 $criteria = new \CriteriaCompo();
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
 
 // Права на просмотр инструкции
 $categories = Xoopsmodules\instruction\Utility::getItemIds();
-if (!in_array($objInsinstr->getVar('cid'), $categories)) {
+if ( ! in_array($objInsinstr->getVar('cid'), $categories)) {
     redirect_header(XOOPS_URL . '/modules/' . $moduleDirName . '/', 3, _NOPERM);
     exit();
 }

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.

		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	$moduleDirName = basename(dirname(__DIR__));
23	23	$capsDirName = strtoupper($moduleDirName);
24	24
25		-if (!defined($capsDirName . '_DIRNAME')) {
	25	+if ( ! defined($capsDirName . '_DIRNAME')) {
26	26	//if (!defined(constant($capsDirName . '_DIRNAME'))) {
27	27	define($capsDirName . '_DIRNAME', $GLOBALS['xoopsModule']->dirname());
28	28	define($capsDirName . '_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	}
36	36
37	37	//Configurator
38		-return (object)[
	38	+return (object) [
39	39	'name' => strtoupper($moduleDirName) . ' Module Configurator',
40	40	'paths' => [
41	41	'dirname' => $moduleDirName,

		@@ -23,57 +23,57 @@
		block discarded – undo
23	23	$capsDirName = strtoupper($moduleDirName);
24	24
25	25	if (!defined($capsDirName . '_DIRNAME')) {
26		- //if (!defined(constant($capsDirName . '_DIRNAME'))) {
27		- define($capsDirName . '_DIRNAME', $GLOBALS['xoopsModule']->dirname());
28		- define($capsDirName . '_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
29		- define($capsDirName . '_URL', XOOPS_URL . '/modules/' . constant($capsDirName . '_DIRNAME'));
30		- define($capsDirName . '_ADMIN', constant($capsDirName . '_URL') . '/admin/index.php');
31		- define($capsDirName . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
32		- define($capsDirName . '_AUTHOR_LOGOIMG', constant($capsDirName . '_URL') . '/assets/images/logoModule.png');
33		- define($capsDirName . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
34		- define($capsDirName . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
	26	+ //if (!defined(constant($capsDirName . '_DIRNAME'))) {
	27	+ define($capsDirName . '_DIRNAME', $GLOBALS['xoopsModule']->dirname());
	28	+ define($capsDirName . '_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
	29	+ define($capsDirName . '_URL', XOOPS_URL . '/modules/' . constant($capsDirName . '_DIRNAME'));
	30	+ define($capsDirName . '_ADMIN', constant($capsDirName . '_URL') . '/admin/index.php');
	31	+ define($capsDirName . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . constant($capsDirName . '_DIRNAME'));
	32	+ define($capsDirName . '_AUTHOR_LOGOIMG', constant($capsDirName . '_URL') . '/assets/images/logoModule.png');
	33	+ define($capsDirName . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
	34	+ define($capsDirName . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
35	35	}
36	36
37	37	//Configurator
38	38	return (object)[
39		- 'name' => strtoupper($moduleDirName) . ' Module Configurator',
40		- 'paths' => [
41		- 'dirname' => $moduleDirName,
42		- 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
43		- // 'path' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
44		- // 'url' => XOOPS_URL . '/modules/' . $moduleDirName,
45		- 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
46		- 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
47		- ],
48		- 'uploadFolders' => [
49		- constant($capsDirName . '_UPLOAD_PATH'),
50		- //constant($capsDirName . '_UPLOAD_PATH') . '/category',
51		- //constant($capsDirName . '_UPLOAD_PATH') . '/screenshots',
52		- //XOOPS_UPLOAD_PATH . '/flags'
53		- ],
54		- 'blankFiles' => [
55		- constant($capsDirName . '_UPLOAD_PATH'),
56		- //constant($capsDirName . '_UPLOAD_PATH') . '/category',
57		- //constant($capsDirName . '_UPLOAD_PATH') . '/screenshots',
58		- //XOOPS_UPLOAD_PATH . '/flags'
59		- ],
	39	+ 'name' => strtoupper($moduleDirName) . ' Module Configurator',
	40	+ 'paths' => [
	41	+ 'dirname' => $moduleDirName,
	42	+ 'admin' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
	43	+ // 'path' => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
	44	+ // 'url' => XOOPS_URL . '/modules/' . $moduleDirName,
	45	+ 'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
	46	+ 'uploadUrl' => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
	47	+ ],
	48	+ 'uploadFolders' => [
	49	+ constant($capsDirName . '_UPLOAD_PATH'),
	50	+ //constant($capsDirName . '_UPLOAD_PATH') . '/category',
	51	+ //constant($capsDirName . '_UPLOAD_PATH') . '/screenshots',
	52	+ //XOOPS_UPLOAD_PATH . '/flags'
	53	+ ],
	54	+ 'blankFiles' => [
	55	+ constant($capsDirName . '_UPLOAD_PATH'),
	56	+ //constant($capsDirName . '_UPLOAD_PATH') . '/category',
	57	+ //constant($capsDirName . '_UPLOAD_PATH') . '/screenshots',
	58	+ //XOOPS_UPLOAD_PATH . '/flags'
	59	+ ],
60	60
61		- 'templateFolders' => [
62		- '/templates/',
63		- '/templates/blocks/',
64		- '/templates/admin/'
	61	+ 'templateFolders' => [
	62	+ '/templates/',
	63	+ '/templates/blocks/',
	64	+ '/templates/admin/'
65	65
66		- ],
67		- 'oldFiles' => [// '/sql/mysql.sql',
68		- ],
69		- 'oldFolders' => [
70		- '/images',
71		- '/css',
72		- '/js',
73		- '/tree',
74		- '/images/icons/16',
75		- '/images/icons/32',
76		- ],
77		- 'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
	66	+ ],
	67	+ 'oldFiles' => [// '/sql/mysql.sql',
	68	+ ],
	69	+ 'oldFolders' => [
	70	+ '/images',
	71	+ '/css',
	72	+ '/js',
	73	+ '/tree',
	74	+ '/images/icons/16',
	75	+ '/images/icons/32',
	76	+ ],
	77	+ 'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
78	78	<img src='" . $capsDirName . '_AUTHOR_LOGOIMG' . '\' alt=\'XOOPS Project\' /></a>',
79	79	];

		@@ -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	];

		@@ -9,7 +9,7 @@
		block discarded – undo
9	9
10	10	$sql = 'SELECT p.pageid, p.title, p.uid, p.datecreated, i.title FROM ' . $GLOBALS['xoopsDB']->prefix('instruction_page') . ' p, ' . $GLOBALS['xoopsDB']->prefix('instruction_instr') . ' i WHERE i.instrid = p.instrid AND i.status > 0 AND p.status > 0 AND p.type > 0';
11	11	if (0 != $userid) {
12		- $sql .= ' AND p.uid = ' . (int)$userid . ' ';
	12	+ $sql .= ' AND p.uid = ' . (int) $userid . ' ';
13	13	//return NULL;
14	14	}
15	15

		@@ -13,45 +13,45 @@
		block discarded – undo
13	13	*/
14	14	function instruction_search($queryarray, $andor, $limit, $offset, $userid)
15	15	{
16		- // Подключаем функции
17		- include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php');
	16	+ // Подключаем функции
	17	+ include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php');
18	18
19		- $sql = 'SELECT p.pageid, p.title, p.uid, p.datecreated, i.title FROM ' . $GLOBALS['xoopsDB']->prefix('instruction_page') . ' p, ' . $GLOBALS['xoopsDB']->prefix('instruction_instr') . ' i WHERE i.instrid = p.instrid AND i.status > 0 AND p.status > 0 AND p.type > 0';
20		- if (0 != $userid) {
21		- $sql .= ' AND p.uid = ' . (int)$userid . ' ';
22		- //return NULL;
23		- }
	19	+ $sql = 'SELECT p.pageid, p.title, p.uid, p.datecreated, i.title FROM ' . $GLOBALS['xoopsDB']->prefix('instruction_page') . ' p, ' . $GLOBALS['xoopsDB']->prefix('instruction_instr') . ' i WHERE i.instrid = p.instrid AND i.status > 0 AND p.status > 0 AND p.type > 0';
	20	+ if (0 != $userid) {
	21	+ $sql .= ' AND p.uid = ' . (int)$userid . ' ';
	22	+ //return NULL;
	23	+ }
24	24
25		- // Права на просмотр
26		- $categories = Xoopsmodules\instruction\Utility::getItemIds();
27		- if (is_array($categories) && count($categories) > 0) {
28		- $sql .= ' AND i.cid IN ( ' . implode(', ', $categories) . ' ) ';
29		- // Если пользователь не имеет прав просмотра ни одной категории
30		- } else {
31		- return null;
32		- }
	25	+ // Права на просмотр
	26	+ $categories = Xoopsmodules\instruction\Utility::getItemIds();
	27	+ if (is_array($categories) && count($categories) > 0) {
	28	+ $sql .= ' AND i.cid IN ( ' . implode(', ', $categories) . ' ) ';
	29	+ // Если пользователь не имеет прав просмотра ни одной категории
	30	+ } else {
	31	+ return null;
	32	+ }
33	33
34		- // Добавляем в условие ключевые слова поиска
35		- if (is_array($queryarray) && $count = count($queryarray)) {
36		- $sql .= " AND ( ( p.title LIKE '%$queryarray[0]%' OR p.hometext LIKE '%$queryarray[0]%' )";
37		- for ($i = 1; $i < $count; $i++) {
38		- $sql .= " $andor ";
39		- $sql .= "( p.title LIKE '%$queryarray[$i]%' OR p.hometext LIKE '%$queryarray[$i]%' )";
40		- }
41		- $sql .= ' ) ';
42		- }
43		- //$sql .= "ORDER BY date DESC";
44		- $result = $GLOBALS['xoopsDB']->query($sql, $limit, $offset);
45		- $ret = [];
46		- $i = 0;
47		- // Перебираем все результаты
48		- while (list($pageid, $ptitle, $puid, $pdatecreated, $ititle) = $GLOBALS['xoopsDB']->fetchRow($result)) {
49		- $ret[$i]['image'] = 'assets/images/size2.gif';
50		- $ret[$i]['link'] = 'page.php?id=' . $pageid;
51		- $ret[$i]['title'] = $ititle . ': ' . $ptitle;
52		- $ret[$i]['time'] = $pdatecreated;
53		- $ret[$i]['uid'] = $puid;
54		- $i++;
55		- }
56		- return $ret;
	34	+ // Добавляем в условие ключевые слова поиска
	35	+ if (is_array($queryarray) && $count = count($queryarray)) {
	36	+ $sql .= " AND ( ( p.title LIKE '%$queryarray[0]%' OR p.hometext LIKE '%$queryarray[0]%' )";
	37	+ for ($i = 1; $i < $count; $i++) {
	38	+ $sql .= " $andor ";
	39	+ $sql .= "( p.title LIKE '%$queryarray[$i]%' OR p.hometext LIKE '%$queryarray[$i]%' )";
	40	+ }
	41	+ $sql .= ' ) ';
	42	+ }
	43	+ //$sql .= "ORDER BY date DESC";
	44	+ $result = $GLOBALS['xoopsDB']->query($sql, $limit, $offset);
	45	+ $ret = [];
	46	+ $i = 0;
	47	+ // Перебираем все результаты
	48	+ while (list($pageid, $ptitle, $puid, $pdatecreated, $ititle) = $GLOBALS['xoopsDB']->fetchRow($result)) {
	49	+ $ret[$i]['image'] = 'assets/images/size2.gif';
	50	+ $ret[$i]['link'] = 'page.php?id=' . $pageid;
	51	+ $ret[$i]['title'] = $ititle . ': ' . $ptitle;
	52	+ $ret[$i]['time'] = $pdatecreated;
	53	+ $ret[$i]['uid'] = $puid;
	54	+ $i++;
	55	+ }
	56	+ return $ret;
57	57	}

		@@ -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();

		@@ -12,63 +12,63 @@ discard block
		block discarded – undo
12	12	function b_instr_lastpage_show($options = [])
13	13	{
14	14
15		- // Подключаем функции
16		- $moduleDirName = basename(dirname(__DIR__));
17		- include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php');
18		- //
19		- $myts = MyTextSanitizer::getInstance();
20		- //
21		- //mb $instructionHandler = xoops_getModuleHandler('instruction', 'instruction');
22		- //mb $pageHandler = xoops_getModuleHandler('page', 'instruction');
	15	+ // Подключаем функции
	16	+ $moduleDirName = basename(dirname(__DIR__));
	17	+ include_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/class/utility.php');
	18	+ //
	19	+ $myts = MyTextSanitizer::getInstance();
	20	+ //
	21	+ //mb $instructionHandler = xoops_getModuleHandler('instruction', 'instruction');
	22	+ //mb $pageHandler = xoops_getModuleHandler('page', 'instruction');
23	23
24		- $db = \XoopsDatabaseFactory::getDatabase();
25		- $instructionHandler = new \Xoopsmodules\instruction\InstructionHandler($db);
26		- $pageHandler = new \Xoopsmodules\instruction\PageHandler($db);
	24	+ $db = \XoopsDatabaseFactory::getDatabase();
	25	+ $instructionHandler = new \Xoopsmodules\instruction\InstructionHandler($db);
	26	+ $pageHandler = new \Xoopsmodules\instruction\PageHandler($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 p.pageid, p.instrid, p.title, p.dateupdated, i.title, i.cid FROM {$pageHandler->table} p, {$instructionHandler->table} i WHERE p.instrid = i.instrid AND i.cid IN (" . implode(', ', $cat_view) . ') AND p.status > 0 AND i.status > 0 ORDER BY p.dateupdated DESC';
48		- // Лимит запроса
49		- $result = $GLOBALS['xoopsDB']->query($sql, $limit);
50		- // Перебираем все значения
51		- $i = 0;
52		- while (list($pageid, $instrid, $ptitle, $dateupdated, $ititle, $cid) = $GLOBALS['xoopsDB']->fetchRow($result)) {
53		- // ID страницы
54		- $block[$i]['pageid'] = $pageid;
55		- // ID инструкции
56		- $block[$i]['instrid'] = $instrid;
57		- // Название страницы
58		- $block[$i]['ptitle'] = $myts->htmlSpecialChars($ptitle);
59		- // Название инструкции
60		- $block[$i]['ititle'] = $myts->htmlSpecialChars($ititle);
61		- // Дата обновления страницы
62		- $block[$i]['dateupdated'] = formatTimeStamp($dateupdated, 's');
63		- // Категория инстркции
64		- $block[$i]['cid'] = $cid;
65		- // Инкримент
66		- $i++;
67		- }
68		- }
	46	+ // Находим последние страницы
	47	+ $sql = "SELECT p.pageid, p.instrid, p.title, p.dateupdated, i.title, i.cid FROM {$pageHandler->table} p, {$instructionHandler->table} i WHERE p.instrid = i.instrid AND i.cid IN (" . implode(', ', $cat_view) . ') AND p.status > 0 AND i.status > 0 ORDER BY p.dateupdated DESC';
	48	+ // Лимит запроса
	49	+ $result = $GLOBALS['xoopsDB']->query($sql, $limit);
	50	+ // Перебираем все значения
	51	+ $i = 0;
	52	+ while (list($pageid, $instrid, $ptitle, $dateupdated, $ititle, $cid) = $GLOBALS['xoopsDB']->fetchRow($result)) {
	53	+ // ID страницы
	54	+ $block[$i]['pageid'] = $pageid;
	55	+ // ID инструкции
	56	+ $block[$i]['instrid'] = $instrid;
	57	+ // Название страницы
	58	+ $block[$i]['ptitle'] = $myts->htmlSpecialChars($ptitle);
	59	+ // Название инструкции
	60	+ $block[$i]['ititle'] = $myts->htmlSpecialChars($ititle);
	61	+ // Дата обновления страницы
	62	+ $block[$i]['dateupdated'] = formatTimeStamp($dateupdated, 's');
	63	+ // Категория инстркции
	64	+ $block[$i]['cid'] = $cid;
	65	+ // Инкримент
	66	+ $i++;
	67	+ }
	68	+ }
69	69
70		- // Возвращаем массив
71		- return $block;
	70	+ // Возвращаем массив
	71	+ return $block;
72	72	}
73	73
74	74	// Редактирование последних страниц
		@@ -78,10 +78,10 @@ discard block
		block discarded – undo
78	78	*/
79	79	function b_instr_lastpage_edit($options = [])
80	80	{
81		- $form = '';
82		- $form .= _MB_INSTR_DISPLAYPAGESC . ' <input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text" /><br>' . "\n";
83		- $form .= _MB_INSTR_NUMCHARSC . ' <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text" /><br>' . "\n";
	81	+ $form = '';
	82	+ $form .= _MB_INSTR_DISPLAYPAGESC . ' <input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text" /><br>' . "\n";
	83	+ $form .= _MB_INSTR_NUMCHARSC . ' <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text" /><br>' . "\n";
84	84
85		- // Возвращаем форму
86		- return $form;
	85	+ // Возвращаем форму
	86	+ return $form;
87	87	}

		@@ -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	}

		@@ -19,8 +19,8 @@ discard block
		block discarded – undo
19	19	$criteria->add(new \Criteria('instrid', $instrid));
20	20	$criteria->add(new \Criteria('status ', '0', '>'));
21	21	if (0 == $instructionHandler->getCount($criteria)) {
22		- redirect_header('index.php', 3, _MD_INSTRUCTION_INSTRNOTEXIST);
23		- exit();
	22	+ redirect_header('index.php', 3, _MD_INSTRUCTION_INSTRNOTEXIST);
	23	+ exit();
24	24	}
25	25	//
26	26	unset($criteria);
		@@ -42,8 +42,8 @@ discard block
		block discarded – undo
42	42	// Права на просмотр инструкции
43	43	$categories = Xoopsmodules\instruction\Utility::getItemIds();
44	44	if (!in_array($objInsinstr->getVar('cid'), $categories)) {
45		- redirect_header(XOOPS_URL . '/modules/' . $moduleDirName . '/', 3, _NOPERM);
46		- exit();
	45	+ redirect_header(XOOPS_URL . '/modules/' . $moduleDirName . '/', 3, _NOPERM);
	46	+ exit();
47	47	}
48	48
49	49	// Массив данных об инструкции
		@@ -56,29 +56,29 @@ discard block
		block discarded – undo
56	56	$instrs['description'] = $objInsinstr->getVar('description');
57	57	// Если админ, рисуем админлинк
58	58	if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isAdmin($GLOBALS['xoopsModule']->mid())) {
59		- $instrs['adminlink'] = ' <a href="'
60		- . XOOPS_URL
61		- . '/modules/'
62		- . $moduleDirName
63		- . '/admin/instr.php?op=editinstr&instrid='
64		- . $instrid
65		- . '"><img style="width:16px;" src="./assets/icons/edit_mini.png" alt='
66		- . _EDIT
67		- . ' title='
68		- . _EDIT
69		- . '></a> <a href="'
70		- . XOOPS_URL
71		- . '/modules/'
72		- . $moduleDirName
73		- . '/admin/instr.php?op=delinstr&instrid='
74		- . $instrid
75		- . '"><img style="width:16px;" src="./assets/icons/delete_mini.png" alt='
76		- . _DELETE
77		- . ' title='
78		- . _DELETE
79		- . '></a> ';
	59	+ $instrs['adminlink'] = ' <a href="'
	60	+ . XOOPS_URL
	61	+ . '/modules/'
	62	+ . $moduleDirName
	63	+ . '/admin/instr.php?op=editinstr&instrid='
	64	+ . $instrid
	65	+ . '"><img style="width:16px;" src="./assets/icons/edit_mini.png" alt='
	66	+ . _EDIT
	67	+ . ' title='
	68	+ . _EDIT
	69	+ . '></a> <a href="'
	70	+ . XOOPS_URL
	71	+ . '/modules/'
	72	+ . $moduleDirName
	73	+ . '/admin/instr.php?op=delinstr&instrid='
	74	+ . $instrid
	75	+ . '"><img style="width:16px;" src="./assets/icons/delete_mini.png" alt='
	76	+ . _DELETE
	77	+ . ' title='
	78	+ . _DELETE
	79	+ . '></a> ';
80	80	} else {
81		- $instrs['adminlink'] = '';
	81	+ $instrs['adminlink'] = '';
82	82	}
83	83
84	84	// Выводим в шаблон
		@@ -102,7 +102,7 @@ discard block
		block discarded – undo
102	102	$nav_parent_id = array_reverse($nav_parent_id);
103	103	$navigation = '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/">' . $GLOBALS['xoopsModule']->name() . '</a> : ';
104	104	foreach (array_keys($nav_parent_id) as $i) {
105		- $navigation .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/index.php?cid=' . $nav_parent_id[$i]->getVar('cid') . '">' . $nav_parent_id[$i]->getVar('title') . '</a> : ';
	105	+ $navigation .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/index.php?cid=' . $nav_parent_id[$i]->getVar('cid') . '">' . $nav_parent_id[$i]->getVar('title') . '</a> : ';
106	106	}
107	107	$navigation .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/index.php?cid=' . $objInscat->getVar('cid') . '">' . $objInscat->getVar('title') . '</a> : ';
108	108	$navigation .= $objInsinstr->getVar('title');
		@@ -129,18 +129,18 @@ discard block
		block discarded – undo
129	129
130	130	// Теги
131	131	if (xoops_getModuleOption('usetag', 'instruction')) {
132		- include_once $GLOBALS['xoops']->path('modules/tag/include/tagbar.php');
133		- $xoopsTpl->assign('tags', true);
134		- $xoopsTpl->assign('tagbar', tagBar($instrid, 0));
	132	+ include_once $GLOBALS['xoops']->path('modules/tag/include/tagbar.php');
	133	+ $xoopsTpl->assign('tags', true);
	134	+ $xoopsTpl->assign('tagbar', tagBar($instrid, 0));
135	135	} else {
136		- $xoopsTpl->assign('tags', false);
	136	+ $xoopsTpl->assign('tags', false);
137	137	}
138	138
139	139	// Рейтинг
140	140	if (xoops_getModuleOption('userat', 'instruction')) {
141		- $xoopsTpl->assign('insUserat', true);
	141	+ $xoopsTpl->assign('insUserat', true);
142	142	} else {
143		- $xoopsTpl->assign('insUserat', false);
	143	+ $xoopsTpl->assign('insUserat', false);
144	144	}
145	145
146	146	// Подвал

		@@ -12,7 +12,7 @@ discard block
		block discarded – undo
12	12	//$categoryHandler = xoops_getModuleHandler('category', 'instruction');
13	13	//$pageHandler = xoops_getModuleHandler('page', 'instruction');
14	14
15		-$instrid = isset($_GET['id']) ? (int)$_GET['id'] : 0;
	15	+$instrid = isset($_GET['id']) ? (int) $_GET['id'] : 0;
16	16
17	17	// Существует ли такая инструкция
18	18	$criteria = new \CriteriaCompo();
		@@ -41,7 +41,7 @@ discard block
		block discarded – undo
41	41
42	42	// Права на просмотр инструкции
43	43	$categories = Xoopsmodules\instruction\Utility::getItemIds();
44		-if (!in_array($objInsinstr->getVar('cid'), $categories)) {
	44	+if ( ! in_array($objInsinstr->getVar('cid'), $categories)) {
45	45	redirect_header(XOOPS_URL . '/modules/' . $moduleDirName . '/', 3, _NOPERM);
46	46	exit();
47	47	}

		@@ -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

mambax7 / instruction

Push — master ( 825da9...adb11b )

Status

Category

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

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

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +38 added lines, -38 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 +55 added lines, -55 removed lines patch added patch discarded remove patch

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

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

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

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