lang_todays_featured_articleTheme changes in Geeklog 1.5.1
!Note: Themes made for Geeklog 1.5.0 should be compatible with Geeklog 1.5.1. ! We only made a few optional additions and a few adjustments for special setups ! (e.g. multi-language sites, right-to-left languages) which are detailed ! below.
Multilingual blocks
--- 199,207 ----Theme changes in Geeklog 1.5.1
!Note: Themes made for Geeklog 1.5.0 are mostly compatible with Geeklog 1.5.1. We only made one mandatory change (for the Configuration admin panel) - all the other changes listed below are optional or adjustments for special setups (e.g. multi-language sites, right-to-left languages). See details below.
! !Important change: Configuration
! !The JavaScript code used for the Configuration admin panel used a generic name which caused conflicts with other JavaScript code. You should update the file admin/config/config_element.thtml to make sure your theme works with Geeklog 1.5.1.
Multilingual blocks
*************** *** 226,234 ****- In Geeklog 1.5.0, the behaviour of the variable
{page_title}! changed so that it now only contains the actual page title or the site's ! slogan (in earlier versions, it contained both the site's name and either ! the page title or the site's slogan). This was done so that the combination !{page_title}{page_site_splitter}{site_name}could be used ! to place the page title before the site's name for better SEO. If you prefer --- 227,235 ----- In Geeklog 1.5.0, the behaviour of the variable
{page_title}! (in header.thtml) changed so that it now only contains the actual ! page title or the site's slogan (in earlier versions, it contained both the ! site's name and either the page title or the site's slogan). This was done ! so that the combination{page_title}{page_site_splitter}{site_name}! could be used to place the page title before the site's name for better SEO. If you prefer *************** *** 251,254 **** --- 252,260 ---- no changes in functionality and other commentbar layouts will continue to work as before.
+ - The story template files archivestorytext.thtml,
+ featuredstorytext.thtml, and storytext.thtml are now
+ using the
{story_text_no_br}variable to refer to the story + text. Template files that use{story_introtext}here will + continue to work as before.
inside to expand it. + if ( FCKDomTools.CheckIsEmptyElement(oFixedBlock, function( element ) { return element.getAttribute('_fck_bookmark') != 'true' ; } ) + && FCKBrowserInfo.IsGeckoLike ) + FCKTools.AppendBogusBr( oFixedBlock ) ; + // Insert the fixed block into the DOM. this.InsertNode( oFixedBlock ) ; Index: fckstyle.js =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckstyle.js,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fckstyle.js 5 May 2008 00:35:23 -0000 1.2 --- fckstyle.js 10 Aug 2008 16:46:25 -0000 1.3 *************** *** 222,225 **** --- 222,227 ---- continue ; + /*jsl:fallthru*/ + default : FCKDomTools.RemoveAttribute( pathElement, att ) ; *************** *** 374,377 **** --- 376,381 ---- continue ; + /*jsl:fallthru*/ + default : FCKDomTools.RemoveAttribute( currentNode, att ) ; *************** *** 547,550 **** --- 551,556 ---- continue ; + /*jsl:fallthru*/ + default : FCKDomTools.RemoveAttribute( innerElement, att ) ; *************** *** 782,786 **** if ( !isTag ) { ! value = value.replace( /\n/g, '
' ) ; value = value.replace( /[ \t]{2,}/g, function ( match ) --- 788,792 ---- if ( !isTag ) { ! value = value.replace( /\n/g, '
' ) ; value = value.replace( /[ \t]{2,}/g, function ( match ) *************** *** 803,813 **** var innerHTML = block.innerHTML.Trim() ; ! // 1. Delete ANSI whitespaces immediately before and after
because they are not visible. ! // 2. Mark down any
nodes here so they can be turned into \n in the next step and avoid being compressed. ! innerHTML = innerHTML.replace( /[ \t\r\n]*(
' ) ; ! // 3. Compress other ANSI whitespaces since they're only visible as one single space previously. // 4. Convert to spaces since is no longer needed in. ! // 5. Convert any
to \n. This must not be done earlier because the \n would then get compressed. var htmlIterator = new FCKHtmlIterator( innerHTML ) ; var results = [] ; --- 809,823 ---- var innerHTML = block.innerHTML.Trim() ; ! // 1. Delete ANSI whitespaces immediately before and after
because ! // they are not visible. ! // 2. Mark down any
nodes here so they can be turned into \n in ! // the next step and avoid being compressed. ! innerHTML = innerHTML.replace( /[ \t\r\n]*(
' ) ; ! // 3. Compress other ANSI whitespaces since they're only visible as one ! // single space previously. // 4. Convert to spaces since is no longer needed in. ! // 5. Convert any
to \n. This must not be done earlier because ! // the \n would then get compressed. var htmlIterator = new FCKHtmlIterator( innerHTML ) ; var results = [] ; *************** *** 816,827 **** if ( !isTag ) value = value.replace( /([ \t\n\r]+| )/g, ' ' ) ; ! else if ( isTag && value == '
' ) value = '\n' ; results.push( value ) ; } ) ; ! // Assigning innerHTML toin IE causes all linebreaks to be reduced to spaces. ! // Assigning outerHTML to
in IE doesn't work if the
isn't contained in another node ! // since the node reference is changed after outerHTML assignment. // So, we need some hacks to workaround IE bugs here. if ( FCKBrowserInfo.IsIE ) --- 826,839 ---- if ( !isTag ) value = value.replace( /([ \t\n\r]+| )/g, ' ' ) ; ! else if ( isTag && value == '
' ) value = '\n' ; results.push( value ) ; } ) ; ! // Assigning innerHTML toin IE causes all linebreaks to be ! // reduced to spaces. ! // Assigning outerHTML to
in IE doesn't work if the
isn't ! // contained in another node since the node reference is changed after ! // outerHTML assignment. // So, we need some hacks to workaround IE bugs here. if ( FCKBrowserInfo.IsIE ) *************** *** 829,841 **** var temp = doc.createElement( 'div' ) ; temp.appendChild( newBlock ) ; ! newBlock.outerHTML = '
\n' + results.join( '' ) + '
' ; newBlock = temp.removeChild( temp.firstChild ) ; } else newBlock.innerHTML = results.join( '' ) ; return newBlock ; }, /** * Apply an inline style to a FCKDomRange. * --- 841,933 ---- var temp = doc.createElement( 'div' ) ; temp.appendChild( newBlock ) ; ! newBlock.outerHTML = '\n' + results.join( '' ) + '
' ; newBlock = temp.removeChild( temp.firstChild ) ; } else newBlock.innerHTML = results.join( '' ) ; + return newBlock ; }, /** + * Merge ablock with a previous
block, if available. + */ + _CheckAndMergePre : function( previousBlock, preBlock ) + { + // Check if the previous block and the current block are next + // to each other. + if ( previousBlock != FCKDomTools.GetPreviousSourceElement( preBlock, true ) ) + return ; + + // Merge the previousblock contents into the current
+ // block. + // + // Another thing to be careful here is that currentBlock might contain + // a '\n' at the beginning, and previousBlock might contain a '\n' + // towards the end. These new lines are not normally displayed but they + // become visible after merging. + var innerHTML = previousBlock.innerHTML.replace( /\n$/, '' ) + '\n\n' + + preBlock.innerHTML.replace( /^\n/, '' ) ; + + // Buggy IE normalizes innerHTML from
, breaking whitespaces. + if ( FCKBrowserInfo.IsIE ) + preBlock.outerHTML = '
' + innerHTML + '
' ; + else + preBlock.innerHTML = innerHTML ; + + // Remove the previousblock. + // + // The preBlock must not be moved or deleted from the DOM tree. This + // guarantees the FCKDomRangeIterator in _ApplyBlockStyle would not + // get lost at the next iteration. + FCKDomTools.RemoveNode( previousBlock ) ; + }, + + _CheckAndSplitPre : function( newBlock ) + { + var lastNewBlock ; + + var cursor = newBlock.firstChild ; + + // We are not splitting
at the beginning of the block, so + // we'll start from the second child. + cursor = cursor && cursor.nextSibling ; + + while ( cursor ) + { + var next = cursor.nextSibling ; + + // If we have two
s, and they're not at the beginning or the end, + // then we'll split up the contents following them into another block. + // Stop processing if we are at the last child couple. + if ( next && next.nextSibling && cursor.nodeName.IEquals( 'br' ) && next.nodeName.IEquals( 'br' ) ) + { + // Remove the first
. + FCKDomTools.RemoveNode( cursor ) ; + + // Move to the node after the second
. + cursor = next.nextSibling ; + + // Remove the second
. + FCKDomTools.RemoveNode( next ) ; + + // Create the block that will hold the child nodes from now on. + lastNewBlock = FCKDomTools.InsertAfterNode( lastNewBlock || newBlock, FCKDomTools.CloneElement( newBlock ) ) ; + + continue ; + } + + // If we split it, then start moving the nodes to the new block. + if ( lastNewBlock ) + { + cursor = cursor.previousSibling ; + FCKDomTools.MoveNode(cursor.nextSibling, lastNewBlock ) ; + } + + cursor = cursor.nextSibling ; + } + }, + + /** * Apply an inline style to a FCKDomRange. * *************** *** 857,863 **** var block ; var doc = range.Window.document ; ! ! var preBlocks = [] ; ! var convertedPreBlocks = [] ; while( ( block = iterator.GetNextParagraph() ) ) // Only one = --- 949,953 ---- var block ; var doc = range.Window.document ; ! var previousPreBlock ; while( ( block = iterator.GetNextParagraph() ) ) // Only one = *************** *** 866,882 **** var newBlock = this.BuildElement( doc ) ; // Move everything from the current node to the new one. ! var newBlockIsPre = newBlock.nodeName.IEquals( 'pre' ) ; ! var blockIsPre = block.nodeName.IEquals( 'pre' ) ; ! if ( newBlockIsPre && !blockIsPre ) ! { newBlock = this._ToPre( doc, block, newBlock ) ; ! preBlocks.push( newBlock ) ; ! } ! else if ( !newBlockIsPre && blockIsPre ) ! { newBlock = this._FromPre( doc, block, newBlock ) ; - convertedPreBlocks.push( newBlock ) ; - } else // Convering from a regular block to another regular block. FCKDomTools.MoveChildren( block, newBlock ) ; --- 956,971 ---- var newBlock = this.BuildElement( doc ) ; + // Check if we are changing from/to. + var newBlockIsPre = newBlock.nodeName.IEquals( 'pre' ) ; + var blockIsPre = block.nodeName.IEquals( 'pre' ) ; + + var toPre = newBlockIsPre && !blockIsPre ; + var fromPre = !newBlockIsPre && blockIsPre ; + // Move everything from the current node to the new one. ! if ( toPre ) newBlock = this._ToPre( doc, block, newBlock ) ; ! else if ( fromPre ) newBlock = this._FromPre( doc, block, newBlock ) ; else // Convering from a regular block to another regular block. FCKDomTools.MoveChildren( block, newBlock ) ; *************** *** 885,930 **** block.parentNode.insertBefore( newBlock, block ) ; FCKDomTools.RemoveNode( block ) ; - } ! // Merge adjacent
blocks for #1229. ! for ( var i = 0 ; i < preBlocks.length - 1 ; i++ ) ! { ! // Check if the next block in HTML equals the nextblock generated. ! if ( FCKDomTools.GetNextSourceElement( preBlocks[i], true, [], [], true ) != preBlocks[i+1] ) ! continue ; ! ! // Merge the upper
block's content into the lower
block. ! // Remove the upper
block. ! preBlocks[i+1].innerHTML = preBlocks[i].innerHTML + '\n\n' + preBlocks[i+1].innerHTML ; ! FCKDomTools.RemoveNode( preBlocks[i] ) ; ! } ! ! // Split converted
blocks for #1229. ! for ( var i = 0 ; i < convertedPreBlocks.length ; i++ ) ! { ! var currentBlock = convertedPreBlocks[i] ; ! var lastNewBlock = null ; ! for ( var j = 0 ; j < currentBlock.childNodes.length ; j++ ) { ! var cursor = currentBlock.childNodes[j] ; ! ! // If we have two
s, and they're not at the beginning or the end, ! // then we'll split up the contents following them into another block. ! if ( cursor.nodeName.IEquals( 'br' ) && j != 0 && j != currentBlock.childNodes.length - 2 ! && cursor.nextSibling && cursor.nextSibling.nodeName.IEquals( 'br' ) ) ! { ! FCKDomTools.RemoveNode( cursor.nextSibling ) ; ! FCKDomTools.RemoveNode( cursor ) ; ! j-- ; // restart at current index at next iteration ! lastNewBlock = FCKDomTools.InsertAfterNode( lastNewBlock || currentBlock, doc.createElement( currentBlock.nodeName ) ) ; ! continue ; ! } ! ! if ( lastNewBlock ) ! { ! FCKDomTools.MoveNode( cursor, lastNewBlock ) ; ! j-- ; // restart at current index at next iteration ! } } } --- 974,987 ---- block.parentNode.insertBefore( newBlock, block ) ; FCKDomTools.RemoveNode( block ) ; ! // Complete other tasks after inserting the node in the DOM. ! if ( newBlockIsPre ) { ! if ( previousPreBlock ) ! this._CheckAndMergePre( previousPreBlock, newBlock ) ; // Merge successiveblocks. ! previousPreBlock = newBlock ; } + else if ( fromPre ) + this._CheckAndSplitPre( newBlock ) ; // Split
in successives. } Index: fckdomrangeiterator.js =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckdomrangeiterator.js,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fckdomrangeiterator.js 5 May 2008 00:35:23 -0000 1.2 --- fckdomrangeiterator.js 10 Aug 2008 16:46:25 -0000 1.3 *************** *** 137,141 **** // point. (#1717) if ( nodeName != 'br' ) ! this._NextNode = currentNode ; } --- 137,141 ---- // point. (#1717) if ( nodeName != 'br' ) ! this._NextNode = FCKDomTools.GetNextSourceNode( currentNode, true, null, lastNode ) ; } Index: fckpanel.js =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckpanel.js,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** fckpanel.js 5 May 2008 00:35:23 -0000 1.5 --- fckpanel.js 10 Aug 2008 16:46:25 -0000 1.6 *************** *** 67,75 **** { var oIFrame = this._IFrame = this._Window.document.createElement('iframe') ; oIFrame.src = 'javascript:void(0)' ; oIFrame.allowTransparency = true ; oIFrame.frameBorder = '0' ; oIFrame.scrolling = 'no' ; ! oIFrame.width = oIFrame.height = 0 ; FCKDomTools.SetElementStyles( oIFrame, { --- 67,76 ---- { var oIFrame = this._IFrame = this._Window.document.createElement('iframe') ; + FCKTools.ResetStyles( oIFrame ); oIFrame.src = 'javascript:void(0)' ; oIFrame.allowTransparency = true ; oIFrame.frameBorder = '0' ; oIFrame.scrolling = 'no' ; ! oIFrame.style.width = oIFrame.style.height = '0px' ; FCKDomTools.SetElementStyles( oIFrame, { *************** *** 278,283 **** var iWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ; var iHeight = eMainNode.offsetHeight ; ! me._IFrame.width = iWidth ; ! me._IFrame.height = iHeight ; }, 0 ) ; --- 279,284 ---- var iWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ; var iHeight = eMainNode.offsetHeight ; ! me._IFrame.style.width = iWidth + 'px' ; ! me._IFrame.style.height = iHeight + 'px' ; }, 0 ) ; *************** *** 304,308 **** // It is better to set the sizes to 0, otherwise Firefox would have // rendering problems. ! this._IFrame.width = this._IFrame.height = 0 ; this._IsOpened = false ; --- 305,309 ---- // It is better to set the sizes to 0, otherwise Firefox would have // rendering problems. ! this._IFrame.style.width = this._IFrame.style.height = '0px' ; this._IsOpened = false ; Index: fckdocumentfragment_gecko.js =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fckdocumentfragment_gecko.js 5 May 2008 00:35:23 -0000 1.2 --- fckdocumentfragment_gecko.js 10 Aug 2008 16:46:25 -0000 1.3 *************** *** 40,43 **** --- 40,50 ---- }, + AppendHtml : function( html ) + { + var eTmpDiv = this.RootNode.ownerDocument.createElement( 'div' ) ; + eTmpDiv.innerHTML = html ; + FCKDomTools.MoveChildren( eTmpDiv, this.RootNode ) ; + }, + InsertAfterNode : function( existingNode ) { Index: fckeditingarea.js =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckeditingarea.js,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** fckeditingarea.js 5 May 2008 00:35:23 -0000 1.5 --- fckeditingarea.js 10 Aug 2008 16:46:25 -0000 1.6 *************** *** 97,105 **** oIFrame.frameBorder = 0 ; ! oIFrame.width = oIFrame.height = '100%' ; if ( FCK_IS_CUSTOM_DOMAIN && FCKBrowserInfo.IsIE ) { ! window._FCKHtmlToLoad = sOverrideError + html ; oIFrame.src = 'javascript:void( (function(){' + 'document.open() ;' + --- 97,105 ---- oIFrame.frameBorder = 0 ; ! oIFrame.style.width = oIFrame.style.height = '100%' ; if ( FCK_IS_CUSTOM_DOMAIN && FCKBrowserInfo.IsIE ) { ! window._FCKHtmlToLoad = html.replace( //i, '' + sOverrideError ) ; oIFrame.src = 'javascript:void( (function(){' + 'document.open() ;' + *************** *** 133,137 **** oDoc.open() ; ! oDoc.write( sOverrideError + html ) ; oDoc.close() ; } --- 133,137 ---- oDoc.open() ; ! oDoc.write( html.replace( //i, '' + sOverrideError ) ) ; oDoc.close() ; } *************** *** 151,166 **** { var editArea = this ; ! ( oIFrame.onreadystatechange = function() ! { ! if ( oIFrame.readyState == 'complete' ) ! { ! oIFrame.onreadystatechange = null ; ! editArea.Window._FCKEditingArea = editArea ; ! FCKEditingArea_CompleteStart.call( editArea.Window ) ; ! } ! // It happened that IE changed the state to "complete" after the ! // "if" and before the "onreadystatechange" assignement, making we ! // lost the event call, so we do a manual call just to be sure. ! } )() ; } else --- 151,171 ---- { var editArea = this ; ! ! // Using a IE alternative for DOMContentLoaded, similar to the ! // solution proposed at http://javascript.nwbox.com/IEContentLoaded/ ! setTimeout( function() ! { ! try ! { ! editArea.Window.document.documentElement.doScroll("left") ; ! } ! catch(e) ! { ! setTimeout( arguments.callee, 0 ) ; ! return ; ! } ! editArea.Window._FCKEditingArea = editArea ; ! FCKEditingArea_CompleteStart.call( editArea.Window ) ; ! }, 0 ) ; } else *************** *** 247,250 **** --- 252,256 ---- { oDoc.body.innerHTML = this._BodyHTML ; + oDoc.body.offsetLeft ; // Don't remove, this is a hack to fix Opera 9.50, see #2264. this._BodyHTML = null ; } Index: fckenterkey.js =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/classes/fckenterkey.js,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fckenterkey.js 5 May 2008 00:35:23 -0000 1.2 --- fckenterkey.js 10 Aug 2008 16:46:25 -0000 1.3 *************** *** 44,58 **** [ 13 , 'Enter' ], [ SHIFT + 13, 'ShiftEnter' ], - [ 9 , 'Tab' ], [ 8 , 'Backspace' ], ! [ CTRL + 8 , 'CtrlBackspace' ], [ 46 , 'Delete' ] ] ) ; ! if ( tabSpaces > 0 ) { ! this.TabText = '' ; ! while ( tabSpaces-- > 0 ) this.TabText += '\xa0' ; } --- 44,62 ---- [ 13 , 'Enter' ], [ SHIFT + 13, 'ShiftEnter' ], [ 8 , 'Backspace' ], ! [ CTRL + 8 , 'CtrlBackspace' ], [ 46 , 'Delete' ] ] ) ; ! this.TabText = '' ; ! ! // Safari by default inserts 4 spaces on TAB, while others make the editor ! // loose focus. So, we need to handle it here to not include those spaces. ! if ( tabSpaces > 0 || FCKBrowserInfo.IsSafari ) { ! while ( tabSpaces-- ) this.TabText += '\xa0' ; + + oKeystrokeHandler.SetKeystrokes( [ 9, 'Tab' ] ); } *************** *** 164,167 **** --- 168,193 ---- } + // On IE, it is better for us handle the deletion if the caret is preceeded + // by a
(#1383). + if ( FCKBrowserInfo.IsIE ) + { + var previousElement = FCKDomTools.GetPreviousSourceElement( oRange.StartNode, true ) ; + + if ( previousElement && previousElement.nodeName.toLowerCase() == 'br' ) + { + // Create a range that starts after the
and ends at the + // current range position. + var testRange = oRange.Clone() ; + testRange.SetStart( previousElement, 4 ) ; + + // If that range is empty, we can proceed cleaning that
manually. + if ( testRange.CheckIsEmpty() ) + { + previousElement.parentNode.removeChild( previousElement ) ; + return true ; + } + } + } + var oStartBlock = oRange.StartBlock ; var oEndBlock = oRange.EndBlock ; *************** *** 505,512 **** } ! if ( FCKBrowserInfo.IsSafari ) FCKDomTools.ScrollIntoView( eNextBlock || eNewBlock, false ) ; - else if ( FCKBrowserInfo.IsGeckoLike ) - ( eNextBlock || eNewBlock ).scrollIntoView( false ) ; oRange.Select() ; --- 531,536 ---- } ! if ( FCKBrowserInfo.IsGeckoLike ) FCKDomTools.ScrollIntoView( eNextBlock || eNewBlock, false ) ; oRange.Select() ; *************** *** 591,598 **** eLineBreak.parentNode.insertBefore( dummy, eLineBreak.nextSibling ) ; ! if ( FCKBrowserInfo.IsSafari ) ! FCKDomTools.ScrollIntoView( dummy, false ) ; ! else ! dummy.scrollIntoView( false ) ; dummy.parentNode.removeChild( dummy ) ; --- 615,619 ---- eLineBreak.parentNode.insertBefore( dummy, eLineBreak.nextSibling ) ; ! FCKDomTools.ScrollIntoView( dummy, false ) ; dummy.parentNode.removeChild( dummy ) ; From blaine at qs1489.pair.com Sun Aug 10 12:46:30 2008 From: blaine at qs1489.pair.com (Blaine Lang) Date: Sun, 10 Aug 2008 16:46:30 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/css fck_editorarea.css, 1.7, 1.8 Message-ID: <20080810164705.53323F7415@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/css In directory qs1489.pair.com:/tmp/cvs-serv4567/editor/css Modified Files: fck_editorarea.css Log Message: Upgrade to FCKeditor ver 2.6.3 Index: fck_editorarea.css =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/css/fck_editorarea.css,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** fck_editorarea.css 5 May 2008 00:35:24 -0000 1.7 --- fck_editorarea.css 10 Aug 2008 16:46:27 -0000 1.8 *************** *** 27,34 **** */ ! /* ! The "body" styles should match your editor web site, mainly regarding ! background color and font family and size. ! */ body --- 27,34 ---- */ ! /** ! * The "body" styles should match your editor web site, mainly regarding ! * background color and font family and size. ! */ body *************** *** 51,58 **** } ! /* ! Just uncomment the following block if you want to avoid spaces between ! paragraphs. Remember to apply the same style in your output front end page. ! */ /* --- 51,58 ---- } ! /** ! * Just uncomment the following block if you want to avoid spaces between ! * paragraphs. Remember to apply the same style in your output front end page. ! */ /* *************** *** 64,73 **** */ /* ! The following are some sample styles used in the "Styles" toolbar command. ! You should instead remove them, and include the styles used by the site ! you are using the editor in. */ .Bold { --- 64,91 ---- */ + /** + * Uncomment the following block, or only selected lines if appropriate, + * if you have some style items that would break the styles combo box. + * You can also write other CSS overrides inside the style block below + * as needed and they will be applied to inside the style combo only. + */ + /* ! .SC_Item *, .SC_ItemSelected * ! { ! margin: 0px !important; ! padding: 0px !important; ! text-indent: 0px !important; ! clip: auto !important; ! position: static !important; ! } */ + /** + * The following are some sample styles used in the "Styles" toolbar command. + * You should instead remove them, and include the styles used by the site + * you are using the editor in. + */ + .Bold { From blaine at qs1489.pair.com Sun Aug 10 12:46:28 2008 From: blaine at qs1489.pair.com (Blaine Lang) Date: Sun, 10 Aug 2008 16:46:28 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses fck_othercommands.js, 1.7, 1.8 fckfitwindow.js, 1.4, 1.5 fckshowblocks.js, 1.2, 1.3 Message-ID: <20080810164658.F1E48F7410@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses In directory qs1489.pair.com:/tmp/cvs-serv4567/editor/_source/commandclasses Modified Files: fck_othercommands.js fckfitwindow.js fckshowblocks.js Log Message: Upgrade to FCKeditor ver 2.6.3 Index: fckshowblocks.js =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckshowblocks.js,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fckshowblocks.js 5 May 2008 00:35:23 -0000 1.2 --- fckshowblocks.js 10 Aug 2008 16:46:26 -0000 1.3 *************** *** 45,48 **** --- 45,65 ---- body.className += ' FCK__ShowBlocks' ; + if ( FCKBrowserInfo.IsIE ) + { + try + { + FCK.EditorDocument.selection.createRange().select() ; + } + catch ( e ) + {} + } + else + { + var focus = FCK.EditorWindow.getSelection().focusNode ; + if ( focus.nodeType != 1 ) + focus = focus.parentNode ; + FCKDomTools.ScrollIntoView( focus, false ) ; + } + FCK.Events.FireEvent( 'OnSelectionChange' ) ; } Index: fck_othercommands.js =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fck_othercommands.js,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** fck_othercommands.js 5 May 2008 00:35:23 -0000 1.7 --- fck_othercommands.js 10 Aug 2008 16:46:26 -0000 1.8 *************** *** 312,315 **** --- 312,374 ---- } + FCKVisitLinkCommand = function() + { + this.Name = 'VisitLink'; + } + FCKVisitLinkCommand.prototype = + { + GetState : function() + { + if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG ) + return FCK_TRISTATE_DISABLED ; + var state = FCK.GetNamedCommandState( 'Unlink' ) ; + + if ( state == FCK_TRISTATE_OFF ) + { + var el = FCKSelection.MoveToAncestorNode( 'A' ) ; + if ( !el.href ) + state = FCK_TRISTATE_DISABLED ; + } + + return state ; + }, + + Execute : function() + { + var el = FCKSelection.MoveToAncestorNode( 'A' ) ; + var url = el.getAttribute( '_fcksavedurl' ) || el.getAttribute( 'href', 2 ) ; + + // Check if it's a full URL. + // If not full URL, we'll need to apply the BaseHref setting. + if ( ! /:\/\//.test( url ) ) + { + var baseHref = FCKConfig.BaseHref ; + var parentWindow = FCK.GetInstanceObject( 'parent' ) ; + if ( !baseHref ) + { + baseHref = parentWindow.document.location.href ; + baseHref = baseHref.substring( 0, baseHref.lastIndexOf( '/' ) + 1 ) ; + } + + if ( /^\//.test( url ) ) + { + try + { + baseHref = baseHref.match( /^.*:\/\/+[^\/]+/ )[0] ; + } + catch ( e ) + { + baseHref = parentWindow.document.location.protocol + '://' + parentWindow.parent.document.location.host ; + } + } + + url = baseHref + url ; + } + + if ( !window.open( url, '_blank' ) ) + alert( FCKLang.VisitLinkBlocked ) ; + } + } ; + // FCKSelectAllCommand var FCKSelectAllCommand = function() *************** *** 517,518 **** --- 576,634 ---- } }; + + var FCKDeleteDivCommand = function() + { + } + FCKDeleteDivCommand.prototype = + { + GetState : function() + { + if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG ) + return FCK_TRISTATE_DISABLED ; + + var node = FCKSelection.GetParentElement() ; + var path = new FCKElementPath( node ) ; + return path.BlockLimit && path.BlockLimit.nodeName.IEquals( 'div' ) ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ; + }, + + Execute : function() + { + // Create an undo snapshot before doing anything. + FCKUndo.SaveUndoStep() ; + + // Find out the nodes to delete. + var nodes = FCKDomTools.GetSelectedDivContainers() ; + + // Remember the current selection position. + var range = new FCKDomRange( FCK.EditorWindow ) ; + range.MoveToSelection() ; + var bookmark = range.CreateBookmark() ; + + // Delete the container DIV node. + for ( var i = 0 ; i < nodes.length ; i++) + FCKDomTools.RemoveNode( nodes[i], true ) ; + + // Restore selection. + range.MoveToBookmark( bookmark ) ; + range.Select() ; + } + } ; + + // FCKRuleCommand + var FCKNbsp = function() + { + this.Name = 'Non Breaking Space' ; + } + + FCKNbsp.prototype = + { + Execute : function() + { + FCK.InsertHtml( ' ' ) ; + }, + + GetState : function() + { + return ( FCK.EditMode != FCK_EDITMODE_WYSIWYG ? FCK_TRISTATE_DISABLED : FCK_TRISTATE_OFF ) ; + } + } ; Index: fckfitwindow.js =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/_source/commandclasses/fckfitwindow.js,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** fckfitwindow.js 5 May 2008 00:35:23 -0000 1.4 --- fckfitwindow.js 10 Aug 2008 16:46:26 -0000 1.5 *************** *** 38,41 **** --- 38,46 ---- var eParent ; + // Save the current selection and scroll position. + var oRange = new FCKDomRange( FCK.EditorWindow ) ; + oRange.MoveToSelection() ; + var oEditorScrollPos = FCKTools.GetScrollPosition( FCK.EditorWindow ) ; + // No original style properties known? Go fullscreen. if ( !this.IsMaximized ) *************** *** 84,87 **** --- 89,93 ---- eEditorFrameStyle.position = "absolute"; + eEditorFrame.offsetLeft ; // Kludge for Safari 3.1 browser bug, do not remove. See #2066. eEditorFrameStyle.zIndex = FCKConfig.FloatingPanelsZIndex - 1; eEditorFrameStyle.left = "0px"; *************** *** 160,163 **** --- 166,173 ---- FCK.Focus() ; + + // Restore the selection and scroll position of inside the document. + oRange.Select() ; + FCK.EditorWindow.scrollTo( oEditorScrollPos.X, oEditorScrollPos.Y ) ; } From blaine at qs1489.pair.com Sun Aug 10 12:46:30 2008 From: blaine at qs1489.pair.com (Blaine Lang) Date: Sun, 10 Aug 2008 16:46:30 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog/common fck_dialog_common.js, 1.6, 1.7 Message-ID: <20080810164705.6062AF7416@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/common In directory qs1489.pair.com:/tmp/cvs-serv4567/editor/dialog/common Modified Files: fck_dialog_common.js Log Message: Upgrade to FCKeditor ver 2.6.3 Index: fck_dialog_common.js =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/common/fck_dialog_common.js,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** fck_dialog_common.js 5 May 2008 00:35:24 -0000 1.6 --- fck_dialog_common.js 10 Aug 2008 16:46:28 -0000 1.7 *************** *** 58,62 **** function GetCommonDialogCss( prefix ) { ! // CSS minified by http://iceyboard.no-ip.org/projects/css_compressor return FCKConfig.BasePath + 'dialog/common/' + '|.ImagePreviewArea{border:#000 1px solid;overflow:auto;width:100%;height:170px;background-color:#fff}.FlashPreviewArea{border:#000 1px solid;padding:5px;overflow:auto;width:100%;height:170px;background-color:#fff}.BtnReset{float:left;background-position:center center;background-image:url(images/reset.gif);width:16px;height:16px;background-repeat:no-repeat;border:1px none;font-size:1px}.BtnLocked,.BtnUnlocked{float:left;background-position:center center;background-image:url(images/locked.gif);width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.BtnUnlocked{background-image:url(images/unlocked.gif)}.BtnOver{border:outset 1px;cursor:pointer;cursor:hand}' ; } --- 58,62 ---- function GetCommonDialogCss( prefix ) { ! // CSS minified by http://iceyboard.no-ip.org/projects/css_compressor (see _dev/css_compression.txt). return FCKConfig.BasePath + 'dialog/common/' + '|.ImagePreviewArea{border:#000 1px solid;overflow:auto;width:100%;height:170px;background-color:#fff}.FlashPreviewArea{border:#000 1px solid;padding:5px;overflow:auto;width:100%;height:170px;background-color:#fff}.BtnReset{float:left;background-position:center center;background-image:url(images/reset.gif);width:16px;height:16px;background-repeat:no-repeat;border:1px none;font-size:1px}.BtnLocked,.BtnUnlocked{float:left;background-position:center center;background-image:url(images/locked.gif);width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.BtnUnlocked{background-image:url(images/unlocked.gif)}.BtnOver{border:outset 1px;cursor:pointer;cursor:hand}' ; } *************** *** 188,219 **** sOptions += ",top=" + iTop ; ! // The "PreserveSessionOnFileBrowser" because the above code could be ! // blocked by popup blockers. ! if ( oEditor.FCKConfig.PreserveSessionOnFileBrowser && oEditor.FCKBrowserInfo.IsIE ) ! { ! // The following change has been made otherwise IE will open the file ! // browser on a different server session (on some cases): ! // http://support.microsoft.com/default.aspx?scid=kb;en-us;831678 ! // by Simone Chiaretta. ! var oWindow = oEditor.window.open( url, 'FCKBrowseWindow', sOptions ) ; ! ! if ( oWindow ) ! { ! // Detect Yahoo popup blocker. ! try ! { ! var sTest = oWindow.name ; // Yahoo returns "something", but we can't access it, so detect that and avoid strange errors for the user. ! oWindow.opener = window ; ! } ! catch(e) ! { ! alert( oEditor.FCKLang.BrowseServerBlocked ) ; ! } ! } ! else ! alert( oEditor.FCKLang.BrowseServerBlocked ) ; ! } ! else ! window.open( url, 'FCKBrowseWindow', sOptions ) ; } --- 188,192 ---- sOptions += ",top=" + iTop ; ! window.open( url, 'FCKBrowseWindow', sOptions ) ; } From blaine at qs1489.pair.com Sun Aug 10 12:46:32 2008 From: blaine at qs1489.pair.com (Blaine Lang) Date: Sun, 10 Aug 2008 16:46:32 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image fck_image.js, 1.8, 1.9 fck_image_preview.html, 1.5, 1.6 Message-ID: <20080810164705.38F43F741D@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image In directory qs1489.pair.com:/tmp/cvs-serv4567/editor/dialog/fck_image Modified Files: fck_image.js fck_image_preview.html Log Message: Upgrade to FCKeditor ver 2.6.3 Index: fck_image.js =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image/fck_image.js,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** fck_image.js 5 May 2008 00:35:24 -0000 1.8 --- fck_image.js 10 Aug 2008 16:46:29 -0000 1.9 *************** *** 448,451 **** --- 448,455 ---- function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg ) { + // Remove animation + window.parent.Throbber.Hide() ; + GetE( 'divUpload' ).style.display = '' ; + switch ( errorNumber ) { *************** *** 501,504 **** --- 505,512 ---- } + // Show animation + window.parent.Throbber.Show( 100 ) ; + GetE( 'divUpload' ).style.display = 'none' ; + return true ; } Index: fck_image_preview.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_image/fck_image_preview.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** fck_image_preview.html 5 May 2008 00:35:24 -0000 1.5 --- fck_image_preview.html 10 Aug 2008 16:46:29 -0000 1.6 *************** *** 35,41 **** var FCKConfig = window.parent.FCKConfig ; ! // Sets the Skin CSS ! document.write( FCKTools.GetStyleHtml( FCKConfig.SkinDialogCSS ) ) ; ! document.write( FCKTools.GetStyleHtml( GetCommonDialogCss( '../' ) ) ) ; if ( window.parent.FCKConfig.BaseHref.length > 0 ) --- 35,41 ---- var FCKConfig = window.parent.FCKConfig ; ! // Set the preview CSS ! document.write( FCKTools.GetStyleHtml( FCKConfig.EditorAreaCSS ) ) ; ! document.write( FCKTools.GetStyleHtml( FCKConfig.EditorAreaStyles ) ) ; if ( window.parent.FCKConfig.BaseHref.length > 0 ) *************** *** 51,55 **** !--- 51,55 ---- !From blaine at qs1489.pair.com Sun Aug 10 12:46:37 2008 From: blaine at qs1489.pair.com (Blaine Lang) Date: Sun, 10 Aug 2008 16:46:37 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php io.php, 1.2, 1.3 Message-ID: <20080810164710.B3075F7426@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php In directory qs1489.pair.com:/tmp/cvs-serv4567/editor/filemanager/connectors/php Modified Files: io.php Log Message: Upgrade to FCKeditor ver 2.6.3 Index: io.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/php/io.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** io.php 5 May 2008 00:35:25 -0000 1.2 --- io.php 10 Aug 2008 16:46:32 -0000 1.3 *************** *** 155,158 **** --- 155,160 ---- } $sRealPath = realpath( './' ) ; + // #2124 ensure that no slash is at the end + $sRealPath = rtrim($sRealPath,"\\/"); $sSelfPath = $_SERVER['PHP_SELF'] ; *************** *** 278,315 **** function SendUploadResults( $errorNumber, $fileUrl = '', $fileName = '', $customMsg = '' ) { echo <<! (function() ! { ! var d = document.domain ; ! ! while ( true ) ! { ! // Test if we can access a parent property. ! try ! { ! var test = window.top.opener.document.domain ; ! break ; ! } ! catch( e ) {} ! ! // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ... ! d = d.replace( /.*?(?:\.|$)/, '' ) ; ! ! if ( d.length == 0 ) ! break ; // It was not able to detect the domain. ! ! try ! { ! document.domain = d ; ! } ! catch (e) ! { ! break ; ! } ! } ! })() ; ! EOF; $rpl = array( '\\' => '\\\\', '"' => '\\"' ) ; echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr( $fileUrl, $rpl ) . '","' . strtr( $fileName, $rpl ) . '", "' . strtr( $customMsg, $rpl ) . '") ;' ; --- 280,290 ---- function SendUploadResults( $errorNumber, $fileUrl = '', $fileName = '', $customMsg = '' ) { + // Minified version of the document.domain automatic fix script (#1919). + // The original script can be found at _dev/domain_fix_template.js echo << ! (function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})(); EOF; + $rpl = array( '\\' => '\\\\', '"' => '\\"' ) ; echo 'window.parent.OnUploadCompleted(' . $errorNumber . ',"' . strtr( $fileUrl, $rpl ) . '","' . strtr( $fileName, $rpl ) . '", "' . strtr( $customMsg, $rpl ) . '") ;' ; From blaine at qs1489.pair.com Sun Aug 10 12:46:37 2008 From: blaine at qs1489.pair.com (Blaine Lang) Date: Sun, 10 Aug 2008 16:46:37 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py fckoutput.py, 1.2, 1.3 Message-ID: <20080810164710.1D132F7422@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py In directory qs1489.pair.com:/tmp/cvs-serv4567/editor/filemanager/connectors/py Modified Files: fckoutput.py Log Message: Upgrade to FCKeditor ver 2.6.3 Index: fckoutput.py =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/py/fckoutput.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fckoutput.py 5 May 2008 00:35:25 -0000 1.2 --- fckoutput.py 10 Aug 2008 16:46:33 -0000 1.3 *************** *** 102,136 **** self.setHttpHeaders("text/html") "This is the function that sends the results of the uploading process" - return """ *************** *** 735,739 **** --- 760,766 ---- *************** *** 773,776 **** --- 800,804 ---- Index: fckeditor.original.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/fckeditor.original.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** fckeditor.original.html 5 May 2008 00:35:24 -0000 1.7 --- fckeditor.original.html 10 Aug 2008 16:46:30 -0000 1.8 *************** *** 32,35 **** --- 32,66 ---- ! ! ! ! !--- 188,192 ---- ! Index: frmactualfolder.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/frmactualfolder.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** frmactualfolder.html 5 May 2008 00:35:25 -0000 1.4 --- frmactualfolder.html 10 Aug 2008 16:46:30 -0000 1.5 *************** *** 24,27 **** --- 24,28 ---- + Folder path *************** *** 40,44 **** break ; } ! catch( e ) {} // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ... --- 41,46 ---- break ; } ! catch( e ) ! {} // Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ... *************** *** 59,68 **** })() ; - function OnResize() - { - divName.style.width = "1px" ; - divName.style.width = tdName.offsetWidth + "px" ; - } - function SetCurrentFolder( resourceType, folderPath ) { --- 61,64 ---- *************** *** 77,82 **** ! !--- 73,78 ---- ! ! *************** *** 88,92 **** / 
/ Resources ! Index: frmcreatefolder.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** frmcreatefolder.html 5 May 2008 00:35:25 -0000 1.4 --- frmcreatefolder.html 10 Aug 2008 16:46:30 -0000 1.5 *************** *** 24,31 **** ! ! ! !--- 95,100 ---- ! ! Index: browser.css =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/browser.css,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** browser.css 5 May 2008 00:35:25 -0000 1.4 --- browser.css 10 Aug 2008 16:46:30 -0000 1.5 *************** *** 25,34 **** { background-color: #f1f1e3; } form { ! margin: 0px 0px 0px 0px ; ! padding: 0px 0px 0px 0px ; } --- 25,36 ---- { background-color: #f1f1e3; + margin-top:0; + margin-bottom:0; } form { ! margin: 0; ! padding: 0; } *************** *** 36,49 **** { background-color: #f1f1e3; ! border-color: #f1f1e3; ! border-right: thin inset; ! border-top: thin inset; ! border-left: thin inset; ! border-bottom: thin inset; } body.FileArea { - background-color: #ffffff; margin: 10px; --- 38,46 ---- { background-color: #f1f1e3; ! border: thin inset #f1f1e3; } body.FileArea { background-color: #ffffff; margin: 10px; *************** *** 71,79 **** .Button, button { - border-right: #737357 1px solid; - border-top: #737357 1px solid; - border-left: #737357 1px solid; color: #3b3b1f; ! border-bottom: #737357 1px solid; background-color: #c7c78f; } --- 68,73 ---- .Button, button { color: #3b3b1f; ! border: #737357 1px solid; background-color: #c7c78f; } *************** *** 88,89 **** --- 82,87 ---- background-image: url(images/Folder.gif); } + + .fullHeight { + height: 100%; + } Index: frmupload.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/browser/default/frmupload.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** frmupload.html 5 May 2008 00:35:25 -0000 1.4 --- frmupload.html 10 Aug 2008 16:46:30 -0000 1.5 *************** *** 22,30 **** * Page used to upload new files in the current folder. --> ! File Upload ! ! --- 166,170 ---- Index: fck_replace.html =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_replace.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** fck_replace.html 5 May 2008 00:35:24 -0000 1.5 --- fck_replace.html 10 Aug 2008 16:46:28 -0000 1.6 *************** *** 35,38 **** --- 35,44 ---- var FCKLang = oEditor.FCKLang ; + var FCKDomTools = oEditor.FCKDomTools ; + var FCKDomRange = oEditor.FCKDomRange ; + var FCKListsLib = oEditor.FCKListsLib ; + var FCKTools = oEditor.FCKTools ; + var EditorDocument = oEditor.FCK.EditorDocument ; + var HighlightStyle = oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ) ; dialog.AddTab( 'Find', FCKLang.DlgFindTitle ) ; *************** *** 52,231 **** } ! // Place a range at the start of document. ! // This will be the starting point of our search. ! var GlobalRange = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ; ! ! function ResetGlobalRange() ! { ! GlobalRange.SetStart( oEditor.FCK.EditorDocument.body, 1 ) ; ! GlobalRange.SetEnd( oEditor.FCK.EditorDocument.body, 1 ) ; ! GlobalRange.Collapse( true ) ; ! } ! ResetGlobalRange() ; ! ! var HighlightRange = null ; ! function Highlight() { ! if ( HighlightRange ) ! ClearHighlight() ; ! var cloneRange = GlobalRange.Clone() ; ! oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ).ApplyToRange( cloneRange, false, true ) ; ! HighlightRange = cloneRange ; ! GlobalRange = HighlightRange.Clone() ; } ! function ClearHighlight() { ! if ( HighlightRange ) { ! oEditor.FCKStyles.GetStyle( '_FCK_SelectionHighlight' ).RemoveFromRange( HighlightRange, false, true ) ; ! HighlightRange = null ; } } ! ! function OnLoad() { ! // First of all, translate the dialog box texts. ! oEditor.FCKLanguageManager.TranslatePage( document ) ; ! // Show the appropriate tab at startup. ! if ( dialogArguments.CustomValue == 'Find' ) { ! dialog.SetSelectedTab( 'Find' ) ; ! dialog.SetAutoSize( true ) ; ! } ! else ! dialog.SetSelectedTab( 'Replace' ) ; ! SelectField( 'txtFind' + dialogArguments.CustomValue ) ; ! } ! function btnStat() ! { ! GetE('btnReplace').disabled = ! GetE('btnReplaceAll').disabled = ! GetE('btnFind').disabled = ! ( GetE(idMap["FindText"]).value.length == 0 ) ; ! } ! function btnStatDelayed() ! { ! setTimeout( btnStat, 1 ) ; ! } ! function GetSearchString() ! { ! return GetE(idMap['FindText']).value ; ! } ! function GetReplaceString() ! { ! return GetE("txtReplace").value ; ! } ! function GetCheckCase() ! { ! return !! ( GetE(idMap['CheckCase']).checked ) ; ! } ! function GetMatchWord() { ! return !! ( GetE(idMap['CheckWord']).checked ) ; } ! ! // Get the data pointed to by a bookmark. ! function GetData( bookmark ) { ! var cursor = oEditor.FCK.EditorDocument.documentElement ; ! for ( var i = 0 ; i < bookmark.length ; i++ ) { ! var target = bookmark[i] ; ! var currentIndex = -1 ; ! if ( cursor.nodeType != 3 ) ! { ! for (var j = 0 ; j < cursor.childNodes.length ; j++ ) ! { ! var candidate = cursor.childNodes[j] ; ! if ( candidate.nodeType == 3 && ! candidate.previousSibling && ! candidate.previousSibling.nodeType == 3 ) ! continue ; ! currentIndex++ ; ! if ( currentIndex == target ) ! { ! cursor = candidate ; ! break ; ! } ! } ! if ( currentIndex < target ) ! return null ; ! } ! else { ! if ( i != bookmark.length - 1 ) ! return null ; ! while ( target >= cursor.length && cursor.nextSibling && cursor.nextSibling.nodeType == 3 ) ! { ! target -= cursor.length ; ! cursor = cursor.nextSibling ; ! } ! cursor = cursor.nodeValue.charAt( target ) ; ! if ( cursor == "" ) ! cursor = null ; } } ! return cursor ; ! } ! // With this function, we can treat the bookmark as an iterator for DFS. ! function NextPosition( bookmark ) { ! // See if there's anything further down the tree. ! var next = bookmark.concat( [0] ) ; ! if ( GetData( next ) != null ) ! return next ; ! ! // Nothing down there? See if there's anything next to me. ! var next = bookmark.slice( 0, bookmark.length - 1 ).concat( [ bookmark[ bookmark.length - 1 ] + 1 ] ) ; ! if ( GetData( next ) != null ) ! return next ; ! // Nothing even next to me? See if there's anything next to my ancestors. ! for ( var i = bookmark.length - 1 ; i > 0 ; i-- ) { ! var next = bookmark.slice( 0, i - 1 ).concat( [ bookmark[ i - 1 ] + 1 ] ) ; ! if ( GetData( next ) != null ) ! return next ; } ! // There's absolutely nothing left to walk, return null. ! return null ; ! } ! // Is this character a unicode whitespace? ! // Reference: http://unicode.org/Public/UNIDATA/PropList.txt ! function CheckIsWhitespace( c ) ! { ! var code = c.charCodeAt( 0 ); ! if ( code >= 9 && code <= 0xd ) ! return true; ! if ( code >= 0x2000 && code <= 0x200a ) ! return true; ! switch ( code ) { ! case 0x20: ! case 0x85: ! case 0xa0: ! case 0x1680: ! case 0x180e: ! case 0x2028: ! case 0x2029: ! case 0x202f: ! case 0x205f: ! case 0x3000: ! return true; ! default: ! return false; } } --- 58,309 ---- } ! GetNextNonEmptyTextNode = function( node, stopNode ) { ! while ( ( node = FCKDomTools.GetNextSourceNode( node, false, 3, stopNode ) ) && node && node.length < 1 ) ! 1 ; ! return node ; } ! CharacterCursor = function( arg ) { ! if ( arg.nodeType && arg.nodeType == 9 ) { ! this._textNode = GetNextNonEmptyTextNode( arg.body, arg.documentElement ) ; ! this._offset = 0 ; ! this._doc = arg ; ! } ! else ! { ! this._textNode = arguments[0] ; ! this._offset = arguments[1] ; ! this._doc = FCKTools.GetElementDocument( arguments[0] ) ; } } ! CharacterCursor.prototype = { ! GetCharacter : function() ! { ! return ( this._textNode && this._textNode.nodeValue.charAt( this._offset ) ) || null ; ! }, ! // Non-normalized. ! GetTextNode : function() { ! return this._textNode ; ! }, ! // Non-normalized. ! GetIndex : function() ! { ! return this._offset ; ! }, ! // Return value means whehther we've crossed a line break or a paragraph boundary. ! MoveNext : function() ! { ! if ( this._offset < this._textNode.length - 1 ) ! { ! this._offset++ ; ! return false ; ! } ! var crossed = false ; ! var curNode = this._textNode ; ! while ( ( curNode = FCKDomTools.GetNextSourceNode( curNode ) ) ! && curNode && ( curNode.nodeType != 3 || curNode.length < 1 ) ) ! { ! var tag = curNode.nodeName.toLowerCase() ; ! if ( FCKListsLib.BlockElements[tag] || tag == 'br' ) ! crossed = true ; ! } ! this._textNode = curNode ; ! this._offset = 0 ; ! return crossed ; ! }, ! // Return value means whehther we've crossed a line break or a paragraph boundary. ! MoveBack : function() ! { ! if ( this._offset > 0 && this._textNode.length > 0 ) ! { ! this._offset = Math.min( this._offset - 1, this._textNode.length - 1 ) ; ! return false ; ! } ! var crossed = false ; ! var curNode = this._textNode ; ! while ( ( curNode = FCKDomTools.GetPreviousSourceNode( curNode ) ) ! && curNode && ( curNode.nodeType != 3 || curNode.length < 1 ) ) ! { ! var tag = curNode.nodeName.toLowerCase() ; ! if ( FCKListsLib.BlockElements[tag] || tag == 'br' ) ! crossed = true ; ! } ! this._textNode = curNode ; ! this._offset = curNode.length - 1 ; ! return crossed ; ! }, ! ! Clone : function() ! { ! return new CharacterCursor( this._textNode, this._offset ) ; ! } ! } ; ! ! CharacterRange = function( initCursor, maxLength ) { ! this._cursors = initCursor.push ? initCursor : [initCursor] ; ! this._maxLength = maxLength ; ! this._highlightRange = null ; } ! CharacterRange.prototype = { ! ToDomRange : function() { ! var firstCursor = this._cursors[0] ; ! var lastCursor = this._cursors[ this._cursors.length - 1 ] ; ! var domRange = new FCKDomRange( FCKTools.GetElementWindow( firstCursor.GetTextNode() ) ) ; ! var w3cRange = domRange._Range = domRange.CreateRange() ; ! w3cRange.setStart( firstCursor.GetTextNode(), firstCursor.GetIndex() ) ; ! w3cRange.setEnd( lastCursor.GetTextNode(), lastCursor.GetIndex() + 1 ) ; ! domRange._UpdateElementInfo() ; ! return domRange ; ! }, ! ! Highlight : function() ! { ! if ( this._cursors.length < 1 ) ! return ; ! ! var domRange = this.ToDomRange() ; ! HighlightStyle.ApplyToRange( domRange, false, true ) ; ! this._highlightRange = domRange ; ! ! var charRange = CharacterRange.CreateFromDomRange( domRange ) ; ! var focusNode = domRange.StartNode ; ! if ( focusNode.nodeType != 1 ) ! focusNode = focusNode.parentNode ; ! FCKDomTools.ScrollIntoView( focusNode, false ) ; ! this._cursors = charRange._cursors ; ! }, ! ! RemoveHighlight : function() ! { ! if ( this._highlightRange ) { ! HighlightStyle.RemoveFromRange( this._highlightRange, false, true ) ; ! var charRange = CharacterRange.CreateFromDomRange( this._highlightRange ) ; ! this._cursors = charRange._cursors ; ! this._highlightRange = null ; } + }, + + GetHighlightDomRange : function() + { + return this._highlightRange; + }, + + MoveNext : function() + { + var next = this._cursors[ this._cursors.length - 1 ].Clone() ; + var retval = next.MoveNext() ; + if ( retval ) + this._cursors = [] ; + this._cursors.push( next ) ; + if ( this._cursors.length > this._maxLength ) + this._cursors.shift() ; + return retval ; + }, + + MoveBack : function() + { + var prev = this._cursors[0].Clone() ; + var retval = prev.MoveBack() ; + if ( retval ) + this._cursors = [] ; + this._cursors.unshift( prev ) ; + if ( this._cursors.length > this._maxLength ) + this._cursors.pop() ; + return retval ; + }, + + GetEndCharacter : function() + { + if ( this._cursors.length < 1 ) + return null ; + var retval = this._cursors[ this._cursors.length - 1 ].GetCharacter() ; + return retval ; + }, + + GetNextRange : function( len ) + { + if ( this._cursors.length == 0 ) + return null ; + var cur = this._cursors[ this._cursors.length - 1 ].Clone() ; + cur.MoveNext() ; + return new CharacterRange( cur, len ) ; + }, + + GetCursors : function() + { + return this._cursors ; } ! } ; ! CharacterRange.CreateFromDomRange = function( domRange ) { ! var w3cRange = domRange._Range ; ! var startContainer = w3cRange.startContainer ; ! var endContainer = w3cRange.endContainer ; ! var startTextNode, startIndex, endTextNode, endIndex ; ! if ( startContainer.nodeType == 3 ) { ! startTextNode = startContainer ; ! startIndex = w3cRange.startOffset ; ! } ! else if ( domRange.StartNode.nodeType == 3 ) ! { ! startTextNode = domRange.StartNode ; ! startIndex = 0 ; ! } ! else ! { ! startTextNode = GetNextNonEmptyTextNode( domRange.StartNode, domRange.StartNode.parentNode ) ; ! if ( !startTextNode ) ! return null ; ! startIndex = 0 ; } ! if ( endContainer.nodeType == 3 && w3cRange.endOffset > 0 ) ! { ! endTextNode = endContainer ; ! endIndex = w3cRange.endOffset - 1 ; ! } ! else ! { ! endTextNode = domRange.EndNode ; ! while ( endTextNode.nodeType != 3 ) ! endTextNode = endTextNode.lastChild ; ! endIndex = endTextNode.length - 1 ; ! } ! var cursors = [] ; ! var current = new CharacterCursor( startTextNode, startIndex ) ; ! cursors.push( current ) ; ! if ( !( current.GetTextNode() == endTextNode && current.GetIndex() == endIndex ) && !domRange.CheckIsEmpty() ) { ! do ! { ! current = current.Clone() ; ! current.MoveNext() ; ! cursors.push( current ) ; ! } ! while ( !( current.GetTextNode() == endTextNode && current.GetIndex() == endIndex ) ) ; } + + return new CharacterRange( cursors, cursors.length ) ; } *************** *** 234,238 **** KMP_ADVANCED = 1 ; KMP_MATCHED = 2 ; ! function KmpMatch( pattern, ignoreCase ) { var overlap = [ -1 ] ; --- 312,316 ---- KMP_ADVANCED = 1 ; KMP_MATCHED = 2 ; ! KmpMatch = function( pattern, ignoreCase ) { var overlap = [ -1 ] ; *************** *** 252,256 **** } KmpMatch.prototype = { ! "FeedCharacter" : function( c ) { if ( this._IgnoreCase ) --- 330,334 ---- } KmpMatch.prototype = { ! FeedCharacter : function( c ) { if ( this._IgnoreCase ) *************** *** 278,282 **** return null ; }, ! "Reset" : function() { this._State = 0 ; --- 356,361 ---- return null ; }, ! ! Reset : function() { this._State = 0 ; *************** *** 284,408 **** }; ! function _Find() { ! // Start from the end of the current selection. ! var matcher = new KmpMatch( GetSearchString(), ! GetCheckCase() ) ; ! var cursor = GlobalRange.CreateBookmark2().End ; ! var matchState = KMP_NOMATCH ; ! var matchBookmark = null ; ! var matchBookmarkStart = [] ; ! // Match finding. ! while ( true ) { ! // Perform KMP stream matching. ! // - Reset KMP matcher if we encountered a block element. ! var data = GetData( cursor ) ; ! if ( data ) ! { ! if ( data.tagName ) ! { ! if ( oEditor.FCKListsLib.BlockElements[ data.tagName.toLowerCase() ] ) ! { ! matcher.Reset(); ! matchBookmarkStart = [] ; ! } ! } ! else if ( data.charAt != undefined ) ! { ! matchState = matcher.FeedCharacter(data) ; ! // No possible match of any useful substring in the pattern for the currently scanned character. ! // So delete any positional information. ! if ( matchState == KMP_NOMATCH ) ! matchBookmarkStart = [] ; ! // We've matched something, but it's not a complete match, so let's just mark down the position for backtracking later. ! else if ( matchState == KMP_ADVANCED ) ! { ! matchBookmarkStart.push( cursor.concat( [] ) ) ; ! if ( matchBookmarkStart.length > matcher._State ) ! matchBookmarkStart.shift() ; ! } ! // Found a complete match! Mark down the ending position as well. ! else if ( matchState == KMP_MATCHED ) ! { ! // It is possible to get a KMP_MATCHED without KMP_ADVANCED when the match pattern is only 1 character. ! // So need to check and mark down the starting position as well. ! if ( matchBookmarkStart.length == 0 ) ! matchBookmarkStart = [cursor.concat( [] )] ; ! matchBookmark = { 'Start' : matchBookmarkStart.shift(), 'End' : cursor.concat( [] ) } ; ! matchBookmark.End[ matchBookmark.End.length - 1 ]++; ! // Wait, do we have to match a whole word? ! // If yes, carry out additional checks on what we've got. ! if ( GetMatchWord() ) ! { ! var startOk = false ; ! var endOk = false ; ! var start = matchBookmark.Start ; ! var end = matchBookmark.End ; ! if ( start[ start.length - 1 ] == 0 ) ! startOk = true ; ! else ! { ! var cursorBeforeStart = start.slice( 0, start.length - 1 ) ; ! cursorBeforeStart.push( start[ start.length - 1 ] - 1 ) ; ! var dataBeforeStart = GetData( cursorBeforeStart ) ; ! if ( dataBeforeStart == null || dataBeforeStart.charAt == undefined ) ! startOk = true ; ! else if ( CheckIsWhitespace( dataBeforeStart ) ) ! startOk = true ; ! } ! // this is already one character beyond the last char, no need to move ! var cursorAfterEnd = end ; ! var dataAfterEnd = GetData( cursorAfterEnd ); ! if ( dataAfterEnd == null || dataAfterEnd.charAt == undefined ) ! endOk = true ; ! else if ( CheckIsWhitespace( dataAfterEnd ) ) ! endOk = true ; ! if ( startOk && endOk ) ! break ; ! else ! matcher.Reset() ; ! } ! else ! break ; ! } ! } ! } ! // Perform DFS across the document, until we've reached the end. ! cursor = NextPosition( cursor ) ; ! if ( cursor == null ) ! break; } ! // If we've found a match, highlight the match. ! if ( matchState == KMP_MATCHED ) { ! GlobalRange.MoveToBookmark2( matchBookmark ) ; ! Highlight() ; ! var focus = GlobalRange._Range.endContainer ; ! while ( focus && focus.nodeType != 1 ) ! focus = focus.parentNode ; ! if ( focus ) { ! if ( oEditor.FCKBrowserInfo.IsSafari ) ! oEditor.FCKDomTools.ScrollIntoView( focus, false ) ; ! else ! focus.scrollIntoView( false ) ; } ! return true ; ! } ! else ! { ! ResetGlobalRange() ; ! return false ; } } --- 363,493 ---- }; ! // Place a range at the start of document. ! function OnLoad() { ! // First of all, translate the dialog box texts. ! oEditor.FCKLanguageManager.TranslatePage( document ) ; ! // Show the appropriate tab at startup. ! if ( dialogArguments.CustomValue == 'Find' ) { ! dialog.SetSelectedTab( 'Find' ) ; ! dialog.SetAutoSize( true ) ; ! } ! else ! dialog.SetSelectedTab( 'Replace' ) ; ! SelectField( 'txtFind' + dialogArguments.CustomValue ) ; ! } ! function btnStat() ! { ! GetE('btnReplace').disabled = ! GetE('btnReplaceAll').disabled = ! GetE('btnFind').disabled = ! ( GetE(idMap["FindText"]).value.length == 0 ) ; ! } ! function btnStatDelayed() ! { ! setTimeout( btnStat, 1 ) ; ! } ! function GetSearchString() ! { ! return GetE(idMap['FindText']).value ; ! } ! function GetReplaceString() ! { ! return GetE("txtReplace").value ; ! } ! function GetCheckCase() ! { ! return !! ( GetE(idMap['CheckCase']).checked ) ; ! } ! ! function GetMatchWord() ! { ! return !! ( GetE(idMap['CheckWord']).checked ) ; ! } ! ! /* Is this character a unicode whitespace or a punctuation mark? ! * References: ! * http://unicode.org/Public/UNIDATA/PropList.txt (whitespaces) ! * http://php.chinaunix.net/manual/tw/ref.regex.php (punctuation marks) ! */ ! function CheckIsWordSeparator( c ) ! { ! var code = c.charCodeAt( 0 ); ! if ( code >= 9 && code <= 0xd ) ! return true; ! if ( code >= 0x2000 && code <= 0x200a ) ! return true; ! switch ( code ) ! { ! case 0x20: ! case 0x85: ! case 0xa0: ! case 0x1680: ! case 0x180e: ! case 0x2028: ! case 0x2029: ! case 0x202f: ! case 0x205f: ! case 0x3000: ! return true; ! default: } + return /[.,"'?!;:]/.test( c ) ; + } ! FindRange = null ; ! function _Find() ! { ! var searchString = GetSearchString() ; ! if ( !FindRange ) ! FindRange = new CharacterRange( new CharacterCursor( EditorDocument ), searchString.length ) ; ! else { ! FindRange.RemoveHighlight() ; ! FindRange = FindRange.GetNextRange( searchString.length ) ; ! } ! var matcher = new KmpMatch( searchString, ! GetCheckCase() ) ; ! var matchState = KMP_NOMATCH ; ! var character = '%' ; ! while ( character != null ) ! { ! while ( ( character = FindRange.GetEndCharacter() ) ) { ! matchState = matcher.FeedCharacter( character ) ; ! if ( matchState == KMP_MATCHED ) ! break ; ! if ( FindRange.MoveNext() ) ! matcher.Reset() ; } ! if ( matchState == KMP_MATCHED ) ! { ! if ( GetMatchWord() ) ! { ! var cursors = FindRange.GetCursors() ; ! var head = cursors[ cursors.length - 1 ].Clone() ; ! var tail = cursors[0].Clone() ; ! if ( !head.MoveNext() && !CheckIsWordSeparator( head.GetCharacter() ) ) ! continue ; ! if ( !tail.MoveBack() && !CheckIsWordSeparator( tail.GetCharacter() ) ) ! continue ; ! } ! ! FindRange.Highlight() ; ! return true ; ! } } + + FindRange = null ; + return false ; } *************** *** 410,435 **** { if ( ! _Find() ) - { - ClearHighlight() ; alert( FCKLang.DlgFindNotFoundMsg ) ; - } } function Replace() { ! if ( GlobalRange.CheckIsCollapsed() ) { ! if (! _Find() ) ! { ! ClearHighlight() ; ! alert( FCKLang.DlgFindNotFoundMsg ) ; ! } } else { ! oEditor.FCKUndo.SaveUndoStep() ; ! GlobalRange.DeleteContents() ; ! GlobalRange.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ; ! GlobalRange.Collapse( false ) ; } } --- 495,540 ---- { if ( ! _Find() ) alert( FCKLang.DlgFindNotFoundMsg ) ; } function Replace() { ! var saveUndoStep = function( selectRange ) { ! var ieRange ; ! if ( oEditor.FCKBrowserInfo.IsIE ) ! ieRange = document.selection.createRange() ; ! ! selectRange.Select() ; ! oEditor.FCKUndo.SaveUndoStep() ; ! var cloneRange = selectRange.Clone() ; ! cloneRange.Collapse( false ) ; ! cloneRange.Select() ; ! ! if ( ieRange ) ! setTimeout( function(){ ieRange.select() ; }, 1 ) ; ! } ! ! if ( FindRange && FindRange.GetHighlightDomRange() ) ! { ! var range = FindRange.GetHighlightDomRange() ; ! var bookmark = range.CreateBookmark() ; ! FindRange.RemoveHighlight() ; ! range.MoveToBookmark( bookmark ) ; ! ! saveUndoStep( range ) ; ! range.DeleteContents() ; ! range.InsertNode( EditorDocument.createTextNode( GetReplaceString() ) ) ; ! range._UpdateElementInfo() ; ! ! FindRange = CharacterRange.CreateFromDomRange( range ) ; } else { ! if ( ! _Find() ) ! { ! FindRange && FindRange.RemoveHighlight() ; ! alert( FCKLang.DlgFindNotFoundMsg ) ; ! } } } *************** *** 442,454 **** while ( _Find() ) { ! dialog.Selection.EnsureSelection() ; ! GlobalRange.DeleteContents() ; ! GlobalRange.InsertNode( oEditor.FCK.EditorDocument.createTextNode( GetReplaceString() ) ) ; ! GlobalRange.Collapse( false ) ; replaceCount++ ; } if ( replaceCount == 0 ) { ! ClearHighlight() ; alert( FCKLang.DlgFindNotFoundMsg ) ; } --- 547,565 ---- while ( _Find() ) { ! var range = FindRange.GetHighlightDomRange() ; ! var bookmark = range.CreateBookmark() ; ! FindRange.RemoveHighlight() ; ! range.MoveToBookmark( bookmark) ; ! ! range.DeleteContents() ; ! range.InsertNode( EditorDocument.createTextNode( GetReplaceString() ) ) ; ! range._UpdateElementInfo() ; ! ! FindRange = CharacterRange.CreateFromDomRange( range ) ; replaceCount++ ; } if ( replaceCount == 0 ) { ! FindRange && FindRange.RemoveHighlight() ; alert( FCKLang.DlgFindNotFoundMsg ) ; } *************** *** 456,460 **** } ! window.onunload = function(){ ClearHighlight() ; } --- 567,578 ---- } ! window.onunload = function() ! { ! if ( FindRange ) ! { ! FindRange.RemoveHighlight() ; ! FindRange.ToDomRange().Select() ; ! } ! } From blaine at qs1489.pair.com Sun Aug 10 12:46:35 2008 From: blaine at qs1489.pair.com (Blaine Lang) Date: Sun, 10 Aug 2008 16:46:35 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl commands.pl, 1.2, 1.3 Message-ID: <20080810164710.96640F7420@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl In directory qs1489.pair.com:/tmp/cvs-serv4567/editor/filemanager/connectors/perl Modified Files: commands.pl Log Message: Upgrade to FCKeditor ver 2.6.3 Index: commands.pl =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/commands.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** commands.pl 5 May 2008 00:35:25 -0000 1.2 --- commands.pl 10 Aug 2008 16:46:32 -0000 1.3 *************** *** 170,208 **** local($sErrorNumber, $sFileUrl, $sFileName, $customMsg) = @_; print <) and ! // the function replaced by regular expression patterns. ! var sFunc = func ; ! var pos = new Array() ; ! for ( var i = 0 ; i < keys.length ; i ++ ) ! { ! var rexp = new RegExp( keys[i] ) ; ! var p = func.search( rexp ) ; ! if ( p >= 0 ) ! { ! sFunc = sFunc.replace( rexp, '\'([^\']*)\'' ) ; ! pos[pos.length] = p + ':' + keys[i] ; ! } ! } ! ! // Sort the available keys. ! pos.sort( oParser.SortNumerical ) ; ! ! // Replace the excaped single quotes in the url, such they do ! // not affect the regexp afterwards. ! aLinkInfo[2] = aLinkInfo[2].replace( /\\'/g, '###SINGLE_QUOTE###' ) ; ! ! // Create the regexp and execute it. ! var rFunc = new RegExp( '^' + sFunc + '$' ) ; ! var aMatch = rFunc.exec( aLinkInfo[2] ) ; ! if ( aMatch ) ! { ! var aInfo = new Array(); ! for ( var i = 1 ; i < aMatch.length ; i ++ ) ! { ! var k = pos[i-1].match(/^\d+:(.+)$/) ; ! aInfo[k[1]] = aMatch[i].replace(/###SINGLE_QUOTE###/g, '\'') ; ! } ! ! // Fill the EMailInfo object that will be returned ! oEMailInfo.Address = aInfo['NAME'] + '@' + aInfo['DOMAIN'] ; ! oEMailInfo.Subject = decodeURIComponent( aInfo['SUBJECT'] ) ; ! oEMailInfo.Body = decodeURIComponent( aInfo['BODY'] ) ; ! ! return oEMailInfo ; ! } ! } ! catch (e) ! { ! } ! } ! ! // Try to match the email against the encode protection. ! var aMatch = aLinkInfo[2].match( /^location\.href='mailto:'\+(String\.fromCharCode\([\d,]+\))\+'(.*)'$/ ) ; ! if ( aMatch ) ! { ! // The link is encoded ! oEMailInfo.Address = eval( aMatch[1] ) ; ! if ( aMatch[2] ) ! { ! var oEMailParams = oParser.ParseEMailParams( aMatch[2] ) ; ! oEMailInfo.Subject = oEMailParams.Subject ; ! oEMailInfo.Body = oEMailParams.Body ; ! } ! return oEMailInfo ; ! } ! } ! return false; } oParser.CreateEMailUri = function( address, subject, body ) { + // Switch for the EMailProtection setting. + switch ( FCKConfig.EMailProtection ) + { + case 'function' : + var func = FCKConfig.EMailProtectionFunction ; + if ( func == null ) + { + if ( FCKConfig.Debug ) + { + alert('EMailProtection alert!\nNo function defined. Please set "FCKConfig.EMailProtectionFunction"') ; + } + return ''; + } + + // Split the email address into name and domain parts. + var aAddressParts = address.split( '@', 2 ) ; + if ( aAddressParts[1] == undefined ) + { + aAddressParts[1] = '' ; + } + + // Replace the keys by their values (embedded in single quotes). + func = func.replace(/NAME/g, "'" + aAddressParts[0].replace(/'/g, '\\\'') + "'") ; + func = func.replace(/DOMAIN/g, "'" + aAddressParts[1].replace(/'/g, '\\\'') + "'") ; + func = func.replace(/SUBJECT/g, "'" + encodeURIComponent( subject ).replace(/'/g, '\\\'') + "'") ; + func = func.replace(/BODY/g, "'" + encodeURIComponent( body ).replace(/'/g, '\\\'') + "'") ; + + return 'javascript:' + func ; + + case 'encode' : + var aParams = [] ; + var aAddressCode = [] ; + + if ( subject.length > 0 ) + aParams.push( 'subject='+ encodeURIComponent( subject ) ) ; + if ( body.length > 0 ) + aParams.push( 'body=' + encodeURIComponent( body ) ) ; + for ( var i = 0 ; i < address.length ; i++ ) + aAddressCode.push( address.charCodeAt( i ) ) ; + + return 'javascript:location.href=\'mailto:\'+String.fromCharCode(' + aAddressCode.join( ',' ) + ')+\'?' + aParams.join( '&' ) + '\'' ; + } + + // EMailProtection 'none' + var sBaseUri = 'mailto:' + address ; *************** *** 264,268 **** var sProtocol = oRegex.UriProtocol.exec( sHRef ) ; ! if ( sProtocol ) { sProtocol = sProtocol[0].toLowerCase() ; --- 415,430 ---- var sProtocol = oRegex.UriProtocol.exec( sHRef ) ; ! // Search for a protected email link. ! var oEMailInfo = oParser.ParseEMailUri( sHRef ); ! ! if ( oEMailInfo ) ! { ! sType = 'email' ; ! ! GetE('txtEMailAddress').value = oEMailInfo.Address ; ! GetE('txtEMailSubject').value = oEMailInfo.Subject ; ! GetE('txtEMailBody').value = oEMailInfo.Body ; ! } ! else if ( sProtocol ) { sProtocol = sProtocol[0].toLowerCase() ; *************** *** 271,289 **** // Remove the protocol and get the remaining URL. var sUrl = sHRef.replace( oRegex.UriProtocol, '' ) ; ! ! if ( sProtocol == 'mailto:' ) // It is an e-mail link. ! { ! sType = 'email' ; ! ! var oEMailInfo = oParser.ParseEMailUrl( sUrl ) ; ! GetE('txtEMailAddress').value = oEMailInfo.Address ; ! GetE('txtEMailSubject').value = oEMailInfo.Subject ; ! GetE('txtEMailBody').value = oEMailInfo.Body ; ! } ! else // It is a normal link. ! { ! sType = 'url' ; ! GetE('txtUrl').value = sUrl ; ! } } else if ( sHRef.substr(0,1) == '#' && sHRef.length > 1 ) // It is an anchor link. --- 433,438 ---- // Remove the protocol and get the remaining URL. var sUrl = sHRef.replace( oRegex.UriProtocol, '' ) ; ! sType = 'url' ; ! GetE('txtUrl').value = sUrl ; } else if ( sHRef.substr(0,1) == '#' && sHRef.length > 1 ) // It is an anchor link. *************** *** 651,655 **** function SetUrl( url ) { ! document.getElementById('txtUrl').value = url ; OnUrlChange() ; dialog.SetSelectedTab( 'Info' ) ; --- 800,804 ---- function SetUrl( url ) { ! GetE('txtUrl').value = url ; OnUrlChange() ; dialog.SetSelectedTab( 'Info' ) ; *************** *** 658,661 **** --- 807,814 ---- function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg ) { + // Remove animation + window.parent.Throbber.Hide() ; + GetE( 'divUpload' ).style.display = '' ; + switch ( errorNumber ) { *************** *** 710,713 **** --- 863,870 ---- } + // Show animation + window.parent.Throbber.Show( 100 ) ; + GetE( 'divUpload' ).style.display = 'none' ; + return true ; } From blaine at qs1489.pair.com Sun Aug 10 12:51:49 2008 From: blaine at qs1489.pair.com (Blaine Lang) Date: Sun, 10 Aug 2008 16:51:49 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/javascript storyeditor_fckeditor.js, 1.3, 1.4 Message-ID: <20080810165149.4C875F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/javascript In directory qs1489.pair.com:/tmp/cvs-serv5876 Modified Files: storyeditor_fckeditor.js Log Message: Changes to support FCKeditor ver 2.6.3 Disabled the Expand/Shrink featrure when in Advanced Editor mode. Feature not working for some reason that I've not resolvd. Index: storyeditor_fckeditor.js =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/javascript/storyeditor_fckeditor.js,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** storyeditor_fckeditor.js 17 Jun 2006 20:31:24 -0000 1.3 --- storyeditor_fckeditor.js 10 Aug 2008 16:51:46 -0000 1.4 *************** *** 46,54 **** --- 46,57 ---- var size = 0; var size = document.getElementById(element + '___Frame').height; + if (option == 'larger') { document.getElementById(element + '___Frame').height = +(size) + 50; + document.getElementById(element + '___Frame').style.height = +(size) + 50; } else if (option == 'smaller') { document.getElementById(element + '___Frame').height = +(size) - 50; + document.getElementById(element + '___Frame').style.height = +(size) - 50; } } *************** *** 69,73 **** var oEditor = FCKeditorAPI.GetInstance(instanceName) ; // return the editor contents in XHTML. ! return oEditor.GetXHTML( true ); } --- 72,81 ---- var oEditor = FCKeditorAPI.GetInstance(instanceName) ; // return the editor contents in XHTML. ! var content = ''; ! try { ! content = oEditor.GetXHTML( true ); ! } catch (e) {} ! ! return content; } *************** *** 75,89 **** var content = ''; var oEditor = FCKeditorAPI.GetInstance(instanceName) ; ! //alert(curmode + ':' + instanceName); if (curmode == 'adveditor') { // Switching from Text to HTML mode // Get the content from the textarea 'text' content and copy it to the editor if (instanceName == 'introhtml' ) { content = document.getElementById('introtext').value; - //alert('Intro :' + instanceName + '\n' + content); } else { content = document.getElementById('bodytext').value; - //alert('HTML :' + instanceName + '\n' + content); } ! oEditor.SetHTML(content); } else { content = getEditorContent(instanceName); --- 83,98 ---- var content = ''; var oEditor = FCKeditorAPI.GetInstance(instanceName) ; ! if (curmode == 'adveditor') { // Switching from Text to HTML mode // Get the content from the textarea 'text' content and copy it to the editor if (instanceName == 'introhtml' ) { content = document.getElementById('introtext').value; } else { content = document.getElementById('bodytext').value; } ! try { ! oEditor.SetHTML(content); ! } catch (e) {} ! } else { content = getEditorContent(instanceName); *************** *** 96,100 **** } ! function set_postcontent() { if (document.getElementById('sel_editmode').value == 'adveditor') { document.getElementById('introtext').value = getEditorContent('introhtml'); --- 105,109 ---- } ! function set_postcontent() { if (document.getElementById('sel_editmode').value == 'adveditor') { document.getElementById('introtext').value = getEditorContent('introhtml'); From blaine at qs1489.pair.com Sun Aug 10 12:52:04 2008 From: blaine at qs1489.pair.com (Blaine Lang) Date: Sun, 10 Aug 2008 16:52:04 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/layout/professional/admin/story storyeditor_advanced.thtml, 1.34, 1.35 Message-ID: <20080810165204.7FF6DF740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/story In directory qs1489.pair.com:/tmp/cvs-serv5935 Modified Files: storyeditor_advanced.thtml Log Message: Changes to support FCKeditor ver 2.6.3 Disabled the Expand/Shrink featrure when in Advanced Editor mode. Feature not working for some reason that I've not resolvd. Index: storyeditor_advanced.thtml =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/layout/professional/admin/story/storyeditor_advanced.thtml,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** storyeditor_advanced.thtml 12 May 2008 08:27:17 -0000 1.34 --- storyeditor_advanced.thtml 10 Aug 2008 16:52:01 -0000 1.35 *************** *** 74,79 **** --- 74,81 ---- {lang_introtext}: + {lang_toolbar}:--- 88,95 ---- {lang_bodytext}: ! From blaine at qs1489.pair.com Sun Aug 10 12:56:51 2008 From: blaine at qs1489.pair.com (Blaine Lang) Date: Sun, 10 Aug 2008 16:56:51 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.698,1.699 Message-ID: <20080810165652.12865F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv6535 Modified Files: history Log Message: Upgrade to FCKeditor ver 2.6.3 Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.698 retrieving revision 1.699 diff -C2 -d -r1.698 -r1.699 *** history 10 Aug 2008 15:29:46 -0000 1.698 --- history 10 Aug 2008 16:56:48 -0000 1.699 *************** *** 3,7 **** ??? ??, 2008 (1.5.1) ------------ ! - Moved remove() (config javascript) to gl_cfg_remove (bug #0000681) [Mike] - Change for CUSTOM_usercreate to support passing in $batchimport, --- 3,7 ---- ??? ??, 2008 (1.5.1) ------------ ! - Updated FCKEditor to v2.6.3 [Blaine] - Moved remove() (config javascript) to gl_cfg_remove (bug #0000681) [Mike] - Change for CUSTOM_usercreate to support passing in $batchimport, From mjervis at qs1489.pair.com Mon Aug 11 03:07:46 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Mon, 11 Aug 2008 07:07:46 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.47, 1.48 Message-ID: <20080811070746.985EDF740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes In directory qs1489.pair.com:/tmp/cvs-serv99907/system/classes Modified Files: config.class.php Log Message: Fixes for MS SQL support for install. Index: config.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** config.class.php 3 Aug 2008 19:35:44 -0000 1.47 --- config.class.php 11 Aug 2008 07:07:44 -0000 1.48 *************** *** 274,284 **** global $_TABLES; ! $format = 'INSERT INTO %1$s (name, value, type, ' . ! 'subgroup, group_name, selectionArray, sort_order,'. ! ' fieldset, default_value) ' . ! 'VALUES ("%2$s","%3$s","%4$s",%5$s,"%6$s",%7$s,'. ! '%8$s,%9$s, "%10$s")'; ! $Qargs = array($_TABLES['conf_values'], ! $param_name, $set ? serialize($default_value) : 'unset', $type, --- 274,278 ---- global $_TABLES; ! $Qargs = array($param_name, $set ? serialize($default_value) : 'unset', $type, *************** *** 291,295 **** serialize($default_value)); $Qargs = array_map('addslashes', $Qargs); ! $sql = vsprintf($format, $Qargs); $this->_DB_escapedQuery($sql); --- 285,300 ---- serialize($default_value)); $Qargs = array_map('addslashes', $Qargs); ! $sql = "INSERT INTO {$_TABLES['conf_values']} (name, value, type, " . ! "subgroup, group_name, selectionArray, sort_order,". ! " fieldset, default_value) VALUES (" ! ."'{$Qargs[0]}'," ! ."'{$Qargs[1]}'," ! ."'{$Qargs[2]}'," ! ."{$Qargs[3]}," ! ."'{$Qargs[4]}'," ! ."{$Qargs[5]}," ! ."{$Qargs[6]}," ! ."{$Qargs[7]}," ! ."'{$Qargs[8]}')"; $this->_DB_escapedQuery($sql); From dhaun at qs1489.pair.com Mon Aug 11 03:50:26 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 11 Aug 2008 07:50:26 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.718,1.719 Message-ID: <20080811075028.9BEDFF740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv3764/public_html Modified Files: lib-common.php Log Message: Fixed error when attempting to highlight a search query that contained a slash Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.718 retrieving revision 1.719 diff -C2 -d -r1.718 -r1.719 *** lib-common.php 4 Aug 2008 09:34:43 -0000 1.718 --- lib-common.php 11 Aug 2008 07:50:23 -0000 1.719 *************** *** 5716,5719 **** --- 5716,5720 ---- { $searchword = preg_quote( str_replace( "'", "\'", $searchword )); + $searchword = str_replace('/', '\\/', $searchword); $text = preg_replace( '/(\>(((?>[^><]+)|(?R))*)\<)/ie', "preg_replace('/(?>$searchword+)/i','\\\\0','\\0')", '' . $text . '' ); } From dhaun at qs1489.pair.com Mon Aug 11 03:50:28 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 11 Aug 2008 07:50:28 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.699,1.700 Message-ID: <20080811075028.DDBB8F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv3764/public_html/docs Modified Files: history Log Message: Fixed error when attempting to highlight a search query that contained a slash Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.699 retrieving revision 1.700 diff -C2 -d -r1.699 -r1.700 *** history 10 Aug 2008 16:56:48 -0000 1.699 --- history 11 Aug 2008 07:50:23 -0000 1.700 *************** *** 3,6 **** --- 3,9 ---- ??? ??, 2008 (1.5.1) ------------ + + - Fixed error when attempting to highlight a search query that contained a + slash [Dirk] - Updated FCKEditor to v2.6.3 [Blaine] - Moved remove() (config javascript) to gl_cfg_remove (bug #0000681) [Mike] From dhaun at qs1489.pair.com Mon Aug 11 10:11:26 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 11 Aug 2008 14:11:26 +0000 Subject: [geeklog-cvs] Geeklog-1.x/system/classes downloader.class.php, 1.14, 1.15 Message-ID: <20080811141126.2A464F7410@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/system/classes In directory qs1489.pair.com:/tmp/cvs-serv49595/system/classes Modified Files: downloader.class.php Log Message: We accept "image/png" for uploads, so we should also accept it for downloads Index: downloader.class.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/downloader.class.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** downloader.class.php 25 Nov 2007 06:59:56 -0000 1.14 --- downloader.class.php 11 Aug 2008 14:11:21 -0000 1.15 *************** *** 3,7 **** /* Reminder: always indent with 4 spaces (no tabs). */ // +---------------------------------------------------------------------------+ ! // | Geeklog 1.3 | // +---------------------------------------------------------------------------+ // | downloader.class.php | --- 3,7 ---- /* Reminder: always indent with 4 spaces (no tabs). */ // +---------------------------------------------------------------------------+ ! // | Geeklog 1.5 | // +---------------------------------------------------------------------------+ // | downloader.class.php | *************** *** 9,13 **** // | Geeklog file download class library. | // +---------------------------------------------------------------------------+ ! // | Copyright (C) 2002-2005 by the following authors: | // | | // | Authors: Tony Bibbs - tony AT tonybibbs DOT com | --- 9,13 ---- // | Geeklog file download class library. | // +---------------------------------------------------------------------------+ ! // | Copyright (C) 2002-2008 by the following authors: | // | | // | Authors: Tony Bibbs - tony AT tonybibbs DOT com | *************** *** 208,211 **** --- 208,212 ---- 'jpg' => 'image/jpeg', 'jpeg' => 'image/jpeg', + 'png' => 'image/png', 'png' => 'image/x-png', 'mp3' => 'audio/mpeg', From dhaun at qs1489.pair.com Mon Aug 11 15:13:46 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 11 Aug 2008 19:13:46 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/docs history,1.700,1.701 Message-ID: <20080811191346.91F43F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/docs In directory qs1489.pair.com:/tmp/cvs-serv87362/public_html/docs Modified Files: history Log Message: Test Index: history =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/docs/history,v retrieving revision 1.700 retrieving revision 1.701 diff -C2 -d -r1.700 -r1.701 *** history 11 Aug 2008 07:50:23 -0000 1.700 --- history 11 Aug 2008 19:13:41 -0000 1.701 *************** *** 7,11 **** slash [Dirk] - Updated FCKEditor to v2.6.3 [Blaine] ! - Moved remove() (config javascript) to gl_cfg_remove (bug #0000681) [Mike] - Change for CUSTOM_usercreate to support passing in $batchimport, set true if called via the Admin->Users Batch_Add [Blaine] --- 7,11 ---- slash [Dirk] - Updated FCKEditor to v2.6.3 [Blaine] ! - Moved remove() (config JavaScript) to gl_cfg_remove (bug #0000681) [Mike] - Change for CUSTOM_usercreate to support passing in $batchimport, set true if called via the Admin->Users Batch_Add [Blaine] From dhaun at qs1489.pair.com Mon Aug 11 15:14:57 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 11 Aug 2008 19:14:57 +0000 Subject: [geeklog-cvs] Geeklog-1.x/sql mssql_tableanddata.php,1.42,1.43 Message-ID: <20080811191457.BEED4F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/sql In directory qs1489.pair.com:/tmp/cvs-serv87599 Modified Files: mssql_tableanddata.php Log Message: Test 2 Index: mssql_tableanddata.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/mssql_tableanddata.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** mssql_tableanddata.php 13 Jul 2008 12:03:59 -0000 1.42 --- mssql_tableanddata.php 11 Aug 2008 19:14:53 -0000 1.43 *************** *** 1800,1803 **** $_DATA = array(); - ?> --- 1800,1802 ---- From dhaun at qs1489.pair.com Mon Aug 11 16:23:16 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Mon, 11 Aug 2008 20:23:16 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install index.php, 1.49, 1.50 Message-ID: <20080811202316.DD2F7F740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install In directory qs1489.pair.com:/tmp/cvs-serv95721 Modified Files: index.php Log Message: Fixes for MS SQL install, on behalf of Michael Jervis Index: index.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** index.php 13 Jul 2008 12:03:59 -0000 1.49 --- index.php 11 Aug 2008 20:23:11 -0000 1.50 *************** *** 409,413 **** break; case 'mssql': ! if (!$db_handle = @mssql_connect($db_host, $db_user, $db_pass)) { $invalid_db_auth = true; } --- 409,413 ---- break; case 'mssql': ! if (!$db_handle = mssql_connect($db_host, $db_user, $db_pass)) { $invalid_db_auth = true; } *************** *** 913,917 **** // nobody uses such an old version any more ... ); ! break; --- 913,923 ---- // nobody uses such an old version any more ... ); ! $firstCheck = "DESCRIBE {$_TABLES['access']} acc_ft_id"; ! $result = DB_query($firstCheck, 1); ! if ($result === false) { ! // A check for the first field in the first table failed? ! // Sounds suspiciously like an empty table ... ! return 'empty'; ! } break; *************** *** 919,927 **** $test = array( '1.5.1' => array("SELECT name FROM {$_TABLES['vars']} WHERE name = 'database_version'", 'database_version'), ! '1.5.0' => array("DESCRIBE {$_TABLES['storysubmission']} bodytext",''), '1.4.1' => array("SELECT ft_name FROM {$_TABLES['features']} WHERE ft_name = 'syndication.edit'", 'syndication.edit') // 1.4.1 was the first version with MS SQL support ); ! break; --- 925,939 ---- $test = array( '1.5.1' => array("SELECT name FROM {$_TABLES['vars']} WHERE name = 'database_version'", 'database_version'), ! '1.5.0' => array("SELECT c.name FROM syscolumns c JOIN sysobjects o ON o.id = c.id WHERE c.name='bodytext' AND o.name='{$_TABLES['storysubmission']}'",'bodytext'), '1.4.1' => array("SELECT ft_name FROM {$_TABLES['features']} WHERE ft_name = 'syndication.edit'", 'syndication.edit') // 1.4.1 was the first version with MS SQL support ); ! $firstCheck = "SELECT 1 FROM sysobjects WHERE name='{$_TABLES['access']}'"; ! $result = DB_query($firstCheck, 1); ! if (($result === false) || (DB_numRows($result) < 1)) { ! // a check for the first table returned nothing. ! // empty database? ! return 'empty'; ! } break; *************** *** 930,945 **** $version = ''; - $result = DB_query("DESCRIBE {$_TABLES['access']} acc_ft_id", 1); - if ($result === false) { - // A check for the first field in the first table failed? - // Sounds suspiciously like an empty table ... - - return 'empty'; - } - foreach ($test as $v => $qarray) { $result = DB_query($qarray[0], 1); if ($result === false) { - // error - continue with next test --- 942,948 ---- *************** *** 2168,2171 **** echo $display; ! ?> --- 2171,2177 ---- echo $display; ! function d($in) ! { ! echo('');var_dump($in);echo(''); ! } ?> From mjervis at qs1489.pair.com Tue Aug 12 02:31:51 2008 From: mjervis at qs1489.pair.com (Michael Jervis) Date: Tue, 12 Aug 2008 06:31:51 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install index.php, 1.50, 1.51 Message-ID: <20080812063151.EA9FFF740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install In directory qs1489.pair.com:/tmp/cvs-serv65304/public_html/admin/install Modified Files: index.php Log Message: Install/upgrade fixes for mssql. (Cleaned out debug function) Index: index.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** index.php 11 Aug 2008 20:23:11 -0000 1.50 --- index.php 12 Aug 2008 06:31:49 -0000 1.51 *************** *** 2171,2177 **** echo $display; - function d($in) - { - echo('');var_dump($in);echo(''); - } ?> --- 2171,2173 ---- From dhaun at qs1489.pair.com Tue Aug 12 05:34:32 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Tue, 12 Aug 2008 09:34:32 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html/admin/install success.php, 1.19, 1.20 Message-ID: <20080812093433.EF255F740F@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install In directory qs1489.pair.com:/tmp/cvs-serv81914/public_html/admin/install Modified Files: success.php Log Message: "mode=edit" is the default for usersettings.php anyway Index: success.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/success.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** success.php 2 Jan 2008 13:29:02 -0000 1.19 --- success.php 12 Aug 2008 09:34:29 -0000 1.20 *************** *** 66,70 **** if ($type == 'install') { ! $display .= "- " . $LANG_SUCCESS[14] . ' ' . $LANG_SUCCESS[7] . ' ' . $LANG_SUCCESS[15] . '
'; } --- 66,70 ---- if ($type == 'install') { ! $display .= "- " . $LANG_SUCCESS[14] . ' ' . $LANG_SUCCESS[7] . ' ' . $LANG_SUCCESS[15] . '
'; } From dhaun at qs1489.pair.com Tue Aug 12 05:34:31 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Tue, 12 Aug 2008 09:34:31 +0000 Subject: [geeklog-cvs] Geeklog-1.x/public_html lib-common.php, 1.719, 1.720 usersettings.php, 1.174, 1.175 Message-ID: <20080812093432.B27AFF740E@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/public_html In directory qs1489.pair.com:/tmp/cvs-serv81914/public_html Modified Files: lib-common.php usersettings.php Log Message: "mode=edit" is the default for usersettings.php anyway Index: usersettings.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/usersettings.php,v retrieving revision 1.174 retrieving revision 1.175 diff -C2 -d -r1.174 -r1.175 *** usersettings.php 3 Aug 2008 08:05:50 -0000 1.174 --- usersettings.php 12 Aug 2008 09:34:29 -0000 1.175 *************** *** 35,40 **** // $Id$ ! require_once ('lib-common.php'); ! require_once ($_CONF['path_system'] . 'lib-user.php'); // Set this to true to have this script generate various debug messages in --- 35,40 ---- // $Id$ ! require_once 'lib-common.php'; ! require_once $_CONF['path_system'] . 'lib-user.php'; // Set this to true to have this script generate various debug messages in *************** *** 262,266 **** (SEC_encryptPassword($_POST['old_passwd']) != $_USER['passwd'])) { return COM_refresh($_CONF['site_url'] ! . '/usersettings.php?mode=edit&msg=84'); } --- 262,266 ---- (SEC_encryptPassword($_POST['old_passwd']) != $_USER['passwd'])) { return COM_refresh($_CONF['site_url'] ! . '/usersettings.php?msg=84'); } *************** *** 876,886 **** return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?mode=edit&msg=83'); } elseif ($_CONF['custom_registration'] && function_exists ('CUSTOM_userCheck')) { $ret = CUSTOM_userCheck ($A['username'], $A['email']); ! // Need a numeric return for the default message hander - if not numeric use default message ! if (!is_numeric($ret)) $ret = 97; ! return COM_refresh ("{$_CONF['site_url']}/usersettings.php?mode=edit&msg={$ret}"); } } --- 876,889 ---- return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?msg=83'); } elseif ($_CONF['custom_registration'] && function_exists ('CUSTOM_userCheck')) { $ret = CUSTOM_userCheck ($A['username'], $A['email']); ! // Need a numeric return for the default message hander ! // - if not numeric use default message ! if (!is_numeric($ret)) { ! $ret = 97; ! } ! return COM_refresh("{$_CONF['site_url']}/usersettings.php?msg={$ret}"); } } *************** *** 917,921 **** } else { return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?mode=edit&msg=51'); } } --- 920,924 ---- } else { return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?msg=51'); } } *************** *** 938,945 **** } elseif (SEC_encryptPassword($A['old_passwd']) != $_USER['passwd']) { return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?mode=edit&msg=68'); } elseif ($A['passwd'] != $A['passwd_conf']) { return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?mode=edit&msg=67'); } } --- 941,948 ---- } elseif (SEC_encryptPassword($A['old_passwd']) != $_USER['passwd']) { return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?msg=68'); } elseif ($A['passwd'] != $A['passwd_conf']) { return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?msg=67'); } } *************** *** 968,978 **** if (!COM_isEmail ($A['email'])) { return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?mode=edit&msg=52'); } else if ($A['email'] !== $A['email_conf']) { return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?mode=edit&msg=78'); } else if (emailAddressExists ($A['email'], $_USER['uid'])) { return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?mode=edit&msg=56'); } else { if ($_US_VERBOSE) { --- 971,981 ---- if (!COM_isEmail ($A['email'])) { return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?msg=52'); } else if ($A['email'] !== $A['email_conf']) { return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?msg=78'); } else if (emailAddressExists ($A['email'], $_USER['uid'])) { return COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?msg=56'); } else { if ($_US_VERBOSE) { *************** *** 1497,1501 **** PLG_profileExtrasSave ($_POST['plugin']); $display = COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?mode=edit&msg=5'); break; --- 1500,1504 ---- PLG_profileExtrasSave ($_POST['plugin']); $display = COM_refresh ($_CONF['site_url'] ! . '/usersettings.php?msg=5'); break; Index: lib-common.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v retrieving revision 1.719 retrieving revision 1.720 diff -C2 -d -r1.719 -r1.720 *** lib-common.php 11 Aug 2008 07:50:23 -0000 1.719 --- lib-common.php 12 Aug 2008 09:34:29 -0000 1.720 *************** *** 709,713 **** case 'prefs': ! $url = $_CONF['site_url'] . '/usersettings.php?mode=edit'; $label = $LANG01[48]; break; --- 709,713 ---- case 'prefs': ! $url = $_CONF['site_url'] . '/usersettings.php'; $label = $LANG01[48]; break; *************** *** 2316,2320 **** } ! $url = $_CONF['site_url'] . '/usersettings.php?mode=edit'; $usermenu->set_var( 'option_label', $LANG01[48] ); $usermenu->set_var( 'option_count', '' ); --- 2316,2320 ---- } ! $url = $_CONF['site_url'] . '/usersettings.php'; $usermenu->set_var( 'option_label', $LANG01[48] ); $usermenu->set_var( 'option_count', '' ); From dhaun at qs1489.pair.com Tue Aug 12 05:34:33 2008 From: dhaun at qs1489.pair.com (Dirk Haun) Date: Tue, 12 Aug 2008 09:34:33 +0000 Subject: [geeklog-cvs] Geeklog-1.x/sql mssql_tableanddata.php, 1.43, 1.44 mysql_tableanddata.php, 1.210, 1.211 Message-ID: <20080812093434.1B2E1F7410@qs1489.pair.com> Update of /cvsroot/geeklog/Geeklog-1.x/sql In directory qs1489.pair.com:/tmp/cvs-serv81914/sql Modified Files: mssql_tableanddata.php mysql_tableanddata.php Log Message: "mode=edit" is the default for usersettings.php anyway Index: mssql_tableanddata.php =================================================================== RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/mssql_tableanddata.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** mssql_tableanddata.php 11 Aug 2008 19:14:53 -0000 1.43 --- mssql_tableanddata.php 12 Aug 2008 09:34:29 -0000 1.44 *************** *** 1701,1705 **** $_SQL[] = "INSERT INTO {$_TABLES['statuscodes']} (code, name) VALUES (10,'Archive')"; ! $_SQL[] = "INSERT INTO {$_TABLES['stories']} (sid, uid, draft_flag, tid, date, title, introtext, bodytext, hits, numemails, comments, related, featured, commentcode, statuscode, postmode, frontpage, owner_id, group_id, perm_owner, perm_group, perm_members, perm_anon) VALUES ('welcome',2,0,'Geeklog',getdate(),'Welcome to Geeklog!','Welcome and let me be the first to congratulate you on installing Geeklog. Please take the time to read everything in the docs directory. Geeklog now has enhanced, user-based security. You should thoroughly understand how these work before you run a production Geeklog Site.\r\r
To log into your new Geeklog site, please use this account:\r
Username: Admin
\rPassword: passwordAnd don''t forget to change your password after logging in!','',100,1,0,'',1,0,0,'html',1,2,3,3,2,2,2)"; $_SQL[] = "INSERT INTO {$_TABLES['storysubmission']} (sid, uid, tid, title, introtext, date, postmode) VALUES ('security-reminder',2,'Geeklog','Are you secure?','
This is a reminder to secure your site once you have Geeklog up and running. What you should do:
\r\r- \r
- Change the default password for the Admin account. \r
- Remove the install directory (you won''t need it any more). \r
Welcome and let me be the first to congratulate you on installing Geeklog. Please take the time to read everything in the docs directory. Geeklog now has enhanced, user-based security. You should thoroughly understand how these work before you run a production Geeklog Site.\r\r
To log into your new Geeklog site, please use this account:\r
Username: Admin
\rPassword: passwordAnd don''t forget to change your password after logging in!','',100,1,0,'',1,0,0,'html',1,2,3,3,2,2,2)"; $_SQL[] = "INSERT INTO {$_TABLES['storysubmission']} (sid, uid, tid, title, introtext, date, postmode) VALUES ('security-reminder',2,'Geeklog','Are you secure?','
This is a reminder to secure your site once you have Geeklog up and running. What you should do:
\r\r- \r
- Change the default password for the Admin account. \r
- Remove the install directory (you won''t need it any more). \r
Welcome and let me be the first to congratulate you on installing Geeklog. Please take the time to read everything in the docs directory. Geeklog now has enhanced, user-based security. You should thoroughly understand how these work before you run a production Geeklog Site.
\rTo log into your new Geeklog site, please use this account:
\rUsername: Admin
\rPassword: passwordAnd don\'t forget to change your password after logging in!
','',100,1,0,'',1,0,0,'html',1,2,3,3,2,2,2) "; $_DATA[] = "INSERT INTO {$_TABLES['storysubmission']} (sid, uid, tid, title, introtext, date, postmode) VALUES ('security-reminder',2,'Geeklog','Are you secure?','This is a reminder to secure your site once you have Geeklog up and running. What you should do:
\r\r- \r
- Change the default password for the Admin account. \r
- Remove the install directory (you won\'t need it any more). \r
Welcome and let me be the first to congratulate you on installing Geeklog. Please take the time to read everything in the docs directory. Geeklog now has enhanced, user-based security. You should thoroughly understand how these work before you run a production Geeklog Site.
\rTo log into your new Geeklog site, please use this account:
\rUsername: Admin
\rPassword: passwordAnd don\'t forget to change your password after logging in!
','',100,1,0,'',1,0,0,'html',1,2,3,3,2,2,2) "; $_DATA[] = "INSERT INTO {$_TABLES['storysubmission']} (sid, uid, tid, title, introtext, date, postmode) VALUES ('security-reminder',2,'Geeklog','Are you secure?','This is a reminder to secure your site once you have Geeklog up and running. What you should do:
\r\r- \r
- Change the default password for the Admin account. \r
- Remove the install directory (you won\'t need it any more). \r
- In Geeklog 1.5.0, the behaviour of the variable