Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[10029] XoopsCore/branches/2.6.x/2.6.0/htdocs/install
|
From: <for...@us...> - 2012-08-08 08:16:01
|
Revision: 10029
http://xoops.svn.sourceforge.net/xoops/?rev=10029&view=rev
Author: forxoops
Date: 2012-08-08 08:15:49 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
Add extension installation in installer
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/config.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/install_tpl.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/page.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/language/english/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/config.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/config.php 2012-08-08 07:53:01 UTC (rev 10028)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/config.php 2012-08-08 08:15:49 UTC (rev 10029)
@@ -54,11 +54,14 @@
// Writable files and directories
$configs['writable'] =
- array('uploads/', 'uploads/avatars/', 'uploads/images/', 'uploads/ranks/', 'uploads/smilies/', 'uploads/banners/', 'mainfile.php');
+ array('uploads/', 'uploads/avatars/', 'uploads/images/', 'uploads/ranks/', 'uploads/smilies/', 'uploads/banners/', 'mainfile.php');
// Modules to be installed by default
$configs['modules'] = array();
+// Extensions to be installed by default
+$configs['ext'] = array('protector');
+
// xoops_lib, xoops_data directories
$configs['xoopsPathDefault'] = array(
'lib' => 'xoops_lib',
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/install_tpl.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/install_tpl.php 2012-08-08 07:53:01 UTC (rev 10028)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/install_tpl.php 2012-08-08 08:15:49 UTC (rev 10029)
@@ -23,7 +23,7 @@
* @author Kris <kr...@fr...>
* @author DuGris (aka L. JEN) <du...@fr...>
* @version $Id$
-**/
+ **/
defined('XOOPS_INSTALL') or die('XOOPS Installation wizard die');
@@ -55,7 +55,7 @@
'current' => false, 'past' => false
)
);
-} elseif ($current > 0 && $current < count($keys) - 2) {
+} elseif ($current > 0 && $current < count($keys) - 1) {
$pages = array(
array(
'name' => $wizard->pages[$keys[$current - 1]]['name'], 'index' => $wizard->pageIndex, 'current' => false,
@@ -66,10 +66,13 @@
), array(
'name' => $wizard->pages[$keys[$current + 1]]['name'], 'index' => $wizard->pageIndex + 2,
'current' => false, 'past' => false
- ), array(
+ )/*, array(
'name' => $wizard->pages[$keys[$current + 2]]['name'], 'index' => $wizard->pageIndex + 3,
'current' => false, 'past' => false
- )
+ ), array(
+ 'name' => $wizard->pages[$keys[$current + 3]]['name'], 'index' => $wizard->pageIndex + 4,
+ 'current' => false, 'past' => false
+ ) */
);
} else {
$pages = array();
@@ -82,7 +85,8 @@
}
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo _LANGCODE; ?>" lang="<?php echo _LANGCODE; ?>">
<head>
@@ -90,13 +94,13 @@
<?php echo XOOPS_VERSION . ' : ' . XOOPS_INSTALL_WIZARD; ?>
(<?php echo ($wizard->pageIndex + 1) . '/' . count($wizard->pages); ?>)
</title>
- <meta http-equiv="Content-Type" content="text/html; charset=<?php echo _INSTALL_CHARSET ?>" />
- <link rel="shortcut icon" type="image/ico" href="../favicon.ico" />
- <link charset="UTF-8" rel="stylesheet" type="text/css" media="all" href="css/style.css" />
+ <meta http-equiv="Content-Type" content="text/html; charset=<?php echo _INSTALL_CHARSET ?>"/>
+ <link rel="shortcut icon" type="image/ico" href="../favicon.ico"/>
+ <link charset="UTF-8" rel="stylesheet" type="text/css" media="all" href="css/style.css"/>
<?php
- if (file_exists('language/' . $wizard->language . '/style.css')) {
- echo '<link charset="UTF-8" rel="stylesheet" type="text/css" media="all" href="language/' . $wizard->language . '/style.css" />';
- }
+ if (file_exists('language/' . $wizard->language . '/style.css')) {
+ echo '<link charset="UTF-8" rel="stylesheet" type="text/css" media="all" href="language/' . $wizard->language . '/style.css" />';
+ }
?>
<script type="text/javascript" src="./js/prototype-1.6.0.3.js"></script>
@@ -104,25 +108,27 @@
</head>
<body>
- <div id="xo-main-logo">
- <img src="img/logo.png" alt="XOOPS" />
+<div id="xo-main-logo">
+ <img src="img/logo.png" alt="XOOPS"/>
+</div>
+<div id="xo-container-brd"> </div>
+<div id="xo-container">
+ <div id="xo-header" class="gradient_bar">
+ <!--<div class="xo_title_c"><div class="xo_title gradient_bar"><?php echo XOOPS_INSTALL_WIZARD; ?></div></div>-->
+ <ul>
+ <?php foreach ($pages as $page): ?>
+ <li<?php echo $page['current'] ? ' class="current"' : ''; ?><?php echo $page['past'] ? ' class="past"' : ''; ?>>
+ <?php echo $page['name']; ?>
+ <span><?php echo $page['index']; ?><?php if ($page['past']): ?><img src="./img/yes.png"
+ alt=""/><?php endif; ?></span>
+ </li>
+ <?php endforeach; ?>
+ </ul>
</div>
- <div id="xo-container-brd"> </div>
- <div id="xo-container">
- <div id="xo-header" class="gradient_bar">
- <!--<div class="xo_title_c"><div class="xo_title gradient_bar"><?php echo XOOPS_INSTALL_WIZARD; ?></div></div>-->
- <ul>
- <?php foreach($pages as $page): ?>
- <li<?php echo $page['current']? ' class="current"':''; ?><?php echo $page['past']? ' class="past"':''; ?>>
- <?php echo $page['name']; ?>
- <span><?php echo $page['index']; ?><?php if($page['past']): ?><img src="./img/yes.png" alt="" /><?php endif; ?></span>
- </li>
- <?php endforeach; ?>
- </ul>
- </div>
- <form id='<?php echo $wizard->pages[$wizard->currentPage]['name']; ?>' action='<?php echo $_SERVER['PHP_SELF']; ?>' method='post'>
+ <form id='<?php echo $wizard->pages[$wizard->currentPage]['name']; ?>' action='<?php echo $_SERVER['PHP_SELF']; ?>'
+ method='post'>
<div id="xo-page-title">
- <span class="index"><?php echo $wizard->pageIndex+1; ?></span>
+ <span class="index"><?php echo $wizard->pageIndex + 1; ?></span>
<span class="setup"><?php echo XOOPS_INSTALL_WIZARD; ?></span>
<span class="title"><?php echo $wizard->pages[$wizard->currentPage]['title']; ?></span>
</div>
@@ -131,21 +137,22 @@
</div>
<div id="buttons">
<?php if ($wizard->pageIndex != 0) { ?>
- <button type="button" class="buttong" onclick="history.back()">
- <?php echo BUTTON_PREVIOUS; ?>
+ <button type="button" class="buttong" accesskey="p"
+ onclick="location.href='<?php echo $wizard->pageURI('-1'); ?>'">
+ <?php echo BUTTON_PREVIOUS; ?>
</button>
<?php } ?>
-
<?php if (@$pageHasForm) { ?>
<button type="submit" class="gradient_bar button">
<?php } else { ?>
- <button type="button" class="gradient_bar button" accesskey="n" onclick="location.href='<?php echo $wizard->pageURI('+1'); ?>'">
+ <button type="button" class="gradient_bar button" accesskey="n"
+ onclick="location.href='<?php echo $wizard->pageURI('+1'); ?>'">
<?php } ?>
<?php echo BUTTON_NEXT; ?>
- </button>
+ </button>
</div>
- </form>
- </div>
+ </form>
+</div>
</body>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/page.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/page.php 2012-08-08 07:53:01 UTC (rev 10028)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/include/page.php 2012-08-08 08:15:49 UTC (rev 10029)
@@ -25,46 +25,49 @@
* @version $Id$
*/
$pages = array(
- 'langselect' => array(
- 'name' => LANGUAGE_SELECTION,
- 'title' => LANGUAGE_SELECTION_TITLE),
- 'start' => array(
- 'name' => INTRODUCTION,
- 'title' => INTRODUCTION_TITLE),
- 'modcheck' => array(
- 'name' => CONFIGURATION_CHECK,
- 'title' => CONFIGURATION_CHECK_TITLE),
- 'pathsettings' => array(
- 'name' => PATHS_SETTINGS,
- 'title' => PATHS_SETTINGS_TITLE),
- 'dbconnection' => array(
- 'name' => DATABASE_CONNECTION,
- 'title' => DATABASE_CONNECTION_TITLE),
- 'dbsettings' => array(
- 'name' => DATABASE_CONFIG,
- 'title' => DATABASE_CONFIG_TITLE),
- 'configsave' => array(
- 'name' => CONFIG_SAVE,
- 'title' => CONFIG_SAVE_TITLE),
- 'tablescreate' => array(
- 'name' => TABLES_CREATION,
- 'title' => TABLES_CREATION_TITLE),
- 'siteinit' => array(
- 'name' => INITIAL_SETTINGS,
- 'title' => INITIAL_SETTINGS_TITLE),
- 'tablesfill' => array(
- 'name' => DATA_INSERTION,
- 'title' => DATA_INSERTION_TITLE),
- 'configsite' => array(
- 'name' => CONFIG_SITE,
- 'title' => CONFIG_SITE_TITLE),
- 'theme' => array(
- 'name' => THEME,
- 'title' => THEME_TITLE),
- 'moduleinstaller' => array(
- 'name' => MODULES,
- 'title' => MODULES_TITLE),
- 'end' => array(
- 'name' => WELCOME,
- 'title' => WELCOME_TITLE),
- );
\ No newline at end of file
+ 'langselect' => array(
+ 'name' => LANGUAGE_SELECTION,
+ 'title' => LANGUAGE_SELECTION_TITLE),
+ 'start' => array(
+ 'name' => INTRODUCTION,
+ 'title' => INTRODUCTION_TITLE),
+ 'modcheck' => array(
+ 'name' => CONFIGURATION_CHECK,
+ 'title' => CONFIGURATION_CHECK_TITLE),
+ 'pathsettings' => array(
+ 'name' => PATHS_SETTINGS,
+ 'title' => PATHS_SETTINGS_TITLE),
+ 'dbconnection' => array(
+ 'name' => DATABASE_CONNECTION,
+ 'title' => DATABASE_CONNECTION_TITLE),
+ 'dbsettings' => array(
+ 'name' => DATABASE_CONFIG,
+ 'title' => DATABASE_CONFIG_TITLE),
+ 'configsave' => array(
+ 'name' => CONFIG_SAVE,
+ 'title' => CONFIG_SAVE_TITLE),
+ 'tablescreate' => array(
+ 'name' => TABLES_CREATION,
+ 'title' => TABLES_CREATION_TITLE),
+ 'siteinit' => array(
+ 'name' => INITIAL_SETTINGS,
+ 'title' => INITIAL_SETTINGS_TITLE),
+ 'tablesfill' => array(
+ 'name' => DATA_INSERTION,
+ 'title' => DATA_INSERTION_TITLE),
+ 'configsite' => array(
+ 'name' => CONFIG_SITE,
+ 'title' => CONFIG_SITE_TITLE),
+ 'theme' => array(
+ 'name' => THEME,
+ 'title' => THEME_TITLE),
+ 'moduleinstaller' => array(
+ 'name' => MODULES,
+ 'title' => MODULES_TITLE),
+ 'extensioninstaller' => array(
+ 'name' => EXTENSIONS,
+ 'title' => EXTENSIONS_TITLE),
+ 'end' => array(
+ 'name' => WELCOME,
+ 'title' => WELCOME_TITLE)
+);
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/language/english/install.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/language/english/install.php 2012-08-08 07:53:01 UTC (rev 10028)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/language/english/install.php 2012-08-08 08:15:49 UTC (rev 10029)
@@ -18,194 +18,201 @@
// _CHARSET : UTF-8
// Translator: XOOPS Translation Team
-define( "SHOW_HIDE_HELP", "Show/hide help text" );
+define("SHOW_HIDE_HELP", "Show/hide help text");
// 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" );
+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 Setup Wizard" );
+define("XOOPS_INSTALL_WIZARD", "XOOPS Setup 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
+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_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_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_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("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("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 database on the host. The installer will attempt to create the database if not exist"); // L64
-define( "DB_CHARSET_LABEL", "Database character set" );
-define( "DB_CHARSET_HELP", "MySQL includes character set support that enables you to store data using a variety of character sets and perform comparisons according to a variety of collations.");
-define( "DB_COLLATION_LABEL", "Database collation" );
-define( "DB_COLLATION_HELP", "A collation is a set of rules for comparing characters in a character set.");
-define( "DB_PREFIX_LABEL", "Table prefix" ); // L30
-define( "DB_PREFIX_HELP", "This prefix will be added to all new tables created to avoid name conflicts in the database. If you are unsure, just keep the default"); // L63
-define( "DB_PCONNECT_LABEL", "Use persistent connection" ); // L54
-define( "DB_PCONNECT_HELP", "Default is 'No'. Leave it blank if you are unsure"); // L69
-define( "DB_DATABASE_LABEL", "Database" );
+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 database on the host. The installer will attempt to create the database if not exist"); // L64
+define("DB_CHARSET_LABEL", "Database character set");
+define("DB_CHARSET_HELP", "MySQL includes character set support that enables you to store data using a variety of character sets and perform comparisons according to a variety of collations.");
+define("DB_COLLATION_LABEL", "Database collation");
+define("DB_COLLATION_HELP", "A collation is a set of rules for comparing characters in a character set.");
+define("DB_PREFIX_LABEL", "Table prefix"); // L30
+define("DB_PREFIX_HELP", "This prefix will be added to all new tables created to avoid name conflicts in the database. If you are unsure, just keep the default"); // L63
+define("DB_PCONNECT_LABEL", "Use persistent connection"); // L54
+define("DB_PCONNECT_HELP", "Default is 'No'. Leave it blank if you are unsure"); // L69
+define("DB_DATABASE_LABEL", "Database");
-define( "LEGEND_ADMIN_ACCOUNT", "Administrator account" );
-define( "ADMIN_LOGIN_LABEL", "Admin login" ); // L37
-define( "ADMIN_EMAIL_LABEL", "Admin e-mail" ); // L38
-define( "ADMIN_PASS_LABEL", "Admin password" ); // L39
-define( "ADMIN_CONFIRMPASS_LABEL", "Confirm password" ); // L74
+define("LEGEND_ADMIN_ACCOUNT", "Administrator account");
+define("ADMIN_LOGIN_LABEL", "Admin login"); // L37
+define("ADMIN_EMAIL_LABEL", "Admin e-mail"); // L38
+define("ADMIN_PASS_LABEL", "Admin password"); // L39
+define("ADMIN_CONFIRMPASS_LABEL", "Confirm password"); // L74
// Buttons
-define( "BUTTON_PREVIOUS", "Previous" ); // L42
-define( "BUTTON_NEXT", "Next" ); // L47
+define("BUTTON_PREVIOUS", "Previous"); // L42
+define("BUTTON_NEXT", "Next"); // L47
// Messages
-define( "XOOPS_FOUND", "%s found" );
-define( "CHECKING_PERMISSIONS", "Checking file and directory permissions..." ); // L82
-define( "IS_NOT_WRITABLE", "%s is NOT writable." ); // L83
-define( "IS_WRITABLE", "%s is writable." ); // L84
+define("XOOPS_FOUND", "%s found");
+define("CHECKING_PERMISSIONS", "Checking file and directory permissions..."); // L82
+define("IS_NOT_WRITABLE", "%s is NOT writable."); // L83
+define("IS_WRITABLE", "%s is writable."); // L84
-define( "XOOPS_PATH_FOUND", "Path found." );
+define("XOOPS_PATH_FOUND", "Path found.");
-define( "READY_CREATE_TABLES", "No XOOPS tables were detected.<br />The installer is now ready to create the XOOPS system tables.<br />Press <em>next</em> to proceed." );
-define( "XOOPS_TABLES_FOUND", "The XOOPS system tables already exists in your database.<br />Press <em>next</em> to go to the next step." ); // L131
-define( "XOOPS_TABLES_CREATED", "XOOPS system tables have been created.<br />Press <em>next</em> to go to the next step." );
-define( "READY_INSERT_DATA", "The installer is now ready to insert initial data into your database." );
-define( "READY_SAVE_MAINFILE", "The installer is now ready to save the specified settings to <em>mainfile.php</em>.<br />Press <em>next</em> to proceed." );
-define( "SAVED_MAINFILE", "Saved settings in mainfile.php" );
-define( "SAVED_MAINFILE_MSG", "The installer has saved the specified settings to <em>mainfile.php</em> and <em>secure.php</em>. Press <em>next</em> to go to the next step." );
-define( "DATA_ALREADY_INSERTED", "XOOPS data found in database.<br />Press <em>next</em> to go to the next step." );
-define( "DATA_INSERTED", "Initial data have been inserted into database.<br />Press <em>next</em> to go to the next step." );
+define("READY_CREATE_TABLES", "No XOOPS tables were detected.<br />The installer is now ready to create the XOOPS system tables.<br />Press <em>next</em> to proceed.");
+define("XOOPS_TABLES_FOUND", "The XOOPS system tables already exists in your database.<br />Press <em>next</em> to go to the next step."); // L131
+define("XOOPS_TABLES_CREATED", "XOOPS system tables have been created.<br />Press <em>next</em> to go to the next step.");
+define("READY_INSERT_DATA", "The installer is now ready to insert initial data into your database.");
+define("READY_SAVE_MAINFILE", "The installer is now ready to save the specified settings to <em>mainfile.php</em>.<br />Press <em>next</em> to proceed.");
+define("SAVED_MAINFILE", "Saved settings in mainfile.php");
+define("SAVED_MAINFILE_MSG", "The installer has saved the specified settings to <em>mainfile.php</em> and <em>secure.php</em>. Press <em>next</em> to go to the next step.");
+define("DATA_ALREADY_INSERTED", "XOOPS data found in database.<br />Press <em>next</em> to go to the next step.");
+define("DATA_INSERTED", "Initial data have been inserted into database.<br />Press <em>next</em> to go to the next step.");
// %s is database name
-define( "DATABASE_CREATED", "Database %s created!" ); // L43
+define("DATABASE_CREATED", "Database %s created!"); // L43
// %s is table name
-define( "TABLE_NOT_CREATED", "Unable to create table %s" ); // L118
-define( "TABLE_CREATED", "Table %s created." ); // L45
-define( "ROWS_INSERTED", "%d entries inserted to table %s." ); // L119
-define( "ROWS_FAILED", "Failed inserting %d entries to table %s." ); // L120
-define( "TABLE_ALTERED", "Table %s updated."); // L133
-define( "TABLE_NOT_ALTERED", "Failed updating table %s."); // L134
-define( "TABLE_DROPPED", "Table %s dropped."); // L163
-define( "TABLE_NOT_DROPPED", "Failed deleting table %s."); // L164
+define("TABLE_NOT_CREATED", "Unable to create table %s"); // L118
+define("TABLE_CREATED", "Table %s created."); // L45
+define("ROWS_INSERTED", "%d entries inserted to table %s."); // L119
+define("ROWS_FAILED", "Failed inserting %d entries to table %s."); // L120
+define("TABLE_ALTERED", "Table %s updated."); // L133
+define("TABLE_NOT_ALTERED", "Failed updating table %s."); // L134
+define("TABLE_DROPPED", "Table %s dropped."); // L163
+define("TABLE_NOT_DROPPED", "Failed deleting table %s."); // L164
// Error messages
-define( "ERR_COULD_NOT_ACCESS", "Could not access the specified folder. Please verify that it exists and is readable by the server." );
-define( "ERR_NO_XOOPS_FOUND", "No XOOPS installation could be found in the specified folder." );
-define( "ERR_INVALID_EMAIL", "Invalid Email" ); // L73
-define( "ERR_REQUIRED", "Information is required." ); // L41
-define( "ERR_PASSWORD_MATCH", "The two passwords do not match" );
-define( "ERR_NEED_WRITE_ACCESS", "The server must be given write access to the following files and folders<br />(i.e. <em>chmod 777 directory_name</em> on a UNIX/LINUX server)<br />If they are not available or not created correctly, please create manually and set proper permissions." );
-define( "ERR_NO_DATABASE", "Could not create database. Contact the server administrator for details." ); // L31
-define( "ERR_NO_DBCONNECTION", "Could not connect to the database server." ); // L106
-define( "ERR_WRITING_CONSTANT", "Failed writing constant %s." ); // L122
+define("ERR_COULD_NOT_ACCESS", "Could not access the specified folder. Please verify that it exists and is readable by the server.");
+define("ERR_NO_XOOPS_FOUND", "No XOOPS installation could be found in the specified folder.");
+define("ERR_INVALID_EMAIL", "Invalid Email"); // L73
+define("ERR_REQUIRED", "Information is required."); // L41
+define("ERR_PASSWORD_MATCH", "The two passwords do not match");
+define("ERR_NEED_WRITE_ACCESS", "The server must be given write access to the following files and folders<br />(i.e. <em>chmod 777 directory_name</em> on a UNIX/LINUX server)<br />If they are not available or not created correctly, please create manually and set proper permissions.");
+define("ERR_NO_DATABASE", "Could not create database. Contact the server administrator for details."); // L31
+define("ERR_NO_DBCONNECTION", "Could not connect to the database server."); // L106
+define("ERR_WRITING_CONSTANT", "Failed writing constant %s."); // L122
-define( "ERR_COPY_MAINFILE", "Could not copy the distribution file to mainfile.php" );
-define( "ERR_WRITE_MAINFILE", "Could not write into mainfile.php. Please check the file permission and try again.");
-define( "ERR_READ_MAINFILE", "Could not open mainfile.php for reading" );
+define("ERR_COPY_MAINFILE", "Could not copy the distribution file to mainfile.php");
+define("ERR_WRITE_MAINFILE", "Could not write into mainfile.php. Please check the file permission and try again.");
+define("ERR_READ_MAINFILE", "Could not open mainfile.php for reading");
-define( "ERR_INVALID_DBCHARSET", "The charset '%s' is not supported." );
-define( "ERR_INVALID_DBCOLLATION", "The collation '%s' is not supported." );
-define( "ERR_CHARSET_NOT_SET", "Default character set is not set for XOOPS database." );
+define("ERR_INVALID_DBCHARSET", "The charset '%s' is not supported.");
+define("ERR_INVALID_DBCOLLATION", "The collation '%s' is not supported.");
+define("ERR_CHARSET_NOT_SET", "Default character set is not set for XOOPS database.");
define("_INSTALL_CHARSET", "UTF-8");
-define( "SUPPORT", "Supports");
+define("SUPPORT", "Supports");
-define( "LOGIN", "Authentication");
-define( "LOGIN_TITLE", "Authentication");
-define( "USER_LOGIN", "Administrator Login" );
-define( "USERNAME", "Username :");
-define( "PASSWORD", "Password :");
+define("LOGIN", "Authentication");
+define("LOGIN_TITLE", "Authentication");
+define("USER_LOGIN", "Administrator Login");
+define("USERNAME", "Username :");
+define("PASSWORD", "Password :");
-define( "ICONV_CONVERSION", "Character set conversion");
-define( "ZLIB_COMPRESSION", "Zlib Compression");
-define( "IMAGE_FUNCTIONS", "Image functions");
-define( "IMAGE_METAS", "Image meta data (exif)");
+define("ICONV_CONVERSION", "Character set conversion");
+define("ZLIB_COMPRESSION", "Zlib Compression");
+define("IMAGE_FUNCTIONS", "Image functions");
+define("IMAGE_METAS", "Image meta data (exif)");
-define( "ADMIN_EXIST", "The administrator account already exists.<br />Press <strong>next</strong> to go to the next step.");
+define("ADMIN_EXIST", "The administrator account already exists.<br />Press <strong>next</strong> to go to the next step.");
-define( "CONFIG_SITE", "Site configuration" );
-define( "CONFIG_SITE_TITLE", "Site configuration" );
-define( "MODULES", "Modules installation" );
-define( "MODULES_TITLE", "Modules installation" );
-define( "THEME", "Select theme" );
-define( "THEME_TITLE", "Choose the default theme" );
+define("CONFIG_SITE", "Site configuration");
+define("CONFIG_SITE_TITLE", "Site configuration");
+define("MODULES", "Modules installation");
+define("MODULES_TITLE", "Modules installation");
+define("EXTENSIONS", "Extensions installation");
+define("EXTENSIONS_TITLE", "Extensions installation");
+define("THEME", "Select theme");
+define("THEME_TITLE", "Choose the default theme");
-define( "INSTALLED_MODULES", "The following modules have been installed.<br />Press <strong>next</strong> to go to the next step.");
-define( "NO_MODULES_FOUND", "No modules found.<br />Press <strong>next</strong> to go to the next step.");
-define( "NO_INSTALLED_MODULES", "No module installed.<br />Press <strong>next</strong> to go to the next step.");
+define("INSTALLED_MODULES", "The following modules have been installed.<br />Press <strong>next</strong> to go to the next step.");
+define("NO_MODULES_FOUND", "No modules found.<br />Press <strong>next</strong> to go to the next step.");
+define("NO_INSTALLED_MODULES", "No module installed.<br />Press <strong>next</strong> to go to the next step.");
-define( "THEME_NO_SCREENSHOT", "No screenshot found");
+define("INSTALLED_EXTENSION", "The following extensions have been installed.<br />Press <strong>next</strong> to go to the next step.");
+define("NO_EXTENSION_FOUND", "No extensions found.<br />Press <strong>next</strong> to go to the next step.");
+define("NO_INSTALLED_EXTENSION", "No extension installed.<br />Press <strong>next</strong> to go to the next step.");
-define( "IS_VALOR", " => ");
+define("THEME_NO_SCREENSHOT", "No screenshot found");
+
+define("IS_VALOR", " => ");
+
// password message
-define( "PASSWORD_LABEL", "Password strength : ");
-define( "PASSWORD_DESC", "Password not entered");
-define( "PASSWORD_GENERATOR", "Password generator");
-define( "PASSWORD_GENERATE", "Generate");
-define( "PASSWORD_COPY", "Copy");
+define("PASSWORD_LABEL", "Password strength : ");
+define("PASSWORD_DESC", "Password not entered");
+define("PASSWORD_GENERATOR", "Password generator");
+define("PASSWORD_GENERATE", "Generate");
+define("PASSWORD_COPY", "Copy");
-define( "PASSWORD_VERY_WEAK", "Very Weak");
-define( "PASSWORD_WEAK", "Weak");
-define( "PASSWORD_BETTER", "Better");
-define( "PASSWORD_MEDIUM", "Medium");
-define( "PASSWORD_STRONG", "Strong");
-define( "PASSWORD_STRONGEST", "Strongest");
+define("PASSWORD_VERY_WEAK", "Very Weak");
+define("PASSWORD_WEAK", "Weak");
+define("PASSWORD_BETTER", "Better");
+define("PASSWORD_MEDIUM", "Medium");
+define("PASSWORD_STRONG", "Strong");
+define("PASSWORD_STRONGEST", "Strongest");
?>
\ No newline at end of file
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php (from rev 9980, XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_extensioninstaller.php 2012-08-08 08:15:49 UTC (rev 10029)
@@ -0,0 +1,116 @@
+<?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.
+*/
+
+/**
+ * @copyright The XOOPS project http://www.xoops.org/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU General Public License (GPL)
+ * @package installer
+ * @author Andricq Nicolas (AKA MusS)
+ * @version $Id$
+ */
+
+$xoopsOption['checkadmin'] = true;
+$xoopsOption['hascommon'] = true;
+
+require_once dirname(__FILE__) . '/include/common.inc.php';
+
+$xoops = Xoops::getInstance();
+
+/* @var $wizard XoopsInstallWizard */
+$wizard = $xoops->registry->get('wizard');
+
+$xoops->loadLanguage('admin', 'system', $wizard->language);
+$xoops->loadLanguage('global', '', $wizard->language);
+$xoops->loadLanguage('admin/extension', 'system', $wizard->language);
+
+$pageHasForm = true;
+
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+ include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
+
+ $system_module = new SystemModule();
+
+ $msgs = array();
+ foreach ($_REQUEST['modules'] as $dirname => $installmod) {
+ if ($installmod) {
+ $msgs[] = $system_module->install($dirname);
+ }
+ }
+
+ $pageHasForm = false;
+
+ if (count($msgs) > 0) {
+ $content = "<div class='x2-note successMsg'>" . INSTALLED_EXTENSION . "</div><ul class='log'>";
+ foreach ($msgs as $msg) {
+ $tempvar = $msg->modinfo['name'];
+ $content .= "<dt>{$tempvar}</dt>";
+ }
+ $content .= "</ul>";
+ } else {
+ $content = "<div class='x2-note confirmMsg'>" . NO_INSTALLED_EXTENSION . "</div>";
+ }
+
+ //Set active modules in cache folder
+ $xoops->setActiveModules();
+} else {
+ if (!$xoops->getConfig('language')) {
+ $xoops->setConfig('language', $_COOKIE['xo_install_lang']);
+ }
+ include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
+ include_once XOOPS_ROOT_PATH . "/modules/system/class/extension.php";
+ // Get installed modules
+ $system_module = new SystemExtension();
+
+ $dirlist = $system_module->getExtensionList();
+ $toinstal = 0;
+
+ $javascript = "";
+ $content = "<ul class='log'><li style='background: none;'>";
+ $content .= "<table class='module'>\n";
+ /* @var $ext XoopsModule */
+ foreach ($dirlist as $ext) {
+ clearstatcache();
+ $value = 0;
+ $style = "";
+
+ if (in_array($ext->getInfo('dirname'), $wizard->configs['ext'])) {
+ $value = 1;
+ $style = " style='background-color:#E6EFC2;'";
+ }
+
+ $form = new XoopsThemeForm('', 'modules', 'index.php', 'post');
+ $moduleYN = new XoopsFormRadioYN('', 'modules[' . $ext->getInfo('dirname') . ']', $value, _YES, _NO);
+ $moduleYN->setExtra("onclick='selectModule(\"" . $ext->getInfo('dirname') . "\", this)'");
+ $form->addElement($moduleYN);
+
+ $content .= "<tr id='" . $ext->getInfo('dirname') . "'" . $style . ">\n";
+ $content .= " <td class='img' ><img src='" . XOOPS_URL . "/modules/" . $ext->getInfo('dirname') . "/" . $ext->getInfo('image') . "' alt='" . $ext->getInfo('name') . "'/></td>\n";
+ $content .= " <td>";
+ $content .= " " . $ext->getInfo('name') . " " . number_format(round($ext->getInfo('version'), 2), 2) . " (" . $ext->getInfo('dirname') . ")";
+ $content .= " <br />" . $ext->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_EXTENSION_FOUND . "</div>";
+ }
+}
+
+$xoops->registry->set('pageHasHelp', false);
+$xoops->registry->set('pageHasForm', $pageHasForm);
+$xoops->registry->set('content', $content);
+include XOOPS_INSTALL_PATH . '/include/install_tpl.php';
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php 2012-08-08 07:53:01 UTC (rev 10028)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/install/page_moduleinstaller.php 2012-08-08 08:15:49 UTC (rev 10029)
@@ -33,8 +33,8 @@
$wizard = $xoops->registry->get('wizard');
$xoops->loadLanguage('admin', 'system', $wizard->language);
-$xoops->loadLanguage('global', '',$wizard->language);
-$xoops->loadLanguage('admin/modulesadmin', 'system',$wizard->language);
+$xoops->loadLanguage('global', '', $wizard->language);
+$xoops->loadLanguage('admin/modulesadmin', 'system', $wizard->language);
$pageHasForm = true;
@@ -69,55 +69,40 @@
if (!$xoops->getConfig('language')) {
$xoops->setConfig('language', $_COOKIE['xo_install_lang']);
}
-
+ include_once XOOPS_ROOT_PATH . "/modules/system/class/module.php";
// Get installed modules
- /* @var $module_handler XoopsModuleHandler */
- $module_handler = $xoops->getHandlerModule();
- $installed_mods = $module_handler->getObjectsArray();
- $listed_mods = array();
- foreach ($installed_mods as $module) {
- $listed_mods[] = $module->getVar('dirname');
- }
+ $system_module = new SystemModule();
- $dirlist = XoopsLists::getModulesList();
+ $dirlist = $system_module->getModuleInstall();
$toinstal = 0;
$javascript = "";
$content = "<ul class='log'><li style='background: none;'>";
$content .= "<table class='module'>\n";
- foreach ($dirlist as $file) {
+ /* @var $module XoopsModule */
+ foreach ($dirlist as $module) {
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);
- /* @var $module XoopsModule */
- $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++;
+ $value = 0;
+ $style = "";
+ if (in_array($module->getInfo('dirname'), $wizard->configs['modules'])) {
+ $value = 1;
+ $style = " style='background-color:#E6EFC2;'";
}
+ $form = new XoopsThemeForm('', 'modules', 'index.php', 'post');
+ $moduleYN = new XoopsFormRadioYN('', 'modules[' . $module->getInfo('dirname') . ']', $value, _YES, _NO);
+ $moduleYN->setExtra("onclick='selectModule(\"" . $module->getInfo('dirname') . "\", this)'");
+ $form->addElement($moduleYN);
+
+ $content .= "<tr id='" . $module->getInfo('dirname') . "'" . $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>";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
