';
//fadeInfoBoxes();
document.getElementById(aclManagerID+'_main').scrollTop = 0;
+
+ aclDataCache.mode = 'save_edit';
break;
case 'delete':
@@ -389,6 +397,9 @@
note = document.createElement('div');
note.className = 'info-box';
note.style.marginLeft = '0';
+ note.style.position = 'absolute';
+ note.style.width = '558px';
+ note.id = 'aclSuccessNotice_' + Math.floor(Math.random() * 100000);
b = document.createElement('b');
b.appendChild(document.createTextNode('Entry deleted'));
note.appendChild(b);
@@ -397,7 +408,7 @@
note.appendChild(document.createElement('br'));
a = document.createElement('a');
a.href = '#';
- a.onclick = function() { this.parentNode.parentNode.removeChild(this.parentNode); return false; };
+ a.onclick = function() { opacity(this.parentNode.id, 100, 0, 1000); setTimeout('var div = document.getElementById("' + this.parentNode.id + '"); div.parentNode.removeChild(div);', 1100); return false; };
a.appendChild(document.createTextNode('[ dismiss :'));
note.appendChild(a);
a = document.createElement('a');
@@ -714,8 +725,22 @@
function __aclDeleteRule()
{
- if(!aclDataCache) return false;
- if(aclDataCache.mode != 'seltarget') return false;
+ if(!aclDataCache)
+ {
+ if ( window.console )
+ {
+ try{ console.error('ACL editor: can\'t load data cache on delete'); } catch(e) {};
+ }
+ return false;
+ }
+ if(aclDataCache.mode != 'seltarget' && aclDataCache.mode != 'save_new' && aclDataCache.mode != 'save_edit')
+ {
+ if ( window.console )
+ {
+ try{ console.error('ACL editor: wrong mode on aclDataCache: ' + aclDataCache.mode); } catch(e) {};
+ }
+ return false;
+ }
parms = {
'target_type' : aclDataCache.target_type,
'target_id' : aclDataCache.target_id,
diff -r 7c7920b65f42 -r 45ebe475ff75 includes/rijndael.php
--- a/includes/rijndael.php Tue Jul 03 14:21:33 2007 -0400
+++ b/includes/rijndael.php Thu Jul 05 10:37:36 2007 -0400
@@ -770,7 +770,7 @@
$cryptext = $this->rijndaelEncrypt($text, $key, 'ECB');
if(!is_array($cryptext))
{
- echo 'Warning: encryption failed for string: '.$text.' ';
+ echo 'Warning: encryption failed for string: '.print_r($text,true).' ';
return false;
}
switch($return_encoding)
diff -r 7c7920b65f42 -r 45ebe475ff75 includes/sessions.php
--- a/includes/sessions.php Tue Jul 03 14:21:33 2007 -0400
+++ b/includes/sessions.php Thu Jul 05 10:37:36 2007 -0400
@@ -1396,7 +1396,7 @@
$db->free_result();
$user_id =& $row['user_id'];
- $this->sql('INSERT INTO '.table_prefix.'user_extra(user_id) VALUES(' . $user_id . ');');
+ $this->sql('INSERT INTO '.table_prefix.'users_extra(user_id) VALUES(' . $user_id . ');');
}
// Require the account to be activated?
diff -r 7c7920b65f42 -r 45ebe475ff75 index.php
--- a/index.php Tue Jul 03 14:21:33 2007 -0400
+++ b/index.php Thu Jul 05 10:37:36 2007 -0400
@@ -11,38 +11,38 @@
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
*
*/
-
+
// Set up gzip encoding before any output is sent
-
+
$aggressive_optimize_html = false;
-
+
global $do_gzip;
$do_gzip = false;
-
+
if(isset($_SERVER['PATH_INFO'])) $v = $_SERVER['PATH_INFO'];
elseif(isset($_GET['title'])) $v = $_GET['title'];
else $v = '';
-
+
error_reporting(E_ALL);
-
+
// if(!strstr($v, 'CSS') && !strstr($v, 'UploadFile') && !strstr($v, 'DownloadFile')) // These pages are blacklisted because we can't have debugConsole's HTML output disrupting the flow of header() calls and whatnot
// {
// $do_gzip = ( function_exists('gzcompress') && ( isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') ) ) ? true : false;
// // Uncomment the following line to enable debugConsole (requires PHP 5 or later)
// // define('ENANO_DEBUG', '');
// }
-
+
if(defined('ENANO_DEBUG')) $do_gzip = false;
-
+
if($aggressive_optimize_html || $do_gzip)
{
ob_start();
}
-
+
require('includes/common.php');
-
+
global $db, $session, $paths, $template, $plugins; // Common objects
-
+
if(!isset($_GET['do'])) $_GET['do'] = 'view';
switch($_GET['do'])
{
@@ -129,7 +129,7 @@
';
if($paths->wiki_mode)
- echo 'Edit summary:
';
+ echo 'Edit summary:
';
echo '
@@ -223,7 +223,7 @@
echo 'None; Warning: request validation will fail after clicking submit';
}
?>
-
+
footer();
@@ -240,10 +240,10 @@
Error: you must enter a new name for this page.'; ?>