[geeklog-cvs] Geeklog-1.x/public_html/admin/install index.php, NONE, 1.1 success.php, 1.12, 1.13 install.php, 1.94, NONE

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv15619/public_html/admin/install

Modified Files:
	success.php 
Added Files:
	index.php 
Removed Files:
	install.php 
Log Message:
Initial commit of the new install script, on behalf of Matt West


--- install.php DELETED ---

Index: success.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/success.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** success.php	25 Jun 2006 19:28:55 -0000	1.12
--- success.php	28 Jul 2007 17:19:13 -0000	1.13
***************
*** 3,26 ****
  require_once ('../../lib-common.php');
  
  // enable detailed error reporting
  $_CONF['rootdebug'] = true;
  
! $display = COM_siteHeader ('menu', 'Installation complete');
! $display .= COM_startBlock ('Installation complete');
! $display .= '<h2>Installation of Geeklog ' . VERSION . ' complete!</h2>';
  
! $display .= '<p>Congratulations, you have successfully installed Geeklog. Please take a minute to read the information displayed below.</p>';
  
! $display .= '<p>Then <a href="' . $_CONF['site_url'] . '">click here</a> to go to your site\'s front page and <b>learn about the default login</b>.</p>';
  
! $display .= '<h2>Check Permissions</h2>';
! $display .= '<p>Geeklog requires certain files and directories to be writable. To check if those are set up properly, please use <a href="check.php">this script</a>.</p>';
  
! $display .= '<h2>Security Warning</h2>';
! $display .= '<p>Once your site is up and running, don\'t forget to <strong>remove the install directory</strong>, <tt>' . $_CONF['path_html'] . 'admin/install</tt>, and <strong>change the password</strong> of the default \'Admin\' account.</p>';
  
  // note for those upgrading from Geeklog 1.2.5-1 or older
  if (DB_count ($_TABLES['users'], 'username', 'NewAdmin') > 0) {
!     $display .= '<p><strong>Note:</strong> Because the security model has been changed, we have created a new account with the rights you need to administer your new site.  The username for this new account is <b>NewAdmin</b> and the password is <b>password</b></p>.';
  }
  
--- 3,40 ----
  require_once ('../../lib-common.php');
  
+ $type = (isset( $_GET['type'] ) && !empty( $_GET['type'] )) ? $_GET['type'] : 'install';
+ $language = (isset( $_GET['language'] ) && !empty( $_GET['language'] )) ? $_GET['language'] : 'english';
+ require_once( 'language/' . $language . '.php' );
  // enable detailed error reporting
  $_CONF['rootdebug'] = true;
  
! $display = COM_siteHeader( 'menu', $LANG_INSTALL[80] );
! $display .= COM_startBlock( $LANG_INSTALL[81] . VERSION . $LANG_INSTALL[82] );
  
! $display .= '<p>' . $LANG_INSTALL[83] . (($type == 'install') ? 'installed' : 'upgraded') . $LANG_INSTALL[84] . '</p>' ;
  
! if ($type == 'install') {
! 	$display .= '<p>' . $LANG_INSTALL[85] . '</p>
!     <p>' . $LANG_INSTALL[86] . ' <strong>' . $LANG_INSTALL[87] . '</strong><br />
!     ' . $LANG_INSTALL[88] . ' <strong>' . $LANG_INSTALL[89] . '</strong></p> <br />';
! }
  
! $display .= '<h2>' . $LANG_INSTALL[90] . '</h2>
! <p>' . $LANG_INSTALL[91] . ' <strong>' . (($type == 'upgrade') ? '2' : '3') . ' ' . $LANG_INSTALL[92] . '</strong>:
! <ul>
! <li>' . $LANG_INSTALL[93] . '<tt>' . $_CONF['path_html'] . 'admin/install</tt>.</li>';
  
! 
! if ($type == 'install') {
!     $display .= '<li>' . $LANG_INSTALL[94] . ' <strong>' . $LANG_INSTALL[87] . '</strong> ' . $LANG_INSTALL[95] . '</li>';
! }
! 
! $display .= '<li>' . $LANG_INSTALL[96] . '<tt>' . $_CONF['path'] . 'config.php</tt> ' . $LANG_INSTALL[97] . '<tt>' . $_CONF['path_html'] . 'lib-common.php</tt> ' . $LANG_INSTALL[98] . ' 755.</li>
! </ul>
! </p>';
  
  // note for those upgrading from Geeklog 1.2.5-1 or older
  if (DB_count ($_TABLES['users'], 'username', 'NewAdmin') > 0) {
!     $display .= '<p>' . $LANG_INSTALL[99] . '</p>.';
  }
  

--- NEW FILE: index.php ---
<?php

/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
// | Geeklog 1.4                                                               |
// +---------------------------------------------------------------------------+
// | install.php                                                               |
// |                                                                           |
// | Geeklog installation script.                                              |
// +---------------------------------------------------------------------------+
// | Copyright (C) 2000-2007 by the following authors:                         |
// |                                                                           |
// | Authors: Tony Bibbs        - tony AT tonybibbs DOT com                    |
// |          Mark Limburg      - mlimburg AT users DOT sourceforge DOT net    |
// |          Jason Whittenburg - jwhitten AT securitygeeks DOT com            |
// |          Dirk Haun         - dirk AT haun-online DOT de                   |
// |          Randy Kolenko     - randy AT nextide DOT ca
// |          Matt West         - matt AT mattdanger DOT net                   |
// +---------------------------------------------------------------------------+
[...1863 lines suppressed...]
                
                break;            

        } // End switch (Upgrade steps)

        break;

} // end switch (fresh install or upgrade)  

$display .= '
    <br /><br />
        </div>
    </div>

</body>
</html>' . LB;

echo $display;

?>