mambax7 / instruction

include/comment_functions.php

Indentation +4 added lines, -4 removed lines

@@ -5,12 +5,12 @@
 // Функция вызывается при добавлении комментария
 function instruction_com_update($pageid, $total_num)
 {
-    $db  = XoopsDatabaseFactory::getDatabaseConnection();
-    $sql = 'UPDATE ' . $db->prefix('instruction_page') . ' SET comments = ' . $total_num . ' WHERE pageid  = ' . $pageid;
-    $db->query($sql);
+	$db  = XoopsDatabaseFactory::getDatabaseConnection();
+	$sql = 'UPDATE ' . $db->prefix('instruction_page') . ' SET comments = ' . $total_num . ' WHERE pageid  = ' . $pageid;
+	$db->query($sql);
 }
 
 function instruction_com_approve(&$comment)
 {
-    // notification mail here
+	// notification mail here
 }

include/pagetypes.inc.php

Indentation +2 added lines, -2 removed lines

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

include/common.php

Indentation +10 added lines, -10 removed lines

@@ -18,14 +18,14 @@ 
  */
 
 if (!defined('INSTRUCTION_MODULE_PATH')) {
-    define('INSTRUCTION_DIRNAME', basename(dirname(__DIR__)));
-    define('INSTRUCTION_URL', XOOPS_URL . '/modules/' . INSTRUCTION_DIRNAME);
-    define('INSTRUCTION_IMAGE_URL', INSTRUCTION_URL . '/assets/images/');
-    define('INSTRUCTION_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . INSTRUCTION_DIRNAME);
-    define('INSTRUCTION_IMAGE_PATH', INSTRUCTION_ROOT_PATH . '/assets/images');
-    define('INSTRUCTION_ADMIN_URL', INSTRUCTION_URL . '/admin/');
-    define('INSTRUCTION_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . INSTRUCTION_DIRNAME);
-    define('INSTRUCTION_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . INSTRUCTION_DIRNAME);
+	define('INSTRUCTION_DIRNAME', basename(dirname(__DIR__)));
+	define('INSTRUCTION_URL', XOOPS_URL . '/modules/' . INSTRUCTION_DIRNAME);
+	define('INSTRUCTION_IMAGE_URL', INSTRUCTION_URL . '/assets/images/');
+	define('INSTRUCTION_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . INSTRUCTION_DIRNAME);
+	define('INSTRUCTION_IMAGE_PATH', INSTRUCTION_ROOT_PATH . '/assets/images');
+	define('INSTRUCTION_ADMIN_URL', INSTRUCTION_URL . '/admin/');
+	define('INSTRUCTION_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . INSTRUCTION_DIRNAME);
+	define('INSTRUCTION_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . INSTRUCTION_DIRNAME);
 }
 xoops_loadLanguage('common', INSTRUCTION_DIRNAME);
 
@@ -46,8 +46,8 @@ 
 $instruction->loadLanguage('common');
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) {
-    require_once $GLOBALS['xoops']->path('class/template.php');
-    $xoopsTpl = new XoopsTpl();
+	require_once $GLOBALS['xoops']->path('class/template.php');
+	$xoopsTpl = new XoopsTpl();
 }
 
 $moduleDirName = basename(dirname(__DIR__));

include/plugin.tag.php

Indentation +53 added lines, -53 removed lines

@@ -3,66 +3,66 @@
 // Информация об теге
 function instruction_tag_iteminfo(&$items)
 {
-    if (empty($items) || !is_array($items)) {
-        return false;
-    }
+	if (empty($items) || !is_array($items)) {
+		return false;
+	}
 
-    $items_id = [];
-    foreach (array_keys($items) as $cat_id) {
-        foreach (array_keys($items[$cat_id]) as $item_id) {
-            $items_id[] = (int)$item_id;
-        }
-    }
+	$items_id = [];
+	foreach (array_keys($items) as $cat_id) {
+		foreach (array_keys($items[$cat_id]) as $item_id) {
+			$items_id[] = (int)$item_id;
+		}
+	}
 
-    $itemHandler = xoops_getModuleHandler('instruction', 'instruction');
-    $items_obj   = $itemHandler->getObjects(new Criteria('instrid', '(' . implode(', ', $items_id) . ')', 'IN'), true);
+	$itemHandler = xoops_getModuleHandler('instruction', 'instruction');
+	$items_obj   = $itemHandler->getObjects(new Criteria('instrid', '(' . implode(', ', $items_id) . ')', 'IN'), true);
 
-    foreach (array_keys($items) as $cat_id) {
-        foreach (array_keys($items[$cat_id]) as $item_id) {
-            if (isset($items_obj[$item_id])) {
-                $item_obj                 = $items_obj[$item_id];
-                $items[$cat_id][$item_id] = [
-                    'title'   => $item_obj->getVar('title'),
-                    'uid'     => $item_obj->getVar('uid'),
-                    'link'    => "instr.php?id={$item_id}",
-                    'time'    => $item_obj->getVar('datecreated'),
-                    'tags'    => '',
-                    'content' => '',
-                ];
-            }
-        }
-    }
-    unset($items_obj);
+	foreach (array_keys($items) as $cat_id) {
+		foreach (array_keys($items[$cat_id]) as $item_id) {
+			if (isset($items_obj[$item_id])) {
+				$item_obj                 = $items_obj[$item_id];
+				$items[$cat_id][$item_id] = [
+					'title'   => $item_obj->getVar('title'),
+					'uid'     => $item_obj->getVar('uid'),
+					'link'    => "instr.php?id={$item_id}",
+					'time'    => $item_obj->getVar('datecreated'),
+					'tags'    => '',
+					'content' => '',
+				];
+			}
+		}
+	}
+	unset($items_obj);
 }
 
 // Синхронизация тегов
 function instruction_tag_synchronization($mid)
 {
-    $itemHandler = xoops_getModuleHandler('instruction', 'instruction');
-    $linkHandler = xoops_getModuleHandler('link', 'tag');
+	$itemHandler = xoops_getModuleHandler('instruction', 'instruction');
+	$linkHandler = xoops_getModuleHandler('link', 'tag');
 
-    /* clear tag-item links */
-    if (version_compare(mysqli_get_server_info(), '4.1.0', 'ge')):
-        $sql = "    DELETE FROM {$linkHandler->table}"
-               . '    WHERE '
-               . "        tag_modid = {$mid}"
-               . '        AND '
-               . '        ( tag_itemid NOT IN '
-               . "            ( SELECT DISTINCT {$itemHandler->keyName} "
-               . "                FROM {$itemHandler->table} "
-               . "                WHERE {$itemHandler->table}.status > 0"
-               . '            ) '
-               . '        )'; else:
-        $sql = "    DELETE {$linkHandler->table} FROM {$linkHandler->table}"
-               . "    LEFT JOIN {$itemHandler->table} AS aa ON {$linkHandler->table}.tag_itemid = aa.{$itemHandler->keyName} "
-               . '    WHERE '
-               . "        tag_modid = {$mid}"
-               . '        AND '
-               . "        ( aa.{$itemHandler->keyName} IS NULL"
-               . '            OR aa.status < 1'
-               . '        )';
-    endif;
-    if (!$result = $linkHandler->db->queryF($sql)) {
-        //xoops_error($linkHandler->db->error());
-    }
+	/* clear tag-item links */
+	if (version_compare(mysqli_get_server_info(), '4.1.0', 'ge')):
+		$sql = "    DELETE FROM {$linkHandler->table}"
+			   . '    WHERE '
+			   . "        tag_modid = {$mid}"
+			   . '        AND '
+			   . '        ( tag_itemid NOT IN '
+			   . "            ( SELECT DISTINCT {$itemHandler->keyName} "
+			   . "                FROM {$itemHandler->table} "
+			   . "                WHERE {$itemHandler->table}.status > 0"
+			   . '            ) '
+			   . '        )'; else:
+		$sql = "    DELETE {$linkHandler->table} FROM {$linkHandler->table}"
+			   . "    LEFT JOIN {$itemHandler->table} AS aa ON {$linkHandler->table}.tag_itemid = aa.{$itemHandler->keyName} "
+			   . '    WHERE '
+			   . "        tag_modid = {$mid}"
+			   . '        AND '
+			   . "        ( aa.{$itemHandler->keyName} IS NULL"
+			   . '            OR aa.status < 1'
+			   . '        )';
+	endif;
+	if (!$result = $linkHandler->db->queryF($sql)) {
+		//xoops_error($linkHandler->db->error());
+	}
 }

page.php

Indentation +43 added lines, -43 removed lines

@@ -28,8 +28,8 @@ 
 $criteria->add(new Criteria('pageid ', $pageid));
 $criteria->add(new Criteria('status ', '0', '>'));
 if (0 == $inspageHandler->getCount($criteria)) {
-    redirect_header('index.php', 3, _MD_INSTRUCTION_PAGENOTEXIST);
-    exit();
+	redirect_header('index.php', 3, _MD_INSTRUCTION_PAGENOTEXIST);
+	exit();
 }
 //
 unset($criteria);
@@ -41,8 +41,8 @@ 
 
 // Если админ и ссылка на отключение кэша
 if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isAdmin() && $nocache) {
-    // Отключаем кэш
-    $GLOBALS['xoopsConfig']['module_cache'][$GLOBALS['xoopsModule']->getVar('mid')] = 0;
+	// Отключаем кэш
+	$GLOBALS['xoopsConfig']['module_cache'][$GLOBALS['xoopsModule']->getVar('mid')] = 0;
 }
 
 // Задание тайтла
@@ -59,8 +59,8 @@ 
 // Права на просмотр инструкции
 $categories = InstructionUtility::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();
 }
 
 // Массив данных о странице
@@ -77,9 +77,9 @@ 
 $footnote = $objInspage->getVar('footnote');
 // Если есть сноски
 if ($footnote) {
-    $pages['footnotes'] = explode('|', $objInspage->getVar('footnote'));
+	$pages['footnotes'] = explode('|', $objInspage->getVar('footnote'));
 } else {
-    $pages['footnotes'] = false;
+	$pages['footnotes'] = false;
 }
 // Мета-теги ключевых слов
 $pages['keywords'] = $objInspage->getVar('keywords');
@@ -88,39 +88,39 @@ 
 //
 // Если админ, рисуем админлинк
 if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isAdmin($GLOBALS['xoopsModule']->mid())) {
-    $pages['adminlink'] = '&nbsp;<a href="'
-                          . XOOPS_URL
-                          . '/modules/'
-                          . $moduleDirName
-                          . '/admin/instr.php?op=editpage&pageid='
-                          . $pages['pageid']
-                          . '"><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=delpage&pageid='
-                          . $pages['pageid']
-                          . '"><img style="width:16px;" src="./assets/icons/delete_mini.png" alt='
-                          . _DELETE
-                          . ' title='
-                          . _DELETE
-                          . '></a>&nbsp;';
+	$pages['adminlink'] = '&nbsp;<a href="'
+						  . XOOPS_URL
+						  . '/modules/'
+						  . $moduleDirName
+						  . '/admin/instr.php?op=editpage&pageid='
+						  . $pages['pageid']
+						  . '"><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=delpage&pageid='
+						  . $pages['pageid']
+						  . '"><img style="width:16px;" src="./assets/icons/delete_mini.png" alt='
+						  . _DELETE
+						  . ' title='
+						  . _DELETE
+						  . '></a>&nbsp;';
 } else {
-    $pages['adminlink'] = '&nbsp;';
-    // Если можно редактировать
-    if ($gpermHandler->checkRight($moduleDirName . '_edit', $objInsinstr->getVar('cid'), $groups, $GLOBALS['xoopsModule']->getVar('mid'))) {
-        $pages['adminlink'] .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/submit.php?op=editpage&pageid=' . $pages['pageid'] . '"><img style="width:16px;" src="./assets/icons/edit_mini.png" alt=' . _EDIT . ' title=' . _EDIT . '></a>';
-    }
-
-    $pages['adminlink'] .= '&nbsp;';
-    // Если нет админлика
-    if ('[&nbsp;&nbsp;]' == $pages['adminlink']) {
-        $pages['adminlink'] = '';
-    }
+	$pages['adminlink'] = '&nbsp;';
+	// Если можно редактировать
+	if ($gpermHandler->checkRight($moduleDirName . '_edit', $objInsinstr->getVar('cid'), $groups, $GLOBALS['xoopsModule']->getVar('mid'))) {
+		$pages['adminlink'] .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/submit.php?op=editpage&pageid=' . $pages['pageid'] . '"><img style="width:16px;" src="./assets/icons/edit_mini.png" alt=' . _EDIT . ' title=' . _EDIT . '></a>';
+	}
+
+	$pages['adminlink'] .= '&nbsp;';
+	// Если нет админлика
+	if ('[&nbsp;&nbsp;]' == $pages['adminlink']) {
+		$pages['adminlink'] = '';
+	}
 }
 // Выводим в шаблон
 $GLOBALS['xoopsTpl']->assign('insPage', $pages);
@@ -139,7 +139,7 @@ 
 $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 .= '<a href="' . XOOPS_URL . '/modules/' . $moduleDirName . '/instr.php?id=' . $pages['instrid'] . '">' . $objInsinstr->getVar('title') . '</a>';
@@ -171,9 +171,9 @@ 
 
 // Рейтинг
 if (xoops_getModuleOption('userat', 'instruction')) {
-    $xoopsTpl->assign('insUserat', true);
+	$xoopsTpl->assign('insUserat', true);
 } else {
-    $xoopsTpl->assign('insUserat', false);
+	$xoopsTpl->assign('insUserat', false);
 }
 
 // Мета теги

class/common/traitserverstats.php

Indentation +55 added lines, -55 removed lines

@@ -16,60 +16,60 @@
  */
 trait ServerStats
 {
-    /**
-     * serverStats()
-     *
-     * @return string
-     */
-    public static function getServerStats()
-    {
-        //mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
-        $moduleDirName      = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper = strtoupper($moduleDirName);
-        xoops_loadLanguage('common', $moduleDirName);
-        $html = '';
-        //        $sql   = 'SELECT metavalue';
-        //        $sql   .= ' FROM ' . $GLOBALS['xoopsDB']->prefix('wfdownloads_meta');
-        //        $sql   .= " WHERE metakey='version' LIMIT 1";
-        //        $query = $GLOBALS['xoopsDB']->query($sql);
-        //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
-        $html .= "<div style='padding: 8px;'>\n";
-        //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
-        //        $html .= "<br>\n";
-        //        $html .= "<br>\n";
-        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
-        $html .= "<ul>\n";
-        //
-        $gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
-        if (function_exists('gd_info')) {
-            if ($gdlib = true === gd_info()) {
-                $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
-            }
-        }
-        //
-        //    $safemode = ini_get('safe_mode') ? constant('CO_' . $moduleDirNameUpper . '_ON') . constant('CO_' . $moduleDirNameUpper . '_SAFEMODEPROBLEMS : constant('CO_' . $moduleDirNameUpper . '_OFF');
-        //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SAFEMODESTATUS . $safemode;
-        //
-        //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
-        //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
-        //
-        $downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
-        //
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
-        $html .= "</ul>\n";
-        $html .= "<ul>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
-        $html .= "</ul>\n";
-        $html .= "<br>\n";
-        $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
-        $html .= '</div>';
-        $html .= '</fieldset><br>';
+	/**
+	 * serverStats()
+	 *
+	 * @return string
+	 */
+	public static function getServerStats()
+	{
+		//mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
+		$moduleDirName      = basename(dirname(dirname(__DIR__)));
+		$moduleDirNameUpper = strtoupper($moduleDirName);
+		xoops_loadLanguage('common', $moduleDirName);
+		$html = '';
+		//        $sql   = 'SELECT metavalue';
+		//        $sql   .= ' FROM ' . $GLOBALS['xoopsDB']->prefix('wfdownloads_meta');
+		//        $sql   .= " WHERE metakey='version' LIMIT 1";
+		//        $query = $GLOBALS['xoopsDB']->query($sql);
+		//        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
+		$html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
+		$html .= "<div style='padding: 8px;'>\n";
+		//        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
+		//        $html .= "<br>\n";
+		//        $html .= "<br>\n";
+		$html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
+		$html .= "<ul>\n";
+		//
+		$gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
+		$html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
+		if (function_exists('gd_info')) {
+			if ($gdlib = true === gd_info()) {
+				$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
+			}
+		}
+		//
+		//    $safemode = ini_get('safe_mode') ? constant('CO_' . $moduleDirNameUpper . '_ON') . constant('CO_' . $moduleDirNameUpper . '_SAFEMODEPROBLEMS : constant('CO_' . $moduleDirNameUpper . '_OFF');
+		//    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SAFEMODESTATUS . $safemode;
+		//
+		//    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
+		//    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
+		//
+		$downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
+		$html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+		//
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
+		$html .= "</ul>\n";
+		$html .= "<ul>\n";
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
+		$html .= "</ul>\n";
+		$html .= "<br>\n";
+		$html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
+		$html .= '</div>';
+		$html .= '</fieldset><br>';
 
-        return $html;
-    }
+		return $html;
+	}
 }

class/common/traitfilesmgmt.php

Indentation +222 added lines, -222 removed lines

@@ -16,226 +16,226 @@
  */
 trait FilesManagement
 {
-    /**
-     * Function responsible for checking if a directory exists, we can also write in and create an index.html file
-     *
-     * @param string $folder The full path of the directory to check
-     *
-     * @return void
-     */
-    public static function createFolder($folder)
-    {
-        try {
-            if (!file_exists($folder)) {
-                if (!mkdir($folder) && !is_dir($folder)) {
-                    throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
-                }
-
-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
-            }
-        } catch (Exception $e) {
-            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        }
-    }
-
-    /**
-     * @param $file
-     * @param $folder
-     * @return bool
-     */
-    public static function copyFile($file, $folder)
-    {
-        return copy($file, $folder);
-    }
-
-    /**
-     * @param $src
-     * @param $dst
-     */
-    public static function recurseCopy($src, $dst)
-    {
-        $dir = opendir($src);
-        @mkdir($dst);
-        while (false !== ($file = readdir($dir))) {
-            if (('.' !== $file) && ('..' !== $file)) {
-                if (is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
-                } else {
-                    copy($src . '/' . $file, $dst . '/' . $file);
-                }
-            }
-        }
-        closedir($dir);
-    }
-
-    /**
-     *
-     * Remove files and (sub)directories
-     *
-     * @param string $src source directory to delete
-     *
-     * @uses \Xmf\Module\Helper::getHelper()
-     * @uses \Xmf\Module\Helper::isUserAdmin()
-     *
-     * @return bool true on success
-     */
-    public static function deleteDirectory($src)
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        $success = true;
-        // remove old files
-        $dirInfo = new SplFileInfo($src);
-        // validate is a directory
-        if ($dirInfo->isDir()) {
-            $fileList = array_diff(scandir($src, SCANDIR_SORT_NONE), ['..', '.']);
-            foreach ($fileList as $k => $v) {
-                $fileInfo = new SplFileInfo("{$src}/{$v}");
-                if ($fileInfo->isDir()) {
-                    // recursively handle subdirectories
-                    if (!$success = self::deleteDirectory($fileInfo->getRealPath())) {
-                        break;
-                    }
-                } else {
-                    // delete the file
-                    if (!($success = unlink($fileInfo->getRealPath()))) {
-                        break;
-                    }
-                }
-            }
-            // now delete this (sub)directory if all the files are gone
-            if ($success) {
-                $success = rmdir($dirInfo->getRealPath());
-            }
-        } else {
-            // input is not a valid directory
-            $success = false;
-        }
-        return $success;
-    }
-
-    /**
-     *
-     * Recursively remove directory
-     *
-     * @todo currently won't remove directories with hidden files, should it?
-     *
-     * @param string $src directory to remove (delete)
-     *
-     * @return bool true on success
-     */
-    public static function rrmdir($src)
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        // If source is not a directory stop processing
-        if (!is_dir($src)) {
-            return false;
-        }
-
-        $success = true;
-
-        // Open the source directory to read in files
-        $iterator = new DirectoryIterator($src);
-        foreach ($iterator as $fObj) {
-            if ($fObj->isFile()) {
-                $filename = $fObj->getPathname();
-                $fObj     = null; // clear this iterator object to close the file
-                if (!unlink($filename)) {
-                    return false; // couldn't delete the file
-                }
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                // Try recursively on directory
-                self::rrmdir($fObj->getPathname());
-            }
-        }
-        $iterator = null;   // clear iterator Obj to close file/directory
-        return rmdir($src); // remove the directory & return results
-    }
-
-    /**
-     * Recursively move files from one directory to another
-     *
-     * @param string $src  - Source of files being moved
-     * @param string $dest - Destination of files being moved
-     *
-     * @return bool true on success
-     */
-    public static function rmove($src, $dest)
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        // If source is not a directory stop processing
-        if (!is_dir($src)) {
-            return false;
-        }
-
-        // If the destination directory does not exist and could not be created stop processing
-        if (!is_dir($dest) && !mkdir($dest, 0755)) {
-            return false;
-        }
-
-        // Open the source directory to read in files
-        $iterator = new DirectoryIterator($src);
-        foreach ($iterator as $fObj) {
-            if ($fObj->isFile()) {
-                rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                // Try recursively on directory
-                self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-                //                rmdir($fObj->getPath()); // now delete the directory
-            }
-        }
-        $iterator = null;   // clear iterator Obj to close file/directory
-        return rmdir($src); // remove the directory & return results
-    }
-
-    /**
-     * Recursively copy directories and files from one directory to another
-     *
-     * @param string $src  - Source of files being moved
-     * @param string $dest - Destination of files being moved
-     *
-     * @uses \Xmf\Module\Helper::getHelper()
-     * @uses \Xmf\Module\Helper::isUserAdmin()
-     *
-     * @return bool true on success
-     */
-    public static function rcopy($src, $dest)
-    {
-        // Only continue if user is a 'global' Admin
-        if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
-            return false;
-        }
-
-        // If source is not a directory stop processing
-        if (!is_dir($src)) {
-            return false;
-        }
-
-        // If the destination directory does not exist and could not be created stop processing
-        if (!is_dir($dest) && !mkdir($dest, 0755)) {
-            return false;
-        }
-
-        // Open the source directory to read in files
-        $iterator = new DirectoryIterator($src);
-        foreach ($iterator as $fObj) {
-            if ($fObj->isFile()) {
-                copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
-            }
-        }
-        return true;
-    }
+	/**
+	 * Function responsible for checking if a directory exists, we can also write in and create an index.html file
+	 *
+	 * @param string $folder The full path of the directory to check
+	 *
+	 * @return void
+	 */
+	public static function createFolder($folder)
+	{
+		try {
+			if (!file_exists($folder)) {
+				if (!mkdir($folder) && !is_dir($folder)) {
+					throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
+				}
+
+				file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+			}
+		} catch (Exception $e) {
+			echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		}
+	}
+
+	/**
+	 * @param $file
+	 * @param $folder
+	 * @return bool
+	 */
+	public static function copyFile($file, $folder)
+	{
+		return copy($file, $folder);
+	}
+
+	/**
+	 * @param $src
+	 * @param $dst
+	 */
+	public static function recurseCopy($src, $dst)
+	{
+		$dir = opendir($src);
+		@mkdir($dst);
+		while (false !== ($file = readdir($dir))) {
+			if (('.' !== $file) && ('..' !== $file)) {
+				if (is_dir($src . '/' . $file)) {
+					self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+				} else {
+					copy($src . '/' . $file, $dst . '/' . $file);
+				}
+			}
+		}
+		closedir($dir);
+	}
+
+	/**
+	 *
+	 * Remove files and (sub)directories
+	 *
+	 * @param string $src source directory to delete
+	 *
+	 * @uses \Xmf\Module\Helper::getHelper()
+	 * @uses \Xmf\Module\Helper::isUserAdmin()
+	 *
+	 * @return bool true on success
+	 */
+	public static function deleteDirectory($src)
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		$success = true;
+		// remove old files
+		$dirInfo = new SplFileInfo($src);
+		// validate is a directory
+		if ($dirInfo->isDir()) {
+			$fileList = array_diff(scandir($src, SCANDIR_SORT_NONE), ['..', '.']);
+			foreach ($fileList as $k => $v) {
+				$fileInfo = new SplFileInfo("{$src}/{$v}");
+				if ($fileInfo->isDir()) {
+					// recursively handle subdirectories
+					if (!$success = self::deleteDirectory($fileInfo->getRealPath())) {
+						break;
+					}
+				} else {
+					// delete the file
+					if (!($success = unlink($fileInfo->getRealPath()))) {
+						break;
+					}
+				}
+			}
+			// now delete this (sub)directory if all the files are gone
+			if ($success) {
+				$success = rmdir($dirInfo->getRealPath());
+			}
+		} else {
+			// input is not a valid directory
+			$success = false;
+		}
+		return $success;
+	}
+
+	/**
+	 *
+	 * Recursively remove directory
+	 *
+	 * @todo currently won't remove directories with hidden files, should it?
+	 *
+	 * @param string $src directory to remove (delete)
+	 *
+	 * @return bool true on success
+	 */
+	public static function rrmdir($src)
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		// If source is not a directory stop processing
+		if (!is_dir($src)) {
+			return false;
+		}
+
+		$success = true;
+
+		// Open the source directory to read in files
+		$iterator = new DirectoryIterator($src);
+		foreach ($iterator as $fObj) {
+			if ($fObj->isFile()) {
+				$filename = $fObj->getPathname();
+				$fObj     = null; // clear this iterator object to close the file
+				if (!unlink($filename)) {
+					return false; // couldn't delete the file
+				}
+			} elseif (!$fObj->isDot() && $fObj->isDir()) {
+				// Try recursively on directory
+				self::rrmdir($fObj->getPathname());
+			}
+		}
+		$iterator = null;   // clear iterator Obj to close file/directory
+		return rmdir($src); // remove the directory & return results
+	}
+
+	/**
+	 * Recursively move files from one directory to another
+	 *
+	 * @param string $src  - Source of files being moved
+	 * @param string $dest - Destination of files being moved
+	 *
+	 * @return bool true on success
+	 */
+	public static function rmove($src, $dest)
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		// If source is not a directory stop processing
+		if (!is_dir($src)) {
+			return false;
+		}
+
+		// If the destination directory does not exist and could not be created stop processing
+		if (!is_dir($dest) && !mkdir($dest, 0755)) {
+			return false;
+		}
+
+		// Open the source directory to read in files
+		$iterator = new DirectoryIterator($src);
+		foreach ($iterator as $fObj) {
+			if ($fObj->isFile()) {
+				rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+			} elseif (!$fObj->isDot() && $fObj->isDir()) {
+				// Try recursively on directory
+				self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+				//                rmdir($fObj->getPath()); // now delete the directory
+			}
+		}
+		$iterator = null;   // clear iterator Obj to close file/directory
+		return rmdir($src); // remove the directory & return results
+	}
+
+	/**
+	 * Recursively copy directories and files from one directory to another
+	 *
+	 * @param string $src  - Source of files being moved
+	 * @param string $dest - Destination of files being moved
+	 *
+	 * @uses \Xmf\Module\Helper::getHelper()
+	 * @uses \Xmf\Module\Helper::isUserAdmin()
+	 *
+	 * @return bool true on success
+	 */
+	public static function rcopy($src, $dest)
+	{
+		// Only continue if user is a 'global' Admin
+		if (!($GLOBALS['xoopsUser'] instanceof XoopsUser) || !$GLOBALS['xoopsUser']->isAdmin()) {
+			return false;
+		}
+
+		// If source is not a directory stop processing
+		if (!is_dir($src)) {
+			return false;
+		}
+
+		// If the destination directory does not exist and could not be created stop processing
+		if (!is_dir($dest) && !mkdir($dest, 0755)) {
+			return false;
+		}
+
+		// Open the source directory to read in files
+		$iterator = new DirectoryIterator($src);
+		foreach ($iterator as $fObj) {
+			if ($fObj->isFile()) {
+				copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+			} elseif (!$fObj->isDot() && $fObj->isDir()) {
+				self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+			}
+		}
+		return true;
+	}
 }

class/helper.php

Indentation +29 added lines, -29 removed lines

@@ -23,37 +23,37 @@
  */
 class Instruction extends \Xmf\Module\Helper
 {
-    public $debugArray = [];
+	public $debugArray = [];
 
-    /**
-     * @internal param $debug
-     */
-    protected function __construct()
-    {
-        //        $this->debug   = $debug;
-        $this->dirname = basename(dirname(__DIR__));
-    }
+	/**
+	 * @internal param $debug
+	 */
+	protected function __construct()
+	{
+		//        $this->debug   = $debug;
+		$this->dirname = basename(dirname(__DIR__));
+	}
 
-    /**
-     * @param bool $debug
-     *
-     * @return Newbb
-     */
-    public static function getInstance($debug = false)
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static($debug);
-        }
+	/**
+	 * @param bool $debug
+	 *
+	 * @return Newbb
+	 */
+	public static function getInstance($debug = false)
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static($debug);
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    /**
-     * @return string
-     */
-    public function getDirname()
-    {
-        return $this->dirname;
-    }
+	/**
+	 * @return string
+	 */
+	public function getDirname()
+	{
+		return $this->dirname;
+	}
 }

comment_new.php

Indentation +8 added lines, -8 removed lines

@@ -7,12 +7,12 @@
 
 $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');
 }