# HG changeset patch # User Dan # Date 1196279262 18000 # Node ID ce2873735506709cab42ef903b7a0f0e181634ac # Parent 39c132e69781eb0c2dfc359879c4769e98017e54# Parent ee1fc84f12a8e0a76f56f653a76fdb737c0c832a Oops, never merged in updates from ee1fc84f12a8 (240) diff -r ee1fc84f12a8 -r ce2873735506 includes/clientside/static/ajax.js --- a/includes/clientside/static/ajax.js Sun Nov 25 21:40:42 2007 -0500 +++ b/includes/clientside/static/ajax.js Wed Nov 28 14:47:42 2007 -0500 @@ -234,7 +234,7 @@ document.getElementById('protbtn_1').style.textDecoration = 'none'; document.getElementById('protbtn_2').style.textDecoration = 'none'; document.getElementById('protbtn_'+l).style.textDecoration = 'underline'; - ajaxPost(stdAjaxPrefix+'&_mode=protect', 'reason='+escape(r)+'&level='+l, function() { + ajaxPost(stdAjaxPrefix+'&_mode=protect', 'reason='+ajaxEscape(r)+'&level='+l, function() { if(ajax.readyState == 4) { unsetAjaxLoading(); if(ajax.responseText != 'good') @@ -251,7 +251,7 @@ r = prompt('What title should this page be renamed to?\nNote: This does not and will never change the URL of this page, that must be done from the admin panel.'); if(!r || r=='') return; setAjaxLoading(); - ajaxPost(stdAjaxPrefix+'&_mode=rename', 'newtitle='+escape(r), function() { + ajaxPost(stdAjaxPrefix+'&_mode=rename', 'newtitle='+ajaxEscape(r), function() { if(ajax.readyState == 4) { unsetAjaxLoading(); alert(ajax.responseText); @@ -289,7 +289,7 @@ return; } setAjaxLoading(); - ajaxPost(stdAjaxPrefix+'&_mode=deletepage', 'reason=' + escape(reason), function() { + ajaxPost(stdAjaxPrefix+'&_mode=deletepage', 'reason=' + ajaxEscape(reason), function() { if(ajax.readyState == 4) { unsetAjaxLoading(); alert(ajax.responseText); @@ -661,7 +661,7 @@ return true; } - ajaxPost(stdAjaxPrefix + '&_mode=change_theme', 'theme_id=' + escape(theme_id) + '&style_id=' + escape(style_id), function() + ajaxPost(stdAjaxPrefix + '&_mode=change_theme', 'theme_id=' + ajaxEscape(theme_id) + '&style_id=' + ajaxEscape(style_id), function() { if ( ajax.readyState == 4 ) { diff -r ee1fc84f12a8 -r ce2873735506 includes/functions.php --- a/includes/functions.php Sun Nov 25 21:40:42 2007 -0500 +++ b/includes/functions.php Wed Nov 28 14:47:42 2007 -0500 @@ -552,94 +552,6 @@ * Prints out the categorization box found on most regular pages. Doesn't take or return anything, but assumes that the page information is already set in $paths. */ - /* -function show_category_info() -{ - global $db, $session, $paths, $template, $plugins; // Common objects - dc_here('functions: showing category info'); - // if($template->no_headers && !strpos($_SERVER['REQUEST_URI'], 'ajax.php')) return ''; - if ( $paths->namespace == 'Category' ) - { - $q = $db->sql_query('SELECT page_id,namespace FROM '.table_prefix.'categories WHERE category_id=\''.$paths->cpage['urlname_nons'].'\' AND namespace=\'Category\' ORDER BY page_id;'); - if(!$q) $db->_die('The category information could not be selected.'); - $ticker = -1; - echo '

Subcategories

'; - if($db->numrows() < 1) echo '

There are no subcategories in this category.

'; - echo ''; - while($row = $db->fetchrow()) - { - $ticker++; - if ( $ticker == 3 ) - { - $ticker = 0; - } - if ( $ticker == 0 ) - { - echo ''; - } - echo ''; - if ( $ticker == 2 ) - { - echo ''; - } - } - $db->free_result(); - if($ticker) echo ''; - echo '
' . htmlspecialchars($paths->pages[$paths->nslist[$row['namespace']].$row['page_id']]['name']) . '
'; - - $q = $db->sql_query('SELECT page_id,namespace FROM '.table_prefix.'categories WHERE category_id=\''.$paths->cpage['urlname_nons'].'\' AND namespace!=\'Category\' ORDER BY page_id;'); - if ( !$q ) - { - $db->_die('The category information could not be selected.'); - } - $ticker = -1; - echo '

Pages

'; - if ( $db->numrows() < 1 ) - { - echo '

There are no pages in this category.

'; - } - echo ''; - while($row = $db->fetchrow()) - { - $ticker += ( $ticker == 3 ) ? -3 : 1; - if ( $ticker == 0 ) - { - echo ''; - } - echo ''; - if ( $ticker == 2 ) - { - echo ''; - } - } - $db->free_result(); - if($ticker) echo ''; - echo '
'.htmlspecialchars($paths->pages[$paths->nslist[$row['namespace']].$row['page_id']]['name']).'


'; - } - $q = $db->sql_query('SELECT category_id FROM '.table_prefix.'categories WHERE page_id=\''.$paths->cpage['urlname_nons'].'\' AND namespace=\''.$paths->namespace.'\''); - if(!$q) $db->_die('The error seems to have occurred during selection of category data.'); - if($db->numrows() > 0) { - echo '
Categories: '; - $i=0; - while($r = $db->fetchrow()) - { - if($i>0) echo ', '; - $i++; - echo ''.$paths->pages[$paths->nslist['Category'].$r['category_id']]['name'].''; - } - if( ( $paths->wiki_mode && !$paths->page_protected ) || ( $session->get_permissions('edit_cat') && $session->get_permissions('even_when_protected') ) ) echo ' [ edit categorization ]
'; - } - else - { - echo '
Categories: '; - echo '(Uncategorized)'; - if( ( $paths->wiki_mode && !$paths->page_protected ) || ( $session->get_permissions('edit_cat') && $session->get_permissions('even_when_protected') ) ) echo ' [ edit categorization ]
'; - else echo ''; - } - $db->free_result(); -} -*/ - function show_category_info() { global $db, $session, $paths, $template, $plugins; // Common objects diff -r ee1fc84f12a8 -r ce2873735506 themes/oxygen/header.tpl --- a/themes/oxygen/header.tpl Sun Nov 25 21:40:42 2007 -0500 +++ b/themes/oxygen/header.tpl Wed Nov 28 14:47:42 2007 -0500 @@ -94,7 +94,7 @@ elem1.appendChild(document.createTextNode(value)); elem1.style.display = 'block'; if(!value || value=='') return; - ajaxPost(stdAjaxPrefix+'&_mode=rename', 'newtitle='+escape(value), function() { + ajaxPost(stdAjaxPrefix+'&_mode=rename', 'newtitle='+ajaxEscape(value), function() { if(ajax.readyState == 4) { alert(ajax.responseText); } diff -r ee1fc84f12a8 -r ce2873735506 themes/stpatty/header.tpl --- a/themes/stpatty/header.tpl Sun Nov 25 21:40:42 2007 -0500 +++ b/themes/stpatty/header.tpl Wed Nov 28 14:47:42 2007 -0500 @@ -45,7 +45,7 @@ elem1.appendChild(document.createTextNode(value)); elem1.style.display = 'block'; if(!value || value=='') return; - ajaxPost(stdAjaxPrefix+'&_mode=rename', 'newtitle='+escape(value), function() { + ajaxPost(stdAjaxPrefix+'&_mode=rename', 'newtitle='+ajaxEscape(value), function() { if(ajax.readyState == 4) { alert(ajax.responseText); }