[vanillin commit] r281 - in trunk: setup themes/vanilla/styles/default

1 view
Skip to first unread message

codesite...@google.com

unread,
Sep 30, 2007, 4:48:36 PM9/30/07
to vanilli...@googlegroups.com
Author: helgith
Date: Sun Sep 30 13:47:37 2007
New Revision: 281

Modified:
trunk/setup/index.html
trunk/setup/installer.php
trunk/setup/upgrader.php
trunk/themes/vanilla/styles/default/people.css
trunk/themes/vanilla/styles/default/vanilla.css

Log:
And now we should be fully in sync with 1.1.3

Modified: trunk/setup/index.html
==============================================================================
--- trunk/setup/index.html (original)
+++ trunk/setup/index.html Sun Sep 30 13:47:37 2007
@@ -1,23 +1,23 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-ca">
<head>
- <title>Vanilla 1.1.2 Setup</title>
+ <title>Vanilla 1.1.3 Setup</title>
<link rel="stylesheet" type="text/css" href="./style.css" />
</head>
<body>
<h1>
- <span><strong>Vanilla 1.1.2</strong> Setup</span>
+ <span><strong>Vanilla 1.1.3</strong> Setup</span>
</h1>
<div class="Container">
<div class="Content">
<h2>Installing Fresh</h2>
<p>If you are creating a brand new installation of Vanilla, all you need to do is upload all of the Vanilla files to your server. Once you are finished uploading, open this file in your web browser and click the install link below.</p>
<div class="Button"><a href="installer.php">Click here to install a completely brand new version of Vanilla</a></div>
-
+
<h2>Upgrading</h2>
-
+
<div style="margin-top: 16px; padding: 8px; border: 1px solid #D53F90; background: #FFE6F4; color: #A52068; font-weight: bold;">If you are upgrading from Vanilla 1.x, <a style="color: #A52068;" href="http://lussumo.com/upgrade/">read the upgrade instructions online</a>.</div>
-
+
<p><strong>If you are upgrading from Vanilla 0.9.2.x, here are a few things you should do first:</strong></p>
<ul>
<li>
@@ -29,10 +29,10 @@
<p>Download and save your old Vanilla files to your local machine. Specifically, we can use your old appg/settings.php file for importing old settings.</p>
</li>
</ul>
-
+
<p>When you are finished backing everything up, upload all of the new Vanilla files to your server, open this file in your web browser and click the upgrade link below.</p>
-
- <div class="Button"><a href="upgrader.php">Click here to upgrade from Vanilla 0.9.2.x to Vanilla 1.1.2</a></div>
+
+ <div class="Button"><a href="upgrader.php">Click here to upgrade from Vanilla 0.9.2.x to Vanilla 1.1.3</a></div>
</div>
</div>
</body>

Modified: trunk/setup/installer.php
==============================================================================
--- trunk/setup/installer.php (original)
+++ trunk/setup/installer.php Sun Sep 30 13:47:37 2007
@@ -25,24 +25,24 @@
include '../appg/database.php';

// Set up some configuration defaults to override
-$Configuration['DATABASE_HOST'] = '';
-$Configuration['DATABASE_NAME'] = '';
-$Configuration['DATABASE_USER'] = '';
+$Configuration['DATABASE_HOST'] = '';
+$Configuration['DATABASE_NAME'] = '';
+$Configuration['DATABASE_USER'] = '';
$Configuration['DATABASE_PASSWORD'] = '';
-$Configuration['DATABASE_CHARACTER_ENCODING'] = '';
+$Configuration['DATABASE_CHARACTER_ENCODING'] = '';
$Configuration['APPLICATION_PATH'] = '';
-$Configuration['DATABASE_PATH'] = '';
-$Configuration['LIBRARY_PATH'] = '';
-$Configuration['EXTENSIONS_PATH'] = '';
+$Configuration['DATABASE_PATH'] = '';
+$Configuration['LIBRARY_PATH'] = '';
+$Configuration['EXTENSIONS_PATH'] = '';
$Configuration['LANGUAGES_PATH'] = '';
$Configuration['THEME_PATH'] = '';
$Configuration['BASE_URL'] = '';
-$Configuration['DEFAULT_STYLE'] = '';
+$Configuration['DEFAULT_STYLE'] = '';
$Configuration['WEB_ROOT'] = '';
-$Configuration['COOKIE_DOMAIN'] = '-';
-$Configuration['COOKIE_PATH'] = '-';
-$Configuration['SUPPORT_EMAIL'] = '';
-$Configuration['SUPPORT_NAME'] = '';
+$Configuration['COOKIE_DOMAIN'] = '-';
+$Configuration['COOKIE_PATH'] = '-';
+$Configuration['SUPPORT_EMAIL'] = '';
+$Configuration['SUPPORT_NAME'] = '';
$Configuration['FORWARD_VALIDATED_USER_URL'] = '';
$Configuration['CHARSET'] = 'utf-8';
$Configuration['DATABASE_TABLE_PREFIX'] = 'LUM_';
@@ -141,25 +141,25 @@

// Step 1. Check for correct PHP, MySQL, and permissions
if ($PostBackAction == "Permissions") {
-
+
// Make sure we are running at least PHP 4.1.0
if (intval(str_replace('.', '', phpversion())) < 410) $Context->WarningCollector->Add("It appears as though you are running PHP version ".phpversion().". Vanilla requires at least version 4.1.0 of PHP. You will need to upgrade your version of PHP before you can continue.");
// Make sure MySQL is available
- if (!function_exists('mysql_connect')) $Context->WarningCollector->Add("It appears as though you do not have MySQL enabled for PHP. You will need a working copy of MySQL and PHP's MySQL extensions enabled in order to run Vanilla.");
+ if (!function_exists('mysql_connect')) $Context->WarningCollector->Add("It appears as though you do not have MySQL enabled for PHP. You will need a working copy of MySQL and PHP's MySQL extensions enabled in order to run Vanilla.");
// Make sure the conf folder is readable
if (!is_readable('../conf/')) $Context->WarningCollector->Add("Vanilla needs to have read permission enabled on the conf folder.");
// Make sure the conf folder is writeable
if (!is_writable('../conf/')) $Context->WarningCollector->Add("Vanilla needs to have write permission enabled on the conf folder.");
-
+
// Make sure other folders are readable
if (!is_readable('../extensions/')) $Context->WarningCollector->Add("Vanilla needs to have read permission enabled on the extensions folder.");
if (!is_readable('../languages/')) $Context->WarningCollector->Add("Vanilla needs to have read permission enabled on the languages folder.");
if (!is_readable('../themes/')) $Context->WarningCollector->Add("Vanilla needs to have read permission enabled on the themes folder.");
if (!is_readable('../setup/')) $Context->WarningCollector->Add("Vanilla needs to have read permission enabled on the setup folder.");
-
+
// Make sure the files don't exist already (ie. the site is already up and running);
- if (file_exists('../conf/settings.php')) $Context->WarningCollector->Add("Vanilla seems to have been installed already. You will need to remove the conf/settings.php, conf/database.php files, and all database tables in order to run the installer utility again.");
-
+ if (file_exists('../conf/settings.php')) $Context->WarningCollector->Add("Vanilla seems to have been installed already. You will need to remove the conf/settings.php, conf/database.php files, and all database tables in order to run the installer utility again.");
+
if ($Context->WarningCollector->Count() == 0) {
$Contents = '<?php
// Database Configuration Settings
@@ -167,7 +167,7 @@
CreateFile($RootDirectory.'conf/database.php', $Contents, $Context);
$Contents = "<?php
// Make sure this file was not accessed directly and prevent register_globals configuration array attack
-if (!defined('IN_VANILLA')) exit();
+if (!defined('IN_VANILLA')) exit();
// Enabled Extensions
?>";
CreateFile($RootDirectory.'conf/extensions.php', $Contents, $Context);
@@ -191,7 +191,7 @@
$Context->WarningCollector->Add("For some reason we couldn't save your general settings to the '".$SettingsFile."' file.");
}
}
-
+
if ($Context->WarningCollector->Count() == 0) {
// Redirect to the next step (this is done so that refreshes don't cause steps to be redone)
Redirect($WebRoot.'setup/installer.php?Step=2&PostBackAction=None');
@@ -217,7 +217,7 @@
} elseif (!mysql_select_db($DBName, $Connection)) {
$Context->WarningCollector->Add("We connected to the server, but we couldn't access the \"".$DBName."\" database. Are you sure it exists and that the specified user has access to it?");
}
-
+
// If the database connection worked, attempt to set up the database
if ($Context->WarningCollector->Count() == 0 && $Connection) {
// On MySQL 4.1 and later, force UTF-8
@@ -225,7 +225,7 @@
mysql_query('SET NAMES "utf8"', $Connection);
$DatabaseCharacterEncoding = 'utf8';
}
-
+
// Make sure there are no conflicting tables in the database
$TableData = @mysql_query('show tables', $Connection);
if (!$TableData) {
@@ -281,12 +281,12 @@
}
}
}
- }
+ }
}
// Close the database connection
@mysql_close($Connection);
}
-
+
// If the database was created successfully, save all parameters to the conf/database.php file
if ($Context->WarningCollector->Count() == 0) {
$DBManager->DefineSetting("DATABASE_HOST", $DBHost, 1);
@@ -330,14 +330,14 @@
}
}
}
-
+
if ($Context->WarningCollector->Count() == 0) {
// Redirect to the next step (this is done so that refreshes don't cause steps to be redone)
Redirect($WebRoot.'setup/installer.php?Step=3&PostBackAction=None');
}
} elseif ($PostBackAction == "User") {
$CurrentStep = 3;
-
+
$SettingsFile = $RootDirectory . 'conf/settings.php';
$SettingsManager = new ConfigurationManager($Context);
$SettingsManager->GetSettingsFromFile($SettingsFile);
@@ -354,11 +354,11 @@
if ($SupportName == "") $Context->WarningCollector->Add("You must provide a support contact name.");
if (!eregi("(.+)@(.+)\.(.+)", $SupportEmail)) $Context->WarningCollector->Add("The email address you entered doesn't appear to be valid.");
if ($ApplicationTitle == "") $Context->WarningCollector->Add("You must provide an application title.");
-
+
// Include the db settings defined in the previous step
include($RootDirectory.'conf/database.php');
$Context->DatabaseTables['User'] = $DatabaseTables['User'];
-
+
// Open the database connection
$Connection = false;
if ($Context->WarningCollector->Count() == 0) {
@@ -376,12 +376,12 @@
mysql_query('SET NAMES "utf8"', $Connection);
}
}
-
+
// Create the administrative user
if ($Context->WarningCollector->Count() == 0 && $Connection) {
$Username = FormatStringForDatabaseInput($Username);
$Password = FormatStringForDatabaseInput($Password);
-
+
$s = new SqlBuilder($Context);
$s->SetMainTable('User', 'u');
$s->AddFieldNameValue('FirstName', 'Administrative');
@@ -421,10 +421,10 @@
$s->AddFieldNameValue('Url', $ThemeDirectory.'vanilla/styles/default/');
@mysql_query($s->GetInsert(), $Connection);
}
-
+
// Close the database connection
@mysql_close($Connection);
-
+
// Save the application constants
if ($Context->WarningCollector->Count() == 0) {
$SettingsManager->DefineSetting("SUPPORT_EMAIL", $SupportEmail, 1);
@@ -437,24 +437,24 @@
$SettingsManager->SaveSettingsToFile($SettingsFile);
}
}
-
+
if ($Context->WarningCollector->Count() == 0) {
// Redirect to the next step (this is done so that refreshes don't cause steps to be redone)
Redirect($WebRoot.'setup/installer.php?Step=4&PostBackAction=None');
}
-}
-
+}
+
// Write the page
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-ca">
<head>
- <title>Vanilla 1.1.2 Installer</title>
+ <title>Vanilla 1.1.3 Installer</title>
<link rel="stylesheet" type="text/css" href="./style.css" />
</head>
<body>
<h1>
- <span><strong>Vanilla 1.1.2</strong> Installer</span>
+ <span><strong>Vanilla 1.1.3</strong> Installer</span>
</h1>
<div class="Container">
<div class="Content">
@@ -468,18 +468,18 @@
</div>";
}
echo "<p>Navigate the filesystem of your server to the Vanilla folder. Vanilla will need read AND write access to the <strong>conf</strong> folder.</p>
-
+
<p>There are many ways to set these permissions. One way is to execute the following from the root Vanilla folder:</p>
-
+
<code>chmod 777 ./conf</code>
-
+
<p>You will also need to grant read access to the extensions, languages, setup, and themes folders. Typically these permissions are granted by default, but if not you can achieve them with the following commands:</p>
-
+
<code>chmod -R 755 ./extensions
<br />chmod -R 755 ./languages
<br />chmod -R 755 ./setup
<br />chmod -R 755 ./themes</code>
-
+
<form id=\"frmPermissions\" method=\"post\" action=\"installer.php\">
<input type=\"hidden\" name=\"PostBackAction\" value=\"Permissions\" />
<div class=\"Button\"><input type=\"submit\" value=\"Click here to check your permissions and proceed to the next step\" /></div>
@@ -603,7 +603,7 @@
<li>Create new categories, and even limit which roles get to access them</li>
</ul>
<p>All of these configuration options (and many more) are available in the settings tab of your Vanilla forum.</p>
-
+
<p>If you need some help getting started with administering your new Vanilla forum, you can <a href=\"http://lussumo.com/docs\" target=\"Lussumo\">read the complete documentation</a> or ask for help on the <a href=\"http://lussumo.com/community/\" target=\"Lussumo\">Lussumo Community Forum</a>. Enough talking...</p>
<div class=\"Button\"><a href=\"../people.php\">Go sign in and have some fun!</a></div>";
}

Modified: trunk/setup/upgrader.php
==============================================================================
--- trunk/setup/upgrader.php (original)
+++ trunk/setup/upgrader.php Sun Sep 30 13:47:37 2007
@@ -25,23 +25,23 @@
include '../appg/database.php';

// Set up some configuration defaults to override
-$Configuration['DATABASE_HOST'] = '';
-$Configuration['DATABASE_NAME'] = '';
-$Configuration['DATABASE_USER'] = '';
+$Configuration['DATABASE_HOST'] = '';
+$Configuration['DATABASE_NAME'] = '';
+$Configuration['DATABASE_USER'] = '';
$Configuration['DATABASE_PASSWORD'] = '';
$Configuration['APPLICATION_PATH'] = '';
-$Configuration['DATABASE_PATH'] = '';
-$Configuration['LIBRARY_PATH'] = '';
-$Configuration['EXTENSIONS_PATH'] = '';
+$Configuration['DATABASE_PATH'] = '';
+$Configuration['LIBRARY_PATH'] = '';
+$Configuration['EXTENSIONS_PATH'] = '';
$Configuration['LANGUAGES_PATH'] = '';
$Configuration['THEME_PATH'] = '';
$Configuration['BASE_URL'] = '';
-$Configuration['DEFAULT_STYLE'] = '';
+$Configuration['DEFAULT_STYLE'] = '';
$Configuration['WEB_ROOT'] = '';
-$Configuration['COOKIE_DOMAIN'] = '';
-$Configuration['COOKIE_PATH'] = '';
-$Configuration['SUPPORT_EMAIL'] = '';
-$Configuration['SUPPORT_NAME'] = '';
+$Configuration['COOKIE_DOMAIN'] = '';
+$Configuration['COOKIE_PATH'] = '';
+$Configuration['SUPPORT_EMAIL'] = '';
+$Configuration['SUPPORT_NAME'] = '';
$Configuration['FORWARD_VALIDATED_USER_URL'] = '';
$Configuration['CHARSET'] = 'utf-8';
$Configuration['DATABASE_TABLE_PREFIX'] = 'LUM_';
@@ -110,7 +110,7 @@
} else {
while ($Row = mysql_fetch_array($Data)) {
$FoundColumns[] = $Row[0];
- }
+ }
}
return $FoundColumns;
}
@@ -158,7 +158,7 @@
// Include the old settings file if it is present (it just contains constants)
if (file_exists($RootDirectory.'conf/old_settings.php')) {
include($RootDirectory.'conf/old_settings.php');
-
+
// Now re-assign the default configuration settings to the ones defined as constants in the old version
if (defined('dbHOST')) {
$NewConfiguration['DATABASE_HOST'] = dbHOST;
@@ -175,7 +175,7 @@
if (defined('dbPASSWORD')) {
$NewConfiguration['DATABASE_PASSWORD'] = dbPASSWORD;
$DBPass = dbPASSWORD;
- }
+ }
if (defined('agAPPLICATION_TITLE')) {
$NewConfiguration['APPLICATION_TITLE'] = agAPPLICATION_TITLE;
$ApplicationTitle = agAPPLICATION_TITLE;
@@ -210,7 +210,7 @@
if (defined('agCOMMENT_THRESHOLD_PUNISHMENT')) $NewConfiguration['COMMENT_THRESHOLD_PUNISHMENT'] = agCOMMENT_THRESHOLD_PUNISHMENT;
if (defined('agDEFAULT_ROLE')) $NewConfiguration['DEFAULT_ROLE'] = agDEFAULT_ROLE;
if (defined('agALLOW_IMMEDIATE_ACCESS')) $NewConfiguration['ALLOW_IMMEDIATE_ACCESS'] = agALLOW_IMMEDIATE_ACCESS;
- if (defined('agAPPROVAL_ROLE')) $NewConfiguration['APPROVAL_ROLE'] = agAPPROVAL_ROLE;
+ if (defined('agAPPROVAL_ROLE')) $NewConfiguration['APPROVAL_ROLE'] = agAPPROVAL_ROLE;
}

// Retrieve all postback parameters
@@ -245,25 +245,25 @@

// Step 1. Check for correct PHP, MySQL, and permissions
if ($PostBackAction == "Permissions") {
-
+
// Make sure we are running at least PHP 4.1.0
if (intval(str_replace('.', '', phpversion())) < 410) $Context->WarningCollector->Add("It appears as though you are running PHP version ".phpversion().". Vanilla requires at least version 4.1.0 of PHP. You will need to upgrade your version of PHP before you can continue.");
// Make sure MySQL is available
- if (!function_exists('mysql_connect')) $Context->WarningCollector->Add("It appears as though you do not have MySQL enabled for PHP. You will need a working copy of MySQL and PHP's MySQL extensions enabled in order to run Vanilla.");
+ if (!function_exists('mysql_connect')) $Context->WarningCollector->Add("It appears as though you do not have MySQL enabled for PHP. You will need a working copy of MySQL and PHP's MySQL extensions enabled in order to run Vanilla.");
// Make sure the conf folder is readable
if (!is_readable('../conf/')) $Context->WarningCollector->Add("Vanilla needs to have read permission enabled on the conf folder.");
// Make sure the conf folder is writeable
if (!is_writable('../conf/')) $Context->WarningCollector->Add("Vanilla needs to have write permission enabled on the conf folder.");
-
+
// Make sure other folders are readable
if (!is_readable('../extensions/')) $Context->WarningCollector->Add("Vanilla needs to have read permission enabled on the extensions folder.");
if (!is_readable('../languages/')) $Context->WarningCollector->Add("Vanilla needs to have read permission enabled on the languages folder.");
if (!is_readable('../themes/')) $Context->WarningCollector->Add("Vanilla needs to have read permission enabled on the themes folder.");
if (!is_readable('../setup/')) $Context->WarningCollector->Add("Vanilla needs to have read permission enabled on the setup folder.");
-
+
// Make sure the files don't exist already (ie. the site is already up and running);
if (file_exists('../conf/settings.php')) $Context->WarningCollector->Add("Vanilla seems to have been upgraded already. You will need to remove the conf/settings.php and conf/database.php files to run the upgrade utility again.");
-
+
if ($Context->WarningCollector->Count() == 0) {
$Contents = '<?php
// Database Configuration Settings
@@ -271,7 +271,7 @@
CreateFile($RootDirectory.'conf/database.php', $Contents, $Context);
$Contents = "<?php
// Make sure this file was not accessed directly and prevent register_globals configuration array attack
-if (!defined('IN_VANILLA')) exit();
+if (!defined('IN_VANILLA')) exit();
// Enabled Extensions
?>";
CreateFile($RootDirectory.'conf/extensions.php', $Contents, $Context);
@@ -295,7 +295,7 @@
$Context->WarningCollector->Add("For some reason we couldn't save your general settings to the '".$SettingsFile."' file.");
}
}
-
+
if ($Context->WarningCollector->Count() == 0) {
// Redirect to the next step (this is done so that refreshes don't cause steps to be redone)
Redirect($WebRoot.'setup/upgrader.php?Step=2&PostBackAction=None');
@@ -311,10 +311,10 @@
} elseif (!mysql_select_db($DBName, $Connection)) {
$Context->WarningCollector->Add("We connected to the server, but we couldn't access the \"".$DBName."\" database. Are you sure it exists and that the specified user has access to it?");
}
-
+
// If the database connection worked...
if ($Context->WarningCollector->Count() == 0 && $Connection) {
-
+
// Make sure all of the required tables are there for upgrading
$TableData = @mysql_query('show tables', $Connection);
if (!$TableData) {
@@ -351,11 +351,11 @@
$Context->WarningCollector->Add("It appears as though your Vanilla installation is missing some tables: <code>".$MissingTables."</code>");
} else {
// 1. Upgrade Role Table (The hard part first)
-
+
// Check for current columns in the table
$RoleData = @mysql_query('show columns from '.$DatabaseTables['Role'], $Connection);
$RoleColumns = GetColumns($Connection, $DatabaseTables['Role']);
-
+
// 1a. Rename columns
if ($Context->WarningCollector->Count() == 0) {
if (in_array('CanLogin', $RoleColumns) && !in_array('PERMISSION_SIGN_IN', $RoleColumns)) {
@@ -363,14 +363,14 @@
if (!@mysql_query($AlterSQL, $Connection)) $Context->WarningCollector->Add("An error occurred renaming LUM_Role.CanLogin to LUM_Role.PERMISSION_SIGN_IN. MySQL reported the following error: <code>".mysql_error($Connection).'</code>');
}
}
-
+
if ($Context->WarningCollector->Count() == 0) {
if (in_array('CanPostHTML', $RoleColumns) && !in_array('PERMISSION_HTML_ALLOWED', $RoleColumns)) {
$AlterSQL = "alter table ".$DatabaseTables['Role']." change CanPostHTML PERMISSION_HTML_ALLOWED enum('1','0') not null default '0'";
if (!@mysql_query($AlterSQL, $Connection)) $Context->WarningCollector->Add("An error occurred renaming LUM_Role.CanPostHTML to LUM_Role.PERMISSION_HTML_ALLOWED. MySQL reported the following error: <code>".mysql_error($Connection).'</code>');
}
}
-
+
// 1b. Add new columns
if ($Context->WarningCollector->Count() == 0) {
if (!in_array('PERMISSION_RECEIVE_APPLICATION_NOTIFICATION', $RoleColumns)) {
@@ -378,7 +378,7 @@
if (!@mysql_query($AlterSQL, $Connection)) $Context->WarningCollector->Add("An error occurred while adding LUM_Role.PERMISSION_RECEIVE_APPLICATION_NOTIFICATION. MySQL reported the following error: <code>".mysql_error($Connection).'</code>');
}
}
-
+
if ($Context->WarningCollector->Count() == 0) {
if (!in_array('Permissions', $RoleColumns)) {
$AlterSQL = "alter table ".$DatabaseTables['Role']." add Permissions text";
@@ -397,7 +397,7 @@
if (!@mysql_query($AlterSQL, $Connection)) $Context->WarningCollector->Add("An error occurred while adding LUM_Role.UnAuthenticated. MySQL reported the following error: <code>".mysql_error($Connection).'</code>');
}
}
-
+
// 1c. Retrieve current permissions, serialize, and resave as long as the MasterAdmin column was present
if (in_array('MasterAdmin', $RoleColumns)) {
// Get an updated version of the columns in the database (Because some were changed above)
@@ -447,8 +447,8 @@
$Permissions['PERMISSION_MANAGE_THEMES'] = ForceBool(@$Row['MasterAdmin'], 0);
$Permissions['PERMISSION_MANAGE_STYLES'] = ForceBool(@$Row['MasterAdmin'], 0);
$Permissions['PERMISSION_ALLOW_DEBUG_INFO'] = ForceBool(@$Row['MasterAdmin'], 0);
-
-
+
+
$UpdateSQL = "update ".$DatabaseTables['Role']." set Permissions = '".SerializeArray($Permissions)."' where RoleID = ".$RoleID;
if (!@mysql_query($UpdateSQL, $Connection)) {
$Context->WarningCollector->Add("An error occurred while updating LUM_Role data. MySQL reported the following error: <code>".mysql_error($Connection).'</code>');
@@ -459,7 +459,7 @@
}
}
}
-
+
// 1d. Remove old permission columns
if ($Context->WarningCollector->Count() == 0) {
// Silently drop these columns. If any errors occur, it doesn't
@@ -493,7 +493,7 @@
@mysql_query($AlterSQL, $Connection);
}
}
-
+
// 1e. Make sure that there is an unauthenticated role.
if ($Context->WarningCollector->Count() == 0) {
$SelectSQL = "select RoleID from ".$DatabaseTables['Role']." where UnAuthenticated = '1'";
@@ -512,13 +512,13 @@
}
}
}
-
+
if ($Context->WarningCollector->Count() == 0) {
// Retrieve Category Columns
$CategoryColumns = GetColumns($Connection, $DatabaseTables['Category']);
$DiscussionColumns = GetColumns($Connection, $DatabaseTables['Discussion']);
$UserColumns = GetColumns($Connection, $DatabaseTables['User']);
-
+
// Make remaining table alterations
if (in_array('Order', $CategoryColumns) && !in_array('Priority', $CategoryColumns)) {
$AlterSQL = "alter table ".$DatabaseTables['Category']." change `Order` Priority int not null default '0'";
@@ -546,12 +546,12 @@
@mysql_query($AlterSQL, $Connection);
}
}
- }
+ }
}
// Close the database connection
@mysql_close($Connection);
}
-
+
// If the database was upgraded successfully, save all parameters to the conf/database.php file
if ($Context->WarningCollector->Count() == 0) {
// Save database settings
@@ -565,7 +565,7 @@
$DBManager->DefineSetting("DATABASE_USER", $DBUser, 1);
$DBManager->DefineSetting("DATABASE_PASSWORD", $DBPass, 1);
$DBManager->SaveSettingsToFile($DBFile);
-
+
// Save the general settings as well (now that we know this person is authenticated to
// a degree - knowing the database access params).
$SettingsFile = $RootDirectory . 'conf/settings.php';
@@ -590,20 +590,20 @@
Redirect($WebRoot.'setup/upgrader.php?Step=3&PostBackAction=None');
}
} elseif ($PostBackAction == "User") {
- $CurrentStep = 3;
+ $CurrentStep = 3;
// Validate user inputs
if (strip_tags($ApplicationTitle) != $ApplicationTitle) $Context->WarningCollector->Add("You can't have any html in your forum name.");
if ($SupportName == "") $Context->WarningCollector->Add("You must provide a support contact name.");
if (!eregi("(.+)@(.+)\.(.+)", $SupportEmail)) $Context->WarningCollector->Add("The email address you entered doesn't appear to be valid.");
if ($ApplicationTitle == "") $Context->WarningCollector->Add("You must provide an application title.");
-
+
$SettingsFile = $RootDirectory . 'conf/settings.php';
$SettingsManager = new ConfigurationManager($Context);
$SettingsManager->GetSettingsFromFile($SettingsFile);
if ($SettingsManager->GetSetting('SETUP_COMPLETE') != '1') {
// Include the db settings defined in the previous step
include($RootDirectory.'conf/database.php');
-
+
// Open the database connection
$Connection = false;
if ($Context->WarningCollector->Count() == 0) {
@@ -618,7 +618,7 @@
$Context->WarningCollector->Add("We connected to the server, but we couldn't access the \"".$DBName."\" database. Are you sure it exists and that the specified user has access to it?");
}
}
-
+
// Insert the new Style and assign to all users
if ($Context->WarningCollector->Count() == 0 && $Connection) {
// Truncate all old styles (They can't work with the new Vanilla)
@@ -643,10 +643,10 @@
}
}
}
-
+
// Close the database connection
@mysql_close($Connection);
-
+
// Save the application constants
if ($Context->WarningCollector->Count() == 0) {
$SettingsManager->DefineSetting("SUPPORT_EMAIL", $SupportEmail, 1);
@@ -659,7 +659,7 @@
} else {
$SettingsManager->DefineSetting("BANNER_TITLE", $ApplicationTitle, 1);
}
-
+
// Apply old settings if they were provided
ApplySetting($SettingsManager, $NewConfiguration, 'DISCUSSIONS_PER_PAGE');
ApplySetting($SettingsManager, $NewConfiguration, 'COMMENTS_PER_PAGE');
@@ -689,33 +689,33 @@
} else {
$Context->WarningCollector->Add("Vanilla seems to have been upgraded already. You will need to remove the conf/settings.php and conf/database.php files to run the upgrade utility again.");
}
-
+
if ($Context->WarningCollector->Count() == 0) {
// Redirect to the next step (this is done so that refreshes don't cause steps to be redone)
Redirect($WebRoot.'setup/upgrader.php?Step=4&PostBackAction=None');
}
-}
+}

// Write the page
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-ca">
<head>
- <title>Vanilla 1.1.2 Upgrader</title>
+ <title>Vanilla 1.1.3 Upgrader</title>
<link rel="stylesheet" type="text/css" href="./style.css" />
</head>
<body>
<h1>
- <span><strong>Vanilla 1.1.2</strong> Upgrader</span>
+ <span><strong>Vanilla 1.1.3</strong> Upgrader</span>
</h1>
<div class="Container">
<div class="Content">
<?php
if ($CurrentStep < 2 || $CurrentStep > 4) {
echo '<h2>Vanilla Upgrade Wizard (Step 1 of 3)</h2>
-
+
<p><strong>Only use this upgrader if you are upgrading from Vanilla 0.9.2.x</strong></p>';
-
+
if ($Context->WarningCollector->Count() > 0) {
echo "<div class=\"Warnings\">
<strong>We came across some problems while checking your permissions...</strong>
@@ -723,20 +723,20 @@
</div>";
}
echo "<p>Navigate the filesystem of your server to the Vanilla folder. If you have your old appg/settings.php file from your previous installation of Vanilla, rename it <strong>old_settings.php</strong> and upload it to the /conf folder of your new Vanilla installation.</p>
-
+
<p>Vanilla will need read AND write access to the <strong>conf</strong> folder.</p>
-
+
<p>There are many ways to set these permissions. One way is to execute the following from the root Vanilla folder:</p>
-
+
<code>chmod 777 ./conf</code>
-
+
<p>You will also need to grant read access to the extensions, languages, setup, and themes folders. Typically these permissions are granted by default, but if not you can achieve them with the following commands:</p>
-
+
<code>chmod -R 755 ./extensions
<br />chmod -R 755 ./languages
<br />chmod -R 755 ./setup
<br />chmod -R 755 ./themes</code>
-
+
<form id=\"frmPermissions\" method=\"post\" action=\"upgrader.php\">
<input type=\"hidden\" name=\"PostBackAction\" value=\"Permissions\" />
<div class=\"Button\"><input type=\"submit\" value=\"Click here to check your permissions and proceed to the next step\" /></div>
@@ -790,7 +790,7 @@
echo "<p>Now we've got to set up the support contact information for your forum. This is what people will see when emails go out from the system for things like password retrieval and role changes.</p>
<fieldset>"
.'<form name="frmUser" method="post" action="upgrader.php">
- <input type="hidden" name="PostBackAction" value="User" />
+ <input type="hidden" name="PostBackAction" value="User" />
<ul>
<li>
<label for="tSupportName">Support Contact Name</label>
@@ -831,7 +831,7 @@
<li>Public &amp; Private browsing on the Registration Management Form</li>
<li>On public forums, make sure that the unauthenticated role has access to all public discussion categories</li>
</ul>
-
+
<p>If you find that there was some unforseen problem with the upgrade procedure, visit <a href=\"http://lussumo.com/community/\" target=\"Lussumo\">Lussumo Community Forum</a> for help.</p>
<div class=\"Button\"><a href=\"../people.php\">Go sign in and have some fun!</a></div>";
}

Modified: trunk/themes/vanilla/styles/default/people.css
==============================================================================
--- trunk/themes/vanilla/styles/default/people.css (original)
+++ trunk/themes/vanilla/styles/default/people.css Sun Sep 30 13:47:37 2007
@@ -11,8 +11,8 @@
*/


-/* Global Definitions */
-body {
+/* Global Definitions */
+body {
background: #F5F9FF;
text-align: center;
}
@@ -51,7 +51,7 @@
.Error {
color: #c00;
font-size: 12px;
-}
+}
.SiteContainer {
margin-top: 100px;
border: 1px solid #c7d3ea;
@@ -65,7 +65,7 @@
}

/* Various page widths */
-
+
.SignIn { width: 280px; }
.PasswordRequest { width: 500px; }
.PasswordRequest .PageTitle{ width: 492px; }
@@ -74,7 +74,7 @@
.PasswordReset { width: 550px; }

/* Banner */
-
+
h1 {
text-align: center;
background: url('waves.blue.gif') no-repeat center top #E5EAF6;
@@ -92,14 +92,13 @@
font-weight: normal;
color: orange;
}
-
+
/* About Paragraphs */

.About {
margin: 8px 0px 0px 0px;
padding: 0px 4px 0px 8px;
width: 260px;
- xborder-right: 1px solid #f3f3f3;
position: absolute;
}
.About h2 {
@@ -121,7 +120,7 @@
}

/* Forms */
-
+
fieldset {
border: 0px;
margin: 0px;
@@ -171,7 +170,7 @@
width: auto;
cursor: pointer;
}
-
+
/* Sign-In Page */

#Form.SignInForm fieldset {
@@ -224,7 +223,7 @@
.ApplyForMembershipLink {
padding-left: 136px !important;
}
-
+
/* Password Request Form */

.PasswordRequestForm .ErrorContainer {
@@ -236,7 +235,7 @@
.PasswordRequestForm {
padding: 0px 0px 0px 247px;
}
-
+
/* Apply Form */
#Form.ApplyForm {
padding: 0px 0px 0px 282px;
@@ -273,7 +272,7 @@
#TermsOfServiceCheckBox a {
text-decoration: underline;
}
-
+
/* Password Reset Form */

#Form.PasswordResetForm .ErrorContainer {
@@ -281,16 +280,16 @@
}
#Form.PasswordResetForm .Submit {
padding-left:100px;
- }
+ }
.PasswordReset .About {
width: 254px;
}
-#Form.PasswordResetForm {
+.PasswordResetForm {
padding: 0px 0px 0px 267px;
}
-
+
/* Form Complete */
-
+
.FormComplete {
padding: 8px 16px 16px 16px;
}
@@ -317,7 +316,7 @@
}

/* Foot */
-
+
.Foot {
color: #ccc;
text-align: center;
@@ -329,4 +328,4 @@
.Foot a:hover {
color: #aaa;
background: none;
- }
\ No newline at end of file
+ }
\ No newline at end of file

Modified: trunk/themes/vanilla/styles/default/vanilla.css
==============================================================================
--- trunk/themes/vanilla/styles/default/vanilla.css (original)
+++ trunk/themes/vanilla/styles/default/vanilla.css Sun Sep 30 13:47:37 2007
@@ -23,7 +23,7 @@
width: 1px;
font-size: 1px;
}
-
+
/* Errors & Success */
.ErrorContainer {
background: url(alert.gif) no-repeat top left #FFEDEF;
@@ -58,7 +58,7 @@
color: #D57D00;
line-height: 150%;
}
-
+
/* Remove System Message Button */
.Notice span {
float:right;
@@ -73,7 +73,7 @@
}
.Invisible { display: none; }
.Visible { display: block; }
-
+
/* Session.. */

#Session {
@@ -271,6 +271,9 @@
margin:0px;
padding:0px;
}
+.ContentInfo h1 {
+ color:#000;
+}
#CommentsPage .ContentInfo h1 {
float:left;
width:60%;
@@ -278,8 +281,9 @@
white-space:nowrap;
text-align:left;
}
-html>body .ContentInfo h1 { width:80% !important; }
-body#DiscussionsPage .ContentInfo h1 { width:auto !important; }
+html>body#CommentsPage .ContentInfo h1 {
+ width:80% !important;
+}
.ContentInfo input {
font-size:10px;
margin-left:5px;
@@ -336,7 +340,7 @@
}

/* Discussion Index */
-
+
#PageJump {
margin: 9px 0px 0px 20px;
float: right;
@@ -346,7 +350,7 @@
margin-top:-5px !important;
float: left;
width: 100%;
- }
+ }
#Discussions, #Discussions * {
margin:0px;
padding:0px;
@@ -434,7 +438,7 @@
}

/* Category Index */
-
+
#CategoryPage div.ContentInfo h1 {
float: left;
text-align: left;
@@ -623,7 +627,7 @@
#Comments .CommentBody ol li {
border-bottom:none;
padding:0px;
- }
+ }
#CommentsPage .ContentInfo.Middle .PageInfo {
border-top: 0px;
margin:0px;
@@ -638,7 +642,7 @@
padding-left: 16px;
display: block;
white-space: pre;
- }
+ }

/* Thanks to Bergamot */
#Comments blockquote {
@@ -710,7 +714,7 @@
color: #f60 !important;
position: relative;
top: -20px;
- float: right;
+ float: right;
}

/* Advanced Search Form */
@@ -728,9 +732,9 @@
#ddRoles, #ddOrder, #ddCommentCategories, #ddDiscussionCategories {
width: auto !important;
}
-
+
/* Search Results */
-
+
#SearchPage {
margin-bottom: 20px;
}
@@ -743,7 +747,7 @@
}

/* Comment Search Results */
-
+
#CommentResults {
margin-top:-5px !important;
}
@@ -772,7 +776,7 @@
}
#CommentResults ul a {
color:#777;
- }
+ }
#CommentResults .CommentResult ul {
background-color:#fff !important;
}
@@ -812,7 +816,7 @@
}

/* User Search Results */
-
+
#UserResults {
margin-top:-5px !important;
}
@@ -860,7 +864,7 @@
margin-right: 6px !important;
background-repeat:no-repeat !important;
display: inline !important;
- background: center center no-repeat;
+ background: center center no-repeat;
}
li.User.Name a {
font-size: 14px;
@@ -931,7 +935,7 @@
font-family:'Trebuchet MS', 'Verdana', 'Tahoma', 'Arial', sans-serif;
font-size:13px;
font-weight: normal;
- }
+ }
#Form textarea {
width:99.5%;
height:150px;
@@ -963,14 +967,14 @@
}
#Form.AddComments {
width: 100%;
- }
+ }
#Form.AddComments fieldset {
margin: 0px;
}
#Form.AddComments form {
margin-top: 0px !important;
}
-#Form.StartDiscussion label,
+#Form.StartDiscussion label,
#Form.AddComments label {
display:block;
width:100%;
@@ -991,7 +995,7 @@
}
.DiscussionBox {
width: 400px;
- }
+ }
#Form .Button {
width: auto !important;
}
@@ -1068,7 +1072,7 @@
margin-top:5px;
}
#Form.Account p span label {
- float:none;
+ float:none;
display:inline;
margin-left:5px;
font-weight:bold;
@@ -1081,9 +1085,9 @@
#Form.Preferences p span label {
font-weight: normal;
}
-
+
/* Globals Form */
-
+
#Form.GlobalsForm select.SmallSelect {
font-size: 11px;
width: 50px;
@@ -1097,7 +1101,7 @@
#Form.GlobalsForm p {
margin-bottom: 10px;
}
-
+
/* Update Check form */
.UpdateOld .Name,
.UpdateGood .Name,
@@ -1134,9 +1138,9 @@
background: url(progress.gif) no-repeat center left;
}

-
+
/* RoleEdit Form */
-
+
#Form.RoleEditForm li p span label {
font-weight: normal !important;
}
@@ -1145,7 +1149,7 @@
#Form.CategoryList .RoleBlocked {
background: url(disabled-tile.gif) #F4F4C2;
}
-
+
/* Category Form */
#Form.CategoryForm li p span label {
font-weight: normal !important;
@@ -1164,7 +1168,7 @@
div.Extensions ul {
background-color:#fffeec;
}
-div.Extensions ul li {
+div.Extensions ul li {
border-bottom:1px solid #ddd;
margin:0px !important;
padding:10px !important;
@@ -1255,7 +1259,7 @@
}

/* Custom form for sortable list */
-
+
.SortList {
background-color: #ffc;
border: 1px solid #ddd;
@@ -1390,7 +1394,7 @@
display: inline;
float: left;
width: 32px;
- }
+ }
#AccountProfile .ProfileTitle p {
width:auto;
float: right;
@@ -1454,9 +1458,9 @@
padding-bottom:0px;
font-style:italic;
}
-
+
/* Settings Home */
-
+
#Form.Help form {
width: 450px !important;
margin: 0px;
@@ -1495,7 +1499,7 @@
}

/* Autocomplete results */
-
+
.AutoCompleteContainer {
margin: 0px;
padding: 0px;
@@ -1514,7 +1518,7 @@
background: #335EA8;
color: #fff;
}
-
+
/* Ajax progress */
.HideProgress {
background: url(hprogress.gif) center center no-repeat;
@@ -1543,7 +1547,7 @@
}

/* IE Rendering Fixes */
-
+
#Body, #Form h2, #Form p {height: 1%;}

/* Thank you positioniseverything.com*/
@@ -1558,23 +1562,23 @@
.clearfix {
display:inline-table;
}
-
+
/* Hides from IE-mac \*/
-
+
* html .clearfix {
height:1%;
}
.clearfix {
display:block;
}
-
+
/* End hide from IE-mac */
-
+
/* IE 7 Fixes - thanks WallPhone */
-
+
#Content .ContentInfo.Bottom .PageInfo p {
min-width: 20px;
}
html>body #Content .ContentInfo.Bottom .PageInfo {
border-top: 1px solid #fff;
- }
\ No newline at end of file
+ }
\ No newline at end of file

Reply all
Reply to author
Forward
0 new messages