--- a/ajax.php Sat Jun 23 09:55:58 2007 -0400
+++ b/ajax.php Sat Jun 23 10:16:53 2007 -0400
@@ -1,7 +1,7 @@
<?php
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
*
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
--- a/includes/captcha.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/captcha.php Sat Jun 23 10:16:53 2007 -0400
@@ -1,7 +1,7 @@
<?php
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
* captcha.php - visual confirmation system used during registration
*
--- a/includes/clientside/jsres.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/clientside/jsres.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
* jsres.php - the Enano client-side runtime, a.k.a. AJAX on steroids
*
@@ -40,7 +40,7 @@
{
echo "/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* [Aggressively compressed] Javascript client code
* Copyright (C) 2006-2007 Dan Fuhry
* Enano is Free Software, licensed under the GNU General Public License; see http://www.enanocms.org/ for details.
--- a/includes/comment.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/comment.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
*
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
--- a/includes/common.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/common.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
*
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
--- a/includes/constants.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/constants.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
* constants.php - important defines used Enano-wide
*
--- a/includes/dbal.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/dbal.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
*
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
--- a/includes/email.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/email.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
*
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
--- a/includes/functions.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/functions.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
*
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
--- a/includes/graphs.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/graphs.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
*
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
--- a/includes/js-compressor.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/js-compressor.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
* Javascript compression library - used to compact the client-side Javascript code (all 72KB of it!) to save some bandwidth
*
--- a/includes/pageprocess.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/pageprocess.php Sat Jun 23 10:16:53 2007 -0400
@@ -1,7 +1,7 @@
<?php
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* pageprocess.php - intelligent retrieval of pages
* Copyright (C) 2006-2007 Dan Fuhry
*
@@ -384,7 +384,8 @@
{
display_page_headers();
}
-
+
+ /*
// Start left sidebar: basic user info, latest comments
echo '<table border="0" cellspacing="4" cellpadding="0" style="width: 100%;">';
@@ -399,6 +400,7 @@
</div>';
echo '</td><td>';
+ */
// User's own content
@@ -414,6 +416,8 @@
$this->err_page_not_existent();
}
+ /*
+
// Right sidebar
echo '</td><td style="width: 150px;">';
@@ -433,6 +437,8 @@
display_page_footers();
}
+ */
+
$this->send_headers = $send_headers;
unset($send_headers);
--- a/includes/pageutils.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/pageutils.php Sat Jun 23 10:16:53 2007 -0400
@@ -1,7 +1,7 @@
<?php
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
* pageutils.php - a class that handles raw page manipulations, used mostly by AJAX requests or their old-fashioned form-based counterparts
*
--- a/includes/paths.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/paths.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/**
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
* paths.php - The part of Enano that actually manages content. Everything related to page handling and namespaces is in here.
*
--- a/includes/plugins.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/plugins.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
*
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
--- a/includes/render.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/render.php Sat Jun 23 10:16:53 2007 -0400
@@ -1,7 +1,7 @@
<?php
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* render.php - handles fetching pages and parsing them into HTML
* Copyright (C) 2006-2007 Dan Fuhry
*
--- a/includes/search.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/search.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
* search.php - algorithm used to search pages
*
--- a/includes/sessions.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/sessions.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
* sessions.php - everything related to security and user management
*
--- a/includes/stats.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/stats.php Sat Jun 23 10:16:53 2007 -0400
@@ -1,7 +1,7 @@
<?php
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
* stats.php - handles statistics for pages (disablable in the admin CP)
*
--- a/includes/template.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/template.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
*
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
--- a/includes/wikiengine/Tables.php Sat Jun 23 09:55:58 2007 -0400
+++ b/includes/wikiengine/Tables.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/**
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
*
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
--- a/index.php Sat Jun 23 09:55:58 2007 -0400
+++ b/index.php Sat Jun 23 10:16:53 2007 -0400
@@ -1,7 +1,7 @@
<?php
/**
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * @version 1.0 (Banshee)
+ * @Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
*
* This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
--- a/install.php Sat Jun 23 09:55:58 2007 -0400
+++ b/install.php Sat Jun 23 10:16:53 2007 -0400
@@ -1,7 +1,7 @@
<?php
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* Copyright (C) 2006-2007 Dan Fuhry
* install.php - handles everything related to installation and initial configuration
*
@@ -23,6 +23,7 @@
define('IN_ENANO_INSTALL', 'true');
define('ENANO_VERSION', '1.0');
+define('ENANO_BETA_VERSION', '3'); // This is really RC
// In beta versions, define ENANO_BETA_VERSION here
if(!defined('scriptPath')) {
@@ -257,7 +258,7 @@
}
$template = new template_nodb();
-$template->load_theme('oxygen', 'bleu', false);
+$template->load_theme('stpatty', 'shamrock', false);
$modestrings = Array(
'welcome' => 'Welcome',
@@ -312,8 +313,8 @@
<div style="text-align: center; margin-top: 10px;">
<img alt="[ Enano CMS Project logo ]" src="images/enano-artwork/installer-greeting-blue.png" style="display: block; margin: 0 auto; padding-left: 100px;" />
<h2>Welcome to Enano</h2>
- <h3>version 1.0 – stable<br />
- <span style="font-weight: normal;">also affectionately known as "banshee" <tt>:)</tt></span></h3>
+ <h3>version 1.0rc3 – security release<br />
+ <span style="font-weight: normal;">also affectionately known as "druid" <tt>:)</tt></span></h3>
<?php
if ( file_exists('./_nightly.php') )
{
@@ -1041,8 +1042,7 @@
$schema = str_replace('{{TABLE_PREFIX}}', $_POST['table_prefix'], $schema);
$schema = str_replace('{{VERSION}}', ENANO_VERSION, $schema);
$schema = str_replace('{{ADMIN_EMBED_PHP}}', $_POST['admin_embed_php'], $schema);
- // Not anymore! :-D
- // $schema = str_replace('{{BETA_VERSION}}', ENANO_BETA_VERSION, $schema);
+ $schema = str_replace('{{BETA_VERSION}}', ENANO_BETA_VERSION, $schema);
if(isset($_POST['wiki_mode'])) $schema = str_replace('{{WIKI_MODE}}', '1', $schema);
else $schema = str_replace('{{WIKI_MODE}}', '0', $schema);
--- a/schema.sql Sat Jun 23 09:55:58 2007 -0400
+++ b/schema.sql Sat Jun 23 10:16:53 2007 -0400
@@ -19,10 +19,10 @@
CREATE TABLE {{TABLE_PREFIX}}group_members( member_id int(12) UNSIGNED NOT NULL auto_increment, group_id mediumint(5) UNSIGNED NOT NULL, user_id int(12) NOT NULL, is_mod tinyint(1) NOT NULL DEFAULT 0, pending tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY ( member_id ) );
CREATE TABLE {{TABLE_PREFIX}}acl( rule_id int(12) UNSIGNED NOT NULL auto_increment, target_type tinyint(1) UNSIGNED NOT NULL, target_id int(12) UNSIGNED NOT NULL, page_id varchar(255), namespace varchar(24), rules text, PRIMARY KEY ( rule_id ) );
CREATE TABLE {{TABLE_PREFIX}}search_cache( search_id int(15) NOT NULL auto_increment, search_time int(11) NOT NULL, query text, results longblob, PRIMARY KEY ( search_id ));
-INSERT INTO {{TABLE_PREFIX}}config(config_name, config_value) VALUES ('site_name', '{{SITE_NAME}}'), ('main_page', 'Main_Page'), ('site_desc', '{{SITE_DESC}}'), ('wiki_mode', '{{WIKI_MODE}}'), ('wiki_edit_notice', '0'), ('sflogo_enabled', '0'), ('sflogo_groupid', ''), ('sflogo_type', '1'), ('w3c_vh32', '0'), ('w3c_vh40', '0'), ('w3c_vh401', '0'), ('w3c_vxhtml10', '0'), ('w3c_vxhtml11', '0'), ('w3c_vcss', '0'), ('approve_comments', '0'), ('enable_comments', '1'), ('plugin_SpecialAdmin.php', '1'), ('plugin_SpecialPageFuncs.php', '1'), ('plugin_SpecialUserFuncs.php', '1'), ('plugin_SpecialCSS.php', '1'), ('copyright_notice', '{{COPYRIGHT}}'), ('wiki_edit_notice_text', '== Why can I edit this page? ==\n\nEveryone can edit almost any page in this website. This concept is called a wiki. It gives everyone the opportunity to make a change for the best. While some spam and vandalism may occur, it is believed that most contributions will be legitimate and helpful.\n\nFor security purposes, a history of all page edits is kept, and administrators are able to restore vandalized or spammed pages with just a few clicks.'), ('cache_thumbs', '{{ENABLE_CACHE}}'), ('max_file_size', '256000'),('enano_version', '{{VERSION}}'),( 'allowed_mime_types', 'cbf:len=168;crc=c3dcad3f;data=0[1],1[4],0[3],1[1],0[2],1[1],0[11],1[1],0[7],1[1],0[9],1[1],0[6],1[3],0[10],1[1],0[2],1[2],0[1],1[1],0[1],1[2],0[6],1[3],0[1],1[1],0[2],1[4],0[1],1[2],0[3],1[1],0[4],1[2],0[26],1[5],0[6],1[2],0[2],1[1],0[4],1[1],0[10],1[2],0[1],1[1],0[6]|end' ), ('contact_email', '{{ADMIN_EMAIL}}');
+INSERT INTO {{TABLE_PREFIX}}config(config_name, config_value) VALUES ('site_name', '{{SITE_NAME}}'), ('main_page', 'Main_Page'), ('site_desc', '{{SITE_DESC}}'), ('wiki_mode', '{{WIKI_MODE}}'), ('wiki_edit_notice', '0'), ('sflogo_enabled', '0'), ('sflogo_groupid', ''), ('sflogo_type', '1'), ('w3c_vh32', '0'), ('w3c_vh40', '0'), ('w3c_vh401', '0'), ('w3c_vxhtml10', '0'), ('w3c_vxhtml11', '0'), ('w3c_vcss', '0'), ('approve_comments', '0'), ('enable_comments', '1'), ('plugin_SpecialAdmin.php', '1'), ('plugin_SpecialPageFuncs.php', '1'), ('plugin_SpecialUserFuncs.php', '1'), ('plugin_SpecialCSS.php', '1'), ('copyright_notice', '{{COPYRIGHT}}'), ('wiki_edit_notice_text', '== Why can I edit this page? ==\n\nEveryone can edit almost any page in this website. This concept is called a wiki. It gives everyone the opportunity to make a change for the best. While some spam and vandalism may occur, it is believed that most contributions will be legitimate and helpful.\n\nFor security purposes, a history of all page edits is kept, and administrators are able to restore vandalized or spammed pages with just a few clicks.'), ('cache_thumbs', '{{ENABLE_CACHE}}'), ('max_file_size', '256000'),('enano_version', '{{VERSION}}'),('enano_rc_version', '{{BETA_VERSION}}'),( 'allowed_mime_types', 'cbf:len=168;crc=c3dcad3f;data=0[1],1[4],0[3],1[1],0[2],1[1],0[11],1[1],0[7],1[1],0[9],1[1],0[6],1[3],0[10],1[1],0[2],1[2],0[1],1[1],0[1],1[2],0[6],1[3],0[1],1[1],0[2],1[4],0[1],1[2],0[3],1[1],0[4],1[2],0[26],1[5],0[6],1[2],0[2],1[1],0[4],1[1],0[10],1[2],0[1],1[1],0[6]|end' ), ('contact_email', '{{ADMIN_EMAIL}}');
INSERT INTO {{TABLE_PREFIX}}page_text(page_id, namespace, page_text, char_tag) VALUES ('Main_Page', 'Article', '=== Enano has been successfully installed! ===\n\nYou have finished installing Enano on this server. Congratulations!', '');
INSERT INTO {{TABLE_PREFIX}}pages(page_order, name, urlname, namespace, special, visible, comments_on, protected, delvotes, delvote_ips) VALUES (NULL, 'Main Page', 'Main_Page', 'Article', 0, 1, 1, 1, 0, '');
-INSERT INTO {{TABLE_PREFIX}}themes(theme_id, theme_name, theme_order, default_style, enabled) VALUES ('oxygen', 'Oxygen', 1, 'bleu.css', 1),('stpatty', 'St. Patty', 2, 'shamrock.css', 1);
+INSERT INTO {{TABLE_PREFIX}}themes(theme_id, theme_name, theme_order, default_style, enabled) VALUES ('oxygen', 'Oxygen', 2, 'bleu.css', 1),('stpatty', 'St. Patty', 1, 'shamrock.css', 1);
INSERT INTO {{TABLE_PREFIX}}users(user_id, username, password, email, real_name, user_level, theme, style, signature, reg_time) VALUES(1, 'Anonymous', 'invalid-pass-hash', 'anonspam@enanocms.org', 'None', 1, 'stpatty', 'shamrock', '', 0);
INSERT INTO {{TABLE_PREFIX}}users(user_id, username, password, email, real_name, user_level, theme, style, account_active, reg_time) VALUES (2, '{{ADMIN_USER}}', '{{ADMIN_PASS}}', '{{ADMIN_EMAIL}}', '{{REAL_NAME}}', 9, 'stpatty', 'shamrock', 1, UNIX_TIMESTAMP());
INSERT INTO {{TABLE_PREFIX}}groups(group_id,group_name,group_type) VALUES(1, 'Everyone', 3),(2,'Administrators',3),(3,'Moderators',3);
--- a/upgrade.php Sat Jun 23 09:55:58 2007 -0400
+++ b/upgrade.php Sat Jun 23 10:16:53 2007 -0400
@@ -2,7 +2,7 @@
/*
* Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.0 (Banshee)
+ * Version 1.0 release candidate 3 (Druid)
* upgrade.php - upgrade script
* Copyright (C) 2006-2007 Dan Fuhry
*
@@ -62,10 +62,10 @@
'1.0b4' => Array('1.0RC1'),
'1.0RC1' => Array('1.0RC2')
);
-$this_version = '1.0';
+$this_version = '1.0RC3';
$func_list = Array(
- '1.0b4' => Array('u_1_0_RC1_update_user_ids', 'u_1_0_RC1_add_admins_to_group', 'u_1_0_RC1_alter_files_table', 'u_1_0_RC1_destroy_session_cookie', 'u_1_0_RC1_set_contact_email', 'u_1_0_RC1_update_page_text'),
- '1.0RC2' => Array('u_1_0_populate_userpage_comments')
+ '1.0b4' => Array('u_1_0_RC1_update_user_ids', 'u_1_0_RC1_add_admins_to_group', 'u_1_0_RC1_alter_files_table', 'u_1_0_RC1_destroy_session_cookie', 'u_1_0_RC1_set_contact_email', 'u_1_0_RC1_update_page_text') // ,
+ // '1.0RC2' => Array('u_1_0_populate_userpage_comments')
);
if(!isset($_GET['mode']))
@@ -339,6 +339,7 @@
function u_1_0_populate_userpage_comments()
{
+ /*
global $db;
$q = $db->sql_query('SELECT COUNT(c.comment_id) AS num_comments...');
if ( !$q )
@@ -348,6 +349,7 @@
{
}
+ */
}
switch($_GET['mode'])