Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2012-08-08 22:34:44
|
Revision: 10042
http://xoops.svn.sourceforge.net/xoops/?rev=10042&view=rev
Author: beckmi
Date: 2012-08-08 22:34:35 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
small updates
Modified Paths:
--------------
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/about.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_footer.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_header.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/index.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/menu.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/class/installwizard.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/css/reset.css
XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/credits.txt
XoopsModules/moduleinstaller/trunk/moduleinstaller/include/common.inc.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/include/config.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/include/install_tpl.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/include/page.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/admin.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/help/help.html
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/install.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/main.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/modinfo.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/xoops_version.php
Removed Paths:
-------------
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/finish.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/install2.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/mysql.lang.data.sql
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/style.css
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/support.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/support.png
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/welcome.php
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/about.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/about.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/about.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -1,33 +1,28 @@
-<?php
-/**
- * Marquee module
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project (http://www.xoops.org)
- * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/)
- * @package Marquee
- * @since 2.5.0
- * @author Mage, Mamba
- * @version $Id $
- **/
-
-include '../../../include/cp_header.php';
-include '../../../class/xoopsformloader.php';
-include 'admin_header.php';
-
-//$moduleInfo =& $module_handler->get($xoopsModule->getVar("mid"));
-
-xoops_cp_header();
-
-$aboutAdmin = new ModuleAdmin();
-
-echo $aboutAdmin->addNavigation('about.php');
-echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
-
+<?php
+/**
+ * Module Installer module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project (http://www.xoops.org)
+ * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License}
+ * @package ModuleInstaller
+ * @since 2.5.0
+ * @author XOOPS Development Team
+ * @version $Id $
+ **/
+include_once dirname(__FILE__) . '/admin_header.php';
+
+xoops_cp_header();
+
+$aboutAdmin = new ModuleAdmin();
+
+echo $aboutAdmin->addNavigation('about.php');
+echo $aboutAdmin->renderAbout('6KJ7RW5DR3VTJ', false);
+
include 'admin_footer.php';
\ No newline at end of file
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_footer.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_footer.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_footer.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -1,6 +1,6 @@
<?php
/**
- * Marquee module
+ * Module Installer module
*
* You may not change or alter any portion of this comment or credits
* of supporting developers from this source code or any supporting source code
@@ -10,13 +10,18 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Marquee
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package moduleinstaller
* @since 2.5.0
* @author Mamba (www.xoops.org)
* @version $Id $
**/
-echo "<div align=\"center\"><a href=\"http://www.xoops.org\" target=\"_blank\"><img src=" . XOOPS_URL ."/". $moduleInfo->getInfo("icons32")."/xoopsmicrobutton.gif"." alt=\"XOOPS\" title=\"XOOPS\"></a></div>";
-echo "<div class='center smallsmall italic pad5'><strong>" . $xoopsModule->getVar("name") . "</strong> is maintained by the <a class='tooltip' rel='external' href='http://www.xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>";
-xoops_cp_footer();
\ No newline at end of file
+echo "<div class='adminfooter'>\n"
+ ." <div style='text-align: center;'>\n"
+ ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
+ ." </div>\n"
+ ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+ ."</div>";
+
+xoops_cp_footer();;
\ No newline at end of file
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_header.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_header.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/admin_header.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -1,60 +1,41 @@
-<?php
-/**
- * Marquee module
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Marquee
- * @since 2.5.0
- * @author XOOPS Module Team
- * @version $Id $
-**/
-include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-include("../../../include/cp_header.php");
-
-if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php');
- //return true;
- }else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
- //return false;
- }
-
-$module_handler =& xoops_gethandler( 'module' );
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
-$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
-
-$myts =& MyTextSanitizer::getInstance();
-
-if ($xoopsUser) {
- $moduleperm_handler =& xoops_gethandler('groupperm');
- if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar( 'mid' ), $xoopsUser->getGroups())) {
- redirect_header(XOOPS_URL, 1, _NOPERM);
- exit();
- }
-} else {
- redirect_header(XOOPS_URL . "/user.php", 1, _NOPERM);
- exit();
-}
-
-if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
- include_once(XOOPS_ROOT_PATH."/class/template.php");
- $xoopsTpl = new XoopsTpl();
-}
-
-$xoopsTpl->assign('pathImageIcon', $pathImageIcon);
-//xoops_cp_header();
-
-//Load languages
-xoops_loadLanguage('admin', $xoopsModule->getVar("dirname"));
-xoops_loadLanguage('modinfo', $xoopsModule->getVar("dirname"));
-xoops_loadLanguage('main', $xoopsModule->getVar("dirname"));
\ No newline at end of file
+<?php
+/**
+ * Module Installer module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package moduleinstaller
+ * @since 1.0
+ * @author XOOPS Module Team
+ * @version $Id $
+**/
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+include_once $path . '/mainfile.php';
+include_once $path . '/include/cp_functions.php';
+require_once $path . '/include/cp_header.php';
+
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
+ }else{
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+ }
\ No newline at end of file
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/index.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/index.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/index.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -1,33 +1,30 @@
-<?php
-/**
- * ****************************************************************************
- * marquee - MODULE FOR XOOPS
- * Copyright (c) Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package marquee
- * @author Herv\xE9 Thouzard (http://www.herve-thouzard.com)
- *
- * Version : $Id:
- * ****************************************************************************
- */
-
-require_once '../../../include/cp_header.php';
-include 'admin_header.php';
-xoops_cp_header();
-
- $indexAdmin = new ModuleAdmin();
-
- echo $indexAdmin->addNavigation('index.php');
- echo $indexAdmin->renderIndex();
-
-include "admin_footer.php";
+<?php
+/**
+ * Module Installer module
+ *
+ * You may not change or alter any portion of this comment or credits
+ * of supporting developers from this source code or any supporting source code
+ * which is considered copyrighted (c) material of the original comment or credit authors.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
+ * @package moduleinstaller
+ * @since 1.0
+ * @author XOOPS Development Team
+ * @version $Id $
+**/
+
+require_once '../../../include/cp_header.php';
+include 'admin_header.php';
+xoops_cp_header();
+
+ $indexAdmin = new ModuleAdmin();
+
+ echo $indexAdmin->addNavigation('index.php');
+ echo $indexAdmin->renderIndex();
+
+include "admin_footer.php";
?>
\ No newline at end of file
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -1,139 +1,139 @@
-<?php
-/**
- * See the enclosed file license.txt for licensing information.
- * If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
- *
- * @copyright The XOOPS project http://www.xoops.org/
- * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
- * @package installer
- * @since 2.3.0
- * @author Haruki Setoyama <ha...@pl...>
- * @author Kazumi Ono <web...@my...>
- * @author Skalpa Keo <sk...@xo...>
- * @author Taiwen Jiang <ph...@us...>
- * @author DuGris (aka L. JEN) <du...@fr...>
- * @version $Id$
-**/
-include 'admin_header.php';
-xoops_cp_header();
-$xoopsOption['checkadmin'] = true;
-$xoopsOption['hascommon'] = true;
-require_once './../include/common.inc.php';
-require_once XOOPS_ROOT_PATH . "/modules/system/admin/modulesadmin/modulesadmin.php";
-defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
-
-if (!@include_once "../../../language/{$wizard->language}/global.php") {
- include_once "../../../language/english/global.php";
-}
-if (!@include_once "../../system/language/{$wizard->language}/admin/modulesadmin.php") {
- include_once "../../system/language/english/admin/modulesadmin.php";
-}
-require_once '../../../class/xoopsformloader.php';
-require_once '../../../class/xoopslists.php';
-
-//$xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/css/style.css" );
-
-$pageHasForm = true;
-$pageHasHelp = false;
-
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- include_once '../../../class/xoopsblock.php';
- include_once '../../../kernel/module.php';
- include_once '../../../include/cp_functions.php';
- include_once '../../../include/version.php';
-// include_once './../include/modulesadmin.php';
-
- $config_handler =& xoops_gethandler('config');
- $xoopsConfig =& $config_handler->getConfigsByCat(XOOPS_CONF);
-
- $msgs = array();
- foreach ($_REQUEST['modules'] as $dirname => $installmod) {
- if ($installmod) {
- $msgs[] =& xoops_module_install($dirname);
- }
- }
-
- $pageHasForm = false;
-
- if (count($msgs) > 0) {
- $content = "<div class='x2-note successMsg'>" . INSTALLED_MODULES . "</div><ul class='log'>";
- foreach ($msgs as $msg) {
- $content .= "<dt>{$msg}</dt>";
- }
- $content .= "</ul>";
- } else {
- $content = "<div class='x2-note confirmMsg'>" . NO_INSTALLED_MODULES . "</div>";
- }
-
- // Flush cache files for cpanel GUIs
- xoops_load("cpanel", "system");
- XoopsSystemCpanel::flush();
-
- //Set active modules in cache folder
- xoops_setActiveModules();
-} else {
- if (!isset($GLOBALS['xoopsConfig']['language'])) {
- $GLOBALS['xoopsConfig']['language'] = $_COOKIE['xo_install_lang'];
- }
-
- // Get installed modules
- $module_handler =& xoops_gethandler('module');
- $installed_mods =& $module_handler->getObjects();
- $listed_mods = array();
- foreach ($installed_mods as $module) {
- $listed_mods[] = $module->getVar('dirname');
- }
-
- include_once '../../../class/xoopslists.php';
- $dirlist = XoopsLists::getModulesList();
- $toinstal = 0;
-
- $javascript = "";
- $content = "<ul class='log'><li>";
- $content .= "<table class='module'>\n";
- foreach ($dirlist as $file) {
- clearstatcache();
- if (!in_array($file, $listed_mods)) {
- $value = 0;
- $style = "";
- if (in_array($file, $wizard->configs['modules'])) {
- $value = 1;
- $style = " style='background-color:#E6EFC2;'";
- }
-
- $file = trim($file);
- $module =& $module_handler->create();
- if (!$module->loadInfo($file, false)) {
- continue;
- }
-
- $form = new XoopsThemeForm('', 'modules', 'index.php', 'post');
- $moduleYN = new XoopsFormRadioYN('', 'modules['. $module->getInfo('dirname') . ']', $value, _YES, _NO);
- $moduleYN->setExtra( "onclick='selectModule(\"" . $file . "\", this)'" );
- $form->addElement($moduleYN);
-
- $content .= "<tr id='" . $file . "'" . $style . ">\n";
- $content .= " <td class='img' ><img src='" . XOOPS_URL . "/modules/" . $module->getInfo('dirname') . "/" . $module->getInfo('image') . "' alt='" . $module->getInfo('name') . "'/></td>\n";
- $content .= " <td>";
- $content .= " " . $module->getInfo('name') . " " . number_format( round($module->getInfo('version'), 2), 2) . " (" . $module->getInfo('dirname') . ")";
- $content .= " <br />" . $module->getInfo('description');
- $content .= " </td>\n";
- $content .= " <td class='yesno'>";
- $content .= $moduleYN->render() ;
- $content .= " </td></tr>\n";
- $toinstal++;
- }
- }
- $content .= "</table>";
- $content .= "</li></ul><script type='text/javascript'>" . $javascript . "</script>";
- if ($toinstal == 0) {
- $pageHasForm = false;
- $content = "<div class='x2-note confirmMsg'>" . NO_MODULES_FOUND . "</div>";
- }
-}
-$indexAdmin = new ModuleAdmin();
-echo $indexAdmin->addNavigation('install.php');
-
-include './../include/install_tpl.php';
-include 'admin_footer.php';
+<?php
+/**
+ * See the enclosed file license.txt for licensing information.
+ * If you did not receive this file, get it at http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * @copyright The XOOPS project http://www.xoops.org/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package installer
+ * @since 2.3.0
+ * @author Haruki Setoyama <ha...@pl...>
+ * @author Kazumi Ono <web...@my...>
+ * @author Skalpa Keo <sk...@xo...>
+ * @author Taiwen Jiang <ph...@us...>
+ * @author DuGris (aka L. JEN) <du...@fr...>
+ * @version $Id$
+**/
+include 'admin_header.php';
+xoops_cp_header();
+$xoopsOption['checkadmin'] = true;
+$xoopsOption['hascommon'] = true;
+require_once './../include/common.inc.php';
+require_once XOOPS_ROOT_PATH . "/modules/system/admin/modulesadmin/modulesadmin.php";
+defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
+
+if (!@include_once "../../../language/{$wizard->language}/global.php") {
+ include_once "../../../language/english/global.php";
+}
+if (!@include_once "../../system/language/{$wizard->language}/admin/modulesadmin.php") {
+ include_once "../../system/language/english/admin/modulesadmin.php";
+}
+require_once '../../../class/xoopsformloader.php';
+require_once '../../../class/xoopslists.php';
+
+//$xoTheme->addStylesheet( XOOPS_URL . "/modules/" . $xoopsModule->getVar("dirname") . "/css/style.css" );
+
+$pageHasForm = true;
+$pageHasHelp = false;
+
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+ include_once '../../../class/xoopsblock.php';
+ include_once '../../../kernel/module.php';
+ include_once '../../../include/cp_functions.php';
+ include_once '../../../include/version.php';
+// include_once './../include/modulesadmin.php';
+
+ $config_handler =& xoops_gethandler('config');
+ $xoopsConfig =& $config_handler->getConfigsByCat(XOOPS_CONF);
+
+ $msgs = array();
+ foreach ($_REQUEST['modules'] as $dirname => $installmod) {
+ if ($installmod) {
+ $msgs[] =& xoops_module_install($dirname);
+ }
+ }
+
+ $pageHasForm = false;
+
+ if (count($msgs) > 0) {
+ $content = "<div class='x2-note successMsg'>" . INSTALLED_MODULES . "</div><ul class='log'>";
+ foreach ($msgs as $msg) {
+ $content .= "<dt>{$msg}</dt>";
+ }
+ $content .= "</ul>";
+ } else {
+ $content = "<div class='x2-note confirmMsg'>" . NO_INSTALLED_MODULES . "</div>";
+ }
+
+ // Flush cache files for cpanel GUIs
+ xoops_load("cpanel", "system");
+ XoopsSystemCpanel::flush();
+
+ //Set active modules in cache folder
+ xoops_setActiveModules();
+} else {
+ if (!isset($GLOBALS['xoopsConfig']['language'])) {
+ $GLOBALS['xoopsConfig']['language'] = $_COOKIE['xo_install_lang'];
+ }
+
+ // Get installed modules
+ $module_handler =& xoops_gethandler('module');
+ $installed_mods =& $module_handler->getObjects();
+ $listed_mods = array();
+ foreach ($installed_mods as $module) {
+ $listed_mods[] = $module->getVar('dirname');
+ }
+
+ include_once '../../../class/xoopslists.php';
+ $dirlist = XoopsLists::getModulesList();
+ $toinstal = 0;
+
+ $javascript = "";
+ $content = "<ul class='log'><li>";
+ $content .= "<table class='module'>\n";
+ foreach ($dirlist as $file) {
+ clearstatcache();
+ if (!in_array($file, $listed_mods)) {
+ $value = 0;
+ $style = "";
+ if (in_array($file, $wizard->configs['modules'])) {
+ $value = 1;
+ $style = " style='background-color:#E6EFC2;'";
+ }
+
+ $file = trim($file);
+ $module =& $module_handler->create();
+ if (!$module->loadInfo($file, false)) {
+ continue;
+ }
+
+ $form = new XoopsThemeForm('', 'modules', 'index.php', 'post');
+ $moduleYN = new XoopsFormRadioYN('', 'modules['. $module->getInfo('dirname') . ']', $value, _YES, _NO);
+ $moduleYN->setExtra( "onclick='selectModule(\"" . $file . "\", this)'" );
+ $form->addElement($moduleYN);
+
+ $content .= "<tr id='" . $file . "'" . $style . ">\n";
+ $content .= " <td class='img' ><img src='" . XOOPS_URL . "/modules/" . $module->getInfo('dirname') . "/" . $module->getInfo('image') . "' alt='" . $module->getInfo('name') . "'/></td>\n";
+ $content .= " <td>";
+ $content .= " " . $module->getInfo('name') . " " . number_format( round($module->getInfo('version'), 2), 2) . " (" . $module->getInfo('dirname') . ")";
+ $content .= " <br />" . $module->getInfo('description');
+ $content .= " </td>\n";
+ $content .= " <td class='yesno'>";
+ $content .= $moduleYN->render() ;
+ $content .= " </td></tr>\n";
+ $toinstal++;
+ }
+ }
+ $content .= "</table>";
+ $content .= "</li></ul><script type='text/javascript'>" . $javascript . "</script>";
+ if ($toinstal == 0) {
+ $pageHasForm = false;
+ $content = "<div class='x2-note confirmMsg'>" . NO_MODULES_FOUND . "</div>";
+ }
+}
+$indexAdmin = new ModuleAdmin();
+echo $indexAdmin->addNavigation('install.php');
+
+include './../include/install_tpl.php';
+include 'admin_footer.php';
?>
\ No newline at end of file
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/menu.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/menu.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/menu.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -1,27 +1,30 @@
-<?php
-
-$module_handler =& xoops_gethandler('module');
-$xoopsModule =& XoopsModule::getByDirname('moduleinstaller');
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
-//$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
-$pathImageAdmin = $moduleInfo->getInfo('icons32');
-
-$adminmenu = array();
-
-$i = 1;
-$adminmenu[$i]["title"] = _MI_INSTALLER_MENU_00;
-$adminmenu[$i]["link"] = 'admin/index.php';
-$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/home.png';
-$i++;
-$adminmenu[$i]["title"] = _MI_INSTALLER_MENU_01;
-// $adminmenu[$i]["link"] = 'admin/page_moduleinstaller.php';
-$adminmenu[$i]["link"] = 'admin/install.php';
-$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/add.png';
-$i++;
-$adminmenu[$i]["title"] = _MI_INSTALLER_MENU_02;
-$adminmenu[$i]["link"] = 'admin/uninstall.php';
-$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/delete.png';
-$i++;
-$adminmenu[$i]["title"] = _MI_INSTALLER_ADMIN_ABOUT;
-$adminmenu[$i]["link"] = 'admin/about.php';
-$adminmenu[$i]["icon"] = '../../'.$pathImageAdmin.'/about.png';
+<?php
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+
+//xoops_loadLanguage('admin', $dirname);
+
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]["title"] = _MI_INSTALLER_MENU_00;
+$adminmenu[$i]["link"] = 'admin/index.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_INSTALLER_MENU_01;
+// $adminmenu[$i]["link"] = 'admin/page_moduleinstaller.php';
+$adminmenu[$i]["link"] = 'admin/install.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/add.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_INSTALLER_MENU_02;
+$adminmenu[$i]["link"] = 'admin/uninstall.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/delete.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_INSTALLER_ADMIN_ABOUT;
+$adminmenu[$i]["link"] = 'admin/about.php';
+$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -1,10 +1,10 @@
<?php
/**
* See the enclosed file license.txt for licensing information.
- * If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
+ * If you did not receive this file, get it at http://www.gnu.org/licenses/gpl-2.0.html
*
* @copyright The XOOPS project http://www.xoops.org/
- * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License (GPL)
* @package installer
* @since 2.3.0
* @author Haruki Setoyama <ha...@pl...>
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/class/installwizard.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/class/installwizard.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/class/installwizard.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -1,241 +1,241 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-/**
- * See the enclosed file license.txt for licensing information.
- * If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
- *
- * @copyright The XOOPS project http://www.xoops.org/
- * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
- * @package installer
- * @since 2.3.0
- * @author Haruki Setoyama <ha...@pl...>
- * @author Kazumi Ono <web...@my...>
- * @author Skalpa Keo <sk...@xo...>
- * @author Taiwen Jiang <ph...@us...>
- * @author DuGris (aka L. JEN) <du...@fr...>
- * @version $Id$
- */
-
-class XoopsInstallWizard
-{
- var $language = 'english';
- var $pages = array();
- var $currentPage = 'langselect';
- var $pageIndex = 0;
- var $configs = array();
-
- function xoInit()
- {
- if (@empty( $_SERVER['REQUEST_URI'])) {
- $_SERVER['REQUEST_URI'] = $_SERVER['PHP_SELF'];
- }
-
- // Load the main language file
- $this->initLanguage(!empty( $_COOKIE['xo_install_lang']) ? $_COOKIE['xo_install_lang'] : 'english');
- // Setup pages
- include_once './../include/page.php';
- $this->pages = $pages;
-
- // Load default configs
- include_once './../include/config.php';
- $this->configs = $configs;
- /*
- // Database type
- $this->db_types = $db_types;
-
- // setup config site info
- $this->conf_names = $conf_names;
-
- // languages config files
- $this->language_files = $language_files;
-
- // extension_loaded
- $this->extensions = $extensions;
-
- // Modules to be installed by default
- $this->modules = $modules;
-
- // xoops_lib, xoops_data directories
- $this->xoopsPathDefault = $xoopsPathDefault;
-
- // writable xoops_lib, xoops_data directories
- $this->dataPath = $dataPath;
-
- // Protector default trust_path
- $this->trust_path = isset($trust_path) ? $trust_path : false;
-
- // Writable files and directories
- $this->writable = $writable;
- */
-
- if (!$this->checkAccess()) {
- return false;
- }
-
- $pagename = preg_replace('~(page_)(.*)~','$2', basename($_SERVER['PHP_SELF'], ".php"));
- $this->setPage($pagename);
-
- // Prevent client caching
- header("Cache-Control: no-store, no-cache, must-revalidate", false);
- header("Pragma: no-cache");
- return true;
- }
-
- function checkAccess()
- {
- if (INSTALL_USER != '' && INSTALL_PASSWORD != '') {
- if (!isset($_SERVER['PHP_AUTH_USER']) ) {
- header('WWW-Authenticate: Basic realm="XOOPS Installer"');
- header('HTTP/1.0 401 Unauthorized');
- echo 'You can not access this XOOPS installer.';
- return false;
- }
- if(INSTALL_USER != '' && $_SERVER['PHP_AUTH_USER'] != INSTALL_USER) {
- header('HTTP/1.0 401 Unauthorized');
- echo 'You can not access this XOOPS installer.';
- return false;
- }
- if(INSTALL_PASSWORD != $_SERVER['PHP_AUTH_PW']){
- header('HTTP/1.0 401 Unauthorized');
- echo 'You can not access this XOOPS installer.';
- return false;
- }
- }
-
- if (empty($GLOBALS['xoopsOption']['checkadmin'])) {
- return true;
- }
-
- if (empty($GLOBALS['xoopsUser']) && !empty($_COOKIE["xo_install_user"])) {
- install_acceptUser( $_COOKIE["xo_install_user"] );
- }
- if (empty($GLOBALS['xoopsUser'])) {
- redirect_header("../user.php");
- }
- if (!$GLOBALS['xoopsUser']->isAdmin()) {
- return false;
- }
- return true;
- }
-
- function loadLangFile($file)
- {
- if (file_exists("./language/{$this->language}/{$file}.php")) {
- include_once "./language/{$this->language}/{$file}.php";
- } else {
- include_once "./../language/english/$file.php";
- }
- }
-
- function initLanguage($language)
- {
- $language = preg_replace("/[^a-z0-9_\-]/i", "", $language);
- if (!file_exists("./language/{$language}/install.php")) {
- $language = 'english';
- }
- $this->language = $language;
- $this->loadLangFile('install');
- }
-
- function setPage($page)
- {
- $pages = array_keys($this->pages);
- if ((int)$page && $page >= 0 && $page < count($pages)) {
- $this->pageIndex = $page;
- $this->currentPage = $pages[$page];
- } else if (isset( $this->pages[$page])) {
- $this->currentPage = $page;
- $this->pageIndex = array_search($this->currentPage, $pages);
- } else {
- return false;
- }
-
- if ($this->pageIndex > 0 && !isset($_COOKIE['xo_install_lang'])) {
- header('Location: index.php');
- }
-
- return $this->pageIndex;
- }
-
- function baseLocation()
- {
- $proto = ( @$_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
- $host = $_SERVER['HTTP_HOST'];
- $base = substr( $_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/'));
- return $proto . '://' . $host . $base;
- }
-
- function pageURI( $page )
- {
- $pages = array_keys($this->pages);
- $pageIndex = $this->pageIndex;
- if (!(int)$page{0}) {
- if ($page{0} == '+') {
- $pageIndex += substr($page, 1);
- } else if ($page{0} == '-') {
- $pageIndex -= substr($page, 1);
- } else {
- $pageIndex = (int)array_search($page, $pages);
- }
- }
- if (!isset($pages[$pageIndex])) {
- if (defined("XOOPS_URL")) {
- return XOOPS_URL;
- } else {
- return $this->baseLocation();
- }
- }
- $page = $pages[$pageIndex];
- return $this->baseLocation() . "/page_{$page}.php";
- }
-
- function redirectToPage( $page, $status = 303, $message = 'See other' )
- {
- $location = $this->pageURI( $page );
- $proto = !@empty($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
- header("{$proto} {$status} {$message}");
- //header( "Status: $status $message" );
- header("Location: {$location}");
- }
-
- function CreateForm()
- {
- $hidden = '';
- $ret = '';
-
- foreach ($this->form as $form) {
- $ret .= "<fieldset><legend>" . $form->getTitle() . "</legend>\n";
-
- foreach ($form->getElements() as $ele) {
- if (is_object($ele)) {
- if (!$ele->isHidden() ) {
- if (($caption = $ele->getCaption()) != '') {
- $name = $ele->getName();
- $ret .= "<label class='xolabel' for='" . $ele->getName() . "'>" . $caption . "</label>";
- if (($desc = $ele->getDescription()) != '') {
- $ret .= "<div class='xoform-help'>";
- $ret .= $desc;
- $ret .= "</div>";
- }
- }
- $ret .= $ele->render() . "\n";
- } else {
- $hidden .= $ele->render() . "\n";
- }
- }
- }
- $ret .= "</fieldset>\n" . $hidden. "\n" . $form->renderValidationJS(true);
- }
- return $ret;
- }
-
-}
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+/**
+ * See the enclosed file license.txt for licensing information.
+ * If you did not receive this file, get it at http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * @copyright The XOOPS project http://www.xoops.org/
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License (GPL)
+ * @package installer
+ * @since 2.3.0
+ * @author Haruki Setoyama <ha...@pl...>
+ * @author Kazumi Ono <web...@my...>
+ * @author Skalpa Keo <sk...@xo...>
+ * @author Taiwen Jiang <ph...@us...>
+ * @author DuGris (aka L. JEN) <du...@fr...>
+ * @version $Id$
+ */
+
+class XoopsInstallWizard
+{
+ var $language = 'english';
+ var $pages = array();
+ var $currentPage = 'langselect';
+ var $pageIndex = 0;
+ var $configs = array();
+
+ function xoInit()
+ {
+ if (@empty( $_SERVER['REQUEST_URI'])) {
+ $_SERVER['REQUEST_URI'] = $_SERVER['PHP_SELF'];
+ }
+
+ // Load the main language file
+ $this->initLanguage(!empty( $_COOKIE['xo_install_lang']) ? $_COOKIE['xo_install_lang'] : 'english');
+ // Setup pages
+ include_once './../include/page.php';
+ $this->pages = $pages;
+
+ // Load default configs
+ include_once './../include/config.php';
+ $this->configs = $configs;
+ /*
+ // Database type
+ $this->db_types = $db_types;
+
+ // setup config site info
+ $this->conf_names = $conf_names;
+
+ // languages config files
+ $this->language_files = $language_files;
+
+ // extension_loaded
+ $this->extensions = $extensions;
+
+ // Modules to be installed by default
+ $this->modules = $modules;
+
+ // xoops_lib, xoops_data directories
+ $this->xoopsPathDefault = $xoopsPathDefault;
+
+ // writable xoops_lib, xoops_data directories
+ $this->dataPath = $dataPath;
+
+ // Protector default trust_path
+ $this->trust_path = isset($trust_path) ? $trust_path : false;
+
+ // Writable files and directories
+ $this->writable = $writable;
+ */
+
+ if (!$this->checkAccess()) {
+ return false;
+ }
+
+ $pagename = preg_replace('~(page_)(.*)~','$2', basename($_SERVER['PHP_SELF'], ".php"));
+ $this->setPage($pagename);
+
+ // Prevent client caching
+ header("Cache-Control: no-store, no-cache, must-revalidate", false);
+ header("Pragma: no-cache");
+ return true;
+ }
+
+ function checkAccess()
+ {
+ if (INSTALL_USER != '' && INSTALL_PASSWORD != '') {
+ if (!isset($_SERVER['PHP_AUTH_USER']) ) {
+ header('WWW-Authenticate: Basic realm="XOOPS Installer"');
+ header('HTTP/1.0 401 Unauthorized');
+ echo 'You can not access this XOOPS installer.';
+ return false;
+ }
+ if(INSTALL_USER != '' && $_SERVER['PHP_AUTH_USER'] != INSTALL_USER) {
+ header('HTTP/1.0 401 Unauthorized');
+ echo 'You can not access this XOOPS installer.';
+ return false;
+ }
+ if(INSTALL_PASSWORD != $_SERVER['PHP_AUTH_PW']){
+ header('HTTP/1.0 401 Unauthorized');
+ echo 'You can not access this XOOPS installer.';
+ return false;
+ }
+ }
+
+ if (empty($GLOBALS['xoopsOption']['checkadmin'])) {
+ return true;
+ }
+
+ if (empty($GLOBALS['xoopsUser']) && !empty($_COOKIE["xo_install_user"])) {
+ install_acceptUser( $_COOKIE["xo_install_user"] );
+ }
+ if (empty($GLOBALS['xoopsUser'])) {
+ redirect_header("../user.php");
+ }
+ if (!$GLOBALS['xoopsUser']->isAdmin()) {
+ return false;
+ }
+ return true;
+ }
+
+ function loadLangFile($file)
+ {
+ if (file_exists("./language/{$this->language}/{$file}.php")) {
+ include_once "./language/{$this->language}/{$file}.php";
+ } else {
+ include_once "./../language/english/$file.php";
+ }
+ }
+
+ function initLanguage($language)
+ {
+ $language = preg_replace("/[^a-z0-9_\-]/i", "", $language);
+ if (!file_exists("./language/{$language}/install.php")) {
+ $language = 'english';
+ }
+ $this->language = $language;
+ $this->loadLangFile('install');
+ }
+
+ function setPage($page)
+ {
+ $pages = array_keys($this->pages);
+ if ((int)$page && $page >= 0 && $page < count($pages)) {
+ $this->pageIndex = $page;
+ $this->currentPage = $pages[$page];
+ } else if (isset( $this->pages[$page])) {
+ $this->currentPage = $page;
+ $this->pageIndex = array_search($this->currentPage, $pages);
+ } else {
+ return false;
+ }
+
+ if ($this->pageIndex > 0 && !isset($_COOKIE['xo_install_lang'])) {
+ header('Location: index.php');
+ }
+
+ return $this->pageIndex;
+ }
+
+ function baseLocation()
+ {
+ $proto = ( @$_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
+ $host = $_SERVER['HTTP_HOST'];
+ $base = substr( $_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/'));
+ return $proto . '://' . $host . $base;
+ }
+
+ function pageURI( $page )
+ {
+ $pages = array_keys($this->pages);
+ $pageIndex = $this->pageIndex;
+ if (!(int)$page{0}) {
+ if ($page{0} == '+') {
+ $pageIndex += substr($page, 1);
+ } else if ($page{0} == '-') {
+ $pageIndex -= substr($page, 1);
+ } else {
+ $pageIndex = (int)array_search($page, $pages);
+ }
+ }
+ if (!isset($pages[$pageIndex])) {
+ if (defined("XOOPS_URL")) {
+ return XOOPS_URL;
+ } else {
+ return $this->baseLocation();
+ }
+ }
+ $page = $pages[$pageIndex];
+ return $this->baseLocation() . "/page_{$page}.php";
+ }
+
+ function redirectToPage( $page, $status = 303, $message = 'See other' )
+ {
+ $location = $this->pageURI( $page );
+ $proto = !@empty($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
+ header("{$proto} {$status} {$message}");
+ //header( "Status: $status $message" );
+ header("Location: {$location}");
+ }
+
+ function CreateForm()
+ {
+ $hidden = '';
+ $ret = '';
+
+ foreach ($this->form as $form) {
+ $ret .= "<fieldset><legend>" . $form->getTitle() . "</legend>\n";
+
+ foreach ($form->getElements() as $ele) {
+ if (is_object($ele)) {
+ if (!$ele->isHidden() ) {
+ if (($caption = $ele->getCaption()) != '') {
+ $name = $ele->getName();
+ $ret .= "<label class='xolabel' for='" . $ele->getName() . "'>" . $caption . "</label>";
+ if (($desc = $ele->getDescription()) != '') {
+ $ret .= "<div class='xoform-help'>";
+ $ret .= $desc;
+ $ret .= "</div>";
+ }
+ }
+ $ret .= $ele->render() . "\n";
+ } else {
+ $hidden .= $ele->render() . "\n";
+ }
+ }
+ }
+ $ret .= "</fieldset>\n" . $hidden. "\n" . $form->renderValidationJS(true);
+ }
+ return $ret;
+ }
+
+}
?>
\ No newline at end of file
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/css/reset.css
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/css/reset.css 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/css/reset.css 2012-08-08 22:34:35 UTC (rev 10042)
@@ -3,7 +3,7 @@
* Suico theme
* In memory of Marcello Brandao
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License 3.0
* @package themes
* @since 2.5.x
* @author Kris <http://www.xoofoo.org/>
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/credits.txt
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/credits.txt 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/credits.txt 2012-08-08 22:34:35 UTC (rev 10042)
@@ -1,7 +1,7 @@
Credits
===============
-Originally developed by Michael Beck (Mamba)
+ModuleInstaller put together by Michael Beck (Mamba)
-Utilizing code from the XOOPS Install script developed by: Haruki Setoyama, Kazumi Ono, Skalpa Keo, Taiwen Jiang, DuGris
+Based on code from the XOOPS Install script developed by: Haruki Setoyama, Kazumi Ono, Skalpa Keo, Taiwen Jiang, DuGris
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/include/common.inc.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/include/common.inc.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/include/common.inc.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -12,10 +12,10 @@
* Installer common include file
*
* See the enclosed file license.txt for licensing information.
- * If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
+ * If you did not receive this file, get it at http://www.gnu.org/licenses/gpl-2.0.html
*
* @copyright The XOOPS project http://www.xoops.org/
- * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License (GPL)
* @package installer
* @since 2.3.0
* @author Haruki Setoyama <ha...@pl...>
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/include/config.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/include/config.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/include/config.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -1,10 +1,10 @@
<?php
/**
* See the enclosed file license.txt for licensing information.
- * If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
+ * If you did not receive this file, get it at http://www.gnu.org/licenses/gpl-2.0.html
*
* @copyright The XOOPS project http://www.xoops.org/
- * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License (GPL)
* @package installer
* @since 2.3.0
* @author Haruki Setoyama <ha...@pl...>
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/include/install_tpl.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/include/install_tpl.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/include/install_tpl.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -12,10 +12,10 @@
* Installer template file
*
* See the enclosed file license.txt for licensing information.
- * If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
+ * If you did not receive this file, get it at http://www.gnu.org/licenses/gpl-2.0.html
*
* @copyright The XOOPS project http://www.xoops.org/
- * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License (GPL)
* @package installer
* @since 2.3.0
* @author Haruki Setoyama <ha...@pl...>
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/include/page.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/include/page.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/include/page.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -10,10 +10,10 @@
*/
/**
* See the enclosed file license.txt for licensing information.
- * If you did not receive this file, get it at http://www.fsf.org/copyleft/gpl.html
+ * If you did not receive this file, get it at http://www.gnu.org/licenses/gpl-2.0.html
*
* @copyright The XOOPS project http://www.xoops.org/
- * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
+ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License (GPL)
* @package installer
* @since 2.3.0
* @author Haruki Setoyama <ha...@pl...>
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/admin.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/admin.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/admin.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -1,18 +1,4 @@
<?php
-/**
- * Module Installer
- *
- * You may not change or alter any portion of this comment or credits
- * of supporting developers from this source code or any supporting source code
- * which is considered copyrighted (c) material of the original comment or credit authors.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
- * @package moduleinstaller
- * @since 1.0
- * @author Michael Beck (Mamba), XOOPS Development Team
- * @version $Id $
-**/
+
+// Text for Admin footer
+define("_AM_ADMIN_FOOTER","<div class='center smallsmall italic pad5'>Module Installer is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
\ No newline at end of file
Deleted: XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/finish.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/finish.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/finish.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -1,25 +0,0 @@
-<?php
-// $Id$
-// _LANGCODE: en
-// _CHARSET : UTF-8
-// Translator: XOOPS Translation Team
-
-$content .=
-"<h3>Your site</h3>
-<p>You can now access the <a href='../index.php'>home page of your site</a>.</p>
-<h3>Support</h3>
-<p>Visit <a href='http://xoops.sourceforge.net/' rel='external'>The XOOPS Project</a></p>
-<p><strong>ATTENTION :</strong> Your site currently contains the minimum functionality, if you want to add content: text pages, photo gallery, forum, links directory, ... You must first download from the <a href='http://www.xoops.org/modules/repository' rel='external' title='Choice and download modules'>library of your local support</a> and install these components, it is the same for <a href='http://www.xoops.org/modules/extgallery' rel='external' title='Select and Install new themes'>design (theme) Additional</a>.</p>
-";
-
-$content .=
-"<h3>Security configuration</h3>
-<p>The installer will try to configure your site for security considerations. Please double check to make sure:
-<div class='confirmMsg'>
-The <em>mainfile.php</em> is readonly.<br />
-Remove the folder <em>{$installer_modified}</em> (or <em>install</em> if it was not renamed automatically by the installer) from your server.
-</div>
-</p>
-";
-
-?>
\ No newline at end of file
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/help/help.html
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/help/help.html 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/help/help.html 2012-08-08 22:34:35 UTC (rev 10042)
@@ -13,7 +13,7 @@
<h4 class="odd">Install/uninstall</h4>
-No special measures necessary, follow the standard installation process – extract the /moduleinstaller folder into the ../modules directory. Install the module through Admin -> System Module -> Modules. <br /><br />
+No special measures necessary, follow the standard installation process – extract the /moduleinstaller folder into the ../modules directory. Install the module through Admin -> System Module -> Modules. <br /><br />
Detailed instructions on installing modules are available in the <a href="http://goo.gl/adT2i">XOOPS Operations Manual</a> </p>
<p class="even">
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/install.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/install.php 2012-08-08 22:18:40 UTC (rev 10041)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/install.php 2012-08-08 22:34:35 UTC (rev 10042)
@@ -1,216 +1,216 @@
-<?php
-/**
- * Installer main english strings declaration file
- *
- * @copyright The XOOPS project http://www.xoops.org/
- * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
- * @package installer
- * @since 2.3.0
- * @author Haruki Setoyama <ha...@pl...>
- * @author Kazumi Ono <web...@my...>
- * @author Skalpa Keo <sk...@xo...>
- * @author Taiwen Jiang <ph...@us...>
- * @author dugris <du...@fr...>
- * @version $Id$
- */
-
-// _LANGCODE: en
-// _CHARSET : UTF-8
-// Translator: XOOPS Translation Team
-
-define( "SHOW_HIDE_HELP", "Show/hide help text" );
-
-// License
-define('LICENSE_NOT_WRITEABLE', 'License is %s . <br/><font style="colour:#ff0000">Make ../include/license.php Writable</font>');
-define('LICENSE_IS_WRITEABLE', 'License is %s');
-
-// Configuration check page
-define( "SERVER_API", "Server API" );
-define( "PHP_EXTENSION", "%s extension" );
-define( "CHAR_ENCODING", "Character encoding" );
-define( "XML_PARSING", "XML parsing" );
-define( "REQUIREMENTS", "Requirements" );
-define( "_PHP_VERSION", "PHP version" );
-define( "RECOMMENDED_SETTINGS", "Recommended settings" );
-define( "RECOMMENDED_EXTENSIONS", "Recommended extensions" );
-define( "SETTING_NAME", "Setting name" );
-define( "RECOMMENDED", "Recommended" );
-define( "CURRENT", "Current" );
-define( "RECOMMENDED_EXTENSIONS_MSG", "These extensions are not required for normal use, but may be necessary to exploit
- some specific features (like the multi-language or RSS support). Thus, it is recommended to have them installed." );
-define( "NONE", "None" );
-define( "SUCCESS", "Success" );
-define( "WARNING", "Warning" );
-define( "FAILED", "Failed" );
-
-// Titles (main and pages)
-define( "XOOPS_INSTALL_WIZARD", "XOOPS installation wizard" );
-
-define( "LANGUAGE_SELECTION", "Language selection" );
-define( "LANGUAGE_SELECTION_TITLE", "Choose your language"); // L128
-define( "INTRODUCTION", "Introduction" );
-define( "INTRODUCTION_TITLE", "Welcome to the XOOPS installation assistant" ); // L0
-define( "CONFIGURATION_CHECK", "Configuration check" );
-define( "CONFIGURATION_CHECK_TITLE", "Checking your server configuration" );
-define( "PATHS_SETTINGS", "Paths settings" );
-define( "PATHS_SETTINGS_TITLE", "Paths settings" );
-define( "DATABASE_CONNECTION", "Database connection" );
-define( "DATABASE_CONNECTION_TITLE", "Database connection" );
-define( "DATABASE_CONFIG", "Database configuration" );
-define( "DATABASE_CONFIG_TITLE", "Database configuration" );
-define( "CONFIG_SAVE", "Configuration save" );
-define( "CONFIG_SAVE_TITLE", "Saving your system configuration" );
-define( "TABLES_CREATION", "Tables creation" );
-define( "TABLES_CREATION_TITLE", "Database tables creation" );
-define( "INITIAL_SETTINGS", "Initial settings" );
-define( "INITIAL_SETTINGS_TITLE", "Please enter your initial settings" );
-define( "DATA_INSERTION", "Data insertion" );
-define( "DATA_INSERTION_TITLE", "Saving your settings to the database" );
-define( "WELCOME", "Welcome" );
-define( "WELCOME_TITLE", "Welcome to your XOOPS site" ); // L0
-
-
-// Settings (labels and help text)
-define( "XOOPS_PATHS", "XOOPS Physical paths" );
-define( "XOOPS_URLS", "Web locations" );
-
-define( "XOOPS_ROOT_PATH_LABEL", "XOOPS documents root physical path" );
-define( "XOOPS_ROOT_PATH_HELP", "Physical path to the XOOPS documents (served) directory WITHOUT trailing slash" );
-
-define( "XOOPS_LIB_PATH_LABEL", "XOOPS library directory" );
-define( "XOOPS_LIB_PATH_HELP", "Physical path to the XOOPS library directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH_LABEL . " to make it secure.");
-define( "XOOPS_DATA_PATH_LABEL", "XOOPS datafiles directory" );
-define( "XOOPS_DATA_PATH_HELP", "Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash, for forward compatibility. Locate the folder out of " . XOOPS_ROOT_PATH_LABEL . " to make it secure." );
-
-define( "XOOPS_URL_LABEL", "Website location (URL)" ); // L56
-define( "XOOPS_URL_HELP", "Main URL that will be used to access your XOOPS installation" ); // L58
-
-define( "LEGEND_CONNECTION", "Server connection" );
-define( "LEGEND_DATABASE", "Database" ); // L51
-
-define( "DB_HOST_LABEL", "Server hostname" ); // L27
-define( "DB_HOST_HELP", "Hostname of the database server. If you are unsure, <em>localhost</em> works in most cases"); // L67
-define( "DB_USER_LABEL", "User name" ); // L28
-define( "DB_USER_HELP", "Name of the user account that will be used to connect to the database server"); // L65
-define( "DB_PASS_LABEL", "Password" ); // L52
-define( "DB_PASS_HELP", "Password of your database user account"); // L68
-define( "DB_NAME_LABEL", "Database name" ); // L29
-define( "DB_NAME_HELP", "The name of dat...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X