# HG changeset patch
# User Dan
# Date 1195694054 18000
# Node ID acfdccf7a2bf7964c240ac730203d54fef84d6a1
# Parent 956263992d483511507904d6634b1d2dfdf5ce44
Re-sync Oxygen and Mint and Oxygen simple with Oxygen main; a couple improvements to the redirect-on-no-config code
diff -r 956263992d48 -r acfdccf7a2bf includes/dbal.php
--- a/includes/dbal.php Wed Nov 21 15:18:15 2007 -0500
+++ b/includes/dbal.php Wed Nov 21 20:14:14 2007 -0500
@@ -145,7 +145,7 @@
// scriptPath isn't set yet - we need to autodetect it to avoid infinite redirects
if ( !defined('scriptPath') )
{
- if ( isset($_SERVER['PATH_INFO']) )
+ if ( isset($_SERVER['PATH_INFO']) && !preg_match('/index\.php$/', $_SERVER['PATH_INFO']) )
{
$_SERVER['REQUEST_URI'] = preg_replace(';' . preg_quote($_SERVER['PATH_INFO']) . '$;', '', $_SERVER['REQUEST_URI']);
}
diff -r 956263992d48 -r acfdccf7a2bf includes/functions.php
--- a/includes/functions.php Wed Nov 21 15:18:15 2007 -0500
+++ b/includes/functions.php Wed Nov 21 20:14:14 2007 -0500
@@ -289,7 +289,7 @@
$template->load_theme('oxygen', 'bleu', false);
$template->tpl_strings['SITE_NAME'] = 'Enano';
$template->tpl_strings['SITE_DESC'] = 'This site is experiencing a critical error and cannot load.';
- $template->tpl_strings['COPYRIGHT'] = '© ' . date('Y');
+ $template->tpl_strings['COPYRIGHT'] = 'Powered by Enano CMS - © 2007 Dan Fuhry. This program is Free Software; see the GPL file included with this package for details.';
$template->tpl_strings['PAGE_NAME'] = htmlspecialchars($title);
}
diff -r 956263992d48 -r acfdccf7a2bf includes/template.php
--- a/includes/template.php Wed Nov 21 15:18:15 2007 -0500
+++ b/includes/template.php Wed Nov 21 20:14:14 2007 -0500
@@ -1795,7 +1795,7 @@
*/
class template_nodb {
- var $tpl_strings, $tpl_bool, $theme, $style, $no_headers, $additional_headers, $sidebar_extra, $sidebar_widgets, $toolbar_menu, $theme_list;
+ var $fading_button, $tpl_strings, $tpl_bool, $theme, $style, $no_headers, $additional_headers, $sidebar_extra, $sidebar_widgets, $toolbar_menu, $theme_list;
function __construct() {
$this->tpl_bool = Array();
@@ -1805,6 +1805,10 @@
$this->toolbar_menu = '';
$this->additional_headers = '';
+ $this->fading_button = '
+
+
+
GNU General Public License
+
+
Declaration of license usage
+
Enano is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
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 (below) for more details.
+
By clicking the button below or otherwise continuing the installation, you indicate your acceptance of this license agreement.
+
+
Human-readable version
+
Enano is distributed under certain licensing terms that we believe make it of the greatest possible use to the public. The license we distribute it under, the GNU General Public License, provides certain terms and conditions that, rather than limit your use of Enano, allow you to get the most out of it. If you would like to read the full text, it can be found below. Here is a human-readable version that we think is a little easier to understand.
+
+
+ - You may to run Enano for any purpose.
+ - You may study how Enano works and adapt it to your needs.
+ - You may redistribute copies so you can help your neighbor.
+ - You may improve Enano and release your improvements to the public, so that the whole community benefits.
+
+
+
You may exercise the freedoms specified here provided that you comply with the express conditions of this license. The principal conditions are:
+
+
+ - You must conspicuously and appropriately publish on each copy distributed an appropriate copyright notice and disclaimer of warranty and keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of Enano a copy of the GNU General Public License along with Enano. Any translation of the GNU General Public License must be accompanied by the GNU General Public License.
+ - If you modify your copy or copies of Enano or any portion of it, or develop a program based upon it, you may distribute the resulting work provided you do so under the GNU General Public License. Any translation of the GNU General Public License must be accompanied by the GNU General Public License.
+ - If you copy or distribute Enano, you must accompany it with the complete corresponding machine-readable source code or with a written offer, valid for at least three years, to furnish the complete corresponding machine-readable source code.
+
+
+
Disclaimer: The above text is not a license. It is simply a handy reference for understanding the Legal Code (the full license) – it is a human-readable expression of some of its key terms. Think of it as the user-friendly interface to the Legal Code beneath. The above text itself has no legal value, and its contents do not appear in the actual license.
Text copied from the Creative Commons GPL Deed page
+
+
Notice for prerelease versions
+
This version of Enano is designed only for testing and evaluation purposes. It is not yet completely stable, and should not be used on production websites. As with any Enano version, Dan Fuhry and the Enano team cannot be responsible for any damage, physical or otherwise, to any property as a result of the use of Enano. While security is a number one priority, sometimes things slip through.
+
+
Lawyer-readable version
+
+ Because I could never find the Create a Page button in PHP-Nuke.';
+ echo '
' . str_replace('http://enanocms.org/', 'http://www.2robots.com/2003/10/15/web-portals-suck/', $template->fading_button) . '
';
+ echo '
It\'s not a portal, my friends.
';
+ }
+ ?>
+
Welcome to the Enano installer.
Thank you for choosing Enano as your CMS. You've selected the finest in design, the strongest in security, and the latest in Web 2.0 toys. Trust us, you'll like it.
To get started, please read and accept the following license agreement. You've probably seen it before.
-
-
GNU General Public License
-
Declaration of license usage
-
Enano is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
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 (below) for more details.
-
By clicking the button below or otherwise continuing the installation, you indicate your acceptance of this license agreement.
-
Human-readable version
-
Enano is distributed under certain licensing terms that we believe make it of the greatest possible use to the public. The license we distribute it under, the GNU General Public License, provides certain terms and conditions that, rather than limit your use of Enano, allow you to get the most out of it. If you would like to read the full text, it can be found below. Here is a human-readable version that we think is a little easier to understand.
-
- - You may to run Enano for any purpose.
- - You may study how Enano works and adapt it to your needs.
- - You may redistribute copies so you can help your neighbor.
- - You may improve Enano and release your improvements to the public, so that the whole community benefits.
-
-
You may exercise the freedoms specified here provided that you comply with the express conditions of this license. The principal conditions are:
-
- - You must conspicuously and appropriately publish on each copy distributed an appropriate copyright notice and disclaimer of warranty and keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of Enano a copy of the GNU General Public License along with Enano. Any translation of the GNU General Public License must be accompanied by the GNU General Public License.
- - If you modify your copy or copies of Enano or any portion of it, or develop a program based upon it, you may distribute the resulting work provided you do so under the GNU General Public License. Any translation of the GNU General Public License must be accompanied by the GNU General Public License.
- - If you copy or distribute Enano, you must accompany it with the complete corresponding machine-readable source code or with a written offer, valid for at least three years, to furnish the complete corresponding machine-readable source code.
-
-
Disclaimer: The above text is not a license. It is simply a handy reference for understanding the Legal Code (the full license) – it is a human-readable expression of some of its key terms. Think of it as the user-friendly interface to the Legal Code beneath. The above text itself has no legal value, and its contents do not appear in the actual license.
Text copied from the Creative Commons GPL Deed page
-
-
Notice for prerelease versions
-
This version of Enano is designed only for testing and evaluation purposes. It is not yet completely stable, and should not be used on production websites. As with any Enano version, Dan Fuhry and the Enano team cannot be responsible for any damage, physical or otherwise, to any property as a result of the use of Enano. While security is a number one priority, sometimes things slip through.
-
-
Lawyer-readable version
-
-