# HG changeset patch # User Dan # Date 1237676321 14400 # Node ID e48b1937dfc3f2ed2f9ad4a0b63b9edb972165a8 # Parent 17eebd541742560b303af3a9bca7a4a6e0283815# Parent 202c37a8713a50362eed399c5519b2a6036f78e4 Merging nighthawk and scribus branches diff -r 17eebd541742 -r e48b1937dfc3 .hgtags --- a/.hgtags Sat Mar 21 18:57:34 2009 -0400 +++ b/.hgtags Sat Mar 21 18:58:41 2009 -0400 @@ -6,5 +6,6 @@ e49604416b5aaa71900c488cc3a34bb799a3f568 1.0.2 8be996c3740dccf30ea470a597cd28bf9ce38cfb 1.0.3 72ecb951b3137f7cb0f07dea50a7dcf2aa323382 1.0.4 -72ecb951b3137f7cb0f07dea50a7dcf2aa323382 current-stable 36bcc9212837aab62e34fa66f0d600651d2a4814 1.0.5 +35e175170222e629aa638aef5685dfa33495cb57 1.0.6 +35e175170222e629aa638aef5685dfa33495cb57 current-stable diff -r 17eebd541742 -r e48b1937dfc3 README --- a/README Sat Mar 21 18:57:34 2009 -0400 +++ b/README Sat Mar 21 18:58:41 2009 -0400 @@ -1,5 +1,5 @@ Enano CMS -Version 1.0.5 +Version 1.0.6 ----------------------------- Thanks for downloading Enano! If you're looking for an installation guide, @@ -71,7 +71,7 @@ CHANGES IN THIS RELEASE ----------------------------- -Please see for a list of changes in +Please see for a list of changes in this release. UPGRADING FROM PREVIOUS RELEASES diff -r 17eebd541742 -r e48b1937dfc3 ajax.php --- a/ajax.php Sat Mar 21 18:57:34 2009 -0400 +++ b/ajax.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 diff -r 17eebd541742 -r e48b1937dfc3 cron.php --- a/cron.php Sat Mar 21 18:57:34 2009 -0400 +++ b/cron.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 diff -r 17eebd541742 -r e48b1937dfc3 images/enano-artwork/installer-greeting-blue.png Binary file images/enano-artwork/installer-greeting-blue.png has changed diff -r 17eebd541742 -r e48b1937dfc3 images/enano-artwork/installer-greeting-green.png Binary file images/enano-artwork/installer-greeting-green.png has changed diff -r 17eebd541742 -r e48b1937dfc3 includes/captcha.php --- a/includes/captcha.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/captcha.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * Copyright (C) 2006-2007 Dan Fuhry * captcha.php - visual confirmation system used during registration * @@ -158,6 +158,21 @@ unset($image); unset($_png); } elseif(defined('ENANO_CAPTCHA_BIGNFAT')) { + + /************************************************************************** + * usercp_confirm.php + * ------------------- + * begin : Feb 23, 2006 + * copyright : (C) 2006 AmigaLink + * website : www.AmigaLink.de + * + * $Id: usercp_confirm.php,v 2.0.9.0 2006/03/29 14:03:00 AmigaLink Exp $ + * ************************************************************************ + * CAPTCHA engine by AmigaLink - Copyright (C) 2006 + * Released under the GNU General Public License + * Modified for use in Enano approximately October 7, 2006 + */ + // Prefs $total_width = $this->captcha_config['width']; $total_height = $this->captcha_config['height']; @@ -743,6 +758,6 @@ } -// define('ENANO_CAPTCHA_BIGNFAT', ''); +define('ENANO_CAPTCHA_BIGNFAT', ''); ?> diff -r 17eebd541742 -r e48b1937dfc3 includes/clientside/css/enano-shared.css --- a/includes/clientside/css/enano-shared.css Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/clientside/css/enano-shared.css Sat Mar 21 18:58:41 2009 -0400 @@ -190,62 +190,6 @@ div.search-lobar { background-color: #E5EFFF; margin: 0; padding: 5px; } /* - * Search box - */ - -input.js-search-box { - font-size: 13px; - margin: 0; - padding: 1px !important; - background-image: url(../../../images/search-box-normal.gif); - height: 15px; - background-repeat: repeat-x; - border-width: 1px; - border-style: solid; - border-color: #6c6c6c; - color: #C0C0C0; -} - -input.js-search-box:focus { - background-image: url(../../../images/search-box-hilite.gif); - color: #666; -} - -div.js-search-submit { - display: block; - position: absolute; - width: 24px; - height: 19px; - font-size: 1px; - line-height: 19px; - clip: rect(0px, 24px, 19px, 0px); - overflow: hidden; - margin: 0; - padding: 0; - background: transparent url(../../../images/search-btn-normal.png) no-repeat !important; - background-repeat: no-repeat; - cursor: pointer; -} - -div.js-search-submit:hover { - background-image: url(../../../images/search-btn-hilite.png); -} - -input[type ^="text"].username, input[type ^="password"].password { - padding: 2px 2px 2px 27px; - width: 96px; - height: 15px; - border: 0px none #000; - font-size: 11px; -} -input[type ^="text"].username { - background-image: url(../../../images/login-username.png); -} -input[type ^="password"].password { - background-image: url(../../../images/login-password.png); -} - -/* * jBox menu system */ diff -r 17eebd541742 -r e48b1937dfc3 includes/clientside/jsres.php --- a/includes/clientside/jsres.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/clientside/jsres.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * [Aggressively compressed] Javascript client code * Copyright (C) 2006-2007 Dan Fuhry * Enano is Free Software, licensed under the GNU General Public License; see http://enanocms.org/ for details. diff -r 17eebd541742 -r e48b1937dfc3 includes/comment.php --- a/includes/comment.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/comment.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 diff -r 17eebd541742 -r e48b1937dfc3 includes/common.php --- a/includes/common.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/common.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 @@ -37,7 +37,7 @@ // be the expected output of enano_version(), which will always be in the // format of 1.0.2, 1.0.2a1, 1.0.2b1, 1.0.2RC1 // You'll want to change this for custom distributions. -$version = '1.0.5'; +$version = '1.0.6'; /** * Returns a floating-point number with the current UNIX timestamp in microseconds. Defined very early because we gotta call it diff -r 17eebd541742 -r e48b1937dfc3 includes/constants.php --- a/includes/constants.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/constants.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * Copyright (C) 2006-2007 Dan Fuhry * constants.php - important defines used Enano-wide * diff -r 17eebd541742 -r e48b1937dfc3 includes/dbal.php --- a/includes/dbal.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/dbal.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 diff -r 17eebd541742 -r e48b1937dfc3 includes/email.php --- a/includes/email.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/email.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 diff -r 17eebd541742 -r e48b1937dfc3 includes/functions.php --- a/includes/functions.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/functions.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 @@ -1139,26 +1139,19 @@ '1.0.2' => 'Coblynau', '1.0.3' => 'Dyrad', '1.0.4' => 'Ellyyllon', - '1.0.5' => 'Ferrishyn' + '1.0.5' => 'Ferrishyn', + '1.0.6' => 'Roane' ); $version = enano_version(); if ( isset($names[$version]) ) { return $names[$version]; } - return 'Anonymous build'; + return 'Unofficial build'; } /** - * What kinda sh** was I thinking when I wrote this. Deprecated. - */ - -function _dualurlenc($t) { - return rawurlencode(rawurlencode($t)); -} - -/** - * Badly named function to send back eval'able Javascript code with an error message. Deprecated, use JSON instead. + * Badly named function to send back eval-able Javascript code with an error message. Deprecated, use JSON instead. * @param string Message to send */ @@ -1854,6 +1847,11 @@ // < // The rule is so specific because everything else will have been filtered by now $html = preg_replace('/<(script|iframe)(.+?)src=([^>]*)!', '</\\1>', $html); // Restore stripped comments $i = 0; diff -r 17eebd541742 -r e48b1937dfc3 includes/js-compressor.php --- a/includes/js-compressor.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/js-compressor.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 * diff -r 17eebd541742 -r e48b1937dfc3 includes/pageprocess.php --- a/includes/pageprocess.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/pageprocess.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * pageprocess.php - intelligent retrieval of pages * Copyright (C) 2006-2007 Dan Fuhry * @@ -165,6 +165,11 @@ $this->err_access_denied(); return false; } + if ( $this->revision_id > 0 && !$this->perms->get_permissions('history_view') ) + { + $this->err_access_denied(); + return false; + } $pathskey = $paths->nslist[ $this->namespace ] . $this->page_id; $strict_no_headers = false; if ( isset($paths->pages[$pathskey]) ) diff -r 17eebd541742 -r e48b1937dfc3 includes/pageutils.php --- a/includes/pageutils.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/pageutils.php Sat Mar 21 18:58:41 2009 -0400 @@ -1,7 +1,7 @@ _die('The page entry could not be deleted.'); $e = $db->sql_query('DELETE FROM ' . table_prefix.'files WHERE page_id=\'' . $page_id . '\''); if(!$e) $db->_die('The file entry could not be deleted.'); + $e = $db->sql_query('DELETE FROM ' . table_prefix.'acl WHERE page_id=\'' . $page_id . '\' AND namespace=\'' . $namespace . '\''); + if(!$e) $db->_die('The ACL entries associated with the page could not be deleted.'); return('This page has been deleted. Note that there is still a log of edits and actions in the database, and anyone with admin rights can raise this page from the dead unless the log is cleared. If the deleted file is an image, there may still be cached thumbnails of it in the cache/ directory, which is inaccessible to users.'); } diff -r 17eebd541742 -r e48b1937dfc3 includes/paths.php --- a/includes/paths.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/paths.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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. * diff -r 17eebd541742 -r e48b1937dfc3 includes/plugins.php --- a/includes/plugins.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/plugins.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 diff -r 17eebd541742 -r e48b1937dfc3 includes/render.php --- a/includes/render.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/render.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * Copyright (C) 2006-2007 Dan Fuhry * render.php - handles fetching pages and parsing them into HTML * diff -r 17eebd541742 -r e48b1937dfc3 includes/search.php --- a/includes/search.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/search.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * Copyright (C) 2006-2007 Dan Fuhry * search.php - algorithm used to search pages * diff -r 17eebd541742 -r e48b1937dfc3 includes/sessions.php --- a/includes/sessions.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/sessions.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * Copyright (C) 2006-2007 Dan Fuhry * sessions.php - everything related to security and user management * diff -r 17eebd541742 -r e48b1937dfc3 includes/stats.php --- a/includes/stats.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/stats.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * Copyright (C) 2006-2007 Dan Fuhry * stats.php - handles statistics for pages (disablable in the admin CP) * diff -r 17eebd541742 -r e48b1937dfc3 includes/tagcloud.php --- a/includes/tagcloud.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/tagcloud.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 diff -r 17eebd541742 -r e48b1937dfc3 includes/template.php --- a/includes/template.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/template.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 diff -r 17eebd541742 -r e48b1937dfc3 includes/wikiengine/Tables.php --- a/includes/wikiengine/Tables.php Sat Mar 21 18:57:34 2009 -0400 +++ b/includes/wikiengine/Tables.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 diff -r 17eebd541742 -r e48b1937dfc3 index.php --- a/index.php Sat Mar 21 18:57:34 2009 -0400 +++ b/index.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 diff -r 17eebd541742 -r e48b1937dfc3 install.php --- a/install.php Sat Mar 21 18:57:34 2009 -0400 +++ b/install.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * Copyright (C) 2006-2007 Dan Fuhry * install.php - handles everything related to installation and initial configuration * @@ -30,8 +30,8 @@ define('IN_ENANO_INSTALL', 'true'); -define('ENANO_VERSION', '1.0.5'); -define('ENANO_RELEASE_NAME', 'Ferrishyn'); +define('ENANO_VERSION', '1.0.6'); +define('ENANO_RELEASE_NAME', 'Roane'); // In beta versions, define ENANO_BETA_VERSION here if(!defined('scriptPath')) { @@ -1149,7 +1149,7 @@ case 'welcome': ?>
- [ Enano CMS Project logo ] + [ Enano CMS Project logo ]

Welcome to Enano

Version – stable
also affectionately known as "" :)

@@ -1531,7 +1531,7 @@
Your copy of Enano has the Windows mod_rewrite workaround patch enabled.
diff -r 17eebd541742 -r e48b1937dfc3 licenses/index.html --- a/licenses/index.html Sat Mar 21 18:57:34 2009 -0400 +++ b/licenses/index.html Sat Mar 21 18:58:41 2009 -0400 @@ -82,7 +82,7 @@
  • phpWiki - just the diff engine, which is also used in MediaWiki
  • MediaWiki's table parsing engine (the Text_Wiki one doesn't work in PHP 5.2.0)
    • -
  • One of the CAPTCHA easter eggs was ported from the phpBB Advanced Visual Confirmation Mod. The strange thing here is this: The installation instructions expressly state that the MOD is distributed under the GPL, but immediately afterwards it says that the MOD "can be freely used, but not distributed, without permission." Sorry buddy, but I'm with the FSF on this one, I'm legally allowed to distribute/modify it under the GPL.
    • +
  • The primary CAPTCHA engine as of Enano 1.0.7 was written by AmigaLink and ported from the Advanced Visual Confirmation Mod. There were some licensing issues with the phpBB hack including a copy of the GPL not being included, but the actual CAPTCHA engine file had the GPLv2 or later header.
  • The e-mail address encryption routine was originally written by Jim Tucek, and ported to PHP by Dan Fuhry. Jim allowed the code to be released under the GPL specifically for Enano.
  • Tigra Tree Menu - a modified version that remembers the state of the tree. The license terms are stated here. After contacting the author, I was given permission to use the Tigra Tree Menu code as if it were under the GNU GPL. Therefore, you may use this code unde the terms of the GPL, however if you're making commercial use of it, the Softcomplex guys would appreciate if (but not require that) you would contact them first.
  • youngpup's DOM-Drag class - the unmodified version is in the public domain; we chose to relicense it as of Enano 1.0.4 to clear up any potential legal complications
    • diff -r 17eebd541742 -r e48b1937dfc3 plugins/PrivateMessages.php --- a/plugins/PrivateMessages.php Sat Mar 21 18:57:34 2009 -0400 +++ b/plugins/PrivateMessages.php Sat Mar 21 18:58:41 2009 -0400 @@ -4,7 +4,7 @@ Plugin URI: http://enanocms.org/ Description: Provides the page Special:PrivateMessages, which is used to manage private message functions. Also handles buddy lists. Author: Dan Fuhry -Version: 1.0.4 +Version: 1.0.6 Author URI: http://enanocms.org/ */ diff -r 17eebd541742 -r e48b1937dfc3 plugins/SpecialAdmin.php --- a/plugins/SpecialAdmin.php Sat Mar 21 18:57:34 2009 -0400 +++ b/plugins/SpecialAdmin.php Sat Mar 21 18:58:41 2009 -0400 @@ -4,13 +4,13 @@ Plugin URI: http://enanocms.org/ Description: Provides the page Special:Administration, which is the AJAX frontend to the various Admin pagelets. This plugin cannot be disabled. Author: Dan Fuhry -Version: 1.0.4 +Version: 1.0.6 Author URI: http://enanocms.org/ */ /* * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between - * Version 1.0.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 @@ -1431,6 +1431,7 @@ 'DELETE FROM '.table_prefix.'comments WHERE page_id=\'' . $db->escape($_POST['old_page_id']) . '\' AND namespace=\'' . $db->escape($_POST['old_namespace']) . '\';', 'DELETE FROM '.table_prefix.'logs WHERE page_id=\'' . $db->escape($_POST['old_page_id']) . '\' AND namespace=\'' . $db->escape($_POST['old_namespace']) . '\';', 'DELETE FROM '.table_prefix.'page_text WHERE page_id=\'' . $db->escape($_POST['old_page_id']) . '\' AND namespace=\'' . $db->escape($_POST['old_namespace']) . '\';', + 'DELETE FROM '.table_prefix.'acl WHERE page_id=\'' . $db->escape($_POST['old_page_id']) . '\' AND namespace=\'' . $db->escape($_POST['old_namespace']) . '\';', ); foreach($q as $cq) { @@ -2626,11 +2627,11 @@

    @@ -2643,6 +2644,10 @@

    + This block type is for textual content. This could be information, a random fact, or some other blob of fully formatted text. Links show up inline, + not as a list. +

    +

    Wikitext:

    @@ -2652,6 +2657,13 @@

    + This block type is for links. Use wikilinks (both internal and external are supported) to build a list of links. All links will be shown block-style, + or one link per line. You can use logic in these blocks as well: +

    + 
    {if user_logged_in}
+  [[Special:Preferences|User control panel]]
+{/if}
    +

    Template code:

    @@ -2661,6 +2673,10 @@

    + This block type is for textual content. HTML you use here will not be filtered or parsed at all - it will be displayed verbatim. This gives you + slightly more control over your content but you can't use wikilinks or other wikitext in here. +

    +

    HTML to place inside the sidebar:

    @@ -2674,18 +2690,18 @@

    WARNING: If you don't know what you're doing, or if you are not fluent in PHP, stop now and choose a different block type. You will brick your Enano installation if you are not careful here. - ALWAYS remember to write secure code! The Enano team is not responsible if someone drops all your tables because of an SQL injection vulnerability in your sidebar code. You are probably better off using the template-formatted block type. + ALWAYS remember to write secure code! The Enano team is not responsible if someone drops all your tables because of an SQL injection vulnerability in your sidebar code. You are probably better off using the links and logic block type.

    - It is especially important to note that this code is NOT checked for errors! If there is a syntax error in your code here, it will prevent any pages from loading AT ALL. So you need to use an external PHP editor (like jEdit) to check your syntax before you hit save. + It is especially important to note that the syntax of your code is not validated here. If there is a syntax error in your code here, it might prevent Enano from working properly. It is recommended that you use an external PHP editor (like jEdit) to check your syntax before you hit save. You have been warned.

    Also, you should avoid using output buffering functions (ob_[start|end|get_contents|clean]) here, because Enano uses those to track output from this script.

    - The standard <?php and ?> tags work here. Don't use an initial "<?php" or it will cause a parse error. + The standard <?php and ?> tags work here, but don't use an initial "<?php" or it will cause a parse error.

    PHP code: diff -r 17eebd541742 -r e48b1937dfc3 plugins/SpecialCSS.php --- a/plugins/SpecialCSS.php Sat Mar 21 18:57:34 2009 -0400 +++ b/plugins/SpecialCSS.php Sat Mar 21 18:58:41 2009 -0400 @@ -4,7 +4,7 @@ Plugin URI: http://enanocms.org/ Description: Provides the page Special:CSS, which is used in template files to reference the style sheet. Disabling or deleting this plugin will result in site instability. Author: Dan Fuhry -Version: 1.0.4 +Version: 1.0.6 Author URI: http://enanocms.org/ */ diff -r 17eebd541742 -r e48b1937dfc3 plugins/SpecialGroups.php --- a/plugins/SpecialGroups.php Sat Mar 21 18:57:34 2009 -0400 +++ b/plugins/SpecialGroups.php Sat Mar 21 18:58:41 2009 -0400 @@ -4,7 +4,7 @@ Plugin URI: http://enanocms.org/ Description: Provides group moderators and site administrators with the ability to control who is part of their groups. Author: Dan Fuhry -Version: 1.0.4 +Version: 1.0.6 Author URI: http://enanocms.org/ */ diff -r 17eebd541742 -r e48b1937dfc3 plugins/SpecialPageFuncs.php --- a/plugins/SpecialPageFuncs.php Sat Mar 21 18:57:34 2009 -0400 +++ b/plugins/SpecialPageFuncs.php Sat Mar 21 18:58:41 2009 -0400 @@ -4,7 +4,7 @@ Plugin URI: http://enanocms.org/ Description: Provides the page Special:CreatePage, which can be used to create new pages. Also adds the About Enano and GNU General Public License pages. Author: Dan Fuhry -Version: 1.0.4 +Version: 1.0.6 Author URI: http://enanocms.org/ */ diff -r 17eebd541742 -r e48b1937dfc3 plugins/SpecialSearch.php --- a/plugins/SpecialSearch.php Sat Mar 21 18:57:34 2009 -0400 +++ b/plugins/SpecialSearch.php Sat Mar 21 18:58:41 2009 -0400 @@ -4,7 +4,7 @@ Plugin URI: http://enanocms.org/ Description: Provides the page Special:Search, which is a frontend to the Enano search engine. Author: Dan Fuhry -Version: 1.0.4 +Version: 1.0.6 Author URI: http://enanocms.org/ */ diff -r 17eebd541742 -r e48b1937dfc3 plugins/SpecialUpdownload.php --- a/plugins/SpecialUpdownload.php Sat Mar 21 18:57:34 2009 -0400 +++ b/plugins/SpecialUpdownload.php Sat Mar 21 18:58:41 2009 -0400 @@ -4,7 +4,7 @@ Plugin URI: http://enanocms.org/ Description: Provides the pages Special:UploadFile and Special:DownloadFile. UploadFile is used to upload files to the site, and DownloadFile fetches the file from the database, creates thumbnails if necessary, and sends the file to the user. Author: Dan Fuhry -Version: 1.0.4 +Version: 1.0.6 Author URI: http://enanocms.org/ */ diff -r 17eebd541742 -r e48b1937dfc3 plugins/SpecialUserFuncs.php --- a/plugins/SpecialUserFuncs.php Sat Mar 21 18:57:34 2009 -0400 +++ b/plugins/SpecialUserFuncs.php Sat Mar 21 18:58:41 2009 -0400 @@ -4,7 +4,7 @@ Plugin URI: http://enanocms.org/ Description: Provides the pages Special:Login, Special:Logout, Special:Register, and Special:Preferences. Author: Dan Fuhry -Version: 1.0.4 +Version: 1.0.6 Author URI: http://enanocms.org/ */ diff -r 17eebd541742 -r e48b1937dfc3 plugins/SpecialUserPrefs.php --- a/plugins/SpecialUserPrefs.php Sat Mar 21 18:57:34 2009 -0400 +++ b/plugins/SpecialUserPrefs.php Sat Mar 21 18:58:41 2009 -0400 @@ -4,7 +4,7 @@ Plugin URI: http://enanocms.org/ Description: Provides the page Special:Preferences. Author: Dan Fuhry -Version: 1.0.4 +Version: 1.0.6 Author URI: http://enanocms.org/ */ diff -r 17eebd541742 -r e48b1937dfc3 plugins/admin/PageGroups.php --- a/plugins/admin/PageGroups.php Sat Mar 21 18:57:34 2009 -0400 +++ b/plugins/admin/PageGroups.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 diff -r 17eebd541742 -r e48b1937dfc3 plugins/admin/SecurityLog.php --- a/plugins/admin/SecurityLog.php Sat Mar 21 18:57:34 2009 -0400 +++ b/plugins/admin/SecurityLog.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 diff -r 17eebd541742 -r e48b1937dfc3 plugins/admin/UserManager.php --- a/plugins/admin/UserManager.php Sat Mar 21 18:57:34 2009 -0400 +++ b/plugins/admin/UserManager.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * 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 diff -r 17eebd541742 -r e48b1937dfc3 upgrade.php --- a/upgrade.php Sat Mar 21 18:57:34 2009 -0400 +++ b/upgrade.php Sat Mar 21 18:58:41 2009 -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.5 (Ferrishyn) + * Version 1.0.6 (Roane) * upgrade.php - upgrade script * Copyright (C) 2006-2007 Dan Fuhry * @@ -70,7 +70,7 @@ // Everything related to versions goes here! // Valid versions to upgrade from -$valid_versions = Array('1.0b1', '1.0b2', '1.0b3', '1.0b4', '1.0RC1', '1.0RC2', '1.0RC3', '1.0', '1.0.1', '1.0.1.1', '1.0.2b1', '1.0.2', '1.0.3', '1.0.4'); +$valid_versions = Array('1.0b1', '1.0b2', '1.0b3', '1.0b4', '1.0RC1', '1.0RC2', '1.0RC3', '1.0', '1.0.1', '1.0.1.1', '1.0.2b1', '1.0.2', '1.0.3', '1.0.4', '1.0.5'); // Basically a list of dependencies, which should be resolved automatically // If, for example, upgrading from 1.0b1 to 1.0RC1 requires one extra query that would not @@ -88,9 +88,10 @@ '1.0.1.1' => Array('1.0.2b1'), '1.0.2b1' => Array('1.0.2'), '1.0.2' => Array('1.0.3'), - '1.0.3' => Array('1.0.4') + '1.0.3' => Array('1.0.4'), + '1.0.4' => Array('1.0.5') ); -$this_version = '1.0.5'; +$this_version = '1.0.6'; $func_list = Array( '1.0' => Array('u_1_0_1_update_del_votes'), '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'), // , @@ -563,7 +564,7 @@ ?>

    - [ Enano CMS Project logo ] + [ Enano CMS Project logo ]

    Welcome to the Enano upgrade wizard