+
+
+ | lang['USER_ADMIN_' . strtoupper($action)]; ?> |
+
+
+ |
+
+lang['VIEW_AVATARS']; ?>:
/>lang['YES']; ?> />lang['NO']; ?> |
-
| lang['DISABLE_CENSORS']; ?>: |
/>lang['YES']; ?> />lang['NO']; ?> |
-
| lang['HIDE_ONLINE']; ?>: |
/>lang['YES']; ?> />lang['NO']; ?> |
-
-
lang['NOTIFY_METHOD']; ?>:
lang['NOTIFY_METHOD_EXPLAIN']; ?> |
/>lang['NOTIFY_METHOD_EMAIL']; ?> />lang['NOTIFY_METHOD_IM']; ?> />lang['NOTIFY_METHOD_BOTH']; ?> |
-
| lang['NOTIFY_ON_PM']; ?>: |
/>lang['YES']; ?> />lang['NO']; ?> |
@@ -1141,6 +1305,11 @@ if ($username || $user_id)
case 'avatar':
$can_upload = ($file_uploads && file_exists($phpbb_root_path . $config['avatar_path']) && is_writeable($phpbb_root_path . $config['avatar_path'])) ? true : false;
+ $display_gallery = (isset($_POST['displaygallery'])) ? true : false;
+ $avatar_category = request_var('category', '');
+
+ // Generate users avatar
+ $avatar_img = '';
if ($user_avatar)
{
switch ($user_avatar_type)
@@ -1247,11 +1416,46 @@ if ($username || $user_id)
case 'sig':
include($phpbb_root_path . 'includes/functions_posting.'.$phpEx);
+ $signature_preview = '';
+ if ($preview)
+ {
+ $signature_preview = $signature;
+
+ // Fudge-o-rama ...
+ include($phpbb_root_path . 'includes/message_parser.'.$phpEx);
+
+ $message_parser = new parse_message();
+ $message_parser->message = $signature_preview;
+ $message_parser->parse($enable_html, $enable_bbcode, $enable_urls, $enable_smilies);
+ $signature_preview = $message_parser->message;
+
+ if ($enable_bbcode)
+ {
+ include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
+ $bbcode = new bbcode($message_parser->bbcode_bitfield);
+
+ $bbcode->bbcode_second_pass($signature_preview, $message_parser->bbcode_uid);
+ }
+
+ // If we allow users to disable display of emoticons
+ // we'll need an appropriate check and preg_replace here
+ $signature_preview = (empty($enable_smilies) || empty($config['allow_smilies'])) ? preg_replace('# : str_replace('<img src=) (((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$censors['match'], \$censors['replace'], '\\0')", '>' . $signature_preview . '<'), 1, -1));
+ }
+
+ $signature_preview = str_replace("\n", '
', $signature_preview);
+ }
+
decode_text($user_sig, $user_sig_bbcode_uid);
?>
+ | lang['SIGNATURE']; ?>: |
|
+
+ lang['OPTIONS']; ?>
+
+ | lang['HTML_IS_ON'] : $user->lang['HTML_IS_OFF']; ?> |
+
+
+ | lang['BBCODE_IS_ON'], "", '') : sprintf($user->lang['BBCODE_IS_OFF'], "", ''); ?> |
+
+
+ | lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF']; ?> |
+
+
+ | lang['FLASH_IS_ON'] : $user->lang['FLASH_IS_OFF']; ?> |
+
+
+ | lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF']; ?> |
+
+ |
+ |
+
+
+
+ | lang['ADMIN_SIGNATURE_PREVIEW']; ?> |
+
+
+ |
+
+
- | |
+ lang['PREVIEW'] . '" /> ' : ''; ?> |
|
diff --git a/phpBB/adm/admin_viewlogs.php b/phpBB/adm/admin_viewlogs.php
index e42bee398a..ece903bb5b 100644
--- a/phpBB/adm/admin_viewlogs.php
+++ b/phpBB/adm/admin_viewlogs.php
@@ -140,7 +140,7 @@ if ($mode == 'mod')
//
$log_data = array();
$log_count = 0;
-view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, $sql_where, $sql_sort);
+view_log($mode, $log_data, $log_count, $config['topics_per_page'], $start, $forum_id, 0, 0, $sql_where, $sql_sort);
if ($log_count)
{
diff --git a/phpBB/adm/editor.js b/phpBB/adm/editor.js
new file mode 100644
index 0000000000..a54a31db38
--- /dev/null
+++ b/phpBB/adm/editor.js
@@ -0,0 +1,306 @@
+// bbCode control by subBlue design [ www.subBlue.com ]
+// Includes unixsafe colour palette selector by SHS`
+
+// Startup variables
+var imageTag = false;
+var theSelection = false;
+
+// Check for Browser & Platform for PC & IE specific bits
+// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
+var clientPC = navigator.userAgent.toLowerCase(); // Get client info
+var clientVer = parseInt(navigator.appVersion); // Get browser version
+
+var is_ie = ((clientPC.indexOf("msie") != -1) && (clientPC.indexOf("opera") == -1));
+var is_nav = ((clientPC.indexOf('mozilla')!=-1) && (clientPC.indexOf('spoofer')==-1)
+ && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera')==-1)
+ && (clientPC.indexOf('webtv')==-1) && (clientPC.indexOf('hotjava')==-1));
+
+var is_win = ((clientPC.indexOf("win")!=-1) || (clientPC.indexOf("16bit") != -1));
+var is_mac = (clientPC.indexOf("mac")!=-1);
+
+// Shows the help messages in the helpline window
+function helpline(help) {
+ document.forms[form_name].helpbox.value = eval(help + "_help");
+}
+
+// Replacement for arrayname.length property
+function getarraysize(thearray) {
+ for (i = 0; i < thearray.length; i++) {
+ if ((thearray[i] == "undefined") || (thearray[i] == "") || (thearray[i] == null))
+ return i;
+ }
+ return thearray.length;
+}
+
+// Replacement for arrayname.push(value) not implemented in IE until version 5.5
+// Appends element to the array
+function arraypush(thearray,value) {
+ thearray[ getarraysize(thearray) ] = value;
+}
+
+// Replacement for arrayname.pop() not implemented in IE until version 5.5
+// Removes and returns the last element of an array
+function arraypop(thearray) {
+ thearraysize = getarraysize(thearray);
+ retval = thearray[thearraysize - 1];
+ delete thearray[thearraysize - 1];
+ return retval;
+}
+
+function emoticon(text) {
+ text = ' ' + text + ' ';
+ if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) {
+ var caretPos = document.forms[form_name].elements[text_name].caretPos;
+
+ caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text;
+ document.forms[form_name].elements[text_name].focus();
+ } else {
+ var selStart = document.forms[form_name].elements[text_name].selectionStart;
+ var selEnd = document.forms[form_name].elements[text_name].selectionEnd;
+
+ mozWrap(document.forms[form_name].elements[text_name], text, '')
+ document.forms[form_name].elements[text_name].focus();
+ document.forms[form_name].elements[text_name].selectionStart = selStart + text.length;
+ document.forms[form_name].elements[text_name].selectionEnd = selEnd + text.length;
+ }
+}
+
+function bbfontstyle(bbopen, bbclose) {
+ if ((clientVer >= 4) && is_ie && is_win) {
+ theSelection = document.selection.createRange().text;
+ if (!theSelection) {
+ insert_text(bbopen + bbclose);
+ document.forms[form_name].elements[text_name].focus();
+ return;
+ }
+ document.selection.createRange().text = bbopen + theSelection + bbclose;
+ document.forms[form_name].elements[text_name].focus();
+ return;
+ } else {
+ insert_text(bbopen + bbclose);
+ document.forms[form_name].elements[text_name].focus();
+ return;
+ }
+ storeCaret(document.forms[form_name].elements[text_name]);
+}
+
+function insert_text(text) {
+ if (document.forms[form_name].elements[text_name].createTextRange && document.forms[form_name].elements[text_name].caretPos) {
+ var caretPos = document.forms[form_name].elements[text_name].caretPos;
+ caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text;
+ } else {
+ var selStart = document.forms[form_name].elements[text_name].selectionStart;
+ var selEnd = document.forms[form_name].elements[text_name].selectionEnd;
+
+ mozWrap(document.forms[form_name].elements[text_name], text, '')
+ document.forms[form_name].elements[text_name].selectionStart = selStart + text.length;
+ document.forms[form_name].elements[text_name].selectionEnd = selEnd + text.length;
+ }
+}
+
+function attach_inline() {
+ insert_text('[attachment=' + document.forms[form_name].elements['attachments'].value + ']' + document.forms[form_name].elements['attachments'].options[document.forms[form_name].elements['attachments'].selectedIndex].text + '[/attachment]');
+}
+
+function bbstyle(bbnumber) {
+
+ donotinsert = false;
+ theSelection = false;
+ bblast = 0;
+ document.forms[form_name].elements[text_name].focus();
+
+ if (bbnumber == -1) { // Close all open tags & default button names
+ while (bbcode[0]) {
+ butnumber = arraypop(bbcode) - 1;
+ document.forms[form_name].elements[text_name].value += bbtags[butnumber + 1];
+ buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value');
+ if (buttext != "[*]")
+ {
+ eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
+ }
+ }
+ document.forms[form_name].addbbcode10.value = "List";
+ bbtags[10] = "[list]";
+ document.forms[form_name].addbbcode12.value = "List=";
+ bbtags[12] = "[list=]";
+ imageTag = false; // All tags are closed including image tags :D
+ document.forms[form_name].elements[text_name].focus();
+ return;
+ }
+
+ if ((clientVer >= 4) && is_ie && is_win)
+ {
+ theSelection = document.selection.createRange().text; // Get text selection
+ if (theSelection) {
+ // Add tags around selection
+ document.selection.createRange().text = bbtags[bbnumber] + theSelection + bbtags[bbnumber+1];
+ document.forms[form_name].elements[text_name].focus();
+ theSelection = '';
+ return;
+ }
+ }
+ else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0))
+ {
+ mozWrap(document.forms[form_name].elements[text_name], bbtags[bbnumber], bbtags[bbnumber+1]);
+ document.forms[form_name].elements[text_name].focus();
+ theSelection = '';
+ return;
+ }
+
+ // Find last occurance of an open tag the same as the one just clicked
+ for (i = 0; i < bbcode.length; i++) {
+ if (bbcode[i] == bbnumber+1) {
+ bblast = i;
+ donotinsert = true;
+ }
+ }
+
+ if ((bbnumber == 10) && (bbtags[10] != "[*]"))
+ {
+ if (donotinsert)
+ {
+ document.forms[form_name].addbbcode12.value = "List=";
+ tmp_help = o_help;
+ o_help = e_help;
+ e_help = tmp_help;
+ bbtags[12] = "[list=]";
+ }
+ else
+ {
+ document.forms[form_name].addbbcode12.value = "[*]";
+ tmp_help = o_help;
+ o_help = e_help;
+ e_help = tmp_help;
+ bbtags[12] = "[*]";
+ }
+ }
+
+ if ((bbnumber == 12) && (bbtags[12] != "[*]"))
+ {
+ if (donotinsert)
+ {
+ document.forms[form_name].addbbcode10.value = "List";
+ tmp_help = l_help;
+ l_help = e_help;
+ e_help = tmp_help;
+ bbtags[10] = "[list]";
+ }
+ else
+ {
+ document.forms[form_name].addbbcode10.value = "[*]";
+ tmp_help = l_help;
+ l_help = e_help;
+ e_help = tmp_help;
+ bbtags[10] = "[*]";
+ }
+ }
+
+ if (donotinsert) { // Close all open tags up to the one just clicked & default button names
+ while (bbcode[bblast]) {
+ butnumber = arraypop(bbcode) - 1;
+ if (bbtags[butnumber] != "[*]")
+ {
+ insert_text(bbtags[butnumber + 1]);
+ }
+ else
+ {
+ insert_text(bbtags[butnumber]);
+ }
+ buttext = eval('document.forms[form_name].addbbcode' + butnumber + '.value');
+ if (bbtags[butnumber] != "[*]")
+ {
+ eval('document.forms[form_name].addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
+ }
+ imageTag = false;
+ }
+ document.forms[form_name].elements[text_name].focus();
+ return;
+ } else { // Open tags
+
+ if (imageTag && (bbnumber != 14)) { // Close image tag before adding another
+ insert_text(bbtags[15]);
+
+ lastValue = arraypop(bbcode) - 1; // Remove the close image tag from the list
+ document.forms[form_name].addbbcode14.value = "Img"; // Return button back to normal state
+ imageTag = false;
+ }
+
+ // Open tag
+ insert_text(bbtags[bbnumber]);
+
+ if ((bbnumber == 14) && (imageTag == false)) imageTag = 1; // Check to stop additional tags after an unclosed image tag
+ if (bbtags[bbnumber] != "[*]")
+ {
+ arraypush(bbcode,bbnumber+1);
+ eval('document.forms[form_name].addbbcode'+bbnumber+'.value += "*"');
+ }
+ document.forms[form_name].elements[text_name].focus();
+ return;
+ }
+
+ storeCaret(document.forms[form_name].elements[text_name]);
+}
+
+// From http://www.massless.org/mozedit/
+function mozWrap(txtarea, open, close)
+{
+ var selLength = txtarea.textLength;
+ var selStart = txtarea.selectionStart;
+ var selEnd = txtarea.selectionEnd;
+ if (selEnd == 1 || selEnd == 2)
+ selEnd = selLength;
+
+ var s1 = (txtarea.value).substring(0,selStart);
+ var s2 = (txtarea.value).substring(selStart, selEnd)
+ var s3 = (txtarea.value).substring(selEnd, selLength);
+ txtarea.value = s1 + open + s2 + close + s3;
+ return;
+}
+
+// Insert at Claret position. Code from
+// http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
+function storeCaret(textEl) {
+ if (textEl.createTextRange) { textEl.caretPos = document.selection.createRange().duplicate(); }
+}
+
+function colorPalette(dir, width, height)
+{
+ var r = 0, g = 0, b = 0;
+ var numberList = new Array(6);
+ numberList[0] = "00";
+ numberList[1] = "40";
+ numberList[2] = "80";
+ numberList[3] = "BF";
+ numberList[4] = "FF";
+ document.writeln('