Enano CMS (1.1.x): comparison install.php

equal deleted inserted replaced

-:53ba55d33abb
+:8acd77a6c19d
 * 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 GNU General Public License for details.
 */
 @include('config.php');
-if( ( defined('ENANO_INSTALLED') || defined('MIDGET_INSTALLED') ) && ((isset($_GET['mode']) && ($_GET['mode']!='finish' && $_GET['mode']!='css')) || !isset($_GET['mode'])))
+if( ( defined('ENANO_INSTALLED') || defined('MIDGET_INSTALLED') ) && ((isset($_GET['mode']) && ($_GET['mode']!='finish' && $_GET['mode']!='css') && $_GET['mode']!='showlicense') || !isset($_GET['mode'])))
 {
 $_GET['title'] = 'Enano:Installation_locked';
 require('includes/common.php');
 die_friendly('Installation locked', '<p>The Enano installer has found a Enano installation in this directory. You MUST delete config.php if you want to re-install Enano.</p><p>If you wish to upgrade an older Enano installation to this version, please use the <a href="upgrade.php">upgrade script</a>.</p>');
 exit;
 {
 $conn = stg_mysql_connect(true);
 if ( !$conn )
 return false;
 // Our list of tables included in Enano
-$tables = Array( 'categories', 'comments', 'config', 'logs', 'page_text', 'session_keys', 'pages', 'users', 'users_extra', 'themes', 'buddies', 'banlist', 'files', 'privmsgs', 'sidebar', 'hits', 'search_index', 'groups', 'group_members', 'acl', 'search_cache', 'tags', 'page_groups', 'page_group_members' );
+$tables = Array( 'categories', 'comments', 'config', 'logs', 'page_text', 'session_keys', 'pages', 'users', 'users_extra', 'themes', 'buddies', 'banlist', 'files', 'privmsgs', 'sidebar', 'hits', 'search_index', 'groups', 'group_members', 'acl', 'tags', 'page_groups', 'page_group_members' );
 // Drop each table individually; if it fails, it probably means we're trying to drop a
 // table that didn't exist in the Enano version we're deleting the database for.
 foreach ( $tables as $table )
 {
 fwrite($handle, $contents);
 fclose($handle);
 return true;
 }
+function stg_build_index()
+{
+global $db, $session, $paths, $template, $plugins; // Common objects;
+if ( $paths->rebuild_search_index() )
+return true;
+return false;
+}
 function stg_rename_config()
 {
 if ( !@rename('./config.new.php', './config.php') )
 {
 echo '<p>Can\'t rename config.php</p>';
 if($cv) $color='FFCCCC'; else $color='FFAAAA';
 echo "<tr><td style='background-color: #$color; width: 500px; padding: 5px;'>$desc<br /><b>$extended_desc</b></td><td style='padding-left: 10px;'><img alt='Test failed' src='images/bad.gif' /></td></tr>";
 $failed = true;
 }
 }
-function is_apache()
+function is_apache() { $r = strstr($_SERVER['SERVER_SOFTWARE'], 'Apache') ? true : false; return $r; }
-{
-return strstr($_SERVER['SERVER_SOFTWARE'], 'Apache') ? true : false;
+function show_license($fb = false)
+{
+?>
+<div style="height: 500px; clip: rect(0px,auto,500px,auto); overflow: auto; padding: 10px; border: 1px dashed #456798; margin: 1em;">
+<?php
+if ( !file_exists('./GPL') || !file_exists('./language/english/install/license-deed.html') )
+{
+echo 'Cannot find the license files.';
+}
+echo file_get_contents('./language/english/install/license-deed.html');
+if ( defined('ENANO_BETA_VERSION') || $branch == 'unstable' )
+{
+?>
+<h3><?php echo $lang->get('license_info_unstable_title'); ?></h3>
+<p><?php echo $lang->get('license_info_unstable_body'); ?></p>
+<?php
+}
+?>
+<h3><?php echo $lang->get('license_section_gpl_heading'); ?></h3>
+<?php if ( $lang->lang_code != 'eng' ): ?>
+<p><i><?php echo $lang->get('license_gpl_blurb_inenglish'); ?></i></p>
+<?php endif; ?>
+<?php echo wikiFormat(file_get_contents(ENANO_ROOT . '/GPL')); ?>
+<?php
+global $template;
+if ( $fb )
+{
+echo '<p style="text-align: center;">Because I could never find the Create a Page button in PHP-Nuke.</p>';
+echo '<p>' . str_replace('http://enanocms.org/', 'http://www.2robots.com/2003/10/15/web-portals-suck/', $template->fading_button) . '</p>';
+echo '<p style="text-align: center;">It\'s not a portal, my friends.</p>';
+}
+?>
+</div>
+<?php
 }
 require_once('includes/template.php');
-//
+if(!isset($_GET['mode']))
-// Startup localization
+{
-//
-// We need $db just for the _die function
-$db = new mysql();
-$lang = new Language('eng');
-$lang->load_file('./language/english/install.json');
-if ( !isset($_GET['mode']) )
 $_GET['mode'] = 'welcome';
+}
 switch($_GET['mode'])
 {
 case 'mysql_test':
 error_reporting(0);
 $dbhost     = rawurldecode($_POST['host']);
 'website' => $lang->get('website_modetitle'),
 'login'   => $lang->get('login_modetitle'),
 'confirm' => $lang->get('confirm_modetitle'),
 'install' => $lang->get('install_modetitle'),
 'finish'  => $lang->get('finish_modetitle')
+'_hiddenstages' => '...', // all stages below this line are hidden
+'showlicense' => $lang->get('license_modetitle')
 );
 $sideinfo = '';
 $vars = $template->extract_vars('elements.tpl');
 $p = $template->makeParserText($vars['sidebar_button']);
+$hidden = false;
 foreach ( $modestrings as $id => $str )
 {
 if ( $_GET['mode'] == $id )
 {
 $flags = 'style="font-weight: bold; text-decoration: underline;"';
 }
 else
 {
 $flags = '';
 }
-$p->assign_vars(Array(
+if ( $id == '_hiddenstages' )
-'HREF' => '#',
+$hidden = true;
-'FLAGS' => $flags . ' onclick="return false;"',
+if ( !$hidden )
-'TEXT' => $str
+{
-));
+$p->assign_vars(Array(
-$sideinfo .= $p->run();
+'HREF' => '#',
+'FLAGS' => $flags . ' onclick="return false;"',
+'TEXT' => $str
+));
+$sideinfo .= $p->run();
+}
 }
 $template->init_vars();
 if(isset($_GET['mode']) && $_GET['mode'] == 'css')
 else
 $branch = 'stable';
 }
 }
-$template->header();
-if(!isset($_GET['mode'])) $_GET['mode'] = 'license';
 switch($_GET['mode'])
 {
 default:
 case 'welcome':
 ?>
 case "license":
 ?>
 <h3><?php echo $lang->get('license_heading'); ?></h3>
 <p><?php echo $lang->get('license_blurb_thankyou'); ?></p>
 <p><?php echo $lang->get('license_blurb_pleaseread'); ?></p>
-<div style="height: 500px; clip: rect(0px,auto,500px,auto); overflow: auto; padding: 10px; border: 1px dashed #456798; margin: 1em;">
+<?php show_license(); ?>
-<?php
-if ( !file_exists('./GPL') || !file_exists('./language/english/install/license-deed.html') )
-{
-echo 'Cannot find the license files.';
-}
-echo file_get_contents('./language/english/install/license-deed.html');
-if ( defined('ENANO_BETA_VERSION') || $branch == 'unstable' )
-{
-?>
-<h3><?php echo $lang->get('license_info_unstable_title'); ?></h3>
-<p><?php echo $lang->get('license_info_unstable_body'); ?></p>
-<?php
-}
-?>
-<h3><?php echo $lang->get('license_section_gpl_heading'); ?></h3>
-<?php if ( $lang->lang_code != 'eng' ): ?>
-<p><i><?php echo $lang->get('license_gpl_blurb_inenglish'); ?></i></p>
-<?php endif; ?>
-<?php echo wikiFormat(file_get_contents(ENANO_ROOT . '/GPL')); ?>
-</div>
 <div class="pagenav">
 <form action="install.php?mode=sysreqs" method="post">
 <table border="0">
 <tr>
 <td>
 $paths->init();
 run_installer_stage('importlang', $lang->get('install_stg_importlang_title'), 'stg_import_language', $lang->get('install_stg_importlang_body'));
 run_installer_stage('initlogs', $lang->get('install_stg_initlogs_title'), 'stg_init_logs', $lang->get('install_stg_initlogs_body'));
+run_installer_stage('buildindex', 'Initialize search index', 'stg_build_index', 'Something went wrong while the page manager was attempting to build a search index.');
 /*
 * HACKERS:
 * If you're making a custom distribution of Enano, put all your custom plugin-related code here.
 * You have access to the full Enano API as well as being logged in with complete admin rights.
 * Don't do anything horrendously fancy here, unless you add a new stage (or more than one) and
 case "finish":
 echo '<h3>' . $lang->get('finish_msg_congratulations') . '</h3>
 ' . $lang->get('finish_body') . '
 <p>' . $lang->get('finish_link_mainpage', array('mainpage_link' => 'index.php')) . '</p>';
 break;
+// this stage is never shown during the installation, but is provided for legal purposes
+case "showlicense":
+show_license(true);
+break;
 }
 $template->footer();
 ?>

changeset 279	8acd77a6c19d
parent 278	53ba55d33abb
parent 276	acfdccf7a2bf
child 280	dc08c70ca550