Please enter an expression to match against..

'; - } - else - { - $target = $db->escape($target); - $q = $db->sql_query('UPDATE '.table_prefix.'page_groups SET pg_target=\'' . $target . '\' WHERE pg_id=' . $edit_id . ';'); - if ( !$q ) - $db->_die(); - else - echo '

The expression to match against was updated.

'; - } - } else if ( $_POST['pg_type'] == PAGE_GRP_CATLINK ) { $target = $_POST['pg_target']; @@ -877,22 +860,6 @@ '; break; - case PAGE_GRP_REGEX: - echo ' - - Regular expression to use:
- Be sure to include the starting and ending delimiters and any flags you might need.
- These pages might help: Pattern modifiers • - Pattern syntax
- Examples: /^(Special|Admin):/i • /^Image:([0-9]+)$/
- Developers, remember that this will be matched against the full page identifier string. This means that /^About_Enano$/ - will NOT match the page Special:About_Enano. - - - - - '; - break; case PAGE_GRP_CATLINK: // Build category list diff -r 8e2fffc5c622 -r 861807631f70 plugins/admin/SecurityLog.php --- a/plugins/admin/SecurityLog.php Tue Oct 23 12:30:08 2007 -0400 +++ b/plugins/admin/SecurityLog.php Wed Oct 24 12:45:05 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.2 (Coblynau) + * Version 1.1.1 * 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 8e2fffc5c622 -r 861807631f70 plugins/admin/UserManager.php --- a/plugins/admin/UserManager.php Tue Oct 23 12:30:08 2007 -0400 +++ b/plugins/admin/UserManager.php Wed Oct 24 12:45:05 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.2 (Coblynau) + * Version 1.1.1 * 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 8e2fffc5c622 -r 861807631f70 schema.sql --- a/schema.sql Tue Oct 23 12:30:08 2007 -0400 +++ b/schema.sql Wed Oct 24 12:45:05 2007 -0400 @@ -254,6 +254,16 @@ PRIMARY KEY ( tag_id ) ) CHARACTER SET `utf8`; +-- Added in 1.1.1 + +CREATE TABLE {{TABLE_PREFIX}}lockout( + id int(12) NOT NULL auto_increment, + ipaddr varchar(40) NOT NULL, + action ENUM('credential', 'level') NOT NULL DEFAULT 'credential', + timestamp int(12) NOT NULL DEFAULT 0, + PRIMARY KEY ( id ) +) CHARACTER SET `utf8`; + INSERT INTO {{TABLE_PREFIX}}config(config_name, config_value) VALUES ('site_name', '{{SITE_NAME}}'), ('main_page', 'Main_Page'), diff -r 8e2fffc5c622 -r 861807631f70 upgrade.php --- a/upgrade.php Tue Oct 23 12:30:08 2007 -0400 +++ b/upgrade.php Wed Oct 24 12:45:05 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.2 (Coblynau) + * Version 1.1.1 * upgrade.php - upgrade script * Copyright (C) 2006-2007 Dan Fuhry * @@ -61,7 +61,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'); +$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', 'Stable1.0ToUnstable1.1'); // 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 @@ -76,9 +76,11 @@ '1.0RC3' => Array('1.0'), '1.0' => Array('1.0.1'), '1.0.1' => Array('1.0.1.1'), - '1.0.1.1' => Array('1.0.2b1') + '1.0.1.1' => Array('1.0.2b1'), + '1.0.2b1' => Array('Stable1.0ToUnstable1.1'), + 'Stable1.0ToUnstable1.1' => Array('1.1.1') ); -$this_version = '1.0.2'; +$this_version = '1.1.1'; $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'), // , @@ -445,7 +447,7 @@ { if(isset($_POST['login'])) { - $session->login_without_crypto($_POST['username'], $_POST['password'], false, $ul_admin); + $result = $session->login_without_crypto($_POST['username'], $_POST['password'], false, $ul_admin); if($session->sid_super) { header('Location: upgrade.php?mode=welcome&auth='.$session->sid_super); @@ -462,7 +464,7 @@

'; + echo '

'; } ?> diff -r 8e2fffc5c622 -r 861807631f70 upgrade.sql --- a/upgrade.sql Tue Oct 23 12:30:08 2007 -0400 +++ b/upgrade.sql Wed Oct 24 12:45:05 2007 -0400 @@ -3,7 +3,15 @@ -- ALL NON-SQL LINES, even otherwise blank lines, must start with "--" or they will get sent to MySQL! -- Common tasks (version numbers) DELETE FROM {{TABLE_PREFIX}}config WHERE config_name='enano_version' OR config_name='enano_beta_version' OR config_name='enano_alpha_version' OR config_name='enano_rc_version'; -INSERT INTO {{TABLE_PREFIX}}config (config_name, config_value) VALUES( 'enano_version', '1.0.2' ); +INSERT INTO {{TABLE_PREFIX}}config (config_name, config_value) VALUES( 'enano_version', '1.1.1' ); +---BEGIN Stable1.0ToUnstable1.1--- +-- UPDATE {{TABLE_PREFIX}}groups SET group_id=9998 WHERE group_id=4; +-- UPDATE {{TABLE_PREFIX}}group_members SET group_id=9998 WHERE group_id=4; +-- INSERT INTO {{TABLE_PREFIX}}groups(group_id,group_name,group_type,system_group) VALUES(4, 'Regular members', 3, 1); +CREATE TABLE {{TABLE_PREFIX}}lockout( id int(12) NOT NULL auto_increment, ipaddr varchar(40) NOT NULL, action ENUM('credential', 'level') NOT NULL DEFAULT 'credential', timestamp int(12) NOT NULL DEFAULT 0, PRIMARY KEY ( id ) ) CHARACTER SET `utf8`; +---END Stable1.0ToUnstable1.1--- +---BEGIN 1.0.2--- +---END 1.0.2--- ---BEGIN 1.0.2b1--- -- This is really optional, but could reduce confusion if regex page groups get truncated for no apparent reason. ALTER TABLE {{TABLE_PREFIX}}page_groups MODIFY COLUMN pg_target text DEFAULT NULL;