]]> {$lang->post_thread}]]> + +
{$onlinemembers}
{$remove_users}
@@ -4290,7 +4294,7 @@ $(".forumjump").change(function() {
{$footer}
]]>
-
+
-
+
-
+
-
+
@@ -12035,8 +12010,8 @@ if(use_xmlhttprequest == "1")
MyBB.select2();
$("#buddy_add_username").select2({
placeholder: "{$lang->search_user}",
- minimumInputLength: 3,
- maximumSelectionSize: 3,
+ minimumInputLength: 2,
+ maximumSelectionSize: 5,
multiple: true,
ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
url: "xmlhttp.php?action=get_users",
@@ -12107,8 +12082,8 @@ if(use_xmlhttprequest == "1")
MyBB.select2();
$("#ignored_add_username").select2({
placeholder: "{$lang->search_user}",
- minimumInputLength: 3,
- maximumSelectionSize: 3,
+ minimumInputLength: 2,
+ maximumSelectionSize: 5,
multiple: true,
ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
url: "xmlhttp.php?action=get_users",
@@ -12209,8 +12184,8 @@ if(use_xmlhttprequest == "1")
]]>
-
- 
+
+
{$profile_link}
]]>
@@ -13104,7 +13079,7 @@ if(use_xmlhttprequest == "1")
{$referral_link}]]>
{$lang->reputation} {$reputation_link} [{$lang->details}]]]> ({$lang->resend_activation})]]> - +
-
-
- {$lang->new_thread} +
- {$lang->new_posts_thread}
- {$lang->new_hot_thread}
- {$lang->hot_thread}
{$sql_queries} / {$server_load} / {$memory_usage}
[{$lang->debug_advanced_details}]
Performing necessary upgrade queries...
"; + flush(); + + if($db->field_exists('subscriptionkey', 'threadsubscriptions')) + { + $db->drop_column("threadsubscriptions", "subscriptionkey"); + } + + if($db->type != 'pgsql') + { + $db->modify_column('adminsessions', 'useragent', "varchar(200) NOT NULL default ''"); + $db->modify_column('sessions', 'useragent', "varchar(200) NOT NULL default ''"); + } + else + { + $db->modify_column('adminsessions', 'useragent', "varchar(200)", "set", "''"); + $db->modify_column('sessions', 'useragent', "varchar(200)", "set", "''"); + } + + // Remove "Are You a Human" captcha + $db->update_query('settings', array('value' => 1), "name='captchaimage' AND value=3"); + $db->delete_query('settings', "name IN ('ayahpublisherkey', 'ayahscoringkey')"); + $db->delete_query('templates', "title IN ('member_register_regimage_ayah', 'post_captcha_ayah')"); + + global $footer_extra; + $footer_extra = ""; + + $output->print_contents("Click next to continue with the upgrade process.
"); + $output->print_footer("35_dbchanges2"); +} + +function upgrade35_dbchanges2() +{ + global $db, $output; + + $output->print_header("Updating Database"); + echo "Performing necessary optimization queries...
"; + flush(); + + switch($db->type) + { + // PostgreSQL and SQLite do not support unsigned ints + case "pgsql": + $db->modify_column("buddyrequests", "uid", "int", "set", "'0'"); + $db->modify_column("buddyrequests", "touid", "int", "set", "'0'"); + $db->modify_column("buddyrequests", "date", "int", "set", "'0'"); + break; + case "sqlite": + $db->modify_column("threadratings", "rating", "tinyint(1) NOT NULL default '0'"); + $db->modify_column("buddyrequests", "uid", "int NOT NULL default '0'"); + $db->modify_column("buddyrequests", "touid", "int NOT NULL default '0'"); + $db->modify_column("buddyrequests", "date", "int NOT NULL default '0'"); + break; + default: + $db->modify_column("adminviews", "perpage", "smallint(4) unsigned NOT NULL default '0'"); + $db->modify_column("attachments", "filesize", "int(10) unsigned NOT NULL default '0'"); + $db->modify_column("attachtypes", "maxsize", "int(15) unsigned NOT NULL default '0'"); + $db->modify_column("banned", "olddisplaygroup", "int unsigned NOT NULL default '0'"); + $db->modify_column("buddyrequests", "uid", "int unsigned NOT NULL default '0'"); + $db->modify_column("buddyrequests", "touid", "int unsigned NOT NULL default '0'"); + $db->modify_column("buddyrequests", "date", "int unsigned NOT NULL default '0'"); + $db->modify_column("calendars", "eventlimit", "smallint(3) unsigned NOT NULL default '0'"); + $db->modify_column("massemails", "perpage", "smallint(4) unsigned NOT NULL default '50'"); + $db->modify_column("promotions", "posts", "int unsigned NOT NULL default '0'"); + $db->modify_column("promotions", "threads", "int unsigned NOT NULL default '0'"); + $db->modify_column("promotions", "registered", "int unsigned NOT NULL default '0'"); + $db->modify_column("promotions", "online", "int unsigned NOT NULL default '0'"); + $db->modify_column("promotions", "referrals", "int unsigned NOT NULL default '0'"); + $db->modify_column("promotions", "warnings", "int unsigned NOT NULL default '0'"); + $db->modify_column("sessions", "location1", "int(10) unsigned NOT NULL default '0'"); + $db->modify_column("sessions", "location2", "int(10) unsigned NOT NULL default '0'"); + $db->modify_column("threadratings", "rating", "tinyint(1) unsigned NOT NULL default '0'"); + $db->modify_column("threads", "views", "int(100) unsigned NOT NULL default '0'"); + $db->modify_column("threads", "replies", "int(100) unsigned NOT NULL default '0'"); + break; + } + + global $footer_extra; + $footer_extra = ""; + + $output->print_contents("Click next to continue with the upgrade process.
"); + $output->print_footer("35_dbchanges3"); +} + +function upgrade35_dbchanges3() +{ + global $db, $output; + + $output->print_header("Updating Database"); + echo "Performing necessary optimization queries...
"; + flush(); + + switch($db->type) + { + // PostgreSQL and SQLite do not support unsigned ints + case "sqlite": + $db->modify_column("usergroups", "type", "tinyint(1) NOT NULL default '2'"); + $db->modify_column("users", "loginattempts", "smallint(2) NOT NULL default '1'"); + break; + case "mysql": + case "mysqli": + $db->modify_column("usergroups", "type", "tinyint(1) unsigned NOT NULL default '2'"); + $db->modify_column("usergroups", "stars", "smallint(4) unsigned NOT NULL default '0'"); + $db->modify_column("usergroups", "pmquota", "int(3) unsigned NOT NULL default '0'"); + $db->modify_column("usergroups", "maxpmrecipients", "int(4) unsigned NOT NULL default '5'"); + $db->modify_column("usergroups", "maxemails", "int(3) unsigned NOT NULL default '5'"); + $db->modify_column("usergroups", "emailfloodtime", "int(3) unsigned NOT NULL default '5'"); + $db->modify_column("usergroups", "maxwarningsday", "int(3) unsigned NOT NULL default '3'"); + $db->modify_column("usergroups", "edittimelimit", "int(4) unsigned NOT NULL default '0'"); + $db->modify_column("usergroups", "maxposts", "int(4) unsigned NOT NULL default '0'"); + $db->modify_column("users", "postnum", "int(10) unsigned NOT NULL default '0'"); + $db->modify_column("users", "threadnum", "int(10) unsigned NOT NULL default '0'"); + $db->modify_column("users", "ppp", "smallint(6) unsigned NOT NULL default '0'"); + $db->modify_column("users", "tpp", "smallint(6) unsigned NOT NULL default '0'"); + $db->modify_column("users", "daysprune", "smallint(6) unsigned NOT NULL default '0'"); + $db->modify_column("users", "totalpms", "int(10) unsigned NOT NULL default '0'"); + $db->modify_column("users", "unreadpms", "int(10) unsigned NOT NULL default '0'"); + $db->modify_column("users", "warningpoints", "int(3) unsigned NOT NULL default '0'"); + $db->modify_column("users", "loginattempts", "smallint(2) unsigned NOT NULL default '1'"); + $db->modify_column("usertitles", "stars", "smallint(4) unsigned NOT NULL default '0'"); + $db->modify_column("warninglevels", "percentage", "smallint(3) unsigned NOT NULL default '0'"); + break; + } + + global $footer_extra; + $footer_extra = ""; + + $output->print_contents("Click next to continue with the upgrade process.
"); + $output->print_footer("35_dbchanges4"); +} + +function upgrade35_dbchanges4() +{ + global $mybb, $output; + + $output->print_header("Adding index files"); + echo "Adding index files to attachment directories...
"; + flush(); + + $dir = @opendir('../'.$mybb->settings['uploadspath']); + if($dir) + { + while(($file = @readdir($dir)) !== false) + { + $filename = "../{$mybb->settings['uploadspath']}/{$file}"; + $indexfile = "{$filename}/index.html"; + + if(preg_match('#^[0-9]{6}$#', $file) && @is_dir($filename) && @is_writable($filename) && !file_exists($indexfile)) + { + $index = @fopen($indexfile, 'w'); + @fwrite($index, "\n\nClick next to continue with the upgrade process.
"); + $output->print_footer("35_done"); +} diff --git a/Upload/jscripts/general.js b/Upload/jscripts/general.js index 910c679..c8fe439 100644 --- a/Upload/jscripts/general.js +++ b/Upload/jscripts/general.js @@ -633,4 +633,25 @@ var lang = { }; +/* add keepelement to jquery-modal plugin */ +(function($) { + if(typeof $.modal != 'undefined') + { + $.modal.defaults.keepelement = false; + + $.modal.prototype.oldCloseFunction = $.modal.prototype.close; + $.modal.prototype.close = function() + { + this.oldCloseFunction(); + + // Deletes the element (multi-modal feature: e.g. when you click on multiple report buttons, you will want to see different content for each) + if(!this.options.keepelement) + { + this.$elm.remove(); + } + }; + } +})(jQuery); + + MyBB.init(); diff --git a/Upload/jscripts/inline_moderation.js b/Upload/jscripts/inline_moderation.js index 36bfcb8..a13bc2d 100644 --- a/Upload/jscripts/inline_moderation.js +++ b/Upload/jscripts/inline_moderation.js @@ -35,7 +35,7 @@ var inlineModeration = { if(inlineIds.indexOf(id) != -1 || (inlineIds.indexOf('ALL') != -1 && removedIds.indexOf(id) == -1)) { element.prop('checked', true); - var post = element.parents('.post_content'); + var post = element.parents('.post'); var thread = element.parents('.inline_row'); var fieldset = element.parents('fieldset'); if(post.length) @@ -56,7 +56,7 @@ var inlineModeration = { else { element.prop('checked', false); - var post = element.parents('.post_content'); + var post = element.parents('.post'); var thread = element.parents('.inline_row'); if(post.length) { @@ -131,7 +131,7 @@ var inlineModeration = { } } } - var post = element.parents('.post_content'); + var post = element.parents('.post'); var thread = element.parents('.inline_row'); if(post.length) { @@ -162,7 +162,7 @@ var inlineModeration = { allSelectedRow.hide(); } } - var post = element.parents('.post_content'); + var post = element.parents('.post'); var thread = element.parents('.inline_row'); if(post.length) { @@ -239,7 +239,7 @@ var inlineModeration = { var changed = (element.prop('checked') != master.prop('checked')); element.prop('checked', master.prop('checked')); - var post = element.parents('.post_content'); + var post = element.parents('.post'); var fieldset = element.parents('fieldset'); var thread = element.parents('.inline_row'); if(post.length) diff --git a/Upload/jscripts/jeditable/jeditable.min.js b/Upload/jscripts/jeditable/jeditable.min.js index ef885f0..ba73d23 100644 --- a/Upload/jscripts/jeditable/jeditable.min.js +++ b/Upload/jscripts/jeditable/jeditable.min.js @@ -1,38 +1,38 @@ - -(function($){$.fn.editable=function(target,options){if('disable'==target){$(this).data('disabled.editable',true);return;} -if('enable'==target){$(this).data('disabled.editable',false);return;} -if('destroy'==target){$(this).unbind($(this).data('event.editable')).removeData('disabled.editable').removeData('event.editable');return;} -var settings=$.extend({},$.fn.editable.defaults,{target:target},options);var plugin=$.editable.types[settings.type].plugin||function(){};var submit=$.editable.types[settings.type].submit||function(){};var buttons=$.editable.types[settings.type].buttons||$.editable.types['defaults'].buttons;var content=$.editable.types[settings.type].content||$.editable.types['defaults'].content;var element=$.editable.types[settings.type].element||$.editable.types['defaults'].element;var reset=$.editable.types[settings.type].reset||$.editable.types['defaults'].reset;var callback=settings.callback||function(){};var onedit=settings.onedit||function(){};var onsubmit=settings.onsubmit||function(){};var onreset=settings.onreset||function(){};var onerror=settings.onerror||reset;if(settings.tooltip){$(this).attr('title',settings.tooltip);} -settings.autowidth='auto'==settings.width;settings.autoheight='auto'==settings.height;return this.each(function(){var self=this;var savedwidth=$(self).width();var savedheight=$(self).height();$(this).data('event.editable',settings.event);if(!$.trim($(this).html())){$(this).html(settings.placeholder);} -$(this).bind(settings.event,function(e){if(true===$(this).data('disabled.editable')){return;} -if(self.editing){return;} -if(false===onedit.apply(this,[settings,self])){return;} -e.preventDefault();e.stopPropagation();if(settings.tooltip){$(self).removeAttr('title');} -if(0==$(self).width()){settings.width=savedwidth;settings.height=savedheight;}else{if(settings.width!='none'){settings.width=settings.autowidth?$(self).width():settings.width;} -if(settings.height!='none'){settings.height=settings.autoheight?$(self).height():settings.height;}} -if($(this).html().toLowerCase().replace(/(;|")/g,'')==settings.placeholder.toLowerCase().replace(/(;|")/g,'')){$(this).html('');} -self.editing=true;self.revert=$(self).html();$(self).html('');var form=$('');if(settings.cssclass){if('inherit'==settings.cssclass){form.attr('class',$(self).attr('class'));}else{form.attr('class',settings.cssclass);}} -if(settings.style){if('inherit'==settings.style){form.attr('style',$(self).attr('style'));form.css('display',$(self).css('display'));}else{form.attr('style',settings.style);}} -var input=element.apply(form,[settings,self]);var input_content;if(settings.loadurl){var t=setTimeout(function(){input.disabled=true;content.apply(form,[settings.loadtext,settings,self]);},100);var loaddata={};loaddata[settings.id]=self.id;if($.isFunction(settings.loaddata)){$.extend(loaddata,settings.loaddata.apply(self,[self.revert,settings]));}else{$.extend(loaddata,settings.loaddata);} -$.ajax({type:settings.loadtype,url:settings.loadurl,data:loaddata,async:false,success:function(result){window.clearTimeout(t);input_content=result;input.disabled=false;}});}else if(settings.data){input_content=settings.data;if($.isFunction(settings.data)){input_content=settings.data.apply(self,[self.revert,settings]);}}else{input_content=self.revert;} -content.apply(form,[input_content,settings,self]);input.attr('name',settings.name);buttons.apply(form,[settings,self]);$(self).append(form);plugin.apply(form,[settings,self]);$(':input:visible:enabled:first',form).focus();if(settings.select){input.select();} -input.keydown(function(e){if(e.keyCode==27){e.preventDefault();reset.apply(form,[settings,self]);}});var t;if('cancel'==settings.onblur){input.blur(function(e){t=setTimeout(function(){reset.apply(form,[settings,self]);},500);});}else if('submit'==settings.onblur){input.blur(function(e){t=setTimeout(function(){form.submit();},200);});}else if($.isFunction(settings.onblur)){input.blur(function(e){settings.onblur.apply(self,[input.val(),settings]);});}else{input.blur(function(e){});} -form.submit(function(e){if(t){clearTimeout(t);} -e.preventDefault();if(false!==onsubmit.apply(form,[settings,self])){if(false!==submit.apply(form,[settings,self])){if($.isFunction(settings.target)){var str=settings.target.apply(self,[input.val(),settings]);$(self).html(str);self.editing=false;callback.apply(self,[self.innerHTML,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}}else{var submitdata={};submitdata[settings.name]=input.val();submitdata[settings.id]=self.id;if($.isFunction(settings.submitdata)){$.extend(submitdata,settings.submitdata.apply(self,[self.revert,settings]));}else{$.extend(submitdata,settings.submitdata);} -if('PUT'==settings.method){submitdata['_method']='put';} -$(self).html(settings.indicator);var ajaxoptions={type:'POST',data:submitdata,dataType:'html',url:settings.target,success:function(result,status){if(ajaxoptions.dataType=='html'){$(self).html(result);} -self.editing=false;callback.apply(self,[result,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}},error:function(xhr,status,error){onerror.apply(form,[settings,self,xhr]);}};$.extend(ajaxoptions,settings.ajaxoptions);$.ajax(ajaxoptions);}}} -$(self).attr('title',settings.tooltip);return false;});});this.reset=function(form){if(this.editing){if(false!==onreset.apply(form,[settings,self])){$(self).html(self.revert);self.editing=false;if(!$.trim($(self).html())){$(self).html(settings.placeholder);} -if(settings.tooltip){$(self).attr('title',settings.tooltip);}}}};});};$.editable={types:{defaults:{element:function(settings,original){var input=$('');$(this).append(input);return(input);},content:function(string,settings,original){$(':input:first',this).val(string);},reset:function(settings,original){original.reset(this);},buttons:function(settings,original){var form=this;if(settings.submit){if(settings.submit.match(/>$/)){var submit=$(settings.submit).click(function(){if(submit.attr("type")!="submit"){form.submit();}});}else{var submit=$('');submit.html(settings.submit);} -$(this).append(submit);} -if(settings.cancel){if(settings.cancel.match(/>$/)){var cancel=$(settings.cancel);}else{var cancel=$('');cancel.html(settings.cancel);} -$(this).append(cancel);$(cancel).click(function(event){if($.isFunction($.editable.types[settings.type].reset)){var reset=$.editable.types[settings.type].reset;}else{var reset=$.editable.types['defaults'].reset;} -reset.apply(form,[settings,original]);return false;});}}},text:{element:function(settings,original){var input=$('');if(settings.width!='none'){input.width(settings.width);} -if(settings.height!='none'){input.height(settings.height);} -input.attr('autocomplete','off');$(this).append(input);return(input);}},textarea:{element:function(settings,original){var textarea=$('');if(settings.rows){textarea.attr('rows',settings.rows);}else if(settings.height!="none"){textarea.height(settings.height);} -if(settings.cols){textarea.attr('cols',settings.cols);}else if(settings.width!="none"){textarea.width(settings.width);} -$(this).append(textarea);return(textarea);}},select:{element:function(settings,original){var select=$('');$(this).append(select);return(select);},content:function(data,settings,original){if(String==data.constructor){eval('var json = '+data);}else{var json=data;} -for(var key in json){if(!json.hasOwnProperty(key)){continue;} -if('selected'==key){continue;} -var option=$('').val(key).append(json[key]);$('select',this).append(option);} + +(function($){$.fn.editable=function(target,options){if('disable'==target){$(this).data('disabled.editable',true);return;} +if('enable'==target){$(this).data('disabled.editable',false);return;} +if('destroy'==target){$(this).unbind($(this).data('event.editable')).removeData('disabled.editable').removeData('event.editable');return;} +var settings=$.extend({},$.fn.editable.defaults,{target:target},options);var plugin=$.editable.types[settings.type].plugin||function(){};var submit=$.editable.types[settings.type].submit||function(){};var buttons=$.editable.types[settings.type].buttons||$.editable.types['defaults'].buttons;var content=$.editable.types[settings.type].content||$.editable.types['defaults'].content;var element=$.editable.types[settings.type].element||$.editable.types['defaults'].element;var reset=$.editable.types[settings.type].reset||$.editable.types['defaults'].reset;var callback=settings.callback||function(){};var onedit=settings.onedit||function(){};var onsubmit=settings.onsubmit||function(){};var onreset=settings.onreset||function(){};var onerror=settings.onerror||reset;if(settings.tooltip){$(this).attr('title',settings.tooltip);} +settings.autowidth='auto'==settings.width;settings.autoheight='auto'==settings.height;return this.each(function(){var self=this;var savedwidth=$(self).width();var savedheight=$(self).height();$(this).data('event.editable',settings.event);if(!$.trim($(this).html())){$(this).html(settings.placeholder);} +$(this).bind(settings.event,function(e){if(true===$(this).data('disabled.editable')){return;} +if(self.editing){return;} +if(false===onedit.apply(this,[settings,self])){return;} +e.preventDefault();e.stopPropagation();if(settings.tooltip){$(self).removeAttr('title');} +if(0==$(self).width()){settings.width=savedwidth;settings.height=savedheight;}else{if(settings.width!='none'){settings.width=settings.autowidth?$(self).width():settings.width;} +if(settings.height!='none'){settings.height=settings.autoheight?$(self).height():settings.height;}} +if($(this).html().toLowerCase().replace(/(;|")/g,'')==settings.placeholder.toLowerCase().replace(/(;|")/g,'')){$(this).html('');} +self.editing=true;self.revert=$(self).html();$(self).html('');var form=$('');if(settings.cssclass){if('inherit'==settings.cssclass){form.attr('class',$(self).attr('class'));}else{form.attr('class',settings.cssclass);}} +if(settings.style){if('inherit'==settings.style){form.attr('style',$(self).attr('style'));form.css('display',$(self).css('display'));}else{form.attr('style',settings.style);}} +var input=element.apply(form,[settings,self]);var input_content;if(settings.loadurl){var t=setTimeout(function(){input.disabled=true;content.apply(form,[settings.loadtext,settings,self]);},100);var loaddata={};loaddata[settings.id]=self.id;if($.isFunction(settings.loaddata)){$.extend(loaddata,settings.loaddata.apply(self,[self.revert,settings]));}else{$.extend(loaddata,settings.loaddata);} +$.ajax({type:settings.loadtype,url:settings.loadurl,data:loaddata,async:false,success:function(result){window.clearTimeout(t);input_content=result;input.disabled=false;}});}else if(settings.data){input_content=settings.data;if($.isFunction(settings.data)){input_content=settings.data.apply(self,[self.revert,settings]);}}else{input_content=self.revert;} +content.apply(form,[input_content,settings,self]);input.attr('name',settings.name);buttons.apply(form,[settings,self]);$(self).append(form);plugin.apply(form,[settings,self]);$(':input:visible:enabled:first',form).focus();if(settings.select){input.select();} +input.keydown(function(e){if(e.keyCode==27){e.preventDefault();reset.apply(form,[settings,self]);}});var t;if('cancel'==settings.onblur){input.blur(function(e){t=setTimeout(function(){reset.apply(form,[settings,self]);},500);});}else if('submit'==settings.onblur){input.blur(function(e){t=setTimeout(function(){form.submit();},200);});}else if($.isFunction(settings.onblur)){input.blur(function(e){settings.onblur.apply(self,[input.val(),settings]);});}else{input.blur(function(e){});} +form.submit(function(e){if(t){clearTimeout(t);} +e.preventDefault();if(false!==onsubmit.apply(form,[settings,self])){if(false!==submit.apply(form,[settings,self])){if($.isFunction(settings.target)){var str=settings.target.apply(self,[input.val(),settings]);$(self).html(str);self.editing=false;callback.apply(self,[self.innerHTML,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}}else{var submitdata={};submitdata[settings.name]=input.val();submitdata[settings.id]=self.id;if($.isFunction(settings.submitdata)){$.extend(submitdata,settings.submitdata.apply(self,[self.revert,settings]));}else{$.extend(submitdata,settings.submitdata);} +if('PUT'==settings.method){submitdata['_method']='put';} +$(self).html(settings.indicator);var ajaxoptions={type:'POST',data:submitdata,dataType:'html',url:settings.target,success:function(result,status){if(ajaxoptions.dataType=='html'){$(self).html(result);} +self.editing=false;callback.apply(self,[result,settings]);if(!$.trim($(self).html())){$(self).html(settings.placeholder);}},error:function(xhr,status,error){onerror.apply(form,[settings,self,xhr]);}};$.extend(ajaxoptions,settings.ajaxoptions);$.ajax(ajaxoptions);}}} +$(self).attr('title',settings.tooltip);return false;});});this.reset=function(form){if(this.editing){if(false!==onreset.apply(form,[settings,self])){$(self).html(self.revert);self.editing=false;if(!$.trim($(self).html())){$(self).html(settings.placeholder);} +if(settings.tooltip){$(self).attr('title',settings.tooltip);}}}};});};$.editable={types:{defaults:{element:function(settings,original){var input=$('');$(this).append(input);return(input);},content:function(string,settings,original){$(':input:first',this).val(string);},reset:function(settings,original){original.reset(this);},buttons:function(settings,original){var form=this;if(settings.submit){if(settings.submit.match(/>$/)){var submit=$(settings.submit).click(function(){if(submit.attr("type")!="submit"){form.submit();}});}else{var submit=$('');submit.html(settings.submit);} +$(this).append(submit);} +if(settings.cancel){if(settings.cancel.match(/>$/)){var cancel=$(settings.cancel);}else{var cancel=$('');cancel.html(settings.cancel);} +$(this).append(cancel);$(cancel).click(function(event){if($.isFunction($.editable.types[settings.type].reset)){var reset=$.editable.types[settings.type].reset;}else{var reset=$.editable.types['defaults'].reset;} +reset.apply(form,[settings,original]);return false;});}}},text:{element:function(settings,original){var input=$('');if(settings.width!='none'){input.width(settings.width);} +if(settings.height!='none'){input.height(settings.height);} +input.attr('autocomplete','off');$(this).append(input);return(input);}},textarea:{element:function(settings,original){var textarea=$('');if(settings.rows){textarea.attr('rows',settings.rows);}else if(settings.height!="none"){textarea.height(settings.height);} +if(settings.cols){textarea.attr('cols',settings.cols);}else if(settings.width!="none"){textarea.width(settings.width);} +$(this).append(textarea);return(textarea);}},select:{element:function(settings,original){var select=$('');$(this).append(select);return(select);},content:function(data,settings,original){if(String==data.constructor){eval('var json = '+data);}else{var json=data;} +for(var key in json){if(!json.hasOwnProperty(key)){continue;} +if('selected'==key){continue;} +var option=$('').val(key).append(json[key]);$('select',this).append(option);} $('select',this).children().each(function(){if($(this).val()==json['selected']||$(this).text()==$.trim(original.revert)){$(this).attr('selected','selected');}});}}},addInputType:function(name,input){$.editable.types[name]=input;}};$.fn.editable.defaults={name:'value',id:'id',type:'text',width:'auto',height:'auto',event:'click.editable',onblur:'cancel',loadtype:'GET',loadtext:'Loading...',placeholder:'Click to edit',loaddata:{},submitdata:{},ajaxoptions:{}};})(jQuery); \ No newline at end of file diff --git a/Upload/jscripts/sceditor/editor_themes/emoticons/credits.txt b/Upload/jscripts/sceditor/editor_themes/emoticons/credits.txt index 96b3e7a..2ffdaeb 100644 --- a/Upload/jscripts/sceditor/editor_themes/emoticons/credits.txt +++ b/Upload/jscripts/sceditor/editor_themes/emoticons/credits.txt @@ -1,9 +1,9 @@ -Presenting, Nomicons: The Full Monty :o - -Credits: -Oscar Gruno, aka Nominell v. 2.0 -> oscargruno@mac.com -Andy Fedosjeenko, aka Nightwolf -> bobo@animevanguard.com - -Copyright (C) 2001-Infinity, Oscar Gruno & Andy Fedosjeenko - +Presenting, Nomicons: The Full Monty :o + +Credits: +Oscar Gruno, aka Nominell v. 2.0 -> oscargruno@mac.com +Andy Fedosjeenko, aka Nightwolf -> bobo@animevanguard.com + +Copyright (C) 2001-Infinity, Oscar Gruno & Andy Fedosjeenko + You can redistribute these files as much as you like, as long as you keep this file with them and give us the proper credit. You may even rape them if you please, just give us credit for our work. \ No newline at end of file diff --git a/Upload/jscripts/select2/select2.css b/Upload/jscripts/select2/select2.css index 68ef385..ae227f4 100644 --- a/Upload/jscripts/select2/select2.css +++ b/Upload/jscripts/select2/select2.css @@ -83,6 +83,10 @@ html[dir="rtl"] .select2-container .select2-choice { text-overflow: ellipsis; float: none; width: auto; + + /* MyBB modification start - Search container min-width */ + min-width: 120px; + /* MyBB modification end */ } html[dir="rtl"] .select2-container .select2-choice > .select2-chosen { @@ -689,4 +693,4 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close { .select2-search input { background-position: 100% -21px !important; } -} \ No newline at end of file +} diff --git a/Upload/managegroup.php b/Upload/managegroup.php index 8990638..37529b8 100644 --- a/Upload/managegroup.php +++ b/Upload/managegroup.php @@ -352,7 +352,7 @@ $page = $mybb->get_input('page', MyBB::INPUT_INT); if($page && $page > 0) { - $start = ($page-1) *$perpage; + $start = ($page-1) * $perpage; } else { @@ -360,6 +360,17 @@ $page = 1; } $multipage = multipage($numusers, $perpage, $page, "managegroup.php?gid=".$gid); + + switch($db->type) + { + case "pgsql": + case "sqlite": + $query = $db->simple_select("users", "*", "','||additionalgroups||',' LIKE '%,{$gid},%' OR usergroup='{$gid}'", array('order_by' => 'username', 'limit' => $perpage, 'limit_start' => $start)); + break; + default: + $query = $db->simple_select("users", "*", "CONCAT(',',additionalgroups,',') LIKE '%,{$gid},%' OR usergroup='{$gid}'", array('order_by' => 'username', 'limit' => $perpage, 'limit_start' => $start)); + } + $users = ""; while($user = $db->fetch_array($query)) { diff --git a/Upload/member.php b/Upload/member.php index 90dd55c..2f3ae18 100644 --- a/Upload/member.php +++ b/Upload/member.php @@ -15,13 +15,13 @@ $nosession['avatar'] = 1; $templatelist = "member_register,member_register_hiddencaptcha,member_coppa_form,member_register_coppa,member_register_agreement_coppa,member_register_agreement,usercp_options_tppselect,usercp_options_pppselect,member_register_referrer,member_register_customfield,member_register_requiredfields"; -$templatelist .= ",member_resetpassword,member_loggedin_notice,member_profile_away,member_emailuser,member_register_regimage,member_register_regimage_recaptcha,member_register_regimage_nocaptcha,member_register_regimage_ayah,post_captcha_hidden,post_captcha,post_captcha_recaptcha,post_captcha_ayah,member_profile_addremove,member_emailuser_guest"; +$templatelist .= ",member_resetpassword,member_loggedin_notice,member_profile_away,member_emailuser,member_register_regimage,member_register_regimage_recaptcha,member_register_regimage_nocaptcha,post_captcha_hidden,post_captcha,post_captcha_recaptcha,member_profile_addremove,member_emailuser_guest"; $templatelist .= ",member_profile_email,member_profile_offline,member_profile_reputation,member_profile_warn,member_profile_warninglevel,member_profile_customfields_field,member_profile_customfields,member_profile_adminoptions,member_profile,member_login,member_profile_online,member_viewnotes"; $templatelist .= ",member_profile_signature,member_profile_avatar,member_profile_groupimage,member_profile_referrals,member_profile_website,member_profile_reputation_vote,member_activate,member_resendactivation,member_lostpw,member_register_additionalfields,member_register_password,usercp_options_pppselect_option"; $templatelist .= ",member_profile_modoptions_manageuser,member_profile_modoptions_editprofile,member_profile_modoptions_banuser,member_profile_modoptions_viewnotes,member_profile_modoptions,member_profile_modoptions_editnotes,member_profile_modoptions_purgespammer,postbit_reputation_formatted,postbit_warninglevel_formatted"; $templatelist .= ",usercp_profile_profilefields_select_option,usercp_profile_profilefields_multiselect,usercp_profile_profilefields_select,usercp_profile_profilefields_textarea,usercp_profile_profilefields_radio,usercp_profile_profilefields_checkbox,usercp_profile_profilefields_text,usercp_options_tppselect_option"; $templatelist .= ",member_register_question,member_register_question_refresh,usercp_options_timezone,usercp_options_timezone_option,usercp_options_language_option,member_register_language,member_profile_userstar,member_profile_customfields_field_multi_item,member_profile_customfields_field_multi,member_register_day"; -$templatelist .= ",member_profile_contact_fields_aim,member_profile_contact_fields_google,member_profile_contact_fields_icq,member_profile_contact_fields_skype,member_profile_contact_fields_yahoo,member_profile_pm,member_profile_contact_details,member_profile_banned"; +$templatelist .= ",member_profile_contact_fields_aim,member_profile_contact_fields_google,member_profile_contact_fields_icq,member_profile_contact_fields_skype,member_profile_contact_fields_yahoo,member_profile_pm,member_profile_contact_details,member_profile_banned,member_profile_findposts,member_profile_findthreads"; require_once "./global.php"; require_once MYBB_ROOT."inc/functions_post.php"; @@ -1384,7 +1384,7 @@ { $plugins->run_hooks("member_activate_form"); - $code = $mybb->get_input('code'); + $code = htmlspecialchars_uni($mybb->get_input('code')); if(!isset($user['username'])) { @@ -1728,7 +1728,7 @@ $mybb->input['url'] = $mybb->get_input('url'); - if(!empty($mybb->input['url']) && my_strpos(basename($mybb->input['url']), 'member.php') === false) + if(!empty($mybb->input['url']) && my_strpos(basename($mybb->input['url']), 'member.php') === false && !preg_match('#^javascript:#i', $mybb->input['url'])) { if((my_strpos(basename($mybb->input['url']), 'newthread.php') !== false || my_strpos(basename($mybb->input['url']), 'newreply.php') !== false) && my_strpos($mybb->input['url'], '&processed=1') !== false) { @@ -1797,10 +1797,6 @@ { $login_captcha->build_recaptcha(); } - elseif($login_captcha->type == 3) - { - $login_captcha->build_ayah(); - } if($login_captcha->html) { @@ -2101,6 +2097,13 @@ $thread_percent = 100; } + $findposts = $findthreads = ''; + if($mybb->usergroup['cansearch'] == 1) + { + eval("\$findposts = \"".$templates->get("member_profile_findposts")."\";"); + eval("\$findthreads = \"".$templates->get("member_profile_findthreads")."\";"); + } + $awaybit = ''; if($memprofile['away'] == 1 && $mybb->settings['allowaway'] != 0) { diff --git a/Upload/misc.php b/Upload/misc.php index ff58798..de48a1b 100644 --- a/Upload/misc.php +++ b/Upload/misc.php @@ -625,22 +625,32 @@ error($lang->error_invalidthread); } - if(is_moderator($thread['fid'], "canviewunapprove")) + // Make sure we are looking at a real thread here. + if(($thread['visible'] == -1 && !is_moderator($thread['fid'], "canviewdeleted")) || ($thread['visible'] == 0 && !is_moderator($thread['fid'], "canviewunapprove")) || $thread['visible'] > 1) { - $ismod = true; - $show_posts = "(p.visible = '1' OR p.visible = '0')"; + error($lang->error_invalidthread); } - else + + if(is_moderator($thread['fid'], "canviewdeleted") || is_moderator($thread['fid'], "canviewunapprove")) { - $ismod = false; - $show_posts = "p.visible = '1'"; + if(is_moderator($thread['fid'], "canviewunapprove") && !is_moderator($thread['fid'], "canviewdeleted")) + { + $show_posts = "p.visible IN (0,1)"; + } + elseif(is_moderator($thread['fid'], "canviewdeleted") && !is_moderator($thread['fid'], "canviewunapprove")) + { + $show_posts = "p.visible IN (-1,1)"; + } + else + { + $show_posts = "p.visible IN (-1,0,1)"; + } } - - // Make sure we are looking at a real thread here. - if(($thread['visible'] != 1 && $ismod == false) || ($thread['visible'] > 1 && $ismod == true)) + else { - error($lang->error_invalidthread); + $show_posts = "p.visible = 1"; } + // Does the thread belong to a valid forum? $forum = get_forum($thread['fid']); if(!$forum || $forum['type'] != "f") diff --git a/Upload/modcp.php b/Upload/modcp.php index d741c29..40107c7 100644 --- a/Upload/modcp.php +++ b/Upload/modcp.php @@ -2208,6 +2208,7 @@ { $altbg = alt_trow(); $post['threadsubject'] = htmlspecialchars_uni($parser->parse_badwords($post['threadsubject'])); + $post['subject'] = htmlspecialchars_uni($parser->parse_badwords($post['subject'])); $post['threadlink'] = get_thread_link($post['tid']); $post['postlink'] = get_post_link($post['pid'], $post['tid']); $forum_link = get_forum_link($post['fid']); @@ -3017,6 +3018,7 @@ $lang->edit_profile = $lang->sprintf($lang->edit_profile, $user['username']); $profile_link = build_profile_link(format_name($user['username'], $user['usergroup'], $user['displaygroup']), $user['uid']); + $user['signature'] = htmlspecialchars_uni($user['signature']); $codebuttons = build_mycode_inserter("signature"); // Do we mark the suspend signature box? @@ -3557,11 +3559,11 @@ { if(!is_array($ip_range)) { - $post_ip_sql = "ipaddress=".$db->escape_binary($ip_range); + $post_ip_sql = "p.ipaddress=".$db->escape_binary($ip_range); } else { - $post_ip_sql = "ipaddress BETWEEN ".$db->escape_binary($ip_range[0])." AND ".$db->escape_binary($ip_range[1]); + $post_ip_sql = "p.ipaddress BETWEEN ".$db->escape_binary($ip_range[0])." AND ".$db->escape_binary($ip_range[1]); } } @@ -3569,7 +3571,77 @@ if($post_ip_sql) { - $query = $db->simple_select('posts', 'COUNT(pid) AS count', "$post_ip_sql AND visible >= -1"); + $where_sql = ''; + + $unviewable_forums = get_unviewable_forums(true); + + if($unviewable_forums) + { + $where_sql .= " AND p.fid NOT IN ({$unviewable_forums})"; + } + + if($inactiveforums) + { + $where_sql .= " AND p.fid NOT IN ({$inactiveforums})"; + } + + // Check group permissions if we can't view threads not started by us + $onlyusfids = array(); + $group_permissions = forum_permissions(); + foreach($group_permissions as $fid => $forumpermissions) + { + if(isset($forumpermissions['canonlyviewownthreads']) && $forumpermissions['canonlyviewownthreads'] == 1) + { + $onlyusfids[] = $fid; + } + } + + if(!empty($onlyusfids)) + { + $where_sql .= " AND ((t.fid IN(".implode(',', $onlyusfids).") AND t.uid='{$mybb->user['uid']}') OR t.fid NOT IN(".implode(',', $onlyusfids)."))"; + } + + // Moderators can view unapproved/deleted posts + if($mybb->usergroup['issupermod'] != 1) + { + $unapprove_forums = array(); + $deleted_forums = array(); + $visible_sql = " AND (p.visible = 1 AND t.visible = 1)"; + $query = $db->simple_select("moderators", "fid, canviewunapprove, canviewdeleted", "(id='{$mybb->user['uid']}' AND isgroup='0') OR (id='{$mybb->user['usergroup']}' AND isgroup='1')"); + while($moderator = $db->fetch_array($query)) + { + if($moderator['canviewunapprove'] == 1) + { + $unapprove_forums[] = $moderator['fid']; + } + + if($moderator['canviewdeleted'] == 1) + { + $deleted_forums[] = $moderator['fid']; + } + } + + if(!empty($unapprove_forums)) + { + $visible_sql .= " OR (p.visible = 0 AND p.fid IN(".implode(',', $unapprove_forums).")) OR (t.visible = 0 AND t.fid IN(".implode(',', $unapprove_forums)."))"; + } + if(!empty($deleted_forums)) + { + $visible_sql .= " OR (p.visible = -1 AND p.fid IN(".implode(',', $deleted_forums).")) OR (t.visible = -1 AND t.fid IN(".implode(',', $deleted_forums)."))"; + } + } + else + { + // Super moderators (and admins) + $visible_sql = " AND p.visible >= -1"; + } + + $query = $db->query(" + SELECT COUNT(p.pid) AS count + FROM ".TABLE_PREFIX."posts p + LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid = p.tid) + WHERE {$post_ip_sql}{$where_sql}{$visible_sql} + "); $post_results = $db->fetch_field($query, "count"); } } @@ -3711,10 +3783,15 @@ if(isset($mybb->input['search_posts']) && $post_results && (!isset($mybb->input['search_users']) || (isset($mybb->input['search_users']) && $post_limit > 0))) { $ipaddresses = $tids = $uids = array(); - - $query = $db->simple_select('posts', 'username AS postusername, uid, subject, pid, tid, ipaddress', "$post_ip_sql AND visible >= -1", - array('order_by' => 'dateline', 'order_dir' => 'DESC', 'limit_start' => $post_start, 'limit' => $post_limit)); + $query = $db->query(" + SELECT p.username AS postusername, p.uid, p.subject, p.pid, p.tid, p.ipaddress + FROM ".TABLE_PREFIX."posts p + LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid = p.tid) + WHERE {$post_ip_sql}{$where_sql}{$visible_sql} + ORDER BY p.dateline desc + LIMIT {$post_start}, {$post_limit} + "); while($ipaddress = $db->fetch_array($query)) { $tids[$ipaddress['tid']] = $ipaddress['pid']; diff --git a/Upload/newreply.php b/Upload/newreply.php index 880d862..57ba2c1 100644 --- a/Upload/newreply.php +++ b/Upload/newreply.php @@ -15,7 +15,7 @@ $templatelist .= ",smilieinsert,smilieinsert_getmore,smilieinsert_smilie,smilieinsert_smilie_empty,codebuttons,post_attachments_new,post_attachments,post_savedraftbutton,newreply_modoptions,newreply_threadreview_more,newreply_disablesmilies,postbit_online"; $templatelist .= ",postbit_www,postbit_email,postbit_reputation,postbit_warninglevel,postbit_author_user,postbit_edit,postbit_quickdelete,postbit_inlinecheck,postbit_posturl,postbit_quote,postbit_multiquote,postbit_report,postbit_ignored,postbit,postbit_userstar"; $templatelist .= ",post_attachments_attachment_postinsert,post_attachments_attachment_remove,post_attachments_attachment_unapproved,post_attachments_attachment,postbit_attachments_attachment,postbit_attachments,newreply_options_signature,postbit_find"; -$templatelist .= ",member_register_regimage,member_register_regimage_recaptcha,member_register_regimage_ayah,post_captcha_hidden,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,post_captcha_ayah,postbit_groupimage,postbit_away,postbit_offline,postbit_avatar,postbit_icon"; +$templatelist .= ",member_register_regimage,member_register_regimage_recaptcha,post_captcha_hidden,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,postbit_groupimage,postbit_away,postbit_offline,postbit_avatar,postbit_icon"; $templatelist .= ",postbit_rep_button,postbit_warn,postbit_author_guest,postbit_signature,postbit_classic,postbit_attachments_thumbnails_thumbnailpostbit_attachments_images_image,postbit_attachments_attachment_unapproved,postbit_pm,post_attachments_update"; $templatelist .= ",postbit_attachments_thumbnails,postbit_attachments_images,postbit_gotopost,forumdisplay_password_wrongpass,forumdisplay_password,posticons_icon,attachment_icon,postbit_reputation_formatted_link,newreply_disablesmilies_hidden,forumdisplay_rules,global_moderation_notice"; @@ -76,7 +76,8 @@ // Make navigation build_forum_breadcrumb($fid); -$thread['subject'] = htmlspecialchars_uni($thread['subject']); +$thread_subject = $thread['subject']; +$thread['subject'] = htmlspecialchars_uni($parser->parse_badwords($thread['subject'])); add_breadcrumb($thread['subject'], get_thread_link($thread['tid'])); add_breadcrumb($lang->nav_newreply); @@ -311,7 +312,7 @@ $username = $mybb->get_input('username'); } $uid = 0; - + if($mybb->settings['stopforumspam_on_newreply']) { @@ -615,7 +616,7 @@ redirect(get_thread_link($tid, 0, "lastpost")); } } - + if(!$mybb->settings['postsperpage'] || (int)$mybb->settings['postsperpage'] < 1) { $mybb->settings['postsperpage'] = 20; @@ -680,7 +681,7 @@ $data .= $post; // Build a new posthash incase the user wishes to quick reply again - $new_posthash = md5($mybb->user['uid'].random_str()); + $new_posthash = md5($mybb->user['uid'].random_str()); $data .= "