# HG changeset patch # User Dan # Date 1194624860 18000 # Node ID c9fd175289aa63afceac458405101b6da3e6348c # Parent c26308d8188276accb639b153a08c28d6c57949a Cleaned up some HTML in the installer; corrected some phpDoc syntax errors diff -r c26308d81882 -r c9fd175289aa includes/sessions.php --- a/includes/sessions.php Mon Nov 05 20:00:41 2007 -0500 +++ b/includes/sessions.php Fri Nov 09 11:14:20 2007 -0500 @@ -206,8 +206,8 @@ var $acl_deps = Array(); /** - * Our tell-all list of permissions. - * @access private - or, preferably, protected + * Our tell-all list of permissions. Do not even try to change this. + * @access private * @var array */ @@ -2596,8 +2596,8 @@ var $acl_deps = Array(); /** - * Our tell-all list of permissions. - * @access private - or, preferably, protected...too bad this has to be PHP4 compatible + * Our tell-all list of permissions. Do not even try to change this. + * @access private * @var array */ diff -r c26308d81882 -r c9fd175289aa includes/template.php --- a/includes/template.php Mon Nov 05 20:00:41 2007 -0500 +++ b/includes/template.php Fri Nov 09 11:14:20 2007 -0500 @@ -798,7 +798,7 @@ { $login_link = makeUrlNS('Special', 'Login/' . $paths->fullpage, 'level=' . $session->user_level, true); echo '

'; - echo 'Your administrative session has timed out. Log in again'; + echo 'Your administrative session has timed out. Log in again'; echo '

'; } if ( $this->site_disabled && $session->user_level >= USER_LEVEL_ADMIN && ( $paths->page != $paths->nslist['Special'] . 'Administration' ) ) diff -r c26308d81882 -r c9fd175289aa index.php --- a/index.php Mon Nov 05 20:00:41 2007 -0500 +++ b/index.php Fri Nov 09 11:14:20 2007 -0500 @@ -1,6 +1,6 @@ '; - run_test('return false;', 'Some scalebacks were made due to your server configuration.', 'Enano has detected that some of the features or configuration settings on your server are not optimal for the best behavior and/or performance for Enano. As a result, certain features or enhancements that are part of Enano have been disabled to prevent further errors. You have seen those "fatal error" notices that spew from PHP, haven\'t you?

Fatal error: call to undefined function wannahokaloogie() in file '.__FILE__.' on line '.__LINE__.'', true); + run_test('return false;', 'Some of the features of Enano have been turned off to accommodate your server.', 'Enano has detected that some of the features or configuration settings on your server are not optimal for the best behavior and/or performance for Enano. As a result, certain features or enhancements that are part of Enano have been disabled to prevent further errors. You have seen those "fatal error" notices that spew from PHP, haven\'t you?

Fatal error: call to undefined function wannahockaloogie() in file '.__FILE__.' on line '.__LINE__.'', true); echo ''; } else { echo ''; @@ -936,7 +936,7 @@

- +

Before clicking continue:
• Ensure that you are satisfied with any scalebacks that may have been made to accomodate your server configuration
• Have your database host, name, username, and password available
Before clicking continue:
• Review the list above to ensure that you are satisfied with any of Enano's workarounds for your server. If you need a particular feature and that feature is listed as disabled above, you should take the opportunity now to correct the problem.
• Have your database host, name, username, and password available

@@ -1161,26 +1161,137 @@ ?>
- - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Database information
Database hostname
This is the hostname (or sometimes the IP address) of your MySQL server. In many cases, this is "localhost".
Database name
The name of the actual database. If you don't already have a database, you can create one here, if you have the username and password of a MySQL user with administrative rights.
Database login
These fields should be the username and password of a user with "select", "insert", "update", "delete", "create table", and "replace" privileges for your database.
Optional information
Table prefix
The value that you enter here will be added to the beginning of the name of each Enano table. You may use lowercase letters (a-z), numbers (0-9), and underscores (_).
Database administrative login
If the MySQL database or username that you entered above does not exist yet, you can create them here, assuming that you have the login information for an administrative user (such as root). Leave these fields blank unless you need to use them.
MySQL version MySQL version information will be checked when you click "Test Connection".
Delete existing tables?
If this option is checked, all the tables that will be used by Enano will be dropped (deleted) before the schema is executed. Do NOT use this option unless specifically instructed to. Drop existing tables
+
Database information
+
+ Database hostname +
This is the hostname (or sometimes the IP address) of your MySQL server. In many cases, this is "localhost". +
+ + + + +
+ Database name
+ The name of the actual database. If you don't already have a database, you can create one here, if you have the username and password + of a MySQL user with administrative rights.
+ + + + + +
+ Database login
+ These fields should be the username and password of a user with "select", "insert", "update", "delete", "create table", and "replace" + privileges for your database.
+ + + + + +
+ +
+
Optional information
+
+ Table prefix
+ The value that you enter here will be added to the beginning of the name of each Enano table. You may use lowercase letters (a-z), + numbers (0-9), and underscores (_). + + + + +
+ Database administrative login
+ If the MySQL database or username that you entered above does not exist yet, you can create them here, assuming that you have the + login information for an administrative user (such as root). Leave these fields blank unless you need to use them.
+ + + + + +
+ +
+ MySQL version + + MySQL version information will be checked when you click "Test Connection". + + +
+ Delete existing tables?
+ If this option is checked, all the tables that will be used by Enano will be dropped (deleted) before the schema is executed. Do + NOT use this option unless specifically instructed to. + + Drop existing tables +
+ +

- - - - -
Before clicking continue:
• Check your MySQL connection using the "Test Connection" button.
• Be aware that your database information will be transmitted unencrypted several times.
-
+ + + + + +
+ + +
+ Before continuing:
+ • Check your MySQL connection using the "Test Connection" button.
+ • Be aware that your database information will be transmitted unencrypted several times. +
+
+

Database information
Database hostname This is the hostname (or sometimes the IP address) of your MySQL server. In many cases, this is "localhost".
Database name The name of the actual database. If you don't already have a database, you can create one here, if you have the username and password of a MySQL user with administrative rights.
Database login These fields should be the username and password of a user with "select", "insert", "update", "delete", "create table", and "replace" privileges for your database.

Optional information
Table prefix The value that you enter here will be added to the beginning of the name of each Enano table. You may use lowercase letters (a-z), numbers (0-9), and underscores (_).
Database administrative login If the MySQL database or username that you entered above does not exist yet, you can create them here, assuming that you have the login information for an administrative user (such as root). Leave these fields blank unless you need to use them.

MySQL version	MySQL version information will be checked when you click "Test Connection".
Delete existing tables? If this option is checked, all the tables that will be used by Enano will be dropped (deleted) before the schema is executed. Do NOT use this option unless specifically instructed to.	Drop existing tables

+ Database information +
+ Database hostname + This is the hostname (or sometimes the IP address) of your MySQL server. In many cases, this is "localhost". + +	+ +	+ +
+ Database name + The name of the actual database. If you don't already have a database, you can create one here, if you have the username and password + of a MySQL user with administrative rights. + +	+ +	+ +
+ Database login + These fields should be the username and password of a user with "select", "insert", "update", "delete", "create table", and "replace" + privileges for your database. + +	+ +	+ +
	+ +	+ +
+ Optional information +
+ Table prefix + The value that you enter here will be added to the beginning of the name of each Enano table. You may use lowercase letters (a-z), + numbers (0-9), and underscores (_). +	+ +	+ +
+ Database administrative login + If the MySQL database or username that you entered above does not exist yet, you can create them here, assuming that you have the + login information for an administrative user (such as root). Leave these fields blank unless you need to use them. + +	+ +	+ +
	+ +	+ +
+ MySQL version +	+ MySQL version information will be checked when you click "Test Connection". +	+ +
+ Delete existing tables? + If this option is checked, all the tables that will be used by Enano will be dropped (deleted) before the schema is executed. Do + NOT use this option unless specifically instructed to. +	+ Drop existing tables +
+ +