# HG changeset patch
# User Dan
# Date 1208224952 14400
# Node ID a43f9d646dc7621a174b1ba7000f69d19b640e19
# Parent  547b7ba6d535729be042e064f2467882feeb8b22# Parent  b31eb2b6c13793d7d512e2d9ff16e8ff10151ae4
Merging changes from nighthawk

diff -r b31eb2b6c137 -r a43f9d646dc7 ajax.php
--- a/ajax.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/ajax.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 cron.php
--- a/cron.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/cron.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/captcha.php
--- a/includes/captcha.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/captcha.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * captcha.php - visual confirmation system used during registration
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/captcha/engine_default.php
--- a/includes/captcha/engine_default.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/captcha/engine_default.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * captcha.php - visual confirmation system used during registration
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/captcha/engine_failsafe.php
--- a/includes/captcha/engine_failsafe.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/captcha/engine_failsafe.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * captcha.php - visual confirmation system used during registration
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/captcha/engine_potpourri.php
--- a/includes/captcha/engine_potpourri.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/captcha/engine_potpourri.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * captcha.php - visual confirmation system used during registration
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/clientside/css/enano-shared.css
--- a/includes/clientside/css/enano-shared.css	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/clientside/css/enano-shared.css	Mon Apr 14 22:02:32 2008 -0400
@@ -794,12 +794,13 @@
 
 .abutton:hover {
   color: #f0f0f0 !important;
+  background-color: #606060;
 }
 
-.abutton_green       { color: #00aa00 !important; }
-.abutton_green:hover { background-color: #00aa00; }
-.abutton_blue        { color: #0000aa !important; }
-.abutton_blue:hover  { background-color: #0000aa; }
-.abutton_red         { color: #aa0000 !important; }
-.abutton_red:hover   { background-color: #aa0000; }
+.abutton_green       { color:            #008800 !important; }
+.abutton_green:hover { background-color: #008800 !important; }
+.abutton_blue        { color:            #000088 !important; }
+.abutton_blue:hover  { background-color: #000088 !important; }
+.abutton_red         { color:            #880000 !important; }
+.abutton_red:hover   { background-color: #880000 !important; }
 
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/clientside/jsres.php
--- a/includes/clientside/jsres.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/clientside/jsres.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * jsres.php - the Enano client-side runtime, a.k.a. AJAX on steroids
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/clientside/static/ajax.js
--- a/includes/clientside/static/ajax.js	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/clientside/static/ajax.js	Mon Apr 14 22:02:32 2008 -0400
@@ -275,12 +275,12 @@
   var btn_submit = document.createElement('a');
   btn_submit.href = '#';
   btn_submit.appendChild(document.createTextNode($lang.get('etc_go')));
-  btn_submit.className = 'fakebutton fakebutton-submit';
+  btn_submit.className = 'abutton abutton_green';
   
   var btn_cancel = document.createElement('a');
   btn_cancel.href = '#';
   btn_cancel.appendChild(document.createTextNode($lang.get('etc_cancel')));
-  btn_cancel.className = 'fakebutton';
+  btn_cancel.className = 'abutton';
   
   btndiv.appendChild(btn_submit);
   btndiv.appendChild(document.createTextNode(' | '));
@@ -829,49 +829,6 @@
   return id;
 }
 
-/*
-function ajaxChangeStyle()
-{
-  // IE <6 pseudo-compatibility
-  if ( KILL_SWITCH )
-    return true;
-  var win = document.getElementById("cn2");
-  win.innerHTML = ' \
-    <form action="'+ENANO_SPECIAL_CHANGESTYLE+'" onsubmit="jws.closeWin(\'root2\');" method="post" style="text-align: center"> \
-    <h3>Select a theme...</h3>\
-    <select id="mdgThemeID" name="theme" onchange="ajaxGetStyles(this.value);"> \
-    '+ENANO_THEME_LIST+' \
-    </select> \
-    <div id="styleSelector"></div>\
-    <br /><br />\
-    <input type="hidden" name="return_to" value="'+title+'" />\
-    <input id="styleSubmitter" type="submit" style="display: none; font-weight: bold" value="Change theme" /> \
-    <input type="button" value="Cancel" onclick="jws.closeWin(\'root2\');" /> \
-    </form> \
-  ';
-  ajaxGetStyles(ENANO_CURRENT_THEME);
-  jws.openWin('root2', 340, 300);
-}
-
-function ajaxGetStyles(id) {
-  setAjaxLoading();
-  ajaxGet(stdAjaxPrefix+'&_mode=getstyles&id='+id, function() {
-    if ( ajax.readyState == 4 && ajax.status == 200 ) {
-      unsetAjaxLoading();
-      eval(ajax.responseText);
-      html = '<h3>And a style...</h3><select id="mdgStyleID" name="style">';
-      for(i=0;i<list.length;i++) {
-        lname = list[i].substr(0, 1).toUpperCase() + list[i].substr(1, list[i].length);
-        html = html + '<option value="'+list[i]+'">'+lname+'</option>';
-      }
-      html = html + '</select>';
-      document.getElementById('styleSelector').innerHTML = html;
-      document.getElementById('styleSubmitter').style.display = 'inline'; 
-    }
-  });
-}
-*/
-
 function ajaxSwapCSS()
 {
   // IE <6 pseudo-compatibility
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/clientside/static/faders.js
--- a/includes/clientside/static/faders.js	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/clientside/static/faders.js	Mon Apr 14 22:02:32 2008 -0400
@@ -514,6 +514,145 @@
   miniPrompt(function(div) { div.innerHTML = 'hello world! <a href="#" onclick="miniPromptDestroy(this); return false;">destroy me</a>'; });
 }
 
+/**
+ * Message box system for miniPrompts. Less customization but easier to scale than the regular messageBox framework.
+ * @example
+ <code>
+ miniPromptMessage({
+   title: 'Delete page',
+   message: 'Do you really want to delete this page? This is reversible unless you clear the page logs.',
+   buttons: [
+     {
+       text: 'Delete',
+       color: 'red',
+       style: {
+         fontWeight: 'bold'
+       },
+       onclick: function() {
+         ajaxDeletePage();
+         miniPromptDestroy(this);
+       }
+     },
+     {
+       text: 'cancel',
+       onclick: function() {
+         miniPromptDestroy(this);
+       }
+     }
+   ]
+ });
+ </code>
+ */
+
+function miniPromptMessage(parms)
+{
+  if ( !parms.title || !parms.message || !parms.buttons )
+    return false;
+  
+  return miniPrompt(function(parent)
+    {
+      try
+      {
+        var h3 = document.createElement('h3');
+        h3.appendChild(document.createTextNode(parms.title));
+        var body = document.createElement('p');
+        var message = parms.message.split(unescape('%0A'));
+        for ( var i = 0; i < message.length; i++ )
+        {
+          body.appendChild(document.createTextNode(message[i]));
+          if ( i + 1 < message.length )
+            body.appendChild(document.createElement('br'));
+        }
+        
+        parent.style.textAlign = 'center';
+        
+        parent.appendChild(h3);
+        parent.appendChild(body);
+        parent.appendChild(document.createElement('br'));
+        
+        // construct buttons
+        for ( var i = 0; i < parms.buttons.length; i++ )
+        {
+          var button = parms.buttons[i];
+          button.input = document.createElement('a');
+          button.input.href = '#';
+          button.input.clickAction = button.onclick;
+          button.input.className = 'abutton';
+          if ( button.color )
+          {
+            button.input.className += ' abutton_' + button.color;
+          }
+          button.input.appendChild(document.createTextNode(button.text));
+          if ( button.style )
+          {
+            for ( var j in button.style )
+            {
+              button.input.style[j] = button.style[j];
+            }
+          }
+          button.input.onclick = function(e)
+          {
+            try
+            {
+              this.clickAction(e);
+            }
+            catch(e)
+            {
+              console.error(e);
+            }
+            return false;
+          }
+          parent.appendChild(button.input);
+        }
+        if ( parms.buttons[0] )
+        {
+          setTimeout(function()
+            {
+              parms.buttons[0].input.focus();
+            }, 300);
+        }
+      }
+      catch ( e )
+      {
+        console.error(e);
+      }
+    });
+}
+
+function testMPMessageBox()
+{
+  miniPromptMessage({
+    title: 'The Game of LIFE question #73',
+    message: 'You just got your girlfriend pregnant. Please select an option:',
+    buttons: [
+      {
+        text: 'Abort',
+        color: 'red',
+        style: {
+          fontWeight: 'bold'
+        },
+        onclick: function() {
+          miniPromptDestroy(this);
+        }
+      },
+      {
+        text: 'Retry',
+        color: 'blue',
+        onclick: function() {
+          miniPromptDestroy(this);
+        }
+      },
+      {
+        text: 'Ignore',
+        color: 'green',
+        onclick: function() {
+          miniPromptDestroy(this);
+        }
+      }
+    ]
+  });
+}
+
 // Function to fade classes info-box, warning-box, error-box, etc.
 
 function fadeInfoBoxes()
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/clientside/static/misc.js
--- a/includes/clientside/static/misc.js	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/clientside/static/misc.js	Mon Apr 14 22:02:32 2008 -0400
@@ -630,4 +630,13 @@
   el.setAttribute('enano:expand', 'open');
 }
 
+/**
+ * Equivalent to PHP's explode function.
+ */
+
+function explode(needle, haystack)
+{
+  return haystack.split(needle);
+}
+
 addOnloadHook(expander_onload);
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/comment.php
--- a/includes/comment.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/comment.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/common.php
--- a/includes/common.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/common.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
@@ -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.1.3';
+$version = '1.1.4';
 
 /**
  * Returns a floating-point number with the current UNIX timestamp in microseconds. Defined very early because we gotta call it
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/common_cli.php
--- a/includes/common_cli.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/common_cli.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/constants.php
--- a/includes/constants.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/constants.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * constants.php - important defines used Enano-wide
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/dbal.php
--- a/includes/dbal.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/dbal.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/diff.php
--- a/includes/diff.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/diff.php	Mon Apr 14 22:02:32 2008 -0400
@@ -1,5 +1,17 @@
 <?php
 
+/*
+ * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
+ *
+ * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
+ */
+
 // A PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
 //
 // Copyright (C) 2000, 2001 Geoffrey T. Dairiki <dairiki@dairiki.org>
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/diffiehellman.php
--- a/includes/diffiehellman.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/diffiehellman.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * diffiehellman.php - Diffie Hellman key exchange and supporting functions
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/email.php
--- a/includes/email.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/email.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/functions.php
--- a/includes/functions.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/functions.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
@@ -1283,6 +1283,7 @@
       '1.1.1'  => 'Caoineag alpha 1',
       '1.1.2'  => 'Caoineag alpha 2',
       '1.1.3'  => 'Caoineag alpha 3',
+      '1.1.4'  => 'Caoineag alpha 4',
     );
   $version = enano_version();
   if ( isset($names[$version]) )
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/graphs.php
--- a/includes/graphs.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/graphs.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/http.php
--- a/includes/http.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/http.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * class_http.php - Pure PHP HTTP client library
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/js-compressor.php
--- a/includes/js-compressor.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/js-compressor.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Javascript compression library - used to compact the client-side Javascript code (all 72KB of it!) to save some bandwidth
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/lang.php
--- a/includes/lang.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/lang.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
@@ -599,6 +599,9 @@
   {
     if ( !is_array($substitutions) )
       $substitutions = array();
+    // if this isn't a valid language string ID, just return the string unprocessed.
+    if ( !preg_match('/^([a-z0-9]+)((_[a-z0-9]+)+)$/', $string_id) )
+      return $string_id;
     return $this->substitute($this->get_uncensored($string_id), $substitutions);
   }
   
@@ -625,6 +628,7 @@
     if ( !$found )
     {
       // Ehh, the string wasn't found. Rerun fetch() and try again.
+      // Or if it's the installer, no use in refetching, so just fail.
       if ( defined('IN_ENANO_INSTALL') )
       {
         return $string_id;
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/math.php
--- a/includes/math.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/math.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * diffiehellman.php - Diffie Hellman key exchange and supporting functions
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/pageprocess.php
--- a/includes/pageprocess.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/pageprocess.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,9 +2,9 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
+ * Version 1.1.4 (Caoineag alpha 4)
  * pageprocess.php - intelligent retrieval of pages
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/pageutils.php
--- a/includes/pageutils.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/pageutils.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * pageutils.php - a class that handles raw page manipulations, used mostly by AJAX requests or their old-fashioned form-based counterparts
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/paths.php
--- a/includes/paths.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/paths.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /**
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * paths.php - The part of Enano that actually manages content. Everything related to page handling and namespaces is in here.
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/plugins.php
--- a/includes/plugins.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/plugins.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/render.php
--- a/includes/render.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/render.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * render.php - handles fetching pages and parsing them into HTML
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/search.php
--- a/includes/search.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/search.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * search.php - algorithm used to search pages
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/sessions.php
--- a/includes/sessions.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/sessions.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * sessions.php - everything related to security and user management
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/sql_parse.php
--- a/includes/sql_parse.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/sql_parse.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * sql_parse.php - SQL query splitter and templater
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/stats.php
--- a/includes/stats.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/stats.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * stats.php - handles statistics for pages (disablable in the admin CP)
  *
  *   ***** UNFINISHED ***** 
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/tagcloud.php
--- a/includes/tagcloud.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/tagcloud.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/template.php
--- a/includes/template.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/template.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/wikiengine/Tables.php
--- a/includes/wikiengine/Tables.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/wikiengine/Tables.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 includes/wikiformat.php
--- a/includes/wikiformat.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/includes/wikiformat.php	Mon Apr 14 22:02:32 2008 -0400
@@ -1,4 +1,17 @@
 <?php
+
+/*
+ * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
+ *
+ * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
+ */
+
 /**
  * Parse structured wiki text and render into arbitrary formats such as XHTML.
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 index.php
--- a/index.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/index.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/common.php
--- a/install/includes/common.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/common.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * common.php - Installer common functions
  *
@@ -16,7 +16,7 @@
 
 // Our version number. This needs to be changed for any custom releases.
 $installer_version = array(
-  'version' => '1.1.3',
+  'version' => '1.1.4',
   'type' => 'alpha'
   // If type is set to "rc", "beta", or "alpha", optionally another version number can be issued with the key 'sub':
   // 'sub' => '3' will produce Enano 1.1.1a3 / Enano 1.1.1 alpha 3
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/libenanoinstall.php
--- a/install/includes/libenanoinstall.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/libenanoinstall.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * libenanoinstall.php - Installation payload backend
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/payload.php
--- a/install/includes/payload.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/payload.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * payload.php - Installer payload (the installation logic)
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/stages/confirm.php
--- a/install/includes/stages/confirm.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/stages/confirm.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * confirm.php - Installer installation summary/confirmation stage
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/stages/database.php
--- a/install/includes/stages/database.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/stages/database.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * database.php - Installer database driver selection stage
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/stages/database_mysql.php
--- a/install/includes/stages/database_mysql.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/stages/database_mysql.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * database_mysql.php - Installer database info page, MySQL
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/stages/database_post.php
--- a/install/includes/stages/database_post.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/stages/database_post.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * database_post.php - Database installation, stage 1
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/stages/database_postgresql.php
--- a/install/includes/stages/database_postgresql.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/stages/database_postgresql.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * database_postgresql.php - Installer database info page, PostgreSQL
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/stages/finish.php
--- a/install/includes/stages/finish.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/stages/finish.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * finish.php - Installer finalization stage
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/stages/install.php
--- a/install/includes/stages/install.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/stages/install.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * install.php - Installer payload stage
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/stages/license.php
--- a/install/includes/stages/license.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/stages/license.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * license.php - Installer license-agreement stage
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/stages/login.php
--- a/install/includes/stages/login.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/stages/login.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * login.php - Installer login information stage
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/stages/sysreqs.php
--- a/install/includes/stages/sysreqs.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/stages/sysreqs.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * sysreqs.php - Installer system-requirements page
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/stages/website.php
--- a/install/includes/stages/website.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/stages/website.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * website.php - Installer website-settings stage
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/includes/ui.php
--- a/install/includes/ui.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/includes/ui.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * ui.php - User interface for installations and upgrades
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/index.php
--- a/install/index.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/index.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * welcome.php - Portal to upgrade, readme, and install pages
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/install.php
--- a/install/install.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/install.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * install.php - Main installation interface
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/readme.php
--- a/install/readme.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/readme.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * install.php - Main installation interface
  *
diff -r b31eb2b6c137 -r a43f9d646dc7 install/upgrade.php
--- a/install/upgrade.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/install/upgrade.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * Installation package
  * upgrade.php - Upgrade interface
  *
@@ -19,7 +19,7 @@
 // The list of versions in THIS AND PREVIOUS branches, in chronological order.
 $enano_versions = array();
 $enano_versions['1.0'] = array('1.0', '1.0.1', '1.0.2b1', '1.0.2', '1.0.3', '1.0.4');
-$enano_versions['1.1'] = array('1.1.1', '1.1.2', '1.1.3');
+$enano_versions['1.1'] = array('1.1.1', '1.1.2', '1.1.3', '1.1.4');
 
 // Turn on every imaginable API hack to make common load on older databases
 define('IN_ENANO_UPGRADE', 1);
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/PrivateMessages.php
--- a/plugins/PrivateMessages.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/PrivateMessages.php	Mon Apr 14 22:02:32 2008 -0400
@@ -12,8 +12,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/SpecialAdmin.php
--- a/plugins/SpecialAdmin.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/SpecialAdmin.php	Mon Apr 14 22:02:32 2008 -0400
@@ -12,8 +12,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/SpecialCSS.php
--- a/plugins/SpecialCSS.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/SpecialCSS.php	Mon Apr 14 22:02:32 2008 -0400
@@ -12,8 +12,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/SpecialGroups.php
--- a/plugins/SpecialGroups.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/SpecialGroups.php	Mon Apr 14 22:02:32 2008 -0400
@@ -12,7 +12,7 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
+ * Version 1.1.4 (Caoineag alpha 4)
  * Copyright (C) 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 b31eb2b6c137 -r a43f9d646dc7 plugins/SpecialPageFuncs.php
--- a/plugins/SpecialPageFuncs.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/SpecialPageFuncs.php	Mon Apr 14 22:02:32 2008 -0400
@@ -12,8 +12,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/SpecialRecentChanges.php
--- a/plugins/SpecialRecentChanges.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/SpecialRecentChanges.php	Mon Apr 14 22:02:32 2008 -0400
@@ -12,8 +12,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/SpecialSearch.php
--- a/plugins/SpecialSearch.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/SpecialSearch.php	Mon Apr 14 22:02:32 2008 -0400
@@ -12,8 +12,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/SpecialUpdownload.php
--- a/plugins/SpecialUpdownload.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/SpecialUpdownload.php	Mon Apr 14 22:02:32 2008 -0400
@@ -12,8 +12,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  * SpecialUpdownload.php - handles uploading and downloading of user-uploaded files - possibly the most rigorously security-enforcing script in all of Enano, although sessions.php comes in a close second
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/SpecialUserFuncs.php
--- a/plugins/SpecialUserFuncs.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/SpecialUserFuncs.php	Mon Apr 14 22:02:32 2008 -0400
@@ -12,8 +12,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/SpecialUserPrefs.php
--- a/plugins/SpecialUserPrefs.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/SpecialUserPrefs.php	Mon Apr 14 22:02:32 2008 -0400
@@ -12,8 +12,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute it and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/admin/GroupManager.php
--- a/plugins/admin/GroupManager.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/admin/GroupManager.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/admin/LangManager.php
--- a/plugins/admin/LangManager.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/admin/LangManager.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/admin/PageEditor.php
--- a/plugins/admin/PageEditor.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/admin/PageEditor.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/admin/PageGroups.php
--- a/plugins/admin/PageGroups.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/admin/PageGroups.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/admin/PageManager.php
--- a/plugins/admin/PageManager.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/admin/PageManager.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/admin/PluginManager.php
--- a/plugins/admin/PluginManager.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/admin/PluginManager.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/admin/SecurityLog.php
--- a/plugins/admin/SecurityLog.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/admin/SecurityLog.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/admin/ThemeManager.php
--- a/plugins/admin/ThemeManager.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/admin/ThemeManager.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
diff -r b31eb2b6c137 -r a43f9d646dc7 plugins/admin/UserManager.php
--- a/plugins/admin/UserManager.php	Mon Apr 14 22:00:12 2008 -0400
+++ b/plugins/admin/UserManager.php	Mon Apr 14 22:02:32 2008 -0400
@@ -2,8 +2,8 @@
 
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.3 (Caoineag alpha 3)
- * Copyright (C) 2006-2007 Dan Fuhry
+ * Version 1.1.4 (Caoineag alpha 4)
+ * Copyright (C) 2006-2008 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.