[vanillin commit] r277 - in trunk: . appg
codesite...@google.com
Date: Sun Sep 30 13:36:13 2007
New Revision: 277
Modified:
trunk/account.php
trunk/appg/settings.php
trunk/comments.php
Log:
Sync with Vanilla 1.1.3
Modified: trunk/account.php
==============================================================================
--- trunk/account.php (original)
+++ trunk/account.php Sun Sep 30 13:36:13 2007
@@ -57,12 +57,17 @@
$Menu->CurrentTab = 'account';
$Panel->CssClass = 'AccountPanel';
$Panel->BodyCssClass = 'AccountPageBody';
-if ($AccountUser->UserID == $session->UserID) {
- $Context->PageTitle = $Context->GetDefinition('MyAccount');
+if ($AccountUser) {
+ if ($AccountUser->UserID == $session->UserID) {
+ $Context->PageTitle = $Context->GetDefinition('MyAccount');
+ } else {
+ $Context->PageTitle = $AccountUser->Name;
+ }
} else {
- $Context->PageTitle = $AccountUser->Name;
+ $Context->PageTitle = $Context->GetDefinition("ErrUserNotFound");
}
+
// 2. BUILD PAGE CONTROLS
// Build the control panel
if ($session->UserID > 0) {
@@ -85,7 +90,7 @@
}
}
}
- if ($AccountUser->UserID == $session->UserID) {
+ if ($AccountUser && $AccountUser->UserID == $session->UserID) {
$Panel->AddListItem($AccountOptions, $Context->GetDefinition('ChangeForumFunctionality'), GetUrl($Context->Configuration, $Context->SelfUrl, '', '', '', '', 'PostBackAction=Functionality'), '', '', 40);
}
}
Modified: trunk/appg/settings.php
==============================================================================
--- trunk/appg/settings.php (original)
+++ trunk/appg/settings.php Sun Sep 30 13:36:13 2007
@@ -9,7 +9,7 @@
* Contact Mark O'Sullivan at mark [at] lussumo [dot] com
*
* Description: Global application constants
-*
+*
*
*
*
@@ -23,7 +23,7 @@
*
*
*
-*
+*
* If you wish to override any configuration setting, do it in the
* conf/settings.php file. This file will be overwritten when you apply upgrades
* to Vanilla. The conf/settings.php file will NOT be overwritten.
@@ -36,27 +36,27 @@
// Database Settings
$Configuration['DATABASE_SERVER'] = 'mysql'; // drivers MDB2 supports mysql, mysqli, pgsql, sqlite
$Configuration['DATABASE_TABLE_PREFIX'] = 'LUM_';
-$Configuration['DATABASE_HOST'] = 'localhost';
-$Configuration['DATABASE_NAME'] = 'your_vanilla_database_name';
-$Configuration['DATABASE_USER'] = 'your_vanilla_database_user_name';
+$Configuration['DATABASE_HOST'] = 'localhost';
+$Configuration['DATABASE_NAME'] = 'your_vanilla_database_name';
+$Configuration['DATABASE_USER'] = 'your_vanilla_database_user_name';
$Configuration['DATABASE_PASSWORD'] = 'your_vanilla_database_password';
$Configuration['FARM_DATABASE_SERVER'] = ''; // used with MDB2: mysql, mysqli, pgsql, sqlite
-$Configuration['FARM_DATABASE_HOST'] = '';
-$Configuration['FARM_DATABASE_NAME'] = 'your_farm_database_name';
-$Configuration['FARM_DATABASE_USER'] = 'your_farm_database_user_name';
+$Configuration['FARM_DATABASE_HOST'] = '';
+$Configuration['FARM_DATABASE_NAME'] = 'your_farm_database_name';
+$Configuration['FARM_DATABASE_USER'] = 'your_farm_database_user_name';
$Configuration['FARM_DATABASE_PASSWORD'] = 'your_farm_database_password';
$Configuration['DATABASE_CHARACTER_ENCODING'] = '';
// Path Settings
$Configuration['APPLICATION_PATH'] = '/path/to/vanilla/';
-$Configuration['DATABASE_PATH'] = '/path/to/your/database/file.php';
-$Configuration['LIBRARY_PATH'] = '/path/to/your/library/';
-$Configuration['EXTENSIONS_PATH'] = '/path/to/your/extensions/';
+$Configuration['DATABASE_PATH'] = '/path/to/your/database/file.php';
+$Configuration['LIBRARY_PATH'] = '/path/to/your/library/';
+$Configuration['EXTENSIONS_PATH'] = '/path/to/your/extensions/';
$Configuration['LANGUAGES_PATH'] = '/path/to/your/languages/';
$Configuration['THEME_PATH'] = '/path/to/vanilla/themes/vanilla/';
$Configuration['BASE_URL'] = 'http://your.base.url/to/vanilla/';
-$Configuration['DEFAULT_STYLE'] = '/vanilla/themes/vanilla/styles/default/';
+$Configuration['DEFAULT_STYLE'] = '/vanilla/themes/vanilla/styles/default/';
$Configuration['WEB_ROOT'] = '/vanilla/';
$Configuration['SIGNIN_URL'] = 'people.php';
$Configuration['SIGNOUT_URL'] = 'people.php?PostBackAction=SignOutNow';
@@ -67,15 +67,15 @@
$Configuration['COOKIE_VERIFICATION_KEY'] = 'lussumocookietwo';
$Configuration['SESSION_USER_IDENTIFIER'] = 'LussumoUserID';
$Configuration['SESSION_NAME'] = '';
-$Configuration['COOKIE_DOMAIN'] = '.domain.com';
-$Configuration['COOKIE_PATH'] = '/';
-$Configuration['SUPPORT_EMAIL'] = 'sup...@domain.com';
-$Configuration['SUPPORT_NAME'] = 'Support';
+$Configuration['COOKIE_DOMAIN'] = '.domain.com';
+$Configuration['COOKIE_PATH'] = '/';
+$Configuration['SUPPORT_EMAIL'] = 'sup...@domain.com';
+$Configuration['SUPPORT_NAME'] = 'Support';
$Configuration['LOG_ALL_IPS'] = '0';
$Configuration['FORWARD_VALIDATED_USER_URL'] = './';
-$Configuration['ALLOW_IMMEDIATE_ACCESS'] = '0';
-$Configuration['DEFAULT_ROLE'] = '0';
-$Configuration['APPROVAL_ROLE'] = '3';
+$Configuration['ALLOW_IMMEDIATE_ACCESS'] = '0';
+$Configuration['DEFAULT_ROLE'] = '0';
+$Configuration['APPROVAL_ROLE'] = '3';
$Configuration['SAFE_REDIRECT'] = 'people.php?PageAction=SignOutNow';
$Configuration['PEOPLE_USE_EXTENSIONS'] = '1';
$Configuration['DEFAULT_EMAIL_VISIBLE'] = '0';
@@ -92,7 +92,7 @@
$Configuration['LIBRARY_NAMESPACE_ARRAY'] = array('Framework', 'People', 'Vanilla');
$Configuration['DEFAULT_FORMAT_TYPE'] = 'Text';
$Configuration['FORMAT_TYPES'] = array('Text');
-$Configuration['APPLICATION_TITLE'] = 'Vanilla';
+$Configuration['APPLICATION_TITLE'] = 'Vanilla';
$Configuration['BANNER_TITLE'] = 'Vanilla';
$Configuration['UPDATE_REMINDER'] = 'Monthly';
$Configuration['LAST_UPDATE'] = '';
@@ -100,23 +100,23 @@
// Vanilla Settings
$Configuration['ENABLE_WHISPERS'] = '0';
-$Configuration['DISCUSSIONS_PER_PAGE'] = '30';
-$Configuration['COMMENTS_PER_PAGE'] = '50';
-$Configuration['SEARCH_RESULTS_PER_PAGE'] = '30';
+$Configuration['DISCUSSIONS_PER_PAGE'] = '30';
+$Configuration['COMMENTS_PER_PAGE'] = '50';
+$Configuration['SEARCH_RESULTS_PER_PAGE'] = '30';
$Configuration['ALLOW_NAME_CHANGE'] = '1';
$Configuration['ALLOW_EMAIL_CHANGE'] = '1';
$Configuration['ALLOW_PASSWORD_CHANGE'] = '1';
$Configuration['USE_REAL_NAMES'] = '1';
-$Configuration['PUBLIC_BROWSING'] = '1';
-$Configuration['USE_CATEGORIES'] = '1';
-$Configuration['MAX_COMMENT_LENGTH'] = '5000';
-$Configuration['MAX_TOPIC_WORD_LENGTH'] = '45';
-$Configuration['DISCUSSION_POST_THRESHOLD'] = '3';
-$Configuration['DISCUSSION_TIME_THRESHOLD'] = '60';
-$Configuration['DISCUSSION_THRESHOLD_PUNISHMENT'] = '120';
-$Configuration['COMMENT_POST_THRESHOLD'] = '5';
-$Configuration['COMMENT_TIME_THRESHOLD'] = '60';
-$Configuration['COMMENT_THRESHOLD_PUNISHMENT'] = '120';
+$Configuration['PUBLIC_BROWSING'] = '1';
+$Configuration['USE_CATEGORIES'] = '1';
+$Configuration['MAX_COMMENT_LENGTH'] = '5000';
+$Configuration['MAX_TOPIC_WORD_LENGTH'] = '45';
+$Configuration['DISCUSSION_POST_THRESHOLD'] = '3';
+$Configuration['DISCUSSION_TIME_THRESHOLD'] = '60';
+$Configuration['DISCUSSION_THRESHOLD_PUNISHMENT'] = '120';
+$Configuration['COMMENT_POST_THRESHOLD'] = '5';
+$Configuration['COMMENT_TIME_THRESHOLD'] = '60';
+$Configuration['COMMENT_THRESHOLD_PUNISHMENT'] = '120';
$Configuration['UPDATE_URL'] = 'http://lussumo.com/updatecheck/default.php';
// Vanilla Control Positions
@@ -207,16 +207,16 @@
// Application versions
define('APPLICATION', 'Vanillin');
-define('FRAMEWORK_VERSION', '1.1.1');
+define('FRAMEWORK_VERSION', '1.1.2');
define('PEOPLE_VERSION', '1.1.2');
-define('APPLICATION_VERSION', '1.1.3.rc1');
+define('APPLICATION_VERSION', '1.1.3');
// Application Mode Constants
-define('MODE_DEBUG', 'DEBUG');
-define('MODE_RELEASE', 'RELEASE');
+define('MODE_DEBUG', 'DEBUG');
+define('MODE_RELEASE', 'RELEASE');
// Format type definitions
-define('FORMAT_STRING_FOR_DISPLAY', 'DISPLAY');
+define('FORMAT_STRING_FOR_DISPLAY', 'DISPLAY');
define('FORMAT_STRING_FOR_DATABASE', 'DATABASE');
// PHP Settings
@@ -238,7 +238,7 @@
* Setting the include paht to include our local pear tree first.
*/
set_include_path(
- dirname(__FILE__) . '/../library/pear/' .
+ dirname(__FILE__) . '/../library/pear/' .
PATH_SEPARATOR .
dirname(__FILE__) . '/../library/ezc/' .
PATH_SEPARATOR .
Modified: trunk/comments.php
==============================================================================
--- trunk/comments.php (original)
+++ trunk/comments.php Sun Sep 30 13:36:13 2007
@@ -42,11 +42,16 @@
$Menu->CurrentTab = 'discussions';
$Panel->CssClass = 'CommentPanel';
$Panel->BodyCssClass = 'Comments';
-$Context->PageTitle = $CommentGrid->Discussion->Name;
+if ($CommentGrid->Discussion) {
+ $Context->PageTitle = $CommentGrid->Discussion->Name;
+} else {
+ $Context->PageTitle = $Context->GetDefinition('ErrDiscussionNotFound');
+}
+
// 2. BUILD PAGE CONTROLS
// Add discussion options to the panel
-if ($session->UserID > 0) {
+if ($CommentGrid->Discussion && $session->UserID > 0) {
$Options = $Context->GetDefinition('Options');
$Panel->AddList($Options, 5);
$txt = $CommentGrid->Discussion->Bookmarked ? 'UnbookmarkThisDiscussion' : 'BookmarkThisDiscussion';