Show
Ignore:
Location:
branches/genoa
Files:
1 added
1 removed
23 modified

Legend:

Unmodified
Added
Removed

  • branches/genoa/plugins/comedit/comedit.loop.php

    r866 r1074  
    1515 * 
    1616 * @package Cotonti 
    17  * @version 0.0.3 
     17 * @version 0.6.6 
    1818 * @author Asmo (Edited by motor2hg), Cotonti Team 
    19  * @copyright Copyright (c) Cotonti Team 2008-2009 
     19 * @copyright Copyright (c) Cotonti Team 2008-2010 
    2020 * @license BSD 
    2121 */ 
    … …  
    2525$time_limit = ($sys['now_offset'] < ($row['com_date'] + $cfg['plugin']['comedit']['time'] * 60)) ? TRUE : FALSE; 
    2626 
    27 $usr['isowner_com'] = ($row['com_authorid'] == $usr['id'] && $time_limit); 
     27$usr['isowner_com'] = $time_limit && ($usr['id'] > 0 && $row['com_authorid'] == $usr['id'] 
     28                || $usr['id'] == 0 && $usr['ip'] == $row['com_authorip']); 
    2829 
    2930$com_gup = $sys['now_offset'] - ($row['com_date'] + $cfg['plugin']['comedit']['time'] * 60); 

  • branches/genoa/plugins/comedit/comedit.setup.php

    r706 r1074  
    55Name=Comments Edit 
    66Description=Enhance comedit system 
    7 Version=0.0.2 
    8 Date=2009-jan-03 
     7Version=0.6.6 
     8Date=2010-jan-18 
    99Author=Asmo (Edited by motor2hg) 
    1010Copyright=asmo.org.ru 
    … …  
    2828 * 
    2929 * @package Cotonti 
    30  * @version 0.0.3 
     30 * @version 0.6.6 
    3131 * @author Neocrome, Cotonti Team 
    32  * @copyright Copyright (c) Cotonti Team 2008-2009 
     32 * @copyright Copyright (c) Cotonti Team 2008-2010 
    3333 * @license BSD 
    3434 */ 

  • branches/genoa/plugins/comedit/comedit.php

    r866 r1074  
    1515 * 
    1616 * @package Cotonti 
    17  * @version 0.0.3 
     17 * @version 0.6.6 
    1818 * @author Asmo (Edited by motor2hg), Cotonti Team 
    19  * @copyright Copyright (c) Cotonti Team 2008-2009 
     19 * @copyright Copyright (c) Cotonti Team 2008-2010 
    2020 * @license BSD 
    2121 */ 
    … …  
    4444 
    4545        $time_limit = ($sys['now_offset'] < ($row['com_date'] + $cfg['plugin']['comedit']['time'] * 60)) ? TRUE : FALSE; 
    46         $usr['isowner'] = ($row['com_authorid'] == $usr['id'] && $time_limit); 
     46        $usr['isowner'] = $time_limit && ($usr['id'] > 0 && $row['com_authorid'] == $usr['id'] 
     47                        || $usr['id'] == 0 && $usr['ip'] == $row['com_authorip']); 
    4748        $usr['allow_write'] = ($usr['isadmin'] || $usr['isowner']); 
    4849        sed_block($usr['allow_write']); 
    … …  
    9192 
    9293$com_limit = ($sys['now_offset']<($com['com_date']+$cfg['plugin']['comedit']['time']*60)) ? TRUE : FALSE; 
    93 $usr['isowner'] = ($com['com_authorid'] == $usr['id'] && $com_limit); 
     94$usr['isowner'] = $com_limit && ($usr['id'] > 0 && $com['com_authorid'] == $usr['id'] 
     95                || $usr['id'] == 0 && $usr['ip'] == $com['com_authorip']); 
    9496 
    9597$usr['allow_write'] = ($usr['isadmin'] || $usr['isowner']); 

  • branches/genoa/plugins/markitup/markitup.ajax.php

    r706 r1080  
    2727$style = '<link rel="stylesheet" type="text/css" href="skins/'.$skin.'/'.$skin.'.css" />'."\n"; 
    2828sed_sendheaders(); 
    29 echo $style.sed_post_parse(sed_parse($text)); 
     29echo $style . '<body class="preview">' . sed_post_parse(sed_parse($text)) . '</body>'; 
    3030ob_end_flush(); 
    3131 

  • branches/genoa/plugins/markitup/js/jquery.markitup.js

    r422 r1072  
    1 (function($){$.fn.markItUp=function(settings,extraSettings){var options,ctrlKey,shiftKey,altKey;ctrlKey=shiftKey=altKey=false;options={id:"",nameSpace:"",root:"",previewInWindow:"",previewAutoRefresh:true,previewPosition:"after",previewTemplatePath:"~/templates/preview.html",previewParserPath:"",previewParserVar:"data",resizeHandle:true,beforeInsert:"",afterInsert:"",onEnter:{},onShiftEnter:{},onCtrlEnter:{},onTab:{},markupSet:[{}]};$.extend(options,settings,extraSettings);if(!options.root){$("script").each(function(a,tag){miuScript=$(tag).get(0).src.match(/(.*)jquery\.markitup(\.pack)?\.js$/);if(miuScript!==null){options.root=miuScript[1]}})}return this.each(function(){var $$,textarea,levels,scrollPosition,caretPosition,caretOffset,clicked,hash,header,footer,previewWindow,template,iFrame,abort;$$=$(this);textarea=this;levels=[];abort=false;scrollPosition=caretPosition=0;caretOffset=-1;options.previewParserPath=localize(options.previewParserPath);options.previewTemplatePath=localize(options.previewTemplatePath);function localize(data,inText){if(inText){return data.replace(/("|')~\//g,"$1"+options.root)}return data.replace(/^~\//,options.root)}function init(){id="";nameSpace="";if(options.id){id='id="'+options.id+'"'}else{if($$.attr("id")){id='id="markItUp'+($$.attr("id").substr(0,1).toUpperCase())+($$.attr("id").substr(1))+'"'}}if(options.nameSpace){nameSpace='class="'+options.nameSpace+'"'}$$.wrap("<div "+nameSpace+"></div>");$$.wrap("<div "+id+' class="markItUp"></div>');$$.wrap('<div class="markItUpContainer"></div>');$$.addClass("markItUpEditor");header=$('<div class="markItUpHeader"></div>').insertBefore($$);$(dropMenus(options.markupSet)).appendTo(header);footer=$('<div class="markItUpFooter"></div>').insertAfter($$);if(options.resizeHandle===true&&$.browser.safari!==true){resizeHandle=$('<div class="markItUpResizeHandle"></div>').insertAfter($$).bind("mousedown",function(e){var h=$$.height(),y=e.clientY,mouseMove,mouseUp;mouseMove=function(e){$$.css("height",Math.max(20,e.clientY+h-y)+"px");return false};mouseUp=function(e){$("html").unbind("mousemove",mouseMove).unbind("mouseup",mouseUp);return false};$("html").bind("mousemove",mouseMove).bind("mouseup",mouseUp)});footer.append(resizeHandle)}$$.keydown(keyPressed).keyup(keyPressed);$$.bind("insertion",function(e,settings){if(settings.target!==false){get()}if(textarea===$.markItUp.focused){markup(settings)}});$$.focus(function(){$.markItUp.focused=this})}function dropMenus(markupSet){var ul=$("<ul></ul>"),i=0;$("li:hover > ul",ul).css("display","block");$.each(markupSet,function(){var button=this,t="",title,li,j;title=(button.key)?(button.name||"")+" [Ctrl+"+button.key+"]":(button.name||"");key=(button.key)?'accesskey="'+button.key+'"':"";if(button.separator){li=$('<li class="markItUpSeparator">'+(button.separator||"")+"</li>").appendTo(ul)}else{i++;for(j=levels.length-1;j>=0;j--){t+=levels[j]+"-"}li=$('<li class="markItUpButton markItUpButton'+t+(i)+" "+(button.className||"")+'"><a href="" '+key+' title="'+title+'">'+(button.name||"")+"</a></li>").bind("contextmenu",function(){return false}).click(function(){return false}).mouseup(function(){if(button.call){eval(button.call)()}markup(button);return false}).hover(function(){$("> ul",this).show();$(document).one("click",function(){$("ul ul",header).hide()})},function(){$("> ul",this).hide()}).appendTo(ul);if(button.dropMenu){levels.push(i);$(li).addClass("markItUpDropMenu").append(dropMenus(button.dropMenu))}}});levels.pop();return ul}function magicMarkups(string){if(string){string=string.toString();string=string.replace(/\(\!\(([\s\S]*?)\)\!\)/g,function(x,a){var b=a.split("|!|");if(altKey===true){return(b[1]!==undefined)?b[1]:b[0]}else{return(b[1]===undefined)?"":b[0]}});string=string.replace(/\[\!\[([\s\S]*?)\]\!\]/g,function(x,a){var b=a.split(":!:");if(abort===true){return false}value=prompt(b[0],(b[1])?b[1]:"");if(value===null){abort=true}return value});return string}return""}function prepare(action){if($.isFunction(action)){action=action(hash)}return magicMarkups(action)}function build(string){openWith=prepare(clicked.openWith);placeHolder=prepare(clicked.placeHolder);replaceWith=prepare(clicked.replaceWith);closeWith=prepare(clicked.closeWith);if(replaceWith!==""){block=openWith+replaceWith+closeWith}else{if(selection===""&&placeHolder!==""){block=openWith+placeHolder+closeWith}else{block=openWith+(string||selection)+closeWith}}return{block:block,openWith:openWith,replaceWith:replaceWith,placeHolder:placeHolder,closeWith:closeWith}}function markup(button){var len,j,n,i;hash=clicked=button;get();$.extend(hash,{line:"",root:options.root,textarea:textarea,selection:(selection||""),caretPosition:caretPosition,ctrlKey:ctrlKey,shiftKey:shiftKey,altKey:altKey});prepare(options.beforeInsert);prepare(clicked.beforeInsert);if(ctrlKey===true&&shiftKey===true){prepare(clicked.beforeMultiInsert)}$.extend(hash,{line:1});if(ctrlKey===true&&shiftKey===true){lines=selection.split(/\r?\n/);for(j=0,n=lines.length,i=0;i<n;i++){if($.trim(lines[i])!==""){$.extend(hash,{line:++j,selection:lines[i]});lines[i]=build(lines[i]).block}else{lines[i]=""}}string={block:lines.join("\n")};start=caretPosition;len=string.block.length+(($.browser.opera)?n:0)}else{if(ctrlKey===true){string=build(selection);start=caretPosition+string.openWith.length;len=string.block.length-string.openWith.length-string.closeWith.length;len-=fixIeBug(string.block)}else{if(shiftKey===true){string=build(selection);start=caretPosition;len=string.block.length;len-=fixIeBug(string.block)}else{string=build(selection);start=caretPosition+string.block.length;len=0;start-=fixIeBug(string.block)}}}if((selection===""&&string.replaceWith==="")){caretOffset+=fixOperaBug(string.block);start=caretPosition+string.openWith.length;len=string.block.length-string.openWith.length-string.closeWith.length;caretOffset=$$.val().substring(caretPosition,$$.val().length).length;caretOffset-=fixOperaBug($$.val().substring(0,caretPosition))}$.extend(hash,{caretPosition:caretPosition,scrollPosition:scrollPosition});if(string.block!==selection&&abort===false){insert(string.block);set(start,len)}else{caretOffset=-1}get();$.extend(hash,{line:"",selection:selection});if(ctrlKey===true&&shiftKey===true){prepare(clicked.afterMultiInsert)}prepare(clicked.afterInsert);prepare(options.afterInsert);if(previewWindow&&options.previewAutoRefresh){refreshPreview()}shiftKey=altKey=ctrlKey=abort=false}function fixOperaBug(string){if($.browser.opera){return string.length-string.replace(/\n*/g,"").length}return 0}function fixIeBug(string){if($.browser.msie){return string.length-string.replace(/\r*/g,"").length}return 0}function insert(block){if(document.selection){var newSelection=document.selection.createRange();newSelection.text=block}else{$$.val($$.val().substring(0,caretPosition)+block+$$.val().substring(caretPosition+selection.length,$$.val().length))}}function set(start,len){if(textarea.createTextRange){if($.browser.opera&&$.browser.version>=9.5&&len==0){return false}range=textarea.createTextRange();range.collapse(true);range.moveStart("character",start);range.moveEnd("character",len);range.select()}else{if(textarea.setSelectionRange){textarea.setSelectionRange(start,start+len)}}textarea.scrollTop=scrollPosition;textarea.focus()}function get(){textarea.focus();scrollPosition=textarea.scrollTop;if(document.selection){selection=document.selection.createRange().text;if($.browser.msie){var range=document.selection.createRange(),rangeCopy=range.duplicate();rangeCopy.moveToElementText(textarea);caretPosition=-1;while(rangeCopy.inRange(range)){rangeCopy.moveStart("character");caretPosition++}}else{caretPosition=textarea.selectionStart}}else{caretPosition=textarea.selectionStart;selection=$$.val().substring(caretPosition,textarea.selectionEnd)}return selection}function preview(){if(!previewWindow||previewWindow.closed){if(options.previewInWindow){previewWindow=window.open("","preview",options.previewInWindow)}else{iFrame=$('<iframe class="markItUpPreviewFrame"></iframe>');if(options.previewPosition=="after"){iFrame.insertAfter(footer)}else{iFrame.insertBefore(header)}previewWindow=iFrame[iFrame.length-1].contentWindow||frame[iFrame.length-1]}}else{if(altKey===true){if(iFrame){iFrame.remove()}previewWindow.close();previewWindow=iFrame=false}}if(!options.previewAutoRefresh){refreshPreview()}}function refreshPreview(){if(previewWindow.document){try{sp=previewWindow.document.documentElement.scrollTop}catch(e){sp=0}previewWindow.document.open();previewWindow.document.write(renderPreview());previewWindow.document.close();previewWindow.document.documentElement.scrollTop=sp}if(options.previewInWindow){previewWindow.focus()}}function renderPreview(){if(options.previewParserPath!==""){$.ajax({type:"POST",async:false,url:options.previewParserPath,data:options.previewParserVar+"="+encodeURIComponent($$.val()),success:function(data){phtml=localize(data,1)}})}else{if(!template){$.ajax({async:false,url:options.previewTemplatePath,success:function(data){template=localize(data,1)}})}phtml=template.replace(/<!-- content -->/g,$$.val())}return phtml}function keyPressed(e){shiftKey=e.shiftKey;altKey=e.altKey;ctrlKey=(!(e.altKey&&e.ctrlKey))?e.ctrlKey:false;if(e.type==="keydown"){if(ctrlKey===true){li=$("a[accesskey="+String.fromCharCode(e.keyCode)+"]",header).parent("li");if(li.length!==0){ctrlKey=false;li.triggerHandler("mouseup");return false}}if(e.keyCode===13||e.keyCode===10){if(ctrlKey===true){ctrlKey=false;markup(options.onCtrlEnter);return options.onCtrlEnter.keepDefault}else{if(shiftKey===true){shiftKey=false;markup(options.onShiftEnter);return options.onShiftEnter.keepDefault}else{markup(options.onEnter);return options.onEnter.keepDefault}}}if(e.keyCode===9){if(shiftKey==true||ctrlKey==true||altKey==true){return false}if(caretOffset!==-1){get();caretOffset=$$.val().length-caretOffset;set(caretOffset,0);caretOffset=-1;return false}else{markup(options.onTab);return options.onTab.keepDefault}}}}init()})};$.fn.markItUpRemove=function(){return this.each(function(){$$=$(this).unbind().removeClass("markItUpEditor");$$.parent("div").parent("div.markItUp").parent("div").replaceWith($$)})};$.markItUp=function(settings){var options={target:false};$.extend(options,settings);if(options.target){return $(options.target).each(function(){$(this).focus();$(this).trigger("insertion",[options])})}else{$("textarea").trigger("insertion",[options])}}})(jQuery); 
     1// markItUp! Universal MarkUp Engine, JQuery plugin 
     2// v 1.1.6 
     3// Dual licensed under the MIT and GPL licenses. 
     4// ---------------------------------------------------------------------------- 
     5// Copyright (C) 2007-2009 Jay Salvat 
     6// http://markitup.jaysalvat.com/ 
     7(function($){$.fn.markItUp=function(settings,extraSettings){var options,ctrlKey,shiftKey,altKey;ctrlKey=shiftKey=altKey=false;options={id:"",nameSpace:"",root:"",previewInWindow:"",previewAutoRefresh:true,previewPosition:"after",previewTemplatePath:"~/templates/preview.html",previewParserPath:"",previewParserVar:"data",resizeHandle:true,beforeInsert:"",afterInsert:"",onEnter:{},onShiftEnter:{},onCtrlEnter:{},onTab:{},markupSet:[{}]};$.extend(options,settings,extraSettings);if(!options.root){$("script").each(function(a,tag){miuScript=$(tag).get(0).src.match(/(.*)jquery\.markitup(\.pack)?\.js$/);if(miuScript!==null){options.root=miuScript[1]}})}return this.each(function(){var $$,textarea,levels,scrollPosition,caretPosition,caretOffset,clicked,hash,header,footer,previewWindow,template,iFrame,abort;$$=$(this);textarea=this;levels=[];abort=false;scrollPosition=caretPosition=0;caretOffset=-1;options.previewParserPath=localize(options.previewParserPath);options.previewTemplatePath=localize(options.previewTemplatePath);function localize(data,inText){if(inText){return data.replace(/("|')~\//g,"$1"+options.root)}return data.replace(/^~\//,options.root)}function init(){id="";nameSpace="";if(options.id){id='id="'+options.id+'"'}else{if($$.attr("id")){id='id="markItUp'+($$.attr("id").substr(0,1).toUpperCase())+($$.attr("id").substr(1))+'"'}}if(options.nameSpace){nameSpace='class="'+options.nameSpace+'"'}$$.wrap("<div "+nameSpace+"></div>");$$.wrap("<div "+id+' class="markItUp"></div>');$$.wrap('<div class="markItUpContainer"></div>');$$.addClass("markItUpEditor");header=$('<div class="markItUpHeader"></div>').insertBefore($$);$(dropMenus(options.markupSet)).appendTo(header);footer=$('<div class="markItUpFooter"></div>').insertAfter($$);if(options.resizeHandle===true&&$.browser.safari!==true){resizeHandle=$('<div class="markItUpResizeHandle"></div>').insertAfter($$).bind("mousedown",function(e){var h=$$.height(),y=e.clientY,mouseMove,mouseUp;mouseMove=function(e){$$.css("height",Math.max(20,e.clientY+h-y)+"px");return false};mouseUp=function(e){$("html").unbind("mousemove",mouseMove).unbind("mouseup",mouseUp);return false};$("html").bind("mousemove",mouseMove).bind("mouseup",mouseUp)});footer.append(resizeHandle)}$$.keydown(keyPressed).keyup(keyPressed);$$.bind("insertion",function(e,settings){if(settings.target!==false){get()}if(textarea===$.markItUp.focused){markup(settings)}});$$.focus(function(){$.markItUp.focused=this})}function dropMenus(markupSet){var ul=$("<ul></ul>"),i=0;$("li:hover > ul",ul).css("display","block");$.each(markupSet,function(){var button=this,t="",title,li,j;title=(button.key)?(button.name||"")+" [Ctrl+"+button.key+"]":(button.name||"");key=(button.key)?'accesskey="'+button.key+'"':"";if(button.separator){li=$('<li class="markItUpSeparator">'+(button.separator||"")+"</li>").appendTo(ul)}else{i++;for(j=levels.length-1;j>=0;j--){t+=levels[j]+"-"}li=$('<li class="markItUpButton markItUpButton'+t+(i)+" "+(button.className||"")+'"><a href="" '+key+' title="'+title+'">'+(button.name||"")+"</a></li>").bind("contextmenu",function(){return false}).click(function(){return false}).mouseup(function(){if(button.call){eval(button.call)()}markup(button);return false}).hover(function(){$("> ul",this).show();$(document).one("click",function(){$("ul ul",header).hide()})},function(){$("> ul",this).hide()}).appendTo(ul);if(button.dropMenu){levels.push(i);$(li).addClass("markItUpDropMenu").append(dropMenus(button.dropMenu))}}});levels.pop();return ul}function magicMarkups(string){if(string){string=string.toString();string=string.replace(/\(\!\(([\s\S]*?)\)\!\)/g,function(x,a){var b=a.split("|!|");if(altKey===true){return(b[1]!==undefined)?b[1]:b[0]}else{return(b[1]===undefined)?"":b[0]}});string=string.replace(/\[\!\[([\s\S]*?)\]\!\]/g,function(x,a){var b=a.split(":!:");if(abort===true){return false}value=prompt(b[0],(b[1])?b[1]:"");if(value===null){abort=true}return value});return string}return""}function prepare(action){if($.isFunction(action)){action=action(hash)}return magicMarkups(action)}function build(string){openWith=prepare(clicked.openWith);placeHolder=prepare(clicked.placeHolder);replaceWith=prepare(clicked.replaceWith);closeWith=prepare(clicked.closeWith);if(replaceWith!==""){block=openWith+replaceWith+closeWith}else{if(selection===""&&placeHolder!==""){block=openWith+placeHolder+closeWith}else{block=openWith+(string||selection)+closeWith}}return{block:block,openWith:openWith,replaceWith:replaceWith,placeHolder:placeHolder,closeWith:closeWith}}function markup(button){var len,j,n,i;hash=clicked=button;get();$.extend(hash,{line:"",root:options.root,textarea:textarea,selection:(selection||""),caretPosition:caretPosition,ctrlKey:ctrlKey,shiftKey:shiftKey,altKey:altKey});prepare(options.beforeInsert);prepare(clicked.beforeInsert);if(ctrlKey===true&&shiftKey===true){prepare(clicked.beforeMultiInsert)}$.extend(hash,{line:1});if(ctrlKey===true&&shiftKey===true){lines=selection.split(/\r?\n/);for(j=0,n=lines.length,i=0;i<n;i++){if($.trim(lines[i])!==""){$.extend(hash,{line:++j,selection:lines[i]});lines[i]=build(lines[i]).block}else{lines[i]=""}}string={block:lines.join("\n")};start=caretPosition;len=string.block.length+(($.browser.opera)?n:0)}else{if(ctrlKey===true){string=build(selection);start=caretPosition+string.openWith.length;len=string.block.length-string.openWith.length-string.closeWith.length;len-=fixIeBug(string.block)}else{if(shiftKey===true){string=build(selection);start=caretPosition;len=string.block.length;len-=fixIeBug(string.block)}else{string=build(selection);start=caretPosition+string.block.length;len=0;start-=fixIeBug(string.block)}}}if((selection===""&&string.replaceWith==="")){caretOffset+=fixOperaBug(string.block);start=caretPosition+string.openWith.length;len=string.block.length-string.openWith.length-string.closeWith.length;caretOffset=$$.val().substring(caretPosition,$$.val().length).length;caretOffset-=fixOperaBug($$.val().substring(0,caretPosition))}$.extend(hash,{caretPosition:caretPosition,scrollPosition:scrollPosition});if(string.block!==selection&&abort===false){insert(string.block);set(start,len)}else{caretOffset=-1}get();$.extend(hash,{line:"",selection:selection});if(ctrlKey===true&&shiftKey===true){prepare(clicked.afterMultiInsert)}prepare(clicked.afterInsert);prepare(options.afterInsert);if(previewWindow&&options.previewAutoRefresh){refreshPreview()}shiftKey=altKey=ctrlKey=abort=false}function fixOperaBug(string){if($.browser.opera){return string.length-string.replace(/\n*/g,"").length}return 0}function fixIeBug(string){if($.browser.msie){return string.length-string.replace(/\r*/g,"").length}return 0}function insert(block){if(document.selection){var newSelection=document.selection.createRange();newSelection.text=block}else{$$.val($$.val().substring(0,caretPosition)+block+$$.val().substring(caretPosition+selection.length,$$.val().length))}}function set(start,len){if(textarea.createTextRange){if($.browser.opera&&$.browser.version>=9.5&&len==0){return false}range=textarea.createTextRange();range.collapse(true);range.moveStart("character",start);range.moveEnd("character",len);range.select()}else{if(textarea.setSelectionRange){textarea.setSelectionRange(start,start+len)}}textarea.scrollTop=scrollPosition;textarea.focus()}function get(){textarea.focus();scrollPosition=textarea.scrollTop;if(document.selection){selection=document.selection.createRange().text;if($.browser.msie){var range=document.selection.createRange(),rangeCopy=range.duplicate();rangeCopy.moveToElementText(textarea);caretPosition=-1;while(rangeCopy.inRange(range)){rangeCopy.moveStart("character");caretPosition++}}else{caretPosition=textarea.selectionStart}}else{caretPosition=textarea.selectionStart;selection=$$.val().substring(caretPosition,textarea.selectionEnd)}return selection}function preview(){if(!previewWindow||previewWindow.closed){if(options.previewInWindow){previewWindow=window.open("","preview",options.previewInWindow)}else{iFrame=$('<iframe class="markItUpPreviewFrame"></iframe>');if(options.previewPosition=="after"){iFrame.insertAfter(footer)}else{iFrame.insertBefore(header)}previewWindow=iFrame[iFrame.length-1].contentWindow||frame[iFrame.length-1]}}else{if(altKey===true){if(iFrame){iFrame.remove()}else{previewWindow.close()}previewWindow=iFrame=false}}if(!options.previewAutoRefresh){refreshPreview()}}function refreshPreview(){renderPreview()}function renderPreview(){var phtml;if(options.previewParserPath!==""){$.ajax({type:"POST",url:options.previewParserPath,data:options.previewParserVar+"="+encodeURIComponent($$.val()),success:function(data){writeInPreview(localize(data,1))}})}else{if(!template){$.ajax({url:options.previewTemplatePath,success:function(data){writeInPreview(localize(data,1).replace(/<!-- content -->/g,$$.val()))}})}}return false}function writeInPreview(data){if(previewWindow.document){try{sp=previewWindow.document.documentElement.scrollTop}catch(e){sp=0}var h="test";previewWindow.document.open();previewWindow.document.write(data);previewWindow.document.close();previewWindow.document.documentElement.scrollTop=sp}if(options.previewInWindow){previewWindow.focus()}}function keyPressed(e){shiftKey=e.shiftKey;altKey=e.altKey;ctrlKey=(!(e.altKey&&e.ctrlKey))?e.ctrlKey:false;if(e.type==="keydown"){if(ctrlKey===true){li=$("a[accesskey="+String.fromCharCode(e.keyCode)+"]",header).parent("li");if(li.length!==0){ctrlKey=false;li.triggerHandler("mouseup");return false}}if(e.keyCode===13||e.keyCode===10){if(ctrlKey===true){console.log("onCtrlEnter");ctrlKey=false;markup(options.onCtrlEnter);return options.onCtrlEnter.keepDefault}else{if(shiftKey===true){console.log("onShiftEnter");shiftKey=false;markup(options.onShiftEnter);return options.onShiftEnter.keepDefault}else{markup(options.onEnter);return options.onEnter.keepDefault}}}if(e.keyCode===9){if(shiftKey==true||ctrlKey==true||altKey==true){return false}if(caretOffset!==-1){get();caretOffset=$$.val().length-caretOffset;set(caretOffset,0);caretOffset=-1;return false}else{markup(options.onTab);return options.onTab.keepDefault}}}}init()})};$.fn.markItUpRemove=function(){return this.each(function(){$$=$(this).unbind().removeClass("markItUpEditor");$$.parent("div").parent("div.markItUp").parent("div").replaceWith($$)})};$.markItUp=function(settings){var options={target:false};$.extend(options,settings);if(options.target){return $(options.target).each(function(){$(this).focus();$(this).trigger("insertion",[options])})}else{$("textarea").trigger("insertion",[options])}}})(jQuery); 

  • branches/genoa/plugins/markitup/js/set.js

    r755 r1072  
    11/** 
    2  * MarkItUp! extended settings for Seditio 
     2 * MarkItUp! extended settings for Cotonti 
    33 */ 
    44 

  • branches/genoa/plugins/news/news.php

    r865 r1078  
    1515 * 
    1616 * @package Cotonti 
    17  * @version 0.0.3 
    18  * @author Neocrome, Cotonti Team 
     17 * @version 0.6.6 
     18 * @author Cotonti Team 
    1919 * @copyright Copyright (c) Cotonti Team 2008-2009 
    2020 * @license BSD 
    … …  
    3131    $v=trim($v); 
    3232    $v = explode('|', $v); 
    33     $checkin = isset($sed_cat[$v[0]]); 
    34     if($checkin) 
    35     $cats[$v[0]] = $v; 
    36     if($k==0) 
    37     $indexcat=$v[0]; 
     33    if(isset($sed_cat[$v[0]])) 
     34    {    
     35        $cats[$v[0]] = $v; 
     36        if($k==0) 
     37        $indexcat=$v[0]; 
     38    } 
    3839} 
    3940 
    … …  
    4243    $d = '0'; 
    4344} 
    44 if(empty($c)) 
    45 { 
    46     $c = $indexcat; 
    47     unset($cats[$indexcat]); 
    48 } 
    49 else 
    50 { 
    51     $checkin = isset($sed_cat[$c]); 
    52     $c = ($checkin === false) ? $cfg['plugin']['news']['category'] :  $c ; 
    53     if (isset($cats[$c])) 
    54     unset($cats[$c]); 
    55 } 
     45$c=(empty($c)||!isset($sed_cat[$c])) ? $indexcat : $c; 
     46unset($cats[$c]); 
    5647 
    5748require_once $cfg['plugins_dir'].'/news/inc/news.functions.php'; 

  • branches/genoa/system/lang/en/main.lang.php

    r994 r1080  
    396396$L['aut_emailbanned'] = 'This e-mail (or this host) is banned, reason is: '; 
    397397$L['aut_emailtooshort'] = 'The e-mail is not valid!'; 
     398$L['aut_invalidloginchars'] = 'The login contains invalid characters'; // 0.6.6 
    398399$L['aut_logintitle'] = 'Login form'; 
    399400$L['aut_mailnoticetitle'] = 'E-mail transition';        // New in N-0.1.0 
    … …  
    449450 
    450451$L['for_antibump'] = 'The anti-bump protection is up, you cannot post twice in a row.'; // 0.0.6 
     452$L['for_keepmovedlink'] = 'Keep a Moved Topic link'; // 0.6.6 
    451453$L['for_markallasread'] = 'Mark all posts as read'; 
    452454$L['for_mergetime'] = 'Added %1$s later:'; // 0.0.6 

  • branches/genoa/system/lang/ru/main.lang.php

    r994 r1080  
    396396$L['aut_emailbanned'] = 'Данный e-mail (или хост) заблокирован. Причина: '; 
    397397$L['aut_emailtooshort'] = 'Ошибочный e-mail'; 
     398$L['aut_invalidloginchars'] = 'Логин содержит недопустимые символы'; // 0.6.6 
    398399$L['aut_logintitle'] = 'Авторизация'; 
    399400$L['aut_mailnoticetitle'] = 'Смена e-mail'; // New in N-0.1.0 
    … …  
    449450 
    450451$L['for_antibump'] = 'Активирована система защиты от поднятия тем: вы не можете создавать несколько сообщений подряд';  // 0.0.2 
     452$L['for_keepmovedlink'] = 'Оставить ссылку в старом разделе'; // 0.6.6 
    451453$L['for_markallasread'] = 'Отметить все сообщения как прочитанные'; 
    452454$L['for_mergetime'] = 'Добавлено %1$s спустя:'; // 0.0.6 

  • branches/genoa/system/core/users/users.register.inc.php

    r973 r1092  
    7575                if($row['field_type']=="checkbox") 
    7676                { 
    77                         if ($import == "0") $import = 1; 
    78                         if ($import == "") $import = 0; 
     77                        $import = $import != ''; 
    7978                } 
    8079                $ruserextrafields[] = $import; 
    … …  
    9594        $res2 = sed_sql_result($sql,0,"COUNT(*)"); 
    9695 
    97         $rusername = str_replace('&#160;', '', $rusername); 
     96        $error_string .= (preg_match('/&#\d+;/', $rusername) || preg_match('/[<>#\'"\/]/', $rusername)) ? 
     97                $L['aut_invalidloginchars'] . '<br />' : ''; 
    9898        $error_string .= (!empty($bannedreason)) ? $L['aut_emailbanned'].$bannedreason."<br />" : ''; 
    9999        $error_string .= (mb_strlen($rusername)<2) ? $L['aut_usernametooshort']."<br />" : ''; 

  • branches/genoa/system/core/users/users.edit.inc.php

    r973 r1092  
    106106                if($row['field_type']=="checkbox") 
    107107                { 
    108                         if ($import == "0") $import = 1; 
    109                         if ($import == "") $import = 0; 
     108                        $import = $import != ''; 
    110109                } 
    111110                $ruserextrafields[] = $import; 

  • branches/genoa/system/core/users/users.profile.inc.php

    r973 r1092  
    383383                if($row['field_type']=="checkbox") 
    384384                { 
    385                         if ($import == "0") $import = 1; 
    386                         if ($import == "") $import = 0; 
     385                        $import = $import != ''; 
    387386                } 
    388387                $ruserextrafields[] = $import; 

  • branches/genoa/system/core/admin/admin.cache.inc.php

    r864 r1074  
    4040elseif($a == 'delete') 
    4141{ 
     42        $name = sed_sql_prep(sed_import('name', 'G', 'TXT')); 
    4243        sed_check_xg(); 
    43         $sql = sed_sql_query("DELETE FROM $db_cache WHERE c_name='$id'"); 
     44        $sql = sed_sql_query("DELETE FROM $db_cache WHERE c_name='$name'"); 
    4445 
    4546        $adminwarnings = ($sql) ? $L['adm_delcacheitem'] : $L['Error']; 
    … …  
    6162        $cachesize += $row['size']; 
    6263        $t -> assign(array( 
    63                 "ADMIN_CACHE_ITEM_DEL_URL" => sed_url('admin', 'm=cache&a=delete&id='.$row['c_name'].'&'.sed_xg()), 
    64                 "ADMIN_CACHE_ITEM_DEL_URL_AJAX" => ($cfg['jquery'] AND $cfg['turnajax']) ? " onclick=\"return ajaxSend({url: '".sed_url('admin', 'm=cache&a=delete&ajax=1&id='.$row['c_name'].'&'.sed_xg())."', divId: 'pagtab', errMsg: '".$L['ajaxSenderror']."'});\"" : "", 
     64                "ADMIN_CACHE_ITEM_DEL_URL" => sed_url('admin', 'm=cache&a=delete&name='.$row['c_name'].'&'.sed_xg()), 
     65                "ADMIN_CACHE_ITEM_DEL_URL_AJAX" => ($cfg['jquery'] AND $cfg['turnajax']) ? " onclick=\"return ajaxSend({url: '".sed_url('admin', 'm=cache&a=delete&ajax=1&name='.$row['c_name'].'&'.sed_xg())."', divId: 'pagtab', errMsg: '".$L['ajaxSenderror']."'});\"" : "", 
    6566                "ADMIN_CACHE_ITEM_NAME" => $row['c_name'], 
    6667                "ADMIN_CACHE_EXPIRE" => ($row['c_expire'] - $sys['now']), 

  • branches/genoa/system/core/pfs/pfs.inc.php

    r983 r1100  
    1010 * 
    1111 * @package Cotonti 
    12  * @version 0.0.6 
     12 * @version 0.6.6 
    1313 * @author Neocrome, Cotonti Team 
    1414 * @copyright Copyright (c) 2008-2009 Cotonti Team 
    … …  
    1818defined('SED_CODE') or die('Wrong URL'); 
    1919 
    20 $id = sed_import('id','G','INT'); 
    21 $o = sed_import('o','G','ALP'); 
    22 $f = sed_import('f','G','INT'); 
    23 $c1 = sed_import('c1','G','ALP'); 
    24 $c2 = sed_import('c2','G','ALP'); 
    25 $userid = sed_import('userid','G','INT'); 
     20$id = sed_import('id','G','INT');                     // id (delete file(folder) id 
     21$o = sed_import('o','G','ALP');                       // 
     22$f = sed_import('f','G','INT');                       // folder id 
     23$c1 = sed_import('c1','G','ALP');                                         // 
     24$c2 = sed_import('c2','G','ALP');                                         // 
     25$userid = sed_import('userid','G','INT');                         // User ID or 0 
    2626$gd_supported = array('jpg', 'jpeg', 'png', 'gif'); 
    2727 
    28 $d = sed_import('d', 'G', 'INT'); 
     28$d = sed_import('d', 'G', 'INT');                                          // Page number files 
     29$df = sed_import('df', 'G', 'INT');                                        // page number folders 
     30         
     31$more2.='&f='.$f.'&d='.$d.'&df='.$df; 
     32 
     33$df = empty($df) ? 0 : (int) $df; 
    2934$d = empty($d) ? 0 : (int) $d; 
    30 $df = sed_import('df', 'G', 'INT'); 
    31 $df = empty($df) ? 0 : (int) $df; 
    3235 
    3336list($usr['auth_read'], $usr['auth_write'], $usr['isadmin']) = sed_auth('pfs', 'a'); 
    … …  
    4346else 
    4447{ 
    45         $more = 'userid='.$userid; 
    46 } 
    47  
    48 if ($userid!=$usr['id']) 
    49 { sed_block($usr['isadmin']); } 
     48        $more = '&userid='.$userid; 
     49} 
    5050 
    5151$files_count = 0; 
    … …  
    8181} 
    8282        "; 
    83         $more .= empty($more) ? 'c1='.$c1.'&c2='.$c2 : '&c1='.$c1.'&c2='.$c2; 
     83        $more .= '&c1='.$c1.'&c2='.$c2; 
    8484        $standalone = TRUE; 
    8585} 
    … …  
    9898if ($userid!=$usr['id']) 
    9999{ 
    100         sed_block($usr['isadmin']); 
    101100        $title .= ($userid==0) ? '' : " (".sed_build_user($user_info['user_id'], $user_info['user_name']).")"; 
    102101} 
    … …  
    124123        /* ===== */ 
    125124 
    126         if ($folder_id!=0) 
     125        if (!empty($folderid)) 
    127126        { 
    128127                $sql = sed_sql_query("SELECT pff_id FROM $db_pfs_folders WHERE pff_userid='$userid' AND pff_id='$folderid' "); 
    … …  
    286285 
    287286                $sql = sed_sql_query("DELETE FROM $db_pfs WHERE pfs_id='$id'"); 
    288                 header("Location: " . SED_ABSOLUTE_URL . sed_url('pfs', $more, '', true)); 
    289                 exit; 
    290         } 
    291         else 
    292         { sed_die(); } 
     287        } 
    293288} 
    294289elseif ($a=='newfolder') 
    … …  
    326321        sed_block($usr['auth_write']); 
    327322        sed_check_xg(); 
    328         $sql = sed_sql_query("DELETE FROM $db_pfs_folders WHERE pff_userid='$userid' AND pff_id='$f' "); 
    329         $sql = sed_sql_query("UPDATE $db_pfs SET pfs_folderid=0 WHERE pfs_userid='$userid' AND pfs_folderid='$f' "); 
    330         header("Location: " . SED_ABSOLUTE_URL . sed_url('pfs', $more, '', true)); 
    331         exit; 
     323        $sql = sed_sql_query("DELETE FROM $db_pfs_folders WHERE pff_userid='$userid' AND pff_id='$id' "); 
     324        $sql = sed_sql_query("UPDATE $db_pfs SET pfs_folderid=0 WHERE pfs_userid='$userid' AND pfs_folderid='$id' "); 
    332325} 
    333326 
    … …  
    349342                $sql = sed_sql_query("SELECT * FROM $db_pfs WHERE pfs_userid='$userid' AND pfs_folderid='$f' ORDER BY pfs_file ASC"); 
    350343                $sqll = sed_sql_query("SELECT * FROM $db_pfs WHERE pfs_userid='$userid' AND pfs_folderid='$f' ORDER BY pfs_file ASC LIMIT $d, ".$cfg['maxpfsperpage']); 
    351                 $title .= " ".$cfg['separator']." <a href=\"".sed_url('pfs', 'f='.$pff_id.'&'.$more)."\">".$pff_title."</a>"; 
     344                $title .= " ".$cfg['separator']." <a href=\"".sed_url('pfs', 'f='.$pff_id.$more)."\">".$pff_title."</a>"; 
    352345        } 
    353346        else 
    … …  
    391384                $pff_fssize = (empty($pff_fsize)) ? "0" : $pff_fsize; 
    392385 
    393                 $list_folders .= "<tr><td>[<a href=\"".sed_url('pfs', 'a=deletefolder&'.sed_xg().'&f='.$pff_id.'&'.$more)."\">x</a>]</td>"; 
    394                 $list_folders .= "<td><a href=\"".sed_url('pfs', 'm=editfolder&f='.$pff_id.'&'.$more)."\">".$L['Edit']."</a></td>"; 
     386                $list_folders .= "<tr><td>[<a href=\"".sed_url('pfs', 'a=deletefolder&'.sed_xg().'&id='.$pff_id.$more.$more2)."\">x</a>]</td>"; 
     387                $list_folders .= "<td><a href=\"".sed_url('pfs', 'm=editfolder&f='.$pff_id.$more)."\">".$L['Edit']."</a></td>"; 
    395388 
    396389                if ($pff_isgallery) 
    … …  
    399392                { $icon_f = "<img src=\"skins/$skin/img/system/icon-folder.gif\" alt=\"\" />"; } 
    400393 
    401                 $list_folders .= "<td><a href=\"".sed_url('pfs', 'f='.$pff_id.'&'.$more)."\">".$icon_f."</a></td>"; 
    402                 $list_folders .= "<td><a href=\"".sed_url('pfs', 'f='.$pff_id.'&'.$more)."\">".$pff_title."</a></td>"; 
     394                $list_folders .= "<td><a href=\"".sed_url('pfs', 'f='.$pff_id.$more)."\">".$icon_f."</a></td>"; 
     395                $list_folders .= "<td><a href=\"".sed_url('pfs', 'f='.$pff_id.$more)."\">".$pff_title."</a></td>"; 
    403396                $list_folders .= "<td style=\"text-align:right;\">".$pff_fcount."</td>"; 
    404397                $list_folders .= "<td style=\"text-align:right;\">".$pff_fsize." ".$L['kb']."</td>"; 
    … …  
    460453        } 
    461454 
    462         $list_files .= "<tr><td>[<a href=\"".sed_url('pfs', 'a=delete&'.sed_xg().'&id='.$pfs_id.'&'.$more.'&o='.$o)."\">x</a>]</td>"; 
    463         $list_files .= "<td><a href=\"".sed_url('pfs', 'm=edit&id='.$pfs_id.'&'.$more)."\">".$L['Edit']."</a></td>"; 
     455        $list_files .= "<tr><td>[<a href=\"".sed_url('pfs', 'a=delete&'.sed_xg().'&id='.$pfs_id.$more.$more2.'&o='.$o)."\">x</a>]</td>"; 
     456        $list_files .= "<td><a href=\"".sed_url('pfs', 'm=edit&id='.$pfs_id.$more)."\">".$L['Edit']."</a></td>"; 
    464457        $list_files .= "<td>".$pfs_icon."</td>"; 
    465458        $list_files .= "<td><a href=\"".$pfs_fullfile."\">".$pfs_file."</a></td>"; 
    … …  
    533526$disp_stats .= " (".@floor(100*$pfs_totalsize/1024/$maxtotal)."%) "; 
    534527$disp_stats .= " &nbsp; ".$L['pfs_maxsize']." : ".$maxfile.$L['kb']; 
    535 $disp_stats .= ($o!='thumbs' && $files_count>0 && $cfg['th_amode']!='Disabled') ? " &nbsp; <a href=\"".sed_url('pfs', 'f='.$f.'&'.$more.'&o=thumbs')."\">".$L['Thumbnails']."</a></p>" : '</p>'; 
     528$disp_stats .= ($o!='thumbs' && $files_count>0 && $cfg['th_amode']!='Disabled') ? " &nbsp; <a href=\"".sed_url('pfs', 'f='.$f.$more.'&o=thumbs')."\">".$L['Thumbnails']."</a></p>" : '</p>'; 
    536529$disp_stats .= "<div style=\"width:200px; margin-top:0;\"><div class=\"bar_back\">"; 
    537530$disp_stats .= "<div class=\"bar_front\" style=\"width:".$pfs_precentbar."%;\"></div></div></div>"; 
    … …  
    540533 
    541534$disp_upload = "<h4>".$L['pfs_newfile']."</h4>"; 
    542 $disp_upload .= "<form enctype=\"multipart/form-data\" action=\"".sed_url('pfs','a=upload'.'&'.$more)."\" method=\"post\">"; 
     535$disp_upload .= "<form enctype=\"multipart/form-data\" action=\"".sed_url('pfs','a=upload'.$more.$more2)."\" method=\"post\">"; 
    543536$disp_upload .= "<table class=\"cells\"><tr><td colspan=\"3\">"; 
    544537$disp_upload .= "<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\"".($maxfile*1024)."\" />"; 
    … …  
    573566{ 
    574567        $disp_newfolder = "<h4>".$L['pfs_newfolder']."</h4>"; 
    575         $disp_newfolder .= "<form id=\"newfolder\" action=\"".sed_url('pfs', 'a=newfolder'.'&'.$more)."\" method=\"post\">"; 
     568        $disp_newfolder .= "<form id=\"newfolder\" action=\"".sed_url('pfs', 'a=newfolder'.$more.$more2)."\" method=\"post\">"; 
    576569        $disp_newfolder .= "<table class=\"cells\"><tr><td>".$L['Title']."</td>"; 
    577570        $disp_newfolder .= "<td><input type=\"text\" class=\"text\" name=\"ntitle\" value=\"\" size=\"32\" maxlength=\"255\" /></td></tr>"; 

  • branches/genoa/system/core/forums/forums.posts.inc.php

    r1029 r1080  
    5757        $sql = sed_sql_query("SELECT fp_id, fp_topicid, fp_sectionid, fp_posterid 
    5858        FROM $db_forum_posts 
    59         WHERE fp_topicid='$q' AND fp_creation>'".$usr['lastvisit']."' 
     59        WHERE fp_topicid='$q' AND fp_updated > ". $usr['lastvisit']." 
    6060                ORDER by fp_id ASC LIMIT 1"); 
    6161        if ($row = sed_sql_fetcharray($sql)) 
    … …  
    554554} 
    555555 
    556 $movebox .= "</select> ".$L['Ghost']."<input type=\"checkbox\" class=\"checkbox\" name=\"ghost\" checked=\"checked\" />"; 
     556$movebox .= "</select> ".$L['for_keepmovedlink']." <input type=\"checkbox\" class=\"checkbox\" name=\"ghost\" />"; 
    557557$jumpbox .= "</select>"; 
    558558 

  • branches/genoa/system/core/list/list.inc.php

    r867 r1074  
    153153list($pageprev, $pagenext) = sed_pagination_pn(sed_url('list', "c=$c&s=$s&w=$w&o=$o&p=$p"), $d, $totallines, $cfg['maxrowsperpage'], TRUE); 
    154154 
    155 list($list_comments, $list_comments_display) = sed_build_comments($item_code, sed_url('list', 'c=' . $c), $comments); 
    156 list($list_ratings, $list_ratings_display) = sed_build_ratings($item_code, sed_url('list', 'c=' . $c), $ratings); 
     155list($list_comments, $list_comments_display) = sed_build_comments($item_code, sed_url('list', 'c=' . $c), $sed_cat[$c]['com']); 
     156list($list_ratings, $list_ratings_display) = sed_build_ratings($item_code, sed_url('list', 'c=' . $c), $sed_cat[$c]['ratings']); 
    157157 
    158158$sys['sublocation'] = $sed_cat[$c]['title']; 

  • branches/genoa/system/core/page/page.inc.php

    r1027 r1095  
    2727$c = sed_import('c','G','TXT'); 
    2828$pg = sed_import('pg','G','INT'); 
    29 $comments = true; // TODO enable/disable comments on categories 
    30 $ratings = true; // TODO enable/disable ratings on categories 
    3129 
    3230/* === Hook === */ 
    … …  
    6866if (mb_substr($pag['page_text'], 0, 6)=='redir:') 
    6967{ 
    70         $redir = str_replace('redir:', '', trim($pag['page_text'])); 
     68        $redir = trim(str_replace('redir:', '', $pag['page_text'])); 
    7169        $sql = sed_sql_query("UPDATE $db_pages SET page_filecount=page_filecount+1 WHERE page_id='".$pag['page_id']."'"); 
    72         header("Location: " . SED_ABSOLUTE_URL . $redir); 
     70        header('Location: ' . (preg_match('#^(http|ftp)s?://#', $redir) ? '' : SED_ABSOLUTE_URL) . $redir); 
    7371        exit; 
    7472} 
    … …  
    288286                if(($pag['page_file'] === 2 && $usr['id'] == 0) || ($pag['page_file'] === 2 && !$usr['auth_download'])) 
    289287                { 
    290                         $t->assign('PAGE_SHORTTITLE', $L['Members_download']); 
     288                        $t->assign('PAGE_FILETITLE', $L['Members_download']); 
    291289                } 
    292290                else 
    293291                { 
    294292                        $t->assign(array( 
    295                                 'PAGE_SHORTTITLE' => $pag['page_title'], 
     293                                'PAGE_FILETITLE' => $pag['page_title'], 
    296294                                'PAGE_FILE_URL' => sed_url('page', "id=".$pag['page_id']."&a=dl") 
    297295                                )); 
    … …  
    334332                else 
    335333                { 
    336                         $pag['page_tabtitle'][$i] = ''; 
     334                        $pag['page_tabtitle'][$i] = $i == 1 ? $pag['page_title'] : $L['Page'] . ' ' . ($i + 1); 
    337335                } 
    338336                $tab_url = empty($pag['page_alias']) ? sed_url('page', 'id='.$pag['page_id'].'&pg='.$i) : sed_url('page', 'al='.$pag['page_alias'].'&pg='.$i); 

  • branches/genoa/system/core/pm/pm.list.inc.php

    r864 r1074  
    124124{ 
    125125    $jj++; 
    126     $row['pm_icon_status'] = ($row['pm_state']=='0' && $f!='sentbox') ? "<a href=\"".sed_url('pm', 'id='.$row['pm_id'])."\"><img src=\"skins/".$skin."/img/system/icon-pm-new.gif\" alt=\"\" /></a>" : "<a href=\"".sed_url('pm', 'id='.$row['pm_id'])."\"><img src=\"skins/".$skin."/img/system/icon-pm.gif\" alt=\"\" /></a>"; 
     126    $row['pm_icon_status'] = ($row['pm_state']=='0' && $f!='sentbox') ? "<a href=\"".sed_url('pm', 'm=message&id='.$row['pm_id'])."\"><img src=\"skins/".$skin."/img/system/icon-pm-new.gif\" alt=\"\" /></a>" : "<a href=\"".sed_url('pm', 'm=message&id='.$row['pm_id'])."\"><img src=\"skins/".$skin."/img/system/icon-pm.gif\" alt=\"\" /></a>"; 
    127127 
    128128    if ($f=='sentbox') 

  • branches/genoa/system/functions.php

    r1041 r1100  
    44 * 
    55 * @package Cotonti 
    6  * @version 0.6.5 
     6 * @version 0.6.6 
    77 * @author Neocrome, Cotonti Team 
    8  * @copyright Copyright (c) 2008-2009 Cotonti Team 
     8 * @copyright Copyright (c) 2008-2010 Cotonti Team 
    99 * @license BSD License 
    1010 */ 
    … …  
    3838 
    3939$cfg['svnrevision'] = '$Rev$'; //DO NOT MODIFY this is set by SVN automatically 
    40 $cfg['version'] = '0.6.5'; 
    41 $cfg['dbversion'] = '0.6.5'; 
     40$cfg['version'] = '0.6.6'; 
     41$cfg['dbversion'] = '0.6.6'; 
    4242 
    4343if($cfg['customfuncs']) 
    … …  
    245245        if ($usr['id']<1) 
    246246        { 
    247                 header("Location: " . SED_ABSOLUTE_URL . sed_url('message', "msg=930&".$sys['url_redirect'], '', true)); 
     247                header('Location: ' . SED_ABSOLUTE_URL . sed_url('message', 'msg=930&' . $sys['url_redirect'], '', true)); 
    248248                exit; 
    249249        } 
    … …  
    10681068                $pagnav = sed_pagination($url, $d, $totalitems, $cfg['maxcommentsperpage']); 
    10691069                list($pagination_prev, $pagination_next) = sed_pagination_pn($url, $d, $totalitems, $cfg['maxcommentsperpage'], TRUE); 
     1070                if (!$cfg['expand_comments']) 
     1071                { 
     1072                        // A dirty fix for pagination anchors 
     1073                        $pagnav = preg_replace('/href="(.+?)"/', 'href="$1#comments"', $pagnav); 
     1074                        $pagination_prev = preg_replace('/href="(.+?)"/', 'href="$1#comments"', $pagination_prev); 
     1075                        $pagination_next = preg_replace('/href="(.+?)"/', 'href="$1#comments"', $pagination_next); 
     1076                } 
    10701077                $t->assign(array( 
    10711078                        'COMMENTS_PAGES_INFO' => $L['Total'] . ' : ' . $totalitems . ', ' . $L['comm_on_page'] . ': ' . ($i - $d), 
    … …  
    39853992        } 
    39863993        $bname = is_array($base) ? $base[0] : $base; 
    3987         if($plug || !$admn) 
     3994        if($admn) 
     3995        { 
     3996                $scan_prefix[] = './skins/'.$usr['skin'].'/admin/'; 
     3997                if ($usr['skin'] != $cfg['defaultskin']) 
     3998                { 
     3999                        $scan_prefix[] = './skins/'.$cfg['defaultskin'].'/admin/'; 
     4000                } 
     4001                if ($plug) 
     4002                { 
     4003                        $scan_prefix[] = $cfg['plugins_dir'].'/'.$bname.'/tpl/admin/'; 
     4004                } 
     4005        } 
     4006        elseif($plug) 
    39884007        { 
    39894008                $scan_prefix[] = './skins/'.$usr['skin'].'/plugins/'; 
    … …  
    39964015                $scan_prefix[] = $cfg['plugins_dir'].'/'.$bname.'/tpl/'; 
    39974016                $scan_prefix[] = $cfg['plugins_dir'].'/'.$bname .'/'; 
    3998         } 
    3999         if($admn) 
    4000         { 
    4001                 $scan_prefix[] = './skins/'.$usr['skin'].'/admin/'; 
    4002                 if ($usr['skin'] != $cfg['defaultskin']) 
    4003                 { 
    4004                         $scan_prefix[] = './skins/'.$cfg['defaultskin'].'/admin/'; 
    4005                 } 
    4006                 if ($plug) 
    4007                 { 
    4008                         $scan_prefix[] = $cfg['plugins_dir'].'/'.$bname.'/tpl/admin/'; 
    4009                 } 
    40104017        } 
    40114018        $scan_prefix[] = 'skins/'.$usr['skin'].'/'; 
    … …  
    45104517        $mask = (!empty($cfg[$mask])) ? $cfg[$mask] : $mask; 
    45114518        $mask = str_replace($tags[0], $tags[1], $mask); 
     4519        $data = array_map('htmlspecialchars', $data); 
    45124520        $title = vsprintf($mask, $data); 
    45134521        return $title; 

  • branches/genoa/system/header.php

    r871 r1080  
    4040$out['basehref'] = '<base href="'.$cfg['mainurl'].'/" />'; 
    4141$out['meta_charset'] = $cfg['charset']; 
    42 $out['meta_desc'] = $plug_desc.$cfg['maintitle']." - ".$cfg['subtitle']; 
     42$out['meta_desc'] = $plug_desc.htmlspecialchars($cfg['maintitle'])." - ".htmlspecialchars($cfg['subtitle']); 
    4343$out['meta_keywords'] = $plug_keywords.$cfg['metakeywords']; 
    4444$out['meta_lastmod'] = gmdate("D, d M Y H:i:s"); 

  • branches/genoa/skins/sed-light/plugins/news.tpl

    r1009 r1081  
    2424    <!-- END: PAGE_ROW --> 
    2525 
    26     <div class="pagnav">{PAGE_PAGEPREV} {PAGE_PAGNAV} {PAGE_PAGENEXT}</div> 
     26    <div class="paging">{PAGE_PAGEPREV} {PAGE_PAGENAV} {PAGE_PAGENEXT}</div> 
    2727</div> 
    2828<!-- END: NEWS --> 

  • branches/genoa/skins/sed-light/page.tpl

    r873 r1081  
    3939                        <strong>{PHP.L.Tags}:</strong>&nbsp; 
    4040                        <!-- BEGIN: PAGE_TAGS_ROW --> 
    41                                 <!-- IF {PHP.tag_i} > 0 -->,&nbsp;<!-- ENDIF --><a href="{PAGE_TAGS_ROW_URL}">{PAGE_TAGS_ROW_TAG}</a> 
     41                                <!-- IF {PHP.tag_i} > 0 -->, &nbsp;<!-- ENDIF --><a href="{PAGE_TAGS_ROW_URL}">{PAGE_TAGS_ROW_TAG}</a> 
    4242                        <!-- END: PAGE_TAGS_ROW --> 
    4343                        <!-- BEGIN: PAGE_NO_TAGS --> 
    … …  
    5656                                <!-- END: MEMBERSONLY --> 
    5757                                <!-- BEGIN: DOWNLOAD --> 
    58                                 {PAGE_FILE_ICON}<a href="{PAGE_FILE_URL}">{PHP.L.Download}: {PAGE_SHORTTITLE}</a><br/> 
     58                                {PAGE_FILE_ICON}<a href="{PAGE_FILE_URL}">{PHP.L.Download}: {PAGE_FILETITLE}</a><br/> 
    5959                                <!-- END: DOWNLOAD --> 
    6060                                {PHP.skinlang.page.Filesize}: {PAGE_FILE_SIZE}{PHP.L.kb}, {PHP.skinlang.page.downloaded} {PAGE_FILE_COUNT} {PHP.skinlang.page.times} 

  • branches/genoa/rss.php

    r1007 r1047  
    44 * 
    55 * @package Cotonti 
    6  * @version 0.0.3 
     6 * @version 0.6.5 
    77 * @author medar 
    88 * @copyright Copyright (c) 2009 Cotonti Team 
    … …  
    266266 
    267267                $items[$i]['title'] = $row['page_title']; 
    268                 $items[$i]['link'] = $row['page_pageurl']; 
     268                $items[$i]['link'] = SED_ABSOLUTE_URL . $row['page_pageurl']; 
    269269                $items[$i]['pubDate'] = date('r', $row['page_date']); 
    270270                $items[$i]['description'] = sed_parse_page_text($row['page_id'], $row['page_type'], $row['page_text'], $row['page_html'], $row['page_pageurl']);