# HG changeset patch
# User Dan
# Date 1186676776 14400
# Node ID 7c68a18a27be502748c102f42713ae62b66ee1ec
# Parent f99fb84bd9596e30288187b4b243c6f5b1052147
AJAX comments are now paginated; plugin manager can now show system plugins; typo in installer corrected; links in oxygen/stpatty/admin footers changed to "About Enano" page; 1.0.1 release candidate
diff -r f99fb84bd959 -r 7c68a18a27be includes/clientside/static/comments.js
--- a/includes/clientside/static/comments.js Mon Aug 06 10:37:42 2007 -0400
+++ b/includes/clientside/static/comments.js Thu Aug 09 12:26:16 2007 -0400
@@ -1,8 +1,10 @@
// Comments
var comment_template = false;
+var comment_render_track = 0;
-function ajaxComments(parms) {
+function ajaxComments(parms)
+{
setAjaxLoading();
var pid = strToPageID(title);
if(!parms)
@@ -106,64 +108,9 @@
if ( data.count_total > 0 )
{
- var parser = new templateParser(comment_template);
- for ( var i = 0; i < data.comments.length; i++ )
- {
- var tplvars = new Object();
-
- if ( data.comments[i].approved != '1' && !data.auth_mod_comments )
- continue;
-
- tplvars.ID = i;
- tplvars.DATETIME = data.comments[i].time;
- tplvars.SUBJECT = data.comments[i].subject;
- tplvars.DATA = data.comments[i].comment_data;
- tplvars.SIGNATURE = data.comments[i].signature;
-
- if ( data.comments[i].approved != '1' )
- tplvars.SUBJECT += ' (Unapproved)';
-
- // Name
- tplvars.NAME = data.comments[i].name;
- if ( data.comments[i].user_id > 1 )
- tplvars.NAME = '' + data.comments[i].name + '';
-
- // User level
- tplvars.USER_LEVEL = 'Guest';
- if ( data.comments[i].user_level >= data.user_level.member ) tplvars.USER_LEVEL = 'Member';
- if ( data.comments[i].user_level >= data.user_level.mod ) tplvars.USER_LEVEL = 'Moderator';
- if ( data.comments[i].user_level >= data.user_level.admin ) tplvars.USER_LEVEL = 'Administrator';
-
- // Send PM link
- tplvars.SEND_PM_LINK=(data.comments[i].user_id>1)?'Send private message
':'';
-
- // Add buddy link
- tplvars.ADD_BUDDY_LINK=(data.comments[i].user_id>1)?'Add to buddy list
':'';
-
- // Edit link
- tplvars.EDIT_LINK='edit';
-
- // Delete link
- tplvars.DELETE_LINK='delete';
-
- // Moderation: (Un)approve link
- var appr = ( data.comments[i].approved == 1 ) ? 'Unapprove' : 'Approve';
- tplvars.MOD_APPROVE_LINK='';
-
- // Moderation: Delete post link
- tplvars.MOD_DELETE_LINK='Delete';
-
- var tplbool = new Object();
-
- tplbool.signature = ( data.comments[i].signature == '' ) ? false : true;
- tplbool.can_edit = ( data.auth_edit_comments && ( ( data.comments[i].user_id == data.user_id && data.logged_in ) || data.auth_mod_comments ) );
- tplbool.auth_mod = data.auth_mod_comments;
-
- parser.assign_vars(tplvars);
- parser.assign_bool(tplbool);
-
- html += '';
- }
+ comment_render_track = 0;
+ var commentpages = new paginator(data.comments, _render_comment, 0, 10, data);
+ html += commentpages.html;
}
if ( data.auth_post_comments )
@@ -200,11 +147,72 @@
document.getElementById('ajaxEditContainer').innerHTML = html;
- for ( i = 0; i < data.comments.length; i++ )
- {
- document.getElementById('comment_source_'+i).value = data.comments[i].comment_source;
- }
+ //for ( i = 0; i < data.comments.length; i++ )
+ //{
+ // document.getElementById('comment_source_'+i).value = data.comments[i].comment_source;
+ //}
+
+}
+
+var _render_comment = function(this_comment, data)
+{
+ var i = comment_render_track;
+ comment_render_track++;
+ var parser = new templateParser(comment_template);
+ var tplvars = new Object();
+
+ if ( this_comment.approved != '1' && !data.auth_mod_comments )
+ return '';
+
+ tplvars.ID = i;
+ tplvars.DATETIME = this_comment.time;
+ tplvars.SUBJECT = this_comment.subject;
+ tplvars.DATA = this_comment.comment_data;
+ tplvars.SIGNATURE = this_comment.signature;
+
+ if ( this_comment.approved != '1' )
+ tplvars.SUBJECT += ' (Unapproved)';
+
+ // Name
+ tplvars.NAME = this_comment.name;
+ if ( this_comment.user_id > 1 )
+ tplvars.NAME = '' + this_comment.name + '';
+ // User level
+ tplvars.USER_LEVEL = 'Guest';
+ if ( this_comment.user_level >= data.user_level.member ) tplvars.USER_LEVEL = 'Member';
+ if ( this_comment.user_level >= data.user_level.mod ) tplvars.USER_LEVEL = 'Moderator';
+ if ( this_comment.user_level >= data.user_level.admin ) tplvars.USER_LEVEL = 'Administrator';
+
+ // Send PM link
+ tplvars.SEND_PM_LINK=(this_comment.user_id>1)?'Send private message
':'';
+
+ // Add buddy link
+ tplvars.ADD_BUDDY_LINK=(this_comment.user_id>1)?'Add to buddy list
':'';
+
+ // Edit link
+ tplvars.EDIT_LINK='edit';
+
+ // Delete link
+ tplvars.DELETE_LINK='delete';
+
+ // Moderation: (Un)approve link
+ var appr = ( this_comment.approved == 1 ) ? 'Unapprove' : 'Approve';
+ tplvars.MOD_APPROVE_LINK='';
+
+ // Moderation: Delete post link
+ tplvars.MOD_DELETE_LINK='Delete';
+
+ var tplbool = new Object();
+
+ tplbool.signature = ( this_comment.signature == '' ) ? false : true;
+ tplbool.can_edit = ( data.auth_edit_comments && ( ( this_comment.user_id == data.user_id && data.logged_in ) || data.auth_mod_comments ) );
+ tplbool.auth_mod = data.auth_mod_comments;
+
+ parser.assign_vars(tplvars);
+ parser.assign_bool(tplbool);
+
+ return '';
}
function displayCommentForm()
diff -r f99fb84bd959 -r 7c68a18a27be includes/clientside/static/enano-lib-basic.js
--- a/includes/clientside/static/enano-lib-basic.js Mon Aug 06 10:37:42 2007 -0400
+++ b/includes/clientside/static/enano-lib-basic.js Thu Aug 09 12:26:16 2007 -0400
@@ -246,6 +246,7 @@
'editor.js',
'dynano.js',
'flyin.js',
+ 'paginate.js',
'loader.js'
];
diff -r f99fb84bd959 -r 7c68a18a27be includes/clientside/static/misc.js
--- a/includes/clientside/static/misc.js Mon Aug 06 10:37:42 2007 -0400
+++ b/includes/clientside/static/misc.js Thu Aug 09 12:26:16 2007 -0400
@@ -557,59 +557,6 @@
return str;
}
-function paginator_goto(parentobj, this_page, num_pages, perpage, url_string)
-{
- var height = $(parentobj).Height();
- var width = $(parentobj).Width();
- var left = $(parentobj).Left();
- var top = $(parentobj).Top();
- var left_pos = left + width ;
- var top_pos = height + top;
- var div = document.createElement('div');
- div.style.position = 'absolute';
- div.style.top = top_pos + 'px';
- div.className = 'question-box';
- div.style.margin = '1px 0 0 2px';
- var vtmp = 'input_' + Math.floor(Math.random() * 1000000);
- div.innerHTML = 'Go to page:
» ×';
-
- var body = document.getElementsByTagName('body')[0];
- domObjChangeOpac(0, div);
-
- body.appendChild(div);
-
- document.getElementById(vtmp).onkeypress = function(e){if(e.keyCode==13)this.nextSibling.nextSibling.onclick();};
- document.getElementById(vtmp).focus();
-
- // fade the div
- /*
- if(!div.id) div.id = 'autofade_'+Math.floor(Math.random() * 100000);
- var from = '#33FF33';
- Fat.fade_element(div.id,30,2000,from,Fat.get_bgcolor(div.id));
- */
-
- fly_in_bottom(div, false, true);
-
- var divh = $(div).Width();
- left_pos = left_pos - divh;
- div.style.left = left_pos + 'px';
-}
-
-function paginator_submit(obj, max, perpage, formatstring)
-{
- var userinput = obj.previousSibling.previousSibling.value;
- userinput = parseInt(userinput);
- var offset = ( userinput - 1 ) * perpage;
- if ( userinput > max || isNaN(userinput) || userinput < 1 )
- {
- new messagebox(MB_OK|MB_ICONSTOP, 'Invalid entry', 'Please enter a page number between 1 and ' + max + '.');
- return false;
- }
- var url = sprintf(formatstring, String(offset));
- fly_out_top(obj.parentNode, false, true);
- window.location = url;
-}
-
/**
* Insert a DOM object _after_ the specified child.
* @param object Parent node
diff -r f99fb84bd959 -r 7c68a18a27be includes/clientside/static/paginate.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/includes/clientside/static/paginate.js Thu Aug 09 12:26:16 2007 -0400
@@ -0,0 +1,275 @@
+// Javascript pagination control
+
+/**
+ * Paginates an array of data.
+ * @param array List of objects to render
+ * @param function Function called on each member of the array to render, should take an array member and set this.html to a string
+ * @param int Optional. Object to start at, defaults to 0.
+ * @param int Optional. Objects per page, defaults to 10
+ * @param object Variable that will be passed to the renderer callback
+ */
+
+var pagin_objects = new Object();
+
+function paginator(data, callback, offset, perpage, passer)
+{
+ if ( !perpage || typeof(perpage) != 'number' || ( typeof(perpage) == 'number' && perpage < 1 ) )
+ {
+ this.perpage = 10;
+ }
+ else
+ {
+ this.perpage = perpage;
+ }
+ if ( typeof(offset) != 'number' )
+ this.offset = 0;
+ else
+ this.offset = offset;
+ if ( typeof(passer) != 'undefined' )
+ this.passer = passer;
+ else
+ this.passer = false;
+ this.num_pages = Math.ceil(data.length / perpage );
+ this.random_id = 'autopagin_' + Math.floor(Math.random() * 1000000);
+ this._build_control = _build_paginator;
+ if ( this.num_pages > 1 )
+ {
+ var pg_control = ''+this._build_control(0)+'
';
+ }
+ else
+ {
+ var pg_control = '';
+ }
+ this.html = pg_control;
+ var i = 0;
+ while ( i < data.length )
+ {
+ if ( i % this.perpage == 0 )
+ {
+ if ( i > 0 )
+ this.html += '';
+ var display = ( ( i * this.perpage ) == this.offset ) ? '' : 'display: none;';
+ var thispage = Math.floor(i / this.perpage);
+ this.html += '';
+ }
+ this.html += callback(data[i], this.passer);
+ i++;
+ }
+ this.html += '
';
+ this.html += pg_control;
+ pagin_objects[this.random_id] = this;
+}
+
+function _build_paginator(this_page)
+{
+ var begin = '| Page: | ';
+ var block = '{LINK} | ';
+ var end = '
|---|
↓ | ';
+
+ var paginator = "\n"+begin+inner+end+"\n";
+ return paginator;
+
+}
+
+function jspaginator_goto(pagin_id, jump_to)
+{
+ var theobj = pagin_objects[pagin_id];
+ for ( var i = 0; i < theobj.num_pages; i++ )
+ {
+ var display = ( i == jump_to ) ? 'block' : 'none';
+ var thediv = document.getElementById(pagin_id + '_' + i);
+ if ( thediv )
+ thediv.style.display = display;
+ }
+ var pg_control = theobj._build_control(jump_to);
+ var divs = getElementsByClassName(document, 'div', pagin_id + '_control');
+ for ( var i = 0; i < divs.length; i++ )
+ {
+ divs[i].innerHTML = pg_control;
+ }
+}
+
+function paginator_goto(parentobj, this_page, num_pages, perpage, url_string)
+{
+ var height = $(parentobj).Height();
+ var width = $(parentobj).Width();
+ var left = $(parentobj).Left();
+ var top = $(parentobj).Top();
+ var left_pos = left + width ;
+ var top_pos = height + top;
+ var div = document.createElement('div');
+ div.style.position = 'absolute';
+ div.style.top = top_pos + 'px';
+ div.className = 'question-box';
+ div.style.margin = '1px 0 0 2px';
+ var vtmp = 'input_' + Math.floor(Math.random() * 1000000);
+ var regex = new RegExp('\"', 'g');
+ var submit_target = ( typeof(url_string) == 'object' ) ? ( toJSONString(url_string) ).replace(regex, '\'') : 'unescape(\'' + escape(url_string) + '\')';
+ var onclick = 'paginator_submit(this, '+num_pages+', '+perpage+', '+submit_target+'); return false;';
+ div.innerHTML = 'Go to page:
» ×';
+
+ var body = document.getElementsByTagName('body')[0];
+ domObjChangeOpac(0, div);
+
+ body.appendChild(div);
+
+ document.getElementById(vtmp).onkeypress = function(e){if(e.keyCode==13)this.nextSibling.nextSibling.onclick();};
+ document.getElementById(vtmp).focus();
+
+ // fade the div
+ /*
+ if(!div.id) div.id = 'autofade_'+Math.floor(Math.random() * 100000);
+ var from = '#33FF33';
+ Fat.fade_element(div.id,30,2000,from,Fat.get_bgcolor(div.id));
+ */
+
+ fly_in_bottom(div, false, true);
+
+ var divh = $(div).Width();
+ left_pos = left_pos - divh;
+ div.style.left = left_pos + 'px';
+}
+
+function paginator_submit(obj, max, perpage, formatstring)
+{
+ var userinput = obj.previousSibling.previousSibling.value;
+ userinput = parseInt(userinput);
+ var offset = ( userinput - 1 ) * perpage;
+ if ( userinput > max || isNaN(userinput) || userinput < 1 )
+ {
+ new messagebox(MB_OK|MB_ICONSTOP, 'Invalid entry', 'Please enter a page number between 1 and ' + max + '.');
+ return false;
+ }
+ if ( typeof(formatstring) == 'object' )
+ {
+ fly_out_top(obj.parentNode, false, true);
+ jspaginator_goto(formatstring.random_id, ( offset / perpage ));
+ }
+ else
+ {
+ var url = sprintf(formatstring, String(offset));
+ fly_out_top(obj.parentNode, false, true);
+ window.location = url;
+ }
+}
+
diff -r f99fb84bd959 -r 7c68a18a27be includes/render.php
--- a/includes/render.php Mon Aug 06 10:37:42 2007 -0400
+++ b/includes/render.php Thu Aug 09 12:26:16 2007 -0400
@@ -826,6 +826,12 @@
$img_tag .= 'style="border-width: 0px; /* background-color: white; */" ';
+ $code = $plugins->setHook('img_tag_parse_img');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+
$img_tag .= '/>';
$complete_tag = '';
@@ -868,7 +874,13 @@
}
else
{
- $complete_tag .= '';
+ $complete_tag .= 'setHook('img_tag_parse_link');
+ foreach ( $code as $cmd )
+ {
+ eval($cmd);
+ }
+ $complete_tag .= '>';
$complete_tag .= $img_tag;
$complete_tag .= '';
}
diff -r f99fb84bd959 -r 7c68a18a27be includes/template.php
--- a/includes/template.php Mon Aug 06 10:37:42 2007 -0400
+++ b/includes/template.php Thu Aug 09 12:26:16 2007 -0400
@@ -747,7 +747,8 @@
'THEME_ID'=>$this->theme,
'STYLE_ID'=>$this->style,
'JS_DYNAMIC_VARS'=>$js_dynamic,
- 'UNREAD_PMS'=>$session->unread_pms
+ 'UNREAD_PMS'=>$session->unread_pms,
+ 'URL_ABOUT_ENANO' => makeUrlNS('Special', 'About_Enano', true)
);
foreach ( $paths->nslist as $ns_id => $ns_prefix )
diff -r f99fb84bd959 -r 7c68a18a27be install.php
--- a/install.php Mon Aug 06 10:37:42 2007 -0400
+++ b/install.php Thu Aug 09 12:26:16 2007 -0400
@@ -1119,7 +1119,7 @@
RewriteEngine on
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.+) '.scriptPath.'/index.php/$1 [L,QSA]
+RewriteRule ^(.+) '.scriptPath.'/index.php?title=$1 [L,QSA]
RewriteRule \.(php|html|gif|jpg|png|css|js)$ - [L]
');
fclose($ht);
diff -r f99fb84bd959 -r 7c68a18a27be plugins/PrivateMessages.php
--- a/plugins/PrivateMessages.php Mon Aug 06 10:37:42 2007 -0400
+++ b/plugins/PrivateMessages.php Thu Aug 09 12:26:16 2007 -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
+Version: 1.0.1
Author URI: http://enanocms.org/
*/
diff -r f99fb84bd959 -r 7c68a18a27be plugins/SpecialAdmin.php
--- a/plugins/SpecialAdmin.php Mon Aug 06 10:37:42 2007 -0400
+++ b/plugins/SpecialAdmin.php Thu Aug 09 12:26:16 2007 -0400
@@ -2,7 +2,7 @@
/*
Plugin Name: Runt - the Enano administration panel
Plugin URI: http://enanocms.org/
-Description: Provides the page Special:Administration, which is the AJAX frontend to the various Admin:
+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.1
Author URI: http://enanocms.org/
@@ -549,13 +549,13 @@
echo('Error disabling plugin
The demo lockdown plugin cannot be disabled in demo mode.
');
break;
}
- if ( $_GET['plugin'] != 'SpecialAdmin.php' )
+ if ( !in_array($_GET['plugin'], $plugins->system_plugins) )
{
setConfig('plugin_'.$_GET['plugin'], '0');
}
else
{
- echo('Error disabling plugin
The administration panel plugin cannot be disabled.
');
+ echo('Error disabling plugin
The plugin you selected cannot be disabled because it is a system plugin.
');
}
break;
}
@@ -563,6 +563,7 @@
$dir = './plugins/';
$plugin_list = Array();
$system = Array();
+ $show_system = ( isset($_GET['show_system']) && $_GET['show_system'] == 'yes' );
if (is_dir($dir))
{
@@ -572,10 +573,12 @@
{
if(preg_match('#^(.*?)\.php$#is', $file) && $file != 'index.php')
{
+ unset($thelist);
if ( in_array($file, $plugins->system_plugins) )
{
+ if ( !$show_system )
+ continue;
$thelist =& $system;
- continue;
}
else
{
@@ -614,28 +617,48 @@
}
echo('
| Plugin filename | Plugin name | Description | Author | Version | |
|---|
');
- $plugin_files = array_keys($plugin_list);
+ $plugin_files_1 = array_keys($plugin_list);
+ $plugin_files_2 = array_keys($system);
+ $plugin_files = array_values(array_merge($plugin_files_1, $plugin_files_2));
$cls = 'row2';
for ( $i = 0; $i < sizeof($plugin_files); $i++ )
{
$cls = ( $cls == 'row2' ) ? 'row3' : 'row2';
+ $this_plugin = ( isset($system[$plugin_files[$i]]) ) ? $system[$plugin_files[$i]] : $plugin_list[$plugin_files[$i]];
+ $is_system = ( $system[$plugin_files[$i]] );
+ $bgcolor = '';
+ if ( $is_system && $cls == 'row2' )
+ $bgcolor = ' style="background-color: #FFD8D8;"';
+ else if ( $is_system && $cls == 'row3' )
+ $bgcolor = ' style="background-color: #FFD0D0;"';
echo '
- | '.$plugin_files[$i].' |
- '.$plugin_list[$plugin_files[$i]]['name'].' |
- '.$plugin_list[$plugin_files[$i]]['desc'].' |
- '.$plugin_list[$plugin_files[$i]]['auth'].' |
- '.$plugin_list[$plugin_files[$i]]['vers'].' |
- ';
- if ( getConfig('plugin_'.$plugin_files[$i]) == '1' )
+ | '.$plugin_files[$i].' |
+ '.$this_plugin['name'].' |
+ '.$this_plugin['desc'].' |
+ '.$this_plugin['auth'].' |
+ '.$this_plugin['vers'].' |
+ ';
+ if ( !in_array($plugin_files[$i], $plugins->system_plugins) )
{
- echo 'Disable';
+ if ( getConfig('plugin_'.$plugin_files[$i]) == '1' )
+ {
+ echo 'Disable';
+ }
+ else
+ {
+ echo 'Enable';
+ }
}
else
{
- echo 'Enable';
+ echo '[System]';
}
echo ' |
';
}
+ $showhide_link = ( $show_system ) ?
+ 'Hide system plugins' :
+ 'Show system plugins' ;
+ echo '| '.$showhide_link.' |
|---|
';
echo '
|
diff -r f99fb84bd959 -r 7c68a18a27be themes/oxygen/footer.tpl
--- a/themes/oxygen/footer.tpl Mon Aug 06 10:37:42 2007 -0400
+++ b/themes/oxygen/footer.tpl Thu Aug 09 12:26:16 2007 -0400
@@ -12,7 +12,7 @@
-->
|
diff -r f99fb84bd959 -r 7c68a18a27be themes/stpatty/footer.tpl
--- a/themes/stpatty/footer.tpl Mon Aug 06 10:37:42 2007 -0400
+++ b/themes/stpatty/footer.tpl Thu Aug 09 12:26:16 2007 -0400
@@ -9,7 +9,7 @@
-Dan
-->
- {COPYRIGHT} • Powered by Enano | Valid XHTML 1.1 | Valid CSS | [[Stats]]
+ {COPYRIGHT} • Powered by Enano | Valid XHTML 1.1 | Valid CSS | [[Stats]]